diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9bfb4814a7..009bb74262 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,10 +37,10 @@
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
     <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <application android:theme="@style/res_2131951648_apptheme_dark" android:label="@string/discord" android:icon="@mipmap/ic_logo_square_canary" android:name="com.discord.app.App" android:allowBackup="false" android:largeHeap="true" android:supportsRtl="true" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory">
-        <activity android:theme="@style/res_2131951669_apptheme_translucent" android:name="com.discord.samsung.SamsungConnectActivity"/>
-        <activity android:theme="@style/res_2131951648_apptheme_dark" android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:windowSoftInputMode="stateHidden|adjustResize"/>
-        <activity android:theme="@style/res_2131951659_apptheme_loading" android:name="com.discord.app.AppActivity$Main" android:exported="true" android:launchMode="singleTask" android:screenOrientation="fullUser" android:windowSoftInputMode="stateHidden|adjustResize">
+    <application android:theme="@style/AppTheme_Dark" android:label="@string/discord" android:icon="@mipmap/ic_logo_square_canary" android:name="com.discord.app.App" android:allowBackup="false" android:largeHeap="true" android:supportsRtl="true" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_logo_round_canary" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory">
+        <activity android:theme="@style/AppTheme_Translucent" android:name="com.discord.samsung.SamsungConnectActivity"/>
+        <activity android:theme="@style/AppTheme_Dark" android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:windowSoftInputMode="stateHidden|adjustResize"/>
+        <activity android:theme="@style/AppTheme_Loading" android:name="com.discord.app.AppActivity$Main" android:exported="true" android:launchMode="singleTask" android:screenOrientation="fullUser" android:windowSoftInputMode="stateHidden|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -122,7 +122,7 @@
         </activity>
         <activity android:name="com.discord.app.AppActivity$Call" android:excludeFromRecents="true" android:launchMode="singleTask"/>
         <activity android:name="com.discord.app.AppActivity$IncomingCall" android:excludeFromRecents="true" android:launchMode="singleTask" android:showOnLockScreen="true" android:showWhenLocked="true" android:turnScreenOn="true"/>
-        <activity android:theme="@style/res_2131951659_apptheme_loading" android:label="@string/discord" android:name="com.discord.app.AppActivity$AppAction" android:exported="true" android:launchMode="standard" android:windowSoftInputMode="stateHidden|adjustResize">
+        <activity android:theme="@style/AppTheme_Loading" android:label="@string/discord" android:name="com.discord.app.AppActivity$AppAction" android:exported="true" android:launchMode="standard" android:windowSoftInputMode="stateHidden|adjustResize">
             <intent-filter>
                 <action android:name="com.discord.intent.action.SDK"/>
                 <category android:name="android.intent.category.DEFAULT"/>
diff --git a/app/src/main/java/android/support/v4/media/MediaBrowserCompat.java b/app/src/main/java/android/support/v4/media/MediaBrowserCompat.java
index 534b6df858..1de3fdfa19 100644
--- a/app/src/main/java/android/support/v4/media/MediaBrowserCompat.java
+++ b/app/src/main/java/android/support/v4/media/MediaBrowserCompat.java
@@ -25,6 +25,8 @@ import androidx.annotation.RequiresApi;
 import androidx.collection.ArrayMap;
 import androidx.core.app.BundleCompat;
 import androidx.media.MediaBrowserCompatUtils;
+import androidx.media.MediaBrowserProtocol;
+import androidx.media.MediaBrowserServiceCompat;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
@@ -46,10 +48,10 @@ public final class MediaBrowserCompat {
             if (bundle != null) {
                 bundle = MediaSessionCompat.b(bundle);
             }
-            if (i != 0 || bundle == null || !bundle.containsKey("media_item")) {
+            if (i != 0 || bundle == null || !bundle.containsKey(MediaBrowserServiceCompat.KEY_MEDIA_ITEM)) {
                 throw null;
             }
-            Parcelable parcelable = bundle.getParcelable("media_item");
+            Parcelable parcelable = bundle.getParcelable(MediaBrowserServiceCompat.KEY_MEDIA_ITEM);
             if (parcelable == null || (parcelable instanceof MediaItem)) {
                 MediaItem mediaItem = (MediaItem) parcelable;
                 throw null;
@@ -136,10 +138,10 @@ public final class MediaBrowserCompat {
             if (bundle != null) {
                 bundle = MediaSessionCompat.b(bundle);
             }
-            if (i != 0 || bundle == null || !bundle.containsKey("search_results")) {
+            if (i != 0 || bundle == null || !bundle.containsKey(MediaBrowserServiceCompat.KEY_SEARCH_RESULTS)) {
                 throw null;
             }
-            Parcelable[] parcelableArray = bundle.getParcelableArray("search_results");
+            Parcelable[] parcelableArray = bundle.getParcelableArray(MediaBrowserServiceCompat.KEY_SEARCH_RESULTS);
             Objects.requireNonNull(parcelableArray);
             ArrayList arrayList = new ArrayList();
             for (Parcelable parcelable : parcelableArray) {
@@ -172,19 +174,19 @@ public final class MediaBrowserCompat {
                 try {
                     int i = message.what;
                     if (i == 1) {
-                        Bundle bundle = data.getBundle("data_root_hints");
+                        Bundle bundle = data.getBundle(MediaBrowserProtocol.DATA_ROOT_HINTS);
                         MediaSessionCompat.a(bundle);
-                        gVar.a(messenger, data.getString("data_media_item_id"), (MediaSessionCompat.Token) data.getParcelable("data_media_session_token"), bundle);
+                        gVar.a(messenger, data.getString(MediaBrowserProtocol.DATA_MEDIA_ITEM_ID), (MediaSessionCompat.Token) data.getParcelable(MediaBrowserProtocol.DATA_MEDIA_SESSION_TOKEN), bundle);
                     } else if (i == 2) {
                         gVar.c(messenger);
                     } else if (i != 3) {
                         Log.w("MediaBrowserCompat", "Unhandled message: " + message + "\n  Client version: 1\n  Service version: " + message.arg1);
                     } else {
-                        Bundle bundle2 = data.getBundle("data_options");
+                        Bundle bundle2 = data.getBundle(MediaBrowserProtocol.DATA_OPTIONS);
                         MediaSessionCompat.a(bundle2);
-                        Bundle bundle3 = data.getBundle("data_notify_children_changed_options");
+                        Bundle bundle3 = data.getBundle(MediaBrowserProtocol.DATA_NOTIFY_CHILDREN_CHANGED_OPTIONS);
                         MediaSessionCompat.a(bundle3);
-                        gVar.b(messenger, data.getString("data_media_item_id"), data.getParcelableArrayList("data_media_item_list"), bundle2, bundle3);
+                        gVar.b(messenger, data.getString(MediaBrowserProtocol.DATA_MEDIA_ITEM_ID), data.getParcelableArrayList(MediaBrowserProtocol.DATA_MEDIA_ITEM_LIST), bundle2, bundle3);
                     }
                 } catch (BadParcelableException unused) {
                     Log.e("MediaBrowserCompat", "Could not unparcel the data.");
@@ -214,8 +216,8 @@ public final class MediaBrowserCompat {
                     try {
                         Bundle extras = dVar.b.getExtras();
                         if (extras != null) {
-                            extras.getInt("extra_service_version", 0);
-                            IBinder binder = BundleCompat.getBinder(extras, "extra_messenger");
+                            extras.getInt(MediaBrowserProtocol.EXTRA_SERVICE_VERSION, 0);
+                            IBinder binder = BundleCompat.getBinder(extras, MediaBrowserProtocol.EXTRA_MESSENGER_BINDER);
                             if (binder != null) {
                                 dVar.f = new h(binder, dVar.f11c);
                                 Messenger messenger = new Messenger(dVar.d);
@@ -227,15 +229,15 @@ public final class MediaBrowserCompat {
                                     Messenger messenger2 = dVar.g;
                                     Objects.requireNonNull(hVar);
                                     Bundle bundle = new Bundle();
-                                    bundle.putString("data_package_name", context.getPackageName());
-                                    bundle.putInt("data_calling_pid", Process.myPid());
-                                    bundle.putBundle("data_root_hints", hVar.b);
+                                    bundle.putString(MediaBrowserProtocol.DATA_PACKAGE_NAME, context.getPackageName());
+                                    bundle.putInt(MediaBrowserProtocol.DATA_CALLING_PID, Process.myPid());
+                                    bundle.putBundle(MediaBrowserProtocol.DATA_ROOT_HINTS, hVar.b);
                                     hVar.a(6, bundle, messenger2);
                                 } catch (RemoteException unused) {
                                     Log.i("MediaBrowserCompat", "Remote error registering client messenger.");
                                 }
                             }
-                            x.a.b.b.a.b e = b.a.e(BundleCompat.getBinder(extras, "extra_session_binder"));
+                            x.a.b.b.a.b e = b.a.e(BundleCompat.getBinder(extras, MediaBrowserProtocol.EXTRA_SESSION_BINDER));
                             if (e != null) {
                                 dVar.h = MediaSessionCompat.Token.a(dVar.b.getSessionToken(), e);
                             }
@@ -311,8 +313,8 @@ public final class MediaBrowserCompat {
             this.a = context;
             Bundle bundle2 = bundle != null ? new Bundle(bundle) : new Bundle();
             this.f11c = bundle2;
-            bundle2.putInt("extra_client_version", 1);
-            bundle2.putInt("extra_calling_pid", Process.myPid());
+            bundle2.putInt(MediaBrowserProtocol.EXTRA_CLIENT_VERSION, 1);
+            bundle2.putInt(MediaBrowserProtocol.EXTRA_CALLING_PID, Process.myPid());
             bVar.setInternalConnectionCallback(this);
             this.b = new MediaBrowser(context, componentName, bVar.mConnectionCallbackFwk, bundle2);
         }
diff --git a/app/src/main/java/androidx/activity/ComponentActivity.java b/app/src/main/java/androidx/activity/ComponentActivity.java
index 10fafecada..ebf3c58f91 100644
--- a/app/src/main/java/androidx/activity/ComponentActivity.java
+++ b/app/src/main/java/androidx/activity/ComponentActivity.java
@@ -23,6 +23,7 @@ import androidx.activity.result.ActivityResultRegistry;
 import androidx.activity.result.ActivityResultRegistryOwner;
 import androidx.activity.result.IntentSenderRequest;
 import androidx.activity.result.contract.ActivityResultContract;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.ContentView;
 import androidx.annotation.LayoutRes;
@@ -111,7 +112,7 @@ public class ComponentActivity extends androidx.core.app.ComponentActivity imple
 
             @Override // java.lang.Runnable
             public void run() {
-                AnonymousClass2.this.dispatchResult(this.val$requestCode, 0, new Intent().setAction("androidx.activity.result.contract.action.INTENT_SENDER_REQUEST").putExtra("androidx.activity.result.contract.extra.SEND_INTENT_EXCEPTION", this.val$e));
+                AnonymousClass2.this.dispatchResult(this.val$requestCode, 0, new Intent().setAction(ActivityResultContracts.StartIntentSenderForResult.ACTION_INTENT_SENDER_REQUEST).putExtra(ActivityResultContracts.StartIntentSenderForResult.EXTRA_SEND_INTENT_EXCEPTION, this.val$e));
             }
         }
 
@@ -128,14 +129,14 @@ public class ComponentActivity extends androidx.core.app.ComponentActivity imple
             }
             Intent createIntent = activityResultContract.createIntent(componentActivity, i2);
             Bundle bundle = null;
-            if (createIntent.hasExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE")) {
-                bundle = createIntent.getBundleExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE");
-                createIntent.removeExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE");
+            if (createIntent.hasExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE)) {
+                bundle = createIntent.getBundleExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE);
+                createIntent.removeExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE);
             } else if (activityOptionsCompat != null) {
                 bundle = activityOptionsCompat.toBundle();
             }
-            if ("androidx.activity.result.contract.action.REQUEST_PERMISSIONS".equals(createIntent.getAction())) {
-                String[] stringArrayExtra = createIntent.getStringArrayExtra("androidx.activity.result.contract.extra.PERMISSIONS");
+            if (ActivityResultContracts.RequestMultiplePermissions.ACTION_REQUEST_PERMISSIONS.equals(createIntent.getAction())) {
+                String[] stringArrayExtra = createIntent.getStringArrayExtra(ActivityResultContracts.RequestMultiplePermissions.EXTRA_PERMISSIONS);
                 if (stringArrayExtra != null) {
                     ArrayList arrayList = new ArrayList();
                     for (String str : stringArrayExtra) {
@@ -147,8 +148,8 @@ public class ComponentActivity extends androidx.core.app.ComponentActivity imple
                         ActivityCompat.requestPermissions(componentActivity, (String[]) arrayList.toArray(new String[0]), i);
                     }
                 }
-            } else if ("androidx.activity.result.contract.action.INTENT_SENDER_REQUEST".equals(createIntent.getAction())) {
-                IntentSenderRequest intentSenderRequest = (IntentSenderRequest) createIntent.getParcelableExtra("androidx.activity.result.contract.extra.INTENT_SENDER_REQUEST");
+            } else if (ActivityResultContracts.StartIntentSenderForResult.ACTION_INTENT_SENDER_REQUEST.equals(createIntent.getAction())) {
+                IntentSenderRequest intentSenderRequest = (IntentSenderRequest) createIntent.getParcelableExtra(ActivityResultContracts.StartIntentSenderForResult.EXTRA_INTENT_SENDER_REQUEST);
                 try {
                     ActivityCompat.startIntentSenderForResult(componentActivity, intentSenderRequest.getIntentSender(), i, intentSenderRequest.getFillInIntent(), intentSenderRequest.getFlagsMask(), intentSenderRequest.getFlagsValues(), 0, bundle);
                 } catch (IntentSender.SendIntentException e) {
@@ -358,7 +359,7 @@ public class ComponentActivity extends androidx.core.app.ComponentActivity imple
     @CallSuper
     @Deprecated
     public void onRequestPermissionsResult(int i, @NonNull String[] strArr, @NonNull int[] iArr) {
-        if (!this.mActivityResultRegistry.dispatchResult(i, -1, new Intent().putExtra("androidx.activity.result.contract.extra.PERMISSIONS", strArr).putExtra("androidx.activity.result.contract.extra.PERMISSION_GRANT_RESULTS", iArr)) && Build.VERSION.SDK_INT >= 23) {
+        if (!this.mActivityResultRegistry.dispatchResult(i, -1, new Intent().putExtra(ActivityResultContracts.RequestMultiplePermissions.EXTRA_PERMISSIONS, strArr).putExtra(ActivityResultContracts.RequestMultiplePermissions.EXTRA_PERMISSION_GRANT_RESULTS, iArr)) && Build.VERSION.SDK_INT >= 23) {
             super.onRequestPermissionsResult(i, strArr, iArr);
         }
     }
diff --git a/app/src/main/java/androidx/activity/result/ActivityResultRegistry.java b/app/src/main/java/androidx/activity/result/ActivityResultRegistry.java
index 19fdf2ce37..564566ee1a 100644
--- a/app/src/main/java/androidx/activity/result/ActivityResultRegistry.java
+++ b/app/src/main/java/androidx/activity/result/ActivityResultRegistry.java
@@ -225,24 +225,24 @@ public abstract class ActivityResultRegistry {
 
     public final void onRestoreInstanceState(@Nullable Bundle bundle) {
         if (bundle != null) {
-            ArrayList<Integer> integerArrayList = bundle.getIntegerArrayList("KEY_COMPONENT_ACTIVITY_REGISTERED_RCS");
-            ArrayList<String> stringArrayList = bundle.getStringArrayList("KEY_COMPONENT_ACTIVITY_REGISTERED_KEYS");
+            ArrayList<Integer> integerArrayList = bundle.getIntegerArrayList(KEY_COMPONENT_ACTIVITY_REGISTERED_RCS);
+            ArrayList<String> stringArrayList = bundle.getStringArrayList(KEY_COMPONENT_ACTIVITY_REGISTERED_KEYS);
             if (!(stringArrayList == null || integerArrayList == null)) {
                 int size = stringArrayList.size();
                 for (int i = 0; i < size; i++) {
                     bindRcKey(integerArrayList.get(i).intValue(), stringArrayList.get(i));
                 }
-                this.mRandom = (Random) bundle.getSerializable("KEY_COMPONENT_ACTIVITY_RANDOM_OBJECT");
-                this.mPendingResults.putAll(bundle.getBundle("KEY_COMPONENT_ACTIVITY_PENDING_RESULT"));
+                this.mRandom = (Random) bundle.getSerializable(KEY_COMPONENT_ACTIVITY_RANDOM_OBJECT);
+                this.mPendingResults.putAll(bundle.getBundle(KEY_COMPONENT_ACTIVITY_PENDING_RESULTS));
             }
         }
     }
 
     public final void onSaveInstanceState(@NonNull Bundle bundle) {
-        bundle.putIntegerArrayList("KEY_COMPONENT_ACTIVITY_REGISTERED_RCS", new ArrayList<>(this.mRcToKey.keySet()));
-        bundle.putStringArrayList("KEY_COMPONENT_ACTIVITY_REGISTERED_KEYS", new ArrayList<>(this.mRcToKey.values()));
-        bundle.putBundle("KEY_COMPONENT_ACTIVITY_PENDING_RESULT", (Bundle) this.mPendingResults.clone());
-        bundle.putSerializable("KEY_COMPONENT_ACTIVITY_RANDOM_OBJECT", this.mRandom);
+        bundle.putIntegerArrayList(KEY_COMPONENT_ACTIVITY_REGISTERED_RCS, new ArrayList<>(this.mRcToKey.keySet()));
+        bundle.putStringArrayList(KEY_COMPONENT_ACTIVITY_REGISTERED_KEYS, new ArrayList<>(this.mRcToKey.values()));
+        bundle.putBundle(KEY_COMPONENT_ACTIVITY_PENDING_RESULTS, (Bundle) this.mPendingResults.clone());
+        bundle.putSerializable(KEY_COMPONENT_ACTIVITY_RANDOM_OBJECT, this.mRandom);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: androidx.activity.result.ActivityResultCallback<O> */
@@ -290,13 +290,13 @@ public abstract class ActivityResultRegistry {
         if (this.mParsedPendingResults.containsKey(str)) {
             StringBuilder P = a.P("Dropping pending result for request ", str, ": ");
             P.append(this.mParsedPendingResults.get(str));
-            Log.w("ActivityResultRegistry", P.toString());
+            Log.w(LOG_TAG, P.toString());
             this.mParsedPendingResults.remove(str);
         }
         if (this.mPendingResults.containsKey(str)) {
             StringBuilder P2 = a.P("Dropping pending result for request ", str, ": ");
             P2.append(this.mPendingResults.getParcelable(str));
-            Log.w("ActivityResultRegistry", P2.toString());
+            Log.w(LOG_TAG, P2.toString());
             this.mPendingResults.remove(str);
         }
         LifecycleContainer lifecycleContainer = this.mKeyToLifecycleContainers.get(str);
diff --git a/app/src/main/java/androidx/activity/result/contract/ActivityResultContracts.java b/app/src/main/java/androidx/activity/result/contract/ActivityResultContracts.java
index 61d798ecfb..c4d5d0f59b 100644
--- a/app/src/main/java/androidx/activity/result/contract/ActivityResultContracts.java
+++ b/app/src/main/java/androidx/activity/result/contract/ActivityResultContracts.java
@@ -202,7 +202,7 @@ public final class ActivityResultContracts {
 
         @NonNull
         public static Intent createIntent(@NonNull String[] strArr) {
-            return new Intent("androidx.activity.result.contract.action.REQUEST_PERMISSIONS").putExtra("androidx.activity.result.contract.extra.PERMISSIONS", strArr);
+            return new Intent(ACTION_REQUEST_PERMISSIONS).putExtra(EXTRA_PERMISSIONS, strArr);
         }
 
         @NonNull
@@ -239,8 +239,8 @@ public final class ActivityResultContracts {
             if (intent == null) {
                 return Collections.emptyMap();
             }
-            String[] stringArrayExtra = intent.getStringArrayExtra("androidx.activity.result.contract.extra.PERMISSIONS");
-            int[] intArrayExtra = intent.getIntArrayExtra("androidx.activity.result.contract.extra.PERMISSION_GRANT_RESULTS");
+            String[] stringArrayExtra = intent.getStringArrayExtra(EXTRA_PERMISSIONS);
+            int[] intArrayExtra = intent.getIntArrayExtra(EXTRA_PERMISSION_GRANT_RESULTS);
             if (intArrayExtra == null || stringArrayExtra == null) {
                 return Collections.emptyMap();
             }
@@ -276,7 +276,7 @@ public final class ActivityResultContracts {
             if (intent == null || i != -1) {
                 return Boolean.FALSE;
             }
-            int[] intArrayExtra = intent.getIntArrayExtra("androidx.activity.result.contract.extra.PERMISSION_GRANT_RESULTS");
+            int[] intArrayExtra = intent.getIntArrayExtra(RequestMultiplePermissions.EXTRA_PERMISSION_GRANT_RESULTS);
             if (intArrayExtra == null || intArrayExtra.length == 0) {
                 return Boolean.FALSE;
             }
@@ -310,7 +310,7 @@ public final class ActivityResultContracts {
 
         @NonNull
         public Intent createIntent(@NonNull Context context, @NonNull IntentSenderRequest intentSenderRequest) {
-            return new Intent("androidx.activity.result.contract.action.INTENT_SENDER_REQUEST").putExtra("androidx.activity.result.contract.extra.INTENT_SENDER_REQUEST", intentSenderRequest);
+            return new Intent(ACTION_INTENT_SENDER_REQUEST).putExtra(EXTRA_INTENT_SENDER_REQUEST, intentSenderRequest);
         }
 
         @Override // androidx.activity.result.contract.ActivityResultContract
diff --git a/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggle.java b/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggle.java
index 1b6c937393..a7f8028aee 100644
--- a/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggle.java
+++ b/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggle.java
@@ -15,6 +15,7 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBarDrawerToggleHoneycomb;
 import androidx.appcompat.graphics.drawable.DrawerArrowDrawable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 public class ActionBarDrawerToggle implements DrawerLayout.DrawerListener {
     private final Delegate mActivityImpl;
@@ -278,7 +279,7 @@ public class ActionBarDrawerToggle implements DrawerLayout.DrawerListener {
     public void setDrawerIndicatorEnabled(boolean z2) {
         if (z2 != this.mDrawerIndicatorEnabled) {
             if (z2) {
-                setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(8388611) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
+                setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(GravityCompat.START) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
             } else {
                 setActionBarUpIndicator(this.mHomeAsUpIndicator, 0);
             }
@@ -315,22 +316,22 @@ public class ActionBarDrawerToggle implements DrawerLayout.DrawerListener {
     }
 
     public void syncState() {
-        if (this.mDrawerLayout.isDrawerOpen(8388611)) {
+        if (this.mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
             setPosition(1.0f);
         } else {
             setPosition(0.0f);
         }
         if (this.mDrawerIndicatorEnabled) {
-            setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(8388611) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
+            setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(GravityCompat.START) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
         }
     }
 
     public void toggle() {
-        int drawerLockMode = this.mDrawerLayout.getDrawerLockMode(8388611);
-        if (this.mDrawerLayout.isDrawerVisible(8388611) && drawerLockMode != 2) {
-            this.mDrawerLayout.closeDrawer(8388611);
+        int drawerLockMode = this.mDrawerLayout.getDrawerLockMode(GravityCompat.START);
+        if (this.mDrawerLayout.isDrawerVisible(GravityCompat.START) && drawerLockMode != 2) {
+            this.mDrawerLayout.closeDrawer(GravityCompat.START);
         } else if (drawerLockMode != 1) {
-            this.mDrawerLayout.openDrawer(8388611);
+            this.mDrawerLayout.openDrawer(GravityCompat.START);
         }
     }
 }
diff --git a/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java b/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java
index 06c2d7fe41..d4ad0360a7 100644
--- a/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java
+++ b/app/src/main/java/androidx/appcompat/app/ActionBarDrawerToggleHoneycomb.java
@@ -56,7 +56,7 @@ public class ActionBarDrawerToggleHoneycomb {
             try {
                 setIndicatorInfo.setHomeActionContentDescription.invoke(activity.getActionBar(), Integer.valueOf(i));
             } catch (Exception e) {
-                Log.w("ActionBarDrawerToggleHC", "Couldn't set content description via JB-MR2 API", e);
+                Log.w(TAG, "Couldn't set content description via JB-MR2 API", e);
             }
         }
         return setIndicatorInfo;
@@ -70,14 +70,14 @@ public class ActionBarDrawerToggleHoneycomb {
                 setIndicatorInfo.setHomeAsUpIndicator.invoke(actionBar, drawable);
                 setIndicatorInfo.setHomeActionContentDescription.invoke(actionBar, Integer.valueOf(i));
             } catch (Exception e) {
-                Log.w("ActionBarDrawerToggleHC", "Couldn't set home-as-up indicator via JB-MR2 API", e);
+                Log.w(TAG, "Couldn't set home-as-up indicator via JB-MR2 API", e);
             }
         } else {
             ImageView imageView = setIndicatorInfo.upIndicatorView;
             if (imageView != null) {
                 imageView.setImageDrawable(drawable);
             } else {
-                Log.w("ActionBarDrawerToggleHC", "Couldn't set home-as-up indicator");
+                Log.w(TAG, "Couldn't set home-as-up indicator");
             }
         }
         return setIndicatorInfo;
diff --git a/app/src/main/java/androidx/appcompat/app/AppCompatDelegate.java b/app/src/main/java/androidx/appcompat/app/AppCompatDelegate.java
index c822d6f51a..ddb8d382d3 100644
--- a/app/src/main/java/androidx/appcompat/app/AppCompatDelegate.java
+++ b/app/src/main/java/androidx/appcompat/app/AppCompatDelegate.java
@@ -123,7 +123,7 @@ public abstract class AppCompatDelegate {
 
     public static void setDefaultNightMode(int i) {
         if (i != -1 && i != 0 && i != 1 && i != 2 && i != 3) {
-            Log.d("AppCompatDelegate", "setDefaultNightMode() called with an unknown mode");
+            Log.d(TAG, "setDefaultNightMode() called with an unknown mode");
         } else if (sDefaultNightMode != i) {
             sDefaultNightMode = i;
             applyDayNightToActiveDelegates();
diff --git a/app/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java b/app/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
index 3fa6c8ae61..3b313ed06c 100644
--- a/app/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
+++ b/app/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
@@ -87,6 +87,7 @@ import androidx.core.util.ObjectsCompat;
 import androidx.core.view.KeyEventDispatcher;
 import androidx.core.view.LayoutInflaterCompat;
 import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.PointerIconCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewPropertyAnimatorCompat;
 import androidx.core.view.ViewPropertyAnimatorListenerAdapter;
@@ -97,6 +98,7 @@ import androidx.lifecycle.LifecycleOwner;
 import c.d.b.a.a;
 import java.lang.Thread;
 import java.util.List;
+import org.webrtc.MediaStreamTrack;
 import org.xmlpull.v1.XmlPullParser;
 @RestrictTo({RestrictTo.Scope.LIBRARY})
 public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuilder.Callback, LayoutInflater.Factory2 {
@@ -176,7 +178,7 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
         @Override // java.lang.Thread.UncaughtExceptionHandler
         public void uncaughtException(@NonNull Thread thread, @NonNull Throwable th) {
             if (shouldWrapException(th)) {
-                Resources.NotFoundException notFoundException = new Resources.NotFoundException(th.getMessage() + ". If the resource you are trying to use is a vector resource, you may be referencing it in an unsupported way. See AppCompatDelegate.setCompatVectorFromResourcesEnabled() for more info.");
+                Resources.NotFoundException notFoundException = new Resources.NotFoundException(th.getMessage() + AppCompatDelegateImpl.EXCEPTION_HANDLER_MESSAGE_SUFFIX);
                 notFoundException.initCause(th.getCause());
                 notFoundException.setStackTrace(th.getStackTrace());
                 this.val$defHandler.uncaughtException(thread, notFoundException);
@@ -1437,7 +1439,7 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
                 ActivityInfo activityInfo = packageManager.getActivityInfo(new ComponentName(this.mContext, this.mHost.getClass()), i >= 29 ? 269221888 : i >= 24 ? 786432 : 0);
                 this.mActivityHandlesUiMode = (activityInfo == null || (activityInfo.configChanges & 512) == 0) ? false : true;
             } catch (PackageManager.NameNotFoundException e) {
-                Log.d("AppCompatDelegate", "Exception while getting ActivityInfo", e);
+                Log.d(AppCompatDelegate.TAG, "Exception while getting ActivityInfo", e);
                 this.mActivityHandlesUiMode = false;
             }
         }
@@ -1471,11 +1473,11 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
                 closePanel(panelState, true);
                 z3 = z4;
                 if (z3) {
-                    AudioManager audioManager = (AudioManager) this.mContext.getApplicationContext().getSystemService("audio");
+                    AudioManager audioManager = (AudioManager) this.mContext.getApplicationContext().getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
                     if (audioManager != null) {
                         audioManager.playSoundEffect(0);
                     } else {
-                        Log.w("AppCompatDelegate", "Couldn't get audio manager");
+                        Log.w(AppCompatDelegate.TAG, "Couldn't get audio manager");
                     }
                 }
                 return z3;
@@ -1553,7 +1555,7 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
                         if (!(view == null || (layoutParams = view.getLayoutParams()) == null || layoutParams.width != -1)) {
                             i = -1;
                             panelFeatureState.isHandled = false;
-                            WindowManager.LayoutParams layoutParams3 = new WindowManager.LayoutParams(i, -2, panelFeatureState.f14x, panelFeatureState.f15y, 1002, 8519680, -3);
+                            WindowManager.LayoutParams layoutParams3 = new WindowManager.LayoutParams(i, -2, panelFeatureState.f14x, panelFeatureState.f15y, PointerIconCompat.TYPE_HAND, 8519680, -3);
                             layoutParams3.gravity = panelFeatureState.gravity;
                             layoutParams3.windowAnimations = panelFeatureState.windowAnimations;
                             windowManager.addView(panelFeatureState.decorView, layoutParams3);
@@ -1563,7 +1565,7 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
                     }
                     i = -2;
                     panelFeatureState.isHandled = false;
-                    WindowManager.LayoutParams layoutParams3 = new WindowManager.LayoutParams(i, -2, panelFeatureState.f14x, panelFeatureState.f15y, 1002, 8519680, -3);
+                    WindowManager.LayoutParams layoutParams3 = new WindowManager.LayoutParams(i, -2, panelFeatureState.f14x, panelFeatureState.f15y, PointerIconCompat.TYPE_HAND, 8519680, -3);
                     layoutParams3.gravity = panelFeatureState.gravity;
                     layoutParams3.windowAnimations = panelFeatureState.windowAnimations;
                     windowManager.addView(panelFeatureState.decorView, layoutParams3);
@@ -1691,12 +1693,12 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
 
     private int sanitizeWindowFeatureId(int i) {
         if (i == 8) {
-            Log.i("AppCompatDelegate", "You should now use the AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR id when requesting this feature.");
+            Log.i(AppCompatDelegate.TAG, "You should now use the AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR id when requesting this feature.");
             return 108;
         } else if (i != 9) {
             return i;
         } else {
-            Log.i("AppCompatDelegate", "You should now use the AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR_OVERLAY id when requesting this feature.");
+            Log.i(AppCompatDelegate.TAG, "You should now use the AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR_OVERLAY id when requesting this feature.");
             return 109;
         }
     }
@@ -1941,7 +1943,7 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
                 try {
                     this.mAppCompatViewInflater = (AppCompatViewInflater) Class.forName(string).getDeclaredConstructor(new Class[0]).newInstance(new Object[0]);
                 } catch (Throwable th) {
-                    Log.i("AppCompatDelegate", "Failed to instantiate custom view inflater " + string + ". Falling back to default.", th);
+                    Log.i(AppCompatDelegate.TAG, "Failed to instantiate custom view inflater " + string + ". Falling back to default.", th);
                     this.mAppCompatViewInflater = new AppCompatViewInflater();
                 }
             }
@@ -2129,7 +2131,7 @@ public class AppCompatDelegateImpl extends AppCompatDelegate implements MenuBuil
         if (from.getFactory() == null) {
             LayoutInflaterCompat.setFactory2(from, this);
         } else if (!(from.getFactory2() instanceof AppCompatDelegateImpl)) {
-            Log.i("AppCompatDelegate", "The Activity's LayoutInflater already has a Factory installed so we can not install AppCompat's");
+            Log.i(AppCompatDelegate.TAG, "The Activity's LayoutInflater already has a Factory installed so we can not install AppCompat's");
         }
     }
 
diff --git a/app/src/main/java/androidx/appcompat/app/AppCompatViewInflater.java b/app/src/main/java/androidx/appcompat/app/AppCompatViewInflater.java
index 99b96b3fc7..949eb81719 100644
--- a/app/src/main/java/androidx/appcompat/app/AppCompatViewInflater.java
+++ b/app/src/main/java/androidx/appcompat/app/AppCompatViewInflater.java
@@ -178,7 +178,7 @@ public class AppCompatViewInflater {
         TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.View, 0, 0);
         int resourceId = z2 ? obtainStyledAttributes.getResourceId(R.styleable.View_android_theme, 0) : 0;
         if (z3 && resourceId == 0 && (resourceId = obtainStyledAttributes.getResourceId(R.styleable.View_theme, 0)) != 0) {
-            Log.i("AppCompatViewInflater", "app:theme is now deprecated. Please move to using android:theme instead.");
+            Log.i(LOG_TAG, "app:theme is now deprecated. Please move to using android:theme instead.");
         }
         obtainStyledAttributes.recycle();
         return resourceId != 0 ? (!(context instanceof ContextThemeWrapper) || ((ContextThemeWrapper) context).getThemeResId() != resourceId) ? new ContextThemeWrapper(context, resourceId) : context : context;
diff --git a/app/src/main/java/androidx/appcompat/app/ResourcesFlusher.java b/app/src/main/java/androidx/appcompat/app/ResourcesFlusher.java
index 05923329c4..36b7ba795a 100644
--- a/app/src/main/java/androidx/appcompat/app/ResourcesFlusher.java
+++ b/app/src/main/java/androidx/appcompat/app/ResourcesFlusher.java
@@ -43,7 +43,7 @@ public class ResourcesFlusher {
                 sDrawableCacheField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                Log.e("ResourcesFlusher", "Could not retrieve Resources#mDrawableCache field", e);
+                Log.e(TAG, "Could not retrieve Resources#mDrawableCache field", e);
             }
             sDrawableCacheFieldFetched = true;
         }
@@ -53,7 +53,7 @@ public class ResourcesFlusher {
             try {
                 map = (Map) field.get(resources);
             } catch (IllegalAccessException e2) {
-                Log.e("ResourcesFlusher", "Could not retrieve value from Resources#mDrawableCache", e2);
+                Log.e(TAG, "Could not retrieve value from Resources#mDrawableCache", e2);
             }
             if (map != null) {
                 map.clear();
@@ -69,7 +69,7 @@ public class ResourcesFlusher {
                 sDrawableCacheField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                Log.e("ResourcesFlusher", "Could not retrieve Resources#mDrawableCache field", e);
+                Log.e(TAG, "Could not retrieve Resources#mDrawableCache field", e);
             }
             sDrawableCacheFieldFetched = true;
         }
@@ -79,7 +79,7 @@ public class ResourcesFlusher {
             try {
                 obj = field.get(resources);
             } catch (IllegalAccessException e2) {
-                Log.e("ResourcesFlusher", "Could not retrieve value from Resources#mDrawableCache", e2);
+                Log.e(TAG, "Could not retrieve value from Resources#mDrawableCache", e2);
             }
         }
         if (obj != null) {
@@ -96,7 +96,7 @@ public class ResourcesFlusher {
                 sResourcesImplField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                Log.e("ResourcesFlusher", "Could not retrieve Resources#mResourcesImpl field", e);
+                Log.e(TAG, "Could not retrieve Resources#mResourcesImpl field", e);
             }
             sResourcesImplFieldFetched = true;
         }
@@ -106,7 +106,7 @@ public class ResourcesFlusher {
             try {
                 obj = field.get(resources);
             } catch (IllegalAccessException e2) {
-                Log.e("ResourcesFlusher", "Could not retrieve value from Resources#mResourcesImpl", e2);
+                Log.e(TAG, "Could not retrieve value from Resources#mResourcesImpl", e2);
                 obj = null;
             }
             if (obj != null) {
@@ -116,7 +116,7 @@ public class ResourcesFlusher {
                         sDrawableCacheField = declaredField2;
                         declaredField2.setAccessible(true);
                     } catch (NoSuchFieldException e3) {
-                        Log.e("ResourcesFlusher", "Could not retrieve ResourcesImpl#mDrawableCache field", e3);
+                        Log.e(TAG, "Could not retrieve ResourcesImpl#mDrawableCache field", e3);
                     }
                     sDrawableCacheFieldFetched = true;
                 }
@@ -125,7 +125,7 @@ public class ResourcesFlusher {
                     try {
                         obj2 = field2.get(obj);
                     } catch (IllegalAccessException e4) {
-                        Log.e("ResourcesFlusher", "Could not retrieve value from ResourcesImpl#mDrawableCache", e4);
+                        Log.e(TAG, "Could not retrieve value from ResourcesImpl#mDrawableCache", e4);
                     }
                 }
                 if (obj2 != null) {
@@ -141,7 +141,7 @@ public class ResourcesFlusher {
             try {
                 sThemedResourceCacheClazz = Class.forName("android.content.res.ThemedResourceCache");
             } catch (ClassNotFoundException e) {
-                Log.e("ResourcesFlusher", "Could not find ThemedResourceCache class", e);
+                Log.e(TAG, "Could not find ThemedResourceCache class", e);
             }
             sThemedResourceCacheClazzFetched = true;
         }
@@ -153,7 +153,7 @@ public class ResourcesFlusher {
                     sThemedResourceCache_mUnthemedEntriesField = declaredField;
                     declaredField.setAccessible(true);
                 } catch (NoSuchFieldException e2) {
-                    Log.e("ResourcesFlusher", "Could not retrieve ThemedResourceCache#mUnthemedEntries field", e2);
+                    Log.e(TAG, "Could not retrieve ThemedResourceCache#mUnthemedEntries field", e2);
                 }
                 sThemedResourceCache_mUnthemedEntriesFieldFetched = true;
             }
@@ -163,7 +163,7 @@ public class ResourcesFlusher {
                 try {
                     longSparseArray = (LongSparseArray) field.get(obj);
                 } catch (IllegalAccessException e3) {
-                    Log.e("ResourcesFlusher", "Could not retrieve value from ThemedResourceCache#mUnthemedEntries", e3);
+                    Log.e(TAG, "Could not retrieve value from ThemedResourceCache#mUnthemedEntries", e3);
                 }
                 if (longSparseArray != null) {
                     longSparseArray.clear();
diff --git a/app/src/main/java/androidx/appcompat/app/TwilightCalculator.java b/app/src/main/java/androidx/appcompat/app/TwilightCalculator.java
index d4f105278f..56cca39d27 100644
--- a/app/src/main/java/androidx/appcompat/app/TwilightCalculator.java
+++ b/app/src/main/java/androidx/appcompat/app/TwilightCalculator.java
@@ -23,12 +23,12 @@ public class TwilightCalculator {
     }
 
     public void calculateTwilight(long j, double d, double d2) {
-        float f = ((float) (j - 946728000000L)) / 8.64E7f;
+        float f = ((float) (j - UTC_2000)) / 8.64E7f;
         float f2 = (0.01720197f * f) + 6.24006f;
         double d3 = (double) f2;
         double sin = (Math.sin((double) (f2 * 3.0f)) * 5.236000106378924E-6d) + (Math.sin((double) (2.0f * f2)) * 3.4906598739326E-4d) + (Math.sin(d3) * 0.03341960161924362d) + d3 + 1.796593063d + 3.141592653589793d;
         double d4 = (-d2) / 360.0d;
-        double sin2 = (Math.sin(2.0d * sin) * -0.0069d) + (Math.sin(d3) * 0.0053d) + ((double) (((float) Math.round(((double) (f - 9.0E-4f)) - d4)) + 9.0E-4f)) + d4;
+        double sin2 = (Math.sin(2.0d * sin) * -0.0069d) + (Math.sin(d3) * 0.0053d) + ((double) (((float) Math.round(((double) (f - J0)) - d4)) + J0)) + d4;
         double asin = Math.asin(Math.sin(0.4092797040939331d) * Math.sin(sin));
         double d5 = 0.01745329238474369d * d;
         double sin3 = (Math.sin(-0.10471975803375244d) - (Math.sin(asin) * Math.sin(d5))) / (Math.cos(asin) * Math.cos(d5));
@@ -42,8 +42,8 @@ public class TwilightCalculator {
             this.sunrise = -1;
         } else {
             double acos = (double) ((float) (Math.acos(sin3) / 6.283185307179586d));
-            this.sunset = Math.round((sin2 + acos) * 8.64E7d) + 946728000000L;
-            long round = Math.round((sin2 - acos) * 8.64E7d) + 946728000000L;
+            this.sunset = Math.round((sin2 + acos) * 8.64E7d) + UTC_2000;
+            long round = Math.round((sin2 - acos) * 8.64E7d) + UTC_2000;
             this.sunrise = round;
             if (round >= j || this.sunset <= j) {
                 this.state = 1;
diff --git a/app/src/main/java/androidx/appcompat/app/TwilightManager.java b/app/src/main/java/androidx/appcompat/app/TwilightManager.java
index b23406a5cd..628a42f1e5 100644
--- a/app/src/main/java/androidx/appcompat/app/TwilightManager.java
+++ b/app/src/main/java/androidx/appcompat/app/TwilightManager.java
@@ -60,7 +60,7 @@ public class TwilightManager {
             }
             return null;
         } catch (Exception e) {
-            Log.d("TwilightManager", "Failed to get last known location", e);
+            Log.d(TAG, "Failed to get last known location", e);
             return null;
         }
     }
@@ -110,7 +110,7 @@ public class TwilightManager {
             updateState(lastKnownLocation);
             return twilightState.isNight;
         }
-        Log.i("TwilightManager", "Could not get last known location. This is probably because the app does not have any location permissions. Falling back to hardcoded sunrise/sunset values.");
+        Log.i(TAG, "Could not get last known location. This is probably because the app does not have any location permissions. Falling back to hardcoded sunrise/sunset values.");
         int i = Calendar.getInstance().get(11);
         return i < 6 || i >= 22;
     }
diff --git a/app/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java b/app/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
index 55ca6298a6..c967bef874 100644
--- a/app/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
+++ b/app/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
@@ -662,9 +662,9 @@ public class WindowDecorActionBar extends ActionBar implements ActionBarOverlayL
         if (shouldAnimateContextView()) {
             if (z2) {
                 viewPropertyAnimatorCompat = this.mDecorToolbar.setupAnimatorToVisibility(4, 100);
-                viewPropertyAnimatorCompat2 = this.mContextView.setupAnimatorToVisibility(0, 200);
+                viewPropertyAnimatorCompat2 = this.mContextView.setupAnimatorToVisibility(0, FADE_IN_DURATION_MS);
             } else {
-                viewPropertyAnimatorCompat2 = this.mDecorToolbar.setupAnimatorToVisibility(0, 200);
+                viewPropertyAnimatorCompat2 = this.mDecorToolbar.setupAnimatorToVisibility(0, FADE_IN_DURATION_MS);
                 viewPropertyAnimatorCompat = this.mContextView.setupAnimatorToVisibility(8, 100);
             }
             ViewPropertyAnimatorCompatSet viewPropertyAnimatorCompatSet = new ViewPropertyAnimatorCompatSet();
diff --git a/app/src/main/java/androidx/appcompat/content/res/AppCompatResources.java b/app/src/main/java/androidx/appcompat/content/res/AppCompatResources.java
index 438ec99cbb..0fe340bd28 100644
--- a/app/src/main/java/androidx/appcompat/content/res/AppCompatResources.java
+++ b/app/src/main/java/androidx/appcompat/content/res/AppCompatResources.java
@@ -107,7 +107,7 @@ public final class AppCompatResources {
         try {
             return ColorStateListInflaterCompat.createFromXml(resources, resources.getXml(i), context.getTheme());
         } catch (Exception e) {
-            Log.e("AppCompatResources", "Failed to inflate ColorStateList, leaving it to the framework", e);
+            Log.e(LOG_TAG, "Failed to inflate ColorStateList, leaving it to the framework", e);
             return null;
         }
     }
diff --git a/app/src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java b/app/src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java
index 5d793fe049..4d12095e83 100644
--- a/app/src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java
+++ b/app/src/main/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat.java
@@ -331,9 +331,9 @@ public class AnimatedStateListDrawableCompat extends StateListDrawable implement
                     return;
                 }
                 if (next == 2 && depth2 <= depth) {
-                    if (xmlPullParser.getName().equals("item")) {
+                    if (xmlPullParser.getName().equals(ELEMENT_ITEM)) {
                         parseItem(context, resources, xmlPullParser, attributeSet, theme);
-                    } else if (xmlPullParser.getName().equals("transition")) {
+                    } else if (xmlPullParser.getName().equals(ELEMENT_TRANSITION)) {
                         parseTransition(context, resources, xmlPullParser, attributeSet, theme);
                     }
                 }
@@ -362,13 +362,13 @@ public class AnimatedStateListDrawableCompat extends StateListDrawable implement
             if (next == 2) {
                 drawable = xmlPullParser.getName().equals("vector") ? VectorDrawableCompat.createFromXmlInner(resources, xmlPullParser, attributeSet, theme) : Drawable.createFromXmlInner(resources, xmlPullParser, attributeSet, theme);
             } else {
-                throw new XmlPullParserException(xmlPullParser.getPositionDescription() + ": <item> tag requires a 'drawable' attribute or child tag defining a drawable");
+                throw new XmlPullParserException(xmlPullParser.getPositionDescription() + ITEM_MISSING_DRAWABLE_ERROR);
             }
         }
         if (drawable != null) {
             return this.mState.addStateSet(extractStateSet, drawable, resourceId);
         }
-        throw new XmlPullParserException(xmlPullParser.getPositionDescription() + ": <item> tag requires a 'drawable' attribute or child tag defining a drawable");
+        throw new XmlPullParserException(xmlPullParser.getPositionDescription() + ITEM_MISSING_DRAWABLE_ERROR);
     }
 
     private int parseTransition(@NonNull Context context, @NonNull Resources resources, @NonNull XmlPullParser xmlPullParser, @NonNull AttributeSet attributeSet, @Nullable Resources.Theme theme) throws XmlPullParserException, IOException {
@@ -387,15 +387,15 @@ public class AnimatedStateListDrawableCompat extends StateListDrawable implement
             if (next == 2) {
                 drawable = xmlPullParser.getName().equals("animated-vector") ? AnimatedVectorDrawableCompat.createFromXmlInner(context, resources, xmlPullParser, attributeSet, theme) : Drawable.createFromXmlInner(resources, xmlPullParser, attributeSet, theme);
             } else {
-                throw new XmlPullParserException(xmlPullParser.getPositionDescription() + ": <transition> tag requires a 'drawable' attribute or child tag defining a drawable");
+                throw new XmlPullParserException(xmlPullParser.getPositionDescription() + TRANSITION_MISSING_DRAWABLE_ERROR);
             }
         }
         if (drawable == null) {
-            throw new XmlPullParserException(xmlPullParser.getPositionDescription() + ": <transition> tag requires a 'drawable' attribute or child tag defining a drawable");
+            throw new XmlPullParserException(xmlPullParser.getPositionDescription() + TRANSITION_MISSING_DRAWABLE_ERROR);
         } else if (resourceId != -1 && resourceId2 != -1) {
             return this.mState.addTransition(resourceId, resourceId2, drawable, z2);
         } else {
-            throw new XmlPullParserException(xmlPullParser.getPositionDescription() + ": <transition> tag requires 'fromId' & 'toId' attributes");
+            throw new XmlPullParserException(xmlPullParser.getPositionDescription() + TRANSITION_MISSING_FROM_TO_ID);
         }
     }
 
diff --git a/app/src/main/java/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.java b/app/src/main/java/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.java
index 3d2668b7ae..7bbca31569 100644
--- a/app/src/main/java/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.java
+++ b/app/src/main/java/androidx/appcompat/graphics/drawable/DrawerArrowDrawable.java
@@ -14,6 +14,7 @@ import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
 import androidx.core.graphics.drawable.DrawableCompat;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 public class DrawerArrowDrawable extends Drawable {
@@ -153,7 +154,7 @@ public class DrawerArrowDrawable extends Drawable {
         return this.mPaint;
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float getProgress() {
         return this.mProgress;
     }
diff --git a/app/src/main/java/androidx/appcompat/view/SupportMenuInflater.java b/app/src/main/java/androidx/appcompat/view/SupportMenuInflater.java
index 38f7be69d7..e79114707f 100644
--- a/app/src/main/java/androidx/appcompat/view/SupportMenuInflater.java
+++ b/app/src/main/java/androidx/appcompat/view/SupportMenuInflater.java
@@ -138,7 +138,7 @@ public class SupportMenuInflater extends MenuInflater {
                 constructor.setAccessible(true);
                 return (T) constructor.newInstance(objArr);
             } catch (Exception e) {
-                Log.w("SupportMenuInflater", "Cannot instantiate class: " + str, e);
+                Log.w(SupportMenuInflater.LOG_TAG, "Cannot instantiate class: " + str, e);
                 return null;
             }
         }
@@ -174,7 +174,7 @@ public class SupportMenuInflater extends MenuInflater {
                 if (!z2) {
                     menuItem.setActionView(i2);
                 } else {
-                    Log.w("SupportMenuInflater", "Ignoring attribute 'itemActionViewLayout'. Action view already specified.");
+                    Log.w(SupportMenuInflater.LOG_TAG, "Ignoring attribute 'itemActionViewLayout'. Action view already specified.");
                 }
             }
             ActionProvider actionProvider = this.itemActionProvider;
@@ -225,7 +225,7 @@ public class SupportMenuInflater extends MenuInflater {
         public void readItem(AttributeSet attributeSet) {
             TintTypedArray obtainStyledAttributes = TintTypedArray.obtainStyledAttributes(SupportMenuInflater.this.mContext, attributeSet, R.styleable.MenuItem);
             this.itemId = obtainStyledAttributes.getResourceId(R.styleable.MenuItem_android_id, 0);
-            this.itemCategoryOrder = (obtainStyledAttributes.getInt(R.styleable.MenuItem_android_menuCategory, this.groupCategory) & -65536) | (obtainStyledAttributes.getInt(R.styleable.MenuItem_android_orderInCategory, this.groupOrder) & 65535);
+            this.itemCategoryOrder = (obtainStyledAttributes.getInt(R.styleable.MenuItem_android_menuCategory, this.groupCategory) & SupportMenu.CATEGORY_MASK) | (obtainStyledAttributes.getInt(R.styleable.MenuItem_android_orderInCategory, this.groupOrder) & 65535);
             this.itemTitle = obtainStyledAttributes.getText(R.styleable.MenuItem_android_title);
             this.itemTitleCondensed = obtainStyledAttributes.getText(R.styleable.MenuItem_android_titleCondensed);
             this.itemIconResId = obtainStyledAttributes.getResourceId(R.styleable.MenuItem_android_icon, 0);
@@ -253,7 +253,7 @@ public class SupportMenuInflater extends MenuInflater {
                 this.itemActionProvider = (ActionProvider) newInstance(string, SupportMenuInflater.ACTION_PROVIDER_CONSTRUCTOR_SIGNATURE, SupportMenuInflater.this.mActionProviderConstructorArguments);
             } else {
                 if (z2) {
-                    Log.w("SupportMenuInflater", "Ignoring attribute 'actionProviderClass'. Action view already specified.");
+                    Log.w(SupportMenuInflater.LOG_TAG, "Ignoring attribute 'actionProviderClass'. Action view already specified.");
                 }
                 this.itemActionProvider = null;
             }
@@ -314,7 +314,7 @@ public class SupportMenuInflater extends MenuInflater {
                 }
             } else {
                 String name = xmlPullParser.getName();
-                if (name.equals("menu")) {
+                if (name.equals(XML_MENU)) {
                     eventType = xmlPullParser.next();
                 } else {
                     throw new RuntimeException(a.s("Expecting menu, got ", name));
@@ -332,9 +332,9 @@ public class SupportMenuInflater extends MenuInflater {
                         if (z3 && name2.equals(str)) {
                             str = null;
                             z3 = false;
-                        } else if (name2.equals("group")) {
+                        } else if (name2.equals(XML_GROUP)) {
                             menuState.resetGroup();
-                        } else if (name2.equals("item")) {
+                        } else if (name2.equals(XML_ITEM)) {
                             if (!menuState.hasAddedItem()) {
                                 ActionProvider actionProvider = menuState.itemActionProvider;
                                 if (actionProvider == null || !actionProvider.hasSubMenu()) {
@@ -343,17 +343,17 @@ public class SupportMenuInflater extends MenuInflater {
                                     menuState.addSubMenuItem();
                                 }
                             }
-                        } else if (name2.equals("menu")) {
+                        } else if (name2.equals(XML_MENU)) {
                             z2 = true;
                         }
                     }
                 } else if (!z3) {
                     String name3 = xmlPullParser.getName();
-                    if (name3.equals("group")) {
+                    if (name3.equals(XML_GROUP)) {
                         menuState.readGroup(attributeSet);
-                    } else if (name3.equals("item")) {
+                    } else if (name3.equals(XML_ITEM)) {
                         menuState.readItem(attributeSet);
-                    } else if (name3.equals("menu")) {
+                    } else if (name3.equals(XML_MENU)) {
                         parseMenu(xmlPullParser, attributeSet, menuState.addSubMenuItem());
                     } else {
                         z3 = true;
diff --git a/app/src/main/java/androidx/appcompat/view/menu/ActionMenuItemView.java b/app/src/main/java/androidx/appcompat/view/menu/ActionMenuItemView.java
index df418a9c28..765da12b88 100644
--- a/app/src/main/java/androidx/appcompat/view/menu/ActionMenuItemView.java
+++ b/app/src/main/java/androidx/appcompat/view/menu/ActionMenuItemView.java
@@ -18,6 +18,7 @@ import androidx.appcompat.widget.ActionMenuView;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.ForwardingListener;
 import androidx.appcompat.widget.TooltipCompat;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
 public class ActionMenuItemView extends AppCompatTextView implements MenuView.ItemView, View.OnClickListener, ActionMenuView.ActionMenuChildView {
     private static final int MAX_ICON_SIZE = 32;
@@ -174,7 +175,7 @@ public class ActionMenuItemView extends AppCompatTextView implements MenuView.It
         int measuredWidth = getMeasuredWidth();
         int min = mode == Integer.MIN_VALUE ? Math.min(size, this.mMinWidth) : this.mMinWidth;
         if (mode != 1073741824 && this.mMinWidth > 0 && measuredWidth < min) {
-            super.onMeasure(View.MeasureSpec.makeMeasureSpec(min, 1073741824), i2);
+            super.onMeasure(View.MeasureSpec.makeMeasureSpec(min, BasicMeasure.EXACTLY), i2);
         }
         if (!hasText && this.mIcon != null) {
             super.setPadding((getMeasuredWidth() - this.mIcon.getBounds().width()) / 2, getPaddingTop(), getPaddingRight(), getPaddingBottom());
diff --git a/app/src/main/java/androidx/appcompat/view/menu/ListMenuPresenter.java b/app/src/main/java/androidx/appcompat/view/menu/ListMenuPresenter.java
index 10a86ca3a6..96168c6da0 100644
--- a/app/src/main/java/androidx/appcompat/view/menu/ListMenuPresenter.java
+++ b/app/src/main/java/androidx/appcompat/view/menu/ListMenuPresenter.java
@@ -209,7 +209,7 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick
     }
 
     public void restoreHierarchyState(Bundle bundle) {
-        SparseArray<Parcelable> sparseParcelableArray = bundle.getSparseParcelableArray("android:menu:list");
+        SparseArray<Parcelable> sparseParcelableArray = bundle.getSparseParcelableArray(VIEWS_TAG);
         if (sparseParcelableArray != null) {
             this.mMenuView.restoreHierarchyState(sparseParcelableArray);
         }
@@ -221,7 +221,7 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick
         if (expandedMenuView != null) {
             expandedMenuView.saveHierarchyState(sparseArray);
         }
-        bundle.putSparseParcelableArray("android:menu:list", sparseArray);
+        bundle.putSparseParcelableArray(VIEWS_TAG, sparseArray);
     }
 
     @Override // androidx.appcompat.view.menu.MenuPresenter
diff --git a/app/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java b/app/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
index a02b869e35..97fb4fd6e5 100644
--- a/app/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
+++ b/app/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
@@ -110,7 +110,7 @@ public class MenuBuilder implements SupportMenu {
 
     private void dispatchRestoreInstanceState(Bundle bundle) {
         Parcelable parcelable;
-        SparseArray sparseParcelableArray = bundle.getSparseParcelableArray("android:menu:presenters");
+        SparseArray sparseParcelableArray = bundle.getSparseParcelableArray(PRESENTER_KEY);
         if (sparseParcelableArray != null && !this.mPresenters.isEmpty()) {
             Iterator<WeakReference<MenuPresenter>> it = this.mPresenters.iterator();
             while (it.hasNext()) {
@@ -145,7 +145,7 @@ public class MenuBuilder implements SupportMenu {
                     }
                 }
             }
-            bundle.putSparseParcelableArray("android:menu:presenters", sparseArray);
+            bundle.putSparseParcelableArray(PRESENTER_KEY, sparseArray);
         }
     }
 
@@ -513,7 +513,7 @@ public class MenuBuilder implements SupportMenu {
                     ((MenuBuilder) menuItemImpl.getSubMenu()).findItemsWithShortcutForKey(list, i, keyEvent);
                 }
                 char alphabeticShortcut = isQwertyMode ? menuItemImpl.getAlphabeticShortcut() : menuItemImpl.getNumericShortcut();
-                if (((modifiers & 69647) == ((isQwertyMode ? menuItemImpl.getAlphabeticModifiers() : menuItemImpl.getNumericModifiers()) & 69647)) && alphabeticShortcut != 0) {
+                if (((modifiers & SupportMenu.SUPPORTED_MODIFIERS_MASK) == ((isQwertyMode ? menuItemImpl.getAlphabeticModifiers() : menuItemImpl.getNumericModifiers()) & SupportMenu.SUPPORTED_MODIFIERS_MASK)) && alphabeticShortcut != 0) {
                     char[] cArr = keyData.meta;
                     if ((alphabeticShortcut == cArr[0] || alphabeticShortcut == cArr[2] || (isQwertyMode && alphabeticShortcut == '\b' && i == 67)) && menuItemImpl.isEnabled()) {
                         list.add(menuItemImpl);
@@ -564,7 +564,7 @@ public class MenuBuilder implements SupportMenu {
     }
 
     public String getActionViewStatesKey() {
-        return "android:menu:actionviewstates";
+        return ACTION_VIEW_STATES_KEY;
     }
 
     public Context getContext() {
@@ -789,7 +789,7 @@ public class MenuBuilder implements SupportMenu {
                     ((SubMenuBuilder) item.getSubMenu()).restoreActionViewStates(bundle);
                 }
             }
-            int i2 = bundle.getInt("android:menu:expandedactionview");
+            int i2 = bundle.getInt(EXPANDED_ACTION_VIEW_ID);
             if (i2 > 0 && (findItem = findItem(i2)) != null) {
                 findItem.expandActionView();
             }
@@ -812,7 +812,7 @@ public class MenuBuilder implements SupportMenu {
                 }
                 actionView.saveHierarchyState(sparseArray);
                 if (item.isActionViewExpanded()) {
-                    bundle.putInt("android:menu:expandedactionview", item.getItemId());
+                    bundle.putInt(EXPANDED_ACTION_VIEW_ID, item.getItemId());
                 }
             }
             if (item.hasSubMenu()) {
diff --git a/app/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java b/app/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
index 995f6d11bb..3270f4fd9a 100644
--- a/app/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
+++ b/app/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.R;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.menu.MenuPresenter;
+import androidx.core.view.PointerIconCompat;
 public class MenuDialogHelper implements DialogInterface.OnKeyListener, DialogInterface.OnClickListener, DialogInterface.OnDismissListener, MenuPresenter.Callback {
     private AlertDialog mDialog;
     private MenuBuilder mMenu;
@@ -103,7 +104,7 @@ public class MenuDialogHelper implements DialogInterface.OnKeyListener, DialogIn
         this.mDialog = create;
         create.setOnDismissListener(this);
         WindowManager.LayoutParams attributes = this.mDialog.getWindow().getAttributes();
-        attributes.type = 1003;
+        attributes.type = PointerIconCompat.TYPE_HELP;
         if (iBinder != null) {
             attributes.token = iBinder;
         }
diff --git a/app/src/main/java/androidx/appcompat/view/menu/MenuItemImpl.java b/app/src/main/java/androidx/appcompat/view/menu/MenuItemImpl.java
index 1b52d6b52e..6b082300d3 100644
--- a/app/src/main/java/androidx/appcompat/view/menu/MenuItemImpl.java
+++ b/app/src/main/java/androidx/appcompat/view/menu/MenuItemImpl.java
@@ -345,7 +345,7 @@ public final class MenuItemImpl implements SupportMenuItem {
                 this.mMenu.getContext().startActivity(this.mIntent);
                 return true;
             } catch (ActivityNotFoundException e) {
-                Log.e("MenuItemImpl", "Can't find activity to handle intent; ignoring", e);
+                Log.e(TAG, "Can't find activity to handle intent; ignoring", e);
             }
         }
         ActionProvider actionProvider = this.mActionProvider;
diff --git a/app/src/main/java/androidx/appcompat/view/menu/MenuItemWrapperICS.java b/app/src/main/java/androidx/appcompat/view/menu/MenuItemWrapperICS.java
index aeab037c81..0f9481b93d 100644
--- a/app/src/main/java/androidx/appcompat/view/menu/MenuItemWrapperICS.java
+++ b/app/src/main/java/androidx/appcompat/view/menu/MenuItemWrapperICS.java
@@ -373,7 +373,7 @@ public class MenuItemWrapperICS extends BaseMenuWrapper implements MenuItem {
             }
             this.mSetExclusiveCheckableMethod.invoke(this.mWrappedObject, Boolean.valueOf(z2));
         } catch (Exception e) {
-            Log.w("MenuItemWrapper", "Error while calling setExclusiveCheckable", e);
+            Log.w(LOG_TAG, "Error while calling setExclusiveCheckable", e);
         }
     }
 
diff --git a/app/src/main/java/androidx/appcompat/view/menu/MenuPopupHelper.java b/app/src/main/java/androidx/appcompat/view/menu/MenuPopupHelper.java
index e505f884fe..6919a61d09 100644
--- a/app/src/main/java/androidx/appcompat/view/menu/MenuPopupHelper.java
+++ b/app/src/main/java/androidx/appcompat/view/menu/MenuPopupHelper.java
@@ -57,7 +57,7 @@ public class MenuPopupHelper implements MenuHelper {
     }
 
     public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menuBuilder, @NonNull View view, boolean z2, @AttrRes int i, @StyleRes int i2) {
-        this.mDropDownGravity = 8388611;
+        this.mDropDownGravity = GravityCompat.START;
         this.mInternalOnDismissListener = new AnonymousClass1();
         this.mContext = context;
         this.mMenu = menuBuilder;
diff --git a/app/src/main/java/androidx/appcompat/widget/ActionBarContextView.java b/app/src/main/java/androidx/appcompat/widget/ActionBarContextView.java
index 3773426e18..180c17a999 100644
--- a/app/src/main/java/androidx/appcompat/widget/ActionBarContextView.java
+++ b/app/src/main/java/androidx/appcompat/widget/ActionBarContextView.java
@@ -16,6 +16,7 @@ import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewPropertyAnimatorCompat;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
@@ -267,8 +268,9 @@ public class ActionBarContextView extends AbsActionBarView {
 
     @Override // android.view.View
     public void onMeasure(int i, int i2) {
-        int i3 = 1073741824;
-        if (View.MeasureSpec.getMode(i) != 1073741824) {
+        int mode = View.MeasureSpec.getMode(i);
+        int i3 = BasicMeasure.EXACTLY;
+        if (mode != 1073741824) {
             throw new IllegalStateException(getClass().getSimpleName() + " can only be used with android:layout_width=\"match_parent\" (or fill_parent)");
         } else if (View.MeasureSpec.getMode(i2) != 0) {
             int size = View.MeasureSpec.getSize(i);
@@ -308,7 +310,7 @@ public class ActionBarContextView extends AbsActionBarView {
             if (view2 != null) {
                 ViewGroup.LayoutParams layoutParams = view2.getLayoutParams();
                 int i6 = layoutParams.width;
-                int i7 = i6 != -2 ? 1073741824 : Integer.MIN_VALUE;
+                int i7 = i6 != -2 ? BasicMeasure.EXACTLY : Integer.MIN_VALUE;
                 if (i6 >= 0) {
                     paddingLeft = Math.min(i6, paddingLeft);
                 }
diff --git a/app/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java b/app/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
index 22380e87ea..e509b4851d 100644
--- a/app/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
+++ b/app/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
@@ -27,6 +27,7 @@ import androidx.appcompat.view.menu.SubMenuBuilder;
 import androidx.appcompat.widget.ActionMenuView;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ActionProvider;
+import androidx.core.view.GravityCompat;
 import java.util.ArrayList;
 public class ActionMenuPresenter extends BaseMenuPresenter implements ActionProvider.SubUiVisibilityListener {
     private static final String TAG = "ActionMenuPresenter";
@@ -192,7 +193,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter implements ActionProv
     public class OverflowPopup extends MenuPopupHelper {
         public OverflowPopup(Context context, MenuBuilder menuBuilder, View view, boolean z2) {
             super(context, menuBuilder, view, z2, R.attr.actionOverflowMenuStyle);
-            setGravity(8388613);
+            setGravity(GravityCompat.END);
             setPresenterCallback(ActionMenuPresenter.this.mPopupPresenterCallback);
         }
 
diff --git a/app/src/main/java/androidx/appcompat/widget/ActionMenuView.java b/app/src/main/java/androidx/appcompat/widget/ActionMenuView.java
index 33d3b9076e..3d503342c1 100644
--- a/app/src/main/java/androidx/appcompat/widget/ActionMenuView.java
+++ b/app/src/main/java/androidx/appcompat/widget/ActionMenuView.java
@@ -21,6 +21,7 @@ import androidx.appcompat.view.menu.MenuItemImpl;
 import androidx.appcompat.view.menu.MenuPresenter;
 import androidx.appcompat.view.menu.MenuView;
 import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 public class ActionMenuView extends LinearLayoutCompat implements MenuBuilder.ItemInvoker, MenuView {
     public static final int GENERATED_ITEM_PADDING = 4;
     public static final int MIN_CELL_SIZE = 56;
@@ -155,7 +156,7 @@ public class ActionMenuView extends LinearLayoutCompat implements MenuBuilder.It
         }
         layoutParams.expandable = z2;
         layoutParams.cellsUsed = i5;
-        view.measure(View.MeasureSpec.makeMeasureSpec(i * i5, 1073741824), makeMeasureSpec);
+        view.measure(View.MeasureSpec.makeMeasureSpec(i * i5, BasicMeasure.EXACTLY), makeMeasureSpec);
         return i5;
     }
 
@@ -362,7 +363,7 @@ public class ActionMenuView extends LinearLayoutCompat implements MenuBuilder.It
                 View childAt4 = getChildAt(i33);
                 LayoutParams layoutParams5 = (LayoutParams) childAt4.getLayoutParams();
                 if (layoutParams5.expanded) {
-                    childAt4.measure(View.MeasureSpec.makeMeasureSpec((layoutParams5.cellsUsed * i12) + layoutParams5.extraPixels, 1073741824), childMeasureSpec);
+                    childAt4.measure(View.MeasureSpec.makeMeasureSpec((layoutParams5.cellsUsed * i12) + layoutParams5.extraPixels, BasicMeasure.EXACTLY), childMeasureSpec);
                 }
             }
         }
diff --git a/app/src/main/java/androidx/appcompat/widget/ActivityChooserModel.java b/app/src/main/java/androidx/appcompat/widget/ActivityChooserModel.java
index 24d4e0251c..43798babd7 100644
--- a/app/src/main/java/androidx/appcompat/widget/ActivityChooserModel.java
+++ b/app/src/main/java/androidx/appcompat/widget/ActivityChooserModel.java
@@ -11,6 +11,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -119,7 +120,7 @@ public class ActivityChooserModel extends DataSetObservable {
                 ActivityResolveInfo activityResolveInfo2 = map.get(historicalRecord.activity);
                 if (activityResolveInfo2 != null) {
                     activityResolveInfo2.weight = (historicalRecord.weight * f) + activityResolveInfo2.weight;
-                    f *= 0.95f;
+                    f *= WEIGHT_DECAY_COEFFICIENT;
                 }
             }
             Collections.sort(list);
@@ -211,18 +212,18 @@ public class ActivityChooserModel extends DataSetObservable {
                 XmlSerializer newSerializer = Xml.newSerializer();
                 try {
                     newSerializer.setOutput(openFileOutput, null);
-                    newSerializer.startDocument("UTF-8", Boolean.TRUE);
-                    newSerializer.startTag(null, "historical-records");
+                    newSerializer.startDocument(Constants.ENCODING, Boolean.TRUE);
+                    newSerializer.startTag(null, ActivityChooserModel.TAG_HISTORICAL_RECORDS);
                     int size = list.size();
                     for (int i = 0; i < size; i++) {
                         HistoricalRecord historicalRecord = (HistoricalRecord) list.remove(0);
-                        newSerializer.startTag(null, "historical-record");
-                        newSerializer.attribute(null, "activity", historicalRecord.activity.flattenToString());
+                        newSerializer.startTag(null, ActivityChooserModel.TAG_HISTORICAL_RECORD);
+                        newSerializer.attribute(null, ActivityChooserModel.ATTRIBUTE_ACTIVITY, historicalRecord.activity.flattenToString());
                         newSerializer.attribute(null, "time", String.valueOf(historicalRecord.time));
-                        newSerializer.attribute(null, "weight", String.valueOf(historicalRecord.weight));
-                        newSerializer.endTag(null, "historical-record");
+                        newSerializer.attribute(null, ActivityChooserModel.ATTRIBUTE_WEIGHT, String.valueOf(historicalRecord.weight));
+                        newSerializer.endTag(null, ActivityChooserModel.TAG_HISTORICAL_RECORD);
                     }
-                    newSerializer.endTag(null, "historical-records");
+                    newSerializer.endTag(null, ActivityChooserModel.TAG_HISTORICAL_RECORDS);
                     newSerializer.endDocument();
                     ActivityChooserModel.this.mCanReadHistoricalData = true;
                 } catch (IllegalArgumentException e) {
@@ -258,10 +259,10 @@ public class ActivityChooserModel extends DataSetObservable {
 
     private ActivityChooserModel(Context context, String str) {
         this.mContext = context.getApplicationContext();
-        if (TextUtils.isEmpty(str) || str.endsWith(".xml")) {
+        if (TextUtils.isEmpty(str) || str.endsWith(HISTORY_FILE_EXTENSION)) {
             this.mHistoryFileName = str;
         } else {
-            this.mHistoryFileName = a.s(str, ".xml");
+            this.mHistoryFileName = a.s(str, HISTORY_FILE_EXTENSION);
         }
     }
 
@@ -349,12 +350,12 @@ public class ActivityChooserModel extends DataSetObservable {
             FileInputStream openFileInput = this.mContext.openFileInput(this.mHistoryFileName);
             try {
                 XmlPullParser newPullParser = Xml.newPullParser();
-                newPullParser.setInput(openFileInput, "UTF-8");
+                newPullParser.setInput(openFileInput, Constants.ENCODING);
                 int i = 0;
                 while (i != 1 && i != 2) {
                     i = newPullParser.next();
                 }
-                if ("historical-records".equals(newPullParser.getName())) {
+                if (TAG_HISTORICAL_RECORDS.equals(newPullParser.getName())) {
                     List<HistoricalRecord> list = this.mHistoricalRecords;
                     list.clear();
                     while (true) {
@@ -364,8 +365,8 @@ public class ActivityChooserModel extends DataSetObservable {
                                 return;
                             }
                         } else if (!(next == 3 || next == 4)) {
-                            if ("historical-record".equals(newPullParser.getName())) {
-                                list.add(new HistoricalRecord(newPullParser.getAttributeValue(null, "activity"), Long.parseLong(newPullParser.getAttributeValue(null, "time")), Float.parseFloat(newPullParser.getAttributeValue(null, "weight"))));
+                            if (TAG_HISTORICAL_RECORD.equals(newPullParser.getName())) {
+                                list.add(new HistoricalRecord(newPullParser.getAttributeValue(null, ATTRIBUTE_ACTIVITY), Long.parseLong(newPullParser.getAttributeValue(null, "time")), Float.parseFloat(newPullParser.getAttributeValue(null, ATTRIBUTE_WEIGHT))));
                             } else {
                                 throw new XmlPullParserException("Share records file not well-formed.");
                             }
diff --git a/app/src/main/java/androidx/appcompat/widget/ActivityChooserView.java b/app/src/main/java/androidx/appcompat/widget/ActivityChooserView.java
index a12fbfea36..1a8365646b 100644
--- a/app/src/main/java/androidx/appcompat/widget/ActivityChooserView.java
+++ b/app/src/main/java/androidx/appcompat/widget/ActivityChooserView.java
@@ -28,6 +28,7 @@ import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
 import androidx.appcompat.view.menu.ShowableListMenu;
 import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.ActionProvider;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
@@ -505,7 +506,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
     public void onMeasure(int i, int i2) {
         View view = this.mActivityChooserContent;
         if (this.mDefaultActivityButton.getVisibility() != 0) {
-            i2 = View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i2), 1073741824);
+            i2 = View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i2), BasicMeasure.EXACTLY);
         }
         measureChild(view, i, i2);
         setMeasuredDimension(view.getMeasuredWidth(), view.getMeasuredHeight());
diff --git a/app/src/main/java/androidx/appcompat/widget/AlertDialogLayout.java b/app/src/main/java/androidx/appcompat/widget/AlertDialogLayout.java
index 58e8661fcd..d983c3f0ab 100644
--- a/app/src/main/java/androidx/appcompat/widget/AlertDialogLayout.java
+++ b/app/src/main/java/androidx/appcompat/widget/AlertDialogLayout.java
@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
 import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
@@ -22,7 +23,7 @@ public class AlertDialogLayout extends LinearLayoutCompat {
     }
 
     private void forceUniformWidth(int i, int i2) {
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), BasicMeasure.EXACTLY);
         for (int i3 = 0; i3 < i; i3++) {
             View childAt = getChildAt(i3);
             if (childAt.getVisibility() != 8) {
@@ -116,7 +117,7 @@ public class AlertDialogLayout extends LinearLayoutCompat {
                 i8 -= min;
                 i5 += min;
             }
-            view2.measure(i, View.MeasureSpec.makeMeasureSpec(i5, 1073741824));
+            view2.measure(i, View.MeasureSpec.makeMeasureSpec(i5, BasicMeasure.EXACTLY));
             paddingBottom = i9 + view2.getMeasuredHeight();
             i3 = View.combineMeasuredStates(i3, view2.getMeasuredState());
         }
@@ -154,7 +155,7 @@ public class AlertDialogLayout extends LinearLayoutCompat {
         int childCount = getChildCount();
         int gravity = getGravity();
         int i9 = gravity & 112;
-        int i10 = gravity & 8388615;
+        int i10 = gravity & GravityCompat.RELATIVE_HORIZONTAL_GRAVITY_MASK;
         int paddingTop = i9 != 16 ? i9 != 80 ? getPaddingTop() : ((getPaddingTop() + i4) - i2) - measuredHeight : (((i4 - i2) - measuredHeight) / 2) + getPaddingTop();
         Drawable dividerDrawable = getDividerDrawable();
         int intrinsicHeight = dividerDrawable == null ? 0 : dividerDrawable.getIntrinsicHeight();
diff --git a/app/src/main/java/androidx/appcompat/widget/AppCompatSpinner.java b/app/src/main/java/androidx/appcompat/widget/AppCompatSpinner.java
index 070cc67068..26d7d7ffca 100644
--- a/app/src/main/java/androidx/appcompat/widget/AppCompatSpinner.java
+++ b/app/src/main/java/androidx/appcompat/widget/AppCompatSpinner.java
@@ -167,17 +167,17 @@ public class AppCompatSpinner extends Spinner implements TintableBackgroundView
 
         @Override // androidx.appcompat.widget.AppCompatSpinner.SpinnerPopup
         public void setBackgroundDrawable(Drawable drawable) {
-            Log.e("AppCompatSpinner", "Cannot set popup background for MODE_DIALOG, ignoring");
+            Log.e(AppCompatSpinner.TAG, "Cannot set popup background for MODE_DIALOG, ignoring");
         }
 
         @Override // androidx.appcompat.widget.AppCompatSpinner.SpinnerPopup
         public void setHorizontalOffset(int i) {
-            Log.e("AppCompatSpinner", "Cannot set horizontal offset for MODE_DIALOG, ignoring");
+            Log.e(AppCompatSpinner.TAG, "Cannot set horizontal offset for MODE_DIALOG, ignoring");
         }
 
         @Override // androidx.appcompat.widget.AppCompatSpinner.SpinnerPopup
         public void setHorizontalOriginalOffset(int i) {
-            Log.e("AppCompatSpinner", "Cannot set horizontal (original) offset for MODE_DIALOG, ignoring");
+            Log.e(AppCompatSpinner.TAG, "Cannot set horizontal (original) offset for MODE_DIALOG, ignoring");
         }
 
         @Override // androidx.appcompat.widget.AppCompatSpinner.SpinnerPopup
@@ -187,7 +187,7 @@ public class AppCompatSpinner extends Spinner implements TintableBackgroundView
 
         @Override // androidx.appcompat.widget.AppCompatSpinner.SpinnerPopup
         public void setVerticalOffset(int i) {
-            Log.e("AppCompatSpinner", "Cannot set vertical offset for MODE_DIALOG, ignoring");
+            Log.e(AppCompatSpinner.TAG, "Cannot set vertical offset for MODE_DIALOG, ignoring");
         }
 
         @Override // androidx.appcompat.widget.AppCompatSpinner.SpinnerPopup
@@ -603,7 +603,7 @@ public class AppCompatSpinner extends Spinner implements TintableBackgroundView
                 } catch (Exception e2) {
                     e = e2;
                     try {
-                        Log.i("AppCompatSpinner", "Could not read android:spinnerMode", e);
+                        Log.i(TAG, "Could not read android:spinnerMode", e);
                     } catch (Throwable th2) {
                         th = th2;
                         typedArray2 = typedArray;
@@ -616,7 +616,7 @@ public class AppCompatSpinner extends Spinner implements TintableBackgroundView
             } catch (Exception e3) {
                 e = e3;
                 typedArray = null;
-                Log.i("AppCompatSpinner", "Could not read android:spinnerMode", e);
+                Log.i(TAG, "Could not read android:spinnerMode", e);
             } catch (Throwable th3) {
                 th = th3;
                 if (typedArray2 != null) {
diff --git a/app/src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java b/app/src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java
index 9c8c5157ab..c6fe9ffae6 100644
--- a/app/src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java
+++ b/app/src/main/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.java
@@ -101,7 +101,7 @@ public class AppCompatTextViewAutoSizeHelper {
             Field textViewField = getTextViewField(str);
             return textViewField == null ? t : (T) textViewField.get(obj);
         } catch (IllegalAccessException e) {
-            Log.w("ACTVAutoSizeHelper", "Failed to access TextView#" + str + " member", e);
+            Log.w(TAG, "Failed to access TextView#" + str + " member", e);
             return t;
         }
     }
@@ -149,7 +149,7 @@ public class AppCompatTextViewAutoSizeHelper {
         try {
             this.mImpl.computeAndSetTextDirection(obtain, this.mTextView);
         } catch (ClassCastException unused) {
-            Log.w("ACTVAutoSizeHelper", "Failed to obtain TextDirectionHeuristic, auto size may be incorrect");
+            Log.w(TAG, "Failed to obtain TextDirectionHeuristic, auto size may be incorrect");
         }
         return obtain.build();
     }
@@ -195,7 +195,7 @@ public class AppCompatTextViewAutoSizeHelper {
             }
             return field;
         } catch (NoSuchFieldException e) {
-            Log.w("ACTVAutoSizeHelper", "Failed to access TextView#" + str + " member", e);
+            Log.w(TAG, "Failed to access TextView#" + str + " member", e);
             return null;
         }
     }
@@ -210,7 +210,7 @@ public class AppCompatTextViewAutoSizeHelper {
             }
             return method;
         } catch (Exception e) {
-            Log.w("ACTVAutoSizeHelper", "Failed to retrieve TextView#" + str + "() method", e);
+            Log.w(TAG, "Failed to retrieve TextView#" + str + "() method", e);
             return null;
         }
     }
@@ -219,7 +219,7 @@ public class AppCompatTextViewAutoSizeHelper {
         try {
             return (T) getTextViewMethod(str).invoke(obj, new Object[0]);
         } catch (Exception e) {
-            Log.w("ACTVAutoSizeHelper", "Failed to invoke TextView#" + str + "() method", e);
+            Log.w(TAG, "Failed to invoke TextView#" + str + "() method", e);
             return t;
         }
     }
@@ -236,7 +236,7 @@ public class AppCompatTextViewAutoSizeHelper {
                         textViewMethod.invoke(this.mTextView, new Object[0]);
                     }
                 } catch (Exception e) {
-                    Log.w("ACTVAutoSizeHelper", "Failed to invoke TextView#nullLayouts() method", e);
+                    Log.w(TAG, "Failed to invoke TextView#nullLayouts() method", e);
                 }
                 if (!isInLayout) {
                     this.mTextView.requestLayout();
diff --git a/app/src/main/java/androidx/appcompat/widget/ButtonBarLayout.java b/app/src/main/java/androidx/appcompat/widget/ButtonBarLayout.java
index 8f323304f4..cdd8d32f63 100644
--- a/app/src/main/java/androidx/appcompat/widget/ButtonBarLayout.java
+++ b/app/src/main/java/androidx/appcompat/widget/ButtonBarLayout.java
@@ -79,7 +79,7 @@ public class ButtonBarLayout extends LinearLayout {
         }
         super.onMeasure(i3, i2);
         if (this.mAllowStacking && !isStacked()) {
-            if ((getMeasuredWidthAndState() & -16777216) == 16777216) {
+            if ((getMeasuredWidthAndState() & ViewCompat.MEASURED_STATE_MASK) == 16777216) {
                 setStacked(true);
                 z2 = true;
             }
diff --git a/app/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java b/app/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java
index de5489603a..23ce9d385e 100644
--- a/app/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java
+++ b/app/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java
@@ -10,6 +10,7 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.ViewCompat;
 @RestrictTo({RestrictTo.Scope.LIBRARY})
 public class ContentFrameLayout extends FrameLayout {
@@ -147,7 +148,7 @@ public class ContentFrameLayout extends FrameLayout {
                     i8 = 0;
                     if (i8 > 0) {
                         Rect rect = this.mDecorPadding;
-                        i = View.MeasureSpec.makeMeasureSpec(Math.min(i8 - (rect.left + rect.right), View.MeasureSpec.getSize(i)), 1073741824);
+                        i = View.MeasureSpec.makeMeasureSpec(Math.min(i8 - (rect.left + rect.right), View.MeasureSpec.getSize(i)), BasicMeasure.EXACTLY);
                         z2 = true;
                         if (mode2 == Integer.MIN_VALUE) {
                             TypedValue typedValue2 = z4 ? this.mFixedHeightMajor : this.mFixedHeightMinor;
@@ -161,7 +162,7 @@ public class ContentFrameLayout extends FrameLayout {
                                     i6 = 0;
                                     if (i6 > 0) {
                                         Rect rect2 = this.mDecorPadding;
-                                        i2 = View.MeasureSpec.makeMeasureSpec(Math.min(i6 - (rect2.top + rect2.bottom), View.MeasureSpec.getSize(i2)), 1073741824);
+                                        i2 = View.MeasureSpec.makeMeasureSpec(Math.min(i6 - (rect2.top + rect2.bottom), View.MeasureSpec.getSize(i2)), BasicMeasure.EXACTLY);
                                     }
                                 }
                                 i6 = (int) fraction2;
@@ -171,7 +172,7 @@ public class ContentFrameLayout extends FrameLayout {
                         }
                         super.onMeasure(i, i2);
                         measuredWidth = getMeasuredWidth();
-                        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824);
+                        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY);
                         if (!z2 && mode == Integer.MIN_VALUE) {
                             TypedValue typedValue3 = !z4 ? this.mMinWidthMinor : this.mMinWidthMajor;
                             if (!(typedValue3 == null || (i3 = typedValue3.type) == 0)) {
@@ -187,7 +188,7 @@ public class ContentFrameLayout extends FrameLayout {
                                         i4 -= rect3.left + rect3.right;
                                     }
                                     if (measuredWidth < i4) {
-                                        makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i4, 1073741824);
+                                        makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i4, BasicMeasure.EXACTLY);
                                         if (z3) {
                                             super.onMeasure(makeMeasureSpec, i2);
                                             return;
@@ -217,7 +218,7 @@ public class ContentFrameLayout extends FrameLayout {
         }
         super.onMeasure(i, i2);
         measuredWidth = getMeasuredWidth();
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY);
         if (!z4) {
         }
         if (i3 != 5) {
diff --git a/app/src/main/java/androidx/appcompat/widget/DrawableUtils.java b/app/src/main/java/androidx/appcompat/widget/DrawableUtils.java
index ce5fd36c41..e0eb836057 100644
--- a/app/src/main/java/androidx/appcompat/widget/DrawableUtils.java
+++ b/app/src/main/java/androidx/appcompat/widget/DrawableUtils.java
@@ -61,7 +61,7 @@ public class DrawableUtils {
     }
 
     public static void fixDrawable(@NonNull Drawable drawable) {
-        if (Build.VERSION.SDK_INT == 21 && "android.graphics.drawable.VectorDrawable".equals(drawable.getClass().getName())) {
+        if (Build.VERSION.SDK_INT == 21 && VECTOR_DRAWABLE_CLAZZ_NAME.equals(drawable.getClass().getName())) {
             fixVectorDrawableTinting(drawable);
         }
     }
@@ -135,7 +135,7 @@ public class DrawableUtils {
                     return rect2;
                 }
             } catch (Exception unused) {
-                Log.e("DrawableUtils", "Couldn't obtain the optical insets. Ignoring.");
+                Log.e(TAG, "Couldn't obtain the optical insets. Ignoring.");
             }
         }
         return INSETS_NONE;
diff --git a/app/src/main/java/androidx/appcompat/widget/DropDownListView.java b/app/src/main/java/androidx/appcompat/widget/DropDownListView.java
index 73b505dc82..daa7aa3941 100644
--- a/app/src/main/java/androidx/appcompat/widget/DropDownListView.java
+++ b/app/src/main/java/androidx/appcompat/widget/DropDownListView.java
@@ -14,6 +14,7 @@ import android.widget.ListView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.R;
 import androidx.appcompat.graphics.drawable.DrawableWrapper;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewPropertyAnimatorCompat;
 import androidx.core.widget.ListViewAutoScrollHelper;
@@ -329,7 +330,7 @@ public class DropDownListView extends ListView {
                 view.setLayoutParams(layoutParams);
             }
             int i10 = layoutParams.height;
-            view.measure(i, i10 > 0 ? View.MeasureSpec.makeMeasureSpec(i10, 1073741824) : View.MeasureSpec.makeMeasureSpec(0, 0));
+            view.measure(i, i10 > 0 ? View.MeasureSpec.makeMeasureSpec(i10, BasicMeasure.EXACTLY) : View.MeasureSpec.makeMeasureSpec(0, 0));
             view.forceLayout();
             if (i7 > 0) {
                 i6 += dividerHeight;
diff --git a/app/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java b/app/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java
index 8b4db8dab8..47e7b7f2ee 100644
--- a/app/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java
+++ b/app/src/main/java/androidx/appcompat/widget/LinearLayoutCompat.java
@@ -13,9 +13,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.GravityCompat;
+import androidx.core.view.InputDeviceCompat;
 import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
+import com.google.android.material.badge.BadgeDrawable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 public class LinearLayoutCompat extends ViewGroup {
@@ -113,7 +116,7 @@ public class LinearLayoutCompat extends ViewGroup {
         this.mBaselineAligned = true;
         this.mBaselineAlignedChildIndex = -1;
         this.mBaselineChildTop = 0;
-        this.mGravity = 8388659;
+        this.mGravity = BadgeDrawable.TOP_START;
         int[] iArr = R.styleable.LinearLayoutCompat;
         TintTypedArray obtainStyledAttributes = TintTypedArray.obtainStyledAttributes(context, attributeSet, iArr, i, 0);
         ViewCompat.saveAttributeDataForStyleable(this, context, iArr, attributeSet, obtainStyledAttributes.getWrappedTypeArray(), i, 0);
@@ -139,7 +142,7 @@ public class LinearLayoutCompat extends ViewGroup {
     }
 
     private void forceUniformHeight(int i, int i2) {
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(getMeasuredHeight(), 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(getMeasuredHeight(), BasicMeasure.EXACTLY);
         for (int i3 = 0; i3 < i; i3++) {
             View virtualChildAt = getVirtualChildAt(i3);
             if (virtualChildAt.getVisibility() != 8) {
@@ -155,7 +158,7 @@ public class LinearLayoutCompat extends ViewGroup {
     }
 
     private void forceUniformWidth(int i, int i2) {
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), BasicMeasure.EXACTLY);
         for (int i3 = 0; i3 < i; i3++) {
             View virtualChildAt = getVirtualChildAt(i3);
             if (virtualChildAt.getVisibility() != 8) {
@@ -499,7 +502,7 @@ public class LinearLayoutCompat extends ViewGroup {
         int virtualChildCount = getVirtualChildCount();
         int i9 = this.mGravity;
         int i10 = i9 & 112;
-        int i11 = i9 & 8388615;
+        int i11 = i9 & GravityCompat.RELATIVE_HORIZONTAL_GRAVITY_MASK;
         int paddingTop = i10 != 16 ? i10 != 80 ? getPaddingTop() : ((getPaddingTop() + i4) - i2) - this.mTotalLength : getPaddingTop() + (((i4 - i2) - this.mTotalLength) / 2);
         int i12 = 0;
         while (i12 < virtualChildCount) {
@@ -598,7 +601,7 @@ public class LinearLayoutCompat extends ViewGroup {
         iArr2[0] = -1;
         boolean z6 = this.mBaselineAligned;
         boolean z7 = this.mUseLargestChild;
-        int i20 = 1073741824;
+        int i20 = BasicMeasure.EXACTLY;
         boolean z8 = mode == 1073741824;
         float f2 = 0.0f;
         int i21 = 0;
@@ -642,7 +645,7 @@ public class LinearLayoutCompat extends ViewGroup {
                         z4 = z7;
                         z3 = z6;
                         view = virtualChildAt;
-                        i17 = 1073741824;
+                        i17 = BasicMeasure.EXACTLY;
                         z9 = true;
                         if (mode2 == i17 && ((ViewGroup.MarginLayoutParams) layoutParams).height == -1) {
                             z5 = true;
@@ -682,7 +685,7 @@ public class LinearLayoutCompat extends ViewGroup {
                         iArr2 = iArr2;
                         z7 = z4;
                         z6 = z3;
-                        i20 = 1073741824;
+                        i20 = BasicMeasure.EXACTLY;
                     }
                 } else {
                     if (((ViewGroup.MarginLayoutParams) layoutParams).width != 0 || f3 <= 0.0f) {
@@ -711,7 +714,7 @@ public class LinearLayoutCompat extends ViewGroup {
                         i22 = Math.max(measuredWidth, i22);
                     }
                 }
-                i17 = 1073741824;
+                i17 = BasicMeasure.EXACTLY;
                 if (mode2 == i17) {
                 }
                 z5 = false;
@@ -735,7 +738,7 @@ public class LinearLayoutCompat extends ViewGroup {
                 iArr2 = iArr2;
                 z7 = z4;
                 z6 = z3;
-                i20 = 1073741824;
+                i20 = BasicMeasure.EXACTLY;
             }
             i15 = i21;
             z4 = z7;
@@ -744,7 +747,7 @@ public class LinearLayoutCompat extends ViewGroup {
             iArr2 = iArr2;
             z7 = z4;
             z6 = z3;
-            i20 = 1073741824;
+            i20 = BasicMeasure.EXACTLY;
         }
         if (this.mTotalLength > 0 && hasDividerBeforeChildAt(virtualChildCount)) {
             this.mTotalLength += this.mDividerWidth;
@@ -819,25 +822,25 @@ public class LinearLayoutCompat extends ViewGroup {
                         i9 = virtualChildCount;
                         int childMeasureSpec = ViewGroup.getChildMeasureSpec(i2, getPaddingBottom() + getPaddingTop() + ((ViewGroup.MarginLayoutParams) layoutParams3).topMargin + ((ViewGroup.MarginLayoutParams) layoutParams3).bottomMargin, ((ViewGroup.MarginLayoutParams) layoutParams3).height);
                         if (((ViewGroup.MarginLayoutParams) layoutParams3).width == 0) {
-                            i13 = 1073741824;
+                            i13 = BasicMeasure.EXACTLY;
                             if (mode == 1073741824) {
                                 if (i38 <= 0) {
                                     i38 = 0;
                                 }
-                                virtualChildAt3.measure(View.MeasureSpec.makeMeasureSpec(i38, 1073741824), childMeasureSpec);
-                                i35 = View.combineMeasuredStates(i35, virtualChildAt3.getMeasuredState() & -16777216);
+                                virtualChildAt3.measure(View.MeasureSpec.makeMeasureSpec(i38, BasicMeasure.EXACTLY), childMeasureSpec);
+                                i35 = View.combineMeasuredStates(i35, virtualChildAt3.getMeasuredState() & ViewCompat.MEASURED_STATE_MASK);
                                 f2 = f7;
                                 i10 = i39;
                             }
                         } else {
-                            i13 = 1073741824;
+                            i13 = BasicMeasure.EXACTLY;
                         }
                         int measuredWidth2 = virtualChildAt3.getMeasuredWidth() + i38;
                         if (measuredWidth2 < 0) {
                             measuredWidth2 = 0;
                         }
                         virtualChildAt3.measure(View.MeasureSpec.makeMeasureSpec(measuredWidth2, i13), childMeasureSpec);
-                        i35 = View.combineMeasuredStates(i35, virtualChildAt3.getMeasuredState() & -16777216);
+                        i35 = View.combineMeasuredStates(i35, virtualChildAt3.getMeasuredState() & ViewCompat.MEASURED_STATE_MASK);
                         f2 = f7;
                         i10 = i39;
                     } else {
@@ -907,7 +910,7 @@ public class LinearLayoutCompat extends ViewGroup {
                 for (int i43 = 0; i43 < virtualChildCount; i43++) {
                     View virtualChildAt4 = getVirtualChildAt(i43);
                     if (!(virtualChildAt4 == null || virtualChildAt4.getVisibility() == 8 || ((LayoutParams) virtualChildAt4.getLayoutParams()).weight <= 0.0f)) {
-                        virtualChildAt4.measure(View.MeasureSpec.makeMeasureSpec(i22, 1073741824), View.MeasureSpec.makeMeasureSpec(virtualChildAt4.getMeasuredHeight(), 1073741824));
+                        virtualChildAt4.measure(View.MeasureSpec.makeMeasureSpec(i22, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(virtualChildAt4.getMeasuredHeight(), BasicMeasure.EXACTLY));
                     }
                 }
             }
@@ -918,7 +921,7 @@ public class LinearLayoutCompat extends ViewGroup {
         if (z10 || mode2 == 1073741824) {
             i8 = i6;
         }
-        setMeasuredDimension(resolveSizeAndState | (i3 & -16777216), View.resolveSizeAndState(Math.max(getPaddingBottom() + getPaddingTop() + i8, getSuggestedMinimumHeight()), i7, i3 << 16));
+        setMeasuredDimension(resolveSizeAndState | (i3 & ViewCompat.MEASURED_STATE_MASK), View.resolveSizeAndState(Math.max(getPaddingBottom() + getPaddingTop() + i8, getSuggestedMinimumHeight()), i7, i3 << 16));
         if (z11) {
             forceUniformHeight(i5, i);
         }
@@ -1122,24 +1125,24 @@ public class LinearLayoutCompat extends ViewGroup {
                                 i7 = i36 - i39;
                                 int childMeasureSpec = ViewGroup.getChildMeasureSpec(i, getPaddingRight() + getPaddingLeft() + ((ViewGroup.MarginLayoutParams) layoutParams3).leftMargin + ((ViewGroup.MarginLayoutParams) layoutParams3).rightMargin, ((ViewGroup.MarginLayoutParams) layoutParams3).width);
                                 if (((ViewGroup.MarginLayoutParams) layoutParams3).height == 0) {
-                                    i10 = 1073741824;
+                                    i10 = BasicMeasure.EXACTLY;
                                     if (mode2 == 1073741824) {
                                         if (i39 <= 0) {
                                             i39 = 0;
                                         }
-                                        virtualChildAt3.measure(childMeasureSpec, View.MeasureSpec.makeMeasureSpec(i39, 1073741824));
-                                        i5 = View.combineMeasuredStates(i5, virtualChildAt3.getMeasuredState() & -256);
+                                        virtualChildAt3.measure(childMeasureSpec, View.MeasureSpec.makeMeasureSpec(i39, BasicMeasure.EXACTLY));
+                                        i5 = View.combineMeasuredStates(i5, virtualChildAt3.getMeasuredState() & InputDeviceCompat.SOURCE_ANY);
                                         f = f6;
                                     }
                                 } else {
-                                    i10 = 1073741824;
+                                    i10 = BasicMeasure.EXACTLY;
                                 }
                                 int measuredHeight2 = virtualChildAt3.getMeasuredHeight() + i39;
                                 if (measuredHeight2 < 0) {
                                     measuredHeight2 = 0;
                                 }
                                 virtualChildAt3.measure(childMeasureSpec, View.MeasureSpec.makeMeasureSpec(measuredHeight2, i10));
-                                i5 = View.combineMeasuredStates(i5, virtualChildAt3.getMeasuredState() & -256);
+                                i5 = View.combineMeasuredStates(i5, virtualChildAt3.getMeasuredState() & InputDeviceCompat.SOURCE_ANY);
                                 f = f6;
                             } else {
                                 i7 = i36;
@@ -1193,7 +1196,7 @@ public class LinearLayoutCompat extends ViewGroup {
                         for (int i42 = 0; i42 < i3; i42++) {
                             View virtualChildAt4 = getVirtualChildAt(i42);
                             if (!(virtualChildAt4 == null || virtualChildAt4.getVisibility() == 8 || ((LayoutParams) virtualChildAt4.getLayoutParams()).weight <= 0.0f)) {
-                                virtualChildAt4.measure(View.MeasureSpec.makeMeasureSpec(virtualChildAt4.getMeasuredWidth(), 1073741824), View.MeasureSpec.makeMeasureSpec(i24, 1073741824));
+                                virtualChildAt4.measure(View.MeasureSpec.makeMeasureSpec(virtualChildAt4.getMeasuredWidth(), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(i24, BasicMeasure.EXACTLY));
                             }
                         }
                     }
@@ -1227,13 +1230,13 @@ public class LinearLayoutCompat extends ViewGroup {
     @Override // android.view.View
     public void onInitializeAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
         super.onInitializeAccessibilityEvent(accessibilityEvent);
-        accessibilityEvent.setClassName("androidx.appcompat.widget.LinearLayoutCompat");
+        accessibilityEvent.setClassName(ACCESSIBILITY_CLASS_NAME);
     }
 
     @Override // android.view.View
     public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo accessibilityNodeInfo) {
         super.onInitializeAccessibilityNodeInfo(accessibilityNodeInfo);
-        accessibilityNodeInfo.setClassName("androidx.appcompat.widget.LinearLayoutCompat");
+        accessibilityNodeInfo.setClassName(ACCESSIBILITY_CLASS_NAME);
     }
 
     @Override // android.view.ViewGroup, android.view.View
@@ -1294,7 +1297,7 @@ public class LinearLayoutCompat extends ViewGroup {
     public void setGravity(int i) {
         if (this.mGravity != i) {
             if ((8388615 & i) == 0) {
-                i |= 8388611;
+                i |= GravityCompat.START;
             }
             if ((i & 112) == 0) {
                 i |= 48;
@@ -1305,7 +1308,7 @@ public class LinearLayoutCompat extends ViewGroup {
     }
 
     public void setHorizontalGravity(int i) {
-        int i2 = i & 8388615;
+        int i2 = i & GravityCompat.RELATIVE_HORIZONTAL_GRAVITY_MASK;
         int i3 = this.mGravity;
         if ((8388615 & i3) != i2) {
             this.mGravity = i2 | (-8388616 & i3);
diff --git a/app/src/main/java/androidx/appcompat/widget/ListPopupWindow.java b/app/src/main/java/androidx/appcompat/widget/ListPopupWindow.java
index 48ef38206a..fcd97cde50 100644
--- a/app/src/main/java/androidx/appcompat/widget/ListPopupWindow.java
+++ b/app/src/main/java/androidx/appcompat/widget/ListPopupWindow.java
@@ -27,6 +27,8 @@ import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.R;
 import androidx.appcompat.view.menu.ShowableListMenu;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
+import androidx.core.view.PointerIconCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.PopupWindowCompat;
 import c.d.b.a.a;
@@ -214,19 +216,19 @@ public class ListPopupWindow implements ShowableListMenu {
             try {
                 sSetClipToWindowEnabledMethod = PopupWindow.class.getDeclaredMethod("setClipToScreenEnabled", Boolean.TYPE);
             } catch (NoSuchMethodException unused) {
-                Log.i("ListPopupWindow", "Could not find method setClipToScreenEnabled() on PopupWindow. Oh well.");
+                Log.i(TAG, "Could not find method setClipToScreenEnabled() on PopupWindow. Oh well.");
             }
             try {
                 sSetEpicenterBoundsMethod = PopupWindow.class.getDeclaredMethod("setEpicenterBounds", Rect.class);
             } catch (NoSuchMethodException unused2) {
-                Log.i("ListPopupWindow", "Could not find method setEpicenterBounds(Rect) on PopupWindow. Oh well.");
+                Log.i(TAG, "Could not find method setEpicenterBounds(Rect) on PopupWindow. Oh well.");
             }
         }
         if (Build.VERSION.SDK_INT <= 23) {
             try {
                 sGetMaxAvailableHeightMethod = PopupWindow.class.getDeclaredMethod("getMaxAvailableHeight", View.class, Integer.TYPE, Boolean.TYPE);
             } catch (NoSuchMethodException unused3) {
-                Log.i("ListPopupWindow", "Could not find method getMaxAvailableHeight(View, int, boolean) on PopupWindow. Oh well.");
+                Log.i(TAG, "Could not find method getMaxAvailableHeight(View, int, boolean) on PopupWindow. Oh well.");
             }
         }
     }
@@ -246,7 +248,7 @@ public class ListPopupWindow implements ShowableListMenu {
     public ListPopupWindow(@NonNull Context context, @Nullable AttributeSet attributeSet, @AttrRes int i, @StyleRes int i2) {
         this.mDropDownHeight = -2;
         this.mDropDownWidth = -2;
-        this.mDropDownWindowLayoutType = 1002;
+        this.mDropDownWindowLayoutType = PointerIconCompat.TYPE_HAND;
         this.mDropDownGravity = 0;
         this.mDropDownAlwaysVisible = false;
         this.mForceIgnoreOutsideTouch = false;
@@ -312,7 +314,7 @@ public class ListPopupWindow implements ShowableListMenu {
                 } else if (i5 != 1) {
                     StringBuilder K = a.K("Invalid hint position ");
                     K.append(this.mPromptPosition);
-                    Log.e("ListPopupWindow", K.toString());
+                    Log.e(TAG, K.toString());
                 } else {
                     linearLayout.addView(dropDownListView, layoutParams);
                     linearLayout.addView(view);
@@ -368,11 +370,11 @@ public class ListPopupWindow implements ShowableListMenu {
             Rect rect2 = this.mTempRect;
             i3 = View.MeasureSpec.makeMeasureSpec(i9 - (rect2.left + rect2.right), Integer.MIN_VALUE);
         } else if (i8 != -1) {
-            i3 = View.MeasureSpec.makeMeasureSpec(i8, 1073741824);
+            i3 = View.MeasureSpec.makeMeasureSpec(i8, BasicMeasure.EXACTLY);
         } else {
             int i10 = this.mContext.getResources().getDisplayMetrics().widthPixels;
             Rect rect3 = this.mTempRect;
-            i3 = View.MeasureSpec.makeMeasureSpec(i10 - (rect3.left + rect3.right), 1073741824);
+            i3 = View.MeasureSpec.makeMeasureSpec(i10 - (rect3.left + rect3.right), BasicMeasure.EXACTLY);
         }
         int measureHeightOfChildrenCompat = this.mDropDownList.measureHeightOfChildrenCompat(i3, 0, -1, maxAvailableHeight - i, -1);
         if (measureHeightOfChildrenCompat > 0) {
@@ -390,7 +392,7 @@ public class ListPopupWindow implements ShowableListMenu {
             try {
                 return ((Integer) method.invoke(this.mPopup, view, Integer.valueOf(i), Boolean.valueOf(z2))).intValue();
             } catch (Exception unused) {
-                Log.i("ListPopupWindow", "Could not call getMaxAvailableHeightMethod(View, int, boolean) on PopupWindow. Using the public version.");
+                Log.i(TAG, "Could not call getMaxAvailableHeightMethod(View, int, boolean) on PopupWindow. Using the public version.");
             }
         }
         return this.mPopup.getMaxAvailableHeight(view, i);
@@ -417,7 +419,7 @@ public class ListPopupWindow implements ShowableListMenu {
                 try {
                     method.invoke(this.mPopup, Boolean.valueOf(z2));
                 } catch (Exception unused) {
-                    Log.i("ListPopupWindow", "Could not call setClipToScreenEnabled() on PopupWindow. Oh well.");
+                    Log.i(TAG, "Could not call setClipToScreenEnabled() on PopupWindow. Oh well.");
                 }
             }
         } else {
@@ -837,7 +839,7 @@ public class ListPopupWindow implements ShowableListMenu {
                     try {
                         method.invoke(this.mPopup, this.mEpicenterBounds);
                     } catch (Exception e) {
-                        Log.e("ListPopupWindow", "Could not invoke setEpicenterBounds on PopupWindow", e);
+                        Log.e(TAG, "Could not invoke setEpicenterBounds on PopupWindow", e);
                     }
                 }
             } else {
diff --git a/app/src/main/java/androidx/appcompat/widget/MenuPopupWindow.java b/app/src/main/java/androidx/appcompat/widget/MenuPopupWindow.java
index 923797cb5f..6e377403a8 100644
--- a/app/src/main/java/androidx/appcompat/widget/MenuPopupWindow.java
+++ b/app/src/main/java/androidx/appcompat/widget/MenuPopupWindow.java
@@ -156,7 +156,7 @@ public class MenuPopupWindow extends ListPopupWindow implements MenuItemHoverLis
                 sSetTouchModalMethod = PopupWindow.class.getDeclaredMethod("setTouchModal", Boolean.TYPE);
             }
         } catch (NoSuchMethodException unused) {
-            Log.i("MenuPopupWindow", "Could not find method setTouchModal() on PopupWindow. Oh well.");
+            Log.i(TAG, "Could not find method setTouchModal() on PopupWindow. Oh well.");
         }
     }
 
@@ -211,7 +211,7 @@ public class MenuPopupWindow extends ListPopupWindow implements MenuItemHoverLis
                 try {
                     method.invoke(this.mPopup, Boolean.valueOf(z2));
                 } catch (Exception unused) {
-                    Log.i("MenuPopupWindow", "Could not invoke setTouchModal() on PopupWindow. Oh well.");
+                    Log.i(TAG, "Could not invoke setTouchModal() on PopupWindow. Oh well.");
                 }
             }
         } else {
diff --git a/app/src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java b/app/src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java
index 6592dd996d..5f06e919cd 100644
--- a/app/src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java
+++ b/app/src/main/java/androidx/appcompat/widget/ResourceManagerInternal.java
@@ -255,7 +255,7 @@ public final class ResourceManagerInternal {
     }
 
     private static boolean isVectorDrawable(@NonNull Drawable drawable) {
-        return (drawable instanceof VectorDrawableCompat) || "android.graphics.drawable.VectorDrawable".equals(drawable.getClass().getName());
+        return (drawable instanceof VectorDrawableCompat) || PLATFORM_VD_CLAZZ.equals(drawable.getClass().getName());
     }
 
     private Drawable loadDrawableFromDelegates(@NonNull Context context, @DrawableRes int i) {
@@ -268,7 +268,7 @@ public final class ResourceManagerInternal {
         SparseArrayCompat<String> sparseArrayCompat = this.mKnownDrawableIdTags;
         if (sparseArrayCompat != null) {
             String str = sparseArrayCompat.get(i);
-            if ("appcompat_skip_skip".equals(str) || (str != null && this.mDelegates.get(str) == null)) {
+            if (SKIP_DRAWABLE_TAG.equals(str) || (str != null && this.mDelegates.get(str) == null)) {
                 return null;
             }
         } else {
@@ -305,7 +305,7 @@ public final class ResourceManagerInternal {
                     throw new XmlPullParserException("No start tag found");
                 }
             } catch (Exception e) {
-                Log.e("ResourceManagerInternal", "Exception while inflating drawable", e);
+                Log.e(TAG, "Exception while inflating drawable", e);
             }
             while (true) {
                 next = xml.next();
@@ -315,7 +315,7 @@ public final class ResourceManagerInternal {
             }
         }
         if (cachedDrawable == null) {
-            this.mKnownDrawableIdTags.append(i, "appcompat_skip_skip");
+            this.mKnownDrawableIdTags.append(i, SKIP_DRAWABLE_TAG);
         }
         return cachedDrawable;
     }
@@ -356,7 +356,7 @@ public final class ResourceManagerInternal {
             }
             return;
         }
-        Log.d("ResourceManagerInternal", "Mutated drawable is not the same instance as the input.");
+        Log.d(TAG, "Mutated drawable is not the same instance as the input.");
     }
 
     public synchronized Drawable getDrawable(@NonNull Context context, @DrawableRes int i) {
diff --git a/app/src/main/java/androidx/appcompat/widget/ScrollingTabContainerView.java b/app/src/main/java/androidx/appcompat/widget/ScrollingTabContainerView.java
index ffbc24c9f3..0704d1eb18 100644
--- a/app/src/main/java/androidx/appcompat/widget/ScrollingTabContainerView.java
+++ b/app/src/main/java/androidx/appcompat/widget/ScrollingTabContainerView.java
@@ -29,6 +29,7 @@ import androidx.appcompat.R;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.view.ActionBarPolicy;
 import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
 public class ScrollingTabContainerView extends HorizontalScrollView implements AdapterView.OnItemSelectedListener {
     private static final int FADE_DURATION = 200;
@@ -143,13 +144,13 @@ public class ScrollingTabContainerView extends HorizontalScrollView implements A
         @Override // android.view.View
         public void onInitializeAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
             super.onInitializeAccessibilityEvent(accessibilityEvent);
-            accessibilityEvent.setClassName("androidx.appcompat.app.ActionBar$Tab");
+            accessibilityEvent.setClassName(ACCESSIBILITY_CLASS_NAME);
         }
 
         @Override // android.view.View
         public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo accessibilityNodeInfo) {
             super.onInitializeAccessibilityNodeInfo(accessibilityNodeInfo);
-            accessibilityNodeInfo.setClassName("androidx.appcompat.app.ActionBar$Tab");
+            accessibilityNodeInfo.setClassName(ACCESSIBILITY_CLASS_NAME);
         }
 
         @Override // android.widget.LinearLayout, android.view.View
@@ -157,7 +158,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView implements A
             int i3;
             super.onMeasure(i, i2);
             if (ScrollingTabContainerView.this.mMaxTabWidth > 0 && getMeasuredWidth() > (i3 = ScrollingTabContainerView.this.mMaxTabWidth)) {
-                super.onMeasure(View.MeasureSpec.makeMeasureSpec(i3, 1073741824), i2);
+                super.onMeasure(View.MeasureSpec.makeMeasureSpec(i3, BasicMeasure.EXACTLY), i2);
             }
         }
 
@@ -472,7 +473,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView implements A
             }
             this.mMaxTabWidth = Math.min(this.mMaxTabWidth, this.mStackedTabMaxWidth);
         }
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(this.mContentHeight, 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(this.mContentHeight, BasicMeasure.EXACTLY);
         if (z3 || !this.mAllowCollapse) {
             z2 = false;
         }
diff --git a/app/src/main/java/androidx/appcompat/widget/SearchView.java b/app/src/main/java/androidx/appcompat/widget/SearchView.java
index 1b8b9930d1..d25fb8936e 100644
--- a/app/src/main/java/androidx/appcompat/widget/SearchView.java
+++ b/app/src/main/java/androidx/appcompat/widget/SearchView.java
@@ -44,10 +44,12 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
 import androidx.appcompat.view.CollapsibleActionView;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.ViewCompat;
 import androidx.cursoradapter.widget.CursorAdapter;
 import androidx.customview.view.AbsSavedState;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.lang.reflect.Method;
 import java.util.WeakHashMap;
 public class SearchView extends LinearLayoutCompat implements CollapsibleActionView {
@@ -775,7 +777,7 @@ public class SearchView extends LinearLayoutCompat implements CollapsibleActionV
                 columnString3 = this.mSearchable.getSuggestIntentData();
             }
             if (!(columnString3 == null || (columnString = SuggestionsAdapter.getColumnString(cursor, "suggest_intent_data_id")) == null)) {
-                columnString3 = columnString3 + "/" + Uri.encode(columnString);
+                columnString3 = columnString3 + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + Uri.encode(columnString);
             }
             return createIntent(columnString2, columnString3 == null ? null : Uri.parse(columnString3), SuggestionsAdapter.getColumnString(cursor, "suggest_intent_extra_data"), SuggestionsAdapter.getColumnString(cursor, "suggest_intent_query"), i, str);
         } catch (RuntimeException e) {
@@ -784,7 +786,7 @@ public class SearchView extends LinearLayoutCompat implements CollapsibleActionV
             } catch (RuntimeException unused) {
                 i2 = -1;
             }
-            Log.w("SearchView", "Search suggestions cursor at row " + i2 + " returned exception.", e);
+            Log.w(LOG_TAG, "Search suggestions cursor at row " + i2 + " returned exception.", e);
             return null;
         }
     }
@@ -793,7 +795,7 @@ public class SearchView extends LinearLayoutCompat implements CollapsibleActionV
         ComponentName searchActivity = searchableInfo.getSearchActivity();
         Intent intent2 = new Intent("android.intent.action.SEARCH");
         intent2.setComponent(searchActivity);
-        PendingIntent activity = PendingIntent.getActivity(getContext(), 0, intent2, 1073741824);
+        PendingIntent activity = PendingIntent.getActivity(getContext(), 0, intent2, BasicMeasure.EXACTLY);
         Bundle bundle = new Bundle();
         Bundle bundle2 = this.mAppSearchData;
         if (bundle2 != null) {
@@ -891,7 +893,7 @@ public class SearchView extends LinearLayoutCompat implements CollapsibleActionV
             try {
                 getContext().startActivity(intent);
             } catch (RuntimeException e) {
-                Log.e("SearchView", "Failed launch activity: " + intent, e);
+                Log.e(LOG_TAG, "Failed launch activity: " + intent, e);
             }
         }
     }
@@ -1218,7 +1220,7 @@ public class SearchView extends LinearLayoutCompat implements CollapsibleActionV
         } else if (mode2 == 0) {
             size2 = getPreferredHeight();
         }
-        super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, 1073741824), View.MeasureSpec.makeMeasureSpec(size2, 1073741824));
+        super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(size2, BasicMeasure.EXACTLY));
     }
 
     public void onQueryRefine(CharSequence charSequence) {
@@ -1318,7 +1320,7 @@ public class SearchView extends LinearLayoutCompat implements CollapsibleActionV
                     getContext().startActivity(createVoiceAppSearchIntent(this.mVoiceAppSearchIntent, searchableInfo));
                 }
             } catch (ActivityNotFoundException unused) {
-                Log.w("SearchView", "Could not find voice search activity");
+                Log.w(LOG_TAG, "Could not find voice search activity");
             }
         }
     }
@@ -1432,7 +1434,7 @@ public class SearchView extends LinearLayoutCompat implements CollapsibleActionV
         boolean hasVoiceSearch = hasVoiceSearch();
         this.mVoiceButtonEnabled = hasVoiceSearch;
         if (hasVoiceSearch) {
-            this.mSearchSrcTextView.setPrivateImeOptions("nm");
+            this.mSearchSrcTextView.setPrivateImeOptions(IME_OPTION_NO_MICROPHONE);
         }
         updateViewsVisibility(isIconified());
     }
diff --git a/app/src/main/java/androidx/appcompat/widget/ShareActionProvider.java b/app/src/main/java/androidx/appcompat/widget/ShareActionProvider.java
index 30ac5df488..97d360665f 100644
--- a/app/src/main/java/androidx/appcompat/widget/ShareActionProvider.java
+++ b/app/src/main/java/androidx/appcompat/widget/ShareActionProvider.java
@@ -20,7 +20,7 @@ public class ShareActionProvider extends ActionProvider {
     private ActivityChooserModel.OnChooseActivityListener mOnChooseActivityListener;
     private final ShareMenuItemOnMenuItemClickListener mOnMenuItemClickListener = new ShareMenuItemOnMenuItemClickListener();
     public OnShareTargetSelectedListener mOnShareTargetSelectedListener;
-    public String mShareHistoryFileName = "share_history.xml";
+    public String mShareHistoryFileName = DEFAULT_SHARE_HISTORY_FILE_NAME;
 
     public interface OnShareTargetSelectedListener {
         boolean onShareTargetSelected(ShareActionProvider shareActionProvider, Intent intent);
diff --git a/app/src/main/java/androidx/appcompat/widget/SuggestionsAdapter.java b/app/src/main/java/androidx/appcompat/widget/SuggestionsAdapter.java
index e1bf0f6321..cdf0006479 100644
--- a/app/src/main/java/androidx/appcompat/widget/SuggestionsAdapter.java
+++ b/app/src/main/java/androidx/appcompat/widget/SuggestionsAdapter.java
@@ -25,6 +25,7 @@ import androidx.appcompat.R;
 import androidx.core.content.ContextCompat;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -112,10 +113,10 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
             }
             StringBuilder L = a.L("Invalid icon resource ", iconResource, " for ");
             L.append(componentName.flattenToShortString());
-            Log.w("SuggestionsAdapter", L.toString());
+            Log.w(LOG_TAG, L.toString());
             return null;
         } catch (PackageManager.NameNotFoundException e) {
-            Log.w("SuggestionsAdapter", e.toString());
+            Log.w(LOG_TAG, e.toString());
             return null;
         }
     }
@@ -162,14 +163,14 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
                         Drawable createFromStream = Drawable.createFromStream(openInputStream, null);
                         try {
                         } catch (IOException e) {
-                            Log.e("SuggestionsAdapter", "Error closing icon stream for " + uri, e);
+                            Log.e(LOG_TAG, "Error closing icon stream for " + uri, e);
                         }
                         return createFromStream;
                     } finally {
                         try {
                             openInputStream.close();
                         } catch (IOException e2) {
-                            Log.e("SuggestionsAdapter", "Error closing icon stream for " + uri, e2);
+                            Log.e(LOG_TAG, "Error closing icon stream for " + uri, e2);
                         }
                     }
                 } else {
@@ -177,7 +178,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
                 }
             }
         } catch (FileNotFoundException e3) {
-            Log.w("SuggestionsAdapter", "Icon not found: " + uri + ", " + e3.getMessage());
+            Log.w(LOG_TAG, "Icon not found: " + uri + ", " + e3.getMessage());
             return null;
         }
     }
@@ -188,7 +189,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
         }
         try {
             int parseInt = Integer.parseInt(str);
-            String str2 = "android.resource://" + this.mProviderContext.getPackageName() + "/" + parseInt;
+            String str2 = "android.resource://" + this.mProviderContext.getPackageName() + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + parseInt;
             Drawable checkIconCache = checkIconCache(str2);
             if (checkIconCache != null) {
                 return checkIconCache;
@@ -205,7 +206,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
             storeInIconCache(str, drawable2);
             return drawable2;
         } catch (Resources.NotFoundException unused2) {
-            a.g0("Icon resource not found: ", str, "SuggestionsAdapter");
+            a.g0("Icon resource not found: ", str, LOG_TAG);
             return null;
         }
     }
@@ -234,7 +235,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
         try {
             return cursor.getString(i);
         } catch (Exception e) {
-            Log.e("SuggestionsAdapter", "unexpected error retrieving valid column from cursor, did the remote process die?", e);
+            Log.e(LOG_TAG, "unexpected error retrieving valid column from cursor, did the remote process die?", e);
             return null;
         }
     }
@@ -318,7 +319,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
     @Override // androidx.cursoradapter.widget.CursorAdapter, androidx.cursoradapter.widget.CursorFilter.CursorFilterClient
     public void changeCursor(Cursor cursor) {
         if (this.mClosed) {
-            Log.w("SuggestionsAdapter", "Tried to change cursor after adapter was closed.");
+            Log.w(LOG_TAG, "Tried to change cursor after adapter was closed.");
             if (cursor != null) {
                 cursor.close();
                 return;
@@ -336,7 +337,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
                 this.mFlagsCol = cursor.getColumnIndex("suggest_flags");
             }
         } catch (Exception e) {
-            Log.e("SuggestionsAdapter", "error changing cursor and caching columns", e);
+            Log.e(LOG_TAG, "error changing cursor and caching columns", e);
         }
     }
 
@@ -404,7 +405,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
         try {
             return super.getDropDownView(i, view, viewGroup);
         } catch (RuntimeException e) {
-            Log.w("SuggestionsAdapter", "Search suggestions cursor threw exception.", e);
+            Log.w(LOG_TAG, "Search suggestions cursor threw exception.", e);
             View newDropDownView = newDropDownView(this.mContext, this.mCursor, viewGroup);
             if (newDropDownView != null) {
                 ((ChildViewCache) newDropDownView.getTag()).mText1.setText(e.toString());
@@ -446,7 +447,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
         try {
             return super.getView(i, view, viewGroup);
         } catch (RuntimeException e) {
-            Log.w("SuggestionsAdapter", "Search suggestions cursor threw exception.", e);
+            Log.w(LOG_TAG, "Search suggestions cursor threw exception.", e);
             View newView = newView(this.mContext, this.mCursor, viewGroup);
             if (newView != null) {
                 ((ChildViewCache) newView.getTag()).mText1.setText(e.toString());
@@ -499,7 +500,7 @@ public class SuggestionsAdapter extends ResourceCursorAdapter implements View.On
                     return searchManagerSuggestions;
                 }
             } catch (RuntimeException e) {
-                Log.w("SuggestionsAdapter", "Search suggestions query threw an exception.", e);
+                Log.w(LOG_TAG, "Search suggestions query threw an exception.", e);
             }
         }
         return null;
diff --git a/app/src/main/java/androidx/appcompat/widget/SwitchCompat.java b/app/src/main/java/androidx/appcompat/widget/SwitchCompat.java
index 7fa6644f38..b54f296d46 100644
--- a/app/src/main/java/androidx/appcompat/widget/SwitchCompat.java
+++ b/app/src/main/java/androidx/appcompat/widget/SwitchCompat.java
@@ -563,13 +563,13 @@ public class SwitchCompat extends CompoundButton {
     @Override // android.view.View
     public void onInitializeAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
         super.onInitializeAccessibilityEvent(accessibilityEvent);
-        accessibilityEvent.setClassName("android.widget.Switch");
+        accessibilityEvent.setClassName(ACCESSIBILITY_EVENT_CLASS_NAME);
     }
 
     @Override // android.view.View
     public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo accessibilityNodeInfo) {
         super.onInitializeAccessibilityNodeInfo(accessibilityNodeInfo);
-        accessibilityNodeInfo.setClassName("android.widget.Switch");
+        accessibilityNodeInfo.setClassName(ACCESSIBILITY_EVENT_CLASS_NAME);
         CharSequence charSequence = isChecked() ? this.mTextOn : this.mTextOff;
         if (!TextUtils.isEmpty(charSequence)) {
             CharSequence text = accessibilityNodeInfo.getText();
diff --git a/app/src/main/java/androidx/appcompat/widget/ThemeUtils.java b/app/src/main/java/androidx/appcompat/widget/ThemeUtils.java
index ba5ef03d4e..728d087758 100644
--- a/app/src/main/java/androidx/appcompat/widget/ThemeUtils.java
+++ b/app/src/main/java/androidx/appcompat/widget/ThemeUtils.java
@@ -34,7 +34,7 @@ public class ThemeUtils {
         TypedArray obtainStyledAttributes = context.obtainStyledAttributes(R.styleable.AppCompatTheme);
         try {
             if (!obtainStyledAttributes.hasValue(R.styleable.AppCompatTheme_windowActionBar)) {
-                Log.e("ThemeUtils", "View " + view.getClass() + " is an AppCompat widget that can only be used with a Theme.AppCompat theme (or descendant).");
+                Log.e(TAG, "View " + view.getClass() + " is an AppCompat widget that can only be used with a Theme.AppCompat theme (or descendant).");
             }
         } finally {
             obtainStyledAttributes.recycle();
diff --git a/app/src/main/java/androidx/appcompat/widget/Toolbar.java b/app/src/main/java/androidx/appcompat/widget/Toolbar.java
index cfd2191630..3a66aba089 100644
--- a/app/src/main/java/androidx/appcompat/widget/Toolbar.java
+++ b/app/src/main/java/androidx/appcompat/widget/Toolbar.java
@@ -38,6 +38,7 @@ import androidx.appcompat.view.menu.MenuPresenter;
 import androidx.appcompat.view.menu.MenuView;
 import androidx.appcompat.view.menu.SubMenuBuilder;
 import androidx.appcompat.widget.ActionMenuView;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.core.view.ViewCompat;
@@ -675,7 +676,7 @@ public class Toolbar extends ViewGroup {
             if (mode != 0) {
                 i5 = Math.min(View.MeasureSpec.getSize(childMeasureSpec2), i5);
             }
-            childMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(i5, 1073741824);
+            childMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(i5, BasicMeasure.EXACTLY);
         }
         view.measure(childMeasureSpec, childMeasureSpec2);
     }
diff --git a/app/src/main/java/androidx/appcompat/widget/ToolbarWidgetWrapper.java b/app/src/main/java/androidx/appcompat/widget/ToolbarWidgetWrapper.java
index 5947358a77..fb53ac5212 100644
--- a/app/src/main/java/androidx/appcompat/widget/ToolbarWidgetWrapper.java
+++ b/app/src/main/java/androidx/appcompat/widget/ToolbarWidgetWrapper.java
@@ -25,6 +25,7 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewPropertyAnimatorCompat;
 import androidx.core.view.ViewPropertyAnimatorListenerAdapter;
 import c.d.b.a.a;
+import com.google.android.material.badge.BadgeDrawable;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
 public class ToolbarWidgetWrapper implements DecorToolbar {
     private static final int AFFECTS_LOGO_MASK = 3;
@@ -233,7 +234,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
 
     @Override // androidx.appcompat.widget.DecorToolbar
     public void animateToVisibility(int i) {
-        ViewPropertyAnimatorCompat viewPropertyAnimatorCompat = setupAnimatorToVisibility(i, 200);
+        ViewPropertyAnimatorCompat viewPropertyAnimatorCompat = setupAnimatorToVisibility(i, DEFAULT_FADE_DURATION_MS);
         if (viewPropertyAnimatorCompat != null) {
             viewPropertyAnimatorCompat.start();
         }
@@ -349,12 +350,12 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
 
     @Override // androidx.appcompat.widget.DecorToolbar
     public void initIndeterminateProgress() {
-        Log.i("ToolbarWidgetWrapper", "Progress display unsupported");
+        Log.i(TAG, "Progress display unsupported");
     }
 
     @Override // androidx.appcompat.widget.DecorToolbar
     public void initProgress() {
-        Log.i("ToolbarWidgetWrapper", "Progress display unsupported");
+        Log.i(TAG, "Progress display unsupported");
     }
 
     @Override // androidx.appcompat.widget.DecorToolbar
@@ -486,7 +487,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
             Toolbar.LayoutParams layoutParams = (Toolbar.LayoutParams) this.mTabView.getLayoutParams();
             ((ViewGroup.MarginLayoutParams) layoutParams).width = -2;
             ((ViewGroup.MarginLayoutParams) layoutParams).height = -2;
-            layoutParams.gravity = 8388691;
+            layoutParams.gravity = BadgeDrawable.BOTTOM_START;
             scrollingTabContainerView.setAllowCollapse(true);
         }
     }
@@ -589,7 +590,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
                     Toolbar.LayoutParams layoutParams = (Toolbar.LayoutParams) this.mTabView.getLayoutParams();
                     ((ViewGroup.MarginLayoutParams) layoutParams).width = -2;
                     ((ViewGroup.MarginLayoutParams) layoutParams).height = -2;
-                    layoutParams.gravity = 8388691;
+                    layoutParams.gravity = BadgeDrawable.BOTTOM_START;
                 }
             } else {
                 throw new IllegalArgumentException(a.j("Invalid navigation mode ", i));
diff --git a/app/src/main/java/androidx/appcompat/widget/TooltipCompatHandler.java b/app/src/main/java/androidx/appcompat/widget/TooltipCompatHandler.java
index 8b1a95c64e..bdbde7a493 100644
--- a/app/src/main/java/androidx/appcompat/widget/TooltipCompatHandler.java
+++ b/app/src/main/java/androidx/appcompat/widget/TooltipCompatHandler.java
@@ -121,7 +121,7 @@ public class TooltipCompatHandler implements View.OnLongClickListener, View.OnHo
                 clearAnchorPos();
                 this.mAnchor.removeOnAttachStateChangeListener(this);
             } else {
-                Log.e("TooltipCompatHandler", "sActiveHandler.mPopup == null");
+                Log.e(TAG, "sActiveHandler.mPopup == null");
             }
         }
         if (sPendingHandler == this) {
@@ -185,13 +185,13 @@ public class TooltipCompatHandler implements View.OnLongClickListener, View.OnHo
             tooltipPopup.show(this.mAnchor, this.mAnchorX, this.mAnchorY, this.mFromTouch, this.mTooltipText);
             this.mAnchor.addOnAttachStateChangeListener(this);
             if (this.mFromTouch) {
-                j = 2500;
+                j = LONG_CLICK_HIDE_TIMEOUT_MS;
             } else {
                 if ((ViewCompat.getWindowSystemUiVisibility(this.mAnchor) & 1) == 1) {
-                    j2 = 3000;
+                    j2 = HOVER_HIDE_TIMEOUT_SHORT_MS;
                     i = ViewConfiguration.getLongPressTimeout();
                 } else {
-                    j2 = 15000;
+                    j2 = HOVER_HIDE_TIMEOUT_MS;
                     i = ViewConfiguration.getLongPressTimeout();
                 }
                 j = j2 - ((long) i);
diff --git a/app/src/main/java/androidx/appcompat/widget/TooltipPopup.java b/app/src/main/java/androidx/appcompat/widget/TooltipPopup.java
index 0695d2415e..70f65f82af 100644
--- a/app/src/main/java/androidx/appcompat/widget/TooltipPopup.java
+++ b/app/src/main/java/androidx/appcompat/widget/TooltipPopup.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
+import androidx.core.view.PointerIconCompat;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
 public class TooltipPopup {
     private static final String TAG = "TooltipPopup";
@@ -35,7 +36,7 @@ public class TooltipPopup {
         this.mMessageView = (TextView) inflate.findViewById(R.id.message);
         layoutParams.setTitle(getClass().getSimpleName());
         layoutParams.packageName = context.getPackageName();
-        layoutParams.type = 1002;
+        layoutParams.type = PointerIconCompat.TYPE_HAND;
         layoutParams.width = -2;
         layoutParams.height = -2;
         layoutParams.format = -3;
@@ -63,7 +64,7 @@ public class TooltipPopup {
         int dimensionPixelOffset3 = this.mContext.getResources().getDimensionPixelOffset(z2 ? R.dimen.tooltip_y_offset_touch : R.dimen.tooltip_y_offset_non_touch);
         View appRootView = getAppRootView(view);
         if (appRootView == null) {
-            Log.e("TooltipPopup", "Cannot find app view");
+            Log.e(TAG, "Cannot find app view");
             return;
         }
         appRootView.getWindowVisibleDisplayFrame(this.mTmpDisplayFrame);
diff --git a/app/src/main/java/androidx/appcompat/widget/ViewUtils.java b/app/src/main/java/androidx/appcompat/widget/ViewUtils.java
index d8bb00e951..5e849f5651 100644
--- a/app/src/main/java/androidx/appcompat/widget/ViewUtils.java
+++ b/app/src/main/java/androidx/appcompat/widget/ViewUtils.java
@@ -20,7 +20,7 @@ public class ViewUtils {
                 sComputeFitSystemWindowsMethod.setAccessible(true);
             }
         } catch (NoSuchMethodException unused) {
-            Log.d("ViewUtils", "Could not find method computeFitSystemWindows. Oh well.");
+            Log.d(TAG, "Could not find method computeFitSystemWindows. Oh well.");
         }
     }
 
@@ -33,7 +33,7 @@ public class ViewUtils {
             try {
                 method.invoke(view, rect, rect2);
             } catch (Exception e) {
-                Log.d("ViewUtils", "Could not invoke computeFitSystemWindows", e);
+                Log.d(TAG, "Could not invoke computeFitSystemWindows", e);
             }
         }
     }
@@ -50,11 +50,11 @@ public class ViewUtils {
             }
             method.invoke(view, new Object[0]);
         } catch (NoSuchMethodException unused) {
-            Log.d("ViewUtils", "Could not find method makeOptionalFitsSystemWindows. Oh well...");
+            Log.d(TAG, "Could not find method makeOptionalFitsSystemWindows. Oh well...");
         } catch (InvocationTargetException e) {
-            Log.d("ViewUtils", "Could not invoke makeOptionalFitsSystemWindows", e);
+            Log.d(TAG, "Could not invoke makeOptionalFitsSystemWindows", e);
         } catch (IllegalAccessException e2) {
-            Log.d("ViewUtils", "Could not invoke makeOptionalFitsSystemWindows", e2);
+            Log.d(TAG, "Could not invoke makeOptionalFitsSystemWindows", e2);
         }
     }
 }
diff --git a/app/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java b/app/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java
index 78ae60430c..5679cf312a 100644
--- a/app/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java
+++ b/app/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java
@@ -29,7 +29,7 @@ public class DefaultTaskExecutor extends TaskExecutor {
         @Override // java.util.concurrent.ThreadFactory
         public Thread newThread(Runnable runnable) {
             Thread thread = new Thread(runnable);
-            thread.setName(String.format("arch_disk_io_%d", Integer.valueOf(this.mThreadId.getAndIncrement())));
+            thread.setName(String.format(THREAD_NAME_STEM, Integer.valueOf(this.mThreadId.getAndIncrement())));
             return thread;
         }
     }
diff --git a/app/src/main/java/androidx/asynclayoutinflater/view/AsyncLayoutInflater.java b/app/src/main/java/androidx/asynclayoutinflater/view/AsyncLayoutInflater.java
index 7b7cdce891..4ad20d7244 100644
--- a/app/src/main/java/androidx/asynclayoutinflater/view/AsyncLayoutInflater.java
+++ b/app/src/main/java/androidx/asynclayoutinflater/view/AsyncLayoutInflater.java
@@ -127,11 +127,11 @@ public final class AsyncLayoutInflater {
                 try {
                     take.view = take.inflater.mInflater.inflate(take.resid, take.parent, false);
                 } catch (RuntimeException e) {
-                    Log.w("AsyncLayoutInflater", "Failed to inflate resource in the background! Retrying on the UI thread", e);
+                    Log.w(AsyncLayoutInflater.TAG, "Failed to inflate resource in the background! Retrying on the UI thread", e);
                 }
                 Message.obtain(take.inflater.mHandler, 0, take).sendToTarget();
             } catch (InterruptedException e2) {
-                Log.w("AsyncLayoutInflater", e2);
+                Log.w(AsyncLayoutInflater.TAG, e2);
             }
         }
     }
diff --git a/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.java b/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.java
index 51447d7788..c7c67ab0d6 100644
--- a/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.java
+++ b/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuDialog.java
@@ -45,7 +45,7 @@ public class BrowserActionsFallbackMenuDialog extends Dialog {
         if (z2) {
             f = 1.0f;
         }
-        long j = z2 ? 250 : 150;
+        long j = z2 ? ENTER_ANIMATION_DURATION_MS : 150;
         this.mContentView.setScaleX(f2);
         this.mContentView.setScaleY(f2);
         this.mContentView.animate().scaleX(f).scaleY(f).setDuration(j).setInterpolator(new LinearOutSlowInInterpolator()).setListener(new AnonymousClass1(z2)).start();
diff --git a/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.java b/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.java
index 2a24cad590..7887a9baa0 100644
--- a/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.java
+++ b/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUi.java
@@ -23,6 +23,7 @@ import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import androidx.browser.R;
 import androidx.core.widget.TextViewCompat;
+import com.discord.restapi.RestAPIBuilder;
 import java.util.ArrayList;
 import java.util.List;
 @Deprecated
@@ -60,7 +61,7 @@ public class BrowserActionsFallbackMenuUi implements AdapterView.OnItemClickList
         public void onShow(DialogInterface dialogInterface) {
             BrowserActionsFallMenuUiListener browserActionsFallMenuUiListener = BrowserActionsFallbackMenuUi.this.mMenuUiListener;
             if (browserActionsFallMenuUiListener == null) {
-                Log.e("BrowserActionskMenuUi", "Cannot trigger menu item listener, it is null");
+                Log.e(BrowserActionsFallbackMenuUi.TAG, "Cannot trigger menu item listener, it is null");
             } else {
                 browserActionsFallMenuUiListener.onMenuShown(this.val$view);
             }
@@ -120,7 +121,7 @@ public class BrowserActionsFallbackMenuUi implements AdapterView.OnItemClickList
     private PendingIntent buildShareAction() {
         Intent intent = new Intent("android.intent.action.SEND");
         intent.putExtra("android.intent.extra.TEXT", this.mUri.toString());
-        intent.setType("text/plain");
+        intent.setType(RestAPIBuilder.CONTENT_TYPE_TEXT);
         return PendingIntent.getActivity(this.mContext, 0, intent, 0);
     }
 
@@ -153,14 +154,14 @@ public class BrowserActionsFallbackMenuUi implements AdapterView.OnItemClickList
             try {
                 browserActionItem.getAction().send();
             } catch (PendingIntent.CanceledException e) {
-                Log.e("BrowserActionskMenuUi", "Failed to send custom item action", e);
+                Log.e(TAG, "Failed to send custom item action", e);
             }
         } else if (browserActionItem.getRunnableAction() != null) {
             browserActionItem.getRunnableAction().run();
         }
         BrowserActionsFallbackMenuDialog browserActionsFallbackMenuDialog = this.mBrowserActionsDialog;
         if (browserActionsFallbackMenuDialog == null) {
-            Log.e("BrowserActionskMenuUi", "Cannot dismiss dialog, it has already been dismissed.");
+            Log.e(TAG, "Cannot dismiss dialog, it has already been dismissed.");
         } else {
             browserActionsFallbackMenuDialog.dismiss();
         }
diff --git a/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuView.java b/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuView.java
index d144b900eb..5d8c030c29 100644
--- a/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuView.java
+++ b/app/src/main/java/androidx/browser/browseractions/BrowserActionsFallbackMenuView.java
@@ -7,6 +7,7 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.browser.R;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
 @Deprecated
 public class BrowserActionsFallbackMenuView extends LinearLayout {
@@ -19,6 +20,6 @@ public class BrowserActionsFallbackMenuView extends LinearLayout {
 
     @Override // android.widget.LinearLayout, android.view.View
     public void onMeasure(int i, int i2) {
-        super.onMeasure(View.MeasureSpec.makeMeasureSpec(Math.min(getResources().getDisplayMetrics().widthPixels - (this.mBrowserActionsMenuMinPaddingPx * 2), this.mBrowserActionsMenuMaxWidthPx), 1073741824), i2);
+        super.onMeasure(View.MeasureSpec.makeMeasureSpec(Math.min(getResources().getDisplayMetrics().widthPixels - (this.mBrowserActionsMenuMinPaddingPx * 2), this.mBrowserActionsMenuMaxWidthPx), BasicMeasure.EXACTLY), i2);
     }
 }
diff --git a/app/src/main/java/androidx/browser/browseractions/BrowserActionsIntent.java b/app/src/main/java/androidx/browser/browseractions/BrowserActionsIntent.java
index e9065845c9..8a99de6cec 100644
--- a/app/src/main/java/androidx/browser/browseractions/BrowserActionsIntent.java
+++ b/app/src/main/java/androidx/browser/browseractions/BrowserActionsIntent.java
@@ -69,7 +69,7 @@ public class BrowserActionsIntent {
     public static final class Builder {
         private Context mContext;
         private List<Uri> mImageUris = new ArrayList();
-        private final Intent mIntent = new Intent("androidx.browser.browseractions.browser_action_open");
+        private final Intent mIntent = new Intent(BrowserActionsIntent.ACTION_BROWSER_ACTIONS_OPEN);
         private ArrayList<Bundle> mMenuItems = new ArrayList<>();
         @Nullable
         private PendingIntent mOnItemSelectedPendingIntent = null;
@@ -84,13 +84,13 @@ public class BrowserActionsIntent {
         @NonNull
         private Bundle getBundleFromItem(@NonNull BrowserActionItem browserActionItem) {
             Bundle bundle = new Bundle();
-            bundle.putString("androidx.browser.browseractions.TITLE", browserActionItem.getTitle());
-            bundle.putParcelable("androidx.browser.browseractions.ACTION", browserActionItem.getAction());
+            bundle.putString(BrowserActionsIntent.KEY_TITLE, browserActionItem.getTitle());
+            bundle.putParcelable(BrowserActionsIntent.KEY_ACTION, browserActionItem.getAction());
             if (browserActionItem.getIconId() != 0) {
-                bundle.putInt("androidx.browser.browseractions.ICON_ID", browserActionItem.getIconId());
+                bundle.putInt(BrowserActionsIntent.KEY_ICON_ID, browserActionItem.getIconId());
             }
             if (browserActionItem.getIconUri() != null) {
-                bundle.putParcelable("androidx.browser.browseractions.ICON_URI", browserActionItem.getIconUri());
+                bundle.putParcelable(BrowserActionsIntent.KEY_ICON_URI, browserActionItem.getIconUri());
             }
             return bundle;
         }
@@ -98,12 +98,12 @@ public class BrowserActionsIntent {
         @NonNull
         public BrowserActionsIntent build() {
             this.mIntent.setData(this.mUri);
-            this.mIntent.putExtra("androidx.browser.browseractions.extra.TYPE", this.mType);
-            this.mIntent.putParcelableArrayListExtra("androidx.browser.browseractions.extra.MENU_ITEMS", this.mMenuItems);
-            this.mIntent.putExtra("androidx.browser.browseractions.APP_ID", PendingIntent.getActivity(this.mContext, 0, new Intent(), 0));
+            this.mIntent.putExtra(BrowserActionsIntent.EXTRA_TYPE, this.mType);
+            this.mIntent.putParcelableArrayListExtra(BrowserActionsIntent.EXTRA_MENU_ITEMS, this.mMenuItems);
+            this.mIntent.putExtra(BrowserActionsIntent.EXTRA_APP_ID, PendingIntent.getActivity(this.mContext, 0, new Intent(), 0));
             PendingIntent pendingIntent = this.mOnItemSelectedPendingIntent;
             if (pendingIntent != null) {
-                this.mIntent.putExtra("androidx.browser.browseractions.extra.SELECTED_ACTION_PENDING_INTENT", pendingIntent);
+                this.mIntent.putExtra(BrowserActionsIntent.EXTRA_SELECTED_ACTION_PENDING_INTENT, pendingIntent);
             }
             BrowserServiceFileProvider.grantReadPermission(this.mIntent, this.mImageUris, this.mContext);
             return new BrowserActionsIntent(this.mIntent);
@@ -151,7 +151,7 @@ public class BrowserActionsIntent {
     @NonNull
     @RestrictTo({RestrictTo.Scope.LIBRARY})
     public static List<ResolveInfo> getBrowserActionsIntentHandlers(@NonNull Context context) {
-        return context.getPackageManager().queryIntentActivities(new Intent("androidx.browser.browseractions.browser_action_open", Uri.parse("https://www.example.com")), 131072);
+        return context.getPackageManager().queryIntentActivities(new Intent(ACTION_BROWSER_ACTIONS_OPEN, Uri.parse(TEST_URL)), 131072);
     }
 
     @Nullable
@@ -162,7 +162,7 @@ public class BrowserActionsIntent {
 
     @Nullable
     public static String getUntrustedCreatorPackageName(@NonNull Intent intent) {
-        PendingIntent pendingIntent = (PendingIntent) intent.getParcelableExtra("androidx.browser.browseractions.APP_ID");
+        PendingIntent pendingIntent = (PendingIntent) intent.getParcelableExtra(EXTRA_APP_ID);
         if (pendingIntent != null) {
             return pendingIntent.getCreatorPackage();
         }
@@ -184,7 +184,7 @@ public class BrowserActionsIntent {
         if (list.size() == 1) {
             intent.setPackage(list.get(0).activityInfo.packageName);
         } else {
-            ResolveInfo resolveActivity = context.getPackageManager().resolveActivity(new Intent("android.intent.action.VIEW", Uri.parse("https://www.example.com")), 65536);
+            ResolveInfo resolveActivity = context.getPackageManager().resolveActivity(new Intent("android.intent.action.VIEW", Uri.parse(TEST_URL)), 65536);
             if (resolveActivity != null) {
                 String str = resolveActivity.activityInfo.packageName;
                 while (true) {
@@ -212,7 +212,7 @@ public class BrowserActionsIntent {
 
     private static void openFallbackBrowserActionsMenu(Context context, Intent intent) {
         Uri data = intent.getData();
-        ArrayList parcelableArrayListExtra = intent.getParcelableArrayListExtra("androidx.browser.browseractions.extra.MENU_ITEMS");
+        ArrayList parcelableArrayListExtra = intent.getParcelableArrayListExtra(EXTRA_MENU_ITEMS);
         openFallbackBrowserActionsMenu(context, data, parcelableArrayListExtra != null ? parseBrowserActionItems(parcelableArrayListExtra) : null);
     }
 
@@ -229,10 +229,10 @@ public class BrowserActionsIntent {
         ArrayList arrayList2 = new ArrayList();
         for (int i = 0; i < arrayList.size(); i++) {
             Bundle bundle = arrayList.get(i);
-            String string = bundle.getString("androidx.browser.browseractions.TITLE");
-            PendingIntent pendingIntent = (PendingIntent) bundle.getParcelable("androidx.browser.browseractions.ACTION");
-            int i2 = bundle.getInt("androidx.browser.browseractions.ICON_ID");
-            Uri uri = (Uri) bundle.getParcelable("androidx.browser.browseractions.ICON_URI");
+            String string = bundle.getString(KEY_TITLE);
+            PendingIntent pendingIntent = (PendingIntent) bundle.getParcelable(KEY_ACTION);
+            int i2 = bundle.getInt(KEY_ICON_ID);
+            Uri uri = (Uri) bundle.getParcelable(KEY_ICON_URI);
             if (TextUtils.isEmpty(string) || pendingIntent == null) {
                 throw new IllegalArgumentException("Custom item should contain a non-empty title and non-null intent.");
             }
diff --git a/app/src/main/java/androidx/browser/browseractions/BrowserServiceFileProvider.java b/app/src/main/java/androidx/browser/browseractions/BrowserServiceFileProvider.java
index 53d49dffb2..224120be4d 100644
--- a/app/src/main/java/androidx/browser/browseractions/BrowserServiceFileProvider.java
+++ b/app/src/main/java/androidx/browser/browseractions/BrowserServiceFileProvider.java
@@ -94,16 +94,16 @@ public final class BrowserServiceFileProvider extends FileProvider {
         }
 
         private static boolean shouldCleanUp(SharedPreferences sharedPreferences) {
-            return System.currentTimeMillis() > sharedPreferences.getLong("last_cleanup_time", System.currentTimeMillis()) + CLEANUP_REQUIRED_TIME_SPAN;
+            return System.currentTimeMillis() > sharedPreferences.getLong(BrowserServiceFileProvider.LAST_CLEANUP_TIME_KEY, System.currentTimeMillis()) + CLEANUP_REQUIRED_TIME_SPAN;
         }
 
         public Void doInBackground(Void... voidArr) {
-            SharedPreferences sharedPreferences = this.mAppContext.getSharedPreferences(this.mAppContext.getPackageName() + ".image_provider", 0);
+            SharedPreferences sharedPreferences = this.mAppContext.getSharedPreferences(this.mAppContext.getPackageName() + BrowserServiceFileProvider.AUTHORITY_SUFFIX, 0);
             if (!shouldCleanUp(sharedPreferences)) {
                 return null;
             }
             synchronized (BrowserServiceFileProvider.sFileCleanupLock) {
-                File file = new File(this.mAppContext.getFilesDir(), "image_provider");
+                File file = new File(this.mAppContext.getFilesDir(), BrowserServiceFileProvider.FILE_SUB_DIR);
                 if (!file.exists()) {
                     return null;
                 }
@@ -113,14 +113,14 @@ public final class BrowserServiceFileProvider extends FileProvider {
                 for (File file2 : listFiles) {
                     if (isImageFile(file2)) {
                         if (file2.lastModified() < currentTimeMillis && !file2.delete()) {
-                            Log.e("BrowserServiceFP", "Fail to delete image: " + file2.getAbsoluteFile());
+                            Log.e(BrowserServiceFileProvider.TAG, "Fail to delete image: " + file2.getAbsoluteFile());
                             z2 = false;
                         }
                     }
                 }
                 long currentTimeMillis2 = z2 ? System.currentTimeMillis() : (System.currentTimeMillis() - CLEANUP_REQUIRED_TIME_SPAN) + DELETION_FAILED_REATTEMPT_DURATION;
                 SharedPreferences.Editor edit = sharedPreferences.edit();
-                edit.putLong("last_cleanup_time", currentTimeMillis2);
+                edit.putLong(BrowserServiceFileProvider.LAST_CLEANUP_TIME_KEY, currentTimeMillis2);
                 edit.apply();
                 return null;
             }
@@ -176,10 +176,10 @@ public final class BrowserServiceFileProvider extends FileProvider {
         }
 
         private void saveFileIfNeededBlocking() {
-            File file = new File(this.mAppContext.getFilesDir(), "image_provider");
+            File file = new File(this.mAppContext.getFilesDir(), BrowserServiceFileProvider.FILE_SUB_DIR);
             synchronized (BrowserServiceFileProvider.sFileCleanupLock) {
                 if (file.exists() || file.mkdir()) {
-                    File file2 = new File(file, this.mFilename + ".png");
+                    File file2 = new File(file, this.mFilename + BrowserServiceFileProvider.FILE_EXTENSION);
                     if (file2.exists()) {
                         this.mResultFuture.set(this.mFileUri);
                     } else {
@@ -203,16 +203,16 @@ public final class BrowserServiceFileProvider extends FileProvider {
     }
 
     private static Uri generateUri(Context context, String str) {
-        String t = a.t("image_provider_images/", str, ".png");
-        Uri.Builder scheme = new Uri.Builder().scheme("content");
-        return scheme.authority(context.getPackageName() + ".image_provider").path(t).build();
+        String t = a.t(FILE_SUB_DIR_NAME, str, FILE_EXTENSION);
+        Uri.Builder scheme = new Uri.Builder().scheme(CONTENT_SCHEME);
+        return scheme.authority(context.getPackageName() + AUTHORITY_SUFFIX).path(t).build();
     }
 
     public static void grantReadPermission(@NonNull Intent intent, @Nullable List<Uri> list, @NonNull Context context) {
         if (!(list == null || list.size() == 0)) {
             ContentResolver contentResolver = context.getContentResolver();
             intent.addFlags(1);
-            ClipData newUri = ClipData.newUri(contentResolver, "image_provider_uris", list.get(0));
+            ClipData newUri = ClipData.newUri(contentResolver, CLIP_DATA_LABEL, list.get(0));
             for (int i = 1; i < list.size(); i++) {
                 newUri.addItem(new ClipData.Item(list.get(i)));
             }
diff --git a/app/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java b/app/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java
index b82e7b379e..195e54e8aa 100644
--- a/app/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java
+++ b/app/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 public final class CustomTabColorSchemeParams {
     @Nullable
     @ColorInt
@@ -39,7 +40,7 @@ public final class CustomTabColorSchemeParams {
 
         @NonNull
         public Builder setNavigationBarColor(@ColorInt int i) {
-            this.mNavigationBarColor = Integer.valueOf(i | -16777216);
+            this.mNavigationBarColor = Integer.valueOf(i | ViewCompat.MEASURED_STATE_MASK);
             return this;
         }
 
@@ -57,7 +58,7 @@ public final class CustomTabColorSchemeParams {
 
         @NonNull
         public Builder setToolbarColor(@ColorInt int i) {
-            this.mToolbarColor = Integer.valueOf(i | -16777216);
+            this.mToolbarColor = Integer.valueOf(i | ViewCompat.MEASURED_STATE_MASK);
             return this;
         }
     }
@@ -74,7 +75,7 @@ public final class CustomTabColorSchemeParams {
         if (bundle == null) {
             bundle = new Bundle(0);
         }
-        return new CustomTabColorSchemeParams((Integer) bundle.get("android.support.customtabs.extra.TOOLBAR_COLOR"), (Integer) bundle.get("android.support.customtabs.extra.SECONDARY_TOOLBAR_COLOR"), (Integer) bundle.get("androidx.browser.customtabs.extra.NAVIGATION_BAR_COLOR"), (Integer) bundle.get("androidx.browser.customtabs.extra.NAVIGATION_BAR_DIVIDER_COLOR"));
+        return new CustomTabColorSchemeParams((Integer) bundle.get(CustomTabsIntent.EXTRA_TOOLBAR_COLOR), (Integer) bundle.get(CustomTabsIntent.EXTRA_SECONDARY_TOOLBAR_COLOR), (Integer) bundle.get(CustomTabsIntent.EXTRA_NAVIGATION_BAR_COLOR), (Integer) bundle.get(CustomTabsIntent.EXTRA_NAVIGATION_BAR_DIVIDER_COLOR));
     }
 
     @NonNull
@@ -82,19 +83,19 @@ public final class CustomTabColorSchemeParams {
         Bundle bundle = new Bundle();
         Integer num = this.toolbarColor;
         if (num != null) {
-            bundle.putInt("android.support.customtabs.extra.TOOLBAR_COLOR", num.intValue());
+            bundle.putInt(CustomTabsIntent.EXTRA_TOOLBAR_COLOR, num.intValue());
         }
         Integer num2 = this.secondaryToolbarColor;
         if (num2 != null) {
-            bundle.putInt("android.support.customtabs.extra.SECONDARY_TOOLBAR_COLOR", num2.intValue());
+            bundle.putInt(CustomTabsIntent.EXTRA_SECONDARY_TOOLBAR_COLOR, num2.intValue());
         }
         Integer num3 = this.navigationBarColor;
         if (num3 != null) {
-            bundle.putInt("androidx.browser.customtabs.extra.NAVIGATION_BAR_COLOR", num3.intValue());
+            bundle.putInt(CustomTabsIntent.EXTRA_NAVIGATION_BAR_COLOR, num3.intValue());
         }
         Integer num4 = this.navigationBarDividerColor;
         if (num4 != null) {
-            bundle.putInt("androidx.browser.customtabs.extra.NAVIGATION_BAR_DIVIDER_COLOR", num4.intValue());
+            bundle.putInt(CustomTabsIntent.EXTRA_NAVIGATION_BAR_DIVIDER_COLOR, num4.intValue());
         }
         return bundle;
     }
diff --git a/app/src/main/java/androidx/browser/customtabs/CustomTabsClient.java b/app/src/main/java/androidx/browser/customtabs/CustomTabsClient.java
index e282b6cf37..8d124338e7 100644
--- a/app/src/main/java/androidx/browser/customtabs/CustomTabsClient.java
+++ b/app/src/main/java/androidx/browser/customtabs/CustomTabsClient.java
@@ -191,7 +191,7 @@ public class CustomTabsClient {
 
     public static boolean bindCustomTabsService(@NonNull Context context, @Nullable String str, @NonNull CustomTabsServiceConnection customTabsServiceConnection) {
         customTabsServiceConnection.setApplicationContext(context.getApplicationContext());
-        Intent intent = new Intent("android.support.customtabs.action.CustomTabsService");
+        Intent intent = new Intent(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION);
         if (!TextUtils.isEmpty(str)) {
             intent.setPackage(str);
         }
@@ -200,7 +200,7 @@ public class CustomTabsClient {
 
     public static boolean bindCustomTabsServicePreservePriority(@NonNull Context context, @Nullable String str, @NonNull CustomTabsServiceConnection customTabsServiceConnection) {
         customTabsServiceConnection.setApplicationContext(context.getApplicationContext());
-        Intent intent = new Intent("android.support.customtabs.action.CustomTabsService");
+        Intent intent = new Intent(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION);
         if (!TextUtils.isEmpty(str)) {
             intent.setPackage(str);
         }
@@ -247,7 +247,7 @@ public class CustomTabsClient {
             }
             arrayList = arrayList2;
         }
-        Intent intent2 = new Intent("android.support.customtabs.action.CustomTabsService");
+        Intent intent2 = new Intent(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION);
         for (String str2 : arrayList) {
             intent2.setPackage(str2);
             if (packageManager.resolveService(intent2, 0) != null) {
@@ -257,7 +257,7 @@ public class CustomTabsClient {
         if (Build.VERSION.SDK_INT < 30) {
             return null;
         }
-        Log.w("CustomTabsClient", "Unable to find any Custom Tabs packages, you may need to add a <queries> element to your manifest. See the docs for CustomTabsClient#getPackageName.");
+        Log.w(TAG, "Unable to find any Custom Tabs packages, you may need to add a <queries> element to your manifest. See the docs for CustomTabsClient#getPackageName.");
         return null;
     }
 
@@ -274,7 +274,7 @@ public class CustomTabsClient {
         if (pendingIntent != null) {
             try {
                 Bundle bundle = new Bundle();
-                bundle.putParcelable("android.support.customtabs.extra.SESSION_ID", pendingIntent);
+                bundle.putParcelable(CustomTabsIntent.EXTRA_SESSION_ID, pendingIntent);
                 z2 = this.mService.newSessionWithExtras(createCallbackWrapper, bundle);
             } catch (RemoteException unused) {
                 return null;
diff --git a/app/src/main/java/androidx/browser/customtabs/CustomTabsIntent.java b/app/src/main/java/androidx/browser/customtabs/CustomTabsIntent.java
index 042013e5c3..daffb24946 100644
--- a/app/src/main/java/androidx/browser/customtabs/CustomTabsIntent.java
+++ b/app/src/main/java/androidx/browser/customtabs/CustomTabsIntent.java
@@ -99,9 +99,9 @@ public final class CustomTabsIntent {
 
         private void setSessionParameters(@Nullable IBinder iBinder, @Nullable PendingIntent pendingIntent) {
             Bundle bundle = new Bundle();
-            BundleCompat.putBinder(bundle, "android.support.customtabs.extra.SESSION", iBinder);
+            BundleCompat.putBinder(bundle, CustomTabsIntent.EXTRA_SESSION, iBinder);
             if (pendingIntent != null) {
-                bundle.putParcelable("android.support.customtabs.extra.SESSION_ID", pendingIntent);
+                bundle.putParcelable(CustomTabsIntent.EXTRA_SESSION_ID, pendingIntent);
             }
             this.mIntent.putExtras(bundle);
         }
@@ -119,8 +119,8 @@ public final class CustomTabsIntent {
                 this.mMenuItems = new ArrayList<>();
             }
             Bundle bundle = new Bundle();
-            bundle.putString("android.support.customtabs.customaction.MENU_ITEM_TITLE", str);
-            bundle.putParcelable("android.support.customtabs.customaction.PENDING_INTENT", pendingIntent);
+            bundle.putString(CustomTabsIntent.KEY_MENU_ITEM_TITLE, str);
+            bundle.putParcelable(CustomTabsIntent.KEY_PENDING_INTENT, pendingIntent);
             this.mMenuItems.add(bundle);
             return this;
         }
@@ -133,10 +133,10 @@ public final class CustomTabsIntent {
             }
             if (this.mActionButtons.size() < 5) {
                 Bundle bundle = new Bundle();
-                bundle.putInt("android.support.customtabs.customaction.ID", i);
-                bundle.putParcelable("android.support.customtabs.customaction.ICON", bitmap);
-                bundle.putString("android.support.customtabs.customaction.DESCRIPTION", str);
-                bundle.putParcelable("android.support.customtabs.customaction.PENDING_INTENT", pendingIntent);
+                bundle.putInt(CustomTabsIntent.KEY_ID, i);
+                bundle.putParcelable(CustomTabsIntent.KEY_ICON, bitmap);
+                bundle.putString(CustomTabsIntent.KEY_DESCRIPTION, str);
+                bundle.putParcelable(CustomTabsIntent.KEY_PENDING_INTENT, pendingIntent);
                 this.mActionButtons.add(bundle);
                 return this;
             }
@@ -145,18 +145,18 @@ public final class CustomTabsIntent {
 
         @NonNull
         public CustomTabsIntent build() {
-            if (!this.mIntent.hasExtra("android.support.customtabs.extra.SESSION")) {
+            if (!this.mIntent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
                 setSessionParameters(null, null);
             }
             ArrayList<Bundle> arrayList = this.mMenuItems;
             if (arrayList != null) {
-                this.mIntent.putParcelableArrayListExtra("android.support.customtabs.extra.MENU_ITEMS", arrayList);
+                this.mIntent.putParcelableArrayListExtra(CustomTabsIntent.EXTRA_MENU_ITEMS, arrayList);
             }
             ArrayList<Bundle> arrayList2 = this.mActionButtons;
             if (arrayList2 != null) {
-                this.mIntent.putParcelableArrayListExtra("android.support.customtabs.extra.TOOLBAR_ITEMS", arrayList2);
+                this.mIntent.putParcelableArrayListExtra(CustomTabsIntent.EXTRA_TOOLBAR_ITEMS, arrayList2);
             }
-            this.mIntent.putExtra("android.support.customtabs.extra.EXTRA_ENABLE_INSTANT_APPS", this.mInstantAppsEnabled);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_ENABLE_INSTANT_APPS, this.mInstantAppsEnabled);
             this.mIntent.putExtras(this.mDefaultColorSchemeBuilder.build().toBundle());
             Bundle bundle = this.mDefaultColorSchemeBundle;
             if (bundle != null) {
@@ -164,17 +164,17 @@ public final class CustomTabsIntent {
             }
             if (this.mColorSchemeParamBundles != null) {
                 Bundle bundle2 = new Bundle();
-                bundle2.putSparseParcelableArray("androidx.browser.customtabs.extra.COLOR_SCHEME_PARAMS", this.mColorSchemeParamBundles);
+                bundle2.putSparseParcelableArray(CustomTabsIntent.EXTRA_COLOR_SCHEME_PARAMS, this.mColorSchemeParamBundles);
                 this.mIntent.putExtras(bundle2);
             }
-            this.mIntent.putExtra("androidx.browser.customtabs.extra.SHARE_STATE", this.mShareState);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_SHARE_STATE, this.mShareState);
             return new CustomTabsIntent(this.mIntent, this.mStartAnimationBundle);
         }
 
         @NonNull
         @Deprecated
         public Builder enableUrlBarHiding() {
-            this.mIntent.putExtra("android.support.customtabs.extra.ENABLE_URLBAR_HIDING", true);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_ENABLE_URLBAR_HIDING, true);
             return this;
         }
 
@@ -186,18 +186,18 @@ public final class CustomTabsIntent {
         @NonNull
         public Builder setActionButton(@NonNull Bitmap bitmap, @NonNull String str, @NonNull PendingIntent pendingIntent, boolean z2) {
             Bundle bundle = new Bundle();
-            bundle.putInt("android.support.customtabs.customaction.ID", 0);
-            bundle.putParcelable("android.support.customtabs.customaction.ICON", bitmap);
-            bundle.putString("android.support.customtabs.customaction.DESCRIPTION", str);
-            bundle.putParcelable("android.support.customtabs.customaction.PENDING_INTENT", pendingIntent);
-            this.mIntent.putExtra("android.support.customtabs.extra.ACTION_BUTTON_BUNDLE", bundle);
-            this.mIntent.putExtra("android.support.customtabs.extra.TINT_ACTION_BUTTON", z2);
+            bundle.putInt(CustomTabsIntent.KEY_ID, 0);
+            bundle.putParcelable(CustomTabsIntent.KEY_ICON, bitmap);
+            bundle.putString(CustomTabsIntent.KEY_DESCRIPTION, str);
+            bundle.putParcelable(CustomTabsIntent.KEY_PENDING_INTENT, pendingIntent);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_ACTION_BUTTON_BUNDLE, bundle);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_TINT_ACTION_BUTTON, z2);
             return this;
         }
 
         @NonNull
         public Builder setCloseButtonIcon(@NonNull Bitmap bitmap) {
-            this.mIntent.putExtra("android.support.customtabs.extra.CLOSE_BUTTON_ICON", bitmap);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_CLOSE_BUTTON_ICON, bitmap);
             return this;
         }
 
@@ -206,7 +206,7 @@ public final class CustomTabsIntent {
             if (i < 0 || i > 2) {
                 throw new IllegalArgumentException("Invalid value for the colorScheme argument");
             }
-            this.mIntent.putExtra("androidx.browser.customtabs.extra.COLOR_SCHEME", i);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_COLOR_SCHEME, i);
             return this;
         }
 
@@ -241,7 +241,7 @@ public final class CustomTabsIntent {
 
         @NonNull
         public Builder setExitAnimations(@NonNull Context context, @AnimRes int i, @AnimRes int i2) {
-            this.mIntent.putExtra("android.support.customtabs.extra.EXIT_ANIMATION_BUNDLE", ActivityOptionsCompat.makeCustomAnimation(context, i, i2).toBundle());
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_EXIT_ANIMATION_BUNDLE, ActivityOptionsCompat.makeCustomAnimation(context, i, i2).toBundle());
             return this;
         }
 
@@ -281,9 +281,9 @@ public final class CustomTabsIntent {
 
         @NonNull
         public Builder setSecondaryToolbarViews(@NonNull RemoteViews remoteViews, @Nullable int[] iArr, @Nullable PendingIntent pendingIntent) {
-            this.mIntent.putExtra("android.support.customtabs.extra.EXTRA_REMOTEVIEWS", remoteViews);
-            this.mIntent.putExtra("android.support.customtabs.extra.EXTRA_REMOTEVIEWS_VIEW_IDS", iArr);
-            this.mIntent.putExtra("android.support.customtabs.extra.EXTRA_REMOTEVIEWS_PENDINGINTENT", pendingIntent);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_REMOTEVIEWS, remoteViews);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_REMOTEVIEWS_VIEW_IDS, iArr);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_REMOTEVIEWS_PENDINGINTENT, pendingIntent);
             return this;
         }
 
@@ -301,18 +301,18 @@ public final class CustomTabsIntent {
             }
             this.mShareState = i;
             if (i == 1) {
-                this.mIntent.putExtra("android.support.customtabs.extra.SHARE_MENU_ITEM", true);
+                this.mIntent.putExtra(CustomTabsIntent.EXTRA_DEFAULT_SHARE_MENU_ITEM, true);
             } else if (i == 2) {
-                this.mIntent.putExtra("android.support.customtabs.extra.SHARE_MENU_ITEM", false);
+                this.mIntent.putExtra(CustomTabsIntent.EXTRA_DEFAULT_SHARE_MENU_ITEM, false);
             } else {
-                this.mIntent.removeExtra("android.support.customtabs.extra.SHARE_MENU_ITEM");
+                this.mIntent.removeExtra(CustomTabsIntent.EXTRA_DEFAULT_SHARE_MENU_ITEM);
             }
             return this;
         }
 
         @NonNull
         public Builder setShowTitle(boolean z2) {
-            this.mIntent.putExtra("android.support.customtabs.extra.TITLE_VISIBILITY", z2 ? 1 : 0);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_TITLE_VISIBILITY_STATE, z2 ? 1 : 0);
             return this;
         }
 
@@ -331,7 +331,7 @@ public final class CustomTabsIntent {
 
         @NonNull
         public Builder setUrlBarHidingEnabled(boolean z2) {
-            this.mIntent.putExtra("android.support.customtabs.extra.ENABLE_URLBAR_HIDING", z2);
+            this.mIntent.putExtra(CustomTabsIntent.EXTRA_ENABLE_URLBAR_HIDING, z2);
             return this;
         }
     }
@@ -362,7 +362,7 @@ public final class CustomTabsIntent {
             return CustomTabColorSchemeParams.fromBundle(null);
         }
         CustomTabColorSchemeParams fromBundle = CustomTabColorSchemeParams.fromBundle(extras);
-        SparseArray sparseParcelableArray = extras.getSparseParcelableArray("androidx.browser.customtabs.extra.COLOR_SCHEME_PARAMS");
+        SparseArray sparseParcelableArray = extras.getSparseParcelableArray(EXTRA_COLOR_SCHEME_PARAMS);
         return (sparseParcelableArray == null || (bundle = (Bundle) sparseParcelableArray.get(i)) == null) ? fromBundle : CustomTabColorSchemeParams.fromBundle(bundle).withDefaults(fromBundle);
     }
 
@@ -376,12 +376,12 @@ public final class CustomTabsIntent {
             intent = new Intent("android.intent.action.VIEW");
         }
         intent.addFlags(268435456);
-        intent.putExtra("android.support.customtabs.extra.user_opt_out", true);
+        intent.putExtra(EXTRA_USER_OPT_OUT_FROM_CUSTOM_TABS, true);
         return intent;
     }
 
     public static boolean shouldAlwaysUseBrowserUI(@NonNull Intent intent) {
-        return intent.getBooleanExtra("android.support.customtabs.extra.user_opt_out", false) && (intent.getFlags() & 268435456) != 0;
+        return intent.getBooleanExtra(EXTRA_USER_OPT_OUT_FROM_CUSTOM_TABS, false) && (intent.getFlags() & 268435456) != 0;
     }
 
     public void launchUrl(@NonNull Context context, @NonNull Uri uri) {
diff --git a/app/src/main/java/androidx/browser/customtabs/CustomTabsService.java b/app/src/main/java/androidx/browser/customtabs/CustomTabsService.java
index 01c5c86b3d..bc7c21c10b 100644
--- a/app/src/main/java/androidx/browser/customtabs/CustomTabsService.java
+++ b/app/src/main/java/androidx/browser/customtabs/CustomTabsService.java
@@ -46,8 +46,8 @@ public abstract class CustomTabsService extends Service {
             if (bundle == null) {
                 return null;
             }
-            PendingIntent pendingIntent = (PendingIntent) bundle.getParcelable("android.support.customtabs.extra.SESSION_ID");
-            bundle.remove("android.support.customtabs.extra.SESSION_ID");
+            PendingIntent pendingIntent = (PendingIntent) bundle.getParcelable(CustomTabsIntent.EXTRA_SESSION_ID);
+            bundle.remove(CustomTabsIntent.EXTRA_SESSION_ID);
             return pendingIntent;
         }
 
diff --git a/app/src/main/java/androidx/browser/customtabs/CustomTabsSession.java b/app/src/main/java/androidx/browser/customtabs/CustomTabsSession.java
index 7db5bbcb28..7374d24127 100644
--- a/app/src/main/java/androidx/browser/customtabs/CustomTabsSession.java
+++ b/app/src/main/java/androidx/browser/customtabs/CustomTabsSession.java
@@ -115,7 +115,7 @@ public final class CustomTabsSession {
     private void addIdToBundle(Bundle bundle) {
         PendingIntent pendingIntent = this.mId;
         if (pendingIntent != null) {
-            bundle.putParcelable("android.support.customtabs.extra.SESSION_ID", pendingIntent);
+            bundle.putParcelable(CustomTabsIntent.EXTRA_SESSION_ID, pendingIntent);
         }
     }
 
@@ -188,10 +188,10 @@ public final class CustomTabsSession {
 
     public boolean setActionButton(@NonNull Bitmap bitmap, @NonNull String str) {
         Bundle bundle = new Bundle();
-        bundle.putParcelable("android.support.customtabs.customaction.ICON", bitmap);
-        bundle.putString("android.support.customtabs.customaction.DESCRIPTION", str);
+        bundle.putParcelable(CustomTabsIntent.KEY_ICON, bitmap);
+        bundle.putString(CustomTabsIntent.KEY_DESCRIPTION, str);
         Bundle bundle2 = new Bundle();
-        bundle2.putBundle("android.support.customtabs.extra.ACTION_BUTTON_BUNDLE", bundle);
+        bundle2.putBundle(CustomTabsIntent.EXTRA_ACTION_BUTTON_BUNDLE, bundle);
         addIdToBundle(bundle);
         try {
             return this.mService.updateVisuals(this.mCallback, bundle2);
@@ -202,9 +202,9 @@ public final class CustomTabsSession {
 
     public boolean setSecondaryToolbarViews(@Nullable RemoteViews remoteViews, @Nullable int[] iArr, @Nullable PendingIntent pendingIntent) {
         Bundle bundle = new Bundle();
-        bundle.putParcelable("android.support.customtabs.extra.EXTRA_REMOTEVIEWS", remoteViews);
-        bundle.putIntArray("android.support.customtabs.extra.EXTRA_REMOTEVIEWS_VIEW_IDS", iArr);
-        bundle.putParcelable("android.support.customtabs.extra.EXTRA_REMOTEVIEWS_PENDINGINTENT", pendingIntent);
+        bundle.putParcelable(CustomTabsIntent.EXTRA_REMOTEVIEWS, remoteViews);
+        bundle.putIntArray(CustomTabsIntent.EXTRA_REMOTEVIEWS_VIEW_IDS, iArr);
+        bundle.putParcelable(CustomTabsIntent.EXTRA_REMOTEVIEWS_PENDINGINTENT, pendingIntent);
         addIdToBundle(bundle);
         try {
             return this.mService.updateVisuals(this.mCallback, bundle);
@@ -216,11 +216,11 @@ public final class CustomTabsSession {
     @Deprecated
     public boolean setToolbarItem(int i, @NonNull Bitmap bitmap, @NonNull String str) {
         Bundle bundle = new Bundle();
-        bundle.putInt("android.support.customtabs.customaction.ID", i);
-        bundle.putParcelable("android.support.customtabs.customaction.ICON", bitmap);
-        bundle.putString("android.support.customtabs.customaction.DESCRIPTION", str);
+        bundle.putInt(CustomTabsIntent.KEY_ID, i);
+        bundle.putParcelable(CustomTabsIntent.KEY_ICON, bitmap);
+        bundle.putString(CustomTabsIntent.KEY_DESCRIPTION, str);
         Bundle bundle2 = new Bundle();
-        bundle2.putBundle("android.support.customtabs.extra.ACTION_BUTTON_BUNDLE", bundle);
+        bundle2.putBundle(CustomTabsIntent.EXTRA_ACTION_BUTTON_BUNDLE, bundle);
         addIdToBundle(bundle2);
         try {
             return this.mService.updateVisuals(this.mCallback, bundle2);
diff --git a/app/src/main/java/androidx/browser/customtabs/CustomTabsSessionToken.java b/app/src/main/java/androidx/browser/customtabs/CustomTabsSessionToken.java
index 61be467b3b..b2646405f3 100644
--- a/app/src/main/java/androidx/browser/customtabs/CustomTabsSessionToken.java
+++ b/app/src/main/java/androidx/browser/customtabs/CustomTabsSessionToken.java
@@ -31,7 +31,7 @@ public class CustomTabsSessionToken {
             try {
                 CustomTabsSessionToken.this.mCallbackBinder.extraCallback(str, bundle);
             } catch (RemoteException unused) {
-                Log.e("CustomTabsSessionToken", "RemoteException during ICustomTabsCallback transaction");
+                Log.e(CustomTabsSessionToken.TAG, "RemoteException during ICustomTabsCallback transaction");
             }
         }
 
@@ -41,7 +41,7 @@ public class CustomTabsSessionToken {
             try {
                 return CustomTabsSessionToken.this.mCallbackBinder.extraCallbackWithResult(str, bundle);
             } catch (RemoteException unused) {
-                Log.e("CustomTabsSessionToken", "RemoteException during ICustomTabsCallback transaction");
+                Log.e(CustomTabsSessionToken.TAG, "RemoteException during ICustomTabsCallback transaction");
                 return null;
             }
         }
@@ -51,7 +51,7 @@ public class CustomTabsSessionToken {
             try {
                 CustomTabsSessionToken.this.mCallbackBinder.onMessageChannelReady(bundle);
             } catch (RemoteException unused) {
-                Log.e("CustomTabsSessionToken", "RemoteException during ICustomTabsCallback transaction");
+                Log.e(CustomTabsSessionToken.TAG, "RemoteException during ICustomTabsCallback transaction");
             }
         }
 
@@ -60,7 +60,7 @@ public class CustomTabsSessionToken {
             try {
                 CustomTabsSessionToken.this.mCallbackBinder.onNavigationEvent(i, bundle);
             } catch (RemoteException unused) {
-                Log.e("CustomTabsSessionToken", "RemoteException during ICustomTabsCallback transaction");
+                Log.e(CustomTabsSessionToken.TAG, "RemoteException during ICustomTabsCallback transaction");
             }
         }
 
@@ -69,7 +69,7 @@ public class CustomTabsSessionToken {
             try {
                 CustomTabsSessionToken.this.mCallbackBinder.onPostMessage(str, bundle);
             } catch (RemoteException unused) {
-                Log.e("CustomTabsSessionToken", "RemoteException during ICustomTabsCallback transaction");
+                Log.e(CustomTabsSessionToken.TAG, "RemoteException during ICustomTabsCallback transaction");
             }
         }
 
@@ -78,7 +78,7 @@ public class CustomTabsSessionToken {
             try {
                 CustomTabsSessionToken.this.mCallbackBinder.onRelationshipValidationResult(i, uri, z2, bundle);
             } catch (RemoteException unused) {
-                Log.e("CustomTabsSessionToken", "RemoteException during ICustomTabsCallback transaction");
+                Log.e(CustomTabsSessionToken.TAG, "RemoteException during ICustomTabsCallback transaction");
             }
         }
     }
@@ -144,8 +144,8 @@ public class CustomTabsSessionToken {
         if (extras == null) {
             return null;
         }
-        IBinder binder = BundleCompat.getBinder(extras, "android.support.customtabs.extra.SESSION");
-        PendingIntent pendingIntent = (PendingIntent) intent.getParcelableExtra("android.support.customtabs.extra.SESSION_ID");
+        IBinder binder = BundleCompat.getBinder(extras, CustomTabsIntent.EXTRA_SESSION);
+        PendingIntent pendingIntent = (PendingIntent) intent.getParcelableExtra(CustomTabsIntent.EXTRA_SESSION_ID);
         if (binder == null && pendingIntent == null) {
             return null;
         }
diff --git a/app/src/main/java/androidx/browser/customtabs/PostMessageServiceConnection.java b/app/src/main/java/androidx/browser/customtabs/PostMessageServiceConnection.java
index 8f0597e6ad..c79a5eae8c 100644
--- a/app/src/main/java/androidx/browser/customtabs/PostMessageServiceConnection.java
+++ b/app/src/main/java/androidx/browser/customtabs/PostMessageServiceConnection.java
@@ -66,7 +66,7 @@ public abstract class PostMessageServiceConnection implements PostMessageBackend
         intent.setClassName(str, PostMessageService.class.getName());
         boolean bindService = context.bindService(intent, this, 1);
         if (!bindService) {
-            Log.w("PostMessageServConn", "Could not bind to PostMessageService in client.");
+            Log.w(TAG, "Could not bind to PostMessageService in client.");
         }
         return bindService;
     }
diff --git a/app/src/main/java/androidx/browser/customtabs/TrustedWebUtils.java b/app/src/main/java/androidx/browser/customtabs/TrustedWebUtils.java
index a2749ffc0d..147e2f948d 100644
--- a/app/src/main/java/androidx/browser/customtabs/TrustedWebUtils.java
+++ b/app/src/main/java/androidx/browser/customtabs/TrustedWebUtils.java
@@ -23,7 +23,7 @@ public class TrustedWebUtils {
 
     public static boolean areSplashScreensSupported(@NonNull Context context, @NonNull String str, @NonNull String str2) {
         IntentFilter intentFilter;
-        ResolveInfo resolveService = context.getPackageManager().resolveService(new Intent().setAction("android.support.customtabs.action.CustomTabsService").setPackage(str), 64);
+        ResolveInfo resolveService = context.getPackageManager().resolveService(new Intent().setAction(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION).setPackage(str), 64);
         if (resolveService == null || (intentFilter = resolveService.filter) == null) {
             return false;
         }
@@ -32,8 +32,8 @@ public class TrustedWebUtils {
 
     @Deprecated
     public static void launchAsTrustedWebActivity(@NonNull Context context, @NonNull CustomTabsIntent customTabsIntent, @NonNull Uri uri) {
-        if (BundleCompat.getBinder(customTabsIntent.intent.getExtras(), "android.support.customtabs.extra.SESSION") != null) {
-            customTabsIntent.intent.putExtra("android.support.customtabs.extra.LAUNCH_AS_TRUSTED_WEB_ACTIVITY", true);
+        if (BundleCompat.getBinder(customTabsIntent.intent.getExtras(), CustomTabsIntent.EXTRA_SESSION) != null) {
+            customTabsIntent.intent.putExtra(EXTRA_LAUNCH_AS_TRUSTED_WEB_ACTIVITY, true);
             customTabsIntent.launchUrl(context, uri);
             return;
         }
@@ -42,15 +42,15 @@ public class TrustedWebUtils {
 
     @RestrictTo({RestrictTo.Scope.LIBRARY})
     public static void launchBrowserSiteSettings(@NonNull Context context, @NonNull CustomTabsSession customTabsSession, @NonNull Uri uri) {
-        Intent intent = new Intent("android.support.customtabs.action.ACTION_MANAGE_TRUSTED_WEB_ACTIVITY_DATA");
+        Intent intent = new Intent(ACTION_MANAGE_TRUSTED_WEB_ACTIVITY_DATA);
         intent.setPackage(customTabsSession.getComponentName().getPackageName());
         intent.setData(uri);
         Bundle bundle = new Bundle();
-        BundleCompat.putBinder(bundle, "android.support.customtabs.extra.SESSION", customTabsSession.getBinder());
+        BundleCompat.putBinder(bundle, CustomTabsIntent.EXTRA_SESSION, customTabsSession.getBinder());
         intent.putExtras(bundle);
         PendingIntent id2 = customTabsSession.getId();
         if (id2 != null) {
-            intent.putExtra("android.support.customtabs.extra.SESSION_ID", id2);
+            intent.putExtra(CustomTabsIntent.EXTRA_SESSION_ID, id2);
         }
         context.startActivity(intent);
     }
diff --git a/app/src/main/java/androidx/browser/trusted/PackageIdentityUtils.java b/app/src/main/java/androidx/browser/trusted/PackageIdentityUtils.java
index 5489505aa6..acf4ff6754 100644
--- a/app/src/main/java/androidx/browser/trusted/PackageIdentityUtils.java
+++ b/app/src/main/java/androidx/browser/trusted/PackageIdentityUtils.java
@@ -96,7 +96,7 @@ public class PackageIdentityUtils {
         try {
             return getImpl().getFingerprintsForPackage(str, packageManager);
         } catch (PackageManager.NameNotFoundException e) {
-            Log.e("PackageIdentity", "Could not get fingerprint for package.", e);
+            Log.e(TAG, "Could not get fingerprint for package.", e);
             return null;
         }
     }
@@ -109,7 +109,7 @@ public class PackageIdentityUtils {
         try {
             return getImpl().packageMatchesToken(str, packageManager, tokenContents);
         } catch (PackageManager.NameNotFoundException | IOException e) {
-            Log.e("PackageIdentity", "Could not check if package matches token.", e);
+            Log.e(TAG, "Could not check if package matches token.", e);
             return false;
         }
     }
diff --git a/app/src/main/java/androidx/browser/trusted/Token.java b/app/src/main/java/androidx/browser/trusted/Token.java
index 5c4bc873d8..041abbc42f 100644
--- a/app/src/main/java/androidx/browser/trusted/Token.java
+++ b/app/src/main/java/androidx/browser/trusted/Token.java
@@ -24,7 +24,7 @@ public final class Token {
         try {
             return new Token(TokenContents.create(str, fingerprintsForPackage));
         } catch (IOException e) {
-            Log.e("Token", "Exception when creating token.", e);
+            Log.e(TAG, "Exception when creating token.", e);
             return null;
         }
     }
diff --git a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityDisplayMode.java b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityDisplayMode.java
index 7b3d0bb9ba..3aac2a580f 100644
--- a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityDisplayMode.java
+++ b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityDisplayMode.java
@@ -12,7 +12,7 @@ public interface TrustedWebActivityDisplayMode {
         @NonNull
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putInt("androidx.browser.trusted.displaymode.KEY_ID", 0);
+            bundle.putInt(TrustedWebActivityDisplayMode.KEY_ID, 0);
             return bundle;
         }
     }
@@ -31,7 +31,7 @@ public interface TrustedWebActivityDisplayMode {
 
         @NonNull
         public static TrustedWebActivityDisplayMode fromBundle(@NonNull Bundle bundle) {
-            return new ImmersiveMode(bundle.getBoolean("androidx.browser.trusted.displaymode.KEY_STICKY"), bundle.getInt("androidx.browser.trusted.displaymode.KEY_CUTOUT_MODE"));
+            return new ImmersiveMode(bundle.getBoolean(KEY_STICKY), bundle.getInt(KEY_CUTOUT_MODE));
         }
 
         public boolean isSticky() {
@@ -46,9 +46,9 @@ public interface TrustedWebActivityDisplayMode {
         @NonNull
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putInt("androidx.browser.trusted.displaymode.KEY_ID", 1);
-            bundle.putBoolean("androidx.browser.trusted.displaymode.KEY_STICKY", this.mIsSticky);
-            bundle.putInt("androidx.browser.trusted.displaymode.KEY_CUTOUT_MODE", this.mLayoutInDisplayCutoutMode);
+            bundle.putInt(TrustedWebActivityDisplayMode.KEY_ID, 1);
+            bundle.putBoolean(KEY_STICKY, this.mIsSticky);
+            bundle.putInt(KEY_CUTOUT_MODE, this.mLayoutInDisplayCutoutMode);
             return bundle;
         }
     }
diff --git a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityIntentBuilder.java b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityIntentBuilder.java
index 534c190a06..c8787e7f1b 100644
--- a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityIntentBuilder.java
+++ b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityIntentBuilder.java
@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
 import androidx.browser.customtabs.CustomTabColorSchemeParams;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.browser.customtabs.CustomTabsSession;
+import androidx.browser.customtabs.TrustedWebUtils;
 import androidx.browser.trusted.TrustedWebActivityDisplayMode;
 import androidx.browser.trusted.sharing.ShareData;
 import androidx.browser.trusted.sharing.ShareTarget;
@@ -52,26 +53,26 @@ public class TrustedWebActivityIntentBuilder {
         this.mIntentBuilder.setSession(customTabsSession);
         Intent intent = this.mIntentBuilder.build().intent;
         intent.setData(this.mUri);
-        intent.putExtra("android.support.customtabs.extra.LAUNCH_AS_TRUSTED_WEB_ACTIVITY", true);
+        intent.putExtra(TrustedWebUtils.EXTRA_LAUNCH_AS_TRUSTED_WEB_ACTIVITY, true);
         if (this.mAdditionalTrustedOrigins != null) {
-            intent.putExtra("android.support.customtabs.extra.ADDITIONAL_TRUSTED_ORIGINS", new ArrayList(this.mAdditionalTrustedOrigins));
+            intent.putExtra(EXTRA_ADDITIONAL_TRUSTED_ORIGINS, new ArrayList(this.mAdditionalTrustedOrigins));
         }
         Bundle bundle = this.mSplashScreenParams;
         if (bundle != null) {
-            intent.putExtra("androidx.browser.trusted.EXTRA_SPLASH_SCREEN_PARAMS", bundle);
+            intent.putExtra(EXTRA_SPLASH_SCREEN_PARAMS, bundle);
         }
         List<Uri> emptyList = Collections.emptyList();
         ShareTarget shareTarget = this.mShareTarget;
         if (!(shareTarget == null || this.mShareData == null)) {
-            intent.putExtra("androidx.browser.trusted.extra.SHARE_TARGET", shareTarget.toBundle());
-            intent.putExtra("androidx.browser.trusted.extra.SHARE_DATA", this.mShareData.toBundle());
+            intent.putExtra(EXTRA_SHARE_TARGET, shareTarget.toBundle());
+            intent.putExtra(EXTRA_SHARE_DATA, this.mShareData.toBundle());
             List<Uri> list = this.mShareData.uris;
             if (list != null) {
                 emptyList = list;
             }
         }
-        intent.putExtra("androidx.browser.trusted.extra.DISPLAY_MODE", this.mDisplayMode.toBundle());
-        intent.putExtra("androidx.browser.trusted.extra.SCREEN_ORIENTATION", this.mScreenOrientation);
+        intent.putExtra(EXTRA_DISPLAY_MODE, this.mDisplayMode.toBundle());
+        intent.putExtra(EXTRA_SCREEN_ORIENTATION, this.mScreenOrientation);
         return new TrustedWebActivityIntent(intent, emptyList);
     }
 
diff --git a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityService.java b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityService.java
index acafacb530..ec11742673 100644
--- a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityService.java
+++ b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityService.java
@@ -185,7 +185,7 @@ public abstract class TrustedWebActivityService extends Service {
         if (onGetSmallIconId == -1) {
             return bundle;
         }
-        bundle.putParcelable("android.support.customtabs.trusted.SMALL_ICON_BITMAP", BitmapFactory.decodeResource(getResources(), onGetSmallIconId));
+        bundle.putParcelable(KEY_SMALL_ICON_BITMAP, BitmapFactory.decodeResource(getResources(), onGetSmallIconId));
         return bundle;
     }
 
@@ -196,7 +196,7 @@ public abstract class TrustedWebActivityService extends Service {
             if (bundle == null) {
                 return -1;
             }
-            return bundle.getInt("android.support.customtabs.trusted.SMALL_ICON", -1);
+            return bundle.getInt(META_DATA_NAME_SMALL_ICON, -1);
         } catch (PackageManager.NameNotFoundException unused) {
             return -1;
         }
diff --git a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnection.java b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnection.java
index 32ea36cf14..0946ad084e 100644
--- a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnection.java
+++ b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnection.java
@@ -44,13 +44,13 @@ public final class TrustedWebActivityServiceConnection {
         }
 
         public static ActiveNotificationsArgs fromBundle(Bundle bundle) {
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.ACTIVE_NOTIFICATIONS");
-            return new ActiveNotificationsArgs(bundle.getParcelableArray("android.support.customtabs.trusted.ACTIVE_NOTIFICATIONS"));
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_ACTIVE_NOTIFICATIONS);
+            return new ActiveNotificationsArgs(bundle.getParcelableArray(TrustedWebActivityServiceConnection.KEY_ACTIVE_NOTIFICATIONS));
         }
 
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putParcelableArray("android.support.customtabs.trusted.ACTIVE_NOTIFICATIONS", this.notifications);
+            bundle.putParcelableArray(TrustedWebActivityServiceConnection.KEY_ACTIVE_NOTIFICATIONS, this.notifications);
             return bundle;
         }
     }
@@ -65,15 +65,15 @@ public final class TrustedWebActivityServiceConnection {
         }
 
         public static CancelNotificationArgs fromBundle(Bundle bundle) {
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.PLATFORM_TAG");
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.PLATFORM_ID");
-            return new CancelNotificationArgs(bundle.getString("android.support.customtabs.trusted.PLATFORM_TAG"), bundle.getInt("android.support.customtabs.trusted.PLATFORM_ID"));
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_PLATFORM_TAG);
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_PLATFORM_ID);
+            return new CancelNotificationArgs(bundle.getString(TrustedWebActivityServiceConnection.KEY_PLATFORM_TAG), bundle.getInt(TrustedWebActivityServiceConnection.KEY_PLATFORM_ID));
         }
 
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putString("android.support.customtabs.trusted.PLATFORM_TAG", this.platformTag);
-            bundle.putInt("android.support.customtabs.trusted.PLATFORM_ID", this.platformId);
+            bundle.putString(TrustedWebActivityServiceConnection.KEY_PLATFORM_TAG, this.platformTag);
+            bundle.putInt(TrustedWebActivityServiceConnection.KEY_PLATFORM_ID, this.platformId);
             return bundle;
         }
     }
@@ -86,13 +86,13 @@ public final class TrustedWebActivityServiceConnection {
         }
 
         public static NotificationsEnabledArgs fromBundle(Bundle bundle) {
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.CHANNEL_NAME");
-            return new NotificationsEnabledArgs(bundle.getString("android.support.customtabs.trusted.CHANNEL_NAME"));
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_CHANNEL_NAME);
+            return new NotificationsEnabledArgs(bundle.getString(TrustedWebActivityServiceConnection.KEY_CHANNEL_NAME));
         }
 
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putString("android.support.customtabs.trusted.CHANNEL_NAME", this.channelName);
+            bundle.putString(TrustedWebActivityServiceConnection.KEY_CHANNEL_NAME, this.channelName);
             return bundle;
         }
     }
@@ -111,19 +111,19 @@ public final class TrustedWebActivityServiceConnection {
         }
 
         public static NotifyNotificationArgs fromBundle(Bundle bundle) {
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.PLATFORM_TAG");
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.PLATFORM_ID");
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.NOTIFICATION");
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.CHANNEL_NAME");
-            return new NotifyNotificationArgs(bundle.getString("android.support.customtabs.trusted.PLATFORM_TAG"), bundle.getInt("android.support.customtabs.trusted.PLATFORM_ID"), (Notification) bundle.getParcelable("android.support.customtabs.trusted.NOTIFICATION"), bundle.getString("android.support.customtabs.trusted.CHANNEL_NAME"));
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_PLATFORM_TAG);
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_PLATFORM_ID);
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_NOTIFICATION);
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_CHANNEL_NAME);
+            return new NotifyNotificationArgs(bundle.getString(TrustedWebActivityServiceConnection.KEY_PLATFORM_TAG), bundle.getInt(TrustedWebActivityServiceConnection.KEY_PLATFORM_ID), (Notification) bundle.getParcelable(TrustedWebActivityServiceConnection.KEY_NOTIFICATION), bundle.getString(TrustedWebActivityServiceConnection.KEY_CHANNEL_NAME));
         }
 
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putString("android.support.customtabs.trusted.PLATFORM_TAG", this.platformTag);
-            bundle.putInt("android.support.customtabs.trusted.PLATFORM_ID", this.platformId);
-            bundle.putParcelable("android.support.customtabs.trusted.NOTIFICATION", this.notification);
-            bundle.putString("android.support.customtabs.trusted.CHANNEL_NAME", this.channelName);
+            bundle.putString(TrustedWebActivityServiceConnection.KEY_PLATFORM_TAG, this.platformTag);
+            bundle.putInt(TrustedWebActivityServiceConnection.KEY_PLATFORM_ID, this.platformId);
+            bundle.putParcelable(TrustedWebActivityServiceConnection.KEY_NOTIFICATION, this.notification);
+            bundle.putString(TrustedWebActivityServiceConnection.KEY_CHANNEL_NAME, this.channelName);
             return bundle;
         }
     }
@@ -136,13 +136,13 @@ public final class TrustedWebActivityServiceConnection {
         }
 
         public static ResultArgs fromBundle(Bundle bundle) {
-            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, "android.support.customtabs.trusted.NOTIFICATION_SUCCESS");
-            return new ResultArgs(bundle.getBoolean("android.support.customtabs.trusted.NOTIFICATION_SUCCESS"));
+            TrustedWebActivityServiceConnection.ensureBundleContains(bundle, TrustedWebActivityServiceConnection.KEY_NOTIFICATION_SUCCESS);
+            return new ResultArgs(bundle.getBoolean(TrustedWebActivityServiceConnection.KEY_NOTIFICATION_SUCCESS));
         }
 
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putBoolean("android.support.customtabs.trusted.NOTIFICATION_SUCCESS", this.success);
+            bundle.putBoolean(TrustedWebActivityServiceConnection.KEY_NOTIFICATION_SUCCESS, this.success);
             return bundle;
         }
     }
@@ -188,7 +188,7 @@ public final class TrustedWebActivityServiceConnection {
 
     @Nullable
     public Bitmap getSmallIconBitmap() throws RemoteException {
-        return (Bitmap) this.mService.getSmallIconBitmap().getParcelable("android.support.customtabs.trusted.SMALL_ICON_BITMAP");
+        return (Bitmap) this.mService.getSmallIconBitmap().getParcelable(TrustedWebActivityService.KEY_SMALL_ICON_BITMAP);
     }
 
     public int getSmallIconId() throws RemoteException {
diff --git a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.java b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.java
index 26e38fcc7e..7ff45d04d8 100644
--- a/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.java
+++ b/app/src/main/java/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.java
@@ -10,6 +10,7 @@ import android.util.Log;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentTransaction;
 import c.d.b.a.a;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -36,13 +37,13 @@ public final class TrustedWebActivityServiceConnectionPool {
         @Nullable
         public Exception doInBackground(Void... voidArr) {
             try {
-                if (this.mAppContext.bindService(this.mIntent, this.mConnection, 4097)) {
+                if (this.mAppContext.bindService(this.mIntent, this.mConnection, FragmentTransaction.TRANSIT_FRAGMENT_OPEN)) {
                     return null;
                 }
                 this.mAppContext.unbindService(this.mConnection);
                 return new IllegalStateException("Could not bind to the service");
             } catch (SecurityException e) {
-                Log.w("TWAConnectionPool", "SecurityException while binding.", e);
+                Log.w(TrustedWebActivityServiceConnectionPool.TAG, "SecurityException while binding.", e);
                 return e;
             }
         }
@@ -88,17 +89,17 @@ public final class TrustedWebActivityServiceConnectionPool {
         }
         if (str == null) {
             if (z2) {
-                Log.w("TWAConnectionPool", "No TWA candidates for " + uri + " have been registered.");
+                Log.w(TAG, "No TWA candidates for " + uri + " have been registered.");
             }
             return null;
         }
         Intent intent2 = new Intent();
         intent2.setPackage(str);
-        intent2.setAction("android.support.customtabs.trusted.TRUSTED_WEB_ACTIVITY_SERVICE");
+        intent2.setAction(TrustedWebActivityService.ACTION_TRUSTED_WEB_ACTIVITY_SERVICE);
         ResolveInfo resolveService = context.getPackageManager().resolveService(intent2, 131072);
         if (resolveService == null) {
             if (z2) {
-                a.g0("Could not find TWAService for ", str, "TWAConnectionPool");
+                a.g0("Could not find TWAService for ", str, TAG);
             }
             return null;
         }
@@ -107,7 +108,7 @@ public final class TrustedWebActivityServiceConnectionPool {
             K.append(resolveService.serviceInfo.name);
             K.append(" to handle request for ");
             K.append(uri);
-            Log.i("TWAConnectionPool", K.toString());
+            Log.i(TAG, K.toString());
         }
         Intent intent3 = new Intent();
         intent3.setComponent(new ComponentName(str, resolveService.serviceInfo.name));
diff --git a/app/src/main/java/androidx/browser/trusted/sharing/ShareData.java b/app/src/main/java/androidx/browser/trusted/sharing/ShareData.java
index 3b6d0b738b..f93b548827 100644
--- a/app/src/main/java/androidx/browser/trusted/sharing/ShareData.java
+++ b/app/src/main/java/androidx/browser/trusted/sharing/ShareData.java
@@ -25,7 +25,7 @@ public final class ShareData {
 
     @NonNull
     public static ShareData fromBundle(@NonNull Bundle bundle) {
-        return new ShareData(bundle.getString("androidx.browser.trusted.sharing.KEY_TITLE"), bundle.getString("androidx.browser.trusted.sharing.KEY_TEXT"), bundle.getParcelableArrayList("androidx.browser.trusted.sharing.KEY_URIS"));
+        return new ShareData(bundle.getString("androidx.browser.trusted.sharing.KEY_TITLE"), bundle.getString("androidx.browser.trusted.sharing.KEY_TEXT"), bundle.getParcelableArrayList(KEY_URIS));
     }
 
     @NonNull
@@ -34,7 +34,7 @@ public final class ShareData {
         bundle.putString("androidx.browser.trusted.sharing.KEY_TITLE", this.title);
         bundle.putString("androidx.browser.trusted.sharing.KEY_TEXT", this.text);
         if (this.uris != null) {
-            bundle.putParcelableArrayList("androidx.browser.trusted.sharing.KEY_URIS", new ArrayList<>(this.uris));
+            bundle.putParcelableArrayList(KEY_URIS, new ArrayList<>(this.uris));
         }
         return bundle;
     }
diff --git a/app/src/main/java/androidx/browser/trusted/sharing/ShareTarget.java b/app/src/main/java/androidx/browser/trusted/sharing/ShareTarget.java
index 59d35ca193..40193a377a 100644
--- a/app/src/main/java/androidx/browser/trusted/sharing/ShareTarget.java
+++ b/app/src/main/java/androidx/browser/trusted/sharing/ShareTarget.java
@@ -53,8 +53,8 @@ public final class ShareTarget {
             if (bundle == null) {
                 return null;
             }
-            String string = bundle.getString("androidx.browser.trusted.sharing.KEY_FILE_NAME");
-            ArrayList<String> stringArrayList = bundle.getStringArrayList("androidx.browser.trusted.sharing.KEY_ACCEPTED_TYPES");
+            String string = bundle.getString(KEY_NAME);
+            ArrayList<String> stringArrayList = bundle.getStringArrayList(KEY_ACCEPTED_TYPES);
             if (string == null || stringArrayList == null) {
                 return null;
             }
@@ -64,8 +64,8 @@ public final class ShareTarget {
         @NonNull
         public Bundle toBundle() {
             Bundle bundle = new Bundle();
-            bundle.putString("androidx.browser.trusted.sharing.KEY_FILE_NAME", this.name);
-            bundle.putStringArrayList("androidx.browser.trusted.sharing.KEY_ACCEPTED_TYPES", new ArrayList<>(this.acceptedTypes));
+            bundle.putString(KEY_NAME, this.name);
+            bundle.putStringArrayList(KEY_ACCEPTED_TYPES, new ArrayList<>(this.acceptedTypes));
             return bundle;
         }
     }
@@ -93,7 +93,7 @@ public final class ShareTarget {
             if (bundle == null) {
                 return null;
             }
-            ArrayList<Bundle> parcelableArrayList = bundle.getParcelableArrayList("androidx.browser.trusted.sharing.KEY_FILES");
+            ArrayList<Bundle> parcelableArrayList = bundle.getParcelableArrayList(KEY_FILES);
             if (parcelableArrayList != null) {
                 arrayList = new ArrayList();
                 for (Bundle bundle2 : parcelableArrayList) {
@@ -113,7 +113,7 @@ public final class ShareTarget {
                 for (FileFormField fileFormField : this.files) {
                     arrayList.add(fileFormField.toBundle());
                 }
-                bundle.putParcelableArrayList("androidx.browser.trusted.sharing.KEY_FILES", arrayList);
+                bundle.putParcelableArrayList(KEY_FILES, arrayList);
             }
             return bundle;
         }
@@ -133,10 +133,10 @@ public final class ShareTarget {
 
     @Nullable
     public static ShareTarget fromBundle(@NonNull Bundle bundle) {
-        String string = bundle.getString("androidx.browser.trusted.sharing.KEY_ACTION");
-        String string2 = bundle.getString("androidx.browser.trusted.sharing.KEY_METHOD");
-        String string3 = bundle.getString("androidx.browser.trusted.sharing.KEY_ENCTYPE");
-        Params fromBundle = Params.fromBundle(bundle.getBundle("androidx.browser.trusted.sharing.KEY_PARAMS"));
+        String string = bundle.getString(KEY_ACTION);
+        String string2 = bundle.getString(KEY_METHOD);
+        String string3 = bundle.getString(KEY_ENCTYPE);
+        Params fromBundle = Params.fromBundle(bundle.getBundle(KEY_PARAMS));
         if (string == null || fromBundle == null) {
             return null;
         }
@@ -146,10 +146,10 @@ public final class ShareTarget {
     @NonNull
     public Bundle toBundle() {
         Bundle bundle = new Bundle();
-        bundle.putString("androidx.browser.trusted.sharing.KEY_ACTION", this.action);
-        bundle.putString("androidx.browser.trusted.sharing.KEY_METHOD", this.method);
-        bundle.putString("androidx.browser.trusted.sharing.KEY_ENCTYPE", this.encodingType);
-        bundle.putBundle("androidx.browser.trusted.sharing.KEY_PARAMS", this.params.toBundle());
+        bundle.putString(KEY_ACTION, this.action);
+        bundle.putString(KEY_METHOD, this.method);
+        bundle.putString(KEY_ENCTYPE, this.encodingType);
+        bundle.putBundle(KEY_PARAMS, this.params.toBundle());
         return bundle;
     }
 }
diff --git a/app/src/main/java/androidx/constraintlayout/helper/widget/Layer.java b/app/src/main/java/androidx/constraintlayout/helper/widget/Layer.java
index a6f04bd8ff..b5965c3876 100644
--- a/app/src/main/java/androidx/constraintlayout/helper/widget/Layer.java
+++ b/app/src/main/java/androidx/constraintlayout/helper/widget/Layer.java
@@ -8,6 +8,7 @@ import androidx.constraintlayout.solver.widgets.ConstraintWidget;
 import androidx.constraintlayout.widget.ConstraintHelper;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.R;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 public class Layer extends ConstraintHelper {
     private static final String TAG = "Layer";
     private boolean mApplyElevationOnAttach;
@@ -60,7 +61,7 @@ public class Layer extends ConstraintHelper {
                 reCacheViews();
             }
             calcCenters();
-            double radians = Float.isNaN(this.mGroupRotateAngle) ? 0.0d : Math.toRadians((double) this.mGroupRotateAngle);
+            double radians = Float.isNaN(this.mGroupRotateAngle) ? ShadowDrawableWrapper.COS_45 : Math.toRadians((double) this.mGroupRotateAngle);
             float sin = (float) Math.sin(radians);
             float cos = (float) Math.cos(radians);
             float f = this.mScaleX;
diff --git a/app/src/main/java/androidx/constraintlayout/motion/utils/ArcCurveFit.java b/app/src/main/java/androidx/constraintlayout/motion/utils/ArcCurveFit.java
index 83971cc75f..25e14afca4 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/utils/ArcCurveFit.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/utils/ArcCurveFit.java
@@ -1,5 +1,6 @@
 package androidx.constraintlayout.motion.utils;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Arrays;
 public class ArcCurveFit extends CurveFit {
     public static final int ARC_START_FLIP = 3;
@@ -47,7 +48,7 @@ public class ArcCurveFit extends CurveFit {
             }
             double d7 = d5 - d3;
             double d8 = d6 - d4;
-            if (this.linear || Math.abs(d7) < 0.001d || Math.abs(d8) < 0.001d) {
+            if (this.linear || Math.abs(d7) < EPSILON || Math.abs(d8) < EPSILON) {
                 this.linear = true;
                 this.mX1 = d3;
                 this.mX2 = d5;
@@ -77,9 +78,9 @@ public class ArcCurveFit extends CurveFit {
             double d6 = d3 - d;
             double d7 = d2 - d4;
             int i = 0;
-            double d8 = 0.0d;
-            double d9 = 0.0d;
-            double d10 = 0.0d;
+            double d8 = ShadowDrawableWrapper.COS_45;
+            double d9 = ShadowDrawableWrapper.COS_45;
+            double d10 = ShadowDrawableWrapper.COS_45;
             while (true) {
                 double[] dArr = ourPercent;
                 if (i >= dArr.length) {
@@ -177,8 +178,8 @@ public class ArcCurveFit extends CurveFit {
         }
 
         public double lookup(double d) {
-            if (d <= 0.0d) {
-                return 0.0d;
+            if (d <= ShadowDrawableWrapper.COS_45) {
+                return ShadowDrawableWrapper.COS_45;
             }
             if (d >= 1.0d) {
                 return 1.0d;
diff --git a/app/src/main/java/androidx/constraintlayout/motion/utils/CurveFit.java b/app/src/main/java/androidx/constraintlayout/motion/utils/CurveFit.java
index e868dd83da..3633581723 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/utils/CurveFit.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/utils/CurveFit.java
@@ -1,4 +1,6 @@
 package androidx.constraintlayout.motion.utils;
+
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 public abstract class CurveFit {
     public static final int CONSTANT = 2;
     public static final int LINEAR = 1;
@@ -40,7 +42,7 @@ public abstract class CurveFit {
 
         @Override // androidx.constraintlayout.motion.utils.CurveFit
         public double getSlope(double d, int i) {
-            return 0.0d;
+            return ShadowDrawableWrapper.COS_45;
         }
 
         @Override // androidx.constraintlayout.motion.utils.CurveFit
diff --git a/app/src/main/java/androidx/constraintlayout/motion/utils/Easing.java b/app/src/main/java/androidx/constraintlayout/motion/utils/Easing.java
index 1d5b6b6b1e..43cf6aab8e 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/utils/Easing.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/utils/Easing.java
@@ -2,6 +2,7 @@ package androidx.constraintlayout.motion.utils;
 
 import android.util.Log;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Arrays;
 public class Easing {
     private static final String ACCELERATE = "cubic(0.4, 0.05, 0.8, 0.7)";
@@ -77,8 +78,8 @@ public class Easing {
 
         @Override // androidx.constraintlayout.motion.utils.Easing
         public double get(double d) {
-            if (d <= 0.0d) {
-                return 0.0d;
+            if (d <= ShadowDrawableWrapper.COS_45) {
+                return ShadowDrawableWrapper.COS_45;
             }
             if (d >= 1.0d) {
                 return 1.0d;
@@ -119,7 +120,7 @@ public class Easing {
     }
 
     static {
-        NAMED_EASING = new String[]{"standard", "accelerate", "decelerate", "linear"};
+        NAMED_EASING = new String[]{STANDARD_NAME, ACCELERATE_NAME, DECELERATE_NAME, LINEAR_NAME};
     }
 
     public static Easing getInterpolator(String str) {
@@ -133,25 +134,25 @@ public class Easing {
         char c2 = 65535;
         switch (str.hashCode()) {
             case -1354466595:
-                if (str.equals("accelerate")) {
+                if (str.equals(ACCELERATE_NAME)) {
                     c2 = 0;
                     break;
                 }
                 break;
             case -1263948740:
-                if (str.equals("decelerate")) {
+                if (str.equals(DECELERATE_NAME)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case -1102672091:
-                if (str.equals("linear")) {
+                if (str.equals(LINEAR_NAME)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case 1312628413:
-                if (str.equals("standard")) {
+                if (str.equals(STANDARD_NAME)) {
                     c2 = 3;
                     break;
                 }
@@ -159,13 +160,13 @@ public class Easing {
         }
         switch (c2) {
             case 0:
-                return new CubicEasing("cubic(0.4, 0.05, 0.8, 0.7)");
+                return new CubicEasing(ACCELERATE);
             case 1:
-                return new CubicEasing("cubic(0.0, 0.0, 0.2, 0.95)");
+                return new CubicEasing(DECELERATE);
             case 2:
-                return new CubicEasing("cubic(1, 1, 0, 0)");
+                return new CubicEasing(LINEAR);
             case 3:
-                return new CubicEasing("cubic(0.4, 0.0, 0.2, 1)");
+                return new CubicEasing(STANDARD);
             default:
                 StringBuilder K = a.K("transitionEasing syntax error syntax:transitionEasing=\"cubic(1.0,0.5,0.0,0.6)\" or ");
                 K.append(Arrays.toString(NAMED_EASING));
diff --git a/app/src/main/java/androidx/constraintlayout/motion/utils/HyperSpline.java b/app/src/main/java/androidx/constraintlayout/motion/utils/HyperSpline.java
index 5caf1618c3..49124f4926 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/utils/HyperSpline.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/utils/HyperSpline.java
@@ -1,5 +1,6 @@
 package androidx.constraintlayout.motion.utils;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.lang.reflect.Array;
 public class HyperSpline {
     public double[][] mCtl;
@@ -79,7 +80,7 @@ public class HyperSpline {
         int i;
         int length = cubicArr.length;
         double[] dArr = new double[cubicArr.length];
-        double d = 0.0d;
+        double d = ShadowDrawableWrapper.COS_45;
         double d2 = 0.0d;
         double d3 = 0.0d;
         while (true) {
@@ -96,7 +97,7 @@ public class HyperSpline {
                 d4 += d6 * d6;
                 i++;
             }
-            if (d2 > 0.0d) {
+            if (d2 > ShadowDrawableWrapper.COS_45) {
                 d3 += Math.sqrt(d4);
             }
             d2 += 0.1d;
@@ -203,7 +204,7 @@ public class HyperSpline {
             i4++;
         }
         this.mCurveLength = new double[(this.mPoints - 1)];
-        this.mTotalLength = 0.0d;
+        this.mTotalLength = ShadowDrawableWrapper.COS_45;
         Cubic[] cubicArr2 = new Cubic[i];
         for (int i5 = 0; i5 < this.mCurveLength.length; i5++) {
             for (int i6 = 0; i6 < this.mDimensionality; i6++) {
diff --git a/app/src/main/java/androidx/constraintlayout/motion/utils/LinearCurveFit.java b/app/src/main/java/androidx/constraintlayout/motion/utils/LinearCurveFit.java
index e8061dc250..db18d9c5e4 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/utils/LinearCurveFit.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/utils/LinearCurveFit.java
@@ -1,4 +1,6 @@
 package androidx.constraintlayout.motion.utils;
+
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 public class LinearCurveFit extends CurveFit {
     private static final String TAG = "LinearCurveFit";
     private double[] mT;
@@ -24,18 +26,18 @@ public class LinearCurveFit extends CurveFit {
                 d = d3;
                 d2 = d4;
             }
-            this.mTotalLength = 0.0d;
+            this.mTotalLength = ShadowDrawableWrapper.COS_45;
         }
     }
 
     private double getLength2D(double d) {
         if (Double.isNaN(this.mTotalLength)) {
-            return 0.0d;
+            return ShadowDrawableWrapper.COS_45;
         }
         double[] dArr = this.mT;
         int length = dArr.length;
         if (d <= dArr[0]) {
-            return 0.0d;
+            return ShadowDrawableWrapper.COS_45;
         }
         int i = length - 1;
         if (d >= dArr[i]) {
@@ -69,7 +71,7 @@ public class LinearCurveFit extends CurveFit {
             d3 = d5;
             d4 = d6;
         }
-        return 0.0d;
+        return ShadowDrawableWrapper.COS_45;
     }
 
     @Override // androidx.constraintlayout.motion.utils.CurveFit
@@ -97,7 +99,7 @@ public class LinearCurveFit extends CurveFit {
             }
             i2 = i4;
         }
-        return 0.0d;
+        return ShadowDrawableWrapper.COS_45;
     }
 
     @Override // androidx.constraintlayout.motion.utils.CurveFit
@@ -208,7 +210,7 @@ public class LinearCurveFit extends CurveFit {
             }
             i2 = i4;
         }
-        return 0.0d;
+        return ShadowDrawableWrapper.COS_45;
     }
 
     @Override // androidx.constraintlayout.motion.utils.CurveFit
diff --git a/app/src/main/java/androidx/constraintlayout/motion/utils/MonotonicCurveFit.java b/app/src/main/java/androidx/constraintlayout/motion/utils/MonotonicCurveFit.java
index df82ed4bf8..d3b28a5d70 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/utils/MonotonicCurveFit.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/utils/MonotonicCurveFit.java
@@ -1,5 +1,6 @@
 package androidx.constraintlayout.motion.utils;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.lang.reflect.Array;
 public class MonotonicCurveFit extends CurveFit {
     private static final String TAG = "MonotonicCurveFit";
@@ -35,7 +36,7 @@ public class MonotonicCurveFit extends CurveFit {
         }
         for (int i5 = 0; i5 < i; i5++) {
             for (int i6 = 0; i6 < length2; i6++) {
-                if (dArr3[i5][i6] == 0.0d) {
+                if (dArr3[i5][i6] == ShadowDrawableWrapper.COS_45) {
                     dArr4[i5][i6] = 0.0d;
                     dArr4[i5 + 1][i6] = 0.0d;
                 } else {
@@ -105,7 +106,7 @@ public class MonotonicCurveFit extends CurveFit {
             }
             i2 = i4;
         }
-        return 0.0d;
+        return ShadowDrawableWrapper.COS_45;
     }
 
     @Override // androidx.constraintlayout.motion.utils.CurveFit
@@ -225,7 +226,7 @@ public class MonotonicCurveFit extends CurveFit {
             }
             i2 = i4;
         }
-        return 0.0d;
+        return ShadowDrawableWrapper.COS_45;
     }
 
     @Override // androidx.constraintlayout.motion.utils.CurveFit
diff --git a/app/src/main/java/androidx/constraintlayout/motion/utils/Oscillator.java b/app/src/main/java/androidx/constraintlayout/motion/utils/Oscillator.java
index a6e75549ae..1cd84ad837 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/utils/Oscillator.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/utils/Oscillator.java
@@ -1,6 +1,7 @@
 package androidx.constraintlayout.motion.utils;
 
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Arrays;
 public class Oscillator {
     public static final int BOUNCE = 6;
@@ -35,14 +36,14 @@ public class Oscillator {
     }
 
     public double getDP(double d) {
-        if (d <= 0.0d) {
+        if (d <= ShadowDrawableWrapper.COS_45) {
             d = 1.0E-5d;
         } else if (d >= 1.0d) {
             d = 0.999999d;
         }
         int binarySearch = Arrays.binarySearch(this.mPosition, d);
         if (binarySearch > 0 || binarySearch == 0) {
-            return 0.0d;
+            return ShadowDrawableWrapper.COS_45;
         }
         int i = (-binarySearch) - 1;
         float[] fArr = this.mPeriod;
@@ -54,7 +55,7 @@ public class Oscillator {
     }
 
     public double getP(double d) {
-        if (d < 0.0d) {
+        if (d < ShadowDrawableWrapper.COS_45) {
             d = 0.0d;
         } else if (d > 1.0d) {
             d = 1.0d;
@@ -64,7 +65,7 @@ public class Oscillator {
             return 1.0d;
         }
         if (binarySearch == 0) {
-            return 0.0d;
+            return ShadowDrawableWrapper.COS_45;
         }
         int i = (-binarySearch) - 1;
         float[] fArr = this.mPeriod;
@@ -78,7 +79,7 @@ public class Oscillator {
     public double getSlope(double d) {
         switch (this.mType) {
             case 1:
-                return 0.0d;
+                return ShadowDrawableWrapper.COS_45;
             case 2:
                 return Math.signum((((getP(d) * 4.0d) + 3.0d) % 4.0d) - 2.0d) * getDP(d) * 4.0d;
             case 3:
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyAttributes.java b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyAttributes.java
index aca9056805..b67ac11c0c 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyAttributes.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyAttributes.java
@@ -317,7 +317,7 @@ public class KeyAttributes extends Key {
 
     /* JADX INFO: Can't fix incorrect switch cases order, some code will duplicate */
     /* JADX WARNING: Code restructure failed: missing block: B:30:0x009c, code lost:
-        if (r1.equals("scaleY") == false) goto L_0x0041;
+        if (r1.equals(androidx.constraintlayout.motion.widget.Key.SCALE_Y) == false) goto L_0x0041;
      */
     @Override // androidx.constraintlayout.motion.widget.Key
     public void addValues(HashMap<String, SplineSet> hashMap) {
@@ -326,7 +326,7 @@ public class KeyAttributes extends Key {
             String next = it.next();
             SplineSet splineSet = hashMap.get(next);
             char c2 = 7;
-            if (next.startsWith("CUSTOM")) {
+            if (next.startsWith(Key.CUSTOM)) {
                 ConstraintAttribute constraintAttribute = this.mCustomConstraints.get(next.substring(7));
                 if (constraintAttribute != null) {
                     ((SplineSet.CustomSet) splineSet).setPoint(this.mFramePosition, constraintAttribute);
@@ -334,35 +334,35 @@ public class KeyAttributes extends Key {
             } else {
                 switch (next.hashCode()) {
                     case -1249320806:
-                        if (next.equals("rotationX")) {
+                        if (next.equals(Key.ROTATION_X)) {
                             c2 = 0;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1249320805:
-                        if (next.equals("rotationY")) {
+                        if (next.equals(Key.ROTATION_Y)) {
                             c2 = 1;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1225497657:
-                        if (next.equals("translationX")) {
+                        if (next.equals(Key.TRANSLATION_X)) {
                             c2 = 2;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1225497656:
-                        if (next.equals("translationY")) {
+                        if (next.equals(Key.TRANSLATION_Y)) {
                             c2 = 3;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1225497655:
-                        if (next.equals("translationZ")) {
+                        if (next.equals(Key.TRANSLATION_Z)) {
                             c2 = 4;
                             break;
                         }
@@ -376,7 +376,7 @@ public class KeyAttributes extends Key {
                         c2 = 65535;
                         break;
                     case -908189618:
-                        if (next.equals("scaleX")) {
+                        if (next.equals(Key.SCALE_X)) {
                             c2 = 6;
                             break;
                         }
@@ -385,42 +385,42 @@ public class KeyAttributes extends Key {
                     case -908189617:
                         break;
                     case -760884510:
-                        if (next.equals("transformPivotX")) {
+                        if (next.equals(Key.PIVOT_X)) {
                             c2 = '\b';
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -760884509:
-                        if (next.equals("transformPivotY")) {
+                        if (next.equals(Key.PIVOT_Y)) {
                             c2 = '\t';
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -40300674:
-                        if (next.equals("rotation")) {
+                        if (next.equals(Key.ROTATION)) {
                             c2 = '\n';
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -4379043:
-                        if (next.equals("elevation")) {
+                        if (next.equals(Key.ELEVATION)) {
                             c2 = 11;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case 37232917:
-                        if (next.equals("transitionPathRotate")) {
+                        if (next.equals(Key.TRANSITION_PATH_ROTATE)) {
                             c2 = '\f';
                             break;
                         }
                         c2 = 65535;
                         break;
                     case 92909918:
-                        if (next.equals("alpha")) {
+                        if (next.equals(Key.ALPHA)) {
                             c2 = '\r';
                             break;
                         }
@@ -540,43 +540,43 @@ public class KeyAttributes extends Key {
     @Override // androidx.constraintlayout.motion.widget.Key
     public void getAttributeNames(HashSet<String> hashSet) {
         if (!Float.isNaN(this.mAlpha)) {
-            hashSet.add("alpha");
+            hashSet.add(Key.ALPHA);
         }
         if (!Float.isNaN(this.mElevation)) {
-            hashSet.add("elevation");
+            hashSet.add(Key.ELEVATION);
         }
         if (!Float.isNaN(this.mRotation)) {
-            hashSet.add("rotation");
+            hashSet.add(Key.ROTATION);
         }
         if (!Float.isNaN(this.mRotationX)) {
-            hashSet.add("rotationX");
+            hashSet.add(Key.ROTATION_X);
         }
         if (!Float.isNaN(this.mRotationY)) {
-            hashSet.add("rotationY");
+            hashSet.add(Key.ROTATION_Y);
         }
         if (!Float.isNaN(this.mPivotX)) {
-            hashSet.add("transformPivotX");
+            hashSet.add(Key.PIVOT_X);
         }
         if (!Float.isNaN(this.mPivotY)) {
-            hashSet.add("transformPivotY");
+            hashSet.add(Key.PIVOT_Y);
         }
         if (!Float.isNaN(this.mTranslationX)) {
-            hashSet.add("translationX");
+            hashSet.add(Key.TRANSLATION_X);
         }
         if (!Float.isNaN(this.mTranslationY)) {
-            hashSet.add("translationY");
+            hashSet.add(Key.TRANSLATION_Y);
         }
         if (!Float.isNaN(this.mTranslationZ)) {
-            hashSet.add("translationZ");
+            hashSet.add(Key.TRANSLATION_Z);
         }
         if (!Float.isNaN(this.mTransitionPathRotate)) {
-            hashSet.add("transitionPathRotate");
+            hashSet.add(Key.TRANSITION_PATH_ROTATE);
         }
         if (!Float.isNaN(this.mScaleX)) {
-            hashSet.add("scaleX");
+            hashSet.add(Key.SCALE_X);
         }
         if (!Float.isNaN(this.mScaleY)) {
-            hashSet.add("scaleY");
+            hashSet.add(Key.SCALE_Y);
         }
         if (!Float.isNaN(this.mProgress)) {
             hashSet.add("progress");
@@ -602,43 +602,43 @@ public class KeyAttributes extends Key {
     public void setInterpolation(HashMap<String, Integer> hashMap) {
         if (this.mCurveFit != -1) {
             if (!Float.isNaN(this.mAlpha)) {
-                hashMap.put("alpha", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ALPHA, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mElevation)) {
-                hashMap.put("elevation", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ELEVATION, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mRotation)) {
-                hashMap.put("rotation", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ROTATION, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mRotationX)) {
-                hashMap.put("rotationX", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ROTATION_X, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mRotationY)) {
-                hashMap.put("rotationY", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ROTATION_Y, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mPivotX)) {
-                hashMap.put("transformPivotX", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.PIVOT_X, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mPivotY)) {
-                hashMap.put("transformPivotY", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.PIVOT_Y, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTranslationX)) {
-                hashMap.put("translationX", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSLATION_X, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTranslationY)) {
-                hashMap.put("translationY", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSLATION_Y, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTranslationZ)) {
-                hashMap.put("translationZ", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSLATION_Z, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTransitionPathRotate)) {
-                hashMap.put("transitionPathRotate", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSITION_PATH_ROTATE, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mScaleX)) {
-                hashMap.put("scaleX", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.SCALE_X, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mScaleY)) {
-                hashMap.put("scaleY", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.SCALE_Y, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mProgress)) {
                 hashMap.put("progress", Integer.valueOf(this.mCurveFit));
@@ -669,25 +669,25 @@ public class KeyAttributes extends Key {
                 }
                 break;
             case -1249320806:
-                if (str.equals("rotationX")) {
+                if (str.equals(Key.ROTATION_X)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case -1249320805:
-                if (str.equals("rotationY")) {
+                if (str.equals(Key.ROTATION_Y)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case -1225497657:
-                if (str.equals("translationX")) {
+                if (str.equals(Key.TRANSLATION_X)) {
                     c2 = 4;
                     break;
                 }
                 break;
             case -1225497656:
-                if (str.equals("translationY")) {
+                if (str.equals(Key.TRANSLATION_Y)) {
                     c2 = 5;
                     break;
                 }
@@ -705,37 +705,37 @@ public class KeyAttributes extends Key {
                 }
                 break;
             case -908189618:
-                if (str.equals("scaleX")) {
+                if (str.equals(Key.SCALE_X)) {
                     c2 = '\b';
                     break;
                 }
                 break;
             case -908189617:
-                if (str.equals("scaleY")) {
+                if (str.equals(Key.SCALE_Y)) {
                     c2 = '\t';
                     break;
                 }
                 break;
             case -40300674:
-                if (str.equals("rotation")) {
+                if (str.equals(Key.ROTATION)) {
                     c2 = '\n';
                     break;
                 }
                 break;
             case -4379043:
-                if (str.equals("elevation")) {
+                if (str.equals(Key.ELEVATION)) {
                     c2 = 11;
                     break;
                 }
                 break;
             case 37232917:
-                if (str.equals("transitionPathRotate")) {
+                if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                     c2 = '\f';
                     break;
                 }
                 break;
             case 92909918:
-                if (str.equals("alpha")) {
+                if (str.equals(Key.ALPHA)) {
                     c2 = '\r';
                     break;
                 }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycle.java b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycle.java
index de74f56060..f28aff4324 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycle.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycle.java
@@ -352,7 +352,7 @@ public class KeyCycle extends Key {
 
     public void addCycleValues(HashMap<String, KeyCycleOscillator> hashMap) {
         for (String str : hashMap.keySet()) {
-            if (str.startsWith("CUSTOM")) {
+            if (str.startsWith(Key.CUSTOM)) {
                 ConstraintAttribute constraintAttribute = this.mCustomConstraints.get(str.substring(7));
                 if (constraintAttribute != null && constraintAttribute.getType() == ConstraintAttribute.AttributeType.FLOAT_TYPE) {
                     hashMap.get(str).setPoint(this.mFramePosition, this.mWaveShape, this.mWaveVariesBy, this.mWavePeriod, this.mWaveOffset, constraintAttribute.getValueToInterpolate(), constraintAttribute);
@@ -379,31 +379,31 @@ public class KeyCycle extends Key {
             char c2 = 65535;
             switch (str.hashCode()) {
                 case -1249320806:
-                    if (str.equals("rotationX")) {
+                    if (str.equals(Key.ROTATION_X)) {
                         c2 = 0;
                         break;
                     }
                     break;
                 case -1249320805:
-                    if (str.equals("rotationY")) {
+                    if (str.equals(Key.ROTATION_Y)) {
                         c2 = 1;
                         break;
                     }
                     break;
                 case -1225497657:
-                    if (str.equals("translationX")) {
+                    if (str.equals(Key.TRANSLATION_X)) {
                         c2 = 2;
                         break;
                     }
                     break;
                 case -1225497656:
-                    if (str.equals("translationY")) {
+                    if (str.equals(Key.TRANSLATION_Y)) {
                         c2 = 3;
                         break;
                     }
                     break;
                 case -1225497655:
-                    if (str.equals("translationZ")) {
+                    if (str.equals(Key.TRANSLATION_Z)) {
                         c2 = 4;
                         break;
                     }
@@ -415,43 +415,43 @@ public class KeyCycle extends Key {
                     }
                     break;
                 case -908189618:
-                    if (str.equals("scaleX")) {
+                    if (str.equals(Key.SCALE_X)) {
                         c2 = 6;
                         break;
                     }
                     break;
                 case -908189617:
-                    if (str.equals("scaleY")) {
+                    if (str.equals(Key.SCALE_Y)) {
                         c2 = 7;
                         break;
                     }
                     break;
                 case -40300674:
-                    if (str.equals("rotation")) {
+                    if (str.equals(Key.ROTATION)) {
                         c2 = '\b';
                         break;
                     }
                     break;
                 case -4379043:
-                    if (str.equals("elevation")) {
+                    if (str.equals(Key.ELEVATION)) {
                         c2 = '\t';
                         break;
                     }
                     break;
                 case 37232917:
-                    if (str.equals("transitionPathRotate")) {
+                    if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                         c2 = '\n';
                         break;
                     }
                     break;
                 case 92909918:
-                    if (str.equals("alpha")) {
+                    if (str.equals(Key.ALPHA)) {
                         c2 = 11;
                         break;
                     }
                     break;
                 case 156108012:
-                    if (str.equals("waveOffset")) {
+                    if (str.equals(Key.WAVE_OFFSET)) {
                         c2 = '\f';
                         break;
                     }
@@ -507,37 +507,37 @@ public class KeyCycle extends Key {
     @Override // androidx.constraintlayout.motion.widget.Key
     public void getAttributeNames(HashSet<String> hashSet) {
         if (!Float.isNaN(this.mAlpha)) {
-            hashSet.add("alpha");
+            hashSet.add(Key.ALPHA);
         }
         if (!Float.isNaN(this.mElevation)) {
-            hashSet.add("elevation");
+            hashSet.add(Key.ELEVATION);
         }
         if (!Float.isNaN(this.mRotation)) {
-            hashSet.add("rotation");
+            hashSet.add(Key.ROTATION);
         }
         if (!Float.isNaN(this.mRotationX)) {
-            hashSet.add("rotationX");
+            hashSet.add(Key.ROTATION_X);
         }
         if (!Float.isNaN(this.mRotationY)) {
-            hashSet.add("rotationY");
+            hashSet.add(Key.ROTATION_Y);
         }
         if (!Float.isNaN(this.mScaleX)) {
-            hashSet.add("scaleX");
+            hashSet.add(Key.SCALE_X);
         }
         if (!Float.isNaN(this.mScaleY)) {
-            hashSet.add("scaleY");
+            hashSet.add(Key.SCALE_Y);
         }
         if (!Float.isNaN(this.mTransitionPathRotate)) {
-            hashSet.add("transitionPathRotate");
+            hashSet.add(Key.TRANSITION_PATH_ROTATE);
         }
         if (!Float.isNaN(this.mTranslationX)) {
-            hashSet.add("translationX");
+            hashSet.add(Key.TRANSLATION_X);
         }
         if (!Float.isNaN(this.mTranslationY)) {
-            hashSet.add("translationY");
+            hashSet.add(Key.TRANSLATION_Y);
         }
         if (!Float.isNaN(this.mTranslationZ)) {
-            hashSet.add("translationZ");
+            hashSet.add(Key.TRANSLATION_Z);
         }
         if (this.mCustomConstraints.size() > 0) {
             Iterator<String> it = this.mCustomConstraints.keySet().iterator();
@@ -552,31 +552,31 @@ public class KeyCycle extends Key {
         char c2 = 65535;
         switch (str.hashCode()) {
             case -1249320806:
-                if (str.equals("rotationX")) {
+                if (str.equals(Key.ROTATION_X)) {
                     c2 = 0;
                     break;
                 }
                 break;
             case -1249320805:
-                if (str.equals("rotationY")) {
+                if (str.equals(Key.ROTATION_Y)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case -1225497657:
-                if (str.equals("translationX")) {
+                if (str.equals(Key.TRANSLATION_X)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case -1225497656:
-                if (str.equals("translationY")) {
+                if (str.equals(Key.TRANSLATION_Y)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case -1225497655:
-                if (str.equals("translationZ")) {
+                if (str.equals(Key.TRANSLATION_Z)) {
                     c2 = 4;
                     break;
                 }
@@ -588,43 +588,43 @@ public class KeyCycle extends Key {
                 }
                 break;
             case -908189618:
-                if (str.equals("scaleX")) {
+                if (str.equals(Key.SCALE_X)) {
                     c2 = 6;
                     break;
                 }
                 break;
             case -908189617:
-                if (str.equals("scaleY")) {
+                if (str.equals(Key.SCALE_Y)) {
                     c2 = 7;
                     break;
                 }
                 break;
             case -40300674:
-                if (str.equals("rotation")) {
+                if (str.equals(Key.ROTATION)) {
                     c2 = '\b';
                     break;
                 }
                 break;
             case -4379043:
-                if (str.equals("elevation")) {
+                if (str.equals(Key.ELEVATION)) {
                     c2 = '\t';
                     break;
                 }
                 break;
             case 37232917:
-                if (str.equals("transitionPathRotate")) {
+                if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                     c2 = '\n';
                     break;
                 }
                 break;
             case 92909918:
-                if (str.equals("alpha")) {
+                if (str.equals(Key.ALPHA)) {
                     c2 = 11;
                     break;
                 }
                 break;
             case 156108012:
-                if (str.equals("waveOffset")) {
+                if (str.equals(Key.WAVE_OFFSET)) {
                     c2 = '\f';
                     break;
                 }
@@ -680,25 +680,25 @@ public class KeyCycle extends Key {
                 }
                 break;
             case -1249320806:
-                if (str.equals("rotationX")) {
+                if (str.equals(Key.ROTATION_X)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case -1249320805:
-                if (str.equals("rotationY")) {
+                if (str.equals(Key.ROTATION_Y)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case -1225497657:
-                if (str.equals("translationX")) {
+                if (str.equals(Key.TRANSLATION_X)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case -1225497656:
-                if (str.equals("translationY")) {
+                if (str.equals(Key.TRANSLATION_Y)) {
                     c2 = 4;
                     break;
                 }
@@ -710,49 +710,49 @@ public class KeyCycle extends Key {
                 }
                 break;
             case -908189618:
-                if (str.equals("scaleX")) {
+                if (str.equals(Key.SCALE_X)) {
                     c2 = 6;
                     break;
                 }
                 break;
             case -908189617:
-                if (str.equals("scaleY")) {
+                if (str.equals(Key.SCALE_Y)) {
                     c2 = 7;
                     break;
                 }
                 break;
             case -40300674:
-                if (str.equals("rotation")) {
+                if (str.equals(Key.ROTATION)) {
                     c2 = '\b';
                     break;
                 }
                 break;
             case -4379043:
-                if (str.equals("elevation")) {
+                if (str.equals(Key.ELEVATION)) {
                     c2 = '\t';
                     break;
                 }
                 break;
             case 37232917:
-                if (str.equals("transitionPathRotate")) {
+                if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                     c2 = '\n';
                     break;
                 }
                 break;
             case 92909918:
-                if (str.equals("alpha")) {
+                if (str.equals(Key.ALPHA)) {
                     c2 = 11;
                     break;
                 }
                 break;
             case 156108012:
-                if (str.equals("waveOffset")) {
+                if (str.equals(Key.WAVE_OFFSET)) {
                     c2 = '\f';
                     break;
                 }
                 break;
             case 184161818:
-                if (str.equals("wavePeriod")) {
+                if (str.equals(Key.WAVE_PERIOD)) {
                     c2 = '\r';
                     break;
                 }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycleOscillator.java b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycleOscillator.java
index c1dbe4b33d..54fbe2d5c9 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycleOscillator.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyCycleOscillator.java
@@ -7,6 +7,7 @@ import androidx.constraintlayout.motion.utils.CurveFit;
 import androidx.constraintlayout.motion.utils.Oscillator;
 import androidx.constraintlayout.widget.ConstraintAttribute;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -143,8 +144,8 @@ public abstract class KeyCycleOscillator {
             float[] fArr = this.mValues;
             this.mSplineValueCache = new double[(fArr.length + 1)];
             this.mSplineSlopeCache = new double[(fArr.length + 1)];
-            if (this.mPosition[0] > 0.0d) {
-                this.mOscillator.addPoint(0.0d, this.mPeriod[0]);
+            if (this.mPosition[0] > ShadowDrawableWrapper.COS_45) {
+                this.mOscillator.addPoint(ShadowDrawableWrapper.COS_45, this.mPeriod[0]);
             }
             double[] dArr2 = this.mPosition;
             int length2 = dArr2.length - 1;
@@ -316,9 +317,9 @@ public abstract class KeyCycleOscillator {
                     try {
                         method.invoke(view, Float.valueOf(get(f)));
                     } catch (IllegalAccessException e) {
-                        Log.e("KeyCycleOscillator", "unable to setProgress", e);
+                        Log.e(KeyCycleOscillator.TAG, "unable to setProgress", e);
                     } catch (InvocationTargetException e2) {
-                        Log.e("KeyCycleOscillator", "unable to setProgress", e2);
+                        Log.e(KeyCycleOscillator.TAG, "unable to setProgress", e2);
                     }
                 }
             }
@@ -396,37 +397,37 @@ public abstract class KeyCycleOscillator {
     }
 
     public static KeyCycleOscillator makeSpline(String str) {
-        if (str.startsWith("CUSTOM")) {
+        if (str.startsWith(Key.CUSTOM)) {
             return new CustomSet();
         }
         char c2 = 65535;
         switch (str.hashCode()) {
             case -1249320806:
-                if (str.equals("rotationX")) {
+                if (str.equals(Key.ROTATION_X)) {
                     c2 = 0;
                     break;
                 }
                 break;
             case -1249320805:
-                if (str.equals("rotationY")) {
+                if (str.equals(Key.ROTATION_Y)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case -1225497657:
-                if (str.equals("translationX")) {
+                if (str.equals(Key.TRANSLATION_X)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case -1225497656:
-                if (str.equals("translationY")) {
+                if (str.equals(Key.TRANSLATION_Y)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case -1225497655:
-                if (str.equals("translationZ")) {
+                if (str.equals(Key.TRANSLATION_Z)) {
                     c2 = 4;
                     break;
                 }
@@ -438,49 +439,49 @@ public abstract class KeyCycleOscillator {
                 }
                 break;
             case -908189618:
-                if (str.equals("scaleX")) {
+                if (str.equals(Key.SCALE_X)) {
                     c2 = 6;
                     break;
                 }
                 break;
             case -908189617:
-                if (str.equals("scaleY")) {
+                if (str.equals(Key.SCALE_Y)) {
                     c2 = 7;
                     break;
                 }
                 break;
             case -797520672:
-                if (str.equals("waveVariesBy")) {
+                if (str.equals(Key.WAVE_VARIES_BY)) {
                     c2 = '\b';
                     break;
                 }
                 break;
             case -40300674:
-                if (str.equals("rotation")) {
+                if (str.equals(Key.ROTATION)) {
                     c2 = '\t';
                     break;
                 }
                 break;
             case -4379043:
-                if (str.equals("elevation")) {
+                if (str.equals(Key.ELEVATION)) {
                     c2 = '\n';
                     break;
                 }
                 break;
             case 37232917:
-                if (str.equals("transitionPathRotate")) {
+                if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                     c2 = 11;
                     break;
                 }
                 break;
             case 92909918:
-                if (str.equals("alpha")) {
+                if (str.equals(Key.ALPHA)) {
                     c2 = '\f';
                     break;
                 }
                 break;
             case 156108012:
-                if (str.equals("waveOffset")) {
+                if (str.equals(Key.WAVE_OFFSET)) {
                     c2 = '\r';
                     break;
                 }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyFrames.java b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyFrames.java
index bf666b0c54..eb8a868838 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyFrames.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyFrames.java
@@ -23,13 +23,13 @@ public class KeyFrames {
         HashMap<String, Constructor<? extends Key>> hashMap = new HashMap<>();
         sKeyMakers = hashMap;
         try {
-            hashMap.put("KeyAttribute", KeyAttributes.class.getConstructor(new Class[0]));
-            sKeyMakers.put("KeyPosition", KeyPosition.class.getConstructor(new Class[0]));
-            sKeyMakers.put("KeyCycle", KeyCycle.class.getConstructor(new Class[0]));
-            sKeyMakers.put("KeyTimeCycle", KeyTimeCycle.class.getConstructor(new Class[0]));
-            sKeyMakers.put("KeyTrigger", KeyTrigger.class.getConstructor(new Class[0]));
+            hashMap.put(KeyAttributes.NAME, KeyAttributes.class.getConstructor(new Class[0]));
+            sKeyMakers.put(KeyPosition.NAME, KeyPosition.class.getConstructor(new Class[0]));
+            sKeyMakers.put(KeyCycle.NAME, KeyCycle.class.getConstructor(new Class[0]));
+            sKeyMakers.put(KeyTimeCycle.NAME, KeyTimeCycle.class.getConstructor(new Class[0]));
+            sKeyMakers.put(KeyTrigger.NAME, KeyTrigger.class.getConstructor(new Class[0]));
         } catch (NoSuchMethodException e) {
-            Log.e("KeyFrames", "unable to load", e);
+            Log.e(TAG, "unable to load", e);
         }
     }
 
@@ -55,7 +55,7 @@ public class KeyFrames {
                         } catch (Exception e3) {
                             key = key2;
                             e = e3;
-                            Log.e("KeyFrames", "unable to create ", e);
+                            Log.e(TAG, "unable to create ", e);
                             key2 = key;
                             eventType = xmlPullParser.next();
                         }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyPosition.java b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyPosition.java
index 740d8ded44..53051e3e69 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyPosition.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyPosition.java
@@ -242,11 +242,11 @@ public class KeyPosition extends KeyPositionBase {
         float centerX2 = rectF2.centerX() - centerX;
         float centerY2 = rectF2.centerY() - centerY;
         if (strArr[0] == null) {
-            strArr[0] = "percentX";
+            strArr[0] = PERCENT_X;
             fArr[0] = (f - centerX) / centerX2;
-            strArr[1] = "percentY";
+            strArr[1] = PERCENT_Y;
             fArr[1] = (f2 - centerY) / centerY2;
-        } else if ("percentX".equals(strArr[0])) {
+        } else if (PERCENT_X.equals(strArr[0])) {
             fArr[0] = (f - centerX) / centerX2;
             fArr[1] = (f2 - centerY) / centerY2;
         } else {
@@ -274,11 +274,11 @@ public class KeyPosition extends KeyPositionBase {
         float f7 = ((f3 * f5) - (f6 * f4)) / hypot;
         float f8 = ((f4 * f5) + (f3 * f6)) / hypot;
         if (strArr[0] == null) {
-            strArr[0] = "percentX";
-            strArr[1] = "percentY";
+            strArr[0] = PERCENT_X;
+            strArr[1] = PERCENT_Y;
             fArr[0] = f8;
             fArr[1] = f7;
-        } else if ("percentX".equals(strArr[0])) {
+        } else if (PERCENT_X.equals(strArr[0])) {
             fArr[0] = f8;
             fArr[1] = f7;
         }
@@ -293,11 +293,11 @@ public class KeyPosition extends KeyPositionBase {
         int width = viewGroup.getWidth();
         int height = viewGroup.getHeight();
         if (strArr[0] == null) {
-            strArr[0] = "percentX";
+            strArr[0] = PERCENT_X;
             fArr[0] = f / ((float) width);
-            strArr[1] = "percentY";
+            strArr[1] = PERCENT_Y;
             fArr[1] = f2 / ((float) height);
-        } else if ("percentX".equals(strArr[0])) {
+        } else if (PERCENT_X.equals(strArr[0])) {
             fArr[0] = f / ((float) width);
             fArr[1] = f2 / ((float) height);
         } else {
@@ -342,13 +342,13 @@ public class KeyPosition extends KeyPositionBase {
                 }
                 break;
             case 428090547:
-                if (str.equals("percentX")) {
+                if (str.equals(PERCENT_X)) {
                     c2 = 5;
                     break;
                 }
                 break;
             case 428090548:
-                if (str.equals("percentY")) {
+                if (str.equals(PERCENT_Y)) {
                     c2 = 6;
                     break;
                 }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyTimeCycle.java b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyTimeCycle.java
index f4d1f9a78f..0233972a91 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/KeyTimeCycle.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/KeyTimeCycle.java
@@ -336,7 +336,7 @@ public class KeyTimeCycle extends Key {
 
     /* JADX INFO: Can't fix incorrect switch cases order, some code will duplicate */
     /* JADX WARNING: Code restructure failed: missing block: B:24:0x0089, code lost:
-        if (r1.equals("scaleY") == false) goto L_0x004a;
+        if (r1.equals(androidx.constraintlayout.motion.widget.Key.SCALE_Y) == false) goto L_0x004a;
      */
     public void addTimeValues(HashMap<String, TimeCycleSplineSet> hashMap) {
         Iterator<String> it = hashMap.keySet().iterator();
@@ -344,7 +344,7 @@ public class KeyTimeCycle extends Key {
             String next = it.next();
             TimeCycleSplineSet timeCycleSplineSet = hashMap.get(next);
             char c2 = 7;
-            if (next.startsWith("CUSTOM")) {
+            if (next.startsWith(Key.CUSTOM)) {
                 ConstraintAttribute constraintAttribute = this.mCustomConstraints.get(next.substring(7));
                 if (constraintAttribute != null) {
                     ((TimeCycleSplineSet.CustomSet) timeCycleSplineSet).setPoint(this.mFramePosition, constraintAttribute, this.mWavePeriod, this.mWaveShape, this.mWaveOffset);
@@ -352,35 +352,35 @@ public class KeyTimeCycle extends Key {
             } else {
                 switch (next.hashCode()) {
                     case -1249320806:
-                        if (next.equals("rotationX")) {
+                        if (next.equals(Key.ROTATION_X)) {
                             c2 = 0;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1249320805:
-                        if (next.equals("rotationY")) {
+                        if (next.equals(Key.ROTATION_Y)) {
                             c2 = 1;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1225497657:
-                        if (next.equals("translationX")) {
+                        if (next.equals(Key.TRANSLATION_X)) {
                             c2 = 2;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1225497656:
-                        if (next.equals("translationY")) {
+                        if (next.equals(Key.TRANSLATION_Y)) {
                             c2 = 3;
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -1225497655:
-                        if (next.equals("translationZ")) {
+                        if (next.equals(Key.TRANSLATION_Z)) {
                             c2 = 4;
                             break;
                         }
@@ -394,7 +394,7 @@ public class KeyTimeCycle extends Key {
                         c2 = 65535;
                         break;
                     case -908189618:
-                        if (next.equals("scaleX")) {
+                        if (next.equals(Key.SCALE_X)) {
                             c2 = 6;
                             break;
                         }
@@ -403,28 +403,28 @@ public class KeyTimeCycle extends Key {
                     case -908189617:
                         break;
                     case -40300674:
-                        if (next.equals("rotation")) {
+                        if (next.equals(Key.ROTATION)) {
                             c2 = '\b';
                             break;
                         }
                         c2 = 65535;
                         break;
                     case -4379043:
-                        if (next.equals("elevation")) {
+                        if (next.equals(Key.ELEVATION)) {
                             c2 = '\t';
                             break;
                         }
                         c2 = 65535;
                         break;
                     case 37232917:
-                        if (next.equals("transitionPathRotate")) {
+                        if (next.equals(Key.TRANSITION_PATH_ROTATE)) {
                             c2 = '\n';
                             break;
                         }
                         c2 = 65535;
                         break;
                     case 92909918:
-                        if (next.equals("alpha")) {
+                        if (next.equals(Key.ALPHA)) {
                             c2 = 11;
                             break;
                         }
@@ -535,37 +535,37 @@ public class KeyTimeCycle extends Key {
     @Override // androidx.constraintlayout.motion.widget.Key
     public void getAttributeNames(HashSet<String> hashSet) {
         if (!Float.isNaN(this.mAlpha)) {
-            hashSet.add("alpha");
+            hashSet.add(Key.ALPHA);
         }
         if (!Float.isNaN(this.mElevation)) {
-            hashSet.add("elevation");
+            hashSet.add(Key.ELEVATION);
         }
         if (!Float.isNaN(this.mRotation)) {
-            hashSet.add("rotation");
+            hashSet.add(Key.ROTATION);
         }
         if (!Float.isNaN(this.mRotationX)) {
-            hashSet.add("rotationX");
+            hashSet.add(Key.ROTATION_X);
         }
         if (!Float.isNaN(this.mRotationY)) {
-            hashSet.add("rotationY");
+            hashSet.add(Key.ROTATION_Y);
         }
         if (!Float.isNaN(this.mTranslationX)) {
-            hashSet.add("translationX");
+            hashSet.add(Key.TRANSLATION_X);
         }
         if (!Float.isNaN(this.mTranslationY)) {
-            hashSet.add("translationY");
+            hashSet.add(Key.TRANSLATION_Y);
         }
         if (!Float.isNaN(this.mTranslationZ)) {
-            hashSet.add("translationZ");
+            hashSet.add(Key.TRANSLATION_Z);
         }
         if (!Float.isNaN(this.mTransitionPathRotate)) {
-            hashSet.add("transitionPathRotate");
+            hashSet.add(Key.TRANSITION_PATH_ROTATE);
         }
         if (!Float.isNaN(this.mScaleX)) {
-            hashSet.add("scaleX");
+            hashSet.add(Key.SCALE_X);
         }
         if (!Float.isNaN(this.mScaleY)) {
-            hashSet.add("scaleY");
+            hashSet.add(Key.SCALE_Y);
         }
         if (!Float.isNaN(this.mProgress)) {
             hashSet.add("progress");
@@ -587,37 +587,37 @@ public class KeyTimeCycle extends Key {
     public void setInterpolation(HashMap<String, Integer> hashMap) {
         if (this.mCurveFit != -1) {
             if (!Float.isNaN(this.mAlpha)) {
-                hashMap.put("alpha", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ALPHA, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mElevation)) {
-                hashMap.put("elevation", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ELEVATION, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mRotation)) {
-                hashMap.put("rotation", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ROTATION, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mRotationX)) {
-                hashMap.put("rotationX", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ROTATION_X, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mRotationY)) {
-                hashMap.put("rotationY", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.ROTATION_Y, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTranslationX)) {
-                hashMap.put("translationX", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSLATION_X, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTranslationY)) {
-                hashMap.put("translationY", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSLATION_Y, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTranslationZ)) {
-                hashMap.put("translationZ", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSLATION_Z, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mTransitionPathRotate)) {
-                hashMap.put("transitionPathRotate", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.TRANSITION_PATH_ROTATE, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mScaleX)) {
-                hashMap.put("scaleX", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.SCALE_X, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mScaleX)) {
-                hashMap.put("scaleY", Integer.valueOf(this.mCurveFit));
+                hashMap.put(Key.SCALE_Y, Integer.valueOf(this.mCurveFit));
             }
             if (!Float.isNaN(this.mProgress)) {
                 hashMap.put("progress", Integer.valueOf(this.mCurveFit));
@@ -642,25 +642,25 @@ public class KeyTimeCycle extends Key {
                 }
                 break;
             case -1249320806:
-                if (str.equals("rotationX")) {
+                if (str.equals(Key.ROTATION_X)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case -1249320805:
-                if (str.equals("rotationY")) {
+                if (str.equals(Key.ROTATION_Y)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case -1225497657:
-                if (str.equals("translationX")) {
+                if (str.equals(Key.TRANSLATION_X)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case -1225497656:
-                if (str.equals("translationY")) {
+                if (str.equals(Key.TRANSLATION_Y)) {
                     c2 = 4;
                     break;
                 }
@@ -672,37 +672,37 @@ public class KeyTimeCycle extends Key {
                 }
                 break;
             case -908189618:
-                if (str.equals("scaleX")) {
+                if (str.equals(Key.SCALE_X)) {
                     c2 = 6;
                     break;
                 }
                 break;
             case -908189617:
-                if (str.equals("scaleY")) {
+                if (str.equals(Key.SCALE_Y)) {
                     c2 = 7;
                     break;
                 }
                 break;
             case -40300674:
-                if (str.equals("rotation")) {
+                if (str.equals(Key.ROTATION)) {
                     c2 = '\b';
                     break;
                 }
                 break;
             case -4379043:
-                if (str.equals("elevation")) {
+                if (str.equals(Key.ELEVATION)) {
                     c2 = '\t';
                     break;
                 }
                 break;
             case 37232917:
-                if (str.equals("transitionPathRotate")) {
+                if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                     c2 = '\n';
                     break;
                 }
                 break;
             case 92909918:
-                if (str.equals("alpha")) {
+                if (str.equals(Key.ALPHA)) {
                     c2 = 11;
                     break;
                 }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionConstrainedPoint.java b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionConstrainedPoint.java
index eeb2395033..fcecf02135 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionConstrainedPoint.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionConstrainedPoint.java
@@ -7,6 +7,7 @@ import androidx.constraintlayout.motion.widget.SplineSet;
 import androidx.constraintlayout.solver.widgets.ConstraintWidget;
 import androidx.constraintlayout.widget.ConstraintAttribute;
 import androidx.constraintlayout.widget.ConstraintSet;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -15,7 +16,7 @@ public class MotionConstrainedPoint implements Comparable<MotionConstrainedPoint
     public static final boolean DEBUG = false;
     public static final int PERPENDICULAR = 1;
     public static final String TAG = "MotionPaths";
-    public static String[] names = {"position", "x", "y", "width", "height", "pathRotate"};
+    public static String[] names = {ModelAuditLogEntry.CHANGE_KEY_POSITION, "x", "y", "width", "height", "pathRotate"};
     private float alpha = 1.0f;
     private boolean applyElevation = false;
     public LinkedHashMap<String, ConstraintAttribute> attributes = new LinkedHashMap<>();
@@ -60,31 +61,31 @@ public class MotionConstrainedPoint implements Comparable<MotionConstrainedPoint
             char c2 = 65535;
             switch (str.hashCode()) {
                 case -1249320806:
-                    if (str.equals("rotationX")) {
+                    if (str.equals(Key.ROTATION_X)) {
                         c2 = 0;
                         break;
                     }
                     break;
                 case -1249320805:
-                    if (str.equals("rotationY")) {
+                    if (str.equals(Key.ROTATION_Y)) {
                         c2 = 1;
                         break;
                     }
                     break;
                 case -1225497657:
-                    if (str.equals("translationX")) {
+                    if (str.equals(Key.TRANSLATION_X)) {
                         c2 = 2;
                         break;
                     }
                     break;
                 case -1225497656:
-                    if (str.equals("translationY")) {
+                    if (str.equals(Key.TRANSLATION_Y)) {
                         c2 = 3;
                         break;
                     }
                     break;
                 case -1225497655:
-                    if (str.equals("translationZ")) {
+                    if (str.equals(Key.TRANSLATION_Z)) {
                         c2 = 4;
                         break;
                     }
@@ -96,49 +97,49 @@ public class MotionConstrainedPoint implements Comparable<MotionConstrainedPoint
                     }
                     break;
                 case -908189618:
-                    if (str.equals("scaleX")) {
+                    if (str.equals(Key.SCALE_X)) {
                         c2 = 6;
                         break;
                     }
                     break;
                 case -908189617:
-                    if (str.equals("scaleY")) {
+                    if (str.equals(Key.SCALE_Y)) {
                         c2 = 7;
                         break;
                     }
                     break;
                 case -760884510:
-                    if (str.equals("transformPivotX")) {
+                    if (str.equals(Key.PIVOT_X)) {
                         c2 = '\b';
                         break;
                     }
                     break;
                 case -760884509:
-                    if (str.equals("transformPivotY")) {
+                    if (str.equals(Key.PIVOT_Y)) {
                         c2 = '\t';
                         break;
                     }
                     break;
                 case -40300674:
-                    if (str.equals("rotation")) {
+                    if (str.equals(Key.ROTATION)) {
                         c2 = '\n';
                         break;
                     }
                     break;
                 case -4379043:
-                    if (str.equals("elevation")) {
+                    if (str.equals(Key.ELEVATION)) {
                         c2 = 11;
                         break;
                     }
                     break;
                 case 37232917:
-                    if (str.equals("transitionPathRotate")) {
+                    if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                         c2 = '\f';
                         break;
                     }
                     break;
                 case 92909918:
-                    if (str.equals("alpha")) {
+                    if (str.equals(Key.ALPHA)) {
                         c2 = '\r';
                         break;
                     }
@@ -232,7 +233,7 @@ public class MotionConstrainedPoint implements Comparable<MotionConstrainedPoint
                     splineSet.setPoint(i, f);
                     break;
                 default:
-                    if (str.startsWith("CUSTOM")) {
+                    if (str.startsWith(Key.CUSTOM)) {
                         String str2 = str.split(",")[1];
                         if (this.attributes.containsKey(str2)) {
                             ConstraintAttribute constraintAttribute = this.attributes.get(str2);
@@ -311,51 +312,51 @@ public class MotionConstrainedPoint implements Comparable<MotionConstrainedPoint
 
     public void different(MotionConstrainedPoint motionConstrainedPoint, HashSet<String> hashSet) {
         if (diff(this.alpha, motionConstrainedPoint.alpha)) {
-            hashSet.add("alpha");
+            hashSet.add(Key.ALPHA);
         }
         if (diff(this.elevation, motionConstrainedPoint.elevation)) {
-            hashSet.add("elevation");
+            hashSet.add(Key.ELEVATION);
         }
         int i = this.visibility;
         int i2 = motionConstrainedPoint.visibility;
         if (i != i2 && this.mVisibilityMode == 0 && (i == 0 || i2 == 0)) {
-            hashSet.add("alpha");
+            hashSet.add(Key.ALPHA);
         }
         if (diff(this.rotation, motionConstrainedPoint.rotation)) {
-            hashSet.add("rotation");
+            hashSet.add(Key.ROTATION);
         }
         if (!Float.isNaN(this.mPathRotate) || !Float.isNaN(motionConstrainedPoint.mPathRotate)) {
-            hashSet.add("transitionPathRotate");
+            hashSet.add(Key.TRANSITION_PATH_ROTATE);
         }
         if (!Float.isNaN(this.mProgress) || !Float.isNaN(motionConstrainedPoint.mProgress)) {
             hashSet.add("progress");
         }
         if (diff(this.rotationX, motionConstrainedPoint.rotationX)) {
-            hashSet.add("rotationX");
+            hashSet.add(Key.ROTATION_X);
         }
         if (diff(this.rotationY, motionConstrainedPoint.rotationY)) {
-            hashSet.add("rotationY");
+            hashSet.add(Key.ROTATION_Y);
         }
         if (diff(this.mPivotX, motionConstrainedPoint.mPivotX)) {
-            hashSet.add("transformPivotX");
+            hashSet.add(Key.PIVOT_X);
         }
         if (diff(this.mPivotY, motionConstrainedPoint.mPivotY)) {
-            hashSet.add("transformPivotY");
+            hashSet.add(Key.PIVOT_Y);
         }
         if (diff(this.scaleX, motionConstrainedPoint.scaleX)) {
-            hashSet.add("scaleX");
+            hashSet.add(Key.SCALE_X);
         }
         if (diff(this.scaleY, motionConstrainedPoint.scaleY)) {
-            hashSet.add("scaleY");
+            hashSet.add(Key.SCALE_Y);
         }
         if (diff(this.translationX, motionConstrainedPoint.translationX)) {
-            hashSet.add("translationX");
+            hashSet.add(Key.TRANSLATION_X);
         }
         if (diff(this.translationY, motionConstrainedPoint.translationY)) {
-            hashSet.add("translationY");
+            hashSet.add(Key.TRANSLATION_Y);
         }
         if (diff(this.translationZ, motionConstrainedPoint.translationZ)) {
-            hashSet.add("translationZ");
+            hashSet.add(Key.TRANSLATION_Z);
         }
     }
 
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionController.java b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionController.java
index 90315b2ad7..e95d2e33b1 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionController.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionController.java
@@ -12,10 +12,12 @@ import androidx.constraintlayout.motion.widget.KeyCycleOscillator;
 import androidx.constraintlayout.motion.widget.SplineSet;
 import androidx.constraintlayout.motion.widget.TimeCycleSplineSet;
 import androidx.constraintlayout.solver.widgets.ConstraintWidget;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.constraintlayout.widget.ConstraintAttribute;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -124,7 +126,7 @@ public class MotionController {
     private float getPreCycleDistance() {
         float[] fArr = new float[2];
         float f = 1.0f / ((float) 99);
-        double d = 0.0d;
+        double d = ShadowDrawableWrapper.COS_45;
         double d2 = 0.0d;
         int i = 0;
         float f2 = 0.0f;
@@ -175,7 +177,7 @@ public class MotionController {
             StringBuilder K = a.K(" KeyPath positon \"");
             K.append(motionPaths.position);
             K.append("\" outside of range");
-            Log.e("MotionController", K.toString());
+            Log.e(TAG, K.toString());
         }
         this.mMotionPaths.add((-binarySearch) - 1, motionPaths);
     }
@@ -196,19 +198,19 @@ public class MotionController {
         float f = 1.0f / ((float) (i - 1));
         HashMap<String, SplineSet> hashMap = this.mAttributesMap;
         if (hashMap != null) {
-            hashMap.get("translationX");
+            hashMap.get(Key.TRANSLATION_X);
         }
         HashMap<String, SplineSet> hashMap2 = this.mAttributesMap;
         if (hashMap2 != null) {
-            hashMap2.get("translationY");
+            hashMap2.get(Key.TRANSLATION_Y);
         }
         HashMap<String, KeyCycleOscillator> hashMap3 = this.mCycleMap;
         if (hashMap3 != null) {
-            hashMap3.get("translationX");
+            hashMap3.get(Key.TRANSLATION_X);
         }
         HashMap<String, KeyCycleOscillator> hashMap4 = this.mCycleMap;
         if (hashMap4 != null) {
-            hashMap4.get("translationY");
+            hashMap4.get(Key.TRANSLATION_Y);
         }
         for (int i2 = 0; i2 < i; i2++) {
             float f2 = ((float) i2) * f;
@@ -320,14 +322,14 @@ public class MotionController {
         float f2 = 1.0f / ((float) (i2 - 1));
         HashMap<String, SplineSet> hashMap = this.mAttributesMap;
         KeyCycleOscillator keyCycleOscillator = null;
-        SplineSet splineSet2 = hashMap == null ? null : hashMap.get("translationX");
+        SplineSet splineSet2 = hashMap == null ? null : hashMap.get(Key.TRANSLATION_X);
         HashMap<String, SplineSet> hashMap2 = this.mAttributesMap;
-        SplineSet splineSet3 = hashMap2 == null ? null : hashMap2.get("translationY");
+        SplineSet splineSet3 = hashMap2 == null ? null : hashMap2.get(Key.TRANSLATION_Y);
         HashMap<String, KeyCycleOscillator> hashMap3 = this.mCycleMap;
-        KeyCycleOscillator keyCycleOscillator2 = hashMap3 == null ? null : hashMap3.get("translationX");
+        KeyCycleOscillator keyCycleOscillator2 = hashMap3 == null ? null : hashMap3.get(Key.TRANSLATION_X);
         HashMap<String, KeyCycleOscillator> hashMap4 = this.mCycleMap;
         if (hashMap4 != null) {
-            keyCycleOscillator = hashMap4.get("translationY");
+            keyCycleOscillator = hashMap4.get(Key.TRANSLATION_Y);
         }
         int i3 = 0;
         while (i3 < i2) {
@@ -630,26 +632,26 @@ public class MotionController {
         float adjustedPosition = getAdjustedPosition(f, this.mVelocity);
         HashMap<String, SplineSet> hashMap = this.mAttributesMap;
         KeyCycleOscillator keyCycleOscillator = null;
-        SplineSet splineSet = hashMap == null ? null : hashMap.get("translationX");
+        SplineSet splineSet = hashMap == null ? null : hashMap.get(Key.TRANSLATION_X);
         HashMap<String, SplineSet> hashMap2 = this.mAttributesMap;
-        SplineSet splineSet2 = hashMap2 == null ? null : hashMap2.get("translationY");
+        SplineSet splineSet2 = hashMap2 == null ? null : hashMap2.get(Key.TRANSLATION_Y);
         HashMap<String, SplineSet> hashMap3 = this.mAttributesMap;
-        SplineSet splineSet3 = hashMap3 == null ? null : hashMap3.get("rotation");
+        SplineSet splineSet3 = hashMap3 == null ? null : hashMap3.get(Key.ROTATION);
         HashMap<String, SplineSet> hashMap4 = this.mAttributesMap;
-        SplineSet splineSet4 = hashMap4 == null ? null : hashMap4.get("scaleX");
+        SplineSet splineSet4 = hashMap4 == null ? null : hashMap4.get(Key.SCALE_X);
         HashMap<String, SplineSet> hashMap5 = this.mAttributesMap;
-        SplineSet splineSet5 = hashMap5 == null ? null : hashMap5.get("scaleY");
+        SplineSet splineSet5 = hashMap5 == null ? null : hashMap5.get(Key.SCALE_Y);
         HashMap<String, KeyCycleOscillator> hashMap6 = this.mCycleMap;
-        KeyCycleOscillator keyCycleOscillator2 = hashMap6 == null ? null : hashMap6.get("translationX");
+        KeyCycleOscillator keyCycleOscillator2 = hashMap6 == null ? null : hashMap6.get(Key.TRANSLATION_X);
         HashMap<String, KeyCycleOscillator> hashMap7 = this.mCycleMap;
-        KeyCycleOscillator keyCycleOscillator3 = hashMap7 == null ? null : hashMap7.get("translationY");
+        KeyCycleOscillator keyCycleOscillator3 = hashMap7 == null ? null : hashMap7.get(Key.TRANSLATION_Y);
         HashMap<String, KeyCycleOscillator> hashMap8 = this.mCycleMap;
-        KeyCycleOscillator keyCycleOscillator4 = hashMap8 == null ? null : hashMap8.get("rotation");
+        KeyCycleOscillator keyCycleOscillator4 = hashMap8 == null ? null : hashMap8.get(Key.ROTATION);
         HashMap<String, KeyCycleOscillator> hashMap9 = this.mCycleMap;
-        KeyCycleOscillator keyCycleOscillator5 = hashMap9 == null ? null : hashMap9.get("scaleX");
+        KeyCycleOscillator keyCycleOscillator5 = hashMap9 == null ? null : hashMap9.get(Key.SCALE_X);
         HashMap<String, KeyCycleOscillator> hashMap10 = this.mCycleMap;
         if (hashMap10 != null) {
-            keyCycleOscillator = hashMap10.get("scaleY");
+            keyCycleOscillator = hashMap10.get(Key.SCALE_Y);
         }
         VelocityMatrix velocityMatrix = new VelocityMatrix();
         velocityMatrix.clear();
@@ -840,7 +842,7 @@ public class MotionController {
             int i6 = i5 - i3;
             int i7 = a4 - i4;
             if (!(f5 == f4 && f7 == f6)) {
-                view.measure(View.MeasureSpec.makeMeasureSpec(i6, 1073741824), View.MeasureSpec.makeMeasureSpec(i7, 1073741824));
+                view.measure(View.MeasureSpec.makeMeasureSpec(i6, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(i7, BasicMeasure.EXACTLY));
             }
             view.layout(i3, i4, i5, a4);
         }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java
index 358de6e248..1fb4c5db89 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionLayout.java
@@ -39,8 +39,12 @@ import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.Constraints;
 import androidx.constraintlayout.widget.R;
 import androidx.constraintlayout.widget.StateSet;
+import androidx.core.internal.view.SupportMenu;
 import androidx.core.view.NestedScrollingParent3;
+import androidx.core.view.ViewCompat;
+import androidx.exifinterface.media.ExifInterface;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -397,7 +401,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             canvas.translate(2.0f, 2.0f);
             canvas.drawPath(this.mPath, this.mPaint);
             canvas.translate(-2.0f, -2.0f);
-            this.mPaint.setColor(-65536);
+            this.mPaint.setColor(SupportMenu.CATEGORY_MASK);
             canvas.drawPath(this.mPath, this.mPaint);
         }
 
@@ -557,14 +561,14 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             StringBuilder O = a.O(str, " ");
             O.append(Debug.getName((View) constraintWidgetContainer.getCompanionWidget()));
             String sb = O.toString();
-            Log.v("MotionLayout", sb + "  ========= " + constraintWidgetContainer);
+            Log.v(MotionLayout.TAG, sb + "  ========= " + constraintWidgetContainer);
             int size = constraintWidgetContainer.getChildren().size();
             for (int i = 0; i < size; i++) {
                 String str2 = sb + "[" + i + "] ";
                 ConstraintWidget constraintWidget = constraintWidgetContainer.getChildren().get(i);
                 StringBuilder K = a.K("");
                 String str3 = "_";
-                K.append(constraintWidget.mTop.mTarget != null ? "T" : str3);
+                K.append(constraintWidget.mTop.mTarget != null ? ExifInterface.GPS_DIRECTION_TRUE : str3);
                 StringBuilder K2 = a.K(K.toString());
                 K2.append(constraintWidget.mBottom.mTarget != null ? "B" : str3);
                 StringBuilder K3 = a.K(K2.toString());
@@ -583,9 +587,9 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
                     O2.append(")");
                     name = O2.toString();
                 }
-                Log.v("MotionLayout", str2 + "  " + name + " " + constraintWidget + " " + sb2);
+                Log.v(MotionLayout.TAG, str2 + "  " + name + " " + constraintWidget + " " + sb2);
             }
-            Log.v("MotionLayout", sb + " done. ");
+            Log.v(MotionLayout.TAG, sb + " done. ");
         }
 
         private void debugLayoutParam(String str, ConstraintLayout.LayoutParams layoutParams) {
@@ -618,7 +622,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             }
             K12.append(str2);
             String sb = K12.toString();
-            Log.v("MotionLayout", str + sb);
+            Log.v(MotionLayout.TAG, str + sb);
         }
 
         private void debugWidget(String str, ConstraintWidget constraintWidget) {
@@ -629,8 +633,8 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             String str5 = "B";
             String str6 = "__";
             if (constraintWidget.mTop.mTarget != null) {
-                StringBuilder K2 = a.K("T");
-                K2.append(constraintWidget.mTop.mTarget.mType == ConstraintAnchor.Type.TOP ? "T" : str5);
+                StringBuilder K2 = a.K(ExifInterface.GPS_DIRECTION_TRUE);
+                K2.append(constraintWidget.mTop.mTarget.mType == ConstraintAnchor.Type.TOP ? ExifInterface.GPS_DIRECTION_TRUE : str5);
                 str2 = K2.toString();
             } else {
                 str2 = str6;
@@ -640,7 +644,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             if (constraintWidget.mBottom.mTarget != null) {
                 StringBuilder K4 = a.K(str5);
                 if (constraintWidget.mBottom.mTarget.mType == ConstraintAnchor.Type.TOP) {
-                    str5 = "T";
+                    str5 = ExifInterface.GPS_DIRECTION_TRUE;
                 }
                 K4.append(str5);
                 str3 = K4.toString();
@@ -669,7 +673,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             }
             K7.append(str6);
             String sb = K7.toString();
-            Log.v("MotionLayout", str + sb + " ---  " + constraintWidget);
+            Log.v(MotionLayout.TAG, str + sb + " ---  " + constraintWidget);
         }
 
         private void setupConstraintWidget(ConstraintWidgetContainer constraintWidgetContainer, ConstraintSet constraintSet) {
@@ -731,7 +735,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
                         if (widget != null) {
                             motionController.setStartState(widget, this.mStart);
                         } else if (MotionLayout.this.mDebugPath != 0) {
-                            Log.e("MotionLayout", Debug.getLocation() + "no widget for  " + Debug.getName(childAt2) + " (" + childAt2.getClass().getName() + ")");
+                            Log.e(MotionLayout.TAG, Debug.getLocation() + "no widget for  " + Debug.getName(childAt2) + " (" + childAt2.getClass().getName() + ")");
                         }
                     }
                     if (this.mEnd != null) {
@@ -739,7 +743,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
                         if (widget2 != null) {
                             motionController.setEndState(widget2, this.mEnd);
                         } else if (MotionLayout.this.mDebugPath != 0) {
-                            Log.e("MotionLayout", Debug.getLocation() + "no widget for  " + Debug.getName(childAt2) + " (" + childAt2.getClass().getName() + ")");
+                            Log.e(MotionLayout.TAG, Debug.getLocation() + "no widget for  " + Debug.getName(childAt2) + " (" + childAt2.getClass().getName() + ")");
                         }
                     }
                 }
@@ -1208,7 +1212,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
     private void checkStructure() {
         MotionScene motionScene = this.mScene;
         if (motionScene == null) {
-            Log.e("MotionLayout", "CHECK: motion scene not set! set \"app:layoutDescription=\"@xml/file\"");
+            Log.e(TAG, "CHECK: motion scene not set! set \"app:layoutDescription=\"@xml/file\"");
             return;
         }
         int startId = motionScene.getStartId();
@@ -1220,7 +1224,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
         while (it.hasNext()) {
             MotionScene.Transition next = it.next();
             if (next == this.mScene.mCurrentTransition) {
-                Log.v("MotionLayout", "CHECK: CURRENT");
+                Log.v(TAG, "CHECK: CURRENT");
             }
             checkStructure(next);
             int startConstraintSetId = next.getStartConstraintSetId();
@@ -1228,18 +1232,18 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             String name = Debug.getName(getContext(), startConstraintSetId);
             String name2 = Debug.getName(getContext(), endConstraintSetId);
             if (sparseIntArray.get(startConstraintSetId) == endConstraintSetId) {
-                Log.e("MotionLayout", "CHECK: two transitions with the same start and end " + name + "->" + name2);
+                Log.e(TAG, "CHECK: two transitions with the same start and end " + name + "->" + name2);
             }
             if (sparseIntArray2.get(endConstraintSetId) == startConstraintSetId) {
-                Log.e("MotionLayout", "CHECK: you can't have reverse transitions" + name + "->" + name2);
+                Log.e(TAG, "CHECK: you can't have reverse transitions" + name + "->" + name2);
             }
             sparseIntArray.put(startConstraintSetId, endConstraintSetId);
             sparseIntArray2.put(endConstraintSetId, startConstraintSetId);
             if (this.mScene.getConstraintSet(startConstraintSetId) == null) {
-                Log.e("MotionLayout", " no such constraintSetStart " + name);
+                Log.e(TAG, " no such constraintSetStart " + name);
             }
             if (this.mScene.getConstraintSet(endConstraintSetId) == null) {
-                Log.e("MotionLayout", " no such constraintSetEnd " + name);
+                Log.e(TAG, " no such constraintSetEnd " + name);
             }
         }
     }
@@ -1254,12 +1258,12 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
                 StringBuilder P = a.P("CHECK: ", name, " ALL VIEWS SHOULD HAVE ID's ");
                 P.append(childAt.getClass().getName());
                 P.append(" does not!");
-                Log.w("MotionLayout", P.toString());
+                Log.w(TAG, P.toString());
             }
             if (constraintSet.getConstraint(id2) == null) {
                 StringBuilder P2 = a.P("CHECK: ", name, " NO CONSTRAINTS for ");
                 P2.append(Debug.getName(childAt));
-                Log.w("MotionLayout", P2.toString());
+                Log.w(TAG, P2.toString());
             }
         }
         int[] knownIds = constraintSet.getKnownIds();
@@ -1267,13 +1271,13 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             int i4 = knownIds[i3];
             String name2 = Debug.getName(getContext(), i4);
             if (findViewById(knownIds[i3]) == null) {
-                Log.w("MotionLayout", "CHECK: " + name + " NO View matches id " + name2);
+                Log.w(TAG, "CHECK: " + name + " NO View matches id " + name2);
             }
             if (constraintSet.getHeight(i4) == -1) {
-                Log.w("MotionLayout", "CHECK: " + name + "(" + name2 + ") no LAYOUT_HEIGHT");
+                Log.w(TAG, "CHECK: " + name + "(" + name2 + ") no LAYOUT_HEIGHT");
             }
             if (constraintSet.getWidth(i4) == -1) {
-                Log.w("MotionLayout", "CHECK: " + name + "(" + name2 + ") no LAYOUT_HEIGHT");
+                Log.w(TAG, "CHECK: " + name + "(" + name2 + ") no LAYOUT_HEIGHT");
             }
         }
     }
@@ -1281,10 +1285,10 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
     private void checkStructure(MotionScene.Transition transition) {
         StringBuilder K = a.K("CHECK: transition = ");
         K.append(transition.debugString(getContext()));
-        Log.v("MotionLayout", K.toString());
-        Log.v("MotionLayout", "CHECK: transition.setDuration = " + transition.getDuration());
+        Log.v(TAG, K.toString());
+        Log.v(TAG, "CHECK: transition.setDuration = " + transition.getDuration());
         if (transition.getStartConstraintSetId() == transition.getEndConstraintSetId()) {
-            Log.e("MotionLayout", "CHECK: start and end constraint set should not be the same!");
+            Log.e(TAG, "CHECK: start and end constraint set should not be the same!");
         }
     }
 
@@ -1313,7 +1317,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             K.append(childAt.getLeft());
             K.append(" ");
             K.append(childAt.getTop());
-            Log.v("MotionLayout", K.toString());
+            Log.v(TAG, K.toString());
         }
     }
 
@@ -1452,7 +1456,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             }
             obtainStyledAttributes.recycle();
             if (this.mScene == null) {
-                Log.e("MotionLayout", "WARNING NO app:layoutDescription tag");
+                Log.e(TAG, "WARNING NO app:layoutDescription tag");
             }
             if (!z2) {
                 this.mScene = null;
@@ -1517,7 +1521,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
         }
         float staggered = this.mScene.getStaggered();
         if (staggered != 0.0f) {
-            boolean z3 = ((double) staggered) < 0.0d;
+            boolean z3 = ((double) staggered) < ShadowDrawableWrapper.COS_45;
             float abs = Math.abs(staggered);
             float f = -3.4028235E38f;
             float f2 = Float.MAX_VALUE;
@@ -1651,7 +1655,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
                 int i = this.mCurrentState;
                 K.append(i == -1 ? "undefined" : Debug.getState(this, i));
                 String sb = K.toString();
-                paint.setColor(-16777216);
+                paint.setColor(ViewCompat.MEASURED_STATE_MASK);
                 canvas.drawText(sb, 11.0f, (float) (getHeight() - 29), paint);
                 paint.setColor(-7864184);
                 canvas.drawText(sb, 10.0f, (float) (getHeight() - 30), paint);
@@ -1737,7 +1741,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
                     if (interpolator2 instanceof MotionInterpolator) {
                         float velocity = ((MotionInterpolator) interpolator2).getVelocity();
                         this.mLastVelocity = velocity;
-                        if (Math.abs(velocity) * this.mTransitionDuration <= 1.0E-5f) {
+                        if (Math.abs(velocity) * this.mTransitionDuration <= EPSILON) {
                             this.mInTransition = false;
                         }
                         if (velocity > 0.0f && f2 >= 1.0f) {
@@ -1762,7 +1766,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
                 }
                 f4 = f2;
             }
-            if (Math.abs(this.mLastVelocity) > 1.0E-5f) {
+            if (Math.abs(this.mLastVelocity) > EPSILON) {
                 setState(TransitionState.MOVING);
             }
             if ((i3 > 0 && f4 >= this.mTransitionGoalPosition) || (signum <= 0.0f && f4 <= this.mTransitionGoalPosition)) {
@@ -1887,7 +1891,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             this.lastY = y2;
             return;
         }
-        a.g0("WARNING could not find view id ", viewById == null ? a.j("", i) : viewById.getContext().getResources().getResourceName(i), "MotionLayout");
+        a.g0("WARNING could not find view id ", viewById == null ? a.j("", i) : viewById.getContext().getResources().getResourceName(i), TAG);
     }
 
     public ConstraintSet getConstraintSet(int i) {
@@ -1988,9 +1992,9 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
         float f5 = this.mTransitionLastPosition;
         if (this.mInterpolator != null) {
             float signum = Math.signum(this.mTransitionGoalPosition - f5);
-            float interpolation = this.mInterpolator.getInterpolation(this.mTransitionLastPosition + 1.0E-5f);
+            float interpolation = this.mInterpolator.getInterpolation(this.mTransitionLastPosition + EPSILON);
             float interpolation2 = this.mInterpolator.getInterpolation(this.mTransitionLastPosition);
-            f4 = (((interpolation - interpolation2) / 1.0E-5f) * signum) / this.mTransitionDuration;
+            f4 = (((interpolation - interpolation2) / EPSILON) * signum) / this.mTransitionDuration;
             f3 = interpolation2;
         } else {
             f3 = f5;
@@ -2350,7 +2354,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
 
     @Deprecated
     public void rebuildMotion() {
-        Log.e("MotionLayout", "This method is deprecated. Please call rebuildScene() instead.");
+        Log.e(TAG, "This method is deprecated. Please call rebuildScene() instead.");
         rebuildScene();
     }
 
@@ -2420,7 +2424,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
     public void setProgress(float f) {
         int i = (f > 0.0f ? 1 : (f == 0.0f ? 0 : -1));
         if (i < 0 || f > 1.0f) {
-            Log.w("MotionLayout", "Warning! Progress is defined for values between 0.0 and 1.0 inclusive");
+            Log.w(TAG, "Warning! Progress is defined for values between 0.0 and 1.0 inclusive");
         }
         if (!isAttachedToWindow()) {
             if (this.mStateCache == null) {
@@ -2545,7 +2549,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
             }
             this.mTransitionLastPosition = f2;
             if (Float.isNaN(f)) {
-                Log.v("MotionLayout", Debug.getLocation() + " transitionToStart ");
+                Log.v(TAG, Debug.getLocation() + " transitionToStart ");
                 transitionToStart();
                 return;
             }
@@ -2603,7 +2607,7 @@ public class MotionLayout extends ConstraintLayout implements NestedScrollingPar
     public void setTransitionDuration(int i) {
         MotionScene motionScene = this.mScene;
         if (motionScene == null) {
-            Log.e("MotionLayout", "MotionScene not defined");
+            Log.e(TAG, "MotionScene not defined");
         } else {
             motionScene.setDuration(i);
         }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionPaths.java b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionPaths.java
index 8ee8c79506..473f4f79cc 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionPaths.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionPaths.java
@@ -3,8 +3,11 @@ package androidx.constraintlayout.motion.widget;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.motion.utils.Easing;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.constraintlayout.widget.ConstraintAttribute;
 import androidx.constraintlayout.widget.ConstraintSet;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 public class MotionPaths implements Comparable<MotionPaths> {
@@ -20,7 +23,7 @@ public class MotionPaths implements Comparable<MotionPaths> {
     public static final int PERPENDICULAR = 1;
     public static final int SCREEN = 3;
     public static final String TAG = "MotionPaths";
-    public static String[] names = {"position", "x", "y", "width", "height", "pathRotate"};
+    public static String[] names = {ModelAuditLogEntry.CHANGE_KEY_POSITION, "x", "y", "width", "height", "pathRotate"};
     public LinkedHashMap<String, ConstraintAttribute> attributes;
     public float height;
     public int mDrawPath;
@@ -398,8 +401,9 @@ public class MotionPaths implements Comparable<MotionPaths> {
             if (i3 >= dArr4.length) {
                 break;
             }
-            double d = 0.0d;
-            if (!Double.isNaN(dArr4[i3]) || !(dArr3 == null || dArr3[i3] == 0.0d)) {
+            boolean isNaN = Double.isNaN(dArr4[i3]);
+            double d = ShadowDrawableWrapper.COS_45;
+            if (!isNaN || !(dArr3 == null || dArr3[i3] == ShadowDrawableWrapper.COS_45)) {
                 if (dArr3 != null) {
                     d = dArr3[i3];
                 }
@@ -450,7 +454,7 @@ public class MotionPaths implements Comparable<MotionPaths> {
         int i8 = i6 - i4;
         int i9 = i7 - i5;
         if ((i8 == view.getMeasuredWidth() && i9 == view.getMeasuredHeight()) ? false : true) {
-            view.measure(View.MeasureSpec.makeMeasureSpec(i8, 1073741824), View.MeasureSpec.makeMeasureSpec(i9, 1073741824));
+            view.measure(View.MeasureSpec.makeMeasureSpec(i8, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(i9, BasicMeasure.EXACTLY));
         }
         view.layout(i4, i5, i6, i7);
     }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
index 17808ff7bf..d9ce551ae6 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
@@ -24,6 +24,9 @@ import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.R;
 import androidx.constraintlayout.widget.StateSet;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -146,7 +149,7 @@ public class MotionScene {
                 if (motionLayout2 == null) {
                     StringBuilder K = a.K("OnClick could not find id ");
                     K.append(this.mTargetId);
-                    Log.e("MotionScene", K.toString());
+                    Log.e(MotionScene.TAG, K.toString());
                     return;
                 }
                 int access$100 = Transition.access$100(transition);
@@ -241,7 +244,7 @@ public class MotionScene {
                     if (findViewById == null) {
                         StringBuilder K = a.K(" (*)  could not find id ");
                         K.append(this.mTargetId);
-                        Log.e("MotionScene", K.toString());
+                        Log.e(MotionScene.TAG, K.toString());
                         return;
                     }
                     findViewById.setOnClickListener(null);
@@ -387,7 +390,7 @@ public class MotionScene {
                     } else if (i2 == 3) {
                         String string = typedArray.getString(index);
                         this.mDefaultInterpolatorString = string;
-                        if (string.indexOf("/") > 0) {
+                        if (string.indexOf(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN) > 0) {
                             this.mDefaultInterpolatorID = typedArray.getResourceId(index, -1);
                             this.mDefaultInterpolator = -2;
                         } else {
@@ -543,8 +546,8 @@ public class MotionScene {
 
     private int getId(Context context, String str) {
         int i;
-        if (str.contains("/")) {
-            i = context.getResources().getIdentifier(str.substring(str.indexOf(47) + 1), "id", context.getPackageName());
+        if (str.contains(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN)) {
+            i = context.getResources().getIdentifier(str.substring(str.indexOf(47) + 1), ModelAuditLogEntry.CHANGE_KEY_ID, context.getPackageName());
             if (this.DEBUG_DESKTOP) {
                 PrintStream printStream = System.out;
                 printStream.println("id getMap res = " + i);
@@ -558,7 +561,7 @@ public class MotionScene {
         if (str.length() > 1) {
             return Integer.parseInt(str.substring(1));
         }
-        Log.e("MotionScene", "error in parsing id");
+        Log.e(TAG, "error in parsing id");
         return i;
     }
 
@@ -654,7 +657,7 @@ public class MotionScene {
                                 c2 = 65535;
                                 break;
                             case 793277014:
-                                if (name.equals("MotionScene")) {
+                                if (name.equals(TAG)) {
                                     c2 = 0;
                                     break;
                                 }
@@ -699,7 +702,7 @@ public class MotionScene {
                                 if (transition == null) {
                                     String resourceEntryName = context.getResources().getResourceEntryName(i);
                                     int lineNumber = xml.getLineNumber();
-                                    Log.v("MotionScene", " OnSwipe (" + resourceEntryName + ".xml:" + lineNumber + ")");
+                                    Log.v(TAG, " OnSwipe (" + resourceEntryName + ".xml:" + lineNumber + ")");
                                 }
                                 Transition.access$202(transition, new TouchResponse(context, this.mMotionLayout, xml));
                                 continue;
@@ -716,7 +719,7 @@ public class MotionScene {
                                 Transition.access$1300(transition).add(new KeyFrames(context, xml));
                                 continue;
                             default:
-                                Log.v("MotionScene", "WARNING UNKNOWN ATTRIBUTE " + name);
+                                Log.v(TAG, "WARNING UNKNOWN ATTRIBUTE " + name);
                                 continue;
                         }
                     }
@@ -748,7 +751,7 @@ public class MotionScene {
             attributeName.hashCode();
             if (attributeName.equals("deriveConstraintsFrom")) {
                 i2 = getId(context, attributeValue);
-            } else if (attributeName.equals("id")) {
+            } else if (attributeName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 i = getId(context, attributeValue);
                 this.mConstraintSetIdMap.put(stripID(attributeValue), Integer.valueOf(i));
             }
@@ -788,7 +791,7 @@ public class MotionScene {
             if (constraintSet2 == null) {
                 StringBuilder K = a.K("ERROR! invalid deriveConstraintsFrom: @id/");
                 K.append(Debug.getName(this.mMotionLayout.getContext(), i2));
-                Log.e("MotionScene", K.toString());
+                Log.e(TAG, K.toString());
                 return;
             }
             constraintSet.readFallback(constraintSet2);
@@ -967,7 +970,7 @@ public class MotionScene {
         StringBuilder K2 = a.K("Warning could not find ConstraintSet id/");
         K2.append(Debug.getName(this.mMotionLayout.getContext(), i));
         K2.append(" In MotionScene");
-        Log.e("MotionScene", K2.toString());
+        Log.e(TAG, K2.toString());
         SparseArray<ConstraintSet> sparseArray = this.mConstraintSetMap;
         return sparseArray.get(sparseArray.keyAt(0));
     }
@@ -1265,7 +1268,7 @@ public class MotionScene {
             } else if (action == 2 && !this.mIgnoreTouch) {
                 float rawY = motionEvent.getRawY() - this.mLastTouchY;
                 float rawX = motionEvent.getRawX() - this.mLastTouchX;
-                if ((((double) rawX) != 0.0d || ((double) rawY) != 0.0d) && (motionEvent2 = this.mLastTouchDown) != null) {
+                if ((((double) rawX) != ShadowDrawableWrapper.COS_45 || ((double) rawY) != ShadowDrawableWrapper.COS_45) && (motionEvent2 = this.mLastTouchDown) != null) {
                     Transition bestTransitionFor = bestTransitionFor(i, rawX, rawY, motionEvent2);
                     if (bestTransitionFor != null) {
                         motionLayout.setTransition(bestTransitionFor);
@@ -1303,7 +1306,7 @@ public class MotionScene {
         for (int i = 0; i < this.mConstraintSetMap.size(); i++) {
             int keyAt = this.mConstraintSetMap.keyAt(i);
             if (hasCycleDependency(keyAt)) {
-                Log.e("MotionScene", "Cannot be derived from yourself");
+                Log.e(TAG, "Cannot be derived from yourself");
                 return;
             } else {
                 readConstraintChain(keyAt);
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/SplineSet.java b/app/src/main/java/androidx/constraintlayout/motion/widget/SplineSet.java
index 970dc35e4a..12c3613d2d 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/SplineSet.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/SplineSet.java
@@ -127,9 +127,9 @@ public abstract class SplineSet {
                     try {
                         method.invoke(view, Float.valueOf(get(f)));
                     } catch (IllegalAccessException e) {
-                        Log.e("SplineSet", "unable to setProgress", e);
+                        Log.e(SplineSet.TAG, "unable to setProgress", e);
                     } catch (InvocationTargetException e2) {
-                        Log.e("SplineSet", "unable to setProgress", e2);
+                        Log.e(SplineSet.TAG, "unable to setProgress", e2);
                     }
                 }
             }
@@ -253,31 +253,31 @@ public abstract class SplineSet {
         char c2 = 65535;
         switch (str.hashCode()) {
             case -1249320806:
-                if (str.equals("rotationX")) {
+                if (str.equals(Key.ROTATION_X)) {
                     c2 = 0;
                     break;
                 }
                 break;
             case -1249320805:
-                if (str.equals("rotationY")) {
+                if (str.equals(Key.ROTATION_Y)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case -1225497657:
-                if (str.equals("translationX")) {
+                if (str.equals(Key.TRANSLATION_X)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case -1225497656:
-                if (str.equals("translationY")) {
+                if (str.equals(Key.TRANSLATION_Y)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case -1225497655:
-                if (str.equals("translationZ")) {
+                if (str.equals(Key.TRANSLATION_Z)) {
                     c2 = 4;
                     break;
                 }
@@ -289,61 +289,61 @@ public abstract class SplineSet {
                 }
                 break;
             case -908189618:
-                if (str.equals("scaleX")) {
+                if (str.equals(Key.SCALE_X)) {
                     c2 = 6;
                     break;
                 }
                 break;
             case -908189617:
-                if (str.equals("scaleY")) {
+                if (str.equals(Key.SCALE_Y)) {
                     c2 = 7;
                     break;
                 }
                 break;
             case -797520672:
-                if (str.equals("waveVariesBy")) {
+                if (str.equals(Key.WAVE_VARIES_BY)) {
                     c2 = '\b';
                     break;
                 }
                 break;
             case -760884510:
-                if (str.equals("transformPivotX")) {
+                if (str.equals(Key.PIVOT_X)) {
                     c2 = '\t';
                     break;
                 }
                 break;
             case -760884509:
-                if (str.equals("transformPivotY")) {
+                if (str.equals(Key.PIVOT_Y)) {
                     c2 = '\n';
                     break;
                 }
                 break;
             case -40300674:
-                if (str.equals("rotation")) {
+                if (str.equals(Key.ROTATION)) {
                     c2 = 11;
                     break;
                 }
                 break;
             case -4379043:
-                if (str.equals("elevation")) {
+                if (str.equals(Key.ELEVATION)) {
                     c2 = '\f';
                     break;
                 }
                 break;
             case 37232917:
-                if (str.equals("transitionPathRotate")) {
+                if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                     c2 = '\r';
                     break;
                 }
                 break;
             case 92909918:
-                if (str.equals("alpha")) {
+                if (str.equals(Key.ALPHA)) {
                     c2 = 14;
                     break;
                 }
                 break;
             case 156108012:
-                if (str.equals("waveOffset")) {
+                if (str.equals(Key.WAVE_OFFSET)) {
                     c2 = 15;
                     break;
                 }
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/TimeCycleSplineSet.java b/app/src/main/java/androidx/constraintlayout/motion/widget/TimeCycleSplineSet.java
index 4a7f4877f4..8184ee3690 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/TimeCycleSplineSet.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/TimeCycleSplineSet.java
@@ -6,6 +6,7 @@ import android.view.View;
 import androidx.constraintlayout.motion.utils.CurveFit;
 import androidx.constraintlayout.widget.ConstraintAttribute;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -85,7 +86,7 @@ public abstract class TimeCycleSplineSet {
                 }
                 boolean z2 = this.mContinue;
                 float[] fArr3 = this.mTempValues;
-                this.mContinue = z2 | (((double) fArr3[i]) != 0.0d);
+                this.mContinue = z2 | (((double) fArr3[i]) != ShadowDrawableWrapper.COS_45);
                 fArr2[i] = (fArr3[i] * calcWave) + f3;
                 i++;
             }
@@ -169,9 +170,9 @@ public abstract class TimeCycleSplineSet {
                     try {
                         method.invoke(view, Float.valueOf(get(f, j, view, keyCache)));
                     } catch (IllegalAccessException e) {
-                        Log.e("SplineSet", "unable to setProgress", e);
+                        Log.e(TimeCycleSplineSet.TAG, "unable to setProgress", e);
                     } catch (InvocationTargetException e2) {
-                        Log.e("SplineSet", "unable to setProgress", e2);
+                        Log.e(TimeCycleSplineSet.TAG, "unable to setProgress", e2);
                     }
                 }
             }
@@ -305,31 +306,31 @@ public abstract class TimeCycleSplineSet {
         char c2 = 65535;
         switch (str.hashCode()) {
             case -1249320806:
-                if (str.equals("rotationX")) {
+                if (str.equals(Key.ROTATION_X)) {
                     c2 = 0;
                     break;
                 }
                 break;
             case -1249320805:
-                if (str.equals("rotationY")) {
+                if (str.equals(Key.ROTATION_Y)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case -1225497657:
-                if (str.equals("translationX")) {
+                if (str.equals(Key.TRANSLATION_X)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case -1225497656:
-                if (str.equals("translationY")) {
+                if (str.equals(Key.TRANSLATION_Y)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case -1225497655:
-                if (str.equals("translationZ")) {
+                if (str.equals(Key.TRANSLATION_Z)) {
                     c2 = 4;
                     break;
                 }
@@ -341,37 +342,37 @@ public abstract class TimeCycleSplineSet {
                 }
                 break;
             case -908189618:
-                if (str.equals("scaleX")) {
+                if (str.equals(Key.SCALE_X)) {
                     c2 = 6;
                     break;
                 }
                 break;
             case -908189617:
-                if (str.equals("scaleY")) {
+                if (str.equals(Key.SCALE_Y)) {
                     c2 = 7;
                     break;
                 }
                 break;
             case -40300674:
-                if (str.equals("rotation")) {
+                if (str.equals(Key.ROTATION)) {
                     c2 = '\b';
                     break;
                 }
                 break;
             case -4379043:
-                if (str.equals("elevation")) {
+                if (str.equals(Key.ELEVATION)) {
                     c2 = '\t';
                     break;
                 }
                 break;
             case 37232917:
-                if (str.equals("transitionPathRotate")) {
+                if (str.equals(Key.TRANSITION_PATH_ROTATE)) {
                     c2 = '\n';
                     break;
                 }
                 break;
             case 92909918:
-                if (str.equals("alpha")) {
+                if (str.equals(Key.ALPHA)) {
                     c2 = 11;
                     break;
                 }
@@ -503,7 +504,7 @@ public abstract class TimeCycleSplineSet {
         if (i2 == 0) {
             StringBuilder K = a.K("Error no points added to ");
             K.append(this.mType);
-            Log.e("SplineSet", K.toString());
+            Log.e(TAG, K.toString());
             return;
         }
         Sort.doubleQuickSort(this.mTimePoints, this.mValues, 0, i2 - 1);
diff --git a/app/src/main/java/androidx/constraintlayout/motion/widget/TouchResponse.java b/app/src/main/java/androidx/constraintlayout/motion/widget/TouchResponse.java
index cc5c871feb..06bd73317d 100644
--- a/app/src/main/java/androidx/constraintlayout/motion/widget/TouchResponse.java
+++ b/app/src/main/java/androidx/constraintlayout/motion/widget/TouchResponse.java
@@ -387,7 +387,7 @@ public class TouchResponse {
             if (view == null) {
                 StringBuilder K = a.K("cannot find TouchAnchorId @id/");
                 K.append(Debug.getName(this.mMotionLayout.getContext(), this.mTouchAnchorId));
-                Log.e("TouchResponse", K.toString());
+                Log.e(TAG, K.toString());
             }
         } else {
             view = null;
diff --git a/app/src/main/java/androidx/constraintlayout/solver/LinearSystem.java b/app/src/main/java/androidx/constraintlayout/solver/LinearSystem.java
index 8691b084d6..b15c9fde44 100644
--- a/app/src/main/java/androidx/constraintlayout/solver/LinearSystem.java
+++ b/app/src/main/java/androidx/constraintlayout/solver/LinearSystem.java
@@ -4,6 +4,7 @@ import androidx.constraintlayout.solver.SolverVariable;
 import androidx.constraintlayout.solver.widgets.ConstraintAnchor;
 import androidx.constraintlayout.solver.widgets.ConstraintWidget;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -868,11 +869,11 @@ public class LinearSystem {
         K.append(getDisplaySize(i3));
         K.append(" rows: ");
         K.append(this.mNumRows);
-        K.append("/");
+        K.append(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         K.append(this.mMaxRows);
         K.append(" cols: ");
         K.append(this.mNumColumns);
-        K.append("/");
+        K.append(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         K.append(this.mMaxColumns);
         K.append(" ");
         K.append(0);
diff --git a/app/src/main/java/androidx/constraintlayout/solver/SolverVariable.java b/app/src/main/java/androidx/constraintlayout/solver/SolverVariable.java
index df7f656eaf..6f37094087 100644
--- a/app/src/main/java/androidx/constraintlayout/solver/SolverVariable.java
+++ b/app/src/main/java/androidx/constraintlayout/solver/SolverVariable.java
@@ -1,5 +1,7 @@
 package androidx.constraintlayout.solver;
 
+import androidx.exifinterface.media.ExifInterface;
+import c.a.r.n0.c.e;
 import c.d.b.a.a;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -135,19 +137,19 @@ public class SolverVariable {
             K3.append(i2);
             return K3.toString();
         } else if (ordinal == 2) {
-            StringBuilder K4 = a.K("S");
+            StringBuilder K4 = a.K(ExifInterface.LATITUDE_SOUTH);
             int i3 = uniqueSlackId + 1;
             uniqueSlackId = i3;
             K4.append(i3);
             return K4.toString();
         } else if (ordinal == 3) {
-            StringBuilder K5 = a.K("e");
+            StringBuilder K5 = a.K(e.a);
             int i4 = uniqueErrorId + 1;
             uniqueErrorId = i4;
             K5.append(i4);
             return K5.toString();
         } else if (ordinal == 4) {
-            StringBuilder K6 = a.K("V");
+            StringBuilder K6 = a.K(ExifInterface.GPS_MEASUREMENT_INTERRUPTED);
             int i5 = uniqueId + 1;
             uniqueId = i5;
             K6.append(i5);
diff --git a/app/src/main/java/androidx/constraintlayout/solver/widgets/ConstraintWidget.java b/app/src/main/java/androidx/constraintlayout/solver/widgets/ConstraintWidget.java
index b453177587..139dc7c889 100644
--- a/app/src/main/java/androidx/constraintlayout/solver/widgets/ConstraintWidget.java
+++ b/app/src/main/java/androidx/constraintlayout/solver/widgets/ConstraintWidget.java
@@ -10,6 +10,7 @@ import androidx.constraintlayout.solver.widgets.analyzer.DependencyNode;
 import androidx.constraintlayout.solver.widgets.analyzer.HorizontalWidgetRun;
 import androidx.constraintlayout.solver.widgets.analyzer.VerticalWidgetRun;
 import androidx.constraintlayout.solver.widgets.analyzer.WidgetRun;
+import androidx.exifinterface.media.ExifInterface;
 import c.d.b.a.a;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -2668,7 +2669,7 @@ public class ConstraintWidget {
         int i2 = 0;
         if (indexOf > 0 && indexOf < length - 1) {
             String substring = str.substring(0, indexOf);
-            if (substring.equalsIgnoreCase("W")) {
+            if (substring.equalsIgnoreCase(ExifInterface.LONGITUDE_WEST)) {
                 i = 0;
             } else if (substring.equalsIgnoreCase("H")) {
                 i = 1;
diff --git a/app/src/main/java/androidx/constraintlayout/solver/widgets/analyzer/DependencyGraph.java b/app/src/main/java/androidx/constraintlayout/solver/widgets/analyzer/DependencyGraph.java
index 71a8fca7f6..3088f202b6 100644
--- a/app/src/main/java/androidx/constraintlayout/solver/widgets/analyzer/DependencyGraph.java
+++ b/app/src/main/java/androidx/constraintlayout/solver/widgets/analyzer/DependencyGraph.java
@@ -8,6 +8,7 @@ import androidx.constraintlayout.solver.widgets.Guideline;
 import androidx.constraintlayout.solver.widgets.HelperWidget;
 import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -469,7 +470,7 @@ public class DependencyGraph {
         if (runGroup != null) {
             StringBuilder K = a.K(" [");
             K.append(runGroup.groupIndex + 1);
-            K.append("/");
+            K.append(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
             str2 = a.w(K, RunGroup.index, "]");
         } else {
             str2 = "";
diff --git a/app/src/main/java/androidx/constraintlayout/widget/ConstraintAttribute.java b/app/src/main/java/androidx/constraintlayout/widget/ConstraintAttribute.java
index 1a4e47e5d4..58a7f062ca 100644
--- a/app/src/main/java/androidx/constraintlayout/widget/ConstraintAttribute.java
+++ b/app/src/main/java/androidx/constraintlayout/widget/ConstraintAttribute.java
@@ -10,6 +10,7 @@ import android.util.TypedValue;
 import android.util.Xml;
 import android.view.View;
 import androidx.constraintlayout.motion.widget.Debug;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -204,22 +205,22 @@ public class ConstraintAttribute {
                         continue;
                 }
             } catch (NoSuchMethodException e) {
-                Log.e("TransitionLayout", e.getMessage());
-                Log.e("TransitionLayout", " Custom Attribute \"" + str + "\" not found on " + cls.getName());
+                Log.e(TAG, e.getMessage());
+                Log.e(TAG, " Custom Attribute \"" + str + "\" not found on " + cls.getName());
                 StringBuilder sb = new StringBuilder();
                 sb.append(cls.getName());
                 sb.append(" must have a method ");
                 sb.append(s2);
-                Log.e("TransitionLayout", sb.toString());
+                Log.e(TAG, sb.toString());
             } catch (IllegalAccessException e2) {
                 StringBuilder P = a.P(" Custom Attribute \"", str, "\" not found on ");
                 P.append(cls.getName());
-                Log.e("TransitionLayout", P.toString());
+                Log.e(TAG, P.toString());
                 e2.printStackTrace();
             } catch (InvocationTargetException e3) {
                 StringBuilder P2 = a.P(" Custom Attribute \"", str, "\" not found on ");
                 P2.append(cls.getName());
-                Log.e("TransitionLayout", P2.toString());
+                Log.e(TAG, P2.toString());
                 e3.printStackTrace();
             }
         }
@@ -372,13 +373,13 @@ public class ConstraintAttribute {
             StringBuilder P = a.P("no method ", sb, "on View \"");
             P.append(Debug.getName(view));
             P.append("\"");
-            Log.e("TransitionLayout", P.toString());
+            Log.e(TAG, P.toString());
             e.printStackTrace();
         } catch (IllegalAccessException e2) {
             StringBuilder P2 = a.P("cannot access method ", sb, "on View \"");
             P2.append(Debug.getName(view));
             P2.append("\"");
-            Log.e("TransitionLayout", P2.toString());
+            Log.e(TAG, P2.toString());
             e2.printStackTrace();
         } catch (InvocationTargetException e3) {
             e3.printStackTrace();
@@ -428,7 +429,7 @@ public class ConstraintAttribute {
             case 3:
                 int HSVToColor = Color.HSVToColor(fArr);
                 this.mColorValue = HSVToColor;
-                this.mColorValue = (clamp((int) (fArr[3] * 255.0f)) << 24) | (HSVToColor & 16777215);
+                this.mColorValue = (clamp((int) (fArr[3] * 255.0f)) << 24) | (HSVToColor & ViewCompat.MEASURED_SIZE_MASK);
                 return;
             case 4:
                 throw new RuntimeException("Color does not have a single color to interpolate");
diff --git a/app/src/main/java/androidx/constraintlayout/widget/ConstraintHelper.java b/app/src/main/java/androidx/constraintlayout/widget/ConstraintHelper.java
index 3a936c8571..a2ee536795 100644
--- a/app/src/main/java/androidx/constraintlayout/widget/ConstraintHelper.java
+++ b/app/src/main/java/androidx/constraintlayout/widget/ConstraintHelper.java
@@ -18,6 +18,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.R;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Arrays;
 import java.util.HashMap;
 public abstract class ConstraintHelper extends View {
@@ -175,7 +176,7 @@ public abstract class ConstraintHelper extends View {
             } catch (Exception unused) {
             }
         }
-        return i == 0 ? this.myContext.getResources().getIdentifier(str, "id", this.myContext.getPackageName()) : i;
+        return i == 0 ? this.myContext.getResources().getIdentifier(str, ModelAuditLogEntry.CHANGE_KEY_ID, this.myContext.getPackageName()) : i;
     }
 
     public void addView(View view) {
diff --git a/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayout.java b/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayout.java
index 8fca7bfca0..63750443ef 100644
--- a/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayout.java
+++ b/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayout.java
@@ -23,6 +23,10 @@ import androidx.constraintlayout.solver.widgets.Guideline;
 import androidx.constraintlayout.solver.widgets.Optimizer;
 import androidx.constraintlayout.solver.widgets.VirtualLayout;
 import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.ViewCompat;
+import androidx.exifinterface.media.ExifInterface;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.util.ArrayList;
 import java.util.HashMap;
 public class ConstraintLayout extends ViewGroup {
@@ -485,7 +489,7 @@ public class ConstraintLayout extends ViewGroup {
                         int i4 = obtainStyledAttributes.getInt(index, 0);
                         this.matchConstraintDefaultWidth = i4;
                         if (i4 == 1) {
-                            Log.e("ConstraintLayout", "layout_constraintWidth_default=\"wrap\" is deprecated.\nUse layout_width=\"WRAP_CONTENT\" and layout_constrainedWidth=\"true\" instead.");
+                            Log.e(ConstraintLayout.TAG, "layout_constraintWidth_default=\"wrap\" is deprecated.\nUse layout_width=\"WRAP_CONTENT\" and layout_constrainedWidth=\"true\" instead.");
                             break;
                         } else {
                             break;
@@ -494,7 +498,7 @@ public class ConstraintLayout extends ViewGroup {
                         int i5 = obtainStyledAttributes.getInt(index, 0);
                         this.matchConstraintDefaultHeight = i5;
                         if (i5 == 1) {
-                            Log.e("ConstraintLayout", "layout_constraintHeight_default=\"wrap\" is deprecated.\nUse layout_height=\"WRAP_CONTENT\" and layout_constrainedHeight=\"true\" instead.");
+                            Log.e(ConstraintLayout.TAG, "layout_constraintHeight_default=\"wrap\" is deprecated.\nUse layout_height=\"WRAP_CONTENT\" and layout_constrainedHeight=\"true\" instead.");
                             break;
                         } else {
                             break;
@@ -569,7 +573,7 @@ public class ConstraintLayout extends ViewGroup {
                                         i = 0;
                                     } else {
                                         String substring = this.dimensionRatio.substring(0, indexOf);
-                                        if (substring.equalsIgnoreCase("W")) {
+                                        if (substring.equalsIgnoreCase(ExifInterface.LONGITUDE_WEST)) {
                                             this.dimensionRatioSide = 0;
                                         } else if (substring.equalsIgnoreCase("H")) {
                                             this.dimensionRatioSide = 1;
@@ -1006,7 +1010,7 @@ public class ConstraintLayout extends ViewGroup {
                     View view = (View) constraintWidget.getCompanionWidget();
                     int ordinal = dimensionBehaviour.ordinal();
                     if (ordinal == 0) {
-                        i = View.MeasureSpec.makeMeasureSpec(i8, 1073741824);
+                        i = View.MeasureSpec.makeMeasureSpec(i8, BasicMeasure.EXACTLY);
                     } else if (ordinal == 1) {
                         i = ViewGroup.getChildMeasureSpec(this.layoutWidthSpec, i11, -2);
                     } else if (ordinal != 2) {
@@ -1017,13 +1021,13 @@ public class ConstraintLayout extends ViewGroup {
                         int i12 = measure.measureStrategy;
                         if (i12 == BasicMeasure.Measure.TRY_GIVEN_DIMENSIONS || i12 == BasicMeasure.Measure.USE_GIVEN_DIMENSIONS) {
                             if (measure.measureStrategy == BasicMeasure.Measure.USE_GIVEN_DIMENSIONS || !z2 || (z2 && (view.getMeasuredHeight() == constraintWidget.getHeight())) || (view instanceof Placeholder) || constraintWidget.isResolvedHorizontally()) {
-                                i = View.MeasureSpec.makeMeasureSpec(constraintWidget.getWidth(), 1073741824);
+                                i = View.MeasureSpec.makeMeasureSpec(constraintWidget.getWidth(), BasicMeasure.EXACTLY);
                             }
                         }
                     }
                     int ordinal2 = dimensionBehaviour2.ordinal();
                     if (ordinal2 == 0) {
-                        i2 = View.MeasureSpec.makeMeasureSpec(i9, 1073741824);
+                        i2 = View.MeasureSpec.makeMeasureSpec(i9, BasicMeasure.EXACTLY);
                     } else if (ordinal2 == 1) {
                         i2 = ViewGroup.getChildMeasureSpec(this.layoutHeightSpec, i10, -2);
                     } else if (ordinal2 != 2) {
@@ -1034,7 +1038,7 @@ public class ConstraintLayout extends ViewGroup {
                         int i13 = measure.measureStrategy;
                         if (i13 == BasicMeasure.Measure.TRY_GIVEN_DIMENSIONS || i13 == BasicMeasure.Measure.USE_GIVEN_DIMENSIONS) {
                             if (measure.measureStrategy == BasicMeasure.Measure.USE_GIVEN_DIMENSIONS || !z3 || (z3 && (view.getMeasuredWidth() == constraintWidget.getWidth())) || (view instanceof Placeholder) || constraintWidget.isResolvedVertically()) {
-                                i2 = View.MeasureSpec.makeMeasureSpec(constraintWidget.getHeight(), 1073741824);
+                                i2 = View.MeasureSpec.makeMeasureSpec(constraintWidget.getHeight(), BasicMeasure.EXACTLY);
                             }
                         }
                     }
@@ -1094,9 +1098,9 @@ public class ConstraintLayout extends ViewGroup {
                                 }
                             }
                             if (!(measuredWidth == i3 && measuredHeight == i5)) {
-                                int makeMeasureSpec = measuredWidth != i3 ? View.MeasureSpec.makeMeasureSpec(i3, 1073741824) : i7;
+                                int makeMeasureSpec = measuredWidth != i3 ? View.MeasureSpec.makeMeasureSpec(i3, BasicMeasure.EXACTLY) : i7;
                                 if (measuredHeight != i5) {
-                                    i2 = View.MeasureSpec.makeMeasureSpec(i5, 1073741824);
+                                    i2 = View.MeasureSpec.makeMeasureSpec(i5, BasicMeasure.EXACTLY);
                                 }
                                 view.measure(makeMeasureSpec, i2);
                                 constraintWidget.setLastMeasureSpec(makeMeasureSpec, i2);
@@ -1528,7 +1532,7 @@ public class ConstraintLayout extends ViewGroup {
                         int i3 = (int) ((((float) parseInt) / 1080.0f) * width);
                         int i4 = (int) ((((float) parseInt2) / 1920.0f) * height);
                         Paint paint = new Paint();
-                        paint.setColor(-65536);
+                        paint.setColor(SupportMenu.CATEGORY_MASK);
                         float f = (float) i3;
                         float f2 = (float) i4;
                         float f3 = (float) (i3 + ((int) ((((float) parseInt3) / 1080.0f) * width)));
@@ -1755,8 +1759,11 @@ public class ConstraintLayout extends ViewGroup {
         Measurer measurer = this.mMeasurer;
         int i5 = measurer.paddingHeight;
         int resolveSizeAndState = ViewGroup.resolveSizeAndState(i3 + measurer.paddingWidth, i, 0);
-        int min = Math.min(this.mMaxWidth, resolveSizeAndState & 16777215);
-        int min2 = Math.min(this.mMaxHeight, ViewGroup.resolveSizeAndState(i4 + i5, i2, 0) & 16777215);
+        int resolveSizeAndState2 = ViewGroup.resolveSizeAndState(i4 + i5, i2, 0);
+        int i6 = resolveSizeAndState & ViewCompat.MEASURED_SIZE_MASK;
+        int i7 = resolveSizeAndState2 & ViewCompat.MEASURED_SIZE_MASK;
+        int min = Math.min(this.mMaxWidth, i6);
+        int min2 = Math.min(this.mMaxHeight, i7);
         if (z2) {
             min |= 16777216;
         }
@@ -1797,7 +1804,7 @@ public class ConstraintLayout extends ViewGroup {
                 this.mDesignIds = new HashMap<>();
             }
             String str = (String) obj;
-            int indexOf = str.indexOf("/");
+            int indexOf = str.indexOf(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
             if (indexOf != -1) {
                 str = str.substring(indexOf + 1);
             }
diff --git a/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayoutStates.java b/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayoutStates.java
index d205ac5c8e..43da99acaa 100644
--- a/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayoutStates.java
+++ b/app/src/main/java/androidx/constraintlayout/widget/ConstraintLayoutStates.java
@@ -6,6 +6,8 @@ import android.content.res.XmlResourceParser;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.Xml;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.IOException;
 import java.util.ArrayList;
 import org.xmlpull.v1.XmlPullParser;
@@ -189,9 +191,9 @@ public class ConstraintLayoutStates {
         ConstraintSet constraintSet = new ConstraintSet();
         int attributeCount = xmlPullParser.getAttributeCount();
         for (int i = 0; i < attributeCount; i++) {
-            if ("id".equals(xmlPullParser.getAttributeName(i))) {
+            if (ModelAuditLogEntry.CHANGE_KEY_ID.equals(xmlPullParser.getAttributeName(i))) {
                 String attributeValue = xmlPullParser.getAttributeValue(i);
-                int identifier = attributeValue.contains("/") ? context.getResources().getIdentifier(attributeValue.substring(attributeValue.indexOf(47) + 1), "id", context.getPackageName()) : -1;
+                int identifier = attributeValue.contains(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN) ? context.getResources().getIdentifier(attributeValue.substring(attributeValue.indexOf(47) + 1), ModelAuditLogEntry.CHANGE_KEY_ID, context.getPackageName()) : -1;
                 if (identifier == -1) {
                     if (attributeValue.length() > 1) {
                         identifier = Integer.parseInt(attributeValue.substring(1));
diff --git a/app/src/main/java/androidx/constraintlayout/widget/ConstraintSet.java b/app/src/main/java/androidx/constraintlayout/widget/ConstraintSet.java
index c2cd00b5d5..46dd1ff141 100644
--- a/app/src/main/java/androidx/constraintlayout/widget/ConstraintSet.java
+++ b/app/src/main/java/androidx/constraintlayout/widget/ConstraintSet.java
@@ -22,6 +22,8 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Constraints;
 import androidx.constraintlayout.widget.R;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -840,7 +842,7 @@ public class ConstraintSet {
                                                     this.heightPercent = obtainStyledAttributes.getFloat(index, 1.0f);
                                                     continue;
                                                 case 71:
-                                                    Log.e("ConstraintSet", "CURRENTLY UNSUPPORTED");
+                                                    Log.e(ConstraintSet.TAG, "CURRENTLY UNSUPPORTED");
                                                     continue;
                                                 case 72:
                                                     this.mBarrierDirection = obtainStyledAttributes.getInt(index, this.mBarrierDirection);
@@ -859,7 +861,7 @@ public class ConstraintSet {
                                                     K.append(Integer.toHexString(index));
                                                     K.append("   ");
                                                     K.append(mapToConstant.get(index));
-                                                    Log.w("ConstraintSet", K.toString());
+                                                    Log.w(ConstraintSet.TAG, K.toString());
                                                     continue;
                                                 case 77:
                                                     this.mConstraintTag = obtainStyledAttributes.getString(index);
@@ -869,7 +871,7 @@ public class ConstraintSet {
                                                     K2.append(Integer.toHexString(index));
                                                     K2.append("   ");
                                                     K2.append(mapToConstant.get(index));
-                                                    Log.w("ConstraintSet", K2.toString());
+                                                    Log.w(ConstraintSet.TAG, K2.toString());
                                                     continue;
                                                     continue;
                                                     continue;
@@ -1231,7 +1233,7 @@ public class ConstraintSet {
                 i = 0;
             }
             if (i == 0) {
-                i = context.getResources().getIdentifier(trim, "id", context.getPackageName());
+                i = context.getResources().getIdentifier(trim, ModelAuditLogEntry.CHANGE_KEY_ID, context.getPackageName());
             }
             if (i == 0 && view.isInEditMode() && (view.getParent() instanceof ConstraintLayout) && (designInformation = ((ConstraintLayout) view.getParent()).getDesignInformation(0, trim)) != null && (designInformation instanceof Integer)) {
                 i = ((Integer) designInformation).intValue();
@@ -1581,7 +1583,7 @@ public class ConstraintSet {
                     constraint.layout.heightPercent = typedArray.getFloat(index, 1.0f);
                     break;
                 case 71:
-                    Log.e("ConstraintSet", "CURRENTLY UNSUPPORTED");
+                    Log.e(TAG, "CURRENTLY UNSUPPORTED");
                     break;
                 case 72:
                     Layout layout49 = constraint.layout;
@@ -1626,14 +1628,14 @@ public class ConstraintSet {
                     K.append(Integer.toHexString(index));
                     K.append("   ");
                     K.append(mapToConstant.get(index));
-                    Log.w("ConstraintSet", K.toString());
+                    Log.w(TAG, K.toString());
                     break;
                 default:
                     StringBuilder K2 = a.K("Unknown attribute 0x");
                     K2.append(Integer.toHexString(index));
                     K2.append("   ");
                     K2.append(mapToConstant.get(index));
-                    Log.w("ConstraintSet", K2.toString());
+                    Log.w(TAG, K2.toString());
                     break;
             }
         }
@@ -1734,7 +1736,7 @@ public class ConstraintSet {
             if (!this.mConstraints.containsKey(Integer.valueOf(id2))) {
                 StringBuilder K = a.K("id unknown ");
                 K.append(Debug.getName(childAt));
-                Log.v("ConstraintSet", K.toString());
+                Log.v(TAG, K.toString());
             } else if (this.mForceId && id2 == -1) {
                 throw new RuntimeException("All children of ConstraintLayout must have ids to use ConstraintSet");
             } else if (this.mConstraints.containsKey(Integer.valueOf(id2))) {
@@ -1768,7 +1770,7 @@ public class ConstraintSet {
             if (!this.mConstraints.containsKey(Integer.valueOf(id2))) {
                 StringBuilder K = a.K("id unknown ");
                 K.append(Debug.getName(childAt));
-                Log.w("ConstraintSet", K.toString());
+                Log.w(TAG, K.toString());
             } else if (this.mForceId && id2 == -1) {
                 throw new RuntimeException("All children of ConstraintLayout must have ids to use ConstraintSet");
             } else if (id2 != -1) {
@@ -1828,7 +1830,7 @@ public class ConstraintSet {
                         childAt.setElevation(transform.elevation);
                     }
                 } else {
-                    Log.v("ConstraintSet", "WARNING NO CONSTRAINTS for view " + id2);
+                    Log.v(TAG, "WARNING NO CONSTRAINTS for view " + id2);
                 }
             }
         }
@@ -2029,7 +2031,7 @@ public class ConstraintSet {
                 constraint.transform.scaleY = childAt.getScaleY();
                 float pivotX = childAt.getPivotX();
                 float pivotY = childAt.getPivotY();
-                if (!(((double) pivotX) == 0.0d && ((double) pivotY) == 0.0d)) {
+                if (!(((double) pivotX) == ShadowDrawableWrapper.COS_45 && ((double) pivotY) == ShadowDrawableWrapper.COS_45)) {
                     Transform transform = constraint.transform;
                     transform.transformPivotX = pivotX;
                     transform.transformPivotY = pivotY;
@@ -2606,42 +2608,42 @@ public class ConstraintSet {
                                     constraint2.propertySet.fillFromAttributeList(context, Xml.asAttributeSet(xmlPullParser));
                                     break;
                                 } else {
-                                    throw new RuntimeException("XML parser error must be within a Constraint " + xmlPullParser.getLineNumber());
+                                    throw new RuntimeException(ERROR_MESSAGE + xmlPullParser.getLineNumber());
                                 }
                             case 4:
                                 if (constraint2 != null) {
                                     constraint2.transform.fillFromAttributeList(context, Xml.asAttributeSet(xmlPullParser));
                                     break;
                                 } else {
-                                    throw new RuntimeException("XML parser error must be within a Constraint " + xmlPullParser.getLineNumber());
+                                    throw new RuntimeException(ERROR_MESSAGE + xmlPullParser.getLineNumber());
                                 }
                             case 5:
                                 if (constraint2 != null) {
                                     constraint2.layout.fillFromAttributeList(context, Xml.asAttributeSet(xmlPullParser));
                                     break;
                                 } else {
-                                    throw new RuntimeException("XML parser error must be within a Constraint " + xmlPullParser.getLineNumber());
+                                    throw new RuntimeException(ERROR_MESSAGE + xmlPullParser.getLineNumber());
                                 }
                             case 6:
                                 if (constraint2 != null) {
                                     constraint2.motion.fillFromAttributeList(context, Xml.asAttributeSet(xmlPullParser));
                                     break;
                                 } else {
-                                    throw new RuntimeException("XML parser error must be within a Constraint " + xmlPullParser.getLineNumber());
+                                    throw new RuntimeException(ERROR_MESSAGE + xmlPullParser.getLineNumber());
                                 }
                             case 7:
                                 if (constraint2 != null) {
                                     ConstraintAttribute.parse(context, xmlPullParser, constraint2.mCustomConstraints);
                                     break;
                                 } else {
-                                    throw new RuntimeException("XML parser error must be within a Constraint " + xmlPullParser.getLineNumber());
+                                    throw new RuntimeException(ERROR_MESSAGE + xmlPullParser.getLineNumber());
                                 }
                         }
                     } else if (eventType != 3) {
                         continue;
                     } else {
                         String name2 = xmlPullParser.getName();
-                        if (!"ConstraintSet".equals(name2)) {
+                        if (!TAG.equals(name2)) {
                             if (name2.equalsIgnoreCase("Constraint")) {
                                 this.mConstraints.put(Integer.valueOf(constraint2.mViewId), constraint2);
                                 constraint2 = null;
@@ -2667,7 +2669,7 @@ public class ConstraintSet {
         for (int i = 0; i < split.length; i++) {
             String[] split2 = split[i].split("=");
             if (split2.length != 2) {
-                a.i0(a.K(" Unable to parse "), split[i], "ConstraintSet");
+                a.i0(a.K(" Unable to parse "), split[i], TAG);
             } else {
                 Constraint.access$600(constraint, split2[0], Color.parseColor(split2[1]));
             }
@@ -2679,7 +2681,7 @@ public class ConstraintSet {
         for (int i = 0; i < split.length; i++) {
             String[] split2 = split[i].split("=");
             if (split2.length != 2) {
-                a.i0(a.K(" Unable to parse "), split[i], "ConstraintSet");
+                a.i0(a.K(" Unable to parse "), split[i], TAG);
             } else {
                 Constraint.access$700(constraint, split2[0], Float.parseFloat(split2[1]));
             }
@@ -2691,7 +2693,7 @@ public class ConstraintSet {
         for (int i = 0; i < split.length; i++) {
             String[] split2 = split[i].split("=");
             if (split2.length != 2) {
-                a.i0(a.K(" Unable to parse "), split[i], "ConstraintSet");
+                a.i0(a.K(" Unable to parse "), split[i], TAG);
             } else {
                 Constraint.access$700(constraint, split2[0], (float) Integer.decode(split2[1]).intValue());
             }
@@ -2702,7 +2704,7 @@ public class ConstraintSet {
         String[] splitString = splitString(str);
         for (int i = 0; i < splitString.length; i++) {
             String[] split = splitString[i].split("=");
-            a.i0(a.K(" Unable to parse "), splitString[i], "ConstraintSet");
+            a.i0(a.K(" Unable to parse "), splitString[i], TAG);
             Constraint.access$800(constraint, split[0], split[1]);
         }
     }
@@ -2747,7 +2749,7 @@ public class ConstraintSet {
                     constraint.transform.scaleY = childAt.getScaleY();
                     float pivotX = childAt.getPivotX();
                     float pivotY = childAt.getPivotY();
-                    if (!(((double) pivotX) == 0.0d && ((double) pivotY) == 0.0d)) {
+                    if (!(((double) pivotX) == ShadowDrawableWrapper.COS_45 && ((double) pivotY) == ShadowDrawableWrapper.COS_45)) {
                         Transform transform2 = constraint.transform;
                         transform2.transformPivotX = pivotX;
                         transform2.transformPivotY = pivotY;
diff --git a/app/src/main/java/androidx/constraintlayout/widget/Constraints.java b/app/src/main/java/androidx/constraintlayout/widget/Constraints.java
index fd44fa3abf..11e84e8fb4 100644
--- a/app/src/main/java/androidx/constraintlayout/widget/Constraints.java
+++ b/app/src/main/java/androidx/constraintlayout/widget/Constraints.java
@@ -127,7 +127,7 @@ public class Constraints extends ViewGroup {
     }
 
     private void init(AttributeSet attributeSet) {
-        Log.v("Constraints", " ################# init");
+        Log.v(TAG, " ################# init");
     }
 
     @Override // android.view.ViewGroup
diff --git a/app/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java b/app/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java
index 0f2aa8c9ce..c319ee8a0a 100644
--- a/app/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java
+++ b/app/src/main/java/androidx/coordinatorlayout/widget/CoordinatorLayout.java
@@ -45,6 +45,8 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.customview.view.AbsSavedState;
 import c.d.b.a.a;
+import com.google.android.material.badge.BadgeDrawable;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Constructor;
@@ -129,10 +131,10 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen
 
         @ColorInt
         public int getScrimColor(@NonNull CoordinatorLayout coordinatorLayout, @NonNull V v) {
-            return -16777216;
+            return ViewCompat.MEASURED_STATE_MASK;
         }
 
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         public float getScrimOpacity(@NonNull CoordinatorLayout coordinatorLayout, @NonNull V v) {
             return 0.0f;
         }
@@ -718,12 +720,12 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen
     private int getKeyline(int i) {
         int[] iArr = this.mKeylines;
         if (iArr == null) {
-            Log.e("CoordinatorLayout", "No keylines defined for " + this + " - attempted index lookup " + i);
+            Log.e(TAG, "No keylines defined for " + this + " - attempted index lookup " + i);
             return 0;
         } else if (i >= 0 && i < iArr.length) {
             return iArr[i];
         } else {
-            Log.e("CoordinatorLayout", "Keyline index " + i + " out of range for " + this);
+            Log.e(TAG, "Keyline index " + i + " out of range for " + this);
             return 0;
         }
     }
@@ -1008,16 +1010,13 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen
 
     private static int resolveGravity(int i) {
         if ((i & 7) == 0) {
-            i |= 8388611;
+            i |= GravityCompat.START;
         }
         return (i & 112) == 0 ? i | 48 : i;
     }
 
     private static int resolveKeylineGravity(int i) {
-        if (i == 0) {
-            return 8388661;
-        }
-        return i;
+        return i == 0 ? BadgeDrawable.TOP_END : i;
     }
 
     private void setInsetOffsetX(View view, int i) {
@@ -1242,7 +1241,7 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen
             if (view instanceof AttachedBehavior) {
                 Behavior behavior = ((AttachedBehavior) view).getBehavior();
                 if (behavior == null) {
-                    Log.e("CoordinatorLayout", "Attached behavior class is null");
+                    Log.e(TAG, "Attached behavior class is null");
                 }
                 layoutParams.setBehavior(behavior);
                 layoutParams.mBehaviorResolved = true;
@@ -1261,7 +1260,7 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen
                         StringBuilder K = a.K("Default behavior class ");
                         K.append(defaultBehavior.value().getName());
                         K.append(" could not be instantiated. Did you forget a default constructor?");
-                        Log.e("CoordinatorLayout", K.toString(), e);
+                        Log.e(TAG, K.toString(), e);
                     }
                 }
                 layoutParams.mBehaviorResolved = true;
diff --git a/app/src/main/java/androidx/core/app/ActivityRecreator.java b/app/src/main/java/androidx/core/app/ActivityRecreator.java
index 8e49463fa2..5e9b992c39 100644
--- a/app/src/main/java/androidx/core/app/ActivityRecreator.java
+++ b/app/src/main/java/androidx/core/app/ActivityRecreator.java
@@ -81,7 +81,7 @@ public final class ActivityRecreator {
                     throw e;
                 }
             } catch (Throwable th) {
-                Log.e("ActivityRecreator", "Exception while invoking performStopActivity", th);
+                Log.e(ActivityRecreator.LOG_TAG, "Exception while invoking performStopActivity", th);
             }
         }
     }
@@ -233,7 +233,7 @@ public final class ActivityRecreator {
             }
             return false;
         } catch (Throwable th) {
-            Log.e("ActivityRecreator", "Exception while fetching field values", th);
+            Log.e(LOG_TAG, "Exception while fetching field values", th);
             return false;
         }
     }
diff --git a/app/src/main/java/androidx/core/app/AppLaunchChecker.java b/app/src/main/java/androidx/core/app/AppLaunchChecker.java
index dd282e517e..5c45281cc3 100644
--- a/app/src/main/java/androidx/core/app/AppLaunchChecker.java
+++ b/app/src/main/java/androidx/core/app/AppLaunchChecker.java
@@ -5,22 +5,23 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import androidx.annotation.NonNull;
+import androidx.core.content.IntentCompat;
 public class AppLaunchChecker {
     private static final String KEY_STARTED_FROM_LAUNCHER = "startedFromLauncher";
     private static final String SHARED_PREFS_NAME = "android.support.AppLaunchChecker";
 
     public static boolean hasStartedFromLauncher(@NonNull Context context) {
-        return context.getSharedPreferences("android.support.AppLaunchChecker", 0).getBoolean("startedFromLauncher", false);
+        return context.getSharedPreferences(SHARED_PREFS_NAME, 0).getBoolean(KEY_STARTED_FROM_LAUNCHER, false);
     }
 
     public static void onActivityCreate(@NonNull Activity activity) {
         Intent intent;
-        SharedPreferences sharedPreferences = activity.getSharedPreferences("android.support.AppLaunchChecker", 0);
-        if (sharedPreferences.getBoolean("startedFromLauncher", false) || (intent = activity.getIntent()) == null || !"android.intent.action.MAIN".equals(intent.getAction())) {
+        SharedPreferences sharedPreferences = activity.getSharedPreferences(SHARED_PREFS_NAME, 0);
+        if (sharedPreferences.getBoolean(KEY_STARTED_FROM_LAUNCHER, false) || (intent = activity.getIntent()) == null || !"android.intent.action.MAIN".equals(intent.getAction())) {
             return;
         }
-        if (intent.hasCategory("android.intent.category.LAUNCHER") || intent.hasCategory("android.intent.category.LEANBACK_LAUNCHER")) {
-            sharedPreferences.edit().putBoolean("startedFromLauncher", true).apply();
+        if (intent.hasCategory("android.intent.category.LAUNCHER") || intent.hasCategory(IntentCompat.CATEGORY_LEANBACK_LAUNCHER)) {
+            sharedPreferences.edit().putBoolean(KEY_STARTED_FROM_LAUNCHER, true).apply();
         }
     }
 }
diff --git a/app/src/main/java/androidx/core/app/BundleCompat.java b/app/src/main/java/androidx/core/app/BundleCompat.java
index 169631bed1..b6348b2c13 100644
--- a/app/src/main/java/androidx/core/app/BundleCompat.java
+++ b/app/src/main/java/androidx/core/app/BundleCompat.java
@@ -26,7 +26,7 @@ public final class BundleCompat {
                     sGetIBinderMethod = method;
                     method.setAccessible(true);
                 } catch (NoSuchMethodException e) {
-                    Log.i("BundleCompatBaseImpl", "Failed to retrieve getIBinder method", e);
+                    Log.i(TAG, "Failed to retrieve getIBinder method", e);
                 }
                 sGetIBinderMethodFetched = true;
             }
@@ -35,7 +35,7 @@ public final class BundleCompat {
                 try {
                     return (IBinder) method2.invoke(bundle, str);
                 } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e2) {
-                    Log.i("BundleCompatBaseImpl", "Failed to invoke getIBinder via reflection", e2);
+                    Log.i(TAG, "Failed to invoke getIBinder via reflection", e2);
                     sGetIBinderMethod = null;
                 }
             }
@@ -49,7 +49,7 @@ public final class BundleCompat {
                     sPutIBinderMethod = method;
                     method.setAccessible(true);
                 } catch (NoSuchMethodException e) {
-                    Log.i("BundleCompatBaseImpl", "Failed to retrieve putIBinder method", e);
+                    Log.i(TAG, "Failed to retrieve putIBinder method", e);
                 }
                 sPutIBinderMethodFetched = true;
             }
@@ -58,7 +58,7 @@ public final class BundleCompat {
                 try {
                     method2.invoke(bundle, str, iBinder);
                 } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e2) {
-                    Log.i("BundleCompatBaseImpl", "Failed to invoke putIBinder via reflection", e2);
+                    Log.i(TAG, "Failed to invoke putIBinder via reflection", e2);
                     sPutIBinderMethod = null;
                 }
             }
diff --git a/app/src/main/java/androidx/core/app/JobIntentService.java b/app/src/main/java/androidx/core/app/JobIntentService.java
index 48e5e35b55..1a55719f54 100644
--- a/app/src/main/java/androidx/core/app/JobIntentService.java
+++ b/app/src/main/java/androidx/core/app/JobIntentService.java
@@ -16,6 +16,7 @@ import android.os.PowerManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.work.impl.background.systemalarm.CommandHandler;
 import c.d.b.a.a;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -115,7 +116,7 @@ public abstract class JobIntentService extends Service {
             synchronized (this) {
                 if (!this.mServiceProcessing) {
                     this.mServiceProcessing = true;
-                    this.mRunWakeLock.acquire(600000);
+                    this.mRunWakeLock.acquire(CommandHandler.WORK_PROCESSING_TIME_IN_MS);
                     this.mLaunchWakeLock.release();
                 }
             }
diff --git a/app/src/main/java/androidx/core/app/NavUtils.java b/app/src/main/java/androidx/core/app/NavUtils.java
index 0c5304c517..a4f72d1463 100644
--- a/app/src/main/java/androidx/core/app/NavUtils.java
+++ b/app/src/main/java/androidx/core/app/NavUtils.java
@@ -33,7 +33,7 @@ public final class NavUtils {
         try {
             return getParentActivityName(activity, componentName) == null ? Intent.makeMainActivity(componentName) : new Intent().setComponent(componentName);
         } catch (PackageManager.NameNotFoundException unused) {
-            Log.e("NavUtils", "getParentActivityIntent: bad parentActivityName '" + parentActivityName + "' in manifest");
+            Log.e(TAG, "getParentActivityIntent: bad parentActivityName '" + parentActivityName + "' in manifest");
             return null;
         }
     }
@@ -84,7 +84,7 @@ public final class NavUtils {
             return str;
         }
         Bundle bundle = activityInfo.metaData;
-        if (bundle == null || (string = bundle.getString("android.support.PARENT_ACTIVITY")) == null) {
+        if (bundle == null || (string = bundle.getString(PARENT_ACTIVITY)) == null) {
             return null;
         }
         if (string.charAt(0) != '.') {
diff --git a/app/src/main/java/androidx/core/app/NotificationCompat.java b/app/src/main/java/androidx/core/app/NotificationCompat.java
index acea579208..3a9404501f 100644
--- a/app/src/main/java/androidx/core/app/NotificationCompat.java
+++ b/app/src/main/java/androidx/core/app/NotificationCompat.java
@@ -33,6 +33,7 @@ import androidx.core.R;
 import androidx.core.app.Person;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.core.text.BidiFormatter;
+import androidx.core.view.ViewCompat;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.text.NumberFormat;
@@ -294,12 +295,12 @@ public class NotificationCompat {
             }
 
             public WearableExtender(Action action) {
-                Bundle bundle = action.getExtras().getBundle("android.wearable.EXTENSIONS");
+                Bundle bundle = action.getExtras().getBundle(EXTRA_WEARABLE_EXTENSIONS);
                 if (bundle != null) {
-                    this.mFlags = bundle.getInt("flags", 1);
-                    this.mInProgressLabel = bundle.getCharSequence("inProgressLabel");
-                    this.mConfirmLabel = bundle.getCharSequence("confirmLabel");
-                    this.mCancelLabel = bundle.getCharSequence("cancelLabel");
+                    this.mFlags = bundle.getInt(KEY_FLAGS, 1);
+                    this.mInProgressLabel = bundle.getCharSequence(KEY_IN_PROGRESS_LABEL);
+                    this.mConfirmLabel = bundle.getCharSequence(KEY_CONFIRM_LABEL);
+                    this.mCancelLabel = bundle.getCharSequence(KEY_CANCEL_LABEL);
                 }
             }
 
@@ -325,21 +326,21 @@ public class NotificationCompat {
                 Bundle bundle = new Bundle();
                 int i = this.mFlags;
                 if (i != 1) {
-                    bundle.putInt("flags", i);
+                    bundle.putInt(KEY_FLAGS, i);
                 }
                 CharSequence charSequence = this.mInProgressLabel;
                 if (charSequence != null) {
-                    bundle.putCharSequence("inProgressLabel", charSequence);
+                    bundle.putCharSequence(KEY_IN_PROGRESS_LABEL, charSequence);
                 }
                 CharSequence charSequence2 = this.mConfirmLabel;
                 if (charSequence2 != null) {
-                    bundle.putCharSequence("confirmLabel", charSequence2);
+                    bundle.putCharSequence(KEY_CONFIRM_LABEL, charSequence2);
                 }
                 CharSequence charSequence3 = this.mCancelLabel;
                 if (charSequence3 != null) {
-                    bundle.putCharSequence("cancelLabel", charSequence3);
+                    bundle.putCharSequence(KEY_CANCEL_LABEL, charSequence3);
                 }
-                builder.getExtras().putBundle("android.wearable.EXTENSIONS", bundle);
+                builder.getExtras().putBundle(EXTRA_WEARABLE_EXTENSIONS, bundle);
                 return builder;
             }
 
@@ -823,7 +824,7 @@ public class NotificationCompat {
         }
 
         public static CharSequence limitCharSequenceLength(CharSequence charSequence) {
-            return (charSequence != null && charSequence.length() > 5120) ? charSequence.subSequence(0, 5120) : charSequence;
+            return (charSequence != null && charSequence.length() > MAX_CHARSEQUENCE_LENGTH) ? charSequence.subSequence(0, MAX_CHARSEQUENCE_LENGTH) : charSequence;
         }
 
         private Bitmap reduceLargeIconSize(Bitmap bitmap) {
@@ -984,7 +985,7 @@ public class NotificationCompat {
         @RequiresApi(24)
         public Builder setChronometerCountDown(boolean z2) {
             this.mChronometerCountDown = z2;
-            this.mExtras.putBoolean("android.chronometerCountDown", z2);
+            this.mExtras.putBoolean(NotificationCompat.EXTRA_CHRONOMETER_COUNT_DOWN, z2);
             return this;
         }
 
@@ -1350,11 +1351,11 @@ public class NotificationCompat {
         }
 
         public CarExtender(Notification notification) {
-            Bundle bundle = NotificationCompat.getExtras(notification) == null ? null : NotificationCompat.getExtras(notification).getBundle("android.car.EXTENSIONS");
+            Bundle bundle = NotificationCompat.getExtras(notification) == null ? null : NotificationCompat.getExtras(notification).getBundle(EXTRA_CAR_EXTENDER);
             if (bundle != null) {
-                this.mLargeIcon = (Bitmap) bundle.getParcelable("large_icon");
-                this.mColor = bundle.getInt("app_color", 0);
-                this.mUnreadConversation = getUnreadConversationFromBundle(bundle.getBundle("car_conversation"));
+                this.mLargeIcon = (Bitmap) bundle.getParcelable(EXTRA_LARGE_ICON);
+                this.mColor = bundle.getInt(EXTRA_COLOR, 0);
+                this.mUnreadConversation = getUnreadConversationFromBundle(bundle.getBundle(EXTRA_CONVERSATION));
             }
         }
 
@@ -1367,18 +1368,18 @@ public class NotificationCompat {
             for (int i = 0; i < length; i++) {
                 Bundle bundle2 = new Bundle();
                 bundle2.putString("text", unreadConversation.getMessages()[i]);
-                bundle2.putString("author", str);
+                bundle2.putString(KEY_AUTHOR, str);
                 parcelableArr[i] = bundle2;
             }
-            bundle.putParcelableArray("messages", parcelableArr);
+            bundle.putParcelableArray(KEY_MESSAGES, parcelableArr);
             RemoteInput remoteInput = unreadConversation.getRemoteInput();
             if (remoteInput != null) {
-                bundle.putParcelable("remote_input", new RemoteInput.Builder(remoteInput.getResultKey()).setLabel(remoteInput.getLabel()).setChoices(remoteInput.getChoices()).setAllowFreeFormInput(remoteInput.getAllowFreeFormInput()).addExtras(remoteInput.getExtras()).build());
+                bundle.putParcelable(KEY_REMOTE_INPUT, new RemoteInput.Builder(remoteInput.getResultKey()).setLabel(remoteInput.getLabel()).setChoices(remoteInput.getChoices()).setAllowFreeFormInput(remoteInput.getAllowFreeFormInput()).addExtras(remoteInput.getExtras()).build());
             }
-            bundle.putParcelable("on_reply", unreadConversation.getReplyPendingIntent());
-            bundle.putParcelable("on_read", unreadConversation.getReadPendingIntent());
-            bundle.putStringArray("participants", unreadConversation.getParticipants());
-            bundle.putLong("timestamp", unreadConversation.getLatestTimestamp());
+            bundle.putParcelable(KEY_ON_REPLY, unreadConversation.getReplyPendingIntent());
+            bundle.putParcelable(KEY_ON_READ, unreadConversation.getReadPendingIntent());
+            bundle.putStringArray(KEY_PARTICIPANTS, unreadConversation.getParticipants());
+            bundle.putLong(KEY_TIMESTAMP, unreadConversation.getLatestTimestamp());
             return bundle;
         }
 
@@ -1390,7 +1391,7 @@ public class NotificationCompat {
             if (bundle == null) {
                 return null;
             }
-            Parcelable[] parcelableArray = bundle.getParcelableArray("messages");
+            Parcelable[] parcelableArray = bundle.getParcelableArray(KEY_MESSAGES);
             if (parcelableArray != null) {
                 int length = parcelableArray.length;
                 String[] strArr2 = new String[length];
@@ -1417,17 +1418,17 @@ public class NotificationCompat {
             } else {
                 strArr = null;
             }
-            PendingIntent pendingIntent = (PendingIntent) bundle.getParcelable("on_read");
-            PendingIntent pendingIntent2 = (PendingIntent) bundle.getParcelable("on_reply");
-            RemoteInput remoteInput2 = (RemoteInput) bundle.getParcelable("remote_input");
-            String[] stringArray = bundle.getStringArray("participants");
+            PendingIntent pendingIntent = (PendingIntent) bundle.getParcelable(KEY_ON_READ);
+            PendingIntent pendingIntent2 = (PendingIntent) bundle.getParcelable(KEY_ON_REPLY);
+            RemoteInput remoteInput2 = (RemoteInput) bundle.getParcelable(KEY_REMOTE_INPUT);
+            String[] stringArray = bundle.getStringArray(KEY_PARTICIPANTS);
             if (stringArray == null || stringArray.length != 1) {
                 return null;
             }
             if (remoteInput2 != null) {
                 remoteInput = new RemoteInput(remoteInput2.getResultKey(), remoteInput2.getLabel(), remoteInput2.getChoices(), remoteInput2.getAllowFreeFormInput(), Build.VERSION.SDK_INT >= 29 ? remoteInput2.getEditChoicesBeforeSending() : 0, remoteInput2.getExtras(), null);
             }
-            return new UnreadConversation(strArr, remoteInput, pendingIntent2, pendingIntent, stringArray, bundle.getLong("timestamp"));
+            return new UnreadConversation(strArr, remoteInput, pendingIntent2, pendingIntent, stringArray, bundle.getLong(KEY_TIMESTAMP));
         }
 
         @Override // androidx.core.app.NotificationCompat.Extender
@@ -1435,17 +1436,17 @@ public class NotificationCompat {
             Bundle bundle = new Bundle();
             Bitmap bitmap = this.mLargeIcon;
             if (bitmap != null) {
-                bundle.putParcelable("large_icon", bitmap);
+                bundle.putParcelable(EXTRA_LARGE_ICON, bitmap);
             }
             int i = this.mColor;
             if (i != 0) {
-                bundle.putInt("app_color", i);
+                bundle.putInt(EXTRA_COLOR, i);
             }
             UnreadConversation unreadConversation = this.mUnreadConversation;
             if (unreadConversation != null) {
-                bundle.putBundle("car_conversation", getBundleForUnreadConversation(unreadConversation));
+                bundle.putBundle(EXTRA_CONVERSATION, getBundleForUnreadConversation(unreadConversation));
             }
-            builder.getExtras().putBundle("android.car.EXTENSIONS", bundle);
+            builder.getExtras().putBundle(EXTRA_CAR_EXTENDER, bundle);
             return builder;
         }
 
@@ -1681,14 +1682,14 @@ public class NotificationCompat {
             @Nullable
             public static Message getMessageFromBundle(Bundle bundle) {
                 try {
-                    if (bundle.containsKey("text")) {
+                    if (bundle.containsKey(KEY_TEXT)) {
                         if (bundle.containsKey("time")) {
-                            Message message = new Message(bundle.getCharSequence("text"), bundle.getLong("time"), bundle.containsKey("person") ? Person.fromBundle(bundle.getBundle("person")) : (!bundle.containsKey("sender_person") || Build.VERSION.SDK_INT < 28) ? bundle.containsKey("sender") ? new Person.Builder().setName(bundle.getCharSequence("sender")).build() : null : Person.fromAndroidPerson((android.app.Person) bundle.getParcelable("sender_person")));
-                            if (bundle.containsKey("type") && bundle.containsKey("uri")) {
-                                message.setData(bundle.getString("type"), (Uri) bundle.getParcelable("uri"));
+                            Message message = new Message(bundle.getCharSequence(KEY_TEXT), bundle.getLong("time"), bundle.containsKey(KEY_PERSON) ? Person.fromBundle(bundle.getBundle(KEY_PERSON)) : (!bundle.containsKey(KEY_NOTIFICATION_PERSON) || Build.VERSION.SDK_INT < 28) ? bundle.containsKey(KEY_SENDER) ? new Person.Builder().setName(bundle.getCharSequence(KEY_SENDER)).build() : null : Person.fromAndroidPerson((android.app.Person) bundle.getParcelable(KEY_NOTIFICATION_PERSON)));
+                            if (bundle.containsKey("type") && bundle.containsKey(KEY_DATA_URI)) {
+                                message.setData(bundle.getString("type"), (Uri) bundle.getParcelable(KEY_DATA_URI));
                             }
-                            if (bundle.containsKey("extras")) {
-                                message.getExtras().putAll(bundle.getBundle("extras"));
+                            if (bundle.containsKey(KEY_EXTRAS_BUNDLE)) {
+                                message.getExtras().putAll(bundle.getBundle(KEY_EXTRAS_BUNDLE));
                             }
                             return message;
                         }
@@ -1714,16 +1715,16 @@ public class NotificationCompat {
                 Bundle bundle = new Bundle();
                 CharSequence charSequence = this.mText;
                 if (charSequence != null) {
-                    bundle.putCharSequence("text", charSequence);
+                    bundle.putCharSequence(KEY_TEXT, charSequence);
                 }
                 bundle.putLong("time", this.mTimestamp);
                 Person person = this.mPerson;
                 if (person != null) {
-                    bundle.putCharSequence("sender", person.getName());
+                    bundle.putCharSequence(KEY_SENDER, person.getName());
                     if (Build.VERSION.SDK_INT >= 28) {
-                        bundle.putParcelable("sender_person", this.mPerson.toAndroidPerson());
+                        bundle.putParcelable(KEY_NOTIFICATION_PERSON, this.mPerson.toAndroidPerson());
                     } else {
-                        bundle.putBundle("person", this.mPerson.toBundle());
+                        bundle.putBundle(KEY_PERSON, this.mPerson.toBundle());
                     }
                 }
                 String str = this.mDataMimeType;
@@ -1732,11 +1733,11 @@ public class NotificationCompat {
                 }
                 Uri uri = this.mDataUri;
                 if (uri != null) {
-                    bundle.putParcelable("uri", uri);
+                    bundle.putParcelable(KEY_DATA_URI, uri);
                 }
                 Bundle bundle2 = this.mExtras;
                 if (bundle2 != null) {
-                    bundle.putBundle("extras", bundle2);
+                    bundle.putBundle(KEY_EXTRAS_BUNDLE, bundle2);
                 }
                 return bundle;
             }
@@ -1806,7 +1807,7 @@ public class NotificationCompat {
         @Nullable
         public static MessagingStyle extractMessagingStyleFromNotification(Notification notification) {
             Bundle extras = NotificationCompat.getExtras(notification);
-            if (extras != null && !extras.containsKey("android.selfDisplayName") && !extras.containsKey("android.messagingStyleUser")) {
+            if (extras != null && !extras.containsKey(NotificationCompat.EXTRA_SELF_DISPLAY_NAME) && !extras.containsKey(NotificationCompat.EXTRA_MESSAGING_STYLE_USER)) {
                 return null;
             }
             try {
@@ -1855,7 +1856,7 @@ public class NotificationCompat {
         private CharSequence makeMessageLine(Message message) {
             BidiFormatter instance = BidiFormatter.getInstance();
             SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder();
-            int i = 1 != 0 ? -16777216 : -1;
+            int i = 1 != 0 ? ViewCompat.MEASURED_STATE_MASK : -1;
             CharSequence charSequence = "";
             CharSequence name = message.getPerson() == null ? charSequence : message.getPerson().getName();
             if (TextUtils.isEmpty(name)) {
@@ -1877,18 +1878,18 @@ public class NotificationCompat {
         @Override // androidx.core.app.NotificationCompat.Style
         public void addCompatExtras(Bundle bundle) {
             super.addCompatExtras(bundle);
-            bundle.putCharSequence("android.selfDisplayName", this.mUser.getName());
-            bundle.putBundle("android.messagingStyleUser", this.mUser.toBundle());
-            bundle.putCharSequence("android.hiddenConversationTitle", this.mConversationTitle);
+            bundle.putCharSequence(NotificationCompat.EXTRA_SELF_DISPLAY_NAME, this.mUser.getName());
+            bundle.putBundle(NotificationCompat.EXTRA_MESSAGING_STYLE_USER, this.mUser.toBundle());
+            bundle.putCharSequence(NotificationCompat.EXTRA_HIDDEN_CONVERSATION_TITLE, this.mConversationTitle);
             if (this.mConversationTitle != null && this.mIsGroupConversation.booleanValue()) {
-                bundle.putCharSequence("android.conversationTitle", this.mConversationTitle);
+                bundle.putCharSequence(NotificationCompat.EXTRA_CONVERSATION_TITLE, this.mConversationTitle);
             }
             if (!this.mMessages.isEmpty()) {
-                bundle.putParcelableArray("android.messages", Message.getBundleArrayForMessages(this.mMessages));
+                bundle.putParcelableArray(NotificationCompat.EXTRA_MESSAGES, Message.getBundleArrayForMessages(this.mMessages));
             }
             Boolean bool = this.mIsGroupConversation;
             if (bool != null) {
-                bundle.putBoolean("android.isGroupConversation", bool.booleanValue());
+                bundle.putBoolean(NotificationCompat.EXTRA_IS_GROUP_CONVERSATION, bool.booleanValue());
             }
         }
 
@@ -2002,22 +2003,22 @@ public class NotificationCompat {
         @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
         public void restoreFromCompatExtras(Bundle bundle) {
             this.mMessages.clear();
-            if (bundle.containsKey("android.messagingStyleUser")) {
-                this.mUser = Person.fromBundle(bundle.getBundle("android.messagingStyleUser"));
+            if (bundle.containsKey(NotificationCompat.EXTRA_MESSAGING_STYLE_USER)) {
+                this.mUser = Person.fromBundle(bundle.getBundle(NotificationCompat.EXTRA_MESSAGING_STYLE_USER));
             } else {
-                this.mUser = new Person.Builder().setName(bundle.getString("android.selfDisplayName")).build();
+                this.mUser = new Person.Builder().setName(bundle.getString(NotificationCompat.EXTRA_SELF_DISPLAY_NAME)).build();
             }
-            CharSequence charSequence = bundle.getCharSequence("android.conversationTitle");
+            CharSequence charSequence = bundle.getCharSequence(NotificationCompat.EXTRA_CONVERSATION_TITLE);
             this.mConversationTitle = charSequence;
             if (charSequence == null) {
-                this.mConversationTitle = bundle.getCharSequence("android.hiddenConversationTitle");
+                this.mConversationTitle = bundle.getCharSequence(NotificationCompat.EXTRA_HIDDEN_CONVERSATION_TITLE);
             }
-            Parcelable[] parcelableArray = bundle.getParcelableArray("android.messages");
+            Parcelable[] parcelableArray = bundle.getParcelableArray(NotificationCompat.EXTRA_MESSAGES);
             if (parcelableArray != null) {
                 this.mMessages.addAll(Message.getMessagesFromBundleArray(parcelableArray));
             }
-            if (bundle.containsKey("android.isGroupConversation")) {
-                this.mIsGroupConversation = Boolean.valueOf(bundle.getBoolean("android.isGroupConversation"));
+            if (bundle.containsKey(NotificationCompat.EXTRA_IS_GROUP_CONVERSATION)) {
+                this.mIsGroupConversation = Boolean.valueOf(bundle.getBoolean(NotificationCompat.EXTRA_IS_GROUP_CONVERSATION));
             }
         }
 
@@ -2368,9 +2369,9 @@ public class NotificationCompat {
 
         public WearableExtender(Notification notification) {
             Bundle extras = NotificationCompat.getExtras(notification);
-            Bundle bundle = extras != null ? extras.getBundle("android.wearable.EXTENSIONS") : null;
+            Bundle bundle = extras != null ? extras.getBundle(EXTRA_WEARABLE_EXTENSIONS) : null;
             if (bundle != null) {
-                ArrayList parcelableArrayList = bundle.getParcelableArrayList("actions");
+                ArrayList parcelableArrayList = bundle.getParcelableArrayList(KEY_ACTIONS);
                 if (parcelableArrayList != null) {
                     int size = parcelableArrayList.size();
                     Action[] actionArr = new Action[size];
@@ -2379,22 +2380,22 @@ public class NotificationCompat {
                     }
                     Collections.addAll(this.mActions, actionArr);
                 }
-                this.mFlags = bundle.getInt("flags", 1);
-                this.mDisplayIntent = (PendingIntent) bundle.getParcelable("displayIntent");
-                Notification[] notificationArrayFromBundle = NotificationCompat.getNotificationArrayFromBundle(bundle, "pages");
+                this.mFlags = bundle.getInt(KEY_FLAGS, 1);
+                this.mDisplayIntent = (PendingIntent) bundle.getParcelable(KEY_DISPLAY_INTENT);
+                Notification[] notificationArrayFromBundle = NotificationCompat.getNotificationArrayFromBundle(bundle, KEY_PAGES);
                 if (notificationArrayFromBundle != null) {
                     Collections.addAll(this.mPages, notificationArrayFromBundle);
                 }
-                this.mBackground = (Bitmap) bundle.getParcelable("background");
-                this.mContentIcon = bundle.getInt("contentIcon");
-                this.mContentIconGravity = bundle.getInt("contentIconGravity", 8388613);
-                this.mContentActionIndex = bundle.getInt("contentActionIndex", -1);
-                this.mCustomSizePreset = bundle.getInt("customSizePreset", 0);
-                this.mCustomContentHeight = bundle.getInt("customContentHeight");
-                this.mGravity = bundle.getInt("gravity", 80);
-                this.mHintScreenTimeout = bundle.getInt("hintScreenTimeout");
-                this.mDismissalId = bundle.getString("dismissalId");
-                this.mBridgeTag = bundle.getString("bridgeTag");
+                this.mBackground = (Bitmap) bundle.getParcelable(KEY_BACKGROUND);
+                this.mContentIcon = bundle.getInt(KEY_CONTENT_ICON);
+                this.mContentIconGravity = bundle.getInt(KEY_CONTENT_ICON_GRAVITY, 8388613);
+                this.mContentActionIndex = bundle.getInt(KEY_CONTENT_ACTION_INDEX, -1);
+                this.mCustomSizePreset = bundle.getInt(KEY_CUSTOM_SIZE_PRESET, 0);
+                this.mCustomContentHeight = bundle.getInt(KEY_CUSTOM_CONTENT_HEIGHT);
+                this.mGravity = bundle.getInt(KEY_GRAVITY, 80);
+                this.mHintScreenTimeout = bundle.getInt(KEY_HINT_SCREEN_TIMEOUT);
+                this.mDismissalId = bundle.getString(KEY_DISMISSAL_ID);
+                this.mBridgeTag = bundle.getString(KEY_BRIDGE_TAG);
             }
         }
 
@@ -2410,7 +2411,7 @@ public class NotificationCompat {
                 builder = new Notification.Action.Builder((iconCompat2 == null || iconCompat2.getType() != 2) ? 0 : iconCompat2.getResId(), action.getTitle(), action.getActionIntent());
             }
             Bundle bundle = action.getExtras() != null ? new Bundle(action.getExtras()) : new Bundle();
-            bundle.putBoolean("android.support.allowGeneratedReplies", action.getAllowGeneratedReplies());
+            bundle.putBoolean(NotificationCompatJellybean.EXTRA_ALLOW_GENERATED_REPLIES, action.getAllowGeneratedReplies());
             if (i >= 24) {
                 builder.setAllowGeneratedReplies(action.getAllowGeneratedReplies());
             }
@@ -2493,61 +2494,61 @@ public class NotificationCompat {
                 while (it.hasNext()) {
                     arrayList.add(getActionFromActionCompat(it.next()));
                 }
-                bundle.putParcelableArrayList("actions", arrayList);
+                bundle.putParcelableArrayList(KEY_ACTIONS, arrayList);
             }
             int i = this.mFlags;
             if (i != 1) {
-                bundle.putInt("flags", i);
+                bundle.putInt(KEY_FLAGS, i);
             }
             PendingIntent pendingIntent = this.mDisplayIntent;
             if (pendingIntent != null) {
-                bundle.putParcelable("displayIntent", pendingIntent);
+                bundle.putParcelable(KEY_DISPLAY_INTENT, pendingIntent);
             }
             if (!this.mPages.isEmpty()) {
                 ArrayList<Notification> arrayList2 = this.mPages;
-                bundle.putParcelableArray("pages", (Parcelable[]) arrayList2.toArray(new Notification[arrayList2.size()]));
+                bundle.putParcelableArray(KEY_PAGES, (Parcelable[]) arrayList2.toArray(new Notification[arrayList2.size()]));
             }
             Bitmap bitmap = this.mBackground;
             if (bitmap != null) {
-                bundle.putParcelable("background", bitmap);
+                bundle.putParcelable(KEY_BACKGROUND, bitmap);
             }
             int i2 = this.mContentIcon;
             if (i2 != 0) {
-                bundle.putInt("contentIcon", i2);
+                bundle.putInt(KEY_CONTENT_ICON, i2);
             }
             int i3 = this.mContentIconGravity;
             if (i3 != 8388613) {
-                bundle.putInt("contentIconGravity", i3);
+                bundle.putInt(KEY_CONTENT_ICON_GRAVITY, i3);
             }
             int i4 = this.mContentActionIndex;
             if (i4 != -1) {
-                bundle.putInt("contentActionIndex", i4);
+                bundle.putInt(KEY_CONTENT_ACTION_INDEX, i4);
             }
             int i5 = this.mCustomSizePreset;
             if (i5 != 0) {
-                bundle.putInt("customSizePreset", i5);
+                bundle.putInt(KEY_CUSTOM_SIZE_PRESET, i5);
             }
             int i6 = this.mCustomContentHeight;
             if (i6 != 0) {
-                bundle.putInt("customContentHeight", i6);
+                bundle.putInt(KEY_CUSTOM_CONTENT_HEIGHT, i6);
             }
             int i7 = this.mGravity;
             if (i7 != 80) {
-                bundle.putInt("gravity", i7);
+                bundle.putInt(KEY_GRAVITY, i7);
             }
             int i8 = this.mHintScreenTimeout;
             if (i8 != 0) {
-                bundle.putInt("hintScreenTimeout", i8);
+                bundle.putInt(KEY_HINT_SCREEN_TIMEOUT, i8);
             }
             String str = this.mDismissalId;
             if (str != null) {
-                bundle.putString("dismissalId", str);
+                bundle.putString(KEY_DISMISSAL_ID, str);
             }
             String str2 = this.mBridgeTag;
             if (str2 != null) {
-                bundle.putString("bridgeTag", str2);
+                bundle.putString(KEY_BRIDGE_TAG, str2);
             }
-            builder.getExtras().putBundle("android.wearable.EXTENSIONS", bundle);
+            builder.getExtras().putBundle(EXTRA_WEARABLE_EXTENSIONS, bundle);
             return builder;
         }
 
@@ -2768,9 +2769,9 @@ public class NotificationCompat {
             remoteInputArr = remoteInputArr2;
         }
         int i3 = Build.VERSION.SDK_INT;
-        boolean z2 = i3 >= 24 ? action.getExtras().getBoolean("android.support.allowGeneratedReplies") || action.getAllowGeneratedReplies() : action.getExtras().getBoolean("android.support.allowGeneratedReplies");
-        boolean z3 = action.getExtras().getBoolean("android.support.action.showsUserInterface", true);
-        int semanticAction = i3 >= 28 ? action.getSemanticAction() : action.getExtras().getInt("android.support.action.semanticAction", 0);
+        boolean z2 = i3 >= 24 ? action.getExtras().getBoolean(NotificationCompatJellybean.EXTRA_ALLOW_GENERATED_REPLIES) || action.getAllowGeneratedReplies() : action.getExtras().getBoolean(NotificationCompatJellybean.EXTRA_ALLOW_GENERATED_REPLIES);
+        boolean z3 = action.getExtras().getBoolean(Action.EXTRA_SHOWS_USER_INTERFACE, true);
+        int semanticAction = i3 >= 28 ? action.getSemanticAction() : action.getExtras().getInt(Action.EXTRA_SEMANTIC_ACTION, 0);
         boolean isContextual = i3 >= 29 ? action.isContextual() : false;
         if (i3 < 23) {
             return new Action(action.icon, action.title, action.actionIntent, action.getExtras(), remoteInputArr, (RemoteInput[]) null, z2, semanticAction, z3, isContextual);
@@ -2827,7 +2828,7 @@ public class NotificationCompat {
 
     @RequiresApi(19)
     public static CharSequence getContentTitle(Notification notification) {
-        return notification.extras.getCharSequence("android.title");
+        return notification.extras.getCharSequence(EXTRA_TITLE);
     }
 
     @Nullable
@@ -2850,8 +2851,8 @@ public class NotificationCompat {
     public static List<Action> getInvisibleActions(Notification notification) {
         Bundle bundle;
         ArrayList arrayList = new ArrayList();
-        Bundle bundle2 = notification.extras.getBundle("android.car.EXTENSIONS");
-        if (!(bundle2 == null || (bundle = bundle2.getBundle("invisible_actions")) == null)) {
+        Bundle bundle2 = notification.extras.getBundle(CarExtender.EXTRA_CAR_EXTENDER);
+        if (!(bundle2 == null || (bundle = bundle2.getBundle(CarExtender.EXTRA_INVISIBLE_ACTIONS)) == null)) {
             for (int i = 0; i < bundle.size(); i++) {
                 arrayList.add(NotificationCompatJellybean.getActionFromBundle(bundle.getBundle(Integer.toString(i))));
             }
diff --git a/app/src/main/java/androidx/core/app/NotificationCompatBuilder.java b/app/src/main/java/androidx/core/app/NotificationCompatBuilder.java
index 373ea773ae..9044b27b5e 100644
--- a/app/src/main/java/androidx/core/app/NotificationCompatBuilder.java
+++ b/app/src/main/java/androidx/core/app/NotificationCompatBuilder.java
@@ -53,15 +53,15 @@ public class NotificationCompatBuilder implements NotificationBuilderWithBuilder
         }
         this.mHeadsUpContentView = builder.mHeadsUpContentView;
         if (builder.mInvisibleActions.size() > 0) {
-            Bundle bundle2 = builder.getExtras().getBundle("android.car.EXTENSIONS");
+            Bundle bundle2 = builder.getExtras().getBundle(NotificationCompat.CarExtender.EXTRA_CAR_EXTENDER);
             bundle2 = bundle2 == null ? new Bundle() : bundle2;
             Bundle bundle3 = new Bundle();
             for (int i = 0; i < builder.mInvisibleActions.size(); i++) {
                 bundle3.putBundle(Integer.toString(i), NotificationCompatJellybean.getBundleForAction(builder.mInvisibleActions.get(i)));
             }
-            bundle2.putBundle("invisible_actions", bundle3);
-            builder.getExtras().putBundle("android.car.EXTENSIONS", bundle2);
-            this.mExtras.putBundle("android.car.EXTENSIONS", bundle2);
+            bundle2.putBundle(NotificationCompat.CarExtender.EXTRA_INVISIBLE_ACTIONS, bundle3);
+            builder.getExtras().putBundle(NotificationCompat.CarExtender.EXTRA_CAR_EXTENDER, bundle2);
+            this.mExtras.putBundle(NotificationCompat.CarExtender.EXTRA_CAR_EXTENDER, bundle2);
         }
         int i2 = Build.VERSION.SDK_INT;
         if (i2 >= 24) {
@@ -107,7 +107,7 @@ public class NotificationCompatBuilder implements NotificationBuilderWithBuilder
             this.mBuilder.setDefaults(i4);
             if (i2 >= 26) {
                 if (TextUtils.isEmpty(this.mBuilderCompat.mGroupKey)) {
-                    this.mBuilder.setGroup("silent");
+                    this.mBuilder.setGroup(NotificationCompat.GROUP_KEY_SILENT);
                 }
                 this.mBuilder.setGroupAlertBehavior(this.mGroupAlertBehavior);
             }
@@ -124,19 +124,19 @@ public class NotificationCompatBuilder implements NotificationBuilderWithBuilder
             }
         }
         Bundle bundle = action.getExtras() != null ? new Bundle(action.getExtras()) : new Bundle();
-        bundle.putBoolean("android.support.allowGeneratedReplies", action.getAllowGeneratedReplies());
+        bundle.putBoolean(NotificationCompatJellybean.EXTRA_ALLOW_GENERATED_REPLIES, action.getAllowGeneratedReplies());
         int i2 = Build.VERSION.SDK_INT;
         if (i2 >= 24) {
             builder.setAllowGeneratedReplies(action.getAllowGeneratedReplies());
         }
-        bundle.putInt("android.support.action.semanticAction", action.getSemanticAction());
+        bundle.putInt(NotificationCompat.Action.EXTRA_SEMANTIC_ACTION, action.getSemanticAction());
         if (i2 >= 28) {
             builder.setSemanticAction(action.getSemanticAction());
         }
         if (i2 >= 29) {
             builder.setContextual(action.isContextual());
         }
-        bundle.putBoolean("android.support.action.showsUserInterface", action.getShowsUserInterface());
+        bundle.putBoolean(NotificationCompat.Action.EXTRA_SHOWS_USER_INTERFACE, action.getShowsUserInterface());
         builder.addExtras(bundle);
         this.mBuilder.addAction(builder.build());
     }
diff --git a/app/src/main/java/androidx/core/app/NotificationCompatJellybean.java b/app/src/main/java/androidx/core/app/NotificationCompatJellybean.java
index 3ed3e72c5e..4188fb2103 100644
--- a/app/src/main/java/androidx/core/app/NotificationCompatJellybean.java
+++ b/app/src/main/java/androidx/core/app/NotificationCompatJellybean.java
@@ -69,25 +69,25 @@ public class NotificationCompatJellybean {
         try {
             if (sActionsField == null) {
                 Class<?> cls = Class.forName("android.app.Notification$Action");
-                sActionIconField = cls.getDeclaredField("icon");
-                sActionTitleField = cls.getDeclaredField("title");
-                sActionIntentField = cls.getDeclaredField("actionIntent");
+                sActionIconField = cls.getDeclaredField(KEY_ICON);
+                sActionTitleField = cls.getDeclaredField(KEY_TITLE);
+                sActionIntentField = cls.getDeclaredField(KEY_ACTION_INTENT);
                 Field declaredField = Notification.class.getDeclaredField("actions");
                 sActionsField = declaredField;
                 declaredField.setAccessible(true);
             }
         } catch (ClassNotFoundException e) {
-            Log.e("NotificationCompat", "Unable to access notification actions", e);
+            Log.e(TAG, "Unable to access notification actions", e);
             sActionsAccessFailed = true;
         } catch (NoSuchFieldException e2) {
-            Log.e("NotificationCompat", "Unable to access notification actions", e2);
+            Log.e(TAG, "Unable to access notification actions", e2);
             sActionsAccessFailed = true;
         }
         return !sActionsAccessFailed;
     }
 
     private static RemoteInput fromBundle(Bundle bundle) {
-        ArrayList<String> stringArrayList = bundle.getStringArrayList("allowedDataTypes");
+        ArrayList<String> stringArrayList = bundle.getStringArrayList(KEY_ALLOWED_DATA_TYPES);
         HashSet hashSet = new HashSet();
         if (stringArrayList != null) {
             Iterator<String> it = stringArrayList.iterator();
@@ -95,7 +95,7 @@ public class NotificationCompatJellybean {
                 hashSet.add(it.next());
             }
         }
-        return new RemoteInput(bundle.getString("resultKey"), bundle.getCharSequence("label"), bundle.getCharSequenceArray("choices"), bundle.getBoolean("allowFreeFormInput"), 0, bundle.getBundle("extras"), hashSet);
+        return new RemoteInput(bundle.getString(KEY_RESULT_KEY), bundle.getCharSequence(KEY_LABEL), bundle.getCharSequenceArray(KEY_CHOICES), bundle.getBoolean(KEY_ALLOW_FREE_FORM_INPUT), 0, bundle.getBundle("extras"), hashSet);
     }
 
     private static RemoteInput[] fromBundleArray(Bundle[] bundleArr) {
@@ -117,10 +117,10 @@ public class NotificationCompatJellybean {
                 if (actionObjectsLocked != null) {
                     Object obj = actionObjectsLocked[i];
                     Bundle extras = getExtras(notification);
-                    return readAction(sActionIconField.getInt(obj), (CharSequence) sActionTitleField.get(obj), (PendingIntent) sActionIntentField.get(obj), (extras == null || (sparseParcelableArray = extras.getSparseParcelableArray("android.support.actionExtras")) == null) ? null : (Bundle) sparseParcelableArray.get(i));
+                    return readAction(sActionIconField.getInt(obj), (CharSequence) sActionTitleField.get(obj), (PendingIntent) sActionIntentField.get(obj), (extras == null || (sparseParcelableArray = extras.getSparseParcelableArray(NotificationCompatExtras.EXTRA_ACTION_EXTRAS)) == null) ? null : (Bundle) sparseParcelableArray.get(i));
                 }
             } catch (IllegalAccessException e) {
-                Log.e("NotificationCompat", "Unable to access notification actions", e);
+                Log.e(TAG, "Unable to access notification actions", e);
                 sActionsAccessFailed = true;
             } catch (Throwable th) {
                 throw th;
@@ -140,7 +140,7 @@ public class NotificationCompatJellybean {
 
     public static NotificationCompat.Action getActionFromBundle(Bundle bundle) {
         Bundle bundle2 = bundle.getBundle("extras");
-        return new NotificationCompat.Action(bundle.getInt("icon"), bundle.getCharSequence("title"), (PendingIntent) bundle.getParcelable("actionIntent"), bundle.getBundle("extras"), fromBundleArray(getBundleArrayFromBundle(bundle, "remoteInputs")), fromBundleArray(getBundleArrayFromBundle(bundle, "dataOnlyRemoteInputs")), bundle2 != null ? bundle2.getBoolean("android.support.allowGeneratedReplies", false) : false, bundle.getInt("semanticAction"), bundle.getBoolean("showsUserInterface"), false);
+        return new NotificationCompat.Action(bundle.getInt(KEY_ICON), bundle.getCharSequence(KEY_TITLE), (PendingIntent) bundle.getParcelable(KEY_ACTION_INTENT), bundle.getBundle("extras"), fromBundleArray(getBundleArrayFromBundle(bundle, KEY_REMOTE_INPUTS)), fromBundleArray(getBundleArrayFromBundle(bundle, KEY_DATA_ONLY_REMOTE_INPUTS)), bundle2 != null ? bundle2.getBoolean(EXTRA_ALLOW_GENERATED_REPLIES, false) : false, bundle.getInt(KEY_SEMANTIC_ACTION), bundle.getBoolean(KEY_SHOWS_USER_INTERFACE), false);
     }
 
     private static Object[] getActionObjectsLocked(Notification notification) {
@@ -151,7 +151,7 @@ public class NotificationCompatJellybean {
             try {
                 return (Object[]) sActionsField.get(notification);
             } catch (IllegalAccessException e) {
-                Log.e("NotificationCompat", "Unable to access notification actions", e);
+                Log.e(TAG, "Unable to access notification actions", e);
                 sActionsAccessFailed = true;
                 return null;
             }
@@ -171,15 +171,15 @@ public class NotificationCompatJellybean {
     public static Bundle getBundleForAction(NotificationCompat.Action action) {
         Bundle bundle = new Bundle();
         IconCompat iconCompat = action.getIconCompat();
-        bundle.putInt("icon", iconCompat != null ? iconCompat.getResId() : 0);
-        bundle.putCharSequence("title", action.getTitle());
-        bundle.putParcelable("actionIntent", action.getActionIntent());
+        bundle.putInt(KEY_ICON, iconCompat != null ? iconCompat.getResId() : 0);
+        bundle.putCharSequence(KEY_TITLE, action.getTitle());
+        bundle.putParcelable(KEY_ACTION_INTENT, action.getActionIntent());
         Bundle bundle2 = action.getExtras() != null ? new Bundle(action.getExtras()) : new Bundle();
-        bundle2.putBoolean("android.support.allowGeneratedReplies", action.getAllowGeneratedReplies());
+        bundle2.putBoolean(EXTRA_ALLOW_GENERATED_REPLIES, action.getAllowGeneratedReplies());
         bundle.putBundle("extras", bundle2);
-        bundle.putParcelableArray("remoteInputs", toBundleArray(action.getRemoteInputs()));
-        bundle.putBoolean("showsUserInterface", action.getShowsUserInterface());
-        bundle.putInt("semanticAction", action.getSemanticAction());
+        bundle.putParcelableArray(KEY_REMOTE_INPUTS, toBundleArray(action.getRemoteInputs()));
+        bundle.putBoolean(KEY_SHOWS_USER_INTERFACE, action.getShowsUserInterface());
+        bundle.putInt(KEY_SEMANTIC_ACTION, action.getSemanticAction());
         return bundle;
     }
 
@@ -192,7 +192,7 @@ public class NotificationCompatJellybean {
                 if (sExtrasField == null) {
                     Field declaredField = Notification.class.getDeclaredField("extras");
                     if (!Bundle.class.isAssignableFrom(declaredField.getType())) {
-                        Log.e("NotificationCompat", "Notification.extras field is not of type Bundle");
+                        Log.e(TAG, "Notification.extras field is not of type Bundle");
                         sExtrasFieldAccessFailed = true;
                         return null;
                     }
@@ -206,11 +206,11 @@ public class NotificationCompatJellybean {
                 }
                 return bundle;
             } catch (IllegalAccessException e) {
-                Log.e("NotificationCompat", "Unable to access notification extras", e);
+                Log.e(TAG, "Unable to access notification extras", e);
                 sExtrasFieldAccessFailed = true;
                 return null;
             } catch (NoSuchFieldException e2) {
-                Log.e("NotificationCompat", "Unable to access notification extras", e2);
+                Log.e(TAG, "Unable to access notification extras", e2);
                 sExtrasFieldAccessFailed = true;
                 return null;
             }
@@ -222,9 +222,9 @@ public class NotificationCompatJellybean {
         RemoteInput[] remoteInputArr;
         RemoteInput[] remoteInputArr2;
         if (bundle != null) {
-            remoteInputArr2 = fromBundleArray(getBundleArrayFromBundle(bundle, "android.support.remoteInputs"));
-            remoteInputArr = fromBundleArray(getBundleArrayFromBundle(bundle, "android.support.dataRemoteInputs"));
-            z2 = bundle.getBoolean("android.support.allowGeneratedReplies");
+            remoteInputArr2 = fromBundleArray(getBundleArrayFromBundle(bundle, NotificationCompatExtras.EXTRA_REMOTE_INPUTS));
+            remoteInputArr = fromBundleArray(getBundleArrayFromBundle(bundle, EXTRA_DATA_ONLY_REMOTE_INPUTS));
+            z2 = bundle.getBoolean(EXTRA_ALLOW_GENERATED_REPLIES);
         } else {
             remoteInputArr2 = null;
             remoteInputArr = null;
@@ -235,10 +235,10 @@ public class NotificationCompatJellybean {
 
     private static Bundle toBundle(RemoteInput remoteInput) {
         Bundle bundle = new Bundle();
-        bundle.putString("resultKey", remoteInput.getResultKey());
-        bundle.putCharSequence("label", remoteInput.getLabel());
-        bundle.putCharSequenceArray("choices", remoteInput.getChoices());
-        bundle.putBoolean("allowFreeFormInput", remoteInput.getAllowFreeFormInput());
+        bundle.putString(KEY_RESULT_KEY, remoteInput.getResultKey());
+        bundle.putCharSequence(KEY_LABEL, remoteInput.getLabel());
+        bundle.putCharSequenceArray(KEY_CHOICES, remoteInput.getChoices());
+        bundle.putBoolean(KEY_ALLOW_FREE_FORM_INPUT, remoteInput.getAllowFreeFormInput());
         bundle.putBundle("extras", remoteInput.getExtras());
         Set<String> allowedDataTypes = remoteInput.getAllowedDataTypes();
         if (allowedDataTypes != null && !allowedDataTypes.isEmpty()) {
@@ -246,7 +246,7 @@ public class NotificationCompatJellybean {
             for (String str : allowedDataTypes) {
                 arrayList.add(str);
             }
-            bundle.putStringArrayList("allowedDataTypes", arrayList);
+            bundle.putStringArrayList(KEY_ALLOWED_DATA_TYPES, arrayList);
         }
         return bundle;
     }
@@ -267,12 +267,12 @@ public class NotificationCompatJellybean {
         builder.addAction(iconCompat != null ? iconCompat.getResId() : 0, action.getTitle(), action.getActionIntent());
         Bundle bundle = new Bundle(action.getExtras());
         if (action.getRemoteInputs() != null) {
-            bundle.putParcelableArray("android.support.remoteInputs", toBundleArray(action.getRemoteInputs()));
+            bundle.putParcelableArray(NotificationCompatExtras.EXTRA_REMOTE_INPUTS, toBundleArray(action.getRemoteInputs()));
         }
         if (action.getDataOnlyRemoteInputs() != null) {
-            bundle.putParcelableArray("android.support.dataRemoteInputs", toBundleArray(action.getDataOnlyRemoteInputs()));
+            bundle.putParcelableArray(EXTRA_DATA_ONLY_REMOTE_INPUTS, toBundleArray(action.getDataOnlyRemoteInputs()));
         }
-        bundle.putBoolean("android.support.allowGeneratedReplies", action.getAllowGeneratedReplies());
+        bundle.putBoolean(EXTRA_ALLOW_GENERATED_REPLIES, action.getAllowGeneratedReplies());
         return bundle;
     }
 }
diff --git a/app/src/main/java/androidx/core/app/NotificationCompatSideChannelService.java b/app/src/main/java/androidx/core/app/NotificationCompatSideChannelService.java
index 9149240761..4f52bbb654 100644
--- a/app/src/main/java/androidx/core/app/NotificationCompatSideChannelService.java
+++ b/app/src/main/java/androidx/core/app/NotificationCompatSideChannelService.java
@@ -64,7 +64,7 @@ public abstract class NotificationCompatSideChannelService extends Service {
 
     @Override // android.app.Service
     public IBinder onBind(Intent intent) {
-        if (intent.getAction().equals("android.support.BIND_NOTIFICATION_SIDE_CHANNEL")) {
+        if (intent.getAction().equals(NotificationManagerCompat.ACTION_BIND_SIDE_CHANNEL)) {
         }
         return null;
     }
diff --git a/app/src/main/java/androidx/core/app/NotificationManagerCompat.java b/app/src/main/java/androidx/core/app/NotificationManagerCompat.java
index 1385b6bdbd..a9f08ca111 100644
--- a/app/src/main/java/androidx/core/app/NotificationManagerCompat.java
+++ b/app/src/main/java/androidx/core/app/NotificationManagerCompat.java
@@ -185,14 +185,14 @@ public final class NotificationManagerCompat {
             if (listenerRecord.bound) {
                 return true;
             }
-            boolean bindService = this.mContext.bindService(new Intent("android.support.BIND_NOTIFICATION_SIDE_CHANNEL").setComponent(listenerRecord.componentName), this, 33);
+            boolean bindService = this.mContext.bindService(new Intent(NotificationManagerCompat.ACTION_BIND_SIDE_CHANNEL).setComponent(listenerRecord.componentName), this, 33);
             listenerRecord.bound = bindService;
             if (bindService) {
                 listenerRecord.retryCount = 0;
             } else {
                 StringBuilder K = c.d.b.a.a.K("Unable to bind to listener ");
                 K.append(listenerRecord.componentName);
-                Log.w("NotifManCompat", K.toString());
+                Log.w(NotificationManagerCompat.TAG, K.toString());
                 this.mContext.unbindService(this);
             }
             return listenerRecord.bound;
@@ -238,13 +238,13 @@ public final class NotificationManagerCompat {
         }
 
         private void processListenerQueue(ListenerRecord listenerRecord) {
-            if (Log.isLoggable("NotifManCompat", 3)) {
+            if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
                 StringBuilder K = c.d.b.a.a.K("Processing component ");
                 K.append(listenerRecord.componentName);
                 K.append(", ");
                 K.append(listenerRecord.taskQueue.size());
                 K.append(" queued tasks");
-                Log.d("NotifManCompat", K.toString());
+                Log.d(NotificationManagerCompat.TAG, K.toString());
             }
             if (!listenerRecord.taskQueue.isEmpty()) {
                 if (!ensureServiceBound(listenerRecord) || listenerRecord.service == null) {
@@ -257,21 +257,21 @@ public final class NotificationManagerCompat {
                         break;
                     }
                     try {
-                        if (Log.isLoggable("NotifManCompat", 3)) {
-                            Log.d("NotifManCompat", "Sending task " + peek);
+                        if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
+                            Log.d(NotificationManagerCompat.TAG, "Sending task " + peek);
                         }
                         peek.send(listenerRecord.service);
                         listenerRecord.taskQueue.remove();
                     } catch (DeadObjectException unused) {
-                        if (Log.isLoggable("NotifManCompat", 3)) {
+                        if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
                             StringBuilder K2 = c.d.b.a.a.K("Remote service has died: ");
                             K2.append(listenerRecord.componentName);
-                            Log.d("NotifManCompat", K2.toString());
+                            Log.d(NotificationManagerCompat.TAG, K2.toString());
                         }
                     } catch (RemoteException e) {
                         StringBuilder K3 = c.d.b.a.a.K("RemoteException communicating with ");
                         K3.append(listenerRecord.componentName);
-                        Log.w("NotifManCompat", K3.toString(), e);
+                        Log.w(NotificationManagerCompat.TAG, K3.toString(), e);
                     }
                 }
                 if (!listenerRecord.taskQueue.isEmpty()) {
@@ -292,13 +292,13 @@ public final class NotificationManagerCompat {
                     K.append(" after ");
                     K.append(listenerRecord.retryCount);
                     K.append(" retries");
-                    Log.w("NotifManCompat", K.toString());
+                    Log.w(NotificationManagerCompat.TAG, K.toString());
                     listenerRecord.taskQueue.clear();
                     return;
                 }
                 int i2 = (1 << (i - 1)) * 1000;
-                if (Log.isLoggable("NotifManCompat", 3)) {
-                    Log.d("NotifManCompat", "Scheduling retry for " + i2 + " ms");
+                if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
+                    Log.d(NotificationManagerCompat.TAG, "Scheduling retry for " + i2 + " ms");
                 }
                 this.mHandler.sendMessageDelayed(this.mHandler.obtainMessage(3, listenerRecord.componentName), (long) i2);
             }
@@ -308,14 +308,14 @@ public final class NotificationManagerCompat {
             Set<String> enabledListenerPackages = NotificationManagerCompat.getEnabledListenerPackages(this.mContext);
             if (!enabledListenerPackages.equals(this.mCachedEnabledPackages)) {
                 this.mCachedEnabledPackages = enabledListenerPackages;
-                List<ResolveInfo> queryIntentServices = this.mContext.getPackageManager().queryIntentServices(new Intent().setAction("android.support.BIND_NOTIFICATION_SIDE_CHANNEL"), 0);
+                List<ResolveInfo> queryIntentServices = this.mContext.getPackageManager().queryIntentServices(new Intent().setAction(NotificationManagerCompat.ACTION_BIND_SIDE_CHANNEL), 0);
                 HashSet hashSet = new HashSet();
                 for (ResolveInfo resolveInfo : queryIntentServices) {
                     if (enabledListenerPackages.contains(resolveInfo.serviceInfo.packageName)) {
                         ServiceInfo serviceInfo = resolveInfo.serviceInfo;
                         ComponentName componentName = new ComponentName(serviceInfo.packageName, serviceInfo.name);
                         if (resolveInfo.serviceInfo.permission != null) {
-                            Log.w("NotifManCompat", "Permission present on component " + componentName + ", not adding listener record.");
+                            Log.w(NotificationManagerCompat.TAG, "Permission present on component " + componentName + ", not adding listener record.");
                         } else {
                             hashSet.add(componentName);
                         }
@@ -325,8 +325,8 @@ public final class NotificationManagerCompat {
                 while (it.hasNext()) {
                     ComponentName componentName2 = (ComponentName) it.next();
                     if (!this.mRecordMap.containsKey(componentName2)) {
-                        if (Log.isLoggable("NotifManCompat", 3)) {
-                            Log.d("NotifManCompat", "Adding listener record for " + componentName2);
+                        if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
+                            Log.d(NotificationManagerCompat.TAG, "Adding listener record for " + componentName2);
                         }
                         this.mRecordMap.put(componentName2, new ListenerRecord(componentName2));
                     }
@@ -335,10 +335,10 @@ public final class NotificationManagerCompat {
                 while (it2.hasNext()) {
                     Map.Entry<ComponentName, ListenerRecord> next = it2.next();
                     if (!hashSet.contains(next.getKey())) {
-                        if (Log.isLoggable("NotifManCompat", 3)) {
+                        if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
                             StringBuilder K = c.d.b.a.a.K("Removing listener record for ");
                             K.append(next.getKey());
-                            Log.d("NotifManCompat", K.toString());
+                            Log.d(NotificationManagerCompat.TAG, K.toString());
                         }
                         ensureServiceUnbound(next.getValue());
                         it2.remove();
@@ -370,16 +370,16 @@ public final class NotificationManagerCompat {
 
         @Override // android.content.ServiceConnection
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            if (Log.isLoggable("NotifManCompat", 3)) {
-                Log.d("NotifManCompat", "Connected to service " + componentName);
+            if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
+                Log.d(NotificationManagerCompat.TAG, "Connected to service " + componentName);
             }
             this.mHandler.obtainMessage(1, new ServiceConnectedEvent(componentName, iBinder)).sendToTarget();
         }
 
         @Override // android.content.ServiceConnection
         public void onServiceDisconnected(ComponentName componentName) {
-            if (Log.isLoggable("NotifManCompat", 3)) {
-                Log.d("NotifManCompat", "Disconnected from service " + componentName);
+            if (Log.isLoggable(NotificationManagerCompat.TAG, 3)) {
+                Log.d(NotificationManagerCompat.TAG, "Disconnected from service " + componentName);
             }
             this.mHandler.obtainMessage(2, componentName).sendToTarget();
         }
@@ -406,7 +406,7 @@ public final class NotificationManagerCompat {
     @NonNull
     public static Set<String> getEnabledListenerPackages(@NonNull Context context) {
         Set<String> set;
-        String string = Settings.Secure.getString(context.getContentResolver(), "enabled_notification_listeners");
+        String string = Settings.Secure.getString(context.getContentResolver(), SETTING_ENABLED_NOTIFICATION_LISTENERS);
         synchronized (sEnabledNotificationListenersLock) {
             if (string != null) {
                 if (!string.equals(sEnabledNotificationListeners)) {
@@ -438,7 +438,7 @@ public final class NotificationManagerCompat {
 
     private static boolean useSideChannelForNotification(Notification notification) {
         Bundle extras = NotificationCompat.getExtras(notification);
-        return extras != null && extras.getBoolean("android.support.useSideChannel");
+        return extras != null && extras.getBoolean(EXTRA_USE_SIDE_CHANNEL);
     }
 
     public boolean areNotificationsEnabled() {
@@ -452,7 +452,7 @@ public final class NotificationManagerCompat {
         try {
             Class<?> cls = Class.forName(AppOpsManager.class.getName());
             Class<?> cls2 = Integer.TYPE;
-            return ((Integer) cls.getMethod("checkOpNoThrow", new Class[]{cls2, cls2, String.class}).invoke(appOpsManager, new Object[]{Integer.valueOf(((Integer) cls.getDeclaredField("OP_POST_NOTIFICATION").get(Integer.class)).intValue()), Integer.valueOf(i), packageName})).intValue() == 0;
+            return ((Integer) cls.getMethod(CHECK_OP_NO_THROW, new Class[]{cls2, cls2, String.class}).invoke(appOpsManager, new Object[]{Integer.valueOf(((Integer) cls.getDeclaredField(OP_POST_NOTIFICATION).get(Integer.class)).intValue()), Integer.valueOf(i), packageName})).intValue() == 0;
         } catch (ClassNotFoundException | IllegalAccessException | NoSuchFieldException | NoSuchMethodException | RuntimeException | InvocationTargetException unused) {
             return true;
         }
@@ -507,10 +507,7 @@ public final class NotificationManagerCompat {
     }
 
     public int getImportance() {
-        if (Build.VERSION.SDK_INT >= 24) {
-            return this.mNotificationManager.getImportance();
-        }
-        return -1000;
+        return Build.VERSION.SDK_INT >= 24 ? this.mNotificationManager.getImportance() : IMPORTANCE_UNSPECIFIED;
     }
 
     @Nullable
diff --git a/app/src/main/java/androidx/core/app/Person.java b/app/src/main/java/androidx/core/app/Person.java
index 1bdb5a5bf2..7efab27568 100644
--- a/app/src/main/java/androidx/core/app/Person.java
+++ b/app/src/main/java/androidx/core/app/Person.java
@@ -110,15 +110,15 @@ public class Person {
 
     @NonNull
     public static Person fromBundle(@NonNull Bundle bundle) {
-        Bundle bundle2 = bundle.getBundle("icon");
-        return new Builder().setName(bundle.getCharSequence("name")).setIcon(bundle2 != null ? IconCompat.createFromBundle(bundle2) : null).setUri(bundle.getString("uri")).setKey(bundle.getString("key")).setBot(bundle.getBoolean("isBot")).setImportant(bundle.getBoolean("isImportant")).build();
+        Bundle bundle2 = bundle.getBundle(ICON_KEY);
+        return new Builder().setName(bundle.getCharSequence("name")).setIcon(bundle2 != null ? IconCompat.createFromBundle(bundle2) : null).setUri(bundle.getString("uri")).setKey(bundle.getString("key")).setBot(bundle.getBoolean(IS_BOT_KEY)).setImportant(bundle.getBoolean(IS_IMPORTANT_KEY)).build();
     }
 
     @NonNull
     @RequiresApi(22)
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
     public static Person fromPersistableBundle(@NonNull PersistableBundle persistableBundle) {
-        return new Builder().setName(persistableBundle.getString("name")).setUri(persistableBundle.getString("uri")).setKey(persistableBundle.getString("key")).setBot(persistableBundle.getBoolean("isBot")).setImportant(persistableBundle.getBoolean("isImportant")).build();
+        return new Builder().setName(persistableBundle.getString("name")).setUri(persistableBundle.getString("uri")).setKey(persistableBundle.getString("key")).setBot(persistableBundle.getBoolean(IS_BOT_KEY)).setImportant(persistableBundle.getBoolean(IS_IMPORTANT_KEY)).build();
     }
 
     @Nullable
@@ -166,11 +166,11 @@ public class Person {
         Bundle bundle = new Bundle();
         bundle.putCharSequence("name", this.mName);
         IconCompat iconCompat = this.mIcon;
-        bundle.putBundle("icon", iconCompat != null ? iconCompat.toBundle() : null);
+        bundle.putBundle(ICON_KEY, iconCompat != null ? iconCompat.toBundle() : null);
         bundle.putString("uri", this.mUri);
         bundle.putString("key", this.mKey);
-        bundle.putBoolean("isBot", this.mIsBot);
-        bundle.putBoolean("isImportant", this.mIsImportant);
+        bundle.putBoolean(IS_BOT_KEY, this.mIsBot);
+        bundle.putBoolean(IS_IMPORTANT_KEY, this.mIsImportant);
         return bundle;
     }
 
@@ -183,8 +183,8 @@ public class Person {
         persistableBundle.putString("name", charSequence != null ? charSequence.toString() : null);
         persistableBundle.putString("uri", this.mUri);
         persistableBundle.putString("key", this.mKey);
-        persistableBundle.putBoolean("isBot", this.mIsBot);
-        persistableBundle.putBoolean("isImportant", this.mIsImportant);
+        persistableBundle.putBoolean(IS_BOT_KEY, this.mIsBot);
+        persistableBundle.putBoolean(IS_IMPORTANT_KEY, this.mIsImportant);
         return persistableBundle;
     }
 }
diff --git a/app/src/main/java/androidx/core/app/RemoteInput.java b/app/src/main/java/androidx/core/app/RemoteInput.java
index a44bb63cdc..4061115d48 100644
--- a/app/src/main/java/androidx/core/app/RemoteInput.java
+++ b/app/src/main/java/androidx/core/app/RemoteInput.java
@@ -151,7 +151,7 @@ public final class RemoteInput {
                 clipDataIntentFromIntent.putExtra(getExtraResultsKeyForData(key), bundleExtra);
             }
         }
-        intent.setClipData(ClipData.newIntent("android.remoteinput.results", clipDataIntentFromIntent));
+        intent.setClipData(ClipData.newIntent(RESULTS_CLIP_LABEL, clipDataIntentFromIntent));
     }
 
     public static void addResultsToIntent(RemoteInput[] remoteInputArr, Intent intent, Bundle bundle) {
@@ -203,7 +203,7 @@ public final class RemoteInput {
             return null;
         }
         ClipDescription description = clipData.getDescription();
-        if (description.hasMimeType("text/vnd.android.intent") && description.getLabel().toString().contentEquals("android.remoteinput.results")) {
+        if (description.hasMimeType("text/vnd.android.intent") && description.getLabel().toString().contentEquals(RESULTS_CLIP_LABEL)) {
             return clipData.getItemAt(0).getIntent();
         }
         return null;
@@ -220,7 +220,7 @@ public final class RemoteInput {
         }
         HashMap hashMap = new HashMap();
         for (String str2 : clipDataIntentFromIntent.getExtras().keySet()) {
-            if (str2.startsWith("android.remoteinput.dataTypeResultsData")) {
+            if (str2.startsWith(EXTRA_DATA_TYPE_RESULTS_DATA)) {
                 String substring = str2.substring(39);
                 if (!substring.isEmpty() && (string = clipDataIntentFromIntent.getBundleExtra(str2).getString(str)) != null && !string.isEmpty()) {
                     hashMap.put(substring, Uri.parse(string));
@@ -234,7 +234,7 @@ public final class RemoteInput {
     }
 
     private static String getExtraResultsKeyForData(String str) {
-        return a.s("android.remoteinput.dataTypeResultsData", str);
+        return a.s(EXTRA_DATA_TYPE_RESULTS_DATA, str);
     }
 
     public static Bundle getResultsFromIntent(Intent intent) {
@@ -249,7 +249,7 @@ public final class RemoteInput {
         if (clipDataIntentFromIntent == null) {
             return 0;
         }
-        return clipDataIntentFromIntent.getExtras().getInt("android.remoteinput.resultsSource", 0);
+        return clipDataIntentFromIntent.getExtras().getInt(EXTRA_RESULTS_SOURCE, 0);
     }
 
     public static void setResultsSource(@NonNull Intent intent, int i) {
@@ -261,8 +261,8 @@ public final class RemoteInput {
         if (clipDataIntentFromIntent == null) {
             clipDataIntentFromIntent = new Intent();
         }
-        clipDataIntentFromIntent.putExtra("android.remoteinput.resultsSource", i);
-        intent.setClipData(ClipData.newIntent("android.remoteinput.results", clipDataIntentFromIntent));
+        clipDataIntentFromIntent.putExtra(EXTRA_RESULTS_SOURCE, i);
+        intent.setClipData(ClipData.newIntent(RESULTS_CLIP_LABEL, clipDataIntentFromIntent));
     }
 
     public boolean getAllowFreeFormInput() {
diff --git a/app/src/main/java/androidx/core/app/ShareCompat.java b/app/src/main/java/androidx/core/app/ShareCompat.java
index 55e30c78aa..32dd1de29d 100644
--- a/app/src/main/java/androidx/core/app/ShareCompat.java
+++ b/app/src/main/java/androidx/core/app/ShareCompat.java
@@ -18,6 +18,7 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.content.IntentCompat;
 import androidx.core.util.Preconditions;
 import c.d.b.a.a;
 import java.util.ArrayList;
@@ -48,10 +49,10 @@ public final class ShareCompat {
             this.mContext = (Context) Preconditions.checkNotNull(context);
             Intent action = new Intent().setAction("android.intent.action.SEND");
             this.mIntent = action;
-            action.putExtra("androidx.core.app.EXTRA_CALLING_PACKAGE", context.getPackageName());
-            action.putExtra("android.support.v4.app.EXTRA_CALLING_PACKAGE", context.getPackageName());
-            action.putExtra("androidx.core.app.EXTRA_CALLING_ACTIVITY", componentName);
-            action.putExtra("android.support.v4.app.EXTRA_CALLING_ACTIVITY", componentName);
+            action.putExtra(ShareCompat.EXTRA_CALLING_PACKAGE, context.getPackageName());
+            action.putExtra(ShareCompat.EXTRA_CALLING_PACKAGE_INTEROP, context.getPackageName());
+            action.putExtra(ShareCompat.EXTRA_CALLING_ACTIVITY, componentName);
+            action.putExtra(ShareCompat.EXTRA_CALLING_ACTIVITY_INTEROP, componentName);
             action.addFlags(524288);
         }
 
@@ -240,7 +241,7 @@ public final class ShareCompat {
 
         @NonNull
         public IntentBuilder setHtmlText(@Nullable String str) {
-            this.mIntent.putExtra("android.intent.extra.HTML_TEXT", str);
+            this.mIntent.putExtra(IntentCompat.EXTRA_HTML_TEXT, str);
             if (!this.mIntent.hasExtra("android.intent.extra.TEXT")) {
                 setText(Html.fromHtml(str));
             }
@@ -353,7 +354,7 @@ public final class ShareCompat {
             try {
                 return this.mContext.getPackageManager().getActivityIcon(this.mCallingActivity);
             } catch (PackageManager.NameNotFoundException e) {
-                Log.e("IntentReader", "Could not retrieve icon for calling activity", e);
+                Log.e(TAG, "Could not retrieve icon for calling activity", e);
                 return null;
             }
         }
@@ -366,7 +367,7 @@ public final class ShareCompat {
             try {
                 return this.mContext.getPackageManager().getApplicationIcon(this.mCallingPackage);
             } catch (PackageManager.NameNotFoundException e) {
-                Log.e("IntentReader", "Could not retrieve icon for calling application", e);
+                Log.e(TAG, "Could not retrieve icon for calling application", e);
                 return null;
             }
         }
@@ -380,7 +381,7 @@ public final class ShareCompat {
             try {
                 return packageManager.getApplicationLabel(packageManager.getApplicationInfo(this.mCallingPackage, 0));
             } catch (PackageManager.NameNotFoundException e) {
-                Log.e("IntentReader", "Could not retrieve label for calling application", e);
+                Log.e(TAG, "Could not retrieve label for calling application", e);
                 return null;
             }
         }
@@ -407,7 +408,7 @@ public final class ShareCompat {
 
         @Nullable
         public String getHtmlText() {
-            String stringExtra = this.mIntent.getStringExtra("android.intent.extra.HTML_TEXT");
+            String stringExtra = this.mIntent.getStringExtra(IntentCompat.EXTRA_HTML_TEXT);
             if (stringExtra != null) {
                 return stringExtra;
             }
@@ -491,7 +492,7 @@ public final class ShareCompat {
     public static void configureMenuItem(@NonNull MenuItem menuItem, @NonNull IntentBuilder intentBuilder) {
         ActionProvider actionProvider = menuItem.getActionProvider();
         ShareActionProvider shareActionProvider = !(actionProvider instanceof ShareActionProvider) ? new ShareActionProvider(intentBuilder.getContext()) : (ShareActionProvider) actionProvider;
-        StringBuilder K = a.K(".sharecompat_");
+        StringBuilder K = a.K(HISTORY_FILENAME_PREFIX);
         K.append(intentBuilder.getContext().getClass().getName());
         shareActionProvider.setShareHistoryFileName(K.toString());
         shareActionProvider.setShareIntent(intentBuilder.getIntent());
@@ -507,8 +508,8 @@ public final class ShareCompat {
 
     @Nullable
     public static ComponentName getCallingActivity(@NonNull Intent intent) {
-        ComponentName componentName = (ComponentName) intent.getParcelableExtra("androidx.core.app.EXTRA_CALLING_ACTIVITY");
-        return componentName == null ? (ComponentName) intent.getParcelableExtra("android.support.v4.app.EXTRA_CALLING_ACTIVITY") : componentName;
+        ComponentName componentName = (ComponentName) intent.getParcelableExtra(EXTRA_CALLING_ACTIVITY);
+        return componentName == null ? (ComponentName) intent.getParcelableExtra(EXTRA_CALLING_ACTIVITY_INTEROP) : componentName;
     }
 
     @Nullable
@@ -520,7 +521,7 @@ public final class ShareCompat {
 
     @Nullable
     public static String getCallingPackage(@NonNull Intent intent) {
-        String stringExtra = intent.getStringExtra("androidx.core.app.EXTRA_CALLING_PACKAGE");
-        return stringExtra == null ? intent.getStringExtra("android.support.v4.app.EXTRA_CALLING_PACKAGE") : stringExtra;
+        String stringExtra = intent.getStringExtra(EXTRA_CALLING_PACKAGE);
+        return stringExtra == null ? intent.getStringExtra(EXTRA_CALLING_PACKAGE_INTEROP) : stringExtra;
     }
 }
diff --git a/app/src/main/java/androidx/core/app/SharedElementCallback.java b/app/src/main/java/androidx/core/app/SharedElementCallback.java
index b38de531c7..3cde118a0b 100644
--- a/app/src/main/java/androidx/core/app/SharedElementCallback.java
+++ b/app/src/main/java/androidx/core/app/SharedElementCallback.java
@@ -58,12 +58,12 @@ public abstract class SharedElementCallback {
             Drawable background = imageView.getBackground();
             if (!(drawable == null || background != null || (createDrawableBitmap = createDrawableBitmap(drawable)) == null)) {
                 Bundle bundle = new Bundle();
-                bundle.putParcelable("sharedElement:snapshot:bitmap", createDrawableBitmap);
-                bundle.putString("sharedElement:snapshot:imageScaleType", imageView.getScaleType().toString());
+                bundle.putParcelable(BUNDLE_SNAPSHOT_BITMAP, createDrawableBitmap);
+                bundle.putString(BUNDLE_SNAPSHOT_IMAGE_SCALETYPE, imageView.getScaleType().toString());
                 if (imageView.getScaleType() == ImageView.ScaleType.MATRIX) {
                     float[] fArr = new float[9];
                     imageView.getImageMatrix().getValues(fArr);
-                    bundle.putFloatArray("sharedElement:snapshot:imageMatrix", fArr);
+                    bundle.putFloatArray(BUNDLE_SNAPSHOT_IMAGE_MATRIX, fArr);
                 }
                 return bundle;
             }
@@ -92,17 +92,17 @@ public abstract class SharedElementCallback {
     public View onCreateSnapshotView(Context context, Parcelable parcelable) {
         if (parcelable instanceof Bundle) {
             Bundle bundle = (Bundle) parcelable;
-            Bitmap bitmap = (Bitmap) bundle.getParcelable("sharedElement:snapshot:bitmap");
+            Bitmap bitmap = (Bitmap) bundle.getParcelable(BUNDLE_SNAPSHOT_BITMAP);
             if (bitmap == null) {
                 return null;
             }
             ImageView imageView = new ImageView(context);
             imageView.setImageBitmap(bitmap);
-            imageView.setScaleType(ImageView.ScaleType.valueOf(bundle.getString("sharedElement:snapshot:imageScaleType")));
+            imageView.setScaleType(ImageView.ScaleType.valueOf(bundle.getString(BUNDLE_SNAPSHOT_IMAGE_SCALETYPE)));
             if (imageView.getScaleType() != ImageView.ScaleType.MATRIX) {
                 return imageView;
             }
-            float[] floatArray = bundle.getFloatArray("sharedElement:snapshot:imageMatrix");
+            float[] floatArray = bundle.getFloatArray(BUNDLE_SNAPSHOT_IMAGE_MATRIX);
             Matrix matrix = new Matrix();
             matrix.setValues(floatArray);
             imageView.setImageMatrix(matrix);
diff --git a/app/src/main/java/androidx/core/app/TaskStackBuilder.java b/app/src/main/java/androidx/core/app/TaskStackBuilder.java
index b3d22bec96..e6c7fd9bf9 100644
--- a/app/src/main/java/androidx/core/app/TaskStackBuilder.java
+++ b/app/src/main/java/androidx/core/app/TaskStackBuilder.java
@@ -83,7 +83,7 @@ public final class TaskStackBuilder implements Iterable<Intent> {
             }
             return this;
         } catch (PackageManager.NameNotFoundException e) {
-            Log.e("TaskStackBuilder", "Bad ComponentName while traversing activity parent metadata");
+            Log.e(TAG, "Bad ComponentName while traversing activity parent metadata");
             throw new IllegalArgumentException(e);
         }
     }
diff --git a/app/src/main/java/androidx/core/content/ContextCompat.java b/app/src/main/java/androidx/core/content/ContextCompat.java
index 3514de6256..578f014268 100644
--- a/app/src/main/java/androidx/core/content/ContextCompat.java
+++ b/app/src/main/java/androidx/core/content/ContextCompat.java
@@ -66,10 +66,14 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import java.io.File;
 import java.util.HashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
+import org.webrtc.MediaStreamTrack;
 public class ContextCompat {
     private static final String TAG = "ContextCompat";
     private static final Object sLock = new Object();
@@ -87,7 +91,7 @@ public class ContextCompat {
             }
             hashMap.put(AppWidgetManager.class, "appwidget");
             hashMap.put(BatteryManager.class, "batterymanager");
-            hashMap.put(CameraManager.class, "camera");
+            hashMap.put(CameraManager.class, ChatInputComponentTypes.CAMERA);
             hashMap.put(JobScheduler.class, "jobscheduler");
             hashMap.put(LauncherApps.class, "launcherapps");
             hashMap.put(MediaProjectionManager.class, "media_projection");
@@ -107,9 +111,9 @@ public class ContextCompat {
             hashMap.put(NsdManager.class, "servicediscovery");
             hashMap.put(AccessibilityManager.class, "accessibility");
             hashMap.put(AccountManager.class, "account");
-            hashMap.put(ActivityManager.class, "activity");
-            hashMap.put(AlarmManager.class, "alarm");
-            hashMap.put(AudioManager.class, "audio");
+            hashMap.put(ActivityManager.class, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
+            hashMap.put(AlarmManager.class, NotificationCompat.CATEGORY_ALARM);
+            hashMap.put(AudioManager.class, MediaStreamTrack.AUDIO_TRACK_KIND);
             hashMap.put(ClipboardManager.class, "clipboard");
             hashMap.put(ConnectivityManager.class, "connectivity");
             hashMap.put(DevicePolicyManager.class, "device_policy");
@@ -178,7 +182,7 @@ public class ContextCompat {
             if (file.exists()) {
                 return file;
             }
-            Log.w("ContextCompat", "Unable to create files subdir " + file.getPath());
+            Log.w(TAG, "Unable to create files subdir " + file.getPath());
             return null;
         }
     }
diff --git a/app/src/main/java/androidx/core/content/ContextKt.java b/app/src/main/java/androidx/core/content/ContextKt.java
index 99b6ca2697..251b831e57 100644
--- a/app/src/main/java/androidx/core/content/ContextKt.java
+++ b/app/src/main/java/androidx/core/content/ContextKt.java
@@ -5,6 +5,7 @@ import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import androidx.annotation.AttrRes;
 import androidx.annotation.StyleRes;
+import androidx.exifinterface.media.ExifInterface;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -12,7 +13,7 @@ import kotlin.jvm.functions.Function1;
 public final class ContextKt {
     public static final /* synthetic */ <T> T getSystemService(Context context) {
         m.checkParameterIsNotNull(context, "$this$getSystemService");
-        m.reifiedOperationMarker(4, "T");
+        m.reifiedOperationMarker(4, ExifInterface.GPS_DIRECTION_TRUE);
         return (T) ContextCompat.getSystemService(context, Object.class);
     }
 
diff --git a/app/src/main/java/androidx/core/content/FileProvider.java b/app/src/main/java/androidx/core/content/FileProvider.java
index 97ed8fac90..92b17d2695 100644
--- a/app/src/main/java/androidx/core/content/FileProvider.java
+++ b/app/src/main/java/androidx/core/content/FileProvider.java
@@ -16,6 +16,8 @@ import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -26,7 +28,7 @@ public class FileProvider extends ContentProvider {
     private static final String ATTR_NAME = "name";
     private static final String ATTR_PATH = "path";
     private static final String[] COLUMNS = {"_display_name", "_size"};
-    private static final File DEVICE_ROOT = new File("/");
+    private static final File DEVICE_ROOT = new File(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
     private static final String META_DATA_FILE_PROVIDER_PATHS = "android.support.FILE_PROVIDER_PATHS";
     private static final String TAG_CACHE_PATH = "cache-path";
     private static final String TAG_EXTERNAL = "external-path";
@@ -101,8 +103,8 @@ public class FileProvider extends ContentProvider {
                 }
                 if (entry != null) {
                     String path2 = entry.getValue().getPath();
-                    String substring = path2.endsWith("/") ? canonicalPath.substring(path2.length()) : canonicalPath.substring(path2.length() + 1);
-                    return new Uri.Builder().scheme("content").authority(this.mAuthority).encodedPath(Uri.encode(entry.getKey()) + '/' + Uri.encode(substring, "/")).build();
+                    String substring = path2.endsWith(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN) ? canonicalPath.substring(path2.length()) : canonicalPath.substring(path2.length() + 1);
+                    return new Uri.Builder().scheme("content").authority(this.mAuthority).encodedPath(Uri.encode(entry.getKey()) + MentionUtilsKt.SLASH_CHAR + Uri.encode(substring, AutocompleteViewModel.COMMAND_DISCOVER_TOKEN)).build();
                 }
                 throw new IllegalArgumentException(a.s("Failed to find configured root that contains ", canonicalPath));
             } catch (IOException unused) {
@@ -177,7 +179,7 @@ public class FileProvider extends ContentProvider {
         SimplePathStrategy simplePathStrategy = new SimplePathStrategy(str);
         ProviderInfo resolveContentProvider = context.getPackageManager().resolveContentProvider(str, 128);
         if (resolveContentProvider != null) {
-            XmlResourceParser loadXmlMetaData = resolveContentProvider.loadXmlMetaData(context.getPackageManager(), "android.support.FILE_PROVIDER_PATHS");
+            XmlResourceParser loadXmlMetaData = resolveContentProvider.loadXmlMetaData(context.getPackageManager(), META_DATA_FILE_PROVIDER_PATHS);
             if (loadXmlMetaData != null) {
                 while (true) {
                     int next = loadXmlMetaData.next();
@@ -188,26 +190,26 @@ public class FileProvider extends ContentProvider {
                         String name = loadXmlMetaData.getName();
                         File file = null;
                         String attributeValue = loadXmlMetaData.getAttributeValue(null, "name");
-                        String attributeValue2 = loadXmlMetaData.getAttributeValue(null, "path");
-                        if ("root-path".equals(name)) {
+                        String attributeValue2 = loadXmlMetaData.getAttributeValue(null, ATTR_PATH);
+                        if (TAG_ROOT_PATH.equals(name)) {
                             file = DEVICE_ROOT;
-                        } else if ("files-path".equals(name)) {
+                        } else if (TAG_FILES_PATH.equals(name)) {
                             file = context.getFilesDir();
-                        } else if ("cache-path".equals(name)) {
+                        } else if (TAG_CACHE_PATH.equals(name)) {
                             file = context.getCacheDir();
-                        } else if ("external-path".equals(name)) {
+                        } else if (TAG_EXTERNAL.equals(name)) {
                             file = Environment.getExternalStorageDirectory();
-                        } else if ("external-files-path".equals(name)) {
+                        } else if (TAG_EXTERNAL_FILES.equals(name)) {
                             File[] externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null);
                             if (externalFilesDirs.length > 0) {
                                 file = externalFilesDirs[0];
                             }
-                        } else if ("external-cache-path".equals(name)) {
+                        } else if (TAG_EXTERNAL_CACHE.equals(name)) {
                             File[] externalCacheDirs = ContextCompat.getExternalCacheDirs(context);
                             if (externalCacheDirs.length > 0) {
                                 file = externalCacheDirs[0];
                             }
-                        } else if ("external-media-path".equals(name)) {
+                        } else if (TAG_EXTERNAL_MEDIA.equals(name)) {
                             File[] externalMediaDirs = context.getExternalMediaDirs();
                             if (externalMediaDirs.length > 0) {
                                 file = externalMediaDirs[0];
diff --git a/app/src/main/java/androidx/core/content/MimeTypeFilter.java b/app/src/main/java/androidx/core/content/MimeTypeFilter.java
index bd00239289..5b98d97f24 100644
--- a/app/src/main/java/androidx/core/content/MimeTypeFilter.java
+++ b/app/src/main/java/androidx/core/content/MimeTypeFilter.java
@@ -2,6 +2,7 @@ package androidx.core.content;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.util.ArrayList;
 public final class MimeTypeFilter {
     private MimeTypeFilter() {
@@ -12,9 +13,9 @@ public final class MimeTypeFilter {
         if (str == null) {
             return null;
         }
-        String[] split = str.split("/");
+        String[] split = str.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         for (String str2 : strArr) {
-            if (mimeTypeAgainstFilter(split, str2.split("/"))) {
+            if (mimeTypeAgainstFilter(split, str2.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN))) {
                 return str2;
             }
         }
@@ -26,9 +27,9 @@ public final class MimeTypeFilter {
         if (strArr == null) {
             return null;
         }
-        String[] split = str.split("/");
+        String[] split = str.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         for (String str2 : strArr) {
-            if (mimeTypeAgainstFilter(str2.split("/"), split)) {
+            if (mimeTypeAgainstFilter(str2.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN), split)) {
                 return str2;
             }
         }
@@ -39,7 +40,7 @@ public final class MimeTypeFilter {
         if (str == null) {
             return false;
         }
-        return mimeTypeAgainstFilter(str.split("/"), str2.split("/"));
+        return mimeTypeAgainstFilter(str.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN), str2.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN));
     }
 
     @NonNull
@@ -48,9 +49,9 @@ public final class MimeTypeFilter {
             return new String[0];
         }
         ArrayList arrayList = new ArrayList();
-        String[] split = str.split("/");
+        String[] split = str.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         for (String str2 : strArr) {
-            if (mimeTypeAgainstFilter(str2.split("/"), split)) {
+            if (mimeTypeAgainstFilter(str2.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN), split)) {
                 arrayList.add(str2);
             }
         }
diff --git a/app/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java b/app/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java
index 252089e16c..5592b65895 100644
--- a/app/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java
+++ b/app/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java
@@ -194,17 +194,17 @@ public class ShortcutInfoCompat {
         PersistableBundle persistableBundle = new PersistableBundle();
         Person[] personArr = this.mPersons;
         if (personArr != null && personArr.length > 0) {
-            persistableBundle.putInt("extraPersonCount", personArr.length);
+            persistableBundle.putInt(EXTRA_PERSON_COUNT, personArr.length);
             int i = 0;
             while (i < this.mPersons.length) {
-                StringBuilder K = a.K("extraPerson_");
+                StringBuilder K = a.K(EXTRA_PERSON_);
                 int i2 = i + 1;
                 K.append(i2);
                 persistableBundle.putPersistableBundle(K.toString(), this.mPersons[i].toPersistableBundle());
                 i = i2;
             }
         }
-        persistableBundle.putBoolean("extraLongLived", this.mIsLongLived);
+        persistableBundle.putBoolean(EXTRA_LONG_LIVED, this.mIsLongLived);
         return persistableBundle;
     }
 
@@ -212,10 +212,10 @@ public class ShortcutInfoCompat {
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
     @VisibleForTesting
     public static boolean getLongLivedFromExtra(@NonNull PersistableBundle persistableBundle) {
-        if (persistableBundle == null || !persistableBundle.containsKey("extraLongLived")) {
+        if (persistableBundle == null || !persistableBundle.containsKey(EXTRA_LONG_LIVED)) {
             return false;
         }
-        return persistableBundle.getBoolean("extraLongLived");
+        return persistableBundle.getBoolean(EXTRA_LONG_LIVED);
     }
 
     @VisibleForTesting
@@ -223,14 +223,14 @@ public class ShortcutInfoCompat {
     @RequiresApi(25)
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
     public static Person[] getPersonsFromExtra(@NonNull PersistableBundle persistableBundle) {
-        if (persistableBundle == null || !persistableBundle.containsKey("extraPersonCount")) {
+        if (persistableBundle == null || !persistableBundle.containsKey(EXTRA_PERSON_COUNT)) {
             return null;
         }
-        int i = persistableBundle.getInt("extraPersonCount");
+        int i = persistableBundle.getInt(EXTRA_PERSON_COUNT);
         Person[] personArr = new Person[i];
         int i2 = 0;
         while (i2 < i) {
-            StringBuilder K = a.K("extraPerson_");
+            StringBuilder K = a.K(EXTRA_PERSON_);
             int i3 = i2 + 1;
             K.append(i3);
             personArr[i2] = Person.fromPersistableBundle(persistableBundle.getPersistableBundle(K.toString()));
diff --git a/app/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java b/app/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java
index 5faea2bd3b..6804ffbdeb 100644
--- a/app/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java
+++ b/app/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java
@@ -112,12 +112,12 @@ public class ShortcutManagerCompat {
         if (Build.VERSION.SDK_INT >= 26) {
             return ((ShortcutManager) context.getSystemService(ShortcutManager.class)).isRequestPinShortcutSupported();
         }
-        if (ContextCompat.checkSelfPermission(context, "com.android.launcher.permission.INSTALL_SHORTCUT") != 0) {
+        if (ContextCompat.checkSelfPermission(context, INSTALL_SHORTCUT_PERMISSION) != 0) {
             return false;
         }
-        for (ResolveInfo resolveInfo : context.getPackageManager().queryBroadcastReceivers(new Intent("com.android.launcher.action.INSTALL_SHORTCUT"), 0)) {
+        for (ResolveInfo resolveInfo : context.getPackageManager().queryBroadcastReceivers(new Intent(ACTION_INSTALL_SHORTCUT), 0)) {
             String str = resolveInfo.activityInfo.permission;
-            if (TextUtils.isEmpty(str) || "com.android.launcher.permission.INSTALL_SHORTCUT".equals(str)) {
+            if (TextUtils.isEmpty(str) || INSTALL_SHORTCUT_PERMISSION.equals(str)) {
                 return true;
             }
             while (r4.hasNext()) {
@@ -147,7 +147,7 @@ public class ShortcutManagerCompat {
         if (!isRequestPinShortcutSupported(context)) {
             return false;
         }
-        Intent addToIntent = shortcutInfoCompat.addToIntent(new Intent("com.android.launcher.action.INSTALL_SHORTCUT"));
+        Intent addToIntent = shortcutInfoCompat.addToIntent(new Intent(ACTION_INSTALL_SHORTCUT));
         if (intentSender == null) {
             context.sendBroadcast(addToIntent);
             return true;
diff --git a/app/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java b/app/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java
index dbf38d615a..a29d6f609e 100644
--- a/app/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java
+++ b/app/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java
@@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.XmlRes;
 import androidx.core.R;
+import androidx.core.view.ViewCompat;
 import java.io.IOException;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -114,7 +115,7 @@ public final class ColorStateListInflaterCompat {
 
     @ColorInt
     private static int modulateColorAlpha(@ColorInt int i, @FloatRange(from = 0.0d, to = 1.0d) float f) {
-        return (i & 16777215) | (Math.round(((float) Color.alpha(i)) * f) << 24);
+        return (i & ViewCompat.MEASURED_SIZE_MASK) | (Math.round(((float) Color.alpha(i)) * f) << 24);
     }
 
     private static TypedArray obtainAttributes(Resources resources, Resources.Theme theme, AttributeSet attributeSet, int[] iArr) {
diff --git a/app/src/main/java/androidx/core/content/res/ComplexColorCompat.java b/app/src/main/java/androidx/core/content/res/ComplexColorCompat.java
index dbb14b1644..df13de0592 100644
--- a/app/src/main/java/androidx/core/content/res/ComplexColorCompat.java
+++ b/app/src/main/java/androidx/core/content/res/ComplexColorCompat.java
@@ -69,7 +69,7 @@ public final class ComplexColorCompat {
         try {
             return createFromXml(resources, i, theme);
         } catch (Exception e) {
-            Log.e("ComplexColorCompat", "Failed to inflate ComplexColor.", e);
+            Log.e(LOG_TAG, "Failed to inflate ComplexColor.", e);
             return null;
         }
     }
diff --git a/app/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java b/app/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java
index 04ec8afcc4..1f6cc244c9 100644
--- a/app/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java
+++ b/app/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java
@@ -186,7 +186,7 @@ public class FontResourcesParserCompat {
         String string3 = obtainAttributes.getString(R.styleable.FontFamily_fontProviderQuery);
         int resourceId = obtainAttributes.getResourceId(R.styleable.FontFamily_fontProviderCerts, 0);
         int integer = obtainAttributes.getInteger(R.styleable.FontFamily_fontProviderFetchStrategy, 1);
-        int integer2 = obtainAttributes.getInteger(R.styleable.FontFamily_fontProviderFetchTimeout, 500);
+        int integer2 = obtainAttributes.getInteger(R.styleable.FontFamily_fontProviderFetchTimeout, DEFAULT_TIMEOUT_MILLIS);
         obtainAttributes.recycle();
         if (string == null || string2 == null || string3 == null) {
             ArrayList arrayList = new ArrayList();
@@ -216,7 +216,7 @@ public class FontResourcesParserCompat {
         if (!obtainAttributes.hasValue(i)) {
             i = R.styleable.FontFamilyFont_android_fontWeight;
         }
-        int i2 = obtainAttributes.getInt(i, 400);
+        int i2 = obtainAttributes.getInt(i, NORMAL_WEIGHT);
         int i3 = R.styleable.FontFamilyFont_fontStyle;
         if (!obtainAttributes.hasValue(i3)) {
             i3 = R.styleable.FontFamilyFont_android_fontStyle;
diff --git a/app/src/main/java/androidx/core/content/res/ResourcesCompat.java b/app/src/main/java/androidx/core/content/res/ResourcesCompat.java
index 0574bb2536..d39d92b82d 100644
--- a/app/src/main/java/androidx/core/content/res/ResourcesCompat.java
+++ b/app/src/main/java/androidx/core/content/res/ResourcesCompat.java
@@ -103,7 +103,7 @@ public final class ResourcesCompat {
                             sRebaseMethod = declaredMethod;
                             declaredMethod.setAccessible(true);
                         } catch (NoSuchMethodException e) {
-                            Log.i("ResourcesCompat", "Failed to retrieve rebase() method", e);
+                            Log.i(ResourcesCompat.TAG, "Failed to retrieve rebase() method", e);
                         }
                         sRebaseMethodFetched = true;
                     }
@@ -112,7 +112,7 @@ public final class ResourcesCompat {
                         try {
                             method.invoke(theme, new Object[0]);
                         } catch (IllegalAccessException | InvocationTargetException e2) {
-                            Log.i("ResourcesCompat", "Failed to invoke rebase() method via reflection", e2);
+                            Log.i(ResourcesCompat.TAG, "Failed to invoke rebase() method via reflection", e2);
                             sRebaseMethod = null;
                         }
                     }
@@ -242,7 +242,7 @@ public final class ResourcesCompat {
                     if (parse != null) {
                         return TypefaceCompat.createFromResourcesFamilyXml(context, parse, resources, i, i2, fontCallback, handler, z2);
                     }
-                    Log.e("ResourcesCompat", "Failed to find font-family tag");
+                    Log.e(TAG, "Failed to find font-family tag");
                     if (fontCallback != null) {
                         fontCallback.callbackFailAsync(-3, handler);
                     }
@@ -258,13 +258,13 @@ public final class ResourcesCompat {
                 }
                 return createFromResourcesFontFile;
             } catch (XmlPullParserException e) {
-                Log.e("ResourcesCompat", "Failed to parse xml resource " + charSequence2, e);
+                Log.e(TAG, "Failed to parse xml resource " + charSequence2, e);
                 if (fontCallback != null) {
                     fontCallback.callbackFailAsync(-3, handler);
                 }
                 return null;
             } catch (IOException e2) {
-                Log.e("ResourcesCompat", "Failed to read xml resource " + charSequence2, e2);
+                Log.e(TAG, "Failed to read xml resource " + charSequence2, e2);
                 if (fontCallback != null) {
                 }
                 return null;
diff --git a/app/src/main/java/androidx/core/content/res/TypedArrayUtils.java b/app/src/main/java/androidx/core/content/res/TypedArrayUtils.java
index 33d13a0f6a..cea6883a46 100644
--- a/app/src/main/java/androidx/core/content/res/TypedArrayUtils.java
+++ b/app/src/main/java/androidx/core/content/res/TypedArrayUtils.java
@@ -130,7 +130,7 @@ public class TypedArrayUtils {
     }
 
     public static boolean hasAttribute(@NonNull XmlPullParser xmlPullParser, @NonNull String str) {
-        return xmlPullParser.getAttributeValue("http://schemas.android.com/apk/res/android", str) != null;
+        return xmlPullParser.getAttributeValue(NAMESPACE, str) != null;
     }
 
     @NonNull
diff --git a/app/src/main/java/androidx/core/graphics/ColorUtils.java b/app/src/main/java/androidx/core/graphics/ColorUtils.java
index 92320d5044..a57025d9ca 100644
--- a/app/src/main/java/androidx/core/graphics/ColorUtils.java
+++ b/app/src/main/java/androidx/core/graphics/ColorUtils.java
@@ -7,7 +7,9 @@ import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Objects;
 public final class ColorUtils {
     private static final int MIN_ALPHA_SEARCH_MAX_ITERATIONS = 10;
@@ -86,17 +88,17 @@ public final class ColorUtils {
         double d5 = (d2 / 500.0d) + d4;
         double d6 = d4 - (d3 / 200.0d);
         double pow = Math.pow(d5, 3.0d);
-        if (pow <= 0.008856d) {
-            pow = ((d5 * 116.0d) - 16.0d) / 903.3d;
+        if (pow <= XYZ_EPSILON) {
+            pow = ((d5 * 116.0d) - 16.0d) / XYZ_KAPPA;
         }
-        double pow2 = d > 7.9996247999999985d ? Math.pow(d4, 3.0d) : d / 903.3d;
+        double pow2 = d > 7.9996247999999985d ? Math.pow(d4, 3.0d) : d / XYZ_KAPPA;
         double pow3 = Math.pow(d6, 3.0d);
-        if (pow3 <= 0.008856d) {
-            pow3 = ((d6 * 116.0d) - 16.0d) / 903.3d;
+        if (pow3 <= XYZ_EPSILON) {
+            pow3 = ((d6 * 116.0d) - 16.0d) / XYZ_KAPPA;
         }
-        dArr[0] = pow * 95.047d;
-        dArr[1] = pow2 * 100.0d;
-        dArr[2] = pow3 * 108.883d;
+        dArr[0] = pow * XYZ_WHITE_REFERENCE_X;
+        dArr[1] = pow2 * XYZ_WHITE_REFERENCE_Y;
+        dArr[2] = pow3 * XYZ_WHITE_REFERENCE_Z;
     }
 
     public static void RGBToHSL(@IntRange(from = 0, to = 255) int i, @IntRange(from = 0, to = 255) int i2, @IntRange(from = 0, to = 255) int i3, @NonNull float[] fArr) {
@@ -138,9 +140,9 @@ public final class ColorUtils {
             double pow2 = d2 < 0.04045d ? d2 / 12.92d : Math.pow((d2 + 0.055d) / 1.055d, 2.4d);
             double d3 = ((double) i3) / 255.0d;
             double pow3 = d3 < 0.04045d ? d3 / 12.92d : Math.pow((d3 + 0.055d) / 1.055d, 2.4d);
-            dArr[0] = ((0.1805d * pow3) + (0.3576d * pow2) + (0.4124d * pow)) * 100.0d;
-            dArr[1] = ((0.0722d * pow3) + (0.7152d * pow2) + (0.2126d * pow)) * 100.0d;
-            dArr[2] = ((pow3 * 0.9505d) + (pow2 * 0.1192d) + (pow * 0.0193d)) * 100.0d;
+            dArr[0] = ((0.1805d * pow3) + (0.3576d * pow2) + (0.4124d * pow)) * XYZ_WHITE_REFERENCE_Y;
+            dArr[1] = ((0.0722d * pow3) + (0.7152d * pow2) + (0.2126d * pow)) * XYZ_WHITE_REFERENCE_Y;
+            dArr[2] = ((pow3 * 0.9505d) + (pow2 * 0.1192d) + (pow * 0.0193d)) * XYZ_WHITE_REFERENCE_Y;
             return;
         }
         throw new IllegalArgumentException("outXyz must have a length of 3.");
@@ -148,18 +150,18 @@ public final class ColorUtils {
 
     @ColorInt
     public static int XYZToColor(@FloatRange(from = 0.0d, to = 95.047d) double d, @FloatRange(from = 0.0d, to = 100.0d) double d2, @FloatRange(from = 0.0d, to = 108.883d) double d3) {
-        double d4 = ((-0.4986d * d3) + ((-1.5372d * d2) + (3.2406d * d))) / 100.0d;
-        double d5 = ((0.0415d * d3) + ((1.8758d * d2) + (-0.9689d * d))) / 100.0d;
-        double d6 = ((1.057d * d3) + ((-0.204d * d2) + (0.0557d * d))) / 100.0d;
+        double d4 = ((-0.4986d * d3) + ((-1.5372d * d2) + (3.2406d * d))) / XYZ_WHITE_REFERENCE_Y;
+        double d5 = ((0.0415d * d3) + ((1.8758d * d2) + (-0.9689d * d))) / XYZ_WHITE_REFERENCE_Y;
+        double d6 = ((1.057d * d3) + ((-0.204d * d2) + (0.0557d * d))) / XYZ_WHITE_REFERENCE_Y;
         return Color.rgb(constrain((int) Math.round((d4 > 0.0031308d ? (Math.pow(d4, 0.4166666666666667d) * 1.055d) - 0.055d : d4 * 12.92d) * 255.0d), 0, 255), constrain((int) Math.round((d5 > 0.0031308d ? (Math.pow(d5, 0.4166666666666667d) * 1.055d) - 0.055d : d5 * 12.92d) * 255.0d), 0, 255), constrain((int) Math.round((d6 > 0.0031308d ? (Math.pow(d6, 0.4166666666666667d) * 1.055d) - 0.055d : d6 * 12.92d) * 255.0d), 0, 255));
     }
 
     public static void XYZToLAB(@FloatRange(from = 0.0d, to = 95.047d) double d, @FloatRange(from = 0.0d, to = 100.0d) double d2, @FloatRange(from = 0.0d, to = 108.883d) double d3, @NonNull double[] dArr) {
         if (dArr.length == 3) {
-            double pivotXyzComponent = pivotXyzComponent(d / 95.047d);
-            double pivotXyzComponent2 = pivotXyzComponent(d2 / 100.0d);
-            double pivotXyzComponent3 = pivotXyzComponent(d3 / 108.883d);
-            dArr[0] = Math.max(0.0d, (116.0d * pivotXyzComponent2) - 16.0d);
+            double pivotXyzComponent = pivotXyzComponent(d / XYZ_WHITE_REFERENCE_X);
+            double pivotXyzComponent2 = pivotXyzComponent(d2 / XYZ_WHITE_REFERENCE_Y);
+            double pivotXyzComponent3 = pivotXyzComponent(d3 / XYZ_WHITE_REFERENCE_Z);
+            dArr[0] = Math.max((double) ShadowDrawableWrapper.COS_45, (116.0d * pivotXyzComponent2) - 16.0d);
             dArr[1] = (pivotXyzComponent - pivotXyzComponent2) * 500.0d;
             dArr[2] = (pivotXyzComponent2 - pivotXyzComponent3) * 200.0d;
             return;
@@ -209,11 +211,11 @@ public final class ColorUtils {
         throw new IllegalArgumentException(K.toString());
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public static double calculateLuminance(@ColorInt int i) {
         double[] tempDouble3Array = getTempDouble3Array();
         colorToXYZ(i, tempDouble3Array);
-        return tempDouble3Array[1] / 100.0d;
+        return tempDouble3Array[1] / XYZ_WHITE_REFERENCE_Y;
     }
 
     public static int calculateMinimumAlpha(@ColorInt int i, @ColorInt int i2, float f) {
@@ -336,13 +338,13 @@ public final class ColorUtils {
     }
 
     private static double pivotXyzComponent(double d) {
-        return d > 0.008856d ? Math.pow(d, 0.3333333333333333d) : ((d * 903.3d) + 16.0d) / 116.0d;
+        return d > XYZ_EPSILON ? Math.pow(d, 0.3333333333333333d) : ((d * XYZ_KAPPA) + 16.0d) / 116.0d;
     }
 
     @ColorInt
     public static int setAlphaComponent(@ColorInt int i, @IntRange(from = 0, to = 255) int i2) {
         if (i2 >= 0 && i2 <= 255) {
-            return (i & 16777215) | (i2 << 24);
+            return (i & ViewCompat.MEASURED_SIZE_MASK) | (i2 << 24);
         }
         throw new IllegalArgumentException("alpha must be between 0 and 255.");
     }
diff --git a/app/src/main/java/androidx/core/graphics/PaintCompat.java b/app/src/main/java/androidx/core/graphics/PaintCompat.java
index 6107e6b7ed..c9a232ba27 100644
--- a/app/src/main/java/androidx/core/graphics/PaintCompat.java
+++ b/app/src/main/java/androidx/core/graphics/PaintCompat.java
@@ -25,8 +25,8 @@ public final class PaintCompat {
         if (length == 1 && Character.isWhitespace(str.charAt(0))) {
             return true;
         }
-        float measureText = paint.measureText("󟿽");
-        float measureText2 = paint.measureText("m");
+        float measureText = paint.measureText(TOFU_STRING);
+        float measureText2 = paint.measureText(EM_STRING);
         float measureText3 = paint.measureText(str);
         float f = 0.0f;
         if (measureText3 == 0.0f) {
@@ -50,7 +50,7 @@ public final class PaintCompat {
             return true;
         }
         Pair<Rect, Rect> obtainEmptyRects = obtainEmptyRects();
-        paint.getTextBounds("󟿽", 0, 2, obtainEmptyRects.first);
+        paint.getTextBounds(TOFU_STRING, 0, 2, obtainEmptyRects.first);
         paint.getTextBounds(str, 0, length, obtainEmptyRects.second);
         return !obtainEmptyRects.first.equals(obtainEmptyRects.second);
     }
diff --git a/app/src/main/java/androidx/core/graphics/PathParser.java b/app/src/main/java/androidx/core/graphics/PathParser.java
index 80c35ce99d..0dbeca50dc 100644
--- a/app/src/main/java/androidx/core/graphics/PathParser.java
+++ b/app/src/main/java/androidx/core/graphics/PathParser.java
@@ -4,6 +4,7 @@ import android.graphics.Path;
 import android.util.Log;
 import androidx.annotation.Nullable;
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.ArrayList;
 public class PathParser {
     private static final String LOGTAG = "PathParser";
@@ -381,13 +382,13 @@ public class PathParser {
             double d15 = (d7 + d11) / 2.0d;
             double d16 = (d9 + d12) / 2.0d;
             double d17 = (d14 * d14) + (d13 * d13);
-            if (d17 == 0.0d) {
-                Log.w("PathParser", " Points are coincident");
+            if (d17 == ShadowDrawableWrapper.COS_45) {
+                Log.w(PathParser.LOGTAG, " Points are coincident");
                 return;
             }
             double d18 = (1.0d / d17) - 0.25d;
-            if (d18 < 0.0d) {
-                Log.w("PathParser", "Points are too far apart " + d17);
+            if (d18 < ShadowDrawableWrapper.COS_45) {
+                Log.w(PathParser.LOGTAG, "Points are too far apart " + d17);
                 float sqrt = (float) (Math.sqrt(d17) / 1.99999d);
                 drawArc(path, f, f2, f3, f4, f5 * sqrt, f6 * sqrt, f7, z2, z3);
                 return;
@@ -404,7 +405,7 @@ public class PathParser {
             }
             double atan2 = Math.atan2(d9 - d, d7 - d2);
             double atan22 = Math.atan2(d12 - d, d11 - d2) - atan2;
-            int i = (atan22 > 0.0d ? 1 : (atan22 == 0.0d ? 0 : -1));
+            int i = (atan22 > ShadowDrawableWrapper.COS_45 ? 1 : (atan22 == ShadowDrawableWrapper.COS_45 ? 0 : -1));
             if (z3 != (i >= 0)) {
                 atan22 = i > 0 ? atan22 - 6.283185307179586d : atan22 + 6.283185307179586d;
             }
diff --git a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java
index 94f1a57ebd..fd8e85bd4d 100644
--- a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java
+++ b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java
@@ -73,13 +73,13 @@ public class TypefaceCompatApi21Impl extends TypefaceCompatBaseImpl {
             sHasInitBeenCalled = true;
             Constructor<?> constructor = null;
             try {
-                cls = Class.forName("android.graphics.FontFamily");
+                cls = Class.forName(FONT_FAMILY_CLASS);
                 Constructor<?> constructor2 = cls.getConstructor(new Class[0]);
-                method = cls.getMethod("addFontWeightStyle", String.class, Integer.TYPE, Boolean.TYPE);
-                method2 = Typeface.class.getMethod("createFromFamiliesWithDefault", Array.newInstance(cls, 1).getClass());
+                method = cls.getMethod(ADD_FONT_WEIGHT_STYLE_METHOD, String.class, Integer.TYPE, Boolean.TYPE);
+                method2 = Typeface.class.getMethod(CREATE_FROM_FAMILIES_WITH_DEFAULT_METHOD, Array.newInstance(cls, 1).getClass());
                 constructor = constructor2;
             } catch (ClassNotFoundException | NoSuchMethodException e) {
-                Log.e("TypefaceCompatApi21Impl", e.getClass().getName(), e);
+                Log.e(TAG, e.getClass().getName(), e);
                 method2 = null;
                 cls = null;
                 method = null;
diff --git a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java
index 0fb2050621..56a45670e3 100644
--- a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java
+++ b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java
@@ -37,14 +37,14 @@ public class TypefaceCompatApi24Impl extends TypefaceCompatBaseImpl {
         Class<?> cls;
         Constructor<?> constructor = null;
         try {
-            cls = Class.forName("android.graphics.FontFamily");
+            cls = Class.forName(FONT_FAMILY_CLASS);
             Constructor<?> constructor2 = cls.getConstructor(new Class[0]);
             Class<?> cls2 = Integer.TYPE;
-            method = cls.getMethod("addFontWeightStyle", ByteBuffer.class, cls2, List.class, cls2, Boolean.TYPE);
-            method2 = Typeface.class.getMethod("createFromFamiliesWithDefault", Array.newInstance(cls, 1).getClass());
+            method = cls.getMethod(ADD_FONT_WEIGHT_STYLE_METHOD, ByteBuffer.class, cls2, List.class, cls2, Boolean.TYPE);
+            method2 = Typeface.class.getMethod(CREATE_FROM_FAMILIES_WITH_DEFAULT_METHOD, Array.newInstance(cls, 1).getClass());
             constructor = constructor2;
         } catch (ClassNotFoundException | NoSuchMethodException e) {
-            Log.e("TypefaceCompatApi24Impl", e.getClass().getName(), e);
+            Log.e(TAG, e.getClass().getName(), e);
             cls = null;
             method2 = null;
             method = null;
@@ -76,7 +76,7 @@ public class TypefaceCompatApi24Impl extends TypefaceCompatBaseImpl {
     public static boolean isUsable() {
         Method method = sAddFontWeightStyle;
         if (method == null) {
-            Log.w("TypefaceCompatApi24Impl", "Unable to collect necessary private methods.Fallback to legacy implementation.");
+            Log.w(TAG, "Unable to collect necessary private methods.Fallback to legacy implementation.");
         }
         return method != null;
     }
diff --git a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java
index 75d58ab4b2..6c4ccff5e8 100644
--- a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java
+++ b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java
@@ -62,7 +62,7 @@ public class TypefaceCompatApi26Impl extends TypefaceCompatApi21Impl {
         } catch (ClassNotFoundException | NoSuchMethodException e) {
             StringBuilder K = a.K("Unable to collect necessary methods for class ");
             K.append(e.getClass().getName());
-            Log.e("TypefaceCompatApi26Impl", K.toString(), e);
+            Log.e(TAG, K.toString(), e);
             method5 = null;
             constructor = null;
             method4 = null;
@@ -112,7 +112,7 @@ public class TypefaceCompatApi26Impl extends TypefaceCompatApi21Impl {
 
     private boolean isFontFamilyPrivateAPIAvailable() {
         if (this.mAddFontFromAssetManager == null) {
-            Log.w("TypefaceCompatApi26Impl", "Unable to collect necessary private methods. Fallback to legacy implementation.");
+            Log.w(TAG, "Unable to collect necessary private methods. Fallback to legacy implementation.");
         }
         return this.mAddFontFromAssetManager != null;
     }
@@ -237,28 +237,28 @@ public class TypefaceCompatApi26Impl extends TypefaceCompatApi21Impl {
     }
 
     public Method obtainAbortCreationMethod(Class<?> cls) throws NoSuchMethodException {
-        return cls.getMethod("abortCreation", new Class[0]);
+        return cls.getMethod(ABORT_CREATION_METHOD, new Class[0]);
     }
 
     public Method obtainAddFontFromAssetManagerMethod(Class<?> cls) throws NoSuchMethodException {
         Class<?> cls2 = Integer.TYPE;
-        return cls.getMethod("addFontFromAssetManager", AssetManager.class, String.class, cls2, Boolean.TYPE, cls2, cls2, cls2, FontVariationAxis[].class);
+        return cls.getMethod(ADD_FONT_FROM_ASSET_MANAGER_METHOD, AssetManager.class, String.class, cls2, Boolean.TYPE, cls2, cls2, cls2, FontVariationAxis[].class);
     }
 
     public Method obtainAddFontFromBufferMethod(Class<?> cls) throws NoSuchMethodException {
         Class<?> cls2 = Integer.TYPE;
-        return cls.getMethod("addFontFromBuffer", ByteBuffer.class, cls2, FontVariationAxis[].class, cls2, cls2);
+        return cls.getMethod(ADD_FONT_FROM_BUFFER_METHOD, ByteBuffer.class, cls2, FontVariationAxis[].class, cls2, cls2);
     }
 
     public Method obtainCreateFromFamiliesWithDefaultMethod(Class<?> cls) throws NoSuchMethodException {
         Class cls2 = Integer.TYPE;
-        Method declaredMethod = Typeface.class.getDeclaredMethod("createFromFamiliesWithDefault", Array.newInstance(cls, 1).getClass(), cls2, cls2);
+        Method declaredMethod = Typeface.class.getDeclaredMethod(CREATE_FROM_FAMILIES_WITH_DEFAULT_METHOD, Array.newInstance(cls, 1).getClass(), cls2, cls2);
         declaredMethod.setAccessible(true);
         return declaredMethod;
     }
 
     public Class<?> obtainFontFamily() throws ClassNotFoundException {
-        return Class.forName("android.graphics.FontFamily");
+        return Class.forName(FONT_FAMILY_CLASS);
     }
 
     public Constructor<?> obtainFontFamilyCtor(Class<?> cls) throws NoSuchMethodException {
@@ -266,6 +266,6 @@ public class TypefaceCompatApi26Impl extends TypefaceCompatApi21Impl {
     }
 
     public Method obtainFreezeMethod(Class<?> cls) throws NoSuchMethodException {
-        return cls.getMethod("freeze", new Class[0]);
+        return cls.getMethod(FREEZE_METHOD, new Class[0]);
     }
 }
diff --git a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java
index 94aeea8c16..880c4ba3ad 100644
--- a/app/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java
+++ b/app/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java
@@ -18,7 +18,7 @@ public class TypefaceCompatApi28Impl extends TypefaceCompatApi26Impl {
         try {
             Object newInstance = Array.newInstance(this.mFontFamily, 1);
             Array.set(newInstance, 0, obj);
-            return (Typeface) this.mCreateFromFamiliesWithDefault.invoke(null, newInstance, "sans-serif", -1, -1);
+            return (Typeface) this.mCreateFromFamiliesWithDefault.invoke(null, newInstance, DEFAULT_FAMILY, -1, -1);
         } catch (IllegalAccessException | InvocationTargetException e) {
             throw new RuntimeException(e);
         }
@@ -27,7 +27,7 @@ public class TypefaceCompatApi28Impl extends TypefaceCompatApi26Impl {
     @Override // androidx.core.graphics.TypefaceCompatApi26Impl
     public Method obtainCreateFromFamiliesWithDefaultMethod(Class<?> cls) throws NoSuchMethodException {
         Class cls2 = Integer.TYPE;
-        Method declaredMethod = Typeface.class.getDeclaredMethod("createFromFamiliesWithDefault", Array.newInstance(cls, 1).getClass(), String.class, cls2, cls2);
+        Method declaredMethod = Typeface.class.getDeclaredMethod(CREATE_FROM_FAMILIES_WITH_DEFAULT_METHOD, Array.newInstance(cls, 1).getClass(), String.class, cls2, cls2);
         declaredMethod.setAccessible(true);
         return declaredMethod;
     }
diff --git a/app/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java b/app/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java
index e4b8aad83d..c49aebf283 100644
--- a/app/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java
+++ b/app/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java
@@ -90,10 +90,10 @@ public class TypefaceCompatBaseImpl {
             declaredField.setAccessible(true);
             return ((Number) declaredField.get(typeface)).longValue();
         } catch (NoSuchFieldException e) {
-            Log.e("TypefaceCompatBaseImpl", "Could not retrieve font from family.", e);
+            Log.e(TAG, "Could not retrieve font from family.", e);
             return 0;
         } catch (IllegalAccessException e2) {
-            Log.e("TypefaceCompatBaseImpl", "Could not retrieve font from family.", e2);
+            Log.e(TAG, "Could not retrieve font from family.", e2);
             return 0;
         }
     }
diff --git a/app/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java b/app/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java
index 1f87907fca..cb92f5b50b 100644
--- a/app/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java
+++ b/app/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java
@@ -102,7 +102,7 @@ public class TypefaceCompatUtil {
                 e = e2;
                 fileOutputStream = fileOutputStream2;
                 try {
-                    Log.e("TypefaceCompatUtil", "Error copying resource contents to temp file: " + e.getMessage());
+                    Log.e(TAG, "Error copying resource contents to temp file: " + e.getMessage());
                     closeQuietly(fileOutputStream);
                     StrictMode.setThreadPolicy(allowThreadDiskWrites);
                     return false;
@@ -121,7 +121,7 @@ public class TypefaceCompatUtil {
             }
         } catch (IOException e3) {
             e = e3;
-            Log.e("TypefaceCompatUtil", "Error copying resource contents to temp file: " + e.getMessage());
+            Log.e(TAG, "Error copying resource contents to temp file: " + e.getMessage());
             closeQuietly(fileOutputStream);
             StrictMode.setThreadPolicy(allowThreadDiskWrites);
             return false;
@@ -134,7 +134,7 @@ public class TypefaceCompatUtil {
         if (cacheDir == null) {
             return null;
         }
-        StringBuilder K = a.K(".font");
+        StringBuilder K = a.K(CACHE_FILE_PREFIX);
         K.append(Process.myPid());
         K.append("-");
         K.append(Process.myTid());
diff --git a/app/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java b/app/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java
index 44877b6e70..2c982e9b1a 100644
--- a/app/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java
+++ b/app/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java
@@ -75,7 +75,7 @@ public final class DrawableCompat {
                 sGetLayoutDirectionMethod = declaredMethod;
                 declaredMethod.setAccessible(true);
             } catch (NoSuchMethodException e) {
-                Log.i("DrawableCompat", "Failed to retrieve getLayoutDirection() method", e);
+                Log.i(TAG, "Failed to retrieve getLayoutDirection() method", e);
             }
             sGetLayoutDirectionMethodFetched = true;
         }
@@ -84,7 +84,7 @@ public final class DrawableCompat {
             try {
                 return ((Integer) method.invoke(drawable, new Object[0])).intValue();
             } catch (Exception e2) {
-                Log.i("DrawableCompat", "Failed to invoke getLayoutDirection() via reflection", e2);
+                Log.i(TAG, "Failed to invoke getLayoutDirection() via reflection", e2);
                 sGetLayoutDirectionMethod = null;
             }
         }
@@ -126,7 +126,7 @@ public final class DrawableCompat {
                 sSetLayoutDirectionMethod = declaredMethod;
                 declaredMethod.setAccessible(true);
             } catch (NoSuchMethodException e) {
-                Log.i("DrawableCompat", "Failed to retrieve setLayoutDirection(int) method", e);
+                Log.i(TAG, "Failed to retrieve setLayoutDirection(int) method", e);
             }
             sSetLayoutDirectionMethodFetched = true;
         }
@@ -136,7 +136,7 @@ public final class DrawableCompat {
                 method.invoke(drawable, Integer.valueOf(i));
                 return true;
             } catch (Exception e2) {
-                Log.i("DrawableCompat", "Failed to invoke setLayoutDirection(int) via reflection", e2);
+                Log.i(TAG, "Failed to invoke setLayoutDirection(int) via reflection", e2);
                 sSetLayoutDirectionMethod = null;
             }
         }
diff --git a/app/src/main/java/androidx/core/graphics/drawable/IconCompat.java b/app/src/main/java/androidx/core/graphics/drawable/IconCompat.java
index 36270b8d1b..0b08f270d7 100644
--- a/app/src/main/java/androidx/core/graphics/drawable/IconCompat.java
+++ b/app/src/main/java/androidx/core/graphics/drawable/IconCompat.java
@@ -33,11 +33,14 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.util.Preconditions;
+import androidx.core.view.ViewCompat;
 import androidx.versionedparcelable.CustomVersionedParcelable;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -104,31 +107,31 @@ public class IconCompat extends CustomVersionedParcelable {
     public static IconCompat createFromBundle(@NonNull Bundle bundle) {
         int i = bundle.getInt("type");
         IconCompat iconCompat = new IconCompat(i);
-        iconCompat.mInt1 = bundle.getInt("int1");
-        iconCompat.mInt2 = bundle.getInt("int2");
-        if (bundle.containsKey("tint_list")) {
-            iconCompat.mTintList = (ColorStateList) bundle.getParcelable("tint_list");
+        iconCompat.mInt1 = bundle.getInt(EXTRA_INT1);
+        iconCompat.mInt2 = bundle.getInt(EXTRA_INT2);
+        if (bundle.containsKey(EXTRA_TINT_LIST)) {
+            iconCompat.mTintList = (ColorStateList) bundle.getParcelable(EXTRA_TINT_LIST);
         }
-        if (bundle.containsKey("tint_mode")) {
-            iconCompat.mTintMode = PorterDuff.Mode.valueOf(bundle.getString("tint_mode"));
+        if (bundle.containsKey(EXTRA_TINT_MODE)) {
+            iconCompat.mTintMode = PorterDuff.Mode.valueOf(bundle.getString(EXTRA_TINT_MODE));
         }
         switch (i) {
             case -1:
             case 1:
             case 5:
-                iconCompat.mObj1 = bundle.getParcelable("obj");
+                iconCompat.mObj1 = bundle.getParcelable(EXTRA_OBJ);
                 break;
             case 0:
             default:
-                a.d0("Unknown type ", i, "IconCompat");
+                a.d0("Unknown type ", i, TAG);
                 return null;
             case 2:
             case 4:
             case 6:
-                iconCompat.mObj1 = bundle.getString("obj");
+                iconCompat.mObj1 = bundle.getString(EXTRA_OBJ);
                 break;
             case 3:
-                iconCompat.mObj1 = bundle.getByteArray("obj");
+                iconCompat.mObj1 = bundle.getByteArray(EXTRA_OBJ);
                 break;
         }
         return iconCompat;
@@ -190,23 +193,23 @@ public class IconCompat extends CustomVersionedParcelable {
 
     @VisibleForTesting
     public static Bitmap createLegacyIconFromAdaptiveIcon(Bitmap bitmap, boolean z2) {
-        int min = (int) (((float) Math.min(bitmap.getWidth(), bitmap.getHeight())) * 0.6666667f);
+        int min = (int) (((float) Math.min(bitmap.getWidth(), bitmap.getHeight())) * DEFAULT_VIEW_PORT_SCALE);
         Bitmap createBitmap = Bitmap.createBitmap(min, min, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(createBitmap);
         Paint paint = new Paint(3);
         float f = (float) min;
         float f2 = 0.5f * f;
-        float f3 = 0.9166667f * f2;
+        float f3 = ICON_DIAMETER_FACTOR * f2;
         if (z2) {
-            float f4 = 0.010416667f * f;
+            float f4 = BLUR_FACTOR * f;
             paint.setColor(0);
-            paint.setShadowLayer(f4, 0.0f, f * 0.020833334f, 1023410176);
+            paint.setShadowLayer(f4, 0.0f, f * KEY_SHADOW_OFFSET_FACTOR, 1023410176);
             canvas.drawCircle(f2, f2, f3, paint);
             paint.setShadowLayer(f4, 0.0f, 0.0f, 503316480);
             canvas.drawCircle(f2, f2, f3, paint);
             paint.clearShadowLayer();
         }
-        paint.setColor(-16777216);
+        paint.setColor(ViewCompat.MEASURED_STATE_MASK);
         Shader.TileMode tileMode = Shader.TileMode.CLAMP;
         BitmapShader bitmapShader = new BitmapShader(bitmap, tileMode, tileMode);
         Matrix matrix = new Matrix();
@@ -320,13 +323,13 @@ public class IconCompat extends CustomVersionedParcelable {
         try {
             return ((Integer) icon.getClass().getMethod("getResId", new Class[0]).invoke(icon, new Object[0])).intValue();
         } catch (IllegalAccessException e) {
-            Log.e("IconCompat", "Unable to get icon resource", e);
+            Log.e(TAG, "Unable to get icon resource", e);
             return 0;
         } catch (InvocationTargetException e2) {
-            Log.e("IconCompat", "Unable to get icon resource", e2);
+            Log.e(TAG, "Unable to get icon resource", e2);
             return 0;
         } catch (NoSuchMethodException e3) {
-            Log.e("IconCompat", "Unable to get icon resource", e3);
+            Log.e(TAG, "Unable to get icon resource", e3);
             return 0;
         }
     }
@@ -340,13 +343,13 @@ public class IconCompat extends CustomVersionedParcelable {
         try {
             return (String) icon.getClass().getMethod("getResPackage", new Class[0]).invoke(icon, new Object[0]);
         } catch (IllegalAccessException e) {
-            Log.e("IconCompat", "Unable to get icon package", e);
+            Log.e(TAG, "Unable to get icon package", e);
             return null;
         } catch (InvocationTargetException e2) {
-            Log.e("IconCompat", "Unable to get icon package", e2);
+            Log.e(TAG, "Unable to get icon package", e2);
             return null;
         } catch (NoSuchMethodException e3) {
-            Log.e("IconCompat", "Unable to get icon package", e3);
+            Log.e(TAG, "Unable to get icon package", e3);
             return null;
         }
     }
@@ -363,7 +366,7 @@ public class IconCompat extends CustomVersionedParcelable {
             }
             return null;
         } catch (PackageManager.NameNotFoundException e) {
-            Log.e("IconCompat", String.format("Unable to find pkg=%s for icon", str), e);
+            Log.e(TAG, String.format("Unable to find pkg=%s for icon", str), e);
             return null;
         }
     }
@@ -376,13 +379,13 @@ public class IconCompat extends CustomVersionedParcelable {
         try {
             return ((Integer) icon.getClass().getMethod("getType", new Class[0]).invoke(icon, new Object[0])).intValue();
         } catch (IllegalAccessException e) {
-            Log.e("IconCompat", "Unable to get icon type " + icon, e);
+            Log.e(TAG, "Unable to get icon type " + icon, e);
             return -1;
         } catch (InvocationTargetException e2) {
-            Log.e("IconCompat", "Unable to get icon type " + icon, e2);
+            Log.e(TAG, "Unable to get icon type " + icon, e2);
             return -1;
         } catch (NoSuchMethodException e3) {
-            Log.e("IconCompat", "Unable to get icon type " + icon, e3);
+            Log.e(TAG, "Unable to get icon type " + icon, e3);
             return -1;
         }
     }
@@ -396,13 +399,13 @@ public class IconCompat extends CustomVersionedParcelable {
         try {
             return (Uri) icon.getClass().getMethod("getUri", new Class[0]).invoke(icon, new Object[0]);
         } catch (IllegalAccessException e) {
-            Log.e("IconCompat", "Unable to get icon uri", e);
+            Log.e(TAG, "Unable to get icon uri", e);
             return null;
         } catch (InvocationTargetException e2) {
-            Log.e("IconCompat", "Unable to get icon uri", e2);
+            Log.e(TAG, "Unable to get icon uri", e2);
             return null;
         } catch (NoSuchMethodException e3) {
-            Log.e("IconCompat", "Unable to get icon uri", e3);
+            Log.e(TAG, "Unable to get icon uri", e3);
             return null;
         }
     }
@@ -414,14 +417,14 @@ public class IconCompat extends CustomVersionedParcelable {
             try {
                 return context.getContentResolver().openInputStream(uri);
             } catch (Exception e) {
-                Log.w("IconCompat", "Unable to load image from URI: " + uri, e);
+                Log.w(TAG, "Unable to load image from URI: " + uri, e);
                 return null;
             }
         } else {
             try {
                 return new FileInputStream(new File((String) this.mObj1));
             } catch (FileNotFoundException e2) {
-                Log.w("IconCompat", "Unable to load image from path: " + uri, e2);
+                Log.w(TAG, "Unable to load image from path: " + uri, e2);
                 return null;
             }
         }
@@ -439,7 +442,7 @@ public class IconCompat extends CustomVersionedParcelable {
                 try {
                     return ResourcesCompat.getDrawable(getResources(context, resPackage), this.mInt1, context.getTheme());
                 } catch (RuntimeException e) {
-                    Log.e("IconCompat", String.format("Unable to load resource 0x%08x from pkg=%s", Integer.valueOf(this.mInt1), this.mObj1), e);
+                    Log.e(TAG, String.format("Unable to load resource 0x%08x from pkg=%s", Integer.valueOf(this.mInt1), this.mObj1), e);
                     break;
                 }
             case 3:
@@ -506,7 +509,7 @@ public class IconCompat extends CustomVersionedParcelable {
                         drawable2.draw(new Canvas(bitmap));
                     }
                 }
-                int launcherLargeIconSize = ((ActivityManager) createPackageContext.getSystemService("activity")).getLauncherLargeIconSize();
+                int launcherLargeIconSize = ((ActivityManager) createPackageContext.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY)).getLauncherLargeIconSize();
                 bitmap = Bitmap.createBitmap(launcherLargeIconSize, launcherLargeIconSize, Bitmap.Config.ARGB_8888);
                 drawable2.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
                 drawable2.draw(new Canvas(bitmap));
@@ -535,12 +538,12 @@ public class IconCompat extends CustomVersionedParcelable {
             String str = (String) this.mObj1;
             if (str.contains(":")) {
                 String str2 = str.split(":", -1)[1];
-                String str3 = str2.split("/", -1)[0];
-                String str4 = str2.split("/", -1)[1];
+                String str3 = str2.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, -1)[0];
+                String str4 = str2.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, -1)[1];
                 String str5 = str.split(":", -1)[0];
                 int identifier = getResources(context, str5).getIdentifier(str4, str3, str5);
                 if (this.mInt1 != identifier) {
-                    Log.i("IconCompat", "Id has changed for " + str5 + "/" + str4);
+                    Log.i(TAG, "Id has changed for " + str5 + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + str4);
                     this.mInt1 = identifier;
                 }
             }
@@ -715,34 +718,34 @@ public class IconCompat extends CustomVersionedParcelable {
         Bundle bundle = new Bundle();
         switch (this.mType) {
             case -1:
-                bundle.putParcelable("obj", (Parcelable) this.mObj1);
+                bundle.putParcelable(EXTRA_OBJ, (Parcelable) this.mObj1);
                 break;
             case 0:
             default:
                 throw new IllegalArgumentException("Invalid icon");
             case 1:
             case 5:
-                bundle.putParcelable("obj", (Bitmap) this.mObj1);
+                bundle.putParcelable(EXTRA_OBJ, (Bitmap) this.mObj1);
                 break;
             case 2:
             case 4:
             case 6:
-                bundle.putString("obj", (String) this.mObj1);
+                bundle.putString(EXTRA_OBJ, (String) this.mObj1);
                 break;
             case 3:
-                bundle.putByteArray("obj", (byte[]) this.mObj1);
+                bundle.putByteArray(EXTRA_OBJ, (byte[]) this.mObj1);
                 break;
         }
         bundle.putInt("type", this.mType);
-        bundle.putInt("int1", this.mInt1);
-        bundle.putInt("int2", this.mInt2);
+        bundle.putInt(EXTRA_INT1, this.mInt1);
+        bundle.putInt(EXTRA_INT2, this.mInt2);
         ColorStateList colorStateList = this.mTintList;
         if (colorStateList != null) {
-            bundle.putParcelable("tint_list", colorStateList);
+            bundle.putParcelable(EXTRA_TINT_LIST, colorStateList);
         }
         PorterDuff.Mode mode = this.mTintMode;
         if (mode != DEFAULT_TINT_MODE) {
-            bundle.putString("tint_mode", mode.name());
+            bundle.putString(EXTRA_TINT_MODE, mode.name());
         }
         return bundle;
     }
diff --git a/app/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java b/app/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java
index 8b47455eb3..74a49f493f 100644
--- a/app/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java
+++ b/app/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java
@@ -52,7 +52,7 @@ public final class RoundedBitmapDrawableFactory {
     public static RoundedBitmapDrawable create(@NonNull Resources resources, @NonNull InputStream inputStream) {
         RoundedBitmapDrawable create = create(resources, BitmapFactory.decodeStream(inputStream));
         if (create.getBitmap() == null) {
-            Log.w("RoundedBitmapDrawableFa", "RoundedBitmapDrawable cannot decode " + inputStream);
+            Log.w(TAG, "RoundedBitmapDrawable cannot decode " + inputStream);
         }
         return create;
     }
@@ -61,7 +61,7 @@ public final class RoundedBitmapDrawableFactory {
     public static RoundedBitmapDrawable create(@NonNull Resources resources, @NonNull String str) {
         RoundedBitmapDrawable create = create(resources, BitmapFactory.decodeFile(str));
         if (create.getBitmap() == null) {
-            a.g0("RoundedBitmapDrawable cannot decode ", str, "RoundedBitmapDrawableFa");
+            a.g0("RoundedBitmapDrawable cannot decode ", str, TAG);
         }
         return create;
     }
diff --git a/app/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java b/app/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java
index 3bf8c518c5..e0aecaea98 100644
--- a/app/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java
+++ b/app/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java
@@ -35,7 +35,7 @@ public class WrappedDrawableApi21 extends WrappedDrawableApi14 {
             try {
                 sIsProjectedDrawableMethod = Drawable.class.getDeclaredMethod("isProjected", new Class[0]);
             } catch (Exception e) {
-                Log.w("WrappedDrawableApi21", "Failed to retrieve Drawable#isProjected() method", e);
+                Log.w(TAG, "Failed to retrieve Drawable#isProjected() method", e);
             }
         }
     }
@@ -68,7 +68,7 @@ public class WrappedDrawableApi21 extends WrappedDrawableApi14 {
             try {
                 return ((Boolean) method.invoke(drawable, new Object[0])).booleanValue();
             } catch (Exception e) {
-                Log.w("WrappedDrawableApi21", "Error calling Drawable#isProjected() method", e);
+                Log.w(TAG, "Error calling Drawable#isProjected() method", e);
             }
         }
         return false;
diff --git a/app/src/main/java/androidx/core/net/UriCompat.java b/app/src/main/java/androidx/core/net/UriCompat.java
index fffb63a26d..effd8b6440 100644
--- a/app/src/main/java/androidx/core/net/UriCompat.java
+++ b/app/src/main/java/androidx/core/net/UriCompat.java
@@ -3,6 +3,8 @@ package androidx.core.net;
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 public final class UriCompat {
     private UriCompat() {
     }
@@ -15,7 +17,7 @@ public final class UriCompat {
             if (scheme.equalsIgnoreCase("tel") || scheme.equalsIgnoreCase("sip") || scheme.equalsIgnoreCase("sms") || scheme.equalsIgnoreCase("smsto") || scheme.equalsIgnoreCase("mailto") || scheme.equalsIgnoreCase("nfc")) {
                 StringBuilder sb = new StringBuilder(64);
                 sb.append(scheme);
-                sb.append(':');
+                sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
                 if (schemeSpecificPart != null) {
                     for (int i = 0; i < schemeSpecificPart.length(); i++) {
                         char charAt = schemeSpecificPart.charAt(i);
@@ -27,7 +29,7 @@ public final class UriCompat {
                     }
                 }
                 return sb.toString();
-            } else if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https") || scheme.equalsIgnoreCase("ftp") || scheme.equalsIgnoreCase("rtsp")) {
+            } else if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase(Constants.SCHEME) || scheme.equalsIgnoreCase("ftp") || scheme.equalsIgnoreCase("rtsp")) {
                 StringBuilder K = a.K("//");
                 String str = "";
                 K.append(uri.getHost() != null ? uri.getHost() : str);
@@ -42,7 +44,7 @@ public final class UriCompat {
         StringBuilder sb2 = new StringBuilder(64);
         if (scheme != null) {
             sb2.append(scheme);
-            sb2.append(':');
+            sb2.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         }
         if (schemeSpecificPart != null) {
             sb2.append(schemeSpecificPart);
diff --git a/app/src/main/java/androidx/core/os/HandlerCompat.java b/app/src/main/java/androidx/core/os/HandlerCompat.java
index 34ef836449..543c760eda 100644
--- a/app/src/main/java/androidx/core/os/HandlerCompat.java
+++ b/app/src/main/java/androidx/core/os/HandlerCompat.java
@@ -22,7 +22,7 @@ public final class HandlerCompat {
         try {
             return (Handler) Handler.class.getDeclaredConstructor(Looper.class, Handler.Callback.class, Boolean.TYPE).newInstance(looper, null, Boolean.TRUE);
         } catch (IllegalAccessException | InstantiationException | NoSuchMethodException unused) {
-            Log.v("HandlerCompat", "Unable to invoke Handler(Looper, Callback, boolean) constructor");
+            Log.v(TAG, "Unable to invoke Handler(Looper, Callback, boolean) constructor");
             return new Handler(looper);
         } catch (InvocationTargetException e) {
             Throwable cause = e.getCause();
@@ -44,7 +44,7 @@ public final class HandlerCompat {
         try {
             return (Handler) Handler.class.getDeclaredConstructor(Looper.class, Handler.Callback.class, Boolean.TYPE).newInstance(looper, callback, Boolean.TRUE);
         } catch (IllegalAccessException | InstantiationException | NoSuchMethodException unused) {
-            Log.v("HandlerCompat", "Unable to invoke Handler(Looper, Callback, boolean) constructor");
+            Log.v(TAG, "Unable to invoke Handler(Looper, Callback, boolean) constructor");
             return new Handler(looper, callback);
         } catch (InvocationTargetException e) {
             Throwable cause = e.getCause();
diff --git a/app/src/main/java/androidx/core/os/TraceCompat.java b/app/src/main/java/androidx/core/os/TraceCompat.java
index f3b052f701..e61f71dd3b 100644
--- a/app/src/main/java/androidx/core/os/TraceCompat.java
+++ b/app/src/main/java/androidx/core/os/TraceCompat.java
@@ -24,7 +24,7 @@ public final class TraceCompat {
                 sAsyncTraceEndMethod = Trace.class.getMethod("asyncTraceEnd", cls, String.class, cls2);
                 sTraceCounterMethod = Trace.class.getMethod("traceCounter", cls, String.class, cls2);
             } catch (Exception e) {
-                Log.i("TraceCompat", "Unable to initialize via reflection.", e);
+                Log.i(TAG, "Unable to initialize via reflection.", e);
             }
         }
     }
@@ -40,7 +40,7 @@ public final class TraceCompat {
         try {
             sAsyncTraceBeginMethod.invoke(null, Long.valueOf(sTraceTagApp), str, Integer.valueOf(i));
         } catch (Exception unused) {
-            Log.v("TraceCompat", "Unable to invoke asyncTraceBegin() via reflection.");
+            Log.v(TAG, "Unable to invoke asyncTraceBegin() via reflection.");
         }
     }
 
@@ -56,7 +56,7 @@ public final class TraceCompat {
         try {
             sAsyncTraceEndMethod.invoke(null, Long.valueOf(sTraceTagApp), str, Integer.valueOf(i));
         } catch (Exception unused) {
-            Log.v("TraceCompat", "Unable to invoke endAsyncSection() via reflection.");
+            Log.v(TAG, "Unable to invoke endAsyncSection() via reflection.");
         }
     }
 
@@ -71,7 +71,7 @@ public final class TraceCompat {
         try {
             return ((Boolean) sIsTagEnabledMethod.invoke(null, Long.valueOf(sTraceTagApp))).booleanValue();
         } catch (Exception unused) {
-            Log.v("TraceCompat", "Unable to invoke isTagEnabled() via reflection.");
+            Log.v(TAG, "Unable to invoke isTagEnabled() via reflection.");
             return false;
         }
     }
@@ -84,7 +84,7 @@ public final class TraceCompat {
         try {
             sTraceCounterMethod.invoke(null, Long.valueOf(sTraceTagApp), str, Integer.valueOf(i));
         } catch (Exception unused) {
-            Log.v("TraceCompat", "Unable to invoke traceCounter() via reflection.");
+            Log.v(TAG, "Unable to invoke traceCounter() via reflection.");
         }
     }
 }
diff --git a/app/src/main/java/androidx/core/provider/FontsContractCompat.java b/app/src/main/java/androidx/core/provider/FontsContractCompat.java
index e2b07a2ac3..092a4753bf 100644
--- a/app/src/main/java/androidx/core/provider/FontsContractCompat.java
+++ b/app/src/main/java/androidx/core/provider/FontsContractCompat.java
@@ -28,6 +28,7 @@ import androidx.core.graphics.TypefaceCompatUtil;
 import androidx.core.provider.SelfDestructiveThread;
 import androidx.core.util.Preconditions;
 import c.d.b.a.a;
+import com.discord.stores.StoreConnectivity;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
@@ -47,7 +48,7 @@ public class FontsContractCompat {
     public static final int RESULT_CODE_PROVIDER_NOT_FOUND = -1;
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
     public static final int RESULT_CODE_WRONG_CERTIFICATES = -2;
-    private static final SelfDestructiveThread sBackgroundThread = new SelfDestructiveThread("fonts", 10, 10000);
+    private static final SelfDestructiveThread sBackgroundThread = new SelfDestructiveThread("fonts", 10, BACKGROUND_THREAD_KEEP_ALIVE_DURATION_MS);
     private static final Comparator<byte[]> sByteArrayComparator = new AnonymousClass5();
     public static final Object sLock = new Object();
     @GuardedBy("sLock")
@@ -377,7 +378,7 @@ public class FontsContractCompat {
             return this.mUri;
         }
 
-        @IntRange(from = 1, to = 1000)
+        @IntRange(from = 1, to = StoreConnectivity.DELAY_NOMINAL)
         public int getWeight() {
             return this.mWeight;
         }
@@ -466,15 +467,15 @@ public class FontsContractCompat {
         Uri build2 = new Uri.Builder().scheme("content").authority(str).appendPath("file").build();
         Cursor cursor = null;
         try {
-            cursor = context.getContentResolver().query(build, new String[]{"_id", "file_id", "font_ttc_index", "font_variation_settings", "font_weight", "font_italic", "result_code"}, "query = ?", new String[]{fontRequest.getQuery()}, null, cancellationSignal);
+            cursor = context.getContentResolver().query(build, new String[]{"_id", Columns.FILE_ID, Columns.TTC_INDEX, Columns.VARIATION_SETTINGS, Columns.WEIGHT, Columns.ITALIC, Columns.RESULT_CODE}, "query = ?", new String[]{fontRequest.getQuery()}, null, cancellationSignal);
             if (cursor != null && cursor.getCount() > 0) {
-                int columnIndex = cursor.getColumnIndex("result_code");
+                int columnIndex = cursor.getColumnIndex(Columns.RESULT_CODE);
                 ArrayList arrayList2 = new ArrayList();
                 int columnIndex2 = cursor.getColumnIndex("_id");
-                int columnIndex3 = cursor.getColumnIndex("file_id");
-                int columnIndex4 = cursor.getColumnIndex("font_ttc_index");
-                int columnIndex5 = cursor.getColumnIndex("font_weight");
-                int columnIndex6 = cursor.getColumnIndex("font_italic");
+                int columnIndex3 = cursor.getColumnIndex(Columns.FILE_ID);
+                int columnIndex4 = cursor.getColumnIndex(Columns.TTC_INDEX);
+                int columnIndex5 = cursor.getColumnIndex(Columns.WEIGHT);
+                int columnIndex6 = cursor.getColumnIndex(Columns.ITALIC);
                 while (cursor.moveToNext()) {
                     int i = columnIndex != -1 ? cursor.getInt(columnIndex) : 0;
                     arrayList2.add(new FontInfo(columnIndex3 == -1 ? ContentUris.withAppendedId(build, cursor.getLong(columnIndex2)) : ContentUris.withAppendedId(build2, cursor.getLong(columnIndex3)), columnIndex4 != -1 ? cursor.getInt(columnIndex4) : 0, columnIndex5 != -1 ? cursor.getInt(columnIndex5) : 400, columnIndex6 != -1 && cursor.getInt(columnIndex6) == 1, i));
diff --git a/app/src/main/java/androidx/core/text/BidiFormatter.java b/app/src/main/java/androidx/core/text/BidiFormatter.java
index 8e5c2d87c0..1325e1fc08 100644
--- a/app/src/main/java/androidx/core/text/BidiFormatter.java
+++ b/app/src/main/java/androidx/core/text/BidiFormatter.java
@@ -14,11 +14,11 @@ public final class BidiFormatter {
     private static final int FLAG_STEREO_RESET = 2;
     private static final char LRE = 8234;
     private static final char LRM = 8206;
-    private static final String LRM_STRING = Character.toString(8206);
+    private static final String LRM_STRING = Character.toString(LRM);
     private static final char PDF = 8236;
     private static final char RLE = 8235;
     private static final char RLM = 8207;
-    private static final String RLM_STRING = Character.toString(8207);
+    private static final String RLM_STRING = Character.toString(RLM);
     private final TextDirectionHeuristicCompat mDefaultTextDirectionHeuristicCompat;
     private final int mFlags;
     private final boolean mIsRtlContext;
@@ -70,7 +70,7 @@ public final class BidiFormatter {
     }
 
     public static class DirectionalityEstimator {
-        private static final byte[] DIR_TYPE_CACHE = new byte[1792];
+        private static final byte[] DIR_TYPE_CACHE = new byte[DIR_TYPE_CACHE_SIZE];
         private static final int DIR_TYPE_CACHE_SIZE = 1792;
         private int charIndex;
         private final boolean isHtml;
@@ -79,7 +79,7 @@ public final class BidiFormatter {
         private final CharSequence text;
 
         static {
-            for (int i = 0; i < 1792; i++) {
+            for (int i = 0; i < DIR_TYPE_CACHE_SIZE; i++) {
                 DIR_TYPE_CACHE[i] = Character.getDirectionality(i);
             }
         }
@@ -91,7 +91,7 @@ public final class BidiFormatter {
         }
 
         private static byte getCachedDirectionality(char c2) {
-            return c2 < 1792 ? DIR_TYPE_CACHE[c2] : Character.getDirectionality(c2);
+            return c2 < DIR_TYPE_CACHE_SIZE ? DIR_TYPE_CACHE[c2] : Character.getDirectionality(c2);
         }
 
         private byte skipEntityBackward() {
@@ -434,9 +434,9 @@ public final class BidiFormatter {
             spannableStringBuilder.append((CharSequence) markBefore(charSequence, isRtl ? TextDirectionHeuristicsCompat.RTL : TextDirectionHeuristicsCompat.LTR));
         }
         if (isRtl != this.mIsRtlContext) {
-            spannableStringBuilder.append(isRtl ? (char) 8235 : 8234);
+            spannableStringBuilder.append(isRtl ? RLE : LRE);
             spannableStringBuilder.append(charSequence);
-            spannableStringBuilder.append((char) 8236);
+            spannableStringBuilder.append(PDF);
         } else {
             spannableStringBuilder.append(charSequence);
         }
diff --git a/app/src/main/java/androidx/core/text/ICUCompat.java b/app/src/main/java/androidx/core/text/ICUCompat.java
index 33756819da..3c8c280318 100644
--- a/app/src/main/java/androidx/core/text/ICUCompat.java
+++ b/app/src/main/java/androidx/core/text/ICUCompat.java
@@ -33,9 +33,9 @@ public final class ICUCompat {
                 return (String) method.invoke(null, locale2);
             }
         } catch (IllegalAccessException e) {
-            Log.w("ICUCompat", e);
+            Log.w(TAG, e);
         } catch (InvocationTargetException e2) {
-            Log.w("ICUCompat", e2);
+            Log.w(TAG, e2);
         }
         return locale2;
     }
@@ -47,9 +47,9 @@ public final class ICUCompat {
                 return (String) method.invoke(null, str);
             }
         } catch (IllegalAccessException e) {
-            Log.w("ICUCompat", e);
+            Log.w(TAG, e);
         } catch (InvocationTargetException e2) {
-            Log.w("ICUCompat", e2);
+            Log.w(TAG, e2);
         }
         return null;
     }
@@ -62,10 +62,10 @@ public final class ICUCompat {
         try {
             return ((Locale) sAddLikelySubtagsMethod.invoke(null, locale)).getScript();
         } catch (InvocationTargetException e) {
-            Log.w("ICUCompat", e);
+            Log.w(TAG, e);
             return locale.getScript();
         } catch (IllegalAccessException e2) {
-            Log.w("ICUCompat", e2);
+            Log.w(TAG, e2);
             return locale.getScript();
         }
     }
diff --git a/app/src/main/java/androidx/core/text/PrecomputedTextCompat.java b/app/src/main/java/androidx/core/text/PrecomputedTextCompat.java
index 80b9405ce4..25987bb131 100644
--- a/app/src/main/java/androidx/core/text/PrecomputedTextCompat.java
+++ b/app/src/main/java/androidx/core/text/PrecomputedTextCompat.java
@@ -260,7 +260,7 @@ public class PrecomputedTextCompat implements Spannable {
             int length = charSequence.length();
             int i = 0;
             while (i < length) {
-                int indexOf = TextUtils.indexOf(charSequence, '\n', i, length);
+                int indexOf = TextUtils.indexOf(charSequence, (char) LINE_FEED, i, length);
                 i = indexOf < 0 ? length : indexOf + 1;
                 arrayList.add(Integer.valueOf(i));
             }
diff --git a/app/src/main/java/androidx/core/text/SpannedStringKt.java b/app/src/main/java/androidx/core/text/SpannedStringKt.java
index c3fff074e8..fe8a21dd16 100644
--- a/app/src/main/java/androidx/core/text/SpannedStringKt.java
+++ b/app/src/main/java/androidx/core/text/SpannedStringKt.java
@@ -2,12 +2,13 @@ package androidx.core.text;
 
 import android.text.Spanned;
 import android.text.SpannedString;
+import androidx.exifinterface.media.ExifInterface;
 import d0.z.d.m;
 /* compiled from: SpannedString.kt */
 public final class SpannedStringKt {
     public static final /* synthetic */ <T> T[] getSpans(Spanned spanned, int i, int i2) {
         m.checkParameterIsNotNull(spanned, "$this$getSpans");
-        m.reifiedOperationMarker(4, "T");
+        m.reifiedOperationMarker(4, ExifInterface.GPS_DIRECTION_TRUE);
         T[] tArr = (T[]) spanned.getSpans(i, i2, Object.class);
         m.checkExpressionValueIsNotNull(tArr, "getSpans(start, end, T::class.java)");
         return tArr;
@@ -21,7 +22,7 @@ public final class SpannedStringKt {
             i2 = spanned.length();
         }
         m.checkParameterIsNotNull(spanned, "$this$getSpans");
-        m.reifiedOperationMarker(4, "T");
+        m.reifiedOperationMarker(4, ExifInterface.GPS_DIRECTION_TRUE);
         Object[] spans = spanned.getSpans(i, i2, Object.class);
         m.checkExpressionValueIsNotNull(spans, "getSpans(start, end, T::class.java)");
         return spans;
diff --git a/app/src/main/java/androidx/core/text/util/FindAddress.java b/app/src/main/java/androidx/core/text/util/FindAddress.java
index 355fd1b5c3..c8fb3aa6b3 100644
--- a/app/src/main/java/androidx/core/text/util/FindAddress.java
+++ b/app/src/main/java/androidx/core/text/util/FindAddress.java
@@ -73,7 +73,7 @@ public class FindAddress {
                     if (matcher.end() - matcher.start() <= 25) {
                         while (end < matcher.start()) {
                             int i5 = end + 1;
-                            if ("\n\u000b\f\r…

".indexOf(str.charAt(end)) != -1) {
+                            if (NL.indexOf(str.charAt(end)) != -1) {
                                 i++;
                             }
                             end = i5;
@@ -229,7 +229,7 @@ public class FindAddress {
 
     @VisibleForTesting
     public static MatchResult matchHouseNumber(String str, int i) {
-        if (i > 0 && ":,\"'\t                　\n\u000b\f\r…

".indexOf(str.charAt(i - 1)) == -1) {
+        if (i > 0 && HOUSE_PRE_DELIM.indexOf(str.charAt(i - 1)) == -1) {
             return null;
         }
         Matcher region = sHouseNumberRe.matcher(str).region(i, str.length());
@@ -244,7 +244,7 @@ public class FindAddress {
 
     @VisibleForTesting
     public static MatchResult matchState(String str, int i) {
-        if (i > 0 && ",*•\t                　\n\u000b\f\r…

".indexOf(str.charAt(i - 1)) == -1) {
+        if (i > 0 && WORD_DELIM.indexOf(str.charAt(i - 1)) == -1) {
             return null;
         }
         Matcher region = sStateRe.matcher(str).region(i, str.length());
diff --git a/app/src/main/java/androidx/core/text/util/LinkifyCompat.java b/app/src/main/java/androidx/core/text/util/LinkifyCompat.java
index 910ef5fb98..f4c021e6d9 100644
--- a/app/src/main/java/androidx/core/text/util/LinkifyCompat.java
+++ b/app/src/main/java/androidx/core/text/util/LinkifyCompat.java
@@ -14,6 +14,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.core.util.PatternsCompat;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -237,7 +238,7 @@ public final class LinkifyCompat {
                         linkSpec.end = i;
                         obj = obj.substring(length);
                         try {
-                            String encode = URLEncoder.encode(findAddress, "UTF-8");
+                            String encode = URLEncoder.encode(findAddress, Constants.ENCODING);
                             linkSpec.url = "geo:0,0?q=" + encode;
                             arrayList.add(linkSpec);
                         } catch (UnsupportedEncodingException unused) {
diff --git a/app/src/main/java/androidx/core/util/AtomicFileKt.java b/app/src/main/java/androidx/core/util/AtomicFileKt.java
index 0ced766f46..e44e0d1052 100644
--- a/app/src/main/java/androidx/core/util/AtomicFileKt.java
+++ b/app/src/main/java/androidx/core/util/AtomicFileKt.java
@@ -2,6 +2,7 @@ package androidx.core.util;
 
 import android.util.AtomicFile;
 import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 import d0.g0.c;
 import d0.z.d.l;
 import d0.z.d.m;
@@ -72,7 +73,7 @@ public final class AtomicFileKt {
     @RequiresApi(17)
     public static final void writeText(AtomicFile atomicFile, String str, Charset charset) {
         m.checkParameterIsNotNull(atomicFile, "$this$writeText");
-        m.checkParameterIsNotNull(str, "text");
+        m.checkParameterIsNotNull(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         m.checkParameterIsNotNull(charset, "charset");
         byte[] bytes = str.getBytes(charset);
         m.checkExpressionValueIsNotNull(bytes, "(this as java.lang.String).getBytes(charset)");
diff --git a/app/src/main/java/androidx/core/util/PatternsCompat.java b/app/src/main/java/androidx/core/util/PatternsCompat.java
index 78f199cf25..58fd56b716 100644
--- a/app/src/main/java/androidx/core/util/PatternsCompat.java
+++ b/app/src/main/java/androidx/core/util/PatternsCompat.java
@@ -39,14 +39,14 @@ public final class PatternsCompat {
         IP_ADDRESS = compile;
         Pattern compile2 = Pattern.compile("(([a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]](?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]_\\-]{0,61}[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]]){0,1}\\.)+(xn\\-\\-[\\w\\-]{0,58}\\w|[a-zA-Z[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]]{2,63})|" + compile + ")");
         DOMAIN_NAME = compile2;
-        WEB_URL = Pattern.compile("(((?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)?(?:" + compile2 + ")(?:\\:\\d{1,5})?)([/\\?](?:(?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]];/\\?:@&=#~\\-\\.\\+!\\*'\\(\\),_\\$])|(?:%[a-fA-F0-9]{2}))*)?(?:\\b|$|^))");
+        WEB_URL = Pattern.compile("(((?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)?(?:" + compile2 + ")(?:" + PORT_NUMBER + ")?)(" + PATH_AND_QUERY + ")?" + WORD_BOUNDARY + ")");
         Pattern compile3 = Pattern.compile("(?:(?:(?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]](?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]_\\-]{0,61}[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]]){0,1}\\.)+(?:(?:(?:aaa|aarp|abb|abbott|abogado|academy|accenture|accountant|accountants|aco|active|actor|ads|adult|aeg|aero|afl|agency|aig|airforce|airtel|allfinanz|alsace|amica|amsterdam|android|apartments|app|apple|aquarelle|aramco|archi|army|arpa|arte|asia|associates|attorney|auction|audio|auto|autos|axa|azure|a[cdefgilmoqrstuwxz])|(?:band|bank|bar|barcelona|barclaycard|barclays|bargains|bauhaus|bayern|bbc|bbva|bcn|beats|beer|bentley|berlin|best|bet|bharti|bible|bid|bike|bing|bingo|bio|biz|black|blackfriday|bloomberg|blue|bms|bmw|bnl|bnpparibas|boats|bom|bond|boo|boots|boutique|bradesco|bridgestone|broadway|broker|brother|brussels|budapest|build|builders|business|buzz|bzh|b[abdefghijmnorstvwyz])|(?:cab|cafe|cal|camera|camp|cancerresearch|canon|capetown|capital|car|caravan|cards|care|career|careers|cars|cartier|casa|cash|casino|cat|catering|cba|cbn|ceb|center|ceo|cern|cfa|cfd|chanel|channel|chat|cheap|chloe|christmas|chrome|church|cipriani|cisco|citic|city|cityeats|claims|cleaning|click|clinic|clothing|cloud|club|clubmed|coach|codes|coffee|college|cologne|com|commbank|community|company|computer|comsec|condos|construction|consulting|contractors|cooking|cool|coop|corsica|country|coupons|courses|credit|creditcard|creditunion|cricket|crown|crs|cruises|csc|cuisinella|cymru|cyou|c[acdfghiklmnoruvwxyz])|(?:dabur|dad|dance|date|dating|datsun|day|dclk|deals|degree|delivery|dell|delta|democrat|dental|dentist|desi|design|dev|diamonds|diet|digital|direct|directory|discount|dnp|docs|dog|doha|domains|doosan|download|drive|durban|dvag|d[ejkmoz])|(?:earth|eat|edu|education|email|emerck|energy|engineer|engineering|enterprises|epson|equipment|erni|esq|estate|eurovision|eus|events|everbank|exchange|expert|exposed|express|e[cegrstu])|(?:fage|fail|fairwinds|faith|family|fan|fans|farm|fashion|feedback|ferrero|film|final|finance|financial|firmdale|fish|fishing|fit|fitness|flights|florist|flowers|flsmidth|fly|foo|football|forex|forsale|forum|foundation|frl|frogans|fund|furniture|futbol|fyi|f[ijkmor])|(?:gal|gallery|game|garden|gbiz|gdn|gea|gent|genting|ggee|gift|gifts|gives|giving|glass|gle|global|globo|gmail|gmo|gmx|gold|goldpoint|golf|goo|goog|google|gop|gov|grainger|graphics|gratis|green|gripe|group|gucci|guge|guide|guitars|guru|g[abdefghilmnpqrstuwy])|(?:hamburg|hangout|haus|healthcare|help|here|hermes|hiphop|hitachi|hiv|hockey|holdings|holiday|homedepot|homes|honda|horse|host|hosting|hoteles|hotmail|house|how|hsbc|hyundai|h[kmnrtu])|(?:ibm|icbc|ice|icu|ifm|iinet|immo|immobilien|industries|infiniti|info|ing|ink|institute|insure|int|international|investments|ipiranga|irish|ist|istanbul|itau|iwc|i[delmnoqrst])|(?:jaguar|java|jcb|jetzt|jewelry|jlc|jll|jobs|joburg|jprs|juegos|j[emop])|(?:kaufen|kddi|kia|kim|kinder|kitchen|kiwi|koeln|komatsu|krd|kred|kyoto|k[eghimnprwyz])|(?:lacaixa|lancaster|land|landrover|lasalle|lat|latrobe|law|lawyer|lds|lease|leclerc|legal|lexus|lgbt|liaison|lidl|life|lifestyle|lighting|limited|limo|linde|link|live|lixil|loan|loans|lol|london|lotte|lotto|love|ltd|ltda|lupin|luxe|luxury|l[abcikrstuvy])|(?:madrid|maif|maison|man|management|mango|market|marketing|markets|marriott|mba|media|meet|melbourne|meme|memorial|men|menu|meo|miami|microsoft|mil|mini|mma|mobi|moda|moe|moi|mom|monash|money|montblanc|mormon|mortgage|moscow|motorcycles|mov|movie|movistar|mtn|mtpc|mtr|museum|mutuelle|m[acdeghklmnopqrstuvwxyz])|(?:nadex|nagoya|name|navy|nec|net|netbank|network|neustar|new|news|nexus|ngo|nhk|nico|ninja|nissan|nokia|nra|nrw|ntt|nyc|n[acefgilopruz])|(?:obi|office|okinawa|omega|one|ong|onl|online|ooo|oracle|orange|org|organic|osaka|otsuka|ovh|om)|(?:page|panerai|paris|partners|parts|party|pet|pharmacy|philips|photo|photography|photos|physio|piaget|pics|pictet|pictures|ping|pink|pizza|place|play|playstation|plumbing|plus|pohl|poker|porn|post|praxi|press|pro|prod|productions|prof|properties|property|protection|pub|p[aefghklmnrstwy])|(?:qpon|quebec|qa)|(?:racing|realtor|realty|recipes|red|redstone|rehab|reise|reisen|reit|ren|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rich|ricoh|rio|rip|rocher|rocks|rodeo|rsvp|ruhr|run|rwe|ryukyu|r[eosuw])|(?:saarland|sakura|sale|samsung|sandvik|sandvikcoromant|sanofi|sap|sapo|sarl|saxo|sbs|sca|scb|schmidt|scholarships|school|schule|schwarz|science|scor|scot|seat|security|seek|sener|services|seven|sew|sex|sexy|shiksha|shoes|show|shriram|singles|site|ski|sky|skype|sncf|soccer|social|software|sohu|solar|solutions|sony|soy|space|spiegel|spreadbetting|srl|stada|starhub|statoil|stc|stcgroup|stockholm|studio|study|style|sucks|supplies|supply|support|surf|surgery|suzuki|swatch|swiss|sydney|systems|s[abcdeghijklmnortuvxyz])|(?:tab|taipei|tatamotors|tatar|tattoo|tax|taxi|team|tech|technology|tel|telefonica|temasek|tennis|thd|theater|theatre|tickets|tienda|tips|tires|tirol|today|tokyo|tools|top|toray|toshiba|tours|town|toyota|toys|trade|trading|training|travel|trust|tui|t[cdfghjklmnortvwz])|(?:ubs|university|uno|uol|u[agksyz])|(?:vacations|vana|vegas|ventures|versicherung|vet|viajes|video|villas|vin|virgin|vision|vista|vistaprint|viva|vlaanderen|vodka|vote|voting|voto|voyage|v[aceginu])|(?:wales|walter|wang|watch|webcam|website|wed|wedding|weir|whoswho|wien|wiki|williamhill|win|windows|wine|wme|work|works|world|wtc|wtf|w[fs])|(?:ελ|бел|дети|ком|мкд|мон|москва|онлайн|орг|рус|рф|сайт|срб|укр|қаз|հայ|קום|ارامكو|الاردن|الجزائر|السعودية|المغرب|امارات|ایران|بازار|بھارت|تونس|سودان|سورية|شبكة|عراق|عمان|فلسطين|قطر|كوم|مصر|مليسيا|موقع|कॉम|नेट|भारत|संगठन|ভারত|ਭਾਰਤ|ભારત|இந்தியா|இலங்கை|சிங்கப்பூர்|భారత్|ලංකා|คอม|ไทย|გე|みんな|グーグル|コム|世界|中信|中国|中國|中文网|企业|佛山|信息|健康|八卦|公司|公益|台湾|台灣|商城|商店|商标|在线|大拿|娱乐|工行|广东|慈善|我爱你|手机|政务|政府|新加坡|新闻|时尚|机构|淡马锡|游戏|点看|移动|组织机构|网址|网店|网络|谷歌|集团|飞利浦|餐厅|香港|닷넷|닷컴|삼성|한국|xbox|xerox|xin|xn\\-\\-11b4c3d|xn\\-\\-1qqw23a|xn\\-\\-30rr7y|xn\\-\\-3bst00m|xn\\-\\-3ds443g|xn\\-\\-3e0b707e|xn\\-\\-3pxu8k|xn\\-\\-42c2d9a|xn\\-\\-45brj9c|xn\\-\\-45q11c|xn\\-\\-4gbrim|xn\\-\\-55qw42g|xn\\-\\-55qx5d|xn\\-\\-6frz82g|xn\\-\\-6qq986b3xl|xn\\-\\-80adxhks|xn\\-\\-80ao21a|xn\\-\\-80asehdb|xn\\-\\-80aswg|xn\\-\\-90a3ac|xn\\-\\-90ais|xn\\-\\-9dbq2a|xn\\-\\-9et52u|xn\\-\\-b4w605ferd|xn\\-\\-c1avg|xn\\-\\-c2br7g|xn\\-\\-cg4bki|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-czr694b|xn\\-\\-czrs0t|xn\\-\\-czru2d|xn\\-\\-d1acj3b|xn\\-\\-d1alf|xn\\-\\-efvy88h|xn\\-\\-estv75g|xn\\-\\-fhbei|xn\\-\\-fiq228c5hs|xn\\-\\-fiq64b|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fjq720a|xn\\-\\-flw351e|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hxt814e|xn\\-\\-i1b6b1a6a2e|xn\\-\\-imr513n|xn\\-\\-io0a7i|xn\\-\\-j1aef|xn\\-\\-j1amh|xn\\-\\-j6w193g|xn\\-\\-kcrx77d1x4a|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-kput3i|xn\\-\\-l1acc|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgb9awbf|xn\\-\\-mgba3a3ejt|xn\\-\\-mgba3a4f16a|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbab2bd|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-mgbpl2fh|xn\\-\\-mgbtx2b|xn\\-\\-mgbx4cd0ab|xn\\-\\-mk1bu44c|xn\\-\\-mxtq1m|xn\\-\\-ngbc5azd|xn\\-\\-node|xn\\-\\-nqv7f|xn\\-\\-nqv7fs00ema|xn\\-\\-nyqy26a|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1acf|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-pssy2u|xn\\-\\-q9jyb4c|xn\\-\\-qcka1pmc|xn\\-\\-qxam|xn\\-\\-rhqv96g|xn\\-\\-s9brj9c|xn\\-\\-ses554g|xn\\-\\-t60b56a|xn\\-\\-tckwe|xn\\-\\-unup4y|xn\\-\\-vermgensberater\\-ctb|xn\\-\\-vermgensberatung\\-pwb|xn\\-\\-vhquv|xn\\-\\-vuq861b|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xhq521b|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-y9a3aq|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zfr164b|xperia|xxx|xyz)|(?:yachts|yamaxun|yandex|yodobashi|yoga|yokohama|youtube|y[et])|(?:zara|zip|zone|zuerich|z[amw]))|xn\\-\\-[\\w\\-]{0,58}\\w))|" + compile + ")");
         STRICT_DOMAIN_NAME = compile3;
         String str = "(?:(?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]](?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]_\\-]{0,61}[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]]]){0,1}(?:\\.(?=\\S))?)+|" + compile + ")";
         RELAXED_DOMAIN_NAME = str;
-        String str2 = "((?:\\b|$|^)(?<!:\\/\\/)((?:" + compile3 + ")(?:\\:\\d{1,5})?)(?:[/\\?](?:(?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]];/\\?:@&=#~\\-\\.\\+!\\*'\\(\\),_\\$])|(?:%[a-fA-F0-9]{2}))*)?(?:\\b|$|^))";
+        String str2 = "((?:\\b|$|^)(?<!:\\/\\/)((?:" + compile3 + ")(?:" + PORT_NUMBER + ")?)(?:" + PATH_AND_QUERY + ")?" + WORD_BOUNDARY + ")";
         WEB_URL_WITHOUT_PROTOCOL = str2;
-        String str3 = "((?:\\b|$|^)(?:(?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)(?:" + str + ")?(?:\\:\\d{1,5})?)(?:[/\\?](?:(?:[a-zA-Z0-9[ -퟿豈-﷏ﷰ-￯𐀀-🿽𠀀-𯿽𰀀-𿿽񀀀-񏿽񐀀-񟿽񠀀-񯿽񰀀-񿿽򀀀-򏿽򐀀-򟿽򠀀-򯿽򰀀-򿿽󀀀-󏿽󐀀-󟿽󡀀-󯿽&&[^ [ - ]

 　]];/\\?:@&=#~\\-\\.\\+!\\*'\\(\\),_\\$])|(?:%[a-fA-F0-9]{2}))*)?(?:\\b|$|^))";
+        String str3 = "((?:\\b|$|^)(?:(?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)(?:" + str + ")?(?:" + PORT_NUMBER + ")?)(?:" + PATH_AND_QUERY + ")?" + WORD_BOUNDARY + ")";
         WEB_URL_WITH_PROTOCOL = str3;
         AUTOLINK_WEB_URL = Pattern.compile("(" + str3 + "|" + str2 + ")");
     }
diff --git a/app/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java b/app/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java
index 9db49831f4..8bed652830 100644
--- a/app/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java
+++ b/app/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java
@@ -11,6 +11,7 @@ import android.view.accessibility.AccessibilityNodeProvider;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.core.R;
+import androidx.core.view.accessibility.AccessibilityClickableSpanCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
 import java.lang.ref.WeakReference;
@@ -181,7 +182,7 @@ public class AccessibilityDelegateCompat {
         if (!z2) {
             z2 = this.mOriginalDelegate.performAccessibilityAction(view, i, bundle);
         }
-        return (z2 || i != R.id.accessibility_action_clickable_span) ? z2 : performClickableSpanAction(bundle.getInt("ACCESSIBILITY_CLICKABLE_SPAN_ID", -1), view);
+        return (z2 || i != R.id.accessibility_action_clickable_span) ? z2 : performClickableSpanAction(bundle.getInt(AccessibilityClickableSpanCompat.SPAN_ID, -1), view);
     }
 
     public void sendAccessibilityEvent(View view, int i) {
diff --git a/app/src/main/java/androidx/core/view/ActionProvider.java b/app/src/main/java/androidx/core/view/ActionProvider.java
index d1d86229a7..65b2c95521 100644
--- a/app/src/main/java/androidx/core/view/ActionProvider.java
+++ b/app/src/main/java/androidx/core/view/ActionProvider.java
@@ -77,7 +77,7 @@ public abstract class ActionProvider {
             StringBuilder K = a.K("setVisibilityListener: Setting a new ActionProvider.VisibilityListener when one is already set. Are you reusing this ");
             K.append(getClass().getSimpleName());
             K.append(" instance while it is still in use somewhere else?");
-            Log.w("ActionProvider(support)", K.toString());
+            Log.w(TAG, K.toString());
         }
         this.mVisibilityListener = visibilityListener;
     }
diff --git a/app/src/main/java/androidx/core/view/DisplayCompat.java b/app/src/main/java/androidx/core/view/DisplayCompat.java
index 26c38d9248..94d96ba146 100644
--- a/app/src/main/java/androidx/core/view/DisplayCompat.java
+++ b/app/src/main/java/androidx/core/view/DisplayCompat.java
@@ -65,7 +65,7 @@ public final class DisplayCompat {
             return parsePhysicalDisplaySizeFromSystemProperties;
         }
         if (isSonyBravia4kTv(context)) {
-            return new Point(3840, 2160);
+            return new Point(DISPLAY_SIZE_4K_WIDTH, DISPLAY_SIZE_4K_HEIGHT);
         }
         Point point = new Point();
         if (i >= 23) {
diff --git a/app/src/main/java/androidx/core/view/LayoutInflaterCompat.java b/app/src/main/java/androidx/core/view/LayoutInflaterCompat.java
index 1df6b93b59..7d74f27312 100644
--- a/app/src/main/java/androidx/core/view/LayoutInflaterCompat.java
+++ b/app/src/main/java/androidx/core/view/LayoutInflaterCompat.java
@@ -50,7 +50,7 @@ public final class LayoutInflaterCompat {
                 StringBuilder K = a.K("forceSetFactory2 Could not find field 'mFactory2' on class ");
                 K.append(LayoutInflater.class.getName());
                 K.append("; inflation may have unexpected results.");
-                Log.e("LayoutInflaterCompatHC", K.toString(), e);
+                Log.e(TAG, K.toString(), e);
             }
             sCheckedField = true;
         }
@@ -59,7 +59,7 @@ public final class LayoutInflaterCompat {
             try {
                 field.set(layoutInflater, factory2);
             } catch (IllegalAccessException e2) {
-                Log.e("LayoutInflaterCompatHC", "forceSetFactory2 could not set the Factory2 on LayoutInflater " + layoutInflater + "; inflation may have unexpected results.", e2);
+                Log.e(TAG, "forceSetFactory2 could not set the Factory2 on LayoutInflater " + layoutInflater + "; inflation may have unexpected results.", e2);
             }
         }
     }
diff --git a/app/src/main/java/androidx/core/view/MenuItemCompat.java b/app/src/main/java/androidx/core/view/MenuItemCompat.java
index 5d1fb2a312..6b2da81c7b 100644
--- a/app/src/main/java/androidx/core/view/MenuItemCompat.java
+++ b/app/src/main/java/androidx/core/view/MenuItemCompat.java
@@ -63,7 +63,7 @@ public final class MenuItemCompat {
         if (menuItem instanceof SupportMenuItem) {
             return ((SupportMenuItem) menuItem).getSupportActionProvider();
         }
-        Log.w("MenuItemCompat", "getActionProvider: item does not implement SupportMenuItem; returning null");
+        Log.w(TAG, "getActionProvider: item does not implement SupportMenuItem; returning null");
         return null;
     }
 
@@ -141,7 +141,7 @@ public final class MenuItemCompat {
         if (menuItem instanceof SupportMenuItem) {
             return ((SupportMenuItem) menuItem).setSupportActionProvider(actionProvider);
         }
-        Log.w("MenuItemCompat", "setActionProvider: item does not implement SupportMenuItem; ignoring");
+        Log.w(TAG, "setActionProvider: item does not implement SupportMenuItem; ignoring");
         return menuItem;
     }
 
diff --git a/app/src/main/java/androidx/core/view/ViewCompat.java b/app/src/main/java/androidx/core/view/ViewCompat.java
index f6744fa733..df151402c0 100644
--- a/app/src/main/java/androidx/core/view/ViewCompat.java
+++ b/app/src/main/java/androidx/core/view/ViewCompat.java
@@ -623,7 +623,7 @@ public class ViewCompat {
             sDispatchStartTemporaryDetach = View.class.getDeclaredMethod("dispatchStartTemporaryDetach", new Class[0]);
             sDispatchFinishTemporaryDetach = View.class.getDeclaredMethod("dispatchFinishTemporaryDetach", new Class[0]);
         } catch (NoSuchMethodException e) {
-            Log.e("ViewCompat", "Couldn't find method", e);
+            Log.e(TAG, "Couldn't find method", e);
         }
         sTempDetachBound = true;
     }
@@ -695,7 +695,7 @@ public class ViewCompat {
             try {
                 method.invoke(view, new Object[0]);
             } catch (Exception e) {
-                Log.d("ViewCompat", "Error calling dispatchFinishTemporaryDetach", e);
+                Log.d(TAG, "Error calling dispatchFinishTemporaryDetach", e);
             }
         } else {
             view.onFinishTemporaryDetach();
@@ -759,7 +759,7 @@ public class ViewCompat {
             try {
                 method.invoke(view, new Object[0]);
             } catch (Exception e) {
-                Log.d("ViewCompat", "Error calling dispatchStartTemporaryDetach", e);
+                Log.d(TAG, "Error calling dispatchStartTemporaryDetach", e);
             }
         } else {
             view.onStartTemporaryDetach();
@@ -1238,7 +1238,7 @@ public class ViewCompat {
                 try {
                     view.getParent().notifySubtreeAccessibilityStateChanged(view, view, i);
                 } catch (AbstractMethodError e) {
-                    Log.e("ViewCompat", view.getParent().getClass().getSimpleName() + " does not fully implement ViewParent", e);
+                    Log.e(TAG, view.getParent().getClass().getSimpleName() + " does not fully implement ViewParent", e);
                 }
             }
         }
@@ -1491,18 +1491,18 @@ public class ViewCompat {
             try {
                 sChildrenDrawingOrderMethod = ViewGroup.class.getDeclaredMethod("setChildrenDrawingOrderEnabled", Boolean.TYPE);
             } catch (NoSuchMethodException e) {
-                Log.e("ViewCompat", "Unable to find childrenDrawingOrderEnabled", e);
+                Log.e(TAG, "Unable to find childrenDrawingOrderEnabled", e);
             }
             sChildrenDrawingOrderMethod.setAccessible(true);
         }
         try {
             sChildrenDrawingOrderMethod.invoke(viewGroup, Boolean.valueOf(z2));
         } catch (IllegalAccessException e2) {
-            Log.e("ViewCompat", "Unable to invoke childrenDrawingOrderEnabled", e2);
+            Log.e(TAG, "Unable to invoke childrenDrawingOrderEnabled", e2);
         } catch (IllegalArgumentException e3) {
-            Log.e("ViewCompat", "Unable to invoke childrenDrawingOrderEnabled", e3);
+            Log.e(TAG, "Unable to invoke childrenDrawingOrderEnabled", e3);
         } catch (InvocationTargetException e4) {
-            Log.e("ViewCompat", "Unable to invoke childrenDrawingOrderEnabled", e4);
+            Log.e(TAG, "Unable to invoke childrenDrawingOrderEnabled", e4);
         }
     }
 
diff --git a/app/src/main/java/androidx/core/view/ViewConfigurationCompat.java b/app/src/main/java/androidx/core/view/ViewConfigurationCompat.java
index 54aa546ca5..87be73d3af 100644
--- a/app/src/main/java/androidx/core/view/ViewConfigurationCompat.java
+++ b/app/src/main/java/androidx/core/view/ViewConfigurationCompat.java
@@ -17,7 +17,7 @@ public final class ViewConfigurationCompat {
             try {
                 sGetScaledScrollFactorMethod = ViewConfiguration.class.getDeclaredMethod("getScaledScrollFactor", new Class[0]);
             } catch (Exception unused) {
-                Log.i("ViewConfigCompat", "Could not find method getScaledScrollFactor() on ViewConfiguration");
+                Log.i(TAG, "Could not find method getScaledScrollFactor() on ViewConfiguration");
             }
         }
     }
@@ -31,7 +31,7 @@ public final class ViewConfigurationCompat {
             try {
                 return (float) ((Integer) method.invoke(viewConfiguration, new Object[0])).intValue();
             } catch (Exception unused) {
-                Log.i("ViewConfigCompat", "Could not find method getScaledScrollFactor() on ViewConfiguration");
+                Log.i(TAG, "Could not find method getScaledScrollFactor() on ViewConfiguration");
             }
         }
         TypedValue typedValue = new TypedValue();
diff --git a/app/src/main/java/androidx/core/view/ViewKt.java b/app/src/main/java/androidx/core/view/ViewKt.java
index 3aae2c8789..a4303d051b 100644
--- a/app/src/main/java/androidx/core/view/ViewKt.java
+++ b/app/src/main/java/androidx/core/view/ViewKt.java
@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Px;
 import androidx.annotation.RequiresApi;
+import androidx.exifinterface.media.ExifInterface;
 import d0.z.d.m;
 import kotlin.TypeCastException;
 import kotlin.Unit;
@@ -216,7 +217,7 @@ public final class ViewKt {
         m.checkParameterIsNotNull(view, "$this$updateLayoutParams");
         m.checkParameterIsNotNull(function1, "block");
         ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
-        m.reifiedOperationMarker(1, "T");
+        m.reifiedOperationMarker(1, ExifInterface.GPS_DIRECTION_TRUE);
         function1.invoke(layoutParams);
         view.setLayoutParams(layoutParams);
     }
diff --git a/app/src/main/java/androidx/core/view/ViewParentCompat.java b/app/src/main/java/androidx/core/view/ViewParentCompat.java
index 8141d708ac..ff9759b5c3 100644
--- a/app/src/main/java/androidx/core/view/ViewParentCompat.java
+++ b/app/src/main/java/androidx/core/view/ViewParentCompat.java
@@ -31,7 +31,7 @@ public final class ViewParentCompat {
         try {
             return viewParent.onNestedFling(view, f, f2, z2);
         } catch (AbstractMethodError e) {
-            Log.e("ViewParentCompat", "ViewParent " + viewParent + " does not implement interface method onNestedFling", e);
+            Log.e(TAG, "ViewParent " + viewParent + " does not implement interface method onNestedFling", e);
             return false;
         }
     }
@@ -40,7 +40,7 @@ public final class ViewParentCompat {
         try {
             return viewParent.onNestedPreFling(view, f, f2);
         } catch (AbstractMethodError e) {
-            Log.e("ViewParentCompat", "ViewParent " + viewParent + " does not implement interface method onNestedPreFling", e);
+            Log.e(TAG, "ViewParent " + viewParent + " does not implement interface method onNestedPreFling", e);
             return false;
         }
     }
@@ -56,7 +56,7 @@ public final class ViewParentCompat {
             try {
                 viewParent.onNestedPreScroll(view, i, i2, iArr);
             } catch (AbstractMethodError e) {
-                Log.e("ViewParentCompat", "ViewParent " + viewParent + " does not implement interface method onNestedPreScroll", e);
+                Log.e(TAG, "ViewParent " + viewParent + " does not implement interface method onNestedPreScroll", e);
             }
         }
     }
@@ -82,7 +82,7 @@ public final class ViewParentCompat {
             try {
                 viewParent.onNestedScroll(view, i, i2, i3, i4);
             } catch (AbstractMethodError e) {
-                Log.e("ViewParentCompat", "ViewParent " + viewParent + " does not implement interface method onNestedScroll", e);
+                Log.e(TAG, "ViewParent " + viewParent + " does not implement interface method onNestedScroll", e);
             }
         }
     }
@@ -98,7 +98,7 @@ public final class ViewParentCompat {
             try {
                 viewParent.onNestedScrollAccepted(view, view2, i);
             } catch (AbstractMethodError e) {
-                Log.e("ViewParentCompat", "ViewParent " + viewParent + " does not implement interface method onNestedScrollAccepted", e);
+                Log.e(TAG, "ViewParent " + viewParent + " does not implement interface method onNestedScrollAccepted", e);
             }
         }
     }
@@ -117,7 +117,7 @@ public final class ViewParentCompat {
         try {
             return viewParent.onStartNestedScroll(view, view2, i);
         } catch (AbstractMethodError e) {
-            Log.e("ViewParentCompat", "ViewParent " + viewParent + " does not implement interface method onStartNestedScroll", e);
+            Log.e(TAG, "ViewParent " + viewParent + " does not implement interface method onStartNestedScroll", e);
             return false;
         }
     }
@@ -133,7 +133,7 @@ public final class ViewParentCompat {
             try {
                 viewParent.onStopNestedScroll(view);
             } catch (AbstractMethodError e) {
-                Log.e("ViewParentCompat", "ViewParent " + viewParent + " does not implement interface method onStopNestedScroll", e);
+                Log.e(TAG, "ViewParent " + viewParent + " does not implement interface method onStopNestedScroll", e);
             }
         }
     }
diff --git a/app/src/main/java/androidx/core/view/ViewPropertyAnimatorCompat.java b/app/src/main/java/androidx/core/view/ViewPropertyAnimatorCompat.java
index fe491f59bd..6956911451 100644
--- a/app/src/main/java/androidx/core/view/ViewPropertyAnimatorCompat.java
+++ b/app/src/main/java/androidx/core/view/ViewPropertyAnimatorCompat.java
@@ -66,7 +66,7 @@ public final class ViewPropertyAnimatorCompat {
 
         @Override // androidx.core.view.ViewPropertyAnimatorListener
         public void onAnimationCancel(View view) {
-            Object tag = view.getTag(2113929216);
+            Object tag = view.getTag(ViewPropertyAnimatorCompat.LISTENER_TAG_ID);
             ViewPropertyAnimatorListener viewPropertyAnimatorListener = tag instanceof ViewPropertyAnimatorListener ? (ViewPropertyAnimatorListener) tag : null;
             if (viewPropertyAnimatorListener != null) {
                 viewPropertyAnimatorListener.onAnimationCancel(view);
@@ -88,7 +88,7 @@ public final class ViewPropertyAnimatorCompat {
                 viewPropertyAnimatorCompat.mEndAction = null;
                 runnable.run();
             }
-            Object tag = view.getTag(2113929216);
+            Object tag = view.getTag(ViewPropertyAnimatorCompat.LISTENER_TAG_ID);
             if (tag instanceof ViewPropertyAnimatorListener) {
                 viewPropertyAnimatorListener = (ViewPropertyAnimatorListener) tag;
             }
@@ -111,7 +111,7 @@ public final class ViewPropertyAnimatorCompat {
                 viewPropertyAnimatorCompat.mStartAction = null;
                 runnable.run();
             }
-            Object tag = view.getTag(2113929216);
+            Object tag = view.getTag(ViewPropertyAnimatorCompat.LISTENER_TAG_ID);
             if (tag instanceof ViewPropertyAnimatorListener) {
                 viewPropertyAnimatorListener = (ViewPropertyAnimatorListener) tag;
             }
diff --git a/app/src/main/java/androidx/core/view/WindowInsetsCompat.java b/app/src/main/java/androidx/core/view/WindowInsetsCompat.java
index 4fb4e8ae4d..aa8fd842d2 100644
--- a/app/src/main/java/androidx/core/view/WindowInsetsCompat.java
+++ b/app/src/main/java/androidx/core/view/WindowInsetsCompat.java
@@ -139,7 +139,7 @@ public class WindowInsetsCompat {
                 try {
                     sConsumedField = WindowInsets.class.getDeclaredField("CONSUMED");
                 } catch (ReflectiveOperationException e) {
-                    Log.i("WindowInsetsCompat", "Could not retrieve WindowInsets.CONSUMED field", e);
+                    Log.i(WindowInsetsCompat.TAG, "Could not retrieve WindowInsets.CONSUMED field", e);
                 }
                 sConsumedFieldFetched = true;
             }
@@ -151,14 +151,14 @@ public class WindowInsetsCompat {
                         return new WindowInsets(windowInsets);
                     }
                 } catch (ReflectiveOperationException e2) {
-                    Log.i("WindowInsetsCompat", "Could not get value from WindowInsets.CONSUMED field", e2);
+                    Log.i(WindowInsetsCompat.TAG, "Could not get value from WindowInsets.CONSUMED field", e2);
                 }
             }
             if (!sConstructorFetched) {
                 try {
                     sConstructor = WindowInsets.class.getConstructor(Rect.class);
                 } catch (ReflectiveOperationException e3) {
-                    Log.i("WindowInsetsCompat", "Could not retrieve WindowInsets(Rect) constructor", e3);
+                    Log.i(WindowInsetsCompat.TAG, "Could not retrieve WindowInsets(Rect) constructor", e3);
                 }
                 sConstructorFetched = true;
             }
@@ -167,7 +167,7 @@ public class WindowInsetsCompat {
                 try {
                     return constructor.newInstance(new Rect());
                 } catch (ReflectiveOperationException e4) {
-                    Log.i("WindowInsetsCompat", "Could not invoke WindowInsets(Rect) constructor", e4);
+                    Log.i(WindowInsetsCompat.TAG, "Could not invoke WindowInsets(Rect) constructor", e4);
                 }
             }
             return null;
diff --git a/app/src/main/java/androidx/core/view/accessibility/AccessibilityClickableSpanCompat.java b/app/src/main/java/androidx/core/view/accessibility/AccessibilityClickableSpanCompat.java
index b1faf17e1e..53e0b7bd87 100644
--- a/app/src/main/java/androidx/core/view/accessibility/AccessibilityClickableSpanCompat.java
+++ b/app/src/main/java/androidx/core/view/accessibility/AccessibilityClickableSpanCompat.java
@@ -22,7 +22,7 @@ public final class AccessibilityClickableSpanCompat extends ClickableSpan {
     @Override // android.text.style.ClickableSpan
     public void onClick(@NonNull View view) {
         Bundle bundle = new Bundle();
-        bundle.putInt("ACCESSIBILITY_CLICKABLE_SPAN_ID", this.mOriginalClickableSpanId);
+        bundle.putInt(SPAN_ID, this.mOriginalClickableSpanId);
         this.mNodeInfoCompat.performAction(this.mClickableSpanActionId, bundle);
     }
 }
diff --git a/app/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java b/app/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
index 28339bbab9..9cd0100250 100644
--- a/app/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
+++ b/app/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
@@ -236,14 +236,14 @@ public class AccessibilityNodeInfoCompat {
                         Class<? extends AccessibilityViewCommand.CommandArguments> cls2 = this.mViewCommandArgumentClass;
                         if (cls2 != null) {
                         }
-                        Log.e("A11yActionCompat", "Failed to execute command with argument class ViewCommandArgument: " + r1, e);
+                        Log.e(TAG, "Failed to execute command with argument class ViewCommandArgument: " + r1, e);
                         return this.mCommand.perform(view, commandArguments);
                     }
                 } catch (Exception e3) {
                     e = e3;
                     Class<? extends AccessibilityViewCommand.CommandArguments> cls2 = this.mViewCommandArgumentClass;
                     String name = cls2 != null ? "null" : cls2.getName();
-                    Log.e("A11yActionCompat", "Failed to execute command with argument class ViewCommandArgument: " + name, e);
+                    Log.e(TAG, "Failed to execute command with argument class ViewCommandArgument: " + name, e);
                     return this.mCommand.perform(view, commandArguments);
                 }
             }
@@ -409,17 +409,17 @@ public class AccessibilityNodeInfoCompat {
     }
 
     private void addSpanLocationToExtras(ClickableSpan clickableSpan, Spanned spanned, int i) {
-        extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_START_KEY").add(Integer.valueOf(spanned.getSpanStart(clickableSpan)));
-        extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_END_KEY").add(Integer.valueOf(spanned.getSpanEnd(clickableSpan)));
-        extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_FLAGS_KEY").add(Integer.valueOf(spanned.getSpanFlags(clickableSpan)));
-        extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_ID_KEY").add(Integer.valueOf(i));
+        extrasIntList(SPANS_START_KEY).add(Integer.valueOf(spanned.getSpanStart(clickableSpan)));
+        extrasIntList(SPANS_END_KEY).add(Integer.valueOf(spanned.getSpanEnd(clickableSpan)));
+        extrasIntList(SPANS_FLAGS_KEY).add(Integer.valueOf(spanned.getSpanFlags(clickableSpan)));
+        extrasIntList(SPANS_ID_KEY).add(Integer.valueOf(i));
     }
 
     private void clearExtrasSpans() {
-        this.mInfo.getExtras().remove("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_START_KEY");
-        this.mInfo.getExtras().remove("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_END_KEY");
-        this.mInfo.getExtras().remove("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_FLAGS_KEY");
-        this.mInfo.getExtras().remove("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_ID_KEY");
+        this.mInfo.getExtras().remove(SPANS_START_KEY);
+        this.mInfo.getExtras().remove(SPANS_END_KEY);
+        this.mInfo.getExtras().remove(SPANS_FLAGS_KEY);
+        this.mInfo.getExtras().remove(SPANS_ID_KEY);
     }
 
     private List<Integer> extrasIntList(String str) {
@@ -521,7 +521,7 @@ public class AccessibilityNodeInfoCompat {
 
     private boolean getBooleanProperty(int i) {
         Bundle extras = getExtras();
-        return extras != null && (extras.getInt("androidx.view.accessibility.AccessibilityNodeInfoCompat.BOOLEAN_PROPERTY_KEY", 0) & i) == i;
+        return extras != null && (extras.getInt(BOOLEAN_PROPERTY_KEY, 0) & i) == i;
     }
 
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP_PREFIX})
@@ -547,7 +547,7 @@ public class AccessibilityNodeInfoCompat {
     }
 
     private boolean hasSpans() {
-        return !extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_START_KEY").isEmpty();
+        return !extrasIntList(SPANS_START_KEY).isEmpty();
     }
 
     private int idForClickableSpan(ClickableSpan clickableSpan, SparseArray<WeakReference<ClickableSpan>> sparseArray) {
@@ -597,11 +597,11 @@ public class AccessibilityNodeInfoCompat {
     private void setBooleanProperty(int i, boolean z2) {
         Bundle extras = getExtras();
         if (extras != null) {
-            int i2 = extras.getInt("androidx.view.accessibility.AccessibilityNodeInfoCompat.BOOLEAN_PROPERTY_KEY", 0) & (~i);
+            int i2 = extras.getInt(BOOLEAN_PROPERTY_KEY, 0) & (~i);
             if (!z2) {
                 i = 0;
             }
-            extras.putInt("androidx.view.accessibility.AccessibilityNodeInfoCompat.BOOLEAN_PROPERTY_KEY", i | i2);
+            extras.putInt(BOOLEAN_PROPERTY_KEY, i | i2);
         }
     }
 
@@ -639,7 +639,7 @@ public class AccessibilityNodeInfoCompat {
             removeCollectedSpans(view);
             ClickableSpan[] clickableSpans = getClickableSpans(charSequence);
             if (clickableSpans != null && clickableSpans.length > 0) {
-                getExtras().putInt("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_ACTION_ID_KEY", R.id.accessibility_action_clickable_span);
+                getExtras().putInt(SPANS_ACTION_ID_KEY, R.id.accessibility_action_clickable_span);
                 SparseArray<WeakReference<ClickableSpan>> orCreateSpansFromViewTags = getOrCreateSpansFromViewTags(view);
                 for (int i = 0; i < clickableSpans.length; i++) {
                     int idForClickableSpan = idForClickableSpan(clickableSpans[i], orCreateSpansFromViewTags);
@@ -775,7 +775,7 @@ public class AccessibilityNodeInfoCompat {
 
     @Nullable
     public CharSequence getHintText() {
-        return Build.VERSION.SDK_INT >= 26 ? this.mInfo.getHintText() : this.mInfo.getExtras().getCharSequence("androidx.view.accessibility.AccessibilityNodeInfoCompat.HINT_TEXT_KEY");
+        return Build.VERSION.SDK_INT >= 26 ? this.mInfo.getHintText() : this.mInfo.getExtras().getCharSequence(HINT_TEXT_KEY);
     }
 
     @Deprecated
@@ -813,7 +813,7 @@ public class AccessibilityNodeInfoCompat {
 
     @Nullable
     public CharSequence getPaneTitle() {
-        return Build.VERSION.SDK_INT >= 28 ? this.mInfo.getPaneTitle() : this.mInfo.getExtras().getCharSequence("androidx.view.accessibility.AccessibilityNodeInfoCompat.PANE_TITLE_KEY");
+        return Build.VERSION.SDK_INT >= 28 ? this.mInfo.getPaneTitle() : this.mInfo.getExtras().getCharSequence(PANE_TITLE_KEY);
     }
 
     public AccessibilityNodeInfoCompat getParent() {
@@ -830,20 +830,20 @@ public class AccessibilityNodeInfoCompat {
 
     @Nullable
     public CharSequence getRoleDescription() {
-        return this.mInfo.getExtras().getCharSequence("AccessibilityNodeInfo.roleDescription");
+        return this.mInfo.getExtras().getCharSequence(ROLE_DESCRIPTION_KEY);
     }
 
     public CharSequence getText() {
         if (!hasSpans()) {
             return this.mInfo.getText();
         }
-        List<Integer> extrasIntList = extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_START_KEY");
-        List<Integer> extrasIntList2 = extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_END_KEY");
-        List<Integer> extrasIntList3 = extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_FLAGS_KEY");
-        List<Integer> extrasIntList4 = extrasIntList("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_ID_KEY");
+        List<Integer> extrasIntList = extrasIntList(SPANS_START_KEY);
+        List<Integer> extrasIntList2 = extrasIntList(SPANS_END_KEY);
+        List<Integer> extrasIntList3 = extrasIntList(SPANS_FLAGS_KEY);
+        List<Integer> extrasIntList4 = extrasIntList(SPANS_ID_KEY);
         SpannableString spannableString = new SpannableString(TextUtils.substring(this.mInfo.getText(), 0, this.mInfo.getText().length()));
         for (int i = 0; i < extrasIntList.size(); i++) {
-            spannableString.setSpan(new AccessibilityClickableSpanCompat(extrasIntList4.get(i).intValue(), this, getExtras().getInt("androidx.view.accessibility.AccessibilityNodeInfoCompat.SPANS_ACTION_ID_KEY")), extrasIntList.get(i).intValue(), extrasIntList2.get(i).intValue(), extrasIntList3.get(i).intValue());
+            spannableString.setSpan(new AccessibilityClickableSpanCompat(extrasIntList4.get(i).intValue(), this, getExtras().getInt(SPANS_ACTION_ID_KEY)), extrasIntList.get(i).intValue(), extrasIntList2.get(i).intValue(), extrasIntList3.get(i).intValue());
         }
         return spannableString;
     }
@@ -858,7 +858,7 @@ public class AccessibilityNodeInfoCompat {
 
     @Nullable
     public CharSequence getTooltipText() {
-        return Build.VERSION.SDK_INT >= 28 ? this.mInfo.getTooltipText() : this.mInfo.getExtras().getCharSequence("androidx.view.accessibility.AccessibilityNodeInfoCompat.TOOLTIP_TEXT_KEY");
+        return Build.VERSION.SDK_INT >= 28 ? this.mInfo.getTooltipText() : this.mInfo.getExtras().getCharSequence(TOOLTIP_TEXT_KEY);
     }
 
     @Nullable
@@ -1130,7 +1130,7 @@ public class AccessibilityNodeInfoCompat {
         if (Build.VERSION.SDK_INT >= 26) {
             this.mInfo.setHintText(charSequence);
         } else {
-            this.mInfo.getExtras().putCharSequence("androidx.view.accessibility.AccessibilityNodeInfoCompat.HINT_TEXT_KEY", charSequence);
+            this.mInfo.getExtras().putCharSequence(HINT_TEXT_KEY, charSequence);
         }
     }
 
@@ -1188,7 +1188,7 @@ public class AccessibilityNodeInfoCompat {
         if (Build.VERSION.SDK_INT >= 28) {
             this.mInfo.setPaneTitle(charSequence);
         } else {
-            this.mInfo.getExtras().putCharSequence("androidx.view.accessibility.AccessibilityNodeInfoCompat.PANE_TITLE_KEY", charSequence);
+            this.mInfo.getExtras().putCharSequence(PANE_TITLE_KEY, charSequence);
         }
     }
 
@@ -1211,7 +1211,7 @@ public class AccessibilityNodeInfoCompat {
     }
 
     public void setRoleDescription(@Nullable CharSequence charSequence) {
-        this.mInfo.getExtras().putCharSequence("AccessibilityNodeInfo.roleDescription", charSequence);
+        this.mInfo.getExtras().putCharSequence(ROLE_DESCRIPTION_KEY, charSequence);
     }
 
     public void setScreenReaderFocusable(boolean z2) {
@@ -1268,7 +1268,7 @@ public class AccessibilityNodeInfoCompat {
         if (Build.VERSION.SDK_INT >= 28) {
             this.mInfo.setTooltipText(charSequence);
         } else {
-            this.mInfo.getExtras().putCharSequence("androidx.view.accessibility.AccessibilityNodeInfoCompat.TOOLTIP_TEXT_KEY", charSequence);
+            this.mInfo.getExtras().putCharSequence(TOOLTIP_TEXT_KEY, charSequence);
         }
     }
 
diff --git a/app/src/main/java/androidx/core/view/accessibility/AccessibilityViewCommand.java b/app/src/main/java/androidx/core/view/accessibility/AccessibilityViewCommand.java
index bd916a367d..1c1cd8019f 100644
--- a/app/src/main/java/androidx/core/view/accessibility/AccessibilityViewCommand.java
+++ b/app/src/main/java/androidx/core/view/accessibility/AccessibilityViewCommand.java
@@ -18,59 +18,59 @@ public interface AccessibilityViewCommand {
 
     public static final class MoveAtGranularityArguments extends CommandArguments {
         public boolean getExtendSelection() {
-            return this.mBundle.getBoolean("ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN");
+            return this.mBundle.getBoolean(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN);
         }
 
         public int getGranularity() {
-            return this.mBundle.getInt("ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT");
+            return this.mBundle.getInt(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
         }
     }
 
     public static final class MoveHtmlArguments extends CommandArguments {
         public String getHTMLElement() {
-            return this.mBundle.getString("ACTION_ARGUMENT_HTML_ELEMENT_STRING");
+            return this.mBundle.getString(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_HTML_ELEMENT_STRING);
         }
     }
 
     public static final class MoveWindowArguments extends CommandArguments {
         public int getX() {
-            return this.mBundle.getInt("ACTION_ARGUMENT_MOVE_WINDOW_X");
+            return this.mBundle.getInt(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_MOVE_WINDOW_X);
         }
 
         public int getY() {
-            return this.mBundle.getInt("ACTION_ARGUMENT_MOVE_WINDOW_Y");
+            return this.mBundle.getInt(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_MOVE_WINDOW_Y);
         }
     }
 
     public static final class ScrollToPositionArguments extends CommandArguments {
         public int getColumn() {
-            return this.mBundle.getInt("android.view.accessibility.action.ARGUMENT_COLUMN_INT");
+            return this.mBundle.getInt(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT);
         }
 
         public int getRow() {
-            return this.mBundle.getInt("android.view.accessibility.action.ARGUMENT_ROW_INT");
+            return this.mBundle.getInt(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT);
         }
     }
 
     public static final class SetProgressArguments extends CommandArguments {
         public float getProgress() {
-            return this.mBundle.getFloat("android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE");
+            return this.mBundle.getFloat(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE);
         }
     }
 
     public static final class SetSelectionArguments extends CommandArguments {
         public int getEnd() {
-            return this.mBundle.getInt("ACTION_ARGUMENT_SELECTION_END_INT");
+            return this.mBundle.getInt(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT);
         }
 
         public int getStart() {
-            return this.mBundle.getInt("ACTION_ARGUMENT_SELECTION_START_INT");
+            return this.mBundle.getInt(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT);
         }
     }
 
     public static final class SetTextArguments extends CommandArguments {
         public CharSequence getText() {
-            return this.mBundle.getCharSequence("ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE");
+            return this.mBundle.getCharSequence(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE);
         }
     }
 
diff --git a/app/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java b/app/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java
index faad78331a..6b0feb5994 100644
--- a/app/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java
+++ b/app/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java
@@ -22,9 +22,9 @@ public final class EditorInfoCompat {
         if (bundle == null) {
             return EMPTY_STRING_ARRAY;
         }
-        String[] stringArray = bundle.getStringArray("androidx.core.view.inputmethod.EditorInfoCompat.CONTENT_MIME_TYPES");
+        String[] stringArray = bundle.getStringArray(CONTENT_MIME_TYPES_KEY);
         if (stringArray == null) {
-            stringArray = editorInfo.extras.getStringArray("android.support.v13.view.inputmethod.EditorInfoCompat.CONTENT_MIME_TYPES");
+            stringArray = editorInfo.extras.getStringArray(CONTENT_MIME_TYPES_INTEROP_KEY);
         }
         return stringArray != null ? stringArray : EMPTY_STRING_ARRAY;
     }
@@ -37,8 +37,8 @@ public final class EditorInfoCompat {
         if (bundle == null) {
             return 0;
         }
-        boolean containsKey = bundle.containsKey("androidx.core.view.inputmethod.EditorInfoCompat.CONTENT_MIME_TYPES");
-        boolean containsKey2 = editorInfo.extras.containsKey("android.support.v13.view.inputmethod.EditorInfoCompat.CONTENT_MIME_TYPES");
+        boolean containsKey = bundle.containsKey(CONTENT_MIME_TYPES_KEY);
+        boolean containsKey2 = editorInfo.extras.containsKey(CONTENT_MIME_TYPES_INTEROP_KEY);
         if (containsKey && containsKey2) {
             return 4;
         }
@@ -56,7 +56,7 @@ public final class EditorInfoCompat {
         if (editorInfo.extras == null) {
             editorInfo.extras = new Bundle();
         }
-        editorInfo.extras.putStringArray("androidx.core.view.inputmethod.EditorInfoCompat.CONTENT_MIME_TYPES", strArr);
-        editorInfo.extras.putStringArray("android.support.v13.view.inputmethod.EditorInfoCompat.CONTENT_MIME_TYPES", strArr);
+        editorInfo.extras.putStringArray(CONTENT_MIME_TYPES_KEY, strArr);
+        editorInfo.extras.putStringArray(CONTENT_MIME_TYPES_INTEROP_KEY, strArr);
     }
 }
diff --git a/app/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java b/app/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java
index f30e3d0436..2cd59a7ce5 100644
--- a/app/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java
+++ b/app/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java
@@ -102,12 +102,12 @@ public final class InputConnectionCompat {
             return false;
         }
         Bundle bundle2 = new Bundle();
-        bundle2.putParcelable(z3 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_URI" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_URI", inputContentInfoCompat.getContentUri());
-        bundle2.putParcelable(z3 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_DESCRIPTION" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_DESCRIPTION", inputContentInfoCompat.getDescription());
-        bundle2.putParcelable(z3 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_LINK_URI" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_LINK_URI", inputContentInfoCompat.getLinkUri());
-        bundle2.putInt(z3 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_FLAGS" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_FLAGS", i);
-        bundle2.putParcelable(z3 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_OPTS" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_OPTS", bundle);
-        return inputConnection.performPrivateCommand(z3 ? "android.support.v13.view.inputmethod.InputConnectionCompat.COMMIT_CONTENT" : "androidx.core.view.inputmethod.InputConnectionCompat.COMMIT_CONTENT", bundle2);
+        bundle2.putParcelable(z3 ? COMMIT_CONTENT_CONTENT_URI_INTEROP_KEY : COMMIT_CONTENT_CONTENT_URI_KEY, inputContentInfoCompat.getContentUri());
+        bundle2.putParcelable(z3 ? COMMIT_CONTENT_DESCRIPTION_INTEROP_KEY : COMMIT_CONTENT_DESCRIPTION_KEY, inputContentInfoCompat.getDescription());
+        bundle2.putParcelable(z3 ? COMMIT_CONTENT_LINK_URI_INTEROP_KEY : COMMIT_CONTENT_LINK_URI_KEY, inputContentInfoCompat.getLinkUri());
+        bundle2.putInt(z3 ? COMMIT_CONTENT_FLAGS_INTEROP_KEY : COMMIT_CONTENT_FLAGS_KEY, i);
+        bundle2.putParcelable(z3 ? COMMIT_CONTENT_OPTS_INTEROP_KEY : COMMIT_CONTENT_OPTS_KEY, bundle);
+        return inputConnection.performPrivateCommand(z3 ? COMMIT_CONTENT_INTEROP_ACTION : COMMIT_CONTENT_ACTION, bundle2);
     }
 
     @NonNull
@@ -133,21 +133,21 @@ public final class InputConnectionCompat {
         if (bundle == null) {
             return false;
         }
-        if (TextUtils.equals("androidx.core.view.inputmethod.InputConnectionCompat.COMMIT_CONTENT", str)) {
+        if (TextUtils.equals(COMMIT_CONTENT_ACTION, str)) {
             z2 = false;
-        } else if (!TextUtils.equals("android.support.v13.view.inputmethod.InputConnectionCompat.COMMIT_CONTENT", str)) {
+        } else if (!TextUtils.equals(COMMIT_CONTENT_INTEROP_ACTION, str)) {
             return false;
         } else {
             z2 = true;
         }
         try {
-            resultReceiver = (ResultReceiver) bundle.getParcelable(z2 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_RESULT_RECEIVER" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_RESULT_RECEIVER");
+            resultReceiver = (ResultReceiver) bundle.getParcelable(z2 ? COMMIT_CONTENT_RESULT_INTEROP_RECEIVER_KEY : COMMIT_CONTENT_RESULT_RECEIVER_KEY);
             try {
-                Uri uri = (Uri) bundle.getParcelable(z2 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_URI" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_URI");
-                ClipDescription clipDescription = (ClipDescription) bundle.getParcelable(z2 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_DESCRIPTION" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_DESCRIPTION");
-                Uri uri2 = (Uri) bundle.getParcelable(z2 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_LINK_URI" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_LINK_URI");
-                int i = bundle.getInt(z2 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_FLAGS" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_FLAGS");
-                Bundle bundle2 = (Bundle) bundle.getParcelable(z2 ? "android.support.v13.view.inputmethod.InputConnectionCompat.CONTENT_OPTS" : "androidx.core.view.inputmethod.InputConnectionCompat.CONTENT_OPTS");
+                Uri uri = (Uri) bundle.getParcelable(z2 ? COMMIT_CONTENT_CONTENT_URI_INTEROP_KEY : COMMIT_CONTENT_CONTENT_URI_KEY);
+                ClipDescription clipDescription = (ClipDescription) bundle.getParcelable(z2 ? COMMIT_CONTENT_DESCRIPTION_INTEROP_KEY : COMMIT_CONTENT_DESCRIPTION_KEY);
+                Uri uri2 = (Uri) bundle.getParcelable(z2 ? COMMIT_CONTENT_LINK_URI_INTEROP_KEY : COMMIT_CONTENT_LINK_URI_KEY);
+                int i = bundle.getInt(z2 ? COMMIT_CONTENT_FLAGS_INTEROP_KEY : COMMIT_CONTENT_FLAGS_KEY);
+                Bundle bundle2 = (Bundle) bundle.getParcelable(z2 ? COMMIT_CONTENT_OPTS_INTEROP_KEY : COMMIT_CONTENT_OPTS_KEY);
                 if (!(uri == null || clipDescription == null)) {
                     z3 = onCommitContentListener.onCommitContent(new InputContentInfoCompat(uri, clipDescription, uri2), i, bundle2);
                 }
diff --git a/app/src/main/java/androidx/core/widget/CompoundButtonCompat.java b/app/src/main/java/androidx/core/widget/CompoundButtonCompat.java
index adb814f463..f86549ccc0 100644
--- a/app/src/main/java/androidx/core/widget/CompoundButtonCompat.java
+++ b/app/src/main/java/androidx/core/widget/CompoundButtonCompat.java
@@ -28,7 +28,7 @@ public final class CompoundButtonCompat {
                 sButtonDrawableField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                Log.i("CompoundButtonCompat", "Failed to retrieve mButtonDrawable field", e);
+                Log.i(TAG, "Failed to retrieve mButtonDrawable field", e);
             }
             sButtonDrawableFieldFetched = true;
         }
@@ -37,7 +37,7 @@ public final class CompoundButtonCompat {
             try {
                 return (Drawable) field.get(compoundButton);
             } catch (IllegalAccessException e2) {
-                Log.i("CompoundButtonCompat", "Failed to get button drawable via reflection", e2);
+                Log.i(TAG, "Failed to get button drawable via reflection", e2);
                 sButtonDrawableField = null;
             }
         }
diff --git a/app/src/main/java/androidx/core/widget/NestedScrollView.java b/app/src/main/java/androidx/core/widget/NestedScrollView.java
index 1afa6d0b91..d73bc5f270 100644
--- a/app/src/main/java/androidx/core/widget/NestedScrollView.java
+++ b/app/src/main/java/androidx/core/widget/NestedScrollView.java
@@ -27,6 +27,7 @@ import android.widget.ScrollView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.NestedScrollingChild3;
 import androidx.core.view.NestedScrollingChildHelper;
@@ -929,7 +930,7 @@ public class NestedScrollView extends FrameLayout implements NestedScrollingPare
                     if (i2 != -1) {
                         int findPointerIndex = motionEvent.findPointerIndex(i2);
                         if (findPointerIndex == -1) {
-                            Log.e("NestedScrollView", "Invalid pointerId=" + i2 + " in onInterceptTouchEvent");
+                            Log.e(TAG, "Invalid pointerId=" + i2 + " in onInterceptTouchEvent");
                         } else {
                             int y2 = (int) motionEvent.getY(findPointerIndex);
                             if (Math.abs(y2 - this.mLastMotionY) > this.mTouchSlop && (2 & getNestedScrollAxes()) == 0) {
@@ -1016,7 +1017,7 @@ public class NestedScrollView extends FrameLayout implements NestedScrollingPare
             int measuredHeight = childAt.getMeasuredHeight();
             int measuredHeight2 = (((getMeasuredHeight() - getPaddingTop()) - getPaddingBottom()) - layoutParams.topMargin) - layoutParams.bottomMargin;
             if (measuredHeight < measuredHeight2) {
-                childAt.measure(FrameLayout.getChildMeasureSpec(i, getPaddingRight() + getPaddingLeft() + layoutParams.leftMargin + layoutParams.rightMargin, layoutParams.width), View.MeasureSpec.makeMeasureSpec(measuredHeight2, 1073741824));
+                childAt.measure(FrameLayout.getChildMeasureSpec(i, getPaddingRight() + getPaddingLeft() + layoutParams.leftMargin + layoutParams.rightMargin, layoutParams.width), View.MeasureSpec.makeMeasureSpec(measuredHeight2, BasicMeasure.EXACTLY));
             }
         }
     }
@@ -1184,7 +1185,7 @@ public class NestedScrollView extends FrameLayout implements NestedScrollingPare
                     StringBuilder K = a.K("Invalid pointerId=");
                     K.append(this.mActivePointerId);
                     K.append(" in onTouchEvent");
-                    Log.e("NestedScrollView", K.toString());
+                    Log.e(TAG, K.toString());
                 } else {
                     int y2 = (int) motionEvent.getY(findPointerIndex);
                     int i2 = this.mLastMotionY - y2;
diff --git a/app/src/main/java/androidx/core/widget/PopupWindowCompat.java b/app/src/main/java/androidx/core/widget/PopupWindowCompat.java
index 49105d0068..6b1e6b8ece 100644
--- a/app/src/main/java/androidx/core/widget/PopupWindowCompat.java
+++ b/app/src/main/java/androidx/core/widget/PopupWindowCompat.java
@@ -29,7 +29,7 @@ public final class PopupWindowCompat {
                 sOverlapAnchorField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                Log.i("PopupWindowCompatApi21", "Could not fetch mOverlapAnchor field from PopupWindow", e);
+                Log.i(TAG, "Could not fetch mOverlapAnchor field from PopupWindow", e);
             }
             sOverlapAnchorFieldAttempted = true;
         }
@@ -40,7 +40,7 @@ public final class PopupWindowCompat {
         try {
             return ((Boolean) field.get(popupWindow)).booleanValue();
         } catch (IllegalAccessException e2) {
-            Log.i("PopupWindowCompatApi21", "Could not get overlap anchor field in PopupWindow", e2);
+            Log.i(TAG, "Could not get overlap anchor field in PopupWindow", e2);
             return false;
         }
     }
@@ -79,7 +79,7 @@ public final class PopupWindowCompat {
                 sOverlapAnchorField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                Log.i("PopupWindowCompatApi21", "Could not fetch mOverlapAnchor field from PopupWindow", e);
+                Log.i(TAG, "Could not fetch mOverlapAnchor field from PopupWindow", e);
             }
             sOverlapAnchorFieldAttempted = true;
         }
@@ -88,7 +88,7 @@ public final class PopupWindowCompat {
             try {
                 field.set(popupWindow, Boolean.valueOf(z2));
             } catch (IllegalAccessException e2) {
-                Log.i("PopupWindowCompatApi21", "Could not set overlap anchor field in PopupWindow", e2);
+                Log.i(TAG, "Could not set overlap anchor field in PopupWindow", e2);
             }
         }
     }
diff --git a/app/src/main/java/androidx/core/widget/TextViewCompat.java b/app/src/main/java/androidx/core/widget/TextViewCompat.java
index f5a71cc360..12d4fede53 100644
--- a/app/src/main/java/androidx/core/widget/TextViewCompat.java
+++ b/app/src/main/java/androidx/core/widget/TextViewCompat.java
@@ -33,6 +33,7 @@ import androidx.annotation.StyleRes;
 import androidx.core.text.PrecomputedTextCompat;
 import androidx.core.util.Preconditions;
 import c.d.b.a.a;
+import com.discord.restapi.RestAPIBuilder;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
@@ -75,7 +76,7 @@ public final class TextViewCompat {
         }
 
         private Intent createProcessTextIntent() {
-            return new Intent().setAction("android.intent.action.PROCESS_TEXT").setType("text/plain");
+            return new Intent().setAction("android.intent.action.PROCESS_TEXT").setType(RestAPIBuilder.CONTENT_TYPE_TEXT);
         }
 
         private Intent createProcessTextIntentForResolveInfo(ResolveInfo resolveInfo, TextView textView) {
@@ -338,7 +339,7 @@ public final class TextViewCompat {
             field.setAccessible(true);
             return field;
         } catch (NoSuchFieldException unused) {
-            Log.e("TextViewCompat", "Could not retrieve " + str + " field.");
+            Log.e(LOG_TAG, "Could not retrieve " + str + " field.");
             return field;
         }
     }
@@ -350,7 +351,7 @@ public final class TextViewCompat {
             StringBuilder K = a.K("Could not retrieve value of ");
             K.append(field.getName());
             K.append(" field.");
-            Log.d("TextViewCompat", K.toString());
+            Log.d(LOG_TAG, K.toString());
             return -1;
         }
     }
diff --git a/app/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java b/app/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java
index 3230d894fb..6779ace372 100644
--- a/app/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java
+++ b/app/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java
@@ -144,7 +144,7 @@ public abstract class ExploreByTouchHelper extends AccessibilityDelegateCompat {
         AccessibilityNodeInfoCompat obtain = AccessibilityNodeInfoCompat.obtain();
         obtain.setEnabled(true);
         obtain.setFocusable(true);
-        obtain.setClassName("android.view.View");
+        obtain.setClassName(DEFAULT_CLASS_NAME);
         Rect rect = INVALID_PARENT_BOUNDS;
         obtain.setBoundsInParent(rect);
         obtain.setBoundsInScreen(rect);
diff --git a/app/src/main/java/androidx/customview/widget/ViewDragHelper.java b/app/src/main/java/androidx/customview/widget/ViewDragHelper.java
index 15ac868115..61a6386607 100644
--- a/app/src/main/java/androidx/customview/widget/ViewDragHelper.java
+++ b/app/src/main/java/androidx/customview/widget/ViewDragHelper.java
@@ -222,7 +222,7 @@ public class ViewDragHelper {
         float f = (float) (width / 2);
         float distanceInfluenceForSnapDuration = (distanceInfluenceForSnapDuration(Math.min(1.0f, ((float) Math.abs(i)) / ((float) width))) * f) + f;
         int abs = Math.abs(i2);
-        return Math.min(abs > 0 ? Math.round(Math.abs(distanceInfluenceForSnapDuration / ((float) abs)) * 1000.0f) * 4 : (int) (((((float) Math.abs(i)) / ((float) i3)) + 1.0f) * 256.0f), 600);
+        return Math.min(abs > 0 ? Math.round(Math.abs(distanceInfluenceForSnapDuration / ((float) abs)) * 1000.0f) * 4 : (int) (((((float) Math.abs(i)) / ((float) i3)) + 1.0f) * 256.0f), (int) MAX_SETTLE_DURATION);
     }
 
     private int computeSettleDuration(View view, int i, int i2, int i3, int i4) {
@@ -362,7 +362,7 @@ public class ViewDragHelper {
         if (isPointerDown(i)) {
             return true;
         }
-        Log.e("ViewDragHelper", "Ignoring pointerId=" + i + " because ACTION_DOWN was not received for this pointer before ACTION_MOVE. It likely happened because  ViewDragHelper did not receive all the events in the event stream.");
+        Log.e(TAG, "Ignoring pointerId=" + i + " because ACTION_DOWN was not received for this pointer before ACTION_MOVE. It likely happened because  ViewDragHelper did not receive all the events in the event stream.");
         return false;
     }
 
diff --git a/app/src/main/java/androidx/documentfile/provider/RawDocumentFile.java b/app/src/main/java/androidx/documentfile/provider/RawDocumentFile.java
index 7f2674687e..87a4955cfa 100644
--- a/app/src/main/java/androidx/documentfile/provider/RawDocumentFile.java
+++ b/app/src/main/java/androidx/documentfile/provider/RawDocumentFile.java
@@ -25,7 +25,7 @@ public class RawDocumentFile extends DocumentFile {
                     z2 &= deleteContents(file2);
                 }
                 if (!file2.delete()) {
-                    Log.w("DocumentFile", "Failed to delete " + file2);
+                    Log.w(DocumentFile.TAG, "Failed to delete " + file2);
                     z2 = false;
                 }
             }
@@ -71,7 +71,7 @@ public class RawDocumentFile extends DocumentFile {
             file.createNewFile();
             return new RawDocumentFile(this, file);
         } catch (IOException e) {
-            Log.w("DocumentFile", "Failed to createFile: " + e);
+            Log.w(DocumentFile.TAG, "Failed to createFile: " + e);
             return null;
         }
     }
diff --git a/app/src/main/java/androidx/documentfile/provider/TreeDocumentFile.java b/app/src/main/java/androidx/documentfile/provider/TreeDocumentFile.java
index f470b2be2b..bff516a481 100644
--- a/app/src/main/java/androidx/documentfile/provider/TreeDocumentFile.java
+++ b/app/src/main/java/androidx/documentfile/provider/TreeDocumentFile.java
@@ -139,7 +139,7 @@ public class TreeDocumentFile extends DocumentFile {
                 arrayList.add(DocumentsContract.buildDocumentUriUsingTree(this.mUri, cursor.getString(0)));
             }
         } catch (Exception e) {
-            Log.w("DocumentFile", "Failed query: " + e);
+            Log.w(DocumentFile.TAG, "Failed query: " + e);
         } catch (Throwable th) {
             closeQuietly(null);
             throw th;
diff --git a/app/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java b/app/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
index 4e20a846c8..a6cde4dd74 100644
--- a/app/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
+++ b/app/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
@@ -25,6 +25,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.AccessibilityDelegateCompat;
@@ -492,7 +493,7 @@ public class DrawerLayout extends ViewGroup {
     public DrawerLayout(@NonNull Context context, @Nullable AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         this.mChildAccessibilityDelegate = new ChildAccessibilityDelegate();
-        this.mScrimColor = -1728053248;
+        this.mScrimColor = DEFAULT_SCRIM_COLOR;
         this.mScrimPaint = new Paint();
         this.mFirstLayout = true;
         this.mLockModeLeft = 3;
@@ -915,7 +916,7 @@ public class DrawerLayout extends ViewGroup {
         float f = this.mScrimOpacity;
         if (f > 0.0f && isContentView) {
             int i4 = this.mScrimColor;
-            this.mScrimPaint.setColor((i4 & 16777215) | (((int) (((float) ((-16777216 & i4) >>> 24)) * f)) << 24));
+            this.mScrimPaint.setColor((i4 & ViewCompat.MEASURED_SIZE_MASK) | (((int) (((float) ((-16777216 & i4) >>> 24)) * f)) << 24));
             canvas.drawRect((float) i, 0.0f, (float) width, (float) getHeight(), this.mScrimPaint);
         } else if (this.mShadowLeftResolved != null && checkDrawerViewAbsoluteGravity(view, 3)) {
             int intrinsicWidth = this.mShadowLeftResolved.getIntrinsicWidth();
@@ -1320,7 +1321,7 @@ public class DrawerLayout extends ViewGroup {
                     }
                 }
                 if (isContentView(childAt)) {
-                    childAt.measure(View.MeasureSpec.makeMeasureSpec((size - ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin) - ((ViewGroup.MarginLayoutParams) layoutParams).rightMargin, 1073741824), View.MeasureSpec.makeMeasureSpec((size2 - ((ViewGroup.MarginLayoutParams) layoutParams).topMargin) - ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin, 1073741824));
+                    childAt.measure(View.MeasureSpec.makeMeasureSpec((size - ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin) - ((ViewGroup.MarginLayoutParams) layoutParams).rightMargin, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec((size2 - ((ViewGroup.MarginLayoutParams) layoutParams).topMargin) - ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin, BasicMeasure.EXACTLY));
                 } else if (isDrawerView(childAt)) {
                     if (SET_DRAWER_SHADOW_FROM_ELEVATION) {
                         float elevation = ViewCompat.getElevation(childAt);
@@ -1344,7 +1345,7 @@ public class DrawerLayout extends ViewGroup {
                         StringBuilder K = a.K("Child drawer has absolute gravity ");
                         K.append(gravityToString(drawerViewAbsoluteGravity));
                         K.append(" but this ");
-                        K.append("DrawerLayout");
+                        K.append(TAG);
                         K.append(" already has a ");
                         K.append("drawer view along that edge");
                         throw new IllegalStateException(K.toString());
@@ -1381,11 +1382,11 @@ public class DrawerLayout extends ViewGroup {
         }
         int i4 = savedState.lockModeStart;
         if (i4 != 3) {
-            setDrawerLockMode(i4, 8388611);
+            setDrawerLockMode(i4, GravityCompat.START);
         }
         int i5 = savedState.lockModeEnd;
         if (i5 != 3) {
-            setDrawerLockMode(i5, 8388613);
+            setDrawerLockMode(i5, GravityCompat.END);
         }
     }
 
@@ -1605,9 +1606,9 @@ public class DrawerLayout extends ViewGroup {
 
     public void setDrawerShadow(Drawable drawable, int i) {
         if (!SET_DRAWER_SHADOW_FROM_ELEVATION) {
-            if ((i & 8388611) == 8388611) {
+            if ((i & GravityCompat.START) == 8388611) {
                 this.mShadowStart = drawable;
-            } else if ((i & 8388613) == 8388613) {
+            } else if ((i & GravityCompat.END) == 8388613) {
                 this.mShadowEnd = drawable;
             } else if ((i & 3) == 3) {
                 this.mShadowLeft = drawable;
diff --git a/app/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java b/app/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java
index 355279bc70..42b77c6e1f 100644
--- a/app/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java
+++ b/app/src/main/java/androidx/dynamicanimation/animation/AnimationHandler.java
@@ -68,7 +68,7 @@ public class AnimationHandler {
 
         @Override // androidx.dynamicanimation.animation.AnimationHandler.AnimationFrameCallbackProvider
         public void postFrameCallback() {
-            this.mHandler.postDelayed(this.mRunnable, Math.max(10 - (SystemClock.uptimeMillis() - this.mLastFrameTime), 0L));
+            this.mHandler.postDelayed(this.mRunnable, Math.max(AnimationHandler.FRAME_DELAY_MS - (SystemClock.uptimeMillis() - this.mLastFrameTime), 0L));
         }
     }
 
diff --git a/app/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java b/app/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java
index 4c7031be35..10e050b79c 100644
--- a/app/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java
+++ b/app/src/main/java/androidx/dynamicanimation/animation/DynamicAnimation.java
@@ -7,12 +7,13 @@ import android.view.View;
 import androidx.annotation.FloatRange;
 import androidx.annotation.MainThread;
 import androidx.annotation.RestrictTo;
+import androidx.constraintlayout.motion.widget.Key;
 import androidx.core.view.ViewCompat;
 import androidx.dynamicanimation.animation.AnimationHandler;
 import androidx.dynamicanimation.animation.DynamicAnimation;
 import java.util.ArrayList;
 public abstract class DynamicAnimation<T extends DynamicAnimation<T>> implements AnimationHandler.AnimationFrameCallback {
-    public static final ViewProperty ALPHA = new AnonymousClass12("alpha");
+    public static final ViewProperty ALPHA = new AnonymousClass12(Key.ALPHA);
     @SuppressLint({"MinMaxConstant"})
     public static final float MIN_VISIBLE_CHANGE_ALPHA = 0.00390625f;
     @SuppressLint({"MinMaxConstant"})
@@ -21,17 +22,17 @@ public abstract class DynamicAnimation<T extends DynamicAnimation<T>> implements
     public static final float MIN_VISIBLE_CHANGE_ROTATION_DEGREES = 0.1f;
     @SuppressLint({"MinMaxConstant"})
     public static final float MIN_VISIBLE_CHANGE_SCALE = 0.002f;
-    public static final ViewProperty ROTATION = new AnonymousClass6("rotation");
-    public static final ViewProperty ROTATION_X = new AnonymousClass7("rotationX");
-    public static final ViewProperty ROTATION_Y = new AnonymousClass8("rotationY");
-    public static final ViewProperty SCALE_X = new AnonymousClass4("scaleX");
-    public static final ViewProperty SCALE_Y = new AnonymousClass5("scaleY");
+    public static final ViewProperty ROTATION = new AnonymousClass6(Key.ROTATION);
+    public static final ViewProperty ROTATION_X = new AnonymousClass7(Key.ROTATION_X);
+    public static final ViewProperty ROTATION_Y = new AnonymousClass8(Key.ROTATION_Y);
+    public static final ViewProperty SCALE_X = new AnonymousClass4(Key.SCALE_X);
+    public static final ViewProperty SCALE_Y = new AnonymousClass5(Key.SCALE_Y);
     public static final ViewProperty SCROLL_X = new AnonymousClass13("scrollX");
     public static final ViewProperty SCROLL_Y = new AnonymousClass14("scrollY");
     private static final float THRESHOLD_MULTIPLIER = 0.75f;
-    public static final ViewProperty TRANSLATION_X = new AnonymousClass1("translationX");
-    public static final ViewProperty TRANSLATION_Y = new AnonymousClass2("translationY");
-    public static final ViewProperty TRANSLATION_Z = new AnonymousClass3("translationZ");
+    public static final ViewProperty TRANSLATION_X = new AnonymousClass1(Key.TRANSLATION_X);
+    public static final ViewProperty TRANSLATION_Y = new AnonymousClass2(Key.TRANSLATION_Y);
+    public static final ViewProperty TRANSLATION_Z = new AnonymousClass3(Key.TRANSLATION_Z);
     private static final float UNSET = Float.MAX_VALUE;
     public static final ViewProperty X = new AnonymousClass9("x");
     public static final ViewProperty Y = new AnonymousClass10("y");
diff --git a/app/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java b/app/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java
index c2e7f54c41..3208f90f20 100644
--- a/app/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java
+++ b/app/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java
@@ -8,7 +8,7 @@ public final class FlingAnimation extends DynamicAnimation<FlingAnimation> {
     public static final class DragForce implements Force {
         private static final float DEFAULT_FRICTION = -4.2f;
         private static final float VELOCITY_THRESHOLD_MULTIPLIER = 62.5f;
-        private float mFriction = -4.2f;
+        private float mFriction = DEFAULT_FRICTION;
         private final DynamicAnimation.MassState mMassState = new DynamicAnimation.MassState();
         private float mVelocityThreshold;
 
@@ -18,7 +18,7 @@ public final class FlingAnimation extends DynamicAnimation<FlingAnimation> {
         }
 
         public float getFrictionScalar() {
-            return this.mFriction / -4.2f;
+            return this.mFriction / DEFAULT_FRICTION;
         }
 
         @Override // androidx.dynamicanimation.animation.Force
@@ -27,11 +27,11 @@ public final class FlingAnimation extends DynamicAnimation<FlingAnimation> {
         }
 
         public void setFrictionScalar(float f) {
-            this.mFriction = f * -4.2f;
+            this.mFriction = f * DEFAULT_FRICTION;
         }
 
         public void setValueThreshold(float f) {
-            this.mVelocityThreshold = f * 62.5f;
+            this.mVelocityThreshold = f * VELOCITY_THRESHOLD_MULTIPLIER;
         }
 
         public DynamicAnimation.MassState updateValueAndVelocity(float f, float f2, long j) {
diff --git a/app/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java b/app/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java
index 98919f0133..e4d0923a4d 100644
--- a/app/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java
+++ b/app/src/main/java/androidx/dynamicanimation/animation/SpringAnimation.java
@@ -4,6 +4,7 @@ import android.os.Looper;
 import android.util.AndroidRuntimeException;
 import androidx.annotation.MainThread;
 import androidx.dynamicanimation.animation.DynamicAnimation;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 public final class SpringAnimation extends DynamicAnimation<SpringAnimation> {
     private static final float UNSET = Float.MAX_VALUE;
     private boolean mEndRequested = false;
@@ -55,7 +56,7 @@ public final class SpringAnimation extends DynamicAnimation<SpringAnimation> {
     }
 
     public boolean canSkipToEnd() {
-        return this.mSpring.mDampingRatio > 0.0d;
+        return this.mSpring.mDampingRatio > ShadowDrawableWrapper.COS_45;
     }
 
     @Override // androidx.dynamicanimation.animation.DynamicAnimation
diff --git a/app/src/main/java/androidx/dynamicanimation/animation/SpringForce.java b/app/src/main/java/androidx/dynamicanimation/animation/SpringForce.java
index d010c0a25e..5e273d6253 100644
--- a/app/src/main/java/androidx/dynamicanimation/animation/SpringForce.java
+++ b/app/src/main/java/androidx/dynamicanimation/animation/SpringForce.java
@@ -3,6 +3,7 @@ package androidx.dynamicanimation.animation;
 import androidx.annotation.FloatRange;
 import androidx.annotation.RestrictTo;
 import androidx.dynamicanimation.animation.DynamicAnimation;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 public final class SpringForce implements Force {
     public static final float DAMPING_RATIO_HIGH_BOUNCY = 0.2f;
     public static final float DAMPING_RATIO_LOW_BOUNCY = 0.75f;
@@ -16,7 +17,7 @@ public final class SpringForce implements Force {
     private static final double VELOCITY_THRESHOLD_MULTIPLIER = 62.5d;
     private double mDampedFreq;
     public double mDampingRatio = 0.5d;
-    private double mFinalPosition = Double.MAX_VALUE;
+    private double mFinalPosition = UNSET;
     private double mGammaMinus;
     private double mGammaPlus;
     private boolean mInitialized = false;
@@ -34,7 +35,7 @@ public final class SpringForce implements Force {
 
     private void init() {
         if (!this.mInitialized) {
-            if (this.mFinalPosition != Double.MAX_VALUE) {
+            if (this.mFinalPosition != UNSET) {
                 double d = this.mDampingRatio;
                 if (d > 1.0d) {
                     double d2 = this.mNaturalFreq;
@@ -42,7 +43,7 @@ public final class SpringForce implements Force {
                     double d3 = this.mDampingRatio;
                     double d4 = this.mNaturalFreq;
                     this.mGammaMinus = ((-d3) * d4) - (Math.sqrt((d3 * d3) - 1.0d) * d4);
-                } else if (d >= 0.0d && d < 1.0d) {
+                } else if (d >= ShadowDrawableWrapper.COS_45 && d < 1.0d) {
                     this.mDampedFreq = Math.sqrt(1.0d - (d * d)) * this.mNaturalFreq;
                 }
                 this.mInitialized = true;
@@ -105,7 +106,7 @@ public final class SpringForce implements Force {
     public void setValueThreshold(double d) {
         double abs = Math.abs(d);
         this.mValueThreshold = abs;
-        this.mVelocityThreshold = abs * 62.5d;
+        this.mVelocityThreshold = abs * VELOCITY_THRESHOLD_MULTIPLIER;
     }
 
     public DynamicAnimation.MassState updateValues(double d, double d2, long j) {
diff --git a/app/src/main/java/androidx/exifinterface/media/ExifInterface.java b/app/src/main/java/androidx/exifinterface/media/ExifInterface.java
index 71c8182991..0d6febf39b 100644
--- a/app/src/main/java/androidx/exifinterface/media/ExifInterface.java
+++ b/app/src/main/java/androidx/exifinterface/media/ExifInterface.java
@@ -15,7 +15,14 @@ import android.util.Pair;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.core.view.InputDeviceCompat;
+import androidx.media.AudioAttributesCompat;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
+import com.google.android.material.badge.BadgeDrawable;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
@@ -78,9 +85,9 @@ public class ExifInterface {
     private static final Pattern DATETIME_PRIMARY_FORMAT_PATTERN = Pattern.compile("^(\\d{4}):(\\d{2}):(\\d{2})\\s(\\d{2}):(\\d{2}):(\\d{2})$");
     private static final Pattern DATETIME_SECONDARY_FORMAT_PATTERN = Pattern.compile("^(\\d{4})-(\\d{2})-(\\d{2})\\s(\\d{2}):(\\d{2}):(\\d{2})$");
     private static final int DATETIME_VALUE_STRING_LENGTH = 19;
-    private static final boolean DEBUG = Log.isLoggable("ExifInterface", 3);
+    private static final boolean DEBUG = Log.isLoggable(TAG, 3);
     public static final byte[] EXIF_ASCII_PREFIX = {65, 83, 67, 73, 73, 0, 0, 0};
-    private static final ExifTag[] EXIF_POINTER_TAGS = {new ExifTag("SubIFDPointer", 330, 4), new ExifTag("ExifIFDPointer", 34665, 4), new ExifTag("GPSInfoIFDPointer", 34853, 4), new ExifTag("InteroperabilityIFDPointer", 40965, 4), new ExifTag("CameraSettingsIFDPointer", 8224, 1), new ExifTag("ImageProcessingIFDPointer", 8256, 1)};
+    private static final ExifTag[] EXIF_POINTER_TAGS = {new ExifTag(TAG_SUB_IFD_POINTER, 330, 4), new ExifTag(TAG_EXIF_IFD_POINTER, 34665, 4), new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, 4), new ExifTag(TAG_INTEROPERABILITY_IFD_POINTER, 40965, 4), new ExifTag(TAG_ORF_CAMERA_SETTINGS_IFD_POINTER, 8224, 1), new ExifTag(TAG_ORF_IMAGE_PROCESSING_IFD_POINTER, 8256, 1)};
     public static final ExifTag[][] EXIF_TAGS;
     public static final short EXPOSURE_MODE_AUTO = 0;
     public static final short EXPOSURE_MODE_AUTO_BRACKET = 2;
@@ -180,9 +187,9 @@ public class ExifInterface {
     private static final int IMAGE_TYPE_SRW = 11;
     private static final int IMAGE_TYPE_UNKNOWN = 0;
     private static final int IMAGE_TYPE_WEBP = 14;
-    private static final ExifTag JPEG_INTERCHANGE_FORMAT_LENGTH_TAG = new ExifTag("JPEGInterchangeFormatLength", 514, 4);
-    private static final ExifTag JPEG_INTERCHANGE_FORMAT_TAG = new ExifTag("JPEGInterchangeFormat", 513, 4);
-    public static final byte[] JPEG_SIGNATURE = {-1, -40, -1};
+    private static final ExifTag JPEG_INTERCHANGE_FORMAT_LENGTH_TAG = new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, 4);
+    private static final ExifTag JPEG_INTERCHANGE_FORMAT_TAG = new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, InputDeviceCompat.SOURCE_DPAD, 4);
+    public static final byte[] JPEG_SIGNATURE = {-1, MARKER_SOI, -1};
     public static final String LATITUDE_NORTH = "N";
     public static final String LATITUDE_SOUTH = "S";
     public static final short LIGHT_SOURCE_CLOUDY_WEATHER = 10;
@@ -430,7 +437,7 @@ public class ExifInterface {
     public static final String TAG_PIXEL_Y_DIMENSION = "PixelYDimension";
     public static final String TAG_PLANAR_CONFIGURATION = "PlanarConfiguration";
     public static final String TAG_PRIMARY_CHROMATICITIES = "PrimaryChromaticities";
-    private static final ExifTag TAG_RAF_IMAGE_SIZE = new ExifTag("StripOffsets", 273, 3);
+    private static final ExifTag TAG_RAF_IMAGE_SIZE = new ExifTag(TAG_STRIP_OFFSETS, AudioAttributesCompat.FLAG_ALL_PUBLIC, 3);
     public static final String TAG_RECOMMENDED_EXPOSURE_INDEX = "RecommendedExposureIndex";
     public static final String TAG_REFERENCE_BLACK_WHITE = "ReferenceBlackWhite";
     public static final String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
@@ -492,7 +499,7 @@ public class ExifInterface {
     private static final byte[] WEBP_SIGNATURE_1 = {82, 73, 70, 70};
     private static final byte[] WEBP_SIGNATURE_2 = {87, 69, 66, 80};
     private static final byte WEBP_VP8L_SIGNATURE = 47;
-    private static final byte[] WEBP_VP8_SIGNATURE = {-99, 1, 42};
+    private static final byte[] WEBP_VP8_SIGNATURE = {-99, 1, START_CODE};
     @Deprecated
     public static final int WHITEBALANCE_AUTO = 0;
     @Deprecated
@@ -506,7 +513,7 @@ public class ExifInterface {
     private static final HashMap<String, ExifTag>[] sExifTagMapsForWriting;
     private static SimpleDateFormat sFormatterPrimary;
     private static SimpleDateFormat sFormatterSecondary;
-    private static final HashSet<String> sTagSetForCompatibility = new HashSet<>(Arrays.asList("FNumber", "DigitalZoomRatio", "ExposureTime", "SubjectDistance", "GPSTimeStamp"));
+    private static final HashSet<String> sTagSetForCompatibility = new HashSet<>(Arrays.asList(TAG_F_NUMBER, TAG_DIGITAL_ZOOM_RATIO, TAG_EXPOSURE_TIME, TAG_SUBJECT_DISTANCE, TAG_GPS_TIMESTAMP));
     private boolean mAreThumbnailStripsConsecutive;
     private AssetManager.AssetInputStream mAssetInputStream;
     private final HashMap<String, ExifAttribute>[] mAttributes;
@@ -723,7 +730,7 @@ public class ExifInterface {
 
         @Override // java.io.DataInput
         public String readLine() throws IOException {
-            Log.d("ExifInterface", "Currently unsupported");
+            Log.d(ExifInterface.TAG, "Currently unsupported");
             return null;
         }
 
@@ -1134,7 +1141,7 @@ public class ExifInterface {
                 Rational[] rationalArr = (Rational[]) value;
                 while (i < rationalArr.length) {
                     sb.append(rationalArr[i].numerator);
-                    sb.append('/');
+                    sb.append(MentionUtilsKt.SLASH_CHAR);
                     sb.append(rationalArr[i].denominator);
                     i++;
                     if (i != rationalArr.length) {
@@ -1169,7 +1176,7 @@ public class ExifInterface {
                                 try {
                                     byteOrderedDataInputStream.close();
                                 } catch (IOException e2) {
-                                    Log.e("ExifInterface", "IOException occurred while closing InputStream", e2);
+                                    Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e2);
                                 }
                                 return str;
                             }
@@ -1177,7 +1184,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e3) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e3);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e3);
                             }
                             return str2;
                         case 2:
@@ -1211,7 +1218,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e4) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e4);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e4);
                             }
                             return sb2;
                         case 3:
@@ -1223,7 +1230,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e5) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e5);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e5);
                             }
                             return iArr;
                         case 4:
@@ -1235,7 +1242,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e6) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e6);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e6);
                             }
                             return jArr;
                         case 5:
@@ -1247,7 +1254,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e7) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e7);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e7);
                             }
                             return rationalArr;
                         case 8:
@@ -1259,7 +1266,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e8) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e8);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e8);
                             }
                             return iArr2;
                         case 9:
@@ -1271,7 +1278,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e9) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e9);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e9);
                             }
                             return iArr3;
                         case 10:
@@ -1283,7 +1290,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e10) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e10);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e10);
                             }
                             return rationalArr2;
                         case 11:
@@ -1295,7 +1302,7 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e11) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e11);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e11);
                             }
                             return dArr;
                         case 12:
@@ -1307,21 +1314,21 @@ public class ExifInterface {
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e12) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e12);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e12);
                             }
                             return dArr2;
                         default:
                             try {
                                 byteOrderedDataInputStream.close();
                             } catch (IOException e13) {
-                                Log.e("ExifInterface", "IOException occurred while closing InputStream", e13);
+                                Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e13);
                             }
                             return null;
                     }
                 } catch (IOException e14) {
                     e = e14;
                     try {
-                        Log.w("ExifInterface", "IOException occurred during reading a value", e);
+                        Log.w(ExifInterface.TAG, "IOException occurred during reading a value", e);
                         if (byteOrderedDataInputStream != null) {
                         }
                         return null;
@@ -1336,12 +1343,12 @@ public class ExifInterface {
             } catch (IOException e15) {
                 e = e15;
                 byteOrderedDataInputStream = null;
-                Log.w("ExifInterface", "IOException occurred during reading a value", e);
+                Log.w(ExifInterface.TAG, "IOException occurred during reading a value", e);
                 if (byteOrderedDataInputStream != null) {
                     try {
                         byteOrderedDataInputStream.close();
                     } catch (IOException e16) {
-                        Log.e("ExifInterface", "IOException occurred while closing InputStream", e16);
+                        Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e16);
                     }
                 }
                 return null;
@@ -1351,7 +1358,7 @@ public class ExifInterface {
                     try {
                         byteOrderedDataInputStream2.close();
                     } catch (IOException e17) {
-                        Log.e("ExifInterface", "IOException occurred while closing InputStream", e17);
+                        Log.e(ExifInterface.TAG, "IOException occurred while closing InputStream", e17);
                     }
                 }
                 throw th;
@@ -1439,28 +1446,28 @@ public class ExifInterface {
         }
 
         public String toString() {
-            return this.numerator + "/" + this.denominator;
+            return this.numerator + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + this.denominator;
         }
     }
 
     static {
-        ExifTag[] exifTagArr = {new ExifTag("NewSubfileType", 254, 4), new ExifTag("SubfileType", 255, 4), new ExifTag("ImageWidth", 256, 3, 4), new ExifTag("ImageLength", 257, 3, 4), new ExifTag("BitsPerSample", 258, 3), new ExifTag("Compression", 259, 3), new ExifTag("PhotometricInterpretation", 262, 3), new ExifTag("ImageDescription", 270, 2), new ExifTag("Make", 271, 2), new ExifTag("Model", 272, 2), new ExifTag("StripOffsets", 273, 3, 4), new ExifTag("Orientation", 274, 3), new ExifTag("SamplesPerPixel", 277, 3), new ExifTag("RowsPerStrip", 278, 3, 4), new ExifTag("StripByteCounts", 279, 3, 4), new ExifTag("XResolution", 282, 5), new ExifTag("YResolution", 283, 5), new ExifTag("PlanarConfiguration", 284, 3), new ExifTag("ResolutionUnit", 296, 3), new ExifTag("TransferFunction", 301, 3), new ExifTag("Software", 305, 2), new ExifTag("DateTime", 306, 2), new ExifTag("Artist", 315, 2), new ExifTag("WhitePoint", 318, 5), new ExifTag("PrimaryChromaticities", 319, 5), new ExifTag("SubIFDPointer", 330, 4), new ExifTag("JPEGInterchangeFormat", 513, 4), new ExifTag("JPEGInterchangeFormatLength", 514, 4), new ExifTag("YCbCrCoefficients", 529, 5), new ExifTag("YCbCrSubSampling", 530, 3), new ExifTag("YCbCrPositioning", 531, 3), new ExifTag("ReferenceBlackWhite", 532, 5), new ExifTag("Copyright", 33432, 2), new ExifTag("ExifIFDPointer", 34665, 4), new ExifTag("GPSInfoIFDPointer", 34853, 4), new ExifTag("SensorTopBorder", 4, 4), new ExifTag("SensorLeftBorder", 5, 4), new ExifTag("SensorBottomBorder", 6, 4), new ExifTag("SensorRightBorder", 7, 4), new ExifTag("ISO", 23, 3), new ExifTag("JpgFromRaw", 46, 7), new ExifTag("Xmp", 700, 1)};
+        ExifTag[] exifTagArr = {new ExifTag(TAG_NEW_SUBFILE_TYPE, 254, 4), new ExifTag(TAG_SUBFILE_TYPE, 255, 4), new ExifTag(TAG_IMAGE_WIDTH, 256, 3, 4), new ExifTag(TAG_IMAGE_LENGTH, 257, 3, 4), new ExifTag(TAG_BITS_PER_SAMPLE, 258, 3), new ExifTag(TAG_COMPRESSION, 259, 3), new ExifTag(TAG_PHOTOMETRIC_INTERPRETATION, 262, 3), new ExifTag(TAG_IMAGE_DESCRIPTION, 270, 2), new ExifTag(TAG_MAKE, 271, 2), new ExifTag(TAG_MODEL, 272, 2), new ExifTag(TAG_STRIP_OFFSETS, AudioAttributesCompat.FLAG_ALL_PUBLIC, 3, 4), new ExifTag(TAG_ORIENTATION, 274, 3), new ExifTag(TAG_SAMPLES_PER_PIXEL, 277, 3), new ExifTag(TAG_ROWS_PER_STRIP, 278, 3, 4), new ExifTag(TAG_STRIP_BYTE_COUNTS, 279, 3, 4), new ExifTag(TAG_X_RESOLUTION, 282, 5), new ExifTag(TAG_Y_RESOLUTION, 283, 5), new ExifTag(TAG_PLANAR_CONFIGURATION, 284, 3), new ExifTag(TAG_RESOLUTION_UNIT, 296, 3), new ExifTag(TAG_TRANSFER_FUNCTION, 301, 3), new ExifTag(TAG_SOFTWARE, 305, 2), new ExifTag(TAG_DATETIME, 306, 2), new ExifTag(TAG_ARTIST, 315, 2), new ExifTag(TAG_WHITE_POINT, 318, 5), new ExifTag(TAG_PRIMARY_CHROMATICITIES, 319, 5), new ExifTag(TAG_SUB_IFD_POINTER, 330, 4), new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, InputDeviceCompat.SOURCE_DPAD, 4), new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, 4), new ExifTag(TAG_Y_CB_CR_COEFFICIENTS, 529, 5), new ExifTag(TAG_Y_CB_CR_SUB_SAMPLING, 530, 3), new ExifTag(TAG_Y_CB_CR_POSITIONING, 531, 3), new ExifTag(TAG_REFERENCE_BLACK_WHITE, 532, 5), new ExifTag(TAG_COPYRIGHT, 33432, 2), new ExifTag(TAG_EXIF_IFD_POINTER, 34665, 4), new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, 4), new ExifTag(TAG_RW2_SENSOR_TOP_BORDER, 4, 4), new ExifTag(TAG_RW2_SENSOR_LEFT_BORDER, 5, 4), new ExifTag(TAG_RW2_SENSOR_BOTTOM_BORDER, 6, 4), new ExifTag(TAG_RW2_SENSOR_RIGHT_BORDER, 7, 4), new ExifTag(TAG_RW2_ISO, 23, 3), new ExifTag(TAG_RW2_JPG_FROM_RAW, 46, 7), new ExifTag(TAG_XMP, 700, 1)};
         IFD_TIFF_TAGS = exifTagArr;
-        ExifTag[] exifTagArr2 = {new ExifTag("ExposureTime", 33434, 5), new ExifTag("FNumber", 33437, 5), new ExifTag("ExposureProgram", 34850, 3), new ExifTag("SpectralSensitivity", 34852, 2), new ExifTag("PhotographicSensitivity", 34855, 3), new ExifTag("OECF", 34856, 7), new ExifTag("SensitivityType", 34864, 3), new ExifTag("StandardOutputSensitivity", 34865, 4), new ExifTag("RecommendedExposureIndex", 34866, 4), new ExifTag("ISOSpeed", 34867, 4), new ExifTag("ISOSpeedLatitudeyyy", 34868, 4), new ExifTag("ISOSpeedLatitudezzz", 34869, 4), new ExifTag("ExifVersion", 36864, 2), new ExifTag("DateTimeOriginal", 36867, 2), new ExifTag("DateTimeDigitized", 36868, 2), new ExifTag("OffsetTime", 36880, 2), new ExifTag("OffsetTimeOriginal", 36881, 2), new ExifTag("OffsetTimeDigitized", 36882, 2), new ExifTag("ComponentsConfiguration", 37121, 7), new ExifTag("CompressedBitsPerPixel", 37122, 5), new ExifTag("ShutterSpeedValue", 37377, 10), new ExifTag("ApertureValue", 37378, 5), new ExifTag("BrightnessValue", 37379, 10), new ExifTag("ExposureBiasValue", 37380, 10), new ExifTag("MaxApertureValue", 37381, 5), new ExifTag("SubjectDistance", 37382, 5), new ExifTag("MeteringMode", 37383, 3), new ExifTag("LightSource", 37384, 3), new ExifTag("Flash", 37385, 3), new ExifTag("FocalLength", 37386, 5), new ExifTag("SubjectArea", 37396, 3), new ExifTag("MakerNote", 37500, 7), new ExifTag("UserComment", 37510, 7), new ExifTag("SubSecTime", 37520, 2), new ExifTag("SubSecTimeOriginal", 37521, 2), new ExifTag("SubSecTimeDigitized", 37522, 2), new ExifTag("FlashpixVersion", 40960, 7), new ExifTag("ColorSpace", 40961, 3), new ExifTag("PixelXDimension", 40962, 3, 4), new ExifTag("PixelYDimension", 40963, 3, 4), new ExifTag("RelatedSoundFile", 40964, 2), new ExifTag("InteroperabilityIFDPointer", 40965, 4), new ExifTag("FlashEnergy", 41483, 5), new ExifTag("SpatialFrequencyResponse", 41484, 7), new ExifTag("FocalPlaneXResolution", 41486, 5), new ExifTag("FocalPlaneYResolution", 41487, 5), new ExifTag("FocalPlaneResolutionUnit", 41488, 3), new ExifTag("SubjectLocation", 41492, 3), new ExifTag("ExposureIndex", 41493, 5), new ExifTag("SensingMethod", 41495, 3), new ExifTag("FileSource", 41728, 7), new ExifTag("SceneType", 41729, 7), new ExifTag("CFAPattern", 41730, 7), new ExifTag("CustomRendered", 41985, 3), new ExifTag("ExposureMode", 41986, 3), new ExifTag("WhiteBalance", 41987, 3), new ExifTag("DigitalZoomRatio", 41988, 5), new ExifTag("FocalLengthIn35mmFilm", 41989, 3), new ExifTag("SceneCaptureType", 41990, 3), new ExifTag("GainControl", 41991, 3), new ExifTag("Contrast", 41992, 3), new ExifTag("Saturation", 41993, 3), new ExifTag("Sharpness", 41994, 3), new ExifTag("DeviceSettingDescription", 41995, 7), new ExifTag("SubjectDistanceRange", 41996, 3), new ExifTag("ImageUniqueID", 42016, 2), new ExifTag("CameraOwnerName", 42032, 2), new ExifTag("BodySerialNumber", 42033, 2), new ExifTag("LensSpecification", 42034, 5), new ExifTag("LensMake", 42035, 2), new ExifTag("LensModel", 42036, 2), new ExifTag("Gamma", 42240, 5), new ExifTag("DNGVersion", 50706, 1), new ExifTag("DefaultCropSize", 50720, 3, 4)};
+        ExifTag[] exifTagArr2 = {new ExifTag(TAG_EXPOSURE_TIME, 33434, 5), new ExifTag(TAG_F_NUMBER, 33437, 5), new ExifTag(TAG_EXPOSURE_PROGRAM, 34850, 3), new ExifTag(TAG_SPECTRAL_SENSITIVITY, 34852, 2), new ExifTag(TAG_PHOTOGRAPHIC_SENSITIVITY, 34855, 3), new ExifTag(TAG_OECF, 34856, 7), new ExifTag(TAG_SENSITIVITY_TYPE, 34864, 3), new ExifTag(TAG_STANDARD_OUTPUT_SENSITIVITY, 34865, 4), new ExifTag(TAG_RECOMMENDED_EXPOSURE_INDEX, 34866, 4), new ExifTag(TAG_ISO_SPEED, 34867, 4), new ExifTag(TAG_ISO_SPEED_LATITUDE_YYY, 34868, 4), new ExifTag(TAG_ISO_SPEED_LATITUDE_ZZZ, 34869, 4), new ExifTag(TAG_EXIF_VERSION, 36864, 2), new ExifTag(TAG_DATETIME_ORIGINAL, 36867, 2), new ExifTag(TAG_DATETIME_DIGITIZED, 36868, 2), new ExifTag(TAG_OFFSET_TIME, 36880, 2), new ExifTag(TAG_OFFSET_TIME_ORIGINAL, 36881, 2), new ExifTag(TAG_OFFSET_TIME_DIGITIZED, 36882, 2), new ExifTag(TAG_COMPONENTS_CONFIGURATION, 37121, 7), new ExifTag(TAG_COMPRESSED_BITS_PER_PIXEL, 37122, 5), new ExifTag(TAG_SHUTTER_SPEED_VALUE, 37377, 10), new ExifTag(TAG_APERTURE_VALUE, 37378, 5), new ExifTag(TAG_BRIGHTNESS_VALUE, 37379, 10), new ExifTag(TAG_EXPOSURE_BIAS_VALUE, 37380, 10), new ExifTag(TAG_MAX_APERTURE_VALUE, 37381, 5), new ExifTag(TAG_SUBJECT_DISTANCE, 37382, 5), new ExifTag(TAG_METERING_MODE, 37383, 3), new ExifTag(TAG_LIGHT_SOURCE, 37384, 3), new ExifTag(TAG_FLASH, 37385, 3), new ExifTag(TAG_FOCAL_LENGTH, 37386, 5), new ExifTag(TAG_SUBJECT_AREA, 37396, 3), new ExifTag(TAG_MAKER_NOTE, 37500, 7), new ExifTag(TAG_USER_COMMENT, 37510, 7), new ExifTag(TAG_SUBSEC_TIME, 37520, 2), new ExifTag(TAG_SUBSEC_TIME_ORIGINAL, 37521, 2), new ExifTag(TAG_SUBSEC_TIME_DIGITIZED, 37522, 2), new ExifTag(TAG_FLASHPIX_VERSION, 40960, 7), new ExifTag(TAG_COLOR_SPACE, 40961, 3), new ExifTag(TAG_PIXEL_X_DIMENSION, 40962, 3, 4), new ExifTag(TAG_PIXEL_Y_DIMENSION, 40963, 3, 4), new ExifTag(TAG_RELATED_SOUND_FILE, 40964, 2), new ExifTag(TAG_INTEROPERABILITY_IFD_POINTER, 40965, 4), new ExifTag(TAG_FLASH_ENERGY, 41483, 5), new ExifTag(TAG_SPATIAL_FREQUENCY_RESPONSE, 41484, 7), new ExifTag(TAG_FOCAL_PLANE_X_RESOLUTION, 41486, 5), new ExifTag(TAG_FOCAL_PLANE_Y_RESOLUTION, 41487, 5), new ExifTag(TAG_FOCAL_PLANE_RESOLUTION_UNIT, 41488, 3), new ExifTag(TAG_SUBJECT_LOCATION, 41492, 3), new ExifTag(TAG_EXPOSURE_INDEX, 41493, 5), new ExifTag(TAG_SENSING_METHOD, 41495, 3), new ExifTag(TAG_FILE_SOURCE, 41728, 7), new ExifTag(TAG_SCENE_TYPE, 41729, 7), new ExifTag(TAG_CFA_PATTERN, 41730, 7), new ExifTag(TAG_CUSTOM_RENDERED, 41985, 3), new ExifTag(TAG_EXPOSURE_MODE, 41986, 3), new ExifTag(TAG_WHITE_BALANCE, 41987, 3), new ExifTag(TAG_DIGITAL_ZOOM_RATIO, 41988, 5), new ExifTag(TAG_FOCAL_LENGTH_IN_35MM_FILM, 41989, 3), new ExifTag(TAG_SCENE_CAPTURE_TYPE, 41990, 3), new ExifTag(TAG_GAIN_CONTROL, 41991, 3), new ExifTag(TAG_CONTRAST, 41992, 3), new ExifTag(TAG_SATURATION, 41993, 3), new ExifTag(TAG_SHARPNESS, 41994, 3), new ExifTag(TAG_DEVICE_SETTING_DESCRIPTION, 41995, 7), new ExifTag(TAG_SUBJECT_DISTANCE_RANGE, 41996, 3), new ExifTag(TAG_IMAGE_UNIQUE_ID, 42016, 2), new ExifTag("CameraOwnerName", 42032, 2), new ExifTag(TAG_BODY_SERIAL_NUMBER, 42033, 2), new ExifTag(TAG_LENS_SPECIFICATION, 42034, 5), new ExifTag(TAG_LENS_MAKE, 42035, 2), new ExifTag(TAG_LENS_MODEL, 42036, 2), new ExifTag(TAG_GAMMA, 42240, 5), new ExifTag(TAG_DNG_VERSION, 50706, 1), new ExifTag(TAG_DEFAULT_CROP_SIZE, 50720, 3, 4)};
         IFD_EXIF_TAGS = exifTagArr2;
-        ExifTag[] exifTagArr3 = {new ExifTag("GPSVersionID", 0, 1), new ExifTag("GPSLatitudeRef", 1, 2), new ExifTag("GPSLatitude", 2, 5, 10), new ExifTag("GPSLongitudeRef", 3, 2), new ExifTag("GPSLongitude", 4, 5, 10), new ExifTag("GPSAltitudeRef", 5, 1), new ExifTag("GPSAltitude", 6, 5), new ExifTag("GPSTimeStamp", 7, 5), new ExifTag("GPSSatellites", 8, 2), new ExifTag("GPSStatus", 9, 2), new ExifTag("GPSMeasureMode", 10, 2), new ExifTag("GPSDOP", 11, 5), new ExifTag("GPSSpeedRef", 12, 2), new ExifTag("GPSSpeed", 13, 5), new ExifTag("GPSTrackRef", 14, 2), new ExifTag("GPSTrack", 15, 5), new ExifTag("GPSImgDirectionRef", 16, 2), new ExifTag("GPSImgDirection", 17, 5), new ExifTag("GPSMapDatum", 18, 2), new ExifTag("GPSDestLatitudeRef", 19, 2), new ExifTag("GPSDestLatitude", 20, 5), new ExifTag("GPSDestLongitudeRef", 21, 2), new ExifTag("GPSDestLongitude", 22, 5), new ExifTag("GPSDestBearingRef", 23, 2), new ExifTag("GPSDestBearing", 24, 5), new ExifTag("GPSDestDistanceRef", 25, 2), new ExifTag("GPSDestDistance", 26, 5), new ExifTag("GPSProcessingMethod", 27, 7), new ExifTag("GPSAreaInformation", 28, 7), new ExifTag("GPSDateStamp", 29, 2), new ExifTag("GPSDifferential", 30, 3), new ExifTag("GPSHPositioningError", 31, 5)};
+        ExifTag[] exifTagArr3 = {new ExifTag(TAG_GPS_VERSION_ID, 0, 1), new ExifTag(TAG_GPS_LATITUDE_REF, 1, 2), new ExifTag(TAG_GPS_LATITUDE, 2, 5, 10), new ExifTag(TAG_GPS_LONGITUDE_REF, 3, 2), new ExifTag(TAG_GPS_LONGITUDE, 4, 5, 10), new ExifTag(TAG_GPS_ALTITUDE_REF, 5, 1), new ExifTag(TAG_GPS_ALTITUDE, 6, 5), new ExifTag(TAG_GPS_TIMESTAMP, 7, 5), new ExifTag(TAG_GPS_SATELLITES, 8, 2), new ExifTag(TAG_GPS_STATUS, 9, 2), new ExifTag(TAG_GPS_MEASURE_MODE, 10, 2), new ExifTag(TAG_GPS_DOP, 11, 5), new ExifTag(TAG_GPS_SPEED_REF, 12, 2), new ExifTag(TAG_GPS_SPEED, 13, 5), new ExifTag(TAG_GPS_TRACK_REF, 14, 2), new ExifTag(TAG_GPS_TRACK, 15, 5), new ExifTag(TAG_GPS_IMG_DIRECTION_REF, 16, 2), new ExifTag(TAG_GPS_IMG_DIRECTION, 17, 5), new ExifTag(TAG_GPS_MAP_DATUM, 18, 2), new ExifTag(TAG_GPS_DEST_LATITUDE_REF, 19, 2), new ExifTag(TAG_GPS_DEST_LATITUDE, 20, 5), new ExifTag(TAG_GPS_DEST_LONGITUDE_REF, 21, 2), new ExifTag(TAG_GPS_DEST_LONGITUDE, 22, 5), new ExifTag(TAG_GPS_DEST_BEARING_REF, 23, 2), new ExifTag(TAG_GPS_DEST_BEARING, 24, 5), new ExifTag(TAG_GPS_DEST_DISTANCE_REF, 25, 2), new ExifTag(TAG_GPS_DEST_DISTANCE, 26, 5), new ExifTag(TAG_GPS_PROCESSING_METHOD, 27, 7), new ExifTag(TAG_GPS_AREA_INFORMATION, 28, 7), new ExifTag(TAG_GPS_DATESTAMP, 29, 2), new ExifTag(TAG_GPS_DIFFERENTIAL, 30, 3), new ExifTag(TAG_GPS_H_POSITIONING_ERROR, 31, 5)};
         IFD_GPS_TAGS = exifTagArr3;
-        ExifTag[] exifTagArr4 = {new ExifTag("InteroperabilityIndex", 1, 2)};
+        ExifTag[] exifTagArr4 = {new ExifTag(TAG_INTEROPERABILITY_INDEX, 1, 2)};
         IFD_INTEROPERABILITY_TAGS = exifTagArr4;
-        ExifTag[] exifTagArr5 = {new ExifTag("NewSubfileType", 254, 4), new ExifTag("SubfileType", 255, 4), new ExifTag("ThumbnailImageWidth", 256, 3, 4), new ExifTag("ThumbnailImageLength", 257, 3, 4), new ExifTag("BitsPerSample", 258, 3), new ExifTag("Compression", 259, 3), new ExifTag("PhotometricInterpretation", 262, 3), new ExifTag("ImageDescription", 270, 2), new ExifTag("Make", 271, 2), new ExifTag("Model", 272, 2), new ExifTag("StripOffsets", 273, 3, 4), new ExifTag("ThumbnailOrientation", 274, 3), new ExifTag("SamplesPerPixel", 277, 3), new ExifTag("RowsPerStrip", 278, 3, 4), new ExifTag("StripByteCounts", 279, 3, 4), new ExifTag("XResolution", 282, 5), new ExifTag("YResolution", 283, 5), new ExifTag("PlanarConfiguration", 284, 3), new ExifTag("ResolutionUnit", 296, 3), new ExifTag("TransferFunction", 301, 3), new ExifTag("Software", 305, 2), new ExifTag("DateTime", 306, 2), new ExifTag("Artist", 315, 2), new ExifTag("WhitePoint", 318, 5), new ExifTag("PrimaryChromaticities", 319, 5), new ExifTag("SubIFDPointer", 330, 4), new ExifTag("JPEGInterchangeFormat", 513, 4), new ExifTag("JPEGInterchangeFormatLength", 514, 4), new ExifTag("YCbCrCoefficients", 529, 5), new ExifTag("YCbCrSubSampling", 530, 3), new ExifTag("YCbCrPositioning", 531, 3), new ExifTag("ReferenceBlackWhite", 532, 5), new ExifTag("Copyright", 33432, 2), new ExifTag("ExifIFDPointer", 34665, 4), new ExifTag("GPSInfoIFDPointer", 34853, 4), new ExifTag("DNGVersion", 50706, 1), new ExifTag("DefaultCropSize", 50720, 3, 4)};
+        ExifTag[] exifTagArr5 = {new ExifTag(TAG_NEW_SUBFILE_TYPE, 254, 4), new ExifTag(TAG_SUBFILE_TYPE, 255, 4), new ExifTag(TAG_THUMBNAIL_IMAGE_WIDTH, 256, 3, 4), new ExifTag(TAG_THUMBNAIL_IMAGE_LENGTH, 257, 3, 4), new ExifTag(TAG_BITS_PER_SAMPLE, 258, 3), new ExifTag(TAG_COMPRESSION, 259, 3), new ExifTag(TAG_PHOTOMETRIC_INTERPRETATION, 262, 3), new ExifTag(TAG_IMAGE_DESCRIPTION, 270, 2), new ExifTag(TAG_MAKE, 271, 2), new ExifTag(TAG_MODEL, 272, 2), new ExifTag(TAG_STRIP_OFFSETS, AudioAttributesCompat.FLAG_ALL_PUBLIC, 3, 4), new ExifTag(TAG_THUMBNAIL_ORIENTATION, 274, 3), new ExifTag(TAG_SAMPLES_PER_PIXEL, 277, 3), new ExifTag(TAG_ROWS_PER_STRIP, 278, 3, 4), new ExifTag(TAG_STRIP_BYTE_COUNTS, 279, 3, 4), new ExifTag(TAG_X_RESOLUTION, 282, 5), new ExifTag(TAG_Y_RESOLUTION, 283, 5), new ExifTag(TAG_PLANAR_CONFIGURATION, 284, 3), new ExifTag(TAG_RESOLUTION_UNIT, 296, 3), new ExifTag(TAG_TRANSFER_FUNCTION, 301, 3), new ExifTag(TAG_SOFTWARE, 305, 2), new ExifTag(TAG_DATETIME, 306, 2), new ExifTag(TAG_ARTIST, 315, 2), new ExifTag(TAG_WHITE_POINT, 318, 5), new ExifTag(TAG_PRIMARY_CHROMATICITIES, 319, 5), new ExifTag(TAG_SUB_IFD_POINTER, 330, 4), new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, InputDeviceCompat.SOURCE_DPAD, 4), new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, 4), new ExifTag(TAG_Y_CB_CR_COEFFICIENTS, 529, 5), new ExifTag(TAG_Y_CB_CR_SUB_SAMPLING, 530, 3), new ExifTag(TAG_Y_CB_CR_POSITIONING, 531, 3), new ExifTag(TAG_REFERENCE_BLACK_WHITE, 532, 5), new ExifTag(TAG_COPYRIGHT, 33432, 2), new ExifTag(TAG_EXIF_IFD_POINTER, 34665, 4), new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, 4), new ExifTag(TAG_DNG_VERSION, 50706, 1), new ExifTag(TAG_DEFAULT_CROP_SIZE, 50720, 3, 4)};
         IFD_THUMBNAIL_TAGS = exifTagArr5;
-        ExifTag[] exifTagArr6 = {new ExifTag("ThumbnailImage", 256, 7), new ExifTag("CameraSettingsIFDPointer", 8224, 4), new ExifTag("ImageProcessingIFDPointer", 8256, 4)};
+        ExifTag[] exifTagArr6 = {new ExifTag(TAG_ORF_THUMBNAIL_IMAGE, 256, 7), new ExifTag(TAG_ORF_CAMERA_SETTINGS_IFD_POINTER, 8224, 4), new ExifTag(TAG_ORF_IMAGE_PROCESSING_IFD_POINTER, 8256, 4)};
         ORF_MAKER_NOTE_TAGS = exifTagArr6;
-        ExifTag[] exifTagArr7 = {new ExifTag("PreviewImageStart", 257, 4), new ExifTag("PreviewImageLength", 258, 4)};
+        ExifTag[] exifTagArr7 = {new ExifTag(TAG_ORF_PREVIEW_IMAGE_START, 257, 4), new ExifTag(TAG_ORF_PREVIEW_IMAGE_LENGTH, 258, 4)};
         ORF_CAMERA_SETTINGS_TAGS = exifTagArr7;
-        ExifTag[] exifTagArr8 = {new ExifTag("AspectFrame", 4371, 3)};
+        ExifTag[] exifTagArr8 = {new ExifTag(TAG_ORF_ASPECT_FRAME, 4371, 3)};
         ORF_IMAGE_PROCESSING_TAGS = exifTagArr8;
-        ExifTag[] exifTagArr9 = {new ExifTag("ColorSpace", 55, 3)};
+        ExifTag[] exifTagArr9 = {new ExifTag(TAG_COLOR_SPACE, 55, 3)};
         PEF_TAGS = exifTagArr9;
         ExifTag[][] exifTagArr10 = {exifTagArr, exifTagArr2, exifTagArr3, exifTagArr4, exifTagArr5, exifTagArr, exifTagArr6, exifTagArr7, exifTagArr8, exifTagArr9};
         EXIF_TAGS = exifTagArr10;
@@ -1573,9 +1580,9 @@ public class ExifInterface {
         Objects.requireNonNull(inputStream, "inputStream cannot be null");
         this.mFilename = null;
         if (i == 1) {
-            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream, 5000);
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream, SIGNATURE_CHECK_SIZE);
             if (!isExifDataOnly(bufferedInputStream)) {
-                Log.w("ExifInterface", "Given data does not follow the structure of an Exif-only data.");
+                Log.w(TAG, "Given data does not follow the structure of an Exif-only data.");
                 return;
             }
             this.mIsExifDataOnly = true;
@@ -1609,21 +1616,21 @@ public class ExifInterface {
     }
 
     private void addDefaultValuesForCompatibility() {
-        String attribute = getAttribute("DateTimeOriginal");
-        if (attribute != null && getAttribute("DateTime") == null) {
-            this.mAttributes[0].put("DateTime", ExifAttribute.createString(attribute));
+        String attribute = getAttribute(TAG_DATETIME_ORIGINAL);
+        if (attribute != null && getAttribute(TAG_DATETIME) == null) {
+            this.mAttributes[0].put(TAG_DATETIME, ExifAttribute.createString(attribute));
         }
-        if (getAttribute("ImageWidth") == null) {
-            this.mAttributes[0].put("ImageWidth", ExifAttribute.createULong(0, this.mExifByteOrder));
+        if (getAttribute(TAG_IMAGE_WIDTH) == null) {
+            this.mAttributes[0].put(TAG_IMAGE_WIDTH, ExifAttribute.createULong(0, this.mExifByteOrder));
         }
-        if (getAttribute("ImageLength") == null) {
-            this.mAttributes[0].put("ImageLength", ExifAttribute.createULong(0, this.mExifByteOrder));
+        if (getAttribute(TAG_IMAGE_LENGTH) == null) {
+            this.mAttributes[0].put(TAG_IMAGE_LENGTH, ExifAttribute.createULong(0, this.mExifByteOrder));
         }
-        if (getAttribute("Orientation") == null) {
-            this.mAttributes[0].put("Orientation", ExifAttribute.createULong(0, this.mExifByteOrder));
+        if (getAttribute(TAG_ORIENTATION) == null) {
+            this.mAttributes[0].put(TAG_ORIENTATION, ExifAttribute.createULong(0, this.mExifByteOrder));
         }
-        if (getAttribute("LightSource") == null) {
-            this.mAttributes[1].put("LightSource", ExifAttribute.createULong(0, this.mExifByteOrder));
+        if (getAttribute(TAG_LIGHT_SOURCE) == null) {
+            this.mAttributes[1].put(TAG_LIGHT_SOURCE, ExifAttribute.createULong(0, this.mExifByteOrder));
         }
     }
 
@@ -1639,7 +1646,7 @@ public class ExifInterface {
         try {
             Os.close(fileDescriptor);
         } catch (Exception unused) {
-            Log.e("ExifInterface", "Error closing fd.");
+            Log.e(TAG, "Error closing fd.");
         }
     }
 
@@ -1665,15 +1672,15 @@ public class ExifInterface {
     private static double convertRationalLatLonToDouble(String str, String str2) {
         try {
             String[] split = str.split(",", -1);
-            String[] split2 = split[0].split("/", -1);
+            String[] split2 = split[0].split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, -1);
             double parseDouble = Double.parseDouble(split2[0].trim()) / Double.parseDouble(split2[1].trim());
-            String[] split3 = split[1].split("/", -1);
-            String[] split4 = split[2].split("/", -1);
+            String[] split3 = split[1].split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, -1);
+            String[] split4 = split[2].split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, -1);
             double parseDouble2 = ((Double.parseDouble(split4[0].trim()) / Double.parseDouble(split4[1].trim())) / 3600.0d) + ((Double.parseDouble(split3[0].trim()) / Double.parseDouble(split3[1].trim())) / 60.0d) + parseDouble;
-            if (!str2.equals("S")) {
-                if (!str2.equals("W")) {
+            if (!str2.equals(LATITUDE_SOUTH)) {
+                if (!str2.equals(LONGITUDE_WEST)) {
                     if (!str2.equals("N")) {
-                        if (!str2.equals("E")) {
+                        if (!str2.equals(LONGITUDE_EAST)) {
                             throw new IllegalArgumentException();
                         }
                     }
@@ -1769,11 +1776,11 @@ public class ExifInterface {
     @Nullable
     private ExifAttribute getExifAttribute(@NonNull String str) {
         Objects.requireNonNull(str, "tag shouldn't be null");
-        if ("ISOSpeedRatings".equals(str)) {
+        if (TAG_ISO_SPEED_RATINGS.equals(str)) {
             if (DEBUG) {
-                Log.d("ExifInterface", "getExifAttribute: Replacing TAG_ISO_SPEED_RATINGS with TAG_PHOTOGRAPHIC_SENSITIVITY.");
+                Log.d(TAG, "getExifAttribute: Replacing TAG_ISO_SPEED_RATINGS with TAG_PHOTOGRAPHIC_SENSITIVITY.");
             }
-            str = "PhotographicSensitivity";
+            str = TAG_PHOTOGRAPHIC_SENSITIVITY;
         }
         for (int i = 0; i < EXIF_TAGS.length; i++) {
             ExifAttribute exifAttribute = this.mAttributes[i].get(str);
@@ -1823,10 +1830,10 @@ public class ExifInterface {
                 str = null;
             }
             if (str4 != null) {
-                this.mAttributes[0].put("ImageWidth", ExifAttribute.createUShort(Integer.parseInt(str4), this.mExifByteOrder));
+                this.mAttributes[0].put(TAG_IMAGE_WIDTH, ExifAttribute.createUShort(Integer.parseInt(str4), this.mExifByteOrder));
             }
             if (str2 != null) {
-                this.mAttributes[0].put("ImageLength", ExifAttribute.createUShort(Integer.parseInt(str2), this.mExifByteOrder));
+                this.mAttributes[0].put(TAG_IMAGE_LENGTH, ExifAttribute.createUShort(Integer.parseInt(str2), this.mExifByteOrder));
             }
             if (str != null) {
                 int i = 1;
@@ -1838,7 +1845,7 @@ public class ExifInterface {
                 } else if (parseInt == 270) {
                     i = 8;
                 }
-                this.mAttributes[0].put("Orientation", ExifAttribute.createUShort(i, this.mExifByteOrder));
+                this.mAttributes[0].put(TAG_ORIENTATION, ExifAttribute.createUShort(i, this.mExifByteOrder));
             }
             if (!(extractMetadata == null || extractMetadata2 == null)) {
                 int parseInt2 = Integer.parseInt(extractMetadata);
@@ -1868,7 +1875,7 @@ public class ExifInterface {
                 }
             }
             if (DEBUG) {
-                Log.d("ExifInterface", "Heif meta: " + str4 + "x" + str2 + ", rotation " + str);
+                Log.d(TAG, "Heif meta: " + str4 + "x" + str2 + ", rotation " + str);
             }
         } finally {
             mediaMetadataRetriever.release();
@@ -1880,7 +1887,7 @@ public class ExifInterface {
     /* JADX WARNING: Removed duplicated region for block: B:74:0x0184 A[SYNTHETIC] */
     private void getJpegAttributes(ByteOrderedDataInputStream byteOrderedDataInputStream, int i, int i2) throws IOException {
         if (DEBUG) {
-            Log.d("ExifInterface", "getJpegAttributes starting with: " + byteOrderedDataInputStream);
+            Log.d(TAG, "getJpegAttributes starting with: " + byteOrderedDataInputStream);
         }
         char c2 = 0;
         byteOrderedDataInputStream.mark(0);
@@ -1903,7 +1910,7 @@ public class ExifInterface {
                     if (z2) {
                         StringBuilder K2 = a.K("Found JPEG segment indicator: ");
                         K2.append(Integer.toHexString(readByte3 & 255));
-                        Log.d("ExifInterface", K2.toString());
+                        Log.d(TAG, K2.toString());
                     }
                     int i6 = i5 + 1;
                     if (readByte3 != -39 && readByte3 != -38) {
@@ -1915,7 +1922,7 @@ public class ExifInterface {
                             K3.append(" (length: ");
                             K3.append(readUnsignedShort + 2);
                             K3.append(")");
-                            Log.d("ExifInterface", K3.toString());
+                            Log.d(TAG, K3.toString());
                         }
                         if (readUnsignedShort >= 0) {
                             if (readByte3 == -31) {
@@ -1933,8 +1940,8 @@ public class ExifInterface {
                                     if (startsWith(bArr, bArr3)) {
                                         int length = i7 + bArr3.length;
                                         byte[] copyOfRange2 = Arrays.copyOfRange(bArr, bArr3.length, readUnsignedShort);
-                                        if (getAttribute("Xmp") == null) {
-                                            this.mAttributes[c2].put("Xmp", new ExifAttribute(1, copyOfRange2.length, (long) length, copyOfRange2));
+                                        if (getAttribute(TAG_XMP) == null) {
+                                            this.mAttributes[c2].put(TAG_XMP, new ExifAttribute(1, copyOfRange2.length, (long) length, copyOfRange2));
                                             this.mXmpIsFromSeparateMarker = true;
                                         }
                                     }
@@ -1953,8 +1960,8 @@ public class ExifInterface {
                                                     case -54:
                                                     case -53:
                                                         if (byteOrderedDataInputStream.skipBytes(1) == 1) {
-                                                            this.mAttributes[i2].put("ImageLength", ExifAttribute.createULong((long) byteOrderedDataInputStream.readUnsignedShort(), this.mExifByteOrder));
-                                                            this.mAttributes[i2].put("ImageWidth", ExifAttribute.createULong((long) byteOrderedDataInputStream.readUnsignedShort(), this.mExifByteOrder));
+                                                            this.mAttributes[i2].put(TAG_IMAGE_LENGTH, ExifAttribute.createULong((long) byteOrderedDataInputStream.readUnsignedShort(), this.mExifByteOrder));
+                                                            this.mAttributes[i2].put(TAG_IMAGE_WIDTH, ExifAttribute.createULong((long) byteOrderedDataInputStream.readUnsignedShort(), this.mExifByteOrder));
                                                             readUnsignedShort -= 5;
                                                             break;
                                                         } else {
@@ -1986,8 +1993,8 @@ public class ExifInterface {
                                 byte[] bArr4 = new byte[readUnsignedShort];
                                 if (byteOrderedDataInputStream.read(bArr4) != readUnsignedShort) {
                                     throw new IOException("Invalid exif");
-                                } else if (getAttribute("UserComment") == null) {
-                                    this.mAttributes[1].put("UserComment", ExifAttribute.createString(new String(bArr4, ASCII)));
+                                } else if (getAttribute(TAG_USER_COMMENT) == null) {
+                                    this.mAttributes[1].put(TAG_USER_COMMENT, ExifAttribute.createString(new String(bArr4, ASCII)));
                                 }
                             }
                             readUnsignedShort = 0;
@@ -2012,8 +2019,8 @@ public class ExifInterface {
     }
 
     private int getMimeType(BufferedInputStream bufferedInputStream) throws IOException {
-        bufferedInputStream.mark(5000);
-        byte[] bArr = new byte[5000];
+        bufferedInputStream.mark(SIGNATURE_CHECK_SIZE);
+        byte[] bArr = new byte[SIGNATURE_CHECK_SIZE];
         bufferedInputStream.read(bArr);
         bufferedInputStream.reset();
         if (isJpegFormat(bArr)) {
@@ -2039,7 +2046,7 @@ public class ExifInterface {
 
     private void getOrfAttributes(ByteOrderedDataInputStream byteOrderedDataInputStream) throws IOException {
         getRawAttributes(byteOrderedDataInputStream);
-        ExifAttribute exifAttribute = this.mAttributes[1].get("MakerNote");
+        ExifAttribute exifAttribute = this.mAttributes[1].get(TAG_MAKER_NOTE);
         if (exifAttribute != null) {
             ByteOrderedDataInputStream byteOrderedDataInputStream2 = new ByteOrderedDataInputStream(exifAttribute.bytes);
             byteOrderedDataInputStream2.setByteOrder(this.mExifByteOrder);
@@ -2056,19 +2063,19 @@ public class ExifInterface {
                 byteOrderedDataInputStream2.seek(12);
             }
             readImageFileDirectory(byteOrderedDataInputStream2, 6);
-            ExifAttribute exifAttribute2 = this.mAttributes[7].get("PreviewImageStart");
-            ExifAttribute exifAttribute3 = this.mAttributes[7].get("PreviewImageLength");
+            ExifAttribute exifAttribute2 = this.mAttributes[7].get(TAG_ORF_PREVIEW_IMAGE_START);
+            ExifAttribute exifAttribute3 = this.mAttributes[7].get(TAG_ORF_PREVIEW_IMAGE_LENGTH);
             if (!(exifAttribute2 == null || exifAttribute3 == null)) {
-                this.mAttributes[5].put("JPEGInterchangeFormat", exifAttribute2);
-                this.mAttributes[5].put("JPEGInterchangeFormatLength", exifAttribute3);
+                this.mAttributes[5].put(TAG_JPEG_INTERCHANGE_FORMAT, exifAttribute2);
+                this.mAttributes[5].put(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, exifAttribute3);
             }
-            ExifAttribute exifAttribute4 = this.mAttributes[8].get("AspectFrame");
+            ExifAttribute exifAttribute4 = this.mAttributes[8].get(TAG_ORF_ASPECT_FRAME);
             if (exifAttribute4 != null) {
                 int[] iArr = (int[]) exifAttribute4.getValue(this.mExifByteOrder);
                 if (iArr == null || iArr.length != 4) {
                     StringBuilder K = a.K("Invalid aspect frame values. frame=");
                     K.append(Arrays.toString(iArr));
-                    Log.w("ExifInterface", K.toString());
+                    Log.w(TAG, K.toString());
                 } else if (iArr[2] > iArr[0] && iArr[3] > iArr[1]) {
                     int i = (iArr[2] - iArr[0]) + 1;
                     int i2 = (iArr[3] - iArr[1]) + 1;
@@ -2079,8 +2086,8 @@ public class ExifInterface {
                     }
                     ExifAttribute createUShort = ExifAttribute.createUShort(i, this.mExifByteOrder);
                     ExifAttribute createUShort2 = ExifAttribute.createUShort(i2, this.mExifByteOrder);
-                    this.mAttributes[0].put("ImageWidth", createUShort);
-                    this.mAttributes[0].put("ImageLength", createUShort2);
+                    this.mAttributes[0].put(TAG_IMAGE_WIDTH, createUShort);
+                    this.mAttributes[0].put(TAG_IMAGE_LENGTH, createUShort2);
                 }
             }
         }
@@ -2088,7 +2095,7 @@ public class ExifInterface {
 
     private void getPngAttributes(ByteOrderedDataInputStream byteOrderedDataInputStream) throws IOException {
         if (DEBUG) {
-            Log.d("ExifInterface", "getPngAttributes starting with: " + byteOrderedDataInputStream);
+            Log.d(TAG, "getPngAttributes starting with: " + byteOrderedDataInputStream);
         }
         byteOrderedDataInputStream.mark(0);
         byteOrderedDataInputStream.setByteOrder(ByteOrder.BIG_ENDIAN);
@@ -2144,7 +2151,7 @@ public class ExifInterface {
     private void getRafAttributes(ByteOrderedDataInputStream byteOrderedDataInputStream) throws IOException {
         boolean z2 = DEBUG;
         if (z2) {
-            Log.d("ExifInterface", "getRafAttributes starting with: " + byteOrderedDataInputStream);
+            Log.d(TAG, "getRafAttributes starting with: " + byteOrderedDataInputStream);
         }
         byteOrderedDataInputStream.mark(0);
         byteOrderedDataInputStream.skipBytes(84);
@@ -2165,7 +2172,7 @@ public class ExifInterface {
         byteOrderedDataInputStream.setByteOrder(ByteOrder.BIG_ENDIAN);
         int readInt = byteOrderedDataInputStream.readInt();
         if (z2) {
-            a.c0("numberOfDirectoryEntry: ", readInt, "ExifInterface");
+            a.c0("numberOfDirectoryEntry: ", readInt, TAG);
         }
         for (int i4 = 0; i4 < readInt; i4++) {
             int readUnsignedShort = byteOrderedDataInputStream.readUnsignedShort();
@@ -2175,10 +2182,10 @@ public class ExifInterface {
                 short readShort2 = byteOrderedDataInputStream.readShort();
                 ExifAttribute createUShort = ExifAttribute.createUShort(readShort, this.mExifByteOrder);
                 ExifAttribute createUShort2 = ExifAttribute.createUShort(readShort2, this.mExifByteOrder);
-                this.mAttributes[0].put("ImageLength", createUShort);
-                this.mAttributes[0].put("ImageWidth", createUShort2);
+                this.mAttributes[0].put(TAG_IMAGE_LENGTH, createUShort);
+                this.mAttributes[0].put(TAG_IMAGE_WIDTH, createUShort2);
                 if (DEBUG) {
-                    Log.d("ExifInterface", "Updated to length: " + ((int) readShort) + ", width: " + ((int) readShort2));
+                    Log.d(TAG, "Updated to length: " + ((int) readShort) + ", width: " + ((int) readShort2));
                     return;
                 }
                 return;
@@ -2195,31 +2202,31 @@ public class ExifInterface {
         updateImageSizeValues(byteOrderedDataInputStream, 5);
         updateImageSizeValues(byteOrderedDataInputStream, 4);
         validateImages();
-        if (this.mMimeType == 8 && (exifAttribute = this.mAttributes[1].get("MakerNote")) != null) {
+        if (this.mMimeType == 8 && (exifAttribute = this.mAttributes[1].get(TAG_MAKER_NOTE)) != null) {
             ByteOrderedDataInputStream byteOrderedDataInputStream2 = new ByteOrderedDataInputStream(exifAttribute.bytes);
             byteOrderedDataInputStream2.setByteOrder(this.mExifByteOrder);
             byteOrderedDataInputStream2.seek(6);
             readImageFileDirectory(byteOrderedDataInputStream2, 9);
-            ExifAttribute exifAttribute2 = this.mAttributes[9].get("ColorSpace");
+            ExifAttribute exifAttribute2 = this.mAttributes[9].get(TAG_COLOR_SPACE);
             if (exifAttribute2 != null) {
-                this.mAttributes[1].put("ColorSpace", exifAttribute2);
+                this.mAttributes[1].put(TAG_COLOR_SPACE, exifAttribute2);
             }
         }
     }
 
     private void getRw2Attributes(ByteOrderedDataInputStream byteOrderedDataInputStream) throws IOException {
         if (DEBUG) {
-            Log.d("ExifInterface", "getRw2Attributes starting with: " + byteOrderedDataInputStream);
+            Log.d(TAG, "getRw2Attributes starting with: " + byteOrderedDataInputStream);
         }
         getRawAttributes(byteOrderedDataInputStream);
-        ExifAttribute exifAttribute = this.mAttributes[0].get("JpgFromRaw");
+        ExifAttribute exifAttribute = this.mAttributes[0].get(TAG_RW2_JPG_FROM_RAW);
         if (exifAttribute != null) {
             getJpegAttributes(new ByteOrderedDataInputStream(exifAttribute.bytes), (int) exifAttribute.bytesOffset, 5);
         }
-        ExifAttribute exifAttribute2 = this.mAttributes[0].get("ISO");
-        ExifAttribute exifAttribute3 = this.mAttributes[1].get("PhotographicSensitivity");
+        ExifAttribute exifAttribute2 = this.mAttributes[0].get(TAG_RW2_ISO);
+        ExifAttribute exifAttribute3 = this.mAttributes[1].get(TAG_PHOTOGRAPHIC_SENSITIVITY);
         if (exifAttribute2 != null && exifAttribute3 == null) {
-            this.mAttributes[1].put("PhotographicSensitivity", exifAttribute2);
+            this.mAttributes[1].put(TAG_PHOTOGRAPHIC_SENSITIVITY, exifAttribute2);
         }
     }
 
@@ -2234,7 +2241,7 @@ public class ExifInterface {
 
     private void getWebpAttributes(ByteOrderedDataInputStream byteOrderedDataInputStream) throws IOException {
         if (DEBUG) {
-            Log.d("ExifInterface", "getWebpAttributes starting with: " + byteOrderedDataInputStream);
+            Log.d(TAG, "getWebpAttributes starting with: " + byteOrderedDataInputStream);
         }
         byteOrderedDataInputStream.mark(0);
         byteOrderedDataInputStream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
@@ -2305,8 +2312,8 @@ public class ExifInterface {
                 }
             }
             return guessDataFormat;
-        } else if (str.contains("/")) {
-            String[] split2 = str.split("/", -1);
+        } else if (str.contains(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN)) {
+            String[] split2 = str.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, -1);
             if (split2.length == 2) {
                 try {
                     long parseDouble = (long) Double.parseDouble(split2[0]);
@@ -2342,8 +2349,8 @@ public class ExifInterface {
     }
 
     private void handleThumbnailFromJfif(ByteOrderedDataInputStream byteOrderedDataInputStream, HashMap hashMap) throws IOException {
-        ExifAttribute exifAttribute = (ExifAttribute) hashMap.get("JPEGInterchangeFormat");
-        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get("JPEGInterchangeFormatLength");
+        ExifAttribute exifAttribute = (ExifAttribute) hashMap.get(TAG_JPEG_INTERCHANGE_FORMAT);
+        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
         if (exifAttribute != null && exifAttribute2 != null) {
             int intValue = exifAttribute.getIntValue(this.mExifByteOrder);
             int intValue2 = exifAttribute2.getIntValue(this.mExifByteOrder);
@@ -2363,23 +2370,23 @@ public class ExifInterface {
                 this.mThumbnailLength = min;
             }
             if (DEBUG) {
-                Log.d("ExifInterface", "Setting thumbnail attributes with offset: " + intValue + ", length: " + min);
+                Log.d(TAG, "Setting thumbnail attributes with offset: " + intValue + ", length: " + min);
             }
         }
     }
 
     private void handleThumbnailFromStrips(ByteOrderedDataInputStream byteOrderedDataInputStream, HashMap hashMap) throws IOException {
-        ExifAttribute exifAttribute = (ExifAttribute) hashMap.get("StripOffsets");
-        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get("StripByteCounts");
+        ExifAttribute exifAttribute = (ExifAttribute) hashMap.get(TAG_STRIP_OFFSETS);
+        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get(TAG_STRIP_BYTE_COUNTS);
         if (exifAttribute != null && exifAttribute2 != null) {
             long[] convertToLongArray = convertToLongArray(exifAttribute.getValue(this.mExifByteOrder));
             long[] convertToLongArray2 = convertToLongArray(exifAttribute2.getValue(this.mExifByteOrder));
             if (convertToLongArray == null || convertToLongArray.length == 0) {
-                Log.w("ExifInterface", "stripOffsets should not be null or have zero length.");
+                Log.w(TAG, "stripOffsets should not be null or have zero length.");
             } else if (convertToLongArray2 == null || convertToLongArray2.length == 0) {
-                Log.w("ExifInterface", "stripByteCounts should not be null or have zero length.");
+                Log.w(TAG, "stripByteCounts should not be null or have zero length.");
             } else if (convertToLongArray.length != convertToLongArray2.length) {
-                Log.w("ExifInterface", "stripOffsets and stripByteCounts should have same length.");
+                Log.w(TAG, "stripOffsets and stripByteCounts should have same length.");
             } else {
                 long j = 0;
                 for (long j2 : convertToLongArray2) {
@@ -2402,18 +2409,18 @@ public class ExifInterface {
                     }
                     int i8 = i6 - i4;
                     if (i8 < 0) {
-                        Log.d("ExifInterface", "Invalid strip offset value");
+                        Log.d(TAG, "Invalid strip offset value");
                         return;
                     }
                     long j3 = (long) i8;
                     if (byteOrderedDataInputStream.skip(j3) != j3) {
-                        Log.d("ExifInterface", "Failed to skip " + i8 + " bytes.");
+                        Log.d(TAG, "Failed to skip " + i8 + " bytes.");
                         return;
                     }
                     int i9 = i4 + i8;
                     byte[] bArr2 = new byte[i7];
                     if (byteOrderedDataInputStream.read(bArr2) != i7) {
-                        Log.d("ExifInterface", "Failed to read " + i7 + " bytes.");
+                        Log.d(TAG, "Failed to read " + i7 + " bytes.");
                         return;
                     }
                     i4 = i9 + i7;
@@ -2562,7 +2569,7 @@ public class ExifInterface {
         } catch (Exception e3) {
             e = e3;
             if (DEBUG) {
-                Log.d("ExifInterface", "Exception parsing HEIF file type box.", e);
+                Log.d(TAG, "Exception parsing HEIF file type box.", e);
             }
             if (byteOrderedDataInputStream != null) {
                 byteOrderedDataInputStream.close();
@@ -2644,7 +2651,7 @@ public class ExifInterface {
     }
 
     private boolean isRafFormat(byte[] bArr) throws IOException {
-        byte[] bytes = "FUJIFILMCCD-RAW".getBytes(Charset.defaultCharset());
+        byte[] bytes = RAF_SIGNATURE.getBytes(Charset.defaultCharset());
         for (int i = 0; i < bytes.length; i++) {
             if (bArr[i] != bytes[i]) {
                 return false;
@@ -2704,7 +2711,7 @@ public class ExifInterface {
             if (!DEBUG) {
                 return false;
             }
-            Log.d("ExifInterface", "The file descriptor for the given input is not seekable");
+            Log.d(TAG, "The file descriptor for the given input is not seekable");
             return false;
         }
     }
@@ -2712,21 +2719,21 @@ public class ExifInterface {
     private boolean isSupportedDataType(HashMap hashMap) throws IOException {
         ExifAttribute exifAttribute;
         int intValue;
-        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get("BitsPerSample");
+        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get(TAG_BITS_PER_SAMPLE);
         if (exifAttribute2 != null) {
             int[] iArr = (int[]) exifAttribute2.getValue(this.mExifByteOrder);
             int[] iArr2 = BITS_PER_SAMPLE_RGB;
             if (Arrays.equals(iArr2, iArr)) {
                 return true;
             }
-            if (this.mMimeType == 3 && (exifAttribute = (ExifAttribute) hashMap.get("PhotometricInterpretation")) != null && (((intValue = exifAttribute.getIntValue(this.mExifByteOrder)) == 1 && Arrays.equals(iArr, BITS_PER_SAMPLE_GREYSCALE_2)) || (intValue == 6 && Arrays.equals(iArr, iArr2)))) {
+            if (this.mMimeType == 3 && (exifAttribute = (ExifAttribute) hashMap.get(TAG_PHOTOMETRIC_INTERPRETATION)) != null && (((intValue = exifAttribute.getIntValue(this.mExifByteOrder)) == 1 && Arrays.equals(iArr, BITS_PER_SAMPLE_GREYSCALE_2)) || (intValue == 6 && Arrays.equals(iArr, iArr2)))) {
                 return true;
             }
         }
         if (!DEBUG) {
             return false;
         }
-        Log.d("ExifInterface", "Unsupported data type value");
+        Log.d(TAG, "Unsupported data type value");
         return false;
     }
 
@@ -2855,8 +2862,8 @@ public class ExifInterface {
     }
 
     private boolean isThumbnail(HashMap hashMap) throws IOException {
-        ExifAttribute exifAttribute = (ExifAttribute) hashMap.get("ImageLength");
-        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get("ImageWidth");
+        ExifAttribute exifAttribute = (ExifAttribute) hashMap.get(TAG_IMAGE_LENGTH);
+        ExifAttribute exifAttribute2 = (ExifAttribute) hashMap.get(TAG_IMAGE_WIDTH);
         if (exifAttribute == null || exifAttribute2 == null) {
             return false;
         }
@@ -2895,7 +2902,7 @@ public class ExifInterface {
             } catch (IOException e) {
                 boolean z2 = DEBUG;
                 if (z2) {
-                    Log.w("ExifInterface", "Invalid image: ExifInterface got an unsupported image format file(ExifInterface supports JPEG and some RAW image formats only) or a corrupted JPEG file to ExifInterface.", e);
+                    Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file(ExifInterface supports JPEG and some RAW image formats only) or a corrupted JPEG file to ExifInterface.", e);
                 }
                 addDefaultValuesForCompatibility();
                 if (!z2) {
@@ -2910,7 +2917,7 @@ public class ExifInterface {
             }
         }
         if (!this.mIsExifDataOnly) {
-            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream, 5000);
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream, SIGNATURE_CHECK_SIZE);
             this.mMimeType = getMimeType(bufferedInputStream);
             inputStream = bufferedInputStream;
         }
@@ -3000,7 +3007,7 @@ public class ExifInterface {
                     String substring = str3.substring(0, 1);
                     int parseInt = Integer.parseInt(str3.substring(1, 3));
                     int parseInt2 = Integer.parseInt(str3.substring(4, 6));
-                    if (("+".equals(substring) || "-".equals(substring)) && ":".equals(str3.substring(3, 4)) && parseInt <= 14) {
+                    if ((BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX.equals(substring) || "-".equals(substring)) && ":".equals(str3.substring(3, 4)) && parseInt <= 14) {
                         int i2 = ((parseInt * 60) + parseInt2) * 60 * 1000;
                         if (!"-".equals(substring)) {
                             i = -1;
@@ -3051,7 +3058,7 @@ public class ExifInterface {
         for (int i = 0; i < this.mAttributes.length; i++) {
             StringBuilder L = a.L("The size of tag group[", i, "]: ");
             L.append(this.mAttributes[i].size());
-            Log.d("ExifInterface", L.toString());
+            Log.d(TAG, L.toString());
             for (Map.Entry<String, ExifAttribute> entry : this.mAttributes[i].entrySet()) {
                 ExifAttribute value = entry.getValue();
                 StringBuilder K = a.K("tagName: ");
@@ -3061,7 +3068,7 @@ public class ExifInterface {
                 K.append(", tagValue: '");
                 K.append(value.getStringValue(this.mExifByteOrder));
                 K.append("'");
-                Log.d("ExifInterface", K.toString());
+                Log.d(TAG, K.toString());
             }
         }
     }
@@ -3070,12 +3077,12 @@ public class ExifInterface {
         short readShort = byteOrderedDataInputStream.readShort();
         if (readShort == 18761) {
             if (DEBUG) {
-                Log.d("ExifInterface", "readExifSegment: Byte Align II");
+                Log.d(TAG, "readExifSegment: Byte Align II");
             }
             return ByteOrder.LITTLE_ENDIAN;
         } else if (readShort == 19789) {
             if (DEBUG) {
-                Log.d("ExifInterface", "readExifSegment: Byte Align MM");
+                Log.d(TAG, "readExifSegment: Byte Align MM");
             }
             return ByteOrder.BIG_ENDIAN;
         } else {
@@ -3114,7 +3121,7 @@ public class ExifInterface {
         if (byteOrderedDataInputStream.mPosition + 2 <= byteOrderedDataInputStream.mLength) {
             short readShort = byteOrderedDataInputStream.readShort();
             if (DEBUG) {
-                a.c0("numberOfDirectoryEntry: ", readShort, "ExifInterface");
+                a.c0("numberOfDirectoryEntry: ", readShort, TAG);
             }
             if ((readShort * 12) + byteOrderedDataInputStream.mPosition <= byteOrderedDataInputStream.mLength && readShort > 0) {
                 char c2 = 0;
@@ -3133,7 +3140,7 @@ public class ExifInterface {
                         objArr[2] = exifTag2 != null ? exifTag2.name : null;
                         objArr[3] = Integer.valueOf(readUnsignedShort2);
                         objArr[4] = Integer.valueOf(readInt);
-                        Log.d("ExifInterface", String.format("ifdType: %d, tagNumber: %d, tagName: %s, dataFormat: %d, numberOfComponents: %d", objArr));
+                        Log.d(TAG, String.format("ifdType: %d, tagNumber: %d, tagName: %s, dataFormat: %d, numberOfComponents: %d", objArr));
                     }
                     if (exifTag2 != null) {
                         if (readUnsignedShort2 > 0) {
@@ -3148,7 +3155,7 @@ public class ExifInterface {
                                     j = ((long) readInt) * ((long) iArr[readUnsignedShort2]);
                                     if (j < 0 || j > 2147483647L) {
                                         if (z3) {
-                                            a.c0("Skip the tag entry since the number of components is invalid: ", readInt, "ExifInterface");
+                                            a.c0("Skip the tag entry since the number of components is invalid: ", readInt, TAG);
                                         }
                                         z2 = false;
                                         if (z2) {
@@ -3157,13 +3164,13 @@ public class ExifInterface {
                                             if (j > 4) {
                                                 int readInt2 = byteOrderedDataInputStream.readInt();
                                                 if (z3) {
-                                                    a.c0("seek to data offset: ", readInt2, "ExifInterface");
+                                                    a.c0("seek to data offset: ", readInt2, TAG);
                                                 }
                                                 i3 = readUnsignedShort2;
                                                 if (this.mMimeType == 7) {
-                                                    if ("MakerNote".equals(exifTag2.name)) {
+                                                    if (TAG_MAKER_NOTE.equals(exifTag2.name)) {
                                                         this.mOrfMakerNoteOffset = readInt2;
-                                                    } else if (i5 == 6 && "ThumbnailImage".equals(exifTag2.name)) {
+                                                    } else if (i5 == 6 && TAG_ORF_THUMBNAIL_IMAGE.equals(exifTag2.name)) {
                                                         this.mOrfThumbnailOffset = readInt2;
                                                         this.mOrfThumbnailLength = readInt;
                                                         ExifAttribute createUShort = ExifAttribute.createUShort(6, this.mExifByteOrder);
@@ -3171,16 +3178,16 @@ public class ExifInterface {
                                                         ExifAttribute createULong = ExifAttribute.createULong((long) this.mOrfThumbnailOffset, this.mExifByteOrder);
                                                         i2 = readInt;
                                                         ExifAttribute createULong2 = ExifAttribute.createULong((long) this.mOrfThumbnailLength, this.mExifByteOrder);
-                                                        this.mAttributes[4].put("Compression", createUShort);
-                                                        this.mAttributes[4].put("JPEGInterchangeFormat", createULong);
-                                                        this.mAttributes[4].put("JPEGInterchangeFormatLength", createULong2);
+                                                        this.mAttributes[4].put(TAG_COMPRESSION, createUShort);
+                                                        this.mAttributes[4].put(TAG_JPEG_INTERCHANGE_FORMAT, createULong);
+                                                        this.mAttributes[4].put(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, createULong2);
                                                         j4 = (long) readInt2;
                                                         j2 = j;
                                                         if (j4 + j > ((long) byteOrderedDataInputStream.mLength)) {
                                                             byteOrderedDataInputStream.seek(j4);
                                                         } else {
                                                             if (z3) {
-                                                                a.c0("Skip the tag entry since data offset is invalid: ", readInt2, "ExifInterface");
+                                                                a.c0("Skip the tag entry since data offset is invalid: ", readInt2, TAG);
                                                             }
                                                             byteOrderedDataInputStream.seek(peek);
                                                         }
@@ -3206,7 +3213,7 @@ public class ExifInterface {
                                                 sb.append(" byteCount: ");
                                                 j3 = j2;
                                                 sb.append(j3);
-                                                Log.d("ExifInterface", sb.toString());
+                                                Log.d(TAG, sb.toString());
                                             } else {
                                                 j3 = j2;
                                             }
@@ -3221,17 +3228,17 @@ public class ExifInterface {
                                                         i4 = byteOrderedDataInputStream.readInt();
                                                     }
                                                     if (z3) {
-                                                        Log.d("ExifInterface", String.format("Offset: %d, tagName: %s", Long.valueOf(j5), exifTag.name));
+                                                        Log.d(TAG, String.format("Offset: %d, tagName: %s", Long.valueOf(j5), exifTag.name));
                                                     }
                                                     if (j5 > 0 || j5 >= ((long) byteOrderedDataInputStream.mLength)) {
                                                         if (z3) {
-                                                            Log.d("ExifInterface", "Skip jump into the IFD since its offset is invalid: " + j5);
+                                                            Log.d(TAG, "Skip jump into the IFD since its offset is invalid: " + j5);
                                                         }
                                                     } else if (!this.mAttributesOffsets.contains(Integer.valueOf((int) j5))) {
                                                         byteOrderedDataInputStream.seek(j5);
                                                         readImageFileDirectory(byteOrderedDataInputStream, num.intValue());
                                                     } else if (z3) {
-                                                        Log.d("ExifInterface", "Skip jump into the IFD since it has already been read: IfdType " + num + " (at " + j5 + ")");
+                                                        Log.d(TAG, "Skip jump into the IFD since it has already been read: IfdType " + num + " (at " + j5 + ")");
                                                     }
                                                     byteOrderedDataInputStream.seek(peek);
                                                 } else {
@@ -3251,10 +3258,10 @@ public class ExifInterface {
                                                 byteOrderedDataInputStream.readFully(bArr);
                                                 ExifAttribute exifAttribute = new ExifAttribute(i3, i2, (long) peek2, bArr);
                                                 this.mAttributes[i].put(exifTag.name, exifAttribute);
-                                                if ("DNGVersion".equals(exifTag.name)) {
+                                                if (TAG_DNG_VERSION.equals(exifTag.name)) {
                                                     this.mMimeType = 3;
                                                 }
-                                                if ((("Make".equals(exifTag.name) || "Model".equals(exifTag.name)) && exifAttribute.getStringValue(this.mExifByteOrder).contains("PENTAX")) || ("Compression".equals(exifTag.name) && exifAttribute.getIntValue(this.mExifByteOrder) == 65535)) {
+                                                if (((TAG_MAKE.equals(exifTag.name) || TAG_MODEL.equals(exifTag.name)) && exifAttribute.getStringValue(this.mExifByteOrder).contains(PEF_SIGNATURE)) || (TAG_COMPRESSION.equals(exifTag.name) && exifAttribute.getIntValue(this.mExifByteOrder) == 65535)) {
                                                     this.mMimeType = 8;
                                                 }
                                                 if (((long) byteOrderedDataInputStream.peek()) != peek) {
@@ -3280,14 +3287,14 @@ public class ExifInterface {
                                     K.append(IFD_FORMAT_NAMES[readUnsignedShort2]);
                                     K.append(") is unexpected for tag: ");
                                     K.append(exifTag2.name);
-                                    Log.d("ExifInterface", K.toString());
+                                    Log.d(TAG, K.toString());
                                 }
                             }
                         }
                         s3 = readShort;
                         s2 = s4;
                         if (z3) {
-                            a.c0("Skip the tag entry since data format is invalid: ", readUnsignedShort2, "ExifInterface");
+                            a.c0("Skip the tag entry since data format is invalid: ", readUnsignedShort2, TAG);
                         }
                         j = 0;
                         z2 = false;
@@ -3298,7 +3305,7 @@ public class ExifInterface {
                         i5 = i;
                         readShort = s3;
                     } else if (z3) {
-                        a.c0("Skip the tag entry since tag number is not defined: ", readUnsignedShort, "ExifInterface");
+                        a.c0("Skip the tag entry since tag number is not defined: ", readUnsignedShort, TAG);
                     }
                     s3 = readShort;
                     s2 = s4;
@@ -3315,12 +3322,12 @@ public class ExifInterface {
                     int readInt3 = byteOrderedDataInputStream.readInt();
                     boolean z4 = DEBUG;
                     if (z4) {
-                        Log.d("ExifInterface", String.format("nextIfdOffset: %d", Integer.valueOf(readInt3)));
+                        Log.d(TAG, String.format("nextIfdOffset: %d", Integer.valueOf(readInt3)));
                     }
                     long j6 = (long) readInt3;
                     if (j6 <= 0 || readInt3 >= byteOrderedDataInputStream.mLength) {
                         if (z4) {
-                            a.c0("Stop reading file since a wrong offset may cause an infinite loop: ", readInt3, "ExifInterface");
+                            a.c0("Stop reading file since a wrong offset may cause an infinite loop: ", readInt3, TAG);
                         }
                     } else if (!this.mAttributesOffsets.contains(Integer.valueOf(readInt3))) {
                         byteOrderedDataInputStream.seek(j6);
@@ -3330,7 +3337,7 @@ public class ExifInterface {
                             readImageFileDirectory(byteOrderedDataInputStream, 5);
                         }
                     } else if (z4) {
-                        a.c0("Stop reading file since re-reading an IFD may cause an infinite loop: ", readInt3, "ExifInterface");
+                        a.c0("Stop reading file since re-reading an IFD may cause an infinite loop: ", readInt3, TAG);
                     }
                 }
             }
@@ -3344,11 +3351,11 @@ public class ExifInterface {
     }
 
     private void retrieveJpegImageSize(ByteOrderedDataInputStream byteOrderedDataInputStream, int i) throws IOException {
-        ExifAttribute exifAttribute = this.mAttributes[i].get("ImageLength");
-        ExifAttribute exifAttribute2 = this.mAttributes[i].get("ImageWidth");
+        ExifAttribute exifAttribute = this.mAttributes[i].get(TAG_IMAGE_LENGTH);
+        ExifAttribute exifAttribute2 = this.mAttributes[i].get(TAG_IMAGE_WIDTH);
         if (exifAttribute == null || exifAttribute2 == null) {
-            ExifAttribute exifAttribute3 = this.mAttributes[i].get("JPEGInterchangeFormat");
-            ExifAttribute exifAttribute4 = this.mAttributes[i].get("JPEGInterchangeFormatLength");
+            ExifAttribute exifAttribute3 = this.mAttributes[i].get(TAG_JPEG_INTERCHANGE_FORMAT);
+            ExifAttribute exifAttribute4 = this.mAttributes[i].get(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
             if (exifAttribute3 != null && exifAttribute4 != null) {
                 int intValue = exifAttribute3.getIntValue(this.mExifByteOrder);
                 int intValue2 = exifAttribute3.getIntValue(this.mExifByteOrder);
@@ -3362,7 +3369,7 @@ public class ExifInterface {
 
     private void saveJpegAttributes(InputStream inputStream, OutputStream outputStream) throws IOException {
         if (DEBUG) {
-            Log.d("ExifInterface", "saveJpegAttributes starting with (inputStream: " + inputStream + ", outputStream: " + outputStream + ")");
+            Log.d(TAG, "saveJpegAttributes starting with (inputStream: " + inputStream + ", outputStream: " + outputStream + ")");
         }
         DataInputStream dataInputStream = new DataInputStream(inputStream);
         ByteOrderedDataOutputStream byteOrderedDataOutputStream = new ByteOrderedDataOutputStream(outputStream, ByteOrder.BIG_ENDIAN);
@@ -3371,14 +3378,14 @@ public class ExifInterface {
             if (dataInputStream.readByte() == -40) {
                 byteOrderedDataOutputStream.writeByte(-40);
                 ExifAttribute exifAttribute = null;
-                if (getAttribute("Xmp") != null && this.mXmpIsFromSeparateMarker) {
-                    exifAttribute = this.mAttributes[0].remove("Xmp");
+                if (getAttribute(TAG_XMP) != null && this.mXmpIsFromSeparateMarker) {
+                    exifAttribute = this.mAttributes[0].remove(TAG_XMP);
                 }
                 byteOrderedDataOutputStream.writeByte(-1);
                 byteOrderedDataOutputStream.writeByte(-31);
                 writeExifSegment(byteOrderedDataOutputStream);
                 if (exifAttribute != null) {
-                    this.mAttributes[0].put("Xmp", exifAttribute);
+                    this.mAttributes[0].put(TAG_XMP, exifAttribute);
                 }
                 byte[] bArr = new byte[4096];
                 while (dataInputStream.readByte() == -1) {
@@ -3450,7 +3457,7 @@ public class ExifInterface {
     private void savePngAttributes(InputStream inputStream, OutputStream outputStream) throws IOException {
         Throwable th;
         if (DEBUG) {
-            Log.d("ExifInterface", "savePngAttributes starting with (inputStream: " + inputStream + ", outputStream: " + outputStream + ")");
+            Log.d(TAG, "savePngAttributes starting with (inputStream: " + inputStream + ", outputStream: " + outputStream + ")");
         }
         DataInputStream dataInputStream = new DataInputStream(inputStream);
         ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
@@ -3502,7 +3509,7 @@ public class ExifInterface {
         int i3;
         int i4;
         if (DEBUG) {
-            Log.d("ExifInterface", "saveWebpAttributes starting with (inputStream: " + inputStream + ", outputStream: " + outputStream + ")");
+            Log.d(TAG, "saveWebpAttributes starting with (inputStream: " + inputStream + ", outputStream: " + outputStream + ")");
         }
         ByteOrder byteOrder = ByteOrder.LITTLE_ENDIAN;
         ByteOrderedDataInputStream byteOrderedDataInputStream = new ByteOrderedDataInputStream(inputStream, byteOrder);
@@ -3666,7 +3673,7 @@ public class ExifInterface {
 
     private void setThumbnailData(ByteOrderedDataInputStream byteOrderedDataInputStream) throws IOException {
         HashMap<String, ExifAttribute> hashMap = this.mAttributes[4];
-        ExifAttribute exifAttribute = hashMap.get("Compression");
+        ExifAttribute exifAttribute = hashMap.get(TAG_COMPRESSION);
         if (exifAttribute != null) {
             int intValue = exifAttribute.getIntValue(this.mExifByteOrder);
             this.mThumbnailCompression = intValue;
@@ -3702,13 +3709,13 @@ public class ExifInterface {
 
     private void swapBasedOnImageSize(int i, int i2) throws IOException {
         if (!this.mAttributes[i].isEmpty() && !this.mAttributes[i2].isEmpty()) {
-            ExifAttribute exifAttribute = this.mAttributes[i].get("ImageLength");
-            ExifAttribute exifAttribute2 = this.mAttributes[i].get("ImageWidth");
-            ExifAttribute exifAttribute3 = this.mAttributes[i2].get("ImageLength");
-            ExifAttribute exifAttribute4 = this.mAttributes[i2].get("ImageWidth");
+            ExifAttribute exifAttribute = this.mAttributes[i].get(TAG_IMAGE_LENGTH);
+            ExifAttribute exifAttribute2 = this.mAttributes[i].get(TAG_IMAGE_WIDTH);
+            ExifAttribute exifAttribute3 = this.mAttributes[i2].get(TAG_IMAGE_LENGTH);
+            ExifAttribute exifAttribute4 = this.mAttributes[i2].get(TAG_IMAGE_WIDTH);
             if (exifAttribute == null || exifAttribute2 == null) {
                 if (DEBUG) {
-                    Log.d("ExifInterface", "First image does not contain valid size information");
+                    Log.d(TAG, "First image does not contain valid size information");
                 }
             } else if (exifAttribute3 != null && exifAttribute4 != null) {
                 int intValue = exifAttribute.getIntValue(this.mExifByteOrder);
@@ -3722,28 +3729,28 @@ public class ExifInterface {
                     hashMapArr[i2] = hashMap;
                 }
             } else if (DEBUG) {
-                Log.d("ExifInterface", "Second image does not contain valid size information");
+                Log.d(TAG, "Second image does not contain valid size information");
             }
         } else if (DEBUG) {
-            Log.d("ExifInterface", "Cannot perform swap since only one image data exists");
+            Log.d(TAG, "Cannot perform swap since only one image data exists");
         }
     }
 
     private void updateImageSizeValues(ByteOrderedDataInputStream byteOrderedDataInputStream, int i) throws IOException {
         ExifAttribute exifAttribute;
         ExifAttribute exifAttribute2;
-        ExifAttribute exifAttribute3 = this.mAttributes[i].get("DefaultCropSize");
-        ExifAttribute exifAttribute4 = this.mAttributes[i].get("SensorTopBorder");
-        ExifAttribute exifAttribute5 = this.mAttributes[i].get("SensorLeftBorder");
-        ExifAttribute exifAttribute6 = this.mAttributes[i].get("SensorBottomBorder");
-        ExifAttribute exifAttribute7 = this.mAttributes[i].get("SensorRightBorder");
+        ExifAttribute exifAttribute3 = this.mAttributes[i].get(TAG_DEFAULT_CROP_SIZE);
+        ExifAttribute exifAttribute4 = this.mAttributes[i].get(TAG_RW2_SENSOR_TOP_BORDER);
+        ExifAttribute exifAttribute5 = this.mAttributes[i].get(TAG_RW2_SENSOR_LEFT_BORDER);
+        ExifAttribute exifAttribute6 = this.mAttributes[i].get(TAG_RW2_SENSOR_BOTTOM_BORDER);
+        ExifAttribute exifAttribute7 = this.mAttributes[i].get(TAG_RW2_SENSOR_RIGHT_BORDER);
         if (exifAttribute3 != null) {
             if (exifAttribute3.format == 5) {
                 Rational[] rationalArr = (Rational[]) exifAttribute3.getValue(this.mExifByteOrder);
                 if (rationalArr == null || rationalArr.length != 2) {
                     StringBuilder K = a.K("Invalid crop size values. cropSize=");
                     K.append(Arrays.toString(rationalArr));
-                    Log.w("ExifInterface", K.toString());
+                    Log.w(TAG, K.toString());
                     return;
                 }
                 exifAttribute2 = ExifAttribute.createURational(rationalArr[0], this.mExifByteOrder);
@@ -3753,14 +3760,14 @@ public class ExifInterface {
                 if (iArr == null || iArr.length != 2) {
                     StringBuilder K2 = a.K("Invalid crop size values. cropSize=");
                     K2.append(Arrays.toString(iArr));
-                    Log.w("ExifInterface", K2.toString());
+                    Log.w(TAG, K2.toString());
                     return;
                 }
                 exifAttribute2 = ExifAttribute.createUShort(iArr[0], this.mExifByteOrder);
                 exifAttribute = ExifAttribute.createUShort(iArr[1], this.mExifByteOrder);
             }
-            this.mAttributes[i].put("ImageWidth", exifAttribute2);
-            this.mAttributes[i].put("ImageLength", exifAttribute);
+            this.mAttributes[i].put(TAG_IMAGE_WIDTH, exifAttribute2);
+            this.mAttributes[i].put(TAG_IMAGE_LENGTH, exifAttribute);
         } else if (exifAttribute4 == null || exifAttribute5 == null || exifAttribute6 == null || exifAttribute7 == null) {
             retrieveJpegImageSize(byteOrderedDataInputStream, i);
         } else {
@@ -3771,8 +3778,8 @@ public class ExifInterface {
             if (intValue2 > intValue && intValue3 > intValue4) {
                 ExifAttribute createUShort = ExifAttribute.createUShort(intValue2 - intValue, this.mExifByteOrder);
                 ExifAttribute createUShort2 = ExifAttribute.createUShort(intValue3 - intValue4, this.mExifByteOrder);
-                this.mAttributes[i].put("ImageLength", createUShort);
-                this.mAttributes[i].put("ImageWidth", createUShort2);
+                this.mAttributes[i].put(TAG_IMAGE_LENGTH, createUShort);
+                this.mAttributes[i].put(TAG_IMAGE_WIDTH, createUShort2);
             }
         }
     }
@@ -3781,11 +3788,11 @@ public class ExifInterface {
         swapBasedOnImageSize(0, 5);
         swapBasedOnImageSize(0, 4);
         swapBasedOnImageSize(5, 4);
-        ExifAttribute exifAttribute = this.mAttributes[1].get("PixelXDimension");
-        ExifAttribute exifAttribute2 = this.mAttributes[1].get("PixelYDimension");
+        ExifAttribute exifAttribute = this.mAttributes[1].get(TAG_PIXEL_X_DIMENSION);
+        ExifAttribute exifAttribute2 = this.mAttributes[1].get(TAG_PIXEL_Y_DIMENSION);
         if (!(exifAttribute == null || exifAttribute2 == null)) {
-            this.mAttributes[0].put("ImageWidth", exifAttribute);
-            this.mAttributes[0].put("ImageLength", exifAttribute2);
+            this.mAttributes[0].put(TAG_IMAGE_WIDTH, exifAttribute);
+            this.mAttributes[0].put(TAG_IMAGE_LENGTH, exifAttribute2);
         }
         if (this.mAttributes[4].isEmpty() && isThumbnail(this.mAttributes[5])) {
             HashMap<String, ExifAttribute>[] hashMapArr = this.mAttributes;
@@ -3793,7 +3800,7 @@ public class ExifInterface {
             hashMapArr[5] = new HashMap<>();
         }
         if (!isThumbnail(this.mAttributes[4])) {
-            Log.d("ExifInterface", "No image meets the size requirements of a thumbnail image.");
+            Log.d(TAG, "No image meets the size requirements of a thumbnail image.");
         }
     }
 
@@ -3854,7 +3861,7 @@ public class ExifInterface {
         }
         if (DEBUG) {
             for (int i6 = 0; i6 < EXIF_TAGS.length; i6++) {
-                Log.d("ExifInterface", String.format("index: %d, offsets: %d, tag count: %d, data sizes: %d, total size: %d", Integer.valueOf(i6), Integer.valueOf(iArr[i6]), Integer.valueOf(this.mAttributes[i6].size()), Integer.valueOf(iArr2[i6]), Integer.valueOf(i4)));
+                Log.d(TAG, String.format("index: %d, offsets: %d, tag count: %d, data sizes: %d, total size: %d", Integer.valueOf(i6), Integer.valueOf(iArr[i6]), Integer.valueOf(this.mAttributes[i6].size()), Integer.valueOf(iArr2[i6]), Integer.valueOf(i4)));
             }
         }
         if (!this.mAttributes[1].isEmpty()) {
@@ -3877,7 +3884,7 @@ public class ExifInterface {
             byteOrderedDataOutputStream.write(WEBP_CHUNK_TYPE_EXIF);
             byteOrderedDataOutputStream.writeInt(i4);
         }
-        byteOrderedDataOutputStream.writeShort(this.mExifByteOrder == ByteOrder.BIG_ENDIAN ? (short) 19789 : 18761);
+        byteOrderedDataOutputStream.writeShort(this.mExifByteOrder == ByteOrder.BIG_ENDIAN ? BYTE_ALIGN_MM : BYTE_ALIGN_II);
         byteOrderedDataOutputStream.setByteOrder(this.mExifByteOrder);
         byteOrderedDataOutputStream.writeUnsignedShort(42);
         byteOrderedDataOutputStream.writeUnsignedInt(8);
@@ -3930,7 +3937,7 @@ public class ExifInterface {
 
     public void flipHorizontally() {
         int i = 1;
-        switch (getAttributeInt("Orientation", 1)) {
+        switch (getAttributeInt(TAG_ORIENTATION, 1)) {
             case 1:
                 i = 2;
                 break;
@@ -3958,12 +3965,12 @@ public class ExifInterface {
                 i = 0;
                 break;
         }
-        setAttribute("Orientation", Integer.toString(i));
+        setAttribute(TAG_ORIENTATION, Integer.toString(i));
     }
 
     public void flipVertically() {
         int i = 1;
-        switch (getAttributeInt("Orientation", 1)) {
+        switch (getAttributeInt(TAG_ORIENTATION, 1)) {
             case 1:
                 i = 4;
                 break;
@@ -3991,14 +3998,14 @@ public class ExifInterface {
                 i = 0;
                 break;
         }
-        setAttribute("Orientation", Integer.toString(i));
+        setAttribute(TAG_ORIENTATION, Integer.toString(i));
     }
 
     public double getAltitude(double d) {
-        double attributeDouble = getAttributeDouble("GPSAltitude", -1.0d);
+        double attributeDouble = getAttributeDouble(TAG_GPS_ALTITUDE, -1.0d);
         int i = -1;
-        int attributeInt = getAttributeInt("GPSAltitudeRef", -1);
-        if (attributeDouble < 0.0d || attributeInt < 0) {
+        int attributeInt = getAttributeInt(TAG_GPS_ALTITUDE_REF, -1);
+        if (attributeDouble < ShadowDrawableWrapper.COS_45 || attributeInt < 0) {
             return d;
         }
         if (attributeInt != 1) {
@@ -4015,7 +4022,7 @@ public class ExifInterface {
             if (!sTagSetForCompatibility.contains(str)) {
                 return exifAttribute.getStringValue(this.mExifByteOrder);
             }
-            if (str.equals("GPSTimeStamp")) {
+            if (str.equals(TAG_GPS_TIMESTAMP)) {
                 int i = exifAttribute.format;
                 if (i == 5 || i == 10) {
                     Rational[] rationalArr = (Rational[]) exifAttribute.getValue(this.mExifByteOrder);
@@ -4024,12 +4031,12 @@ public class ExifInterface {
                     }
                     StringBuilder K = a.K("Invalid GPS Timestamp array. array=");
                     K.append(Arrays.toString(rationalArr));
-                    Log.w("ExifInterface", K.toString());
+                    Log.w(TAG, K.toString());
                     return null;
                 }
                 StringBuilder K2 = a.K("GPS Timestamp format is not rational. format=");
                 K2.append(exifAttribute.format);
-                Log.w("ExifInterface", K2.toString());
+                Log.w(TAG, K2.toString());
                 return null;
             }
             try {
@@ -4092,26 +4099,26 @@ public class ExifInterface {
     @Nullable
     @RestrictTo({RestrictTo.Scope.LIBRARY})
     public Long getDateTime() {
-        return parseDateTime(getAttribute("DateTime"), getAttribute("SubSecTime"), getAttribute("OffsetTime"));
+        return parseDateTime(getAttribute(TAG_DATETIME), getAttribute(TAG_SUBSEC_TIME), getAttribute(TAG_OFFSET_TIME));
     }
 
     @Nullable
     @RestrictTo({RestrictTo.Scope.LIBRARY})
     public Long getDateTimeDigitized() {
-        return parseDateTime(getAttribute("DateTimeDigitized"), getAttribute("SubSecTimeDigitized"), getAttribute("OffsetTimeDigitized"));
+        return parseDateTime(getAttribute(TAG_DATETIME_DIGITIZED), getAttribute(TAG_SUBSEC_TIME_DIGITIZED), getAttribute(TAG_OFFSET_TIME_DIGITIZED));
     }
 
     @Nullable
     @RestrictTo({RestrictTo.Scope.LIBRARY})
     public Long getDateTimeOriginal() {
-        return parseDateTime(getAttribute("DateTimeOriginal"), getAttribute("SubSecTimeOriginal"), getAttribute("OffsetTimeOriginal"));
+        return parseDateTime(getAttribute(TAG_DATETIME_ORIGINAL), getAttribute(TAG_SUBSEC_TIME_ORIGINAL), getAttribute(TAG_OFFSET_TIME_ORIGINAL));
     }
 
     @Nullable
     @SuppressLint({"AutoBoxing"})
     public Long getGpsDateTime() {
-        String attribute = getAttribute("GPSDateStamp");
-        String attribute2 = getAttribute("GPSTimeStamp");
+        String attribute = getAttribute(TAG_GPS_DATESTAMP);
+        String attribute2 = getAttribute(TAG_GPS_TIMESTAMP);
         if (!(attribute == null || attribute2 == null)) {
             Pattern pattern = NON_ZERO_TIME_PATTERN;
             if (pattern.matcher(attribute).matches() || pattern.matcher(attribute2).matches()) {
@@ -4143,10 +4150,10 @@ public class ExifInterface {
 
     @Nullable
     public double[] getLatLong() {
-        String attribute = getAttribute("GPSLatitude");
-        String attribute2 = getAttribute("GPSLatitudeRef");
-        String attribute3 = getAttribute("GPSLongitude");
-        String attribute4 = getAttribute("GPSLongitudeRef");
+        String attribute = getAttribute(TAG_GPS_LATITUDE);
+        String attribute2 = getAttribute(TAG_GPS_LATITUDE_REF);
+        String attribute3 = getAttribute(TAG_GPS_LONGITUDE);
+        String attribute4 = getAttribute(TAG_GPS_LONGITUDE_REF);
         if (attribute == null || attribute2 == null || attribute3 == null || attribute4 == null) {
             return null;
         }
@@ -4155,16 +4162,16 @@ public class ExifInterface {
         } catch (IllegalArgumentException unused) {
             StringBuilder K = a.K("Latitude/longitude values are not parsable. ");
             K.append(String.format("latValue=%s, latRef=%s, lngValue=%s, lngRef=%s", attribute, attribute2, attribute3, attribute4));
-            Log.w("ExifInterface", K.toString());
+            Log.w(TAG, K.toString());
             return null;
         }
     }
 
     public int getRotationDegrees() {
-        switch (getAttributeInt("Orientation", 1)) {
+        switch (getAttributeInt(TAG_ORIENTATION, 1)) {
             case 3:
             case 4:
-                return 180;
+                return BaseTransientBottomBar.ANIMATION_FADE_DURATION;
             case 5:
             case 8:
                 return 270;
@@ -4205,8 +4212,8 @@ public class ExifInterface {
                 int i3 = i2 * 3;
                 iArr[i2] = (bArr[i3] << 16) + 0 + (bArr[i3 + 1] << 8) + bArr[i3 + 2];
             }
-            ExifAttribute exifAttribute = this.mAttributes[4].get("ImageLength");
-            ExifAttribute exifAttribute2 = this.mAttributes[4].get("ImageWidth");
+            ExifAttribute exifAttribute = this.mAttributes[4].get(TAG_IMAGE_LENGTH);
+            ExifAttribute exifAttribute2 = this.mAttributes[4].get(TAG_IMAGE_WIDTH);
             if (!(exifAttribute == null || exifAttribute2 == null)) {
                 return Bitmap.createBitmap(iArr, exifAttribute2.getIntValue(this.mExifByteOrder), exifAttribute.getIntValue(this.mExifByteOrder), Bitmap.Config.ARGB_8888);
             }
@@ -4239,7 +4246,7 @@ public class ExifInterface {
                     if (inputStream.markSupported()) {
                         inputStream.reset();
                     } else {
-                        Log.d("ExifInterface", "Cannot read thumbnail from inputstream without mark/reset support");
+                        Log.d(TAG, "Cannot read thumbnail from inputstream without mark/reset support");
                         closeQuietly(inputStream);
                         return null;
                     }
@@ -4247,7 +4254,7 @@ public class ExifInterface {
                     e = e2;
                     fileDescriptor = null;
                     try {
-                        Log.d("ExifInterface", "Encountered exception while getting thumbnail", e);
+                        Log.d(TAG, "Encountered exception while getting thumbnail", e);
                         closeQuietly(inputStream);
                         if (fileDescriptor != null) {
                         }
@@ -4294,7 +4301,7 @@ public class ExifInterface {
                             throw new IOException("Corrupted image");
                         } catch (Exception e3) {
                             e = e3;
-                            Log.d("ExifInterface", "Encountered exception while getting thumbnail", e);
+                            Log.d(TAG, "Encountered exception while getting thumbnail", e);
                             closeQuietly(inputStream);
                             if (fileDescriptor != null) {
                             }
@@ -4307,7 +4314,7 @@ public class ExifInterface {
                     e = e4;
                     fileDescriptor = dup;
                     inputStream = null;
-                    Log.d("ExifInterface", "Encountered exception while getting thumbnail", e);
+                    Log.d(TAG, "Encountered exception while getting thumbnail", e);
                     closeQuietly(inputStream);
                     if (fileDescriptor != null) {
                     }
@@ -4328,7 +4335,7 @@ public class ExifInterface {
             inputStream = null;
             e = e5;
             fileDescriptor = null;
-            Log.d("ExifInterface", "Encountered exception while getting thumbnail", e);
+            Log.d(TAG, "Encountered exception while getting thumbnail", e);
             closeQuietly(inputStream);
             if (fileDescriptor != null) {
                 closeFileDescriptor(fileDescriptor);
@@ -4368,7 +4375,7 @@ public class ExifInterface {
     }
 
     public boolean isFlipped() {
-        int attributeInt = getAttributeInt("Orientation", 1);
+        int attributeInt = getAttributeInt(TAG_ORIENTATION, 1);
         return attributeInt == 2 || attributeInt == 7 || attributeInt == 4 || attributeInt == 5;
     }
 
@@ -4381,12 +4388,12 @@ public class ExifInterface {
     }
 
     public void resetOrientation() {
-        setAttribute("Orientation", Integer.toString(1));
+        setAttribute(TAG_ORIENTATION, Integer.toString(1));
     }
 
     public void rotate(int i) {
         if (i % 90 == 0) {
-            int attributeInt = getAttributeInt("Orientation", 1);
+            int attributeInt = getAttributeInt(TAG_ORIENTATION, 1);
             List<Integer> list = ROTATION_ORDER;
             int i2 = 0;
             if (list.contains(Integer.valueOf(attributeInt))) {
@@ -4405,7 +4412,7 @@ public class ExifInterface {
                     i2 = list2.get(indexOf2 + i2).intValue();
                 }
             }
-            setAttribute("Orientation", Integer.toString(i2));
+            setAttribute(TAG_ORIENTATION, Integer.toString(i2));
             return;
         }
         throw new IllegalArgumentException("degree should be a multiple of 90");
@@ -4642,9 +4649,9 @@ public class ExifInterface {
     }
 
     public void setAltitude(double d) {
-        String str = d >= 0.0d ? "0" : "1";
-        setAttribute("GPSAltitude", new Rational(Math.abs(d)).toString());
-        setAttribute("GPSAltitudeRef", str);
+        String str = d >= ShadowDrawableWrapper.COS_45 ? "0" : "1";
+        setAttribute(TAG_GPS_ALTITUDE, new Rational(Math.abs(d)).toString());
+        setAttribute(TAG_GPS_ALTITUDE_REF, str);
     }
 
     public void setAttribute(@NonNull String str, @Nullable String str2) {
@@ -4654,29 +4661,29 @@ public class ExifInterface {
         String str4 = str;
         String str5 = str2;
         Objects.requireNonNull(str4, "tag shouldn't be null");
-        if (("DateTime".equals(str4) || "DateTimeOriginal".equals(str4) || "DateTimeDigitized".equals(str4)) && str5 != null) {
+        if ((TAG_DATETIME.equals(str4) || TAG_DATETIME_ORIGINAL.equals(str4) || TAG_DATETIME_DIGITIZED.equals(str4)) && str5 != null) {
             boolean find = DATETIME_PRIMARY_FORMAT_PATTERN.matcher(str5).find();
             boolean find2 = DATETIME_SECONDARY_FORMAT_PATTERN.matcher(str5).find();
             if (str2.length() != 19 || (!find && !find2)) {
-                Log.w("ExifInterface", "Invalid value for " + str4 + " : " + str5);
+                Log.w(TAG, "Invalid value for " + str4 + " : " + str5);
                 return;
             } else if (find2) {
                 str5 = str5.replaceAll("-", ":");
             }
         }
-        if ("ISOSpeedRatings".equals(str4)) {
+        if (TAG_ISO_SPEED_RATINGS.equals(str4)) {
             if (DEBUG) {
-                Log.d("ExifInterface", "setAttribute: Replacing TAG_ISO_SPEED_RATINGS with TAG_PHOTOGRAPHIC_SENSITIVITY.");
+                Log.d(TAG, "setAttribute: Replacing TAG_ISO_SPEED_RATINGS with TAG_PHOTOGRAPHIC_SENSITIVITY.");
             }
-            str4 = "PhotographicSensitivity";
+            str4 = TAG_PHOTOGRAPHIC_SENSITIVITY;
         }
         int i2 = 2;
         int i3 = 1;
         if (str5 != null && sTagSetForCompatibility.contains(str4)) {
-            if (str4.equals("GPSTimeStamp")) {
+            if (str4.equals(TAG_GPS_TIMESTAMP)) {
                 Matcher matcher = GPS_TIMESTAMP_PATTERN.matcher(str5);
                 if (!matcher.find()) {
-                    Log.w("ExifInterface", "Invalid value for " + str4 + " : " + str5);
+                    Log.w(TAG, "Invalid value for " + str4 + " : " + str5);
                     return;
                 }
                 str5 = Integer.parseInt(matcher.group(1)) + "/1," + Integer.parseInt(matcher.group(2)) + "/1," + Integer.parseInt(matcher.group(3)) + "/1";
@@ -4684,7 +4691,7 @@ public class ExifInterface {
                 try {
                     str5 = new Rational(Double.parseDouble(str5)).toString();
                 } catch (NumberFormatException unused) {
-                    Log.w("ExifInterface", "Invalid value for " + str4 + " : " + str5);
+                    Log.w(TAG, "Invalid value for " + str4 + " : " + str5);
                     return;
                 }
             }
@@ -4728,7 +4735,7 @@ public class ExifInterface {
                                 }
                                 P.append(str6);
                                 P.append(")");
-                                Log.d("ExifInterface", P.toString());
+                                Log.d(TAG, P.toString());
                             }
                         } else {
                             i = exifTag.secondaryFormat;
@@ -4763,7 +4770,7 @@ public class ExifInterface {
                             Rational[] rationalArr = new Rational[split3.length];
                             int i10 = 0;
                             while (i10 < split3.length) {
-                                String[] split4 = split3[i10].split("/", i5);
+                                String[] split4 = split3[i10].split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, i5);
                                 rationalArr[i10] = new Rational((long) Double.parseDouble(split4[0]), (long) Double.parseDouble(split4[1]));
                                 i10++;
                                 i5 = -1;
@@ -4775,7 +4782,7 @@ public class ExifInterface {
                         case 11:
                         default:
                             if (DEBUG) {
-                                a.c0("Data format isn't one of expected formats: ", i, "ExifInterface");
+                                a.c0("Data format isn't one of expected formats: ", i, TAG);
                                 break;
                             } else {
                                 continue;
@@ -4793,7 +4800,7 @@ public class ExifInterface {
                             Rational[] rationalArr2 = new Rational[split6.length];
                             int i12 = 0;
                             while (i12 < split6.length) {
-                                String[] split7 = split6[i12].split("/", -1);
+                                String[] split7 = split6[i12].split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, -1);
                                 rationalArr2[i12] = new Rational((long) Double.parseDouble(split7[c2]), (long) Double.parseDouble(split7[i3]));
                                 i12++;
                                 c2 = 0;
@@ -4822,20 +4829,20 @@ public class ExifInterface {
 
     @RestrictTo({RestrictTo.Scope.LIBRARY})
     public void setDateTime(@NonNull Long l) {
-        setAttribute("DateTime", sFormatterPrimary.format(new Date(l.longValue())));
-        setAttribute("SubSecTime", Long.toString(l.longValue() % 1000));
+        setAttribute(TAG_DATETIME, sFormatterPrimary.format(new Date(l.longValue())));
+        setAttribute(TAG_SUBSEC_TIME, Long.toString(l.longValue() % 1000));
     }
 
     public void setGpsInfo(Location location) {
         if (location != null) {
-            setAttribute("GPSProcessingMethod", location.getProvider());
+            setAttribute(TAG_GPS_PROCESSING_METHOD, location.getProvider());
             setLatLong(location.getLatitude(), location.getLongitude());
             setAltitude(location.getAltitude());
-            setAttribute("GPSSpeedRef", "K");
-            setAttribute("GPSSpeed", new Rational((double) ((location.getSpeed() * ((float) TimeUnit.HOURS.toSeconds(1))) / 1000.0f)).toString());
+            setAttribute(TAG_GPS_SPEED_REF, "K");
+            setAttribute(TAG_GPS_SPEED, new Rational((double) ((location.getSpeed() * ((float) TimeUnit.HOURS.toSeconds(1))) / 1000.0f)).toString());
             String[] split = sFormatterPrimary.format(new Date(location.getTime())).split("\\s+", -1);
-            setAttribute("GPSDateStamp", split[0]);
-            setAttribute("GPSTimeStamp", split[1]);
+            setAttribute(TAG_GPS_DATESTAMP, split[0]);
+            setAttribute(TAG_GPS_TIMESTAMP, split[1]);
         }
     }
 
@@ -4845,10 +4852,10 @@ public class ExifInterface {
         } else if (d2 < -180.0d || d2 > 180.0d || Double.isNaN(d2)) {
             throw new IllegalArgumentException("Longitude value " + d2 + " is not valid.");
         } else {
-            setAttribute("GPSLatitudeRef", d >= 0.0d ? "N" : "S");
-            setAttribute("GPSLatitude", convertDecimalDegree(Math.abs(d)));
-            setAttribute("GPSLongitudeRef", d2 >= 0.0d ? "E" : "W");
-            setAttribute("GPSLongitude", convertDecimalDegree(Math.abs(d2)));
+            setAttribute(TAG_GPS_LATITUDE_REF, d >= ShadowDrawableWrapper.COS_45 ? "N" : LATITUDE_SOUTH);
+            setAttribute(TAG_GPS_LATITUDE, convertDecimalDegree(Math.abs(d)));
+            setAttribute(TAG_GPS_LONGITUDE_REF, d2 >= ShadowDrawableWrapper.COS_45 ? LONGITUDE_EAST : LONGITUDE_WEST);
+            setAttribute(TAG_GPS_LONGITUDE, convertDecimalDegree(Math.abs(d2)));
         }
     }
 }
diff --git a/app/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java b/app/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java
index 370733fad8..7168ecc9c5 100644
--- a/app/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java
+++ b/app/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java
@@ -394,7 +394,7 @@ public class DefaultSpecialEffectsController extends SpecialEffectsController {
                         Fragment fragment = operation.getFragment();
                         if (Boolean.TRUE.equals(map.get(operation))) {
                             if (FragmentManager.isLoggingEnabled(2)) {
-                                Log.v("FragmentManager", "Ignoring Animator set on " + fragment + " as this Fragment was involved in a Transition.");
+                                Log.v(FragmentManager.TAG, "Ignoring Animator set on " + fragment + " as this Fragment was involved in a Transition.");
                             }
                             animationInfo.completeSpecialEffect();
                         } else {
@@ -421,12 +421,12 @@ public class DefaultSpecialEffectsController extends SpecialEffectsController {
             Fragment fragment2 = operation2.getFragment();
             if (z2) {
                 if (FragmentManager.isLoggingEnabled(2)) {
-                    Log.v("FragmentManager", "Ignoring Animation set on " + fragment2 + " as Animations cannot run alongside Transitions.");
+                    Log.v(FragmentManager.TAG, "Ignoring Animation set on " + fragment2 + " as Animations cannot run alongside Transitions.");
                 }
                 animationInfo2.completeSpecialEffect();
             } else if (z3) {
                 if (FragmentManager.isLoggingEnabled(2)) {
-                    Log.v("FragmentManager", "Ignoring Animation set on " + fragment2 + " as Animations cannot run alongside Animators.");
+                    Log.v(FragmentManager.TAG, "Ignoring Animation set on " + fragment2 + " as Animations cannot run alongside Animators.");
                 }
                 animationInfo2.completeSpecialEffect();
             } else {
diff --git a/app/src/main/java/androidx/fragment/app/DialogFragment.java b/app/src/main/java/androidx/fragment/app/DialogFragment.java
index 7cdf2ca06b..a28caf73bd 100644
--- a/app/src/main/java/androidx/fragment/app/DialogFragment.java
+++ b/app/src/main/java/androidx/fragment/app/DialogFragment.java
@@ -106,7 +106,7 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
                     throw new IllegalStateException("DialogFragment can not be attached to a container view");
                 } else if (DialogFragment.access$000(DialogFragment.this) != null) {
                     if (FragmentManager.isLoggingEnabled(3)) {
-                        Log.d("FragmentManager", "DialogFragment " + this + " setting the content view on " + DialogFragment.access$000(DialogFragment.this));
+                        Log.d(FragmentManager.TAG, "DialogFragment " + this + " setting the content view on " + DialogFragment.access$000(DialogFragment.this));
                     }
                     DialogFragment.access$000(DialogFragment.this).setContentView(requireView);
                 }
@@ -273,11 +273,11 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
         this.mHandler = new Handler();
         this.mShowsDialog = this.mContainerId == 0;
         if (bundle != null) {
-            this.mStyle = bundle.getInt("android:style", 0);
-            this.mTheme = bundle.getInt("android:theme", 0);
-            this.mCancelable = bundle.getBoolean("android:cancelable", true);
-            this.mShowsDialog = bundle.getBoolean("android:showsDialog", this.mShowsDialog);
-            this.mBackStackId = bundle.getInt("android:backStackId", -1);
+            this.mStyle = bundle.getInt(SAVED_STYLE, 0);
+            this.mTheme = bundle.getInt(SAVED_THEME, 0);
+            this.mCancelable = bundle.getBoolean(SAVED_CANCELABLE, true);
+            this.mShowsDialog = bundle.getBoolean(SAVED_SHOWS_DIALOG, this.mShowsDialog);
+            this.mBackStackId = bundle.getInt(SAVED_BACK_STACK_ID, -1);
         }
     }
 
@@ -285,7 +285,7 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
     @MainThread
     public Dialog onCreateDialog(@Nullable Bundle bundle) {
         if (FragmentManager.isLoggingEnabled(3)) {
-            Log.d("FragmentManager", "onCreateDialog called for DialogFragment " + this);
+            Log.d(FragmentManager.TAG, "onCreateDialog called for DialogFragment " + this);
         }
         return new Dialog(requireContext(), getTheme());
     }
@@ -321,7 +321,7 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
     public void onDismiss(@NonNull DialogInterface dialogInterface) {
         if (!this.mViewDestroyed) {
             if (FragmentManager.isLoggingEnabled(3)) {
-                Log.d("FragmentManager", "onDismiss called for DialogFragment " + this);
+                Log.d(FragmentManager.TAG, "onDismiss called for DialogFragment " + this);
             }
             dismissInternal(true, true);
         }
@@ -344,16 +344,16 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
             if (FragmentManager.isLoggingEnabled(2)) {
                 String str = "getting layout inflater for DialogFragment " + this;
                 if (!this.mShowsDialog) {
-                    Log.d("FragmentManager", "mShowsDialog = false: " + str);
+                    Log.d(FragmentManager.TAG, "mShowsDialog = false: " + str);
                 } else {
-                    Log.d("FragmentManager", "mCreatingDialog = true: " + str);
+                    Log.d(FragmentManager.TAG, "mCreatingDialog = true: " + str);
                 }
             }
             return onGetLayoutInflater;
         }
         prepareDialog(bundle);
         if (FragmentManager.isLoggingEnabled(2)) {
-            Log.d("FragmentManager", "get layout inflater for DialogFragment " + this + " from dialog context");
+            Log.d(FragmentManager.TAG, "get layout inflater for DialogFragment " + this + " from dialog context");
         }
         Dialog dialog = this.mDialog;
         return dialog != null ? onGetLayoutInflater.cloneInContext(dialog.getContext()) : onGetLayoutInflater;
@@ -370,28 +370,28 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
         Dialog dialog = this.mDialog;
         if (dialog != null) {
             Bundle onSaveInstanceState = dialog.onSaveInstanceState();
-            onSaveInstanceState.putBoolean("android:dialogShowing", false);
-            bundle.putBundle("android:savedDialogState", onSaveInstanceState);
+            onSaveInstanceState.putBoolean(SAVED_INTERNAL_DIALOG_SHOWING, false);
+            bundle.putBundle(SAVED_DIALOG_STATE_TAG, onSaveInstanceState);
         }
         int i = this.mStyle;
         if (i != 0) {
-            bundle.putInt("android:style", i);
+            bundle.putInt(SAVED_STYLE, i);
         }
         int i2 = this.mTheme;
         if (i2 != 0) {
-            bundle.putInt("android:theme", i2);
+            bundle.putInt(SAVED_THEME, i2);
         }
         boolean z2 = this.mCancelable;
         if (!z2) {
-            bundle.putBoolean("android:cancelable", z2);
+            bundle.putBoolean(SAVED_CANCELABLE, z2);
         }
         boolean z3 = this.mShowsDialog;
         if (!z3) {
-            bundle.putBoolean("android:showsDialog", z3);
+            bundle.putBoolean(SAVED_SHOWS_DIALOG, z3);
         }
         int i3 = this.mBackStackId;
         if (i3 != -1) {
-            bundle.putInt("android:backStackId", i3);
+            bundle.putInt(SAVED_BACK_STACK_ID, i3);
         }
     }
 
@@ -421,7 +421,7 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
     public void onViewStateRestored(@Nullable Bundle bundle) {
         Bundle bundle2;
         super.onViewStateRestored(bundle);
-        if (this.mDialog != null && bundle != null && (bundle2 = bundle.getBundle("android:savedDialogState")) != null) {
+        if (this.mDialog != null && bundle != null && (bundle2 = bundle.getBundle(SAVED_DIALOG_STATE_TAG)) != null) {
             this.mDialog.onRestoreInstanceState(bundle2);
         }
     }
@@ -430,7 +430,7 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
     public void performCreateView(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
         Bundle bundle2;
         super.performCreateView(layoutInflater, viewGroup, bundle);
-        if (this.mView == null && this.mDialog != null && bundle != null && (bundle2 = bundle.getBundle("android:savedDialogState")) != null) {
+        if (this.mView == null && this.mDialog != null && bundle != null && (bundle2 = bundle.getBundle(SAVED_DIALOG_STATE_TAG)) != null) {
             this.mDialog.onRestoreInstanceState(bundle2);
         }
     }
@@ -458,7 +458,7 @@ public class DialogFragment extends Fragment implements DialogInterface.OnCancel
 
     public void setStyle(int i, @StyleRes int i2) {
         if (FragmentManager.isLoggingEnabled(2)) {
-            Log.d("FragmentManager", "Setting style and theme for DialogFragment " + this + " to " + i + ", " + i2);
+            Log.d(FragmentManager.TAG, "Setting style and theme for DialogFragment " + this + " to " + i + ", " + i2);
         }
         this.mStyle = i;
         if (i == 2 || i == 3) {
diff --git a/app/src/main/java/androidx/fragment/app/Fragment.java b/app/src/main/java/androidx/fragment/app/Fragment.java
index 286c963887..e9fcda7b42 100644
--- a/app/src/main/java/androidx/fragment/app/Fragment.java
+++ b/app/src/main/java/androidx/fragment/app/Fragment.java
@@ -492,7 +492,7 @@ public class Fragment implements ComponentCallbacks, View.OnCreateContextMenuLis
 
     private void restoreViewState() {
         if (FragmentManager.isLoggingEnabled(3)) {
-            Log.d("FragmentManager", "moveto RESTORE_VIEW_STATE: " + this);
+            Log.d(FragmentManager.TAG, "moveto RESTORE_VIEW_STATE: " + this);
         }
         if (this.mView != null) {
             restoreViewState(this.mSavedFragmentState);
@@ -743,7 +743,7 @@ public class Fragment implements ComponentCallbacks, View.OnCreateContextMenuLis
                     StringBuilder K = a.K("Could not find Application instance from Context ");
                     K.append(requireContext().getApplicationContext());
                     K.append(", you will not be able to use AndroidViewModel with the default ViewModelProvider.Factory");
-                    Log.d("FragmentManager", K.toString());
+                    Log.d(FragmentManager.TAG, K.toString());
                 }
                 this.mDefaultFactory = new SavedStateViewModelFactory(application, this, getArguments());
             }
@@ -1140,7 +1140,7 @@ public class Fragment implements ComponentCallbacks, View.OnCreateContextMenuLis
     @Deprecated
     public void onActivityResult(int i, int i2, @Nullable Intent intent) {
         if (FragmentManager.isLoggingEnabled(2)) {
-            Log.v("FragmentManager", "Fragment " + this + " received the following in onActivityResult(): requestCode: " + i + " resultCode: " + i2 + " data: " + intent);
+            Log.v(FragmentManager.TAG, "Fragment " + this + " received the following in onActivityResult(): requestCode: " + i + " resultCode: " + i2 + " data: " + intent);
         }
     }
 
@@ -1577,7 +1577,7 @@ public class Fragment implements ComponentCallbacks, View.OnCreateContextMenuLis
         this.mSavedStateRegistryController.performSave(bundle);
         Parcelable saveAllState = this.mChildFragmentManager.saveAllState();
         if (saveAllState != null) {
-            bundle.putParcelable("android:support:fragments", saveAllState);
+            bundle.putParcelable(FragmentActivity.FRAGMENTS_TAG, saveAllState);
         }
     }
 
@@ -1723,7 +1723,7 @@ public class Fragment implements ComponentCallbacks, View.OnCreateContextMenuLis
 
     public void restoreChildFragmentState(@Nullable Bundle bundle) {
         Parcelable parcelable;
-        if (bundle != null && (parcelable = bundle.getParcelable("android:support:fragments")) != null) {
+        if (bundle != null && (parcelable = bundle.getParcelable(FragmentActivity.FRAGMENTS_TAG)) != null) {
             this.mChildFragmentManager.restoreSaveState(parcelable);
             this.mChildFragmentManager.dispatchCreate();
         }
@@ -1976,7 +1976,7 @@ public class Fragment implements ComponentCallbacks, View.OnCreateContextMenuLis
     public void startIntentSenderForResult(@SuppressLint({"UnknownNullness"}) IntentSender intentSender, int i, @Nullable Intent intent, int i2, int i3, int i4, @Nullable Bundle bundle) throws IntentSender.SendIntentException {
         if (this.mHost != null) {
             if (FragmentManager.isLoggingEnabled(2)) {
-                Log.v("FragmentManager", "Fragment " + this + " received the following in startIntentSenderForResult() requestCode: " + i + " IntentSender: " + intentSender + " fillInIntent: " + intent + " options: " + bundle);
+                Log.v(FragmentManager.TAG, "Fragment " + this + " received the following in startIntentSenderForResult() requestCode: " + i + " IntentSender: " + intentSender + " fillInIntent: " + intent + " options: " + bundle);
             }
             getParentFragmentManager().launchStartIntentSenderForResult(this, intentSender, i, intent, i2, i3, i4, bundle);
             return;
diff --git a/app/src/main/java/androidx/fragment/app/FragmentActivity.java b/app/src/main/java/androidx/fragment/app/FragmentActivity.java
index 1b30da678f..7b00d76e6a 100644
--- a/app/src/main/java/androidx/fragment/app/FragmentActivity.java
+++ b/app/src/main/java/androidx/fragment/app/FragmentActivity.java
@@ -57,7 +57,7 @@ public class FragmentActivity extends ComponentActivity implements ActivityCompa
             FragmentActivity.this.mFragmentLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP);
             Parcelable saveAllState = FragmentActivity.this.mFragments.saveAllState();
             if (saveAllState != null) {
-                bundle.putParcelable("android:support:fragments", saveAllState);
+                bundle.putParcelable(FragmentActivity.FRAGMENTS_TAG, saveAllState);
             }
             return bundle;
         }
@@ -71,9 +71,9 @@ public class FragmentActivity extends ComponentActivity implements ActivityCompa
         @Override // androidx.activity.contextaware.OnContextAvailableListener
         public void onContextAvailable(@NonNull Context context) {
             FragmentActivity.this.mFragments.attachHost(null);
-            Bundle consumeRestoredStateForKey = FragmentActivity.this.getSavedStateRegistry().consumeRestoredStateForKey("android:support:fragments");
+            Bundle consumeRestoredStateForKey = FragmentActivity.this.getSavedStateRegistry().consumeRestoredStateForKey(FragmentActivity.FRAGMENTS_TAG);
             if (consumeRestoredStateForKey != null) {
-                FragmentActivity.this.mFragments.restoreSaveState(consumeRestoredStateForKey.getParcelable("android:support:fragments"));
+                FragmentActivity.this.mFragments.restoreSaveState(consumeRestoredStateForKey.getParcelable(FragmentActivity.FRAGMENTS_TAG));
             }
         }
     }
@@ -181,7 +181,7 @@ public class FragmentActivity extends ComponentActivity implements ActivityCompa
     }
 
     private void init() {
-        getSavedStateRegistry().registerSavedStateProvider("android:support:fragments", new AnonymousClass1());
+        getSavedStateRegistry().registerSavedStateProvider(FRAGMENTS_TAG, new AnonymousClass1());
         addOnContextAvailableListener(new AnonymousClass2());
     }
 
diff --git a/app/src/main/java/androidx/fragment/app/FragmentManager.java b/app/src/main/java/androidx/fragment/app/FragmentManager.java
index d2deacc5c1..03a2ae7a26 100644
--- a/app/src/main/java/androidx/fragment/app/FragmentManager.java
+++ b/app/src/main/java/androidx/fragment/app/FragmentManager.java
@@ -132,14 +132,14 @@ public abstract class FragmentManager implements FragmentResultOwner {
         public void onActivityResult(ActivityResult activityResult) {
             LaunchedFragmentInfo pollFirst = FragmentManager.this.mLaunchedFragments.pollFirst();
             if (pollFirst == null) {
-                Log.w("FragmentManager", "No IntentSenders were started for " + this);
+                Log.w(FragmentManager.TAG, "No IntentSenders were started for " + this);
                 return;
             }
             String str = pollFirst.mWho;
             int i = pollFirst.mRequestCode;
             Fragment findFragmentByWho = FragmentManager.access$200(FragmentManager.this).findFragmentByWho(str);
             if (findFragmentByWho == null) {
-                a.g0("Intent Sender result delivered for unknown Fragment ", str, "FragmentManager");
+                a.g0("Intent Sender result delivered for unknown Fragment ", str, FragmentManager.TAG);
             } else {
                 findFragmentByWho.onActivityResult(i, activityResult.getResultCode(), activityResult.getData());
             }
@@ -161,14 +161,14 @@ public abstract class FragmentManager implements FragmentResultOwner {
             }
             LaunchedFragmentInfo pollFirst = FragmentManager.this.mLaunchedFragments.pollFirst();
             if (pollFirst == null) {
-                Log.w("FragmentManager", "No permissions were requested for " + this);
+                Log.w(FragmentManager.TAG, "No permissions were requested for " + this);
                 return;
             }
             String str = pollFirst.mWho;
             int i2 = pollFirst.mRequestCode;
             Fragment findFragmentByWho = FragmentManager.access$200(FragmentManager.this).findFragmentByWho(str);
             if (findFragmentByWho == null) {
-                a.g0("Permission request result delivered for unknown Fragment ", str, "FragmentManager");
+                a.g0("Permission request result delivered for unknown Fragment ", str, FragmentManager.TAG);
             } else {
                 findFragmentByWho.onRequestPermissionsResult(i2, strArr, iArr);
             }
@@ -300,14 +300,14 @@ public abstract class FragmentManager implements FragmentResultOwner {
         public void onActivityResult(ActivityResult activityResult) {
             LaunchedFragmentInfo pollFirst = FragmentManager.this.mLaunchedFragments.pollFirst();
             if (pollFirst == null) {
-                Log.w("FragmentManager", "No Activities were started for result for " + this);
+                Log.w(FragmentManager.TAG, "No Activities were started for result for " + this);
                 return;
             }
             String str = pollFirst.mWho;
             int i = pollFirst.mRequestCode;
             Fragment findFragmentByWho = FragmentManager.access$200(FragmentManager.this).findFragmentByWho(str);
             if (findFragmentByWho == null) {
-                a.g0("Activity result delivered for unknown Fragment ", str, "FragmentManager");
+                a.g0("Activity result delivered for unknown Fragment ", str, FragmentManager.TAG);
             } else {
                 findFragmentByWho.onActivityResult(i, activityResult.getResultCode(), activityResult.getData());
             }
@@ -341,18 +341,18 @@ public abstract class FragmentManager implements FragmentResultOwner {
         @NonNull
         public Intent createIntent(@NonNull Context context, IntentSenderRequest intentSenderRequest) {
             Bundle bundleExtra;
-            Intent intent = new Intent("androidx.activity.result.contract.action.INTENT_SENDER_REQUEST");
+            Intent intent = new Intent(ActivityResultContracts.StartIntentSenderForResult.ACTION_INTENT_SENDER_REQUEST);
             Intent fillInIntent = intentSenderRequest.getFillInIntent();
-            if (!(fillInIntent == null || (bundleExtra = fillInIntent.getBundleExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE")) == null)) {
-                intent.putExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE", bundleExtra);
-                fillInIntent.removeExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE");
-                if (fillInIntent.getBooleanExtra("androidx.fragment.extra.ACTIVITY_OPTIONS_BUNDLE", false)) {
+            if (!(fillInIntent == null || (bundleExtra = fillInIntent.getBundleExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE)) == null)) {
+                intent.putExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE, bundleExtra);
+                fillInIntent.removeExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE);
+                if (fillInIntent.getBooleanExtra(FragmentManager.EXTRA_CREATED_FILLIN_INTENT, false)) {
                     intentSenderRequest = new IntentSenderRequest.Builder(intentSenderRequest.getIntentSender()).setFillInIntent(null).setFlags(intentSenderRequest.getFlagsValues(), intentSenderRequest.getFlagsMask()).build();
                 }
             }
-            intent.putExtra("androidx.activity.result.contract.extra.INTENT_SENDER_REQUEST", intentSenderRequest);
+            intent.putExtra(ActivityResultContracts.StartIntentSenderForResult.EXTRA_INTENT_SENDER_REQUEST, intentSenderRequest);
             if (FragmentManager.isLoggingEnabled(2)) {
-                Log.v("FragmentManager", "CreateIntent created the following intent: " + intent);
+                Log.v(FragmentManager.TAG, "CreateIntent created the following intent: " + intent);
             }
             return intent;
         }
@@ -1050,7 +1050,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
     }
 
     public static boolean isLoggingEnabled(int i) {
-        return DEBUG || Log.isLoggable("FragmentManager", i);
+        return DEBUG || Log.isLoggable(TAG, i);
     }
 
     private boolean isMenuAvailable(@NonNull Fragment fragment) {
@@ -1164,10 +1164,13 @@ public abstract class FragmentManager implements FragmentResultOwner {
         if (i == 4097) {
             return 8194;
         }
-        if (i != 4099) {
-            return i != 8194 ? 0 : 4097;
+        if (i == 4099) {
+            return FragmentTransaction.TRANSIT_FRAGMENT_FADE;
         }
-        return 4099;
+        if (i != 8194) {
+            return 0;
+        }
+        return FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
     }
 
     private void setVisibleRemovingFragment(@NonNull Fragment fragment) {
@@ -1188,21 +1191,21 @@ public abstract class FragmentManager implements FragmentResultOwner {
     }
 
     private void throwException(RuntimeException runtimeException) {
-        Log.e("FragmentManager", runtimeException.getMessage());
-        Log.e("FragmentManager", "Activity state:");
-        PrintWriter printWriter = new PrintWriter(new LogWriter("FragmentManager"));
+        Log.e(TAG, runtimeException.getMessage());
+        Log.e(TAG, "Activity state:");
+        PrintWriter printWriter = new PrintWriter(new LogWriter(TAG));
         FragmentHostCallback<?> fragmentHostCallback = this.mHost;
         if (fragmentHostCallback != null) {
             try {
                 fragmentHostCallback.onDump("  ", null, printWriter, new String[0]);
             } catch (Exception e) {
-                Log.e("FragmentManager", "Failed dumping state", e);
+                Log.e(TAG, "Failed dumping state", e);
             }
         } else {
             try {
                 dump("  ", null, printWriter, new String[0]);
             } catch (Exception e2) {
-                Log.e("FragmentManager", "Failed dumping state", e2);
+                Log.e(TAG, "Failed dumping state", e2);
             }
         }
         throw runtimeException;
@@ -1240,7 +1243,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
 
     public void addFragment(@NonNull Fragment fragment) {
         if (isLoggingEnabled(2)) {
-            Log.v("FragmentManager", "add: " + fragment);
+            Log.v(TAG, "add: " + fragment);
         }
         FragmentStateManager createOrGetFragmentStateManager = createOrGetFragmentStateManager(fragment);
         fragment.mFragmentManager = this;
@@ -1325,14 +1328,14 @@ public abstract class FragmentManager implements FragmentResultOwner {
 
     public void attachFragment(@NonNull Fragment fragment) {
         if (isLoggingEnabled(2)) {
-            Log.v("FragmentManager", "attach: " + fragment);
+            Log.v(TAG, "attach: " + fragment);
         }
         if (fragment.mDetached) {
             fragment.mDetached = false;
             if (!fragment.mAdded) {
                 this.mFragmentStore.addFragment(fragment);
                 if (isLoggingEnabled(2)) {
-                    Log.v("FragmentManager", "add from attach: " + fragment);
+                    Log.v(TAG, "add from attach: " + fragment);
                 }
                 if (isMenuAvailable(fragment)) {
                     this.mNeedMenuInvalidate = true;
@@ -1419,13 +1422,13 @@ public abstract class FragmentManager implements FragmentResultOwner {
 
     public void detachFragment(@NonNull Fragment fragment) {
         if (isLoggingEnabled(2)) {
-            Log.v("FragmentManager", "detach: " + fragment);
+            Log.v(TAG, "detach: " + fragment);
         }
         if (!fragment.mDetached) {
             fragment.mDetached = true;
             if (fragment.mAdded) {
                 if (isLoggingEnabled(2)) {
-                    Log.v("FragmentManager", "remove from detach: " + fragment);
+                    Log.v(TAG, "remove from detach: " + fragment);
                 }
                 this.mFragmentStore.removeFragment(fragment);
                 if (isMenuAvailable(fragment)) {
@@ -1897,7 +1900,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
 
     public void hideFragment(@NonNull Fragment fragment) {
         if (isLoggingEnabled(2)) {
-            Log.v("FragmentManager", "hide: " + fragment);
+            Log.v(TAG, "hide: " + fragment);
         }
         if (!fragment.mHidden) {
             fragment.mHidden = true;
@@ -1946,7 +1949,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
         if (this.mStartActivityForResult != null) {
             this.mLaunchedFragments.addLast(new LaunchedFragmentInfo(fragment.mWho, i));
             if (!(intent == null || bundle == null)) {
-                intent.putExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE", bundle);
+                intent.putExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE, bundle);
             }
             this.mStartActivityForResult.launch(intent);
             return;
@@ -1960,21 +1963,21 @@ public abstract class FragmentManager implements FragmentResultOwner {
             if (bundle != null) {
                 if (intent == null) {
                     intent2 = new Intent();
-                    intent2.putExtra("androidx.fragment.extra.ACTIVITY_OPTIONS_BUNDLE", true);
+                    intent2.putExtra(EXTRA_CREATED_FILLIN_INTENT, true);
                 } else {
                     intent2 = intent;
                 }
                 if (isLoggingEnabled(2)) {
-                    Log.v("FragmentManager", "ActivityOptions " + bundle + " were added to fillInIntent " + intent2 + " for fragment " + fragment);
+                    Log.v(TAG, "ActivityOptions " + bundle + " were added to fillInIntent " + intent2 + " for fragment " + fragment);
                 }
-                intent2.putExtra("androidx.activity.result.contract.extra.ACTIVITY_OPTIONS_BUNDLE", bundle);
+                intent2.putExtra(ActivityResultContracts.StartActivityForResult.EXTRA_ACTIVITY_OPTIONS_BUNDLE, bundle);
             } else {
                 intent2 = intent;
             }
             IntentSenderRequest build = new IntentSenderRequest.Builder(intentSender).setFillInIntent(intent2).setFlags(i3, i2).build();
             this.mLaunchedFragments.addLast(new LaunchedFragmentInfo(fragment.mWho, i));
             if (isLoggingEnabled(2)) {
-                Log.v("FragmentManager", "Fragment " + fragment + "is launching an IntentSender for result ");
+                Log.v(TAG, "Fragment " + fragment + "is launching an IntentSender for result ");
             }
             this.mStartIntentSenderForResult.launch(build);
             return;
@@ -2008,7 +2011,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
                 completeShowHideFragment(fragment);
             }
         } else if (isLoggingEnabled(3)) {
-            Log.d("FragmentManager", "Ignoring moving " + fragment + " to state " + this.mCurState + "since it is not added to " + this);
+            Log.d(TAG, "Ignoring moving " + fragment + " to state " + this.mCurState + "since it is not added to " + this);
         }
     }
 
@@ -2141,7 +2144,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
                         }
                         if (min < 4) {
                             if (isLoggingEnabled(3)) {
-                                Log.d("FragmentManager", "movefrom ACTIVITY_CREATED: " + fragment);
+                                Log.d(TAG, "movefrom ACTIVITY_CREATED: " + fragment);
                             }
                             if (fragment.mView != null && this.mHost.onShouldSaveFragmentState(fragment) && fragment.mSavedViewState == null) {
                                 fragmentStateManager.saveViewState();
@@ -2166,7 +2169,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
                                 }
                                 viewGroup2.removeView(view2);
                                 if (isLoggingEnabled(2)) {
-                                    Log.v("FragmentManager", "Removing view " + view2 + " for fragment " + fragment + " from container " + viewGroup2);
+                                    Log.v(TAG, "Removing view " + view2 + " for fragment " + fragment + " from container " + viewGroup2);
                                 }
                                 if (viewGroup2 != fragment.mContainer) {
                                     return;
@@ -2195,7 +2198,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
         }
         if (fragment.mState != min) {
             if (isLoggingEnabled(3)) {
-                Log.d("FragmentManager", "moveToState: Fragment state for " + fragment + " not updated inline; expected state " + min + " found " + fragment.mState);
+                Log.d(TAG, "moveToState: Fragment state for " + fragment + " not updated inline; expected state " + min + " found " + fragment.mState);
             }
             fragment.mState = min;
         }
@@ -2348,7 +2351,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
 
     public void removeFragment(@NonNull Fragment fragment) {
         if (isLoggingEnabled(2)) {
-            Log.v("FragmentManager", "remove: " + fragment + " nesting=" + fragment.mBackStackNesting);
+            Log.v(TAG, "remove: " + fragment + " nesting=" + fragment.mBackStackNesting);
         }
         boolean z2 = !fragment.isInBackStack();
         if (!fragment.mDetached || z2) {
@@ -2397,7 +2400,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
                         Fragment findRetainedFragmentByWho = this.mNonConfig.findRetainedFragmentByWho(next.mWho);
                         if (findRetainedFragmentByWho != null) {
                             if (isLoggingEnabled(2)) {
-                                Log.v("FragmentManager", "restoreSaveState: re-attaching retained " + findRetainedFragmentByWho);
+                                Log.v(TAG, "restoreSaveState: re-attaching retained " + findRetainedFragmentByWho);
                             }
                             fragmentStateManager = new FragmentStateManager(this.mLifecycleCallbacksDispatcher, this.mFragmentStore, findRetainedFragmentByWho, next);
                         } else {
@@ -2410,7 +2413,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
                             K.append(fragment.mWho);
                             K.append("): ");
                             K.append(fragment);
-                            Log.v("FragmentManager", K.toString());
+                            Log.v(TAG, K.toString());
                         }
                         fragmentStateManager.restoreState(this.mHost.getContext().getClassLoader());
                         this.mFragmentStore.makeActive(fragmentStateManager);
@@ -2420,7 +2423,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
                 for (Fragment fragment2 : this.mNonConfig.getRetainedFragments()) {
                     if (!this.mFragmentStore.containsActiveFragment(fragment2.mWho)) {
                         if (isLoggingEnabled(2)) {
-                            Log.v("FragmentManager", "Discarding retained Fragment " + fragment2 + " that was not found in the set of active Fragments " + fragmentManagerState.mActive);
+                            Log.v(TAG, "Discarding retained Fragment " + fragment2 + " that was not found in the set of active Fragments " + fragmentManagerState.mActive);
                         }
                         this.mNonConfig.removeRetainedFragment(fragment2);
                         fragment2.mFragmentManager = this;
@@ -2446,8 +2449,8 @@ public abstract class FragmentManager implements FragmentResultOwner {
                             L.append(instantiate.mIndex);
                             L.append("): ");
                             L.append(instantiate);
-                            Log.v("FragmentManager", L.toString());
-                            PrintWriter printWriter = new PrintWriter(new LogWriter("FragmentManager"));
+                            Log.v(TAG, L.toString());
+                            PrintWriter printWriter = new PrintWriter(new LogWriter(TAG));
                             instantiate.dump("  ", printWriter, false);
                             printWriter.close();
                         }
@@ -2494,7 +2497,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
         BackStackState[] backStackStateArr = null;
         if (saveActiveFragments.isEmpty()) {
             if (isLoggingEnabled(2)) {
-                Log.v("FragmentManager", "saveAllState: no fragments!");
+                Log.v(TAG, "saveAllState: no fragments!");
             }
             return null;
         }
@@ -2507,7 +2510,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
                 if (isLoggingEnabled(2)) {
                     StringBuilder L = a.L("saveAllState: adding back stack #", i, ": ");
                     L.append(this.mBackStack.get(i));
-                    Log.v("FragmentManager", L.toString());
+                    Log.v(TAG, L.toString());
                 }
             }
         }
@@ -2610,7 +2613,7 @@ public abstract class FragmentManager implements FragmentResultOwner {
 
     public void showFragment(@NonNull Fragment fragment) {
         if (isLoggingEnabled(2)) {
-            Log.v("FragmentManager", "show: " + fragment);
+            Log.v(TAG, "show: " + fragment);
         }
         if (fragment.mHidden) {
             fragment.mHidden = false;
diff --git a/app/src/main/java/androidx/fragment/app/FragmentStateManager.java b/app/src/main/java/androidx/fragment/app/FragmentStateManager.java
index a2a751a042..8214c392b8 100644
--- a/app/src/main/java/androidx/fragment/app/FragmentStateManager.java
+++ b/app/src/main/java/androidx/fragment/app/FragmentStateManager.java
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.os.EnvironmentCompat;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.R;
 import androidx.fragment.app.Fragment;
@@ -163,19 +164,19 @@ public class FragmentStateManager {
             if (bundle == null) {
                 bundle = new Bundle();
             }
-            bundle.putSparseParcelableArray("android:view_state", this.mFragment.mSavedViewState);
+            bundle.putSparseParcelableArray(VIEW_STATE_TAG, this.mFragment.mSavedViewState);
         }
         if (this.mFragment.mSavedViewRegistryState != null) {
             if (bundle == null) {
                 bundle = new Bundle();
             }
-            bundle.putBundle("android:view_registry_state", this.mFragment.mSavedViewRegistryState);
+            bundle.putBundle(VIEW_REGISTRY_STATE_TAG, this.mFragment.mSavedViewRegistryState);
         }
         if (!this.mFragment.mUserVisibleHint) {
             if (bundle == null) {
                 bundle = new Bundle();
             }
-            bundle.putBoolean("android:user_visible_hint", this.mFragment.mUserVisibleHint);
+            bundle.putBoolean(USER_VISIBLE_HINT_TAG, this.mFragment.mUserVisibleHint);
         }
         return bundle;
     }
@@ -349,7 +350,7 @@ public class FragmentStateManager {
                                 try {
                                     str = fragment3.getResources().getResourceName(this.mFragment.mContainerId);
                                 } catch (Resources.NotFoundException unused) {
-                                    str = "unknown";
+                                    str = EnvironmentCompat.MEDIA_UNKNOWN;
                                 }
                                 StringBuilder K2 = a.K("No view found for id 0x");
                                 K2.append(Integer.toHexString(this.mFragment.mContainerId));
@@ -679,14 +680,14 @@ public class FragmentStateManager {
         if (bundle != null) {
             bundle.setClassLoader(classLoader);
             Fragment fragment = this.mFragment;
-            fragment.mSavedViewState = fragment.mSavedFragmentState.getSparseParcelableArray("android:view_state");
+            fragment.mSavedViewState = fragment.mSavedFragmentState.getSparseParcelableArray(VIEW_STATE_TAG);
             Fragment fragment2 = this.mFragment;
-            fragment2.mSavedViewRegistryState = fragment2.mSavedFragmentState.getBundle("android:view_registry_state");
+            fragment2.mSavedViewRegistryState = fragment2.mSavedFragmentState.getBundle(VIEW_REGISTRY_STATE_TAG);
             Fragment fragment3 = this.mFragment;
-            fragment3.mTargetWho = fragment3.mSavedFragmentState.getString("android:target_state");
+            fragment3.mTargetWho = fragment3.mSavedFragmentState.getString(TARGET_STATE_TAG);
             Fragment fragment4 = this.mFragment;
             if (fragment4.mTargetWho != null) {
-                fragment4.mTargetRequestCode = fragment4.mSavedFragmentState.getInt("android:target_req_state", 0);
+                fragment4.mTargetRequestCode = fragment4.mSavedFragmentState.getInt(TARGET_REQUEST_CODE_STATE_TAG, 0);
             }
             Fragment fragment5 = this.mFragment;
             Boolean bool = fragment5.mSavedUserVisibleHint;
@@ -694,7 +695,7 @@ public class FragmentStateManager {
                 fragment5.mUserVisibleHint = bool.booleanValue();
                 this.mFragment.mSavedUserVisibleHint = null;
             } else {
-                fragment5.mUserVisibleHint = fragment5.mSavedFragmentState.getBoolean("android:user_visible_hint", true);
+                fragment5.mUserVisibleHint = fragment5.mSavedFragmentState.getBoolean(USER_VISIBLE_HINT_TAG, true);
             }
             Fragment fragment6 = this.mFragment;
             if (!fragment6.mUserVisibleHint) {
@@ -756,10 +757,10 @@ public class FragmentStateManager {
                 if (saveBasicState == null) {
                     fragmentState.mSavedFragmentState = new Bundle();
                 }
-                fragmentState.mSavedFragmentState.putString("android:target_state", this.mFragment.mTargetWho);
+                fragmentState.mSavedFragmentState.putString(TARGET_STATE_TAG, this.mFragment.mTargetWho);
                 int i = this.mFragment.mTargetRequestCode;
                 if (i != 0) {
-                    fragmentState.mSavedFragmentState.putInt("android:target_req_state", i);
+                    fragmentState.mSavedFragmentState.putInt(TARGET_REQUEST_CODE_STATE_TAG, i);
                 }
             }
         }
diff --git a/app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapter.java b/app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapter.java
index 75f9068c16..c846f90057 100644
--- a/app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapter.java
+++ b/app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapter.java
@@ -138,7 +138,7 @@ public abstract class FragmentStatePagerAdapter extends PagerAdapter {
                         fragment.setMenuVisibility(false);
                         this.mFragments.set(parseInt, fragment);
                     } else {
-                        a.g0("Bad fragment at key ", str, "FragmentStatePagerAdapt");
+                        a.g0("Bad fragment at key ", str, TAG);
                     }
                 }
             }
diff --git a/app/src/main/java/androidx/fragment/app/ListFragment.java b/app/src/main/java/androidx/fragment/app/ListFragment.java
index e5ffa34e27..72164205d1 100644
--- a/app/src/main/java/androidx/fragment/app/ListFragment.java
+++ b/app/src/main/java/androidx/fragment/app/ListFragment.java
@@ -62,15 +62,15 @@ public class ListFragment extends Fragment {
                 if (view instanceof ListView) {
                     this.mList = (ListView) view;
                 } else {
-                    TextView textView = (TextView) view.findViewById(16711681);
+                    TextView textView = (TextView) view.findViewById(INTERNAL_EMPTY_ID);
                     this.mStandardEmptyView = textView;
                     if (textView == null) {
                         this.mEmptyView = view.findViewById(16908292);
                     } else {
                         textView.setVisibility(8);
                     }
-                    this.mProgressContainer = view.findViewById(16711682);
-                    this.mListContainer = view.findViewById(16711683);
+                    this.mProgressContainer = view.findViewById(INTERNAL_PROGRESS_CONTAINER_ID);
+                    this.mListContainer = view.findViewById(INTERNAL_LIST_CONTAINER_ID);
                     View findViewById = view.findViewById(16908298);
                     if (findViewById instanceof ListView) {
                         ListView listView = (ListView) findViewById;
@@ -165,16 +165,16 @@ public class ListFragment extends Fragment {
         Context requireContext = requireContext();
         FrameLayout frameLayout = new FrameLayout(requireContext);
         LinearLayout linearLayout = new LinearLayout(requireContext);
-        linearLayout.setId(16711682);
+        linearLayout.setId(INTERNAL_PROGRESS_CONTAINER_ID);
         linearLayout.setOrientation(1);
         linearLayout.setVisibility(8);
         linearLayout.setGravity(17);
         linearLayout.addView(new ProgressBar(requireContext, null, 16842874), new FrameLayout.LayoutParams(-2, -2));
         frameLayout.addView(linearLayout, new FrameLayout.LayoutParams(-1, -1));
         FrameLayout frameLayout2 = new FrameLayout(requireContext);
-        frameLayout2.setId(16711683);
+        frameLayout2.setId(INTERNAL_LIST_CONTAINER_ID);
         TextView textView = new TextView(requireContext);
-        textView.setId(16711681);
+        textView.setId(INTERNAL_EMPTY_ID);
         textView.setGravity(17);
         frameLayout2.addView(textView, new FrameLayout.LayoutParams(-1, -1));
         ListView listView = new ListView(requireContext);
diff --git a/app/src/main/java/androidx/fragment/app/SpecialEffectsController.java b/app/src/main/java/androidx/fragment/app/SpecialEffectsController.java
index 822cc7a695..bdeaaca836 100644
--- a/app/src/main/java/androidx/fragment/app/SpecialEffectsController.java
+++ b/app/src/main/java/androidx/fragment/app/SpecialEffectsController.java
@@ -117,7 +117,7 @@ public abstract class SpecialEffectsController {
             if (findFocus != null) {
                 fragment.setFocusedView(findFocus);
                 if (FragmentManager.isLoggingEnabled(2)) {
-                    Log.v("FragmentManager", "requestFocus: Saved focused view " + findFocus + " for Fragment " + fragment);
+                    Log.v(FragmentManager.TAG, "requestFocus: Saved focused view " + findFocus + " for Fragment " + fragment);
                 }
             }
             if (getLifecycleImpact() == Operation.LifecycleImpact.ADDING) {
@@ -196,23 +196,23 @@ public abstract class SpecialEffectsController {
                     ViewGroup viewGroup = (ViewGroup) view.getParent();
                     if (viewGroup != null) {
                         if (FragmentManager.isLoggingEnabled(2)) {
-                            Log.v("FragmentManager", "SpecialEffectsController: Removing view " + view + " from container " + viewGroup);
+                            Log.v(FragmentManager.TAG, "SpecialEffectsController: Removing view " + view + " from container " + viewGroup);
                         }
                         viewGroup.removeView(view);
                     }
                 } else if (ordinal == 1) {
                     if (FragmentManager.isLoggingEnabled(2)) {
-                        Log.v("FragmentManager", "SpecialEffectsController: Setting view " + view + " to VISIBLE");
+                        Log.v(FragmentManager.TAG, "SpecialEffectsController: Setting view " + view + " to VISIBLE");
                     }
                     view.setVisibility(0);
                 } else if (ordinal == 2) {
                     if (FragmentManager.isLoggingEnabled(2)) {
-                        Log.v("FragmentManager", "SpecialEffectsController: Setting view " + view + " to GONE");
+                        Log.v(FragmentManager.TAG, "SpecialEffectsController: Setting view " + view + " to GONE");
                     }
                     view.setVisibility(8);
                 } else if (ordinal == 3) {
                     if (FragmentManager.isLoggingEnabled(2)) {
-                        Log.v("FragmentManager", "SpecialEffectsController: Setting view " + view + " to INVISIBLE");
+                        Log.v(FragmentManager.TAG, "SpecialEffectsController: Setting view " + view + " to INVISIBLE");
                     }
                     view.setVisibility(4);
                 }
@@ -248,7 +248,7 @@ public abstract class SpecialEffectsController {
         public void complete() {
             if (!this.mIsComplete) {
                 if (FragmentManager.isLoggingEnabled(2)) {
-                    Log.v("FragmentManager", "SpecialEffectsController: " + this + " has called complete.");
+                    Log.v(FragmentManager.TAG, "SpecialEffectsController: " + this + " has called complete.");
                 }
                 this.mIsComplete = true;
                 for (Runnable runnable : this.mCompletionListeners) {
@@ -304,7 +304,7 @@ public abstract class SpecialEffectsController {
                             K.append(" -> REMOVED. mLifecycleImpact  = ");
                             K.append(this.mLifecycleImpact);
                             K.append(" to REMOVING.");
-                            Log.v("FragmentManager", K.toString());
+                            Log.v(FragmentManager.TAG, K.toString());
                         }
                         this.mFinalState = State.REMOVED;
                         this.mLifecycleImpact = LifecycleImpact.REMOVING;
@@ -316,7 +316,7 @@ public abstract class SpecialEffectsController {
                         K2.append(" mFinalState = REMOVED -> VISIBLE. mLifecycleImpact = ");
                         K2.append(this.mLifecycleImpact);
                         K2.append(" to ADDING.");
-                        Log.v("FragmentManager", K2.toString());
+                        Log.v(FragmentManager.TAG, K2.toString());
                     }
                     this.mFinalState = State.VISIBLE;
                     this.mLifecycleImpact = LifecycleImpact.ADDING;
@@ -330,7 +330,7 @@ public abstract class SpecialEffectsController {
                     K3.append(" -> ");
                     K3.append(state);
                     K3.append(". ");
-                    Log.v("FragmentManager", K3.toString());
+                    Log.v(FragmentManager.TAG, K3.toString());
                 }
                 this.mFinalState = state;
             }
@@ -434,7 +434,7 @@ public abstract class SpecialEffectsController {
         if (FragmentManager.isLoggingEnabled(2)) {
             StringBuilder K = a.K("SpecialEffectsController: Enqueuing add operation for fragment ");
             K.append(fragmentStateManager.getFragment());
-            Log.v("FragmentManager", K.toString());
+            Log.v(FragmentManager.TAG, K.toString());
         }
         enqueue(state, Operation.LifecycleImpact.ADDING, fragmentStateManager);
     }
@@ -443,7 +443,7 @@ public abstract class SpecialEffectsController {
         if (FragmentManager.isLoggingEnabled(2)) {
             StringBuilder K = a.K("SpecialEffectsController: Enqueuing hide operation for fragment ");
             K.append(fragmentStateManager.getFragment());
-            Log.v("FragmentManager", K.toString());
+            Log.v(FragmentManager.TAG, K.toString());
         }
         enqueue(Operation.State.GONE, Operation.LifecycleImpact.NONE, fragmentStateManager);
     }
@@ -452,7 +452,7 @@ public abstract class SpecialEffectsController {
         if (FragmentManager.isLoggingEnabled(2)) {
             StringBuilder K = a.K("SpecialEffectsController: Enqueuing remove operation for fragment ");
             K.append(fragmentStateManager.getFragment());
-            Log.v("FragmentManager", K.toString());
+            Log.v(FragmentManager.TAG, K.toString());
         }
         enqueue(Operation.State.REMOVED, Operation.LifecycleImpact.REMOVING, fragmentStateManager);
     }
@@ -461,7 +461,7 @@ public abstract class SpecialEffectsController {
         if (FragmentManager.isLoggingEnabled(2)) {
             StringBuilder K = a.K("SpecialEffectsController: Enqueuing show operation for fragment ");
             K.append(fragmentStateManager.getFragment());
-            Log.v("FragmentManager", K.toString());
+            Log.v(FragmentManager.TAG, K.toString());
         }
         enqueue(Operation.State.VISIBLE, Operation.LifecycleImpact.NONE, fragmentStateManager);
     }
@@ -483,7 +483,7 @@ public abstract class SpecialEffectsController {
                     while (it.hasNext()) {
                         Operation operation = (Operation) it.next();
                         if (FragmentManager.isLoggingEnabled(2)) {
-                            Log.v("FragmentManager", "SpecialEffectsController: Cancelling operation " + operation);
+                            Log.v(FragmentManager.TAG, "SpecialEffectsController: Cancelling operation " + operation);
                         }
                         operation.cancel();
                         if (!operation.isComplete()) {
@@ -529,7 +529,7 @@ public abstract class SpecialEffectsController {
                     sb.append(str2);
                     sb.append("Cancelling running operation ");
                     sb.append(operation);
-                    Log.v("FragmentManager", sb.toString());
+                    Log.v(FragmentManager.TAG, sb.toString());
                 }
                 operation.cancel();
             }
@@ -547,7 +547,7 @@ public abstract class SpecialEffectsController {
                     sb2.append(str);
                     sb2.append("Cancelling pending operation ");
                     sb2.append(operation2);
-                    Log.v("FragmentManager", sb2.toString());
+                    Log.v(FragmentManager.TAG, sb2.toString());
                 }
                 operation2.cancel();
             }
diff --git a/app/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java b/app/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
index 965f08c747..3a27edda3f 100644
--- a/app/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
+++ b/app/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
@@ -18,6 +18,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import java.lang.reflect.Method;
@@ -66,12 +67,12 @@ public class ActionBarDrawerToggle implements DrawerLayout.DrawerListener {
                 this.mSetHomeAsUpIndicator = ActionBar.class.getDeclaredMethod("setHomeAsUpIndicator", Drawable.class);
                 this.mSetHomeActionContentDescription = ActionBar.class.getDeclaredMethod("setHomeActionContentDescription", Integer.TYPE);
             } catch (NoSuchMethodException unused) {
-                View findViewById = activity.findViewById(16908332);
+                View findViewById = activity.findViewById(ActionBarDrawerToggle.ID_HOME);
                 if (findViewById != null) {
                     ViewGroup viewGroup = (ViewGroup) findViewById.getParent();
                     if (viewGroup.getChildCount() == 2) {
                         View childAt = viewGroup.getChildAt(0);
-                        childAt = childAt.getId() == 16908332 ? viewGroup.getChildAt(1) : childAt;
+                        childAt = childAt.getId() == ActionBarDrawerToggle.ID_HOME ? viewGroup.getChildAt(1) : childAt;
                         if (childAt instanceof ImageView) {
                             this.mUpIndicatorView = (ImageView) childAt;
                         }
@@ -145,7 +146,7 @@ public class ActionBarDrawerToggle implements DrawerLayout.DrawerListener {
         this.mDrawerImage = ContextCompat.getDrawable(activity, i);
         SlideDrawable slideDrawable = new SlideDrawable(this.mDrawerImage);
         this.mSlider = slideDrawable;
-        slideDrawable.setOffset(z2 ? 0.33333334f : 0.0f);
+        slideDrawable.setOffset(z2 ? TOGGLE_DRAWABLE_OFFSET : 0.0f);
     }
 
     private static boolean assumeMaterial(Context context) {
@@ -228,21 +229,21 @@ public class ActionBarDrawerToggle implements DrawerLayout.DrawerListener {
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem == null || menuItem.getItemId() != 16908332 || !this.mDrawerIndicatorEnabled) {
+        if (menuItem == null || menuItem.getItemId() != ID_HOME || !this.mDrawerIndicatorEnabled) {
             return false;
         }
-        if (this.mDrawerLayout.isDrawerVisible(8388611)) {
-            this.mDrawerLayout.closeDrawer(8388611);
+        if (this.mDrawerLayout.isDrawerVisible(GravityCompat.START)) {
+            this.mDrawerLayout.closeDrawer(GravityCompat.START);
             return true;
         }
-        this.mDrawerLayout.openDrawer(8388611);
+        this.mDrawerLayout.openDrawer(GravityCompat.START);
         return true;
     }
 
     public void setDrawerIndicatorEnabled(boolean z2) {
         if (z2 != this.mDrawerIndicatorEnabled) {
             if (z2) {
-                setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(8388611) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
+                setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(GravityCompat.START) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
             } else {
                 setActionBarUpIndicator(this.mHomeAsUpIndicator, 0);
             }
@@ -268,13 +269,13 @@ public class ActionBarDrawerToggle implements DrawerLayout.DrawerListener {
     }
 
     public void syncState() {
-        if (this.mDrawerLayout.isDrawerOpen(8388611)) {
+        if (this.mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
             this.mSlider.setPosition(1.0f);
         } else {
             this.mSlider.setPosition(0.0f);
         }
         if (this.mDrawerIndicatorEnabled) {
-            setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(8388611) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
+            setActionBarUpIndicator(this.mSlider, this.mDrawerLayout.isDrawerOpen(GravityCompat.START) ? this.mCloseDrawerContentDescRes : this.mOpenDrawerContentDescRes);
         }
     }
 }
diff --git a/app/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java b/app/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java
index efd548e770..f6da617976 100644
--- a/app/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java
+++ b/app/src/main/java/androidx/legacy/content/WakefulBroadcastReceiver.java
@@ -14,7 +14,7 @@ public abstract class WakefulBroadcastReceiver extends BroadcastReceiver {
     private static final SparseArray<PowerManager.WakeLock> sActiveWakeLocks = new SparseArray<>();
 
     public static boolean completeWakefulIntent(Intent intent) {
-        int intExtra = intent.getIntExtra("androidx.contentpager.content.wakelockid", 0);
+        int intExtra = intent.getIntExtra(EXTRA_WAKE_LOCK_ID, 0);
         if (intExtra == 0) {
             return false;
         }
@@ -40,7 +40,7 @@ public abstract class WakefulBroadcastReceiver extends BroadcastReceiver {
             if (i2 <= 0) {
                 mNextId = 1;
             }
-            intent.putExtra("androidx.contentpager.content.wakelockid", i);
+            intent.putExtra(EXTRA_WAKE_LOCK_ID, i);
             ComponentName startService = context.startService(intent);
             if (startService == null) {
                 return null;
diff --git a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java
index 574ac23ca9..74bf821e85 100644
--- a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java
+++ b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java
@@ -1,5 +1,6 @@
 package androidx.lifecycle;
 
+import androidx.core.app.NotificationCompat;
 import androidx.lifecycle.Lifecycle;
 import c.q.a.k.a;
 import d0.z.d.m;
@@ -35,7 +36,7 @@ public final class LifecycleCoroutineScopeImpl extends LifecycleCoroutineScope i
     @Override // androidx.lifecycle.LifecycleEventObserver
     public void onStateChanged(LifecycleOwner lifecycleOwner, Lifecycle.Event event) {
         m.checkNotNullParameter(lifecycleOwner, "source");
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (getLifecycle$lifecycle_runtime_ktx_release().getCurrentState().compareTo(Lifecycle.State.DESTROYED) <= 0) {
             getLifecycle$lifecycle_runtime_ktx_release().removeObserver(this);
             a.j(getCoroutineContext(), null, 1, null);
diff --git a/app/src/main/java/androidx/lifecycle/ReportFragment.java b/app/src/main/java/androidx/lifecycle/ReportFragment.java
index 43e41cd0bf..013a4653f2 100644
--- a/app/src/main/java/androidx/lifecycle/ReportFragment.java
+++ b/app/src/main/java/androidx/lifecycle/ReportFragment.java
@@ -125,7 +125,7 @@ public class ReportFragment extends Fragment {
     }
 
     public static ReportFragment get(Activity activity) {
-        return (ReportFragment) activity.getFragmentManager().findFragmentByTag("androidx.lifecycle.LifecycleDispatcher.report_fragment_tag");
+        return (ReportFragment) activity.getFragmentManager().findFragmentByTag(REPORT_FRAGMENT_TAG);
     }
 
     public static void injectIfNeededIn(Activity activity) {
@@ -133,8 +133,8 @@ public class ReportFragment extends Fragment {
             LifecycleCallbacks.registerIn(activity);
         }
         FragmentManager fragmentManager = activity.getFragmentManager();
-        if (fragmentManager.findFragmentByTag("androidx.lifecycle.LifecycleDispatcher.report_fragment_tag") == null) {
-            fragmentManager.beginTransaction().add(new ReportFragment(), "androidx.lifecycle.LifecycleDispatcher.report_fragment_tag").commit();
+        if (fragmentManager.findFragmentByTag(REPORT_FRAGMENT_TAG) == null) {
+            fragmentManager.beginTransaction().add(new ReportFragment(), REPORT_FRAGMENT_TAG).commit();
             fragmentManager.executePendingTransactions();
         }
     }
diff --git a/app/src/main/java/androidx/lifecycle/SavedStateHandle.java b/app/src/main/java/androidx/lifecycle/SavedStateHandle.java
index 380d54a3c0..b0c7ca44e4 100644
--- a/app/src/main/java/androidx/lifecycle/SavedStateHandle.java
+++ b/app/src/main/java/androidx/lifecycle/SavedStateHandle.java
@@ -46,8 +46,8 @@ public final class SavedStateHandle {
                 arrayList2.add(SavedStateHandle.this.mRegular.get(str));
             }
             Bundle bundle = new Bundle();
-            bundle.putParcelableArrayList("keys", arrayList);
-            bundle.putParcelableArrayList("values", arrayList2);
+            bundle.putParcelableArrayList(SavedStateHandle.KEYS, arrayList);
+            bundle.putParcelableArrayList(SavedStateHandle.VALUES, arrayList2);
             return bundle;
         }
     }
@@ -108,8 +108,8 @@ public final class SavedStateHandle {
         if (bundle == null) {
             return new SavedStateHandle(hashMap);
         }
-        ArrayList parcelableArrayList = bundle.getParcelableArrayList("keys");
-        ArrayList parcelableArrayList2 = bundle.getParcelableArrayList("values");
+        ArrayList parcelableArrayList = bundle.getParcelableArrayList(KEYS);
+        ArrayList parcelableArrayList2 = bundle.getParcelableArrayList(VALUES);
         if (parcelableArrayList == null || parcelableArrayList2 == null || parcelableArrayList.size() != parcelableArrayList2.size()) {
             throw new IllegalStateException("Invalid bundle passed as restored state");
         }
diff --git a/app/src/main/java/androidx/lifecycle/ViewModelKt.java b/app/src/main/java/androidx/lifecycle/ViewModelKt.java
index f955779d4c..7b78526f55 100644
--- a/app/src/main/java/androidx/lifecycle/ViewModelKt.java
+++ b/app/src/main/java/androidx/lifecycle/ViewModelKt.java
@@ -15,13 +15,13 @@ public final class ViewModelKt {
 
     public static final CoroutineScope getViewModelScope(ViewModel viewModel) {
         m.checkNotNullParameter(viewModel, "$this$viewModelScope");
-        CoroutineScope coroutineScope = (CoroutineScope) viewModel.getTag("androidx.lifecycle.ViewModelCoroutineScope.JOB_KEY");
+        CoroutineScope coroutineScope = (CoroutineScope) viewModel.getTag(JOB_KEY);
         if (coroutineScope != null) {
             return coroutineScope;
         }
         t b = a.b(null, 1);
         CoroutineDispatcher coroutineDispatcher = j0.a;
-        Object tagIfAbsent = viewModel.setTagIfAbsent("androidx.lifecycle.ViewModelCoroutineScope.JOB_KEY", new CloseableCoroutineScope(CoroutineContext.Element.a.plus((g1) b, n.b.H())));
+        Object tagIfAbsent = viewModel.setTagIfAbsent(JOB_KEY, new CloseableCoroutineScope(CoroutineContext.Element.a.plus((g1) b, n.b.H())));
         m.checkNotNullExpressionValue(tagIfAbsent, "setTagIfAbsent(\n        …Main.immediate)\n        )");
         return (CoroutineScope) tagIfAbsent;
     }
diff --git a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java
index ebe0326499..540f7e0971 100644
--- a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java
+++ b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java
@@ -1,5 +1,6 @@
 package androidx.lifecycle;
 
+import androidx.core.app.NotificationCompat;
 import androidx.lifecycle.Lifecycle;
 import d0.k;
 import d0.l;
@@ -29,7 +30,7 @@ public final class WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inline
     public void onStateChanged(LifecycleOwner lifecycleOwner, Lifecycle.Event event) {
         Object obj;
         m.checkNotNullParameter(lifecycleOwner, "source");
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (event == Lifecycle.Event.upTo(this.$state$inlined)) {
             this.$this_suspendWithStateAtLeastUnchecked$inlined.removeObserver(this);
             CancellableContinuation cancellableContinuation = this.$co;
diff --git a/app/src/main/java/androidx/loader/app/LoaderManagerImpl.java b/app/src/main/java/androidx/loader/app/LoaderManagerImpl.java
index cfac047bcf..fc39609430 100644
--- a/app/src/main/java/androidx/loader/app/LoaderManagerImpl.java
+++ b/app/src/main/java/androidx/loader/app/LoaderManagerImpl.java
@@ -49,7 +49,7 @@ public class LoaderManagerImpl extends LoaderManager {
         @MainThread
         public Loader<D> destroy(boolean z2) {
             if (LoaderManagerImpl.DEBUG) {
-                Log.v("LoaderManager", "  Destroying: " + this);
+                Log.v(LoaderManagerImpl.TAG, "  Destroying: " + this);
             }
             this.mLoader.cancelLoad();
             this.mLoader.abandon();
@@ -115,7 +115,7 @@ public class LoaderManagerImpl extends LoaderManager {
         @Override // androidx.lifecycle.LiveData
         public void onActive() {
             if (LoaderManagerImpl.DEBUG) {
-                Log.v("LoaderManager", "  Starting: " + this);
+                Log.v(LoaderManagerImpl.TAG, "  Starting: " + this);
             }
             this.mLoader.startLoading();
         }
@@ -123,7 +123,7 @@ public class LoaderManagerImpl extends LoaderManager {
         @Override // androidx.lifecycle.LiveData
         public void onInactive() {
             if (LoaderManagerImpl.DEBUG) {
-                Log.v("LoaderManager", "  Stopping: " + this);
+                Log.v(LoaderManagerImpl.TAG, "  Stopping: " + this);
             }
             this.mLoader.stopLoading();
         }
@@ -131,14 +131,14 @@ public class LoaderManagerImpl extends LoaderManager {
         @Override // androidx.loader.content.Loader.OnLoadCompleteListener
         public void onLoadComplete(@NonNull Loader<D> loader, @Nullable D d) {
             if (LoaderManagerImpl.DEBUG) {
-                Log.v("LoaderManager", "onLoadComplete: " + this);
+                Log.v(LoaderManagerImpl.TAG, "onLoadComplete: " + this);
             }
             if (Looper.myLooper() == Looper.getMainLooper()) {
                 setValue(d);
                 return;
             }
             if (LoaderManagerImpl.DEBUG) {
-                Log.w("LoaderManager", "onLoadComplete was incorrectly called on a background thread");
+                Log.w(LoaderManagerImpl.TAG, "onLoadComplete was incorrectly called on a background thread");
             }
             postValue(d);
         }
@@ -218,7 +218,7 @@ public class LoaderManagerImpl extends LoaderManager {
                 K.append(this.mLoader);
                 K.append(": ");
                 K.append(this.mLoader.dataToString(d));
-                Log.v("LoaderManager", K.toString());
+                Log.v(LoaderManagerImpl.TAG, K.toString());
             }
             this.mCallback.onLoadFinished(this.mLoader, d);
             this.mDeliveredData = true;
@@ -230,7 +230,7 @@ public class LoaderManagerImpl extends LoaderManager {
                 if (LoaderManagerImpl.DEBUG) {
                     StringBuilder K = a.K("  Resetting: ");
                     K.append(this.mLoader);
-                    Log.v("LoaderManager", K.toString());
+                    Log.v(LoaderManagerImpl.TAG, K.toString());
                 }
                 this.mCallback.onLoaderReset(this.mLoader);
             }
@@ -349,7 +349,7 @@ public class LoaderManagerImpl extends LoaderManager {
                 }
                 LoaderInfo loaderInfo = new LoaderInfo(i, bundle, onCreateLoader, loader);
                 if (DEBUG) {
-                    Log.v("LoaderManager", "  Created new loader " + loaderInfo);
+                    Log.v(TAG, "  Created new loader " + loaderInfo);
                 }
                 this.mLoaderViewModel.putLoader(i, loaderInfo);
                 this.mLoaderViewModel.finishCreatingLoader();
@@ -369,7 +369,7 @@ public class LoaderManagerImpl extends LoaderManager {
             throw new IllegalStateException("Called while creating a loader");
         } else if (Looper.getMainLooper() == Looper.myLooper()) {
             if (DEBUG) {
-                Log.v("LoaderManager", "destroyLoader in " + this + " of " + i);
+                Log.v(TAG, "destroyLoader in " + this + " of " + i);
             }
             LoaderInfo loader = this.mLoaderViewModel.getLoader(i);
             if (loader != null) {
@@ -414,13 +414,13 @@ public class LoaderManagerImpl extends LoaderManager {
         } else if (Looper.getMainLooper() == Looper.myLooper()) {
             LoaderInfo<D> loader = this.mLoaderViewModel.getLoader(i);
             if (DEBUG) {
-                Log.v("LoaderManager", "initLoader in " + this + ": args=" + bundle);
+                Log.v(TAG, "initLoader in " + this + ": args=" + bundle);
             }
             if (loader == null) {
                 return createAndInstallLoader(i, bundle, loaderCallbacks, null);
             }
             if (DEBUG) {
-                Log.v("LoaderManager", "  Re-using existing loader " + loader);
+                Log.v(TAG, "  Re-using existing loader " + loader);
             }
             return loader.setCallback(this.mLifecycleOwner, loaderCallbacks);
         } else {
@@ -441,7 +441,7 @@ public class LoaderManagerImpl extends LoaderManager {
             throw new IllegalStateException("Called while creating a loader");
         } else if (Looper.getMainLooper() == Looper.myLooper()) {
             if (DEBUG) {
-                Log.v("LoaderManager", "restartLoader in " + this + ": args=" + bundle);
+                Log.v(TAG, "restartLoader in " + this + ": args=" + bundle);
             }
             LoaderInfo<D> loader = this.mLoaderViewModel.getLoader(i);
             Loader<D> loader2 = null;
diff --git a/app/src/main/java/androidx/loader/content/ModernAsyncTask.java b/app/src/main/java/androidx/loader/content/ModernAsyncTask.java
index a6566a6b18..a23336ca25 100644
--- a/app/src/main/java/androidx/loader/content/ModernAsyncTask.java
+++ b/app/src/main/java/androidx/loader/content/ModernAsyncTask.java
@@ -84,7 +84,7 @@ public abstract class ModernAsyncTask<Params, Progress, Result> {
             try {
                 ModernAsyncTask.this.postResultIfNotInvoked(get());
             } catch (InterruptedException e) {
-                Log.w("AsyncTask", e);
+                Log.w(ModernAsyncTask.LOG_TAG, e);
             } catch (ExecutionException e2) {
                 throw new RuntimeException("An error occurred while executing doInBackground()", e2.getCause());
             } catch (CancellationException unused) {
diff --git a/app/src/main/java/androidx/localbroadcastmanager/content/LocalBroadcastManager.java b/app/src/main/java/androidx/localbroadcastmanager/content/LocalBroadcastManager.java
index ad93ca69ce..6c30e69d85 100644
--- a/app/src/main/java/androidx/localbroadcastmanager/content/LocalBroadcastManager.java
+++ b/app/src/main/java/androidx/localbroadcastmanager/content/LocalBroadcastManager.java
@@ -155,23 +155,23 @@ public final class LocalBroadcastManager {
             Set<String> categories = intent.getCategories();
             boolean z2 = (intent.getFlags() & 8) != 0;
             if (z2) {
-                Log.v("LocalBroadcastManager", "Resolving type " + resolveTypeIfNeeded + " scheme " + scheme + " of intent " + intent);
+                Log.v(TAG, "Resolving type " + resolveTypeIfNeeded + " scheme " + scheme + " of intent " + intent);
             }
             ArrayList<ReceiverRecord> arrayList3 = this.mActions.get(intent.getAction());
             if (arrayList3 != null) {
                 if (z2) {
-                    Log.v("LocalBroadcastManager", "Action list: " + arrayList3);
+                    Log.v(TAG, "Action list: " + arrayList3);
                 }
                 ArrayList arrayList4 = null;
                 int i2 = 0;
                 while (i2 < arrayList3.size()) {
                     ReceiverRecord receiverRecord = arrayList3.get(i2);
                     if (z2) {
-                        Log.v("LocalBroadcastManager", "Matching against filter " + receiverRecord.filter);
+                        Log.v(TAG, "Matching against filter " + receiverRecord.filter);
                     }
                     if (receiverRecord.broadcasting) {
                         if (z2) {
-                            Log.v("LocalBroadcastManager", "  Filter's target already added");
+                            Log.v(TAG, "  Filter's target already added");
                         }
                         i = i2;
                         arrayList = arrayList3;
@@ -184,10 +184,10 @@ public final class LocalBroadcastManager {
                         arrayList2 = arrayList4;
                         arrayList = arrayList3;
                         str = resolveTypeIfNeeded;
-                        int match = receiverRecord.filter.match(action, resolveTypeIfNeeded, scheme, data, categories, "LocalBroadcastManager");
+                        int match = receiverRecord.filter.match(action, resolveTypeIfNeeded, scheme, data, categories, TAG);
                         if (match >= 0) {
                             if (z2) {
-                                Log.v("LocalBroadcastManager", "  Filter matched!  match=0x" + Integer.toHexString(match));
+                                Log.v(TAG, "  Filter matched!  match=0x" + Integer.toHexString(match));
                             }
                             arrayList4 = arrayList2 == null ? new ArrayList() : arrayList2;
                             arrayList4.add(receiverRecord);
@@ -197,7 +197,7 @@ public final class LocalBroadcastManager {
                             arrayList3 = arrayList;
                             resolveTypeIfNeeded = str;
                         } else if (z2) {
-                            Log.v("LocalBroadcastManager", "  Filter did not match: " + (match != -4 ? match != -3 ? match != -2 ? match != -1 ? "unknown reason" : "type" : "data" : "action" : "category"));
+                            Log.v(TAG, "  Filter did not match: " + (match != -4 ? match != -3 ? match != -2 ? match != -1 ? "unknown reason" : "type" : "data" : "action" : "category"));
                         }
                     }
                     arrayList4 = arrayList2;
diff --git a/app/src/main/java/androidx/media/AudioAttributesImplBase.java b/app/src/main/java/androidx/media/AudioAttributesImplBase.java
index ac60459c85..635799b421 100644
--- a/app/src/main/java/androidx/media/AudioAttributesImplBase.java
+++ b/app/src/main/java/androidx/media/AudioAttributesImplBase.java
@@ -72,7 +72,7 @@ public class AudioAttributesImplBase implements AudioAttributesImpl {
                     this.mContentType = 1;
                     break;
                 default:
-                    Log.e("AudioAttributesCompat", "Invalid stream type " + i + " for AudioAttributesCompat");
+                    Log.e(AudioAttributesCompat.TAG, "Invalid stream type " + i + " for AudioAttributesCompat");
                     break;
             }
             this.mUsage = AudioAttributesImplBase.usageForStreamType(i);
@@ -99,7 +99,7 @@ public class AudioAttributesImplBase implements AudioAttributesImpl {
         @Override // androidx.media.AudioAttributesImpl.Builder
         @NonNull
         public Builder setFlags(int i) {
-            this.mFlags = (i & 1023) | this.mFlags;
+            this.mFlags = (i & AudioAttributesCompat.FLAG_ALL) | this.mFlags;
             return this;
         }
 
@@ -212,7 +212,7 @@ public class AudioAttributesImplBase implements AudioAttributesImpl {
         } else if (legacyStreamType == 7) {
             i |= 1;
         }
-        return i & 273;
+        return i & AudioAttributesCompat.FLAG_ALL_PUBLIC;
     }
 
     @Override // androidx.media.AudioAttributesImpl
diff --git a/app/src/main/java/androidx/media/AudioFocusRequestCompat.java b/app/src/main/java/androidx/media/AudioFocusRequestCompat.java
index 4b43fdb684..ce89e93212 100644
--- a/app/src/main/java/androidx/media/AudioFocusRequestCompat.java
+++ b/app/src/main/java/androidx/media/AudioFocusRequestCompat.java
@@ -109,7 +109,7 @@ public class AudioFocusRequestCompat {
 
         @Override // android.os.Handler.Callback
         public boolean handleMessage(Message message) {
-            if (message.what != 2782386) {
+            if (message.what != FOCUS_CHANGE) {
                 return false;
             }
             this.mListener.onAudioFocusChange(message.arg1);
@@ -119,7 +119,7 @@ public class AudioFocusRequestCompat {
         @Override // android.media.AudioManager.OnAudioFocusChangeListener
         public void onAudioFocusChange(int i) {
             Handler handler = this.mHandler;
-            handler.sendMessage(Message.obtain(handler, 2782386, i, 0));
+            handler.sendMessage(Message.obtain(handler, FOCUS_CHANGE, i, 0));
         }
     }
 
diff --git a/app/src/main/java/androidx/media/MediaBrowserServiceCompat.java b/app/src/main/java/androidx/media/MediaBrowserServiceCompat.java
index e398c0c312..b493669045 100644
--- a/app/src/main/java/androidx/media/MediaBrowserServiceCompat.java
+++ b/app/src/main/java/androidx/media/MediaBrowserServiceCompat.java
@@ -40,7 +40,7 @@ import java.util.Iterator;
 import java.util.List;
 import x.a.b.b.a.b;
 public abstract class MediaBrowserServiceCompat extends Service {
-    public static final boolean DEBUG = Log.isLoggable("MBServiceCompat", 3);
+    public static final boolean DEBUG = Log.isLoggable(TAG, 3);
     private static final float EPSILON = 1.0E-5f;
     @RestrictTo({RestrictTo.Scope.LIBRARY})
     public static final String KEY_MEDIA_ITEM = "media_item";
@@ -57,7 +57,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
     public static final int RESULT_PROGRESS_UPDATE = 1;
     public static final String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService";
     public static final String TAG = "MBServiceCompat";
-    public final ConnectionRecord mConnectionFromFwk = new ConnectionRecord("android.media.session.MediaController", -1, -1, null, null);
+    public final ConnectionRecord mConnectionFromFwk = new ConnectionRecord(MediaSessionManager.RemoteUserInfo.LEGACY_CONTROLLER, -1, -1, null, null);
     public final ArrayMap<IBinder, ConnectionRecord> mConnections = new ArrayMap<>();
     public ConnectionRecord mCurConnection;
     public final ServiceHandler mHandler = new ServiceHandler();
@@ -92,14 +92,14 @@ public abstract class MediaBrowserServiceCompat extends Service {
                     StringBuilder K = a.K("Calling onLoadChildren() failed for id=");
                     K.append(this.val$parentId);
                     K.append(" package=");
-                    a.i0(K, this.val$connection.pkg, "MBServiceCompat");
+                    a.i0(K, this.val$connection.pkg, MediaBrowserServiceCompat.TAG);
                 }
             } else if (MediaBrowserServiceCompat.DEBUG) {
                 StringBuilder K2 = a.K("Not sending onLoadChildren result for connection that has been disconnected. pkg=");
                 K2.append(this.val$connection.pkg);
                 K2.append(" id=");
                 K2.append(this.val$parentId);
-                Log.d("MBServiceCompat", K2.toString());
+                Log.d(MediaBrowserServiceCompat.TAG, K2.toString());
             }
         }
     }
@@ -120,7 +120,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
                 return;
             }
             Bundle bundle = new Bundle();
-            bundle.putParcelable("media_item", mediaItem);
+            bundle.putParcelable(MediaBrowserServiceCompat.KEY_MEDIA_ITEM, mediaItem);
             this.val$receiver.b(0, bundle);
         }
     }
@@ -141,7 +141,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
                 return;
             }
             Bundle bundle = new Bundle();
-            bundle.putParcelableArray("search_results", (Parcelable[]) list.toArray(new MediaBrowserCompat.MediaItem[0]));
+            bundle.putParcelableArray(MediaBrowserServiceCompat.KEY_SEARCH_RESULTS, (Parcelable[]) list.toArray(new MediaBrowserCompat.MediaItem[0]));
             this.val$receiver.b(0, bundle);
         }
     }
@@ -279,7 +279,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
                     b b = this.val$token.b();
                     if (b != null) {
                         for (Bundle bundle : MediaBrowserServiceImplApi21.this.mRootExtrasList) {
-                            BundleCompat.putBinder(bundle, "extra_session_binder", b.asBinder());
+                            BundleCompat.putBinder(bundle, MediaBrowserProtocol.EXTRA_SESSION_BINDER, b.asBinder());
                         }
                     }
                     MediaBrowserServiceImplApi21.this.mRootExtrasList.clear();
@@ -459,24 +459,24 @@ public abstract class MediaBrowserServiceCompat extends Service {
         public BrowserRoot onGetRoot(String str, int i, Bundle bundle) {
             int i2;
             Bundle bundle2;
-            if (bundle == null || bundle.getInt("extra_client_version", 0) == 0) {
+            if (bundle == null || bundle.getInt(MediaBrowserProtocol.EXTRA_CLIENT_VERSION, 0) == 0) {
                 bundle2 = null;
                 i2 = -1;
             } else {
-                bundle.remove("extra_client_version");
+                bundle.remove(MediaBrowserProtocol.EXTRA_CLIENT_VERSION);
                 this.mMessenger = new Messenger(MediaBrowserServiceCompat.this.mHandler);
                 bundle2 = new Bundle();
-                bundle2.putInt("extra_service_version", 2);
-                BundleCompat.putBinder(bundle2, "extra_messenger", this.mMessenger.getBinder());
+                bundle2.putInt(MediaBrowserProtocol.EXTRA_SERVICE_VERSION, 2);
+                BundleCompat.putBinder(bundle2, MediaBrowserProtocol.EXTRA_MESSENGER_BINDER, this.mMessenger.getBinder());
                 MediaSessionCompat.Token token = MediaBrowserServiceCompat.this.mSession;
                 if (token != null) {
                     b b = token.b();
-                    BundleCompat.putBinder(bundle2, "extra_session_binder", b == null ? null : b.asBinder());
+                    BundleCompat.putBinder(bundle2, MediaBrowserProtocol.EXTRA_SESSION_BINDER, b == null ? null : b.asBinder());
                 } else {
                     this.mRootExtrasList.add(bundle2);
                 }
-                int i3 = bundle.getInt("extra_calling_pid", -1);
-                bundle.remove("extra_calling_pid");
+                int i3 = bundle.getInt(MediaBrowserProtocol.EXTRA_CALLING_PID, -1);
+                bundle.remove(MediaBrowserProtocol.EXTRA_CALLING_PID);
                 i2 = i3;
             }
             ConnectionRecord connectionRecord = new ConnectionRecord(str, i2, i, bundle, null);
@@ -711,7 +711,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
                         StringBuilder K = a.K("Connection for ");
                         K.append(next.pkg);
                         K.append(" is no longer valid.");
-                        Log.w("MBServiceCompat", K.toString());
+                        Log.w(MediaBrowserServiceCompat.TAG, K.toString());
                         it.remove();
                     }
                 }
@@ -808,7 +808,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
 
         @Override // androidx.media.MediaBrowserServiceCompat.MediaBrowserServiceImpl
         public IBinder onBind(Intent intent) {
-            if ("android.media.browse.MediaBrowserService".equals(intent.getAction())) {
+            if (MediaBrowserServiceCompat.SERVICE_INTERFACE.equals(intent.getAction())) {
                 return this.mMessenger.getBinder();
             }
             return null;
@@ -997,11 +997,11 @@ public abstract class MediaBrowserServiceCompat extends Service {
                     K.append(this.val$pkg);
                     K.append(" from service ");
                     K.append(getClass().getName());
-                    Log.i("MBServiceCompat", K.toString());
+                    Log.i(MediaBrowserServiceCompat.TAG, K.toString());
                     try {
                         this.val$callbacks.onConnectFailed();
                     } catch (RemoteException unused) {
-                        a.i0(a.K("Calling onConnectFailed() failed. Ignoring. pkg="), this.val$pkg, "MBServiceCompat");
+                        a.i0(a.K("Calling onConnectFailed() failed. Ignoring. pkg="), this.val$pkg, MediaBrowserServiceCompat.TAG);
                     }
                 } else {
                     try {
@@ -1011,7 +1011,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
                             this.val$callbacks.onConnect(connectionRecord.root.getRootId(), MediaBrowserServiceCompat.this.mSession, connectionRecord.root.getExtras());
                         }
                     } catch (RemoteException unused2) {
-                        a.i0(a.K("Calling onConnect() failed. Dropping client. pkg="), this.val$pkg, "MBServiceCompat");
+                        a.i0(a.K("Calling onConnect() failed. Dropping client. pkg="), this.val$pkg, MediaBrowserServiceCompat.TAG);
                         MediaBrowserServiceCompat.this.mConnections.remove(asBinder);
                     }
                 }
@@ -1053,7 +1053,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
             public void run() {
                 ConnectionRecord connectionRecord = MediaBrowserServiceCompat.this.mConnections.get(this.val$callbacks.asBinder());
                 if (connectionRecord == null) {
-                    a.i0(a.K("addSubscription for callback that isn't registered id="), this.val$id, "MBServiceCompat");
+                    a.i0(a.K("addSubscription for callback that isn't registered id="), this.val$id, MediaBrowserServiceCompat.TAG);
                 } else {
                     MediaBrowserServiceCompat.this.addSubscription(this.val$id, connectionRecord, this.val$token, this.val$options);
                 }
@@ -1076,12 +1076,12 @@ public abstract class MediaBrowserServiceCompat extends Service {
             public void run() {
                 ConnectionRecord connectionRecord = MediaBrowserServiceCompat.this.mConnections.get(this.val$callbacks.asBinder());
                 if (connectionRecord == null) {
-                    a.i0(a.K("removeSubscription for callback that isn't registered id="), this.val$id, "MBServiceCompat");
+                    a.i0(a.K("removeSubscription for callback that isn't registered id="), this.val$id, MediaBrowserServiceCompat.TAG);
                 } else if (!MediaBrowserServiceCompat.this.removeSubscription(this.val$id, connectionRecord, this.val$token)) {
                     StringBuilder K = a.K("removeSubscription called for ");
                     K.append(this.val$id);
                     K.append(" which is not subscribed");
-                    Log.w("MBServiceCompat", K.toString());
+                    Log.w(MediaBrowserServiceCompat.TAG, K.toString());
                 }
             }
         }
@@ -1102,7 +1102,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
             public void run() {
                 ConnectionRecord connectionRecord = MediaBrowserServiceCompat.this.mConnections.get(this.val$callbacks.asBinder());
                 if (connectionRecord == null) {
-                    a.i0(a.K("getMediaItem for callback that isn't registered id="), this.val$mediaId, "MBServiceCompat");
+                    a.i0(a.K("getMediaItem for callback that isn't registered id="), this.val$mediaId, MediaBrowserServiceCompat.TAG);
                 } else {
                     MediaBrowserServiceCompat.this.performLoadItem(this.val$mediaId, connectionRecord, this.val$receiver);
                 }
@@ -1147,7 +1147,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
                 try {
                     asBinder.linkToDeath(connectionRecord, 0);
                 } catch (RemoteException unused) {
-                    Log.w("MBServiceCompat", "IBinder is already dead.");
+                    Log.w(MediaBrowserServiceCompat.TAG, "IBinder is already dead.");
                 }
             }
         }
@@ -1188,7 +1188,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
             public void run() {
                 ConnectionRecord connectionRecord = MediaBrowserServiceCompat.this.mConnections.get(this.val$callbacks.asBinder());
                 if (connectionRecord == null) {
-                    a.i0(a.K("search for callback that isn't registered query="), this.val$query, "MBServiceCompat");
+                    a.i0(a.K("search for callback that isn't registered query="), this.val$query, MediaBrowserServiceCompat.TAG);
                 } else {
                     MediaBrowserServiceCompat.this.performSearch(this.val$query, this.val$extras, connectionRecord, this.val$receiver);
                 }
@@ -1217,7 +1217,7 @@ public abstract class MediaBrowserServiceCompat extends Service {
                     K.append(this.val$action);
                     K.append(", extras=");
                     K.append(this.val$extras);
-                    Log.w("MBServiceCompat", K.toString());
+                    Log.w(MediaBrowserServiceCompat.TAG, K.toString());
                     return;
                 }
                 MediaBrowserServiceCompat.this.performCustomAction(this.val$action, this.val$extras, connectionRecord, this.val$receiver);
@@ -1309,11 +1309,11 @@ public abstract class MediaBrowserServiceCompat extends Service {
             if (bundle == null) {
                 bundle = new Bundle();
             }
-            bundle.putInt("extra_service_version", 2);
+            bundle.putInt(MediaBrowserProtocol.EXTRA_SERVICE_VERSION, 2);
             Bundle bundle2 = new Bundle();
-            bundle2.putString("data_media_item_id", str);
-            bundle2.putParcelable("data_media_session_token", token);
-            bundle2.putBundle("data_root_hints", bundle);
+            bundle2.putString(MediaBrowserProtocol.DATA_MEDIA_ITEM_ID, str);
+            bundle2.putParcelable(MediaBrowserProtocol.DATA_MEDIA_SESSION_TOKEN, token);
+            bundle2.putBundle(MediaBrowserProtocol.DATA_ROOT_HINTS, bundle);
             sendRequest(1, bundle2);
         }
 
@@ -1325,11 +1325,11 @@ public abstract class MediaBrowserServiceCompat extends Service {
         @Override // androidx.media.MediaBrowserServiceCompat.ServiceCallbacks
         public void onLoadChildren(String str, List<MediaBrowserCompat.MediaItem> list, Bundle bundle, Bundle bundle2) throws RemoteException {
             Bundle bundle3 = new Bundle();
-            bundle3.putString("data_media_item_id", str);
-            bundle3.putBundle("data_options", bundle);
-            bundle3.putBundle("data_notify_children_changed_options", bundle2);
+            bundle3.putString(MediaBrowserProtocol.DATA_MEDIA_ITEM_ID, str);
+            bundle3.putBundle(MediaBrowserProtocol.DATA_OPTIONS, bundle);
+            bundle3.putBundle(MediaBrowserProtocol.DATA_NOTIFY_CHILDREN_CHANGED_OPTIONS, bundle2);
             if (list != null) {
-                bundle3.putParcelableArrayList("data_media_item_list", list instanceof ArrayList ? (ArrayList) list : new ArrayList<>(list));
+                bundle3.putParcelableArrayList(MediaBrowserProtocol.DATA_MEDIA_ITEM_LIST, list instanceof ArrayList ? (ArrayList) list : new ArrayList<>(list));
             }
             sendRequest(3, bundle3);
         }
@@ -1347,44 +1347,44 @@ public abstract class MediaBrowserServiceCompat extends Service {
             Bundle data = message.getData();
             switch (message.what) {
                 case 1:
-                    Bundle bundle = data.getBundle("data_root_hints");
+                    Bundle bundle = data.getBundle(MediaBrowserProtocol.DATA_ROOT_HINTS);
                     MediaSessionCompat.a(bundle);
-                    this.mServiceBinderImpl.connect(data.getString("data_package_name"), data.getInt("data_calling_pid"), data.getInt("data_calling_uid"), bundle, new ServiceCallbacksCompat(message.replyTo));
+                    this.mServiceBinderImpl.connect(data.getString(MediaBrowserProtocol.DATA_PACKAGE_NAME), data.getInt(MediaBrowserProtocol.DATA_CALLING_PID), data.getInt(MediaBrowserProtocol.DATA_CALLING_UID), bundle, new ServiceCallbacksCompat(message.replyTo));
                     return;
                 case 2:
                     this.mServiceBinderImpl.disconnect(new ServiceCallbacksCompat(message.replyTo));
                     return;
                 case 3:
-                    Bundle bundle2 = data.getBundle("data_options");
+                    Bundle bundle2 = data.getBundle(MediaBrowserProtocol.DATA_OPTIONS);
                     MediaSessionCompat.a(bundle2);
-                    this.mServiceBinderImpl.addSubscription(data.getString("data_media_item_id"), BundleCompat.getBinder(data, "data_callback_token"), bundle2, new ServiceCallbacksCompat(message.replyTo));
+                    this.mServiceBinderImpl.addSubscription(data.getString(MediaBrowserProtocol.DATA_MEDIA_ITEM_ID), BundleCompat.getBinder(data, MediaBrowserProtocol.DATA_CALLBACK_TOKEN), bundle2, new ServiceCallbacksCompat(message.replyTo));
                     return;
                 case 4:
-                    this.mServiceBinderImpl.removeSubscription(data.getString("data_media_item_id"), BundleCompat.getBinder(data, "data_callback_token"), new ServiceCallbacksCompat(message.replyTo));
+                    this.mServiceBinderImpl.removeSubscription(data.getString(MediaBrowserProtocol.DATA_MEDIA_ITEM_ID), BundleCompat.getBinder(data, MediaBrowserProtocol.DATA_CALLBACK_TOKEN), new ServiceCallbacksCompat(message.replyTo));
                     return;
                 case 5:
-                    this.mServiceBinderImpl.getMediaItem(data.getString("data_media_item_id"), (ResultReceiver) data.getParcelable("data_result_receiver"), new ServiceCallbacksCompat(message.replyTo));
+                    this.mServiceBinderImpl.getMediaItem(data.getString(MediaBrowserProtocol.DATA_MEDIA_ITEM_ID), (ResultReceiver) data.getParcelable(MediaBrowserProtocol.DATA_RESULT_RECEIVER), new ServiceCallbacksCompat(message.replyTo));
                     return;
                 case 6:
-                    Bundle bundle3 = data.getBundle("data_root_hints");
+                    Bundle bundle3 = data.getBundle(MediaBrowserProtocol.DATA_ROOT_HINTS);
                     MediaSessionCompat.a(bundle3);
-                    this.mServiceBinderImpl.registerCallbacks(new ServiceCallbacksCompat(message.replyTo), data.getString("data_package_name"), data.getInt("data_calling_pid"), data.getInt("data_calling_uid"), bundle3);
+                    this.mServiceBinderImpl.registerCallbacks(new ServiceCallbacksCompat(message.replyTo), data.getString(MediaBrowserProtocol.DATA_PACKAGE_NAME), data.getInt(MediaBrowserProtocol.DATA_CALLING_PID), data.getInt(MediaBrowserProtocol.DATA_CALLING_UID), bundle3);
                     return;
                 case 7:
                     this.mServiceBinderImpl.unregisterCallbacks(new ServiceCallbacksCompat(message.replyTo));
                     return;
                 case 8:
-                    Bundle bundle4 = data.getBundle("data_search_extras");
+                    Bundle bundle4 = data.getBundle(MediaBrowserProtocol.DATA_SEARCH_EXTRAS);
                     MediaSessionCompat.a(bundle4);
-                    this.mServiceBinderImpl.search(data.getString("data_search_query"), bundle4, (ResultReceiver) data.getParcelable("data_result_receiver"), new ServiceCallbacksCompat(message.replyTo));
+                    this.mServiceBinderImpl.search(data.getString(MediaBrowserProtocol.DATA_SEARCH_QUERY), bundle4, (ResultReceiver) data.getParcelable(MediaBrowserProtocol.DATA_RESULT_RECEIVER), new ServiceCallbacksCompat(message.replyTo));
                     return;
                 case 9:
-                    Bundle bundle5 = data.getBundle("data_custom_action_extras");
+                    Bundle bundle5 = data.getBundle(MediaBrowserProtocol.DATA_CUSTOM_ACTION_EXTRAS);
                     MediaSessionCompat.a(bundle5);
-                    this.mServiceBinderImpl.sendCustomAction(data.getString("data_custom_action"), bundle5, (ResultReceiver) data.getParcelable("data_result_receiver"), new ServiceCallbacksCompat(message.replyTo));
+                    this.mServiceBinderImpl.sendCustomAction(data.getString(MediaBrowserProtocol.DATA_CUSTOM_ACTION), bundle5, (ResultReceiver) data.getParcelable(MediaBrowserProtocol.DATA_RESULT_RECEIVER), new ServiceCallbacksCompat(message.replyTo));
                     return;
                 default:
-                    Log.w("MBServiceCompat", "Unhandled message: " + message + "\n  Service version: 2\n  Client version: " + message.arg1);
+                    Log.w(MediaBrowserServiceCompat.TAG, "Unhandled message: " + message + "\n  Service version: 2\n  Client version: " + message.arg1);
                     return;
             }
         }
@@ -1401,12 +1401,12 @@ public abstract class MediaBrowserServiceCompat extends Service {
         public boolean sendMessageAtTime(Message message, long j) {
             Bundle data = message.getData();
             data.setClassLoader(MediaBrowserCompat.class.getClassLoader());
-            data.putInt("data_calling_uid", Binder.getCallingUid());
+            data.putInt(MediaBrowserProtocol.DATA_CALLING_UID, Binder.getCallingUid());
             int callingPid = Binder.getCallingPid();
             if (callingPid > 0) {
-                data.putInt("data_calling_pid", callingPid);
-            } else if (!data.containsKey("data_calling_pid")) {
-                data.putInt("data_calling_pid", -1);
+                data.putInt(MediaBrowserProtocol.DATA_CALLING_PID, callingPid);
+            } else if (!data.containsKey(MediaBrowserProtocol.DATA_CALLING_PID)) {
+                data.putInt(MediaBrowserProtocol.DATA_CALLING_PID, -1);
             }
             return super.sendMessageAtTime(message, j);
         }
diff --git a/app/src/main/java/androidx/media/MediaSessionManager.java b/app/src/main/java/androidx/media/MediaSessionManager.java
index c64fd90911..1f08a720d7 100644
--- a/app/src/main/java/androidx/media/MediaSessionManager.java
+++ b/app/src/main/java/androidx/media/MediaSessionManager.java
@@ -11,7 +11,7 @@ import androidx.annotation.RestrictTo;
 import androidx.media.MediaSessionManagerImplApi28;
 import androidx.media.MediaSessionManagerImplBase;
 public final class MediaSessionManager {
-    public static final boolean DEBUG = Log.isLoggable("MediaSessionManager", 3);
+    public static final boolean DEBUG = Log.isLoggable(TAG, 3);
     public static final String TAG = "MediaSessionManager";
     private static final Object sLock = new Object();
     private static volatile MediaSessionManager sSessionManager;
diff --git a/app/src/main/java/androidx/media/MediaSessionManagerImplBase.java b/app/src/main/java/androidx/media/MediaSessionManagerImplBase.java
index 02fabe5efa..78c845ef79 100644
--- a/app/src/main/java/androidx/media/MediaSessionManagerImplBase.java
+++ b/app/src/main/java/androidx/media/MediaSessionManagerImplBase.java
@@ -78,7 +78,7 @@ public class MediaSessionManagerImplBase implements MediaSessionManager.MediaSes
 
     public boolean isEnabledNotificationListener(@NonNull MediaSessionManager.RemoteUserInfoImpl remoteUserInfoImpl) {
         String[] split;
-        String string = Settings.Secure.getString(this.mContentResolver, "enabled_notification_listeners");
+        String string = Settings.Secure.getString(this.mContentResolver, ENABLED_NOTIFICATION_LISTENERS);
         if (string != null) {
             for (String str : string.split(":")) {
                 ComponentName unflattenFromString = ComponentName.unflattenFromString(str);
@@ -96,7 +96,7 @@ public class MediaSessionManagerImplBase implements MediaSessionManager.MediaSes
             if (this.mContext.getPackageManager().getApplicationInfo(remoteUserInfoImpl.getPackageName(), 0) == null) {
                 return false;
             }
-            return isPermissionGranted(remoteUserInfoImpl, "android.permission.STATUS_BAR_SERVICE") || isPermissionGranted(remoteUserInfoImpl, "android.permission.MEDIA_CONTENT_CONTROL") || remoteUserInfoImpl.getUid() == 1000 || isEnabledNotificationListener(remoteUserInfoImpl);
+            return isPermissionGranted(remoteUserInfoImpl, PERMISSION_STATUS_BAR_SERVICE) || isPermissionGranted(remoteUserInfoImpl, PERMISSION_MEDIA_CONTENT_CONTROL) || remoteUserInfoImpl.getUid() == 1000 || isEnabledNotificationListener(remoteUserInfoImpl);
         } catch (PackageManager.NameNotFoundException unused) {
             if (DEBUG) {
                 StringBuilder K = a.K("Package ");
diff --git a/app/src/main/java/androidx/media/app/NotificationCompat.java b/app/src/main/java/androidx/media/app/NotificationCompat.java
index d0a07375d9..c9dab16374 100644
--- a/app/src/main/java/androidx/media/app/NotificationCompat.java
+++ b/app/src/main/java/androidx/media/app/NotificationCompat.java
@@ -125,7 +125,7 @@ public class NotificationCompat {
         public static MediaSessionCompat.Token getMediaSession(Notification notification) {
             Parcelable parcelable;
             Bundle extras = androidx.core.app.NotificationCompat.getExtras(notification);
-            if (extras == null || (parcelable = extras.getParcelable("android.mediaSession")) == null) {
+            if (extras == null || (parcelable = extras.getParcelable(androidx.core.app.NotificationCompat.EXTRA_MEDIA_SESSION)) == null) {
                 return null;
             }
             return MediaSessionCompat.Token.a(parcelable, null);
diff --git a/app/src/main/java/androidx/media/session/MediaButtonReceiver.java b/app/src/main/java/androidx/media/session/MediaButtonReceiver.java
index 76f31120c8..0766101986 100644
--- a/app/src/main/java/androidx/media/session/MediaButtonReceiver.java
+++ b/app/src/main/java/androidx/media/session/MediaButtonReceiver.java
@@ -18,6 +18,7 @@ import android.support.v4.media.session.MediaSessionCompat;
 import android.util.Log;
 import android.view.KeyEvent;
 import androidx.annotation.RestrictTo;
+import androidx.media.MediaBrowserServiceCompat;
 import c.d.b.a.a;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
@@ -93,18 +94,18 @@ public class MediaButtonReceiver extends BroadcastReceiver {
         if (mediaButtonReceiverComponent != null) {
             return buildMediaButtonPendingIntent(context, mediaButtonReceiverComponent, j);
         }
-        Log.w("MediaButtonReceiver", "A unique media button receiver could not be found in the given context, so couldn't build a pending intent.");
+        Log.w(TAG, "A unique media button receiver could not be found in the given context, so couldn't build a pending intent.");
         return null;
     }
 
     public static PendingIntent buildMediaButtonPendingIntent(Context context, ComponentName componentName, long j) {
         if (componentName == null) {
-            Log.w("MediaButtonReceiver", "The component name of media button receiver should be provided.");
+            Log.w(TAG, "The component name of media button receiver should be provided.");
             return null;
         }
         int i = j == 4 ? 126 : j == 2 ? 127 : j == 32 ? 87 : j == 16 ? 88 : j == 1 ? 86 : j == 64 ? 90 : j == 8 ? 89 : j == 512 ? 85 : 0;
         if (i == 0) {
-            Log.w("MediaButtonReceiver", "Cannot build a media button pending intent with the given action: " + j);
+            Log.w(TAG, "Cannot build a media button pending intent with the given action: " + j);
             return null;
         }
         Intent intent = new Intent("android.intent.action.MEDIA_BUTTON");
@@ -124,7 +125,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
         } else if (queryBroadcastReceivers.size() <= 1) {
             return null;
         } else {
-            Log.w("MediaButtonReceiver", "More than one BroadcastReceiver that handles android.intent.action.MEDIA_BUTTON was found, returning null.");
+            Log.w(TAG, "More than one BroadcastReceiver that handles android.intent.action.MEDIA_BUTTON was found, returning null.");
             return null;
         }
     }
@@ -165,7 +166,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
     @Override // android.content.BroadcastReceiver
     public void onReceive(Context context, Intent intent) {
         if (intent == null || !"android.intent.action.MEDIA_BUTTON".equals(intent.getAction()) || !intent.hasExtra("android.intent.extra.KEY_EVENT")) {
-            Log.d("MediaButtonReceiver", "Ignore unsupported intent: " + intent);
+            Log.d(TAG, "Ignore unsupported intent: " + intent);
             return;
         }
         ComponentName serviceComponentByAction = getServiceComponentByAction(context, "android.intent.action.MEDIA_BUTTON");
@@ -174,7 +175,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
             startForegroundService(context, intent);
             return;
         }
-        ComponentName serviceComponentByAction2 = getServiceComponentByAction(context, "android.media.browse.MediaBrowserService");
+        ComponentName serviceComponentByAction2 = getServiceComponentByAction(context, MediaBrowserServiceCompat.SERVICE_INTERFACE);
         if (serviceComponentByAction2 != null) {
             BroadcastReceiver.PendingResult goAsync = goAsync();
             Context applicationContext = context.getApplicationContext();
diff --git a/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java b/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java
index 56a3660ddc..b85625c877 100644
--- a/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java
+++ b/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragment.java
@@ -52,7 +52,7 @@ public class EditTextPreferenceDialogFragment extends PreferenceDialogFragment {
         if (bundle == null) {
             this.mText = getEditTextPreference().getText();
         } else {
-            this.mText = bundle.getCharSequence("EditTextPreferenceDialogFragment.text");
+            this.mText = bundle.getCharSequence(SAVE_STATE_TEXT);
         }
     }
 
@@ -70,6 +70,6 @@ public class EditTextPreferenceDialogFragment extends PreferenceDialogFragment {
     @Override // androidx.preference.PreferenceDialogFragment, android.app.DialogFragment, android.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putCharSequence("EditTextPreferenceDialogFragment.text", this.mText);
+        bundle.putCharSequence(SAVE_STATE_TEXT, this.mText);
     }
 }
diff --git a/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java b/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java
index eaa6e6843c..09fe373586 100644
--- a/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/androidx/preference/EditTextPreferenceDialogFragmentCompat.java
@@ -53,7 +53,7 @@ public class EditTextPreferenceDialogFragmentCompat extends PreferenceDialogFrag
         if (bundle == null) {
             this.mText = getEditTextPreference().getText();
         } else {
-            this.mText = bundle.getCharSequence("EditTextPreferenceDialogFragment.text");
+            this.mText = bundle.getCharSequence(SAVE_STATE_TEXT);
         }
     }
 
@@ -71,6 +71,6 @@ public class EditTextPreferenceDialogFragmentCompat extends PreferenceDialogFrag
     @Override // androidx.preference.PreferenceDialogFragmentCompat, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putCharSequence("EditTextPreferenceDialogFragment.text", this.mText);
+        bundle.putCharSequence(SAVE_STATE_TEXT, this.mText);
     }
 }
diff --git a/app/src/main/java/androidx/preference/ExpandButton.java b/app/src/main/java/androidx/preference/ExpandButton.java
index 94f40a3478..52f6ebe34f 100644
--- a/app/src/main/java/androidx/preference/ExpandButton.java
+++ b/app/src/main/java/androidx/preference/ExpandButton.java
@@ -2,6 +2,7 @@ package androidx.preference;
 
 import android.content.Context;
 import android.text.TextUtils;
+import androidx.room.RoomDatabase;
 import java.util.ArrayList;
 import java.util.List;
 public final class ExpandButton extends Preference {
@@ -18,7 +19,7 @@ public final class ExpandButton extends Preference {
         setLayoutResource(R.layout.expand_button);
         setIcon(R.drawable.ic_arrow_down_24dp);
         setTitle(R.string.expand_button_title);
-        setOrder(999);
+        setOrder(RoomDatabase.MAX_BIND_PARAMETER_CNT);
     }
 
     private void setSummary(List<Preference> list) {
diff --git a/app/src/main/java/androidx/preference/ListPreference.java b/app/src/main/java/androidx/preference/ListPreference.java
index 336fb5930a..ea996c142c 100644
--- a/app/src/main/java/androidx/preference/ListPreference.java
+++ b/app/src/main/java/androidx/preference/ListPreference.java
@@ -152,7 +152,7 @@ public class ListPreference extends DialogPreference {
         if (TextUtils.equals(format, summary)) {
             return summary;
         }
-        Log.w("ListPreference", "Setting a summary with a String formatting marker is no longer supported. You should use a SummaryProvider instead.");
+        Log.w(TAG, "Setting a summary with a String formatting marker is no longer supported. You should use a SummaryProvider instead.");
         return format;
     }
 
diff --git a/app/src/main/java/androidx/preference/ListPreferenceDialogFragment.java b/app/src/main/java/androidx/preference/ListPreferenceDialogFragment.java
index 1afd34ba68..ecd8b4577b 100644
--- a/app/src/main/java/androidx/preference/ListPreferenceDialogFragment.java
+++ b/app/src/main/java/androidx/preference/ListPreferenceDialogFragment.java
@@ -53,9 +53,9 @@ public class ListPreferenceDialogFragment extends PreferenceDialogFragment {
             this.mEntryValues = listPreference.getEntryValues();
             return;
         }
-        this.mClickedDialogEntryIndex = bundle.getInt("ListPreferenceDialogFragment.index", 0);
-        this.mEntries = bundle.getCharSequenceArray("ListPreferenceDialogFragment.entries");
-        this.mEntryValues = bundle.getCharSequenceArray("ListPreferenceDialogFragment.entryValues");
+        this.mClickedDialogEntryIndex = bundle.getInt(SAVE_STATE_INDEX, 0);
+        this.mEntries = bundle.getCharSequenceArray(SAVE_STATE_ENTRIES);
+        this.mEntryValues = bundle.getCharSequenceArray(SAVE_STATE_ENTRY_VALUES);
     }
 
     @Override // androidx.preference.PreferenceDialogFragment
@@ -81,8 +81,8 @@ public class ListPreferenceDialogFragment extends PreferenceDialogFragment {
     @Override // androidx.preference.PreferenceDialogFragment, android.app.DialogFragment, android.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putInt("ListPreferenceDialogFragment.index", this.mClickedDialogEntryIndex);
-        bundle.putCharSequenceArray("ListPreferenceDialogFragment.entries", this.mEntries);
-        bundle.putCharSequenceArray("ListPreferenceDialogFragment.entryValues", this.mEntryValues);
+        bundle.putInt(SAVE_STATE_INDEX, this.mClickedDialogEntryIndex);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRIES, this.mEntries);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRY_VALUES, this.mEntryValues);
     }
 }
diff --git a/app/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java b/app/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java
index 2c884e757a..202c8e5eee 100644
--- a/app/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/androidx/preference/ListPreferenceDialogFragmentCompat.java
@@ -51,9 +51,9 @@ public class ListPreferenceDialogFragmentCompat extends PreferenceDialogFragment
             this.mEntryValues = listPreference.getEntryValues();
             return;
         }
-        this.mClickedDialogEntryIndex = bundle.getInt("ListPreferenceDialogFragment.index", 0);
-        this.mEntries = bundle.getCharSequenceArray("ListPreferenceDialogFragment.entries");
-        this.mEntryValues = bundle.getCharSequenceArray("ListPreferenceDialogFragment.entryValues");
+        this.mClickedDialogEntryIndex = bundle.getInt(SAVE_STATE_INDEX, 0);
+        this.mEntries = bundle.getCharSequenceArray(SAVE_STATE_ENTRIES);
+        this.mEntryValues = bundle.getCharSequenceArray(SAVE_STATE_ENTRY_VALUES);
     }
 
     @Override // androidx.preference.PreferenceDialogFragmentCompat
@@ -78,8 +78,8 @@ public class ListPreferenceDialogFragmentCompat extends PreferenceDialogFragment
     @Override // androidx.preference.PreferenceDialogFragmentCompat, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putInt("ListPreferenceDialogFragment.index", this.mClickedDialogEntryIndex);
-        bundle.putCharSequenceArray("ListPreferenceDialogFragment.entries", this.mEntries);
-        bundle.putCharSequenceArray("ListPreferenceDialogFragment.entryValues", this.mEntryValues);
+        bundle.putInt(SAVE_STATE_INDEX, this.mClickedDialogEntryIndex);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRIES, this.mEntries);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRY_VALUES, this.mEntryValues);
     }
 }
diff --git a/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java b/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java
index 877136c59d..4a712ca3b4 100644
--- a/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java
+++ b/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragment.java
@@ -64,10 +64,10 @@ public class MultiSelectListPreferenceDialogFragment extends PreferenceDialogFra
             return;
         }
         this.mNewValues.clear();
-        this.mNewValues.addAll(bundle.getStringArrayList("MultiSelectListPreferenceDialogFragment.values"));
-        this.mPreferenceChanged = bundle.getBoolean("MultiSelectListPreferenceDialogFragment.changed", false);
-        this.mEntries = bundle.getCharSequenceArray("MultiSelectListPreferenceDialogFragment.entries");
-        this.mEntryValues = bundle.getCharSequenceArray("MultiSelectListPreferenceDialogFragment.entryValues");
+        this.mNewValues.addAll(bundle.getStringArrayList(SAVE_STATE_VALUES));
+        this.mPreferenceChanged = bundle.getBoolean(SAVE_STATE_CHANGED, false);
+        this.mEntries = bundle.getCharSequenceArray(SAVE_STATE_ENTRIES);
+        this.mEntryValues = bundle.getCharSequenceArray(SAVE_STATE_ENTRY_VALUES);
     }
 
     @Override // androidx.preference.PreferenceDialogFragment
@@ -97,9 +97,9 @@ public class MultiSelectListPreferenceDialogFragment extends PreferenceDialogFra
     @Override // androidx.preference.PreferenceDialogFragment, android.app.DialogFragment, android.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putStringArrayList("MultiSelectListPreferenceDialogFragment.values", new ArrayList<>(this.mNewValues));
-        bundle.putBoolean("MultiSelectListPreferenceDialogFragment.changed", this.mPreferenceChanged);
-        bundle.putCharSequenceArray("MultiSelectListPreferenceDialogFragment.entries", this.mEntries);
-        bundle.putCharSequenceArray("MultiSelectListPreferenceDialogFragment.entryValues", this.mEntryValues);
+        bundle.putStringArrayList(SAVE_STATE_VALUES, new ArrayList<>(this.mNewValues));
+        bundle.putBoolean(SAVE_STATE_CHANGED, this.mPreferenceChanged);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRIES, this.mEntries);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRY_VALUES, this.mEntryValues);
     }
 }
diff --git a/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java b/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java
index 4ec93e6434..5b13499384 100644
--- a/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/androidx/preference/MultiSelectListPreferenceDialogFragmentCompat.java
@@ -62,10 +62,10 @@ public class MultiSelectListPreferenceDialogFragmentCompat extends PreferenceDia
             return;
         }
         this.mNewValues.clear();
-        this.mNewValues.addAll(bundle.getStringArrayList("MultiSelectListPreferenceDialogFragmentCompat.values"));
-        this.mPreferenceChanged = bundle.getBoolean("MultiSelectListPreferenceDialogFragmentCompat.changed", false);
-        this.mEntries = bundle.getCharSequenceArray("MultiSelectListPreferenceDialogFragmentCompat.entries");
-        this.mEntryValues = bundle.getCharSequenceArray("MultiSelectListPreferenceDialogFragmentCompat.entryValues");
+        this.mNewValues.addAll(bundle.getStringArrayList(SAVE_STATE_VALUES));
+        this.mPreferenceChanged = bundle.getBoolean(SAVE_STATE_CHANGED, false);
+        this.mEntries = bundle.getCharSequenceArray(SAVE_STATE_ENTRIES);
+        this.mEntryValues = bundle.getCharSequenceArray(SAVE_STATE_ENTRY_VALUES);
     }
 
     @Override // androidx.preference.PreferenceDialogFragmentCompat
@@ -93,9 +93,9 @@ public class MultiSelectListPreferenceDialogFragmentCompat extends PreferenceDia
     @Override // androidx.preference.PreferenceDialogFragmentCompat, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putStringArrayList("MultiSelectListPreferenceDialogFragmentCompat.values", new ArrayList<>(this.mNewValues));
-        bundle.putBoolean("MultiSelectListPreferenceDialogFragmentCompat.changed", this.mPreferenceChanged);
-        bundle.putCharSequenceArray("MultiSelectListPreferenceDialogFragmentCompat.entries", this.mEntries);
-        bundle.putCharSequenceArray("MultiSelectListPreferenceDialogFragmentCompat.entryValues", this.mEntryValues);
+        bundle.putStringArrayList(SAVE_STATE_VALUES, new ArrayList<>(this.mNewValues));
+        bundle.putBoolean(SAVE_STATE_CHANGED, this.mPreferenceChanged);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRIES, this.mEntries);
+        bundle.putCharSequenceArray(SAVE_STATE_ENTRY_VALUES, this.mEntryValues);
     }
 }
diff --git a/app/src/main/java/androidx/preference/Preference.java b/app/src/main/java/androidx/preference/Preference.java
index 0af4f47906..9ee261bbee 100644
--- a/app/src/main/java/androidx/preference/Preference.java
+++ b/app/src/main/java/androidx/preference/Preference.java
@@ -153,7 +153,7 @@ public class Preference implements Comparable<Preference> {
         @Override // android.view.MenuItem.OnMenuItemClickListener
         public boolean onMenuItemClick(MenuItem menuItem) {
             CharSequence summary = this.mPreference.getSummary();
-            ((ClipboardManager) this.mPreference.getContext().getSystemService("clipboard")).setPrimaryClip(ClipData.newPlainText("Preference", summary));
+            ((ClipboardManager) this.mPreference.getContext().getSystemService("clipboard")).setPrimaryClip(ClipData.newPlainText(Preference.CLIPBOARD_ID, summary));
             Toast.makeText(this.mPreference.getContext(), this.mPreference.getContext().getString(R.string.preference_copied, summary), 0).show();
             return true;
         }
@@ -698,7 +698,7 @@ public class Preference implements Comparable<Preference> {
                 }
                 findViewById = preferenceViewHolder.findViewById(R.id.icon_frame);
                 if (findViewById == null) {
-                    findViewById = preferenceViewHolder.findViewById(16908350);
+                    findViewById = preferenceViewHolder.findViewById(AndroidResources.ANDROID_R_ICON_FRAME);
                 }
                 if (findViewById != null) {
                     if (this.mIcon != null) {
diff --git a/app/src/main/java/androidx/preference/PreferenceDialogFragment.java b/app/src/main/java/androidx/preference/PreferenceDialogFragment.java
index 04af55bc5d..7beb21497c 100644
--- a/app/src/main/java/androidx/preference/PreferenceDialogFragment.java
+++ b/app/src/main/java/androidx/preference/PreferenceDialogFragment.java
@@ -109,12 +109,12 @@ public abstract class PreferenceDialogFragment extends DialogFragment implements
                 this.mDialogIcon = new BitmapDrawable(getResources(), createBitmap);
                 return;
             }
-            this.mDialogTitle = bundle.getCharSequence("PreferenceDialogFragment.title");
-            this.mPositiveButtonText = bundle.getCharSequence("PreferenceDialogFragment.positiveText");
-            this.mNegativeButtonText = bundle.getCharSequence("PreferenceDialogFragment.negativeText");
-            this.mDialogMessage = bundle.getCharSequence("PreferenceDialogFragment.message");
-            this.mDialogLayoutRes = bundle.getInt("PreferenceDialogFragment.layout", 0);
-            Bitmap bitmap = (Bitmap) bundle.getParcelable("PreferenceDialogFragment.icon");
+            this.mDialogTitle = bundle.getCharSequence(SAVE_STATE_TITLE);
+            this.mPositiveButtonText = bundle.getCharSequence(SAVE_STATE_POSITIVE_TEXT);
+            this.mNegativeButtonText = bundle.getCharSequence(SAVE_STATE_NEGATIVE_TEXT);
+            this.mDialogMessage = bundle.getCharSequence(SAVE_STATE_MESSAGE);
+            this.mDialogLayoutRes = bundle.getInt(SAVE_STATE_LAYOUT, 0);
+            Bitmap bitmap = (Bitmap) bundle.getParcelable(SAVE_STATE_ICON);
             if (bitmap != null) {
                 this.mDialogIcon = new BitmapDrawable(getResources(), bitmap);
                 return;
@@ -170,14 +170,14 @@ public abstract class PreferenceDialogFragment extends DialogFragment implements
     @Override // android.app.DialogFragment, android.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putCharSequence("PreferenceDialogFragment.title", this.mDialogTitle);
-        bundle.putCharSequence("PreferenceDialogFragment.positiveText", this.mPositiveButtonText);
-        bundle.putCharSequence("PreferenceDialogFragment.negativeText", this.mNegativeButtonText);
-        bundle.putCharSequence("PreferenceDialogFragment.message", this.mDialogMessage);
-        bundle.putInt("PreferenceDialogFragment.layout", this.mDialogLayoutRes);
+        bundle.putCharSequence(SAVE_STATE_TITLE, this.mDialogTitle);
+        bundle.putCharSequence(SAVE_STATE_POSITIVE_TEXT, this.mPositiveButtonText);
+        bundle.putCharSequence(SAVE_STATE_NEGATIVE_TEXT, this.mNegativeButtonText);
+        bundle.putCharSequence(SAVE_STATE_MESSAGE, this.mDialogMessage);
+        bundle.putInt(SAVE_STATE_LAYOUT, this.mDialogLayoutRes);
         BitmapDrawable bitmapDrawable = this.mDialogIcon;
         if (bitmapDrawable != null) {
-            bundle.putParcelable("PreferenceDialogFragment.icon", bitmapDrawable.getBitmap());
+            bundle.putParcelable(SAVE_STATE_ICON, bitmapDrawable.getBitmap());
         }
     }
 }
diff --git a/app/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java b/app/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
index d924294286..d7feab1b3a 100644
--- a/app/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
@@ -103,12 +103,12 @@ public abstract class PreferenceDialogFragmentCompat extends DialogFragment impl
                 this.mDialogIcon = new BitmapDrawable(getResources(), createBitmap);
                 return;
             }
-            this.mDialogTitle = bundle.getCharSequence("PreferenceDialogFragment.title");
-            this.mPositiveButtonText = bundle.getCharSequence("PreferenceDialogFragment.positiveText");
-            this.mNegativeButtonText = bundle.getCharSequence("PreferenceDialogFragment.negativeText");
-            this.mDialogMessage = bundle.getCharSequence("PreferenceDialogFragment.message");
-            this.mDialogLayoutRes = bundle.getInt("PreferenceDialogFragment.layout", 0);
-            Bitmap bitmap = (Bitmap) bundle.getParcelable("PreferenceDialogFragment.icon");
+            this.mDialogTitle = bundle.getCharSequence(SAVE_STATE_TITLE);
+            this.mPositiveButtonText = bundle.getCharSequence(SAVE_STATE_POSITIVE_TEXT);
+            this.mNegativeButtonText = bundle.getCharSequence(SAVE_STATE_NEGATIVE_TEXT);
+            this.mDialogMessage = bundle.getCharSequence(SAVE_STATE_MESSAGE);
+            this.mDialogLayoutRes = bundle.getInt(SAVE_STATE_LAYOUT, 0);
+            Bitmap bitmap = (Bitmap) bundle.getParcelable(SAVE_STATE_ICON);
             if (bitmap != null) {
                 this.mDialogIcon = new BitmapDrawable(getResources(), bitmap);
                 return;
@@ -161,14 +161,14 @@ public abstract class PreferenceDialogFragmentCompat extends DialogFragment impl
     @Override // androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putCharSequence("PreferenceDialogFragment.title", this.mDialogTitle);
-        bundle.putCharSequence("PreferenceDialogFragment.positiveText", this.mPositiveButtonText);
-        bundle.putCharSequence("PreferenceDialogFragment.negativeText", this.mNegativeButtonText);
-        bundle.putCharSequence("PreferenceDialogFragment.message", this.mDialogMessage);
-        bundle.putInt("PreferenceDialogFragment.layout", this.mDialogLayoutRes);
+        bundle.putCharSequence(SAVE_STATE_TITLE, this.mDialogTitle);
+        bundle.putCharSequence(SAVE_STATE_POSITIVE_TEXT, this.mPositiveButtonText);
+        bundle.putCharSequence(SAVE_STATE_NEGATIVE_TEXT, this.mNegativeButtonText);
+        bundle.putCharSequence(SAVE_STATE_MESSAGE, this.mDialogMessage);
+        bundle.putInt(SAVE_STATE_LAYOUT, this.mDialogLayoutRes);
         BitmapDrawable bitmapDrawable = this.mDialogIcon;
         if (bitmapDrawable != null) {
-            bundle.putParcelable("PreferenceDialogFragment.icon", bitmapDrawable.getBitmap());
+            bundle.putParcelable(SAVE_STATE_ICON, bitmapDrawable.getBitmap());
         }
     }
 }
diff --git a/app/src/main/java/androidx/preference/PreferenceFragment.java b/app/src/main/java/androidx/preference/PreferenceFragment.java
index c8a1e8ed4f..295b8c0bcd 100644
--- a/app/src/main/java/androidx/preference/PreferenceFragment.java
+++ b/app/src/main/java/androidx/preference/PreferenceFragment.java
@@ -353,7 +353,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
     @Override // android.app.Fragment
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
         Context context = this.mStyledContext;
-        TypedArray obtainStyledAttributes = context.obtainStyledAttributes(null, R.styleable.PreferenceFragment, TypedArrayUtils.getAttr(context, R.attr.preferenceFragmentStyle, 16844038), 0);
+        TypedArray obtainStyledAttributes = context.obtainStyledAttributes(null, R.styleable.PreferenceFragment, TypedArrayUtils.getAttr(context, R.attr.preferenceFragmentStyle, AndroidResources.ANDROID_R_PREFERENCE_FRAGMENT_STYLE), 0);
         this.mLayoutResId = obtainStyledAttributes.getResourceId(R.styleable.PreferenceFragment_android_layout, this.mLayoutResId);
         Drawable drawable = obtainStyledAttributes.getDrawable(R.styleable.PreferenceFragment_android_divider);
         int dimensionPixelSize = obtainStyledAttributes.getDimensionPixelSize(R.styleable.PreferenceFragment_android_dividerHeight, -1);
@@ -361,7 +361,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
         obtainStyledAttributes.recycle();
         LayoutInflater cloneInContext = layoutInflater.cloneInContext(this.mStyledContext);
         View inflate = cloneInContext.inflate(this.mLayoutResId, viewGroup, false);
-        View findViewById = inflate.findViewById(16908351);
+        View findViewById = inflate.findViewById(AndroidResources.ANDROID_R_LIST_CONTAINER);
         if (findViewById instanceof ViewGroup) {
             ViewGroup viewGroup2 = (ViewGroup) findViewById;
             RecyclerView onCreateRecyclerView = onCreateRecyclerView(cloneInContext, viewGroup2, bundle);
@@ -403,7 +403,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
         if (!onPreferenceDisplayDialog && (getActivity() instanceof OnPreferenceDisplayDialogCallback)) {
             onPreferenceDisplayDialog = ((OnPreferenceDisplayDialogCallback) getActivity()).onPreferenceDisplayDialog(this, preference);
         }
-        if (!onPreferenceDisplayDialog && getFragmentManager().findFragmentByTag("androidx.preference.PreferenceFragment.DIALOG") == null) {
+        if (!onPreferenceDisplayDialog && getFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_TAG) == null) {
             if (preference instanceof EditTextPreference) {
                 dialogFragment = EditTextPreferenceDialogFragment.newInstance(preference.getKey());
             } else if (preference instanceof ListPreference) {
@@ -414,7 +414,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
                 throw new IllegalArgumentException("Tried to display dialog for unknown preference type. Did you forget to override onDisplayPreferenceDialog()?");
             }
             dialogFragment.setTargetFragment(this, 0);
-            dialogFragment.show(getFragmentManager(), "androidx.preference.PreferenceFragment.DIALOG");
+            dialogFragment.show(getFragmentManager(), DIALOG_FRAGMENT_TAG);
         }
     }
 
@@ -446,7 +446,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
         if (preferenceScreen != null) {
             Bundle bundle2 = new Bundle();
             preferenceScreen.saveHierarchyState(bundle2);
-            bundle.putBundle("android:preferences", bundle2);
+            bundle.putBundle(PREFERENCES_TAG, bundle2);
         }
     }
 
@@ -473,7 +473,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
         Bundle bundle2;
         PreferenceScreen preferenceScreen;
         super.onViewCreated(view, bundle);
-        if (!(bundle == null || (bundle2 = bundle.getBundle("android:preferences")) == null || (preferenceScreen = getPreferenceScreen()) == null)) {
+        if (!(bundle == null || (bundle2 = bundle.getBundle(PREFERENCES_TAG)) == null || (preferenceScreen = getPreferenceScreen()) == null)) {
             preferenceScreen.restoreHierarchyState(bundle2);
         }
         if (this.mHavePrefs) {
diff --git a/app/src/main/java/androidx/preference/PreferenceFragmentCompat.java b/app/src/main/java/androidx/preference/PreferenceFragmentCompat.java
index 67a0ff43ed..d387562cd6 100644
--- a/app/src/main/java/androidx/preference/PreferenceFragmentCompat.java
+++ b/app/src/main/java/androidx/preference/PreferenceFragmentCompat.java
@@ -349,7 +349,7 @@ public abstract class PreferenceFragmentCompat extends Fragment implements Prefe
         obtainStyledAttributes.recycle();
         LayoutInflater cloneInContext = layoutInflater.cloneInContext(getContext());
         View inflate = cloneInContext.inflate(this.mLayoutResId, viewGroup, false);
-        View findViewById = inflate.findViewById(16908351);
+        View findViewById = inflate.findViewById(AndroidResources.ANDROID_R_LIST_CONTAINER);
         if (findViewById instanceof ViewGroup) {
             ViewGroup viewGroup2 = (ViewGroup) findViewById;
             RecyclerView onCreateRecyclerView = onCreateRecyclerView(cloneInContext, viewGroup2, bundle);
@@ -390,7 +390,7 @@ public abstract class PreferenceFragmentCompat extends Fragment implements Prefe
         if (!onPreferenceDisplayDialog && (getActivity() instanceof OnPreferenceDisplayDialogCallback)) {
             onPreferenceDisplayDialog = ((OnPreferenceDisplayDialogCallback) getActivity()).onPreferenceDisplayDialog(this, preference);
         }
-        if (!onPreferenceDisplayDialog && getParentFragmentManager().findFragmentByTag("androidx.preference.PreferenceFragment.DIALOG") == null) {
+        if (!onPreferenceDisplayDialog && getParentFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_TAG) == null) {
             if (preference instanceof EditTextPreference) {
                 dialogFragment = EditTextPreferenceDialogFragmentCompat.newInstance(preference.getKey());
             } else if (preference instanceof ListPreference) {
@@ -404,7 +404,7 @@ public abstract class PreferenceFragmentCompat extends Fragment implements Prefe
                 throw new IllegalArgumentException(K.toString());
             }
             dialogFragment.setTargetFragment(this, 0);
-            dialogFragment.show(getParentFragmentManager(), "androidx.preference.PreferenceFragment.DIALOG");
+            dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
         }
     }
 
@@ -427,7 +427,7 @@ public abstract class PreferenceFragmentCompat extends Fragment implements Prefe
         if (onPreferenceStartFragment) {
             return true;
         }
-        Log.w("PreferenceFragment", "onPreferenceStartFragment is not implemented in the parent activity - attempting to use a fallback implementation. You should implement this method so that you can configure the new fragment that will be displayed, and set a transition between the fragments.");
+        Log.w(TAG, "onPreferenceStartFragment is not implemented in the parent activity - attempting to use a fallback implementation. You should implement this method so that you can configure the new fragment that will be displayed, and set a transition between the fragments.");
         FragmentManager supportFragmentManager = requireActivity().getSupportFragmentManager();
         Bundle extras = preference.getExtras();
         Fragment instantiate = supportFragmentManager.getFragmentFactory().instantiate(requireActivity().getClassLoader(), preference.getFragment());
@@ -444,7 +444,7 @@ public abstract class PreferenceFragmentCompat extends Fragment implements Prefe
         if (preferenceScreen != null) {
             Bundle bundle2 = new Bundle();
             preferenceScreen.saveHierarchyState(bundle2);
-            bundle.putBundle("android:preferences", bundle2);
+            bundle.putBundle(PREFERENCES_TAG, bundle2);
         }
     }
 
@@ -471,7 +471,7 @@ public abstract class PreferenceFragmentCompat extends Fragment implements Prefe
         Bundle bundle2;
         PreferenceScreen preferenceScreen;
         super.onViewCreated(view, bundle);
-        if (!(bundle == null || (bundle2 = bundle.getBundle("android:preferences")) == null || (preferenceScreen = getPreferenceScreen()) == null)) {
+        if (!(bundle == null || (bundle2 = bundle.getBundle(PREFERENCES_TAG)) == null || (preferenceScreen = getPreferenceScreen()) == null)) {
             preferenceScreen.restoreHierarchyState(bundle2);
         }
         if (this.mHavePrefs) {
diff --git a/app/src/main/java/androidx/preference/PreferenceGroup.java b/app/src/main/java/androidx/preference/PreferenceGroup.java
index b36ba71fac..c9c8677e0b 100644
--- a/app/src/main/java/androidx/preference/PreferenceGroup.java
+++ b/app/src/main/java/androidx/preference/PreferenceGroup.java
@@ -156,7 +156,7 @@ public abstract class PreferenceGroup extends Preference {
             }
             String key = preference.getKey();
             if (preferenceGroup.findPreference(key) != null) {
-                Log.e("PreferenceGroup", "Found duplicated key: \"" + key + "\". This can cause unintended behaviour, please use unique keys for every preference.");
+                Log.e(TAG, "Found duplicated key: \"" + key + "\". This can cause unintended behaviour, please use unique keys for every preference.");
             }
         }
         if (preference.getOrder() == Integer.MAX_VALUE) {
@@ -343,7 +343,7 @@ public abstract class PreferenceGroup extends Preference {
 
     public void setInitialExpandedChildrenCount(int i) {
         if (i != Integer.MAX_VALUE && !hasKey()) {
-            Log.e("PreferenceGroup", getClass().getSimpleName() + " should have a key defined if it contains an expandable preference");
+            Log.e(TAG, getClass().getSimpleName() + " should have a key defined if it contains an expandable preference");
         }
         this.mInitialExpandedChildrenCount = i;
     }
diff --git a/app/src/main/java/androidx/preference/PreferenceInflater.java b/app/src/main/java/androidx/preference/PreferenceInflater.java
index bc55451329..2eb1d11de3 100644
--- a/app/src/main/java/androidx/preference/PreferenceInflater.java
+++ b/app/src/main/java/androidx/preference/PreferenceInflater.java
@@ -129,7 +129,7 @@ public class PreferenceInflater {
             }
             if (next == 2) {
                 String name = xmlPullParser.getName();
-                if ("intent".equals(name)) {
+                if (INTENT_TAG_NAME.equals(name)) {
                     try {
                         preference.setIntent(Intent.parseIntent(getContext().getResources(), xmlPullParser, attributeSet));
                     } catch (IOException e) {
@@ -137,8 +137,8 @@ public class PreferenceInflater {
                         xmlPullParserException.initCause(e);
                         throw xmlPullParserException;
                     }
-                } else if ("extra".equals(name)) {
-                    getContext().getResources().parseBundleExtra("extra", attributeSet, preference.getExtras());
+                } else if (EXTRA_TAG_NAME.equals(name)) {
+                    getContext().getResources().parseBundleExtra(EXTRA_TAG_NAME, attributeSet, preference.getExtras());
                     try {
                         skipCurrentTag(xmlPullParser);
                     } catch (IOException e2) {
diff --git a/app/src/main/java/androidx/preference/PreferenceManager.java b/app/src/main/java/androidx/preference/PreferenceManager.java
index 35e0944b90..ec6886c985 100644
--- a/app/src/main/java/androidx/preference/PreferenceManager.java
+++ b/app/src/main/java/androidx/preference/PreferenceManager.java
@@ -98,13 +98,13 @@ public class PreferenceManager {
     }
 
     public static void setDefaultValues(Context context, String str, int i, int i2, boolean z2) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences("_has_set_default_values", 0);
-        if (z2 || !sharedPreferences.getBoolean("_has_set_default_values", false)) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(KEY_HAS_SET_DEFAULT_VALUES, 0);
+        if (z2 || !sharedPreferences.getBoolean(KEY_HAS_SET_DEFAULT_VALUES, false)) {
             PreferenceManager preferenceManager = new PreferenceManager(context);
             preferenceManager.setSharedPreferencesName(str);
             preferenceManager.setSharedPreferencesMode(i);
             preferenceManager.inflateFromResource(context, i2, null);
-            sharedPreferences.edit().putBoolean("_has_set_default_values", true).apply();
+            sharedPreferences.edit().putBoolean(KEY_HAS_SET_DEFAULT_VALUES, true).apply();
         }
     }
 
diff --git a/app/src/main/java/androidx/preference/PreferenceViewHolder.java b/app/src/main/java/androidx/preference/PreferenceViewHolder.java
index 84cc3b2bb3..799cbe7c6b 100644
--- a/app/src/main/java/androidx/preference/PreferenceViewHolder.java
+++ b/app/src/main/java/androidx/preference/PreferenceViewHolder.java
@@ -19,7 +19,7 @@ public class PreferenceViewHolder extends RecyclerView.ViewHolder {
         sparseArray.put(16908294, view.findViewById(16908294));
         int i = R.id.icon_frame;
         sparseArray.put(i, view.findViewById(i));
-        sparseArray.put(16908350, view.findViewById(16908350));
+        sparseArray.put(AndroidResources.ANDROID_R_ICON_FRAME, view.findViewById(AndroidResources.ANDROID_R_ICON_FRAME));
     }
 
     @RestrictTo({RestrictTo.Scope.TESTS})
diff --git a/app/src/main/java/androidx/preference/SeekBarPreference.java b/app/src/main/java/androidx/preference/SeekBarPreference.java
index 573c7ba3ad..542fe1f67e 100644
--- a/app/src/main/java/androidx/preference/SeekBarPreference.java
+++ b/app/src/main/java/androidx/preference/SeekBarPreference.java
@@ -78,7 +78,7 @@ public class SeekBarPreference extends Preference {
             if (seekBar != null) {
                 return seekBar.onKeyDown(i, keyEvent);
             }
-            Log.e("SeekBarPreference", "SeekBar view is null and hence cannot be adjusted.");
+            Log.e(SeekBarPreference.TAG, "SeekBar view is null and hence cannot be adjusted.");
             return false;
         }
     }
@@ -210,7 +210,7 @@ public class SeekBarPreference extends Preference {
         }
         SeekBar seekBar = this.mSeekBar;
         if (seekBar == null) {
-            Log.e("SeekBarPreference", "SeekBar view is null in onBindViewHolder.");
+            Log.e(TAG, "SeekBar view is null in onBindViewHolder.");
             return;
         }
         seekBar.setOnSeekBarChangeListener(this.mSeekBarChangeListener);
diff --git a/app/src/main/java/androidx/preference/SwitchPreference.java b/app/src/main/java/androidx/preference/SwitchPreference.java
index 5249a4ab07..065c0f741c 100644
--- a/app/src/main/java/androidx/preference/SwitchPreference.java
+++ b/app/src/main/java/androidx/preference/SwitchPreference.java
@@ -71,7 +71,7 @@ public class SwitchPreference extends TwoStatePreference {
 
     private void syncViewIfAccessibilityEnabled(View view) {
         if (((AccessibilityManager) getContext().getSystemService("accessibility")).isEnabled()) {
-            syncSwitchView(view.findViewById(16908352));
+            syncSwitchView(view.findViewById(AndroidResources.ANDROID_R_SWITCH_WIDGET));
             syncSummaryView(view.findViewById(16908304));
         }
     }
@@ -87,7 +87,7 @@ public class SwitchPreference extends TwoStatePreference {
     @Override // androidx.preference.Preference
     public void onBindViewHolder(PreferenceViewHolder preferenceViewHolder) {
         super.onBindViewHolder(preferenceViewHolder);
-        syncSwitchView(preferenceViewHolder.findViewById(16908352));
+        syncSwitchView(preferenceViewHolder.findViewById(AndroidResources.ANDROID_R_SWITCH_WIDGET));
         syncSummaryView(preferenceViewHolder);
     }
 
diff --git a/app/src/main/java/androidx/print/PrintHelper.java b/app/src/main/java/androidx/print/PrintHelper.java
index 724ef42e19..ead5b8db5a 100644
--- a/app/src/main/java/androidx/print/PrintHelper.java
+++ b/app/src/main/java/androidx/print/PrintHelper.java
@@ -142,7 +142,7 @@ public final class PrintHelper {
             } else if (th == null) {
                 this.val$writeResultCallback.onWriteFinished(new PageRange[]{PageRange.ALL_PAGES});
             } else {
-                Log.e("PrintHelper", "Error writing printed content", th);
+                Log.e(PrintHelper.LOG_TAG, "Error writing printed content", th);
                 this.val$writeResultCallback.onWriteFailed(null);
             }
         }
@@ -394,7 +394,7 @@ public final class PrintHelper {
                     try {
                         openInputStream.close();
                     } catch (IOException e) {
-                        Log.w("PrintHelper", "close fail ", e);
+                        Log.w(LOG_TAG, "close fail ", e);
                     }
                 }
                 return decodeStream;
@@ -405,7 +405,7 @@ public final class PrintHelper {
                     try {
                         inputStream.close();
                     } catch (IOException e2) {
-                        Log.w("PrintHelper", "close fail ", e2);
+                        Log.w(LOG_TAG, "close fail ", e2);
                     }
                 }
                 throw th;
@@ -451,7 +451,7 @@ public final class PrintHelper {
         if (i > 0 && i2 > 0) {
             int max = Math.max(i, i2);
             int i3 = 1;
-            while (max > 3500) {
+            while (max > MAX_PRINT_SIZE) {
                 max >>>= 1;
                 i3 <<= 1;
             }
diff --git a/app/src/main/java/androidx/recyclerview/widget/AsyncListUtil.java b/app/src/main/java/androidx/recyclerview/widget/AsyncListUtil.java
index feb7f80cdd..0bc6596e2b 100644
--- a/app/src/main/java/androidx/recyclerview/widget/AsyncListUtil.java
+++ b/app/src/main/java/androidx/recyclerview/widget/AsyncListUtil.java
@@ -59,7 +59,7 @@ public class AsyncListUtil<T> {
             if (addOrReplace != null) {
                 StringBuilder K = a.K("duplicate tile @");
                 K.append(addOrReplace.mStartPosition);
-                Log.e("AsyncListUtil", K.toString());
+                Log.e(AsyncListUtil.TAG, K.toString());
                 AsyncListUtil.this.mBackgroundProxy.recycleTile(addOrReplace);
             }
             int i2 = tile.mStartPosition + tile.mItemCount;
@@ -80,7 +80,7 @@ public class AsyncListUtil<T> {
             if (isRequestedGeneration(i)) {
                 TileList.Tile<T> removeAtPos = AsyncListUtil.this.mTileList.removeAtPos(i2);
                 if (removeAtPos == null) {
-                    Log.e("AsyncListUtil", "tile not found @" + i2);
+                    Log.e(AsyncListUtil.TAG, "tile not found @" + i2);
                     return;
                 }
                 AsyncListUtil.this.mBackgroundProxy.recycleTile(removeAtPos);
@@ -163,7 +163,7 @@ public class AsyncListUtil<T> {
         private void log(String str, Object... objArr) {
             StringBuilder K = a.K("[BKGR] ");
             K.append(String.format(str, objArr));
-            Log.d("AsyncListUtil", K.toString());
+            Log.d(AsyncListUtil.TAG, K.toString());
         }
 
         private void removeTile(int i) {
@@ -310,7 +310,7 @@ public class AsyncListUtil<T> {
     public void log(String str, Object... objArr) {
         StringBuilder K = a.K("[MAIN] ");
         K.append(String.format(str, objArr));
-        Log.d("AsyncListUtil", K.toString());
+        Log.d(TAG, K.toString());
     }
 
     public void onRangeChanged() {
diff --git a/app/src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java b/app/src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java
index 65f33305ae..b4ea4b42fb 100644
--- a/app/src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java
+++ b/app/src/main/java/androidx/recyclerview/widget/DividerItemDecoration.java
@@ -24,7 +24,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
         Drawable drawable = obtainStyledAttributes.getDrawable(0);
         this.mDivider = drawable;
         if (drawable == null) {
-            Log.w("DividerItem", "@android:attr/listDivider was not set in the theme used for this DividerItemDecoration. Please set that attribute all call setDrawable()");
+            Log.w(TAG, "@android:attr/listDivider was not set in the theme used for this DividerItemDecoration. Please set that attribute all call setDrawable()");
         }
         obtainStyledAttributes.recycle();
         setOrientation(i);
diff --git a/app/src/main/java/androidx/recyclerview/widget/FastScroller.java b/app/src/main/java/androidx/recyclerview/widget/FastScroller.java
index 1a2a78a904..07f6e1c6f3 100644
--- a/app/src/main/java/androidx/recyclerview/widget/FastScroller.java
+++ b/app/src/main/java/androidx/recyclerview/widget/FastScroller.java
@@ -449,9 +449,9 @@ public class FastScroller extends RecyclerView.ItemDecoration implements Recycle
         }
         if (this.mState == 2 && i != 2) {
             this.mVerticalThumbDrawable.setState(EMPTY_STATE_SET);
-            resetHideDelay(1200);
+            resetHideDelay(HIDE_DELAY_AFTER_DRAGGING_MS);
         } else if (i == 1) {
-            resetHideDelay(1500);
+            resetHideDelay(HIDE_DELAY_AFTER_VISIBLE_MS);
         }
         this.mState = i;
     }
diff --git a/app/src/main/java/androidx/recyclerview/widget/GapWorker.java b/app/src/main/java/androidx/recyclerview/widget/GapWorker.java
index e5a951b5c2..d9f26fb8cb 100644
--- a/app/src/main/java/androidx/recyclerview/widget/GapWorker.java
+++ b/app/src/main/java/androidx/recyclerview/widget/GapWorker.java
@@ -178,7 +178,7 @@ public final class GapWorker implements Runnable {
     }
 
     private void flushTaskWithDeadline(Task task, long j) {
-        RecyclerView.ViewHolder prefetchPositionWithDeadline = prefetchPositionWithDeadline(task.view, task.position, task.immediate ? Long.MAX_VALUE : j);
+        RecyclerView.ViewHolder prefetchPositionWithDeadline = prefetchPositionWithDeadline(task.view, task.position, task.immediate ? RecyclerView.FOREVER_NS : j);
         if (prefetchPositionWithDeadline != null && prefetchPositionWithDeadline.mNestedRecyclerView != null && prefetchPositionWithDeadline.isBound() && !prefetchPositionWithDeadline.isInvalid()) {
             prefetchInnerRecyclerViewWithDeadline(prefetchPositionWithDeadline.mNestedRecyclerView.get(), j);
         }
@@ -216,7 +216,7 @@ public final class GapWorker implements Runnable {
             layoutPrefetchRegistryImpl.collectPrefetchPositionsFromView(recyclerView, true);
             if (layoutPrefetchRegistryImpl.mCount != 0) {
                 try {
-                    TraceCompat.beginSection("RV Nested Prefetch");
+                    TraceCompat.beginSection(RecyclerView.TRACE_NESTED_PREFETCH_TAG);
                     recyclerView.mState.prepareForNestedPrefetch(recyclerView.mAdapter);
                     for (int i = 0; i < layoutPrefetchRegistryImpl.mCount * 2; i += 2) {
                         prefetchPositionWithDeadline(recyclerView, layoutPrefetchRegistryImpl.mPrefetchArray[i], j);
@@ -275,7 +275,7 @@ public final class GapWorker implements Runnable {
     public void run() {
         long j = 0;
         try {
-            TraceCompat.beginSection("RV Prefetch");
+            TraceCompat.beginSection(RecyclerView.TRACE_PREFETCH_TAG);
             if (!this.mRecyclerViews.isEmpty()) {
                 int size = this.mRecyclerViews.size();
                 long j2 = 0;
diff --git a/app/src/main/java/androidx/recyclerview/widget/GridLayoutManager.java b/app/src/main/java/androidx/recyclerview/widget/GridLayoutManager.java
index adc409b683..3e3ac48e87 100644
--- a/app/src/main/java/androidx/recyclerview/widget/GridLayoutManager.java
+++ b/app/src/main/java/androidx/recyclerview/widget/GridLayoutManager.java
@@ -6,6 +6,7 @@ import android.util.AttributeSet;
 import android.util.SparseIntArray;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -385,7 +386,7 @@ public class GridLayoutManager extends LinearLayoutManager {
         if (convertPreLayoutPositionToPostLayout != -1) {
             return this.mSpanSizeLookup.getCachedSpanGroupIndex(convertPreLayoutPositionToPostLayout, this.mSpanCount);
         }
-        a.d0("Cannot find span size for pre layout position. ", i, "GridLayoutManager");
+        a.d0("Cannot find span size for pre layout position. ", i, TAG);
         return 0;
     }
 
@@ -401,7 +402,7 @@ public class GridLayoutManager extends LinearLayoutManager {
         if (convertPreLayoutPositionToPostLayout != -1) {
             return this.mSpanSizeLookup.getCachedSpanIndex(convertPreLayoutPositionToPostLayout, this.mSpanCount);
         }
-        a.d0("Cannot find span size for pre layout position. It is not cached, not in the adapter. Pos:", i, "GridLayoutManager");
+        a.d0("Cannot find span size for pre layout position. It is not cached, not in the adapter. Pos:", i, TAG);
         return 0;
     }
 
@@ -417,7 +418,7 @@ public class GridLayoutManager extends LinearLayoutManager {
         if (convertPreLayoutPositionToPostLayout != -1) {
             return this.mSpanSizeLookup.getSpanSize(convertPreLayoutPositionToPostLayout);
         }
-        a.d0("Cannot find span size for pre layout position. It is not cached, not in the adapter. Pos:", i, "GridLayoutManager");
+        a.d0("Cannot find span size for pre layout position. It is not cached, not in the adapter. Pos:", i, TAG);
         return 1;
     }
 
@@ -674,7 +675,7 @@ public class GridLayoutManager extends LinearLayoutManager {
             i16 = 0;
             for (int i20 = 0; i20 < i13; i20++) {
                 View view2 = this.mSet[i20];
-                measureChild(view2, 1073741824, true);
+                measureChild(view2, (int) BasicMeasure.EXACTLY, true);
                 int decoratedMeasurement2 = this.mOrientationHelper.getDecoratedMeasurement(view2);
                 if (decoratedMeasurement2 > i16) {
                     i16 = decoratedMeasurement2;
@@ -690,11 +691,11 @@ public class GridLayoutManager extends LinearLayoutManager {
                 int i23 = rect.left + rect.right + ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin + ((ViewGroup.MarginLayoutParams) layoutParams).rightMargin;
                 int spaceForSpanRange = getSpaceForSpanRange(layoutParams.mSpanIndex, layoutParams.mSpanSize);
                 if (this.mOrientation == 1) {
-                    i10 = RecyclerView.LayoutManager.getChildMeasureSpec(spaceForSpanRange, 1073741824, i23, ((ViewGroup.MarginLayoutParams) layoutParams).width, false);
-                    i9 = View.MeasureSpec.makeMeasureSpec(i16 - i22, 1073741824);
+                    i10 = RecyclerView.LayoutManager.getChildMeasureSpec(spaceForSpanRange, BasicMeasure.EXACTLY, i23, ((ViewGroup.MarginLayoutParams) layoutParams).width, false);
+                    i9 = View.MeasureSpec.makeMeasureSpec(i16 - i22, BasicMeasure.EXACTLY);
                 } else {
-                    int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i16 - i23, 1073741824);
-                    i9 = RecyclerView.LayoutManager.getChildMeasureSpec(spaceForSpanRange, 1073741824, i22, ((ViewGroup.MarginLayoutParams) layoutParams).height, false);
+                    int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i16 - i23, BasicMeasure.EXACTLY);
+                    i9 = RecyclerView.LayoutManager.getChildMeasureSpec(spaceForSpanRange, BasicMeasure.EXACTLY, i22, ((ViewGroup.MarginLayoutParams) layoutParams).height, false);
                     i10 = makeMeasureSpec;
                 }
                 measureChildWithDecorationsAndMargin(view3, i10, i9, true);
diff --git a/app/src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java b/app/src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java
index df6c1a63c4..c527b4d6bc 100644
--- a/app/src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java
+++ b/app/src/main/java/androidx/recyclerview/widget/ItemTouchHelper.java
@@ -324,7 +324,7 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
 
         public static int convertToRelativeDirection(int i, int i2) {
             int i3;
-            int i4 = i & 789516;
+            int i4 = i & ABS_HORIZONTAL_DIR_FLAGS;
             if (i4 == 0) {
                 return i;
             }
@@ -334,7 +334,7 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
             } else {
                 int i6 = i4 << 1;
                 i5 |= -789517 & i6;
-                i3 = (i6 & 789516) << 2;
+                i3 = (i6 & ABS_HORIZONTAL_DIR_FLAGS) << 2;
             }
             return i5 | i3;
         }
@@ -408,7 +408,7 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
 
         public int convertToAbsoluteDirection(int i, int i2) {
             int i3;
-            int i4 = i & 3158064;
+            int i4 = i & RELATIVE_DIR_FLAGS;
             if (i4 == 0) {
                 return i;
             }
@@ -418,7 +418,7 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
             } else {
                 int i6 = i4 >> 1;
                 i5 |= -3158065 & i6;
-                i3 = (i6 & 3158064) >> 2;
+                i3 = (i6 & RELATIVE_DIR_FLAGS) >> 2;
             }
             return i5 | i3;
         }
@@ -455,7 +455,7 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
         }
 
         public boolean hasDragFlag(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-            return (getAbsoluteMovementFlags(recyclerView, viewHolder) & 16711680) != 0;
+            return (getAbsoluteMovementFlags(recyclerView, viewHolder) & ItemTouchHelper.ACTION_MODE_DRAG_MASK) != 0;
         }
 
         public boolean hasSwipeFlag(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
@@ -465,7 +465,7 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
         public int interpolateOutOfBoundsScroll(@NonNull RecyclerView recyclerView, int i, int i2, int i3, long j) {
             float f = 1.0f;
             int interpolation = (int) (sDragViewScrollCapInterpolator.getInterpolation(Math.min(1.0f, (((float) Math.abs(i2)) * 1.0f) / ((float) i))) * ((float) (((int) Math.signum((float) i2)) * getMaxDragScroll(recyclerView))));
-            if (j <= 2000) {
+            if (j <= DRAG_SCROLL_ACCELERATION_LIMIT_TIME_MS) {
                 f = ((float) j) / 2000.0f;
             }
             int interpolation2 = (int) (sDragScrollInterpolator.getInterpolation(f) * ((float) interpolation));
@@ -1343,9 +1343,9 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
 
     public void startDrag(@NonNull RecyclerView.ViewHolder viewHolder) {
         if (!this.mCallback.hasDragFlag(this.mRecyclerView, viewHolder)) {
-            Log.e("ItemTouchHelper", "Start drag has been called but dragging is not enabled");
+            Log.e(TAG, "Start drag has been called but dragging is not enabled");
         } else if (viewHolder.itemView.getParent() != this.mRecyclerView) {
-            Log.e("ItemTouchHelper", "Start drag has been called with a view holder which is not a child of the RecyclerView which is controlled by this ItemTouchHelper.");
+            Log.e(TAG, "Start drag has been called with a view holder which is not a child of the RecyclerView which is controlled by this ItemTouchHelper.");
         } else {
             obtainVelocityTracker();
             this.mDy = 0.0f;
@@ -1356,9 +1356,9 @@ public class ItemTouchHelper extends RecyclerView.ItemDecoration implements Recy
 
     public void startSwipe(@NonNull RecyclerView.ViewHolder viewHolder) {
         if (!this.mCallback.hasSwipeFlag(this.mRecyclerView, viewHolder)) {
-            Log.e("ItemTouchHelper", "Start swipe has been called but swiping is not enabled");
+            Log.e(TAG, "Start swipe has been called but swiping is not enabled");
         } else if (viewHolder.itemView.getParent() != this.mRecyclerView) {
-            Log.e("ItemTouchHelper", "Start swipe has been called with a view holder which is not a child of the RecyclerView controlled by this ItemTouchHelper.");
+            Log.e(TAG, "Start swipe has been called with a view holder which is not a child of the RecyclerView controlled by this ItemTouchHelper.");
         } else {
             obtainVelocityTracker();
             this.mDy = 0.0f;
diff --git a/app/src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java b/app/src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java
index 369a84eca6..c5b4a9c873 100644
--- a/app/src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java
+++ b/app/src/main/java/androidx/recyclerview/widget/LinearLayoutManager.java
@@ -11,6 +11,7 @@ import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
@@ -200,7 +201,7 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements I
             K.append(this.mOffset);
             K.append(", layoutDir:");
             K.append(this.mLayoutDirection);
-            Log.d("LLM#LayoutState", K.toString());
+            Log.d(TAG, K.toString());
         }
 
         public View next(RecyclerView.Recycler recycler) {
@@ -466,16 +467,16 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements I
     }
 
     private void logChildren() {
-        Log.d("LinearLayoutManager", "internal representation of views on the screen");
+        Log.d(TAG, "internal representation of views on the screen");
         for (int i = 0; i < getChildCount(); i++) {
             View childAt = getChildAt(i);
             StringBuilder K = a.K("item ");
             K.append(getPosition(childAt));
             K.append(", coord:");
             K.append(this.mOrientationHelper.getDecoratedStart(childAt));
-            Log.d("LinearLayoutManager", K.toString());
+            Log.d(TAG, K.toString());
         }
-        Log.d("LinearLayoutManager", "==============");
+        Log.d(TAG, "==============");
     }
 
     private void recycleByLayoutState(RecyclerView.Recycler recycler, LayoutState layoutState) {
@@ -977,7 +978,7 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements I
             i3 = 16388;
         } else {
             i4 = 4161;
-            i3 = 4097;
+            i3 = FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
         }
         return this.mOrientation == 0 ? this.mHorizontalBoundCheck.findOneViewWithinBoundFlags(i, i2, i4, i3) : this.mVerticalBoundCheck.findOneViewWithinBoundFlags(i, i2, i4, i3);
     }
@@ -1172,7 +1173,7 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements I
             return null;
         }
         ensureLayoutState();
-        updateLayoutState(convertFocusDirectionToLayoutDirection, (int) (((float) this.mOrientationHelper.getTotalSpace()) * 0.33333334f), false, state);
+        updateLayoutState(convertFocusDirectionToLayoutDirection, (int) (((float) this.mOrientationHelper.getTotalSpace()) * MAX_SCROLL_FACTOR), false, state);
         LayoutState layoutState = this.mLayoutState;
         layoutState.mScrollingOffset = Integer.MIN_VALUE;
         layoutState.mRecycle = false;
@@ -1534,7 +1535,7 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements I
     public void validateChildOrder() {
         StringBuilder K = a.K("validating child count ");
         K.append(getChildCount());
-        Log.d("LinearLayoutManager", K.toString());
+        Log.d(TAG, K.toString());
         boolean z2 = true;
         if (getChildCount() >= 1) {
             int position = getPosition(getChildAt(0));
diff --git a/app/src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java b/app/src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java
index db1dd58392..58fa77d4e5 100644
--- a/app/src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java
+++ b/app/src/main/java/androidx/recyclerview/widget/LinearSmoothScroller.java
@@ -85,7 +85,7 @@ public class LinearSmoothScroller extends RecyclerView.SmoothScroller {
     }
 
     public float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
-        return 25.0f / ((float) displayMetrics.densityDpi);
+        return MILLISECONDS_PER_INCH / ((float) displayMetrics.densityDpi);
     }
 
     public int calculateTimeForDeceleration(int i) {
@@ -164,6 +164,6 @@ public class LinearSmoothScroller extends RecyclerView.SmoothScroller {
         this.mTargetVector = computeScrollVectorForPosition;
         this.mInterimTargetDx = (int) (computeScrollVectorForPosition.x * 10000.0f);
         this.mInterimTargetDy = (int) (computeScrollVectorForPosition.y * 10000.0f);
-        action.update((int) (((float) this.mInterimTargetDx) * 1.2f), (int) (((float) this.mInterimTargetDy) * 1.2f), (int) (((float) calculateTimeForScrolling(10000)) * 1.2f), this.mLinearInterpolator);
+        action.update((int) (((float) this.mInterimTargetDx) * TARGET_SEEK_EXTRA_SCROLL_RATIO), (int) (((float) this.mInterimTargetDy) * TARGET_SEEK_EXTRA_SCROLL_RATIO), (int) (((float) calculateTimeForScrolling(TARGET_SEEK_SCROLL_DISTANCE_PX)) * TARGET_SEEK_EXTRA_SCROLL_RATIO), this.mLinearInterpolator);
     }
 }
diff --git a/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java b/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java
index 030349e837..c710395a3b 100644
--- a/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java
+++ b/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java
@@ -40,6 +40,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.Px;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.os.TraceCompat;
 import androidx.core.util.Preconditions;
 import androidx.core.view.AccessibilityDelegateCompat;
@@ -452,7 +453,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 vh.mItemId = getItemId(i);
             }
             vh.setFlags(1, 519);
-            TraceCompat.beginSection("RV OnBindView");
+            TraceCompat.beginSection(RecyclerView.TRACE_BIND_VIEW_TAG);
             onBindViewHolder(vh, i, vh.getUnmodifiedPayloads());
             vh.clearPayload();
             ViewGroup.LayoutParams layoutParams = vh.itemView.getLayoutParams();
@@ -465,7 +466,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         @NonNull
         public final VH createViewHolder(@NonNull ViewGroup viewGroup, int i) {
             try {
-                TraceCompat.beginSection("RV CreateView");
+                TraceCompat.beginSection(RecyclerView.TRACE_CREATE_VIEW_TAG);
                 VH onCreateViewHolder = onCreateViewHolder(viewGroup, i);
                 if (onCreateViewHolder.itemView.getParent() == null) {
                     onCreateViewHolder.mItemViewType = i;
@@ -1065,7 +1066,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 i4 = max;
                 return View.MeasureSpec.makeMeasureSpec(i4, i2);
             }
-            i2 = 1073741824;
+            i2 = BasicMeasure.EXACTLY;
             return View.MeasureSpec.makeMeasureSpec(i4, i2);
         }
 
@@ -1080,14 +1081,14 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
             if (!z2) {
                 if (i3 < 0) {
                     if (i3 == -1) {
-                        i5 = 1073741824;
+                        i5 = BasicMeasure.EXACTLY;
                     } else if (i3 == -2) {
                         i5 = Integer.MIN_VALUE;
                     }
                     i3 = max;
                     return View.MeasureSpec.makeMeasureSpec(i3, i5);
                 }
-                i5 = 1073741824;
+                i5 = BasicMeasure.EXACTLY;
                 return View.MeasureSpec.makeMeasureSpec(i3, i5);
             }
             i3 = 0;
@@ -1798,7 +1799,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         }
 
         public void onLayoutChildren(Recycler recycler, State state) {
-            Log.e("RecyclerView", "You must override onLayoutChildren(Recycler recycler, State state) ");
+            Log.e(RecyclerView.TAG, "You must override onLayoutChildren(Recycler recycler, State state) ");
         }
 
         public void onLayoutCompleted(State state) {
@@ -2022,7 +2023,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         }
 
         public void setExactMeasureSpecsFrom(RecyclerView recyclerView) {
-            setMeasureSpecs(View.MeasureSpec.makeMeasureSpec(recyclerView.getWidth(), 1073741824), View.MeasureSpec.makeMeasureSpec(recyclerView.getHeight(), 1073741824));
+            setMeasureSpecs(View.MeasureSpec.makeMeasureSpec(recyclerView.getWidth(), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(recyclerView.getHeight(), BasicMeasure.EXACTLY));
         }
 
         public final void setItemPrefetchEnabled(boolean z2) {
@@ -2110,8 +2111,8 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 this.mWidth = recyclerView.getWidth();
                 this.mHeight = recyclerView.getHeight();
             }
-            this.mWidthMode = 1073741824;
-            this.mHeightMode = 1073741824;
+            this.mWidthMode = BasicMeasure.EXACTLY;
+            this.mHeightMode = BasicMeasure.EXACTLY;
         }
 
         public boolean shouldMeasureChild(View view, int i, int i2, LayoutParams layoutParams) {
@@ -2127,7 +2128,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         }
 
         public void smoothScrollToPosition(RecyclerView recyclerView, State state, int i) {
-            Log.e("RecyclerView", "You must override smoothScrollToPosition to support smooth scrolling");
+            Log.e(RecyclerView.TAG, "You must override smoothScrollToPosition to support smooth scrolling");
         }
 
         public void startSmoothScroll(SmoothScroller smoothScroller) {
@@ -2435,7 +2436,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
             viewHolder.mOwnerRecyclerView = RecyclerView.this;
             int itemViewType = viewHolder.getItemViewType();
             long nanoTime = RecyclerView.this.getNanoTime();
-            if (j != Long.MAX_VALUE && !this.mRecyclerPool.willBindInTime(itemViewType, nanoTime, j)) {
+            if (j != RecyclerView.FOREVER_NS && !this.mRecyclerPool.willBindInTime(itemViewType, nanoTime, j)) {
                 return false;
             }
             RecyclerView.this.mAdapter.bindViewHolder(viewHolder, i);
@@ -2473,7 +2474,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                     M.append(RecyclerView.this.mState.getItemCount());
                     throw new IndexOutOfBoundsException(a.g(RecyclerView.this, M));
                 }
-                tryBindViewHolderByDeadline(childViewHolderInt, findPositionOffset, i, Long.MAX_VALUE);
+                tryBindViewHolderByDeadline(childViewHolderInt, findPositionOffset, i, RecyclerView.FOREVER_NS);
                 ViewGroup.LayoutParams layoutParams2 = childViewHolderInt.itemView.getLayoutParams();
                 if (layoutParams2 == null) {
                     layoutParams = (LayoutParams) RecyclerView.this.generateDefaultLayoutParams();
@@ -2679,7 +2680,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         }
 
         public View getViewForPosition(int i, boolean z2) {
-            return tryGetViewHolderForPositionByDeadline(i, z2, Long.MAX_VALUE).itemView;
+            return tryGetViewHolderForPositionByDeadline(i, z2, RecyclerView.FOREVER_NS).itemView;
         }
 
         public void markItemDecorInsetsDirty() {
@@ -2977,7 +2978,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                         }
                         if (viewHolder == null) {
                             long nanoTime = RecyclerView.this.getNanoTime();
-                            if (j != Long.MAX_VALUE && !this.mRecyclerPool.willCreateInTime(itemViewType, nanoTime, j)) {
+                            if (j != RecyclerView.FOREVER_NS && !this.mRecyclerPool.willCreateInTime(itemViewType, nanoTime, j)) {
                                 return null;
                             }
                             RecyclerView recyclerView = RecyclerView.this;
@@ -3321,7 +3322,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                     int i2 = this.mConsecutiveUpdates + 1;
                     this.mConsecutiveUpdates = i2;
                     if (i2 > 10) {
-                        Log.e("RecyclerView", "Smooth Scroll action is being updated too frequently. Make sure you are not changing it unless necessary");
+                        Log.e(RecyclerView.TAG, "Smooth Scroll action is being updated too frequently. Make sure you are not changing it unless necessary");
                     }
                     this.mChanged = false;
                 } else {
@@ -3371,7 +3372,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
             }
             StringBuilder K = a.K("You should override computeScrollVectorForPosition when the LayoutManager does not implement ");
             K.append(ScrollVectorProvider.class.getCanonicalName());
-            Log.w("RecyclerView", K.toString());
+            Log.w(RecyclerView.TAG, K.toString());
             return null;
         }
 
@@ -3437,7 +3438,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                     this.mRecyclingAction.runIfNecessary(recyclerView);
                     stop();
                 } else {
-                    Log.e("RecyclerView", "Passed over target position while smooth scrolling.");
+                    Log.e(RecyclerView.TAG, "Passed over target position while smooth scrolling.");
                     this.mTargetView = null;
                 }
             }
@@ -3478,7 +3479,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 K.append(" was started more than once. Each instance of");
                 K.append(getClass().getSimpleName());
                 K.append(" is intended to only be used once. You should create a new instance for each use.");
-                Log.w("RecyclerView", K.toString());
+                Log.w(RecyclerView.TAG, K.toString());
             }
             this.mRecyclerView = recyclerView;
             this.mLayoutManager = layoutManager;
@@ -4715,7 +4716,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 throw new IllegalStateException(a.g(this, sb2));
             }
         }
-        Log.e("RecyclerView", "Problem while matching changed view holders with the newones. The pre-layout information for the change holder " + viewHolder2 + " cannot be found but it is necessary for " + viewHolder + exceptionLabel());
+        Log.e(TAG, "Problem while matching changed view holders with the newones. The pre-layout information for the change holder " + viewHolder2 + " cannot be found but it is necessary for " + viewHolder + exceptionLabel());
     }
 
     private boolean hasUpdatedView() {
@@ -5130,7 +5131,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
             }
             throw new IllegalStateException(str);
         } else if (this.mDispatchScrollCounter > 0) {
-            Log.w("RecyclerView", "Cannot call this method in a scroll callback. Scroll callbacks mightbe run during a measure & layout pass where you cannot change theRecyclerView data. Any method call that might change the structureof the RecyclerView or the adapter contents should be postponed tothe next frame.", new IllegalStateException(a.g(this, a.K(""))));
+            Log.w(TAG, "Cannot call this method in a scroll callback. Scroll callbacks mightbe run during a measure & layout pass where you cannot change theRecyclerView data. Any method call that might change the structureof the RecyclerView or the adapter contents should be postponed tothe next frame.", new IllegalStateException(a.g(this, a.K(""))));
         }
     }
 
@@ -5254,12 +5255,12 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
 
     public void consumePendingUpdateOperations() {
         if (!this.mFirstLayoutComplete || this.mDataSetHasChangedAfterLayout) {
-            TraceCompat.beginSection("RV FullInvalidate");
+            TraceCompat.beginSection(TRACE_ON_DATA_SET_CHANGE_LAYOUT_TAG);
             dispatchLayout();
             TraceCompat.endSection();
         } else if (this.mAdapterHelper.hasPendingUpdates()) {
             if (this.mAdapterHelper.hasAnyUpdateTypes(4) && !this.mAdapterHelper.hasAnyUpdateTypes(11)) {
-                TraceCompat.beginSection("RV PartialInvalidate");
+                TraceCompat.beginSection(TRACE_HANDLE_ADAPTER_UPDATES_TAG);
                 startInterceptRequestLayout();
                 onEnterLayoutOrScroll();
                 this.mAdapterHelper.preProcess();
@@ -5274,7 +5275,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 onExitLayoutOrScroll();
                 TraceCompat.endSection();
             } else if (this.mAdapterHelper.hasPendingUpdates()) {
-                TraceCompat.beginSection("RV FullInvalidate");
+                TraceCompat.beginSection(TRACE_ON_DATA_SET_CHANGE_LAYOUT_TAG);
                 dispatchLayout();
                 TraceCompat.endSection();
             }
@@ -5317,9 +5318,9 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
 
     public void dispatchLayout() {
         if (this.mAdapter == null) {
-            Log.e("RecyclerView", "No adapter attached; skipping layout");
+            Log.e(TAG, "No adapter attached; skipping layout");
         } else if (this.mLayout == null) {
-            Log.e("RecyclerView", "No layout manager attached; skipping layout");
+            Log.e(TAG, "No layout manager attached; skipping layout");
         } else {
             State state = this.mState;
             state.mIsMeasuring = false;
@@ -5690,7 +5691,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         LayoutManager layoutManager = this.mLayout;
         int i3 = 0;
         if (layoutManager == null) {
-            Log.e("RecyclerView", "Cannot fling without a LayoutManager set. Call setLayoutManager with a non-null argument.");
+            Log.e(TAG, "Cannot fling without a LayoutManager set. Call setLayoutManager with a non-null argument.");
             return false;
         } else if (this.mLayoutSuppressed) {
             return false;
@@ -6372,7 +6373,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 StringBuilder K = a.K("Error processing scroll; pointer index for id ");
                 K.append(this.mScrollPointerId);
                 K.append(" not found. Did any MotionEvents get skipped?");
-                Log.e("RecyclerView", K.toString());
+                Log.e(TAG, K.toString());
                 return false;
             }
             int x3 = (int) (motionEvent.getX(findPointerIndex) + 0.5f);
@@ -6412,7 +6413,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
 
     @Override // android.view.ViewGroup, android.view.View
     public void onLayout(boolean z2, int i, int i2, int i3, int i4) {
-        TraceCompat.beginSection("RV OnLayout");
+        TraceCompat.beginSection(TRACE_ON_LAYOUT_TAG);
         dispatchLayout();
         TraceCompat.endSection();
         this.mFirstLayoutComplete = true;
@@ -6442,7 +6443,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 dispatchLayoutStep2();
                 this.mLayout.setMeasuredDimensionFromChildren(i, i2);
                 if (this.mLayout.shouldMeasureTwice()) {
-                    this.mLayout.setMeasureSpecs(View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), 1073741824), View.MeasureSpec.makeMeasureSpec(getMeasuredHeight(), 1073741824));
+                    this.mLayout.setMeasureSpecs(View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(getMeasuredHeight(), BasicMeasure.EXACTLY));
                     this.mState.mIsMeasuring = true;
                     dispatchLayoutStep2();
                     this.mLayout.setMeasuredDimensionFromChildren(i, i2);
@@ -6602,7 +6603,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
                 StringBuilder K = a.K("Error processing scroll; pointer index for id ");
                 K.append(this.mScrollPointerId);
                 K.append(" not found. Did any MotionEvents get skipped?");
-                Log.e("RecyclerView", K.toString());
+                Log.e(TAG, K.toString());
                 return false;
             }
             int x3 = (int) (motionEvent.getX(findPointerIndex) + 0.5f);
@@ -6847,7 +6848,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
     public void scrollBy(int i, int i2) {
         LayoutManager layoutManager = this.mLayout;
         if (layoutManager == null) {
-            Log.e("RecyclerView", "Cannot scroll without a LayoutManager set. Call setLayoutManager with a non-null argument.");
+            Log.e(TAG, "Cannot scroll without a LayoutManager set. Call setLayoutManager with a non-null argument.");
         } else if (!this.mLayoutSuppressed) {
             boolean canScrollHorizontally = layoutManager.canScrollHorizontally();
             boolean canScrollVertically = this.mLayout.canScrollVertically();
@@ -6923,7 +6924,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
     public void scrollStep(int i, int i2, @Nullable int[] iArr) {
         startInterceptRequestLayout();
         onEnterLayoutOrScroll();
-        TraceCompat.beginSection("RV Scroll");
+        TraceCompat.beginSection(TRACE_SCROLL_TAG);
         fillRemainingScrollValues(this.mState);
         int scrollHorizontallyBy = i != 0 ? this.mLayout.scrollHorizontallyBy(i, this.mRecycler, this.mState) : 0;
         int scrollVerticallyBy = i2 != 0 ? this.mLayout.scrollVerticallyBy(i2, this.mRecycler, this.mState) : 0;
@@ -6939,7 +6940,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
 
     @Override // android.view.View
     public void scrollTo(int i, int i2) {
-        Log.w("RecyclerView", "RecyclerView does not support scrolling to an absolute position. Use scrollToPosition instead");
+        Log.w(TAG, "RecyclerView does not support scrolling to an absolute position. Use scrollToPosition instead");
     }
 
     public void scrollToPosition(int i) {
@@ -6947,7 +6948,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
             stopScroll();
             LayoutManager layoutManager = this.mLayout;
             if (layoutManager == null) {
-                Log.e("RecyclerView", "Cannot scroll to position a LayoutManager set. Call setLayoutManager with a non-null argument.");
+                Log.e(TAG, "Cannot scroll to position a LayoutManager set. Call setLayoutManager with a non-null argument.");
                 return;
             }
             layoutManager.scrollToPosition(i);
@@ -7125,7 +7126,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         ViewConfiguration viewConfiguration = ViewConfiguration.get(getContext());
         if (i != 0) {
             if (i != 1) {
-                Log.w("RecyclerView", "setScrollingTouchSlop(): bad argument constant " + i + "; using default value");
+                Log.w(TAG, "setScrollingTouchSlop(): bad argument constant " + i + "; using default value");
             } else {
                 this.mTouchSlop = viewConfiguration.getScaledPagingTouchSlop();
                 return;
@@ -7166,7 +7167,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
     public void smoothScrollBy(@Px int i, @Px int i2, @Nullable Interpolator interpolator, int i3, boolean z2) {
         LayoutManager layoutManager = this.mLayout;
         if (layoutManager == null) {
-            Log.e("RecyclerView", "Cannot smooth scroll without a LayoutManager set. Call setLayoutManager with a non-null argument.");
+            Log.e(TAG, "Cannot smooth scroll without a LayoutManager set. Call setLayoutManager with a non-null argument.");
         } else if (!this.mLayoutSuppressed) {
             int i4 = 0;
             if (!layoutManager.canScrollHorizontally()) {
@@ -7198,7 +7199,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
         if (!this.mLayoutSuppressed) {
             LayoutManager layoutManager = this.mLayout;
             if (layoutManager == null) {
-                Log.e("RecyclerView", "Cannot smooth scroll without a LayoutManager set. Call setLayoutManager with a non-null argument.");
+                Log.e(TAG, "Cannot smooth scroll without a LayoutManager set. Call setLayoutManager with a non-null argument.");
             } else {
                 layoutManager.smoothScrollToPosition(this, this.mState, i);
             }
diff --git a/app/src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java b/app/src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java
index 9b4a221e72..5ba95f8c94 100644
--- a/app/src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java
+++ b/app/src/main/java/androidx/recyclerview/widget/StaggeredGridLayoutManager.java
@@ -2084,7 +2084,7 @@ public class StaggeredGridLayoutManager extends RecyclerView.LayoutManager imple
         setLayoutStateDirection(convertFocusDirectionToLayoutDirection);
         LayoutState layoutState = this.mLayoutState;
         layoutState.mCurrentPosition = layoutState.mItemDirection + lastChildPosition;
-        layoutState.mAvailable = (int) (((float) this.mPrimaryOrientation.getTotalSpace()) * 0.33333334f);
+        layoutState.mAvailable = (int) (((float) this.mPrimaryOrientation.getTotalSpace()) * MAX_SCROLL_FACTOR);
         LayoutState layoutState2 = this.mLayoutState;
         layoutState2.mStopInFocusable = true;
         layoutState2.mRecycle = false;
diff --git a/app/src/main/java/androidx/room/IMultiInstanceInvalidationCallback.java b/app/src/main/java/androidx/room/IMultiInstanceInvalidationCallback.java
index 88aa43f226..009fbdc718 100644
--- a/app/src/main/java/androidx/room/IMultiInstanceInvalidationCallback.java
+++ b/app/src/main/java/androidx/room/IMultiInstanceInvalidationCallback.java
@@ -24,14 +24,14 @@ public interface IMultiInstanceInvalidationCallback extends IInterface {
             }
 
             public String getInterfaceDescriptor() {
-                return "androidx.room.IMultiInstanceInvalidationCallback";
+                return Stub.DESCRIPTOR;
             }
 
             @Override // androidx.room.IMultiInstanceInvalidationCallback
             public void onInvalidation(String[] strArr) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("androidx.room.IMultiInstanceInvalidationCallback");
+                    obtain.writeInterfaceToken(Stub.DESCRIPTOR);
                     obtain.writeStringArray(strArr);
                     this.mRemote.transact(1, obtain, null, 1);
                 } finally {
@@ -41,14 +41,14 @@ public interface IMultiInstanceInvalidationCallback extends IInterface {
         }
 
         public Stub() {
-            attachInterface(this, "androidx.room.IMultiInstanceInvalidationCallback");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static IMultiInstanceInvalidationCallback asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("androidx.room.IMultiInstanceInvalidationCallback");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof IMultiInstanceInvalidationCallback)) ? new Proxy(iBinder) : (IMultiInstanceInvalidationCallback) queryLocalInterface;
         }
 
@@ -60,13 +60,13 @@ public interface IMultiInstanceInvalidationCallback extends IInterface {
         @Override // android.os.Binder
         public boolean onTransact(int i, Parcel parcel, Parcel parcel2, int i2) throws RemoteException {
             if (i == 1) {
-                parcel.enforceInterface("androidx.room.IMultiInstanceInvalidationCallback");
+                parcel.enforceInterface(DESCRIPTOR);
                 onInvalidation(parcel.createStringArray());
                 return true;
             } else if (i != 1598968902) {
                 return super.onTransact(i, parcel, parcel2, i2);
             } else {
-                parcel2.writeString("androidx.room.IMultiInstanceInvalidationCallback");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/java/androidx/room/IMultiInstanceInvalidationService.java b/app/src/main/java/androidx/room/IMultiInstanceInvalidationService.java
index b78e43770a..86042b0898 100644
--- a/app/src/main/java/androidx/room/IMultiInstanceInvalidationService.java
+++ b/app/src/main/java/androidx/room/IMultiInstanceInvalidationService.java
@@ -30,7 +30,7 @@ public interface IMultiInstanceInvalidationService extends IInterface {
             public void broadcastInvalidation(int i, String[] strArr) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("androidx.room.IMultiInstanceInvalidationService");
+                    obtain.writeInterfaceToken(Stub.DESCRIPTOR);
                     obtain.writeInt(i);
                     obtain.writeStringArray(strArr);
                     this.mRemote.transact(3, obtain, null, 1);
@@ -40,7 +40,7 @@ public interface IMultiInstanceInvalidationService extends IInterface {
             }
 
             public String getInterfaceDescriptor() {
-                return "androidx.room.IMultiInstanceInvalidationService";
+                return Stub.DESCRIPTOR;
             }
 
             @Override // androidx.room.IMultiInstanceInvalidationService
@@ -48,7 +48,7 @@ public interface IMultiInstanceInvalidationService extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("androidx.room.IMultiInstanceInvalidationService");
+                    obtain.writeInterfaceToken(Stub.DESCRIPTOR);
                     obtain.writeStrongBinder(iMultiInstanceInvalidationCallback != null ? iMultiInstanceInvalidationCallback.asBinder() : null);
                     obtain.writeString(str);
                     this.mRemote.transact(1, obtain, obtain2, 0);
@@ -65,7 +65,7 @@ public interface IMultiInstanceInvalidationService extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("androidx.room.IMultiInstanceInvalidationService");
+                    obtain.writeInterfaceToken(Stub.DESCRIPTOR);
                     obtain.writeStrongBinder(iMultiInstanceInvalidationCallback != null ? iMultiInstanceInvalidationCallback.asBinder() : null);
                     obtain.writeInt(i);
                     this.mRemote.transact(2, obtain, obtain2, 0);
@@ -78,14 +78,14 @@ public interface IMultiInstanceInvalidationService extends IInterface {
         }
 
         public Stub() {
-            attachInterface(this, "androidx.room.IMultiInstanceInvalidationService");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static IMultiInstanceInvalidationService asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("androidx.room.IMultiInstanceInvalidationService");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof IMultiInstanceInvalidationService)) ? new Proxy(iBinder) : (IMultiInstanceInvalidationService) queryLocalInterface;
         }
 
@@ -97,24 +97,24 @@ public interface IMultiInstanceInvalidationService extends IInterface {
         @Override // android.os.Binder
         public boolean onTransact(int i, Parcel parcel, Parcel parcel2, int i2) throws RemoteException {
             if (i == 1) {
-                parcel.enforceInterface("androidx.room.IMultiInstanceInvalidationService");
+                parcel.enforceInterface(DESCRIPTOR);
                 int registerCallback = registerCallback(IMultiInstanceInvalidationCallback.Stub.asInterface(parcel.readStrongBinder()), parcel.readString());
                 parcel2.writeNoException();
                 parcel2.writeInt(registerCallback);
                 return true;
             } else if (i == 2) {
-                parcel.enforceInterface("androidx.room.IMultiInstanceInvalidationService");
+                parcel.enforceInterface(DESCRIPTOR);
                 unregisterCallback(IMultiInstanceInvalidationCallback.Stub.asInterface(parcel.readStrongBinder()), parcel.readInt());
                 parcel2.writeNoException();
                 return true;
             } else if (i == 3) {
-                parcel.enforceInterface("androidx.room.IMultiInstanceInvalidationService");
+                parcel.enforceInterface(DESCRIPTOR);
                 broadcastInvalidation(parcel.readInt(), parcel.createStringArray());
                 return true;
             } else if (i != 1598968902) {
                 return super.onTransact(i, parcel, parcel2, i2);
             } else {
-                parcel2.writeString("androidx.room.IMultiInstanceInvalidationService");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/java/androidx/room/InvalidationTracker.java b/app/src/main/java/androidx/room/InvalidationTracker.java
index 12037195b0..291713ab08 100644
--- a/app/src/main/java/androidx/room/InvalidationTracker.java
+++ b/app/src/main/java/androidx/room/InvalidationTracker.java
@@ -64,7 +64,7 @@ public class InvalidationTracker {
         /* JADX INFO: finally extract failed */
         private Set<Integer> checkUpdatedTable() {
             HashSet hashSet = new HashSet();
-            Cursor query = InvalidationTracker.this.mDatabase.query(new SimpleSQLiteQuery("SELECT * FROM room_table_modification_log WHERE invalidated = 1;"));
+            Cursor query = InvalidationTracker.this.mDatabase.query(new SimpleSQLiteQuery(InvalidationTracker.SELECT_UPDATED_TABLES_SQL));
             while (query.moveToNext()) {
                 try {
                     hashSet.add(Integer.valueOf(query.getInt(0)));
@@ -117,7 +117,7 @@ public class InvalidationTracker {
                     }
                 }
             } catch (SQLiteException | IllegalStateException e) {
-                Log.e("ROOM", "Cannot run invalidation tracker. Is the db closed?", e);
+                Log.e(Room.LOG_TAG, "Cannot run invalidation tracker. Is the db closed?", e);
             } catch (Throwable th) {
                 closeLock.unlock();
                 throw th;
@@ -414,11 +414,11 @@ public class InvalidationTracker {
             sb.append("CREATE TEMP TRIGGER IF NOT EXISTS ");
             appendTriggerName(sb, str, str2);
             a.j0(sb, " AFTER ", str2, " ON `", str);
-            a.j0(sb, "` BEGIN UPDATE ", "room_table_modification_log", " SET ", "invalidated");
-            a.j0(sb, " = 1", " WHERE ", "table_id", " = ");
+            a.j0(sb, "` BEGIN UPDATE ", UPDATE_TABLE_NAME, " SET ", INVALIDATED_COLUMN_NAME);
+            a.j0(sb, " = 1", " WHERE ", TABLE_ID_COLUMN_NAME, " = ");
             sb.append(i);
             sb.append(" AND ");
-            sb.append("invalidated");
+            sb.append(INVALIDATED_COLUMN_NAME);
             sb.append(" = 0");
             sb.append("; END");
             supportSQLiteDatabase.execSQL(sb.toString());
@@ -499,21 +499,21 @@ public class InvalidationTracker {
         if (this.mInitialized) {
             return true;
         }
-        Log.e("ROOM", "database is not initialized even though it is open");
+        Log.e(Room.LOG_TAG, "database is not initialized even though it is open");
         return false;
     }
 
     public void internalInit(SupportSQLiteDatabase supportSQLiteDatabase) {
         synchronized (this) {
             if (this.mInitialized) {
-                Log.e("ROOM", "Invalidation tracker is initialized twice :/.");
+                Log.e(Room.LOG_TAG, "Invalidation tracker is initialized twice :/.");
                 return;
             }
             supportSQLiteDatabase.execSQL("PRAGMA temp_store = MEMORY;");
             supportSQLiteDatabase.execSQL("PRAGMA recursive_triggers='ON';");
-            supportSQLiteDatabase.execSQL("CREATE TEMP TABLE room_table_modification_log(table_id INTEGER PRIMARY KEY, invalidated INTEGER NOT NULL DEFAULT 0)");
+            supportSQLiteDatabase.execSQL(CREATE_TRACKING_TABLE_SQL);
             syncTriggers(supportSQLiteDatabase);
-            this.mCleanupStatement = supportSQLiteDatabase.compileStatement("UPDATE room_table_modification_log SET invalidated = 0 WHERE invalidated = 1 ");
+            this.mCleanupStatement = supportSQLiteDatabase.compileStatement(RESET_UPDATED_TABLES_SQL);
             this.mInitialized = true;
         }
     }
@@ -609,7 +609,7 @@ public class InvalidationTracker {
                         closeLock.unlock();
                     }
                 } catch (SQLiteException | IllegalStateException e) {
-                    Log.e("ROOM", "Cannot run invalidation tracker. Is the db closed?", e);
+                    Log.e(Room.LOG_TAG, "Cannot run invalidation tracker. Is the db closed?", e);
                     return;
                 }
             }
diff --git a/app/src/main/java/androidx/room/MultiInstanceInvalidationClient.java b/app/src/main/java/androidx/room/MultiInstanceInvalidationClient.java
index 65f3465bb6..5b23885cc9 100644
--- a/app/src/main/java/androidx/room/MultiInstanceInvalidationClient.java
+++ b/app/src/main/java/androidx/room/MultiInstanceInvalidationClient.java
@@ -93,7 +93,7 @@ public class MultiInstanceInvalidationClient {
                     multiInstanceInvalidationClient2.mInvalidationTracker.addObserver(multiInstanceInvalidationClient2.mObserver);
                 }
             } catch (RemoteException e) {
-                Log.w("ROOM", "Cannot register multi-instance invalidation callback", e);
+                Log.w(Room.LOG_TAG, "Cannot register multi-instance invalidation callback", e);
             }
         }
     }
@@ -126,7 +126,7 @@ public class MultiInstanceInvalidationClient {
                     iMultiInstanceInvalidationService.unregisterCallback(multiInstanceInvalidationClient2.mCallback, multiInstanceInvalidationClient2.mClientId);
                 }
             } catch (RemoteException e) {
-                Log.w("ROOM", "Cannot unregister multi-instance invalidation callback", e);
+                Log.w(Room.LOG_TAG, "Cannot unregister multi-instance invalidation callback", e);
             }
             MultiInstanceInvalidationClient multiInstanceInvalidationClient3 = MultiInstanceInvalidationClient.this;
             multiInstanceInvalidationClient3.mAppContext.unbindService(multiInstanceInvalidationClient3.mServiceConnection);
@@ -154,7 +154,7 @@ public class MultiInstanceInvalidationClient {
                         iMultiInstanceInvalidationService.broadcastInvalidation(multiInstanceInvalidationClient.mClientId, (String[]) set.toArray(new String[0]));
                     }
                 } catch (RemoteException e) {
-                    Log.w("ROOM", "Cannot broadcast invalidation", e);
+                    Log.w(Room.LOG_TAG, "Cannot broadcast invalidation", e);
                 }
             }
         }
diff --git a/app/src/main/java/androidx/room/MultiInstanceInvalidationService.java b/app/src/main/java/androidx/room/MultiInstanceInvalidationService.java
index ec031255c3..689caa33b1 100644
--- a/app/src/main/java/androidx/room/MultiInstanceInvalidationService.java
+++ b/app/src/main/java/androidx/room/MultiInstanceInvalidationService.java
@@ -37,7 +37,7 @@ public class MultiInstanceInvalidationService extends Service {
             synchronized (MultiInstanceInvalidationService.this.mCallbackList) {
                 String str = MultiInstanceInvalidationService.this.mClientNames.get(Integer.valueOf(i));
                 if (str == null) {
-                    Log.w("ROOM", "Remote invalidation client ID not registered");
+                    Log.w(Room.LOG_TAG, "Remote invalidation client ID not registered");
                     return;
                 }
                 int beginBroadcast = MultiInstanceInvalidationService.this.mCallbackList.beginBroadcast();
@@ -49,7 +49,7 @@ public class MultiInstanceInvalidationService extends Service {
                             try {
                                 MultiInstanceInvalidationService.this.mCallbackList.getBroadcastItem(i2).onInvalidation(strArr);
                             } catch (RemoteException e) {
-                                Log.w("ROOM", "Error invoking a remote callback", e);
+                                Log.w(Room.LOG_TAG, "Error invoking a remote callback", e);
                             }
                         }
                     } catch (Throwable th) {
diff --git a/app/src/main/java/androidx/room/RoomDatabase.java b/app/src/main/java/androidx/room/RoomDatabase.java
index 131b85074f..eb46d7f0e0 100644
--- a/app/src/main/java/androidx/room/RoomDatabase.java
+++ b/app/src/main/java/androidx/room/RoomDatabase.java
@@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.WorkerThread;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.arch.core.executor.ArchTaskExecutor;
 import androidx.room.migration.Migration;
 import androidx.room.util.SneakyThrow;
@@ -148,7 +149,7 @@ public abstract class RoomDatabase {
                 }
                 Context context = this.mContext;
                 DatabaseConfiguration databaseConfiguration = new DatabaseConfiguration(context, this.mName, this.mFactory, this.mMigrationContainer, this.mCallbacks, this.mAllowMainThreadQueries, this.mJournalMode.resolve(context), this.mQueryExecutor, this.mTransactionExecutor, this.mMultiInstanceInvalidation, this.mRequireMigration, this.mAllowDestructiveMigrationOnDowngrade, this.mMigrationsNotRequiredFrom, this.mCopyFromAssetPath, this.mCopyFromFile);
-                T t = (T) ((RoomDatabase) Room.getGeneratedImplementation(this.mDatabaseClass, "_Impl"));
+                T t = (T) ((RoomDatabase) Room.getGeneratedImplementation(this.mDatabaseClass, RoomDatabase.DB_IMPL_SUFFIX));
                 t.init(databaseConfiguration);
                 return t;
             } else {
@@ -249,7 +250,7 @@ public abstract class RoomDatabase {
             if (this != AUTOMATIC) {
                 return this;
             }
-            ActivityManager activityManager = (ActivityManager) context.getSystemService("activity");
+            ActivityManager activityManager = (ActivityManager) context.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             return (activityManager == null || isLowRamDevice(activityManager)) ? TRUNCATE : WRITE_AHEAD_LOGGING;
         }
     }
@@ -267,7 +268,7 @@ public abstract class RoomDatabase {
             }
             Migration migration2 = treeMap.get(Integer.valueOf(i2));
             if (migration2 != null) {
-                Log.w("ROOM", "Overriding migration " + migration2 + " with " + migration);
+                Log.w(Room.LOG_TAG, "Overriding migration " + migration2 + " with " + migration);
             }
             treeMap.put(Integer.valueOf(i2), migration);
         }
diff --git a/app/src/main/java/androidx/room/RoomOpenHelper.java b/app/src/main/java/androidx/room/RoomOpenHelper.java
index 9a3d8b5e7a..1701957a01 100644
--- a/app/src/main/java/androidx/room/RoomOpenHelper.java
+++ b/app/src/main/java/androidx/room/RoomOpenHelper.java
@@ -83,7 +83,7 @@ public class RoomOpenHelper extends SupportSQLiteOpenHelper.Callback {
     private void checkIdentity(SupportSQLiteDatabase supportSQLiteDatabase) {
         if (hasRoomMasterTable(supportSQLiteDatabase)) {
             String str = null;
-            Cursor query = supportSQLiteDatabase.query(new SimpleSQLiteQuery("SELECT identity_hash FROM room_master_table WHERE id = 42 LIMIT 1"));
+            Cursor query = supportSQLiteDatabase.query(new SimpleSQLiteQuery(RoomMasterTable.READ_QUERY));
             try {
                 if (query.moveToFirst()) {
                     str = query.getString(0);
@@ -110,7 +110,7 @@ public class RoomOpenHelper extends SupportSQLiteOpenHelper.Callback {
     }
 
     private void createMasterTableIfNotExists(SupportSQLiteDatabase supportSQLiteDatabase) {
-        supportSQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)");
+        supportSQLiteDatabase.execSQL(RoomMasterTable.CREATE_QUERY);
     }
 
     private static boolean hasEmptySchema(SupportSQLiteDatabase supportSQLiteDatabase) {
diff --git a/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java b/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java
index 09b841a808..74da13393c 100644
--- a/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java
+++ b/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java
@@ -94,15 +94,15 @@ public class SQLiteCopyOpenHelper implements SupportSQLiteOpenHelper {
                             try {
                                 copyDatabaseFile(databasePath);
                             } catch (IOException e2) {
-                                Log.w("ROOM", "Unable to copy database file.", e2);
+                                Log.w(Room.LOG_TAG, "Unable to copy database file.", e2);
                             }
                         } else {
-                            Log.w("ROOM", "Failed to delete database file (" + databaseName + ") for a copy destructive migration.");
+                            Log.w(Room.LOG_TAG, "Failed to delete database file (" + databaseName + ") for a copy destructive migration.");
                         }
                         copyLock.unlock();
                     }
                 } catch (IOException e3) {
-                    Log.w("ROOM", "Unable to read database version.", e3);
+                    Log.w(Room.LOG_TAG, "Unable to read database version.", e3);
                     copyLock.unlock();
                 }
             }
diff --git a/app/src/main/java/androidx/room/util/FileUtil.java b/app/src/main/java/androidx/room/util/FileUtil.java
index 12d1d0eafb..918966c5ec 100644
--- a/app/src/main/java/androidx/room/util/FileUtil.java
+++ b/app/src/main/java/androidx/room/util/FileUtil.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.recyclerview.widget.RecyclerView;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,7 +31,7 @@ public class FileUtil {
                     newOutputStream.write(bArr, 0, read);
                 }
             } else {
-                fileChannel.transferFrom(readableByteChannel, 0, Long.MAX_VALUE);
+                fileChannel.transferFrom(readableByteChannel, 0, RecyclerView.FOREVER_NS);
             }
             fileChannel.force(false);
         } finally {
diff --git a/app/src/main/java/androidx/room/util/FtsTableInfo.java b/app/src/main/java/androidx/room/util/FtsTableInfo.java
index 3e6f250969..6beab921f0 100644
--- a/app/src/main/java/androidx/room/util/FtsTableInfo.java
+++ b/app/src/main/java/androidx/room/util/FtsTableInfo.java
@@ -5,6 +5,7 @@ import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -86,7 +87,7 @@ public class FtsTableInfo {
         HashSet hashSet = new HashSet();
         try {
             if (query.getColumnCount() > 0) {
-                int columnIndex = query.getColumnIndex("name");
+                int columnIndex = query.getColumnIndex(ModelAuditLogEntry.CHANGE_KEY_NAME);
                 while (query.moveToNext()) {
                     hashSet.add(query.getString(columnIndex));
                 }
diff --git a/app/src/main/java/androidx/room/util/StringUtil.java b/app/src/main/java/androidx/room/util/StringUtil.java
index 4ce4122988..1b09d46132 100644
--- a/app/src/main/java/androidx/room/util/StringUtil.java
+++ b/app/src/main/java/androidx/room/util/StringUtil.java
@@ -3,6 +3,7 @@ package androidx.room.util;
 import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.room.Room;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -56,7 +57,7 @@ public class StringUtil {
             try {
                 arrayList.add(Integer.valueOf(Integer.parseInt(stringTokenizer.nextToken())));
             } catch (NumberFormatException e) {
-                Log.e("ROOM", "Malformed integer list", e);
+                Log.e(Room.LOG_TAG, "Malformed integer list", e);
             }
         }
         return arrayList;
diff --git a/app/src/main/java/androidx/room/util/TableInfo.java b/app/src/main/java/androidx/room/util/TableInfo.java
index 896a2ef2f8..6a6931a450 100644
--- a/app/src/main/java/androidx/room/util/TableInfo.java
+++ b/app/src/main/java/androidx/room/util/TableInfo.java
@@ -7,6 +7,7 @@ import androidx.annotation.RestrictTo;
 import androidx.room.ColumnInfo;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -225,13 +226,13 @@ public class TableInfo {
             }
             Index index = (Index) obj;
             if (this.unique == index.unique && this.columns.equals(index.columns)) {
-                return this.name.startsWith("index_") ? index.name.startsWith("index_") : this.name.equals(index.name);
+                return this.name.startsWith(DEFAULT_PREFIX) ? index.name.startsWith(DEFAULT_PREFIX) : this.name.equals(index.name);
             }
             return false;
         }
 
         public int hashCode() {
-            return this.columns.hashCode() + ((((this.name.startsWith("index_") ? -1184239155 : this.name.hashCode()) * 31) + (this.unique ? 1 : 0)) * 31);
+            return this.columns.hashCode() + ((((this.name.startsWith(DEFAULT_PREFIX) ? -1184239155 : this.name.hashCode()) * 31) + (this.unique ? 1 : 0)) * 31);
         }
 
         public String toString() {
@@ -267,7 +268,7 @@ public class TableInfo {
         HashMap hashMap = new HashMap();
         try {
             if (query.getColumnCount() > 0) {
-                int columnIndex = query.getColumnIndex("name");
+                int columnIndex = query.getColumnIndex(ModelAuditLogEntry.CHANGE_KEY_NAME);
                 int columnIndex2 = query.getColumnIndex("type");
                 int columnIndex3 = query.getColumnIndex("notnull");
                 int columnIndex4 = query.getColumnIndex("pk");
@@ -284,7 +285,7 @@ public class TableInfo {
     }
 
     private static List<ForeignKeyWithSequence> readForeignKeyFieldMappings(Cursor cursor) {
-        int columnIndex = cursor.getColumnIndex("id");
+        int columnIndex = cursor.getColumnIndex(ModelAuditLogEntry.CHANGE_KEY_ID);
         int columnIndex2 = cursor.getColumnIndex("seq");
         int columnIndex3 = cursor.getColumnIndex("from");
         int columnIndex4 = cursor.getColumnIndex("to");
@@ -302,7 +303,7 @@ public class TableInfo {
         HashSet hashSet = new HashSet();
         Cursor query = supportSQLiteDatabase.query("PRAGMA foreign_key_list(`" + str + "`)");
         try {
-            int columnIndex = query.getColumnIndex("id");
+            int columnIndex = query.getColumnIndex(ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndex2 = query.getColumnIndex("seq");
             int columnIndex3 = query.getColumnIndex("table");
             int columnIndex4 = query.getColumnIndex("on_delete");
@@ -336,7 +337,7 @@ public class TableInfo {
         try {
             int columnIndex = query.getColumnIndex("seqno");
             int columnIndex2 = query.getColumnIndex("cid");
-            int columnIndex3 = query.getColumnIndex("name");
+            int columnIndex3 = query.getColumnIndex(ModelAuditLogEntry.CHANGE_KEY_NAME);
             if (!(columnIndex == -1 || columnIndex2 == -1)) {
                 if (columnIndex3 != -1) {
                     TreeMap treeMap = new TreeMap();
@@ -363,7 +364,7 @@ public class TableInfo {
     private static Set<Index> readIndices(SupportSQLiteDatabase supportSQLiteDatabase, String str) {
         Cursor query = supportSQLiteDatabase.query("PRAGMA index_list(`" + str + "`)");
         try {
-            int columnIndex = query.getColumnIndex("name");
+            int columnIndex = query.getColumnIndex(ModelAuditLogEntry.CHANGE_KEY_NAME);
             int columnIndex2 = query.getColumnIndex("origin");
             int columnIndex3 = query.getColumnIndex("unique");
             if (!(columnIndex == -1 || columnIndex2 == -1)) {
diff --git a/app/src/main/java/androidx/savedstate/Recreator.java b/app/src/main/java/androidx/savedstate/Recreator.java
index 8fd62d48da..e893a317f3 100644
--- a/app/src/main/java/androidx/savedstate/Recreator.java
+++ b/app/src/main/java/androidx/savedstate/Recreator.java
@@ -23,7 +23,7 @@ public final class Recreator implements GenericLifecycleObserver {
         public final Set<String> mClasses = new HashSet();
 
         public SavedStateProvider(SavedStateRegistry savedStateRegistry) {
-            savedStateRegistry.registerSavedStateProvider("androidx.savedstate.Restarter", this);
+            savedStateRegistry.registerSavedStateProvider(Recreator.COMPONENT_KEY, this);
         }
 
         public void add(String str) {
@@ -34,7 +34,7 @@ public final class Recreator implements GenericLifecycleObserver {
         @NonNull
         public Bundle saveState() {
             Bundle bundle = new Bundle();
-            bundle.putStringArrayList("classes_to_restore", new ArrayList<>(this.mClasses));
+            bundle.putStringArrayList(Recreator.CLASSES_KEY, new ArrayList<>(this.mClasses));
             return bundle;
         }
     }
@@ -69,9 +69,9 @@ public final class Recreator implements GenericLifecycleObserver {
     public void onStateChanged(LifecycleOwner lifecycleOwner, Lifecycle.Event event) {
         if (event == Lifecycle.Event.ON_CREATE) {
             lifecycleOwner.getLifecycle().removeObserver(this);
-            Bundle consumeRestoredStateForKey = this.mOwner.getSavedStateRegistry().consumeRestoredStateForKey("androidx.savedstate.Restarter");
+            Bundle consumeRestoredStateForKey = this.mOwner.getSavedStateRegistry().consumeRestoredStateForKey(COMPONENT_KEY);
             if (consumeRestoredStateForKey != null) {
-                ArrayList<String> stringArrayList = consumeRestoredStateForKey.getStringArrayList("classes_to_restore");
+                ArrayList<String> stringArrayList = consumeRestoredStateForKey.getStringArrayList(CLASSES_KEY);
                 if (stringArrayList != null) {
                     Iterator<String> it = stringArrayList.iterator();
                     while (it.hasNext()) {
diff --git a/app/src/main/java/androidx/savedstate/SavedStateRegistry.java b/app/src/main/java/androidx/savedstate/SavedStateRegistry.java
index 158debcc40..69fa26c208 100644
--- a/app/src/main/java/androidx/savedstate/SavedStateRegistry.java
+++ b/app/src/main/java/androidx/savedstate/SavedStateRegistry.java
@@ -73,7 +73,7 @@ public final class SavedStateRegistry {
     public void performRestore(@NonNull Lifecycle lifecycle, @Nullable Bundle bundle) {
         if (!this.mRestored) {
             if (bundle != null) {
-                this.mRestoredState = bundle.getBundle("androidx.lifecycle.BundlableSavedStateRegistry.key");
+                this.mRestoredState = bundle.getBundle(SAVED_COMPONENTS_KEY);
             }
             lifecycle.addObserver(new AnonymousClass1());
             this.mRestored = true;
@@ -94,7 +94,7 @@ public final class SavedStateRegistry {
             Map.Entry next = iteratorWithAdditions.next();
             bundle2.putBundle((String) next.getKey(), ((SavedStateProvider) next.getValue()).saveState());
         }
-        bundle.putBundle("androidx.lifecycle.BundlableSavedStateRegistry.key", bundle2);
+        bundle.putBundle(SAVED_COMPONENTS_KEY, bundle2);
     }
 
     @MainThread
diff --git a/app/src/main/java/androidx/sharetarget/ChooserTargetServiceCompat.java b/app/src/main/java/androidx/sharetarget/ChooserTargetServiceCompat.java
index 18136b7769..eb9e0df6b5 100644
--- a/app/src/main/java/androidx/sharetarget/ChooserTargetServiceCompat.java
+++ b/app/src/main/java/androidx/sharetarget/ChooserTargetServiceCompat.java
@@ -13,6 +13,7 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.sharetarget.ShareTargetCompat;
 import java.util.ArrayList;
@@ -64,11 +65,11 @@ public class ChooserTargetServiceCompat extends ChooserTargetService {
             try {
                 iconCompat = shortcutInfoCompatSaverImpl.getShortcutIcon(shortcut.getId());
             } catch (Exception e) {
-                Log.e("ChooserServiceCompat", "Failed to retrieve shortcut icon: ", e);
+                Log.e(TAG, "Failed to retrieve shortcut icon: ", e);
                 iconCompat = null;
             }
             Bundle bundle = new Bundle();
-            bundle.putString("android.intent.extra.shortcut.ID", shortcut.getId());
+            bundle.putString(ShortcutManagerCompat.EXTRA_SHORTCUT_ID, shortcut.getId());
             if (rank != shortcut.getRank()) {
                 f -= 0.01f;
                 rank = shortcut.getRank();
@@ -129,7 +130,7 @@ public class ChooserTargetServiceCompat extends ChooserTargetService {
             }
             return convertShortcutsToChooserTargets(instance, arrayList2);
         } catch (Exception e) {
-            Log.e("ChooserServiceCompat", "Failed to retrieve shortcuts: ", e);
+            Log.e(TAG, "Failed to retrieve shortcuts: ", e);
             return Collections.emptyList();
         }
     }
diff --git a/app/src/main/java/androidx/sharetarget/ShareTargetXmlParser.java b/app/src/main/java/androidx/sharetarget/ShareTargetXmlParser.java
index 0311ba9726..d545106165 100644
--- a/app/src/main/java/androidx/sharetarget/ShareTargetXmlParser.java
+++ b/app/src/main/java/androidx/sharetarget/ShareTargetXmlParser.java
@@ -53,7 +53,7 @@ public class ShareTargetXmlParser {
     }
 
     private static XmlResourceParser getXmlResourceParser(Context context, ActivityInfo activityInfo) {
-        XmlResourceParser loadXmlMetaData = activityInfo.loadXmlMetaData(context.getPackageManager(), "android.app.shortcuts");
+        XmlResourceParser loadXmlMetaData = activityInfo.loadXmlMetaData(context.getPackageManager(), META_DATA_APP_SHORTCUTS);
         if (loadXmlMetaData != null) {
             return loadXmlMetaData;
         }
@@ -63,22 +63,22 @@ public class ShareTargetXmlParser {
     }
 
     private static ShareTargetCompat parseShareTarget(XmlResourceParser xmlResourceParser) throws Exception {
-        String attributeValue = getAttributeValue(xmlResourceParser, "targetClass");
+        String attributeValue = getAttributeValue(xmlResourceParser, ATTR_TARGET_CLASS);
         ArrayList arrayList = new ArrayList();
         ArrayList arrayList2 = new ArrayList();
         while (true) {
             int next = xmlResourceParser.next();
             if (next != 1) {
                 if (next != 2) {
-                    if (next == 3 && xmlResourceParser.getName().equals("share-target")) {
+                    if (next == 3 && xmlResourceParser.getName().equals(TAG_SHARE_TARGET)) {
                         break;
                     }
                 } else {
                     String name = xmlResourceParser.getName();
                     name.hashCode();
-                    if (name.equals("data")) {
+                    if (name.equals(TAG_DATA)) {
                         arrayList.add(parseTargetData(xmlResourceParser));
-                    } else if (name.equals("category")) {
+                    } else if (name.equals(TAG_CATEGORY)) {
                         arrayList2.add(getAttributeValue(xmlResourceParser, "name"));
                     }
                 }
@@ -104,7 +104,7 @@ public class ShareTargetXmlParser {
         for (ResolveInfo resolveInfo : queryIntentActivities) {
             ActivityInfo activityInfo = resolveInfo.activityInfo;
             Bundle bundle = activityInfo.metaData;
-            if (bundle != null && bundle.containsKey("android.app.shortcuts")) {
+            if (bundle != null && bundle.containsKey(META_DATA_APP_SHORTCUTS)) {
                 arrayList.addAll(parseShareTargets(context, activityInfo));
             }
         }
@@ -120,11 +120,11 @@ public class ShareTargetXmlParser {
                 int next = xmlResourceParser.next();
                 if (next == 1) {
                     break;
-                } else if (next == 2 && xmlResourceParser.getName().equals("share-target") && (parseShareTarget = parseShareTarget(xmlResourceParser)) != null) {
+                } else if (next == 2 && xmlResourceParser.getName().equals(TAG_SHARE_TARGET) && (parseShareTarget = parseShareTarget(xmlResourceParser)) != null) {
                     arrayList.add(parseShareTarget);
                 }
             } catch (Exception e) {
-                Log.e("ShareTargetXmlParser", "Failed to parse the Xml resource: ", e);
+                Log.e(TAG, "Failed to parse the Xml resource: ", e);
             }
         }
         xmlResourceParser.close();
@@ -132,6 +132,6 @@ public class ShareTargetXmlParser {
     }
 
     private static ShareTargetCompat.TargetData parseTargetData(XmlResourceParser xmlResourceParser) {
-        return new ShareTargetCompat.TargetData(getAttributeValue(xmlResourceParser, "scheme"), getAttributeValue(xmlResourceParser, "host"), getAttributeValue(xmlResourceParser, "port"), getAttributeValue(xmlResourceParser, "path"), getAttributeValue(xmlResourceParser, "pathPattern"), getAttributeValue(xmlResourceParser, "pathPrefix"), getAttributeValue(xmlResourceParser, "mimeType"));
+        return new ShareTargetCompat.TargetData(getAttributeValue(xmlResourceParser, ATTR_SCHEME), getAttributeValue(xmlResourceParser, ATTR_HOST), getAttributeValue(xmlResourceParser, ATTR_PORT), getAttributeValue(xmlResourceParser, ATTR_PATH), getAttributeValue(xmlResourceParser, ATTR_PATH_PATTERN), getAttributeValue(xmlResourceParser, ATTR_PATH_PREFIX), getAttributeValue(xmlResourceParser, ATTR_MIME_TYPE));
     }
 }
diff --git a/app/src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java b/app/src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java
index 29b4c7f944..94e45bd0d4 100644
--- a/app/src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java
+++ b/app/src/main/java/androidx/sharetarget/ShortcutInfoCompatSaverImpl.java
@@ -64,7 +64,7 @@ public class ShortcutInfoCompatSaverImpl extends ShortcutInfoCompatSaver<a<Void>
                 shortcutInfoCompatSaverImpl.mShortcutsMap.putAll(ShortcutsInfoSerialization.loadFromXml(shortcutInfoCompatSaverImpl.mTargetsXmlFile, shortcutInfoCompatSaverImpl.mContext));
                 ShortcutInfoCompatSaverImpl.this.deleteDanglingBitmaps(new ArrayList(ShortcutInfoCompatSaverImpl.this.mShortcutsMap.values()));
             } catch (Exception e) {
-                Log.w("ShortcutInfoCompatSaver", "ShortcutInfoCompatSaver started with an exceptions ", e);
+                Log.w(ShortcutInfoCompatSaverImpl.TAG, "ShortcutInfoCompatSaver started with an exceptions ", e);
             }
         }
     }
@@ -290,9 +290,9 @@ public class ShortcutInfoCompatSaverImpl extends ShortcutInfoCompatSaver<a<Void>
         this.mContext = context.getApplicationContext();
         this.mCacheUpdateService = executorService;
         this.mDiskIoService = executorService2;
-        File file = new File(context.getFilesDir(), "ShortcutInfoCompatSaver_share_targets");
-        this.mBitmapsDir = new File(file, "ShortcutInfoCompatSaver_share_targets_bitmaps");
-        this.mTargetsXmlFile = new File(file, "targets.xml");
+        File file = new File(context.getFilesDir(), DIRECTORY_TARGETS);
+        this.mBitmapsDir = new File(file, DIRECTORY_BITMAPS);
+        this.mTargetsXmlFile = new File(file, FILENAME_XML);
         executorService.submit(new AnonymousClass1(file));
     }
 
@@ -439,13 +439,13 @@ public class ShortcutInfoCompatSaverImpl extends ShortcutInfoCompatSaver<a<Void>
                         fileOutputStream.close();
                         return;
                     }
-                    Log.wtf("ShortcutInfoCompatSaver", "Unable to compress bitmap");
+                    Log.wtf(TAG, "Unable to compress bitmap");
                     throw new RuntimeException("Unable to compress bitmap for saving " + str);
                 } catch (Throwable th) {
                     th.addSuppressed(th);
                 }
             } catch (IOException | OutOfMemoryError | RuntimeException e) {
-                Log.wtf("ShortcutInfoCompatSaver", "Unable to write bitmap to file", e);
+                Log.wtf(TAG, "Unable to write bitmap to file", e);
                 throw new RuntimeException(c.d.b.a.a.s("Unable to write bitmap to file ", str), e);
             }
         } else {
diff --git a/app/src/main/java/androidx/sharetarget/ShortcutsInfoSerialization.java b/app/src/main/java/androidx/sharetarget/ShortcutsInfoSerialization.java
index 4b65cc1518..90c707e3a8 100644
--- a/app/src/main/java/androidx/sharetarget/ShortcutsInfoSerialization.java
+++ b/app/src/main/java/androidx/sharetarget/ShortcutsInfoSerialization.java
@@ -82,7 +82,7 @@ public class ShortcutsInfoSerialization {
                     int next = newPullParser.next();
                     if (next == 1) {
                         break;
-                    } else if (next == 2 && newPullParser.getName().equals("target") && (parseShortcutContainer = parseShortcutContainer(newPullParser, context)) != null && (shortcutInfoCompat = parseShortcutContainer.mShortcutInfo) != null) {
+                    } else if (next == 2 && newPullParser.getName().equals(TAG_TARGET) && (parseShortcutContainer = parseShortcutContainer(newPullParser, context)) != null && (shortcutInfoCompat = parseShortcutContainer.mShortcutInfo) != null) {
                         arrayMap.put(shortcutInfoCompat.getId(), parseShortcutContainer);
                     }
                 }
@@ -100,7 +100,7 @@ public class ShortcutsInfoSerialization {
 
     @WorkerThread
     private static ComponentName parseComponentName(XmlPullParser xmlPullParser) {
-        String attributeValue = getAttributeValue(xmlPullParser, "component");
+        String attributeValue = getAttributeValue(xmlPullParser, ATTR_COMPONENT);
         if (TextUtils.isEmpty(attributeValue)) {
             return null;
         }
@@ -109,9 +109,9 @@ public class ShortcutsInfoSerialization {
 
     @WorkerThread
     private static Intent parseIntent(XmlPullParser xmlPullParser) {
-        String attributeValue = getAttributeValue(xmlPullParser, "action");
-        String attributeValue2 = getAttributeValue(xmlPullParser, "targetPackage");
-        String attributeValue3 = getAttributeValue(xmlPullParser, "targetClass");
+        String attributeValue = getAttributeValue(xmlPullParser, ATTR_ACTION);
+        String attributeValue2 = getAttributeValue(xmlPullParser, ATTR_TARGET_PACKAGE);
+        String attributeValue3 = getAttributeValue(xmlPullParser, ATTR_TARGET_CLASS);
         if (attributeValue == null) {
             return null;
         }
@@ -124,38 +124,38 @@ public class ShortcutsInfoSerialization {
 
     @WorkerThread
     private static ShortcutContainer parseShortcutContainer(XmlPullParser xmlPullParser, Context context) throws Exception {
-        if (!xmlPullParser.getName().equals("target")) {
+        if (!xmlPullParser.getName().equals(TAG_TARGET)) {
             return null;
         }
         String attributeValue = getAttributeValue(xmlPullParser, "id");
-        String attributeValue2 = getAttributeValue(xmlPullParser, "short_label");
+        String attributeValue2 = getAttributeValue(xmlPullParser, ATTR_SHORT_LABEL);
         if (TextUtils.isEmpty(attributeValue) || TextUtils.isEmpty(attributeValue2)) {
             return null;
         }
-        int parseInt = Integer.parseInt(getAttributeValue(xmlPullParser, "rank"));
-        String attributeValue3 = getAttributeValue(xmlPullParser, "long_label");
-        String attributeValue4 = getAttributeValue(xmlPullParser, "disabled_message");
+        int parseInt = Integer.parseInt(getAttributeValue(xmlPullParser, ATTR_RANK));
+        String attributeValue3 = getAttributeValue(xmlPullParser, ATTR_LONG_LABEL);
+        String attributeValue4 = getAttributeValue(xmlPullParser, ATTR_DISABLED_MSG);
         ComponentName parseComponentName = parseComponentName(xmlPullParser);
-        String attributeValue5 = getAttributeValue(xmlPullParser, "icon_resource_name");
-        String attributeValue6 = getAttributeValue(xmlPullParser, "icon_bitmap_path");
+        String attributeValue5 = getAttributeValue(xmlPullParser, ATTR_ICON_RES_NAME);
+        String attributeValue6 = getAttributeValue(xmlPullParser, ATTR_ICON_BMP_PATH);
         ArrayList arrayList = new ArrayList();
         HashSet hashSet = new HashSet();
         while (true) {
             int next = xmlPullParser.next();
             if (next != 1) {
                 if (next != 2) {
-                    if (next == 3 && xmlPullParser.getName().equals("target")) {
+                    if (next == 3 && xmlPullParser.getName().equals(TAG_TARGET)) {
                         break;
                     }
                 } else {
                     String name = xmlPullParser.getName();
                     name.hashCode();
-                    if (name.equals("intent")) {
+                    if (name.equals(TAG_INTENT)) {
                         Intent parseIntent = parseIntent(xmlPullParser);
                         if (parseIntent != null) {
                             arrayList.add(parseIntent);
                         }
-                    } else if (name.equals("categories")) {
+                    } else if (name.equals(TAG_CATEGORY)) {
                         String attributeValue7 = getAttributeValue(xmlPullParser, "name");
                         if (!TextUtils.isEmpty(attributeValue7)) {
                             hashSet.add(attributeValue7);
@@ -196,11 +196,11 @@ public class ShortcutsInfoSerialization {
                 XmlSerializer newSerializer = Xml.newSerializer();
                 newSerializer.setOutput(bufferedOutputStream, "UTF_8");
                 newSerializer.startDocument(null, Boolean.TRUE);
-                newSerializer.startTag(null, "share_targets");
+                newSerializer.startTag(null, TAG_ROOT);
                 for (ShortcutContainer shortcutContainer : list) {
                     serializeShortcutContainer(newSerializer, shortcutContainer);
                 }
-                newSerializer.endTag(null, "share_targets");
+                newSerializer.endTag(null, TAG_ROOT);
                 newSerializer.endDocument();
                 bufferedOutputStream.flush();
                 startWrite.flush();
@@ -238,44 +238,44 @@ public class ShortcutsInfoSerialization {
     @WorkerThread
     private static void serializeCategory(XmlSerializer xmlSerializer, String str) throws IOException {
         if (!TextUtils.isEmpty(str)) {
-            xmlSerializer.startTag(null, "categories");
+            xmlSerializer.startTag(null, TAG_CATEGORY);
             serializeAttribute(xmlSerializer, "name", str);
-            xmlSerializer.endTag(null, "categories");
+            xmlSerializer.endTag(null, TAG_CATEGORY);
         }
     }
 
     @WorkerThread
     private static void serializeIntent(XmlSerializer xmlSerializer, Intent intent) throws IOException {
-        xmlSerializer.startTag(null, "intent");
-        serializeAttribute(xmlSerializer, "action", intent.getAction());
+        xmlSerializer.startTag(null, TAG_INTENT);
+        serializeAttribute(xmlSerializer, ATTR_ACTION, intent.getAction());
         if (intent.getComponent() != null) {
-            serializeAttribute(xmlSerializer, "targetPackage", intent.getComponent().getPackageName());
-            serializeAttribute(xmlSerializer, "targetClass", intent.getComponent().getClassName());
+            serializeAttribute(xmlSerializer, ATTR_TARGET_PACKAGE, intent.getComponent().getPackageName());
+            serializeAttribute(xmlSerializer, ATTR_TARGET_CLASS, intent.getComponent().getClassName());
         }
-        xmlSerializer.endTag(null, "intent");
+        xmlSerializer.endTag(null, TAG_INTENT);
     }
 
     @WorkerThread
     private static void serializeShortcutContainer(XmlSerializer xmlSerializer, ShortcutContainer shortcutContainer) throws IOException {
-        xmlSerializer.startTag(null, "target");
+        xmlSerializer.startTag(null, TAG_TARGET);
         ShortcutInfoCompat shortcutInfoCompat = shortcutContainer.mShortcutInfo;
         serializeAttribute(xmlSerializer, "id", shortcutInfoCompat.getId());
-        serializeAttribute(xmlSerializer, "short_label", shortcutInfoCompat.getShortLabel().toString());
-        serializeAttribute(xmlSerializer, "rank", Integer.toString(shortcutInfoCompat.getRank()));
+        serializeAttribute(xmlSerializer, ATTR_SHORT_LABEL, shortcutInfoCompat.getShortLabel().toString());
+        serializeAttribute(xmlSerializer, ATTR_RANK, Integer.toString(shortcutInfoCompat.getRank()));
         if (!TextUtils.isEmpty(shortcutInfoCompat.getLongLabel())) {
-            serializeAttribute(xmlSerializer, "long_label", shortcutInfoCompat.getLongLabel().toString());
+            serializeAttribute(xmlSerializer, ATTR_LONG_LABEL, shortcutInfoCompat.getLongLabel().toString());
         }
         if (!TextUtils.isEmpty(shortcutInfoCompat.getDisabledMessage())) {
-            serializeAttribute(xmlSerializer, "disabled_message", shortcutInfoCompat.getDisabledMessage().toString());
+            serializeAttribute(xmlSerializer, ATTR_DISABLED_MSG, shortcutInfoCompat.getDisabledMessage().toString());
         }
         if (shortcutInfoCompat.getActivity() != null) {
-            serializeAttribute(xmlSerializer, "component", shortcutInfoCompat.getActivity().flattenToString());
+            serializeAttribute(xmlSerializer, ATTR_COMPONENT, shortcutInfoCompat.getActivity().flattenToString());
         }
         if (!TextUtils.isEmpty(shortcutContainer.mResourceName)) {
-            serializeAttribute(xmlSerializer, "icon_resource_name", shortcutContainer.mResourceName);
+            serializeAttribute(xmlSerializer, ATTR_ICON_RES_NAME, shortcutContainer.mResourceName);
         }
         if (!TextUtils.isEmpty(shortcutContainer.mBitmapPath)) {
-            serializeAttribute(xmlSerializer, "icon_bitmap_path", shortcutContainer.mBitmapPath);
+            serializeAttribute(xmlSerializer, ATTR_ICON_BMP_PATH, shortcutContainer.mBitmapPath);
         }
         for (Intent intent : shortcutInfoCompat.getIntents()) {
             serializeIntent(xmlSerializer, intent);
@@ -283,6 +283,6 @@ public class ShortcutsInfoSerialization {
         for (String str : shortcutInfoCompat.getCategories()) {
             serializeCategory(xmlSerializer, str);
         }
-        xmlSerializer.endTag(null, "target");
+        xmlSerializer.endTag(null, TAG_TARGET);
     }
 }
diff --git a/app/src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java b/app/src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java
index bfdb95470e..c5840b160c 100644
--- a/app/src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java
+++ b/app/src/main/java/androidx/slidingpanelayout/widget/SlidingPaneLayout.java
@@ -22,6 +22,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Px;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
@@ -339,7 +340,7 @@ public class SlidingPaneLayout extends ViewGroup {
 
     public SlidingPaneLayout(@NonNull Context context, @Nullable AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
-        this.mSliderFadeColor = -858993460;
+        this.mSliderFadeColor = DEFAULT_FADE_COLOR;
         this.mFirstLayout = true;
         this.mTmpRect = new Rect();
         this.mPostedRunnables = new ArrayList<>();
@@ -364,7 +365,7 @@ public class SlidingPaneLayout extends ViewGroup {
     private void dimChildView(View view, float f, int i) {
         LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();
         if (f > 0.0f && i != 0) {
-            int i2 = (((int) (((float) ((-16777216 & i) >>> 24)) * f)) << 24) | (i & 16777215);
+            int i2 = (((int) (((float) ((-16777216 & i) >>> 24)) * f)) << 24) | (i & ViewCompat.MEASURED_SIZE_MASK);
             if (layoutParams.dimPaint == null) {
                 layoutParams.dimPaint = new Paint();
             }
@@ -778,7 +779,7 @@ public class SlidingPaneLayout extends ViewGroup {
         int paddingLeft = (size - getPaddingLeft()) - getPaddingRight();
         int childCount = getChildCount();
         if (childCount > 2) {
-            Log.e("SlidingPaneLayout", "onMeasure: More than two child views are not supported.");
+            Log.e(TAG, "onMeasure: More than two child views are not supported.");
         }
         this.mSlideableView = null;
         int i13 = paddingLeft;
@@ -810,13 +811,13 @@ public class SlidingPaneLayout extends ViewGroup {
                 } else {
                     f = f2;
                     i11 = Integer.MIN_VALUE;
-                    i10 = i16 == -1 ? View.MeasureSpec.makeMeasureSpec(paddingLeft - i15, 1073741824) : View.MeasureSpec.makeMeasureSpec(i16, 1073741824);
+                    i10 = i16 == -1 ? View.MeasureSpec.makeMeasureSpec(paddingLeft - i15, BasicMeasure.EXACTLY) : View.MeasureSpec.makeMeasureSpec(i16, BasicMeasure.EXACTLY);
                 }
                 int i17 = ((ViewGroup.MarginLayoutParams) layoutParams).height;
                 if (i17 == -2) {
                     i12 = View.MeasureSpec.makeMeasureSpec(i3, i11);
                 } else {
-                    i12 = i17 == -1 ? View.MeasureSpec.makeMeasureSpec(i3, 1073741824) : View.MeasureSpec.makeMeasureSpec(i17, 1073741824);
+                    i12 = i17 == -1 ? View.MeasureSpec.makeMeasureSpec(i3, BasicMeasure.EXACTLY) : View.MeasureSpec.makeMeasureSpec(i17, BasicMeasure.EXACTLY);
                 }
                 childAt.measure(i10, i12);
                 int measuredWidth = childAt.getMeasuredWidth();
@@ -850,14 +851,14 @@ public class SlidingPaneLayout extends ViewGroup {
                             if (layoutParams2.weight > 0.0f) {
                                 if (((ViewGroup.MarginLayoutParams) layoutParams2).width == 0) {
                                     int i20 = ((ViewGroup.MarginLayoutParams) layoutParams2).height;
-                                    i7 = i20 == -2 ? View.MeasureSpec.makeMeasureSpec(i3, Integer.MIN_VALUE) : i20 == -1 ? View.MeasureSpec.makeMeasureSpec(i3, 1073741824) : View.MeasureSpec.makeMeasureSpec(i20, 1073741824);
+                                    i7 = i20 == -2 ? View.MeasureSpec.makeMeasureSpec(i3, Integer.MIN_VALUE) : i20 == -1 ? View.MeasureSpec.makeMeasureSpec(i3, BasicMeasure.EXACTLY) : View.MeasureSpec.makeMeasureSpec(i20, BasicMeasure.EXACTLY);
                                 } else {
-                                    i7 = View.MeasureSpec.makeMeasureSpec(childAt2.getMeasuredHeight(), 1073741824);
+                                    i7 = View.MeasureSpec.makeMeasureSpec(childAt2.getMeasuredHeight(), BasicMeasure.EXACTLY);
                                 }
                                 if (z3) {
                                     int i21 = paddingLeft - (((ViewGroup.MarginLayoutParams) layoutParams2).leftMargin + ((ViewGroup.MarginLayoutParams) layoutParams2).rightMargin);
                                     i6 = i18;
-                                    int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i21, 1073741824);
+                                    int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i21, BasicMeasure.EXACTLY);
                                     if (measuredWidth2 != i21) {
                                         childAt2.measure(makeMeasureSpec, i7);
                                     }
@@ -866,7 +867,7 @@ public class SlidingPaneLayout extends ViewGroup {
                                     i5 = 8;
                                 } else {
                                     i6 = i18;
-                                    childAt2.measure(View.MeasureSpec.makeMeasureSpec(measuredWidth2 + ((int) ((layoutParams2.weight * ((float) Math.max(0, i13))) / f2)), 1073741824), i7);
+                                    childAt2.measure(View.MeasureSpec.makeMeasureSpec(measuredWidth2 + ((int) ((layoutParams2.weight * ((float) Math.max(0, i13))) / f2)), BasicMeasure.EXACTLY), i7);
                                     i19++;
                                     i18 = i6;
                                     i5 = 8;
@@ -877,17 +878,17 @@ public class SlidingPaneLayout extends ViewGroup {
                                 int i22 = ((ViewGroup.MarginLayoutParams) layoutParams2).height;
                                 if (i22 == -2) {
                                     i9 = View.MeasureSpec.makeMeasureSpec(i3, Integer.MIN_VALUE);
-                                    i8 = 1073741824;
+                                    i8 = BasicMeasure.EXACTLY;
                                 } else if (i22 == -1) {
-                                    i8 = 1073741824;
-                                    i9 = View.MeasureSpec.makeMeasureSpec(i3, 1073741824);
+                                    i8 = BasicMeasure.EXACTLY;
+                                    i9 = View.MeasureSpec.makeMeasureSpec(i3, BasicMeasure.EXACTLY);
                                 } else {
-                                    i8 = 1073741824;
-                                    i9 = View.MeasureSpec.makeMeasureSpec(i22, 1073741824);
+                                    i8 = BasicMeasure.EXACTLY;
+                                    i9 = View.MeasureSpec.makeMeasureSpec(i22, BasicMeasure.EXACTLY);
                                 }
                             } else {
-                                i8 = 1073741824;
-                                i9 = View.MeasureSpec.makeMeasureSpec(childAt2.getMeasuredHeight(), 1073741824);
+                                i8 = BasicMeasure.EXACTLY;
+                                i9 = View.MeasureSpec.makeMeasureSpec(childAt2.getMeasuredHeight(), BasicMeasure.EXACTLY);
                             }
                             childAt2.measure(View.MeasureSpec.makeMeasureSpec(i18, i8), i9);
                         }
diff --git a/app/src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java b/app/src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java
index 9ea544c559..8de2707425 100644
--- a/app/src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java
+++ b/app/src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.java
@@ -26,11 +26,11 @@ public interface SupportSQLiteOpenHelper extends Closeable {
 
         private void deleteDatabaseFile(String str) {
             if (!str.equalsIgnoreCase(":memory:") && str.trim().length() != 0) {
-                a.g0("deleting the database file: ", str, "SupportSQLite");
+                a.g0("deleting the database file: ", str, TAG);
                 try {
                     SQLiteDatabase.deleteDatabase(new File(str));
                 } catch (Exception e) {
-                    Log.w("SupportSQLite", "delete failed: ", e);
+                    Log.w(TAG, "delete failed: ", e);
                 }
             }
         }
@@ -65,7 +65,7 @@ public interface SupportSQLiteOpenHelper extends Closeable {
         public void onCorruption(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
             StringBuilder K = a.K("Corruption reported by sqlite on database: ");
             K.append(supportSQLiteDatabase.getPath());
-            Log.e("SupportSQLite", K.toString());
+            Log.e(TAG, K.toString());
             if (!supportSQLiteDatabase.isOpen()) {
                 deleteDatabaseFile(supportSQLiteDatabase.getPath());
                 return;
diff --git a/app/src/main/java/androidx/swiperefreshlayout/widget/CircleImageView.java b/app/src/main/java/androidx/swiperefreshlayout/widget/CircleImageView.java
index f1771805d6..c3c857a5ef 100644
--- a/app/src/main/java/androidx/swiperefreshlayout/widget/CircleImageView.java
+++ b/app/src/main/java/androidx/swiperefreshlayout/widget/CircleImageView.java
@@ -37,7 +37,7 @@ public class CircleImageView extends ImageView {
 
         private void updateRadialGradient(int i) {
             float f = (float) (i / 2);
-            this.mShadowPaint.setShader(new RadialGradient(f, f, (float) this.mShadowRadius, new int[]{1023410176, 0}, (float[]) null, Shader.TileMode.CLAMP));
+            this.mShadowPaint.setShader(new RadialGradient(f, f, (float) this.mShadowRadius, new int[]{CircleImageView.FILL_SHADOW_COLOR, 0}, (float[]) null, Shader.TileMode.CLAMP));
         }
 
         @Override // android.graphics.drawable.shapes.OvalShape, android.graphics.drawable.shapes.Shape, android.graphics.drawable.shapes.RectShape
@@ -60,11 +60,11 @@ public class CircleImageView extends ImageView {
         super(context);
         ShapeDrawable shapeDrawable;
         float f = getContext().getResources().getDisplayMetrics().density;
-        int i = (int) (1.75f * f);
+        int i = (int) (Y_OFFSET * f);
         int i2 = (int) (0.0f * f);
-        this.mShadowRadius = (int) (3.5f * f);
+        this.mShadowRadius = (int) (SHADOW_RADIUS * f);
         TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(R.styleable.SwipeRefreshLayout);
-        this.mBackgroundColor = obtainStyledAttributes.getColor(R.styleable.SwipeRefreshLayout_swipeRefreshLayoutProgressSpinnerBackgroundColor, -328966);
+        this.mBackgroundColor = obtainStyledAttributes.getColor(R.styleable.SwipeRefreshLayout_swipeRefreshLayoutProgressSpinnerBackgroundColor, DEFAULT_BACKGROUND_COLOR);
         obtainStyledAttributes.recycle();
         if (elevationSupported()) {
             shapeDrawable = new ShapeDrawable(new OvalShape());
@@ -72,7 +72,7 @@ public class CircleImageView extends ImageView {
         } else {
             ShapeDrawable shapeDrawable2 = new ShapeDrawable(new OvalShadow(this, this.mShadowRadius));
             setLayerType(1, shapeDrawable2.getPaint());
-            shapeDrawable2.getPaint().setShadowLayer((float) this.mShadowRadius, (float) i2, (float) i, 503316480);
+            shapeDrawable2.getPaint().setShadowLayer((float) this.mShadowRadius, (float) i2, (float) i, KEY_SHADOW_COLOR);
             int i3 = this.mShadowRadius;
             setPadding(i3, i3, i3, i3);
             shapeDrawable = shapeDrawable2;
diff --git a/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java b/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java
index 5456cc6ca5..da15de8f2d 100644
--- a/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java
+++ b/app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java
@@ -371,15 +371,15 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
         Ring ring = new Ring();
         this.mRing = ring;
         ring.setColors(COLORS);
-        setStrokeWidth(2.5f);
+        setStrokeWidth(STROKE_WIDTH);
         setupAnimators();
     }
 
     private void applyFinishTranslation(float f, Ring ring) {
         updateRingColor(f, ring);
-        ring.setStartTrim((((ring.getStartingEndTrim() - 0.01f) - ring.getStartingStartTrim()) * f) + ring.getStartingStartTrim());
+        ring.setStartTrim((((ring.getStartingEndTrim() - MIN_PROGRESS_ARC) - ring.getStartingStartTrim()) * f) + ring.getStartingStartTrim());
         ring.setEndTrim(ring.getStartingEndTrim());
-        ring.setRotation(((((float) (Math.floor((double) (ring.getStartingRotation() / 0.8f)) + 1.0d)) - ring.getStartingRotation()) * f) + ring.getStartingRotation());
+        ring.setRotation(((((float) (Math.floor((double) (ring.getStartingRotation() / MAX_PROGRESS_ARC)) + 1.0d)) - ring.getStartingRotation()) * f) + ring.getStartingRotation());
     }
 
     private int evaluateColorChange(float f, int i, int i2) {
@@ -427,16 +427,17 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
             float startingRotation = ring.getStartingRotation();
             if (f < 0.5f) {
                 f2 = ring.getStartingStartTrim();
-                f3 = (MATERIAL_INTERPOLATOR.getInterpolation(f / 0.5f) * 0.79f) + 0.01f + f2;
+                f3 = (MATERIAL_INTERPOLATOR.getInterpolation(f / 0.5f) * 0.79f) + MIN_PROGRESS_ARC + f2;
             } else {
                 float startingStartTrim = ring.getStartingStartTrim() + 0.79f;
-                f2 = startingStartTrim - (((1.0f - MATERIAL_INTERPOLATOR.getInterpolation((f - 0.5f) / 0.5f)) * 0.79f) + 0.01f);
+                f2 = startingStartTrim - (((1.0f - MATERIAL_INTERPOLATOR.getInterpolation((f - 0.5f) / 0.5f)) * 0.79f) + MIN_PROGRESS_ARC);
                 f3 = startingStartTrim;
             }
+            float f4 = (f + this.mRotationCount) * GROUP_FULL_ROTATION;
             ring.setStartTrim(f2);
             ring.setEndTrim(f3);
-            ring.setRotation((0.20999998f * f) + startingRotation);
-            setRotation((f + this.mRotationCount) * 216.0f);
+            ring.setRotation((RING_ROTATION * f) + startingRotation);
+            setRotation(f4);
         }
     }
 
@@ -580,9 +581,9 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
 
     public void setStyle(int i) {
         if (i == 0) {
-            setSizeParameters(11.0f, 3.0f, 12.0f, 6.0f);
+            setSizeParameters(CENTER_RADIUS_LARGE, STROKE_WIDTH_LARGE, 12.0f, 6.0f);
         } else {
-            setSizeParameters(7.5f, 2.5f, 10.0f, 5.0f);
+            setSizeParameters(CENTER_RADIUS, STROKE_WIDTH, 10.0f, 5.0f);
         }
         invalidateSelf();
     }
diff --git a/app/src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java b/app/src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java
index 166dc53ba7..7281ae6a68 100644
--- a/app/src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java
+++ b/app/src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java
@@ -22,6 +22,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Px;
 import androidx.annotation.VisibleForTesting;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.NestedScrollingChild;
 import androidx.core.view.NestedScrollingChild2;
@@ -33,6 +34,7 @@ import androidx.core.view.NestedScrollingParent3;
 import androidx.core.view.NestedScrollingParentHelper;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.ListViewCompat;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingParent3, NestedScrollingParent2, NestedScrollingChild3, NestedScrollingChild2, NestedScrollingParent, NestedScrollingChild {
     private static final int ALPHA_ANIMATION_DURATION = 300;
     private static final int ANIMATE_TO_START_DURATION = 200;
@@ -293,7 +295,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
         this.mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
         this.mMediumAnimationDuration = getResources().getInteger(17694721);
         setWillNotDraw(false);
-        this.mDecelerateInterpolator = new DecelerateInterpolator(2.0f);
+        this.mDecelerateInterpolator = new DecelerateInterpolator(DECELERATE_INTERPOLATION_FACTOR);
         DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
         this.mCircleDiameter = (int) (displayMetrics.density * 40.0f);
         createProgressView();
@@ -385,16 +387,16 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
     private void moveSpinner(float f) {
         this.mProgress.setArrowEnabled(true);
         float min = Math.min(1.0f, Math.abs(f / this.mTotalDragDistance));
-        float max = (((float) Math.max(((double) min) - 0.4d, 0.0d)) * 5.0f) / 3.0f;
+        float max = (((float) Math.max(((double) min) - 0.4d, (double) ShadowDrawableWrapper.COS_45)) * 5.0f) / 3.0f;
         float abs = Math.abs(f) - this.mTotalDragDistance;
         int i = this.mCustomSlingshotDistance;
         if (i <= 0) {
             i = this.mUsingCustomStart ? this.mSpinnerOffsetEnd - this.mOriginalOffsetTop : this.mSpinnerOffsetEnd;
         }
         float f2 = (float) i;
-        double max2 = (double) (Math.max(0.0f, Math.min(abs, f2 * 2.0f) / f2) / 4.0f);
-        float pow = ((float) (max2 - Math.pow(max2, 2.0d))) * 2.0f;
-        int i2 = this.mOriginalOffsetTop + ((int) ((f2 * min) + (f2 * pow * 2.0f)));
+        double max2 = (double) (Math.max(0.0f, Math.min(abs, f2 * DECELERATE_INTERPOLATION_FACTOR) / f2) / 4.0f);
+        float pow = ((float) (max2 - Math.pow(max2, 2.0d))) * DECELERATE_INTERPOLATION_FACTOR;
+        int i2 = this.mOriginalOffsetTop + ((int) ((f2 * min) + (f2 * pow * DECELERATE_INTERPOLATION_FACTOR)));
         if (this.mCircleView.getVisibility() != 0) {
             this.mCircleView.setVisibility(0);
         }
@@ -412,9 +414,9 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
         } else if (this.mProgress.getAlpha() < 255 && !isAnimationRunning(this.mAlphaMaxAnimation)) {
             startProgressAlphaMaxAnimation();
         }
-        this.mProgress.setStartEndTrim(0.0f, Math.min(0.8f, max * 0.8f));
+        this.mProgress.setStartEndTrim(0.0f, Math.min((float) MAX_PROGRESS_ANGLE, max * MAX_PROGRESS_ANGLE));
         this.mProgress.setArrowScale(Math.min(1.0f, max));
-        this.mProgress.setProgressRotation(((pow * 2.0f) + ((max * 0.4f) - 16.0f)) * 0.5f);
+        this.mProgress.setProgressRotation(((pow * DECELERATE_INTERPOLATION_FACTOR) + ((max * 0.4f) - 16.0f)) * 0.5f);
         setTargetOffsetTopAndBottom(i2 - this.mCurrentTargetOffsetTop);
     }
 
@@ -671,8 +673,8 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
         }
         View view = this.mTarget;
         if (view != null) {
-            view.measure(View.MeasureSpec.makeMeasureSpec((getMeasuredWidth() - getPaddingLeft()) - getPaddingRight(), 1073741824), View.MeasureSpec.makeMeasureSpec((getMeasuredHeight() - getPaddingTop()) - getPaddingBottom(), 1073741824));
-            this.mCircleView.measure(View.MeasureSpec.makeMeasureSpec(this.mCircleDiameter, 1073741824), View.MeasureSpec.makeMeasureSpec(this.mCircleDiameter, 1073741824));
+            view.measure(View.MeasureSpec.makeMeasureSpec((getMeasuredWidth() - getPaddingLeft()) - getPaddingRight(), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec((getMeasuredHeight() - getPaddingTop()) - getPaddingBottom(), BasicMeasure.EXACTLY));
+            this.mCircleView.measure(View.MeasureSpec.makeMeasureSpec(this.mCircleDiameter, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(this.mCircleDiameter, BasicMeasure.EXACTLY));
             this.mCircleViewIndex = -1;
             for (int i3 = 0; i3 < getChildCount(); i3++) {
                 if (getChildAt(i3) == this.mCircleView) {
diff --git a/app/src/main/java/androidx/tracing/Trace.java b/app/src/main/java/androidx/tracing/Trace.java
index 27256247e6..112b79a0c8 100644
--- a/app/src/main/java/androidx/tracing/Trace.java
+++ b/app/src/main/java/androidx/tracing/Trace.java
@@ -78,7 +78,7 @@ public final class Trace {
             }
             throw new RuntimeException(cause);
         }
-        Log.v("Trace", "Unable to call " + str + " via reflection", exc);
+        Log.v(TAG, "Unable to call " + str + " via reflection", exc);
     }
 
     @SuppressLint({"NewApi"})
diff --git a/app/src/main/java/androidx/transition/ArcMotion.java b/app/src/main/java/androidx/transition/ArcMotion.java
index da9888f130..771649f432 100644
--- a/app/src/main/java/androidx/transition/ArcMotion.java
+++ b/app/src/main/java/androidx/transition/ArcMotion.java
@@ -12,7 +12,7 @@ public class ArcMotion extends PathMotion {
     private static final float DEFAULT_MAX_ANGLE_DEGREES = 70.0f;
     private static final float DEFAULT_MAX_TANGENT = ((float) Math.tan(Math.toRadians(35.0d)));
     private static final float DEFAULT_MIN_ANGLE_DEGREES = 0.0f;
-    private float mMaximumAngle = 70.0f;
+    private float mMaximumAngle = DEFAULT_MAX_ANGLE_DEGREES;
     private float mMaximumTangent = DEFAULT_MAX_TANGENT;
     private float mMinimumHorizontalAngle = 0.0f;
     private float mMinimumHorizontalTangent = 0.0f;
@@ -29,7 +29,7 @@ public class ArcMotion extends PathMotion {
         XmlPullParser xmlPullParser = (XmlPullParser) attributeSet;
         setMinimumVerticalAngle(TypedArrayUtils.getNamedFloat(obtainStyledAttributes, xmlPullParser, "minimumVerticalAngle", 1, 0.0f));
         setMinimumHorizontalAngle(TypedArrayUtils.getNamedFloat(obtainStyledAttributes, xmlPullParser, "minimumHorizontalAngle", 0, 0.0f));
-        setMaximumAngle(TypedArrayUtils.getNamedFloat(obtainStyledAttributes, xmlPullParser, "maximumAngle", 2, 70.0f));
+        setMaximumAngle(TypedArrayUtils.getNamedFloat(obtainStyledAttributes, xmlPullParser, "maximumAngle", 2, DEFAULT_MAX_ANGLE_DEGREES));
         obtainStyledAttributes.recycle();
     }
 
diff --git a/app/src/main/java/androidx/transition/ChangeBounds.java b/app/src/main/java/androidx/transition/ChangeBounds.java
index 81650339f1..b0255b1431 100644
--- a/app/src/main/java/androidx/transition/ChangeBounds.java
+++ b/app/src/main/java/androidx/transition/ChangeBounds.java
@@ -22,12 +22,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.view.ViewCompat;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Map;
 public class ChangeBounds extends Transition {
     private static final Property<View, PointF> BOTTOM_RIGHT_ONLY_PROPERTY = new AnonymousClass4(PointF.class, "bottomRight");
     private static final Property<ViewBounds, PointF> BOTTOM_RIGHT_PROPERTY = new AnonymousClass3(PointF.class, "bottomRight");
     private static final Property<Drawable, PointF> DRAWABLE_ORIGIN_PROPERTY = new AnonymousClass1(PointF.class, "boundsOrigin");
-    private static final Property<View, PointF> POSITION_PROPERTY = new AnonymousClass6(PointF.class, "position");
+    private static final Property<View, PointF> POSITION_PROPERTY = new AnonymousClass6(PointF.class, ModelAuditLogEntry.CHANGE_KEY_POSITION);
     private static final String PROPNAME_BOUNDS = "android:changeBounds:bounds";
     private static final String PROPNAME_CLIP = "android:changeBounds:clip";
     private static final String PROPNAME_PARENT = "android:changeBounds:parent";
@@ -36,7 +37,7 @@ public class ChangeBounds extends Transition {
     private static final Property<View, PointF> TOP_LEFT_ONLY_PROPERTY = new AnonymousClass5(PointF.class, "topLeft");
     private static final Property<ViewBounds, PointF> TOP_LEFT_PROPERTY = new AnonymousClass2(PointF.class, "topLeft");
     private static RectEvaluator sRectEvaluator = new RectEvaluator();
-    private static final String[] sTransitionProperties = {"android:changeBounds:bounds", "android:changeBounds:clip", "android:changeBounds:parent", "android:changeBounds:windowX", "android:changeBounds:windowY"};
+    private static final String[] sTransitionProperties = {PROPNAME_BOUNDS, PROPNAME_CLIP, PROPNAME_PARENT, PROPNAME_WINDOW_X, PROPNAME_WINDOW_Y};
     private boolean mReparent;
     private boolean mResizeClip;
     private int[] mTempLocation;
@@ -299,15 +300,15 @@ public class ChangeBounds extends Transition {
     private void captureValues(TransitionValues transitionValues) {
         View view = transitionValues.view;
         if (ViewCompat.isLaidOut(view) || view.getWidth() != 0 || view.getHeight() != 0) {
-            transitionValues.values.put("android:changeBounds:bounds", new Rect(view.getLeft(), view.getTop(), view.getRight(), view.getBottom()));
-            transitionValues.values.put("android:changeBounds:parent", transitionValues.view.getParent());
+            transitionValues.values.put(PROPNAME_BOUNDS, new Rect(view.getLeft(), view.getTop(), view.getRight(), view.getBottom()));
+            transitionValues.values.put(PROPNAME_PARENT, transitionValues.view.getParent());
             if (this.mReparent) {
                 transitionValues.view.getLocationInWindow(this.mTempLocation);
-                transitionValues.values.put("android:changeBounds:windowX", Integer.valueOf(this.mTempLocation[0]));
-                transitionValues.values.put("android:changeBounds:windowY", Integer.valueOf(this.mTempLocation[1]));
+                transitionValues.values.put(PROPNAME_WINDOW_X, Integer.valueOf(this.mTempLocation[0]));
+                transitionValues.values.put(PROPNAME_WINDOW_Y, Integer.valueOf(this.mTempLocation[1]));
             }
             if (this.mResizeClip) {
-                transitionValues.values.put("android:changeBounds:clip", ViewCompat.getClipBounds(view));
+                transitionValues.values.put(PROPNAME_CLIP, ViewCompat.getClipBounds(view));
             }
         }
     }
@@ -351,15 +352,15 @@ public class ChangeBounds extends Transition {
         }
         Map<String, Object> map = transitionValues.values;
         Map<String, Object> map2 = transitionValues2.values;
-        ViewGroup viewGroup2 = (ViewGroup) map.get("android:changeBounds:parent");
-        ViewGroup viewGroup3 = (ViewGroup) map2.get("android:changeBounds:parent");
+        ViewGroup viewGroup2 = (ViewGroup) map.get(PROPNAME_PARENT);
+        ViewGroup viewGroup3 = (ViewGroup) map2.get(PROPNAME_PARENT);
         if (viewGroup2 == null || viewGroup3 == null) {
             return null;
         }
         View view2 = transitionValues2.view;
         if (parentMatches(viewGroup2, viewGroup3)) {
-            Rect rect2 = (Rect) transitionValues.values.get("android:changeBounds:bounds");
-            Rect rect3 = (Rect) transitionValues2.values.get("android:changeBounds:bounds");
+            Rect rect2 = (Rect) transitionValues.values.get(PROPNAME_BOUNDS);
+            Rect rect3 = (Rect) transitionValues2.values.get(PROPNAME_BOUNDS);
             int i3 = rect2.left;
             int i4 = rect3.left;
             int i5 = rect2.top;
@@ -372,8 +373,8 @@ public class ChangeBounds extends Transition {
             int i12 = i9 - i5;
             int i13 = i8 - i4;
             int i14 = i10 - i6;
-            Rect rect4 = (Rect) transitionValues.values.get("android:changeBounds:clip");
-            Rect rect5 = (Rect) transitionValues2.values.get("android:changeBounds:clip");
+            Rect rect4 = (Rect) transitionValues.values.get(PROPNAME_CLIP);
+            Rect rect5 = (Rect) transitionValues2.values.get(PROPNAME_CLIP);
             if ((i11 == 0 || i12 == 0) && (i13 == 0 || i14 == 0)) {
                 i = 0;
             } else {
@@ -437,10 +438,10 @@ public class ChangeBounds extends Transition {
             }
             return animator;
         }
-        int intValue = ((Integer) transitionValues.values.get("android:changeBounds:windowX")).intValue();
-        int intValue2 = ((Integer) transitionValues.values.get("android:changeBounds:windowY")).intValue();
-        int intValue3 = ((Integer) transitionValues2.values.get("android:changeBounds:windowX")).intValue();
-        int intValue4 = ((Integer) transitionValues2.values.get("android:changeBounds:windowY")).intValue();
+        int intValue = ((Integer) transitionValues.values.get(PROPNAME_WINDOW_X)).intValue();
+        int intValue2 = ((Integer) transitionValues.values.get(PROPNAME_WINDOW_Y)).intValue();
+        int intValue3 = ((Integer) transitionValues2.values.get(PROPNAME_WINDOW_X)).intValue();
+        int intValue4 = ((Integer) transitionValues2.values.get(PROPNAME_WINDOW_Y)).intValue();
         if (intValue == intValue3 && intValue2 == intValue4) {
             return null;
         }
diff --git a/app/src/main/java/androidx/transition/ChangeClipBounds.java b/app/src/main/java/androidx/transition/ChangeClipBounds.java
index fd981b7011..04543ce933 100644
--- a/app/src/main/java/androidx/transition/ChangeClipBounds.java
+++ b/app/src/main/java/androidx/transition/ChangeClipBounds.java
@@ -15,7 +15,7 @@ import androidx.core.view.ViewCompat;
 public class ChangeClipBounds extends Transition {
     private static final String PROPNAME_BOUNDS = "android:clipBounds:bounds";
     private static final String PROPNAME_CLIP = "android:clipBounds:clip";
-    private static final String[] sTransitionProperties = {"android:clipBounds:clip"};
+    private static final String[] sTransitionProperties = {PROPNAME_CLIP};
 
     /* renamed from: androidx.transition.ChangeClipBounds$1  reason: invalid class name */
     public class AnonymousClass1 extends AnimatorListenerAdapter {
@@ -42,9 +42,9 @@ public class ChangeClipBounds extends Transition {
         View view = transitionValues.view;
         if (view.getVisibility() != 8) {
             Rect clipBounds = ViewCompat.getClipBounds(view);
-            transitionValues.values.put("android:clipBounds:clip", clipBounds);
+            transitionValues.values.put(PROPNAME_CLIP, clipBounds);
             if (clipBounds == null) {
-                transitionValues.values.put("android:clipBounds:bounds", new Rect(0, 0, view.getWidth(), view.getHeight()));
+                transitionValues.values.put(PROPNAME_BOUNDS, new Rect(0, 0, view.getWidth(), view.getHeight()));
             }
         }
     }
@@ -62,17 +62,17 @@ public class ChangeClipBounds extends Transition {
     @Override // androidx.transition.Transition
     public Animator createAnimator(@NonNull ViewGroup viewGroup, TransitionValues transitionValues, TransitionValues transitionValues2) {
         ObjectAnimator objectAnimator = null;
-        if (transitionValues != null && transitionValues2 != null && transitionValues.values.containsKey("android:clipBounds:clip") && transitionValues2.values.containsKey("android:clipBounds:clip")) {
-            Rect rect = (Rect) transitionValues.values.get("android:clipBounds:clip");
-            Rect rect2 = (Rect) transitionValues2.values.get("android:clipBounds:clip");
+        if (transitionValues != null && transitionValues2 != null && transitionValues.values.containsKey(PROPNAME_CLIP) && transitionValues2.values.containsKey(PROPNAME_CLIP)) {
+            Rect rect = (Rect) transitionValues.values.get(PROPNAME_CLIP);
+            Rect rect2 = (Rect) transitionValues2.values.get(PROPNAME_CLIP);
             boolean z2 = rect2 == null;
             if (rect == null && rect2 == null) {
                 return null;
             }
             if (rect == null) {
-                rect = (Rect) transitionValues.values.get("android:clipBounds:bounds");
+                rect = (Rect) transitionValues.values.get(PROPNAME_BOUNDS);
             } else if (rect2 == null) {
-                rect2 = (Rect) transitionValues2.values.get("android:clipBounds:bounds");
+                rect2 = (Rect) transitionValues2.values.get(PROPNAME_BOUNDS);
             }
             if (rect.equals(rect2)) {
                 return null;
diff --git a/app/src/main/java/androidx/transition/ChangeImageTransform.java b/app/src/main/java/androidx/transition/ChangeImageTransform.java
index 5df46e40a7..17c6e2ab57 100644
--- a/app/src/main/java/androidx/transition/ChangeImageTransform.java
+++ b/app/src/main/java/androidx/transition/ChangeImageTransform.java
@@ -20,7 +20,7 @@ public class ChangeImageTransform extends Transition {
     private static final TypeEvaluator<Matrix> NULL_MATRIX_EVALUATOR = new AnonymousClass1();
     private static final String PROPNAME_BOUNDS = "android:changeImageTransform:bounds";
     private static final String PROPNAME_MATRIX = "android:changeImageTransform:matrix";
-    private static final String[] sTransitionProperties = {"android:changeImageTransform:matrix", "android:changeImageTransform:bounds"};
+    private static final String[] sTransitionProperties = {PROPNAME_MATRIX, PROPNAME_BOUNDS};
 
     /* renamed from: androidx.transition.ChangeImageTransform$1  reason: invalid class name */
     public static class AnonymousClass1 implements TypeEvaluator<Matrix> {
@@ -75,8 +75,8 @@ public class ChangeImageTransform extends Transition {
             ImageView imageView = (ImageView) view;
             if (imageView.getDrawable() != null) {
                 Map<String, Object> map = transitionValues.values;
-                map.put("android:changeImageTransform:bounds", new Rect(view.getLeft(), view.getTop(), view.getRight(), view.getBottom()));
-                map.put("android:changeImageTransform:matrix", copyImageMatrix(imageView));
+                map.put(PROPNAME_BOUNDS, new Rect(view.getLeft(), view.getTop(), view.getRight(), view.getBottom()));
+                map.put(PROPNAME_MATRIX, copyImageMatrix(imageView));
             }
         }
     }
@@ -147,13 +147,13 @@ public class ChangeImageTransform extends Transition {
         if (transitionValues == null || transitionValues2 == null) {
             return null;
         }
-        Rect rect = (Rect) transitionValues.values.get("android:changeImageTransform:bounds");
-        Rect rect2 = (Rect) transitionValues2.values.get("android:changeImageTransform:bounds");
+        Rect rect = (Rect) transitionValues.values.get(PROPNAME_BOUNDS);
+        Rect rect2 = (Rect) transitionValues2.values.get(PROPNAME_BOUNDS);
         if (rect == null || rect2 == null) {
             return null;
         }
-        Matrix matrix = (Matrix) transitionValues.values.get("android:changeImageTransform:matrix");
-        Matrix matrix2 = (Matrix) transitionValues2.values.get("android:changeImageTransform:matrix");
+        Matrix matrix = (Matrix) transitionValues.values.get(PROPNAME_MATRIX);
+        Matrix matrix2 = (Matrix) transitionValues2.values.get(PROPNAME_MATRIX);
         boolean z2 = (matrix == null && matrix2 == null) || (matrix != null && matrix.equals(matrix2));
         if (rect.equals(rect2) && z2) {
             return null;
diff --git a/app/src/main/java/androidx/transition/ChangeScroll.java b/app/src/main/java/androidx/transition/ChangeScroll.java
index 3af5bc997d..6d82e3e343 100644
--- a/app/src/main/java/androidx/transition/ChangeScroll.java
+++ b/app/src/main/java/androidx/transition/ChangeScroll.java
@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 public class ChangeScroll extends Transition {
-    private static final String[] PROPERTIES = {"android:changeScroll:x", "android:changeScroll:y"};
+    private static final String[] PROPERTIES = {PROPNAME_SCROLL_X, PROPNAME_SCROLL_Y};
     private static final String PROPNAME_SCROLL_X = "android:changeScroll:x";
     private static final String PROPNAME_SCROLL_Y = "android:changeScroll:y";
 
@@ -21,8 +21,8 @@ public class ChangeScroll extends Transition {
     }
 
     private void captureValues(TransitionValues transitionValues) {
-        transitionValues.values.put("android:changeScroll:x", Integer.valueOf(transitionValues.view.getScrollX()));
-        transitionValues.values.put("android:changeScroll:y", Integer.valueOf(transitionValues.view.getScrollY()));
+        transitionValues.values.put(PROPNAME_SCROLL_X, Integer.valueOf(transitionValues.view.getScrollX()));
+        transitionValues.values.put(PROPNAME_SCROLL_Y, Integer.valueOf(transitionValues.view.getScrollY()));
     }
 
     @Override // androidx.transition.Transition
@@ -44,10 +44,10 @@ public class ChangeScroll extends Transition {
             return null;
         }
         View view = transitionValues2.view;
-        int intValue = ((Integer) transitionValues.values.get("android:changeScroll:x")).intValue();
-        int intValue2 = ((Integer) transitionValues2.values.get("android:changeScroll:x")).intValue();
-        int intValue3 = ((Integer) transitionValues.values.get("android:changeScroll:y")).intValue();
-        int intValue4 = ((Integer) transitionValues2.values.get("android:changeScroll:y")).intValue();
+        int intValue = ((Integer) transitionValues.values.get(PROPNAME_SCROLL_X)).intValue();
+        int intValue2 = ((Integer) transitionValues2.values.get(PROPNAME_SCROLL_X)).intValue();
+        int intValue3 = ((Integer) transitionValues.values.get(PROPNAME_SCROLL_Y)).intValue();
+        int intValue4 = ((Integer) transitionValues2.values.get(PROPNAME_SCROLL_Y)).intValue();
         if (intValue != intValue2) {
             view.setScrollX(intValue);
             objectAnimator = ObjectAnimator.ofInt(view, "scrollX", intValue, intValue2);
diff --git a/app/src/main/java/androidx/transition/ChangeTransform.java b/app/src/main/java/androidx/transition/ChangeTransform.java
index b029266989..188bac38e4 100644
--- a/app/src/main/java/androidx/transition/ChangeTransform.java
+++ b/app/src/main/java/androidx/transition/ChangeTransform.java
@@ -27,7 +27,7 @@ public class ChangeTransform extends Transition {
     private static final String PROPNAME_TRANSFORMS = "android:changeTransform:transforms";
     private static final boolean SUPPORTS_VIEW_REMOVAL_SUPPRESSION = true;
     private static final Property<PathAnimatorMatrix, PointF> TRANSLATIONS_PROPERTY = new AnonymousClass2(PointF.class, "translations");
-    private static final String[] sTransitionProperties = {"android:changeTransform:matrix", "android:changeTransform:transforms", "android:changeTransform:parentMatrix"};
+    private static final String[] sTransitionProperties = {PROPNAME_MATRIX, PROPNAME_TRANSFORMS, PROPNAME_PARENT_MATRIX};
     private boolean mReparent = true;
     private Matrix mTempMatrix = new Matrix();
     public boolean mUseOverlay = true;
@@ -257,29 +257,29 @@ public class ChangeTransform extends Transition {
     private void captureValues(TransitionValues transitionValues) {
         View view = transitionValues.view;
         if (view.getVisibility() != 8) {
-            transitionValues.values.put("android:changeTransform:parent", view.getParent());
-            transitionValues.values.put("android:changeTransform:transforms", new Transforms(view));
+            transitionValues.values.put(PROPNAME_PARENT, view.getParent());
+            transitionValues.values.put(PROPNAME_TRANSFORMS, new Transforms(view));
             Matrix matrix = view.getMatrix();
-            transitionValues.values.put("android:changeTransform:matrix", (matrix == null || matrix.isIdentity()) ? null : new Matrix(matrix));
+            transitionValues.values.put(PROPNAME_MATRIX, (matrix == null || matrix.isIdentity()) ? null : new Matrix(matrix));
             if (this.mReparent) {
                 Matrix matrix2 = new Matrix();
                 ViewGroup viewGroup = (ViewGroup) view.getParent();
                 ViewUtils.transformMatrixToGlobal(viewGroup, matrix2);
                 matrix2.preTranslate((float) (-viewGroup.getScrollX()), (float) (-viewGroup.getScrollY()));
-                transitionValues.values.put("android:changeTransform:parentMatrix", matrix2);
-                transitionValues.values.put("android:changeTransform:intermediateMatrix", view.getTag(R.id.transition_transform));
-                transitionValues.values.put("android:changeTransform:intermediateParentMatrix", view.getTag(R.id.parent_matrix));
+                transitionValues.values.put(PROPNAME_PARENT_MATRIX, matrix2);
+                transitionValues.values.put(PROPNAME_INTERMEDIATE_MATRIX, view.getTag(R.id.transition_transform));
+                transitionValues.values.put(PROPNAME_INTERMEDIATE_PARENT_MATRIX, view.getTag(R.id.parent_matrix));
             }
         }
     }
 
     private void createGhostView(ViewGroup viewGroup, TransitionValues transitionValues, TransitionValues transitionValues2) {
         View view = transitionValues2.view;
-        Matrix matrix = new Matrix((Matrix) transitionValues2.values.get("android:changeTransform:parentMatrix"));
+        Matrix matrix = new Matrix((Matrix) transitionValues2.values.get(PROPNAME_PARENT_MATRIX));
         ViewUtils.transformMatrixToLocal(viewGroup, matrix);
         GhostView addGhost = GhostViewUtils.addGhost(view, viewGroup, matrix);
         if (addGhost != null) {
-            addGhost.reserveEndViewTransition((ViewGroup) transitionValues.values.get("android:changeTransform:parent"), transitionValues.view);
+            addGhost.reserveEndViewTransition((ViewGroup) transitionValues.values.get(PROPNAME_PARENT), transitionValues.view);
             Transition transition = this;
             while (true) {
                 Transition transition2 = transition.mParent;
@@ -300,8 +300,8 @@ public class ChangeTransform extends Transition {
     }
 
     private ObjectAnimator createTransformAnimator(TransitionValues transitionValues, TransitionValues transitionValues2, boolean z2) {
-        Matrix matrix = (Matrix) transitionValues.values.get("android:changeTransform:matrix");
-        Matrix matrix2 = (Matrix) transitionValues2.values.get("android:changeTransform:matrix");
+        Matrix matrix = (Matrix) transitionValues.values.get(PROPNAME_MATRIX);
+        Matrix matrix2 = (Matrix) transitionValues2.values.get(PROPNAME_MATRIX);
         if (matrix == null) {
             matrix = MatrixUtils.IDENTITY_MATRIX;
         }
@@ -311,7 +311,7 @@ public class ChangeTransform extends Transition {
         if (matrix.equals(matrix2)) {
             return null;
         }
-        Transforms transforms = (Transforms) transitionValues2.values.get("android:changeTransform:transforms");
+        Transforms transforms = (Transforms) transitionValues2.values.get(PROPNAME_TRANSFORMS);
         View view = transitionValues2.view;
         setIdentityTransforms(view);
         float[] fArr = new float[9];
@@ -349,17 +349,17 @@ public class ChangeTransform extends Transition {
     }
 
     private void setMatricesForParent(TransitionValues transitionValues, TransitionValues transitionValues2) {
-        Matrix matrix = (Matrix) transitionValues2.values.get("android:changeTransform:parentMatrix");
+        Matrix matrix = (Matrix) transitionValues2.values.get(PROPNAME_PARENT_MATRIX);
         transitionValues2.view.setTag(R.id.parent_matrix, matrix);
         Matrix matrix2 = this.mTempMatrix;
         matrix2.reset();
         matrix.invert(matrix2);
-        Matrix matrix3 = (Matrix) transitionValues.values.get("android:changeTransform:matrix");
+        Matrix matrix3 = (Matrix) transitionValues.values.get(PROPNAME_MATRIX);
         if (matrix3 == null) {
             matrix3 = new Matrix();
-            transitionValues.values.put("android:changeTransform:matrix", matrix3);
+            transitionValues.values.put(PROPNAME_MATRIX, matrix3);
         }
-        matrix3.postConcat((Matrix) transitionValues.values.get("android:changeTransform:parentMatrix"));
+        matrix3.postConcat((Matrix) transitionValues.values.get(PROPNAME_PARENT_MATRIX));
         matrix3.postConcat(matrix2);
     }
 
@@ -389,18 +389,18 @@ public class ChangeTransform extends Transition {
 
     @Override // androidx.transition.Transition
     public Animator createAnimator(@NonNull ViewGroup viewGroup, TransitionValues transitionValues, TransitionValues transitionValues2) {
-        if (transitionValues == null || transitionValues2 == null || !transitionValues.values.containsKey("android:changeTransform:parent") || !transitionValues2.values.containsKey("android:changeTransform:parent")) {
+        if (transitionValues == null || transitionValues2 == null || !transitionValues.values.containsKey(PROPNAME_PARENT) || !transitionValues2.values.containsKey(PROPNAME_PARENT)) {
             return null;
         }
-        ViewGroup viewGroup2 = (ViewGroup) transitionValues.values.get("android:changeTransform:parent");
-        boolean z2 = this.mReparent && !parentsMatch(viewGroup2, (ViewGroup) transitionValues2.values.get("android:changeTransform:parent"));
-        Matrix matrix = (Matrix) transitionValues.values.get("android:changeTransform:intermediateMatrix");
+        ViewGroup viewGroup2 = (ViewGroup) transitionValues.values.get(PROPNAME_PARENT);
+        boolean z2 = this.mReparent && !parentsMatch(viewGroup2, (ViewGroup) transitionValues2.values.get(PROPNAME_PARENT));
+        Matrix matrix = (Matrix) transitionValues.values.get(PROPNAME_INTERMEDIATE_MATRIX);
         if (matrix != null) {
-            transitionValues.values.put("android:changeTransform:matrix", matrix);
+            transitionValues.values.put(PROPNAME_MATRIX, matrix);
         }
-        Matrix matrix2 = (Matrix) transitionValues.values.get("android:changeTransform:intermediateParentMatrix");
+        Matrix matrix2 = (Matrix) transitionValues.values.get(PROPNAME_INTERMEDIATE_PARENT_MATRIX);
         if (matrix2 != null) {
-            transitionValues.values.put("android:changeTransform:parentMatrix", matrix2);
+            transitionValues.values.put(PROPNAME_PARENT_MATRIX, matrix2);
         }
         if (z2) {
             setMatricesForParent(transitionValues, transitionValues2);
diff --git a/app/src/main/java/androidx/transition/Explode.java b/app/src/main/java/androidx/transition/Explode.java
index bd9e28adf7..126ac9014a 100644
--- a/app/src/main/java/androidx/transition/Explode.java
+++ b/app/src/main/java/androidx/transition/Explode.java
@@ -68,7 +68,7 @@ public class Explode extends Visibility {
         int[] iArr = this.mTempLoc;
         int i = iArr[0];
         int i2 = iArr[1];
-        transitionValues.values.put("android:explode:screenBounds", new Rect(i, i2, view.getWidth() + i, view.getHeight() + i2));
+        transitionValues.values.put(PROPNAME_SCREEN_BOUNDS, new Rect(i, i2, view.getWidth() + i, view.getHeight() + i2));
     }
 
     @Override // androidx.transition.Visibility, androidx.transition.Transition
@@ -88,7 +88,7 @@ public class Explode extends Visibility {
         if (transitionValues2 == null) {
             return null;
         }
-        Rect rect = (Rect) transitionValues2.values.get("android:explode:screenBounds");
+        Rect rect = (Rect) transitionValues2.values.get(PROPNAME_SCREEN_BOUNDS);
         float translationX = view.getTranslationX();
         float translationY = view.getTranslationY();
         calculateOut(viewGroup, rect, this.mTempLoc);
@@ -103,7 +103,7 @@ public class Explode extends Visibility {
         if (transitionValues == null) {
             return null;
         }
-        Rect rect = (Rect) transitionValues.values.get("android:explode:screenBounds");
+        Rect rect = (Rect) transitionValues.values.get(PROPNAME_SCREEN_BOUNDS);
         int i = rect.left;
         int i2 = rect.top;
         float translationX = view.getTranslationX();
diff --git a/app/src/main/java/androidx/transition/Fade.java b/app/src/main/java/androidx/transition/Fade.java
index 2cafe7ff8d..8eb8818244 100644
--- a/app/src/main/java/androidx/transition/Fade.java
+++ b/app/src/main/java/androidx/transition/Fade.java
@@ -88,13 +88,13 @@ public class Fade extends Visibility {
 
     private static float getStartAlpha(TransitionValues transitionValues, float f) {
         Float f2;
-        return (transitionValues == null || (f2 = (Float) transitionValues.values.get("android:fade:transitionAlpha")) == null) ? f : f2.floatValue();
+        return (transitionValues == null || (f2 = (Float) transitionValues.values.get(PROPNAME_TRANSITION_ALPHA)) == null) ? f : f2.floatValue();
     }
 
     @Override // androidx.transition.Visibility, androidx.transition.Transition
     public void captureStartValues(@NonNull TransitionValues transitionValues) {
         super.captureStartValues(transitionValues);
-        transitionValues.values.put("android:fade:transitionAlpha", Float.valueOf(ViewUtils.getTransitionAlpha(transitionValues.view)));
+        transitionValues.values.put(PROPNAME_TRANSITION_ALPHA, Float.valueOf(ViewUtils.getTransitionAlpha(transitionValues.view)));
     }
 
     @Override // androidx.transition.Visibility
diff --git a/app/src/main/java/androidx/transition/GhostViewPlatform.java b/app/src/main/java/androidx/transition/GhostViewPlatform.java
index cdc209b784..92a08aa19a 100644
--- a/app/src/main/java/androidx/transition/GhostViewPlatform.java
+++ b/app/src/main/java/androidx/transition/GhostViewPlatform.java
@@ -45,7 +45,7 @@ public class GhostViewPlatform implements GhostView {
                 sAddGhostMethod = declaredMethod;
                 declaredMethod.setAccessible(true);
             } catch (NoSuchMethodException e) {
-                Log.i("GhostViewApi21", "Failed to retrieve addGhost method", e);
+                Log.i(TAG, "Failed to retrieve addGhost method", e);
             }
             sAddGhostMethodFetched = true;
         }
@@ -56,7 +56,7 @@ public class GhostViewPlatform implements GhostView {
             try {
                 sGhostViewClass = Class.forName("android.view.GhostView");
             } catch (ClassNotFoundException e) {
-                Log.i("GhostViewApi21", "Failed to retrieve GhostView class", e);
+                Log.i(TAG, "Failed to retrieve GhostView class", e);
             }
             sGhostViewClassFetched = true;
         }
@@ -70,7 +70,7 @@ public class GhostViewPlatform implements GhostView {
                 sRemoveGhostMethod = declaredMethod;
                 declaredMethod.setAccessible(true);
             } catch (NoSuchMethodException e) {
-                Log.i("GhostViewApi21", "Failed to retrieve removeGhost method", e);
+                Log.i(TAG, "Failed to retrieve removeGhost method", e);
             }
             sRemoveGhostMethodFetched = true;
         }
diff --git a/app/src/main/java/androidx/transition/Slide.java b/app/src/main/java/androidx/transition/Slide.java
index 3858d2c2b6..71ec6ea0f3 100644
--- a/app/src/main/java/androidx/transition/Slide.java
+++ b/app/src/main/java/androidx/transition/Slide.java
@@ -169,7 +169,7 @@ public class Slide extends Visibility {
     private void captureValues(TransitionValues transitionValues) {
         int[] iArr = new int[2];
         transitionValues.view.getLocationOnScreen(iArr);
-        transitionValues.values.put("android:slide:screenPosition", iArr);
+        transitionValues.values.put(PROPNAME_SCREEN_POSITION, iArr);
     }
 
     @Override // androidx.transition.Visibility, androidx.transition.Transition
@@ -193,7 +193,7 @@ public class Slide extends Visibility {
         if (transitionValues2 == null) {
             return null;
         }
-        int[] iArr = (int[]) transitionValues2.values.get("android:slide:screenPosition");
+        int[] iArr = (int[]) transitionValues2.values.get(PROPNAME_SCREEN_POSITION);
         float translationX = view.getTranslationX();
         float translationY = view.getTranslationY();
         return TranslationAnimationCreator.createAnimation(view, transitionValues2, iArr[0], iArr[1], this.mSlideCalculator.getGoneX(viewGroup, view), this.mSlideCalculator.getGoneY(viewGroup, view), translationX, translationY, sDecelerate, this);
@@ -204,7 +204,7 @@ public class Slide extends Visibility {
         if (transitionValues == null) {
             return null;
         }
-        int[] iArr = (int[]) transitionValues.values.get("android:slide:screenPosition");
+        int[] iArr = (int[]) transitionValues.values.get(PROPNAME_SCREEN_POSITION);
         return TranslationAnimationCreator.createAnimation(view, transitionValues, iArr[0], iArr[1], view.getTranslationX(), view.getTranslationY(), this.mSlideCalculator.getGoneX(viewGroup, view), this.mSlideCalculator.getGoneY(viewGroup, view), sAccelerate, this);
     }
 
diff --git a/app/src/main/java/androidx/transition/Transition.java b/app/src/main/java/androidx/transition/Transition.java
index dae12abf31..060d568e7a 100644
--- a/app/src/main/java/androidx/transition/Transition.java
+++ b/app/src/main/java/androidx/transition/Transition.java
@@ -25,6 +25,7 @@ import androidx.collection.ArrayMap;
 import androidx.collection.LongSparseArray;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -475,11 +476,11 @@ public abstract class Transition implements Cloneable {
             String trim = stringTokenizer.nextToken().trim();
             if ("id".equalsIgnoreCase(trim)) {
                 iArr[i] = 3;
-            } else if ("instance".equalsIgnoreCase(trim)) {
+            } else if (MATCH_INSTANCE_STR.equalsIgnoreCase(trim)) {
                 iArr[i] = 1;
             } else if ("name".equalsIgnoreCase(trim)) {
                 iArr[i] = 2;
-            } else if ("itemId".equalsIgnoreCase(trim)) {
+            } else if (MATCH_ITEM_ID_STR.equalsIgnoreCase(trim)) {
                 iArr[i] = 4;
             } else if (trim.isEmpty()) {
                 int[] iArr2 = new int[(iArr.length - 1)];
@@ -704,7 +705,7 @@ public abstract class Transition implements Cloneable {
         ArrayMap<Animator, AnimationInfo> runningAnimators = getRunningAnimators();
         SparseIntArray sparseIntArray = new SparseIntArray();
         int size = arrayList.size();
-        long j = Long.MAX_VALUE;
+        long j = RecyclerView.FOREVER_NS;
         int i3 = 0;
         while (i3 < size) {
             TransitionValues transitionValues3 = arrayList.get(i3);
diff --git a/app/src/main/java/androidx/transition/TransitionUtils.java b/app/src/main/java/androidx/transition/TransitionUtils.java
index dc53a62dd7..011cb145d9 100644
--- a/app/src/main/java/androidx/transition/TransitionUtils.java
+++ b/app/src/main/java/androidx/transition/TransitionUtils.java
@@ -12,6 +12,7 @@ import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 public class TransitionUtils {
     private static final boolean HAS_IS_ATTACHED_TO_WINDOW = true;
     private static final boolean HAS_OVERLAY = true;
@@ -65,7 +66,7 @@ public class TransitionUtils {
         if (createViewBitmap != null) {
             imageView.setImageBitmap(createViewBitmap);
         }
-        imageView.measure(View.MeasureSpec.makeMeasureSpec(round3 - round, 1073741824), View.MeasureSpec.makeMeasureSpec(round4 - round2, 1073741824));
+        imageView.measure(View.MeasureSpec.makeMeasureSpec(round3 - round, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(round4 - round2, BasicMeasure.EXACTLY));
         imageView.layout(round, round2, round3, round4);
         return imageView;
     }
diff --git a/app/src/main/java/androidx/transition/ViewGroupUtilsApi14.java b/app/src/main/java/androidx/transition/ViewGroupUtilsApi14.java
index 8b5a025bc4..19d66c83a5 100644
--- a/app/src/main/java/androidx/transition/ViewGroupUtilsApi14.java
+++ b/app/src/main/java/androidx/transition/ViewGroupUtilsApi14.java
@@ -34,7 +34,7 @@ public class ViewGroupUtilsApi14 {
                 sCancelMethod = declaredMethod;
                 declaredMethod.setAccessible(true);
             } catch (NoSuchMethodException unused) {
-                Log.i("ViewGroupUtilsApi14", "Failed to access cancel method by reflection");
+                Log.i(TAG, "Failed to access cancel method by reflection");
             }
             sCancelMethodFetched = true;
         }
@@ -43,9 +43,9 @@ public class ViewGroupUtilsApi14 {
             try {
                 method.invoke(layoutTransition, new Object[0]);
             } catch (IllegalAccessException unused2) {
-                Log.i("ViewGroupUtilsApi14", "Failed to access cancel method by reflection");
+                Log.i(TAG, "Failed to access cancel method by reflection");
             } catch (InvocationTargetException unused3) {
-                Log.i("ViewGroupUtilsApi14", "Failed to invoke cancel method by reflection");
+                Log.i(TAG, "Failed to invoke cancel method by reflection");
             }
         }
     }
@@ -85,7 +85,7 @@ public class ViewGroupUtilsApi14 {
                 sLayoutSuppressedField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException unused) {
-                Log.i("ViewGroupUtilsApi14", "Failed to access mLayoutSuppressed field by reflection");
+                Log.i(TAG, "Failed to access mLayoutSuppressed field by reflection");
             }
             sLayoutSuppressedFieldFetched = true;
         }
@@ -102,7 +102,7 @@ public class ViewGroupUtilsApi14 {
                 }
                 z3 = z4;
             } catch (IllegalAccessException unused3) {
-                Log.i("ViewGroupUtilsApi14", "Failed to get mLayoutSuppressed field by reflection");
+                Log.i(TAG, "Failed to get mLayoutSuppressed field by reflection");
                 if (z3) {
                 }
                 int i = R.id.transition_layout_save;
diff --git a/app/src/main/java/androidx/transition/ViewUtilsBase.java b/app/src/main/java/androidx/transition/ViewUtilsBase.java
index e9ed8e45a1..0beaa4ea54 100644
--- a/app/src/main/java/androidx/transition/ViewUtilsBase.java
+++ b/app/src/main/java/androidx/transition/ViewUtilsBase.java
@@ -28,7 +28,7 @@ public class ViewUtilsBase {
                 sSetFrameMethod = declaredMethod;
                 declaredMethod.setAccessible(true);
             } catch (NoSuchMethodException e) {
-                Log.i("ViewUtilsBase", "Failed to retrieve setFrame method", e);
+                Log.i(TAG, "Failed to retrieve setFrame method", e);
             }
             sSetFrameFetched = true;
         }
@@ -114,7 +114,7 @@ public class ViewUtilsBase {
                 sViewFlagsField = declaredField;
                 declaredField.setAccessible(true);
             } catch (NoSuchFieldException unused) {
-                Log.i("ViewUtilsBase", "fetchViewFlagsField: ");
+                Log.i(TAG, "fetchViewFlagsField: ");
             }
             sViewFlagsFieldFetched = true;
         }
diff --git a/app/src/main/java/androidx/transition/Visibility.java b/app/src/main/java/androidx/transition/Visibility.java
index efdc9d3b61..0d9e58af94 100644
--- a/app/src/main/java/androidx/transition/Visibility.java
+++ b/app/src/main/java/androidx/transition/Visibility.java
@@ -23,7 +23,7 @@ public abstract class Visibility extends Transition {
     private static final String PROPNAME_PARENT = "android:visibility:parent";
     private static final String PROPNAME_SCREEN_LOCATION = "android:visibility:screenLocation";
     public static final String PROPNAME_VISIBILITY = "android:visibility:visibility";
-    private static final String[] sTransitionProperties = {"android:visibility:visibility", "android:visibility:parent"};
+    private static final String[] sTransitionProperties = {PROPNAME_VISIBILITY, PROPNAME_PARENT};
     private int mMode = 3;
 
     /* renamed from: androidx.transition.Visibility$1  reason: invalid class name */
@@ -182,30 +182,30 @@ public abstract class Visibility extends Transition {
     }
 
     private void captureValues(TransitionValues transitionValues) {
-        transitionValues.values.put("android:visibility:visibility", Integer.valueOf(transitionValues.view.getVisibility()));
-        transitionValues.values.put("android:visibility:parent", transitionValues.view.getParent());
+        transitionValues.values.put(PROPNAME_VISIBILITY, Integer.valueOf(transitionValues.view.getVisibility()));
+        transitionValues.values.put(PROPNAME_PARENT, transitionValues.view.getParent());
         int[] iArr = new int[2];
         transitionValues.view.getLocationOnScreen(iArr);
-        transitionValues.values.put("android:visibility:screenLocation", iArr);
+        transitionValues.values.put(PROPNAME_SCREEN_LOCATION, iArr);
     }
 
     private VisibilityInfo getVisibilityChangeInfo(TransitionValues transitionValues, TransitionValues transitionValues2) {
         VisibilityInfo visibilityInfo = new VisibilityInfo();
         visibilityInfo.mVisibilityChange = false;
         visibilityInfo.mFadeIn = false;
-        if (transitionValues == null || !transitionValues.values.containsKey("android:visibility:visibility")) {
+        if (transitionValues == null || !transitionValues.values.containsKey(PROPNAME_VISIBILITY)) {
             visibilityInfo.mStartVisibility = -1;
             visibilityInfo.mStartParent = null;
         } else {
-            visibilityInfo.mStartVisibility = ((Integer) transitionValues.values.get("android:visibility:visibility")).intValue();
-            visibilityInfo.mStartParent = (ViewGroup) transitionValues.values.get("android:visibility:parent");
+            visibilityInfo.mStartVisibility = ((Integer) transitionValues.values.get(PROPNAME_VISIBILITY)).intValue();
+            visibilityInfo.mStartParent = (ViewGroup) transitionValues.values.get(PROPNAME_PARENT);
         }
-        if (transitionValues2 == null || !transitionValues2.values.containsKey("android:visibility:visibility")) {
+        if (transitionValues2 == null || !transitionValues2.values.containsKey(PROPNAME_VISIBILITY)) {
             visibilityInfo.mEndVisibility = -1;
             visibilityInfo.mEndParent = null;
         } else {
-            visibilityInfo.mEndVisibility = ((Integer) transitionValues2.values.get("android:visibility:visibility")).intValue();
-            visibilityInfo.mEndParent = (ViewGroup) transitionValues2.values.get("android:visibility:parent");
+            visibilityInfo.mEndVisibility = ((Integer) transitionValues2.values.get(PROPNAME_VISIBILITY)).intValue();
+            visibilityInfo.mEndParent = (ViewGroup) transitionValues2.values.get(PROPNAME_PARENT);
         }
         if (transitionValues != null && transitionValues2 != null) {
             int i = visibilityInfo.mStartVisibility;
@@ -276,7 +276,7 @@ public abstract class Visibility extends Transition {
         if (transitionValues == null && transitionValues2 == null) {
             return false;
         }
-        if (transitionValues != null && transitionValues2 != null && transitionValues2.values.containsKey("android:visibility:visibility") != transitionValues.values.containsKey("android:visibility:visibility")) {
+        if (transitionValues != null && transitionValues2 != null && transitionValues2.values.containsKey(PROPNAME_VISIBILITY) != transitionValues.values.containsKey(PROPNAME_VISIBILITY)) {
             return false;
         }
         VisibilityInfo visibilityChangeInfo = getVisibilityChangeInfo(transitionValues, transitionValues2);
@@ -290,7 +290,7 @@ public abstract class Visibility extends Transition {
         if (transitionValues == null) {
             return false;
         }
-        return ((Integer) transitionValues.values.get("android:visibility:visibility")).intValue() == 0 && ((View) transitionValues.values.get("android:visibility:parent")) != null;
+        return ((Integer) transitionValues.values.get(PROPNAME_VISIBILITY)).intValue() == 0 && ((View) transitionValues.values.get(PROPNAME_PARENT)) != null;
     }
 
     public Animator onAppear(ViewGroup viewGroup, View view, TransitionValues transitionValues, TransitionValues transitionValues2) {
@@ -384,7 +384,7 @@ public abstract class Visibility extends Transition {
         }
         if (view5 != null) {
             if (!z2) {
-                int[] iArr = (int[]) transitionValues.values.get("android:visibility:screenLocation");
+                int[] iArr = (int[]) transitionValues.values.get(PROPNAME_SCREEN_LOCATION);
                 int i4 = iArr[0];
                 int i5 = iArr[1];
                 int[] iArr2 = new int[2];
diff --git a/app/src/main/java/androidx/transition/VisibilityPropagation.java b/app/src/main/java/androidx/transition/VisibilityPropagation.java
index 0b24d92b09..4305d86c22 100644
--- a/app/src/main/java/androidx/transition/VisibilityPropagation.java
+++ b/app/src/main/java/androidx/transition/VisibilityPropagation.java
@@ -4,11 +4,11 @@ import android.view.View;
 public abstract class VisibilityPropagation extends TransitionPropagation {
     private static final String PROPNAME_VIEW_CENTER = "android:visibilityPropagation:center";
     private static final String PROPNAME_VISIBILITY = "android:visibilityPropagation:visibility";
-    private static final String[] VISIBILITY_PROPAGATION_VALUES = {"android:visibilityPropagation:visibility", "android:visibilityPropagation:center"};
+    private static final String[] VISIBILITY_PROPAGATION_VALUES = {PROPNAME_VISIBILITY, PROPNAME_VIEW_CENTER};
 
     private static int getViewCoordinate(TransitionValues transitionValues, int i) {
         int[] iArr;
-        if (transitionValues == null || (iArr = (int[]) transitionValues.values.get("android:visibilityPropagation:center")) == null) {
+        if (transitionValues == null || (iArr = (int[]) transitionValues.values.get(PROPNAME_VIEW_CENTER)) == null) {
             return -1;
         }
         return iArr[i];
@@ -17,18 +17,18 @@ public abstract class VisibilityPropagation extends TransitionPropagation {
     @Override // androidx.transition.TransitionPropagation
     public void captureValues(TransitionValues transitionValues) {
         View view = transitionValues.view;
-        Integer num = (Integer) transitionValues.values.get("android:visibility:visibility");
+        Integer num = (Integer) transitionValues.values.get(Visibility.PROPNAME_VISIBILITY);
         if (num == null) {
             num = Integer.valueOf(view.getVisibility());
         }
-        transitionValues.values.put("android:visibilityPropagation:visibility", num);
+        transitionValues.values.put(PROPNAME_VISIBILITY, num);
         int[] iArr = new int[2];
         view.getLocationOnScreen(iArr);
         iArr[0] = Math.round(view.getTranslationX()) + iArr[0];
         iArr[0] = (view.getWidth() / 2) + iArr[0];
         iArr[1] = Math.round(view.getTranslationY()) + iArr[1];
         iArr[1] = (view.getHeight() / 2) + iArr[1];
-        transitionValues.values.put("android:visibilityPropagation:center", iArr);
+        transitionValues.values.put(PROPNAME_VIEW_CENTER, iArr);
     }
 
     @Override // androidx.transition.TransitionPropagation
@@ -38,7 +38,7 @@ public abstract class VisibilityPropagation extends TransitionPropagation {
 
     public int getViewVisibility(TransitionValues transitionValues) {
         Integer num;
-        if (transitionValues == null || (num = (Integer) transitionValues.values.get("android:visibilityPropagation:visibility")) == null) {
+        if (transitionValues == null || (num = (Integer) transitionValues.values.get(PROPNAME_VISIBILITY)) == null) {
             return 8;
         }
         return num.intValue();
diff --git a/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java b/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java
index 059b256869..e04464b0e1 100644
--- a/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java
+++ b/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatedVectorDrawableCompat.java
@@ -256,10 +256,10 @@ public class AnimatedVectorDrawableCompat extends VectorDrawableCommon implement
             }
             throw new XmlPullParserException("No start tag found");
         } catch (XmlPullParserException e) {
-            Log.e("AnimatedVDCompat", "parser error", e);
+            Log.e(LOGTAG, "parser error", e);
             return null;
         } catch (IOException e2) {
-            Log.e("AnimatedVDCompat", "parser error", e2);
+            Log.e(LOGTAG, "parser error", e2);
             return null;
         }
         while (true) {
@@ -481,7 +481,7 @@ public class AnimatedVectorDrawableCompat extends VectorDrawableCommon implement
         while (eventType != 1 && (xmlPullParser.getDepth() >= depth || eventType != 3)) {
             if (eventType == 2) {
                 String name = xmlPullParser.getName();
-                if ("animated-vector".equals(name)) {
+                if (ANIMATED_VECTOR.equals(name)) {
                     TypedArray obtainAttributes = TypedArrayUtils.obtainAttributes(resources, theme, attributeSet, AndroidResources.STYLEABLE_ANIMATED_VECTOR_DRAWABLE);
                     int resourceId = obtainAttributes.getResourceId(0, 0);
                     if (resourceId != 0) {
@@ -495,7 +495,7 @@ public class AnimatedVectorDrawableCompat extends VectorDrawableCommon implement
                         this.mAnimatedVectorState.mVectorDrawable = create;
                     }
                     obtainAttributes.recycle();
-                } else if ("target".equals(name)) {
+                } else if (TARGET.equals(name)) {
                     TypedArray obtainAttributes2 = resources.obtainAttributes(attributeSet, AndroidResources.STYLEABLE_ANIMATED_VECTOR_DRAWABLE_TARGET);
                     String string = obtainAttributes2.getString(0);
                     int resourceId2 = obtainAttributes2.getResourceId(1, 0);
diff --git a/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java b/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java
index f12a2e5203..913fbbda85 100644
--- a/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java
+++ b/app/src/main/java/androidx/vectordrawable/graphics/drawable/AnimatorInflaterCompat.java
@@ -152,7 +152,7 @@ public class AnimatorInflaterCompat {
 
     private static void dumpKeyframes(Object[] objArr, String str) {
         if (!(objArr == null || objArr.length == 0)) {
-            Log.d("AnimatorInflater", str);
+            Log.d(TAG, str);
             int length = objArr.length;
             for (int i = 0; i < length; i++) {
                 Keyframe keyframe = (Keyframe) objArr[i];
@@ -164,7 +164,7 @@ public class AnimatorInflaterCompat {
                     obj = keyframe.getValue();
                 }
                 L.append(obj);
-                Log.d("AnimatorInflater", L.toString());
+                Log.d(TAG, L.toString());
             }
         }
     }
diff --git a/app/src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java b/app/src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java
index 90101ecc77..f5b18b0555 100644
--- a/app/src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java
+++ b/app/src/main/java/androidx/vectordrawable/graphics/drawable/PathInterpolatorCompat.java
@@ -42,7 +42,7 @@ public class PathInterpolatorCompat implements Interpolator {
         int i = 0;
         PathMeasure pathMeasure = new PathMeasure(path, false);
         float length = pathMeasure.getLength();
-        int min = Math.min(3000, ((int) (length / 0.002f)) + 1);
+        int min = Math.min((int) MAX_NUM_POINTS, ((int) (length / 0.002f)) + 1);
         if (min > 0) {
             this.mX = new float[min];
             this.mY = new float[min];
diff --git a/app/src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java b/app/src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java
index 8da54eabeb..b473bd741b 100644
--- a/app/src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java
+++ b/app/src/main/java/androidx/vectordrawable/graphics/drawable/VectorDrawableCompat.java
@@ -30,11 +30,13 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.collection.ArrayMap;
+import androidx.constraintlayout.motion.widget.Key;
 import androidx.core.content.res.ComplexColorCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.graphics.PathParser;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
 import java.io.IOException;
 import java.util.ArrayDeque;
@@ -354,11 +356,11 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
 
         private void updateStateFromTypedArray(TypedArray typedArray, XmlPullParser xmlPullParser) {
             this.mThemeAttrs = null;
-            this.mRotate = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, "rotation", 5, this.mRotate);
+            this.mRotate = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, Key.ROTATION, 5, this.mRotate);
             this.mPivotX = typedArray.getFloat(1, this.mPivotX);
             this.mPivotY = typedArray.getFloat(2, this.mPivotY);
-            this.mScaleX = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, "scaleX", 3, this.mScaleX);
-            this.mScaleY = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, "scaleY", 4, this.mScaleY);
+            this.mScaleX = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, Key.SCALE_X, 3, this.mScaleX);
+            this.mScaleY = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, Key.SCALE_Y, 4, this.mScaleY);
             this.mTranslateX = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, "translateX", 6, this.mTranslateX);
             this.mTranslateY = TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, "translateY", 7, this.mTranslateY);
             String string = typedArray.getString(0);
@@ -556,7 +558,7 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
             O.append(this.mPathName);
             O.append(" pathData is ");
             O.append(nodesToString(this.mNodes));
-            Log.v("VectorDrawableCompat", O.toString());
+            Log.v(VectorDrawableCompat.LOGTAG, O.toString());
         }
 
         public void setPathData(PathParser.PathDataNode[] pathDataNodeArr) {
@@ -973,7 +975,7 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
     }
 
     public static int applyAlpha(int i, float f) {
-        return (i & 16777215) | (((int) (((float) Color.alpha(i)) * f)) << 24);
+        return (i & ViewCompat.MEASURED_SIZE_MASK) | (((int) (((float) Color.alpha(i)) * f)) << 24);
     }
 
     @Nullable
@@ -994,10 +996,10 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
             }
             throw new XmlPullParserException("No start tag found");
         } catch (XmlPullParserException e) {
-            Log.e("VectorDrawableCompat", "parser error", e);
+            Log.e(LOGTAG, "parser error", e);
             return null;
         } catch (IOException e2) {
-            Log.e("VectorDrawableCompat", "parser error", e2);
+            Log.e(LOGTAG, "parser error", e2);
             return null;
         }
         while (true) {
@@ -1026,7 +1028,7 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
             if (eventType == 2) {
                 String name = xmlPullParser.getName();
                 VGroup vGroup = (VGroup) arrayDeque.peek();
-                if ("path".equals(name)) {
+                if (SHAPE_PATH.equals(name)) {
                     VFullPath vFullPath = new VFullPath();
                     vFullPath.inflate(resources, attributeSet, theme, xmlPullParser);
                     vGroup.mChildren.add(vFullPath);
@@ -1035,7 +1037,7 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
                     }
                     z2 = false;
                     vectorDrawableCompatState.mChangingConfigurations = vFullPath.mChangingConfigurations | vectorDrawableCompatState.mChangingConfigurations;
-                } else if ("clip-path".equals(name)) {
+                } else if (SHAPE_CLIP_PATH.equals(name)) {
                     VClipPath vClipPath = new VClipPath();
                     vClipPath.inflate(resources, attributeSet, theme, xmlPullParser);
                     vGroup.mChildren.add(vClipPath);
@@ -1043,7 +1045,7 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
                         vPathRenderer.mVGTargetsMap.put(vClipPath.getPathName(), vClipPath);
                     }
                     vectorDrawableCompatState.mChangingConfigurations = vClipPath.mChangingConfigurations | vectorDrawableCompatState.mChangingConfigurations;
-                } else if ("group".equals(name)) {
+                } else if (SHAPE_GROUP.equals(name)) {
                     VGroup vGroup2 = new VGroup();
                     vGroup2.inflate(resources, attributeSet, theme, xmlPullParser);
                     vGroup.mChildren.add(vGroup2);
@@ -1053,7 +1055,7 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
                     }
                     vectorDrawableCompatState.mChangingConfigurations = vGroup2.mChangingConfigurations | vectorDrawableCompatState.mChangingConfigurations;
                 }
-            } else if (eventType == 3 && "group".equals(xmlPullParser.getName())) {
+            } else if (eventType == 3 && SHAPE_GROUP.equals(xmlPullParser.getName())) {
                 arrayDeque.pop();
             }
             eventType = xmlPullParser.next();
@@ -1098,8 +1100,8 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
         O.append(vGroup.getGroupName());
         O.append(" rotation is ");
         O.append(vGroup.mRotate);
-        Log.v("VectorDrawableCompat", O.toString());
-        Log.v("VectorDrawableCompat", str + "matrix is :" + vGroup.getLocalMatrix().toString());
+        Log.v(LOGTAG, O.toString());
+        Log.v(LOGTAG, str + "matrix is :" + vGroup.getLocalMatrix().toString());
         for (int i3 = 0; i3 < vGroup.mChildren.size(); i3++) {
             VObject vObject = vGroup.mChildren.get(i3);
             if (vObject instanceof VGroup) {
@@ -1131,7 +1133,7 @@ public class VectorDrawableCompat extends VectorDrawableCommon {
             if (vPathRenderer.mBaseWidth <= 0.0f) {
                 throw new XmlPullParserException(typedArray.getPositionDescription() + "<vector> tag requires width > 0");
             } else if (dimension > 0.0f) {
-                vPathRenderer.setAlpha(TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, "alpha", 4, vPathRenderer.getAlpha()));
+                vPathRenderer.setAlpha(TypedArrayUtils.getNamedFloat(typedArray, xmlPullParser, Key.ALPHA, 4, vPathRenderer.getAlpha()));
                 String string = typedArray.getString(0);
                 if (string != null) {
                     vPathRenderer.mRootName = string;
diff --git a/app/src/main/java/androidx/versionedparcelable/ParcelUtils.java b/app/src/main/java/androidx/versionedparcelable/ParcelUtils.java
index 97858e3455..ab30c716c5 100644
--- a/app/src/main/java/androidx/versionedparcelable/ParcelUtils.java
+++ b/app/src/main/java/androidx/versionedparcelable/ParcelUtils.java
@@ -37,7 +37,7 @@ public class ParcelUtils {
                 return null;
             }
             bundle2.setClassLoader(ParcelUtils.class.getClassLoader());
-            return (T) fromParcelable(bundle2.getParcelable("a"));
+            return (T) fromParcelable(bundle2.getParcelable(INNER_BUNDLE_KEY));
         } catch (RuntimeException unused) {
             return null;
         }
@@ -49,7 +49,7 @@ public class ParcelUtils {
         try {
             Bundle bundle2 = (Bundle) bundle.getParcelable(str);
             bundle2.setClassLoader(ParcelUtils.class.getClassLoader());
-            Iterator it = bundle2.getParcelableArrayList("a").iterator();
+            Iterator it = bundle2.getParcelableArrayList(INNER_BUNDLE_KEY).iterator();
             while (it.hasNext()) {
                 arrayList.add(fromParcelable((Parcelable) it.next()));
             }
@@ -62,7 +62,7 @@ public class ParcelUtils {
     public static void putVersionedParcelable(@NonNull Bundle bundle, @NonNull String str, @Nullable VersionedParcelable versionedParcelable) {
         if (versionedParcelable != null) {
             Bundle bundle2 = new Bundle();
-            bundle2.putParcelable("a", toParcelable(versionedParcelable));
+            bundle2.putParcelable(INNER_BUNDLE_KEY, toParcelable(versionedParcelable));
             bundle.putParcelable(str, bundle2);
         }
     }
@@ -73,7 +73,7 @@ public class ParcelUtils {
         for (VersionedParcelable versionedParcelable : list) {
             arrayList.add(toParcelable(versionedParcelable));
         }
-        bundle2.putParcelableArrayList("a", arrayList);
+        bundle2.putParcelableArrayList(INNER_BUNDLE_KEY, arrayList);
         bundle.putParcelable(str, bundle2);
     }
 
diff --git a/app/src/main/java/androidx/versionedparcelable/VersionedParcel.java b/app/src/main/java/androidx/versionedparcelable/VersionedParcel.java
index 39851542ad..3ac9533058 100644
--- a/app/src/main/java/androidx/versionedparcelable/VersionedParcel.java
+++ b/app/src/main/java/androidx/versionedparcelable/VersionedParcel.java
@@ -79,14 +79,14 @@ public abstract class VersionedParcel {
 
     private Exception createException(int i, String str) {
         switch (i) {
-            case -9:
+            case EX_PARCELABLE /* -9 */:
                 return (Exception) readParcelable();
             case -8:
             default:
                 return new RuntimeException("Unknown exception code: " + i + " msg " + str);
-            case -7:
+            case EX_UNSUPPORTED_OPERATION /* -7 */:
                 return new UnsupportedOperationException(str);
-            case -6:
+            case EX_NETWORK_MAIN_THREAD /* -6 */:
                 return new NetworkOnMainThreadException();
             case -5:
                 return new IllegalStateException(str);
@@ -790,7 +790,7 @@ public abstract class VersionedParcel {
         }
         int i2 = 0;
         if ((exc instanceof Parcelable) && exc.getClass().getClassLoader() == Parcelable.class.getClassLoader()) {
-            i2 = -9;
+            i2 = EX_PARCELABLE;
         } else if (exc instanceof SecurityException) {
             i2 = -1;
         } else if (exc instanceof BadParcelableException) {
@@ -802,14 +802,14 @@ public abstract class VersionedParcel {
         } else if (exc instanceof IllegalStateException) {
             i2 = -5;
         } else if (exc instanceof NetworkOnMainThreadException) {
-            i2 = -6;
+            i2 = EX_NETWORK_MAIN_THREAD;
         } else if (exc instanceof UnsupportedOperationException) {
-            i2 = -7;
+            i2 = EX_UNSUPPORTED_OPERATION;
         }
         writeInt(i2);
         if (i2 != 0) {
             writeString(exc.getMessage());
-            if (i2 == -9) {
+            if (i2 == EX_PARCELABLE) {
                 writeParcelable((Parcelable) exc);
             }
         } else if (exc instanceof RuntimeException) {
diff --git a/app/src/main/java/androidx/viewpager/widget/PagerTabStrip.java b/app/src/main/java/androidx/viewpager/widget/PagerTabStrip.java
index 1960b8bb84..f0fcba4e9a 100644
--- a/app/src/main/java/androidx/viewpager/widget/PagerTabStrip.java
+++ b/app/src/main/java/androidx/viewpager/widget/PagerTabStrip.java
@@ -15,6 +15,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
 public class PagerTabStrip extends PagerTitleStrip {
     private static final int FULL_UNDERLINE_HEIGHT = 1;
     private static final int INDICATOR_HEIGHT = 3;
@@ -120,11 +121,11 @@ public class PagerTabStrip extends PagerTitleStrip {
         int height = getHeight();
         int left = this.mCurrText.getLeft() - this.mTabPadding;
         int right = this.mCurrText.getRight() + this.mTabPadding;
-        this.mTabPaint.setColor((this.mTabAlpha << 24) | (this.mIndicatorColor & 16777215));
+        this.mTabPaint.setColor((this.mTabAlpha << 24) | (this.mIndicatorColor & ViewCompat.MEASURED_SIZE_MASK));
         float f = (float) height;
         canvas.drawRect((float) left, (float) (height - this.mIndicatorHeight), (float) right, f, this.mTabPaint);
         if (this.mDrawFullUnderline) {
-            this.mTabPaint.setColor(-16777216 | (this.mIndicatorColor & 16777215));
+            this.mTabPaint.setColor(-16777216 | (this.mIndicatorColor & ViewCompat.MEASURED_SIZE_MASK));
             canvas.drawRect((float) getPaddingLeft(), (float) (height - this.mFullUnderlineHeight), (float) (getWidth() - getPaddingRight()), f, this.mTabPaint);
         }
     }
@@ -159,7 +160,7 @@ public class PagerTabStrip extends PagerTitleStrip {
     public void setBackgroundColor(@ColorInt int i) {
         super.setBackgroundColor(i);
         if (!this.mDrawFullUnderlineSet) {
-            this.mDrawFullUnderline = (i & -16777216) == 0;
+            this.mDrawFullUnderline = (i & ViewCompat.MEASURED_STATE_MASK) == 0;
         }
     }
 
diff --git a/app/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java b/app/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java
index 2b6d7c261e..87b1f6bf94 100644
--- a/app/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java
+++ b/app/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java
@@ -15,6 +15,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.FloatRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.core.widget.TextViewCompat;
 import androidx.viewpager.widget.ViewPager;
 import java.lang.ref.WeakReference;
@@ -147,7 +148,7 @@ public class PagerTitleStrip extends ViewGroup {
         this.mGravity = obtainStyledAttributes.getInteger(3, 80);
         obtainStyledAttributes.recycle();
         this.mTextColor = this.mCurrText.getTextColors().getDefaultColor();
-        setNonPrimaryAlpha(0.6f);
+        setNonPrimaryAlpha(SIDE_ALPHA);
         this.mPrevText.setEllipsize(TextUtils.TruncateAt.END);
         this.mCurrText.setEllipsize(TextUtils.TruncateAt.END);
         this.mNextText.setEllipsize(TextUtils.TruncateAt.END);
@@ -261,7 +262,7 @@ public class PagerTitleStrip extends ViewGroup {
     public void setNonPrimaryAlpha(@FloatRange(from = 0.0d, to = 1.0d) float f) {
         int i = ((int) (f * 255.0f)) & 255;
         this.mNonPrimaryAlpha = i;
-        int i2 = (i << 24) | (this.mTextColor & 16777215);
+        int i2 = (i << 24) | (this.mTextColor & ViewCompat.MEASURED_SIZE_MASK);
         this.mPrevText.setTextColor(i2);
         this.mNextText.setTextColor(i2);
     }
@@ -269,7 +270,7 @@ public class PagerTitleStrip extends ViewGroup {
     public void setTextColor(@ColorInt int i) {
         this.mTextColor = i;
         this.mCurrText.setTextColor(i);
-        int i2 = (this.mNonPrimaryAlpha << 24) | (this.mTextColor & 16777215);
+        int i2 = (this.mNonPrimaryAlpha << 24) | (this.mTextColor & ViewCompat.MEASURED_SIZE_MASK);
         this.mPrevText.setTextColor(i2);
         this.mNextText.setTextColor(i2);
     }
diff --git a/app/src/main/java/androidx/viewpager/widget/ViewPager.java b/app/src/main/java/androidx/viewpager/widget/ViewPager.java
index e1083c9b30..7e1e40900e 100644
--- a/app/src/main/java/androidx/viewpager/widget/ViewPager.java
+++ b/app/src/main/java/androidx/viewpager/widget/ViewPager.java
@@ -31,6 +31,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Px;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.OnApplyWindowInsetsListener;
@@ -982,7 +983,7 @@ public class ViewPager extends ViewGroup {
                     }
                     StringBuilder K = a.K("arrowScroll tried to find focus based on non-child current focused view ");
                     K.append(sb.toString());
-                    Log.e("ViewPager", K.toString());
+                    Log.e(TAG, K.toString());
                 }
             }
             findNextFocus = FocusFinder.getInstance().findNextFocus(this, findFocus, i);
@@ -1630,7 +1631,7 @@ public class ViewPager extends ViewGroup {
                     int i19 = ((int) (infoForChild.offset * f)) + paddingLeft;
                     if (layoutParams2.needsMeasure) {
                         layoutParams2.needsMeasure = false;
-                        childAt2.measure(View.MeasureSpec.makeMeasureSpec((int) (f * layoutParams2.widthFactor), 1073741824), View.MeasureSpec.makeMeasureSpec((i10 - paddingTop) - paddingBottom, 1073741824));
+                        childAt2.measure(View.MeasureSpec.makeMeasureSpec((int) (f * layoutParams2.widthFactor), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec((i10 - paddingTop) - paddingBottom, BasicMeasure.EXACTLY));
                     }
                     childAt2.layout(i19, paddingTop, childAt2.getMeasuredWidth() + i19, childAt2.getMeasuredHeight() + paddingTop);
                 }
@@ -1670,7 +1671,7 @@ public class ViewPager extends ViewGroup {
         int i6 = 0;
         while (true) {
             boolean z2 = true;
-            int i7 = 1073741824;
+            int i7 = BasicMeasure.EXACTLY;
             if (i6 >= childCount) {
                 break;
             }
@@ -1685,15 +1686,15 @@ public class ViewPager extends ViewGroup {
                 }
                 int i11 = Integer.MIN_VALUE;
                 if (z3) {
-                    i11 = 1073741824;
+                    i11 = BasicMeasure.EXACTLY;
                 } else if (z2) {
-                    i3 = 1073741824;
+                    i3 = BasicMeasure.EXACTLY;
                     i4 = ((ViewGroup.LayoutParams) layoutParams2).width;
                     if (i4 == -2) {
                         if (i4 == -1) {
                             i4 = paddingLeft;
                         }
-                        i11 = 1073741824;
+                        i11 = BasicMeasure.EXACTLY;
                     } else {
                         i4 = paddingLeft;
                     }
@@ -1724,8 +1725,8 @@ public class ViewPager extends ViewGroup {
             }
             i6++;
         }
-        this.mChildWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(paddingLeft, 1073741824);
-        this.mChildHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight, 1073741824);
+        this.mChildWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(paddingLeft, BasicMeasure.EXACTLY);
+        this.mChildHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight, BasicMeasure.EXACTLY);
         this.mInLayout = true;
         populate();
         this.mInLayout = false;
@@ -1733,7 +1734,7 @@ public class ViewPager extends ViewGroup {
         for (int i12 = 0; i12 < childCount2; i12++) {
             View childAt2 = getChildAt(i12);
             if (childAt2.getVisibility() != 8 && ((layoutParams = (LayoutParams) childAt2.getLayoutParams()) == null || !layoutParams.isDecor)) {
-                childAt2.measure(View.MeasureSpec.makeMeasureSpec((int) (((float) paddingLeft) * layoutParams.widthFactor), 1073741824), this.mChildHeightMeasureSpec);
+                childAt2.measure(View.MeasureSpec.makeMeasureSpec((int) (((float) paddingLeft) * layoutParams.widthFactor), BasicMeasure.EXACTLY), this.mChildHeightMeasureSpec);
             }
         }
     }
@@ -2263,7 +2264,7 @@ public class ViewPager extends ViewGroup {
 
     public void setOffscreenPageLimit(int i) {
         if (i < 1) {
-            Log.w("ViewPager", "Requested offscreen page limit " + i + " too small; defaulting to 1");
+            Log.w(TAG, "Requested offscreen page limit " + i + " too small; defaulting to 1");
             i = 1;
         }
         if (i != this.mOffscreenPageLimit) {
@@ -2367,7 +2368,7 @@ public class ViewPager extends ViewGroup {
         float f2 = (float) i7;
         float distanceInfluenceForSnapDuration = (distanceInfluenceForSnapDuration(Math.min(1.0f, (((float) Math.abs(i5)) * 1.0f) / f)) * f2) + f2;
         int abs = Math.abs(i3);
-        int min = Math.min(abs > 0 ? Math.round(Math.abs(distanceInfluenceForSnapDuration / ((float) abs)) * 1000.0f) * 4 : (int) (((((float) Math.abs(i5)) / ((this.mAdapter.getPageWidth(this.mCurItem) * f) + ((float) this.mPageMargin))) + 1.0f) * 100.0f), 600);
+        int min = Math.min(abs > 0 ? Math.round(Math.abs(distanceInfluenceForSnapDuration / ((float) abs)) * 1000.0f) * 4 : (int) (((((float) Math.abs(i5)) / ((this.mAdapter.getPageWidth(this.mCurItem) * f) + ((float) this.mPageMargin))) + 1.0f) * 100.0f), (int) MAX_SETTLE_DURATION);
         this.mIsScrollStarted = false;
         this.mScroller.startScroll(i4, scrollY, i5, i6, min);
         ViewCompat.postInvalidateOnAnimation(this);
diff --git a/app/src/main/java/androidx/viewpager2/adapter/FragmentStateAdapter.java b/app/src/main/java/androidx/viewpager2/adapter/FragmentStateAdapter.java
index 542d1a30e3..b32524b91d 100644
--- a/app/src/main/java/androidx/viewpager2/adapter/FragmentStateAdapter.java
+++ b/app/src/main/java/androidx/viewpager2/adapter/FragmentStateAdapter.java
@@ -524,10 +524,10 @@ public abstract class FragmentStateAdapter extends RecyclerView.Adapter<Fragment
             bundle.setClassLoader(getClass().getClassLoader());
         }
         for (String str : bundle.keySet()) {
-            if (isValidKey(str, "f#")) {
-                this.mFragments.put(parseIdFromKey(str, "f#"), this.mFragmentManager.getFragment(bundle, str));
-            } else if (isValidKey(str, "s#")) {
-                long parseIdFromKey = parseIdFromKey(str, "s#");
+            if (isValidKey(str, KEY_PREFIX_FRAGMENT)) {
+                this.mFragments.put(parseIdFromKey(str, KEY_PREFIX_FRAGMENT), this.mFragmentManager.getFragment(bundle, str));
+            } else if (isValidKey(str, KEY_PREFIX_STATE)) {
+                long parseIdFromKey = parseIdFromKey(str, KEY_PREFIX_STATE);
                 Fragment.SavedState savedState = (Fragment.SavedState) bundle.getParcelable(str);
                 if (containsItem(parseIdFromKey)) {
                     this.mSavedStates.put(parseIdFromKey, savedState);
@@ -552,13 +552,13 @@ public abstract class FragmentStateAdapter extends RecyclerView.Adapter<Fragment
             long keyAt = this.mFragments.keyAt(i);
             Fragment fragment = this.mFragments.get(keyAt);
             if (fragment != null && fragment.isAdded()) {
-                this.mFragmentManager.putFragment(bundle, createKey("f#", keyAt), fragment);
+                this.mFragmentManager.putFragment(bundle, createKey(KEY_PREFIX_FRAGMENT, keyAt), fragment);
             }
         }
         for (int i2 = 0; i2 < this.mSavedStates.size(); i2++) {
             long keyAt2 = this.mSavedStates.keyAt(i2);
             if (containsItem(keyAt2)) {
-                bundle.putParcelable(createKey("s#", keyAt2), this.mSavedStates.get(keyAt2));
+                bundle.putParcelable(createKey(KEY_PREFIX_STATE, keyAt2), this.mSavedStates.get(keyAt2));
             }
         }
         return bundle;
diff --git a/app/src/main/java/androidx/viewpager2/widget/ViewPager2.java b/app/src/main/java/androidx/viewpager2/widget/ViewPager2.java
index c2fdc193e2..0dba1facfa 100644
--- a/app/src/main/java/androidx/viewpager2/widget/ViewPager2.java
+++ b/app/src/main/java/androidx/viewpager2/widget/ViewPager2.java
@@ -30,6 +30,7 @@ import androidx.recyclerview.widget.PagerSnapHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.R;
 import androidx.viewpager2.adapter.StatefulAdapter;
+import com.google.android.material.badge.BadgeDrawable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 public final class ViewPager2 extends ViewGroup {
@@ -889,7 +890,7 @@ public final class ViewPager2 extends ViewGroup {
         this.mTmpContainerRect.right = (i3 - i) - getPaddingRight();
         this.mTmpContainerRect.top = getPaddingTop();
         this.mTmpContainerRect.bottom = (i4 - i2) - getPaddingBottom();
-        Gravity.apply(8388659, measuredWidth, measuredHeight, this.mTmpContainerRect, this.mTmpChildRect);
+        Gravity.apply(BadgeDrawable.TOP_START, measuredWidth, measuredHeight, this.mTmpContainerRect, this.mTmpChildRect);
         RecyclerView recyclerView = this.mRecyclerView;
         Rect rect = this.mTmpChildRect;
         recyclerView.layout(rect.left, rect.top, rect.right, rect.bottom);
diff --git a/app/src/main/java/androidx/work/Configuration.java b/app/src/main/java/androidx/work/Configuration.java
index 25cea7f8b4..9356c9bb86 100644
--- a/app/src/main/java/androidx/work/Configuration.java
+++ b/app/src/main/java/androidx/work/Configuration.java
@@ -6,6 +6,7 @@ import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.work.impl.DefaultRunnableScheduler;
+import com.discord.stores.StoreNotices;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 public final class Configuration {
@@ -182,7 +183,7 @@ public final class Configuration {
         return this.mMaxJobSchedulerId;
     }
 
-    @IntRange(from = 20, to = 50)
+    @IntRange(from = 20, to = StoreNotices.PROCESS_THROTTLE_MS)
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
     public int getMaxSchedulerLimit() {
         return Build.VERSION.SDK_INT == 23 ? this.mMaxSchedulerLimit / 2 : this.mMaxSchedulerLimit;
diff --git a/app/src/main/java/androidx/work/DataKt.java b/app/src/main/java/androidx/work/DataKt.java
index 43a60676b8..8e7959ed17 100644
--- a/app/src/main/java/androidx/work/DataKt.java
+++ b/app/src/main/java/androidx/work/DataKt.java
@@ -1,5 +1,6 @@
 package androidx.work;
 
+import androidx.exifinterface.media.ExifInterface;
 import androidx.work.Data;
 import d0.z.d.m;
 import kotlin.Pair;
@@ -8,7 +9,7 @@ public final class DataKt {
     public static final /* synthetic */ <T> boolean hasKeyWithValueOfType(Data data, String str) {
         m.checkParameterIsNotNull(data, "$this$hasKeyWithValueOfType");
         m.checkParameterIsNotNull(str, "key");
-        m.reifiedOperationMarker(4, "T");
+        m.reifiedOperationMarker(4, ExifInterface.GPS_DIRECTION_TRUE);
         return data.hasKeyWithValueOfType(str, Object.class);
     }
 
diff --git a/app/src/main/java/androidx/work/Logger.java b/app/src/main/java/androidx/work/Logger.java
index 68837440ac..51e866b546 100644
--- a/app/src/main/java/androidx/work/Logger.java
+++ b/app/src/main/java/androidx/work/Logger.java
@@ -102,7 +102,7 @@ public abstract class Logger {
     public static String tagWithPrefix(@NonNull String str) {
         int length = str.length();
         StringBuilder sb = new StringBuilder(23);
-        sb.append("WM-");
+        sb.append(TAG_PREFIX);
         int i = MAX_PREFIXED_TAG_LENGTH;
         if (length >= i) {
             sb.append(str.substring(0, i));
diff --git a/app/src/main/java/androidx/work/OneTimeWorkRequestKt.java b/app/src/main/java/androidx/work/OneTimeWorkRequestKt.java
index c24897dc44..7739fe8a91 100644
--- a/app/src/main/java/androidx/work/OneTimeWorkRequestKt.java
+++ b/app/src/main/java/androidx/work/OneTimeWorkRequestKt.java
@@ -1,6 +1,7 @@
 package androidx.work;
 
 import androidx.annotation.NonNull;
+import androidx.exifinterface.media.ExifInterface;
 import androidx.work.OneTimeWorkRequest;
 import d0.e0.c;
 import d0.z.a;
@@ -8,7 +9,7 @@ import d0.z.d.m;
 /* compiled from: OneTimeWorkRequest.kt */
 public final class OneTimeWorkRequestKt {
     public static final /* synthetic */ <W extends ListenableWorker> OneTimeWorkRequest.Builder OneTimeWorkRequestBuilder() {
-        m.reifiedOperationMarker(4, "W");
+        m.reifiedOperationMarker(4, ExifInterface.LONGITUDE_WEST);
         return new OneTimeWorkRequest.Builder(ListenableWorker.class);
     }
 
diff --git a/app/src/main/java/androidx/work/PeriodicWorkRequestKt.java b/app/src/main/java/androidx/work/PeriodicWorkRequestKt.java
index 2d4a6f7725..c2ac9546c6 100644
--- a/app/src/main/java/androidx/work/PeriodicWorkRequestKt.java
+++ b/app/src/main/java/androidx/work/PeriodicWorkRequestKt.java
@@ -1,6 +1,7 @@
 package androidx.work;
 
 import androidx.annotation.RequiresApi;
+import androidx.exifinterface.media.ExifInterface;
 import androidx.work.PeriodicWorkRequest;
 import d0.z.d.m;
 import java.time.Duration;
@@ -9,21 +10,21 @@ import java.util.concurrent.TimeUnit;
 public final class PeriodicWorkRequestKt {
     public static final /* synthetic */ <W extends ListenableWorker> PeriodicWorkRequest.Builder PeriodicWorkRequestBuilder(long j, TimeUnit timeUnit) {
         m.checkParameterIsNotNull(timeUnit, "repeatIntervalTimeUnit");
-        m.reifiedOperationMarker(4, "W");
+        m.reifiedOperationMarker(4, ExifInterface.LONGITUDE_WEST);
         return new PeriodicWorkRequest.Builder(ListenableWorker.class, j, timeUnit);
     }
 
     public static final /* synthetic */ <W extends ListenableWorker> PeriodicWorkRequest.Builder PeriodicWorkRequestBuilder(long j, TimeUnit timeUnit, long j2, TimeUnit timeUnit2) {
         m.checkParameterIsNotNull(timeUnit, "repeatIntervalTimeUnit");
         m.checkParameterIsNotNull(timeUnit2, "flexTimeIntervalUnit");
-        m.reifiedOperationMarker(4, "W");
+        m.reifiedOperationMarker(4, ExifInterface.LONGITUDE_WEST);
         return new PeriodicWorkRequest.Builder(ListenableWorker.class, j, timeUnit, j2, timeUnit2);
     }
 
     @RequiresApi(26)
     public static final /* synthetic */ <W extends ListenableWorker> PeriodicWorkRequest.Builder PeriodicWorkRequestBuilder(Duration duration) {
         m.checkParameterIsNotNull(duration, "repeatInterval");
-        m.reifiedOperationMarker(4, "W");
+        m.reifiedOperationMarker(4, ExifInterface.LONGITUDE_WEST);
         return new PeriodicWorkRequest.Builder(ListenableWorker.class, duration);
     }
 
@@ -31,7 +32,7 @@ public final class PeriodicWorkRequestKt {
     public static final /* synthetic */ <W extends ListenableWorker> PeriodicWorkRequest.Builder PeriodicWorkRequestBuilder(Duration duration, Duration duration2) {
         m.checkParameterIsNotNull(duration, "repeatInterval");
         m.checkParameterIsNotNull(duration2, "flexTimeInterval");
-        m.reifiedOperationMarker(4, "W");
+        m.reifiedOperationMarker(4, ExifInterface.LONGITUDE_WEST);
         return new PeriodicWorkRequest.Builder(ListenableWorker.class, duration, duration2);
     }
 }
diff --git a/app/src/main/java/androidx/work/WorkRequest.java b/app/src/main/java/androidx/work/WorkRequest.java
index 3c149fa815..83b7e48ed5 100644
--- a/app/src/main/java/androidx/work/WorkRequest.java
+++ b/app/src/main/java/androidx/work/WorkRequest.java
@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.work.WorkInfo;
 import androidx.work.impl.model.WorkSpec;
 import java.time.Duration;
@@ -101,7 +102,7 @@ public abstract class WorkRequest {
         @NonNull
         public B setInitialDelay(long j, @NonNull TimeUnit timeUnit) {
             this.mWorkSpec.initialDelay = timeUnit.toMillis(j);
-            if (Long.MAX_VALUE - System.currentTimeMillis() > this.mWorkSpec.initialDelay) {
+            if (RecyclerView.FOREVER_NS - System.currentTimeMillis() > this.mWorkSpec.initialDelay) {
                 return getThis();
             }
             throw new IllegalArgumentException("The given initial delay is too large and will cause an overflow!");
@@ -111,7 +112,7 @@ public abstract class WorkRequest {
         @RequiresApi(26)
         public B setInitialDelay(@NonNull Duration duration) {
             this.mWorkSpec.initialDelay = duration.toMillis();
-            if (Long.MAX_VALUE - System.currentTimeMillis() > this.mWorkSpec.initialDelay) {
+            if (RecyclerView.FOREVER_NS - System.currentTimeMillis() > this.mWorkSpec.initialDelay) {
                 return getThis();
             }
             throw new IllegalArgumentException("The given initial delay is too large and will cause an overflow!");
diff --git a/app/src/main/java/androidx/work/impl/Processor.java b/app/src/main/java/androidx/work/impl/Processor.java
index 66a5f8e83b..506f7169e2 100644
--- a/app/src/main/java/androidx/work/impl/Processor.java
+++ b/app/src/main/java/androidx/work/impl/Processor.java
@@ -180,7 +180,7 @@ public class Processor implements ExecutionListener, ForegroundProcessor {
             WorkerWrapper remove = this.mEnqueuedWorkMap.remove(str);
             if (remove != null) {
                 if (this.mForegroundLock == null) {
-                    PowerManager.WakeLock newWakeLock = WakeLocks.newWakeLock(this.mAppContext, "ProcessorForegroundLck");
+                    PowerManager.WakeLock newWakeLock = WakeLocks.newWakeLock(this.mAppContext, FOREGROUND_WAKELOCK_TAG);
                     this.mForegroundLock = newWakeLock;
                     newWakeLock.acquire();
                 }
diff --git a/app/src/main/java/androidx/work/impl/Schedulers.java b/app/src/main/java/androidx/work/impl/Schedulers.java
index d1efa7faeb..51c6af38c7 100644
--- a/app/src/main/java/androidx/work/impl/Schedulers.java
+++ b/app/src/main/java/androidx/work/impl/Schedulers.java
@@ -80,8 +80,8 @@ public class Schedulers {
     @Nullable
     private static Scheduler tryCreateGcmBasedScheduler(@NonNull Context context) {
         try {
-            Scheduler scheduler = (Scheduler) Class.forName("androidx.work.impl.background.gcm.GcmScheduler").getConstructor(Context.class).newInstance(context);
-            Logger.get().debug(TAG, String.format("Created %s", "androidx.work.impl.background.gcm.GcmScheduler"), new Throwable[0]);
+            Scheduler scheduler = (Scheduler) Class.forName(GCM_SCHEDULER).getConstructor(Context.class).newInstance(context);
+            Logger.get().debug(TAG, String.format("Created %s", GCM_SCHEDULER), new Throwable[0]);
             return scheduler;
         } catch (Throwable th) {
             Logger.get().debug(TAG, "Unable to create GCM Scheduler", th);
diff --git a/app/src/main/java/androidx/work/impl/WorkDatabase.java b/app/src/main/java/androidx/work/impl/WorkDatabase.java
index 45c04b5c11..ca5b130d0d 100644
--- a/app/src/main/java/androidx/work/impl/WorkDatabase.java
+++ b/app/src/main/java/androidx/work/impl/WorkDatabase.java
@@ -93,9 +93,9 @@ public abstract class WorkDatabase extends RoomDatabase {
 
     @NonNull
     public static String getPruneSQL() {
-        StringBuilder K = a.K("DELETE FROM workspec WHERE state IN (2, 3, 5) AND (period_start_time + minimum_retention_duration) < ");
+        StringBuilder K = a.K(PRUNE_SQL_FORMAT_PREFIX);
         K.append(getPruneDate());
-        K.append(" AND (SELECT COUNT(*)=0 FROM dependency WHERE     prerequisite_id=id AND     work_spec_id NOT IN         (SELECT id FROM workspec WHERE state IN (2, 3, 5)))");
+        K.append(PRUNE_SQL_FORMAT_SUFFIX);
         return K.toString();
     }
 
diff --git a/app/src/main/java/androidx/work/impl/WorkDatabaseMigrations.java b/app/src/main/java/androidx/work/impl/WorkDatabaseMigrations.java
index a9d99f6ad4..2ad95218bd 100644
--- a/app/src/main/java/androidx/work/impl/WorkDatabaseMigrations.java
+++ b/app/src/main/java/androidx/work/impl/WorkDatabaseMigrations.java
@@ -53,9 +53,9 @@ public class WorkDatabaseMigrations {
 
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-            supportSQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS `SystemIdInfo` (`work_spec_id` TEXT NOT NULL, `system_id` INTEGER NOT NULL, PRIMARY KEY(`work_spec_id`), FOREIGN KEY(`work_spec_id`) REFERENCES `WorkSpec`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )");
-            supportSQLiteDatabase.execSQL("INSERT INTO SystemIdInfo(work_spec_id, system_id) SELECT work_spec_id, alarm_id AS system_id FROM alarmInfo");
-            supportSQLiteDatabase.execSQL("DROP TABLE IF EXISTS alarmInfo");
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.CREATE_SYSTEM_ID_INFO);
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.MIGRATE_ALARM_INFO_TO_SYSTEM_ID_INFO);
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.REMOVE_ALARM_INFO);
             supportSQLiteDatabase.execSQL("INSERT OR IGNORE INTO worktag(tag, work_spec_id) SELECT worker_class_name AS tag, id AS work_spec_id FROM workspec");
         }
     }
@@ -69,7 +69,7 @@ public class WorkDatabaseMigrations {
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
             if (Build.VERSION.SDK_INT >= 23) {
-                supportSQLiteDatabase.execSQL("UPDATE workspec SET schedule_requested_at=0 WHERE state NOT IN (2, 3, 5) AND schedule_requested_at=-1 AND interval_duration<>0");
+                supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.PERIODIC_WORK_SET_SCHEDULE_REQUESTED_AT);
             }
         }
     }
@@ -82,8 +82,8 @@ public class WorkDatabaseMigrations {
 
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-            supportSQLiteDatabase.execSQL("ALTER TABLE workspec ADD COLUMN `trigger_content_update_delay` INTEGER NOT NULL DEFAULT -1");
-            supportSQLiteDatabase.execSQL("ALTER TABLE workspec ADD COLUMN `trigger_max_content_delay` INTEGER NOT NULL DEFAULT -1");
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.WORKSPEC_ADD_TRIGGER_UPDATE_DELAY);
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.WORKSPEC_ADD_TRIGGER_MAX_CONTENT_DELAY);
         }
     }
 
@@ -95,7 +95,7 @@ public class WorkDatabaseMigrations {
 
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-            supportSQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS `WorkProgress` (`work_spec_id` TEXT NOT NULL, `progress` BLOB NOT NULL, PRIMARY KEY(`work_spec_id`), FOREIGN KEY(`work_spec_id`) REFERENCES `WorkSpec`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )");
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.CREATE_WORK_PROGRESS);
         }
     }
 
@@ -107,7 +107,7 @@ public class WorkDatabaseMigrations {
 
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-            supportSQLiteDatabase.execSQL("CREATE INDEX IF NOT EXISTS `index_WorkSpec_period_start_time` ON `workspec` (`period_start_time`)");
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.CREATE_INDEX_PERIOD_START_TIME);
         }
     }
 
@@ -119,7 +119,7 @@ public class WorkDatabaseMigrations {
 
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-            supportSQLiteDatabase.execSQL("ALTER TABLE workspec ADD COLUMN `run_in_foreground` INTEGER NOT NULL DEFAULT 0");
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.CREATE_RUN_IN_FOREGROUND);
         }
     }
 
@@ -134,9 +134,9 @@ public class WorkDatabaseMigrations {
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
             if (this.endVersion >= 10) {
-                supportSQLiteDatabase.execSQL("INSERT OR REPLACE INTO `Preference` (`key`, `long_value`) VALUES (@key, @long_value)", new Object[]{"reschedule_needed", 1});
+                supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.INSERT_PREFERENCE, new Object[]{PreferenceUtils.KEY_RESCHEDULE_NEEDED, 1});
             } else {
-                this.mContext.getSharedPreferences("androidx.work.util.preferences", 0).edit().putBoolean("reschedule_needed", true).apply();
+                this.mContext.getSharedPreferences(PreferenceUtils.PREFERENCES_FILE_NAME, 0).edit().putBoolean(PreferenceUtils.KEY_RESCHEDULE_NEEDED, true).apply();
             }
         }
     }
@@ -151,7 +151,7 @@ public class WorkDatabaseMigrations {
 
         @Override // androidx.room.migration.Migration
         public void migrate(@NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-            supportSQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS `Preference` (`key` TEXT NOT NULL, `long_value` INTEGER, PRIMARY KEY(`key`))");
+            supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.CREATE_PREFERENCE);
             PreferenceUtils.migrateLegacyPreferences(this.mContext, supportSQLiteDatabase);
             IdGenerator.migrateLegacyIdGenerator(this.mContext, supportSQLiteDatabase);
         }
diff --git a/app/src/main/java/androidx/work/impl/WorkDatabasePathHelper.java b/app/src/main/java/androidx/work/impl/WorkDatabasePathHelper.java
index bcc02dc2ad..1a748fd33f 100644
--- a/app/src/main/java/androidx/work/impl/WorkDatabasePathHelper.java
+++ b/app/src/main/java/androidx/work/impl/WorkDatabasePathHelper.java
@@ -22,13 +22,13 @@ public class WorkDatabasePathHelper {
     @NonNull
     @VisibleForTesting
     public static File getDatabasePath(@NonNull Context context) {
-        return Build.VERSION.SDK_INT < 23 ? getDefaultDatabasePath(context) : getNoBackupPath(context, "androidx.work.workdb");
+        return Build.VERSION.SDK_INT < 23 ? getDefaultDatabasePath(context) : getNoBackupPath(context, WORK_DATABASE_NAME);
     }
 
     @NonNull
     @VisibleForTesting
     public static File getDefaultDatabasePath(@NonNull Context context) {
-        return context.getDatabasePath("androidx.work.workdb");
+        return context.getDatabasePath(WORK_DATABASE_NAME);
     }
 
     @RequiresApi(23)
@@ -38,7 +38,7 @@ public class WorkDatabasePathHelper {
 
     @NonNull
     public static String getWorkDatabaseName() {
-        return "androidx.work.workdb";
+        return WORK_DATABASE_NAME;
     }
 
     public static void migrateDatabase(@NonNull Context context) {
diff --git a/app/src/main/java/androidx/work/impl/WorkDatabase_Impl.java b/app/src/main/java/androidx/work/impl/WorkDatabase_Impl.java
index 0f1fe426b8..5ac06da21a 100644
--- a/app/src/main/java/androidx/work/impl/WorkDatabase_Impl.java
+++ b/app/src/main/java/androidx/work/impl/WorkDatabase_Impl.java
@@ -3,6 +3,7 @@ package androidx.work.impl;
 import androidx.room.DatabaseConfiguration;
 import androidx.room.InvalidationTracker;
 import androidx.room.RoomDatabase;
+import androidx.room.RoomMasterTable;
 import androidx.room.RoomOpenHelper;
 import androidx.room.util.DBUtil;
 import androidx.room.util.TableInfo;
@@ -24,6 +25,7 @@ import androidx.work.impl.model.WorkSpecDao;
 import androidx.work.impl.model.WorkSpecDao_Impl;
 import androidx.work.impl.model.WorkTagDao;
 import androidx.work.impl.model.WorkTagDao_Impl;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,7 +61,7 @@ public final class WorkDatabase_Impl extends WorkDatabase {
             supportSQLiteDatabase.execSQL("CREATE INDEX IF NOT EXISTS `index_WorkName_work_spec_id` ON `WorkName` (`work_spec_id`)");
             supportSQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS `WorkProgress` (`work_spec_id` TEXT NOT NULL, `progress` BLOB NOT NULL, PRIMARY KEY(`work_spec_id`), FOREIGN KEY(`work_spec_id`) REFERENCES `WorkSpec`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )");
             supportSQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS `Preference` (`key` TEXT NOT NULL, `long_value` INTEGER, PRIMARY KEY(`key`))");
-            supportSQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)");
+            supportSQLiteDatabase.execSQL(RoomMasterTable.CREATE_QUERY);
             supportSQLiteDatabase.execSQL("INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'cf029002fffdcadf079e8d0a1c9a70ac')");
         }
 
@@ -118,8 +120,8 @@ public final class WorkDatabase_Impl extends WorkDatabase {
             hashMap.put("work_spec_id", new TableInfo.Column("work_spec_id", "TEXT", true, 1, null, 1));
             hashMap.put("prerequisite_id", new TableInfo.Column("prerequisite_id", "TEXT", true, 2, null, 1));
             HashSet hashSet = new HashSet(2);
-            hashSet.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList("id")));
-            hashSet.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("prerequisite_id"), Arrays.asList("id")));
+            hashSet.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList(ModelAuditLogEntry.CHANGE_KEY_ID)));
+            hashSet.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("prerequisite_id"), Arrays.asList(ModelAuditLogEntry.CHANGE_KEY_ID)));
             HashSet hashSet2 = new HashSet(2);
             hashSet2.add(new TableInfo.Index("index_Dependency_work_spec_id", false, Arrays.asList("work_spec_id")));
             hashSet2.add(new TableInfo.Index("index_Dependency_prerequisite_id", false, Arrays.asList("prerequisite_id")));
@@ -129,7 +131,7 @@ public final class WorkDatabase_Impl extends WorkDatabase {
                 return new RoomOpenHelper.ValidationResult(false, "Dependency(androidx.work.impl.model.Dependency).\n Expected:\n" + tableInfo + "\n Found:\n" + read);
             }
             HashMap hashMap2 = new HashMap(24);
-            hashMap2.put("id", new TableInfo.Column("id", "TEXT", true, 1, null, 1));
+            hashMap2.put(ModelAuditLogEntry.CHANGE_KEY_ID, new TableInfo.Column(ModelAuditLogEntry.CHANGE_KEY_ID, "TEXT", true, 1, null, 1));
             hashMap2.put("state", new TableInfo.Column("state", "INTEGER", true, 0, null, 1));
             hashMap2.put("worker_class_name", new TableInfo.Column("worker_class_name", "TEXT", true, 0, null, 1));
             hashMap2.put("input_merger_class_name", new TableInfo.Column("input_merger_class_name", "TEXT", false, 0, null, 1));
@@ -166,7 +168,7 @@ public final class WorkDatabase_Impl extends WorkDatabase {
             hashMap3.put("tag", new TableInfo.Column("tag", "TEXT", true, 1, null, 1));
             hashMap3.put("work_spec_id", new TableInfo.Column("work_spec_id", "TEXT", true, 2, null, 1));
             HashSet hashSet5 = new HashSet(1);
-            hashSet5.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList("id")));
+            hashSet5.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList(ModelAuditLogEntry.CHANGE_KEY_ID)));
             HashSet hashSet6 = new HashSet(1);
             hashSet6.add(new TableInfo.Index("index_WorkTag_work_spec_id", false, Arrays.asList("work_spec_id")));
             TableInfo tableInfo3 = new TableInfo("WorkTag", hashMap3, hashSet5, hashSet6);
@@ -178,17 +180,17 @@ public final class WorkDatabase_Impl extends WorkDatabase {
             hashMap4.put("work_spec_id", new TableInfo.Column("work_spec_id", "TEXT", true, 1, null, 1));
             hashMap4.put("system_id", new TableInfo.Column("system_id", "INTEGER", true, 0, null, 1));
             HashSet hashSet7 = new HashSet(1);
-            hashSet7.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList("id")));
+            hashSet7.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList(ModelAuditLogEntry.CHANGE_KEY_ID)));
             TableInfo tableInfo4 = new TableInfo("SystemIdInfo", hashMap4, hashSet7, new HashSet(0));
             TableInfo read4 = TableInfo.read(supportSQLiteDatabase, "SystemIdInfo");
             if (!tableInfo4.equals(read4)) {
                 return new RoomOpenHelper.ValidationResult(false, "SystemIdInfo(androidx.work.impl.model.SystemIdInfo).\n Expected:\n" + tableInfo4 + "\n Found:\n" + read4);
             }
             HashMap hashMap5 = new HashMap(2);
-            hashMap5.put("name", new TableInfo.Column("name", "TEXT", true, 1, null, 1));
+            hashMap5.put(ModelAuditLogEntry.CHANGE_KEY_NAME, new TableInfo.Column(ModelAuditLogEntry.CHANGE_KEY_NAME, "TEXT", true, 1, null, 1));
             hashMap5.put("work_spec_id", new TableInfo.Column("work_spec_id", "TEXT", true, 2, null, 1));
             HashSet hashSet8 = new HashSet(1);
-            hashSet8.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList("id")));
+            hashSet8.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList(ModelAuditLogEntry.CHANGE_KEY_ID)));
             HashSet hashSet9 = new HashSet(1);
             hashSet9.add(new TableInfo.Index("index_WorkName_work_spec_id", false, Arrays.asList("work_spec_id")));
             TableInfo tableInfo5 = new TableInfo("WorkName", hashMap5, hashSet8, hashSet9);
@@ -200,7 +202,7 @@ public final class WorkDatabase_Impl extends WorkDatabase {
             hashMap6.put("work_spec_id", new TableInfo.Column("work_spec_id", "TEXT", true, 1, null, 1));
             hashMap6.put("progress", new TableInfo.Column("progress", "BLOB", true, 0, null, 1));
             HashSet hashSet10 = new HashSet(1);
-            hashSet10.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList("id")));
+            hashSet10.add(new TableInfo.ForeignKey("WorkSpec", "CASCADE", "CASCADE", Arrays.asList("work_spec_id"), Arrays.asList(ModelAuditLogEntry.CHANGE_KEY_ID)));
             TableInfo tableInfo6 = new TableInfo("WorkProgress", hashMap6, hashSet10, new HashSet(0));
             TableInfo read6 = TableInfo.read(supportSQLiteDatabase, "WorkProgress");
             if (!tableInfo6.equals(read6)) {
diff --git a/app/src/main/java/androidx/work/impl/background/greedy/GreedyScheduler.java b/app/src/main/java/androidx/work/impl/background/greedy/GreedyScheduler.java
index 6f540f2613..26c655c011 100644
--- a/app/src/main/java/androidx/work/impl/background/greedy/GreedyScheduler.java
+++ b/app/src/main/java/androidx/work/impl/background/greedy/GreedyScheduler.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.work.Configuration;
 import androidx.work.Logger;
 import androidx.work.WorkInfo;
@@ -70,7 +71,7 @@ public class GreedyScheduler implements Scheduler, WorkConstraintsCallback, Exec
             Logger.get().debug(TAG, "Unable to check ActivityThread for processName", th);
         }
         int myPid = Process.myPid();
-        ActivityManager activityManager = (ActivityManager) this.mContext.getSystemService("activity");
+        ActivityManager activityManager = (ActivityManager) this.mContext.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (activityManager == null || (runningAppProcesses = activityManager.getRunningAppProcesses()) == null || runningAppProcesses.isEmpty()) {
             return null;
         }
diff --git a/app/src/main/java/androidx/work/impl/background/systemalarm/Alarms.java b/app/src/main/java/androidx/work/impl/background/systemalarm/Alarms.java
index 81c7dba6a8..2b96e40d7a 100644
--- a/app/src/main/java/androidx/work/impl/background/systemalarm/Alarms.java
+++ b/app/src/main/java/androidx/work/impl/background/systemalarm/Alarms.java
@@ -5,6 +5,7 @@ import android.app.PendingIntent;
 import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.core.app.NotificationCompat;
 import androidx.work.Logger;
 import androidx.work.impl.WorkDatabase;
 import androidx.work.impl.WorkManagerImpl;
@@ -29,7 +30,7 @@ public class Alarms {
     }
 
     private static void cancelExactAlarm(@NonNull Context context, @NonNull String str, int i) {
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService("alarm");
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(NotificationCompat.CATEGORY_ALARM);
         PendingIntent service = PendingIntent.getService(context, i, CommandHandler.createDelayMetIntent(context, str), 536870912);
         if (service != null && alarmManager != null) {
             Logger.get().debug(TAG, String.format("Cancelling existing alarm with (workSpecId, systemId) (%s, %s)", str, Integer.valueOf(i)), new Throwable[0]);
@@ -52,7 +53,7 @@ public class Alarms {
     }
 
     private static void setExactAlarm(@NonNull Context context, @NonNull String str, int i, long j) {
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService("alarm");
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(NotificationCompat.CATEGORY_ALARM);
         PendingIntent service = PendingIntent.getService(context, i, CommandHandler.createDelayMetIntent(context, str), 134217728);
         if (alarmManager != null) {
             alarmManager.setExact(0, j, service);
diff --git a/app/src/main/java/androidx/work/impl/background/systemalarm/CommandHandler.java b/app/src/main/java/androidx/work/impl/background/systemalarm/CommandHandler.java
index d6be3a9f69..774424c5c4 100644
--- a/app/src/main/java/androidx/work/impl/background/systemalarm/CommandHandler.java
+++ b/app/src/main/java/androidx/work/impl/background/systemalarm/CommandHandler.java
@@ -36,42 +36,42 @@ public class CommandHandler implements ExecutionListener {
 
     public static Intent createConstraintsChangedIntent(@NonNull Context context) {
         Intent intent = new Intent(context, SystemAlarmService.class);
-        intent.setAction("ACTION_CONSTRAINTS_CHANGED");
+        intent.setAction(ACTION_CONSTRAINTS_CHANGED);
         return intent;
     }
 
     public static Intent createDelayMetIntent(@NonNull Context context, @NonNull String str) {
         Intent intent = new Intent(context, SystemAlarmService.class);
-        intent.setAction("ACTION_DELAY_MET");
-        intent.putExtra("KEY_WORKSPEC_ID", str);
+        intent.setAction(ACTION_DELAY_MET);
+        intent.putExtra(KEY_WORKSPEC_ID, str);
         return intent;
     }
 
     public static Intent createExecutionCompletedIntent(@NonNull Context context, @NonNull String str, boolean z2) {
         Intent intent = new Intent(context, SystemAlarmService.class);
-        intent.setAction("ACTION_EXECUTION_COMPLETED");
-        intent.putExtra("KEY_WORKSPEC_ID", str);
-        intent.putExtra("KEY_NEEDS_RESCHEDULE", z2);
+        intent.setAction(ACTION_EXECUTION_COMPLETED);
+        intent.putExtra(KEY_WORKSPEC_ID, str);
+        intent.putExtra(KEY_NEEDS_RESCHEDULE, z2);
         return intent;
     }
 
     public static Intent createRescheduleIntent(@NonNull Context context) {
         Intent intent = new Intent(context, SystemAlarmService.class);
-        intent.setAction("ACTION_RESCHEDULE");
+        intent.setAction(ACTION_RESCHEDULE);
         return intent;
     }
 
     public static Intent createScheduleWorkIntent(@NonNull Context context, @NonNull String str) {
         Intent intent = new Intent(context, SystemAlarmService.class);
-        intent.setAction("ACTION_SCHEDULE_WORK");
-        intent.putExtra("KEY_WORKSPEC_ID", str);
+        intent.setAction(ACTION_SCHEDULE_WORK);
+        intent.putExtra(KEY_WORKSPEC_ID, str);
         return intent;
     }
 
     public static Intent createStopWorkIntent(@NonNull Context context, @NonNull String str) {
         Intent intent = new Intent(context, SystemAlarmService.class);
-        intent.setAction("ACTION_STOP_WORK");
-        intent.putExtra("KEY_WORKSPEC_ID", str);
+        intent.setAction(ACTION_STOP_WORK);
+        intent.putExtra(KEY_WORKSPEC_ID, str);
         return intent;
     }
 
@@ -83,7 +83,7 @@ public class CommandHandler implements ExecutionListener {
     private void handleDelayMet(@NonNull Intent intent, int i, @NonNull SystemAlarmDispatcher systemAlarmDispatcher) {
         Bundle extras = intent.getExtras();
         synchronized (this.mLock) {
-            String string = extras.getString("KEY_WORKSPEC_ID");
+            String string = extras.getString(KEY_WORKSPEC_ID);
             Logger logger = Logger.get();
             String str = TAG;
             logger.debug(str, String.format("Handing delay met for %s", string), new Throwable[0]);
@@ -99,8 +99,8 @@ public class CommandHandler implements ExecutionListener {
 
     private void handleExecutionCompleted(@NonNull Intent intent, int i) {
         Bundle extras = intent.getExtras();
-        String string = extras.getString("KEY_WORKSPEC_ID");
-        boolean z2 = extras.getBoolean("KEY_NEEDS_RESCHEDULE");
+        String string = extras.getString(KEY_WORKSPEC_ID);
+        boolean z2 = extras.getBoolean(KEY_NEEDS_RESCHEDULE);
         Logger.get().debug(TAG, String.format("Handling onExecutionCompleted %s, %s", intent, Integer.valueOf(i)), new Throwable[0]);
         onExecuted(string, z2);
     }
@@ -111,7 +111,7 @@ public class CommandHandler implements ExecutionListener {
     }
 
     private void handleScheduleWorkIntent(@NonNull Intent intent, int i, @NonNull SystemAlarmDispatcher systemAlarmDispatcher) {
-        String string = intent.getExtras().getString("KEY_WORKSPEC_ID");
+        String string = intent.getExtras().getString(KEY_WORKSPEC_ID);
         Logger logger = Logger.get();
         String str = TAG;
         logger.debug(str, String.format("Handling schedule work for %s", string), new Throwable[0]);
@@ -145,7 +145,7 @@ public class CommandHandler implements ExecutionListener {
     }
 
     private void handleStopWork(@NonNull Intent intent, @NonNull SystemAlarmDispatcher systemAlarmDispatcher) {
-        String string = intent.getExtras().getString("KEY_WORKSPEC_ID");
+        String string = intent.getExtras().getString(KEY_WORKSPEC_ID);
         Logger.get().debug(TAG, String.format("Handing stopWork work for %s", string), new Throwable[0]);
         systemAlarmDispatcher.getWorkManager().stopWork(string);
         Alarms.cancelAlarm(this.mContext, systemAlarmDispatcher.getWorkManager(), string);
@@ -185,19 +185,19 @@ public class CommandHandler implements ExecutionListener {
     @WorkerThread
     public void onHandleIntent(@NonNull Intent intent, int i, @NonNull SystemAlarmDispatcher systemAlarmDispatcher) {
         String action = intent.getAction();
-        if ("ACTION_CONSTRAINTS_CHANGED".equals(action)) {
+        if (ACTION_CONSTRAINTS_CHANGED.equals(action)) {
             handleConstraintsChanged(intent, i, systemAlarmDispatcher);
-        } else if ("ACTION_RESCHEDULE".equals(action)) {
+        } else if (ACTION_RESCHEDULE.equals(action)) {
             handleReschedule(intent, i, systemAlarmDispatcher);
-        } else if (!hasKeys(intent.getExtras(), "KEY_WORKSPEC_ID")) {
-            Logger.get().error(TAG, String.format("Invalid request for %s, requires %s.", action, "KEY_WORKSPEC_ID"), new Throwable[0]);
-        } else if ("ACTION_SCHEDULE_WORK".equals(action)) {
+        } else if (!hasKeys(intent.getExtras(), KEY_WORKSPEC_ID)) {
+            Logger.get().error(TAG, String.format("Invalid request for %s, requires %s.", action, KEY_WORKSPEC_ID), new Throwable[0]);
+        } else if (ACTION_SCHEDULE_WORK.equals(action)) {
             handleScheduleWorkIntent(intent, i, systemAlarmDispatcher);
-        } else if ("ACTION_DELAY_MET".equals(action)) {
+        } else if (ACTION_DELAY_MET.equals(action)) {
             handleDelayMet(intent, i, systemAlarmDispatcher);
-        } else if ("ACTION_STOP_WORK".equals(action)) {
+        } else if (ACTION_STOP_WORK.equals(action)) {
             handleStopWork(intent, systemAlarmDispatcher);
-        } else if ("ACTION_EXECUTION_COMPLETED".equals(action)) {
+        } else if (ACTION_EXECUTION_COMPLETED.equals(action)) {
             handleExecutionCompleted(intent, i);
         } else {
             Logger.get().warning(TAG, String.format("Ignoring intent %s", intent), new Throwable[0]);
diff --git a/app/src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java b/app/src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java
index 3edae1a0c1..5afa717d65 100644
--- a/app/src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java
+++ b/app/src/main/java/androidx/work/impl/background/systemalarm/ConstraintProxyUpdateReceiver.java
@@ -33,10 +33,10 @@ public class ConstraintProxyUpdateReceiver extends BroadcastReceiver {
         @Override // java.lang.Runnable
         public void run() {
             try {
-                boolean booleanExtra = this.val$intent.getBooleanExtra("KEY_BATTERY_NOT_LOW_PROXY_ENABLED", false);
-                boolean booleanExtra2 = this.val$intent.getBooleanExtra("KEY_BATTERY_CHARGING_PROXY_ENABLED", false);
-                boolean booleanExtra3 = this.val$intent.getBooleanExtra("KEY_STORAGE_NOT_LOW_PROXY_ENABLED", false);
-                boolean booleanExtra4 = this.val$intent.getBooleanExtra("KEY_NETWORK_STATE_PROXY_ENABLED", false);
+                boolean booleanExtra = this.val$intent.getBooleanExtra(ConstraintProxyUpdateReceiver.KEY_BATTERY_NOT_LOW_PROXY_ENABLED, false);
+                boolean booleanExtra2 = this.val$intent.getBooleanExtra(ConstraintProxyUpdateReceiver.KEY_BATTERY_CHARGING_PROXY_ENABLED, false);
+                boolean booleanExtra3 = this.val$intent.getBooleanExtra(ConstraintProxyUpdateReceiver.KEY_STORAGE_NOT_LOW_PROXY_ENABLED, false);
+                boolean booleanExtra4 = this.val$intent.getBooleanExtra(ConstraintProxyUpdateReceiver.KEY_NETWORK_STATE_PROXY_ENABLED, false);
                 Logger.get().debug(ConstraintProxyUpdateReceiver.TAG, String.format("Updating proxies: BatteryNotLowProxy enabled (%s), BatteryChargingProxy enabled (%s), StorageNotLowProxy (%s), NetworkStateProxy enabled (%s)", Boolean.valueOf(booleanExtra), Boolean.valueOf(booleanExtra2), Boolean.valueOf(booleanExtra3), Boolean.valueOf(booleanExtra4)), new Throwable[0]);
                 PackageManagerHelper.setComponentEnabled(this.val$context, ConstraintProxy.BatteryNotLowProxy.class, booleanExtra);
                 PackageManagerHelper.setComponentEnabled(this.val$context, ConstraintProxy.BatteryChargingProxy.class, booleanExtra2);
@@ -49,16 +49,16 @@ public class ConstraintProxyUpdateReceiver extends BroadcastReceiver {
     }
 
     public static Intent newConstraintProxyUpdateIntent(Context context, boolean z2, boolean z3, boolean z4, boolean z5) {
-        Intent intent = new Intent("androidx.work.impl.background.systemalarm.UpdateProxies");
+        Intent intent = new Intent(ACTION);
         intent.setComponent(new ComponentName(context, ConstraintProxyUpdateReceiver.class));
-        intent.putExtra("KEY_BATTERY_NOT_LOW_PROXY_ENABLED", z2).putExtra("KEY_BATTERY_CHARGING_PROXY_ENABLED", z3).putExtra("KEY_STORAGE_NOT_LOW_PROXY_ENABLED", z4).putExtra("KEY_NETWORK_STATE_PROXY_ENABLED", z5);
+        intent.putExtra(KEY_BATTERY_NOT_LOW_PROXY_ENABLED, z2).putExtra(KEY_BATTERY_CHARGING_PROXY_ENABLED, z3).putExtra(KEY_STORAGE_NOT_LOW_PROXY_ENABLED, z4).putExtra(KEY_NETWORK_STATE_PROXY_ENABLED, z5);
         return intent;
     }
 
     @Override // android.content.BroadcastReceiver
     public void onReceive(@NonNull Context context, @Nullable Intent intent) {
         String action = intent != null ? intent.getAction() : null;
-        if (!"androidx.work.impl.background.systemalarm.UpdateProxies".equals(action)) {
+        if (!ACTION.equals(action)) {
             Logger.get().debug(TAG, String.format("Ignoring unknown action %s", action), new Throwable[0]);
         } else {
             WorkManagerImpl.getInstance(context).getWorkTaskExecutor().executeOnBackgroundThread(new AnonymousClass1(intent, context, goAsync()));
diff --git a/app/src/main/java/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.java b/app/src/main/java/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.java
index 1996c07a67..4100d6098b 100644
--- a/app/src/main/java/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.java
+++ b/app/src/main/java/androidx/work/impl/background/systemalarm/DelayMetCommandHandler.java
@@ -108,7 +108,7 @@ public class DelayMetCommandHandler implements WorkConstraintsCallback, Executio
                     this.mCurrentState = 1;
                     Logger.get().debug(TAG, String.format("onAllConstraintsMet for %s", this.mWorkSpecId), new Throwable[0]);
                     if (this.mDispatcher.getProcessor().startWork(this.mWorkSpecId)) {
-                        this.mDispatcher.getWorkTimer().startTimer(this.mWorkSpecId, 600000, this);
+                        this.mDispatcher.getWorkTimer().startTimer(this.mWorkSpecId, CommandHandler.WORK_PROCESSING_TIME_IN_MS, this);
                     } else {
                         cleanUp();
                     }
diff --git a/app/src/main/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.java b/app/src/main/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.java
index 6745376bc3..ed839fd944 100644
--- a/app/src/main/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.java
+++ b/app/src/main/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcher.java
@@ -55,7 +55,7 @@ public class SystemAlarmDispatcher implements ExecutionListener {
             Intent intent = SystemAlarmDispatcher.this.mCurrentIntent;
             if (intent != null) {
                 String action = intent.getAction();
-                int intExtra = SystemAlarmDispatcher.this.mCurrentIntent.getIntExtra("KEY_START_ID", 0);
+                int intExtra = SystemAlarmDispatcher.this.mCurrentIntent.getIntExtra(SystemAlarmDispatcher.KEY_START_ID, 0);
                 Logger logger = Logger.get();
                 String str = SystemAlarmDispatcher.TAG;
                 logger.debug(str, String.format("Processing command %s, %s", SystemAlarmDispatcher.this.mCurrentIntent, Integer.valueOf(intExtra)), new Throwable[0]);
@@ -158,7 +158,7 @@ public class SystemAlarmDispatcher implements ExecutionListener {
     @MainThread
     private void processCommand() {
         assertMainThread();
-        PowerManager.WakeLock newWakeLock = WakeLocks.newWakeLock(this.mContext, "ProcessCommand");
+        PowerManager.WakeLock newWakeLock = WakeLocks.newWakeLock(this.mContext, PROCESS_COMMAND_TAG);
         try {
             newWakeLock.acquire();
             this.mWorkManager.getWorkTaskExecutor().executeOnBackgroundThread(new AnonymousClass1());
@@ -178,10 +178,10 @@ public class SystemAlarmDispatcher implements ExecutionListener {
         if (TextUtils.isEmpty(action)) {
             Logger.get().warning(str, "Unknown command. Ignoring", new Throwable[0]);
             return false;
-        } else if ("ACTION_CONSTRAINTS_CHANGED".equals(action) && hasIntentWithAction("ACTION_CONSTRAINTS_CHANGED")) {
+        } else if (CommandHandler.ACTION_CONSTRAINTS_CHANGED.equals(action) && hasIntentWithAction(CommandHandler.ACTION_CONSTRAINTS_CHANGED)) {
             return false;
         } else {
-            intent.putExtra("KEY_START_ID", i);
+            intent.putExtra(KEY_START_ID, i);
             synchronized (this.mIntents) {
                 if (!this.mIntents.isEmpty()) {
                     z2 = true;
diff --git a/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java b/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java
index 7b133b6ce5..2bbce9b567 100644
--- a/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java
+++ b/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobInfoConverter.java
@@ -90,8 +90,8 @@ public class SystemJobInfoConverter {
         Constraints constraints = workSpec.constraints;
         int convertNetworkType = convertNetworkType(constraints.getRequiredNetworkType());
         PersistableBundle persistableBundle = new PersistableBundle();
-        persistableBundle.putString("EXTRA_WORK_SPEC_ID", workSpec.f29id);
-        persistableBundle.putBoolean("EXTRA_IS_PERIODIC", workSpec.isPeriodic());
+        persistableBundle.putString(EXTRA_WORK_SPEC_ID, workSpec.f29id);
+        persistableBundle.putBoolean(EXTRA_IS_PERIODIC, workSpec.isPeriodic());
         JobInfo.Builder extras = new JobInfo.Builder(i, this.mWorkServiceComponent).setRequiredNetworkType(convertNetworkType).setRequiresCharging(constraints.requiresCharging()).setRequiresDeviceIdle(constraints.requiresDeviceIdle()).setExtras(persistableBundle);
         if (!constraints.requiresDeviceIdle()) {
             extras.setBackoffCriteria(workSpec.backoffDelayDuration, workSpec.backoffPolicy == BackoffPolicy.LINEAR ? 0 : 1);
diff --git a/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java b/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java
index 4341e86497..fd56122f44 100644
--- a/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java
+++ b/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobScheduler.java
@@ -117,8 +117,8 @@ public class SystemJobScheduler implements Scheduler {
             return null;
         }
         try {
-            if (extras.containsKey("EXTRA_WORK_SPEC_ID")) {
-                return extras.getString("EXTRA_WORK_SPEC_ID");
+            if (extras.containsKey(SystemJobInfoConverter.EXTRA_WORK_SPEC_ID)) {
+                return extras.getString(SystemJobInfoConverter.EXTRA_WORK_SPEC_ID);
             }
             return null;
         } catch (NullPointerException unused) {
diff --git a/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobService.java b/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobService.java
index fbad2f801e..fc45c8c767 100644
--- a/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobService.java
+++ b/app/src/main/java/androidx/work/impl/background/systemjob/SystemJobService.java
@@ -28,10 +28,10 @@ public class SystemJobService extends JobService implements ExecutionListener {
     private static String getWorkSpecIdFromJobParameters(@NonNull JobParameters jobParameters) {
         try {
             PersistableBundle extras = jobParameters.getExtras();
-            if (extras == null || !extras.containsKey("EXTRA_WORK_SPEC_ID")) {
+            if (extras == null || !extras.containsKey(SystemJobInfoConverter.EXTRA_WORK_SPEC_ID)) {
                 return null;
             }
-            return extras.getString("EXTRA_WORK_SPEC_ID");
+            return extras.getString(SystemJobInfoConverter.EXTRA_WORK_SPEC_ID);
         } catch (NullPointerException unused) {
             return null;
         }
diff --git a/app/src/main/java/androidx/work/impl/foreground/SystemForegroundDispatcher.java b/app/src/main/java/androidx/work/impl/foreground/SystemForegroundDispatcher.java
index b9aa579a4d..bd3af6c97a 100644
--- a/app/src/main/java/androidx/work/impl/foreground/SystemForegroundDispatcher.java
+++ b/app/src/main/java/androidx/work/impl/foreground/SystemForegroundDispatcher.java
@@ -116,39 +116,39 @@ public class SystemForegroundDispatcher implements WorkConstraintsCallback, Exec
     @NonNull
     public static Intent createCancelWorkIntent(@NonNull Context context, @NonNull String str) {
         Intent intent = new Intent(context, SystemForegroundService.class);
-        intent.setAction("ACTION_CANCEL_WORK");
+        intent.setAction(ACTION_CANCEL_WORK);
         intent.setData(Uri.parse(String.format("workspec://%s", str)));
-        intent.putExtra("KEY_WORKSPEC_ID", str);
+        intent.putExtra(KEY_WORKSPEC_ID, str);
         return intent;
     }
 
     @NonNull
     public static Intent createNotifyIntent(@NonNull Context context, @NonNull String str, @NonNull ForegroundInfo foregroundInfo) {
         Intent intent = new Intent(context, SystemForegroundService.class);
-        intent.setAction("ACTION_NOTIFY");
-        intent.putExtra("KEY_NOTIFICATION_ID", foregroundInfo.getNotificationId());
-        intent.putExtra("KEY_FOREGROUND_SERVICE_TYPE", foregroundInfo.getForegroundServiceType());
-        intent.putExtra("KEY_NOTIFICATION", foregroundInfo.getNotification());
-        intent.putExtra("KEY_WORKSPEC_ID", str);
+        intent.setAction(ACTION_NOTIFY);
+        intent.putExtra(KEY_NOTIFICATION_ID, foregroundInfo.getNotificationId());
+        intent.putExtra(KEY_FOREGROUND_SERVICE_TYPE, foregroundInfo.getForegroundServiceType());
+        intent.putExtra(KEY_NOTIFICATION, foregroundInfo.getNotification());
+        intent.putExtra(KEY_WORKSPEC_ID, str);
         return intent;
     }
 
     @NonNull
     public static Intent createStartForegroundIntent(@NonNull Context context, @NonNull String str, @NonNull ForegroundInfo foregroundInfo) {
         Intent intent = new Intent(context, SystemForegroundService.class);
-        intent.setAction("ACTION_START_FOREGROUND");
-        intent.putExtra("KEY_WORKSPEC_ID", str);
-        intent.putExtra("KEY_NOTIFICATION_ID", foregroundInfo.getNotificationId());
-        intent.putExtra("KEY_FOREGROUND_SERVICE_TYPE", foregroundInfo.getForegroundServiceType());
-        intent.putExtra("KEY_NOTIFICATION", foregroundInfo.getNotification());
-        intent.putExtra("KEY_WORKSPEC_ID", str);
+        intent.setAction(ACTION_START_FOREGROUND);
+        intent.putExtra(KEY_WORKSPEC_ID, str);
+        intent.putExtra(KEY_NOTIFICATION_ID, foregroundInfo.getNotificationId());
+        intent.putExtra(KEY_FOREGROUND_SERVICE_TYPE, foregroundInfo.getForegroundServiceType());
+        intent.putExtra(KEY_NOTIFICATION, foregroundInfo.getNotification());
+        intent.putExtra(KEY_WORKSPEC_ID, str);
         return intent;
     }
 
     @MainThread
     private void handleCancelWork(@NonNull Intent intent) {
         Logger.get().info(TAG, String.format("Stopping foreground work for %s", intent), new Throwable[0]);
-        String stringExtra = intent.getStringExtra("KEY_WORKSPEC_ID");
+        String stringExtra = intent.getStringExtra(KEY_WORKSPEC_ID);
         if (stringExtra != null && !TextUtils.isEmpty(stringExtra)) {
             this.mWorkManagerImpl.cancelWorkById(UUID.fromString(stringExtra));
         }
@@ -157,10 +157,10 @@ public class SystemForegroundDispatcher implements WorkConstraintsCallback, Exec
     @MainThread
     private void handleNotify(@NonNull Intent intent) {
         int i = 0;
-        int intExtra = intent.getIntExtra("KEY_NOTIFICATION_ID", 0);
-        int intExtra2 = intent.getIntExtra("KEY_FOREGROUND_SERVICE_TYPE", 0);
-        String stringExtra = intent.getStringExtra("KEY_WORKSPEC_ID");
-        Notification notification = (Notification) intent.getParcelableExtra("KEY_NOTIFICATION");
+        int intExtra = intent.getIntExtra(KEY_NOTIFICATION_ID, 0);
+        int intExtra2 = intent.getIntExtra(KEY_FOREGROUND_SERVICE_TYPE, 0);
+        String stringExtra = intent.getStringExtra(KEY_WORKSPEC_ID);
+        Notification notification = (Notification) intent.getParcelableExtra(KEY_NOTIFICATION);
         Logger.get().debug(TAG, String.format("Notifying with (id: %s, workSpecId: %s, notificationType: %s)", Integer.valueOf(intExtra), stringExtra, Integer.valueOf(intExtra2)), new Throwable[0]);
         if (!(notification == null || this.mCallback == null)) {
             this.mForegroundInfoById.put(stringExtra, new ForegroundInfo(intExtra, notification, intExtra2));
@@ -185,7 +185,7 @@ public class SystemForegroundDispatcher implements WorkConstraintsCallback, Exec
     @MainThread
     private void handleStartForeground(@NonNull Intent intent) {
         Logger.get().info(TAG, String.format("Started foreground service %s", intent), new Throwable[0]);
-        this.mTaskExecutor.executeOnBackgroundThread(new AnonymousClass1(this.mWorkManagerImpl.getWorkDatabase(), intent.getStringExtra("KEY_WORKSPEC_ID")));
+        this.mTaskExecutor.executeOnBackgroundThread(new AnonymousClass1(this.mWorkManagerImpl.getWorkDatabase(), intent.getStringExtra(KEY_WORKSPEC_ID)));
     }
 
     public WorkManagerImpl getWorkManager() {
@@ -267,12 +267,12 @@ public class SystemForegroundDispatcher implements WorkConstraintsCallback, Exec
 
     public void onStartCommand(@NonNull Intent intent) {
         String action = intent.getAction();
-        if ("ACTION_START_FOREGROUND".equals(action)) {
+        if (ACTION_START_FOREGROUND.equals(action)) {
             handleStartForeground(intent);
             handleNotify(intent);
-        } else if ("ACTION_NOTIFY".equals(action)) {
+        } else if (ACTION_NOTIFY.equals(action)) {
             handleNotify(intent);
-        } else if ("ACTION_CANCEL_WORK".equals(action)) {
+        } else if (ACTION_CANCEL_WORK.equals(action)) {
             handleCancelWork(intent);
         }
     }
diff --git a/app/src/main/java/androidx/work/impl/model/RawWorkInfoDao_Impl.java b/app/src/main/java/androidx/work/impl/model/RawWorkInfoDao_Impl.java
index 730751eb0a..56513a9cd5 100644
--- a/app/src/main/java/androidx/work/impl/model/RawWorkInfoDao_Impl.java
+++ b/app/src/main/java/androidx/work/impl/model/RawWorkInfoDao_Impl.java
@@ -11,6 +11,7 @@ import androidx.room.util.StringUtil;
 import androidx.sqlite.db.SupportSQLiteQuery;
 import androidx.work.Data;
 import androidx.work.impl.model.WorkSpec;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -30,7 +31,7 @@ public final class RawWorkInfoDao_Impl implements RawWorkInfoDao {
         public List<WorkSpec.WorkInfoPojo> call() throws Exception {
             Cursor query = DBUtil.query(RawWorkInfoDao_Impl.access$000(RawWorkInfoDao_Impl.this), this.val$_internalQuery, true, null);
             try {
-                int columnIndex = CursorUtil.getColumnIndex(query, "id");
+                int columnIndex = CursorUtil.getColumnIndex(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                 int columnIndex2 = CursorUtil.getColumnIndex(query, "state");
                 int columnIndex3 = CursorUtil.getColumnIndex(query, "output");
                 int columnIndex4 = CursorUtil.getColumnIndex(query, "run_attempt_count");
@@ -97,7 +98,7 @@ public final class RawWorkInfoDao_Impl implements RawWorkInfoDao {
         Set<String> keySet = arrayMap.keySet();
         if (!keySet.isEmpty()) {
             if (arrayMap.size() > 999) {
-                ArrayMap<String, ArrayList<Data>> arrayMap2 = new ArrayMap<>(999);
+                ArrayMap<String, ArrayList<Data>> arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                 int size = arrayMap.size();
                 int i2 = 0;
                 loop0:
@@ -109,7 +110,7 @@ public final class RawWorkInfoDao_Impl implements RawWorkInfoDao {
                         i++;
                         if (i == 999) {
                             __fetchRelationshipWorkProgressAsandroidxWorkData(arrayMap2);
-                            arrayMap2 = new ArrayMap<>(999);
+                            arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                         }
                     }
                     break loop0;
@@ -158,7 +159,7 @@ public final class RawWorkInfoDao_Impl implements RawWorkInfoDao {
         Set<String> keySet = arrayMap.keySet();
         if (!keySet.isEmpty()) {
             if (arrayMap.size() > 999) {
-                ArrayMap<String, ArrayList<String>> arrayMap2 = new ArrayMap<>(999);
+                ArrayMap<String, ArrayList<String>> arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                 int size = arrayMap.size();
                 int i2 = 0;
                 loop0:
@@ -170,7 +171,7 @@ public final class RawWorkInfoDao_Impl implements RawWorkInfoDao {
                         i++;
                         if (i == 999) {
                             __fetchRelationshipWorkTagAsjavaLangString(arrayMap2);
-                            arrayMap2 = new ArrayMap<>(999);
+                            arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                         }
                     }
                     break loop0;
@@ -230,7 +231,7 @@ public final class RawWorkInfoDao_Impl implements RawWorkInfoDao {
         this.__db.assertNotSuspendingTransaction();
         Cursor query = DBUtil.query(this.__db, supportSQLiteQuery, true, null);
         try {
-            int columnIndex = CursorUtil.getColumnIndex(query, "id");
+            int columnIndex = CursorUtil.getColumnIndex(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndex2 = CursorUtil.getColumnIndex(query, "state");
             int columnIndex3 = CursorUtil.getColumnIndex(query, "output");
             int columnIndex4 = CursorUtil.getColumnIndex(query, "run_attempt_count");
diff --git a/app/src/main/java/androidx/work/impl/model/WorkName.java b/app/src/main/java/androidx/work/impl/model/WorkName.java
index b009f10611..1086e4cfd4 100644
--- a/app/src/main/java/androidx/work/impl/model/WorkName.java
+++ b/app/src/main/java/androidx/work/impl/model/WorkName.java
@@ -6,11 +6,12 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
 import androidx.room.Index;
-@Entity(foreignKeys = {@ForeignKey(childColumns = {"work_spec_id"}, entity = WorkSpec.class, onDelete = 5, onUpdate = 5, parentColumns = {"id"})}, indices = {@Index({"work_spec_id"})}, primaryKeys = {"name", "work_spec_id"})
+import com.discord.models.domain.ModelAuditLogEntry;
+@Entity(foreignKeys = {@ForeignKey(childColumns = {"work_spec_id"}, entity = WorkSpec.class, onDelete = 5, onUpdate = 5, parentColumns = {"id"})}, indices = {@Index({"work_spec_id"})}, primaryKeys = {ModelAuditLogEntry.CHANGE_KEY_NAME, "work_spec_id"})
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
 public class WorkName {
     @NonNull
-    @ColumnInfo(name = "name")
+    @ColumnInfo(name = ModelAuditLogEntry.CHANGE_KEY_NAME)
     public final String name;
     @NonNull
     @ColumnInfo(name = "work_spec_id")
diff --git a/app/src/main/java/androidx/work/impl/model/WorkSpec.java b/app/src/main/java/androidx/work/impl/model/WorkSpec.java
index 9b881be59a..69303afc99 100644
--- a/app/src/main/java/androidx/work/impl/model/WorkSpec.java
+++ b/app/src/main/java/androidx/work/impl/model/WorkSpec.java
@@ -15,7 +15,9 @@ import androidx.work.Constraints;
 import androidx.work.Data;
 import androidx.work.Logger;
 import androidx.work.WorkInfo;
+import androidx.work.WorkRequest;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -37,7 +39,7 @@ public final class WorkSpec {
     public long flexDuration;
     @NonNull
     @PrimaryKey
-    @ColumnInfo(name = "id")
+    @ColumnInfo(name = ModelAuditLogEntry.CHANGE_KEY_ID)
 
     /* renamed from: id  reason: collision with root package name */
     public String f29id;
@@ -86,7 +88,7 @@ public final class WorkSpec {
     }
 
     public static class IdAndState {
-        @ColumnInfo(name = "id")
+        @ColumnInfo(name = ModelAuditLogEntry.CHANGE_KEY_ID)
 
         /* renamed from: id  reason: collision with root package name */
         public String f30id;
@@ -113,19 +115,19 @@ public final class WorkSpec {
     }
 
     public static class WorkInfoPojo {
-        @ColumnInfo(name = "id")
+        @ColumnInfo(name = ModelAuditLogEntry.CHANGE_KEY_ID)
 
         /* renamed from: id  reason: collision with root package name */
         public String f31id;
         @ColumnInfo(name = "output")
         public Data output;
-        @Relation(entity = WorkProgress.class, entityColumn = "work_spec_id", parentColumn = "id", projection = {"progress"})
+        @Relation(entity = WorkProgress.class, entityColumn = "work_spec_id", parentColumn = ModelAuditLogEntry.CHANGE_KEY_ID, projection = {"progress"})
         public List<Data> progress;
         @ColumnInfo(name = "run_attempt_count")
         public int runAttemptCount;
         @ColumnInfo(name = "state")
         public WorkInfo.State state;
-        @Relation(entity = WorkTag.class, entityColumn = "work_spec_id", parentColumn = "id", projection = {"tag"})
+        @Relation(entity = WorkTag.class, entityColumn = "work_spec_id", parentColumn = ModelAuditLogEntry.CHANGE_KEY_ID, projection = {"tag"})
         public List<String> tags;
 
         public boolean equals(Object obj) {
@@ -232,7 +234,7 @@ public final class WorkSpec {
             }
             long scalb = z2 ? this.backoffDelayDuration * ((long) this.runAttemptCount) : (long) Math.scalb((float) this.backoffDelayDuration, this.runAttemptCount - 1);
             j2 = this.periodStartTime;
-            j = Math.min(18000000L, scalb);
+            j = Math.min((long) WorkRequest.MAX_BACKOFF_MILLIS, scalb);
         } else {
             long j3 = 0;
             if (isPeriodic()) {
@@ -313,7 +315,7 @@ public final class WorkSpec {
     }
 
     public void setBackoffDelayDuration(long j) {
-        if (j > 18000000) {
+        if (j > WorkRequest.MAX_BACKOFF_MILLIS) {
             Logger.get().warning(TAG, "Backoff delay duration exceeds maximum value", new Throwable[0]);
             j = 18000000;
         }
diff --git a/app/src/main/java/androidx/work/impl/model/WorkSpecDao_Impl.java b/app/src/main/java/androidx/work/impl/model/WorkSpecDao_Impl.java
index fbd1f93c07..48d7624df9 100644
--- a/app/src/main/java/androidx/work/impl/model/WorkSpecDao_Impl.java
+++ b/app/src/main/java/androidx/work/impl/model/WorkSpecDao_Impl.java
@@ -15,6 +15,7 @@ import androidx.work.Constraints;
 import androidx.work.Data;
 import androidx.work.WorkInfo;
 import androidx.work.impl.model.WorkSpec;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -127,7 +128,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             try {
                 Cursor query = DBUtil.query(WorkSpecDao_Impl.access$000(WorkSpecDao_Impl.this), this.val$_statement, true, null);
                 try {
-                    int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+                    int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                     int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
                     int columnIndexOrThrow3 = CursorUtil.getColumnIndexOrThrow(query, "output");
                     int columnIndexOrThrow4 = CursorUtil.getColumnIndexOrThrow(query, "run_attempt_count");
@@ -202,7 +203,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             try {
                 Cursor query = DBUtil.query(WorkSpecDao_Impl.access$000(WorkSpecDao_Impl.this), this.val$_statement, true, null);
                 try {
-                    int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+                    int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                     int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
                     int columnIndexOrThrow3 = CursorUtil.getColumnIndexOrThrow(query, "output");
                     int columnIndexOrThrow4 = CursorUtil.getColumnIndexOrThrow(query, "run_attempt_count");
@@ -277,7 +278,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             try {
                 Cursor query = DBUtil.query(WorkSpecDao_Impl.access$000(WorkSpecDao_Impl.this), this.val$_statement, true, null);
                 try {
-                    int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+                    int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                     int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
                     int columnIndexOrThrow3 = CursorUtil.getColumnIndexOrThrow(query, "output");
                     int columnIndexOrThrow4 = CursorUtil.getColumnIndexOrThrow(query, "run_attempt_count");
@@ -452,7 +453,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
         Set<String> keySet = arrayMap.keySet();
         if (!keySet.isEmpty()) {
             if (arrayMap.size() > 999) {
-                ArrayMap<String, ArrayList<Data>> arrayMap2 = new ArrayMap<>(999);
+                ArrayMap<String, ArrayList<Data>> arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                 int size = arrayMap.size();
                 int i2 = 0;
                 loop0:
@@ -464,7 +465,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
                         i++;
                         if (i == 999) {
                             __fetchRelationshipWorkProgressAsandroidxWorkData(arrayMap2);
-                            arrayMap2 = new ArrayMap<>(999);
+                            arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                         }
                     }
                     break loop0;
@@ -513,7 +514,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
         Set<String> keySet = arrayMap.keySet();
         if (!keySet.isEmpty()) {
             if (arrayMap.size() > 999) {
-                ArrayMap<String, ArrayList<String>> arrayMap2 = new ArrayMap<>(999);
+                ArrayMap<String, ArrayList<String>> arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                 int size = arrayMap.size();
                 int i2 = 0;
                 loop0:
@@ -525,7 +526,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
                         i++;
                         if (i == 999) {
                             __fetchRelationshipWorkTagAsjavaLangString(arrayMap2);
-                            arrayMap2 = new ArrayMap<>(999);
+                            arrayMap2 = new ArrayMap<>((int) RoomDatabase.MAX_BIND_PARAMETER_CNT);
                         }
                     }
                     break loop0;
@@ -615,7 +616,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             int columnIndexOrThrow6 = CursorUtil.getColumnIndexOrThrow(query, "trigger_content_update_delay");
             int columnIndexOrThrow7 = CursorUtil.getColumnIndexOrThrow(query, "trigger_max_content_delay");
             int columnIndexOrThrow8 = CursorUtil.getColumnIndexOrThrow(query, "content_uri_triggers");
-            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow10 = CursorUtil.getColumnIndexOrThrow(query, "state");
             int columnIndexOrThrow11 = CursorUtil.getColumnIndexOrThrow(query, "worker_class_name");
             int columnIndexOrThrow12 = CursorUtil.getColumnIndexOrThrow(query, "input_merger_class_name");
@@ -752,7 +753,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             int columnIndexOrThrow6 = CursorUtil.getColumnIndexOrThrow(query, "trigger_content_update_delay");
             int columnIndexOrThrow7 = CursorUtil.getColumnIndexOrThrow(query, "trigger_max_content_delay");
             int columnIndexOrThrow8 = CursorUtil.getColumnIndexOrThrow(query, "content_uri_triggers");
-            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow10 = CursorUtil.getColumnIndexOrThrow(query, "state");
             int columnIndexOrThrow11 = CursorUtil.getColumnIndexOrThrow(query, "worker_class_name");
             int columnIndexOrThrow12 = CursorUtil.getColumnIndexOrThrow(query, "input_merger_class_name");
@@ -877,7 +878,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             int columnIndexOrThrow6 = CursorUtil.getColumnIndexOrThrow(query, "trigger_content_update_delay");
             int columnIndexOrThrow7 = CursorUtil.getColumnIndexOrThrow(query, "trigger_max_content_delay");
             int columnIndexOrThrow8 = CursorUtil.getColumnIndexOrThrow(query, "content_uri_triggers");
-            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow10 = CursorUtil.getColumnIndexOrThrow(query, "state");
             int columnIndexOrThrow11 = CursorUtil.getColumnIndexOrThrow(query, "worker_class_name");
             int columnIndexOrThrow12 = CursorUtil.getColumnIndexOrThrow(query, "input_merger_class_name");
@@ -979,7 +980,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             int columnIndexOrThrow6 = CursorUtil.getColumnIndexOrThrow(query, "trigger_content_update_delay");
             int columnIndexOrThrow7 = CursorUtil.getColumnIndexOrThrow(query, "trigger_max_content_delay");
             int columnIndexOrThrow8 = CursorUtil.getColumnIndexOrThrow(query, "content_uri_triggers");
-            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow10 = CursorUtil.getColumnIndexOrThrow(query, "state");
             int columnIndexOrThrow11 = CursorUtil.getColumnIndexOrThrow(query, "worker_class_name");
             int columnIndexOrThrow12 = CursorUtil.getColumnIndexOrThrow(query, "input_merger_class_name");
@@ -1081,7 +1082,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             int columnIndexOrThrow6 = CursorUtil.getColumnIndexOrThrow(query, "trigger_content_update_delay");
             int columnIndexOrThrow7 = CursorUtil.getColumnIndexOrThrow(query, "trigger_max_content_delay");
             int columnIndexOrThrow8 = CursorUtil.getColumnIndexOrThrow(query, "content_uri_triggers");
-            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow10 = CursorUtil.getColumnIndexOrThrow(query, "state");
             int columnIndexOrThrow11 = CursorUtil.getColumnIndexOrThrow(query, "worker_class_name");
             int columnIndexOrThrow12 = CursorUtil.getColumnIndexOrThrow(query, "input_merger_class_name");
@@ -1255,7 +1256,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             int columnIndexOrThrow6 = CursorUtil.getColumnIndexOrThrow(query, "trigger_content_update_delay");
             int columnIndexOrThrow7 = CursorUtil.getColumnIndexOrThrow(query, "trigger_max_content_delay");
             int columnIndexOrThrow8 = CursorUtil.getColumnIndexOrThrow(query, "content_uri_triggers");
-            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow10 = CursorUtil.getColumnIndexOrThrow(query, "state");
             int columnIndexOrThrow11 = CursorUtil.getColumnIndexOrThrow(query, "worker_class_name");
             int columnIndexOrThrow12 = CursorUtil.getColumnIndexOrThrow(query, "input_merger_class_name");
@@ -1334,7 +1335,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
         this.__db.assertNotSuspendingTransaction();
         Cursor query = DBUtil.query(this.__db, acquire, false, null);
         try {
-            int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
             ArrayList arrayList = new ArrayList(query.getCount());
             while (query.moveToNext()) {
@@ -1382,7 +1383,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             int columnIndexOrThrow6 = CursorUtil.getColumnIndexOrThrow(query, "trigger_content_update_delay");
             int columnIndexOrThrow7 = CursorUtil.getColumnIndexOrThrow(query, "trigger_max_content_delay");
             int columnIndexOrThrow8 = CursorUtil.getColumnIndexOrThrow(query, "content_uri_triggers");
-            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, "id");
+            int columnIndexOrThrow9 = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
             int columnIndexOrThrow10 = CursorUtil.getColumnIndexOrThrow(query, "state");
             int columnIndexOrThrow11 = CursorUtil.getColumnIndexOrThrow(query, "worker_class_name");
             int columnIndexOrThrow12 = CursorUtil.getColumnIndexOrThrow(query, "input_merger_class_name");
@@ -1485,7 +1486,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
             ArrayList<Data> arrayList = null;
             Cursor query = DBUtil.query(this.__db, acquire, true, null);
             try {
-                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                 int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
                 int columnIndexOrThrow3 = CursorUtil.getColumnIndexOrThrow(query, "output");
                 int columnIndexOrThrow4 = CursorUtil.getColumnIndexOrThrow(query, "run_attempt_count");
@@ -1565,7 +1566,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
         try {
             Cursor query = DBUtil.query(this.__db, acquire, true, null);
             try {
-                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                 int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
                 int columnIndexOrThrow3 = CursorUtil.getColumnIndexOrThrow(query, "output");
                 int columnIndexOrThrow4 = CursorUtil.getColumnIndexOrThrow(query, "run_attempt_count");
@@ -1635,7 +1636,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
         try {
             Cursor query = DBUtil.query(this.__db, acquire, true, null);
             try {
-                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                 int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
                 int columnIndexOrThrow3 = CursorUtil.getColumnIndexOrThrow(query, "output");
                 int columnIndexOrThrow4 = CursorUtil.getColumnIndexOrThrow(query, "run_attempt_count");
@@ -1705,7 +1706,7 @@ public final class WorkSpecDao_Impl implements WorkSpecDao {
         try {
             Cursor query = DBUtil.query(this.__db, acquire, true, null);
             try {
-                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, "id");
+                int columnIndexOrThrow = CursorUtil.getColumnIndexOrThrow(query, ModelAuditLogEntry.CHANGE_KEY_ID);
                 int columnIndexOrThrow2 = CursorUtil.getColumnIndexOrThrow(query, "state");
                 int columnIndexOrThrow3 = CursorUtil.getColumnIndexOrThrow(query, "output");
                 int columnIndexOrThrow4 = CursorUtil.getColumnIndexOrThrow(query, "run_attempt_count");
diff --git a/app/src/main/java/androidx/work/impl/utils/EnqueueRunnable.java b/app/src/main/java/androidx/work/impl/utils/EnqueueRunnable.java
index 757d1cbff5..17ff142bf9 100644
--- a/app/src/main/java/androidx/work/impl/utils/EnqueueRunnable.java
+++ b/app/src/main/java/androidx/work/impl/utils/EnqueueRunnable.java
@@ -159,7 +159,7 @@ public class EnqueueRunnable implements Runnable {
                                 i = Build.VERSION.SDK_INT;
                                 if (i < 23 && i <= 25) {
                                     tryDelegateConstrainedWorkSpec(workSpec2);
-                                } else if (i <= 22 && usesScheduler(workManagerImpl2, "androidx.work.impl.background.gcm.GcmScheduler")) {
+                                } else if (i <= 22 && usesScheduler(workManagerImpl2, Schedulers.GCM_SCHEDULER)) {
                                     tryDelegateConstrainedWorkSpec(workSpec2);
                                 }
                                 if (workSpec2.state == WorkInfo.State.ENQUEUED) {
@@ -236,7 +236,7 @@ public class EnqueueRunnable implements Runnable {
         if (constraints.requiresBatteryNotLow() || constraints.requiresStorageNotLow()) {
             String str = workSpec.workerClassName;
             Data.Builder builder = new Data.Builder();
-            builder.putAll(workSpec.input).putString("androidx.work.impl.workers.ConstraintTrackingWorker.ARGUMENT_CLASS_NAME", str);
+            builder.putAll(workSpec.input).putString(ConstraintTrackingWorker.ARGUMENT_CLASS_NAME, str);
             workSpec.workerClassName = ConstraintTrackingWorker.class.getName();
             workSpec.input = builder.build();
         }
diff --git a/app/src/main/java/androidx/work/impl/utils/ForceStopRunnable.java b/app/src/main/java/androidx/work/impl/utils/ForceStopRunnable.java
index ce2620d6bf..4d9d1d6bfa 100644
--- a/app/src/main/java/androidx/work/impl/utils/ForceStopRunnable.java
+++ b/app/src/main/java/androidx/work/impl/utils/ForceStopRunnable.java
@@ -12,6 +12,7 @@ import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.app.NotificationCompat;
 import androidx.work.Logger;
 import androidx.work.WorkInfo;
 import androidx.work.impl.Schedulers;
@@ -40,7 +41,7 @@ public class ForceStopRunnable implements Runnable {
 
         @Override // android.content.BroadcastReceiver
         public void onReceive(Context context, Intent intent) {
-            if (intent != null && "ACTION_FORCE_STOP_RESCHEDULE".equals(intent.getAction())) {
+            if (intent != null && ForceStopRunnable.ACTION_FORCE_STOP_RESCHEDULE.equals(intent.getAction())) {
                 Logger.get().verbose(TAG, "Rescheduling alarm that keeps track of force-stops.", new Throwable[0]);
                 ForceStopRunnable.setAlarm(context);
             }
@@ -56,7 +57,7 @@ public class ForceStopRunnable implements Runnable {
     public static Intent getIntent(Context context) {
         Intent intent = new Intent();
         intent.setComponent(new ComponentName(context, BroadcastReceiver.class));
-        intent.setAction("ACTION_FORCE_STOP_RESCHEDULE");
+        intent.setAction(ACTION_FORCE_STOP_RESCHEDULE);
         return intent;
     }
 
@@ -65,7 +66,7 @@ public class ForceStopRunnable implements Runnable {
     }
 
     public static void setAlarm(Context context) {
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService("alarm");
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(NotificationCompat.CATEGORY_ALARM);
         PendingIntent pendingIntent = getPendingIntent(context, 134217728);
         long currentTimeMillis = System.currentTimeMillis() + TEN_YEARS;
         if (alarmManager != null) {
diff --git a/app/src/main/java/androidx/work/impl/utils/IdGenerator.java b/app/src/main/java/androidx/work/impl/utils/IdGenerator.java
index 14f77eb8c3..ad48a92139 100644
--- a/app/src/main/java/androidx/work/impl/utils/IdGenerator.java
+++ b/app/src/main/java/androidx/work/impl/utils/IdGenerator.java
@@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import androidx.work.impl.WorkDatabase;
+import androidx.work.impl.WorkDatabaseMigrations;
 import androidx.work.impl.model.Preference;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
 public class IdGenerator {
@@ -20,14 +21,14 @@ public class IdGenerator {
     }
 
     public static void migrateLegacyIdGenerator(@NonNull Context context, @NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences("androidx.work.util.id", 0);
-        if (sharedPreferences.contains("next_job_scheduler_id") || sharedPreferences.contains("next_job_scheduler_id")) {
-            int i = sharedPreferences.getInt("next_job_scheduler_id", 0);
-            int i2 = sharedPreferences.getInt("next_alarm_manager_id", 0);
+        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFERENCE_FILE_KEY, 0);
+        if (sharedPreferences.contains(NEXT_JOB_SCHEDULER_ID_KEY) || sharedPreferences.contains(NEXT_JOB_SCHEDULER_ID_KEY)) {
+            int i = sharedPreferences.getInt(NEXT_JOB_SCHEDULER_ID_KEY, 0);
+            int i2 = sharedPreferences.getInt(NEXT_ALARM_MANAGER_ID_KEY, 0);
             supportSQLiteDatabase.beginTransaction();
             try {
-                supportSQLiteDatabase.execSQL("INSERT OR REPLACE INTO `Preference` (`key`, `long_value`) VALUES (@key, @long_value)", new Object[]{"next_job_scheduler_id", Integer.valueOf(i)});
-                supportSQLiteDatabase.execSQL("INSERT OR REPLACE INTO `Preference` (`key`, `long_value`) VALUES (@key, @long_value)", new Object[]{"next_alarm_manager_id", Integer.valueOf(i2)});
+                supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.INSERT_PREFERENCE, new Object[]{NEXT_JOB_SCHEDULER_ID_KEY, Integer.valueOf(i)});
+                supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.INSERT_PREFERENCE, new Object[]{NEXT_ALARM_MANAGER_ID_KEY, Integer.valueOf(i2)});
                 sharedPreferences.edit().clear().apply();
                 supportSQLiteDatabase.setTransactionSuccessful();
             } finally {
@@ -60,20 +61,20 @@ public class IdGenerator {
     public int nextAlarmManagerId() {
         int nextId;
         synchronized (IdGenerator.class) {
-            nextId = nextId("next_alarm_manager_id");
+            nextId = nextId(NEXT_ALARM_MANAGER_ID_KEY);
         }
         return nextId;
     }
 
     public int nextJobSchedulerIdWithRange(int i, int i2) {
         synchronized (IdGenerator.class) {
-            int nextId = nextId("next_job_scheduler_id");
+            int nextId = nextId(NEXT_JOB_SCHEDULER_ID_KEY);
             if (nextId >= i) {
                 if (nextId <= i2) {
                     i = nextId;
                 }
             }
-            update("next_job_scheduler_id", i + 1);
+            update(NEXT_JOB_SCHEDULER_ID_KEY, i + 1);
         }
         return i;
     }
diff --git a/app/src/main/java/androidx/work/impl/utils/PreferenceUtils.java b/app/src/main/java/androidx/work/impl/utils/PreferenceUtils.java
index 6f289ee929..1b9da1c647 100644
--- a/app/src/main/java/androidx/work/impl/utils/PreferenceUtils.java
+++ b/app/src/main/java/androidx/work/impl/utils/PreferenceUtils.java
@@ -9,6 +9,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Transformations;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import androidx.work.impl.WorkDatabase;
+import androidx.work.impl.WorkDatabaseMigrations;
 import androidx.work.impl.model.Preference;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
 public class PreferenceUtils {
@@ -32,17 +33,17 @@ public class PreferenceUtils {
     }
 
     public static void migrateLegacyPreferences(@NonNull Context context, @NonNull SupportSQLiteDatabase supportSQLiteDatabase) {
-        SharedPreferences sharedPreferences = context.getSharedPreferences("androidx.work.util.preferences", 0);
-        if (sharedPreferences.contains("reschedule_needed") || sharedPreferences.contains("last_cancel_all_time_ms")) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFERENCES_FILE_NAME, 0);
+        if (sharedPreferences.contains(KEY_RESCHEDULE_NEEDED) || sharedPreferences.contains(KEY_LAST_CANCEL_ALL_TIME_MS)) {
             long j = 0;
-            long j2 = sharedPreferences.getLong("last_cancel_all_time_ms", 0);
-            if (sharedPreferences.getBoolean("reschedule_needed", false)) {
+            long j2 = sharedPreferences.getLong(KEY_LAST_CANCEL_ALL_TIME_MS, 0);
+            if (sharedPreferences.getBoolean(KEY_RESCHEDULE_NEEDED, false)) {
                 j = 1;
             }
             supportSQLiteDatabase.beginTransaction();
             try {
-                supportSQLiteDatabase.execSQL("INSERT OR REPLACE INTO `Preference` (`key`, `long_value`) VALUES (@key, @long_value)", new Object[]{"last_cancel_all_time_ms", Long.valueOf(j2)});
-                supportSQLiteDatabase.execSQL("INSERT OR REPLACE INTO `Preference` (`key`, `long_value`) VALUES (@key, @long_value)", new Object[]{"reschedule_needed", Long.valueOf(j)});
+                supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.INSERT_PREFERENCE, new Object[]{KEY_LAST_CANCEL_ALL_TIME_MS, Long.valueOf(j2)});
+                supportSQLiteDatabase.execSQL(WorkDatabaseMigrations.INSERT_PREFERENCE, new Object[]{KEY_RESCHEDULE_NEEDED, Long.valueOf(j)});
                 sharedPreferences.edit().clear().apply();
                 supportSQLiteDatabase.setTransactionSuccessful();
             } finally {
@@ -52,7 +53,7 @@ public class PreferenceUtils {
     }
 
     public long getLastCancelAllTimeMillis() {
-        Long longValue = this.mWorkDatabase.preferenceDao().getLongValue("last_cancel_all_time_ms");
+        Long longValue = this.mWorkDatabase.preferenceDao().getLongValue(KEY_LAST_CANCEL_ALL_TIME_MS);
         if (longValue != null) {
             return longValue.longValue();
         }
@@ -61,19 +62,19 @@ public class PreferenceUtils {
 
     @NonNull
     public LiveData<Long> getLastCancelAllTimeMillisLiveData() {
-        return Transformations.map(this.mWorkDatabase.preferenceDao().getObservableLongValue("last_cancel_all_time_ms"), new AnonymousClass1());
+        return Transformations.map(this.mWorkDatabase.preferenceDao().getObservableLongValue(KEY_LAST_CANCEL_ALL_TIME_MS), new AnonymousClass1());
     }
 
     public boolean getNeedsReschedule() {
-        Long longValue = this.mWorkDatabase.preferenceDao().getLongValue("reschedule_needed");
+        Long longValue = this.mWorkDatabase.preferenceDao().getLongValue(KEY_RESCHEDULE_NEEDED);
         return longValue != null && longValue.longValue() == 1;
     }
 
     public void setLastCancelAllTimeMillis(long j) {
-        this.mWorkDatabase.preferenceDao().insertPreference(new Preference("last_cancel_all_time_ms", j));
+        this.mWorkDatabase.preferenceDao().insertPreference(new Preference(KEY_LAST_CANCEL_ALL_TIME_MS, j));
     }
 
     public void setNeedsReschedule(boolean z2) {
-        this.mWorkDatabase.preferenceDao().insertPreference(new Preference("reschedule_needed", z2));
+        this.mWorkDatabase.preferenceDao().insertPreference(new Preference(KEY_RESCHEDULE_NEEDED, z2));
     }
 }
diff --git a/app/src/main/java/androidx/work/impl/utils/WorkTimer.java b/app/src/main/java/androidx/work/impl/utils/WorkTimer.java
index 0c44d97e2a..5ec2a63ec3 100644
--- a/app/src/main/java/androidx/work/impl/utils/WorkTimer.java
+++ b/app/src/main/java/androidx/work/impl/utils/WorkTimer.java
@@ -63,7 +63,7 @@ public class WorkTimer {
                         remove.onTimeLimitExceeded(this.mWorkSpecId);
                     }
                 } else {
-                    Logger.get().debug("WrkTimerRunnable", String.format("Timer with %s is already marked as complete.", this.mWorkSpecId), new Throwable[0]);
+                    Logger.get().debug(TAG, String.format("Timer with %s is already marked as complete.", this.mWorkSpecId), new Throwable[0]);
                 }
             }
         }
diff --git a/app/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java b/app/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java
index 1403870915..c11ffa69c5 100644
--- a/app/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java
+++ b/app/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java
@@ -124,7 +124,7 @@ public class ConstraintTrackingWorker extends ListenableWorker implements WorkCo
     }
 
     public void setupAndRunConstraintTrackingWork() {
-        String string = getInputData().getString("androidx.work.impl.workers.ConstraintTrackingWorker.ARGUMENT_CLASS_NAME");
+        String string = getInputData().getString(ARGUMENT_CLASS_NAME);
         if (TextUtils.isEmpty(string)) {
             Logger.get().error(TAG, "No worker to delegate to.", new Throwable[0]);
             setFutureFailed();
diff --git a/app/src/main/java/b0/a/a/b.java b/app/src/main/java/b0/a/a/b.java
index 9bd6b6ada8..ff5588be8c 100644
--- a/app/src/main/java/b0/a/a/b.java
+++ b/app/src/main/java/b0/a/a/b.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import androidx.core.app.NotificationCompat;
 import b0.a.a.e.a;
 import d0.l;
 import d0.w.g.c;
@@ -107,7 +108,7 @@ public final class b extends k implements Function2<CoroutineScope, Continuation
             sb2.append(str3);
             sb.append(sb2.toString());
             m.checkParameterIsNotNull(context, "context");
-            m.checkParameterIsNotNull(uri, "uri");
+            m.checkParameterIsNotNull(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             ContentResolver contentResolver = context.getContentResolver();
             Cursor query = contentResolver.query(uri, new String[]{"_display_name"}, null, null, null);
             if (query == null) {
diff --git a/app/src/main/java/b0/a/a/e/c.java b/app/src/main/java/b0/a/a/e/c.java
index 1750a8d046..bae567178b 100644
--- a/app/src/main/java/b0/a/a/e/c.java
+++ b/app/src/main/java/b0/a/a/e/c.java
@@ -72,7 +72,7 @@ public final class c implements b {
         m.checkExpressionValueIsNotNull(decodeFile, "BitmapFactory.Options().…absolutePath, this)\n    }");
         m.checkParameterIsNotNull(file, "imageFile");
         m.checkParameterIsNotNull(decodeFile, "bitmap");
-        int attributeInt = new ExifInterface(file.getAbsolutePath()).getAttributeInt("Orientation", 0);
+        int attributeInt = new ExifInterface(file.getAbsolutePath()).getAttributeInt(androidx.exifinterface.media.ExifInterface.TAG_ORIENTATION, 0);
         Matrix matrix = new Matrix();
         if (attributeInt == 3) {
             matrix.postRotate(180.0f);
diff --git a/app/src/main/java/c/a/a/a.java b/app/src/main/java/c/a/a/a.java
index 14623e94da..b46f1c2d0b 100644
--- a/app/src/main/java/c/a/a/a.java
+++ b/app/src/main/java/c/a/a/a.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.u;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.dialogs.ImageUploadDialog;
 import com.discord.stores.StoreStream;
@@ -110,41 +111,41 @@ public final class a extends AppDialog {
         public u invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362533;
-            ImageView imageView = (ImageView) view2.findViewById(2131362533);
+            int i2 = R.id.chat_input_upload_too_large_center_file;
+            ImageView imageView = (ImageView) view2.findViewById(R.id.chat_input_upload_too_large_center_file);
             if (imageView != null) {
-                i2 = 2131363747;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363747);
+                i2 = R.id.image_upload_failed_cancel;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.image_upload_failed_cancel);
                 if (materialButton != null) {
-                    i2 = 2131363748;
-                    SwitchMaterial switchMaterial = (SwitchMaterial) view2.findViewById(2131363748);
+                    i2 = R.id.image_upload_failed_compression_settings_checkbox;
+                    SwitchMaterial switchMaterial = (SwitchMaterial) view2.findViewById(R.id.image_upload_failed_compression_settings_checkbox);
                     if (switchMaterial != null) {
-                        i2 = 2131363749;
-                        RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363749);
+                        i2 = R.id.image_upload_failed_compression_settings_container;
+                        RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(R.id.image_upload_failed_compression_settings_container);
                         if (relativeLayout != null) {
-                            i2 = 2131363750;
-                            View findViewById = view2.findViewById(2131363750);
+                            i2 = R.id.image_upload_failed_divider;
+                            View findViewById = view2.findViewById(R.id.image_upload_failed_divider);
                             if (findViewById != null) {
-                                i2 = 2131363751;
-                                MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363751);
+                                i2 = R.id.image_upload_failed_nitro;
+                                MaterialButton materialButton2 = (MaterialButton) view2.findViewById(R.id.image_upload_failed_nitro);
                                 if (materialButton2 != null) {
-                                    i2 = 2131363752;
-                                    RelativeLayout relativeLayout2 = (RelativeLayout) view2.findViewById(2131363752);
+                                    i2 = R.id.image_upload_failed_nitro_wrapper;
+                                    RelativeLayout relativeLayout2 = (RelativeLayout) view2.findViewById(R.id.image_upload_failed_nitro_wrapper);
                                     if (relativeLayout2 != null) {
-                                        i2 = 2131363753;
-                                        MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131363753);
+                                        i2 = R.id.image_upload_failed_okay;
+                                        MaterialButton materialButton3 = (MaterialButton) view2.findViewById(R.id.image_upload_failed_okay);
                                         if (materialButton3 != null) {
-                                            i2 = 2131363754;
-                                            MaterialButton materialButton4 = (MaterialButton) view2.findViewById(2131363754);
+                                            i2 = R.id.image_upload_failed_send_compress;
+                                            MaterialButton materialButton4 = (MaterialButton) view2.findViewById(R.id.image_upload_failed_send_compress);
                                             if (materialButton4 != null) {
-                                                i2 = 2131363755;
-                                                TextView textView = (TextView) view2.findViewById(2131363755);
+                                                i2 = R.id.image_upload_failed_text;
+                                                TextView textView = (TextView) view2.findViewById(R.id.image_upload_failed_text);
                                                 if (textView != null) {
-                                                    i2 = 2131364973;
-                                                    TextView textView2 = (TextView) view2.findViewById(2131364973);
+                                                    i2 = R.id.setting_label;
+                                                    TextView textView2 = (TextView) view2.findViewById(R.id.setting_label);
                                                     if (textView2 != null) {
-                                                        i2 = 2131364974;
-                                                        TextView textView3 = (TextView) view2.findViewById(2131364974);
+                                                        i2 = R.id.setting_subtext;
+                                                        TextView textView3 = (TextView) view2.findViewById(R.id.setting_subtext);
                                                         if (textView3 != null) {
                                                             return new u((RelativeLayout) view2, imageView, materialButton, switchMaterial, relativeLayout, findViewById, materialButton2, relativeLayout2, materialButton3, materialButton4, textView, textView2, textView3);
                                                         }
@@ -174,7 +175,7 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131558531);
+        super(R.layout.image_upload_failed_dialog);
     }
 
     public final u g() {
@@ -191,7 +192,7 @@ public final class a extends AppDialog {
         boolean z2 = getArgumentsOrDefault().getBoolean("PARAM_IS_USER_PREMIUM");
         boolean z3 = this.l != null && getArgumentsOrDefault().getBoolean("PARAM_CAN_COMPRESS");
         int i3 = 8;
-        int i4 = i2 != 8 ? i2 != 50 ? i2 != 100 ? i2 != 200 ? 0 : 2131888545 : 2131888544 : 2131888543 : 2131888546;
+        int i4 = i2 != 8 ? i2 != 50 ? i2 != 100 ? i2 != 200 ? 0 : R.string.file_upload_limit_staff : R.string.file_upload_limit_premium_tier_2 : R.string.file_upload_limit_premium_tier_1 : R.string.file_upload_limit_standard;
         MaterialButton materialButton = g().i;
         m.checkNotNullExpressionValue(materialButton, "binding.imageUploadFailedSendCompress");
         materialButton.setVisibility(z3 ? 0 : 8);
@@ -233,7 +234,7 @@ public final class a extends AppDialog {
                 Object[] objArr = new Object[1];
                 Context context2 = getContext();
                 objArr[0] = context2 != null ? c.a.l.b.h(context2, i4, new Object[0], null, 4) : null;
-                charSequence = c.a.l.b.h(context, 2131894558, objArr, null, 4);
+                charSequence = c.a.l.b.h(context, R.string.upload_area_too_large_help, objArr, null, 4);
             }
         } else {
             Context context3 = getContext();
@@ -241,7 +242,7 @@ public final class a extends AppDialog {
                 Object[] objArr2 = new Object[1];
                 Context context4 = getContext();
                 objArr2[0] = context4 != null ? c.a.l.b.h(context4, i4, new Object[0], null, 4) : null;
-                charSequence = c.a.l.b.h(context3, 2131894559, objArr2, null, 4);
+                charSequence = c.a.l.b.h(context3, R.string.upload_area_too_large_help_mobile, objArr2, null, 4);
             }
         }
         textView.setText(charSequence);
diff --git a/app/src/main/java/c/a/a/b/a.java b/app/src/main/java/c/a/a/b/a.java
index ca8b3f044a..11dee5afe0 100644
--- a/app/src/main/java/c/a/a/b/a.java
+++ b/app/src/main/java/c/a/a/b/a.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.o;
 import c.a.j.o1;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewModel;
 import com.discord.models.user.User;
@@ -62,10 +63,10 @@ public final class a extends AppDialog {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(h.l, "User Profile", h.k, 2, null, 8, null), false, 1, null), h, null, 2, null), f.class, (Context) null, (Function1) null, new h(h), (Function0) null, (Function0) null, new g(h), 54, (Object) null);
             } else if (i == 1) {
                 KProperty[] kPropertyArr2 = a.i;
-                ((a) this.j).h().removeRelationship(2131894673);
+                ((a) this.j).h().removeRelationship(R.string.user_has_been_unblocked);
             } else if (i == 2) {
                 KProperty[] kPropertyArr3 = a.i;
-                ((a) this.j).h().removeRelationship(2131888825);
+                ((a) this.j).h().removeRelationship(R.string.friend_has_been_deleted);
             } else {
                 throw null;
             }
@@ -92,20 +93,20 @@ public final class a extends AppDialog {
         public o1 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131365644;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131365644);
+            int i2 = R.id.user_actions_dialog_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(R.id.user_actions_dialog_avatar);
             if (simpleDraweeView != null) {
-                i2 = 2131365645;
-                TextView textView = (TextView) view2.findViewById(2131365645);
+                i2 = R.id.user_actions_dialog_block_item;
+                TextView textView = (TextView) view2.findViewById(R.id.user_actions_dialog_block_item);
                 if (textView != null) {
-                    i2 = 2131365646;
-                    TextView textView2 = (TextView) view2.findViewById(2131365646);
+                    i2 = R.id.user_actions_dialog_remove_friend_item;
+                    TextView textView2 = (TextView) view2.findViewById(R.id.user_actions_dialog_remove_friend_item);
                     if (textView2 != null) {
-                        i2 = 2131365647;
-                        TextView textView3 = (TextView) view2.findViewById(2131365647);
+                        i2 = R.id.user_actions_dialog_unblock_item;
+                        TextView textView3 = (TextView) view2.findViewById(R.id.user_actions_dialog_unblock_item);
                         if (textView3 != null) {
-                            i2 = 2131365648;
-                            TextView textView4 = (TextView) view2.findViewById(2131365648);
+                            i2 = R.id.user_actions_dialog_user_name;
+                            TextView textView4 = (TextView) view2.findViewById(R.id.user_actions_dialog_user_name);
                             if (textView4 != null) {
                                 return new o1((LinearLayout) view2, simpleDraweeView, textView, textView2, textView3, textView4);
                             }
@@ -162,7 +163,7 @@ public final class a extends AppDialog {
             String str = aVar2.b;
             Context requireContext = aVar3.requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, str, requireContext, 2130968932, 2130969328, 2131427362, 2130968989, 2130969327, 2131427362));
+            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, str, requireContext, R.attr.colorHeaderPrimary, R.attr.font_primary_semibold, R.integer.uikit_textsize_large_sp, R.attr.colorTextMuted, R.attr.font_primary_normal, R.integer.uikit_textsize_large_sp));
             TextView textView2 = aVar3.g().f138c;
             m.checkNotNullExpressionValue(textView2, "binding.userActionsDialogBlockItem");
             int i = 8;
@@ -227,7 +228,7 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131558722);
+        super(R.layout.user_actions_dialog);
         h hVar = new h(this);
         h0 h0Var = new h0(this);
         this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(f.class), new m(4, h0Var), new j0(hVar));
diff --git a/app/src/main/java/c/a/a/b/b.java b/app/src/main/java/c/a/a/b/b.java
index 1c2d519991..05dd662191 100644
--- a/app/src/main/java/c/a/a/b/b.java
+++ b/app/src/main/java/c/a/a/b/b.java
@@ -1,6 +1,7 @@
 package c.a.a.b;
 
 import c.a.a.b.f;
+import com.discord.R;
 import com.discord.models.domain.ModelUserRelationship;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
@@ -29,7 +30,7 @@ public final class b extends o implements Function1<f.c, Unit> {
         Objects.requireNonNull(fVar);
         User user = cVar2.a;
         if (user == null) {
-            fVar.j.j.onNext(new f.b.a(2131888073));
+            fVar.j.j.onNext(new f.b.a(R.string.default_failure_to_perform_action_message));
         } else {
             int type = ModelUserRelationship.getType(cVar2.b);
             boolean z2 = type != 2;
diff --git a/app/src/main/java/c/a/a/b/f.java b/app/src/main/java/c/a/a/b/f.java
index ccea5ee17a..4afc396aa6 100644
--- a/app/src/main/java/c/a/a/b/f.java
+++ b/app/src/main/java/c/a/a/b/f.java
@@ -2,6 +2,7 @@ package c.a.a.b;
 
 import android.content.Context;
 import androidx.annotation.StringRes;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
@@ -246,7 +247,7 @@ public final class f extends AppViewModel<d> {
         public Unit invoke(Error error) {
             m.checkNotNullParameter(error, "it");
             PublishSubject<b> publishSubject = this.this$0.j;
-            publishSubject.j.onNext(new b.a(2131888073));
+            publishSubject.j.onNext(new b.a(R.string.default_failure_to_perform_action_message));
             return Unit.a;
         }
     }
diff --git a/app/src/main/java/c/a/a/b/g.java b/app/src/main/java/c/a/a/b/g.java
index 2c259ec195..653216ef13 100644
--- a/app/src/main/java/c/a/a/b/g.java
+++ b/app/src/main/java/c/a/a/b/g.java
@@ -1,6 +1,7 @@
 package c.a.a.b;
 
 import c.a.a.b.f;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -20,7 +21,7 @@ public final class g extends o implements Function1<Void, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(Void r3) {
         PublishSubject<f.b> publishSubject = this.this$0.j;
-        publishSubject.j.onNext(new f.b.C0003b(2131894672));
+        publishSubject.j.onNext(new f.b.C0003b(R.string.user_has_been_blocked));
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a/b/h.java b/app/src/main/java/c/a/a/b/h.java
index 9e6674dcf1..6df1782af5 100644
--- a/app/src/main/java/c/a/a/b/h.java
+++ b/app/src/main/java/c/a/a/b/h.java
@@ -1,6 +1,7 @@
 package c.a.a.b;
 
 import c.a.a.b.f;
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -23,7 +24,7 @@ public final class h extends o implements Function1<Error, Unit> {
     public Unit invoke(Error error) {
         m.checkNotNullParameter(error, "it");
         PublishSubject<f.b> publishSubject = this.this$0.j;
-        publishSubject.j.onNext(new f.b.a(2131888073));
+        publishSubject.j.onNext(new f.b.a(R.string.default_failure_to_perform_action_message));
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a/c/a.java b/app/src/main/java/c/a/a/c/a.java
index b3cb7a5dec..4fdb0edc05 100644
--- a/app/src/main/java/c/a/a/c/a.java
+++ b/app/src/main/java/c/a/a/c/a.java
@@ -12,6 +12,7 @@ import c.a.a.c.f;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.a.j.w0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewFlipper;
 import com.discord.app.AppViewModel;
@@ -112,29 +113,29 @@ public final class a extends AppDialog {
         public w0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131361898;
-            ProgressBar progressBar = (ProgressBar) view2.findViewById(2131361898);
+            int i2 = R.id.active_subscription_progress;
+            ProgressBar progressBar = (ProgressBar) view2.findViewById(R.id.active_subscription_progress);
             if (progressBar != null) {
-                i2 = 2131364250;
-                LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364250);
+                i2 = R.id.notice_header_container;
+                LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.notice_header_container);
                 if (linearLayout != null) {
-                    i2 = 2131364483;
-                    TextView textView = (TextView) view2.findViewById(2131364483);
+                    i2 = R.id.premium_guild_subscription_cancel_body;
+                    TextView textView = (TextView) view2.findViewById(R.id.premium_guild_subscription_cancel_body);
                     if (textView != null) {
-                        i2 = 2131364484;
-                        LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364484);
+                        i2 = R.id.premium_guild_subscription_cancel_confirm;
+                        LoadingButton loadingButton = (LoadingButton) view2.findViewById(R.id.premium_guild_subscription_cancel_confirm);
                         if (loadingButton != null) {
-                            i2 = 2131364485;
-                            TextView textView2 = (TextView) view2.findViewById(2131364485);
+                            i2 = R.id.premium_guild_subscription_cancel_error;
+                            TextView textView2 = (TextView) view2.findViewById(R.id.premium_guild_subscription_cancel_error);
                             if (textView2 != null) {
-                                i2 = 2131364486;
-                                AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364486);
+                                i2 = R.id.premium_guild_subscription_cancel_flipper;
+                                AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(R.id.premium_guild_subscription_cancel_flipper);
                                 if (appViewFlipper != null) {
-                                    i2 = 2131364487;
-                                    TextView textView3 = (TextView) view2.findViewById(2131364487);
+                                    i2 = R.id.premium_guild_subscription_cancel_header;
+                                    TextView textView3 = (TextView) view2.findViewById(R.id.premium_guild_subscription_cancel_header);
                                     if (textView3 != null) {
-                                        i2 = 2131364488;
-                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364488);
+                                        i2 = R.id.premium_guild_subscription_cancel_nevermind;
+                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.premium_guild_subscription_cancel_nevermind);
                                         if (materialButton != null) {
                                             return new w0((LinearLayout) view2, progressBar, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, materialButton);
                                         }
@@ -195,26 +196,26 @@ public final class a extends AppDialog {
                 if (eVar.g) {
                     TextView textView2 = aVar.g().b;
                     m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionCancelBody");
-                    c.a.l.b.n(textView2, 2131892419, new Object[]{renderUtcDate$default}, null, 4);
+                    c.a.l.b.n(textView2, R.string.premium_guild_subscription_cancel_body_inventory, new Object[]{renderUtcDate$default}, null, 4);
                 } else {
                     TextView textView3 = aVar.g().b;
                     m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionCancelBody");
-                    c.a.l.b.n(textView3, 2131892418, new Object[]{renderUtcDate$default}, null, 4);
+                    c.a.l.b.n(textView3, R.string.premium_guild_subscription_cancel_body_guild, new Object[]{renderUtcDate$default}, null, 4);
                 }
-                aVar.g().f182c.setBackgroundColor(ColorCompat.getColor(aVar, 2131100329));
+                aVar.g().f182c.setBackgroundColor(ColorCompat.getColor(aVar, (int) R.color.status_red_500));
             } else if (cVar2 instanceof f.c.b) {
                 TextView textView4 = aVar.g().f;
                 m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionCancelHeader");
-                textView4.setText(aVar.getString(2131892430));
+                textView4.setText(aVar.getString(R.string.premium_guild_subscription_cancel_title_pending_cancellation));
                 TextView textView5 = aVar.g().b;
                 m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionCancelBody");
                 TimeUtils timeUtils2 = TimeUtils.INSTANCE;
                 String currentPeriodEnd2 = ((f.c.b) cVar2).f.getCurrentPeriodEnd();
                 Context requireContext2 = aVar.requireContext();
                 m.checkNotNullExpressionValue(requireContext2, "requireContext()");
-                c.a.l.b.n(textView5, 2131892431, new Object[]{TimeUtils.renderUtcDate$default(timeUtils2, currentPeriodEnd2, requireContext2, (String) null, (DateFormat) null, 0, 28, (Object) null)}, null, 4);
-                aVar.g().f182c.setText(aVar.getString(2131892004));
-                aVar.g().f182c.setBackgroundColor(ColorCompat.getThemedColor(aVar, 2130969008));
+                c.a.l.b.n(textView5, R.string.premium_guild_subscription_confirm_body, new Object[]{TimeUtils.renderUtcDate$default(timeUtils2, currentPeriodEnd2, requireContext2, (String) null, (DateFormat) null, 0, 28, (Object) null)}, null, 4);
+                aVar.g().f182c.setText(aVar.getString(R.string.okay));
+                aVar.g().f182c.setBackgroundColor(ColorCompat.getThemedColor(aVar, (int) R.attr.color_brand_500));
             } else if (cVar2 instanceof f.c.C0008c) {
                 Integer num = ((f.c.C0008c) cVar2).f;
                 if (num != null) {
@@ -266,7 +267,7 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131558650);
+        super(R.layout.premium_guild_subscription_cancel_dialog);
         f fVar = new f(this);
         h0 h0Var = new h0(this);
         this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(f.class), new m(2, h0Var), new j0(fVar));
diff --git a/app/src/main/java/c/a/a/c/b.java b/app/src/main/java/c/a/a/c/b.java
index bfd54cc5d1..b2f421b049 100644
--- a/app/src/main/java/c/a/a/c/b.java
+++ b/app/src/main/java/c/a/a/c/b.java
@@ -12,6 +12,7 @@ import c.a.a.c.k;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.a.j.x0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewFlipper;
 import com.discord.app.AppViewModel;
@@ -112,29 +113,29 @@ public final class b extends AppDialog {
         public x0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364250;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364250);
+            int i2 = R.id.notice_header_container;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.notice_header_container);
             if (linearLayout != null) {
-                i2 = 2131364489;
-                TextView textView = (TextView) view2.findViewById(2131364489);
+                i2 = R.id.premium_guild_subscription_uncancel_body;
+                TextView textView = (TextView) view2.findViewById(R.id.premium_guild_subscription_uncancel_body);
                 if (textView != null) {
-                    i2 = 2131364490;
-                    LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364490);
+                    i2 = R.id.premium_guild_subscription_uncancel_confirm;
+                    LoadingButton loadingButton = (LoadingButton) view2.findViewById(R.id.premium_guild_subscription_uncancel_confirm);
                     if (loadingButton != null) {
-                        i2 = 2131364491;
-                        TextView textView2 = (TextView) view2.findViewById(2131364491);
+                        i2 = R.id.premium_guild_subscription_uncancel_error;
+                        TextView textView2 = (TextView) view2.findViewById(R.id.premium_guild_subscription_uncancel_error);
                         if (textView2 != null) {
-                            i2 = 2131364492;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364492);
+                            i2 = R.id.premium_guild_subscription_uncancel_flipper;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(R.id.premium_guild_subscription_uncancel_flipper);
                             if (appViewFlipper != null) {
-                                i2 = 2131364493;
-                                TextView textView3 = (TextView) view2.findViewById(2131364493);
+                                i2 = R.id.premium_guild_subscription_uncancel_header;
+                                TextView textView3 = (TextView) view2.findViewById(R.id.premium_guild_subscription_uncancel_header);
                                 if (textView3 != null) {
-                                    i2 = 2131364494;
-                                    ImageView imageView = (ImageView) view2.findViewById(2131364494);
+                                    i2 = R.id.premium_guild_subscription_uncancel_image;
+                                    ImageView imageView = (ImageView) view2.findViewById(R.id.premium_guild_subscription_uncancel_image);
                                     if (imageView != null) {
-                                        i2 = 2131364495;
-                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364495);
+                                        i2 = R.id.premium_guild_subscription_uncancel_nevermind;
+                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.premium_guild_subscription_uncancel_nevermind);
                                         if (materialButton != null) {
                                             return new x0((LinearLayout) view2, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, imageView, materialButton);
                                         }
@@ -195,21 +196,21 @@ public final class b extends AppDialog {
                 if (z3) {
                     TextView textView2 = bVar.g().f;
                     m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionUncancelHeader");
-                    textView2.setText(bVar.getString(2131892454));
+                    textView2.setText(bVar.getString(R.string.premium_guild_subscription_inventory_uncancel_title_mobile));
                     TextView textView3 = bVar.g().b;
                     m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionUncancelBody");
-                    textView3.setText(bVar.getString(2131892451));
+                    textView3.setText(bVar.getString(R.string.premium_guild_subscription_inventory_uncancel_description));
                 } else if (m.areEqual(cVar2, k.c.d.a)) {
                     TextView textView4 = bVar.g().f;
                     m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionUncancelHeader");
-                    textView4.setText(bVar.getString(2131892450));
+                    textView4.setText(bVar.getString(R.string.premium_guild_subscription_inventory_uncancel_confirm_title));
                     ImageView imageView = bVar.g().g;
                     m.checkNotNullExpressionValue(imageView, "binding.premiumGuildSubscriptionUncancelImage");
                     imageView.setVisibility(0);
                     TextView textView5 = bVar.g().b;
                     m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionUncancelBody");
-                    textView5.setText(bVar.getString(2131892449));
-                    bVar.g().f186c.setText(bVar.getString(2131892004));
+                    textView5.setText(bVar.getString(R.string.premium_guild_subscription_inventory_uncancel_confirm_description));
+                    bVar.g().f186c.setText(bVar.getString(R.string.okay));
                 } else if (cVar2 instanceof k.c.a) {
                     Integer num = ((k.c.a) cVar2).a;
                     if (num != null) {
@@ -262,7 +263,7 @@ public final class b extends AppDialog {
     }
 
     public b() {
-        super(2131558651);
+        super(R.layout.premium_guild_subscription_uncancel_dialog);
         f fVar = new f(this);
         h0 h0Var = new h0(this);
         this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(k.class), new m(3, h0Var), new j0(fVar));
diff --git a/app/src/main/java/c/a/a/c/c.java b/app/src/main/java/c/a/a/c/c.java
index 88ce0320a0..90ba38fc9f 100644
--- a/app/src/main/java/c/a/a/c/c.java
+++ b/app/src/main/java/c/a/a/c/c.java
@@ -10,12 +10,14 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.v0;
 import com.airbnb.lottie.LottieAnimationView;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.animations.LottieAnimationUtilsKt;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.google.android.material.button.MaterialButton;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
@@ -41,8 +43,8 @@ public final class c extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(function0, "dismissListener");
-            CharSequence h = z2 ? c.a.l.b.h(context, 2131890198, new Object[0], null, 4) : c.a.l.b.h(context, 2131890181, new Object[0], null, 4);
-            CharSequence h2 = str == null ? c.a.l.b.h(context, 2131890183, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755187, i, Integer.valueOf(i))}, null, 4) : z2 ? c.a.l.b.h(context, 2131890199, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755188, i, Integer.valueOf(i))}, null, 4) : c.a.l.b.h(context, 2131890182, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755185, i, Integer.valueOf(i))}, null, 4);
+            CharSequence h = z2 ? c.a.l.b.h(context, R.string.guild_subscription_purchase_modal_transferred_description_mobile1, new Object[0], null, 4) : c.a.l.b.h(context, R.string.guild_subscription_purchase_modal_activated_description_mobile1, new Object[0], null, 4);
+            CharSequence h2 = str == null ? c.a.l.b.h(context, R.string.guild_subscription_purchase_modal_activated_description_no_application, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_subscription_purchase_modal_activated_description_no_application_guildSubscriptionQuantity, i, Integer.valueOf(i))}, null, 4) : z2 ? c.a.l.b.h(context, R.string.guild_subscription_purchase_modal_transferred_description_mobile2, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_subscription_purchase_modal_transferred_description_mobile2_guildSubscriptionQuantity, i, Integer.valueOf(i))}, null, 4) : c.a.l.b.h(context, R.string.guild_subscription_purchase_modal_activated_description_mobile2, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_subscription_purchase_modal_activated_description_guildSubscriptionQuantity, i, Integer.valueOf(i))}, null, 4);
             c cVar = new c();
             cVar.m = function0;
             Bundle bundle = new Bundle();
@@ -67,17 +69,17 @@ public final class c extends AppDialog {
         public v0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364479;
-            TextView textView = (TextView) view2.findViewById(2131364479);
+            int i2 = R.id.premium_guild_subscription_activated_body1;
+            TextView textView = (TextView) view2.findViewById(R.id.premium_guild_subscription_activated_body1);
             if (textView != null) {
-                i2 = 2131364480;
-                TextView textView2 = (TextView) view2.findViewById(2131364480);
+                i2 = R.id.premium_guild_subscription_activated_body2;
+                TextView textView2 = (TextView) view2.findViewById(R.id.premium_guild_subscription_activated_body2);
                 if (textView2 != null) {
-                    i2 = 2131364481;
-                    LottieAnimationView lottieAnimationView = (LottieAnimationView) view2.findViewById(2131364481);
+                    i2 = R.id.premium_guild_subscription_activated_lottie;
+                    LottieAnimationView lottieAnimationView = (LottieAnimationView) view2.findViewById(R.id.premium_guild_subscription_activated_lottie);
                     if (lottieAnimationView != null) {
-                        i2 = 2131364482;
-                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364482);
+                        i2 = R.id.premium_guild_subscription_activated_ok;
+                        MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.premium_guild_subscription_activated_ok);
                         if (materialButton != null) {
                             return new v0((LinearLayout) view2, textView, textView2, lottieAnimationView, materialButton);
                         }
@@ -104,7 +106,7 @@ public final class c extends AppDialog {
     }
 
     public c() {
-        super(2131558649);
+        super(R.layout.premium_guild_subscription_activated_dialog);
     }
 
     public final v0 g() {
@@ -139,6 +141,6 @@ public final class c extends AppDialog {
         g().e.setOnClickListener(new View$OnClickListenerC0007c(this));
         LottieAnimationView lottieAnimationView = g().d;
         m.checkNotNullExpressionValue(lottieAnimationView, "binding.premiumGuildSubscriptionActivatedLottie");
-        LottieAnimationUtilsKt.loopFrom$default(lottieAnimationView, 180, j, false, 4, null);
+        LottieAnimationUtilsKt.loopFrom$default(lottieAnimationView, BaseTransientBottomBar.ANIMATION_FADE_DURATION, j, false, 4, null);
     }
 }
diff --git a/app/src/main/java/c/a/a/c/d.java b/app/src/main/java/c/a/a/c/d.java
index 97a3debd22..b1f72605e4 100644
--- a/app/src/main/java/c/a/a/c/d.java
+++ b/app/src/main/java/c/a/a/c/d.java
@@ -1,6 +1,7 @@
 package c.a.a.c;
 
 import c.a.a.c.f;
+import com.discord.R;
 import com.discord.models.domain.ModelPremiumGuildSubscription;
 import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot;
 import com.discord.models.domain.ModelSubscription;
@@ -39,13 +40,13 @@ public final class d extends o implements Function1<f.b, Unit> {
             if ((state instanceof StorePremiumGuildSubscription.State.Loading) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loading)) {
                 obj = f.c.C0009f.f;
             } else if ((state instanceof StorePremiumGuildSubscription.State.Failure) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Failure)) {
-                obj = new f.c.C0008c(2131892424);
+                obj = new f.c.C0008c(Integer.valueOf((int) R.string.premium_guild_subscription_cancel_error_mobile));
             } else if (!(state instanceof StorePremiumGuildSubscription.State.Loaded) || !(subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loaded)) {
-                obj = new f.c.C0008c(2131892424);
+                obj = new f.c.C0008c(Integer.valueOf((int) R.string.premium_guild_subscription_cancel_error_mobile));
             } else {
                 ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List<? extends Object>) ((StoreSubscriptions.SubscriptionsState.Loaded) subscriptionsState).getSubscriptions());
                 if (modelSubscription == null) {
-                    obj = new f.c.C0008c(2131892424);
+                    obj = new f.c.C0008c(Integer.valueOf((int) R.string.premium_guild_subscription_cancel_error_mobile));
                 } else if (fVar.getViewState() instanceof f.c.b) {
                     obj = new f.c.b(modelSubscription);
                 } else {
diff --git a/app/src/main/java/c/a/a/c/f.java b/app/src/main/java/c/a/a/c/f.java
index 2b1eb5f207..80d6e54337 100644
--- a/app/src/main/java/c/a/a/c/f.java
+++ b/app/src/main/java/c/a/a/c/f.java
@@ -7,6 +7,7 @@ import com.discord.models.domain.ModelSubscription;
 import com.discord.stores.StorePremiumGuildSubscription;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreSubscriptions;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.m;
@@ -90,7 +91,7 @@ public final class f extends AppViewModel<c> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public a(ModelSubscription modelSubscription) {
                 super(false, true, false, true, false, null);
-                m.checkNotNullParameter(modelSubscription, "subscription");
+                m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
                 this.f = modelSubscription;
             }
 
@@ -124,7 +125,7 @@ public final class f extends AppViewModel<c> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public b(ModelSubscription modelSubscription) {
                 super(false, false, false, false, true, null);
-                m.checkNotNullParameter(modelSubscription, "subscription");
+                m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
                 this.f = modelSubscription;
             }
 
@@ -231,7 +232,7 @@ public final class f extends AppViewModel<c> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public e(ModelSubscription modelSubscription, boolean z2) {
                 super(false, true, true, false, true, null);
-                m.checkNotNullParameter(modelSubscription, "subscription");
+                m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
                 this.f = modelSubscription;
                 this.g = z2;
             }
diff --git a/app/src/main/java/c/a/a/c/i.java b/app/src/main/java/c/a/a/c/i.java
index 98bc51b3b0..7d619b5bc2 100644
--- a/app/src/main/java/c/a/a/c/i.java
+++ b/app/src/main/java/c/a/a/c/i.java
@@ -1,6 +1,7 @@
 package c.a.a.c;
 
 import c.a.a.c.k;
+import com.discord.R;
 import com.discord.models.domain.ModelSubscription;
 import com.discord.stores.StoreSubscriptions;
 import d0.t.u;
@@ -32,10 +33,10 @@ public final class i extends o implements Function1<k.b, Unit> {
             if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loading) {
                 obj = k.c.C0010c.a;
             } else if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Failure) {
-                obj = new k.c.a(2131892424);
+                obj = new k.c.a(Integer.valueOf((int) R.string.premium_guild_subscription_cancel_error_mobile));
             } else if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loaded) {
                 ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List<? extends Object>) ((StoreSubscriptions.SubscriptionsState.Loaded) subscriptionsState).getSubscriptions());
-                obj = modelSubscription == null ? new k.c.a(2131892424) : new k.c.b(modelSubscription, false, false);
+                obj = modelSubscription == null ? new k.c.a(Integer.valueOf((int) R.string.premium_guild_subscription_cancel_error_mobile)) : new k.c.b(modelSubscription, false, false);
             } else {
                 obj = new k.c.a(null, 1);
             }
diff --git a/app/src/main/java/c/a/a/c/k.java b/app/src/main/java/c/a/a/c/k.java
index 65d9e46589..f74b157a31 100644
--- a/app/src/main/java/c/a/a/c/k.java
+++ b/app/src/main/java/c/a/a/c/k.java
@@ -6,6 +6,7 @@ import com.discord.models.domain.ModelSubscription;
 import com.discord.stores.StorePremiumGuildSubscription;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreSubscriptions;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.m;
@@ -113,7 +114,7 @@ public final class k extends AppViewModel<c> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public b(ModelSubscription modelSubscription, boolean z2, boolean z3) {
                 super(null);
-                m.checkNotNullParameter(modelSubscription, "subscription");
+                m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
                 this.a = modelSubscription;
                 this.b = z2;
                 this.f36c = z3;
@@ -128,7 +129,7 @@ public final class k extends AppViewModel<c> {
                     z3 = bVar.f36c;
                 }
                 Objects.requireNonNull(bVar);
-                m.checkNotNullParameter(modelSubscription2, "subscription");
+                m.checkNotNullParameter(modelSubscription2, Traits.Payment.Type.SUBSCRIPTION);
                 return new b(modelSubscription2, z2, z3);
             }
 
diff --git a/app/src/main/java/c/a/a/d.java b/app/src/main/java/c/a/a/d.java
index 36ea34f3b4..477d93a566 100644
--- a/app/src/main/java/c/a/a/d.java
+++ b/app/src/main/java/c/a/a/d.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.j.i1;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.dialogs.SimpleConfirmationDialogArgs;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -110,20 +111,20 @@ public final class d extends AppDialog {
         public i1 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364250;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364250);
+            int i2 = R.id.notice_header_container;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.notice_header_container);
             if (linearLayout != null) {
-                i2 = 2131365183;
-                TextView textView = (TextView) view2.findViewById(2131365183);
+                i2 = R.id.simple_confirmation_dialog_description;
+                TextView textView = (TextView) view2.findViewById(R.id.simple_confirmation_dialog_description);
                 if (textView != null) {
-                    i2 = 2131365184;
-                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131365184);
+                    i2 = R.id.simple_confirmation_dialog_negative;
+                    MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.simple_confirmation_dialog_negative);
                     if (materialButton != null) {
-                        i2 = 2131365185;
-                        MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131365185);
+                        i2 = R.id.simple_confirmation_dialog_positive;
+                        MaterialButton materialButton2 = (MaterialButton) view2.findViewById(R.id.simple_confirmation_dialog_positive);
                         if (materialButton2 != null) {
-                            i2 = 2131365186;
-                            TextView textView2 = (TextView) view2.findViewById(2131365186);
+                            i2 = R.id.simple_confirmation_dialog_title;
+                            TextView textView2 = (TextView) view2.findViewById(R.id.simple_confirmation_dialog_title);
                             if (textView2 != null) {
                                 return new i1((LinearLayout) view2, linearLayout, textView, materialButton, materialButton2, textView2);
                             }
@@ -136,7 +137,7 @@ public final class d extends AppDialog {
     }
 
     public d() {
-        super(2131558672);
+        super(R.layout.simple_confirmation_dialog);
     }
 
     public final SimpleConfirmationDialogArgs g() {
diff --git a/app/src/main/java/c/a/a/e/a.java b/app/src/main/java/c/a/a/e/a.java
index a43e41c527..900e61c0a7 100644
--- a/app/src/main/java/c/a/a/e/a.java
+++ b/app/src/main/java/c/a/a/e/a.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.y0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.Traits;
@@ -72,11 +73,11 @@ public final class a extends AppDialog {
             a aVar = new a();
             String str3 = null;
             if (num != null && num.intValue() == 1) {
-                str2 = "tier_1";
+                str2 = Traits.Location.ObjType.TIER_1;
             } else if (num != null && num.intValue() == 2) {
-                str2 = "tier_2";
+                str2 = Traits.Location.ObjType.TIER_2;
             } else if (num != null && num.intValue() == 3) {
-                str2 = "tier_3";
+                str2 = Traits.Location.ObjType.TIER_3;
             } else {
                 str = null;
                 bundle = new Bundle();
@@ -137,14 +138,14 @@ public final class a extends AppDialog {
         public y0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364503;
-            ImageView imageView = (ImageView) view2.findViewById(2131364503);
+            int i2 = R.id.premium_guild_upsell_close;
+            ImageView imageView = (ImageView) view2.findViewById(R.id.premium_guild_upsell_close);
             if (imageView != null) {
-                i2 = 2131364504;
-                TextView textView = (TextView) view2.findViewById(2131364504);
+                i2 = R.id.premium_guild_upsell_close_button;
+                TextView textView = (TextView) view2.findViewById(R.id.premium_guild_upsell_close_button);
                 if (textView != null) {
-                    i2 = 2131364505;
-                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364505);
+                    i2 = R.id.premium_guild_upsell_subscribe_button;
+                    MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.premium_guild_upsell_subscribe_button);
                     if (materialButton != null) {
                         return new y0((RelativeLayout) view2, imageView, textView, materialButton);
                     }
@@ -172,7 +173,7 @@ public final class a extends AppDialog {
 
         @Override // android.view.View.OnClickListener
         public final void onClick(View view) {
-            AnalyticsTracker.INSTANCE.premiumGuildPromotionOpened(this.j, new Traits.Location(this.l, "Premium Guild Upsell Modal", "Button CTA", this.m, null, 16, null), this.k);
+            AnalyticsTracker.INSTANCE.premiumGuildPromotionOpened(this.j, new Traits.Location(this.l, Traits.Location.Section.PREMIUM_GUILD_UPSELL_MODAL, Traits.Location.Obj.BUTTON_CTA, this.m, null, 16, null), this.k);
             WidgetPremiumGuildSubscription.Companion companion = WidgetPremiumGuildSubscription.Companion;
             Context requireContext = this.i.requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
@@ -182,7 +183,7 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131558652);
+        super(R.layout.premium_guild_subscription_upsell_dialog);
     }
 
     public final y0 g() {
diff --git a/app/src/main/java/c/a/a/e/b.java b/app/src/main/java/c/a/a/e/b.java
index ea1b62a801..6d17810fd1 100644
--- a/app/src/main/java/c/a/a/e/b.java
+++ b/app/src/main/java/c/a/a/e/b.java
@@ -14,6 +14,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 import c.a.j.k5;
 import c.a.j.n0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppFragment;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -196,14 +197,14 @@ public final class b extends AppDialog {
             public k5 invoke(View view) {
                 View view2 = view;
                 m.checkNotNullParameter(view2, "p1");
-                int i2 = 2131364534;
-                TextView textView = (TextView) view2.findViewById(2131364534);
+                int i2 = R.id.premium_upsell_body;
+                TextView textView = (TextView) view2.findViewById(R.id.premium_upsell_body);
                 if (textView != null) {
-                    i2 = 2131364542;
-                    TextView textView2 = (TextView) view2.findViewById(2131364542);
+                    i2 = R.id.premium_upsell_header;
+                    TextView textView2 = (TextView) view2.findViewById(R.id.premium_upsell_header);
                     if (textView2 != null) {
-                        i2 = 2131364543;
-                        ImageView imageView = (ImageView) view2.findViewById(2131364543);
+                        i2 = R.id.premium_upsell_img;
+                        ImageView imageView = (ImageView) view2.findViewById(R.id.premium_upsell_img);
                         if (imageView != null) {
                             return new k5((LinearLayout) view2, textView, textView2, imageView);
                         }
@@ -214,7 +215,7 @@ public final class b extends AppDialog {
         }
 
         public d() {
-            super(2131559167);
+            super(R.layout.widget_premium_upsell);
         }
 
         public final k5 g() {
@@ -290,26 +291,26 @@ public final class b extends AppDialog {
         public n0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364536;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364536);
+            int i2 = R.id.premium_upsell_button_container;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.premium_upsell_button_container);
             if (linearLayout != null) {
-                i2 = 2131364537;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364537);
+                i2 = R.id.premium_upsell_close;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.premium_upsell_close);
                 if (materialButton != null) {
-                    i2 = 2131364539;
-                    View findViewById = view2.findViewById(2131364539);
+                    i2 = R.id.premium_upsell_divider;
+                    View findViewById = view2.findViewById(R.id.premium_upsell_divider);
                     if (findViewById != null) {
-                        i2 = 2131364540;
-                        TabLayout tabLayout = (TabLayout) view2.findViewById(2131364540);
+                        i2 = R.id.premium_upsell_dots;
+                        TabLayout tabLayout = (TabLayout) view2.findViewById(R.id.premium_upsell_dots);
                         if (tabLayout != null) {
-                            i2 = 2131364541;
-                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364541);
+                            i2 = R.id.premium_upsell_get_premium;
+                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(R.id.premium_upsell_get_premium);
                             if (materialButton2 != null) {
-                                i2 = 2131364544;
-                                MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131364544);
+                                i2 = R.id.premium_upsell_learn_more;
+                                MaterialButton materialButton3 = (MaterialButton) view2.findViewById(R.id.premium_upsell_learn_more);
                                 if (materialButton3 != null) {
-                                    i2 = 2131364547;
-                                    ViewPager2 viewPager2 = (ViewPager2) view2.findViewById(2131364547);
+                                    i2 = R.id.premium_upsell_viewpager;
+                                    ViewPager2 viewPager2 = (ViewPager2) view2.findViewById(R.id.premium_upsell_viewpager);
                                     if (viewPager2 != null) {
                                         return new n0((RelativeLayout) view2, linearLayout, materialButton, findViewById, tabLayout, materialButton2, materialButton3, viewPager2);
                                     }
@@ -324,7 +325,7 @@ public final class b extends AppDialog {
     }
 
     public b() {
-        super(2131558602);
+        super(R.layout.multi_value_prop_premium_upsell_dialog);
     }
 
     public static final void g(b bVar) {
@@ -363,29 +364,29 @@ public final class b extends AppDialog {
         String str;
         super.onCreate(bundle);
         AppDialog.hideKeyboard$default(this, null, 1, null);
-        String string2 = getString(2131892729);
+        String string2 = getString(R.string.premium_upsell_tag_passive_mobile);
         m.checkNotNullExpressionValue(string2, "getString(R.string.premi…psell_tag_passive_mobile)");
-        String string3 = getString(2131892728);
+        String string3 = getString(R.string.premium_upsell_tag_description_mobile);
         m.checkNotNullExpressionValue(string3, "getString(R.string.premi…l_tag_description_mobile)");
-        String string4 = getString(2131892715);
+        String string4 = getString(R.string.premium_upsell_emoji_passive_mobile);
         m.checkNotNullExpressionValue(string4, "getString(R.string.premi…ell_emoji_passive_mobile)");
-        String string5 = getString(2131892712);
+        String string5 = getString(R.string.premium_upsell_emoji_description_mobile);
         m.checkNotNullExpressionValue(string5, "getString(R.string.premi…emoji_description_mobile)");
-        String string6 = getString(2131892705);
+        String string6 = getString(R.string.premium_upsell_animated_emojis_passive_mobile);
         m.checkNotNullExpressionValue(string6, "getString(R.string.premi…ed_emojis_passive_mobile)");
-        String string7 = getString(2131892704);
+        String string7 = getString(R.string.premium_upsell_animated_emojis_description_mobile);
         m.checkNotNullExpressionValue(string7, "getString(R.string.premi…mojis_description_mobile)");
-        CharSequence k = c.a.l.b.k(this, 2131892733, new Object[0], null, 4);
-        Object[] objArr = {c.a.l.b.k(this, 2131888546, new Object[0], null, 4), c.a.l.b.k(this, 2131888544, new Object[0], null, 4)};
-        String string8 = getString(2131892700);
+        CharSequence k = c.a.l.b.k(this, R.string.premium_upsell_upload_passive_mobile, new Object[0], null, 4);
+        Object[] objArr = {c.a.l.b.k(this, R.string.file_upload_limit_standard, new Object[0], null, 4), c.a.l.b.k(this, R.string.file_upload_limit_premium_tier_2, new Object[0], null, 4)};
+        String string8 = getString(R.string.premium_upsell_animated_avatar_passive_mobile);
         m.checkNotNullExpressionValue(string8, "getString(R.string.premi…ed_avatar_passive_mobile)");
-        String string9 = getString(2131892699);
+        String string9 = getString(R.string.premium_upsell_animated_avatar_description_mobile);
         m.checkNotNullExpressionValue(string9, "getString(R.string.premi…vatar_description_mobile)");
-        String string10 = getString(2131892708);
+        String string10 = getString(R.string.premium_upsell_badge_passive_mobile);
         m.checkNotNullExpressionValue(string10, "getString(R.string.premi…ell_badge_passive_mobile)");
-        String string11 = getString(2131892707);
+        String string11 = getString(R.string.premium_upsell_badge_description_mobile);
         m.checkNotNullExpressionValue(string11, "getString(R.string.premi…badge_description_mobile)");
-        List listOf = n.listOf((Object[]) new c[]{new c(2131232293, string2, string3), new c(2131232214, string4, string5), new c(2131232166, string6, string7), new c(2131232294, k, c.a.l.b.k(this, 2131892732, objArr, null, 4)), new c(2131232169, string8, string9), new c(2131232172, string10, string11)});
+        List listOf = n.listOf((Object[]) new c[]{new c(R.drawable.img_tag_upsell, string2, string3), new c(R.drawable.img_global_emoji_upsell, string4, string5), new c(R.drawable.img_animated_emoji_upsell, string6, string7), new c(R.drawable.img_upload_upsell, k, c.a.l.b.k(this, R.string.premium_upsell_upload_description_mobile, objArr, null, 4)), new c(R.drawable.img_avatar_upsell, string8, string9), new c(R.drawable.img_badge_upsell, string10, string11)});
         Bundle arguments = getArguments();
         int i2 = arguments != null ? arguments.getInt("extra_page_number") : 0;
         Bundle arguments2 = getArguments();
diff --git a/app/src/main/java/c/a/a/e/c.java b/app/src/main/java/c/a/a/e/c.java
index f61d83da8b..f76766dacb 100644
--- a/app/src/main/java/c/a/a/e/c.java
+++ b/app/src/main/java/c/a/a/e/c.java
@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.j.z0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -85,20 +86,20 @@ public final class c extends AppDialog {
         public z0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362804;
-            TextView textView = (TextView) view2.findViewById(2131362804);
+            int i2 = R.id.continue_button;
+            TextView textView = (TextView) view2.findViewById(R.id.continue_button);
             if (textView != null) {
-                i2 = 2131364537;
-                ImageView imageView = (ImageView) view2.findViewById(2131364537);
+                i2 = R.id.premium_upsell_close;
+                ImageView imageView = (ImageView) view2.findViewById(R.id.premium_upsell_close);
                 if (imageView != null) {
-                    i2 = 2131364538;
-                    TextView textView2 = (TextView) view2.findViewById(2131364538);
+                    i2 = R.id.premium_upsell_description;
+                    TextView textView2 = (TextView) view2.findViewById(R.id.premium_upsell_description);
                     if (textView2 != null) {
-                        i2 = 2131364546;
-                        TextView textView3 = (TextView) view2.findViewById(2131364546);
+                        i2 = R.id.premium_upsell_server_perk;
+                        TextView textView3 = (TextView) view2.findViewById(R.id.premium_upsell_server_perk);
                         if (textView3 != null) {
-                            i2 = 2131365623;
-                            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131365623);
+                            i2 = R.id.upgrade_button;
+                            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.upgrade_button);
                             if (materialButton != null) {
                                 return new z0((RelativeLayout) view2, textView, imageView, textView2, textView3, materialButton);
                             }
@@ -111,7 +112,7 @@ public final class c extends AppDialog {
     }
 
     public c() {
-        super(2131558653);
+        super(R.layout.premium_guild_upgrade_dialog);
     }
 
     public final z0 g() {
@@ -138,12 +139,12 @@ public final class c extends AppDialog {
         requireDialog().setCanceledOnTouchOutside(true);
         TextView textView = g().d;
         m.checkNotNullExpressionValue(textView, "binding.premiumUpsellDescription");
-        c.a.l.b.n(textView, 2131892720, new Object[]{this.m}, null, 4);
+        c.a.l.b.n(textView, R.string.premium_upsell_feature_pretext, new Object[]{this.m}, null, 4);
         TextView textView2 = g().e;
         m.checkNotNullExpressionValue(textView2, "binding.premiumUpsellServerPerk");
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        c.a.l.b.n(textView2, 2131892718, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755303, 2, 2)}, null, 4);
+        c.a.l.b.n(textView2, R.string.premium_upsell_feature_free_guild_subscription, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, R.plurals.premium_upsell_feature_free_guild_subscription_numFreeGuildSubscriptions, 2, 2)}, null, 4);
         TextView textView3 = g().b;
         m.checkNotNullExpressionValue(textView3, "binding.continueButton");
         textView3.setVisibility(this.n ^ true ? 0 : 8);
diff --git a/app/src/main/java/c/a/a/e/d.java b/app/src/main/java/c/a/a/e/d.java
index 01b530f611..c49f125a84 100644
--- a/app/src/main/java/c/a/a/e/d.java
+++ b/app/src/main/java/c/a/a/e/d.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import c.a.j.j1;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -77,29 +78,29 @@ public final class d extends AppDialog {
         public j1 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362215;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131362215);
+            int i2 = R.id.button_container;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.button_container);
             if (linearLayout != null) {
-                i2 = 2131362675;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362675);
+                i2 = R.id.close_button;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.close_button);
                 if (materialButton != null) {
-                    i2 = 2131362798;
-                    View findViewById = view2.findViewById(2131362798);
+                    i2 = R.id.content_background;
+                    View findViewById = view2.findViewById(R.id.content_background);
                     if (findViewById != null) {
-                        i2 = 2131363359;
-                        ShinyButton shinyButton = (ShinyButton) view2.findViewById(2131363359);
+                        i2 = R.id.get_premium_button;
+                        ShinyButton shinyButton = (ShinyButton) view2.findViewById(R.id.get_premium_button);
                         if (shinyButton != null) {
-                            i2 = 2131365594;
-                            View findViewById2 = view2.findViewById(2131365594);
+                            i2 = R.id.transparent_space;
+                            View findViewById2 = view2.findViewById(R.id.transparent_space);
                             if (findViewById2 != null) {
-                                i2 = 2131365640;
-                                TextView textView = (TextView) view2.findViewById(2131365640);
+                                i2 = R.id.upsell_body_text;
+                                TextView textView = (TextView) view2.findViewById(R.id.upsell_body_text);
                                 if (textView != null) {
-                                    i2 = 2131365641;
-                                    TextView textView2 = (TextView) view2.findViewById(2131365641);
+                                    i2 = R.id.upsell_header_text;
+                                    TextView textView2 = (TextView) view2.findViewById(R.id.upsell_header_text);
                                     if (textView2 != null) {
-                                        i2 = 2131365759;
-                                        ImageView imageView = (ImageView) view2.findViewById(2131365759);
+                                        i2 = R.id.value_prop_image;
+                                        ImageView imageView = (ImageView) view2.findViewById(R.id.value_prop_image);
                                         if (imageView != null) {
                                             return new j1((LinearLayout) view2, linearLayout, materialButton, findViewById, shinyButton, findViewById2, textView, textView2, imageView);
                                         }
@@ -115,7 +116,7 @@ public final class d extends AppDialog {
     }
 
     public d() {
-        super(2131558675);
+        super(R.layout.single_value_prop_premium_upsell_dialog);
     }
 
     public final j1 g() {
diff --git a/app/src/main/java/c/a/a/e/e.java b/app/src/main/java/c/a/a/e/e.java
index 63dfd0716b..df5775ff76 100644
--- a/app/src/main/java/c/a/a/e/e.java
+++ b/app/src/main/java/c/a/a/e/e.java
@@ -8,6 +8,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.j.a1;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -81,20 +82,20 @@ public final class e extends AppDialog {
         public a1 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364542;
-            ImageView imageView = (ImageView) view2.findViewById(2131364542);
+            int i2 = R.id.premium_upsell_header;
+            ImageView imageView = (ImageView) view2.findViewById(R.id.premium_upsell_header);
             if (imageView != null) {
-                i2 = 2131364548;
-                TextView textView = (TextView) view2.findViewById(2131364548);
+                i2 = R.id.premium_upsell_yearly_description;
+                TextView textView = (TextView) view2.findViewById(R.id.premium_upsell_yearly_description);
                 if (textView != null) {
-                    i2 = 2131364549;
-                    TextView textView2 = (TextView) view2.findViewById(2131364549);
+                    i2 = R.id.premium_upsell_yearly_title;
+                    TextView textView2 = (TextView) view2.findViewById(R.id.premium_upsell_yearly_title);
                     if (textView2 != null) {
-                        i2 = 2131364607;
-                        TextView textView3 = (TextView) view2.findViewById(2131364607);
+                        i2 = R.id.purchase_premium_monthly;
+                        TextView textView3 = (TextView) view2.findViewById(R.id.purchase_premium_monthly);
                         if (textView3 != null) {
-                            i2 = 2131364608;
-                            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364608);
+                            i2 = R.id.purchase_premium_yearly;
+                            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.purchase_premium_yearly);
                             if (materialButton != null) {
                                 return new a1((LinearLayout) view2, imageView, textView, textView2, textView3, materialButton);
                             }
@@ -107,7 +108,7 @@ public final class e extends AppDialog {
     }
 
     public e() {
-        super(2131558655);
+        super(R.layout.premium_upgrade_yearly_dialog);
     }
 
     public final a1 g() {
@@ -133,17 +134,17 @@ public final class e extends AppDialog {
         }
         requireDialog().setCanceledOnTouchOutside(true);
         boolean z2 = getArgumentsOrDefault().getBoolean("ARG_IS_TIER_1");
-        CharSequence k = c.a.l.b.k(this, z2 ? 2131892675 : 2131892678, new Object[0], null, 4);
+        CharSequence k = c.a.l.b.k(this, z2 ? R.string.premium_tier_1 : R.string.premium_tier_2, new Object[0], null, 4);
         TextView textView = g().d;
         m.checkNotNullExpressionValue(textView, "binding.premiumUpsellYearlyTitle");
-        c.a.l.b.n(textView, 2131892736, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f)), k}, null, 4);
+        c.a.l.b.n(textView, R.string.premium_upsell_yearly_title, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f)), k}, null, 4);
         TextView textView2 = g().f63c;
         m.checkNotNullExpressionValue(textView2, "binding.premiumUpsellYearlyDescription");
-        c.a.l.b.n(textView2, 2131892735, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f))}, null, 4);
+        c.a.l.b.n(textView2, R.string.premium_upsell_yearly_description, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f))}, null, 4);
         MaterialButton materialButton = g().f;
         m.checkNotNullExpressionValue(materialButton, "binding.purchasePremiumYearly");
-        c.a.l.b.n(materialButton, 2131892734, new Object[]{this.m}, null, 4);
-        g().b.setImageResource(z2 ? 2131232275 : 2131232276);
+        c.a.l.b.n(materialButton, R.string.premium_upsell_yearly_cta, new Object[]{this.m}, null, 4);
+        g().b.setImageResource(z2 ? R.drawable.img_premium_guild_subscription_purchase_header_tier_1 : R.drawable.img_premium_guild_subscription_purchase_header_tier_2);
         TextView textView3 = g().e;
         m.checkNotNullExpressionValue(textView3, "binding.purchasePremiumMonthly");
         textView3.setVisibility(this.n ^ true ? 0 : 8);
diff --git a/app/src/main/java/c/a/a/e/f.java b/app/src/main/java/c/a/a/e/f.java
index 5bb2658fc0..9cff9b5f1b 100644
--- a/app/src/main/java/c/a/a/e/f.java
+++ b/app/src/main/java/c/a/a/e/f.java
@@ -10,6 +10,7 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.t0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -60,23 +61,23 @@ public final class f extends AppDialog {
         public t0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364466;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364466);
+            int i2 = R.id.premium_activated_confirm;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.premium_activated_confirm);
             if (materialButton != null) {
-                i2 = 2131364467;
-                TextView textView = (TextView) view2.findViewById(2131364467);
+                i2 = R.id.premium_activated_description;
+                TextView textView = (TextView) view2.findViewById(R.id.premium_activated_description);
                 if (textView != null) {
-                    i2 = 2131364468;
-                    ImageView imageView = (ImageView) view2.findViewById(2131364468);
+                    i2 = R.id.premium_activated_header_background;
+                    ImageView imageView = (ImageView) view2.findViewById(R.id.premium_activated_header_background);
                     if (imageView != null) {
-                        i2 = 2131364469;
-                        ImageView imageView2 = (ImageView) view2.findViewById(2131364469);
+                        i2 = R.id.premium_activated_logo;
+                        ImageView imageView2 = (ImageView) view2.findViewById(R.id.premium_activated_logo);
                         if (imageView2 != null) {
-                            i2 = 2131364470;
-                            ImageView imageView3 = (ImageView) view2.findViewById(2131364470);
+                            i2 = R.id.premium_activated_title;
+                            ImageView imageView3 = (ImageView) view2.findViewById(R.id.premium_activated_title);
                             if (imageView3 != null) {
-                                i2 = 2131364471;
-                                ImageView imageView4 = (ImageView) view2.findViewById(2131364471);
+                                i2 = R.id.premium_activated_wumpus;
+                                ImageView imageView4 = (ImageView) view2.findViewById(R.id.premium_activated_wumpus);
                                 if (imageView4 != null) {
                                     return new t0((LinearLayout) view2, materialButton, textView, imageView, imageView2, imageView3, imageView4);
                                 }
@@ -108,7 +109,7 @@ public final class f extends AppDialog {
     }
 
     public f() {
-        super(2131558647);
+        super(R.layout.premium_activated_dialog);
     }
 
     public final t0 g() {
@@ -123,19 +124,19 @@ public final class f extends AppDialog {
             dismiss();
         }
         boolean z2 = getArgumentsOrDefault().getBoolean("ARG_IS_TIER_1");
-        int i3 = z2 ? 2131230945 : 2131230949;
-        int i4 = z2 ? 2131232230 : 2131232224;
-        int i5 = z2 ? 2131232308 : 2131232306;
+        int i3 = z2 ? R.drawable.bg_premium_classic_subscription_header : R.drawable.bg_premium_subscription_header;
+        int i4 = z2 ? R.drawable.img_logo_nitro_classic : R.drawable.img_logo_discord_nitro;
+        int i5 = z2 ? R.drawable.img_wumpus_riding_wheel : R.drawable.img_wumpus_jetpack;
         if (z2) {
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            i2 = DrawableCompat.getThemedDrawableRes$default(requireContext, 2130969525, 0, 2, (Object) null);
+            i2 = DrawableCompat.getThemedDrawableRes$default(requireContext, (int) R.attr.img_premium_activated_tier_1, 0, 2, (Object) null);
         } else {
             Context requireContext2 = requireContext();
             m.checkNotNullExpressionValue(requireContext2, "requireContext()");
-            i2 = DrawableCompat.getThemedDrawableRes$default(requireContext2, 2130969526, 0, 2, (Object) null);
+            i2 = DrawableCompat.getThemedDrawableRes$default(requireContext2, (int) R.attr.img_premium_activated_tier_2, 0, 2, (Object) null);
         }
-        int i6 = z2 ? 2131887008 : 2131887010;
+        int i6 = z2 ? R.string.billing_switch_plan_confirm_tier_1 : R.string.billing_switch_plan_confirm_tier_2;
         g().d.setBackgroundResource(i3);
         g().e.setImageDrawable(ContextCompat.getDrawable(requireContext(), i4));
         g().g.setImageDrawable(ContextCompat.getDrawable(requireContext(), i5));
diff --git a/app/src/main/java/c/a/a/e/g.java b/app/src/main/java/c/a/a/e/g.java
index fa0a623d5d..d664c4266c 100644
--- a/app/src/main/java/c/a/a/e/g.java
+++ b/app/src/main/java/c/a/a/e/g.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.j.u0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -44,11 +45,11 @@ public final class g extends AppDialog {
         public u0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364466;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364466);
+            int i2 = R.id.premium_activated_confirm;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.premium_activated_confirm);
             if (materialButton != null) {
-                i2 = 2131364472;
-                TextView textView = (TextView) view2.findViewById(2131364472);
+                i2 = R.id.premium_and_premium_guild_activated_text;
+                TextView textView = (TextView) view2.findViewById(R.id.premium_and_premium_guild_activated_text);
                 if (textView != null) {
                     return new u0((LinearLayout) view2, materialButton, textView);
                 }
@@ -76,7 +77,7 @@ public final class g extends AppDialog {
     }
 
     public g() {
-        super(2131558648);
+        super(R.layout.premium_and_premium_guild_activated_dialog);
     }
 
     @Override // com.discord.app.AppDialog
@@ -95,7 +96,7 @@ public final class g extends AppDialog {
         KProperty<?>[] kPropertyArr = i;
         TextView textView = ((u0) fragmentViewBindingDelegate.getValue((Fragment) this, kPropertyArr[0])).f170c;
         m.checkNotNullExpressionValue(textView, "binding.premiumAndPremiumGuildActivatedText");
-        c.a.l.b.n(textView, 2131886944, new Object[]{str}, null, 4);
+        c.a.l.b.n(textView, R.string.billing_premium_and_premium_guild_plan_activated, new Object[]{str}, null, 4);
         requireDialog().setCanceledOnTouchOutside(true);
         ((u0) this.l.getValue((Fragment) this, kPropertyArr[0])).b.setOnClickListener(new c(this));
     }
diff --git a/app/src/main/java/c/a/a/f/a/a.java b/app/src/main/java/c/a/a/f/a/a.java
index ac36cc3830..ac1db4e169 100644
--- a/app/src/main/java/c/a/a/f/a/a.java
+++ b/app/src/main/java/c/a/a/f/a/a.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.a.f.a.d;
 import c.a.e.h0;
 import c.a.e.j0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewModel;
 import com.discord.rtcconnection.audio.DiscordAudioManager;
@@ -91,23 +92,23 @@ public final class a extends AppDialog {
         public c.a.j.b invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131361998;
-            MaterialRadioButton materialRadioButton = (MaterialRadioButton) view2.findViewById(2131361998);
+            int i2 = R.id.audio_output_selection_bluetooth_radio;
+            MaterialRadioButton materialRadioButton = (MaterialRadioButton) view2.findViewById(R.id.audio_output_selection_bluetooth_radio);
             if (materialRadioButton != null) {
-                i2 = 2131361999;
-                TextView textView = (TextView) view2.findViewById(2131361999);
+                i2 = R.id.audio_output_selection_dialog_header;
+                TextView textView = (TextView) view2.findViewById(R.id.audio_output_selection_dialog_header);
                 if (textView != null) {
-                    i2 = 2131362000;
-                    RadioGroup radioGroup = (RadioGroup) view2.findViewById(2131362000);
+                    i2 = R.id.audio_output_selection_dialog_radio_group;
+                    RadioGroup radioGroup = (RadioGroup) view2.findViewById(R.id.audio_output_selection_dialog_radio_group);
                     if (radioGroup != null) {
-                        i2 = 2131362001;
-                        MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view2.findViewById(2131362001);
+                        i2 = R.id.audio_output_selection_earpiece_radio;
+                        MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view2.findViewById(R.id.audio_output_selection_earpiece_radio);
                         if (materialRadioButton2 != null) {
-                            i2 = 2131362002;
-                            MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view2.findViewById(2131362002);
+                            i2 = R.id.audio_output_selection_speaker_radio;
+                            MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view2.findViewById(R.id.audio_output_selection_speaker_radio);
                             if (materialRadioButton3 != null) {
-                                i2 = 2131362003;
-                                MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view2.findViewById(2131362003);
+                                i2 = R.id.audio_output_selection_wired_radio;
+                                MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view2.findViewById(R.id.audio_output_selection_wired_radio);
                                 if (materialRadioButton4 != null) {
                                     return new c.a.j.b((LinearLayout) view2, materialRadioButton, textView, radioGroup, materialRadioButton2, materialRadioButton3, materialRadioButton4);
                                 }
@@ -169,7 +170,7 @@ public final class a extends AppDialog {
                 m.checkNotNullExpressionValue(materialRadioButton6, "binding.audioOutputSelectionBluetoothRadio");
                 String str = aVar4.f38c;
                 if (str == null) {
-                    str = aVar3.getString(2131886748);
+                    str = aVar3.getString(R.string.audio_devices_bluetooth);
                 }
                 materialRadioButton6.setText(str);
                 MaterialRadioButton materialRadioButton7 = aVar3.i().e;
@@ -206,7 +207,7 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131558433);
+        super(R.layout.audio_output_selection_dialog);
         e eVar = e.i;
         h0 h0Var = new h0(this);
         this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(d.class), new m(5, h0Var), new j0(eVar));
@@ -231,7 +232,7 @@ public final class a extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        int themedColor = ColorCompat.getThemedColor(view, 2130968949);
+        int themedColor = ColorCompat.getThemedColor(view, (int) R.attr.colorInteractiveNormal);
         MaterialRadioButton materialRadioButton = i().b;
         m.checkNotNullExpressionValue(materialRadioButton, "binding.audioOutputSelectionBluetoothRadio");
         ColorCompatKt.setDrawableColor(materialRadioButton, themedColor);
diff --git a/app/src/main/java/c/a/a/g/a.java b/app/src/main/java/c/a/a/g/a.java
index 29d5bb20fe..9f2d8fc816 100644
--- a/app/src/main/java/c/a/a/g/a.java
+++ b/app/src/main/java/c/a/a/g/a.java
@@ -7,6 +7,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.j.g5;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
@@ -91,20 +92,20 @@ public final class a extends AppDialog {
         public g5 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363999;
-            TextView textView = (TextView) view2.findViewById(2131363999);
+            int i2 = R.id.masked_links_body_text;
+            TextView textView = (TextView) view2.findViewById(R.id.masked_links_body_text);
             if (textView != null) {
-                i2 = 2131364000;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364000);
+                i2 = R.id.masked_links_cancel;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.masked_links_cancel);
                 if (materialButton != null) {
-                    i2 = 2131364001;
-                    MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364001);
+                    i2 = R.id.masked_links_confirm;
+                    MaterialButton materialButton2 = (MaterialButton) view2.findViewById(R.id.masked_links_confirm);
                     if (materialButton2 != null) {
-                        i2 = 2131364002;
-                        TextView textView2 = (TextView) view2.findViewById(2131364002);
+                        i2 = R.id.masked_links_trust_domain;
+                        TextView textView2 = (TextView) view2.findViewById(R.id.masked_links_trust_domain);
                         if (textView2 != null) {
-                            i2 = 2131365776;
-                            TextView textView3 = (TextView) view2.findViewById(2131365776);
+                            i2 = R.id.view_dialog_confirmation_header;
+                            TextView textView3 = (TextView) view2.findViewById(R.id.view_dialog_confirmation_header);
                             if (textView3 != null) {
                                 return new g5((LinearLayout) view2, textView, materialButton, materialButton2, textView2, textView3);
                             }
@@ -131,7 +132,7 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131559133);
+        super(R.layout.widget_masked_links_dialog);
     }
 
     public final g5 g() {
@@ -165,7 +166,7 @@ public final class a extends AppDialog {
         }
         TextView textView = g().b;
         m.checkNotNullExpressionValue(textView, "binding.maskedLinksBodyText");
-        c.a.l.b.n(textView, 2131891291, new Object[]{obj}, null, 4);
+        c.a.l.b.n(textView, R.string.masked_link_body, new Object[]{obj}, null, 4);
         g().f102c.setOnClickListener(new d(this));
         g().d.setOnClickListener(new View$OnClickListenerC0018a(0, this, str));
         g().e.setOnClickListener(new View$OnClickListenerC0018a(1, this, str));
diff --git a/app/src/main/java/c/a/a/h.java b/app/src/main/java/c/a/a/h.java
index c65026fc3c..6335718009 100644
--- a/app/src/main/java/c/a/a/h.java
+++ b/app/src/main/java/c/a/a/h.java
@@ -10,6 +10,7 @@ import c.a.a.p;
 import c.a.e.f;
 import c.a.e.h0;
 import c.a.e.j0;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewModel;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -75,17 +76,17 @@ public final class h extends AppDialog {
         public c.a.j.a invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131361856;
-            TextView textView = (TextView) view2.findViewById(2131361856);
+            int i2 = R.id.accessibility_detection_body_text;
+            TextView textView = (TextView) view2.findViewById(R.id.accessibility_detection_body_text);
             if (textView != null) {
-                i2 = 2131361857;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131361857);
+                i2 = R.id.accessibility_detection_disable;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.accessibility_detection_disable);
                 if (materialButton != null) {
-                    i2 = 2131361858;
-                    MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131361858);
+                    i2 = R.id.accessibility_detection_enable;
+                    MaterialButton materialButton2 = (MaterialButton) view2.findViewById(R.id.accessibility_detection_enable);
                     if (materialButton2 != null) {
-                        i2 = 2131365776;
-                        TextView textView2 = (TextView) view2.findViewById(2131365776);
+                        i2 = R.id.view_dialog_confirmation_header;
+                        TextView textView2 = (TextView) view2.findViewById(R.id.view_dialog_confirmation_header);
                         if (textView2 != null) {
                             return new c.a.j.a((LinearLayout) view2, textView, materialButton, materialButton2, textView2);
                         }
@@ -113,7 +114,7 @@ public final class h extends AppDialog {
     }
 
     public h() {
-        super(2131558431);
+        super(R.layout.allow_accessibility_detection_dialog);
         d dVar = d.i;
         h0 h0Var = new h0(this);
         this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(p.class), new m(0, h0Var), new j0(dVar));
@@ -136,6 +137,6 @@ public final class h extends AppDialog {
         h().d.setOnClickListener(new a(1, this));
         TextView textView = h().b;
         m.checkNotNullExpressionValue(textView, "binding.accessibilityDetectionBodyText");
-        c.a.l.b.n(textView, 2131886119, new Object[]{f.a.a(360035966492L, null)}, null, 4);
+        c.a.l.b.n(textView, R.string.accessibility_detection_modal_body, new Object[]{f.a.a(360035966492L, null)}, null, 4);
     }
 }
diff --git a/app/src/main/java/c/a/a/i.java b/app/src/main/java/c/a/a/i.java
index bc73bbc2b4..5a1cc37c79 100644
--- a/app/src/main/java/c/a/a/i.java
+++ b/app/src/main/java/c/a/a/i.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.e.o;
 import c.a.j.h;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.uri.UriHandler;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -49,7 +50,7 @@ public final class i extends AppDialog {
                 m.checkNotNullExpressionValue(requireContext2, "requireContext()");
                 String str = (String) this.k;
                 m.checkNotNullExpressionValue(str, "username");
-                o.a(requireContext2, str, 2131887645);
+                o.a(requireContext2, str, R.string.copied_text);
                 ((i) this.j).dismiss();
             } else {
                 throw null;
@@ -77,14 +78,14 @@ public final class i extends AppDialog {
         public h invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362726;
-            TextView textView = (TextView) view2.findViewById(2131362726);
+            int i2 = R.id.connected_account_actions_dialog_copy_username;
+            TextView textView = (TextView) view2.findViewById(R.id.connected_account_actions_dialog_copy_username);
             if (textView != null) {
-                i2 = 2131362727;
-                TextView textView2 = (TextView) view2.findViewById(2131362727);
+                i2 = R.id.connected_account_actions_dialog_header;
+                TextView textView2 = (TextView) view2.findViewById(R.id.connected_account_actions_dialog_header);
                 if (textView2 != null) {
-                    i2 = 2131362728;
-                    TextView textView3 = (TextView) view2.findViewById(2131362728);
+                    i2 = R.id.connected_account_actions_dialog_open_in_browser;
+                    TextView textView3 = (TextView) view2.findViewById(R.id.connected_account_actions_dialog_open_in_browser);
                     if (textView3 != null) {
                         return new h((LinearLayout) view2, textView, textView2, textView3);
                     }
@@ -95,7 +96,7 @@ public final class i extends AppDialog {
     }
 
     public i() {
-        super(2131558447);
+        super(R.layout.connected_account_actions_dialog);
     }
 
     public final h g() {
diff --git a/app/src/main/java/c/a/a/j.java b/app/src/main/java/c/a/a/j.java
index 4f16b72428..1e00497509 100644
--- a/app/src/main/java/c/a/a/j.java
+++ b/app/src/main/java/c/a/a/j.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.e;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -51,14 +52,14 @@ public final class j extends AppDialog {
         public e invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362237;
-            TextView textView = (TextView) view2.findViewById(2131362237);
+            int i2 = R.id.camera_capacity_body;
+            TextView textView = (TextView) view2.findViewById(R.id.camera_capacity_body);
             if (textView != null) {
-                i2 = 2131362238;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362238);
+                i2 = R.id.camera_capacity_confirm;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.camera_capacity_confirm);
                 if (materialButton != null) {
-                    i2 = 2131364250;
-                    LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364250);
+                    i2 = R.id.notice_header_container;
+                    LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.notice_header_container);
                     if (linearLayout != null) {
                         return new e((LinearLayout) view2, textView, materialButton, linearLayout);
                     }
@@ -83,7 +84,7 @@ public final class j extends AppDialog {
     }
 
     public j() {
-        super(2131558438);
+        super(R.layout.camera_capacity_dialog);
     }
 
     @Override // com.discord.app.AppDialog, androidx.fragment.app.Fragment
@@ -97,6 +98,6 @@ public final class j extends AppDialog {
         Integer valueOf = arguments != null ? Integer.valueOf(arguments.getInt("ARG_MAX_VIDEO_CHANNEL_USERS")) : null;
         TextView textView = ((e) this.k.getValue((Fragment) this, kPropertyArr[0])).b;
         m.checkNotNullExpressionValue(textView, "binding.cameraCapacityBody");
-        textView.setText(c.a.l.b.k(this, 2131894950, new Object[]{String.valueOf(valueOf)}, null, 4));
+        textView.setText(c.a.l.b.k(this, R.string.video_capacity_modal_body, new Object[]{String.valueOf(valueOf)}, null, 4));
     }
 }
diff --git a/app/src/main/java/c/a/a/k.java b/app/src/main/java/c/a/a/k.java
index 36ad0cf906..eb2e4369df 100644
--- a/app/src/main/java/c/a/a/k.java
+++ b/app/src/main/java/c/a/a/k.java
@@ -7,8 +7,10 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.birthday.BirthdayHelper;
+import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.google.android.material.button.MaterialButton;
@@ -60,14 +62,14 @@ public final class k extends AppDialog {
         public c.a.j.k invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362944;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362944);
+            int i2 = R.id.dialog_date_picker_done;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.dialog_date_picker_done);
             if (materialButton != null) {
-                i2 = 2131362945;
-                DatePicker datePicker = (DatePicker) view2.findViewById(2131362945);
+                i2 = R.id.dialog_date_picker_input;
+                DatePicker datePicker = (DatePicker) view2.findViewById(R.id.dialog_date_picker_input);
                 if (datePicker != null) {
-                    i2 = 2131362946;
-                    TextView textView = (TextView) view2.findViewById(2131362946);
+                    i2 = R.id.dialog_date_picker_title;
+                    TextView textView = (TextView) view2.findViewById(R.id.dialog_date_picker_title);
                     if (textView != null) {
                         return new c.a.j.k((LinearLayout) view2, materialButton, datePicker, textView);
                     }
@@ -121,7 +123,7 @@ public final class k extends AppDialog {
     }
 
     public k() {
-        super(2131558478);
+        super(R.layout.dialog_date_picker);
     }
 
     public final c.a.j.k g() {
@@ -152,7 +154,7 @@ public final class k extends AppDialog {
         datePicker.setMaxDate(arguments2 != null ? arguments2.getLong("max_date") : 0);
         DatePicker datePicker2 = g().f117c;
         m.checkNotNullExpressionValue(datePicker2, "binding.dialogDatePickerInput");
-        datePicker2.setMinDate(BirthdayHelper.INSTANCE.subtractYearsFromToday(150));
+        datePicker2.setMinDate(BirthdayHelper.INSTANCE.subtractYearsFromToday(FontUtils.MAX_FONT_SCALING));
         Bundle arguments3 = getArguments();
         if (arguments3 != null) {
             j2 = arguments3.getLong("initial_date");
diff --git a/app/src/main/java/c/a/a/l.java b/app/src/main/java/c/a/a/l.java
index 15fd7a1795..ba75570425 100644
--- a/app/src/main/java/c/a/a/l.java
+++ b/app/src/main/java/c/a/a/l.java
@@ -1,6 +1,7 @@
 package c.a.a;
 
 import android.view.View;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -20,7 +21,7 @@ public final class l extends o implements Function1<View, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(View view) {
         m.checkNotNullParameter(view, "<anonymous parameter 0>");
-        this.$onConfirm.invoke(2131888842);
+        this.$onConfirm.invoke(Integer.valueOf((int) R.string.friend_request_cancelled));
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a/m.java b/app/src/main/java/c/a/a/m.java
index e670a6858a..21c893333b 100644
--- a/app/src/main/java/c/a/a/m.java
+++ b/app/src/main/java/c/a/a/m.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.s;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -44,11 +45,11 @@ public final class m extends AppDialog {
         public s invoke(View view) {
             View view2 = view;
             d0.z.d.m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363666;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363666);
+            int i2 = R.id.guild_video_at_capacity_confirm;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.guild_video_at_capacity_confirm);
             if (materialButton != null) {
-                i2 = 2131364250;
-                LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364250);
+                i2 = R.id.notice_header_container;
+                LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.notice_header_container);
                 if (linearLayout != null) {
                     return new s((LinearLayout) view2, materialButton, linearLayout);
                 }
@@ -72,7 +73,7 @@ public final class m extends AppDialog {
     }
 
     public m() {
-        super(2131558524);
+        super(R.layout.guild_video_at_capacity);
     }
 
     @Override // com.discord.app.AppDialog, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/c/a/a/n.java b/app/src/main/java/c/a/a/n.java
index 33bdd7a289..28664f0729 100644
--- a/app/src/main/java/c/a/a/n.java
+++ b/app/src/main/java/c/a/a/n.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.l;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -96,14 +97,14 @@ public final class n extends AppDialog {
         public l invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362925;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362925);
+            int i2 = R.id.dialog_cancel;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.dialog_cancel);
             if (materialButton != null) {
-                i2 = 2131362949;
-                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131362949);
+                i2 = R.id.dialog_selections;
+                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(R.id.dialog_selections);
                 if (maxHeightRecyclerView != null) {
-                    i2 = 2131362950;
-                    TextView textView = (TextView) view2.findViewById(2131362950);
+                    i2 = R.id.dialog_title;
+                    TextView textView = (TextView) view2.findViewById(R.id.dialog_title);
                     if (textView != null) {
                         return new l((LinearLayout) view2, materialButton, maxHeightRecyclerView, textView);
                     }
@@ -145,7 +146,7 @@ public final class n extends AppDialog {
             ViewGroup viewGroup2 = viewGroup;
             m.checkNotNullParameter(layoutInflater2, "inflater");
             m.checkNotNullParameter(viewGroup2, "parent");
-            View inflate = layoutInflater2.inflate(2131558480, viewGroup2, false);
+            View inflate = layoutInflater2.inflate(R.layout.dialog_simple_selector_item, viewGroup2, false);
             Objects.requireNonNull(inflate, "rootView");
             c.a.j.m mVar = new c.a.j.m((TextView) inflate);
             m.checkNotNullExpressionValue(mVar, "DialogSimpleSelectorItem…(inflater, parent, false)");
@@ -154,7 +155,7 @@ public final class n extends AppDialog {
     }
 
     public n() {
-        super(2131558479);
+        super(R.layout.dialog_simple_selector);
     }
 
     public final l g() {
diff --git a/app/src/main/java/c/a/a/r.java b/app/src/main/java/c/a/a/r.java
index c7440d3dbf..58434859ad 100644
--- a/app/src/main/java/c/a/a/r.java
+++ b/app/src/main/java/c/a/a/r.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import c.a.j.z4;
+import com.discord.R;
 import com.discord.api.auth.mfa.EnableMfaResponse;
 import com.discord.app.AppDialog;
 import com.discord.restapi.RestAPIParams;
@@ -54,26 +55,26 @@ public final class r extends AppDialog {
         public z4 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363144;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131363144);
+            int i2 = R.id.enable_two_factor_password_body_container;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.enable_two_factor_password_body_container);
             if (linearLayout != null) {
-                i2 = 2131363145;
-                TextView textView = (TextView) view2.findViewById(2131363145);
+                i2 = R.id.enable_two_factor_password_body_text;
+                TextView textView = (TextView) view2.findViewById(R.id.enable_two_factor_password_body_text);
                 if (textView != null) {
-                    i2 = 2131363146;
-                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363146);
+                    i2 = R.id.enable_two_factor_password_cancel;
+                    MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.enable_two_factor_password_cancel);
                     if (materialButton != null) {
-                        i2 = 2131363147;
-                        TextView textView2 = (TextView) view2.findViewById(2131363147);
+                        i2 = R.id.enable_two_factor_password_header;
+                        TextView textView2 = (TextView) view2.findViewById(R.id.enable_two_factor_password_header);
                         if (textView2 != null) {
-                            i2 = 2131363148;
-                            LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(2131363148);
+                            i2 = R.id.enable_two_factor_password_header_container;
+                            LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(R.id.enable_two_factor_password_header_container);
                             if (linearLayout2 != null) {
-                                i2 = 2131363149;
-                                LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131363149);
+                                i2 = R.id.enable_two_factor_password_ok;
+                                LoadingButton loadingButton = (LoadingButton) view2.findViewById(R.id.enable_two_factor_password_ok);
                                 if (loadingButton != null) {
-                                    i2 = 2131363150;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view2.findViewById(2131363150);
+                                    i2 = R.id.enable_two_factor_password_view_input;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view2.findViewById(R.id.enable_two_factor_password_view_input);
                                     if (textInputLayout != null) {
                                         return new z4((LinearLayout) view2, linearLayout, textView, materialButton, textView2, linearLayout2, loadingButton, textInputLayout);
                                     }
@@ -197,7 +198,7 @@ public final class r extends AppDialog {
     }
 
     public r() {
-        super(2131559038);
+        super(R.layout.widget_enable_two_factor_password_dialog);
     }
 
     public final z4 g() {
diff --git a/app/src/main/java/c/a/a/s.java b/app/src/main/java/c/a/a/s.java
index 477eb17a49..8a7df4836f 100644
--- a/app/src/main/java/c/a/a/s.java
+++ b/app/src/main/java/c/a/a/s.java
@@ -4,12 +4,14 @@ import android.content.Context;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.a.w;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.a.j.t5;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewModel;
 import com.discord.stores.StoreStream;
@@ -57,14 +59,14 @@ public final class s extends AppDialog {
         public t5 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131365775;
-            LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131365775);
+            int i2 = R.id.view_dialog_confirmation_confirm;
+            LoadingButton loadingButton = (LoadingButton) view2.findViewById(R.id.view_dialog_confirmation_confirm);
             if (loadingButton != null) {
-                i2 = 2131365776;
-                TextView textView = (TextView) view2.findViewById(2131365776);
+                i2 = R.id.view_dialog_confirmation_header;
+                TextView textView = (TextView) view2.findViewById(R.id.view_dialog_confirmation_header);
                 if (textView != null) {
-                    i2 = 2131365777;
-                    TextView textView2 = (TextView) view2.findViewById(2131365777);
+                    i2 = R.id.view_dialog_confirmation_text;
+                    TextView textView2 = (TextView) view2.findViewById(R.id.view_dialog_confirmation_text);
                     if (textView2 != null) {
                         return new t5((LinearLayout) view2, loadingButton, textView, textView2);
                     }
@@ -94,11 +96,11 @@ public final class s extends AppDialog {
             KProperty[] kPropertyArr = s.i;
             TextView textView = sVar.g().f168c;
             m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader");
-            textView.setText(sVar.getString(2131894151));
+            textView.setText(sVar.getString(R.string.system_dm_urgent_message_modal_header));
             TextView textView2 = sVar.g().d;
             m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText");
-            textView2.setText(sVar.getString(2131894150));
-            sVar.g().b.setText(sVar.getString(2131892004));
+            textView2.setText(sVar.getString(R.string.system_dm_urgent_message_modal_body));
+            sVar.g().b.setText(sVar.getString(R.string.okay));
             sVar.g().b.setIsLoading(dVar2.b);
             sVar.g().b.setOnClickListener(new t(sVar));
             return Unit.a;
@@ -120,14 +122,14 @@ public final class s extends AppDialog {
         @Override // kotlin.jvm.functions.Function1
         public Unit invoke(w.b bVar) {
             w.b bVar2 = bVar;
-            m.checkNotNullParameter(bVar2, "event");
+            m.checkNotNullParameter(bVar2, NotificationCompat.CATEGORY_EVENT);
             s sVar = this.this$0;
             KProperty[] kPropertyArr = s.i;
             Objects.requireNonNull(sVar);
             if (m.areEqual(bVar2, w.b.a.a)) {
                 sVar.dismiss();
             } else if (m.areEqual(bVar2, w.b.C0020b.a)) {
-                c.a.e.o.g(sVar.getContext(), 2131890764, 0, null, 12);
+                c.a.e.o.g(sVar.getContext(), R.string.internal_server_error, 0, null, 12);
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -152,7 +154,7 @@ public final class s extends AppDialog {
     }
 
     public s() {
-        super(2131559318);
+        super(R.layout.widget_urgent_message_dialog);
         e eVar = e.i;
         h0 h0Var = new h0(this);
         this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(w.class), new m(1, h0Var), new j0(eVar));
diff --git a/app/src/main/java/c/a/a/t.java b/app/src/main/java/c/a/a/t.java
index f8d5d7c816..2557f13017 100644
--- a/app/src/main/java/c/a/a/t.java
+++ b/app/src/main/java/c/a/a/t.java
@@ -6,6 +6,7 @@ import c.a.a.w;
 import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.channel.ChannelSelector;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.user.UserUtils;
 import d0.z.d.m;
 import java.util.Objects;
 import kotlin.jvm.functions.Function0;
@@ -30,7 +31,7 @@ public final class t implements View.OnClickListener {
         m.checkNotNullExpressionValue(context, "button.context");
         Objects.requireNonNull(h);
         m.checkNotNullParameter(context, "context");
-        ChannelSelector.Companion.getInstance().findAndSetDirectMessage(context, 643945264868098049L);
+        ChannelSelector.Companion.getInstance().findAndSetDirectMessage(context, UserUtils.SYSTEM_USER_ID);
         w.d viewState = h.getViewState();
         if (viewState != null && (num = viewState.a) != null) {
             RestAPIParams.UserInfo userInfo = new RestAPIParams.UserInfo(null, null, null, null, null, null, null, null, Integer.valueOf(num.intValue() & -8193), null, 767, null);
diff --git a/app/src/main/java/c/a/a/z/a.java b/app/src/main/java/c/a/a/z/a.java
index a916dff72a..dd1a2a21a2 100644
--- a/app/src/main/java/c/a/a/z/a.java
+++ b/app/src/main/java/c/a/a/z/a.java
@@ -10,6 +10,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.j.p;
+import com.discord.R;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.premium.SubscriptionInterval;
 import com.discord.app.AppDialog;
@@ -61,26 +62,26 @@ public final class a extends AppDialog {
         public p invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363389;
-            TextView textView = (TextView) view2.findViewById(2131363389);
+            int i2 = R.id.gift_entitlement_code;
+            TextView textView = (TextView) view2.findViewById(R.id.gift_entitlement_code);
             if (textView != null) {
-                i2 = 2131363390;
-                RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363390);
+                i2 = R.id.gift_entitlement_code_container;
+                RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(R.id.gift_entitlement_code_container);
                 if (relativeLayout != null) {
-                    i2 = 2131363392;
-                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363392);
+                    i2 = R.id.gift_entitlement_copy;
+                    MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.gift_entitlement_copy);
                     if (materialButton != null) {
-                        i2 = 2131363397;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(2131363397);
+                        i2 = R.id.gift_link_subtext;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(R.id.gift_link_subtext);
                         if (linkifiedTextView != null) {
-                            i2 = 2131363398;
-                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363398);
+                            i2 = R.id.gift_purchased_dialog_confirm;
+                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(R.id.gift_purchased_dialog_confirm);
                             if (materialButton2 != null) {
-                                i2 = 2131363399;
-                                TextView textView2 = (TextView) view2.findViewById(2131363399);
+                                i2 = R.id.gift_purchased_dialog_subtext;
+                                TextView textView2 = (TextView) view2.findViewById(R.id.gift_purchased_dialog_subtext);
                                 if (textView2 != null) {
-                                    i2 = 2131363400;
-                                    ImageView imageView = (ImageView) view2.findViewById(2131363400);
+                                    i2 = R.id.gift_purchased_icon;
+                                    ImageView imageView = (ImageView) view2.findViewById(R.id.gift_purchased_icon);
                                     if (imageView != null) {
                                         return new p((LinearLayout) view2, textView, relativeLayout, materialButton, linkifiedTextView, materialButton2, textView2, imageView);
                                     }
@@ -160,14 +161,14 @@ public final class a extends AppDialog {
                 KProperty[] kPropertyArr = a.i;
                 MaterialButton materialButton = aVar.g().d;
                 m.checkNotNullExpressionValue(materialButton, "binding.giftEntitlementCopy");
-                materialButton.setText(context.getString(2131887644));
-                this.i.g().f141c.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130969335, 0, 2, (Object) null));
+                materialButton.setText(context.getString(R.string.copied));
+                this.i.g().f141c.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.gift_code_copied_outline, 0, 2, (Object) null));
             }
         }
     }
 
     public a() {
-        super(2131558513);
+        super(R.layout.gift_purchased_dialog);
     }
 
     public final p g() {
@@ -196,16 +197,16 @@ public final class a extends AppDialog {
         }
         LinkifiedTextView linkifiedTextView = g().e;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.giftLinkSubtext");
-        c.a.l.b.m(linkifiedTextView, 2131886541, new Object[0], new d(this));
+        c.a.l.b.m(linkifiedTextView, R.string.application_store_gift_purchase_confirmation_subtext, new Object[0], new d(this));
         GiftingUtils giftingUtils = GiftingUtils.INSTANCE;
         Integer iconForSku = giftingUtils.getIconForSku(inAppSku);
         if (iconForSku != null) {
             g().h.setImageResource(iconForSku.intValue());
         }
-        Pair pair = SubscriptionPlanType.Companion.from(inAppSku.getPaymentGatewaySkuId()).getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131886536, 2131755023) : new Pair(2131886539, 2131755026);
+        Pair pair = SubscriptionPlanType.Companion.from(inAppSku.getPaymentGatewaySkuId()).getInterval() == SubscriptionInterval.MONTHLY ? new Pair(Integer.valueOf((int) R.string.application_store_gift_purchase_confirm_monthly_mobile), Integer.valueOf((int) R.plurals.application_store_gift_purchase_confirm_monthly_mobile_intervalCount)) : new Pair(Integer.valueOf((int) R.string.application_store_gift_purchase_confirm_yearly_mobile), Integer.valueOf((int) R.plurals.application_store_gift_purchase_confirm_yearly_mobile_intervalCount));
         int intValue = ((Number) pair.component1()).intValue();
         int intValue2 = ((Number) pair.component2()).intValue();
-        String string2 = getString(giftingUtils.getTierForSku(inAppSku.getSkuId()) == PremiumTier.TIER_1 ? 2131892675 : 2131892678);
+        String string2 = getString(giftingUtils.getTierForSku(inAppSku.getSkuId()) == PremiumTier.TIER_1 ? R.string.premium_tier_1 : R.string.premium_tier_2);
         m.checkNotNullExpressionValue(string2, "getString(\n        if (G…ring.premium_tier_2\n    )");
         TextView textView = g().g;
         m.checkNotNullExpressionValue(textView, "binding.giftPurchasedDialogSubtext");
diff --git a/app/src/main/java/c/a/a/z/c.java b/app/src/main/java/c/a/a/z/c.java
index 54ea8d845a..9d4276bc77 100644
--- a/app/src/main/java/c/a/a/z/c.java
+++ b/app/src/main/java/c/a/a/z/c.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.f;
 import c.a.j.e4;
+import com.discord.R;
 import com.discord.api.application.Application;
 import com.discord.api.premium.SubscriptionPlan;
 import com.discord.app.AppDialog;
@@ -22,6 +23,7 @@ import com.discord.stores.StoreGifting;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.error.Error;
+import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.premium.PremiumUtils;
@@ -95,7 +97,7 @@ public final class c extends AppDialog {
             m.checkNotNullParameter(str, "giftCode");
             m.checkNotNullParameter(str2, "source");
             m.checkNotNullParameter(str, "giftCode");
-            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("gift:" + str, null, 0, 0, false, n.listOf((Object[]) new d0.e0.c[]{a0.getOrCreateKotlinClass(WidgetSettingsGifting.class), a0.getOrCreateKotlinClass(WidgetHome.class)}), 0, false, 0, new C0022a(str, str2, j), 150, null));
+            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("gift:" + str, null, 0, 0, false, n.listOf((Object[]) new d0.e0.c[]{a0.getOrCreateKotlinClass(WidgetSettingsGifting.class), a0.getOrCreateKotlinClass(WidgetHome.class)}), 0, false, 0, new C0022a(str, str2, j), FontUtils.MAX_FONT_SCALING, null));
         }
     }
 
@@ -113,32 +115,32 @@ public final class c extends AppDialog {
         public e4 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131361813;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131361813);
+            int i2 = R.id.accept_gift_body_container;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(R.id.accept_gift_body_container);
             if (linearLayout != null) {
-                i2 = 2131361814;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131361814);
+                i2 = R.id.accept_gift_body_image;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(R.id.accept_gift_body_image);
                 if (simpleDraweeView != null) {
-                    i2 = 2131361815;
-                    TextView textView = (TextView) view2.findViewById(2131361815);
+                    i2 = R.id.accept_gift_body_text;
+                    TextView textView = (TextView) view2.findViewById(R.id.accept_gift_body_text);
                     if (textView != null) {
-                        i2 = 2131361816;
-                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131361816);
+                        i2 = R.id.accept_gift_confirm;
+                        MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.accept_gift_confirm);
                         if (materialButton != null) {
-                            i2 = 2131361817;
-                            LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(2131361817);
+                            i2 = R.id.accept_gift_disclaimer_container;
+                            LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(R.id.accept_gift_disclaimer_container);
                             if (linearLayout2 != null) {
-                                i2 = 2131361818;
-                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(2131361818);
+                                i2 = R.id.accept_gift_disclaimer_text;
+                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(R.id.accept_gift_disclaimer_text);
                                 if (linkifiedTextView != null) {
-                                    i2 = 2131361819;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131361819);
+                                    i2 = R.id.accept_gift_flipper;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(R.id.accept_gift_flipper);
                                     if (appViewFlipper != null) {
-                                        i2 = 2131361820;
-                                        TextView textView2 = (TextView) view2.findViewById(2131361820);
+                                        i2 = R.id.accept_gift_header;
+                                        TextView textView2 = (TextView) view2.findViewById(R.id.accept_gift_header);
                                         if (textView2 != null) {
-                                            i2 = 2131361821;
-                                            ProgressBar progressBar = (ProgressBar) view2.findViewById(2131361821);
+                                            i2 = R.id.accept_gift_progress;
+                                            ProgressBar progressBar = (ProgressBar) view2.findViewById(R.id.accept_gift_progress);
                                             if (progressBar != null) {
                                                 return new e4((LinearLayout) view2, linearLayout, simpleDraweeView, textView, materialButton, linearLayout2, linkifiedTextView, appViewFlipper, textView2, progressBar);
                                             }
@@ -216,14 +218,14 @@ public final class c extends AppDialog {
                             str = "";
                         }
                         CharSequence i2 = cVar2.i(gift);
-                        LinearLayout linearLayout = c.d.b.a.a.e0(c.d.b.a.a.e0(cVar2.h().h, "binding.acceptGiftHeader", gift.isAnyNitroGift() ? c.a.l.b.k(cVar2, 2131889080, new Object[]{str}, null, 4) : c.a.l.b.k(cVar2, 2131889079, new Object[0], null, 4), cVar2).f91c, "binding.acceptGiftBodyText", gift.isNitroClassicGift() ? c.a.l.b.k(cVar2, 2131889061, new Object[]{i2}, null, 4) : gift.isNitroGift() ? c.a.l.b.k(cVar2, 2131889062, new Object[]{i2}, null, 4) : c.a.l.b.k(cVar2, 2131889060, new Object[]{str}, null, 4), cVar2).e;
+                        LinearLayout linearLayout = c.d.b.a.a.e0(c.d.b.a.a.e0(cVar2.h().h, "binding.acceptGiftHeader", gift.isAnyNitroGift() ? c.a.l.b.k(cVar2, R.string.gift_confirmation_header_success_nitro, new Object[]{str}, null, 4) : c.a.l.b.k(cVar2, R.string.gift_confirmation_header_success, new Object[0], null, 4), cVar2).f91c, "binding.acceptGiftBodyText", gift.isNitroClassicGift() ? c.a.l.b.k(cVar2, R.string.gift_confirmation_body_success_nitro_classic_mobile, new Object[]{i2}, null, 4) : gift.isNitroGift() ? c.a.l.b.k(cVar2, R.string.gift_confirmation_body_success_nitro_mobile, new Object[]{i2}, null, 4) : c.a.l.b.k(cVar2, R.string.gift_confirmation_body_success_mobile, new Object[]{str}, null, 4), cVar2).e;
                         m.checkNotNullExpressionValue(linearLayout, "binding.acceptGiftDisclaimerContainer");
                         linearLayout.setVisibility(8);
                         MaterialButton materialButton = cVar2.h().d;
                         m.checkNotNullExpressionValue(materialButton, "binding.acceptGiftConfirm");
                         Context context = cVar2.getContext();
                         if (context != null) {
-                            charSequence = context.getText(2131889075);
+                            charSequence = context.getText(R.string.gift_confirmation_button_success_mobile);
                         }
                         materialButton.setText(charSequence);
                         cVar2.h().d.setOnClickListener(new d(cVar2));
@@ -234,16 +236,16 @@ public final class c extends AppDialog {
                         cVar3.g(gift2);
                         TextView textView = cVar3.h().h;
                         m.checkNotNullExpressionValue(textView, "binding.acceptGiftHeader");
-                        c.a.l.b.n(textView, 2131889078, new Object[0], null, 4);
+                        c.a.l.b.n(textView, R.string.gift_confirmation_header_fail, new Object[0], null, 4);
                         TextView textView2 = cVar3.h().f91c;
                         m.checkNotNullExpressionValue(textView2, "binding.acceptGiftBodyText");
-                        c.a.l.b.n(textView2, 2131889045, new Object[0], null, 4);
+                        c.a.l.b.n(textView2, R.string.gift_confirmation_body_claimed, new Object[0], null, 4);
                         LinearLayout linearLayout2 = cVar3.h().e;
                         m.checkNotNullExpressionValue(linearLayout2, "binding.acceptGiftDisclaimerContainer");
                         linearLayout2.setVisibility(8);
                         MaterialButton materialButton2 = cVar3.h().d;
                         m.checkNotNullExpressionValue(materialButton2, "binding.acceptGiftConfirm");
-                        c.a.l.b.n(materialButton2, 2131889071, new Object[0], null, 4);
+                        c.a.l.b.n(materialButton2, R.string.gift_confirmation_button_fail, new Object[0], null, 4);
                         cVar3.h().d.setOnClickListener(new e(cVar3));
                     } else {
                         c cVar4 = this.this$0;
@@ -252,7 +254,7 @@ public final class c extends AppDialog {
                         cVar4.g(gift3);
                         ModelStoreListing storeListing2 = gift3.getStoreListing();
                         String name = (storeListing2 == null || (sku2 = storeListing2.getSku()) == null) ? null : sku2.getName();
-                        LinearLayout linearLayout3 = c.d.b.a.a.e0(c.d.b.a.a.e0(cVar4.h().h, "binding.acceptGiftHeader", gift3.isAnyNitroGift() ? c.a.l.b.k(cVar4, 2131889077, new Object[]{name}, null, 4) : c.a.l.b.k(cVar4, 2131889076, new Object[0], null, 4), cVar4).f91c, "binding.acceptGiftBodyText", gift3.isAnyNitroGift() ? c.a.l.b.k(cVar4, 2131889047, new Object[]{name, cVar4.i(gift3)}, null, 4) : c.a.l.b.k(cVar4, 2131889046, new Object[]{name}, null, 4), cVar4).e;
+                        LinearLayout linearLayout3 = c.d.b.a.a.e0(c.d.b.a.a.e0(cVar4.h().h, "binding.acceptGiftHeader", gift3.isAnyNitroGift() ? c.a.l.b.k(cVar4, R.string.gift_confirmation_header_confirm_nitro, new Object[]{name}, null, 4) : c.a.l.b.k(cVar4, R.string.gift_confirmation_header_confirm, new Object[0], null, 4), cVar4).f91c, "binding.acceptGiftBodyText", gift3.isAnyNitroGift() ? c.a.l.b.k(cVar4, R.string.gift_confirmation_body_confirm_nitro, new Object[]{name, cVar4.i(gift3)}, null, 4) : c.a.l.b.k(cVar4, R.string.gift_confirmation_body_confirm, new Object[]{name}, null, 4), cVar4).e;
                         m.checkNotNullExpressionValue(linearLayout3, "binding.acceptGiftDisclaimerContainer");
                         if (!gift3.isAnyNitroGift()) {
                             i = 8;
@@ -262,7 +264,7 @@ public final class c extends AppDialog {
                         m.checkNotNullExpressionValue(materialButton3, "binding.acceptGiftConfirm");
                         Context context2 = cVar4.getContext();
                         if (context2 != null) {
-                            charSequence = context2.getText(2131889069);
+                            charSequence = context2.getText(R.string.gift_confirmation_button_confirm_mobile);
                         }
                         materialButton3.setText(charSequence);
                         cVar4.h().d.setOnClickListener(new f(gift3));
@@ -280,7 +282,7 @@ public final class c extends AppDialog {
                     ProgressBar progressBar = cVar5.h().i;
                     m.checkNotNullExpressionValue(progressBar, "binding.acceptGiftProgress");
                     progressBar.setVisibility(0);
-                    LinearLayout linearLayout4 = c.d.b.a.a.e0(c.d.b.a.a.e0(cVar5.h().h, "binding.acceptGiftHeader", gift4.isAnyNitroGift() ? c.a.l.b.k(cVar5, 2131889077, new Object[]{name2}, null, 4) : c.a.l.b.k(cVar5, 2131889076, new Object[0], null, 4), cVar5).f91c, "binding.acceptGiftBodyText", gift4.isAnyNitroGift() ? c.a.l.b.k(cVar5, 2131889047, new Object[]{name2, cVar5.i(gift4)}, null, 4) : c.a.l.b.k(cVar5, 2131889046, new Object[]{name2}, null, 4), cVar5).e;
+                    LinearLayout linearLayout4 = c.d.b.a.a.e0(c.d.b.a.a.e0(cVar5.h().h, "binding.acceptGiftHeader", gift4.isAnyNitroGift() ? c.a.l.b.k(cVar5, R.string.gift_confirmation_header_confirm_nitro, new Object[]{name2}, null, 4) : c.a.l.b.k(cVar5, R.string.gift_confirmation_header_confirm, new Object[0], null, 4), cVar5).f91c, "binding.acceptGiftBodyText", gift4.isAnyNitroGift() ? c.a.l.b.k(cVar5, R.string.gift_confirmation_body_confirm_nitro, new Object[]{name2, cVar5.i(gift4)}, null, 4) : c.a.l.b.k(cVar5, R.string.gift_confirmation_body_confirm, new Object[]{name2}, null, 4), cVar5).e;
                     m.checkNotNullExpressionValue(linearLayout4, "binding.acceptGiftDisclaimerContainer");
                     if (!gift4.isAnyNitroGift()) {
                         i = 8;
@@ -294,38 +296,38 @@ public final class c extends AppDialog {
                     cVar6.g(redeemedFailed.getGift());
                     TextView textView3 = cVar6.h().h;
                     m.checkNotNullExpressionValue(textView3, "binding.acceptGiftHeader");
-                    textView3.setText(c.a.l.b.k(cVar6, 2131889078, new Object[0], null, 4));
+                    textView3.setText(c.a.l.b.k(cVar6, R.string.gift_confirmation_header_fail, new Object[0], null, 4));
                     TextView textView4 = cVar6.h().f91c;
                     m.checkNotNullExpressionValue(textView4, "binding.acceptGiftBodyText");
-                    c.a.l.b.n(textView4, 2131889067, new Object[0], null, 4);
+                    c.a.l.b.n(textView4, R.string.gift_confirmation_body_unknown_error, new Object[0], null, 4);
                     if (redeemedFailed.getCanRetry()) {
                         TextView textView5 = cVar6.h().f91c;
                         m.checkNotNullExpressionValue(textView5, "binding.acceptGiftBodyText");
-                        c.a.l.b.n(textView5, 2131889067, new Object[0], null, 4);
+                        c.a.l.b.n(textView5, R.string.gift_confirmation_body_unknown_error, new Object[0], null, 4);
                         MaterialButton materialButton5 = cVar6.h().d;
                         m.checkNotNullExpressionValue(materialButton5, "binding.acceptGiftConfirm");
                         Context context3 = cVar6.getContext();
                         if (context3 != null) {
-                            charSequence = context3.getText(2131893034);
+                            charSequence = context3.getText(R.string.retry);
                         }
                         materialButton5.setText(charSequence);
                         cVar6.h().d.setOnClickListener(new f(0, redeemedFailed));
                     } else {
                         Integer errorCode = redeemedFailed.getErrorCode();
                         if (errorCode != null && errorCode.intValue() == 50054) {
-                            cVar6.h().f91c.setText(2131889054);
+                            cVar6.h().f91c.setText(R.string.gift_confirmation_body_self_gift_no_payment);
                         } else if (errorCode != null && errorCode.intValue() == 100024) {
-                            cVar6.h().f91c.setText(2131889050);
+                            cVar6.h().f91c.setText(R.string.gift_confirmation_body_error_nitro_upgrade_downgrade);
                         } else if (errorCode != null && errorCode.intValue() == 100022) {
-                            cVar6.h().f91c.setText(2131889051);
+                            cVar6.h().f91c.setText(R.string.gift_confirmation_body_error_subscription_managed);
                         } else if (errorCode != null && errorCode.intValue() == 100025) {
-                            cVar6.h().f91c.setText(2131889049);
+                            cVar6.h().f91c.setText(R.string.gift_confirmation_body_error_invoice_open);
                         }
                         MaterialButton materialButton6 = cVar6.h().d;
                         m.checkNotNullExpressionValue(materialButton6, "binding.acceptGiftConfirm");
                         Context context4 = cVar6.getContext();
                         if (context4 != null) {
-                            charSequence = context4.getText(2131889071);
+                            charSequence = context4.getText(R.string.gift_confirmation_button_fail);
                         }
                         materialButton6.setText(charSequence);
                         cVar6.h().d.setOnClickListener(new f(1, cVar6));
@@ -339,7 +341,7 @@ public final class c extends AppDialog {
     }
 
     public c() {
-        super(2131558861);
+        super(R.layout.widget_accept_gift_dialog);
     }
 
     public final void g(ModelGift modelGift) {
@@ -386,9 +388,9 @@ public final class c extends AppDialog {
         }
         int ordinal = subscriptionPlan.b().ordinal();
         if (ordinal == 0) {
-            i2 = 2131755118;
+            i2 = R.plurals.gift_confirmation_nitro_time_frame_months_time;
         } else if (ordinal == 1) {
-            i2 = 2131755119;
+            i2 = R.plurals.gift_confirmation_nitro_time_frame_years_time;
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -397,10 +399,10 @@ public final class c extends AppDialog {
         CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext, i2, subscriptionPlan.c(), Integer.valueOf(subscriptionPlan.c()));
         int ordinal2 = subscriptionPlan.b().ordinal();
         if (ordinal2 == 0) {
-            return c.a.l.b.k(this, 2131889081, new Object[]{i18nPluralString}, null, 4);
+            return c.a.l.b.k(this, R.string.gift_confirmation_nitro_time_frame_months, new Object[]{i18nPluralString}, null, 4);
         }
         if (ordinal2 == 1) {
-            return c.a.l.b.k(this, 2131889082, new Object[]{i18nPluralString}, null, 4);
+            return c.a.l.b.k(this, R.string.gift_confirmation_nitro_time_frame_years, new Object[]{i18nPluralString}, null, 4);
         }
         throw new NoWhenBranchMatchedException();
     }
@@ -434,7 +436,7 @@ public final class c extends AppDialog {
         }
         LinkifiedTextView linkifiedTextView = h().f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.acceptGiftDisclaimerText");
-        c.a.l.b.n(linkifiedTextView, 2131889048, new Object[]{f.a.a(360055386693L, null)}, null, 4);
+        c.a.l.b.n(linkifiedTextView, R.string.gift_confirmation_body_confirm_nitro_disclaimer, new Object[]{f.a.a(360055386693L, null)}, null, 4);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getGifting().requestGift(string), this, null, 2, null), c.class, (Context) null, (Function1) null, new C0023c(this), (Function0) null, (Function0) null, new d(this), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/c/a/e/e.java b/app/src/main/java/c/a/e/e.java
index f0d296f048..10242f2f53 100644
--- a/app/src/main/java/c/a/e/e.java
+++ b/app/src/main/java/c/a/e/e.java
@@ -1,6 +1,7 @@
 package c.a.e;
 
 import c.a.l.b;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -21,9 +22,9 @@ public final class e extends o implements Function1<Exception, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(Exception exc) {
         Exception exc2 = exc;
-        m.checkNotNullParameter(exc2, "e");
+        m.checkNotNullParameter(exc2, c.a.r.n0.c.e.a);
         AppFragment appFragment = this.this$0.this$0;
-        o.j(appFragment, b.k(appFragment, 2131894482, new Object[]{exc2.getMessage()}, null, 4), 0, 4);
+        o.j(appFragment, b.k(appFragment, R.string.unable_to_open_media_chooser, new Object[]{exc2.getMessage()}, null, 4), 0, 4);
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/e/f.java b/app/src/main/java/c/a/e/f.java
index 48cd58f40c..625e0604f8 100644
--- a/app/src/main/java/c/a/e/f.java
+++ b/app/src/main/java/c/a/e/f.java
@@ -3,6 +3,7 @@ package c.a.e;
 import android.annotation.SuppressLint;
 import c.d.b.a.a;
 import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.util.Objects;
 /* compiled from: AppHelpDesk.kt */
@@ -26,7 +27,7 @@ public final class f {
             O.append(b());
             O.append("/articles/");
             O.append(j);
-            O.append('#');
+            O.append(MentionUtilsKt.CHANNELS_CHAR);
             O.append(str);
             return O.toString();
         }
diff --git a/app/src/main/java/c/a/e/j.java b/app/src/main/java/c/a/e/j.java
index 4e4b002fbb..418fb85fdb 100644
--- a/app/src/main/java/c/a/e/j.java
+++ b/app/src/main/java/c/a/e/j.java
@@ -6,7 +6,9 @@ import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.MainThread;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.core.content.ContextCompat;
+import com.discord.R;
 import com.discord.app.AppPermissionsRequests;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.time.ClockFactory;
@@ -86,7 +88,7 @@ public final class j implements AppPermissionsRequests {
             m.checkNotNullParameter(map, "it");
             Function0 function0 = this.$onFailure;
             if (function0 == null || ((Unit) function0.mo1invoke()) == null) {
-                j.a(this.this$0, 2131892203);
+                j.a(this.this$0, R.string.permission_qr_scanner_denied);
             }
             return Unit.a;
         }
@@ -127,7 +129,7 @@ public final class j implements AppPermissionsRequests {
         @Override // kotlin.jvm.functions.Function1
         public Unit invoke(Map<String, ? extends Boolean> map) {
             m.checkNotNullParameter(map, "it");
-            j.a(this.this$0, 2131892196);
+            j.a(this.this$0, R.string.permission_media_denied);
             return Unit.a;
         }
     }
@@ -147,7 +149,7 @@ public final class j implements AppPermissionsRequests {
         @Override // kotlin.jvm.functions.Function1
         public Unit invoke(Map<String, ? extends Boolean> map) {
             m.checkNotNullParameter(map, "it");
-            j.a(this.this$0, 2131892197);
+            j.a(this.this$0, R.string.permission_media_download_denied);
             return Unit.a;
         }
     }
@@ -196,7 +198,7 @@ public final class j implements AppPermissionsRequests {
             m.checkNotNullParameter(map, "it");
             Function0 function0 = this.$onFailure;
             if (function0 == null || ((Unit) function0.mo1invoke()) == null) {
-                j.a(this.this$0, 2131892198);
+                j.a(this.this$0, R.string.permission_microphone_denied);
             }
             return Unit.a;
         }
@@ -223,16 +225,16 @@ public final class j implements AppPermissionsRequests {
                 obj = Boolean.FALSE;
             }
             if (!((Boolean) obj).booleanValue()) {
-                j.a(this.this$0, 2131892198);
+                j.a(this.this$0, R.string.permission_microphone_denied);
             } else {
                 Object obj2 = map2.get("android.permission.CAMERA");
                 if (obj2 == null) {
                     obj2 = Boolean.FALSE;
                 }
                 if (!((Boolean) obj2).booleanValue()) {
-                    j.a(this.this$0, 2131891713);
+                    j.a(this.this$0, R.string.no_camera_access);
                 } else {
-                    j.a(this.this$0, 2131891713);
+                    j.a(this.this$0, R.string.no_camera_access);
                 }
             }
             return Unit.a;
@@ -251,7 +253,7 @@ public final class j implements AppPermissionsRequests {
     }
 
     public j(ComponentActivity componentActivity) {
-        m.checkNotNullParameter(componentActivity, "activity");
+        m.checkNotNullParameter(componentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         this.o = componentActivity;
         ActivityResultLauncher<String[]> registerForActivityResult = componentActivity.registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new b(this));
         m.checkNotNullExpressionValue(registerForActivityResult, "activity.registerForActi…rtTimeMillis = 0L\n      }");
diff --git a/app/src/main/java/c/a/e/o.java b/app/src/main/java/c/a/e/o.java
index 9c8ac23ecb..8546657b8b 100644
--- a/app/src/main/java/c/a/e/o.java
+++ b/app/src/main/java/c/a/e/o.java
@@ -7,7 +7,9 @@ import android.view.ContextThemeWrapper;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
+import com.discord.R;
 import com.discord.utilities.view.ToastManager;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
 import com.facebook.drawee.span.DraweeSpanStringBuilder;
@@ -16,7 +18,7 @@ import d0.z.d.m;
 public final class o {
     public static final void a(Context context, CharSequence charSequence, int i) {
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         String string = context.getString(i);
         m.checkNotNullExpressionValue(string, "context.getString(toastResId)");
         b(context, charSequence, string);
@@ -24,7 +26,7 @@ public final class o {
 
     public static final void b(Context context, CharSequence charSequence, CharSequence charSequence2) {
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         m.checkNotNullParameter(charSequence2, "toastText");
         Object systemService = context.getSystemService("clipboard");
         if (!(systemService instanceof ClipboardManager)) {
@@ -40,7 +42,7 @@ public final class o {
 
     public static /* synthetic */ void c(Context context, CharSequence charSequence, int i, int i2) {
         if ((i2 & 4) != 0) {
-            i = 2131887645;
+            i = R.string.copied_text;
         }
         a(context, charSequence, i);
     }
@@ -53,7 +55,7 @@ public final class o {
         SimpleDraweeSpanTextView simpleDraweeSpanTextView;
         if (context != null) {
             Toast toast = new Toast(context);
-            ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(context, 2131952584);
+            ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(context, (int) R.style.UiKit_Toast);
             if (charSequence instanceof DraweeSpanStringBuilder) {
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = new SimpleDraweeSpanTextView(contextThemeWrapper);
                 simpleDraweeSpanTextView2.setDraweeSpanStringBuilder((DraweeSpanStringBuilder) charSequence);
diff --git a/app/src/main/java/c/a/e/o0/b.java b/app/src/main/java/c/a/e/o0/b.java
index c4de62d848..ea95ab705c 100644
--- a/app/src/main/java/c/a/e/o0/b.java
+++ b/app/src/main/java/c/a/e/o0/b.java
@@ -1,6 +1,7 @@
 package c.a.e.o0;
 
 import android.net.Uri;
+import com.discord.BuildConfig;
 import d0.g0.i;
 import d0.g0.t;
 import d0.z.d.m;
@@ -53,15 +54,15 @@ public final class b {
     static {
         b bVar = new b();
         F = bVar;
-        String b2 = bVar.b("https://discord.com");
+        String b2 = bVar.b(BuildConfig.HOST);
         a = b2;
-        String b3 = bVar.b("https://discordapp.com");
+        String b3 = bVar.b(BuildConfig.HOST_ALTERNATE);
         b = b3;
-        String b4 = bVar.b("https://discord.gift");
+        String b4 = bVar.b(BuildConfig.HOST_GIFT);
         f49c = b4;
-        String b5 = bVar.b("https://discord.gg");
+        String b5 = bVar.b(BuildConfig.HOST_INVITE);
         d = b5;
-        String b6 = bVar.b("https://discord.new");
+        String b6 = bVar.b(BuildConfig.HOST_GUILD_TEMPLATE);
         e = b6;
         String replace$default = t.replace$default(b2, ".", "\\.", false, 4, (Object) null);
         f = replace$default;
diff --git a/app/src/main/java/c/a/e/q.java b/app/src/main/java/c/a/e/q.java
index 2cf2bf7a57..c155ca674e 100644
--- a/app/src/main/java/c/a/e/q.java
+++ b/app/src/main/java/c/a/e/q.java
@@ -1,6 +1,7 @@
 package c.a.e;
 
 import android.content.Context;
+import androidx.core.app.NotificationCompat;
 import com.discord.app.AppFragment;
 import com.discord.utilities.error.Error;
 import d0.t.h0;
@@ -85,7 +86,7 @@ public final class q {
     /* compiled from: AppTransformers.kt */
     public static final /* synthetic */ class e extends k implements Function1<T, Unit> {
         public e(Action1 action1) {
-            super(1, action1, Action1.class, "call", "call(Ljava/lang/Object;)V", 0);
+            super(1, action1, Action1.class, NotificationCompat.CATEGORY_CALL, "call(Ljava/lang/Object;)V", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -99,7 +100,7 @@ public final class q {
     /* compiled from: AppTransformers.kt */
     public static final /* synthetic */ class f extends k implements Function1<T, Unit> {
         public f(Action1 action1) {
-            super(1, action1, Action1.class, "call", "call(Ljava/lang/Object;)V", 0);
+            super(1, action1, Action1.class, NotificationCompat.CATEGORY_CALL, "call(Ljava/lang/Object;)V", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/c/a/e/w.java b/app/src/main/java/c/a/e/w.java
index 7910772016..339687d558 100644
--- a/app/src/main/java/c/a/e/w.java
+++ b/app/src/main/java/c/a/e/w.java
@@ -1,5 +1,6 @@
 package c.a.e;
 
+import androidx.core.app.NotificationCompat;
 import d0.z.d.k;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -7,7 +8,7 @@ import rx.functions.Action1;
 /* compiled from: AppTransformers.kt */
 public final /* synthetic */ class w extends k implements Function1<T, Unit> {
     public w(Action1 action1) {
-        super(1, action1, Action1.class, "call", "call(Ljava/lang/Object;)V", 0);
+        super(1, action1, Action1.class, NotificationCompat.CATEGORY_CALL, "call(Ljava/lang/Object;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/c/a/f/b.java b/app/src/main/java/c/a/f/b.java
index 166d146706..808d8c27a8 100644
--- a/app/src/main/java/c/a/f/b.java
+++ b/app/src/main/java/c/a/f/b.java
@@ -3,6 +3,7 @@ package c.a.f;
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
+import androidx.appcompat.widget.ActivityChooserModel;
 import d0.z.d.m;
 import j0.l.e.j;
 import java.util.concurrent.TimeUnit;
@@ -20,12 +21,12 @@ public final class b implements Application.ActivityLifecycleCallbacks {
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityCreated(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityDestroyed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     /* JADX WARN: Multi-variable type inference failed */
@@ -33,7 +34,7 @@ public final class b implements Application.ActivityLifecycleCallbacks {
     /* JADX WARNING: Unknown variable types count: 1 */
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityPaused(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         d dVar = d.d;
         Function1 function1 = this.i;
         Observable q = new j(Boolean.TRUE).q(2000, TimeUnit.MILLISECONDS);
@@ -46,7 +47,7 @@ public final class b implements Application.ActivityLifecycleCallbacks {
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityResumed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         d dVar = d.d;
         d.a = false;
         Subscription subscription = d.f54c;
@@ -58,17 +59,17 @@ public final class b implements Application.ActivityLifecycleCallbacks {
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(bundle, "bundle");
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityStarted(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityStopped(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 }
diff --git a/app/src/main/java/c/a/i/a.java b/app/src/main/java/c/a/i/a.java
index fe41163b29..240f3a0c88 100644
--- a/app/src/main/java/c/a/i/a.java
+++ b/app/src/main/java/c/a/i/a.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
+import androidx.browser.customtabs.CustomTabsService;
 import d0.t.u;
 import d0.z.d.m;
 import java.util.ArrayList;
@@ -25,7 +26,7 @@ public final class a {
         m.checkNotNullExpressionValue(queryIntentActivities, "packageManager.queryInte…ltViewIntentHandler(), 0)");
         ArrayList arrayList = new ArrayList();
         for (ResolveInfo resolveInfo : queryIntentActivities) {
-            Intent intent = new Intent().setAction("android.support.customtabs.action.CustomTabsService").setPackage(resolveInfo.activityInfo.packageName);
+            Intent intent = new Intent().setAction(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION).setPackage(resolveInfo.activityInfo.packageName);
             m.checkNotNullExpressionValue(intent, "Intent()\n            .se…activityInfo.packageName)");
             String str = context.getPackageManager().resolveService(intent, 0) != null ? resolveInfo.activityInfo.packageName : null;
             if (str != null) {
diff --git a/app/src/main/java/c/a/i/b.java b/app/src/main/java/c/a/i/b.java
index 587d5b6f26..b2c40b707a 100644
--- a/app/src/main/java/c/a/i/b.java
+++ b/app/src/main/java/c/a/i/b.java
@@ -5,8 +5,10 @@ import android.net.Uri;
 import android.os.Bundle;
 import androidx.browser.customtabs.CustomTabsCallback;
 import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsService;
 import androidx.browser.customtabs.CustomTabsServiceConnection;
 import androidx.browser.customtabs.CustomTabsSession;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.o;
 import d0.t.u;
 import d0.z.d.m;
@@ -25,7 +27,7 @@ public final class b extends CustomTabsServiceConnection {
 
     @Override // androidx.browser.customtabs.CustomTabsServiceConnection
     public void onCustomTabsServiceConnected(ComponentName componentName, CustomTabsClient customTabsClient) {
-        m.checkNotNullParameter(componentName, "name");
+        m.checkNotNullParameter(componentName, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(customTabsClient, "client");
         customTabsClient.warmup(0);
         CustomTabsSession newSession = customTabsClient.newSession(new CustomTabsCallback());
@@ -35,7 +37,7 @@ public final class b extends CustomTabsServiceConnection {
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(drop, 10));
             for (Uri uri2 : drop) {
                 Bundle bundle = new Bundle();
-                bundle.putParcelable("android.support.customtabs.otherurls.URL", uri2);
+                bundle.putParcelable(CustomTabsService.KEY_URL, uri2);
                 arrayList.add(bundle);
             }
             newSession.mayLaunchUrl(uri, Bundle.EMPTY, arrayList);
diff --git a/app/src/main/java/c/a/j/b3.java b/app/src/main/java/c/a/j/b3.java
index bacdeb09f0..fb5c223067 100644
--- a/app/src/main/java/c/a/j/b3.java
+++ b/app/src/main/java/c/a/j/b3.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 /* compiled from: ViewServerMemberCountBinding */
 public final class b3 implements ViewBinding {
     @NonNull
@@ -31,17 +32,17 @@ public final class b3 implements ViewBinding {
 
     @NonNull
     public static b3 a(@NonNull View view) {
-        int i = 2131363907;
-        ImageView imageView = (ImageView) view.findViewById(2131363907);
+        int i = R.id.item_invite_online_dot;
+        ImageView imageView = (ImageView) view.findViewById(R.id.item_invite_online_dot);
         if (imageView != null) {
-            i = 2131363908;
-            TextView textView = (TextView) view.findViewById(2131363908);
+            i = R.id.item_invite_online_text;
+            TextView textView = (TextView) view.findViewById(R.id.item_invite_online_text);
             if (textView != null) {
-                i = 2131363909;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363909);
+                i = R.id.item_invite_total_member_dot;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.item_invite_total_member_dot);
                 if (imageView2 != null) {
-                    i = 2131363910;
-                    TextView textView2 = (TextView) view.findViewById(2131363910);
+                    i = R.id.item_invite_total_member_text;
+                    TextView textView2 = (TextView) view.findViewById(R.id.item_invite_total_member_text);
                     if (textView2 != null) {
                         return new b3((LinearLayout) view, imageView, textView, imageView2, textView2);
                     }
diff --git a/app/src/main/java/c/a/j/g0.java b/app/src/main/java/c/a/j/g0.java
index 799690866c..fed6422e3c 100644
--- a/app/src/main/java/c/a/j/g0.java
+++ b/app/src/main/java/c/a/j/g0.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
 /* compiled from: LayoutContactSyncToggleInfoBinding */
@@ -26,14 +27,14 @@ public final class g0 implements ViewBinding {
 
     @NonNull
     public static g0 a(@NonNull View view) {
-        int i = 2131362744;
-        TextView textView = (TextView) view.findViewById(2131362744);
+        int i = R.id.contact_sync_discovery_info_1;
+        TextView textView = (TextView) view.findViewById(R.id.contact_sync_discovery_info_1);
         if (textView != null) {
-            i = 2131362745;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362745);
+            i = R.id.contact_sync_discovery_info_2;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.contact_sync_discovery_info_2);
             if (linkifiedTextView != null) {
-                i = 2131362746;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362746);
+                i = R.id.contact_sync_discovery_toggle;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.contact_sync_discovery_toggle);
                 if (checkedSetting != null) {
                     return new g0((LinearLayout) view, textView, linkifiedTextView, checkedSetting);
                 }
diff --git a/app/src/main/java/c/a/j/i0.java b/app/src/main/java/c/a/j/i0.java
index 8ac9e0b0af..84b0169a7f 100644
--- a/app/src/main/java/c/a/j/i0.java
+++ b/app/src/main/java/c/a/j/i0.java
@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 /* compiled from: LayoutIconUploaderBinding */
 public final class i0 implements ViewBinding {
@@ -27,23 +28,23 @@ public final class i0 implements ViewBinding {
 
     @NonNull
     public static i0 a(@NonNull View view) {
-        int i = 2131363736;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363736);
+        int i = R.id.icon_uploader_image;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.icon_uploader_image);
         if (simpleDraweeView != null) {
-            i = 2131363737;
-            ImageView imageView = (ImageView) view.findViewById(2131363737);
+            i = R.id.icon_uploader_placeholder_border;
+            ImageView imageView = (ImageView) view.findViewById(R.id.icon_uploader_placeholder_border);
             if (imageView != null) {
-                i = 2131363738;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363738);
+                i = R.id.icon_uploader_placeholder_icon;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.icon_uploader_placeholder_icon);
                 if (imageView2 != null) {
-                    i = 2131363739;
-                    TextView textView = (TextView) view.findViewById(2131363739);
+                    i = R.id.icon_uploader_placeholder_text;
+                    TextView textView = (TextView) view.findViewById(R.id.icon_uploader_placeholder_text);
                     if (textView != null) {
-                        i = 2131363740;
-                        ImageView imageView3 = (ImageView) view.findViewById(2131363740);
+                        i = R.id.icon_uploader_plus;
+                        ImageView imageView3 = (ImageView) view.findViewById(R.id.icon_uploader_plus);
                         if (imageView3 != null) {
-                            i = 2131364447;
-                            Group group = (Group) view.findViewById(2131364447);
+                            i = R.id.placeholder_group;
+                            Group group = (Group) view.findViewById(R.id.placeholder_group);
                             if (group != null) {
                                 return new i0((ConstraintLayout) view, simpleDraweeView, imageView, imageView2, textView, imageView3, group);
                             }
diff --git a/app/src/main/java/c/a/j/j4.java b/app/src/main/java/c/a/j/j4.java
index e44c85f249..11a5f127c5 100644
--- a/app/src/main/java/c/a/j/j4.java
+++ b/app/src/main/java/c/a/j/j4.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 /* compiled from: WidgetChannelSettingsDeleteBinding */
 public final class j4 implements ViewBinding {
@@ -34,19 +35,19 @@ public final class j4 implements ViewBinding {
 
     @NonNull
     public static j4 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558910, (ViewGroup) null, false);
+        View inflate = layoutInflater.inflate(R.layout.widget_channel_settings_delete, (ViewGroup) null, false);
         if (!z2) {
-            int i = 2131362365;
-            TextView textView = (TextView) inflate.findViewById(2131362365);
+            int i = R.id.channel_settings_delete_body;
+            TextView textView = (TextView) inflate.findViewById(R.id.channel_settings_delete_body);
             if (textView != null) {
-                i = 2131362366;
-                MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362366);
+                i = R.id.channel_settings_delete_cancel;
+                MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.channel_settings_delete_cancel);
                 if (materialButton != null) {
-                    i = 2131362367;
-                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131362367);
+                    i = R.id.channel_settings_delete_confirm;
+                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.channel_settings_delete_confirm);
                     if (materialButton2 != null) {
-                        i = 2131362368;
-                        TextView textView2 = (TextView) inflate.findViewById(2131362368);
+                        i = R.id.channel_settings_delete_title;
+                        TextView textView2 = (TextView) inflate.findViewById(R.id.channel_settings_delete_title);
                         if (textView2 != null) {
                             return new j4((LinearLayout) inflate, textView, materialButton, materialButton2, textView2);
                         }
diff --git a/app/src/main/java/c/a/j/m1.java b/app/src/main/java/c/a/j/m1.java
index 933b944a79..19a0c257f6 100644
--- a/app/src/main/java/c/a/j/m1.java
+++ b/app/src/main/java/c/a/j/m1.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 /* compiled from: ThreadBrowserEmptyBinding */
 public final class m1 implements ViewBinding {
@@ -30,17 +31,17 @@ public final class m1 implements ViewBinding {
     @NonNull
     public static m1 a(@NonNull View view) {
         ConstraintLayout constraintLayout = (ConstraintLayout) view;
-        int i = 2131365493;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365493);
+        int i = R.id.thread_browser_empty_create_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.thread_browser_empty_create_button);
         if (materialButton != null) {
-            i = 2131365494;
-            TextView textView = (TextView) view.findViewById(2131365494);
+            i = R.id.thread_browser_empty_heading;
+            TextView textView = (TextView) view.findViewById(R.id.thread_browser_empty_heading);
             if (textView != null) {
-                i = 2131365495;
-                TextView textView2 = (TextView) view.findViewById(2131365495);
+                i = R.id.thread_browser_empty_subheading;
+                TextView textView2 = (TextView) view.findViewById(R.id.thread_browser_empty_subheading);
                 if (textView2 != null) {
-                    i = 2131365519;
-                    ImageView imageView = (ImageView) view.findViewById(2131365519);
+                    i = R.id.thread_icon;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.thread_icon);
                     if (imageView != null) {
                         return new m1(constraintLayout, constraintLayout, materialButton, textView, textView2, imageView);
                     }
diff --git a/app/src/main/java/c/a/j/q4.java b/app/src/main/java/c/a/j/q4.java
index b089fd39e5..6cb524cf42 100644
--- a/app/src/main/java/c/a/j/q4.java
+++ b/app/src/main/java/c/a/j/q4.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.widgets.botuikit.views.ActionRowComponentView;
 import com.google.android.flexbox.FlexboxLayout;
 /* compiled from: WidgetChatListBotUiActionRowComponentBinding */
@@ -27,17 +28,17 @@ public final class q4 implements ViewBinding {
 
     @NonNull
     public static q4 a(@NonNull View view) {
-        int i = 2131361888;
-        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131361888);
+        int i = R.id.action_row_component_view_group;
+        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(R.id.action_row_component_view_group);
         if (flexboxLayout != null) {
-            i = 2131361889;
-            View findViewById = view.findViewById(2131361889);
+            i = R.id.action_row_component_view_group_error_row;
+            View findViewById = view.findViewById(R.id.action_row_component_view_group_error_row);
             if (findViewById != null) {
-                int i2 = 2131365779;
-                ImageView imageView = (ImageView) findViewById.findViewById(2131365779);
+                int i2 = R.id.view_interaction_failed_label_icon;
+                ImageView imageView = (ImageView) findViewById.findViewById(R.id.view_interaction_failed_label_icon);
                 if (imageView != null) {
-                    i2 = 2131365780;
-                    TextView textView = (TextView) findViewById.findViewById(2131365780);
+                    i2 = R.id.view_interaction_failed_label_message;
+                    TextView textView = (TextView) findViewById.findViewById(R.id.view_interaction_failed_label_message);
                     if (textView != null) {
                         return new q4((ActionRowComponentView) view, flexboxLayout, new e2((ConstraintLayout) findViewById, imageView, textView));
                     }
diff --git a/app/src/main/java/c/a/j/r4.java b/app/src/main/java/c/a/j/r4.java
index b7491d21a2..7f999e5c6f 100644
--- a/app/src/main/java/c/a/j/r4.java
+++ b/app/src/main/java/c/a/j/r4.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.views.typing.TypingDots;
 import com.discord.widgets.botuikit.views.select.SelectComponentView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -37,20 +38,20 @@ public final class r4 implements ViewBinding {
 
     @NonNull
     public static r4 a(@NonNull View view) {
-        int i = 2131364797;
-        ImageView imageView = (ImageView) view.findViewById(2131364797);
+        int i = R.id.select_component_chevron;
+        ImageView imageView = (ImageView) view.findViewById(R.id.select_component_chevron);
         if (imageView != null) {
-            i = 2131364798;
-            TypingDots typingDots = (TypingDots) view.findViewById(2131364798);
+            i = R.id.select_component_loading;
+            TypingDots typingDots = (TypingDots) view.findViewById(R.id.select_component_loading);
             if (typingDots != null) {
-                i = 2131364799;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364799);
+                i = R.id.select_component_selection_icon;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.select_component_selection_icon);
                 if (simpleDraweeView != null) {
-                    i = 2131364800;
-                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364800);
+                    i = R.id.select_component_selection_text;
+                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.select_component_selection_text);
                     if (materialTextView != null) {
-                        i = 2131364801;
-                        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131364801);
+                        i = R.id.select_component_selections_root;
+                        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(R.id.select_component_selections_root);
                         if (flexboxLayout != null) {
                             return new r4((SelectComponentView) view, imageView, typingDots, simpleDraweeView, materialTextView, flexboxLayout);
                         }
diff --git a/app/src/main/java/c/a/j/s0.java b/app/src/main/java/c/a/j/s0.java
index 9696ea5560..1081ef7a08 100644
--- a/app/src/main/java/c/a/j/s0.java
+++ b/app/src/main/java/c/a/j/s0.java
@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.textfield.TextInputLayout;
 /* compiled from: OverlayVoiceChannelSelectorBinding */
 public final class s0 implements ViewBinding {
@@ -39,25 +40,25 @@ public final class s0 implements ViewBinding {
 
     @NonNull
     public static s0 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558626, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.overlay_voice_channel_selector, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131362674;
-        ImageView imageView = (ImageView) inflate.findViewById(2131362674);
+        int i = R.id.close;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.close);
         if (imageView != null) {
             CardView cardView = (CardView) inflate;
-            i = 2131363121;
-            TextView textView = (TextView) inflate.findViewById(2131363121);
+            i = R.id.empty_results;
+            TextView textView = (TextView) inflate.findViewById(R.id.empty_results);
             if (textView != null) {
-                i = 2131364339;
-                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131364339);
+                i = R.id.overlay_channel_search;
+                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(R.id.overlay_channel_search);
                 if (textInputLayout != null) {
-                    i = 2131364658;
-                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364658);
+                    i = R.id.results_rv;
+                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.results_rv);
                     if (recyclerView != null) {
-                        i = 2131365456;
-                        TextView textView2 = (TextView) inflate.findViewById(2131365456);
+                        i = R.id.test;
+                        TextView textView2 = (TextView) inflate.findViewById(R.id.test);
                         if (textView2 != null) {
                             return new s0(cardView, imageView, cardView, textView, textInputLayout, recyclerView, textView2);
                         }
diff --git a/app/src/main/java/c/a/j/u5.java b/app/src/main/java/c/a/j/u5.java
index 6c4f323258..1b1c041ff7 100644
--- a/app/src/main/java/c/a/j/u5.java
+++ b/app/src/main/java/c/a/j/u5.java
@@ -5,6 +5,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 /* compiled from: WidgetUserProfileAdapterItemFriendMutualServerBinding */
 public final class u5 implements ViewBinding {
@@ -25,11 +26,11 @@ public final class u5 implements ViewBinding {
 
     @NonNull
     public static u5 a(@NonNull View view) {
-        int i = 2131365672;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365672);
+        int i = R.id.user_profile_adapter_item_friend_mutual_image;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.user_profile_adapter_item_friend_mutual_image);
         if (simpleDraweeView != null) {
-            i = 2131365673;
-            TextView textView = (TextView) view.findViewById(2131365673);
+            i = R.id.user_profile_adapter_item_friend_mutual_text;
+            TextView textView = (TextView) view.findViewById(R.id.user_profile_adapter_item_friend_mutual_text);
             if (textView != null) {
                 return new u5((RelativeLayout) view, simpleDraweeView, textView);
             }
diff --git a/app/src/main/java/c/a/j/v5.java b/app/src/main/java/c/a/j/v5.java
index c803b589f6..cd8fb6a328 100644
--- a/app/src/main/java/c/a/j/v5.java
+++ b/app/src/main/java/c/a/j/v5.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
 /* compiled from: WidgetUserRichPresenceBinding */
@@ -55,45 +56,45 @@ public final class v5 implements ViewBinding {
 
     @NonNull
     public static v5 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131559335, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.widget_user_rich_presence, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131362114;
-        Barrier barrier = (Barrier) inflate.findViewById(2131362114);
+        int i = R.id.barrier;
+        Barrier barrier = (Barrier) inflate.findViewById(R.id.barrier);
         if (barrier != null) {
-            i = 2131363746;
-            Space space = (Space) inflate.findViewById(2131363746);
+            i = R.id.image_bottom_guideline;
+            Space space = (Space) inflate.findViewById(R.id.image_bottom_guideline);
             if (space != null) {
-                i = 2131364663;
-                LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364663);
+                i = R.id.rich_presence_container_data;
+                LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.rich_presence_container_data);
                 if (linearLayout != null) {
-                    i = 2131364664;
-                    TextView textView = (TextView) inflate.findViewById(2131364664);
+                    i = R.id.rich_presence_details;
+                    TextView textView = (TextView) inflate.findViewById(R.id.rich_presence_details);
                     if (textView != null) {
-                        i = 2131364665;
-                        TextView textView2 = (TextView) inflate.findViewById(2131364665);
+                        i = R.id.rich_presence_header;
+                        TextView textView2 = (TextView) inflate.findViewById(R.id.rich_presence_header);
                         if (textView2 != null) {
-                            i = 2131364666;
-                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364666);
+                            i = R.id.rich_presence_image_large;
+                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.rich_presence_image_large);
                             if (simpleDraweeView != null) {
-                                i = 2131364669;
-                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364669);
+                                i = R.id.rich_presence_image_small;
+                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(R.id.rich_presence_image_small);
                                 if (simpleDraweeView2 != null) {
-                                    i = 2131364673;
-                                    MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364673);
+                                    i = R.id.rich_presence_primary_button;
+                                    MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.rich_presence_primary_button);
                                     if (materialButton != null) {
-                                        i = 2131364674;
-                                        MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364674);
+                                        i = R.id.rich_presence_secondary_button;
+                                        MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.rich_presence_secondary_button);
                                         if (materialButton2 != null) {
-                                            i = 2131364676;
-                                            TextView textView3 = (TextView) inflate.findViewById(2131364676);
+                                            i = R.id.rich_presence_state;
+                                            TextView textView3 = (TextView) inflate.findViewById(R.id.rich_presence_state);
                                             if (textView3 != null) {
-                                                i = 2131364677;
-                                                TextView textView4 = (TextView) inflate.findViewById(2131364677);
+                                                i = R.id.rich_presence_time;
+                                                TextView textView4 = (TextView) inflate.findViewById(R.id.rich_presence_time);
                                                 if (textView4 != null) {
-                                                    i = 2131364678;
-                                                    TextView textView5 = (TextView) inflate.findViewById(2131364678);
+                                                    i = R.id.rich_presence_title;
+                                                    TextView textView5 = (TextView) inflate.findViewById(R.id.rich_presence_title);
                                                     if (textView5 != null) {
                                                         return new v5((LinearLayout) inflate, barrier, space, linearLayout, textView, textView2, simpleDraweeView, simpleDraweeView2, materialButton, materialButton2, textView3, textView4, textView5);
                                                     }
diff --git a/app/src/main/java/c/a/j/x3.java b/app/src/main/java/c/a/j/x3.java
index 29744aff70..5027a3e8c0 100644
--- a/app/src/main/java/c/a/j/x3.java
+++ b/app/src/main/java/c/a/j/x3.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 /* compiled from: ViewUserStatusPresenceBinding */
 public final class x3 implements ViewBinding {
     @NonNull
@@ -28,14 +29,14 @@ public final class x3 implements ViewBinding {
 
     @NonNull
     public static x3 a(@NonNull View view) {
-        int i = 2131365745;
-        ImageView imageView = (ImageView) view.findViewById(2131365745);
+        int i = R.id.user_status_presence_dot;
+        ImageView imageView = (ImageView) view.findViewById(R.id.user_status_presence_dot);
         if (imageView != null) {
-            i = 2131365746;
-            TextView textView = (TextView) view.findViewById(2131365746);
+            i = R.id.user_status_presence_subtitle;
+            TextView textView = (TextView) view.findViewById(R.id.user_status_presence_subtitle);
             if (textView != null) {
-                i = 2131365747;
-                TextView textView2 = (TextView) view.findViewById(2131365747);
+                i = R.id.user_status_presence_title;
+                TextView textView2 = (TextView) view.findViewById(R.id.user_status_presence_title);
                 if (textView2 != null) {
                     LinearLayout linearLayout = (LinearLayout) view;
                     return new x3(linearLayout, imageView, textView, textView2, linearLayout);
diff --git a/app/src/main/java/c/a/j/y3.java b/app/src/main/java/c/a/j/y3.java
index 94f6dfd15c..415f4d9304 100644
--- a/app/src/main/java/c/a/j/y3.java
+++ b/app/src/main/java/c/a/j/y3.java
@@ -3,6 +3,7 @@ package c.a.j;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.views.CutoutView;
 import com.facebook.drawee.view.SimpleDraweeView;
 /* compiled from: ViewUserSummaryItemBinding */
@@ -19,11 +20,11 @@ public final class y3 implements ViewBinding {
 
     @NonNull
     public static y3 a(@NonNull View view) {
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362084);
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.avatar);
         if (simpleDraweeView != null) {
             return new y3((CutoutView) view, simpleDraweeView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362084)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.avatar)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/l/a.java b/app/src/main/java/c/a/l/a.java
index 69260a52bf..1f2a9ca0b7 100644
--- a/app/src/main/java/c/a/l/a.java
+++ b/app/src/main/java/c/a/l/a.java
@@ -1,6 +1,7 @@
 package c.a.l;
 
 import android.view.View;
+import androidx.core.view.ViewCompat;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -28,7 +29,7 @@ public final class a {
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public /* bridge */ /* synthetic */ Integer mo1invoke() {
-            return -16777216;
+            return Integer.valueOf((int) ViewCompat.MEASURED_STATE_MASK);
         }
     }
 
diff --git a/app/src/main/java/c/a/o/a.java b/app/src/main/java/c/a/o/a.java
index 884aec6837..9bc5b5af18 100644
--- a/app/src/main/java/c/a/o/a.java
+++ b/app/src/main/java/c/a/o/a.java
@@ -6,6 +6,7 @@ import android.graphics.Point;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import com.discord.overlay.OverlayManager;
 import com.discord.overlay.R;
 import com.discord.overlay.views.OverlayBubbleWrap;
@@ -24,7 +25,7 @@ public final class a implements View.OnTouchListener {
     @Override // android.view.View.OnTouchListener
     public final boolean onTouch(View view, MotionEvent motionEvent) {
         boolean z2;
-        m.checkNotNullExpressionValue(motionEvent, "event");
+        m.checkNotNullExpressionValue(motionEvent, NotificationCompat.CATEGORY_EVENT);
         int action = motionEvent.getAction();
         if (action == 1 || action == 2) {
             c.a.o.h.a aVar = this.i.m;
diff --git a/app/src/main/java/c/a/q/i.java b/app/src/main/java/c/a/q/i.java
index 004563ecd0..7cb55706a3 100644
--- a/app/src/main/java/c/a/q/i.java
+++ b/app/src/main/java/c/a/q/i.java
@@ -8,8 +8,11 @@ import c.i.a.c.i2.f0;
 import c.i.a.c.l0;
 import c.i.a.c.p1;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.BuildConfig;
 import com.discord.app.AppLog;
 import com.discord.player.AppMediaPlayer;
+import com.discord.utilities.guilds.GuildConstantsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.z.d.m;
 import j0.p.a;
 import rx.Scheduler;
@@ -20,7 +23,7 @@ public final class i {
         m.checkNotNullParameter(context, "context");
         AppLog appLog = AppLog.g;
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter("com.discord", "applicationId");
+        m.checkNotNullParameter(BuildConfig.APPLICATION_ID, "applicationId");
         m.checkNotNullParameter(appLog, "logger");
         int i = f0.a;
         try {
@@ -28,16 +31,16 @@ public final class i {
         } catch (PackageManager.NameNotFoundException unused) {
             str = "?";
         }
-        j jVar = new j(new p(context, "com.discord/" + str + " (Linux;Android " + Build.VERSION.RELEASE + ") ExoPlayerLib/2.13.3"), 104857600);
+        j jVar = new j(new p(context, BuildConfig.APPLICATION_ID + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + str + " (Linux;Android " + Build.VERSION.RELEASE + ") ExoPlayerLib/2.13.3"), 104857600);
         k kVar = new k();
         AnimatableValueParser.D(true);
-        l0.j(2500, 0, "bufferForPlaybackMs", "0");
+        l0.j(GuildConstantsKt.MAX_GUILD_MEMBERS_NOTIFY_ALL_MESSAGES, 0, "bufferForPlaybackMs", "0");
         l0.j(5000, 0, "bufferForPlaybackAfterRebufferMs", "0");
-        l0.j(10000, 2500, "minBufferMs", "bufferForPlaybackMs");
+        l0.j(10000, GuildConstantsKt.MAX_GUILD_MEMBERS_NOTIFY_ALL_MESSAGES, "minBufferMs", "bufferForPlaybackMs");
         l0.j(10000, 5000, "minBufferMs", "bufferForPlaybackAfterRebufferMs");
         l0.j(30000, 10000, "maxBufferMs", "minBufferMs");
         AnimatableValueParser.D(true);
-        l0 l0Var = new l0(new c.i.a.c.h2.m(true, 65536), 10000, 30000, 2500, 5000, -1, false, 0, false);
+        l0 l0Var = new l0(new c.i.a.c.h2.m(true, 65536), 10000, 30000, GuildConstantsKt.MAX_GUILD_MEMBERS_NOTIFY_ALL_MESSAGES, 5000, -1, false, 0, false);
         m.checkNotNullExpressionValue(l0Var, "DefaultLoadControl.Build…reateDefaultLoadControl()");
         p1.b bVar = new p1.b(context);
         AnimatableValueParser.D(!bVar.q);
diff --git a/app/src/main/java/c/a/r/b0.java b/app/src/main/java/c/a/r/b0.java
index 502903f254..f9e4742814 100644
--- a/app/src/main/java/c/a/r/b0.java
+++ b/app/src/main/java/c/a/r/b0.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import kotlin.NoWhenBranchMatchedException;
+import org.webrtc.MediaStreamTrack;
 import rx.Observable;
 import rx.Subscription;
 /* compiled from: RtcConnection.kt */
@@ -195,7 +196,7 @@ public final class b0 implements MediaEngineConnection.d {
                 }
                 ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(asList, 10));
                 for (StreamParameters streamParameters : asList) {
-                    String str = streamParameters.getType() == MediaType.Audio ? "audio" : "video";
+                    String str = streamParameters.getType() == MediaType.Audio ? MediaStreamTrack.AUDIO_TRACK_KIND : MediaStreamTrack.VIDEO_TRACK_KIND;
                     String rid = streamParameters.getRid();
                     Integer valueOf = Integer.valueOf(streamParameters.getSsrc());
                     Integer valueOf2 = Integer.valueOf(streamParameters.getRtxSsrc());
diff --git a/app/src/main/java/c/a/r/e.java b/app/src/main/java/c/a/r/e.java
index 7f17c29a59..8775e5c3bd 100644
--- a/app/src/main/java/c/a/r/e.java
+++ b/app/src/main/java/c/a/r/e.java
@@ -1,6 +1,7 @@
 package c.a.r;
 
 import com.discord.rtcconnection.EncodeQuality;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import d0.t.n0;
 import d0.t.u;
 import d0.z.d.m;
@@ -132,7 +133,7 @@ public final class e {
         b bVar = k0Var2.a;
         int i3 = bVar.a * bVar.b;
         this.b = i3;
-        Set of = n0.setOf((Object[]) new Double[]{Double.valueOf(0.0d), Double.valueOf(4.0d), Double.valueOf(8.0d), Double.valueOf(10.0d)});
+        Set of = n0.setOf((Object[]) new Double[]{Double.valueOf((double) ShadowDrawableWrapper.COS_45), Double.valueOf(4.0d), Double.valueOf(8.0d), Double.valueOf(10.0d)});
         ArrayList arrayList = new ArrayList();
         for (int i4 = 1; i4 < 4096; i4++) {
             double d = (double) i4;
diff --git a/app/src/main/java/c/a/r/h0.java b/app/src/main/java/c/a/r/h0.java
index 2b7db69d34..2899d9248c 100644
--- a/app/src/main/java/c/a/r/h0.java
+++ b/app/src/main/java/c/a/r/h0.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import kotlin.NoWhenBranchMatchedException;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: RtcConnection.kt */
 public final class h0 implements a.d {
     public final /* synthetic */ RtcConnection a;
@@ -145,7 +146,7 @@ public final class h0 implements a.d {
                     if (i2 > 0) {
                         z3 = true;
                     }
-                    list2 = d0.t.m.listOf(new Payloads.Stream("video", "100", null, 100, valueOf, valueOf2, null, Boolean.valueOf(z3), null));
+                    list2 = d0.t.m.listOf(new Payloads.Stream(MediaStreamTrack.VIDEO_TRACK_KIND, "100", null, 100, valueOf, valueOf2, null, Boolean.valueOf(z3), null));
                 }
                 rtcConnection.F.c(j, Long.valueOf((long) i));
                 MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.F;
@@ -281,7 +282,7 @@ public final class h0 implements a.d {
             RtcConnection.p(rtcConnection, "onSocketConnect() socket was null.", null, null, 6);
             return;
         }
-        List listOf = d0.t.m.listOf(new Payloads.Stream("video", "100", null, 100, null, null, null, null, null));
+        List listOf = d0.t.m.listOf(new Payloads.Stream(MediaStreamTrack.VIDEO_TRACK_KIND, "100", null, 100, null, null, null, null, null));
         String str = rtcConnection.Q;
         long j = rtcConnection.R;
         String str2 = rtcConnection.O;
@@ -330,7 +331,7 @@ public final class h0 implements a.d {
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
         for (Iterator it = list.iterator(); it.hasNext(); it = it) {
             Payloads.Stream stream = (Payloads.Stream) it.next();
-            MediaType mediaType = "video".equals(stream.getType()) ? MediaType.Video : MediaType.Audio;
+            MediaType mediaType = MediaStreamTrack.VIDEO_TRACK_KIND.equals(stream.getType()) ? MediaType.Video : MediaType.Audio;
             String rid = stream.getRid();
             Integer ssrc = stream.getSsrc();
             int intValue = ssrc != null ? ssrc.intValue() : 0;
diff --git a/app/src/main/java/c/a/r/l0/a.java b/app/src/main/java/c/a/r/l0/a.java
index 45bd7f7996..67ed578cbf 100644
--- a/app/src/main/java/c/a/r/l0/a.java
+++ b/app/src/main/java/c/a/r/l0/a.java
@@ -5,13 +5,16 @@ import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
 import androidx.annotation.MainThread;
+import androidx.core.os.EnvironmentCompat;
 import c.a.r.m0.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.rtcconnection.enums.AudioManagerBroadcastAction;
 import com.discord.rtcconnection.enums.ScoAudioState;
 import d0.z.d.m;
 import java.util.Objects;
 import kotlin.jvm.internal.DefaultConstructorMarker;
+import org.webrtc.MediaStreamTrack;
 import org.webrtc.ThreadUtils;
 /* compiled from: AudioManagerBroadcastReceiver.kt */
 public final class a extends BroadcastReceiver {
@@ -81,9 +84,9 @@ public final class a extends BroadcastReceiver {
                         if (!(intent.getIntExtra("state", 0) == 1)) {
                             aVar = a.b.a;
                         } else {
-                            String stringExtra = intent.getStringExtra("name");
+                            String stringExtra = intent.getStringExtra(ModelAuditLogEntry.CHANGE_KEY_NAME);
                             if (stringExtra == null) {
-                                stringExtra = "unknown";
+                                stringExtra = EnvironmentCompat.MEDIA_UNKNOWN;
                             }
                             m.checkNotNullExpressionValue(stringExtra, "intent.getStringExtra(\"name\") ?: \"unknown\"");
                             if (intent.getIntExtra("microphone", 0) == 1) {
@@ -100,13 +103,13 @@ public final class a extends BroadcastReceiver {
                 } else if (ordinal == 3) {
                     m.checkNotNullParameter(context, "$this$isMicrophoneMute");
                     m.checkNotNullParameter(context, "$this$getAudioManager");
-                    Object systemService = context.getSystemService("audio");
+                    Object systemService = context.getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
                     Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.media.AudioManager");
                     fVar.a(context, ((AudioManager) systemService).isMicrophoneMute());
                 } else if (ordinal == 4) {
                     m.checkNotNullParameter(context, "$this$isSpeakerphoneOn");
                     m.checkNotNullParameter(context, "$this$getAudioManager");
-                    Object systemService2 = context.getSystemService("audio");
+                    Object systemService2 = context.getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
                     Objects.requireNonNull(systemService2, "null cannot be cast to non-null type android.media.AudioManager");
                     fVar.d(context, ((AudioManager) systemService2).isSpeakerphoneOn());
                 }
diff --git a/app/src/main/java/c/a/r/m0/a.java b/app/src/main/java/c/a/r/m0/a.java
index b979241919..d2b9168c2b 100644
--- a/app/src/main/java/c/a/r/m0/a.java
+++ b/app/src/main/java/c/a/r/m0/a.java
@@ -1,5 +1,6 @@
 package c.a.r.m0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: WiredHeadsetState.kt */
@@ -14,7 +15,7 @@ public abstract class a {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public C0035a(String str, boolean z2) {
             super(false, null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.a = str;
             this.b = z2;
         }
diff --git a/app/src/main/java/c/a/r/n0/a.java b/app/src/main/java/c/a/r/n0/a.java
index 1064cbefd1..f5800dddb9 100644
--- a/app/src/main/java/c/a/r/n0/a.java
+++ b/app/src/main/java/c/a/r/n0/a.java
@@ -1,5 +1,6 @@
 package c.a.r.n0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: Codec.kt */
 public final class a {
@@ -12,7 +13,7 @@ public final class a {
     public final Integer e;
 
     public a(String str, int i, String str2, int i2, Integer num) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "type");
         this.a = str;
         this.b = i;
diff --git a/app/src/main/java/c/a/r/n0/b.java b/app/src/main/java/c/a/r/n0/b.java
index db60a604cf..2ba38b19ae 100644
--- a/app/src/main/java/c/a/r/n0/b.java
+++ b/app/src/main/java/c/a/r/n0/b.java
@@ -13,6 +13,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 import androidx.annotation.RequiresApi;
+import androidx.recyclerview.widget.RecyclerView;
 import co.discord.media_engine.NativeCapturerObserver;
 import co.discord.media_engine.SoundshareAudioSource;
 import com.discord.rtcconnection.mediaengine.ThumbnailEmitter;
@@ -217,7 +218,7 @@ public final class b extends ScreenCapturerAndroid {
                 thumbnailEmitter.d.release();
                 thumbnailEmitter.f2132c.release();
                 JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b);
-                thumbnailEmitter.a = Long.MAX_VALUE;
+                thumbnailEmitter.a = RecyclerView.FOREVER_NS;
             }
         }
         this.n.release();
diff --git a/app/src/main/java/c/a/r/n0/c/d.java b/app/src/main/java/c/a/r/n0/c/d.java
index fd3b681c7d..c2a9674b40 100644
--- a/app/src/main/java/c/a/r/n0/c/d.java
+++ b/app/src/main/java/c/a/r/n0/c/d.java
@@ -8,6 +8,7 @@ import d0.z.d.o;
 import java.util.Objects;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: MediaEngineConnectionLegacy.kt */
 public final class d implements Discord.ConnectToServerCallback {
     public final /* synthetic */ e a;
@@ -51,7 +52,7 @@ public final class d implements Discord.ConnectToServerCallback {
                     MediaEngineConnection.ConnectionState connectionState = MediaEngineConnection.ConnectionState.CONNECTED;
                     eVar.f219c = connectionState;
                     eVar.y(new a(eVar, connectionState));
-                    c.a.r.n0.a aVar = new c.a.r.n0.a("opus", 1, "audio", 120, null);
+                    c.a.r.n0.a aVar = new c.a.r.n0.a("opus", 1, MediaStreamTrack.AUDIO_TRACK_KIND, 120, null);
                     eVar.j.clear();
                     eVar.j.add(aVar);
                     eVar.j.addAll(eVar.p);
diff --git a/app/src/main/java/c/a/r/n0/c/o.java b/app/src/main/java/c/a/r/n0/c/o.java
index 632c516727..c3ba8f693d 100644
--- a/app/src/main/java/c/a/r/n0/c/o.java
+++ b/app/src/main/java/c/a/r/n0/c/o.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
+import org.webrtc.MediaStreamTrack;
 import rx.Emitter;
 /* compiled from: MediaEngineLegacy.kt */
 public final class o implements Discord.GetSupportedVideoCodecsCallback {
@@ -45,7 +46,7 @@ public final class o implements Discord.GetSupportedVideoCodecsCallback {
                 n.throwIndexOverflow();
             }
             int i3 = (i * 2) + 101;
-            arrayList2.add(new a((String) obj, i2, "video", i3, Integer.valueOf(i3 + 1)));
+            arrayList2.add(new a((String) obj, i2, MediaStreamTrack.VIDEO_TRACK_KIND, i3, Integer.valueOf(i3 + 1)));
             i = i2;
         }
         this.b.onNext(arrayList2);
diff --git a/app/src/main/java/c/a/r/o0/a.java b/app/src/main/java/c/a/r/o0/a.java
index b6b482d7a0..6ef9c3467f 100644
--- a/app/src/main/java/c/a/r/o0/a.java
+++ b/app/src/main/java/c/a/r/o0/a.java
@@ -4,13 +4,17 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import androidx.annotation.AnyThread;
+import androidx.core.app.NotificationCompat;
+import androidx.core.view.PointerIconCompat;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.rtcconnection.socket.io.Opcodes;
 import com.discord.rtcconnection.socket.io.Payloads;
 import com.discord.utilities.debug.DebugPrintBuilder;
 import com.discord.utilities.debug.DebugPrintable;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.networking.Backoff;
+import com.discord.utilities.rest.SendUtils;
 import com.discord.utilities.time.Clock;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -158,7 +162,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
         public Unit invoke(WebSocket webSocket) {
             WebSocket webSocket2 = webSocket;
             m.checkNotNullParameter(webSocket2, "it");
-            webSocket2.e(4000, "close reason");
+            webSocket2.e(SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, "close reason");
             return Unit.a;
         }
     }
@@ -249,7 +253,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
                     aVar.b();
                     for (d dVar : aVar.p) {
                         m.checkNotNullExpressionValue(dVar, "it");
-                        dVar.b(false, 1001, null);
+                        dVar.b(false, Integer.valueOf((int) PointerIconCompat.TYPE_CONTEXT_MENU), null);
                     }
                 } else {
                     a aVar2 = this.this$0;
@@ -526,7 +530,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
         public Unit invoke(WebSocket webSocket) {
             WebSocket webSocket2 = webSocket;
             m.checkNotNullParameter(webSocket2, "it");
-            webSocket2.e(4000, "reconnecting");
+            webSocket2.e(SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, "reconnecting");
             return Unit.a;
         }
     }
@@ -693,7 +697,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
     }
 
     public final void i(long j2, String str, boolean z2) {
-        m.checkNotNullParameter(str, "reason");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         b();
         if (this.r != null) {
             k("Performing an immediate heartbeat on existing socket: " + str);
@@ -762,7 +766,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
     @Override // okhttp3.WebSocketListener
     public void onClosed(WebSocket webSocket, int i2, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         super.onClosed(webSocket, i2, str);
         o(new h(this, webSocket, i2, str));
     }
@@ -770,7 +774,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
     @Override // okhttp3.WebSocketListener
     public void onClosing(WebSocket webSocket, int i2, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         ((f0.f0.n.d) webSocket).e(i2, str);
     }
 
@@ -785,7 +789,7 @@ public final class a extends WebSocketListener implements DebugPrintable {
     @Override // okhttp3.WebSocketListener
     public void onMessage(WebSocket webSocket, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         Payloads.Incoming incoming = (Payloads.Incoming) c.i.a.f.e.o.c.q0(Payloads.Incoming.class).cast(this.m.g(str, Payloads.Incoming.class));
         super.onMessage(webSocket, str);
         StringBuilder K = c.d.b.a.a.K("received (");
diff --git a/app/src/main/java/c/a/s/a.java b/app/src/main/java/c/a/s/a.java
index 7e9a06071b..a805f9d06d 100644
--- a/app/src/main/java/c/a/s/a.java
+++ b/app/src/main/java/c/a/s/a.java
@@ -1,6 +1,8 @@
 package c.a.s;
 
 import android.net.Uri;
+import androidx.browser.trusted.sharing.ShareTarget;
+import androidx.core.os.EnvironmentCompat;
 import com.discord.samsung.SamsungConnect$SamsungCallbackException;
 import d0.g0.w;
 import d0.l;
@@ -55,7 +57,7 @@ public final class a extends k implements Function2<CoroutineScope, Continuation
             l.throwOnFailure(obj);
             z.a aVar = new z.a();
             String str2 = null;
-            aVar.c("GET", null);
+            aVar.c(ShareTarget.METHOD_GET, null);
             aVar.f(this.$url);
             Response execute = ((f0.f0.g.e) this.$okHttpClient.b(aVar.a())).execute();
             String a = Response.a(execute, "Location", null, 2);
@@ -73,7 +75,7 @@ public final class a extends k implements Function2<CoroutineScope, Continuation
                 return parse;
             }
             if (parse == null || (str = parse.getQueryParameter("error")) == null) {
-                str = "unknown";
+                str = EnvironmentCompat.MEDIA_UNKNOWN;
             }
             m.checkNotNullExpressionValue(str, "location?.getQueryParameter(\"error\") ?: \"unknown\"");
             if (parse != null) {
diff --git a/app/src/main/java/c/a/s/b.java b/app/src/main/java/c/a/s/b.java
index a571486a85..e3f97ede98 100644
--- a/app/src/main/java/c/a/s/b.java
+++ b/app/src/main/java/c/a/s/b.java
@@ -1,7 +1,10 @@
 package c.a.s;
 
 import android.net.Uri;
+import androidx.browser.trusted.sharing.ShareTarget;
+import androidx.core.os.EnvironmentCompat;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.samsung.SamsungConnect$SamsungCallbackException;
 import d0.g0.w;
 import d0.l;
@@ -67,7 +70,7 @@ public final class b extends k implements Function2<CoroutineScope, Continuation
             StringBuilder K = a.K("{\"code\":\"");
             K.append(this.$samsungAuthCode);
             K.append("\"}");
-            Map mapOf = h0.mapOf(o.to("state", this.$state), o.to("code", K.toString()));
+            Map mapOf = h0.mapOf(o.to("state", this.$state), o.to(ModelAuditLogEntry.CHANGE_KEY_CODE, K.toString()));
             ArrayList arrayList = new ArrayList(mapOf.size());
             for (Map.Entry entry : mapOf.entrySet()) {
                 arrayList.add(((String) entry.getKey()) + '=' + ((String) entry.getValue()));
@@ -75,10 +78,10 @@ public final class b extends k implements Function2<CoroutineScope, Continuation
             String joinToString$default = u.joinToString$default(arrayList, "&", null, null, 0, null, null, 62, null);
             RequestBody.Companion companion = RequestBody.Companion;
             MediaType.a aVar = MediaType.f2897c;
-            RequestBody a = companion.a(joinToString$default, MediaType.a.a("application/x-www-form-urlencoded"));
+            RequestBody a = companion.a(joinToString$default, MediaType.a.a(ShareTarget.ENCODING_TYPE_URL_ENCODED));
             z.a aVar2 = new z.a();
             m.checkParameterIsNotNull(a, "body");
-            aVar2.c("POST", a);
+            aVar2.c(ShareTarget.METHOD_POST, a);
             aVar2.f(this.$url);
             Response execute = ((f0.f0.g.e) this.$okHttpClient.b(aVar2.a())).execute();
             String str2 = null;
@@ -96,7 +99,7 @@ public final class b extends k implements Function2<CoroutineScope, Continuation
                 return parse;
             }
             if (parse == null || (str = parse.getQueryParameter("error")) == null) {
-                str = "unknown";
+                str = EnvironmentCompat.MEDIA_UNKNOWN;
             }
             m.checkNotNullExpressionValue(str, "location?.getQueryParameter(\"error\") ?: \"unknown\"");
             if (parse != null) {
diff --git a/app/src/main/java/c/a/t/a.java b/app/src/main/java/c/a/t/a.java
index b4c5f19c6d..adceb2cf8c 100644
--- a/app/src/main/java/c/a/t/a.java
+++ b/app/src/main/java/c/a/t/a.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import androidx.appcompat.widget.ActivityChooserModel;
 import d0.z.d.m;
 /* compiled from: ScreenshotDetector.kt */
 public final class a implements Application.ActivityLifecycleCallbacks {
@@ -30,17 +31,17 @@ public final class a implements Application.ActivityLifecycleCallbacks {
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityCreated(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityDestroyed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityPaused(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (this.i) {
             b bVar = this.j;
             bVar.d.unregisterContentObserver(bVar);
@@ -50,7 +51,7 @@ public final class a implements Application.ActivityLifecycleCallbacks {
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityResumed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (!this.i) {
             b bVar = this.j;
             bVar.d.registerContentObserver(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true, bVar);
@@ -60,17 +61,17 @@ public final class a implements Application.ActivityLifecycleCallbacks {
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(bundle, "outState");
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityStarted(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityStopped(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 }
diff --git a/app/src/main/java/c/a/t/b.java b/app/src/main/java/c/a/t/b.java
index 8fb57a6220..0b140323cf 100644
--- a/app/src/main/java/c/a/t/b.java
+++ b/app/src/main/java/c/a/t/b.java
@@ -6,9 +6,11 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
+import androidx.core.app.NotificationCompat;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.t;
 import d0.g0.w;
 import d0.t.j;
@@ -50,13 +52,13 @@ public final class b extends ContentObserver {
         public C0042b(long j, String str, String str2, Uri uri, long j2) {
             m.checkNotNullParameter(str, "fileName");
             m.checkNotNullParameter(str2, "relativePath");
-            m.checkNotNullParameter(uri, "uri");
+            m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             this.b = j;
             this.f231c = str;
             this.d = str2;
             this.e = uri;
             this.f = j2;
-            this.a = str2 + '/' + str;
+            this.a = str2 + MentionUtilsKt.SLASH_CHAR + str;
         }
 
         public boolean equals(Object obj) {
@@ -137,7 +139,7 @@ public final class b extends ContentObserver {
                     } else {
                         String string = query.getString(query.getColumnIndex("_data"));
                         m.checkNotNullExpressionValue(string, "cursor.getString(cursor.…mages.ImageColumns.DATA))");
-                        str = w.substringBeforeLast$default(string, '/', (String) null, 2, (Object) null);
+                        str = w.substringBeforeLast$default(string, (char) MentionUtilsKt.SLASH_CHAR, (String) null, 2, (Object) null);
                     }
                     long j = query.getLong(query.getColumnIndex("_id"));
                     String string2 = query.getString(query.getColumnIndex("_display_name"));
diff --git a/app/src/main/java/c/a/u/a/i.java b/app/src/main/java/c/a/u/a/i.java
index f137c54066..e54a2165b7 100644
--- a/app/src/main/java/c/a/u/a/i.java
+++ b/app/src/main/java/c/a/u/a/i.java
@@ -1,5 +1,6 @@
 package c.a.u.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.node.StyleNode;
 import d0.z.d.m;
@@ -34,7 +35,7 @@ public final class i {
         public a(String str, String str2, f<RC> fVar) {
             super(new StyleNode.b(str, fVar.d), new StyleNode.b(str2, fVar.e));
             m.checkNotNullParameter(str, "definition");
-            m.checkNotNullParameter(str2, "name");
+            m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(fVar, "codeStyleProviders");
         }
     }
diff --git a/app/src/main/java/c/a/u/a/m.java b/app/src/main/java/c/a/u/a/m.java
index 8884e35ebc..684105d4fa 100644
--- a/app/src/main/java/c/a/u/a/m.java
+++ b/app/src/main/java/c/a/u/a/m.java
@@ -1,5 +1,6 @@
 package c.a.u.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.node.StyleNode;
 import d0.g0.i;
@@ -33,7 +34,7 @@ public final class m {
         public a(String str, String str2, f<RC> fVar) {
             super(new StyleNode.b(str, fVar.d), new StyleNode.b(str2, fVar.e));
             d0.z.d.m.checkNotNullParameter(str, "definition");
-            d0.z.d.m.checkNotNullParameter(str2, "name");
+            d0.z.d.m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(fVar, "codeStyleProviders");
         }
     }
diff --git a/app/src/main/java/c/a/z/a0.java b/app/src/main/java/c/a/z/a0.java
index 3d3ab6236f..be43cf3011 100644
--- a/app/src/main/java/c/a/z/a0.java
+++ b/app/src/main/java/c/a/z/a0.java
@@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.d;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -98,14 +99,14 @@ public final class a0 extends AppBottomSheet implements h {
         public c.a.j.c invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131365918;
-            ConstraintLayout constraintLayout = (ConstraintLayout) view2.findViewById(2131365918);
+            int i2 = R.id.widget_simple_bottom_sheet_selector_header;
+            ConstraintLayout constraintLayout = (ConstraintLayout) view2.findViewById(R.id.widget_simple_bottom_sheet_selector_header);
             if (constraintLayout != null) {
-                i2 = 2131365919;
-                TextView textView = (TextView) view2.findViewById(2131365919);
+                i2 = R.id.widget_simple_bottom_sheet_selector_placeholder;
+                TextView textView = (TextView) view2.findViewById(R.id.widget_simple_bottom_sheet_selector_placeholder);
                 if (textView != null) {
-                    i2 = 2131365920;
-                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131365920);
+                    i2 = R.id.widget_simple_bottom_sheet_selector_recycler;
+                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(R.id.widget_simple_bottom_sheet_selector_recycler);
                     if (maxHeightRecyclerView != null) {
                         return new c.a.j.c((ConstraintLayout) view2, constraintLayout, textView, maxHeightRecyclerView);
                     }
@@ -133,15 +134,15 @@ public final class a0 extends AppBottomSheet implements h {
             ViewGroup viewGroup2 = viewGroup;
             m.checkNotNullParameter(layoutInflater2, "inflater");
             m.checkNotNullParameter(viewGroup2, "parent");
-            View inflate = layoutInflater2.inflate(2131558435, viewGroup2, false);
-            int i = 2131364802;
-            MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364802);
+            View inflate = layoutInflater2.inflate(R.layout.bottom_sheet_simple_selector_item, viewGroup2, false);
+            int i = R.id.select_component_sheet_item_description;
+            MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(R.id.select_component_sheet_item_description);
             if (materialTextView != null) {
-                i = 2131364805;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364805);
+                i = R.id.select_component_sheet_item_icon;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.select_component_sheet_item_icon);
                 if (simpleDraweeView != null) {
-                    i = 2131364807;
-                    MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364807);
+                    i = R.id.select_component_sheet_item_title;
+                    MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(R.id.select_component_sheet_item_title);
                     if (materialTextView2 != null) {
                         d dVar = new d((ConstraintLayout) inflate, materialTextView, simpleDraweeView, materialTextView2);
                         m.checkNotNullExpressionValue(dVar, "BottomSheetSimpleSelecto…(inflater, parent, false)");
@@ -174,7 +175,7 @@ public final class a0 extends AppBottomSheet implements h {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558434;
+        return R.layout.bottom_sheet_simple_selector;
     }
 
     @Override // androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnDismissListener
diff --git a/app/src/main/java/c/a/z/d.java b/app/src/main/java/c/a/z/d.java
index bcff8fb39d..e4951fecb7 100644
--- a/app/src/main/java/c/a/z/d.java
+++ b/app/src/main/java/c/a/z/d.java
@@ -2,6 +2,7 @@ package c.a.z;
 
 import android.view.KeyEvent;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import com.discord.views.CodeVerificationView;
 import d0.g0.y;
 import d0.z.d.m;
@@ -16,7 +17,7 @@ public final class d implements View.OnKeyListener {
 
     @Override // android.view.View.OnKeyListener
     public final boolean onKey(View view, int i, KeyEvent keyEvent) {
-        m.checkNotNullExpressionValue(keyEvent, "event");
+        m.checkNotNullExpressionValue(keyEvent, NotificationCompat.CATEGORY_EVENT);
         if (keyEvent.getAction() == 0) {
             CodeVerificationView codeVerificationView = this.i;
             CodeVerificationView.a aVar = CodeVerificationView.i;
diff --git a/app/src/main/java/c/a/z/d0.java b/app/src/main/java/c/a/z/d0.java
index face799799..45ee818d90 100644
--- a/app/src/main/java/c/a/z/d0.java
+++ b/app/src/main/java/c/a/z/d0.java
@@ -7,6 +7,7 @@ import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import c.a.j.d;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -59,7 +60,7 @@ public final class d0 extends SimpleRecyclerAdapter.ViewHolder<b0> {
         if (d != null) {
             SimpleDraweeView simpleDraweeView2 = this.f241c.f80c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "itemBinding.selectComponentSheetItemIcon");
-            MGImages.setImage$default(simpleDraweeView2, d, 2131165398, 2131165398, true, null, null, 96, null);
+            MGImages.setImage$default(simpleDraweeView2, d, R.dimen.emoji_size, R.dimen.emoji_size, true, null, null, 96, null);
         } else {
             Integer b = b0Var2.b();
             if (b != null) {
@@ -77,7 +78,7 @@ public final class d0 extends SimpleRecyclerAdapter.ViewHolder<b0> {
             i = g.intValue();
         } else {
             m.checkNotNullExpressionValue(materialTextView3, "this");
-            i = ColorCompat.getThemedColor(materialTextView3, 2130968932);
+            i = ColorCompat.getThemedColor(materialTextView3, (int) R.attr.colorHeaderPrimary);
         }
         materialTextView3.setTextColor(i);
         Integer f = b0Var2.f();
@@ -87,7 +88,7 @@ public final class d0 extends SimpleRecyclerAdapter.ViewHolder<b0> {
             if (drawable2 != null) {
                 MaterialTextView materialTextView4 = this.f241c.d;
                 m.checkNotNullExpressionValue(materialTextView4, "itemBinding.selectComponentSheetItemTitle");
-                DrawableCompat.setTint(drawable2, ColorCompat.getThemedColor(materialTextView4, 2130968932));
+                DrawableCompat.setTint(drawable2, ColorCompat.getThemedColor(materialTextView4, (int) R.attr.colorHeaderPrimary));
                 drawable = drawable2;
                 com.discord.utilities.drawable.DrawableCompat.setCompoundDrawablesCompat$default(materialTextView3, (Drawable) null, (Drawable) null, drawable, (Drawable) null, 11, (Object) null);
                 this.f241c.a.setOnClickListener(new c0(this));
diff --git a/app/src/main/java/c/a/z/e0.java b/app/src/main/java/c/a/z/e0.java
index f722a7f4b9..07232b8542 100644
--- a/app/src/main/java/c/a/z/e0.java
+++ b/app/src/main/java/c/a/z/e0.java
@@ -2,6 +2,7 @@ package c.a.z;
 
 import android.graphics.drawable.Drawable;
 import androidx.core.content.ContextCompat;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.views.VoiceUserLimitView;
 import d0.z.d.o;
@@ -20,9 +21,9 @@ public final class e0 extends o implements Function0<Drawable> {
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public Drawable mo1invoke() {
-        Drawable drawable = ContextCompat.getDrawable(this.this$0.getContext(), 2131232100);
+        Drawable drawable = ContextCompat.getDrawable(this.this$0.getContext(), R.drawable.ic_videocam_white_12dp);
         if (drawable != null) {
-            drawable.setTint(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968949));
+            drawable.setTint(ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.colorInteractiveNormal));
         }
         return drawable;
     }
diff --git a/app/src/main/java/c/a/z/g.java b/app/src/main/java/c/a/z/g.java
index 34f95d022d..01d82489d1 100644
--- a/app/src/main/java/c/a/z/g.java
+++ b/app/src/main/java/c/a/z/g.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import c.a.j.o0;
+import com.discord.R;
 import com.discord.views.OAuthPermissionViews;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -26,7 +27,7 @@ public final class g extends o implements Function2<LayoutInflater, ViewGroup, O
         ViewGroup viewGroup2 = viewGroup;
         m.checkNotNullParameter(layoutInflater2, "inflater");
         m.checkNotNullParameter(viewGroup2, "parent");
-        View inflate = layoutInflater2.inflate(2131558622, viewGroup2, false);
+        View inflate = layoutInflater2.inflate(R.layout.oauth_token_permission_list_item, viewGroup2, false);
         Objects.requireNonNull(inflate, "rootView");
         o0 o0Var = new o0((TextView) inflate);
         m.checkNotNullExpressionValue(o0Var, "OauthTokenPermissionList…(inflater, parent, false)");
diff --git a/app/src/main/java/c/a/z/i0/i.java b/app/src/main/java/c/a/z/i0/i.java
index 8d2337dd80..ebb091242f 100644
--- a/app/src/main/java/c/a/z/i0/i.java
+++ b/app/src/main/java/c/a/z/i0/i.java
@@ -1,5 +1,6 @@
 package c.a.z.i0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.views.calls.StageCallSpeakerView;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -21,7 +22,7 @@ public final class i extends o implements Function1<Integer, Unit> {
     public Unit invoke(Integer num) {
         Integer num2 = num;
         StageCallSpeakerView stageCallSpeakerView = this.this$0;
-        m.checkNotNullExpressionValue(num2, "color");
+        m.checkNotNullExpressionValue(num2, ModelAuditLogEntry.CHANGE_KEY_COLOR);
         stageCallSpeakerView.setCardBackgroundColor(num2.intValue());
         return Unit.a;
     }
diff --git a/app/src/main/java/c/a/z/k0/a.java b/app/src/main/java/c/a/z/k0/a.java
index d799c80ba5..1517357227 100644
--- a/app/src/main/java/c/a/z/k0/a.java
+++ b/app/src/main/java/c/a/z/k0/a.java
@@ -3,6 +3,7 @@ package c.a.z.k0;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.text.style.ForegroundColorSpan;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.font.FontUtils;
@@ -30,11 +31,11 @@ public final class a extends o implements Function1<Hook, Unit> {
         FontUtils fontUtils = FontUtils.INSTANCE;
         Context context = this.this$0.this$0.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        Typeface themedFont = fontUtils.getThemedFont(context, 2130969328);
+        Typeface themedFont = fontUtils.getThemedFont(context, R.attr.font_primary_semibold);
         if (themedFont != null) {
             hook2.a.add(new TypefaceSpanCompat(themedFont));
         }
-        hook2.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), 2130969877)));
+        hook2.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), (int) R.attr.primary_000)));
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/z/k0/c/a.java b/app/src/main/java/c/a/z/k0/c/a.java
index 2a896bfe5c..94bd27c924 100644
--- a/app/src/main/java/c/a/z/k0/c/a.java
+++ b/app/src/main/java/c/a/z/k0/c/a.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.j.y4;
 import c.a.z.k0.c.d;
+import com.discord.R;
 import com.discord.utilities.extensions.SimpleDraweeViewExtensionsKt;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -15,14 +16,14 @@ public final class a extends MGRecyclerViewHolder<c, d> {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public a(c cVar) {
-        super(2131559029, cVar);
+        super((int) R.layout.widget_discovery_stage_card_speaker, cVar);
         m.checkNotNullParameter(cVar, "adapter");
         View view = this.itemView;
-        int i = 2131363013;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363013);
+        int i = R.id.discovery_stage_card_speaker_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.discovery_stage_card_speaker_avatar);
         if (simpleDraweeView != null) {
-            i = 2131363014;
-            TextView textView = (TextView) view.findViewById(2131363014);
+            i = R.id.discovery_stage_card_speaker_name;
+            TextView textView = (TextView) view.findViewById(R.id.discovery_stage_card_speaker_name);
             if (textView != null) {
                 y4 y4Var = new y4((LinearLayout) view, simpleDraweeView, textView);
                 m.checkNotNullExpressionValue(y4Var, "WidgetDiscoveryStageCard…kerBinding.bind(itemView)");
@@ -45,7 +46,7 @@ public final class a extends MGRecyclerViewHolder<c, d> {
         String str2 = aVar.m;
         SimpleDraweeView simpleDraweeView = this.a.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.discoveryStageCardSpeakerAvatar");
-        SimpleDraweeViewExtensionsKt.setUserIcon$default(simpleDraweeView, Long.valueOf(j), str, null, false, 2131165291, 12, null);
+        SimpleDraweeViewExtensionsKt.setUserIcon$default(simpleDraweeView, Long.valueOf(j), str, null, false, R.dimen.avatar_size_medium, 12, null);
         TextView textView = this.a.f194c;
         m.checkNotNullExpressionValue(textView, "binding.discoveryStageCardSpeakerName");
         textView.setText(str2);
diff --git a/app/src/main/java/c/a/z/k0/c/b.java b/app/src/main/java/c/a/z/k0/c/b.java
index d644687730..d8612ce290 100644
--- a/app/src/main/java/c/a/z/k0/c/b.java
+++ b/app/src/main/java/c/a/z/k0/c/b.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import c.a.j.x4;
 import c.a.z.k0.c.d;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import d0.z.d.m;
@@ -15,17 +16,17 @@ public final class b extends MGRecyclerViewHolder<c, d> {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public b(c cVar) {
-        super(2131559027, cVar);
+        super((int) R.layout.widget_discovery_other_speakers_count, cVar);
         m.checkNotNullParameter(cVar, "adapter");
         View view = this.itemView;
-        TextView textView = (TextView) view.findViewById(2131364333);
+        TextView textView = (TextView) view.findViewById(R.id.other_speakers_count_text);
         if (textView != null) {
             x4 x4Var = new x4((LinearLayout) view, textView);
             m.checkNotNullExpressionValue(x4Var, "WidgetDiscoveryOtherSpea…untBinding.bind(itemView)");
             this.a = x4Var;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364333)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.other_speakers_count_text)));
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [int, java.lang.Object] */
@@ -39,6 +40,6 @@ public final class b extends MGRecyclerViewHolder<c, d> {
         m.checkNotNullExpressionValue(textView, "binding.otherSpeakersCountText");
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
-        textView.setText(c.a.l.b.j(view, 2131888188, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755061, i2, Integer.valueOf(i2))}, null, 4));
+        textView.setText(c.a.l.b.j(view, R.string.discovery_speaker_count, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.discovery_speaker_count_speakersCount, i2, Integer.valueOf(i2))}, null, 4));
     }
 }
diff --git a/app/src/main/java/c/a/z/m.java b/app/src/main/java/c/a/z/m.java
index c50f53f88c..dec95914f1 100644
--- a/app/src/main/java/c/a/z/m.java
+++ b/app/src/main/java/c/a/z/m.java
@@ -4,6 +4,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import c.a.j.q0;
+import com.discord.R;
 import com.discord.views.OverlayMenuBubbleDialog;
 import com.discord.views.VoiceUserView;
 import d0.z.d.o;
@@ -25,7 +26,7 @@ public final class m extends o implements Function2<LayoutInflater, ViewGroup, O
         ViewGroup viewGroup2 = viewGroup;
         d0.z.d.m.checkNotNullParameter(layoutInflater2, "layoutInflater");
         d0.z.d.m.checkNotNullParameter(viewGroup2, "parent");
-        View inflate = layoutInflater2.inflate(2131558624, viewGroup2, false);
+        View inflate = layoutInflater2.inflate(R.layout.overlay_menu_voice_members_item, viewGroup2, false);
         Objects.requireNonNull(inflate, "rootView");
         q0 q0Var = new q0((VoiceUserView) inflate);
         d0.z.d.m.checkNotNullExpressionValue(q0Var, "OverlayMenuVoiceMembersI…tInflater, parent, false)");
diff --git a/app/src/main/java/c/a/z/r.java b/app/src/main/java/c/a/z/r.java
index 6658834252..e8fd99c721 100644
--- a/app/src/main/java/c/a/z/r.java
+++ b/app/src/main/java/c/a/z/r.java
@@ -1,5 +1,6 @@
 package c.a.z;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.views.OverlayMenuView;
 import d0.z.d.m;
@@ -21,7 +22,7 @@ public final class r extends o implements Function1<Error, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        c.a.e.o.g(this.this$0.getContext(), 2131890661, 0, null, 12);
+        c.a.e.o.g(this.this$0.getContext(), R.string.instant_invite_failed_to_generate, 0, null, 12);
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/z/s.java b/app/src/main/java/c/a/z/s.java
index 8c87d7a508..19c57f6e77 100644
--- a/app/src/main/java/c/a/z/s.java
+++ b/app/src/main/java/c/a/z/s.java
@@ -1,6 +1,8 @@
 package c.a.z;
 
 import android.content.Context;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.models.domain.ModelInvite;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.views.OverlayMenuView;
@@ -27,9 +29,9 @@ public final class s extends o implements Function1<ModelInvite, Unit> {
         AnalyticsTracker.inviteCopied(modelInvite2, "Mobile Voice Overlay");
         Context context = this.this$0.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        String link = modelInvite2.toLink(this.this$0.getResources(), "https://discord.gg");
+        String link = modelInvite2.toLink(this.this$0.getResources(), BuildConfig.HOST_INVITE);
         m.checkNotNullExpressionValue(link, "invite.toLink(resources, BuildConfig.HOST_INVITE)");
-        c.a.e.o.a(context, link, 2131890858);
+        c.a.e.o.a(context, link, R.string.invite_link_copied);
         this.this$0.getOnDismissRequested$app_productionCanaryRelease().mo1invoke();
         return Unit.a;
     }
diff --git a/app/src/main/java/c/a/z/v.java b/app/src/main/java/c/a/z/v.java
index c6e504eb2c..8b28457b79 100644
--- a/app/src/main/java/c/a/z/v.java
+++ b/app/src/main/java/c/a/z/v.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import c.a.j.r0;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.overlay.views.OverlayBubbleWrap;
 import com.discord.stores.StoreStream;
@@ -82,7 +83,7 @@ public final class v extends OverlayBubbleWrap implements AppComponent {
     public v(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558625, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.overlay_voice_bubble, (ViewGroup) this, false);
         addView(inflate);
         Objects.requireNonNull(inflate, "rootView");
         SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate;
diff --git a/app/src/main/java/c/a/z/y.java b/app/src/main/java/c/a/z/y.java
index bb912c86df..b1c494db3d 100644
--- a/app/src/main/java/c/a/z/y.java
+++ b/app/src/main/java/c/a/z/y.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.s0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppComponent;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
@@ -146,7 +147,7 @@ public final class y extends k implements AppComponent {
 
     @Override // c.a.z.k
     public Animator getClosingAnimator() {
-        Animator loadAnimator = AnimatorInflater.loadAnimator(getContext(), 2130837533);
+        Animator loadAnimator = AnimatorInflater.loadAnimator(getContext(), R.animator.overlay_slide_down_fade_out);
         loadAnimator.setTarget(this.f246y.f158c);
         m.checkNotNullExpressionValue(loadAnimator, "AnimatorInflater.loadAni…binding.dialogCard)\n    }");
         return loadAnimator;
@@ -178,7 +179,7 @@ public final class y extends k implements AppComponent {
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
         h();
-        Animator loadAnimator = AnimatorInflater.loadAnimator(getContext(), 2130837534);
+        Animator loadAnimator = AnimatorInflater.loadAnimator(getContext(), R.animator.overlay_slide_up_fade_in);
         loadAnimator.setTarget(this.f246y.f158c);
         loadAnimator.start();
     }
diff --git a/app/src/main/java/c/a/z/z.java b/app/src/main/java/c/a/z/z.java
index 702269d679..f348905f27 100644
--- a/app/src/main/java/c/a/z/z.java
+++ b/app/src/main/java/c/a/z/z.java
@@ -8,6 +8,7 @@ import android.widget.LinearLayout;
 import android.widget.TextSwitcher;
 import android.widget.TextView;
 import c.a.j.d1;
+import com.discord.R;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.utilities.textprocessing.node.EmojiNode;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
@@ -21,19 +22,19 @@ public final class z extends LinearLayout {
 
     public z(Context context) {
         super(context);
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558659, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.reaction_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362814;
-        TextView textView = (TextView) inflate.findViewById(2131362814);
+        int i = R.id.counter_text_1;
+        TextView textView = (TextView) inflate.findViewById(R.id.counter_text_1);
         if (textView != null) {
-            i = 2131362815;
-            TextView textView2 = (TextView) inflate.findViewById(2131362815);
+            i = R.id.counter_text_2;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.counter_text_2);
             if (textView2 != null) {
-                i = 2131362816;
-                TextSwitcher textSwitcher = (TextSwitcher) inflate.findViewById(2131362816);
+                i = R.id.counter_text_switcher;
+                TextSwitcher textSwitcher = (TextSwitcher) inflate.findViewById(R.id.counter_text_switcher);
                 if (textSwitcher != null) {
-                    i = 2131363111;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131363111);
+                    i = R.id.emoji_text_view;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(R.id.emoji_text_view);
                     if (simpleDraweeSpanTextView != null) {
                         d1 d1Var = new d1((LinearLayout) inflate, textView, textView2, textSwitcher, simpleDraweeSpanTextView);
                         m.checkNotNullExpressionValue(d1Var, "ReactionViewBinding.infl…rom(context), this, true)");
@@ -71,12 +72,12 @@ public final class z extends LinearLayout {
             } else {
                 if (a > i) {
                     TextSwitcher textSwitcher = d1Var.d;
-                    textSwitcher.setInAnimation(textSwitcher.getContext(), 2130772022);
-                    textSwitcher.setOutAnimation(textSwitcher.getContext(), 2130772024);
+                    textSwitcher.setInAnimation(textSwitcher.getContext(), R.anim.anim_slide_in_up);
+                    textSwitcher.setOutAnimation(textSwitcher.getContext(), R.anim.anim_slide_out_up);
                 } else {
                     TextSwitcher textSwitcher2 = d1Var.d;
-                    textSwitcher2.setInAnimation(textSwitcher2.getContext(), 2130772021);
-                    textSwitcher2.setOutAnimation(textSwitcher2.getContext(), 2130772023);
+                    textSwitcher2.setInAnimation(textSwitcher2.getContext(), R.anim.anim_slide_in_down);
+                    textSwitcher2.setOutAnimation(textSwitcher2.getContext(), R.anim.anim_slide_out_down);
                 }
                 d1Var.d.setText(String.valueOf(a));
             }
diff --git a/app/src/main/java/c/b/a/d/j.java b/app/src/main/java/c/b/a/d/j.java
index fae6698f3a..dc5c526ee3 100644
--- a/app/src/main/java/c/b/a/d/j.java
+++ b/app/src/main/java/c/b/a/d/j.java
@@ -14,6 +14,7 @@ import android.os.CancellationSignal;
 import android.provider.MediaStore;
 import android.view.View;
 import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import c.f.g.e.r;
 import c.f.g.e.s;
@@ -182,7 +183,7 @@ public abstract class j extends RecyclerView.ViewHolder {
                 if (bVar != null) {
                     Uri uri2 = media.getUri();
                     d dVar = new d(this);
-                    m.checkNotNullParameter(uri2, "uri");
+                    m.checkNotNullParameter(uri2, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
                     m.checkNotNullParameter(dVar, "onGenerate");
                     bVar.a();
                     w0 w0Var = w0.i;
@@ -196,7 +197,7 @@ public abstract class j extends RecyclerView.ViewHolder {
             if (cVar != null) {
                 long id2 = media.getId();
                 Uri uri3 = media.getUri();
-                m.checkNotNullParameter(uri3, "uri");
+                m.checkNotNullParameter(uri3, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
                 n nVar = new n(id2);
                 Cursor query = cVar.a.query(MediaStore.Images.Thumbnails.EXTERNAL_CONTENT_URI, new String[]{"_id"}, "image_id = ? AND KIND = ?", new String[]{String.valueOf(id2), String.valueOf(1)}, null);
                 if (query == null || !query.moveToFirst()) {
diff --git a/app/src/main/java/c/b/a/h/a.java b/app/src/main/java/c/b/a/h/a.java
index cdd69554ca..05bca7ff9e 100644
--- a/app/src/main/java/c/b/a/h/a.java
+++ b/app/src/main/java/c/b/a/h/a.java
@@ -1,6 +1,7 @@
 package c.b.a.h;
 
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: FlexInputEvent.kt */
@@ -41,7 +42,7 @@ public abstract class a {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public d(String str) {
             super(null);
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.a = str;
         }
 
diff --git a/app/src/main/java/c/b/a/i/a.java b/app/src/main/java/c/b/a/i/a.java
index 6992c9caf8..40a9ad2035 100644
--- a/app/src/main/java/c/b/a/i/a.java
+++ b/app/src/main/java/c/b/a/i/a.java
@@ -2,6 +2,7 @@ package c.b.a.i;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import androidx.core.os.EnvironmentCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 import com.lytefast.flexinput.model.Attachment;
 import com.lytefast.flexinput.widget.FlexEditText;
@@ -30,7 +31,7 @@ public final class a extends o implements Function1<InputContentInfoCompat, Unit
             m.checkNotNullExpressionValue(context, "context");
             ContentResolver contentResolver = context.getContentResolver();
             m.checkNotNullExpressionValue(contentResolver, "context.contentResolver");
-            companion.b(inputContentInfoCompat2, contentResolver, true, "unknown");
+            companion.b(inputContentInfoCompat2, contentResolver, true, EnvironmentCompat.MEDIA_UNKNOWN);
         }
         return Unit.a;
     }
diff --git a/app/src/main/java/c/c/a/a0/f0.java b/app/src/main/java/c/c/a/a0/f0.java
index 059c7658ee..4cf498578f 100644
--- a/app/src/main/java/c/c/a/a0/f0.java
+++ b/app/src/main/java/c/c/a/a0/f0.java
@@ -1,7 +1,8 @@
 package c.c.a.a0;
 
+import c.a.r.n0.c.e;
 import c.c.a.a0.h0.c;
 /* compiled from: ShapeTrimPathParser */
 public class f0 {
-    public static c.a a = c.a.a("s", "e", "o", "nm", "m", "hd");
+    public static c.a a = c.a.a("s", e.a, "o", "nm", "m", "hd");
 }
diff --git a/app/src/main/java/c/c/a/a0/l.java b/app/src/main/java/c/c/a/a0/l.java
index 70f2812a97..ae1fe7fb4c 100644
--- a/app/src/main/java/c/c/a/a0/l.java
+++ b/app/src/main/java/c/c/a/a0/l.java
@@ -1,8 +1,9 @@
 package c.c.a.a0;
 
+import c.a.r.n0.c.e;
 import c.c.a.a0.h0.c;
 /* compiled from: GradientFillParser */
 public class l {
-    public static final c.a a = c.a.a("nm", "g", "o", "t", "s", "e", "r", "hd");
+    public static final c.a a = c.a.a("nm", "g", "o", "t", "s", e.a, "r", "hd");
     public static final c.a b = c.a.a("p", "k");
 }
diff --git a/app/src/main/java/c/c/a/a0/m.java b/app/src/main/java/c/c/a/a0/m.java
index a896ed9960..a28a9f7fce 100644
--- a/app/src/main/java/c/c/a/a0/m.java
+++ b/app/src/main/java/c/c/a/a0/m.java
@@ -1,9 +1,10 @@
 package c.c.a.a0;
 
+import c.a.r.n0.c.e;
 import c.c.a.a0.h0.c;
 /* compiled from: GradientStrokeParser */
 public class m {
-    public static c.a a = c.a.a("nm", "g", "o", "t", "s", "e", "w", "lc", "lj", "ml", "hd", "d");
+    public static c.a a = c.a.a("nm", "g", "o", "t", "s", e.a, "w", "lc", "lj", "ml", "hd", "d");
     public static final c.a b = c.a.a("p", "k");
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/c/a/a0/p.java b/app/src/main/java/c/c/a/a0/p.java
index d9b03135ab..b891070a6e 100644
--- a/app/src/main/java/c/c/a/a0/p.java
+++ b/app/src/main/java/c/c/a/a0/p.java
@@ -6,6 +6,7 @@ import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 import androidx.collection.SparseArrayCompat;
 import androidx.core.view.animation.PathInterpolatorCompat;
+import c.a.r.n0.c.e;
 import c.c.a.a0.h0.c;
 import c.c.a.b0.f;
 import c.c.a.b0.g;
@@ -19,7 +20,7 @@ public class p {
     public static SparseArrayCompat<WeakReference<Interpolator>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static c.a f258c = c.a.a("t", "s", "e", "o", "i", "h", "to", "ti");
+    public static c.a f258c = c.a.a("t", "s", e.a, "o", "i", "h", "to", "ti");
 
     public static <T> a<T> a(c cVar, d dVar, float f, g0<T> g0Var, boolean z2) throws IOException {
         T t;
diff --git a/app/src/main/java/c/c/a/a0/s.java b/app/src/main/java/c/c/a/a0/s.java
index 10e775b6e6..af1d5ee9c3 100644
--- a/app/src/main/java/c/c/a/a0/s.java
+++ b/app/src/main/java/c/c/a/a0/s.java
@@ -11,13 +11,14 @@ import c.c.a.y.e;
 import c.c.a.y.i;
 import c.c.a.y.l.m;
 import c.c.a.y.m.e;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 /* compiled from: LottieCompositionMoshiParser */
 public class s {
     public static final c.a a = c.a.a("w", "h", "ip", "op", "fr", "v", "layers", "assets", "fonts", "chars", "markers");
-    public static c.a b = c.a.a("id", "layers", "w", "h", "p", "u");
+    public static c.a b = c.a.a(ModelAuditLogEntry.CHANGE_KEY_ID, "layers", "w", "h", "p", "u");
 
     /* renamed from: c  reason: collision with root package name */
     public static final c.a f260c = c.a.a("list");
diff --git a/app/src/main/java/c/c/a/b0/d.java b/app/src/main/java/c/c/a/b0/d.java
index 180cfd3409..6c0e61d402 100644
--- a/app/src/main/java/c/c/a/b0/d.java
+++ b/app/src/main/java/c/c/a/b0/d.java
@@ -8,6 +8,7 @@ import androidx.annotation.MainThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import c.c.a.c;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 /* compiled from: LottieValueAnimator */
 public class d extends a implements Choreographer.FrameCallback {
     public float k = 1.0f;
@@ -93,7 +94,7 @@ public class d extends a implements Choreographer.FrameCallback {
     }
 
     @Override // android.animation.ValueAnimator
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float getAnimatedFraction() {
         float j;
         float i;
@@ -127,7 +128,7 @@ public class d extends a implements Choreographer.FrameCallback {
         return (long) dVar.b();
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float h() {
         c.c.a.d dVar = this.r;
         if (dVar == null) {
diff --git a/app/src/main/java/c/c/a/e.java b/app/src/main/java/c/c/a/e.java
index 43d24528b1..5dae0e6574 100644
--- a/app/src/main/java/c/c/a/e.java
+++ b/app/src/main/java/c/c/a/e.java
@@ -10,6 +10,7 @@ import c.c.a.a0.h0.d;
 import c.c.a.a0.s;
 import c.c.a.b0.g;
 import c.c.a.y.h;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.z.d.m;
 import g0.n;
 import g0.r;
@@ -173,7 +174,7 @@ public class e {
                             zipInputStream.closeEntry();
                         }
                     }
-                    String[] split = name.split("/");
+                    String[] split = name.split(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
                     hashMap.put(split[split.length - 1], BitmapFactory.decodeStream(zipInputStream));
                 }
                 nextEntry = zipInputStream.getNextEntry();
diff --git a/app/src/main/java/c/c/a/j.java b/app/src/main/java/c/c/a/j.java
index a9b47e7ec5..5c22026c6c 100644
--- a/app/src/main/java/c/c/a/j.java
+++ b/app/src/main/java/c/c/a/j.java
@@ -18,6 +18,7 @@ import androidx.annotation.Nullable;
 import c.c.a.a0.h0.c;
 import c.c.a.a0.r;
 import c.c.a.y.m.e;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -428,7 +429,7 @@ public class j extends Drawable implements Drawable.Callback, Animatable {
         return this.k.j();
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float g() {
         return this.k.h();
     }
diff --git a/app/src/main/java/c/c/a/w/b/n.java b/app/src/main/java/c/c/a/w/b/n.java
index 5fe5475d5b..fd1c9d81c7 100644
--- a/app/src/main/java/c/c/a/w/b/n.java
+++ b/app/src/main/java/c/c/a/w/b/n.java
@@ -10,6 +10,7 @@ import c.c.a.w.c.a;
 import c.c.a.y.f;
 import c.c.a.y.l.h;
 import c.c.a.y.m.b;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.List;
 /* compiled from: PolystarContent */
 public class n implements m, a.b, k {
@@ -168,7 +169,7 @@ public class n implements m, a.b, k {
             return this.a;
         }
         int ordinal = this.d.ordinal();
-        double d6 = 0.0d;
+        double d6 = ShadowDrawableWrapper.COS_45;
         if (ordinal == 0) {
             float floatValue = this.f.e().floatValue();
             a<?, Float> aVar = this.h;
diff --git a/app/src/main/java/c/c/a/w/c/a.java b/app/src/main/java/c/c/a/w/c/a.java
index dcf3734a4a..037863cf13 100644
--- a/app/src/main/java/c/c/a/w/c/a.java
+++ b/app/src/main/java/c/c/a/w/c/a.java
@@ -3,6 +3,7 @@ package c.c.a.w.c;
 import androidx.annotation.FloatRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.ArrayList;
 import java.util.List;
 /* compiled from: BaseKeyframeAnimation */
@@ -69,10 +70,10 @@ public abstract class a<K, A> {
 
         boolean c(float f);
 
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         float d();
 
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         float e();
 
         boolean isEmpty();
@@ -213,7 +214,7 @@ public abstract class a<K, A> {
         return b2;
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float b() {
         if (this.h == -1.0f) {
             this.h = this.f294c.d();
diff --git a/app/src/main/java/c/c/a/x/b.java b/app/src/main/java/c/c/a/x/b.java
index 060003a6b6..f399142079 100644
--- a/app/src/main/java/c/c/a/x/b.java
+++ b/app/src/main/java/c/c/a/x/b.java
@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 import c.c.a.b0.c;
 import c.c.a.k;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.HashMap;
 import java.util.Map;
 /* compiled from: ImageAssetManager */
@@ -27,7 +28,7 @@ public class b {
         if (!TextUtils.isEmpty(str)) {
             String str2 = this.f299c;
             if (str2.charAt(str2.length() - 1) != '/') {
-                this.f299c = a.B(new StringBuilder(), this.f299c, '/');
+                this.f299c = a.B(new StringBuilder(), this.f299c, MentionUtilsKt.SLASH_CHAR);
             }
         }
         if (!(callback instanceof View)) {
diff --git a/app/src/main/java/c/c/a/y/b.java b/app/src/main/java/c/c/a/y/b.java
index b499eed049..3e9ee29c90 100644
--- a/app/src/main/java/c/c/a/y/b.java
+++ b/app/src/main/java/c/c/a/y/b.java
@@ -1,6 +1,7 @@
 package c.c.a.y;
 
 import android.graphics.Paint;
+import androidx.browser.trusted.sharing.ShareTarget;
 public /* synthetic */ class b {
     public static /* synthetic */ int[] A;
     public static /* synthetic */ int[] B;
@@ -207,10 +208,10 @@ public /* synthetic */ class b {
 
     public static /* synthetic */ String n(int i2) {
         if (i2 == 1) {
-            return "GET";
+            return ShareTarget.METHOD_GET;
         }
         if (i2 == 2) {
-            return "POST";
+            return ShareTarget.METHOD_POST;
         }
         if (i2 == 3) {
             return "PUT";
diff --git a/app/src/main/java/c/c/a/y/m/b.java b/app/src/main/java/c/c/a/y/m/b.java
index 00365b499b..6c51eca30b 100644
--- a/app/src/main/java/c/c/a/y/m/b.java
+++ b/app/src/main/java/c/c/a/y/m/b.java
@@ -12,6 +12,7 @@ import android.os.Build;
 import androidx.annotation.CallSuper;
 import androidx.annotation.FloatRange;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import c.c.a.c0.d;
 import c.c.a.j;
 import c.c.a.s;
@@ -278,7 +279,7 @@ public abstract class b implements e, a.b, g {
                         if (h2 != 0) {
                             if (h2 == i2) {
                                 if (i6 == 0) {
-                                    this.f327c.setColor(-16777216);
+                                    this.f327c.setColor(ViewCompat.MEASURED_STATE_MASK);
                                     this.f327c.setAlpha(255);
                                     canvas.drawRect(this.h, this.f327c);
                                 }
diff --git a/app/src/main/java/c/c/a/z/c.java b/app/src/main/java/c/c/a/z/c.java
index 5c173df7b2..8723efe059 100644
--- a/app/src/main/java/c/c/a/z/c.java
+++ b/app/src/main/java/c/c/a/z/c.java
@@ -3,10 +3,12 @@ package c.c.a.z;
 import android.content.Context;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
+import androidx.browser.trusted.sharing.ShareTarget;
 import c.c.a.d;
 import c.c.a.e;
 import c.c.a.p;
 import c.d.b.a.a;
+import com.discord.restapi.RestAPIBuilder;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -41,7 +43,7 @@ public class c {
         K.append(this.b);
         c.c.a.b0.c.a(K.toString());
         HttpURLConnection httpURLConnection = (HttpURLConnection) new URL(this.b).openConnection();
-        httpURLConnection.setRequestMethod("GET");
+        httpURLConnection.setRequestMethod(ShareTarget.METHOD_GET);
         try {
             httpURLConnection.connect();
             if (httpURLConnection.getErrorStream() == null) {
@@ -100,7 +102,7 @@ public class c {
         a aVar;
         String contentType = httpURLConnection.getContentType();
         if (contentType == null) {
-            contentType = "application/json";
+            contentType = RestAPIBuilder.CONTENT_TYPE_JSON;
         }
         if (contentType.contains("application/zip")) {
             c.c.a.b0.c.a("Handling zip response.");
diff --git a/app/src/main/java/c/e/a/a.java b/app/src/main/java/c/e/a/a.java
index 2c38b0457b..d9ac0c7be1 100644
--- a/app/src/main/java/c/e/a/a.java
+++ b/app/src/main/java/c/e/a/a.java
@@ -1,5 +1,6 @@
 package c.e.a;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.Date;
 /* compiled from: Log */
 public class a {
@@ -19,7 +20,7 @@ public class a {
                 sb.append('0');
             }
             sb.append(j);
-            sb.append(':');
+            sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
             if (j2 <= 9) {
                 sb.append('0');
             }
diff --git a/app/src/main/java/c/e/b/b.java b/app/src/main/java/c/e/b/b.java
index b95f2c3d36..51b7af93eb 100644
--- a/app/src/main/java/c/e/b/b.java
+++ b/app/src/main/java/c/e/b/b.java
@@ -1,6 +1,7 @@
 package c.e.b;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import h0.a.a.f;
 import h0.a.a.q;
 import java.lang.reflect.Modifier;
@@ -26,8 +27,8 @@ public abstract class b<T> {
                 try {
                     cls2 = b.loadClass(s2);
                 } catch (ClassNotFoundException unused2) {
-                    String replace = s2.replace('.', '/');
-                    String replace2 = name.replace('.', '/');
+                    String replace = s2.replace('.', MentionUtilsKt.SLASH_CHAR);
+                    String replace2 = name.replace('.', MentionUtilsKt.SLASH_CHAR);
                     String str = null;
                     if (!z3) {
                         try {
@@ -39,7 +40,7 @@ public abstract class b<T> {
                             throw new RuntimeException("Class cannot be created (missing no-arg constructor): " + cls.getName(), e);
                         }
                     } else {
-                        str = enclosingClass.getName().replace('.', '/');
+                        str = enclosingClass.getName().replace('.', MentionUtilsKt.SLASH_CHAR);
                         try {
                             modifiers = cls.getDeclaredConstructor(enclosingClass).getModifiers();
                             if (Modifier.isPrivate(modifiers)) {
diff --git a/app/src/main/java/c/e/b/c.java b/app/src/main/java/c/e/b/c.java
index f8524dea03..71d0b9c943 100644
--- a/app/src/main/java/c/e/b/c.java
+++ b/app/src/main/java/c/e/b/c.java
@@ -1,6 +1,9 @@
 package c.e.b;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import h0.a.a.f;
 import h0.a.a.p;
 import h0.a.a.q;
@@ -49,8 +52,8 @@ public abstract class c {
                 try {
                     cls2 = b.loadClass(s2);
                 } catch (ClassNotFoundException unused2) {
-                    String replace = s2.replace('.', '/');
-                    String replace2 = name.replace('.', '/');
+                    String replace = s2.replace('.', MentionUtilsKt.SLASH_CHAR);
+                    String replace2 = name.replace('.', MentionUtilsKt.SLASH_CHAR);
                     f fVar = new f(0);
                     fVar.c(196653, 33, replace, null, "com/esotericsoftware/reflectasm/FieldAccess", null);
                     q e = fVar.e(1, "<init>", "()V", null, null);
@@ -109,7 +112,7 @@ public abstract class c {
                 e.c(3, 0, null, 0, null);
                 e.t(25, 1);
                 e.s(192, str);
-                e.b(180, str, field.getName(), w.e(field.getType()));
+                e.b(BaseTransientBottomBar.ANIMATION_FADE_DURATION, str, field.getName(), w.e(field.getType()));
                 switch (w.j(field.getType()).i()) {
                     case 1:
                         e.o(184, "java/lang/Boolean", "valueOf", "(Z)Ljava/lang/Boolean;");
@@ -177,7 +180,7 @@ public abstract class c {
                 str2 = "getLong";
                 break;
             case 8:
-                i2 = 175;
+                i2 = HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION;
                 str2 = "getDouble";
                 break;
             default:
@@ -209,7 +212,7 @@ public abstract class c {
                     e.c(3, 0, null, 0, null);
                     e.t(25, 1);
                     e.s(192, str);
-                    e.b(180, str, field.getName(), d);
+                    e.b(BaseTransientBottomBar.ANIMATION_FADE_DURATION, str, field.getName(), d);
                     e.e(i2);
                 }
             }
@@ -253,7 +256,7 @@ public abstract class c {
                     e.c(3, 0, null, 0, null);
                     e.t(25, 1);
                     e.s(192, str);
-                    e.b(180, str, arrayList.get(i3).getName(), "Ljava/lang/String;");
+                    e.b(BaseTransientBottomBar.ANIMATION_FADE_DURATION, str, arrayList.get(i3).getName(), "Ljava/lang/String;");
                     e.e(176);
                 }
             }
diff --git a/app/src/main/java/c/e/b/d.java b/app/src/main/java/c/e/b/d.java
index c33729bc23..6b8f7c30fd 100644
--- a/app/src/main/java/c/e/b/d.java
+++ b/app/src/main/java/c/e/b/d.java
@@ -1,6 +1,7 @@
 package c.e.b;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import h0.a.a.f;
 import h0.a.a.p;
 import h0.a.a.q;
@@ -69,8 +70,8 @@ public abstract class d {
                     cls2 = b.loadClass(s2);
                     clsArr = clsArr4;
                 } catch (ClassNotFoundException unused2) {
-                    String replace = s2.replace('.', '/');
-                    String replace2 = name.replace('.', '/');
+                    String replace = s2.replace('.', MentionUtilsKt.SLASH_CHAR);
+                    String replace2 = name.replace('.', MentionUtilsKt.SLASH_CHAR);
                     f fVar = new f(1);
                     fVar.c(196653, 33, replace, null, "com/esotericsoftware/reflectasm/MethodAccess", null);
                     q e = fVar.e(1, "<init>", "()V", null, null);
diff --git a/app/src/main/java/c/f/d/e/a.java b/app/src/main/java/c/f/d/e/a.java
index 1f01bf7406..61280fe38e 100644
--- a/app/src/main/java/c/f/d/e/a.java
+++ b/app/src/main/java/c/f/d/e/a.java
@@ -1,6 +1,7 @@
 package c.f.d.e;
 
 import android.util.Log;
+import androidx.core.os.EnvironmentCompat;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 /* compiled from: FLog */
@@ -9,11 +10,11 @@ public class a {
 
     public static void a(Class<?> cls, String str) {
         String simpleName = cls.getSimpleName();
-        Log.println(6, "unknown:" + simpleName, str);
+        Log.println(6, EnvironmentCompat.MEDIA_UNKNOWN + ":" + simpleName, str);
     }
 
     public static void b(Class<?> cls, String str, Throwable th) {
-        String t = c.d.b.a.a.t("unknown", ":", cls.getSimpleName());
+        String t = c.d.b.a.a.t(EnvironmentCompat.MEDIA_UNKNOWN, ":", cls.getSimpleName());
         StringBuilder sb = new StringBuilder();
         sb.append(str);
         sb.append('\n');
@@ -26,13 +27,13 @@ public class a {
     public static void c(Class<?> cls, String str, Object... objArr) {
         String simpleName = cls.getSimpleName();
         String g = g(str, objArr);
-        Log.println(6, "unknown:" + simpleName, g);
+        Log.println(6, EnvironmentCompat.MEDIA_UNKNOWN + ":" + simpleName, g);
     }
 
     public static void d(Class<?> cls, Throwable th, String str, Object... objArr) {
         String simpleName = cls.getSimpleName();
         String g = g(str, objArr);
-        String t = c.d.b.a.a.t("unknown", ":", simpleName);
+        String t = c.d.b.a.a.t(EnvironmentCompat.MEDIA_UNKNOWN, ":", simpleName);
         StringBuilder sb = new StringBuilder();
         sb.append(g);
         sb.append('\n');
@@ -43,12 +44,12 @@ public class a {
     }
 
     public static void e(String str, String str2) {
-        Log.println(6, "unknown:" + str, str2);
+        Log.println(6, EnvironmentCompat.MEDIA_UNKNOWN + ":" + str, str2);
     }
 
     public static void f(String str, String str2, Throwable th) {
         String str3;
-        String t = c.d.b.a.a.t("unknown", ":", str);
+        String t = c.d.b.a.a.t(EnvironmentCompat.MEDIA_UNKNOWN, ":", str);
         StringBuilder sb = new StringBuilder();
         sb.append(str2);
         sb.append('\n');
@@ -74,7 +75,7 @@ public class a {
     public static void i(Class<?> cls, String str) {
         if (0 != 0) {
             String simpleName = cls.getSimpleName();
-            Log.println(2, "unknown:" + simpleName, str);
+            Log.println(2, EnvironmentCompat.MEDIA_UNKNOWN + ":" + simpleName, str);
         }
     }
 
@@ -86,13 +87,13 @@ public class a {
 
     public static void k(Class<?> cls, String str) {
         String simpleName = cls.getSimpleName();
-        Log.println(5, "unknown:" + simpleName, str);
+        Log.println(5, EnvironmentCompat.MEDIA_UNKNOWN + ":" + simpleName, str);
     }
 
     public static void l(Class<?> cls, String str, Throwable th) {
         String str2;
         if (1 != 0) {
-            String t = c.d.b.a.a.t("unknown", ":", cls.getSimpleName());
+            String t = c.d.b.a.a.t(EnvironmentCompat.MEDIA_UNKNOWN, ":", cls.getSimpleName());
             StringBuilder sb = new StringBuilder();
             sb.append(str);
             sb.append('\n');
@@ -111,7 +112,7 @@ public class a {
     public static void m(Class<?> cls, String str, Object... objArr) {
         String simpleName = cls.getSimpleName();
         String g = g(str, objArr);
-        Log.println(5, "unknown:" + simpleName, g);
+        Log.println(5, EnvironmentCompat.MEDIA_UNKNOWN + ":" + simpleName, g);
     }
 
     public static void n(Class<?> cls, Throwable th, String str, Object... objArr) {
@@ -122,11 +123,11 @@ public class a {
 
     public static void o(String str, String str2, Object... objArr) {
         String g = g(str2, objArr);
-        Log.println(5, "unknown:" + str, g);
+        Log.println(5, EnvironmentCompat.MEDIA_UNKNOWN + ":" + str, g);
     }
 
     public static void p(String str, String str2, Object... objArr) {
         String g = g(str2, objArr);
-        Log.println(6, "unknown:" + str, g);
+        Log.println(6, EnvironmentCompat.MEDIA_UNKNOWN + ":" + str, g);
     }
 }
diff --git a/app/src/main/java/c/f/d/l/b.java b/app/src/main/java/c/f/d/l/b.java
index 50bba0e477..0b103ccc0a 100644
--- a/app/src/main/java/c/f/d/l/b.java
+++ b/app/src/main/java/c/f/d/l/b.java
@@ -3,6 +3,7 @@ package c.f.d.l;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.MediaStore;
+import com.adjust.sdk.Constants;
 /* compiled from: UriUtil */
 public class b {
     public static final Uri a = Uri.withAppendedPath(ContactsContract.AUTHORITY_URI, "display_photo");
@@ -29,6 +30,6 @@ public class b {
 
     public static boolean e(Uri uri) {
         String a2 = a(uri);
-        return "https".equals(a2) || "http".equals(a2);
+        return Constants.SCHEME.equals(a2) || "http".equals(a2);
     }
 }
diff --git a/app/src/main/java/c/f/g/a/a/c.java b/app/src/main/java/c/f/g/a/a/c.java
index 6a50763a96..7689b2027b 100644
--- a/app/src/main/java/c/f/g/a/a/c.java
+++ b/app/src/main/java/c/f/g/a/a/c.java
@@ -3,6 +3,7 @@ package c.f.g.a.a;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import androidx.core.os.EnvironmentCompat;
 import c.f.d.d.e;
 import c.f.d.d.i;
 import c.f.g.a.a.h.b;
@@ -192,7 +193,7 @@ public class c extends AbstractDraweeController<CloseableReference<c.f.j.j.c>, I
                         str = "local";
                         break;
                     default:
-                        str = "unknown";
+                        str = EnvironmentCompat.MEDIA_UNKNOWN;
                         break;
                 }
                 int i2 = c.f.g.a.a.g.a.a.get(i, -1);
diff --git a/app/src/main/java/c/f/g/a/a/g/a.java b/app/src/main/java/c/f/g/a/a/g/a.java
index 2513a1b58c..a84010c9de 100644
--- a/app/src/main/java/c/f/g/a/a/g/a.java
+++ b/app/src/main/java/c/f/g/a/a/g/a.java
@@ -1,6 +1,8 @@
 package c.f.g.a.a.g;
 
 import android.util.SparseIntArray;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.InputDeviceCompat;
 /* compiled from: DebugOverlayImageOriginColor */
 public class a {
     public static final SparseIntArray a;
@@ -9,9 +11,9 @@ public class a {
         SparseIntArray sparseIntArray = new SparseIntArray(7);
         a = sparseIntArray;
         sparseIntArray.append(1, -7829368);
-        sparseIntArray.append(2, -65536);
-        sparseIntArray.append(3, -256);
-        sparseIntArray.append(4, -256);
+        sparseIntArray.append(2, SupportMenu.CATEGORY_MASK);
+        sparseIntArray.append(3, InputDeviceCompat.SOURCE_ANY);
+        sparseIntArray.append(4, InputDeviceCompat.SOURCE_ANY);
         sparseIntArray.append(5, -16711936);
         sparseIntArray.append(6, -16711936);
         sparseIntArray.append(7, -16711936);
diff --git a/app/src/main/java/c/f/g/d/a.java b/app/src/main/java/c/f/g/d/a.java
index b98dee7eae..21bcf2bb21 100644
--- a/app/src/main/java/c/f/g/d/a.java
+++ b/app/src/main/java/c/f/g/d/a.java
@@ -7,6 +7,8 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.InputDeviceCompat;
 import c.f.g.d.b.b;
 import com.facebook.drawee.drawable.ScalingUtils$ScaleType;
 import java.util.HashMap;
@@ -162,7 +164,7 @@ public class a extends Drawable implements b {
                 while (r1.hasNext()) {
                 }
             } else if (f7 < f3 && ((float) abs2) < f6) {
-                i = -256;
+                i = InputDeviceCompat.SOURCE_ANY;
                 a(canvas, "I", b("%dx%d", Integer.valueOf(this.j), Integer.valueOf(this.k)), i);
                 a(canvas, "I", b("%d KiB", Integer.valueOf(this.l / 1024)), -1);
                 i2 = this.o;
@@ -189,7 +191,7 @@ public class a extends Drawable implements b {
                 }
             }
         }
-        i = -65536;
+        i = SupportMenu.CATEGORY_MASK;
         a(canvas, "I", b("%dx%d", Integer.valueOf(this.j), Integer.valueOf(this.k)), i);
         a(canvas, "I", b("%d KiB", Integer.valueOf(this.l / 1024)), -1);
         i2 = this.o;
diff --git a/app/src/main/java/c/f/g/e/i.java b/app/src/main/java/c/f/g/e/i.java
index c9b309cdcf..dd0a35c5d1 100644
--- a/app/src/main/java/c/f/g/e/i.java
+++ b/app/src/main/java/c/f/g/e/i.java
@@ -6,6 +6,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import androidx.annotation.VisibleForTesting;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 /* compiled from: OrientedDrawable */
 public class i extends g {
     @VisibleForTesting
@@ -51,13 +52,13 @@ public class i extends g {
     @Override // c.f.g.e.g, android.graphics.drawable.Drawable
     public int getIntrinsicHeight() {
         int i = this.o;
-        return (i == 5 || i == 7 || this.n % 180 != 0) ? super.getIntrinsicWidth() : super.getIntrinsicHeight();
+        return (i == 5 || i == 7 || this.n % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0) ? super.getIntrinsicWidth() : super.getIntrinsicHeight();
     }
 
     @Override // c.f.g.e.g, android.graphics.drawable.Drawable
     public int getIntrinsicWidth() {
         int i = this.o;
-        return (i == 5 || i == 7 || this.n % 180 != 0) ? super.getIntrinsicHeight() : super.getIntrinsicWidth();
+        return (i == 5 || i == 7 || this.n % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0) ? super.getIntrinsicHeight() : super.getIntrinsicWidth();
     }
 
     @Override // c.f.g.e.g, android.graphics.drawable.Drawable
diff --git a/app/src/main/java/c/f/i/a.java b/app/src/main/java/c/f/i/a.java
index 4c5d9e5300..85b0f33fb5 100644
--- a/app/src/main/java/c/f/i/a.java
+++ b/app/src/main/java/c/f/i/a.java
@@ -1,5 +1,6 @@
 package c.f.i;
 
+import androidx.exifinterface.media.ExifInterface;
 import c.f.i.c;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 /* compiled from: DefaultImageFormatChecker */
@@ -19,7 +20,7 @@ public class a implements c.a {
     public static final byte[] k = AnimatableValueParser.f("ftyp");
     public static final byte[][] l = {AnimatableValueParser.f("heic"), AnimatableValueParser.f("heix"), AnimatableValueParser.f("hevc"), AnimatableValueParser.f("hevx"), AnimatableValueParser.f("mif1"), AnimatableValueParser.f("msf1")};
     public static final byte[] m;
-    public static final byte[] n = {77, 77, 0, 42};
+    public static final byte[] n = {77, 77, 0, ExifInterface.START_CODE};
     public static final int o;
     public final int p;
 
@@ -36,7 +37,7 @@ public class a implements c.a {
         byte[] bArr3 = {0, 0, 1, 0};
         i = bArr3;
         j = bArr3.length;
-        byte[] bArr4 = {73, 73, 42, 0};
+        byte[] bArr4 = {73, 73, ExifInterface.START_CODE, 0};
         m = bArr4;
         o = bArr4.length;
     }
diff --git a/app/src/main/java/c/f/i/b.java b/app/src/main/java/c/f/i/b.java
index 606434bb50..bceadcbbb3 100644
--- a/app/src/main/java/c/f/i/b.java
+++ b/app/src/main/java/c/f/i/b.java
@@ -1,11 +1,13 @@
 package c.f.i;
+
+import com.discord.utilities.icon.IconUtils;
 /* compiled from: DefaultImageFormats */
 public final class b {
     public static final c a = new c("JPEG", "jpeg");
     public static final c b = new c("PNG", "png");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f418c = new c("GIF", "gif");
+    public static final c f418c = new c("GIF", IconUtils.ANIMATED_IMAGE_EXTENSION);
     public static final c d = new c("BMP", "bmp");
     public static final c e = new c("ICO", "ico");
     public static final c f = new c("WEBP_SIMPLE", "webp");
diff --git a/app/src/main/java/c/f/j/a/c/c.java b/app/src/main/java/c/f/j/a/c/c.java
index 4b28981cab..518af31792 100644
--- a/app/src/main/java/c/f/j/a/c/c.java
+++ b/app/src/main/java/c/f/j/a/c/c.java
@@ -1,6 +1,7 @@
 package c.f.j.a.c;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.core.view.PointerIconCompat;
 import c.f.d.d.i;
 import c.f.j.c.m;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -68,7 +69,7 @@ public class c {
 
         @Override // com.facebook.cache.common.CacheKey
         public int hashCode() {
-            return (this.a.hashCode() * 1013) + this.b;
+            return (this.a.hashCode() * PointerIconCompat.TYPE_ALL_SCROLL) + this.b;
         }
 
         public String toString() {
diff --git a/app/src/main/java/c/f/j/e/j.java b/app/src/main/java/c/f/j/e/j.java
index 7cace25f50..b04442e9ef 100644
--- a/app/src/main/java/c/f/j/e/j.java
+++ b/app/src/main/java/c/f/j/e/j.java
@@ -3,6 +3,7 @@ package c.f.j.e;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.graphics.Bitmap;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.f.d.g.c;
 import c.f.j.c.i;
 import c.f.j.c.n;
@@ -95,7 +96,7 @@ public class j {
         c.f.j.r.b.b();
         this.w = new k(aVar.f, null);
         Supplier<MemoryCacheParams> supplier = aVar.a;
-        this.f437c = supplier == null ? new DefaultBitmapMemoryCacheParamsSupplier((ActivityManager) aVar.b.getSystemService("activity")) : supplier;
+        this.f437c = supplier == null ? new DefaultBitmapMemoryCacheParamsSupplier((ActivityManager) aVar.b.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY)) : supplier;
         this.d = new c.f.j.c.c();
         this.b = Bitmap.Config.ARGB_8888;
         synchronized (n.class) {
diff --git a/app/src/main/java/c/f/j/j/d.java b/app/src/main/java/c/f/j/j/d.java
index 27e47f2311..82d2650867 100644
--- a/app/src/main/java/c/f/j/j/d.java
+++ b/app/src/main/java/c/f/j/j/d.java
@@ -5,6 +5,7 @@ import c.f.d.h.c;
 import c.f.d.h.f;
 import c.f.k.a;
 import com.facebook.common.references.CloseableReference;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.util.Objects;
 /* compiled from: CloseableStaticBitmap */
 public class d extends b implements c {
@@ -65,7 +66,7 @@ public class d extends b implements c {
     @Override // com.facebook.imagepipeline.image.ImageInfo
     public int getHeight() {
         int i;
-        if (this.n % 180 != 0 || (i = this.o) == 5 || i == 7) {
+        if (this.n % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0 || (i = this.o) == 5 || i == 7) {
             Bitmap bitmap = this.l;
             if (bitmap == null) {
                 return 0;
@@ -82,7 +83,7 @@ public class d extends b implements c {
     @Override // com.facebook.imagepipeline.image.ImageInfo
     public int getWidth() {
         int i;
-        if (this.n % 180 != 0 || (i = this.o) == 5 || i == 7) {
+        if (this.n % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0 || (i = this.o) == 5 || i == 7) {
             Bitmap bitmap = this.l;
             if (bitmap == null) {
                 return 0;
diff --git a/app/src/main/java/c/f/j/j/e.java b/app/src/main/java/c/f/j/j/e.java
index 5b287b86c8..8861f94621 100644
--- a/app/src/main/java/c/f/j/j/e.java
+++ b/app/src/main/java/c/f/j/j/e.java
@@ -374,7 +374,7 @@ public class e implements Closeable {
             InputStream e8 = e();
             if (Build.VERSION.SDK_INT >= 24) {
                 try {
-                    i5 = new ExifInterface(e8).getAttributeInt("Orientation", 1);
+                    i5 = new ExifInterface(e8).getAttributeInt(androidx.exifinterface.media.ExifInterface.TAG_ORIENTATION, 1);
                 } catch (IOException unused4) {
                     int i13 = c.f.d.e.a.a;
                 }
diff --git a/app/src/main/java/c/f/j/l/c.java b/app/src/main/java/c/f/j/l/c.java
index b3400b5ab5..8d102cfb89 100644
--- a/app/src/main/java/c/f/j/l/c.java
+++ b/app/src/main/java/c/f/j/l/c.java
@@ -1,4 +1,6 @@
 package c.f.j.l;
+
+import com.discord.api.permission.Permission;
 /* compiled from: BitmapCounterProvider */
 public class c {
     public static final int a;
@@ -9,6 +11,6 @@ public class c {
 
     static {
         int min = (int) Math.min(Runtime.getRuntime().maxMemory(), 2147483647L);
-        a = ((long) min) > 16777216 ? (min / 4) * 3 : min / 2;
+        a = ((long) min) > Permission.MOVE_MEMBERS ? (min / 4) * 3 : min / 2;
     }
 }
diff --git a/app/src/main/java/c/f/j/n/b.java b/app/src/main/java/c/f/j/n/b.java
index 0b33bac700..a5fa223da2 100644
--- a/app/src/main/java/c/f/j/n/b.java
+++ b/app/src/main/java/c/f/j/n/b.java
@@ -9,6 +9,7 @@ import android.graphics.Rect;
 import android.os.Build;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.util.Pools;
+import androidx.exifinterface.media.ExifInterface;
 import c.f.d.j.a;
 import c.f.i.c;
 import c.f.j.j.e;
@@ -23,7 +24,7 @@ import java.util.Objects;
 /* compiled from: DefaultDecoder */
 @TargetApi(11)
 public abstract class b implements d {
-    public static final byte[] a = {-1, -39};
+    public static final byte[] a = {-1, ExifInterface.MARKER_EOI};
     public final d b;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/f/j/p/b.java b/app/src/main/java/c/f/j/p/b.java
index 8f673ed3e5..ad0d6e2e95 100644
--- a/app/src/main/java/c/f/j/p/b.java
+++ b/app/src/main/java/c/f/j/p/b.java
@@ -1,6 +1,7 @@
 package c.f.j.p;
 
 import android.util.Log;
+import androidx.core.os.EnvironmentCompat;
 import c.d.b.a.a;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -80,7 +81,7 @@ public abstract class b<T> implements l<T> {
     public abstract void j(float f);
 
     public void k(Exception exc) {
-        String t = a.t("unknown", ":", getClass().getSimpleName());
+        String t = a.t(EnvironmentCompat.MEDIA_UNKNOWN, ":", getClass().getSimpleName());
         StringBuilder sb = new StringBuilder();
         sb.append("unhandled exception");
         sb.append('\n');
diff --git a/app/src/main/java/c/f/j/p/d.java b/app/src/main/java/c/f/j/p/d.java
index a9f9a1ab44..c6041451e2 100644
--- a/app/src/main/java/c/f/j/p/d.java
+++ b/app/src/main/java/c/f/j/p/d.java
@@ -3,6 +3,7 @@ package c.f.j.p;
 import c.f.d.d.g;
 import c.f.j.e.j;
 import c.f.j.j.f;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.facebook.imagepipeline.request.ImageRequest;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,9 +32,10 @@ public class d implements w0 {
     public final j n;
 
     static {
+        String[] strArr = {ModelAuditLogEntry.CHANGE_KEY_ID, "uri_source"};
         int i = g.i;
         HashSet hashSet = new HashSet(2);
-        Collections.addAll(hashSet, "id", "uri_source");
+        Collections.addAll(hashSet, strArr);
         a = new g(hashSet);
     }
 
@@ -42,7 +44,7 @@ public class d implements w0 {
         this.f474c = str;
         HashMap hashMap = new HashMap();
         this.h = hashMap;
-        hashMap.put("id", str);
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_ID, str);
         hashMap.put("uri_source", imageRequest == null ? "null-request" : imageRequest.f2214c);
         this.d = str2;
         this.e = y0Var;
diff --git a/app/src/main/java/c/f/j/p/f0.java b/app/src/main/java/c/f/j/p/f0.java
index 450317b594..83f74a7e48 100644
--- a/app/src/main/java/c/f/j/p/f0.java
+++ b/app/src/main/java/c/f/j/p/f0.java
@@ -55,7 +55,7 @@ public class f0 extends g0 implements j1<e> {
             int i = 0;
             if (string != null) {
                 try {
-                    i = AnimatableValueParser.u0(new ExifInterface(string).getAttributeInt("Orientation", 1));
+                    i = AnimatableValueParser.u0(new ExifInterface(string).getAttributeInt(androidx.exifinterface.media.ExifInterface.TAG_ORIENTATION, 1));
                 } catch (IOException e2) {
                     a.d(f0.class, e2, "Unable to retrieve thumbnail rotation for %s", string);
                 }
diff --git a/app/src/main/java/c/f/j/p/j0.java b/app/src/main/java/c/f/j/p/j0.java
index 0538a83c45..6eb0f6619a 100644
--- a/app/src/main/java/c/f/j/p/j0.java
+++ b/app/src/main/java/c/f/j/p/j0.java
@@ -20,6 +20,7 @@ import java.io.FileNotFoundException;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Executor;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: LocalVideoThumbnailProducer */
 public class j0 implements v0<CloseableReference<c>> {
     public final Executor a;
@@ -176,7 +177,7 @@ public class j0 implements v0<CloseableReference<c>> {
     public void b(l<CloseableReference<c>> lVar, w0 w0Var) {
         y0 o = w0Var.o();
         ImageRequest e = w0Var.e();
-        w0Var.i("local", "video");
+        w0Var.i("local", MediaStreamTrack.VIDEO_TRACK_KIND);
         a aVar = new a(lVar, o, w0Var, "VideoThumbnailProducer", o, w0Var, e);
         w0Var.f(new b(this, aVar));
         this.a.execute(aVar);
diff --git a/app/src/main/java/c/f/j/p/n.java b/app/src/main/java/c/f/j/p/n.java
index 2ab2b4ef55..05bef300a1 100644
--- a/app/src/main/java/c/f/j/p/n.java
+++ b/app/src/main/java/c/f/j/p/n.java
@@ -1,6 +1,7 @@
 package c.f.j.p;
 
 import android.graphics.Bitmap;
+import androidx.core.os.EnvironmentCompat;
 import c.f.d.d.f;
 import c.f.j.h.d;
 import c.f.j.j.e;
@@ -156,7 +157,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                         if (!z2 && e.t(eVar)) {
                             eVar.w();
                             c.f.i.c cVar3 = eVar.k;
-                            String str2 = cVar3 != null ? cVar3.b : "unknown";
+                            String str2 = cVar3 != null ? cVar3.b : EnvironmentCompat.MEDIA_UNKNOWN;
                             StringBuilder sb = new StringBuilder();
                             eVar.w();
                             sb.append(eVar.n);
@@ -172,7 +173,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                             if (eVar2 != null) {
                                 str = eVar2.a + "x" + eVar2.b;
                             } else {
-                                str = "unknown";
+                                str = EnvironmentCompat.MEDIA_UNKNOWN;
                             }
                             try {
                                 c0 c0Var = cVar2.g;
diff --git a/app/src/main/java/c/f/l/b/a.java b/app/src/main/java/c/f/l/b/a.java
index ab2e4dd682..76e6015ae1 100644
--- a/app/src/main/java/c/f/l/b/a.java
+++ b/app/src/main/java/c/f/l/b/a.java
@@ -5,6 +5,7 @@ import android.graphics.PointF;
 import android.graphics.RectF;
 import androidx.annotation.Nullable;
 import c.f.l.a.b;
+import com.discord.models.domain.ModelAuditLogEntry;
 /* compiled from: AbstractAnimatedZoomableController */
 public abstract class a extends c {
     public boolean m;
@@ -42,7 +43,7 @@ public abstract class a extends c {
 
     @Override // c.f.l.b.c
     public void j() {
-        c.f.d.e.a.i(m(), "reset");
+        c.f.d.e.a.i(m(), ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_RESET);
         o();
         this.r.reset();
         this.q.reset();
diff --git a/app/src/main/java/c/f/l/b/c.java b/app/src/main/java/c/f/l/b/c.java
index be16cfd9af..6a8f21899f 100644
--- a/app/src/main/java/c/f/l/b/c.java
+++ b/app/src/main/java/c/f/l/b/c.java
@@ -7,6 +7,7 @@ import c.f.d.e.a;
 import c.f.l.a.a;
 import c.f.l.a.b;
 import c.f.l.b.e;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.facebook.samples.zoomable.ZoomableDraweeView;
 import java.util.Objects;
 /* compiled from: DefaultZoomableController */
@@ -262,7 +263,7 @@ public class c implements e, b.a {
     }
 
     public void j() {
-        c.f.d.e.a.i(c.class, "reset");
+        c.f.d.e.a.i(c.class, ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_RESET);
         this.a.a.a();
         this.g.reset();
         this.h.reset();
diff --git a/app/src/main/java/c/f/m/c.java b/app/src/main/java/c/f/m/c.java
index cfcd90ce45..49af8b7a39 100644
--- a/app/src/main/java/c/f/m/c.java
+++ b/app/src/main/java/c/f/m/c.java
@@ -5,6 +5,7 @@ import android.os.Trace;
 import android.util.Log;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.facebook.soloader.Api18TraceUtils;
 import com.facebook.soloader.SoLoader;
 import java.io.File;
@@ -54,7 +55,7 @@ public class c extends l {
                         K.append(Arrays.toString(l0));
                         Log.d("SoLoader", K.toString());
                         for (String str2 : l0) {
-                            if (!str2.startsWith("/")) {
+                            if (!str2.startsWith(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN)) {
                                 SoLoader.d(str2, null, null, i | 1, threadPolicy);
                             }
                         }
diff --git a/app/src/main/java/c/f/m/m.java b/app/src/main/java/c/f/m/m.java
index c3f57d1d39..ab871b370c 100644
--- a/app/src/main/java/c/f/m/m.java
+++ b/app/src/main/java/c/f/m/m.java
@@ -5,6 +5,7 @@ import android.os.Parcel;
 import android.os.StrictMode;
 import android.util.Log;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.facebook.soloader.SysUtil$LollipopSysdeps;
 import java.io.Closeable;
 import java.io.DataInput;
@@ -185,7 +186,7 @@ public abstract class m extends c {
     }
 
     public m(Context context, String str) {
-        super(new File(context.getApplicationInfo().dataDir + "/" + str), 1);
+        super(new File(context.getApplicationInfo().dataDir + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + str), 1);
         this.f516c = context;
     }
 
diff --git a/app/src/main/java/c/g/a/b/b.java b/app/src/main/java/c/g/a/b/b.java
index 2d366c57ed..32c84ace04 100644
--- a/app/src/main/java/c/g/a/b/b.java
+++ b/app/src/main/java/c/g/a/b/b.java
@@ -1,4 +1,7 @@
 package c.g.a.b;
+
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
+import com.google.android.material.badge.BadgeDrawable;
 /* compiled from: Base64Variants */
 public final class b {
     public static final a a;
@@ -14,8 +17,8 @@ public final class b {
         b = new a(aVar, "MIME-NO-LINEFEEDS", Integer.MAX_VALUE);
         f519c = new a(aVar, "PEM", true, '=', 64);
         StringBuilder sb = new StringBuilder("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
-        sb.setCharAt(sb.indexOf("+"), '-');
-        sb.setCharAt(sb.indexOf("/"), '_');
+        sb.setCharAt(sb.indexOf(BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX), '-');
+        sb.setCharAt(sb.indexOf(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN), '_');
         d = new a("MODIFIED-FOR-URL", sb.toString(), false, (char) 0, Integer.MAX_VALUE);
     }
 }
diff --git a/app/src/main/java/c/g/a/b/e.java b/app/src/main/java/c/g/a/b/e.java
index 42dd02371d..ab6c323abb 100644
--- a/app/src/main/java/c/g/a/b/e.java
+++ b/app/src/main/java/c/g/a/b/e.java
@@ -1,6 +1,7 @@
 package c.g.a.b;
 
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import java.io.Serializable;
 import java.nio.charset.Charset;
 /* compiled from: JsonLocation */
@@ -94,7 +95,7 @@ public class e implements Serializable {
                 if (obj instanceof byte[]) {
                     byte[] bArr = (byte[]) obj;
                     int min = Math.min(bArr.length, 500);
-                    String str3 = new String(bArr, 0, min, Charset.forName("UTF-8"));
+                    String str3 = new String(bArr, 0, min, Charset.forName(Constants.ENCODING));
                     sb.append('\"');
                     sb.append(str3);
                     sb.append('\"');
diff --git a/app/src/main/java/c/g/a/b/g.java b/app/src/main/java/c/g/a/b/g.java
index 790dad7b0f..01211027a0 100644
--- a/app/src/main/java/c/g/a/b/g.java
+++ b/app/src/main/java/c/g/a/b/g.java
@@ -1,6 +1,7 @@
 package c.g.a.b;
 
 import c.g.a.b.p.a;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 /* compiled from: JsonStreamContext */
 public abstract class g {
     public int a;
@@ -79,7 +80,7 @@ public abstract class g {
                 sb.append(']');
             }
         } else {
-            sb.append("/");
+            sb.append(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         }
         return sb.toString();
     }
diff --git a/app/src/main/java/c/g/a/b/o/b.java b/app/src/main/java/c/g/a/b/o/b.java
index cb1019aa2b..ee92f736e1 100644
--- a/app/src/main/java/c/g/a/b/o/b.java
+++ b/app/src/main/java/c/g/a/b/o/b.java
@@ -1,5 +1,6 @@
 package c.g.a.b.o;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.g.a.b.f;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -17,7 +18,7 @@ public abstract class b extends f {
         j = valueOf2;
         BigInteger valueOf3 = BigInteger.valueOf(Long.MIN_VALUE);
         k = valueOf3;
-        BigInteger valueOf4 = BigInteger.valueOf(Long.MAX_VALUE);
+        BigInteger valueOf4 = BigInteger.valueOf(RecyclerView.FOREVER_NS);
         l = valueOf4;
         new BigDecimal(valueOf3);
         new BigDecimal(valueOf4);
diff --git a/app/src/main/java/c/g/a/b/p/f.java b/app/src/main/java/c/g/a/b/p/f.java
index 842c91aa67..b8f0478537 100644
--- a/app/src/main/java/c/g/a/b/p/f.java
+++ b/app/src/main/java/c/g/a/b/p/f.java
@@ -1,8 +1,10 @@
 package c.g.a.b.p;
+
+import androidx.recyclerview.widget.RecyclerView;
 /* compiled from: NumberInput */
 public final class f {
     public static final String a = String.valueOf(Long.MIN_VALUE).substring(1);
-    public static final String b = String.valueOf(Long.MAX_VALUE);
+    public static final String b = String.valueOf((long) RecyclerView.FOREVER_NS);
 
     public static long a(String str) {
         int i;
diff --git a/app/src/main/java/c/g/a/b/q/d.java b/app/src/main/java/c/g/a/b/q/d.java
index a3f57a7f3a..a4a07b6bf6 100644
--- a/app/src/main/java/c/g/a/b/q/d.java
+++ b/app/src/main/java/c/g/a/b/q/d.java
@@ -8,6 +8,7 @@ import c.g.a.b.p.a;
 import c.g.a.b.p.c;
 import c.g.a.b.p.g;
 import c.g.a.b.t.m;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.fasterxml.jackson.core.JsonGenerationException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -1309,7 +1310,7 @@ public class d extends b {
             if (m == 1) {
                 c2 = ',';
             } else if (m == 2) {
-                c2 = ':';
+                c2 = MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
             } else if (m == 3) {
                 k kVar = this.u;
                 if (kVar != null) {
diff --git a/app/src/main/java/c/g/a/b/t/a.java b/app/src/main/java/c/g/a/b/t/a.java
index 80507f193d..2ffc266403 100644
--- a/app/src/main/java/c/g/a/b/t/a.java
+++ b/app/src/main/java/c/g/a/b/t/a.java
@@ -1,10 +1,11 @@
 package c.g.a.b.t;
 
+import com.discord.utilities.rest.SendUtils;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 /* compiled from: BufferRecycler */
 public class a {
     public static final int[] a = {8000, 8000, 2000, 2000};
-    public static final int[] b = {4000, 4000, 200, 200};
+    public static final int[] b = {SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, 200, 200};
 
     /* renamed from: c  reason: collision with root package name */
     public final AtomicReferenceArray<byte[]> f534c = new AtomicReferenceArray<>(4);
diff --git a/app/src/main/java/c/g/a/b/t/f.java b/app/src/main/java/c/g/a/b/t/f.java
index 4bd141bc25..ad10fddb0e 100644
--- a/app/src/main/java/c/g/a/b/t/f.java
+++ b/app/src/main/java/c/g/a/b/t/f.java
@@ -1,5 +1,6 @@
 package c.g.a.b.t;
 
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.util.concurrent.ConcurrentHashMap;
 /* compiled from: InternCache */
 public final class f extends ConcurrentHashMap<String, String> {
@@ -8,7 +9,7 @@ public final class f extends ConcurrentHashMap<String, String> {
     private final Object lock = new Object();
 
     public f() {
-        super(180, 0.8f, 4);
+        super(BaseTransientBottomBar.ANIMATION_FADE_DURATION, 0.8f, 4);
     }
 
     public String a(String str) {
diff --git a/app/src/main/java/c/g/a/b/t/j.java b/app/src/main/java/c/g/a/b/t/j.java
index b7e63153ca..3fcb131a08 100644
--- a/app/src/main/java/c/g/a/b/t/j.java
+++ b/app/src/main/java/c/g/a/b/t/j.java
@@ -1,12 +1,13 @@
 package c.g.a.b.t;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.io.Serializable;
 /* compiled from: Separators */
 public class j implements Serializable {
     private static final long serialVersionUID = 1;
     private final char arrayValueSeparator = ',';
     private final char objectEntrySeparator = ',';
-    private final char objectFieldValueSeparator = ':';
+    private final char objectFieldValueSeparator = MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
 
     public char a() {
         return this.arrayValueSeparator;
diff --git a/app/src/main/java/c/g/a/c/h0/l.java b/app/src/main/java/c/g/a/c/h0/l.java
index 01a74c4e1a..55a8446961 100644
--- a/app/src/main/java/c/g/a/c/h0/l.java
+++ b/app/src/main/java/c/g/a/c/h0/l.java
@@ -8,6 +8,7 @@ import c.g.a.c.e0.g;
 import c.g.a.c.j;
 import c.g.a.c.m;
 import c.g.a.c.x;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.IOException;
 import java.util.Arrays;
@@ -36,7 +37,7 @@ public abstract class l extends j implements m {
             for (int i2 = 0; i2 < length; i2++) {
                 char charAt = name.charAt(i2);
                 if (charAt == '.') {
-                    charAt = '/';
+                    charAt = MentionUtilsKt.SLASH_CHAR;
                 }
                 sb.append(charAt);
             }
diff --git a/app/src/main/java/c/g/a/c/i0/r.java b/app/src/main/java/c/g/a/c/i0/r.java
index acdcab4316..cf5bb37acf 100644
--- a/app/src/main/java/c/g/a/c/i0/r.java
+++ b/app/src/main/java/c/g/a/c/i0/r.java
@@ -1,6 +1,9 @@
 package c.g.a.c.i0;
 
+import androidx.core.app.NotificationManagerCompat;
 import c.g.a.b.p.f;
+import com.discord.utilities.time.TimeUtils;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.text.DateFormat;
 import java.text.FieldPosition;
 import java.text.ParseException;
@@ -17,7 +20,7 @@ import java.util.regex.Pattern;
 public class r extends DateFormat {
     public static final Pattern i = Pattern.compile("\\d\\d\\d\\d[-]\\d\\d[-]\\d\\d");
     public static final Pattern j = Pattern.compile("\\d\\d\\d\\d[-]\\d\\d[-]\\d\\d[T]\\d\\d[:]\\d\\d(?:[:]\\d\\d)?(\\.\\d+)?(Z|[+-]\\d\\d(?:[:]?\\d\\d)?)?");
-    public static final String[] k = {"yyyy-MM-dd'T'HH:mm:ss.SSSX", "yyyy-MM-dd'T'HH:mm:ss.SSS", "EEE, dd MMM yyyy HH:mm:ss zzz", "yyyy-MM-dd"};
+    public static final String[] k = {"yyyy-MM-dd'T'HH:mm:ss.SSSX", "yyyy-MM-dd'T'HH:mm:ss.SSS", "EEE, dd MMM yyyy HH:mm:ss zzz", TimeUtils.UTCFormat.SHORT};
     public static final TimeZone l;
     public static final Locale m;
     public static final DateFormat n;
@@ -146,9 +149,9 @@ public class r extends DateFormat {
         j(stringBuffer, b.get(5));
         stringBuffer.append('T');
         j(stringBuffer, b.get(11));
-        stringBuffer.append(':');
+        stringBuffer.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         j(stringBuffer, b.get(12));
-        stringBuffer.append(':');
+        stringBuffer.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         j(stringBuffer, b.get(13));
         stringBuffer.append('.');
         int i3 = b.get(14);
@@ -171,7 +174,7 @@ public class r extends DateFormat {
             stringBuffer.append(c2);
             j(stringBuffer, abs);
             if (this._tzSerializedWithColon) {
-                stringBuffer.append(':');
+                stringBuffer.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
             }
             j(stringBuffer, abs2);
         } else if (this._tzSerializedWithColon) {
@@ -209,7 +212,7 @@ public class r extends DateFormat {
                     if (i3 >= 5) {
                         f += f(str, end - 2) * 60;
                     }
-                    b.set(15, str.charAt(start) == '-' ? f * -1000 : f * 1000);
+                    b.set(15, str.charAt(start) == '-' ? f * NotificationManagerCompat.IMPORTANCE_UNSPECIFIED : f * 1000);
                     b.set(16, 0);
                 }
                 b.set(g(str, 0), f(str, 5) - 1, f(str, 8), f(str, 11), f(str, 14), (length <= 16 || str.charAt(16) != ':') ? 0 : f(str, 17));
@@ -243,7 +246,7 @@ public class r extends DateFormat {
             b.set(14, 0);
             return b.getTime();
         } else {
-            str2 = "yyyy-MM-dd";
+            str2 = TimeUtils.UTCFormat.SHORT;
             c2 = 1;
         }
         Object[] objArr = new Object[3];
diff --git a/app/src/main/java/c/i/a/b/i/a.java b/app/src/main/java/c/i/a/b/i/a.java
index 64581b3fb4..50b1ac0889 100644
--- a/app/src/main/java/c/i/a/b/i/a.java
+++ b/app/src/main/java/c/i/a/b/i/a.java
@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import c.i.a.b.b;
 import c.i.a.b.j.d;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -40,7 +41,7 @@ public final class a implements d {
 
     @NonNull
     public static a a(@NonNull byte[] bArr) {
-        String str = new String(bArr, Charset.forName("UTF-8"));
+        String str = new String(bArr, Charset.forName(Constants.ENCODING));
         if (str.startsWith("1$")) {
             String[] split = str.substring(2).split(Pattern.quote("\\"), 2);
             if (split.length == 2) {
@@ -74,6 +75,6 @@ public final class a implements d {
             str = "";
         }
         objArr[3] = str;
-        return String.format("%s%s%s%s", objArr).getBytes(Charset.forName("UTF-8"));
+        return String.format("%s%s%s%s", objArr).getBytes(Charset.forName(Constants.ENCODING));
     }
 }
diff --git a/app/src/main/java/c/i/a/b/i/b.java b/app/src/main/java/c/i/a/b/i/b.java
index e8deef7cda..29bf97b30b 100644
--- a/app/src/main/java/c/i/a/b/i/b.java
+++ b/app/src/main/java/c/i/a/b/i/b.java
@@ -1,9 +1,11 @@
 package c.i.a.b.i;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import c.i.a.b.i.d;
 import c.i.a.b.i.e.h;
 import c.i.a.b.i.e.n;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.restapi.RestAPIBuilder;
 import com.google.firebase.encoders.EncodingException;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -37,10 +39,10 @@ public final /* synthetic */ class b {
         httpURLConnection.setReadTimeout(dVar.g);
         httpURLConnection.setDoOutput(true);
         httpURLConnection.setInstanceFollowRedirects(false);
-        httpURLConnection.setRequestMethod("POST");
+        httpURLConnection.setRequestMethod(ShareTarget.METHOD_POST);
         httpURLConnection.setRequestProperty("User-Agent", String.format("datatransport/%s android/", "2.3.2"));
         httpURLConnection.setRequestProperty("Content-Encoding", "gzip");
-        httpURLConnection.setRequestProperty("Content-Type", "application/json");
+        httpURLConnection.setRequestProperty("Content-Type", RestAPIBuilder.CONTENT_TYPE_JSON);
         httpURLConnection.setRequestProperty("Accept-Encoding", "gzip");
         String str = aVar.f597c;
         if (str != null) {
diff --git a/app/src/main/java/c/i/a/b/i/d.java b/app/src/main/java/c/i/a/b/i/d.java
index 554f15dcb0..c4b0fb52d5 100644
--- a/app/src/main/java/c/i/a/b/i/d.java
+++ b/app/src/main/java/c/i/a/b/i/d.java
@@ -20,6 +20,7 @@ import c.i.a.b.j.q.f;
 import c.i.a.b.j.q.g;
 import c.i.a.b.j.q.m;
 import c.i.c.p.h.e;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -147,7 +148,7 @@ public final class d implements m {
                         bVar = new f.b();
                         bVar.d = bArr;
                     } else if (bVar2.equals(new c.i.a.b.b("json"))) {
-                        String str3 = new String(d.b, Charset.forName("UTF-8"));
+                        String str3 = new String(d.b, Charset.forName(Constants.ENCODING));
                         bVar = new f.b();
                         bVar.e = str3;
                     } else {
diff --git a/app/src/main/java/c/i/a/b/j/t/h/d.java b/app/src/main/java/c/i/a/b/j/t/h/d.java
index 4afb993e76..0f50387d1c 100644
--- a/app/src/main/java/c/i/a/b/j/t/h/d.java
+++ b/app/src/main/java/c/i/a/b/j/t/h/d.java
@@ -7,10 +7,12 @@ import android.content.Context;
 import android.os.PersistableBundle;
 import android.util.Base64;
 import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 import c.i.a.b.j.i;
 import c.i.a.b.j.t.h.f;
 import c.i.a.b.j.t.i.c;
 import c.i.a.b.j.w.a;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService;
 import java.nio.ByteBuffer;
@@ -44,8 +46,8 @@ public class d implements r {
         ComponentName componentName = new ComponentName(this.a, JobInfoSchedulerService.class);
         JobScheduler jobScheduler = (JobScheduler) this.a.getSystemService("jobscheduler");
         Adler32 adler32 = new Adler32();
-        adler32.update(this.a.getPackageName().getBytes(Charset.forName("UTF-8")));
-        adler32.update(iVar.b().getBytes(Charset.forName("UTF-8")));
+        adler32.update(this.a.getPackageName().getBytes(Charset.forName(Constants.ENCODING)));
+        adler32.update(iVar.b().getBytes(Charset.forName(Constants.ENCODING)));
         adler32.update(ByteBuffer.allocate(4).putInt(a.a(iVar.d())).array());
         if (iVar.c() != null) {
             adler32.update(iVar.c());
@@ -93,7 +95,7 @@ public class d implements r {
         persistableBundle.putInt("priority", a.a(iVar.d()));
         if (iVar.c() != null) {
             c2 = 0;
-            persistableBundle.putString("extras", Base64.encodeToString(iVar.c(), 0));
+            persistableBundle.putString(NotificationCompat.MessagingStyle.Message.KEY_EXTRAS_BUNDLE, Base64.encodeToString(iVar.c(), 0));
         } else {
             c2 = 0;
         }
diff --git a/app/src/main/java/c/i/a/b/j/t/i/j.java b/app/src/main/java/c/i/a/b/j/t/i/j.java
index 74d5b92b77..5796c0c826 100644
--- a/app/src/main/java/c/i/a/b/j/t/i/j.java
+++ b/app/src/main/java/c/i/a/b/j/t/i/j.java
@@ -6,6 +6,7 @@ import c.i.a.b.b;
 import c.i.a.b.j.f;
 import c.i.a.b.j.i;
 import c.i.a.b.j.t.i.t;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -33,7 +34,7 @@ public final /* synthetic */ class j implements t.b {
         ArrayList arrayList = new ArrayList();
         Long c2 = tVar.c(sQLiteDatabase, iVar);
         if (c2 != null) {
-            t.p(sQLiteDatabase.query("events", new String[]{"_id", "transport_name", "timestamp_ms", "uptime_ms", "payload_encoding", "payload", "code", "inline"}, "context_id = ?", new String[]{c2.toString()}, null, null, null, String.valueOf(tVar.m.c())), new k(tVar, arrayList, iVar));
+            t.p(sQLiteDatabase.query("events", new String[]{"_id", "transport_name", "timestamp_ms", "uptime_ms", "payload_encoding", "payload", ModelAuditLogEntry.CHANGE_KEY_CODE, "inline"}, "context_id = ?", new String[]{c2.toString()}, null, null, null, String.valueOf(tVar.m.c())), new k(tVar, arrayList, iVar));
         }
         HashMap hashMap = new HashMap();
         StringBuilder sb = new StringBuilder("event_id IN (");
@@ -44,7 +45,7 @@ public final /* synthetic */ class j implements t.b {
             }
         }
         sb.append(')');
-        Cursor query = sQLiteDatabase.query("event_metadata", new String[]{"event_id", "name", "value"}, sb.toString(), null, null, null, null);
+        Cursor query = sQLiteDatabase.query("event_metadata", new String[]{"event_id", ModelAuditLogEntry.CHANGE_KEY_NAME, "value"}, sb.toString(), null, null, null, null);
         while (query.moveToNext()) {
             try {
                 long j = query.getLong(0);
diff --git a/app/src/main/java/c/i/a/b/j/t/i/s.java b/app/src/main/java/c/i/a/b/j/t/i/s.java
index 7262a33627..05edc05336 100644
--- a/app/src/main/java/c/i/a/b/j/t/i/s.java
+++ b/app/src/main/java/c/i/a/b/j/t/i/s.java
@@ -3,11 +3,13 @@ package c.i.a.b.j.t.i;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Base64;
+import androidx.core.app.NotificationCompat;
 import c.i.a.b.b;
 import c.i.a.b.j.f;
 import c.i.a.b.j.i;
 import c.i.a.b.j.t.i.t;
 import c.i.a.b.j.w.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
@@ -45,7 +47,7 @@ public final /* synthetic */ class s implements t.b {
             contentValues.put("priority", Integer.valueOf(a.a(iVar.d())));
             contentValues.put("next_request_ms", (Integer) 0);
             if (iVar.c() != null) {
-                contentValues.put("extras", Base64.encodeToString(iVar.c(), 0));
+                contentValues.put(NotificationCompat.MessagingStyle.Message.KEY_EXTRAS_BUNDLE, Base64.encodeToString(iVar.c(), 0));
             }
             j = sQLiteDatabase.insert("transport_contexts", null, contentValues);
         }
@@ -58,7 +60,7 @@ public final /* synthetic */ class s implements t.b {
         contentValues2.put("timestamp_ms", Long.valueOf(fVar.e()));
         contentValues2.put("uptime_ms", Long.valueOf(fVar.h()));
         contentValues2.put("payload_encoding", fVar.d().a.a);
-        contentValues2.put("code", fVar.c());
+        contentValues2.put(ModelAuditLogEntry.CHANGE_KEY_CODE, fVar.c());
         contentValues2.put("num_attempts", (Integer) 0);
         contentValues2.put("inline", Boolean.valueOf(z2));
         contentValues2.put("payload", z2 ? bArr : new byte[0]);
@@ -77,7 +79,7 @@ public final /* synthetic */ class s implements t.b {
         for (Map.Entry entry : Collections.unmodifiableMap(fVar.b()).entrySet()) {
             ContentValues contentValues4 = new ContentValues();
             contentValues4.put("event_id", Long.valueOf(insert));
-            contentValues4.put("name", (String) entry.getKey());
+            contentValues4.put(ModelAuditLogEntry.CHANGE_KEY_NAME, (String) entry.getKey());
             contentValues4.put("value", (String) entry.getValue());
             sQLiteDatabase.insert("event_metadata", null, contentValues4);
         }
diff --git a/app/src/main/java/c/i/a/c/a2/a.java b/app/src/main/java/c/i/a/c/a2/a.java
index 4884bb0927..f21f2d0795 100644
--- a/app/src/main/java/c/i/a/c/a2/a.java
+++ b/app/src/main/java/c/i/a/c/a2/a.java
@@ -4,6 +4,7 @@ import androidx.annotation.Nullable;
 import c.i.a.c.a2.t;
 import c.i.a.c.i2.f0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import java.io.IOException;
 /* compiled from: BinarySearchSeeker */
 public abstract class a {
@@ -211,7 +212,7 @@ public abstract class a {
 
     public final boolean f(i iVar, long j) throws IOException {
         long position = j - iVar.getPosition();
-        if (position < 0 || position > 262144) {
+        if (position < 0 || position > Permission.USE_EXTERNAL_EMOJIS) {
             return false;
         }
         iVar.l((int) position);
diff --git a/app/src/main/java/c/i/a/c/a2/c0/c.java b/app/src/main/java/c/i/a/c/a2/c0/c.java
index f1ae62a7b3..5738169408 100644
--- a/app/src/main/java/c/i/a/c/a2/c0/c.java
+++ b/app/src/main/java/c/i/a/c/a2/c0/c.java
@@ -6,6 +6,7 @@ import c.i.a.c.a2.m;
 import c.i.a.c.a2.o;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import java.io.IOException;
 import java.util.Objects;
 /* compiled from: FlacBinarySearchSeeker */
@@ -88,7 +89,7 @@ public final class c extends c.i.a.c.a2.a {
             j3 = 1;
         } else {
             int i3 = oVar.a;
-            j4 = ((((i3 != oVar.b || i3 <= 0) ? 4096 : (long) i3) * ((long) oVar.g)) * ((long) oVar.h)) / 8;
+            j4 = ((((i3 != oVar.b || i3 <= 0) ? Permission.SEND_TTS_MESSAGES : (long) i3) * ((long) oVar.g)) * ((long) oVar.h)) / 8;
             j3 = 64;
         }
     }
diff --git a/app/src/main/java/c/i/a/c/a2/d0/d.java b/app/src/main/java/c/i/a/c/a2/d0/d.java
index ebaa3068eb..82b907ccf4 100644
--- a/app/src/main/java/c/i/a/c/a2/d0/d.java
+++ b/app/src/main/java/c/i/a/c/a2/d0/d.java
@@ -4,6 +4,7 @@ import androidx.annotation.Nullable;
 import c.i.a.c.a2.g;
 import c.i.a.c.i2.w;
 import com.google.android.exoplayer2.extractor.flv.TagPayloadReader;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -106,7 +107,7 @@ public final class d extends TagPayloadReader {
         Object obj = e.get("duration");
         if (obj instanceof Double) {
             double doubleValue = ((Double) obj).doubleValue();
-            if (doubleValue > 0.0d) {
+            if (doubleValue > ShadowDrawableWrapper.COS_45) {
                 this.b = (long) (doubleValue * 1000000.0d);
             }
         }
diff --git a/app/src/main/java/c/i/a/c/a2/f0/e.java b/app/src/main/java/c/i/a/c/a2/f0/e.java
index 741dabc48f..22115df0e5 100644
--- a/app/src/main/java/c/i/a/c/a2/f0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/f0/e.java
@@ -5,6 +5,7 @@ import android.util.Pair;
 import android.util.SparseArray;
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.a.c.a2.f0.b;
 import c.i.a.c.a2.h;
 import c.i.a.c.a2.i;
@@ -21,10 +22,13 @@ import c.i.a.c.j2.k;
 import c.i.a.c.j2.m;
 import c.i.a.c.v1.k;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.video.ColorInfo;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -237,7 +241,7 @@ public class e implements h {
         HashMap hashMap = new HashMap();
         hashMap.put("htc_video_rotA-000", 0);
         hashMap.put("htc_video_rotA-090", 90);
-        hashMap.put("htc_video_rotA-180", 180);
+        hashMap.put("htc_video_rotA-180", Integer.valueOf((int) BaseTransientBottomBar.ANIMATION_FADE_DURATION));
         hashMap.put("htc_video_rotA-270", 270);
         e = Collections.unmodifiableMap(hashMap);
     }
@@ -289,9 +293,9 @@ public class e implements h {
         int i;
         f fVar = new f();
         long b2 = iVar.b();
-        long j = 1024;
+        long j = Permission.VIEW_CHANNEL;
         int i2 = (b2 > -1 ? 1 : (b2 == -1 ? 0 : -1));
-        if (i2 != 0 && b2 <= 1024) {
+        if (i2 != 0 && b2 <= Permission.VIEW_CHANNEL) {
             j = b2;
         }
         int i3 = (int) j;
@@ -537,7 +541,7 @@ public class e implements h {
                         case 183:
                         case 187:
                         case 224:
-                        case 225:
+                        case HideBottomViewOnScrollBehavior.ENTER_ANIMATION_DURATION /* 225 */:
                         case 16868:
                         case 18407:
                         case 19899:
@@ -1979,7 +1983,7 @@ public class e implements h {
                                                 } else if (Float.compare(cVar.t, 90.0f) == 0) {
                                                     i6 = 90;
                                                 } else if (Float.compare(cVar.t, -180.0f) == 0 || Float.compare(cVar.t, 180.0f) == 0) {
-                                                    i6 = 180;
+                                                    i6 = BaseTransientBottomBar.ANIMATION_FADE_DURATION;
                                                 } else if (Float.compare(cVar.t, -90.0f) == 0) {
                                                     i6 = 270;
                                                 }
@@ -3553,7 +3557,7 @@ public class e implements h {
                     byte b2 = this.f668d0;
                     if ((b2 & 1) == 1) {
                         boolean z2 = (b2 & 2) == 2;
-                        this.T |= 1073741824;
+                        this.T |= BasicMeasure.EXACTLY;
                         if (!this.f669e0) {
                             iVar.readFully(this.q.a, 0, 8);
                             this.W += 8;
diff --git a/app/src/main/java/c/i/a/c/a2/g0/e.java b/app/src/main/java/c/i/a/c/a2/g0/e.java
index 5ad1378ab7..204f7420ec 100644
--- a/app/src/main/java/c/i/a/c/a2/g0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/g0/e.java
@@ -5,6 +5,7 @@ import c.i.a.c.a2.t;
 import c.i.a.c.a2.u;
 import c.i.a.c.h0;
 import c.i.a.c.i2.f0;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 /* compiled from: MlltSeeker */
 public final class e implements g {
     public final long[] a;
@@ -28,7 +29,7 @@ public final class e implements g {
             return Pair.create(Long.valueOf(j2), Long.valueOf(j3));
         }
         long j4 = jArr[i];
-        return Pair.create(Long.valueOf(j), Long.valueOf(((long) ((j4 == j2 ? 0.0d : (((double) j) - ((double) j2)) / ((double) (j4 - j2))) * ((double) (jArr2[i] - j3)))) + j3));
+        return Pair.create(Long.valueOf(j), Long.valueOf(((long) ((j4 == j2 ? ShadowDrawableWrapper.COS_45 : (((double) j) - ((double) j2)) / ((double) (j4 - j2))) * ((double) (jArr2[i] - j3)))) + j3));
     }
 
     @Override // c.i.a.c.a2.g0.g
diff --git a/app/src/main/java/c/i/a/c/a2/g0/i.java b/app/src/main/java/c/i/a/c/a2/g0/i.java
index 8f4dd248fc..f7a3f34085 100644
--- a/app/src/main/java/c/i/a/c/a2/g0/i.java
+++ b/app/src/main/java/c/i/a/c/a2/g0/i.java
@@ -5,6 +5,7 @@ import c.i.a.c.a2.t;
 import c.i.a.c.a2.u;
 import c.i.a.c.i2.f0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 /* compiled from: XingSeeker */
 public final class i implements g {
     public final long a;
@@ -52,7 +53,7 @@ public final class i implements g {
         int i = e + 1;
         long j6 = (j3 * ((long) i)) / 100;
         long j7 = e == 99 ? 256 : jArr[i];
-        return Math.round((j5 == j7 ? 0.0d : (d - ((double) j5)) / ((double) (j7 - j5))) * ((double) (j6 - j4))) + j4;
+        return Math.round((j5 == j7 ? ShadowDrawableWrapper.COS_45 : (d - ((double) j5)) / ((double) (j7 - j5))) * ((double) (j6 - j4))) + j4;
     }
 
     @Override // c.i.a.c.a2.t
@@ -62,8 +63,8 @@ public final class i implements g {
         }
         long i = f0.i(j, 0, this.f687c);
         double d = (((double) i) * 100.0d) / ((double) this.f687c);
-        double d2 = 0.0d;
-        if (d > 0.0d) {
+        double d2 = ShadowDrawableWrapper.COS_45;
+        if (d > ShadowDrawableWrapper.COS_45) {
             if (d >= 100.0d) {
                 d2 = 256.0d;
             } else {
diff --git a/app/src/main/java/c/i/a/c/a2/h0/e.java b/app/src/main/java/c/i/a/c/a2/h0/e.java
index a2e462f4df..4fd51a14b4 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/e.java
@@ -3,6 +3,7 @@ package c.i.a.c.a2.h0;
 import android.util.Log;
 import android.util.Pair;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.a2.h0.d;
 import c.i.a.c.a2.p;
 import c.i.a.c.i2.f0;
@@ -19,6 +20,7 @@ import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -868,7 +870,7 @@ public final class e {
                     wVar2.E(4);
                     int f6 = wVar2.f();
                     int f7 = wVar2.f();
-                    int i29 = (f4 == 0 && f5 == 65536 && f6 == -65536 && f7 == 0) ? 90 : (f4 == 0 && f5 == -65536 && f6 == 65536 && f7 == 0) ? 270 : (f4 == -65536 && f5 == 0 && f6 == 0 && f7 == -65536) ? 180 : 0;
+                    int i29 = (f4 == 0 && f5 == 65536 && f6 == -65536 && f7 == 0) ? 90 : (f4 == 0 && f5 == -65536 && f6 == 65536 && f7 == 0) ? 270 : (f4 == -65536 && f5 == 0 && f6 == 0 && f7 == -65536) ? BaseTransientBottomBar.ANIMATION_FADE_DURATION : 0;
                     long j4 = j == -9223372036854775807L ? j2 : j;
                     w wVar3 = c2.b;
                     wVar3.D(8);
@@ -1496,7 +1498,7 @@ public final class e {
                                         wVar5.b += i50;
                                         uVar2 = u.t(bArr8);
                                         str18 = "application/x-quicktime-tx3g";
-                                        j3 = Long.MAX_VALUE;
+                                        j3 = RecyclerView.FOREVER_NS;
                                         aVar4 = aVar6;
                                         Format.b m04 = c.d.b.a.a.m0(f3);
                                         m04.k = str18;
@@ -1511,7 +1513,7 @@ public final class e {
                                             uVar2 = null;
                                             j3 = 0;
                                         } else if (f11 == 1664495672) {
-                                            j3 = Long.MAX_VALUE;
+                                            j3 = RecyclerView.FOREVER_NS;
                                             str18 = "application/x-mp4-cea-608";
                                             uVar2 = null;
                                             i31 = 1;
@@ -1528,7 +1530,7 @@ public final class e {
                                     }
                                 }
                                 uVar2 = null;
-                                j3 = Long.MAX_VALUE;
+                                j3 = RecyclerView.FOREVER_NS;
                                 aVar4 = aVar6;
                                 Format.b m04 = c.d.b.a.a.m0(f3);
                                 m04.k = str18;
diff --git a/app/src/main/java/c/i/a/c/a2/h0/g.java b/app/src/main/java/c/i/a/c/a2/h0/g.java
index a30fb2441a..c95e236c20 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/g.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/g.java
@@ -4,6 +4,9 @@ import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.a2.c;
 import c.i.a.c.a2.h;
 import c.i.a.c.a2.h0.d;
@@ -293,7 +296,7 @@ public class g implements h {
 
     public static void i(c.i.a.c.i2.w wVar, int i, o oVar) throws ParserException {
         wVar.D(i + 8);
-        int f = wVar.f() & 16777215;
+        int f = wVar.f() & ViewCompat.MEASURED_SIZE_MASK;
         if ((f & 1) == 0) {
             boolean z2 = (f & 2) != 0;
             int v = wVar.v();
@@ -451,7 +454,7 @@ public class g implements h {
                     throw new ParserException("Atom size less than header length (unsupported).");
                 }
             } else if (i2 != 1) {
-                long j9 = Long.MAX_VALUE;
+                long j9 = RecyclerView.FOREVER_NS;
                 if (i2 != 2) {
                     b bVar = this.f695y;
                     if (bVar == null) {
@@ -614,7 +617,7 @@ public class g implements h {
                     }
                     int i17 = !bVar.l ? bVar.d.g[bVar.f] : bVar.b.k[bVar.f] ? 1 : 0;
                     if (bVar.b() != null) {
-                        i17 |= 1073741824;
+                        i17 |= BasicMeasure.EXACTLY;
                     }
                     n b5 = bVar.b();
                     wVar3.d(j, i17, this.f696z, 0, b5 != null ? b5.f706c : null);
@@ -957,7 +960,7 @@ public class g implements h {
                             Objects.requireNonNull(c2);
                             c.i.a.c.i2.w wVar4 = c2.b;
                             wVar4.D(i23);
-                            int f = wVar4.f() & 16777215;
+                            int f = wVar4.f() & ViewCompat.MEASURED_SIZE_MASK;
                             b valueAt = sparseArray3.size() == 1 ? sparseArray3.valueAt(0) : sparseArray3.get(wVar4.f());
                             if (valueAt == null) {
                                 valueAt = null;
@@ -1040,7 +1043,7 @@ public class g implements h {
                                         int i33 = i31 + 1;
                                         c.i.a.c.i2.w wVar7 = bVar6.b;
                                         wVar7.D(8);
-                                        int f2 = wVar7.f() & 16777215;
+                                        int f2 = wVar7.f() & ViewCompat.MEASURED_SIZE_MASK;
                                         list = list2;
                                         m mVar3 = valueAt.d.a;
                                         i9 = size4;
@@ -1223,7 +1226,7 @@ public class g implements h {
                                     c.i.a.c.i2.w wVar8 = c4.b;
                                     int i36 = a2.d;
                                     wVar8.D(8);
-                                    if ((wVar8.f() & 16777215 & 1) == 1) {
+                                    if ((wVar8.f() & ViewCompat.MEASURED_SIZE_MASK & 1) == 1) {
                                         wVar8.E(8);
                                     }
                                     int s2 = wVar8.s();
diff --git a/app/src/main/java/c/i/a/c/a2/h0/h.java b/app/src/main/java/c/i/a/c/a2/h0/h.java
index 3ad18a6a8f..7d180d1be4 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/h.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/h.java
@@ -3,8 +3,10 @@ package c.i.a.c.a2.h0;
 import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
 import c.i.a.c.i2.w;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.metadata.id3.CommentFrame;
 import com.google.android.exoplayer2.metadata.id3.Id3Frame;
@@ -32,7 +34,7 @@ public final class h {
     public static ApicFrame b(w wVar) {
         int f = wVar.f();
         if (wVar.f() == 1684108385) {
-            int f2 = wVar.f() & 16777215;
+            int f2 = wVar.f() & ViewCompat.MEASURED_SIZE_MASK;
             String str = f2 == 13 ? "image/jpeg" : f2 == 14 ? "image/png" : null;
             if (str == null) {
                 a.d0("Unrecognized cover art flags: ", f2, "MetadataUtil");
@@ -59,7 +61,7 @@ public final class h {
                 String j = a.j("", x2);
                 int x3 = wVar.x();
                 if (x3 > 0) {
-                    j = j + "/" + x3;
+                    j = j + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + x3;
                 }
                 return new TextInformationFrame(str, null, j);
             }
diff --git a/app/src/main/java/c/i/a/c/a2/h0/i.java b/app/src/main/java/c/i/a/c/a2/h0/i.java
index 92fe03935a..85de32e578 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/i.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/i.java
@@ -3,6 +3,7 @@ package c.i.a.c.a2.h0;
 import android.util.Log;
 import android.util.Pair;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.a2.h;
 import c.i.a.c.a2.h0.d;
 import c.i.a.c.a2.h0.k;
@@ -15,6 +16,7 @@ import c.i.a.c.i2.u;
 import c.i.a.c.i2.w;
 import c.i.a.c.v1.m;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.metadata.Metadata;
@@ -266,7 +268,7 @@ public final class i implements h, t {
                     } else if (!this.g.isEmpty()) {
                         this.g.peek().f688c.add(new d.b(this.k, wVar3));
                     }
-                } else if (j8 < 262144) {
+                } else if (j8 < Permission.USE_EXTERNAL_EMOJIS) {
                     iVar.l((int) j8);
                 } else {
                     sVar.a = iVar.getPosition() + j8;
@@ -287,10 +289,10 @@ public final class i implements h, t {
                     boolean z4 = true;
                     int i10 = -1;
                     int i11 = 0;
-                    long j9 = Long.MAX_VALUE;
+                    long j9 = RecyclerView.FOREVER_NS;
                     boolean z5 = true;
-                    long j10 = Long.MAX_VALUE;
-                    long j11 = Long.MAX_VALUE;
+                    long j10 = RecyclerView.FOREVER_NS;
+                    long j11 = RecyclerView.FOREVER_NS;
                     while (true) {
                         a[] aVarArr = this.t;
                         int i12 = f0.a;
@@ -304,7 +306,7 @@ public final class i implements h, t {
                             long j12 = pVar.f708c[i13];
                             long j13 = this.u[i11][i13];
                             long j14 = j12 - position4;
-                            boolean z6 = j14 < 0 || j14 >= 262144;
+                            boolean z6 = j14 < 0 || j14 >= Permission.USE_EXTERNAL_EMOJIS;
                             if ((!z6 && z4) || (z6 == z4 && j14 < j11)) {
                                 z4 = z6;
                                 i10 = i11;
@@ -319,7 +321,7 @@ public final class i implements h, t {
                         }
                         i11++;
                     }
-                    if (j9 == Long.MAX_VALUE || !z5 || j10 < j9 + 10485760) {
+                    if (j9 == RecyclerView.FOREVER_NS || !z5 || j10 < j9 + 10485760) {
                         i9 = i10;
                     }
                     this.o = i9;
@@ -336,7 +338,7 @@ public final class i implements h, t {
                 long j15 = pVar2.f708c[i15];
                 int i16 = pVar2.d[i15];
                 long j16 = (j15 - position4) + ((long) this.p);
-                if (j16 < 0 || j16 >= 262144) {
+                if (j16 < 0 || j16 >= Permission.USE_EXTERNAL_EMOJIS) {
                     sVar.a = j15;
                     return 1;
                 }
@@ -628,7 +630,7 @@ public final class i implements h, t {
             j4 = j5;
             j6 = j8;
         } else {
-            j2 = Long.MAX_VALUE;
+            j2 = RecyclerView.FOREVER_NS;
             j3 = -1;
             j4 = -9223372036854775807L;
         }
@@ -1213,7 +1215,7 @@ public final class i implements h, t {
                                 }
                                 i4 = 0;
                                 while (i4 < aVarArr.length) {
-                                    long j6 = Long.MAX_VALUE;
+                                    long j6 = RecyclerView.FOREVER_NS;
                                     int i38 = -1;
                                     for (int i39 = 0; i39 < aVarArr.length; i39++) {
                                         if (!zArr[i39] && jArr2[i39] <= j6) {
diff --git a/app/src/main/java/c/i/a/c/a2/h0/k.java b/app/src/main/java/c/i/a/c/a2/h0/k.java
index 9764d0f2b3..8505ffa48a 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/k.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/k.java
@@ -2,11 +2,12 @@ package c.i.a.c.a2.h0;
 
 import c.i.b.a.b;
 import c.i.b.a.j;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.ArrayList;
 import java.util.List;
 /* compiled from: SefReader */
 public final class k {
-    public static final c.i.b.a.k a = new c.i.b.a.k(new j(new b.C0123b(':')));
+    public static final c.i.b.a.k a = new c.i.b.a.k(new j(new b.C0123b(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR)));
     public static final c.i.b.a.k b = new c.i.b.a.k(new j(new b.C0123b('*')));
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/a/c/a2/h0/l.java b/app/src/main/java/c/i/a/c/a2/h0/l.java
index 68c6aea5e5..d958e0799e 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/l.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/l.java
@@ -2,6 +2,7 @@ package c.i.a.c.a2.h0;
 
 import c.i.a.c.a2.i;
 import c.i.a.c.i2.w;
+import com.discord.api.permission.Permission;
 import java.io.IOException;
 /* compiled from: Sniffer */
 public final class l {
@@ -13,10 +14,10 @@ public final class l {
     public static boolean a(i iVar, boolean z2, boolean z3) throws IOException {
         boolean z4;
         long b = iVar.b();
-        long j = 4096;
+        long j = Permission.SEND_TTS_MESSAGES;
         long j2 = -1;
         int i = (b > -1 ? 1 : (b == -1 ? 0 : -1));
-        if (i != 0 && b <= 4096) {
+        if (i != 0 && b <= Permission.SEND_TTS_MESSAGES) {
             j = b;
         }
         int i2 = (int) j;
diff --git a/app/src/main/java/c/i/a/c/a2/i0/d.java b/app/src/main/java/c/i/a/c/a2/i0/d.java
index 5b0225998a..451993d617 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/d.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/d.java
@@ -9,6 +9,7 @@ import c.i.a.c.a2.t;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import java.io.IOException;
@@ -26,7 +27,7 @@ public class d implements h {
         a aVar = a.a;
     }
 
-    @EnsuresNonNullIf(expression = {"streamReader"}, result = true)
+    @EnsuresNonNullIf(expression = {"streamReader"}, result = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS)
     public final boolean a(i iVar) throws IOException {
         boolean z2;
         boolean z3;
diff --git a/app/src/main/java/c/i/a/c/a2/i0/h.java b/app/src/main/java/c/i/a/c/a2/i0/h.java
index 3cd89f7529..2776e08001 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/h.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/h.java
@@ -3,6 +3,7 @@ package c.i.a.c.a2.i0;
 import c.i.a.c.a2.i0.i;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.utilities.guilds.GuildConstantsKt;
 import com.google.android.exoplayer2.Format;
 import java.util.Arrays;
 import java.util.List;
@@ -26,7 +27,7 @@ public final class h extends i {
         }
         int i4 = i >> 3;
         int i5 = i4 & 3;
-        return a(((long) i3) * ((long) (i4 >= 16 ? 2500 << i5 : i4 >= 12 ? 10000 << (i5 & 1) : i5 == 3 ? 60000 : 10000 << i5)));
+        return a(((long) i3) * ((long) (i4 >= 16 ? GuildConstantsKt.MAX_GUILD_MEMBERS_NOTIFY_ALL_MESSAGES << i5 : i4 >= 12 ? 10000 << (i5 & 1) : i5 == 3 ? 60000 : 10000 << i5)));
     }
 
     @Override // c.i.a.c.a2.i0.i
diff --git a/app/src/main/java/c/i/a/c/a2/j0/b0.java b/app/src/main/java/c/i/a/c/a2/j0/b0.java
index 413bfb42d6..6dc8aa69f0 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/b0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/b0.java
@@ -2,6 +2,7 @@ package c.i.a.c.a2.j0;
 
 import android.util.SparseArray;
 import androidx.annotation.Nullable;
+import androidx.core.view.InputDeviceCompat;
 import c.i.a.c.a2.h;
 import c.i.a.c.a2.i;
 import c.i.a.c.a2.j;
@@ -12,6 +13,7 @@ import c.i.a.c.i2.e0;
 import c.i.a.c.i2.v;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import java.io.IOException;
 /* compiled from: PsExtractor */
 public final class b0 implements h {
@@ -189,7 +191,7 @@ public final class b0 implements h {
             this.f717c.D(0);
             iVar.l(this.f717c.x() + 6);
             return 0;
-        } else if (((f2 & -256) >> 8) != 1) {
+        } else if (((f2 & InputDeviceCompat.SOURCE_ANY) >> 8) != 1) {
             iVar.l(1);
             return 0;
         } else {
@@ -222,7 +224,7 @@ public final class b0 implements h {
                     if (oVar != null) {
                     }
                 }
-                if (iVar.getPosition() > ((!this.f || !this.g) ? 1048576 : this.h + 8192)) {
+                if (iVar.getPosition() > ((!this.f || !this.g) ? Permission.CONNECT : this.h + Permission.MANAGE_MESSAGES)) {
                     this.e = true;
                     this.j.j();
                 }
diff --git a/app/src/main/java/c/i/a/c/a2/j0/d0.java b/app/src/main/java/c/i/a/c/a2/j0/d0.java
index 08067964f6..b7add68bac 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/d0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/d0.java
@@ -1,5 +1,6 @@
 package c.i.a.c.a2.j0;
 
+import androidx.core.view.InputDeviceCompat;
 import c.i.a.c.a2.j;
 import c.i.a.c.a2.j0.i0;
 import c.i.a.c.i2.e0;
@@ -65,7 +66,7 @@ public final class d0 implements i0 {
                     this.f719c = i4;
                     byte[] bArr = this.b.a;
                     if (bArr.length < i4) {
-                        this.b.b(Math.min(4098, Math.max(i4, bArr.length * 2)));
+                        this.b.b(Math.min((int) InputDeviceCompat.SOURCE_TOUCHSCREEN, Math.max(i4, bArr.length * 2)));
                     }
                 }
             } else {
diff --git a/app/src/main/java/c/i/a/c/a2/j0/i0.java b/app/src/main/java/c/i/a/c/a2/j0/i0.java
index f2331acc22..eacd088af8 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/i0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/i0.java
@@ -4,6 +4,7 @@ import androidx.annotation.Nullable;
 import c.i.a.c.a2.j;
 import c.i.a.c.i2.e0;
 import c.i.a.c.i2.w;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.google.android.exoplayer2.ParserException;
 import java.util.Collections;
 import java.util.List;
@@ -58,7 +59,7 @@ public interface i0 {
         public d(int i, int i2, int i3) {
             String str;
             if (i != Integer.MIN_VALUE) {
-                str = i + "/";
+                str = i + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN;
             } else {
                 str = "";
             }
diff --git a/app/src/main/java/c/i/a/c/a2/j0/x.java b/app/src/main/java/c/i/a/c/a2/j0/x.java
index f401340a03..3d81496b57 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/x.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/x.java
@@ -1,5 +1,6 @@
 package c.i.a.c.a2.j0;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.a2.j;
 import c.i.a.c.a2.j0.i0;
 import c.i.a.c.a2.w;
@@ -56,7 +57,7 @@ public final class x implements c0 {
                     j2 = e0Var.b + j3;
                 } else {
                     long j4 = e0Var.a;
-                    if (j4 != Long.MAX_VALUE) {
+                    if (j4 != RecyclerView.FOREVER_NS) {
                         j = j4;
                     }
                 }
diff --git a/app/src/main/java/c/i/a/c/c2/k/b.java b/app/src/main/java/c/i/a/c/c2/k/b.java
index 214a0db9e5..e9a7f2a85c 100644
--- a/app/src/main/java/c/i/a/c/c2/k/b.java
+++ b/app/src/main/java/c/i/a/c/c2/k/b.java
@@ -7,6 +7,7 @@ import c.i.a.c.c2.g;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.v;
 import c.i.a.c.i2.w;
+import com.adjust.sdk.Constants;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.metadata.id3.BinaryFrame;
@@ -418,7 +419,7 @@ public final class b extends g {
     }
 
     public static String t(int i) {
-        return i != 1 ? i != 2 ? i != 3 ? "ISO-8859-1" : "UTF-8" : "UTF-16BE" : "UTF-16";
+        return i != 1 ? i != 2 ? i != 3 ? "ISO-8859-1" : Constants.ENCODING : "UTF-16BE" : "UTF-16";
     }
 
     public static String u(int i, int i2, int i3, int i4, int i5) {
diff --git a/app/src/main/java/c/i/a/c/d2/b0.java b/app/src/main/java/c/i/a/c/d2/b0.java
index e4b4b18081..06a605fbe6 100644
--- a/app/src/main/java/c/i/a/c/d2/b0.java
+++ b/app/src/main/java/c/i/a/c/d2/b0.java
@@ -6,6 +6,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.a2.h;
 import c.i.a.c.a2.i;
 import c.i.a.c.a2.j;
@@ -844,7 +845,7 @@ public final class b0 implements v, j, Loader.b<a>, Loader.f, e0.b {
             j6 = j7;
         }
         long j8 = o1Var.d;
-        long j9 = Long.MAX_VALUE;
+        long j9 = RecyclerView.FOREVER_NS;
         long j10 = j2 + j8;
         if (((j8 ^ j10) & (j2 ^ j10)) >= 0) {
             j9 = j10;
@@ -1059,7 +1060,7 @@ public final class b0 implements v, j, Loader.b<a>, Loader.f, e0.b {
         } else {
             j2 = Long.MAX_VALUE;
         }
-        if (j2 == Long.MAX_VALUE) {
+        if (j2 == RecyclerView.FOREVER_NS) {
             j2 = v();
         }
         return j2 == Long.MIN_VALUE ? this.Q : j2;
diff --git a/app/src/main/java/c/i/a/c/d2/e0.java b/app/src/main/java/c/i/a/c/d2/e0.java
index dbc52e845d..cb8b93d1bb 100644
--- a/app/src/main/java/c/i/a/c/d2/e0.java
+++ b/app/src/main/java/c/i/a/c/d2/e0.java
@@ -4,6 +4,7 @@ import android.os.Looper;
 import android.util.Log;
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.a.c.a2.v;
 import c.i.a.c.a2.w;
 import c.i.a.c.d2.d0;
@@ -361,7 +362,7 @@ public class e0 implements w {
 
     public final boolean o(int i) {
         DrmSession drmSession = this.h;
-        return drmSession == null || drmSession.getState() == 4 || ((this.m[i] & 1073741824) == 0 && this.h.d());
+        return drmSession == null || drmSession.getState() == 4 || ((this.m[i] & BasicMeasure.EXACTLY) == 0 && this.h.d());
     }
 
     public final void p(Format format, s0 s0Var) {
diff --git a/app/src/main/java/c/i/a/c/d2/l.java b/app/src/main/java/c/i/a/c/d2/l.java
index 8c4ab5db9b..330d771620 100644
--- a/app/src/main/java/c/i/a/c/d2/l.java
+++ b/app/src/main/java/c/i/a/c/d2/l.java
@@ -1,6 +1,7 @@
 package c.i.a.c.d2;
 
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.d2.v;
 import c.i.a.c.f2.g;
 import c.i.a.c.i2.f0;
@@ -182,7 +183,7 @@ public final class l implements v, v.a {
         long i = f0.i(o1Var.f939c, 0, j - j2);
         long j3 = o1Var.d;
         long j4 = this.n;
-        long i2 = f0.i(j3, 0, j4 == Long.MIN_VALUE ? Long.MAX_VALUE : j4 - j);
+        long i2 = f0.i(j3, 0, j4 == Long.MIN_VALUE ? RecyclerView.FOREVER_NS : j4 - j);
         if (!(i == o1Var.f939c && i2 == o1Var.d)) {
             o1Var = new o1(i, i2);
         }
diff --git a/app/src/main/java/c/i/a/c/e0.java b/app/src/main/java/c/i/a/c/e0.java
index ea27d556b5..eb439ed1d2 100644
--- a/app/src/main/java/c/i/a/c/e0.java
+++ b/app/src/main/java/c/i/a/c/e0.java
@@ -9,6 +9,7 @@ import c.i.a.c.i2.f0;
 import c.i.a.c.p1;
 import c.i.a.c.v1.n;
 import java.util.Objects;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: AudioFocusManager */
 public final class e0 {
     public final AudioManager a;
@@ -43,7 +44,7 @@ public final class e0 {
     }
 
     public e0(Context context, Handler handler, b bVar) {
-        AudioManager audioManager = (AudioManager) context.getApplicationContext().getSystemService("audio");
+        AudioManager audioManager = (AudioManager) context.getApplicationContext().getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
         Objects.requireNonNull(audioManager);
         this.a = audioManager;
         this.f815c = bVar;
diff --git a/app/src/main/java/c/i/a/c/e2/b.java b/app/src/main/java/c/i/a/c/e2/b.java
index fb63a354fd..eaa4e01644 100644
--- a/app/src/main/java/c/i/a/c/e2/b.java
+++ b/app/src/main/java/c/i/a/c/e2/b.java
@@ -2,9 +2,10 @@ package c.i.a.c.e2;
 
 import android.graphics.Typeface;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 /* compiled from: CaptionStyleCompat */
 public final class b {
-    public static final b a = new b(-1, -16777216, 0, 0, -1, null);
+    public static final b a = new b(-1, ViewCompat.MEASURED_STATE_MASK, 0, 0, -1, null);
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/a/c/e2/c.java b/app/src/main/java/c/i/a/c/e2/c.java
index 23aae2984f..25bc0b4d00 100644
--- a/app/src/main/java/c/i/a/c/e2/c.java
+++ b/app/src/main/java/c/i/a/c/e2/c.java
@@ -4,6 +4,7 @@ import android.graphics.Bitmap;
 import android.text.Layout;
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.util.Objects;
 /* compiled from: Cue */
@@ -70,7 +71,7 @@ public final class c {
             this.k = -3.4028235E38f;
             this.l = -3.4028235E38f;
             this.m = false;
-            this.n = -16777216;
+            this.n = ViewCompat.MEASURED_STATE_MASK;
             this.o = Integer.MIN_VALUE;
         }
 
diff --git a/app/src/main/java/c/i/a/c/e2/j.java b/app/src/main/java/c/i/a/c/e2/j.java
index 33a0f67d51..a7d3dbc6ee 100644
--- a/app/src/main/java/c/i/a/c/e2/j.java
+++ b/app/src/main/java/c/i/a/c/e2/j.java
@@ -1,6 +1,7 @@
 package c.i.a.c.e2;
 
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.x1.f;
 import java.util.List;
 import java.util.Objects;
@@ -46,7 +47,7 @@ public abstract class j extends f implements f {
     public void r(long j, f fVar, long j2) {
         this.j = j;
         this.k = fVar;
-        if (j2 != Long.MAX_VALUE) {
+        if (j2 != RecyclerView.FOREVER_NS) {
             j = j2;
         }
         this.l = j;
diff --git a/app/src/main/java/c/i/a/c/e2/l.java b/app/src/main/java/c/i/a/c/e2/l.java
index 96ae7c730b..0192c78ba1 100644
--- a/app/src/main/java/c/i/a/c/e2/l.java
+++ b/app/src/main/java/c/i/a/c/e2/l.java
@@ -4,6 +4,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import c.i.a.c.e2.h;
 import c.i.a.c.e2.m.c;
@@ -119,14 +120,14 @@ public final class l extends g0 implements Handler.Callback {
 
     public final long K() {
         if (this.G == -1) {
-            return Long.MAX_VALUE;
+            return RecyclerView.FOREVER_NS;
         }
         Objects.requireNonNull(this.E);
         int i = this.G;
         f fVar = this.E.k;
         Objects.requireNonNull(fVar);
         if (i >= fVar.i()) {
-            return Long.MAX_VALUE;
+            return RecyclerView.FOREVER_NS;
         }
         j jVar = this.E;
         int i2 = this.G;
@@ -379,7 +380,7 @@ public final class l extends g0 implements Handler.Callback {
                 j jVar = this.F;
                 if (jVar != null) {
                     if (jVar.n()) {
-                        if (!z2 && K() == Long.MAX_VALUE) {
+                        if (!z2 && K() == RecyclerView.FOREVER_NS) {
                             if (this.A == 2) {
                                 O();
                             } else {
diff --git a/app/src/main/java/c/i/a/c/e2/m/c.java b/app/src/main/java/c/i/a/c/e2/m/c.java
index 9fffda947a..64827eeb6c 100644
--- a/app/src/main/java/c/i/a/c/e2/m/c.java
+++ b/app/src/main/java/c/i/a/c/e2/m/c.java
@@ -8,12 +8,17 @@ import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
 import android.util.Log;
 import androidx.annotation.Nullable;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.e2.f;
 import c.i.a.c.e2.i;
 import c.i.a.c.e2.j;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.w;
 import com.google.android.exoplayer2.text.SubtitleDecoderException;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,8 +28,8 @@ import java.util.Objects;
 public final class c extends e {
     public static final int[] g = {11, 1, 3, 12, 14, 5, 7, 9};
     public static final int[] h = {0, 4, 8, 12, 16, 20, 24, 28};
-    public static final int[] i = {-1, -16711936, -16776961, -16711681, -65536, -256, -65281};
-    public static final int[] j = {32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 225, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 233, 93, 237, 243, 250, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 231, 247, 209, 241, 9632};
+    public static final int[] i = {-1, -16711936, -16776961, -16711681, SupportMenu.CATEGORY_MASK, InputDeviceCompat.SOURCE_ANY, -65281};
+    public static final int[] j = {32, 33, 34, 35, 36, 37, 38, 39, 40, 41, HideBottomViewOnScrollBehavior.ENTER_ANIMATION_DURATION, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 233, 93, 237, 243, 250, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 231, 247, 209, 241, 9632};
     public static final int[] k = {174, 176, 189, 191, 8482, 162, 163, 9834, 224, 32, 232, 226, 234, 238, 244, 251};
     public static final int[] l = {193, 201, 211, 218, 220, 252, 8216, 161, 42, 39, 8212, 169, 8480, 8226, 8220, 8221, 192, 194, 199, 200, 202, 203, 235, 206, 207, 239, 212, 217, 249, 219, 171, 187};
     public static final int[] m = {195, 227, 205, 204, 236, 210, 242, 213, 245, 123, 125, 92, 94, 95, 124, 126, 196, 228, 214, 246, 223, 165, 164, 9474, 197, 229, 216, 248, 9484, 9488, 9492, 9496};
@@ -157,7 +162,7 @@ public final class c extends e {
             } else if (this.g == 1) {
                 i9 -= this.h - 1;
             }
-            return new c.i.a.c.e2.c(spannableStringBuilder, Layout.Alignment.ALIGN_NORMAL, null, (float) i9, 1, Integer.MIN_VALUE, f, i8, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, -16777216, Integer.MIN_VALUE, 0.0f, null);
+            return new c.i.a.c.e2.c(spannableStringBuilder, Layout.Alignment.ALIGN_NORMAL, null, (float) i9, 1, Integer.MIN_VALUE, f, i8, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, ViewCompat.MEASURED_STATE_MASK, Integer.MIN_VALUE, 0.0f, null);
         }
 
         public final SpannableString d() {
@@ -534,7 +539,7 @@ public final class c extends e {
         this.F = -9223372036854775807L;
         this.w = emptyList;
         Objects.requireNonNull(emptyList);
-        pollFirst.r(this.e, new f(emptyList), Long.MAX_VALUE);
+        pollFirst.r(this.e, new f(emptyList), RecyclerView.FOREVER_NS);
         return pollFirst;
     }
 
diff --git a/app/src/main/java/c/i/a/c/e2/m/d.java b/app/src/main/java/c/i/a/c/e2/m/d.java
index 643f087e45..c29cac68c7 100644
--- a/app/src/main/java/c/i/a/c/e2/m/d.java
+++ b/app/src/main/java/c/i/a/c/e2/m/d.java
@@ -10,11 +10,13 @@ import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
 import android.util.Log;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.e2.f;
 import c.i.a.c.e2.i;
 import c.i.a.c.i2.v;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.utilities.font.FontUtils;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -49,7 +51,7 @@ public final class d extends e {
                 z3 = true;
             } else {
                 z3 = false;
-                i6 = -16777216;
+                i6 = ViewCompat.MEASURED_STATE_MASK;
             }
             this.a = new c.i.a.c.e2.c(charSequence, alignment, null, f, i, i2, f2, i3, Integer.MIN_VALUE, -3.4028235E38f, f3, -3.4028235E38f, z3, i6, Integer.MIN_VALUE, 0.0f, null);
             this.b = i5;
@@ -568,7 +570,7 @@ public final class d extends e {
                                 case 147:
                                 case 148:
                                 case 149:
-                                case 150:
+                                case FontUtils.MAX_FONT_SCALING /* 150 */:
                                 default:
                                     Log.w("Cea708Decoder", c.d.b.a.a.j("Invalid C1 command: ", g3));
                                     break;
diff --git a/app/src/main/java/c/i/a/c/e2/m/e.java b/app/src/main/java/c/i/a/c/e2/m/e.java
index ef43b6ba2f..486737e460 100644
--- a/app/src/main/java/c/i/a/c/e2/m/e.java
+++ b/app/src/main/java/c/i/a/c/e2/m/e.java
@@ -1,6 +1,7 @@
 package c.i.a.c.e2.m;
 
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.e2.g;
 import c.i.a.c.e2.i;
 import c.i.a.c.e2.j;
@@ -156,7 +157,7 @@ public abstract class e implements g {
             if (h()) {
                 c.i.a.c.e2.f e = e();
                 j pollFirst2 = this.b.pollFirst();
-                pollFirst2.r(poll.m, e, Long.MAX_VALUE);
+                pollFirst2.r(poll.m, e, RecyclerView.FOREVER_NS);
                 i(poll);
                 return pollFirst2;
             }
diff --git a/app/src/main/java/c/i/a/c/e2/n/a.java b/app/src/main/java/c/i/a/c/e2/n/a.java
index 478fefd0e7..1b43479f5b 100644
--- a/app/src/main/java/c/i/a/c/e2/n/a.java
+++ b/app/src/main/java/c/i/a/c/e2/n/a.java
@@ -6,6 +6,7 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.util.Log;
 import android.util.SparseArray;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.e2.c;
 import c.i.a.c.e2.d;
 import c.i.a.c.e2.f;
@@ -274,7 +275,7 @@ public final class a extends d {
                 Bitmap createBitmap2 = Bitmap.createBitmap(bVar.j, i15, i16, fVar3.f840c, fVar3.d);
                 float f5 = (float) bVar2.a;
                 float f6 = (float) bVar2.b;
-                arrayList.add(new c(null, null, createBitmap2, ((float) i16) / f6, 0, 0, ((float) i15) / f5, 0, Integer.MIN_VALUE, -3.4028235E38f, ((float) fVar3.f840c) / f5, ((float) fVar3.d) / f6, false, -16777216, Integer.MIN_VALUE, 0.0f, null));
+                arrayList.add(new c(null, null, createBitmap2, ((float) i16) / f6, 0, 0, ((float) i15) / f5, 0, Integer.MIN_VALUE, -3.4028235E38f, ((float) fVar3.f840c) / f5, ((float) fVar3.d) / f6, false, ViewCompat.MEASURED_STATE_MASK, Integer.MIN_VALUE, 0.0f, null));
                 bVar.f.drawColor(0, PorterDuff.Mode.CLEAR);
                 bVar.f.restore();
                 i14++;
diff --git a/app/src/main/java/c/i/a/c/e2/n/b.java b/app/src/main/java/c/i/a/c/e2/n/b.java
index 1c56d9ee02..5407f0d316 100644
--- a/app/src/main/java/c/i/a/c/e2/n/b.java
+++ b/app/src/main/java/c/i/a/c/e2/n/b.java
@@ -7,6 +7,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.util.SparseArray;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.v;
 /* compiled from: DvbParser */
@@ -20,7 +21,7 @@ public final class b {
     public final Paint e;
     public final Canvas f = new Canvas();
     public final C0091b g = new C0091b(719, 575, 0, 719, 0, 575);
-    public final a h = new a(0, new int[]{0, -1, -16777216, -8421505}, b(), c());
+    public final a h = new a(0, new int[]{0, -1, ViewCompat.MEASURED_STATE_MASK, -8421505}, b(), c());
     public final h i;
     public Bitmap j;
 
@@ -586,7 +587,7 @@ public final class b {
         vVar.m(8);
         int i7 = i - 2;
         int i8 = 4;
-        int[] iArr = {0, -1, -16777216, -8421505};
+        int[] iArr = {0, -1, ViewCompat.MEASURED_STATE_MASK, -8421505};
         int[] b2 = b();
         int[] c2 = c();
         while (i7 > 0) {
diff --git a/app/src/main/java/c/i/a/c/e2/o/a.java b/app/src/main/java/c/i/a/c/e2/o/a.java
index 1d7482d38f..ad0efcdd71 100644
--- a/app/src/main/java/c/i/a/c/e2/o/a.java
+++ b/app/src/main/java/c/i/a/c/e2/o/a.java
@@ -2,6 +2,7 @@ package c.i.a.c.e2.o;
 
 import android.graphics.Bitmap;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.e2.c;
 import c.i.a.c.e2.d;
 import c.i.a.c.e2.f;
@@ -181,7 +182,7 @@ public final class a extends d {
                         float f = (float) aVar2.d;
                         float f2 = ((float) aVar2.f) / f;
                         float f3 = (float) aVar2.e;
-                        cVar = new c(null, null, createBitmap, ((float) aVar2.g) / f3, 0, 0, f2, 0, Integer.MIN_VALUE, -3.4028235E38f, ((float) aVar2.h) / f, ((float) aVar2.i) / f3, false, -16777216, Integer.MIN_VALUE, 0.0f, null);
+                        cVar = new c(null, null, createBitmap, ((float) aVar2.g) / f3, 0, 0, f2, 0, Integer.MIN_VALUE, -3.4028235E38f, ((float) aVar2.h) / f, ((float) aVar2.i) / f3, false, ViewCompat.MEASURED_STATE_MASK, Integer.MIN_VALUE, 0.0f, null);
                     }
                     aVar2.a();
                 }
diff --git a/app/src/main/java/c/i/a/c/e2/q/a.java b/app/src/main/java/c/i/a/c/e2/q/a.java
index 032802fb66..690199a47c 100644
--- a/app/src/main/java/c/i/a/c/e2/q/a.java
+++ b/app/src/main/java/c/i/a/c/e2/q/a.java
@@ -8,6 +8,7 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.util.Log;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.e2.c;
 import c.i.a.c.e2.d;
 import c.i.a.c.e2.f;
@@ -16,6 +17,7 @@ import c.i.a.c.i2.f0;
 import c.i.a.c.i2.p;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -301,7 +303,7 @@ public final class a extends d {
                                                 f3 = pointF.x / f6;
                                                 f2 = pointF.y / f7;
                                             }
-                                            c.i.a.c.e2.c cVar2 = new c.i.a.c.e2.c(spannableString, alignment, null, f2, 0, i5, f3, i4, i2, f, -3.4028235E38f, -3.4028235E38f, false, -16777216, Integer.MIN_VALUE, 0.0f, null);
+                                            c.i.a.c.e2.c cVar2 = new c.i.a.c.e2.c(spannableString, alignment, null, f2, 0, i5, f3, i4, i2, f, -3.4028235E38f, -3.4028235E38f, false, ViewCompat.MEASURED_STATE_MASK, Integer.MIN_VALUE, 0.0f, null);
                                             int k = k(j, arrayList2, arrayList);
                                             for (int k2 = k(n2, arrayList2, arrayList); k2 < k; k2++) {
                                                 ((List) arrayList.get(k2)).add(cVar2);
@@ -401,7 +403,7 @@ public final class a extends d {
                                                 c2 = 65535;
                                                 break;
                                             case 3373707:
-                                                if (K2.equals("name")) {
+                                                if (K2.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                                                     c2 = 3;
                                                     break;
                                                 }
diff --git a/app/src/main/java/c/i/a/c/e2/q/b.java b/app/src/main/java/c/i/a/c/e2/q/b.java
index 6a2a16673f..2337c82e0d 100644
--- a/app/src/main/java/c/i/a/c/e2/q/b.java
+++ b/app/src/main/java/c/i/a/c/e2/q/b.java
@@ -2,6 +2,7 @@ package c.i.a.c.e2.q;
 
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import c.i.a.c.i2.f0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 /* compiled from: SsaDialogueFormat */
@@ -44,7 +45,7 @@ public final class b {
                     c2 = 65535;
                     break;
                 case 3556653:
-                    if (K.equals("text")) {
+                    if (K.equals(NotificationCompat.MessagingStyle.Message.KEY_TEXT)) {
                         c2 = 1;
                         break;
                     }
diff --git a/app/src/main/java/c/i/a/c/e2/r/a.java b/app/src/main/java/c/i/a/c/e2/r/a.java
index 5deb92790b..328208d6e1 100644
--- a/app/src/main/java/c/i/a/c/e2/r/a.java
+++ b/app/src/main/java/c/i/a/c/e2/r/a.java
@@ -4,6 +4,7 @@ import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.e2.c;
 import c.i.a.c.e2.d;
 import c.i.a.c.e2.f;
@@ -127,7 +128,7 @@ public final class a extends d {
                                     }
                                 }
                                 if (str == null) {
-                                    cVar = new c(fromHtml, null, null, -3.4028235E38f, Integer.MIN_VALUE, Integer.MIN_VALUE, -3.4028235E38f, Integer.MIN_VALUE, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, -16777216, Integer.MIN_VALUE, 0.0f, null);
+                                    cVar = new c(fromHtml, null, null, -3.4028235E38f, Integer.MIN_VALUE, Integer.MIN_VALUE, -3.4028235E38f, Integer.MIN_VALUE, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, ViewCompat.MEASURED_STATE_MASK, Integer.MIN_VALUE, 0.0f, null);
                                     jArr = jArr2;
                                     wVar = wVar2;
                                     i2 = i6;
@@ -273,7 +274,7 @@ public final class a extends d {
                                             break;
                                     }
                                     int i10 = (c3 == 0 || c3 == 1 || c3 == 2) ? 2 : (c3 == 3 || c3 == 4 || c3 == 5) ? 0 : 1;
-                                    cVar = new c(fromHtml, null, null, k(i10), 0, i10, k(i9), i9, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, -16777216, Integer.MIN_VALUE, 0.0f, null);
+                                    cVar = new c(fromHtml, null, null, k(i10), 0, i10, k(i9), i9, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, ViewCompat.MEASURED_STATE_MASK, Integer.MIN_VALUE, 0.0f, null);
                                 }
                                 arrayList.add(cVar);
                                 arrayList.add(c.a);
diff --git a/app/src/main/java/c/i/a/c/e2/s/c.java b/app/src/main/java/c/i/a/c/e2/s/c.java
index 11d873fa39..3e752bb595 100644
--- a/app/src/main/java/c/i/a/c/e2/s/c.java
+++ b/app/src/main/java/c/i/a/c/e2/s/c.java
@@ -4,6 +4,7 @@ import android.text.Layout;
 import android.text.TextUtils;
 import android.util.Log;
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import c.i.a.c.e2.d;
 import c.i.a.c.e2.f;
 import c.i.a.c.i2.f0;
@@ -14,7 +15,9 @@ import c.i.b.b.h;
 import c.i.b.b.y0;
 import c.i.b.b.z;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.exoplayer2.text.SubtitleDecoderException;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayDeque;
@@ -94,7 +97,7 @@ public final class c extends d {
     }
 
     public static boolean l(String str) {
-        return str.equals("tt") || str.equals("head") || str.equals("body") || str.equals("div") || str.equals("p") || str.equals("span") || str.equals("br") || str.equals("style") || str.equals("styling") || str.equals("layout") || str.equals("region") || str.equals("metadata") || str.equals("image") || str.equals("data") || str.equals("information");
+        return str.equals("tt") || str.equals("head") || str.equals("body") || str.equals("div") || str.equals("p") || str.equals("span") || str.equals("br") || str.equals("style") || str.equals("styling") || str.equals("layout") || str.equals(ModelAuditLogEntry.CHANGE_KEY_REGION) || str.equals("metadata") || str.equals("image") || str.equals("data") || str.equals("information");
     }
 
     public static a m(XmlPullParser xmlPullParser, a aVar) throws SubtitleDecoderException {
@@ -239,8 +242,8 @@ public final class c extends d {
                 if (str2 != null) {
                     map.put(str2, r2);
                 }
-            } else if (AnimatableValueParser.x1(xmlPullParser, "region")) {
-                String t04 = AnimatableValueParser.t0(xmlPullParser, "id");
+            } else if (AnimatableValueParser.x1(xmlPullParser, ModelAuditLogEntry.CHANGE_KEY_REGION)) {
+                String t04 = AnimatableValueParser.t0(xmlPullParser, ModelAuditLogEntry.CHANGE_KEY_ID);
                 if (t04 != null) {
                     String t05 = AnimatableValueParser.t0(xmlPullParser, "origin");
                     if (t05 != null) {
@@ -401,7 +404,7 @@ public final class c extends d {
             } else if (AnimatableValueParser.x1(xmlPullParser, "metadata")) {
                 do {
                     xmlPullParser.next();
-                    if (AnimatableValueParser.x1(xmlPullParser, "image") && (t0 = AnimatableValueParser.t0(xmlPullParser, "id")) != null) {
+                    if (AnimatableValueParser.x1(xmlPullParser, "image") && (t0 = AnimatableValueParser.t0(xmlPullParser, ModelAuditLogEntry.CHANGE_KEY_ID)) != null) {
                         map3.put(t0, xmlPullParser.nextText());
                     }
                 } while (!AnimatableValueParser.j1(xmlPullParser, "metadata"));
@@ -431,7 +434,7 @@ public final class c extends d {
             attributeName.hashCode();
             switch (attributeName.hashCode()) {
                 case -934795532:
-                    if (attributeName.equals("region")) {
+                    if (attributeName.equals(ModelAuditLogEntry.CHANGE_KEY_REGION)) {
                         c2 = 0;
                         break;
                     }
@@ -592,7 +595,7 @@ public final class c extends d {
                     c2 = 65535;
                     break;
                 case 3355:
-                    if (attributeName.equals("id")) {
+                    if (attributeName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                         c2 = 5;
                         break;
                     }
@@ -606,7 +609,7 @@ public final class c extends d {
                     c2 = 65535;
                     break;
                 case 94842723:
-                    if (attributeName.equals("color")) {
+                    if (attributeName.equals(ModelAuditLogEntry.CHANGE_KEY_COLOR)) {
                         c2 = 7;
                         break;
                     }
@@ -816,7 +819,7 @@ public final class c extends d {
                             }
                             break;
                         case 3556653:
-                            if (K3.equals("text")) {
+                            if (K3.equals(NotificationCompat.MessagingStyle.Message.KEY_TEXT)) {
                                 i2 = 5;
                                 break;
                             }
@@ -1071,7 +1074,7 @@ public final class c extends d {
             Objects.requireNonNull(group3);
             double parseLong = ((double) (Long.parseLong(group) * 3600)) + ((double) (Long.parseLong(group2) * 60)) + ((double) Long.parseLong(group3));
             String group4 = matcher.group(4);
-            double d3 = 0.0d;
+            double d3 = ShadowDrawableWrapper.COS_45;
             double parseDouble2 = parseLong + (group4 != null ? Double.parseDouble(group4) : 0.0d);
             String group5 = matcher.group(5);
             double parseLong2 = parseDouble2 + (group5 != null ? (double) (((float) Long.parseLong(group5)) / bVar.a) : 0.0d);
diff --git a/app/src/main/java/c/i/a/c/e2/s/g.java b/app/src/main/java/c/i/a/c/e2/s/g.java
index 43bd0b1dd0..d5f5dd0a79 100644
--- a/app/src/main/java/c/i/a/c/e2/s/g.java
+++ b/app/src/main/java/c/i/a/c/e2/s/g.java
@@ -5,6 +5,7 @@ import android.graphics.BitmapFactory;
 import android.text.SpannableStringBuilder;
 import android.util.Base64;
 import android.util.Pair;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.e2.c;
 import c.i.a.c.e2.f;
 import c.i.a.c.i2.f0;
@@ -77,7 +78,7 @@ public final class g implements f {
                 Bitmap decodeByteArray = BitmapFactory.decodeByteArray(decode, 0, decode.length);
                 e eVar = map2.get(pair.first);
                 Objects.requireNonNull(eVar);
-                arrayList2.add(new c(null, null, decodeByteArray, eVar.f853c, 0, eVar.e, eVar.b, 0, Integer.MIN_VALUE, -3.4028235E38f, eVar.f, eVar.g, false, -16777216, eVar.j, 0.0f, null));
+                arrayList2.add(new c(null, null, decodeByteArray, eVar.f853c, 0, eVar.e, eVar.b, 0, Integer.MIN_VALUE, -3.4028235E38f, eVar.f, eVar.g, false, ViewCompat.MEASURED_STATE_MASK, eVar.j, 0.0f, null));
             }
         }
         for (Map.Entry entry : treeMap.entrySet()) {
diff --git a/app/src/main/java/c/i/a/c/e2/t/a.java b/app/src/main/java/c/i/a/c/e2/t/a.java
index 5b9ddcd226..c87281f690 100644
--- a/app/src/main/java/c/i/a/c/e2/t/a.java
+++ b/app/src/main/java/c/i/a/c/e2/t/a.java
@@ -6,6 +6,8 @@ import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
 import android.util.Log;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import c.i.a.c.e2.d;
 import c.i.a.c.e2.f;
 import c.i.a.c.i2.f0;
@@ -114,7 +116,7 @@ public final class a extends d {
             return b.i;
         }
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(str);
-        l(spannableStringBuilder, this.p, 0, 0, spannableStringBuilder.length(), 16711680);
+        l(spannableStringBuilder, this.p, 0, 0, spannableStringBuilder.length(), ItemTouchHelper.ACTION_MODE_DRAG_MASK);
         int i5 = this.q;
         int length = spannableStringBuilder.length();
         if (i5 != -1) {
@@ -171,6 +173,6 @@ public final class a extends d {
             i2 = 2;
             i3 = 1;
         }
-        return new b(new c.i.a.c.e2.c(spannableStringBuilder, null, null, f, 0, 0, -3.4028235E38f, Integer.MIN_VALUE, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, -16777216, Integer.MIN_VALUE, 0.0f, null));
+        return new b(new c.i.a.c.e2.c(spannableStringBuilder, null, null, f, 0, 0, -3.4028235E38f, Integer.MIN_VALUE, Integer.MIN_VALUE, -3.4028235E38f, -3.4028235E38f, -3.4028235E38f, false, ViewCompat.MEASURED_STATE_MASK, Integer.MIN_VALUE, 0.0f, null));
     }
 }
diff --git a/app/src/main/java/c/i/a/c/e2/u/h.java b/app/src/main/java/c/i/a/c/e2/u/h.java
index 7eadbc0793..0a2b07a5da 100644
--- a/app/src/main/java/c/i/a/c/e2/u/h.java
+++ b/app/src/main/java/c/i/a/c/e2/u/h.java
@@ -15,10 +15,12 @@ import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
 import android.util.Log;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.a.c.e2.c;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -496,7 +498,7 @@ public final class h {
             Set<String> set = cVar.d;
             String str3 = cVar.f861c;
             if (!fVar.a.isEmpty() || !fVar.b.isEmpty() || !fVar.f857c.isEmpty() || !fVar.d.isEmpty()) {
-                int b2 = f.b(f.b(f.b(0, fVar.a, str, 1073741824), fVar.b, str2, 2), fVar.d, str3, 4);
+                int b2 = f.b(f.b(f.b(0, fVar.a, str, BasicMeasure.EXACTLY), fVar.b, str2, 2), fVar.d, str3, 4);
                 i = (b2 == -1 || !set.containsAll(fVar.f857c)) ? 0 : b2 + (fVar.f857c.size() * 4);
             } else {
                 i = TextUtils.isEmpty(str2);
@@ -632,7 +634,7 @@ public final class h {
                             break;
                     }
                     eVar.d = i;
-                } else if ("position".equals(group)) {
+                } else if (ModelAuditLogEntry.CHANGE_KEY_POSITION.equals(group)) {
                     h(group2, eVar);
                 } else if ("size".equals(group)) {
                     eVar.j = j.a(group2);
diff --git a/app/src/main/java/c/i/a/c/e2/u/i.java b/app/src/main/java/c/i/a/c/e2/u/i.java
index 7e40b2f682..fd561ebebf 100644
--- a/app/src/main/java/c/i/a/c/e2/u/i.java
+++ b/app/src/main/java/c/i/a/c/e2/u/i.java
@@ -6,6 +6,7 @@ import c.i.a.c.e2.f;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.text.SubtitleDecoderException;
 import java.util.ArrayList;
@@ -189,7 +190,7 @@ public final class i extends d {
                                                             wVar6.D(i15);
                                                         }
                                                     }
-                                                    if ("color".equals(a)) {
+                                                    if (ModelAuditLogEntry.CHANGE_KEY_COLOR.equals(a)) {
                                                         fVar.f = c.i.a.c.i2.i.a(sb, true);
                                                         fVar.g = true;
                                                     } else if ("background-color".equals(a)) {
diff --git a/app/src/main/java/c/i/a/c/f2/i.java b/app/src/main/java/c/i/a/c/f2/i.java
index d62bb9b143..461b9e0350 100644
--- a/app/src/main/java/c/i/a/c/f2/i.java
+++ b/app/src/main/java/c/i/a/c/f2/i.java
@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -721,8 +722,9 @@ public abstract class i extends l {
                 double[] dArr = new double[length4];
                 int i75 = 0;
                 while (true) {
-                    double d3 = 0.0d;
-                    if (i75 >= jArr[i74].length) {
+                    int length5 = jArr[i74].length;
+                    double d3 = ShadowDrawableWrapper.COS_45;
+                    if (i75 >= length5) {
                         break;
                     }
                     if (jArr[i74][i75] == -1) {
@@ -742,7 +744,7 @@ public abstract class i extends l {
                 while (i77 < i76) {
                     double d5 = dArr[i77];
                     i77++;
-                    Double valueOf = Double.valueOf(d4 == 0.0d ? 1.0d : (((d5 + dArr[i77]) * 0.5d) - dArr[0]) / d4);
+                    Double valueOf = Double.valueOf(d4 == ShadowDrawableWrapper.COS_45 ? 1.0d : (((d5 + dArr[i77]) * 0.5d) - dArr[0]) / d4);
                     Integer valueOf2 = Integer.valueOf(i74);
                     Collection collection = (Collection) m0Var.l.get(valueOf);
                     if (collection == null) {
diff --git a/app/src/main/java/c/i/a/c/g0.java b/app/src/main/java/c/i/a/c/g0.java
index f4a837bddf..7ab226f6c5 100644
--- a/app/src/main/java/c/i/a/c/g0.java
+++ b/app/src/main/java/c/i/a/c/g0.java
@@ -1,6 +1,7 @@
 package c.i.a.c;
 
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.d2.f0;
 import c.i.a.c.i2.r;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -70,7 +71,7 @@ public abstract class g0 implements k1, l1 {
         } else if (a == -5) {
             Format format = s0Var.b;
             Objects.requireNonNull(format);
-            if (format.f2226x != Long.MAX_VALUE) {
+            if (format.f2226x != RecyclerView.FOREVER_NS) {
                 Format.b a2 = format.a();
                 a2.o = format.f2226x + this.p;
                 s0Var.b = a2.a();
diff --git a/app/src/main/java/c/i/a/c/g2/g.java b/app/src/main/java/c/i/a/c/g2/g.java
index df78893c6e..8681cd4ff7 100644
--- a/app/src/main/java/c/i/a/c/g2/g.java
+++ b/app/src/main/java/c/i/a/c/g2/g.java
@@ -16,6 +16,8 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import c.i.a.c.e2.b;
 import c.i.a.c.e2.c;
 import c.i.a.c.i2.f0;
@@ -131,7 +133,7 @@ public final class g extends View implements SubtitleView.a {
                         boolean z4 = cVar.d == null;
                         if (!z4) {
                             i7 = i17;
-                            i8 = -16777216;
+                            i8 = ViewCompat.MEASURED_STATE_MASK;
                             charSequence = jVar.i;
                             i6 = size;
                             charSequence2 = cVar.b;
@@ -255,7 +257,7 @@ public final class g extends View implements SubtitleView.a {
                                             i3 = width;
                                             i2 = paddingBottom;
                                             i10 = 0;
-                                            spannableStringBuilder.setSpan(new AbsoluteSizeSpan((int) jVar.f873y), 0, spannableStringBuilder.length(), 16711680);
+                                            spannableStringBuilder.setSpan(new AbsoluteSizeSpan((int) jVar.f873y), 0, spannableStringBuilder.length(), ItemTouchHelper.ACTION_MODE_DRAG_MASK);
                                         } else {
                                             i3 = width;
                                             i2 = paddingBottom;
@@ -274,10 +276,10 @@ public final class g extends View implements SubtitleView.a {
                                             int i26 = jVar.w;
                                             if (i26 == 0 || i26 == 2) {
                                                 f = t2;
-                                                spannableStringBuilder.setSpan(new BackgroundColorSpan(jVar.t), 0, spannableStringBuilder.length(), 16711680);
+                                                spannableStringBuilder.setSpan(new BackgroundColorSpan(jVar.t), 0, spannableStringBuilder.length(), ItemTouchHelper.ACTION_MODE_DRAG_MASK);
                                             } else {
                                                 f = t2;
-                                                spannableStringBuilder2.setSpan(new BackgroundColorSpan(jVar.t), 0, spannableStringBuilder2.length(), 16711680);
+                                                spannableStringBuilder2.setSpan(new BackgroundColorSpan(jVar.t), 0, spannableStringBuilder2.length(), ItemTouchHelper.ACTION_MODE_DRAG_MASK);
                                             }
                                         } else {
                                             f = t2;
diff --git a/app/src/main/java/c/i/a/c/g2/o/f.java b/app/src/main/java/c/i/a/c/g2/o/f.java
index 837877fb6f..1d976ef3a4 100644
--- a/app/src/main/java/c/i/a/c/g2/o/f.java
+++ b/app/src/main/java/c/i/a/c/g2/o/f.java
@@ -5,6 +5,7 @@ import android.media.MediaFormat;
 import android.opengl.GLES20;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
+import androidx.work.Data;
 import c.i.a.c.i2.d0;
 import c.i.a.c.i2.w;
 import c.i.a.c.j2.s;
@@ -258,7 +259,7 @@ public final class f implements s, a {
         GLES20.glGenTextures(1, IntBuffer.wrap(iArr));
         GLES20.glBindTexture(36197, iArr[0]);
         GLES20.glTexParameteri(36197, 10241, 9729);
-        GLES20.glTexParameteri(36197, 10240, 9729);
+        GLES20.glTexParameteri(36197, Data.MAX_DATA_BYTES, 9729);
         GLES20.glTexParameteri(36197, 10242, 33071);
         GLES20.glTexParameteri(36197, 10243, 33071);
         AnimatableValueParser.r();
diff --git a/app/src/main/java/c/i/a/c/h2/a.java b/app/src/main/java/c/i/a/c/h2/a.java
index 438ae03990..68566e4f3e 100644
--- a/app/src/main/java/c/i/a/c/h2/a.java
+++ b/app/src/main/java/c/i/a/c/h2/a.java
@@ -1,5 +1,6 @@
 package c.i.a.c.h2;
 
+import androidx.core.view.PointerIconCompat;
 import c.i.a.c.d2.y;
 import c.i.a.c.h2.d;
 import c.i.a.c.i2.o;
@@ -54,9 +55,9 @@ public final /* synthetic */ class a implements Runnable {
         }
         d1.a a02 = c1Var.a0(aVar);
         k kVar = new k(a02, i, j, j2);
-        c1Var.m.put(1006, a02);
+        c1Var.m.put(PointerIconCompat.TYPE_CELL, a02);
         o<d1, d1.b> oVar = c1Var.n;
-        oVar.b(1006, kVar);
+        oVar.b(PointerIconCompat.TYPE_CELL, kVar);
         oVar.a();
     }
 }
diff --git a/app/src/main/java/c/i/a/c/h2/l.java b/app/src/main/java/c/i/a/c/h2/l.java
index fff7e6d010..61ca88294e 100644
--- a/app/src/main/java/c/i/a/c/h2/l.java
+++ b/app/src/main/java/c/i/a/c/h2/l.java
@@ -2,6 +2,7 @@ package c.i.a.c.h2;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.browser.trusted.sharing.ShareTarget;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.util.Collections;
 import java.util.HashMap;
@@ -85,10 +86,10 @@ public final class l {
 
     public static String b(int i) {
         if (i == 1) {
-            return "GET";
+            return ShareTarget.METHOD_GET;
         }
         if (i == 2) {
-            return "POST";
+            return ShareTarget.METHOD_POST;
         }
         if (i == 3) {
             return "HEAD";
diff --git a/app/src/main/java/c/i/a/c/h2/n.java b/app/src/main/java/c/i/a/c/h2/n.java
index cec781e09f..c6607a8906 100644
--- a/app/src/main/java/c/i/a/c/h2/n.java
+++ b/app/src/main/java/c/i/a/c/h2/n.java
@@ -16,6 +16,7 @@ import c.i.b.b.u;
 import c.i.b.b.v;
 import c.i.b.b.w;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -420,7 +421,7 @@ public final class n implements d, x {
             this.r = j + j2;
             if (i > 0) {
                 this.k.a((int) Math.sqrt((double) j2), (((float) j2) * 8000.0f) / ((float) i));
-                if (this.q >= 2000 || this.r >= 524288) {
+                if (this.q >= 2000 || this.r >= Permission.VIEW_GUILD_ANALYTICS) {
                     this.f889s = (long) this.k.b(0.5f);
                 }
                 k(i, this.o, this.f889s);
diff --git a/app/src/main/java/c/i/a/c/h2/o.java b/app/src/main/java/c/i/a/c/h2/o.java
index a88329895b..18b44b6bec 100644
--- a/app/src/main/java/c/i/a/c/h2/o.java
+++ b/app/src/main/java/c/i/a/c/h2/o.java
@@ -7,6 +7,7 @@ import android.util.Log;
 import androidx.annotation.Nullable;
 import c.i.a.c.i2.f0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.exoplayer2.upstream.AssetDataSource;
 import com.google.android.exoplayer2.upstream.ContentDataSource;
 import com.google.android.exoplayer2.upstream.FileDataSource;
@@ -76,7 +77,7 @@ public final class o implements j {
                 }
                 this.k = this.e;
             }
-        } else if ("asset".equals(scheme)) {
+        } else if (ModelAuditLogEntry.CHANGE_KEY_ASSET.equals(scheme)) {
             if (this.e == null) {
                 AssetDataSource assetDataSource2 = new AssetDataSource(this.a);
                 this.e = assetDataSource2;
diff --git a/app/src/main/java/c/i/a/c/h2/q.java b/app/src/main/java/c/i/a/c/h2/q.java
index 2574e6197e..56a4c74def 100644
--- a/app/src/main/java/c/i/a/c/h2/q.java
+++ b/app/src/main/java/c/i/a/c/h2/q.java
@@ -7,6 +7,8 @@ import androidx.annotation.Nullable;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.p;
 import c.i.b.a.h;
+import com.adjust.sdk.Constants;
+import com.discord.api.permission.Permission;
 import com.google.android.exoplayer2.upstream.DataSourceException;
 import com.google.android.exoplayer2.upstream.HttpDataSource$CleartextNotPermittedException;
 import com.google.android.exoplayer2.upstream.HttpDataSource$HttpDataSourceException;
@@ -88,7 +90,7 @@ public class q extends e implements j {
         if (str != null) {
             URL url2 = new URL(url, str);
             String protocol = url2.getProtocol();
-            if ("https".equals(protocol) || "http".equals(protocol)) {
+            if (Constants.SCHEME.equals(protocol) || "http".equals(protocol)) {
                 return url2;
             }
             throw new ProtocolException(c.d.b.a.a.s("Unsupported protocol redirect: ", protocol));
@@ -105,7 +107,7 @@ public class q extends e implements j {
                     if (inputStream.read() == -1) {
                         return;
                     }
-                } else if (j <= 2048) {
+                } else if (j <= Permission.SEND_MESSAGES) {
                     return;
                 }
                 String name = inputStream.getClass().getName();
diff --git a/app/src/main/java/c/i/a/c/h2/y/c.java b/app/src/main/java/c/i/a/c/h2/y/c.java
index 56bc3394fe..2838bc7330 100644
--- a/app/src/main/java/c/i/a/c/h2/y/c.java
+++ b/app/src/main/java/c/i/a/c/h2/y/c.java
@@ -2,6 +2,7 @@ package c.i.a.c.h2.y;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.h2.h;
 import c.i.a.c.h2.j;
 import c.i.a.c.h2.l;
@@ -258,7 +259,7 @@ public final class c implements j {
                 hVar = null;
             }
         }
-        this.t = (this.r || jVar != this.d) ? Long.MAX_VALUE : this.n + 102400;
+        this.t = (this.r || jVar != this.d) ? RecyclerView.FOREVER_NS : this.n + 102400;
         if (z2) {
             AnimatableValueParser.D(this.l == this.d);
             if (jVar != this.d) {
diff --git a/app/src/main/java/c/i/a/c/h2/y/f.java b/app/src/main/java/c/i/a/c/h2/y/f.java
index 53ed0a55c3..70a30bfe3c 100644
--- a/app/src/main/java/c/i/a/c/h2/y/f.java
+++ b/app/src/main/java/c/i/a/c/h2/y/f.java
@@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import androidx.annotation.WorkerThread;
 import c.i.a.c.w1.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.exoplayer2.database.DatabaseIOException;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -15,7 +16,7 @@ import java.util.Objects;
 import java.util.Set;
 /* compiled from: CacheFileMetadataIndex */
 public final class f {
-    public static final String[] a = {"name", "length", "last_touch_timestamp"};
+    public static final String[] a = {ModelAuditLogEntry.CHANGE_KEY_NAME, "length", "last_touch_timestamp"};
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
@@ -108,7 +109,7 @@ public final class f {
         try {
             SQLiteDatabase writableDatabase = this.b.getWritableDatabase();
             ContentValues contentValues = new ContentValues();
-            contentValues.put("name", str);
+            contentValues.put(ModelAuditLogEntry.CHANGE_KEY_NAME, str);
             contentValues.put("length", Long.valueOf(j));
             contentValues.put("last_touch_timestamp", Long.valueOf(j2));
             writableDatabase.replaceOrThrow(this.f898c, null, contentValues);
diff --git a/app/src/main/java/c/i/a/c/h2/y/j.java b/app/src/main/java/c/i/a/c/h2/y/j.java
index 2bd730329f..81bec26d7e 100644
--- a/app/src/main/java/c/i/a/c/h2/y/j.java
+++ b/app/src/main/java/c/i/a/c/h2/y/j.java
@@ -13,6 +13,7 @@ import c.i.a.c.i2.f;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.y;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.exoplayer2.database.DatabaseIOException;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -51,7 +52,7 @@ public class j {
 
     /* compiled from: CachedContentIndex */
     public static final class a implements c {
-        public static final String[] a = {"id", "key", "metadata"};
+        public static final String[] a = {ModelAuditLogEntry.CHANGE_KEY_ID, "key", "metadata"};
         public final c.i.a.c.w1.a b;
 
         /* renamed from: c  reason: collision with root package name */
@@ -224,7 +225,7 @@ public class j {
             j.b(iVar.e, new DataOutputStream(byteArrayOutputStream));
             byte[] byteArray = byteArrayOutputStream.toByteArray();
             ContentValues contentValues = new ContentValues();
-            contentValues.put("id", Integer.valueOf(iVar.a));
+            contentValues.put(ModelAuditLogEntry.CHANGE_KEY_ID, Integer.valueOf(iVar.a));
             contentValues.put("key", iVar.b);
             contentValues.put("metadata", byteArray);
             String str = this.e;
diff --git a/app/src/main/java/c/i/a/c/i2/d0.java b/app/src/main/java/c/i/a/c/i2/d0.java
index 9359b103c2..333f0a2007 100644
--- a/app/src/main/java/c/i/a/c/i2/d0.java
+++ b/app/src/main/java/c/i/a/c/i2/d0.java
@@ -1,6 +1,7 @@
 package c.i.a.c.i2;
 
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.util.Arrays;
 /* compiled from: TimedValueQueue */
@@ -59,7 +60,7 @@ public final class d0<V> {
     @Nullable
     public final V d(long j, boolean z2) {
         V v = null;
-        long j2 = Long.MAX_VALUE;
+        long j2 = RecyclerView.FOREVER_NS;
         while (this.d > 0) {
             long j3 = j - this.a[this.f905c];
             if (j3 < 0 && (z2 || (-j3) >= j2)) {
diff --git a/app/src/main/java/c/i/a/c/i2/e0.java b/app/src/main/java/c/i/a/c/i2/e0.java
index 408da5e160..957913a9b9 100644
--- a/app/src/main/java/c/i/a/c/i2/e0.java
+++ b/app/src/main/java/c/i/a/c/i2/e0.java
@@ -1,6 +1,8 @@
 package c.i.a.c.i2;
 
 import androidx.annotation.GuardedBy;
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.api.permission.Permission;
 /* compiled from: TimestampAdjuster */
 public final class e0 {
     @GuardedBy("this")
@@ -24,7 +26,7 @@ public final class e0 {
             this.f906c = j;
         } else {
             long j2 = this.a;
-            if (j2 != Long.MAX_VALUE) {
+            if (j2 != RecyclerView.FOREVER_NS) {
                 this.b = j2 - j;
             }
             this.f906c = j;
@@ -40,9 +42,9 @@ public final class e0 {
         long j2 = this.f906c;
         if (j2 != -9223372036854775807L) {
             long j3 = (j2 * 90000) / 1000000;
-            long j4 = (4294967296L + j3) / 8589934592L;
-            long j5 = ((j4 - 1) * 8589934592L) + j;
-            long j6 = (j4 * 8589934592L) + j;
+            long j4 = (Permission.REQUEST_TO_SPEAK + j3) / Permission.MANAGE_EVENTS;
+            long j5 = ((j4 - 1) * Permission.MANAGE_EVENTS) + j;
+            long j6 = (j4 * Permission.MANAGE_EVENTS) + j;
             j = Math.abs(j5 - j3) < Math.abs(j6 - j3) ? j5 : j6;
         }
         return a((j * 1000000) / 90000);
@@ -55,7 +57,7 @@ public final class e0 {
     public synchronized long d() {
         long j;
         j = -9223372036854775807L;
-        if (this.a == Long.MAX_VALUE) {
+        if (this.a == RecyclerView.FOREVER_NS) {
             j = 0;
         } else if (this.f906c != -9223372036854775807L) {
             j = this.b;
diff --git a/app/src/main/java/c/i/a/c/i2/f0.java b/app/src/main/java/c/i/a/c/i2/f0.java
index 9e5771c23c..3bf54ceb28 100644
--- a/app/src/main/java/c/i/a/c/i2/f0.java
+++ b/app/src/main/java/c/i/a/c/i2/f0.java
@@ -11,9 +11,14 @@ import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
+import androidx.exifinterface.media.ExifInterface;
 import c.d.b.a.a;
 import c.i.b.a.c;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.utilities.font.FontUtils;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,14 +43,14 @@ public final class f0 {
     public static final Pattern g = Pattern.compile("%([A-Fa-f0-9]{2})");
     @Nullable
     public static HashMap<String, String> h;
-    public static final String[] i = {"alb", "sq", "arm", "hy", "baq", "eu", "bur", "my", "tib", "bo", "chi", "zh", "cze", "cs", "dut", "nl", "ger", "de", "gre", "el", "fre", "fr", "geo", "ka", "ice", "is", "mac", "mk", "mao", "mi", "may", "ms", "per", "fa", "rum", "ro", "scc", "hbs-srp", "slo", "sk", "wel", "cy", "id", "ms-ind", "iw", "he", "heb", "he", "ji", "yi", "in", "ms-ind", "ind", "ms-ind", "nb", "no-nob", "nob", "no-nob", "nn", "no-nno", "nno", "no-nno", "tw", "ak-twi", "twi", "ak-twi", "bs", "hbs-bos", "bos", "hbs-bos", "hr", "hbs-hrv", "hrv", "hbs-hrv", "sr", "hbs-srp", "srp", "hbs-srp", "cmn", "zh-cmn", "hak", "zh-hak", "nan", "zh-nan", "hsn", "zh-hsn"};
+    public static final String[] i = {"alb", "sq", "arm", "hy", "baq", "eu", "bur", "my", "tib", "bo", "chi", "zh", "cze", "cs", "dut", "nl", "ger", "de", "gre", "el", "fre", "fr", "geo", "ka", "ice", "is", "mac", "mk", "mao", "mi", "may", "ms", "per", "fa", "rum", "ro", "scc", "hbs-srp", "slo", "sk", "wel", "cy", ModelAuditLogEntry.CHANGE_KEY_ID, "ms-ind", "iw", "he", "heb", "he", "ji", "yi", "in", "ms-ind", "ind", "ms-ind", "nb", "no-nob", "nob", "no-nob", "nn", "no-nno", "nno", "no-nno", "tw", "ak-twi", "twi", "ak-twi", "bs", "hbs-bos", "bos", "hbs-bos", "hr", "hbs-hrv", "hrv", "hbs-hrv", "sr", "hbs-srp", "srp", "hbs-srp", "cmn", "zh-cmn", "hak", "zh-hak", "nan", "zh-nan", "hsn", "zh-hsn"};
     public static final String[] j = {"i-lux", "lb", "i-hak", "zh-hak", "i-navajo", "nv", "no-bok", "no-nob", "no-nyn", "no-nno", "zh-guoyu", "zh-cmn", "zh-hakka", "zh-hak", "zh-min-nan", "zh-nan", "zh-xiang", "zh-hsn"};
     public static final int[] k = {0, 79764919, 159529838, 222504665, 319059676, 398814059, 445009330, 507990021, 638119352, 583659535, 797628118, 726387553, 890018660, 835552979, 1015980042, 944750013, 1276238704, 1221641927, 1167319070, 1095957929, 1595256236, 1540665371, 1452775106, 1381403509, 1780037320, 1859660671, 1671105958, 1733955601, 2031960084, 2111593891, 1889500026, 1952343757, -1742489888, -1662866601, -1851683442, -1788833735, -1960329156, -1880695413, -2103051438, -2040207643, -1104454824, -1159051537, -1213636554, -1284997759, -1389417084, -1444007885, -1532160278, -1603531939, -734892656, -789352409, -575645954, -646886583, -952755380, -1007220997, -827056094, -898286187, -231047128, -151282273, -71779514, -8804623, -515967244, -436212925, -390279782, -327299027, 881225847, 809987520, 1023691545, 969234094, 662832811, 591600412, 771767749, 717299826, 311336399, 374308984, 453813921, 533576470, 25881363, 88864420, 134795389, 214552010, 2023205639, 2086057648, 1897238633, 1976864222, 1804852699, 1867694188, 1645340341, 1724971778, 1587496639, 1516133128, 1461550545, 1406951526, 1302016099, 1230646740, 1142491917, 1087903418, -1398421865, -1469785312, -1524105735, -1578704818, -1079922613, -1151291908, -1239184603, -1293773166, -1968362705, -1905510760, -2094067647, -2014441994, -1716953613, -1654112188, -1876203875, -1796572374, -525066777, -462094256, -382327159, -302564546, -206542021, -143559028, -97365931, -17609246, -960696225, -1031934488, -817968335, -872425850, -709327229, -780559564, -600130067, -654598054, 1762451694, 1842216281, 1619975040, 1682949687, 2047383090, 2127137669, 1938468188, 2001449195, 1325665622, 1271206113, 1183200824, 1111960463, 1543535498, 1489069629, 1434599652, 1363369299, 622672798, 568075817, 748617968, 677256519, 907627842, 853037301, 1067152940, 995781531, 51762726, 131386257, 177728840, 240578815, 269590778, 349224269, 429104020, 491947555, -248556018, -168932423, -122852000, -60002089, -500490030, -420856475, -341238852, -278395381, -685261898, -739858943, -559578920, -630940305, -1004286614, -1058877219, -845023740, -916395085, -1119974018, -1174433591, -1262701040, -1333941337, -1371866206, -1426332139, -1481064244, -1552294533, -1690935098, -1611170447, -1833673816, -1770699233, -2009983462, -1930228819, -2119160460, -2056179517, 1569362073, 1498123566, 1409854455, 1355396672, 1317987909, 1246755826, 1192025387, 1137557660, 2072149281, 2135122070, 1912620623, 1992383480, 1753615357, 1816598090, 1627664531, 1707420964, 295390185, 358241886, 404320391, 483945776, 43990325, 106832002, 186451547, 266083308, 932423249, 861060070, 1041341759, 986742920, 613929101, 542559546, 756411363, 701822548, -978770311, -1050133554, -869589737, -924188512, -693284699, -764654318, -550540341, -605129092, -475935807, -413084042, -366743377, -287118056, -257573603, -194731862, -114850189, -35218492, -1984365303, -1921392450, -2143631769, -2063868976, -1698919467, -1635936670, -1824608069, -1744851700, -1347415887, -1418654458, -1506661409, -1561119128, -1129027987, -1200260134, -1254728445, -1309196108};
-    public static final int[] l = {0, 7, 14, 9, 28, 27, 18, 21, 56, 63, 54, 49, 36, 35, 42, 45, 112, 119, 126, 121, 108, 107, 98, 101, 72, 79, 70, 65, 84, 83, 90, 93, 224, 231, 238, 233, 252, 251, 242, 245, 216, 223, 214, 209, 196, 195, 202, 205, 144, 151, 158, 153, 140, 139, 130, 133, 168, 175, 166, 161, 180, 179, 186, 189, 199, 192, 201, 206, 219, 220, 213, 210, 255, 248, 241, 246, 227, 228, 237, 234, 183, 176, 185, 190, 171, 172, 165, 162, 143, 136, 129, 134, 147, 148, 157, 154, 39, 32, 41, 46, 59, 60, 53, 50, 31, 24, 17, 22, 3, 4, 13, 10, 87, 80, 89, 94, 75, 76, 69, 66, 111, 104, 97, 102, 115, 116, 125, 122, 137, 142, 135, 128, 149, 146, 155, 156, 177, 182, 191, 184, 173, 170, 163, 164, 249, 254, 247, 240, 229, 226, 235, 236, 193, 198, 207, 200, 221, 218, 211, 212, 105, 110, 103, 96, 117, 114, 123, 124, 81, 86, 95, 88, 77, 74, 67, 68, 25, 30, 23, 16, 5, 2, 11, 12, 33, 38, 47, 40, 61, 58, 51, 52, 78, 73, 64, 71, 82, 85, 92, 91, 118, 113, 120, 127, 106, 109, 100, 99, 62, 57, 48, 55, 34, 37, 44, 43, 6, 1, 8, 15, 26, 29, 20, 19, 174, 169, 160, 167, 178, 181, 188, 187, 150, 145, 152, 159, 138, 141, 132, 131, 222, 217, 208, 215, 194, 197, 204, 203, 230, 225, 232, 239, 250, 253, 244, 243};
+    public static final int[] l = {0, 7, 14, 9, 28, 27, 18, 21, 56, 63, 54, 49, 36, 35, 42, 45, 112, 119, 126, 121, 108, 107, 98, 101, 72, 79, 70, 65, 84, 83, 90, 93, 224, 231, 238, 233, 252, 251, 242, 245, 216, 223, 214, 209, 196, 195, 202, 205, 144, 151, 158, 153, 140, 139, 130, 133, 168, HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION, 166, 161, BaseTransientBottomBar.ANIMATION_FADE_DURATION, 179, 186, 189, 199, 192, 201, 206, 219, 220, 213, 210, 255, 248, 241, 246, 227, 228, 237, 234, 183, 176, 185, 190, 171, 172, 165, 162, 143, 136, 129, 134, 147, 148, 157, 154, 39, 32, 41, 46, 59, 60, 53, 50, 31, 24, 17, 22, 3, 4, 13, 10, 87, 80, 89, 94, 75, 76, 69, 66, 111, 104, 97, 102, 115, 116, 125, 122, 137, 142, 135, 128, 149, 146, 155, 156, 177, 182, 191, 184, 173, 170, 163, 164, 249, 254, 247, 240, 229, 226, 235, 236, 193, 198, 207, 200, 221, 218, 211, 212, 105, 110, 103, 96, 117, 114, 123, 124, 81, 86, 95, 88, 77, 74, 67, 68, 25, 30, 23, 16, 5, 2, 11, 12, 33, 38, 47, 40, 61, 58, 51, 52, 78, 73, 64, 71, 82, 85, 92, 91, 118, 113, 120, 127, 106, 109, 100, 99, 62, 57, 48, 55, 34, 37, 44, 43, 6, 1, 8, 15, 26, 29, 20, 19, 174, 169, 160, 167, 178, 181, 188, 187, FontUtils.MAX_FONT_SCALING, 145, 152, 159, 138, 141, 132, 131, 222, 217, 208, 215, 194, 197, 204, 203, 230, HideBottomViewOnScrollBehavior.ENTER_ANIMATION_DURATION, 232, 239, 250, 253, 244, 243};
 
     static {
         String str = Build.VERSION.CODENAME;
-        int i2 = "S".equals(str) ? 31 : "R".equals(str) ? 30 : Build.VERSION.SDK_INT;
+        int i2 = ExifInterface.LATITUDE_SOUTH.equals(str) ? 31 : "R".equals(str) ? 30 : Build.VERSION.SDK_INT;
         a = i2;
         String str2 = Build.DEVICE;
         b = str2;
diff --git a/app/src/main/java/c/i/a/c/i2/h.java b/app/src/main/java/c/i/a/c/i2/h.java
index 68a0b4a980..7195ff0334 100644
--- a/app/src/main/java/c/i/a/c/i2/h.java
+++ b/app/src/main/java/c/i/a/c/i2/h.java
@@ -1,8 +1,10 @@
 package c.i.a.c.i2;
+
+import androidx.exifinterface.media.ExifInterface;
 /* compiled from: CodecSpecificDataUtil */
 public final class h {
     public static final byte[] a = {0, 0, 0, 1};
-    public static final String[] b = {"", "A", "B", "C"};
+    public static final String[] b = {"", ExifInterface.GPS_MEASUREMENT_IN_PROGRESS, "B", "C"};
 
     public static String a(int i, int i2, int i3) {
         return String.format("avc1.%02X%02X%02X", Integer.valueOf(i), Integer.valueOf(i2), Integer.valueOf(i3));
diff --git a/app/src/main/java/c/i/a/c/i2/i.java b/app/src/main/java/c/i/a/c/i2/i.java
index 56f9ae8ed9..ccad3cbc27 100644
--- a/app/src/main/java/c/i/a/c/i2/i.java
+++ b/app/src/main/java/c/i/a/c/i2/i.java
@@ -3,6 +3,9 @@ package c.i.a.c.i2;
 import android.graphics.Color;
 import android.text.TextUtils;
 import androidx.annotation.ColorInt;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.util.HashMap;
@@ -26,7 +29,7 @@ public final class i {
         hashMap.put("antiquewhite", -332841);
         hashMap.put("aqua", -16711681);
         a.Z(-8388652, hashMap, "aquamarine", -983041, "azure", -657956, "beige", -6972, "bisque");
-        a.Z(-16777216, hashMap, "black", -5171, "blanchedalmond", -16776961, "blue", -7722014, "blueviolet");
+        a.Z(ViewCompat.MEASURED_STATE_MASK, hashMap, "black", -5171, "blanchedalmond", -16776961, "blue", -7722014, "blueviolet");
         a.Z(-5952982, hashMap, "brown", -2180985, "burlywood", -10510688, "cadetblue", -8388864, "chartreuse");
         a.Z(-2987746, hashMap, "chocolate", -32944, "coral", -10185235, "cornflowerblue", -1828, "cornsilk");
         hashMap.put("crimson", -2354116);
@@ -88,7 +91,7 @@ public final class i {
         a.Z(-1120086, hashMap, "palegoldenrod", -6751336, "palegreen", -5247250, "paleturquoise", -2396013, "palevioletred");
         a.Z(-4139, hashMap, "papayawhip", -9543, "peachpuff", -3308225, "peru", -16181, "pink");
         a.Z(-2252579, hashMap, "plum", -5185306, "powderblue", -8388480, "purple", -10079335, "rebeccapurple");
-        a.Z(-65536, hashMap, "red", -4419697, "rosybrown", -12490271, "royalblue", -7650029, "saddlebrown");
+        a.Z(SupportMenu.CATEGORY_MASK, hashMap, "red", -4419697, "rosybrown", -12490271, "royalblue", -7650029, "saddlebrown");
         a.Z(-360334, hashMap, "salmon", -744352, "sandybrown", -13726889, "seagreen", -2578, "seashell");
         a.Z(-6270419, hashMap, "sienna", -4144960, "silver", -7876885, "skyblue", -9807155, "slateblue");
         hashMap.put("slategray", -9404272);
@@ -97,7 +100,7 @@ public final class i {
         hashMap.put("springgreen", -16711809);
         a.Z(-12156236, hashMap, "steelblue", -2968436, "tan", -16744320, "teal", -2572328, "thistle");
         a.Z(-40121, hashMap, "tomato", 0, "transparent", -12525360, "turquoise", -1146130, "violet");
-        a.Z(-663885, hashMap, "wheat", -1, "white", -657931, "whitesmoke", -256, "yellow");
+        a.Z(-663885, hashMap, "wheat", -1, "white", -657931, "whitesmoke", InputDeviceCompat.SOURCE_ANY, "yellow");
         hashMap.put("yellowgreen", -6632142);
     }
 
diff --git a/app/src/main/java/c/i/a/c/i2/s.java b/app/src/main/java/c/i/a/c/i2/s.java
index 6c8c841dbf..dde0e69624 100644
--- a/app/src/main/java/c/i/a/c/i2/s.java
+++ b/app/src/main/java/c/i/a/c/i2/s.java
@@ -3,11 +3,13 @@ package c.i.a.c.i2;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.app.NotificationCompat;
 import c.i.a.c.v1.k;
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: MimeTypes */
 public final class s {
     public static final ArrayList<a> a = new ArrayList<>();
@@ -412,14 +414,14 @@ public final class s {
     }
 
     public static boolean h(@Nullable String str) {
-        return "audio".equals(f(str));
+        return MediaStreamTrack.AUDIO_TRACK_KIND.equals(f(str));
     }
 
     public static boolean i(@Nullable String str) {
-        return "text".equals(f(str)) || "application/cea-608".equals(str) || "application/cea-708".equals(str) || "application/x-mp4-cea-608".equals(str) || "application/x-subrip".equals(str) || "application/ttml+xml".equals(str) || "application/x-quicktime-tx3g".equals(str) || "application/x-mp4-vtt".equals(str) || "application/x-rawcc".equals(str) || "application/vobsub".equals(str) || "application/pgs".equals(str) || "application/dvbsubs".equals(str);
+        return NotificationCompat.MessagingStyle.Message.KEY_TEXT.equals(f(str)) || "application/cea-608".equals(str) || "application/cea-708".equals(str) || "application/x-mp4-cea-608".equals(str) || "application/x-subrip".equals(str) || "application/ttml+xml".equals(str) || "application/x-quicktime-tx3g".equals(str) || "application/x-mp4-vtt".equals(str) || "application/x-rawcc".equals(str) || "application/vobsub".equals(str) || "application/pgs".equals(str) || "application/dvbsubs".equals(str);
     }
 
     public static boolean j(@Nullable String str) {
-        return "video".equals(f(str));
+        return MediaStreamTrack.VIDEO_TRACK_KIND.equals(f(str));
     }
 }
diff --git a/app/src/main/java/c/i/a/c/j2/n.java b/app/src/main/java/c/i/a/c/j2/n.java
index 2b56365c23..1ab27851dc 100644
--- a/app/src/main/java/c/i/a/c/j2/n.java
+++ b/app/src/main/java/c/i/a/c/j2/n.java
@@ -17,6 +17,7 @@ import android.view.Surface;
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.b2.g;
 import c.i.a.c.b2.r;
 import c.i.a.c.b2.s;
@@ -30,6 +31,7 @@ import c.i.a.c.s0;
 import c.i.a.c.x1.d;
 import c.i.a.c.x1.e;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
@@ -125,7 +127,7 @@ public class n extends MediaCodecRenderer {
         public final void a(long j) {
             n nVar = n.this;
             if (this == nVar.C1) {
-                if (j == Long.MAX_VALUE) {
+                if (j == RecyclerView.FOREVER_NS) {
                     nVar.G0 = true;
                     return;
                 }
@@ -495,7 +497,7 @@ public class n extends MediaCodecRenderer {
                     break;
                 case -782144577:
                     if (str2.equals("OnePlus5T")) {
-                        c3 = '#';
+                        c3 = MentionUtilsKt.CHANNELS_CHAR;
                         break;
                     }
                     c3 = 65535;
@@ -579,7 +581,7 @@ public class n extends MediaCodecRenderer {
                     break;
                 case 2719:
                     if (str2.equals("V5")) {
-                        c3 = '/';
+                        c3 = MentionUtilsKt.SLASH_CHAR;
                         break;
                     }
                     c3 = 65535;
@@ -656,7 +658,7 @@ public class n extends MediaCodecRenderer {
                     break;
                 case 98846:
                     if (str2.equals("cv1")) {
-                        c3 = ':';
+                        c3 = MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
                         break;
                     }
                     c3 = 65535;
@@ -698,7 +700,7 @@ public class n extends MediaCodecRenderer {
                     break;
                 case 1514185:
                     if (str2.equals("1714")) {
-                        c3 = '@';
+                        c3 = MentionUtilsKt.MENTIONS_CHAR;
                         break;
                     }
                     c3 = 65535;
diff --git a/app/src/main/java/c/i/a/c/j2/o.java b/app/src/main/java/c/i/a/c/j2/o.java
index 3275b7b66d..a75d7321ba 100644
--- a/app/src/main/java/c/i/a/c/j2/o.java
+++ b/app/src/main/java/c/i/a/c/j2/o.java
@@ -2,6 +2,7 @@ package c.i.a.c.j2;
 
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
+import androidx.work.Data;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
@@ -83,7 +84,7 @@ public class o implements GLSurfaceView.Renderer, r {
             GLES20.glActiveTexture(33984 + i2);
             GLES20.glBindTexture(3553, this.n[i2]);
             GLES20.glTexParameterf(3553, 10241, 9729.0f);
-            GLES20.glTexParameterf(3553, 10240, 9729.0f);
+            GLES20.glTexParameterf(3553, Data.MAX_DATA_BYTES, 9729.0f);
             GLES20.glTexParameterf(3553, 10242, 33071.0f);
             GLES20.glTexParameterf(3553, 10243, 33071.0f);
         }
diff --git a/app/src/main/java/c/i/a/c/o1.java b/app/src/main/java/c/i/a/c/o1.java
index 0c3e09869f..5354db6191 100644
--- a/app/src/main/java/c/i/a/c/o1.java
+++ b/app/src/main/java/c/i/a/c/o1.java
@@ -1,6 +1,7 @@
 package c.i.a.c;
 
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 /* compiled from: SeekParameters */
 public final class o1 {
@@ -15,12 +16,12 @@ public final class o1 {
         o1 o1Var = new o1(0, 0);
         a = o1Var;
         boolean z2 = true;
-        AnimatableValueParser.k(Long.MAX_VALUE >= 0);
-        AnimatableValueParser.k(Long.MAX_VALUE >= 0);
-        AnimatableValueParser.k(Long.MAX_VALUE >= 0);
+        AnimatableValueParser.k(RecyclerView.FOREVER_NS >= 0);
+        AnimatableValueParser.k(RecyclerView.FOREVER_NS >= 0);
+        AnimatableValueParser.k(RecyclerView.FOREVER_NS >= 0);
         AnimatableValueParser.k(0 >= 0);
         AnimatableValueParser.k(0 >= 0);
-        if (Long.MAX_VALUE < 0) {
+        if (RecyclerView.FOREVER_NS < 0) {
             z2 = false;
         }
         AnimatableValueParser.k(z2);
diff --git a/app/src/main/java/c/i/a/c/p1.java b/app/src/main/java/c/i/a/c/p1.java
index 4b1f0e5fdf..64a2d880a3 100644
--- a/app/src/main/java/c/i/a/c/p1.java
+++ b/app/src/main/java/c/i/a/c/p1.java
@@ -18,6 +18,7 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.TextureView;
 import androidx.annotation.Nullable;
+import androidx.core.view.PointerIconCompat;
 import c.i.a.c.a2.f;
 import c.i.a.c.c2.e;
 import c.i.a.c.d0;
@@ -46,6 +47,8 @@ import c.i.a.c.v1.y;
 import c.i.b.b.q0;
 import c.i.b.b.u;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.utilities.guilds.GuildConstantsKt;
+import com.discord.utilities.rest.SendUtils;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoTimeoutException;
 import com.google.android.exoplayer2.Format;
@@ -64,6 +67,7 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.TimeoutException;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: SimpleExoPlayer */
 public class p1 extends f0 implements g1, g1.d, g1.c {
     public n A;
@@ -151,7 +155,7 @@ public class p1 extends f0 implements g1, g1.d, g1.c {
             f fVar = new f();
             DefaultTrackSelector defaultTrackSelector = new DefaultTrackSelector(context);
             c.i.a.c.d2.n nVar2 = new c.i.a.c.d2.n(context, fVar);
-            l0 l0Var = new l0(new m(true, 65536), 50000, 50000, 2500, 5000, -1, false, 0, false);
+            l0 l0Var = new l0(new m(true, 65536), 50000, 50000, GuildConstantsKt.MAX_GUILD_MEMBERS_NOTIFY_ALL_MESSAGES, 5000, -1, false, 0, false);
             c.i.b.b.v<String, Integer> vVar = c.i.a.c.h2.n.a;
             synchronized (c.i.a.c.h2.n.class) {
                 if (c.i.a.c.h2.n.g == null) {
@@ -394,9 +398,9 @@ public class p1 extends f0 implements g1, g1.d, g1.c {
             c1 c1Var = p1.this.k;
             d1.a Y = c1Var.Y();
             c.i.a.c.u1.d dVar = new c.i.a.c.u1.d(Y, metadata);
-            c1Var.m.put(1007, Y);
+            c1Var.m.put(PointerIconCompat.TYPE_CROSSHAIR, Y);
             o<d1, d1.b> oVar = c1Var.n;
-            oVar.b(1007, dVar);
+            oVar.b(PointerIconCompat.TYPE_CROSSHAIR, dVar);
             oVar.a();
             Iterator<e> it = p1.this.i.iterator();
             while (it.hasNext()) {
@@ -575,12 +579,12 @@ public class p1 extends f0 implements g1, g1.d, g1.c {
                         this.r = null;
                     }
                     if (this.r == null) {
-                        this.r = new AudioTrack(3, 4000, 4, 2, 2, 0, 0);
+                        this.r = new AudioTrack(3, SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, 4, 2, 2, 0, 0);
                     }
                     this.f944z = this.r.getAudioSessionId();
                 } else {
                     UUID uuid = h0.a;
-                    AudioManager audioManager = (AudioManager) applicationContext.getSystemService("audio");
+                    AudioManager audioManager = (AudioManager) applicationContext.getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
                     this.f944z = audioManager == null ? -1 : audioManager.generateAudioSessionId();
                 }
                 this.D = Collections.emptyList();
diff --git a/app/src/main/java/c/i/a/c/q1.java b/app/src/main/java/c/i/a/c/q1.java
index 3ff03bb94b..67896c6b73 100644
--- a/app/src/main/java/c/i/a/c/q1.java
+++ b/app/src/main/java/c/i/a/c/q1.java
@@ -11,6 +11,7 @@ import c.i.a.c.i2.f0;
 import c.i.a.c.i2.p;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.util.Iterator;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: StreamVolumeManager */
 public final class q1 {
     public final Context a;
@@ -46,7 +47,7 @@ public final class q1 {
         this.a = applicationContext;
         this.b = handler;
         this.f954c = bVar;
-        AudioManager audioManager = (AudioManager) applicationContext.getSystemService("audio");
+        AudioManager audioManager = (AudioManager) applicationContext.getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
         AnimatableValueParser.H(audioManager);
         this.d = audioManager;
         this.g = b(audioManager, 3);
diff --git a/app/src/main/java/c/i/a/c/u1/c1.java b/app/src/main/java/c/i/a/c/u1/c1.java
index a729374ecf..003fc590b3 100644
--- a/app/src/main/java/c/i/a/c/u1/c1.java
+++ b/app/src/main/java/c/i/a/c/u1/c1.java
@@ -3,6 +3,9 @@ package c.i.a.c.u1;
 import android.util.SparseArray;
 import android.view.Surface;
 import androidx.annotation.Nullable;
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.PointerIconCompat;
+import androidx.media.AudioAttributesCompat;
 import c.i.a.c.d2.r;
 import c.i.a.c.d2.y;
 import c.i.a.c.d2.z;
@@ -137,9 +140,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void A(Format format, @Nullable e eVar) {
         d1.a d02 = d0();
         m0 m0Var = new m0(d02, format, eVar);
-        this.m.put(1010, d02);
+        this.m.put(PointerIconCompat.TYPE_ALIAS, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1010, m0Var);
+        oVar.b(PointerIconCompat.TYPE_ALIAS, m0Var);
         oVar.a();
     }
 
@@ -192,9 +195,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void G(boolean z2) {
         d1.a d02 = d0();
         g0 g0Var = new g0(d02, z2);
-        this.m.put(1017, d02);
+        this.m.put(PointerIconCompat.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1017, g0Var);
+        oVar.b(PointerIconCompat.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW, g0Var);
         oVar.a();
     }
 
@@ -202,9 +205,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void H(Exception exc) {
         d1.a d02 = d0();
         g gVar = new g(d02, exc);
-        this.m.put(1018, d02);
+        this.m.put(PointerIconCompat.TYPE_ZOOM_IN, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1018, gVar);
+        oVar.b(PointerIconCompat.TYPE_ZOOM_IN, gVar);
         oVar.a();
     }
 
@@ -212,9 +215,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void I(c.i.a.c.x1.d dVar) {
         d1.a d02 = d0();
         a1 a1Var = new a1(d02, dVar);
-        this.m.put(1020, d02);
+        this.m.put(PointerIconCompat.TYPE_GRAB, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1020, a1Var);
+        oVar.b(PointerIconCompat.TYPE_GRAB, a1Var);
         oVar.a();
     }
 
@@ -232,9 +235,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void K(long j) {
         d1.a d02 = d0();
         y0 y0Var = new y0(d02, j);
-        this.m.put(1011, d02);
+        this.m.put(PointerIconCompat.TYPE_COPY, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1011, y0Var);
+        oVar.b(PointerIconCompat.TYPE_COPY, y0Var);
         oVar.a();
     }
 
@@ -262,9 +265,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void N(int i, @Nullable y.a aVar, r rVar, c.i.a.c.d2.u uVar) {
         d1.a b02 = b0(i, aVar);
         w wVar = new w(b02, rVar, uVar);
-        this.m.put(1001, b02);
+        this.m.put(PointerIconCompat.TYPE_CONTEXT_MENU, b02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1001, wVar);
+        oVar.b(PointerIconCompat.TYPE_CONTEXT_MENU, wVar);
         oVar.a();
     }
 
@@ -282,9 +285,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void P(c.i.a.c.x1.d dVar) {
         d1.a c02 = c0();
         i iVar = new i(c02, dVar);
-        this.m.put(1025, c02);
+        this.m.put(InputDeviceCompat.SOURCE_GAMEPAD, c02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1025, iVar);
+        oVar.b(InputDeviceCompat.SOURCE_GAMEPAD, iVar);
         oVar.a();
     }
 
@@ -317,9 +320,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void T(int i, long j, long j2) {
         d1.a d02 = d0();
         z0 z0Var = new z0(d02, i, j, j2);
-        this.m.put(1012, d02);
+        this.m.put(PointerIconCompat.TYPE_NO_DROP, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1012, z0Var);
+        oVar.b(PointerIconCompat.TYPE_NO_DROP, z0Var);
         oVar.a();
     }
 
@@ -327,9 +330,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void U(int i, @Nullable y.a aVar, r rVar, c.i.a.c.d2.u uVar, IOException iOException, boolean z2) {
         d1.a b02 = b0(i, aVar);
         f0 f0Var = new f0(b02, rVar, uVar, iOException, z2);
-        this.m.put(1003, b02);
+        this.m.put(PointerIconCompat.TYPE_HELP, b02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1003, f0Var);
+        oVar.b(PointerIconCompat.TYPE_HELP, f0Var);
         oVar.a();
     }
 
@@ -449,9 +452,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void c(c.i.a.c.x1.d dVar) {
         d1.a c02 = c0();
         t tVar = new t(c02, dVar);
-        this.m.put(1014, c02);
+        this.m.put(PointerIconCompat.TYPE_HORIZONTAL_DOUBLE_ARROW, c02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1014, tVar);
+        oVar.b(PointerIconCompat.TYPE_HORIZONTAL_DOUBLE_ARROW, tVar);
         oVar.a();
     }
 
@@ -509,9 +512,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void h(c.i.a.c.x1.d dVar) {
         d1.a d02 = d0();
         r rVar = new r(d02, dVar);
-        this.m.put(1008, d02);
+        this.m.put(PointerIconCompat.TYPE_TEXT, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1008, rVar);
+        oVar.b(PointerIconCompat.TYPE_TEXT, rVar);
         oVar.a();
     }
 
@@ -529,9 +532,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void j(String str, long j, long j2) {
         d1.a d02 = d0();
         m mVar = new m(d02, str, j2);
-        this.m.put(1021, d02);
+        this.m.put(PointerIconCompat.TYPE_GRABBING, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1021, mVar);
+        oVar.b(PointerIconCompat.TYPE_GRABBING, mVar);
         oVar.a();
     }
 
@@ -550,9 +553,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void l(int i, @Nullable y.a aVar, c.i.a.c.d2.u uVar) {
         d1.a b02 = b0(i, aVar);
         e eVar = new e(b02, uVar);
-        this.m.put(1004, b02);
+        this.m.put(PointerIconCompat.TYPE_WAIT, b02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1004, eVar);
+        oVar.b(PointerIconCompat.TYPE_WAIT, eVar);
         oVar.a();
     }
 
@@ -560,9 +563,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void m(int i, @Nullable y.a aVar, r rVar, c.i.a.c.d2.u uVar) {
         d1.a b02 = b0(i, aVar);
         i0 i0Var = new i0(b02, rVar, uVar);
-        this.m.put(1002, b02);
+        this.m.put(PointerIconCompat.TYPE_HAND, b02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1002, i0Var);
+        oVar.b(PointerIconCompat.TYPE_HAND, i0Var);
         oVar.a();
     }
 
@@ -635,9 +638,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void t(String str) {
         d1.a d02 = d0();
         f fVar = new f(d02, str);
-        this.m.put(1013, d02);
+        this.m.put(PointerIconCompat.TYPE_ALL_SCROLL, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1013, fVar);
+        oVar.b(PointerIconCompat.TYPE_ALL_SCROLL, fVar);
         oVar.a();
     }
 
@@ -645,9 +648,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void u(String str, long j, long j2) {
         d1.a d02 = d0();
         v0 v0Var = new v0(d02, str, j2);
-        this.m.put(1009, d02);
+        this.m.put(PointerIconCompat.TYPE_VERTICAL_TEXT, d02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1009, v0Var);
+        oVar.b(PointerIconCompat.TYPE_VERTICAL_TEXT, v0Var);
         oVar.a();
     }
 
@@ -670,9 +673,9 @@ public class c1 implements g1.a, q, w, z, d.a, c.i.a.c.z1.q {
     public final void x(int i, long j) {
         d1.a c02 = c0();
         z zVar = new z(c02, i, j);
-        this.m.put(1023, c02);
+        this.m.put(AudioAttributesCompat.FLAG_ALL, c02);
         o<d1, d1.b> oVar = this.n;
-        oVar.b(1023, zVar);
+        oVar.b(AudioAttributesCompat.FLAG_ALL, zVar);
         oVar.a();
     }
 
diff --git a/app/src/main/java/c/i/a/c/v1/c0.java b/app/src/main/java/c/i/a/c/v1/c0.java
index 79f7a6a77e..0a4c9c2fa9 100644
--- a/app/src/main/java/c/i/a/c/v1/c0.java
+++ b/app/src/main/java/c/i/a/c/v1/c0.java
@@ -1,6 +1,7 @@
 package c.i.a.c.v1;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.utilities.rest.SendUtils;
 import java.util.Arrays;
 /* compiled from: Sonic */
 public final class c0 {
@@ -147,7 +148,7 @@ public final class c0 {
                     } else {
                         short[] sArr = this.j;
                         int i13 = this.a;
-                        int i14 = i13 > 4000 ? i13 / 4000 : 1;
+                        int i14 = i13 > 4000 ? i13 / SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM : 1;
                         if (this.b == i9 && i14 == i9) {
                             i5 = d(sArr, i11, this.f, this.g);
                         } else {
diff --git a/app/src/main/java/c/i/a/c/v1/k.java b/app/src/main/java/c/i/a/c/v1/k.java
index 6954561c6a..d159ea05c6 100644
--- a/app/src/main/java/c/i/a/c/v1/k.java
+++ b/app/src/main/java/c/i/a/c/v1/k.java
@@ -1,6 +1,7 @@
 package c.i.a.c.v1;
 
 import android.util.Log;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.a.c.i2.v;
 import com.google.android.exoplayer2.ParserException;
 /* compiled from: AacUtil */
@@ -33,13 +34,10 @@ public final class k {
         if (i == 29) {
             return 12;
         }
-        if (i == 42) {
-            return 16;
+        if (i != 42) {
+            return i != 22 ? i != 23 ? 0 : 15 : BasicMeasure.EXACTLY;
         }
-        if (i != 22) {
-            return i != 23 ? 0 : 15;
-        }
-        return 1073741824;
+        return 16;
     }
 
     public static int b(v vVar) throws ParserException {
diff --git a/app/src/main/java/c/i/a/c/v1/m.java b/app/src/main/java/c/i/a/c/v1/m.java
index 26d8bee319..9b2a96337f 100644
--- a/app/src/main/java/c/i/a/c/v1/m.java
+++ b/app/src/main/java/c/i/a/c/v1/m.java
@@ -1,10 +1,11 @@
 package c.i.a.c.v1;
 
+import androidx.core.view.PointerIconCompat;
 import c.i.a.c.i2.v;
 import c.i.a.c.i2.w;
 /* compiled from: Ac4Util */
 public final class m {
-    public static final int[] a = {2002, 2000, 1920, 1601, 1600, 1001, 1000, 960, 800, 800, 480, 400, 400, 2048};
+    public static final int[] a = {2002, 2000, 1920, 1601, 1600, PointerIconCompat.TYPE_CONTEXT_MENU, 1000, 960, 800, 800, 480, 400, 400, 2048};
 
     /* compiled from: Ac4Util */
     public static final class b {
diff --git a/app/src/main/java/c/i/a/c/v1/z.java b/app/src/main/java/c/i/a/c/v1/z.java
index fb1a946211..3cacc74b2e 100644
--- a/app/src/main/java/c/i/a/c/v1/z.java
+++ b/app/src/main/java/c/i/a/c/v1/z.java
@@ -1,6 +1,7 @@
 package c.i.a.c.v1;
 
 import androidx.annotation.Nullable;
+import com.discord.restapi.RestAPIAbortCodes;
 /* compiled from: MpegAudioUtil */
 public final class z {
     public static final String[] a = {"audio/mpeg-L1", "audio/mpeg-L2", "audio/mpeg"};
@@ -8,10 +9,10 @@ public final class z {
 
     /* renamed from: c  reason: collision with root package name */
     public static final int[] f1008c = {32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000};
-    public static final int[] d = {32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000};
-    public static final int[] e = {32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000};
-    public static final int[] f = {32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000};
-    public static final int[] g = {8000, 16000, 24000, 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000};
+    public static final int[] d = {32000, 48000, 56000, 64000, RestAPIAbortCodes.RELATIONSHIP_INCOMING_DISABLED, 96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000};
+    public static final int[] e = {32000, 48000, 56000, 64000, RestAPIAbortCodes.RELATIONSHIP_INCOMING_DISABLED, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000};
+    public static final int[] f = {32000, 40000, 48000, 56000, 64000, RestAPIAbortCodes.RELATIONSHIP_INCOMING_DISABLED, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000};
+    public static final int[] g = {8000, 16000, 24000, 32000, 40000, 48000, 56000, 64000, RestAPIAbortCodes.RELATIONSHIP_INCOMING_DISABLED, 96000, 112000, 128000, 144000, 160000};
 
     /* compiled from: MpegAudioUtil */
     public static final class a {
diff --git a/app/src/main/java/c/i/a/c/w1/b.java b/app/src/main/java/c/i/a/c/w1/b.java
index 808606b12b..6c9b449ba2 100644
--- a/app/src/main/java/c/i/a/c/w1/b.java
+++ b/app/src/main/java/c/i/a/c/w1/b.java
@@ -6,6 +6,7 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import c.i.a.c.i2.p;
+import com.discord.models.domain.ModelAuditLogEntry;
 /* compiled from: ExoDatabaseProvider */
 public final class b extends SQLiteOpenHelper implements a {
     public b(Context context) {
@@ -36,7 +37,7 @@ public final class b extends SQLiteOpenHelper implements a {
      */
     @Override // android.database.sqlite.SQLiteOpenHelper
     public void onDowngrade(SQLiteDatabase sQLiteDatabase, int i, int i2) {
-        Cursor query = sQLiteDatabase.query("sqlite_master", new String[]{"type", "name"}, null, null, null, null, null);
+        Cursor query = sQLiteDatabase.query("sqlite_master", new String[]{"type", ModelAuditLogEntry.CHANGE_KEY_NAME}, null, null, null, null, null);
         while (query.moveToNext()) {
             String string = query.getString(0);
             String string2 = query.getString(1);
diff --git a/app/src/main/java/c/i/a/c/z0.java b/app/src/main/java/c/i/a/c/z0.java
index e967d27a9b..5735484d2c 100644
--- a/app/src/main/java/c/i/a/c/z0.java
+++ b/app/src/main/java/c/i/a/c/z0.java
@@ -3,6 +3,7 @@ package c.i.a.c;
 import android.os.Handler;
 import android.util.Pair;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.d2.j0.a;
 import c.i.a.c.d2.y;
 import c.i.a.c.r1;
@@ -363,7 +364,7 @@ public final class z0 {
             long j3 = y0Var2.e;
             long j4 = y0Var.e;
             if (!(j3 == -9223372036854775807L || j3 == j4)) {
-                return !m(x0Var) && !(x0Var == this.i && ((j2 > Long.MIN_VALUE ? 1 : (j2 == Long.MIN_VALUE ? 0 : -1)) == 0 || (j2 > ((j4 > -9223372036854775807L ? 1 : (j4 == -9223372036854775807L ? 0 : -1)) == 0 ? Long.MAX_VALUE : x0Var.o + j4) ? 1 : (j2 == ((j4 > -9223372036854775807L ? 1 : (j4 == -9223372036854775807L ? 0 : -1)) == 0 ? Long.MAX_VALUE : x0Var.o + j4) ? 0 : -1)) >= 0));
+                return !m(x0Var) && !(x0Var == this.i && ((j2 > Long.MIN_VALUE ? 1 : (j2 == Long.MIN_VALUE ? 0 : -1)) == 0 || (j2 > ((j4 > -9223372036854775807L ? 1 : (j4 == -9223372036854775807L ? 0 : -1)) == 0 ? RecyclerView.FOREVER_NS : x0Var.o + j4) ? 1 : (j2 == ((j4 > -9223372036854775807L ? 1 : (j4 == -9223372036854775807L ? 0 : -1)) == 0 ? RecyclerView.FOREVER_NS : x0Var.o + j4) ? 0 : -1)) >= 0));
             }
             x0Var2 = x0Var;
             x0Var = x0Var.l;
diff --git a/app/src/main/java/c/i/a/c/z1/a0.java b/app/src/main/java/c/i/a/c/z1/a0.java
index eea643a843..483939890f 100644
--- a/app/src/main/java/c/i/a/c/z1/a0.java
+++ b/app/src/main/java/c/i/a/c/z1/a0.java
@@ -13,6 +13,7 @@ import c.i.a.c.i2.f0;
 import c.i.a.c.z1.x;
 import c.i.b.b.r0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.restapi.RestAPIBuilder;
 import com.google.android.exoplayer2.drm.MediaDrmCallbackException;
 import com.google.android.exoplayer2.upstream.HttpDataSource$InvalidResponseCodeException;
 import java.io.IOException;
@@ -106,7 +107,7 @@ public final class a0 implements b0 {
         if (!TextUtils.isEmpty(str)) {
             HashMap hashMap = new HashMap();
             UUID uuid2 = h0.e;
-            hashMap.put("Content-Type", uuid2.equals(uuid) ? "text/xml" : h0.f881c.equals(uuid) ? "application/json" : "application/octet-stream");
+            hashMap.put("Content-Type", uuid2.equals(uuid) ? "text/xml" : h0.f881c.equals(uuid) ? RestAPIBuilder.CONTENT_TYPE_JSON : "application/octet-stream");
             if (uuid2.equals(uuid)) {
                 hashMap.put("SOAPAction", "http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense");
             }
diff --git a/app/src/main/java/c/i/a/c/z1/z.java b/app/src/main/java/c/i/a/c/z1/z.java
index fc5103f726..4c621515c3 100644
--- a/app/src/main/java/c/i/a/c/z1/z.java
+++ b/app/src/main/java/c/i/a/c/z1/z.java
@@ -18,6 +18,7 @@ import c.i.a.c.i2.p;
 import c.i.a.c.z1.x;
 import c.i.b.a.c;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -114,9 +115,9 @@ public final class z implements x {
                     }
                     JSONObject jSONObject2 = jSONArray.getJSONObject(i);
                     sb.append("{\"k\":\"");
-                    sb.append(jSONObject2.getString("k").replace('-', '+').replace('_', '/'));
+                    sb.append(jSONObject2.getString("k").replace('-', '+').replace('_', MentionUtilsKt.SLASH_CHAR));
                     sb.append("\",\"kid\":\"");
-                    sb.append(jSONObject2.getString("kid").replace('-', '+').replace('_', '/'));
+                    sb.append(jSONObject2.getString("kid").replace('-', '+').replace('_', MentionUtilsKt.SLASH_CHAR));
                     sb.append("\",\"kty\":\"");
                     sb.append(jSONObject2.getString("kty"));
                     sb.append("\"}");
@@ -279,7 +280,7 @@ public final class z implements x {
         UUID uuid4 = this.b;
         byte[] data = keyRequest.getData();
         if (h0.f881c.equals(uuid4) && f0.a < 27) {
-            data = f0.w(f0.l(data).replace('+', '-').replace('/', '_'));
+            data = f0.w(f0.l(data).replace('+', '-').replace(MentionUtilsKt.SLASH_CHAR, '_'));
         }
         String defaultUrl = keyRequest.getDefaultUrl();
         if ("https://x".equals(defaultUrl)) {
diff --git a/app/src/main/java/c/i/a/e/c.java b/app/src/main/java/c/i/a/e/c.java
index 6d4cc72409..d86cc9b07a 100644
--- a/app/src/main/java/c/i/a/e/c.java
+++ b/app/src/main/java/c/i/a/e/c.java
@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.core.widget.CompoundButtonCompat;
 import com.google.android.flexbox.FlexItem;
@@ -502,8 +503,8 @@ public class c {
                 z3 = z2;
             }
             if (!z3) {
-                int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824);
-                int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(measuredHeight, 1073741824);
+                int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY);
+                int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(measuredHeight, BasicMeasure.EXACTLY);
                 view.measure(makeMeasureSpec, makeMeasureSpec2);
                 B(i, makeMeasureSpec, makeMeasureSpec2, view);
                 this.a.e(i, view);
@@ -857,7 +858,7 @@ public class c {
                                 f4 = f5;
                             }
                             int n = n(i2, flexItem, bVar.m);
-                            int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(round, 1073741824);
+                            int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(round, BasicMeasure.EXACTLY);
                             c2.measure(makeMeasureSpec, n);
                             int measuredWidth2 = c2.getMeasuredWidth();
                             int measuredHeight2 = c2.getMeasuredHeight();
@@ -911,7 +912,7 @@ public class c {
                                 f4 = (float) d2;
                             }
                             int o = o(i, flexItem, bVar.m);
-                            int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(round2, 1073741824);
+                            int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(round2, BasicMeasure.EXACTLY);
                             c2.measure(o, makeMeasureSpec2);
                             measuredWidth3 = c2.getMeasuredWidth();
                             int measuredHeight4 = c2.getMeasuredHeight();
@@ -1128,7 +1129,7 @@ public class c {
                                 i8 = round;
                             }
                             int n = n(i2, flexItem, bVar.m);
-                            int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i8, 1073741824);
+                            int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(i8, BasicMeasure.EXACTLY);
                             c2.measure(makeMeasureSpec, n);
                             int measuredWidth2 = c2.getMeasuredWidth();
                             int measuredHeight2 = c2.getMeasuredHeight();
@@ -1184,7 +1185,7 @@ public class c {
                                 f4 = f6;
                             }
                             int o = o(i, flexItem, bVar.m);
-                            int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(round2, 1073741824);
+                            int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(round2, BasicMeasure.EXACTLY);
                             c2.measure(o, makeMeasureSpec2);
                             measuredWidth3 = c2.getMeasuredWidth();
                             int measuredHeight4 = c2.getMeasuredHeight();
@@ -1226,8 +1227,8 @@ public class c {
         FlexItem flexItem = (FlexItem) view.getLayoutParams();
         int min = Math.min(Math.max(((i - flexItem.I()) - flexItem.c0()) - this.a.j(view), flexItem.C()), flexItem.s0());
         long[] jArr = this.e;
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(jArr != null ? m(jArr[i2]) : view.getMeasuredHeight(), 1073741824);
-        int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(min, 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(jArr != null ? m(jArr[i2]) : view.getMeasuredHeight(), BasicMeasure.EXACTLY);
+        int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(min, BasicMeasure.EXACTLY);
         view.measure(makeMeasureSpec2, makeMeasureSpec);
         B(i2, makeMeasureSpec2, makeMeasureSpec, view);
         this.a.e(i2, view);
@@ -1237,8 +1238,8 @@ public class c {
         FlexItem flexItem = (FlexItem) view.getLayoutParams();
         int min = Math.min(Math.max(((i - flexItem.M()) - flexItem.H()) - this.a.j(view), flexItem.e0()), flexItem.l0());
         long[] jArr = this.e;
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(jArr != null ? (int) jArr[i2] : view.getMeasuredWidth(), 1073741824);
-        int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(min, 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(jArr != null ? (int) jArr[i2] : view.getMeasuredWidth(), BasicMeasure.EXACTLY);
+        int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(min, BasicMeasure.EXACTLY);
         view.measure(makeMeasureSpec, makeMeasureSpec2);
         B(i2, makeMeasureSpec, makeMeasureSpec2, view);
         this.a.e(i2, view);
diff --git a/app/src/main/java/c/i/a/f/b/d.java b/app/src/main/java/c/i/a/f/b/d.java
index a03563ac3f..e8dbafdaeb 100644
--- a/app/src/main/java/c/i/a/f/b/d.java
+++ b/app/src/main/java/c/i/a/f/b/d.java
@@ -2,10 +2,11 @@ package c.i.a.f.b;
 
 import android.net.Uri;
 import android.util.LogPrinter;
+import androidx.core.app.NotificationCompat;
 public final class d {
     static {
         Uri.Builder builder = new Uri.Builder();
-        builder.scheme("uri");
+        builder.scheme(NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         builder.authority("local");
         builder.build();
     }
diff --git a/app/src/main/java/c/i/a/f/b/e.java b/app/src/main/java/c/i/a/f/b/e.java
index c5516f2a8a..9889839085 100644
--- a/app/src/main/java/c/i/a/f/b/e.java
+++ b/app/src/main/java/c/i/a/f/b/e.java
@@ -2,6 +2,7 @@ package c.i.a.f.b;
 
 import android.text.TextUtils;
 import c.i.a.f.b.e;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -23,7 +24,7 @@ public abstract class e<T extends e> {
             return ((Long) obj).longValue() == 0 ? "" : obj.toString();
         }
         if (obj instanceof Double) {
-            return ((Double) obj).doubleValue() == 0.0d ? "" : obj.toString();
+            return ((Double) obj).doubleValue() == ShadowDrawableWrapper.COS_45 ? "" : obj.toString();
         }
         if (obj instanceof Boolean) {
             return !((Boolean) obj).booleanValue() ? "" : obj.toString();
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/a.java b/app/src/main/java/c/i/a/f/c/a/f/b/a.java
index 357682044a..61bac92174 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/a.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/a.java
@@ -6,7 +6,9 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import c.i.a.f.c.a.f.c;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.common.api.Scope;
@@ -93,7 +95,7 @@ public class a {
         try {
             String str2 = googleSignInAccount.j;
             if (str2 != null) {
-                jSONObject.put("id", str2);
+                jSONObject.put(ModelAuditLogEntry.CHANGE_KEY_ID, str2);
             }
             String str3 = googleSignInAccount.k;
             if (str3 != null) {
@@ -101,7 +103,7 @@ public class a {
             }
             String str4 = googleSignInAccount.l;
             if (str4 != null) {
-                jSONObject.put("email", str4);
+                jSONObject.put(NotificationCompat.CATEGORY_EMAIL, str4);
             }
             String str5 = googleSignInAccount.m;
             if (str5 != null) {
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/e.java b/app/src/main/java/c/i/a/f/c/a/f/b/e.java
index 46970b4b85..128cbeb8b9 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/e.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/e.java
@@ -1,5 +1,6 @@
 package c.i.a.f.c.a.f.b;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import c.i.a.f.e.h.j.o;
 import c.i.a.f.e.l.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -24,7 +25,7 @@ public final class e implements Runnable {
         try {
             String valueOf = String.valueOf(this.j);
             HttpURLConnection httpURLConnection = (HttpURLConnection) new URL(valueOf.length() != 0 ? "https://accounts.google.com/o/oauth2/revoke?token=".concat(valueOf) : new String("https://accounts.google.com/o/oauth2/revoke?token=")).openConnection();
-            httpURLConnection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            httpURLConnection.setRequestProperty("Content-Type", ShareTarget.ENCODING_TYPE_URL_ENCODED);
             int responseCode = httpURLConnection.getResponseCode();
             if (responseCode == 200) {
                 status = Status.i;
diff --git a/app/src/main/java/c/i/a/f/e/c.java b/app/src/main/java/c/i/a/f/e/c.java
index b9fc15a860..baaa50d794 100644
--- a/app/src/main/java/c/i/a/f/e/c.java
+++ b/app/src/main/java/c/i/a/f/e/c.java
@@ -16,6 +16,7 @@ import c.i.a.f.e.k.h0;
 import c.i.a.f.e.k.q0;
 import c.i.a.f.e.p.b;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.common.R;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
@@ -52,7 +53,7 @@ public class c {
                 String sb = K.toString();
                 int i2 = h0.a;
                 Intent intent = new Intent("android.intent.action.VIEW");
-                Uri.Builder appendQueryParameter = Uri.parse("market://details").buildUpon().appendQueryParameter("id", "com.google.android.gms");
+                Uri.Builder appendQueryParameter = Uri.parse("market://details").buildUpon().appendQueryParameter(ModelAuditLogEntry.CHANGE_KEY_ID, "com.google.android.gms");
                 if (!TextUtils.isEmpty(sb)) {
                     appendQueryParameter.appendQueryParameter("pcampaignid", sb);
                 }
diff --git a/app/src/main/java/c/i/a/f/e/h/b.java b/app/src/main/java/c/i/a/f/e/h/b.java
index beb7684220..1b45d4c656 100644
--- a/app/src/main/java/c/i/a/f/e/h/b.java
+++ b/app/src/main/java/c/i/a/f/e/h/b.java
@@ -25,6 +25,7 @@ import c.i.a.f.e.h.j.y;
 import c.i.a.f.e.h.j.y0;
 import c.i.a.f.e.k.c;
 import c.i.a.f.e.o.c;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.common.api.GoogleApiActivity;
@@ -146,7 +147,7 @@ public class b<O extends a.d> {
                         z2 = bool.booleanValue();
                     } else {
                         try {
-                            if (!"google".equals(Build.BRAND) || Build.ID.startsWith("RPP1") || Build.ID.startsWith("RPP2") || Integer.parseInt(Build.VERSION.INCREMENTAL) < 6301457) {
+                            if (!Constants.REFERRER_API_GOOGLE.equals(Build.BRAND) || Build.ID.startsWith("RPP1") || Build.ID.startsWith("RPP2") || Integer.parseInt(Build.VERSION.INCREMENTAL) < 6301457) {
                                 z2 = false;
                             }
                             c.e = Boolean.valueOf(z2);
diff --git a/app/src/main/java/c/i/a/f/e/k/f0.java b/app/src/main/java/c/i/a/f/e/k/f0.java
index e0236be5ba..54a4c527f4 100644
--- a/app/src/main/java/c/i/a/f/e/k/f0.java
+++ b/app/src/main/java/c/i/a/f/e/k/f0.java
@@ -4,6 +4,7 @@ import android.content.ComponentName;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
+import androidx.core.os.EnvironmentCompat;
 import c.i.a.f.e.k.e;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
@@ -53,7 +54,7 @@ public final class f0 implements Handler.Callback {
                     if (componentName == null) {
                         String str = aVar2.f1062c;
                         Objects.requireNonNull(str, "null reference");
-                        componentName = new ComponentName(str, "unknown");
+                        componentName = new ComponentName(str, EnvironmentCompat.MEDIA_UNKNOWN);
                     }
                     g0Var2.onServiceDisconnected(componentName);
                 }
diff --git a/app/src/main/java/c/i/a/f/e/o/c.java b/app/src/main/java/c/i/a/f/e/o/c.java
index 9d17e79576..bade2d2339 100644
--- a/app/src/main/java/c/i/a/f/e/o/c.java
+++ b/app/src/main/java/c/i/a/f/e/o/c.java
@@ -21,6 +21,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RecentlyNonNull;
 import androidx.annotation.WorkerThread;
+import androidx.media.AudioAttributesCompat;
 import c.i.a.f.h.l.a3;
 import c.i.a.f.h.l.b5;
 import c.i.a.f.h.l.b7;
@@ -56,6 +57,8 @@ import c.i.c.x.g;
 import c.o.a.x.i;
 import c.o.a.x.j;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.google.android.gms.common.R;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.internal.measurement.zzij;
@@ -488,7 +491,7 @@ public final class c {
             if ((((b3 + 112) + (b2 << 28)) >> 30) == 0 && !c1(b4) && !c1(b5)) {
                 int i2 = ((b2 & 7) << 18) | ((b3 & 63) << 12) | ((b4 & 63) << 6) | (b5 & 63);
                 cArr[i] = (char) ((i2 >>> 10) + 55232);
-                cArr[i + 1] = (char) ((i2 & 1023) + 56320);
+                cArr[i + 1] = (char) ((i2 & AudioAttributesCompat.FLAG_ALL) + 56320);
                 return;
             }
         }
@@ -648,7 +651,7 @@ public final class c {
         if (((java.lang.Float) r4).floatValue() == 0.0f) goto L_0x024a;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:93:0x0216, code lost:
-        if (((java.lang.Double) r4).doubleValue() == 0.0d) goto L_0x024a;
+        if (((java.lang.Double) r4).doubleValue() == com.google.android.material.shadow.ShadowDrawableWrapper.COS_45) goto L_0x024a;
      */
     /* JADX WARNING: Removed duplicated region for block: B:111:0x0250  */
     public static void P0(c6 c6Var, StringBuilder sb, int i) {
@@ -784,7 +787,7 @@ public final class c {
         if (q3Var != null) {
             Cursor cursor = null;
             try {
-                cursor = sQLiteDatabase.query("SQLITE_MASTER", new String[]{"name"}, "name=?", new String[]{str}, null, null, null);
+                cursor = sQLiteDatabase.query("SQLITE_MASTER", new String[]{ModelAuditLogEntry.CHANGE_KEY_NAME}, "name=?", new String[]{str}, null, null, null);
                 z2 = cursor.moveToFirst();
                 cursor.close();
             } catch (SQLiteException e2) {
@@ -996,7 +999,7 @@ public final class c {
             try {
                 str2 = String.valueOf(obj);
             } catch (Exception e2) {
-                String str3 = obj.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(obj));
+                String str3 = obj.getClass().getName() + MentionUtilsKt.MENTIONS_CHAR + Integer.toHexString(System.identityHashCode(obj));
                 Logger.getLogger("com.google.common.base.Strings").log(Level.WARNING, "Exception during lenientFormat for " + str3, (Throwable) e2);
                 str2 = "<" + str3 + " threw " + e2.getClass().getName() + ">";
             }
diff --git a/app/src/main/java/c/i/a/f/e/u.java b/app/src/main/java/c/i/a/f/e/u.java
index 6768b75ea2..1b61b74620 100644
--- a/app/src/main/java/c/i/a/f/e/u.java
+++ b/app/src/main/java/c/i/a/f/e/u.java
@@ -2,6 +2,7 @@ package c.i.a.f.e;
 
 import c.i.a.f.e.o.a;
 import c.i.a.f.e.o.e;
+import com.adjust.sdk.Constants;
 import java.security.MessageDigest;
 import java.util.Objects;
 import java.util.concurrent.Callable;
@@ -30,7 +31,7 @@ public final /* synthetic */ class u implements Callable {
         Object[] objArr = new Object[5];
         objArr[0] = !z2 && s.a(str, tVar, true, false).b ? "debug cert rejected" : "not allowed";
         objArr[1] = str;
-        MessageDigest a = a.a("SHA-1");
+        MessageDigest a = a.a(Constants.SHA1);
         Objects.requireNonNull(a, "null reference");
         byte[] digest = a.digest(tVar.g());
         char[] cArr = new char[(digest.length << 1)];
diff --git a/app/src/main/java/c/i/a/f/h/j/c0.java b/app/src/main/java/c/i/a/f/h/j/c0.java
index 004afa75e9..45f9c98561 100644
--- a/app/src/main/java/c/i/a/f/h/j/c0.java
+++ b/app/src/main/java/c/i/a/f/h/j/c0.java
@@ -9,10 +9,11 @@ import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import androidx.core.app.NotificationCompat;
 public final class c0 extends e {
     public boolean k;
     public boolean l;
-    public final AlarmManager m = ((AlarmManager) this.i.b.getSystemService("alarm"));
+    public final AlarmManager m = ((AlarmManager) this.i.b.getSystemService(NotificationCompat.CATEGORY_ALARM));
     public Integer n;
 
     public c0(g gVar) {
diff --git a/app/src/main/java/c/i/a/f/h/j/d.java b/app/src/main/java/c/i/a/f/h/j/d.java
index 915755ad27..55656bf34d 100644
--- a/app/src/main/java/c/i/a/f/h/j/d.java
+++ b/app/src/main/java/c/i/a/f/h/j/d.java
@@ -2,6 +2,7 @@ package c.i.a.f.h.j;
 
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.exifinterface.media.ExifInterface;
 import c.i.a.f.b.f;
 import java.util.Objects;
 public class d {
@@ -87,7 +88,7 @@ public class d {
                     String str3 = f.a;
                     String e = e(str, m0.R(obj), m0.R(obj2), m0.R(obj3));
                     StringBuilder sb = new StringBuilder(String.valueOf(str3).length() + 4 + String.valueOf(e).length());
-                    sb.append("3");
+                    sb.append(ExifInterface.GPS_MEASUREMENT_3D);
                     sb.append(charAt);
                     sb.append(c2);
                     sb.append(str3);
diff --git a/app/src/main/java/c/i/a/f/h/j/o.java b/app/src/main/java/c/i/a/f/h/j/o.java
index 1caa41b84d..6c4e606547 100644
--- a/app/src/main/java/c/i/a/f/h/j/o.java
+++ b/app/src/main/java/c/i/a/f/h/j/o.java
@@ -6,7 +6,9 @@ import android.database.sqlite.SQLiteException;
 import android.text.TextUtils;
 import c.i.a.f.b.f;
 import c.i.a.f.e.o.d;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.widgets.chat.list.adapter.WidgetChatListAdapterItemGuildWelcomeKt;
 import java.io.Closeable;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -145,7 +147,7 @@ public final class o extends e implements Closeable {
         C("Deleting stale hits (if any)");
         SQLiteDatabase Q = Q();
         Objects.requireNonNull((d) this.i.d);
-        int delete = Q.delete("hits2", "hit_time < ?", new String[]{Long.toString(System.currentTimeMillis() - 2592000000L)});
+        int delete = Q.delete("hits2", "hit_time < ?", new String[]{Long.toString(System.currentTimeMillis() - WidgetChatListAdapterItemGuildWelcomeKt.OLD_GUILD_AGE_THRESHOLD)});
         b("Deleted stale hits, count", Integer.valueOf(delete));
         return delete;
     }
@@ -192,7 +194,7 @@ public final class o extends e implements Closeable {
             if (!str.startsWith("?")) {
                 str = str.length() != 0 ? "?".concat(str) : new String("?");
             }
-            return c.i.a.f.e.o.f.a(new URI(str), "UTF-8");
+            return c.i.a.f.e.o.f.a(new URI(str), Constants.ENCODING);
         } catch (URISyntaxException e) {
             B("Error parsing hit parameters", e);
             return new HashMap(0);
diff --git a/app/src/main/java/c/i/a/f/h/j/o0.java b/app/src/main/java/c/i/a/f/h/j/o0.java
index 2c8b096508..a0cc38b2d8 100644
--- a/app/src/main/java/c/i/a/f/h/j/o0.java
+++ b/app/src/main/java/c/i/a/f/h/j/o0.java
@@ -8,6 +8,7 @@ import android.util.Log;
 import c.d.b.a.a;
 import c.i.a.f.b.f;
 import c.i.a.f.e.o.d;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -60,9 +61,9 @@ public final class o0 extends e {
         if (sb.length() != 0) {
             sb.append('&');
         }
-        sb.append(URLEncoder.encode(str, "UTF-8"));
+        sb.append(URLEncoder.encode(str, Constants.ENCODING));
         sb.append('=');
-        sb.append(URLEncoder.encode(str2, "UTF-8"));
+        sb.append(URLEncoder.encode(str2, Constants.ENCODING));
     }
 
     @Override // c.i.a.f.h.j.e
diff --git a/app/src/main/java/c/i/a/f/h/j/p.java b/app/src/main/java/c/i/a/f/h/j/p.java
index 06c6ba187f..1d798bc752 100644
--- a/app/src/main/java/c/i/a/f/h/j/p.java
+++ b/app/src/main/java/c/i/a/f/h/j/p.java
@@ -8,6 +8,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.util.Log;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
@@ -37,7 +38,7 @@ public final class p extends SQLiteOpenHelper {
     public final boolean a(SQLiteDatabase sQLiteDatabase, String str) {
         Cursor cursor = null;
         try {
-            cursor = sQLiteDatabase.query("SQLITE_MASTER", new String[]{"name"}, "name=?", new String[]{str}, null, null, null);
+            cursor = sQLiteDatabase.query("SQLITE_MASTER", new String[]{ModelAuditLogEntry.CHANGE_KEY_NAME}, "name=?", new String[]{str}, null, null, null);
             boolean moveToFirst = cursor.moveToFirst();
             cursor.close();
             return moveToFirst;
diff --git a/app/src/main/java/c/i/a/f/h/j/r0.java b/app/src/main/java/c/i/a/f/h/j/r0.java
index a37661d1f3..941c53921a 100644
--- a/app/src/main/java/c/i/a/f/h/j/r0.java
+++ b/app/src/main/java/c/i/a/f/h/j/r0.java
@@ -1,6 +1,7 @@
 package c.i.a.f.h.j;
 
 import android.content.SharedPreferences;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.f.e.o.d;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import java.util.Objects;
@@ -39,7 +40,7 @@ public final class r0 {
                 return;
             }
             long j2 = j + 1;
-            boolean z2 = (UUID.randomUUID().getLeastSignificantBits() & Long.MAX_VALUE) < Long.MAX_VALUE / j2;
+            boolean z2 = (UUID.randomUUID().getLeastSignificantBits() & RecyclerView.FOREVER_NS) < RecyclerView.FOREVER_NS / j2;
             SharedPreferences.Editor edit3 = this.b.k.edit();
             if (z2) {
                 edit3.putString(c(), str);
diff --git a/app/src/main/java/c/i/a/f/h/j/y.java b/app/src/main/java/c/i/a/f/h/j/y.java
index 175bd2e720..614fb5b6fd 100644
--- a/app/src/main/java/c/i/a/f/h/j/y.java
+++ b/app/src/main/java/c/i/a/f/h/j/y.java
@@ -3,6 +3,7 @@ package c.i.a.f.h.j;
 import android.content.res.XmlResourceParser;
 import android.text.TextUtils;
 import c.i.a.f.h.j.i0;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Objects;
@@ -23,19 +24,19 @@ public class y<T extends i0> extends d {
                 if (xmlResourceParser.getEventType() == 2) {
                     String lowerCase = xmlResourceParser.getName().toLowerCase(Locale.US);
                     if (lowerCase.equals("screenname")) {
-                        String attributeValue = xmlResourceParser.getAttributeValue(null, "name");
+                        String attributeValue = xmlResourceParser.getAttributeValue(null, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         String trim = xmlResourceParser.nextText().trim();
                         if (!TextUtils.isEmpty(attributeValue) && !TextUtils.isEmpty(trim)) {
                             Objects.requireNonNull(this.j);
                         }
                     } else if (lowerCase.equals("string")) {
-                        String attributeValue2 = xmlResourceParser.getAttributeValue(null, "name");
+                        String attributeValue2 = xmlResourceParser.getAttributeValue(null, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         String trim2 = xmlResourceParser.nextText().trim();
                         if (!TextUtils.isEmpty(attributeValue2) && trim2 != null) {
                             this.j.c(attributeValue2, trim2);
                         }
                     } else if (lowerCase.equals("bool")) {
-                        String attributeValue3 = xmlResourceParser.getAttributeValue(null, "name");
+                        String attributeValue3 = xmlResourceParser.getAttributeValue(null, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         String trim3 = xmlResourceParser.nextText().trim();
                         if (!TextUtils.isEmpty(attributeValue3) && !TextUtils.isEmpty(trim3)) {
                             try {
@@ -45,7 +46,7 @@ public class y<T extends i0> extends d {
                             }
                         }
                     } else if (lowerCase.equals("integer")) {
-                        String attributeValue4 = xmlResourceParser.getAttributeValue(null, "name");
+                        String attributeValue4 = xmlResourceParser.getAttributeValue(null, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         String trim4 = xmlResourceParser.nextText().trim();
                         if (!TextUtils.isEmpty(attributeValue4) && !TextUtils.isEmpty(trim4)) {
                             try {
diff --git a/app/src/main/java/c/i/a/f/h/l/c1.java b/app/src/main/java/c/i/a/f/h/l/c1.java
index 43279d6904..4ef9ad502d 100644
--- a/app/src/main/java/c/i/a/f/h/l/c1.java
+++ b/app/src/main/java/c/i/a/f/h/l/c1.java
@@ -1,6 +1,7 @@
 package c.i.a.f.h.l;
 
 import c.i.a.f.h.l.u4;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.List;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
@@ -82,7 +83,7 @@ public final class c1 extends u4<c1, a> implements d6 {
 
     public static void E(c1 c1Var) {
         c1Var.zzc &= -17;
-        c1Var.zzh = 0.0d;
+        c1Var.zzh = ShadowDrawableWrapper.COS_45;
     }
 
     public static void H(c1 c1Var) {
diff --git a/app/src/main/java/c/i/a/f/h/l/e1.java b/app/src/main/java/c/i/a/f/h/l/e1.java
index b20de8ffe4..314fb71b6b 100644
--- a/app/src/main/java/c/i/a/f/h/l/e1.java
+++ b/app/src/main/java/c/i/a/f/h/l/e1.java
@@ -1,5 +1,6 @@
 package c.i.a.f.h.l;
 
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.a.f.h.l.a1;
 import c.i.a.f.h.l.i1;
 import c.i.a.f.h.l.u4;
@@ -761,7 +762,7 @@ public final class e1 extends u4<e1, a> implements d6 {
     }
 
     public static void j1(e1 e1Var, long j) {
-        e1Var.zzc |= 1073741824;
+        e1Var.zzc |= BasicMeasure.EXACTLY;
         e1Var.zzal = j;
     }
 
@@ -1032,7 +1033,7 @@ public final class e1 extends u4<e1, a> implements d6 {
     }
 
     public final boolean c0() {
-        return (this.zzc & 1073741824) != 0;
+        return (this.zzc & BasicMeasure.EXACTLY) != 0;
     }
 
     public final long d0() {
diff --git a/app/src/main/java/c/i/a/f/h/l/e5.java b/app/src/main/java/c/i/a/f/h/l/e5.java
index 9d18b996ed..f686acd060 100644
--- a/app/src/main/java/c/i/a/f/h/l/e5.java
+++ b/app/src/main/java/c/i/a/f/h/l/e5.java
@@ -1,4 +1,6 @@
 package c.i.a.f.h.l;
+
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
 /* JADX WARN: Init of enum j can be incorrect */
 /* JADX WARN: Init of enum q can be incorrect */
@@ -7,7 +9,7 @@ public enum e5 {
     INT(r1, Integer.class, 0),
     LONG(Long.TYPE, Long.class, 0L),
     FLOAT(Float.TYPE, Float.class, Float.valueOf(0.0f)),
-    DOUBLE(Double.TYPE, Double.class, Double.valueOf(0.0d)),
+    DOUBLE(Double.TYPE, Double.class, Double.valueOf((double) ShadowDrawableWrapper.COS_45)),
     BOOLEAN(Boolean.TYPE, Boolean.class, Boolean.FALSE),
     STRING(String.class, String.class, ""),
     BYTE_STRING(t3.class, t3.class, t3.i),
diff --git a/app/src/main/java/c/i/a/f/h/l/e6.java b/app/src/main/java/c/i/a/f/h/l/e6.java
index 5f6cdc3a58..0a6ffc0b73 100644
--- a/app/src/main/java/c/i/a/f/h/l/e6.java
+++ b/app/src/main/java/c/i/a/f/h/l/e6.java
@@ -5,6 +5,7 @@ import c.i.a.f.e.o.c;
 import c.i.a.f.h.l.h4;
 import com.google.android.gms.internal.measurement.zzhi;
 import com.google.android.gms.internal.measurement.zzij;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -5263,7 +5264,7 @@ public final class e6<T> implements q6<T> {
             long j2 = (long) (i3 & 1048575);
             switch ((i3 & 267386880) >>> 20) {
                 case 0:
-                    return j7.q(t, j2) != 0.0d;
+                    return j7.q(t, j2) != ShadowDrawableWrapper.COS_45;
                 case 1:
                     return j7.n(t, j2) != 0.0f;
                 case 2:
diff --git a/app/src/main/java/c/i/a/f/h/l/f1.java b/app/src/main/java/c/i/a/f/h/l/f1.java
index c27ae958f7..0492db3d9d 100644
--- a/app/src/main/java/c/i/a/f/h/l/f1.java
+++ b/app/src/main/java/c/i/a/f/h/l/f1.java
@@ -1,6 +1,7 @@
 package c.i.a.f.h.l;
 
 import c.i.a.f.h.l.u4;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
 public final class f1 extends u4<f1, a> implements d6 {
     private static final f1 zzf;
@@ -34,7 +35,7 @@ public final class f1 extends u4<f1, a> implements d6 {
 
         @Override // java.lang.Enum, java.lang.Object
         public final String toString() {
-            return "<" + b.class.getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzd + " name=" + name() + '>';
+            return "<" + b.class.getName() + MentionUtilsKt.MENTIONS_CHAR + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzd + " name=" + name() + '>';
         }
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/i1.java b/app/src/main/java/c/i/a/f/h/l/i1.java
index 51a42e953a..1fbf092ca8 100644
--- a/app/src/main/java/c/i/a/f/h/l/i1.java
+++ b/app/src/main/java/c/i/a/f/h/l/i1.java
@@ -1,6 +1,7 @@
 package c.i.a.f.h.l;
 
 import c.i.a.f.h.l.u4;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
 public final class i1 extends u4<i1, a> implements d6 {
@@ -77,7 +78,7 @@ public final class i1 extends u4<i1, a> implements d6 {
 
     public static void E(i1 i1Var) {
         i1Var.zzc &= -33;
-        i1Var.zzi = 0.0d;
+        i1Var.zzi = ShadowDrawableWrapper.COS_45;
     }
 
     public static a L() {
diff --git a/app/src/main/java/c/i/a/f/h/l/j.java b/app/src/main/java/c/i/a/f/h/l/j.java
index 1ee558e6a6..2e96f815ca 100644
--- a/app/src/main/java/c/i/a/f/h/l/j.java
+++ b/app/src/main/java/c/i/a/f/h/l/j.java
@@ -6,6 +6,7 @@ import android.util.Log;
 import c.i.a.f.f.b;
 import c.i.a.f.h.l.g;
 import com.google.android.gms.dynamite.DynamiteModule;
+import com.google.android.gms.dynamite.descriptors.com.google.android.gms.measurement.dynamite.ModuleDescriptor;
 import com.google.android.gms.internal.measurement.zzae;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-measurement-sdk-api@@18.0.0 */
@@ -66,14 +67,14 @@ public final class j extends g.a {
                     } else {
                         aVar = DynamiteModule.h;
                     }
-                    ecVar = dc.asInterface(DynamiteModule.c(context, aVar, "com.google.android.gms.measurement.dynamite").b("com.google.android.gms.measurement.internal.AppMeasurementDynamiteService"));
+                    ecVar = dc.asInterface(DynamiteModule.c(context, aVar, ModuleDescriptor.MODULE_ID).b("com.google.android.gms.measurement.internal.AppMeasurementDynamiteService"));
                     gVar.j = ecVar;
                     if (this.q.j != null) {
                         Log.w(this.q.f1096c, "Failed to connect to measurement client.");
                         return;
                     }
-                    int a = DynamiteModule.a(this.o, "com.google.android.gms.measurement.dynamite");
-                    int d = DynamiteModule.d(this.o, "com.google.android.gms.measurement.dynamite", false);
+                    int a = DynamiteModule.a(this.o, ModuleDescriptor.MODULE_ID);
+                    int d = DynamiteModule.d(this.o, ModuleDescriptor.MODULE_ID, false);
                     if (z2) {
                         i = Math.max(a, d);
                         z3 = d < a;
@@ -94,7 +95,7 @@ public final class j extends g.a {
             Objects.requireNonNull(gVar);
             if (!z2) {
             }
-            ecVar = dc.asInterface(DynamiteModule.c(context, aVar, "com.google.android.gms.measurement.dynamite").b("com.google.android.gms.measurement.internal.AppMeasurementDynamiteService"));
+            ecVar = dc.asInterface(DynamiteModule.c(context, aVar, ModuleDescriptor.MODULE_ID).b("com.google.android.gms.measurement.internal.AppMeasurementDynamiteService"));
             gVar.j = ecVar;
             if (this.q.j != null) {
             }
diff --git a/app/src/main/java/c/i/a/f/h/l/j1.java b/app/src/main/java/c/i/a/f/h/l/j1.java
index ea631290f3..4936dfc0ab 100644
--- a/app/src/main/java/c/i/a/f/h/l/j1.java
+++ b/app/src/main/java/c/i/a/f/h/l/j1.java
@@ -1,4 +1,6 @@
 package c.i.a.f.h.l;
+
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
 public enum j1 implements y4 {
     AT_TRACKING_MANAGER_AUTHORIZATION_STATUS_UNKNOWN(0),
@@ -21,6 +23,6 @@ public enum j1 implements y4 {
 
     @Override // java.lang.Enum, java.lang.Object
     public final String toString() {
-        return "<" + j1.class.getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzh + " name=" + name() + '>';
+        return "<" + j1.class.getName() + MentionUtilsKt.MENTIONS_CHAR + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzh + " name=" + name() + '>';
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/l/k7.java b/app/src/main/java/c/i/a/f/h/l/k7.java
index aefd2dc60b..43e68b1d64 100644
--- a/app/src/main/java/c/i/a/f/h/l/k7.java
+++ b/app/src/main/java/c/i/a/f/h/l/k7.java
@@ -1,4 +1,6 @@
 package c.i.a.f.h.l;
+
+import com.discord.api.permission.Permission;
 /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
 public final class k7 {
     public static final m7 a = ((!(j7.g && j7.f) || q3.a()) ? new l7() : new n7());
@@ -43,9 +45,10 @@ public final class k7 {
         if (i3 >= length) {
             return i3;
         }
+        long j = ((long) i3) + Permission.REQUEST_TO_SPEAK;
         StringBuilder sb = new StringBuilder(54);
         sb.append("UTF-8 length does not fit in int: ");
-        sb.append(((long) i3) + 4294967296L);
+        sb.append(j);
         throw new IllegalArgumentException(sb.toString());
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/n0.java b/app/src/main/java/c/i/a/f/h/l/n0.java
index 7cbadc1e02..e96d7094db 100644
--- a/app/src/main/java/c/i/a/f/h/l/n0.java
+++ b/app/src/main/java/c/i/a/f/h/l/n0.java
@@ -1,6 +1,7 @@
 package c.i.a.f.h.l;
 
 import c.i.a.f.h.l.u4;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
 public final class n0 extends u4<n0, b> implements d6 {
     private static final n0 zzi;
@@ -52,7 +53,7 @@ public final class n0 extends u4<n0, b> implements d6 {
 
         @Override // java.lang.Enum, java.lang.Object
         public final String toString() {
-            return "<" + a.class.getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzg + " name=" + name() + '>';
+            return "<" + a.class.getName() + MentionUtilsKt.MENTIONS_CHAR + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzg + " name=" + name() + '>';
         }
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/p0.java b/app/src/main/java/c/i/a/f/h/l/p0.java
index f079a98d8b..f9746e246d 100644
--- a/app/src/main/java/c/i/a/f/h/l/p0.java
+++ b/app/src/main/java/c/i/a/f/h/l/p0.java
@@ -1,6 +1,7 @@
 package c.i.a.f.h.l;
 
 import c.i.a.f.h.l.u4;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.List;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
 public final class p0 extends u4<p0, a> implements d6 {
@@ -63,7 +64,7 @@ public final class p0 extends u4<p0, a> implements d6 {
 
         @Override // java.lang.Enum, java.lang.Object
         public final String toString() {
-            return "<" + b.class.getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzi + " name=" + name() + '>';
+            return "<" + b.class.getName() + MentionUtilsKt.MENTIONS_CHAR + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzi + " name=" + name() + '>';
         }
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/p8.java b/app/src/main/java/c/i/a/f/h/l/p8.java
index 4ecf9879b9..90262ae5a7 100644
--- a/app/src/main/java/c/i/a/f/h/l/p8.java
+++ b/app/src/main/java/c/i/a/f/h/l/p8.java
@@ -1,4 +1,7 @@
 package c.i.a.f.h.l;
+
+import com.adjust.sdk.Constants;
+import com.discord.api.permission.Permission;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public final class p8 implements m8 {
     public static final l2<Long> A;
@@ -51,7 +54,7 @@ public final class p8 implements m8 {
         b = q2Var.a("measurement.config.cache_time", 86400000);
         q2Var.b("measurement.log_tag", "FA");
         f1125c = q2Var.b("measurement.config.url_authority", "app-measurement.com");
-        d = q2Var.b("measurement.config.url_scheme", "https");
+        d = q2Var.b("measurement.config.url_scheme", Constants.SCHEME);
         e = q2Var.a("measurement.upload.debug_upload_interval", 1000);
         f = q2Var.a("measurement.lifetimevalue.max_currency_tracked", 4);
         g = q2Var.a("measurement.store.max_stored_events_per_app", 100000);
@@ -69,7 +72,7 @@ public final class p8 implements m8 {
         q = q2Var.a("measurement.upload.backoff_period", 43200000);
         r = q2Var.a("measurement.upload.initial_upload_delay_time", 15000);
         f1126s = q2Var.a("measurement.upload.interval", 3600000);
-        t = q2Var.a("measurement.upload.max_bundle_size", 65536);
+        t = q2Var.a("measurement.upload.max_bundle_size", Permission.READ_MESSAGE_HISTORY);
         u = q2Var.a("measurement.upload.max_bundles", 100);
         v = q2Var.a("measurement.upload.max_conversions_per_day", 500);
         w = q2Var.a("measurement.upload.max_error_events_per_day", 1000);
@@ -78,7 +81,7 @@ public final class p8 implements m8 {
         f1129z = q2Var.a("measurement.upload.max_public_events_per_day", 50000);
         A = q2Var.a("measurement.upload.max_queue_time", 2419200000L);
         B = q2Var.a("measurement.upload.max_realtime_events_per_day", 10);
-        C = q2Var.a("measurement.upload.max_batch_size", 65536);
+        C = q2Var.a("measurement.upload.max_batch_size", Permission.READ_MESSAGE_HISTORY);
         D = q2Var.a("measurement.upload.retry_count", 6);
         E = q2Var.a("measurement.upload.retry_time", 1800000);
         F = q2Var.b("measurement.upload.url", "https://app-measurement.com/a");
diff --git a/app/src/main/java/c/i/a/f/h/l/q1.java b/app/src/main/java/c/i/a/f/h/l/q1.java
index 1fbf6cfed0..14921d410e 100644
--- a/app/src/main/java/c/i/a/f/h/l/q1.java
+++ b/app/src/main/java/c/i/a/f/h/l/q1.java
@@ -1,6 +1,7 @@
 package c.i.a.f.h.l;
 
 import c.i.a.f.h.l.u4;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
 public final class q1 extends u4<q1, b> implements d6 {
     private static final q1 zzk;
@@ -35,7 +36,7 @@ public final class q1 extends u4<q1, b> implements d6 {
 
         @Override // java.lang.Enum, java.lang.Object
         public final String toString() {
-            return "<" + a.class.getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzg + " name=" + name() + '>';
+            return "<" + a.class.getName() + MentionUtilsKt.MENTIONS_CHAR + Integer.toHexString(System.identityHashCode(this)) + " number=" + this.zzg + " name=" + name() + '>';
         }
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/w4.java b/app/src/main/java/c/i/a/f/h/l/w4.java
index dc58542c79..4640e0f24d 100644
--- a/app/src/main/java/c/i/a/f/h/l/w4.java
+++ b/app/src/main/java/c/i/a/f/h/l/w4.java
@@ -1,13 +1,14 @@
 package c.i.a.f.h.l;
 
 import c.i.a.f.h.l.u4;
+import com.adjust.sdk.Constants;
 import com.google.android.gms.internal.measurement.zzij;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
 public final class w4 {
-    public static final Charset a = Charset.forName("UTF-8");
+    public static final Charset a = Charset.forName(Constants.ENCODING);
     public static final byte[] b;
 
     static {
diff --git a/app/src/main/java/c/i/a/f/h/l/w7.java b/app/src/main/java/c/i/a/f/h/l/w7.java
index d647e9e672..b0888d44f7 100644
--- a/app/src/main/java/c/i/a/f/h/l/w7.java
+++ b/app/src/main/java/c/i/a/f/h/l/w7.java
@@ -1,10 +1,12 @@
 package c.i.a.f.h.l;
+
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
 public enum w7 {
     INT(0),
     LONG(0L),
     FLOAT(Float.valueOf(0.0f)),
-    DOUBLE(Double.valueOf(0.0d)),
+    DOUBLE(Double.valueOf((double) ShadowDrawableWrapper.COS_45)),
     BOOLEAN(Boolean.FALSE),
     STRING(""),
     BYTE_STRING(t3.i),
diff --git a/app/src/main/java/c/i/a/f/i/b/c6.java b/app/src/main/java/c/i/a/f/i/b/c6.java
index 47c57ba20e..41299ea590 100644
--- a/app/src/main/java/c/i/a/f/i/b/c6.java
+++ b/app/src/main/java/c/i/a/f/i/b/c6.java
@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
+import androidx.core.app.NotificationCompat;
 import c.i.a.f.e.o.c;
 import c.i.a.f.e.o.d;
 import c.i.a.f.e.o.h;
@@ -25,6 +26,7 @@ import c.i.a.f.h.l.r9;
 import c.i.a.f.h.l.t8;
 import c.i.a.f.h.l.x7;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.measurement.internal.AppMeasurementDynamiteService;
 import com.google.android.gms.measurement.internal.zzap;
 import com.google.android.gms.measurement.internal.zzaq;
@@ -275,12 +277,12 @@ public final class c6 extends a5 {
                 t9 t = this.a.t();
                 boolean z9 = x7.b() && this.a.h.o(p.L0);
                 int i3 = 2;
-                if (t.a0("event", str2)) {
+                if (t.a0(NotificationCompat.CATEGORY_EVENT, str2)) {
                     if (z9) {
-                        if (t.Z("event", 40, str2)) {
+                        if (t.Z(NotificationCompat.CATEGORY_EVENT, 40, str2)) {
                             i3 = 0;
                         }
-                    } else if (t.Z("event", 40, str2)) {
+                    } else if (t.Z(NotificationCompat.CATEGORY_EVENT, 40, str2)) {
                     }
                     i3 = 13;
                 }
@@ -760,7 +762,7 @@ public final class c6 extends a5 {
         long currentTimeMillis = System.currentTimeMillis();
         AnimatableValueParser.w(str);
         Bundle bundle2 = new Bundle();
-        bundle2.putString("name", str);
+        bundle2.putString(ModelAuditLogEntry.CHANGE_KEY_NAME, str);
         bundle2.putLong("creation_timestamp", currentTimeMillis);
         if (str2 != null) {
             bundle2.putString("expired_event_name", str2);
@@ -837,7 +839,7 @@ public final class c6 extends a5 {
         bundle2.remove("app_id");
         c.D0(bundle2, "app_id", String.class, null);
         c.D0(bundle2, "origin", String.class, null);
-        c.D0(bundle2, "name", String.class, null);
+        c.D0(bundle2, ModelAuditLogEntry.CHANGE_KEY_NAME, String.class, null);
         c.D0(bundle2, "value", Object.class, null);
         c.D0(bundle2, "trigger_event_name", String.class, null);
         c.D0(bundle2, "trigger_timeout", Long.class, 0L);
@@ -848,11 +850,11 @@ public final class c6 extends a5 {
         c.D0(bundle2, "time_to_live", Long.class, 0L);
         c.D0(bundle2, "expired_event_name", String.class, null);
         c.D0(bundle2, "expired_event_params", Bundle.class, null);
-        AnimatableValueParser.w(bundle2.getString("name"));
+        AnimatableValueParser.w(bundle2.getString(ModelAuditLogEntry.CHANGE_KEY_NAME));
         AnimatableValueParser.w(bundle2.getString("origin"));
         Objects.requireNonNull(bundle2.get("value"), "null reference");
         bundle2.putLong("creation_timestamp", j);
-        String string = bundle2.getString("name");
+        String string = bundle2.getString(ModelAuditLogEntry.CHANGE_KEY_NAME);
         Object obj = bundle2.get("value");
         if (e().h0(string) != 0) {
             g().f.b("Invalid conditional user property name", d().y(string));
diff --git a/app/src/main/java/c/i/a/f/i/b/c7.java b/app/src/main/java/c/i/a/f/i/b/c7.java
index b2430f34b2..f1da9c214c 100644
--- a/app/src/main/java/c/i/a/f/i/b/c7.java
+++ b/app/src/main/java/c/i/a/f/i/b/c7.java
@@ -3,6 +3,7 @@ package c.i.a.f.i.b;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import com.adjust.sdk.Constants;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public final class c7 implements Runnable {
     public final /* synthetic */ boolean i;
@@ -40,7 +41,7 @@ public final class c7 implements Runnable {
                     if (str2.contains("gclid") || str2.contains("utm_campaign") || str2.contains("utm_source") || str2.contains("utm_medium")) {
                         bundle = e.x(Uri.parse(str2.length() != 0 ? "https://google.com/search?".concat(str2) : new String("https://google.com/search?")));
                         if (bundle != null) {
-                            bundle.putString("_cis", "referrer");
+                            bundle.putString("_cis", Constants.REFERRER);
                         }
                         boolean z3 = true;
                         if (!z2) {
diff --git a/app/src/main/java/c/i/a/f/i/b/e7.java b/app/src/main/java/c/i/a/f/i/b/e7.java
index ba9decef23..3627465cb7 100644
--- a/app/src/main/java/c/i/a/f/i/b/e7.java
+++ b/app/src/main/java/c/i/a/f/i/b/e7.java
@@ -5,6 +5,8 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import com.adjust.sdk.Constants;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.List;
 import java.util.Map;
 import org.json.JSONException;
@@ -45,9 +47,9 @@ public final /* synthetic */ class e7 implements Runnable {
         }
         try {
             JSONObject jSONObject = new JSONObject(new String(bArr));
-            String optString = jSONObject.optString("deeplink", "");
+            String optString = jSONObject.optString(Constants.DEEPLINK, "");
             String optString2 = jSONObject.optString("gclid", "");
-            double optDouble = jSONObject.optDouble("timestamp", 0.0d);
+            double optDouble = jSONObject.optDouble("timestamp", ShadowDrawableWrapper.COS_45);
             if (TextUtils.isEmpty(optString)) {
                 u4Var.g().m.a("Deferred Deep Link is empty.");
                 return;
diff --git a/app/src/main/java/c/i/a/f/i/b/ea.java b/app/src/main/java/c/i/a/f/i/b/ea.java
index c03798906f..05508f7cc6 100644
--- a/app/src/main/java/c/i/a/f/i/b/ea.java
+++ b/app/src/main/java/c/i/a/f/i/b/ea.java
@@ -2,6 +2,7 @@ package c.i.a.f.i.b;
 
 import c.i.a.f.h.l.n0;
 import c.i.a.f.h.l.p0;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,7 +29,7 @@ public abstract class ea {
 
     public static Boolean b(long j, n0 n0Var) {
         try {
-            return f(new BigDecimal(j), n0Var, 0.0d);
+            return f(new BigDecimal(j), n0Var, ShadowDrawableWrapper.COS_45);
         } catch (NumberFormatException unused) {
             return null;
         }
@@ -46,7 +47,7 @@ public abstract class ea {
             return null;
         }
         try {
-            return f(new BigDecimal(str), n0Var, 0.0d);
+            return f(new BigDecimal(str), n0Var, ShadowDrawableWrapper.COS_45);
         } catch (NumberFormatException unused) {
             return null;
         }
@@ -183,7 +184,7 @@ public abstract class ea {
                     }
                     return Boolean.valueOf(z2);
                 }
-            } else if (d != 0.0d) {
+            } else if (d != ShadowDrawableWrapper.COS_45) {
                 if (bigDecimal.compareTo(bigDecimal4.subtract(new BigDecimal(d).multiply(new BigDecimal(2)))) == 1 && bigDecimal.compareTo(bigDecimal4.add(new BigDecimal(d).multiply(new BigDecimal(2)))) == -1) {
                     z2 = true;
                 }
diff --git a/app/src/main/java/c/i/a/f/i/b/f6.java b/app/src/main/java/c/i/a/f/i/b/f6.java
index c515fb484c..6f3ce8e5bf 100644
--- a/app/src/main/java/c/i/a/f/i/b/f6.java
+++ b/app/src/main/java/c/i/a/f/i/b/f6.java
@@ -4,6 +4,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Pair;
+import com.adjust.sdk.Constants;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public final class f6 implements Runnable {
     public final /* synthetic */ c6 i;
@@ -21,7 +22,7 @@ public final class f6 implements Runnable {
                 y9Var.a.o().B.b(null);
                 Bundle bundle = new Bundle();
                 bundle.putString("source", "(not set)");
-                bundle.putString("medium", "(not set)");
+                bundle.putString(Constants.MEDIUM, "(not set)");
                 bundle.putString("_cis", "intent");
                 bundle.putLong("_cc", 1);
                 y9Var.a.s().H("auto", "_cmpx", bundle);
diff --git a/app/src/main/java/c/i/a/f/i/b/g.java b/app/src/main/java/c/i/a/f/i/b/g.java
index 6982c2dc47..1ba6ffb6ae 100644
--- a/app/src/main/java/c/i/a/f/i/b/g.java
+++ b/app/src/main/java/c/i/a/f/i/b/g.java
@@ -23,6 +23,7 @@ import c.i.a.f.h.l.o0;
 import c.i.a.f.h.l.o8;
 import c.i.a.f.h.l.u4;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.measurement.internal.zzaq;
 import com.google.android.gms.measurement.internal.zzku;
 import com.google.android.gms.measurement.internal.zzz;
@@ -154,7 +155,7 @@ public final class g extends i9 {
         ArrayList arrayList = new ArrayList();
         Cursor cursor2 = null;
         try {
-            cursor = t().query("user_attributes", new String[]{"name", "origin", "set_timestamp", "value"}, "app_id=?", new String[]{str}, null, null, "rowid", "1000");
+            cursor = t().query("user_attributes", new String[]{ModelAuditLogEntry.CHANGE_KEY_NAME, "origin", "set_timestamp", "value"}, "app_id=?", new String[]{str}, null, null, "rowid", "1000");
             try {
                 if (!cursor.moveToFirst()) {
                     cursor.close();
@@ -337,7 +338,7 @@ public final class g extends i9 {
                 arrayList2.add(String.valueOf(str3).concat("*"));
                 sb.append(" and name glob ?");
             }
-            cursor = t().query("user_attributes", new String[]{"name", "set_timestamp", "value", "origin"}, sb.toString(), (String[]) arrayList2.toArray(new String[arrayList2.size()]), null, null, "rowid", "1001");
+            cursor = t().query("user_attributes", new String[]{ModelAuditLogEntry.CHANGE_KEY_NAME, "set_timestamp", "value", "origin"}, sb.toString(), (String[]) arrayList2.toArray(new String[arrayList2.size()]), null, null, "rowid", "1001");
             try {
                 if (!cursor.moveToFirst()) {
                     cursor.close();
@@ -410,7 +411,7 @@ public final class g extends i9 {
         ArrayList arrayList = new ArrayList();
         Cursor cursor = null;
         try {
-            cursor = t().query("conditional_properties", new String[]{"app_id", "origin", "name", "value", "active", "trigger_event_name", "trigger_timeout", "timed_out_event", "creation_timestamp", "triggered_event", "triggered_timestamp", "time_to_live", "expired_event"}, str, strArr, null, null, "rowid", "1001");
+            cursor = t().query("conditional_properties", new String[]{"app_id", "origin", ModelAuditLogEntry.CHANGE_KEY_NAME, "value", "active", "trigger_event_name", "trigger_timeout", "timed_out_event", "creation_timestamp", "triggered_event", "triggered_timestamp", "time_to_live", "expired_event"}, str, strArr, null, null, "rowid", "1001");
             if (!cursor.moveToFirst()) {
                 cursor.close();
                 return arrayList;
@@ -464,7 +465,7 @@ public final class g extends i9 {
         n();
         ContentValues contentValues = new ContentValues();
         contentValues.put("app_id", lVar.a);
-        contentValues.put("name", lVar.b);
+        contentValues.put(ModelAuditLogEntry.CHANGE_KEY_NAME, lVar.b);
         contentValues.put("lifetime_count", Long.valueOf(lVar.f1177c));
         contentValues.put("current_bundle_count", Long.valueOf(lVar.d));
         contentValues.put("last_fire_timestamp", Long.valueOf(lVar.f));
@@ -618,7 +619,7 @@ public final class g extends i9 {
         byte[] d2 = m().v(mVar).d();
         ContentValues contentValues = new ContentValues();
         contentValues.put("app_id", mVar.a);
-        contentValues.put("name", mVar.b);
+        contentValues.put(ModelAuditLogEntry.CHANGE_KEY_NAME, mVar.b);
         contentValues.put("timestamp", Long.valueOf(mVar.d));
         contentValues.put("metadata_fingerprint", Long.valueOf(j2));
         contentValues.put("data", d2);
@@ -659,7 +660,7 @@ public final class g extends i9 {
         ContentValues contentValues = new ContentValues();
         contentValues.put("app_id", u9Var.a);
         contentValues.put("origin", u9Var.b);
-        contentValues.put("name", u9Var.f1209c);
+        contentValues.put(ModelAuditLogEntry.CHANGE_KEY_NAME, u9Var.f1209c);
         contentValues.put("set_timestamp", Long.valueOf(u9Var.d));
         G(contentValues, "value", u9Var.e);
         try {
@@ -682,7 +683,7 @@ public final class g extends i9 {
         ContentValues contentValues = new ContentValues();
         contentValues.put("app_id", zzz.i);
         contentValues.put("origin", zzz.j);
-        contentValues.put("name", zzz.k.j);
+        contentValues.put(ModelAuditLogEntry.CHANGE_KEY_NAME, zzz.k.j);
         G(contentValues, "value", zzz.k.v0());
         contentValues.put("active", Boolean.valueOf(zzz.m));
         contentValues.put("trigger_event_name", zzz.n);
diff --git a/app/src/main/java/c/i/a/f/i/b/h7.java b/app/src/main/java/c/i/a/f/i/b/h7.java
index 93c47ee9ad..b925b203a5 100644
--- a/app/src/main/java/c/i/a/f/i/b/h7.java
+++ b/app/src/main/java/c/i/a/f/i/b/h7.java
@@ -9,6 +9,7 @@ import androidx.annotation.WorkerThread;
 import c.i.a.f.e.o.d;
 import c.i.a.f.h.l.s9;
 import c.i.a.f.h.l.v9;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -207,7 +208,7 @@ public final class h7 extends a5 {
     public final void y(Activity activity, Bundle bundle) {
         Bundle bundle2;
         if (this.a.h.z().booleanValue() && bundle != null && (bundle2 = bundle.getBundle("com.google.app_measurement.screen_service")) != null) {
-            this.f.put(activity, new i7(bundle2.getString("name"), bundle2.getString("referrer_name"), bundle2.getLong("id")));
+            this.f.put(activity, new i7(bundle2.getString(ModelAuditLogEntry.CHANGE_KEY_NAME), bundle2.getString("referrer_name"), bundle2.getLong(ModelAuditLogEntry.CHANGE_KEY_ID)));
         }
     }
 
diff --git a/app/src/main/java/c/i/a/f/i/b/h9.java b/app/src/main/java/c/i/a/f/i/b/h9.java
index 8541e85af7..33970469e4 100644
--- a/app/src/main/java/c/i/a/f/i/b/h9.java
+++ b/app/src/main/java/c/i/a/f/i/b/h9.java
@@ -6,9 +6,10 @@ import android.app.job.JobScheduler;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
+import androidx.core.app.NotificationCompat;
 /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
 public final class h9 extends i9 {
-    public final AlarmManager d = ((AlarmManager) this.a.b.getSystemService("alarm"));
+    public final AlarmManager d = ((AlarmManager) this.a.b.getSystemService(NotificationCompat.CATEGORY_ALARM));
     public final i e;
     public Integer f;
 
diff --git a/app/src/main/java/c/i/a/f/i/b/k9.java b/app/src/main/java/c/i/a/f/i/b/k9.java
index d3f9762226..248c3aa1ee 100644
--- a/app/src/main/java/c/i/a/f/i/b/k9.java
+++ b/app/src/main/java/c/i/a/f/i/b/k9.java
@@ -24,6 +24,8 @@ import android.util.Pair;
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 import androidx.collection.ArrayMap;
+import androidx.exifinterface.media.ExifInterface;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.f.e.o.d;
 import c.i.a.f.e.p.b;
 import c.i.a.f.h.l.a1;
@@ -42,12 +44,15 @@ import c.i.a.f.h.l.t8;
 import c.i.a.f.h.l.u0;
 import c.i.a.f.h.l.u4;
 import c.i.a.f.h.l.x7;
+import com.adjust.sdk.AdjustConfig;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.measurement.internal.zzap;
 import com.google.android.gms.measurement.internal.zzaq;
 import com.google.android.gms.measurement.internal.zzku;
 import com.google.android.gms.measurement.internal.zzn;
 import com.google.android.gms.measurement.internal.zzz;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -884,7 +889,7 @@ public class k9 implements t5 {
                     String z0 = zzaq2.j.z0("currency");
                     if (z4) {
                         double doubleValue = zzaq2.j.y0("value").doubleValue() * 1000000.0d;
-                        if (doubleValue == 0.0d) {
+                        if (doubleValue == ShadowDrawableWrapper.COS_45) {
                             doubleValue = ((double) zzaq2.j.x0("value").longValue()) * 1000000.0d;
                         }
                         if (doubleValue > 9.223372036854776E18d || doubleValue < -9.223372036854776E18d) {
@@ -2453,7 +2458,7 @@ public class k9 implements t5 {
                                             k9Var3.k.g().D().a("Renaming ad_impression to _ai");
                                             if (k9Var3.k.g().x(5)) {
                                                 for (int i15 = 0; i15 < t3.w(); i15++) {
-                                                    if ("ad_platform".equals(t3.u(i15).B()) && !TextUtils.isEmpty(t3.u(i15).G()) && "admob".equalsIgnoreCase(t3.u(i15).G())) {
+                                                    if ("ad_platform".equals(t3.u(i15).B()) && !TextUtils.isEmpty(t3.u(i15).G()) && AdjustConfig.AD_REVENUE_ADMOB.equalsIgnoreCase(t3.u(i15).G())) {
                                                         k9Var3.k.g().B().a("AdMob ad impression logged from app. Potentially duplicative.");
                                                     }
                                                 }
@@ -3009,7 +3014,7 @@ public class k9 implements t5 {
                                         t2.v(i1Var);
                                     }
                                 }
-                                t2.D(Long.MAX_VALUE);
+                                t2.D(RecyclerView.FOREVER_NS);
                                 t2.H(Long.MIN_VALUE);
                                 for (int i24 = 0; i24 < t2.A(); i24++) {
                                     a1 C2 = t2.C(i24);
@@ -3312,7 +3317,7 @@ public class k9 implements t5 {
                 try {
                     cursor3 = cursor2;
                     try {
-                        cursor2 = t.query("raw_events_metadata", new String[]{"metadata"}, "app_id = ? and metadata_fingerprint = ?", new String[]{str11, str12}, null, null, "rowid", "2");
+                        cursor2 = t.query("raw_events_metadata", new String[]{"metadata"}, "app_id = ? and metadata_fingerprint = ?", new String[]{str11, str12}, null, null, "rowid", ExifInterface.GPS_MEASUREMENT_2D);
                         if (!cursor2.moveToFirst()) {
                             K.g().z().b("Raw event metadata record is missing. appId", q3.s(str11));
                             cursor2.close();
@@ -3344,7 +3349,7 @@ public class k9 implements t5 {
                                     str13 = "app_id = ? and metadata_fingerprint = ?";
                                     strArr = new String[]{str11, str12};
                                 }
-                                cursor2 = t.query("raw_events", new String[]{"rowid", "name", "timestamp", "data"}, str13, strArr, null, null, "rowid", null);
+                                cursor2 = t.query("raw_events", new String[]{"rowid", ModelAuditLogEntry.CHANGE_KEY_NAME, "timestamp", "data"}, str13, strArr, null, null, "rowid", null);
                                 if (!cursor2.moveToFirst()) {
                                     K.g().A().b("Raw event data disappeared while in transaction. appId", q3.s(str11));
                                     cursor2.close();
diff --git a/app/src/main/java/c/i/a/f/i/b/m3.java b/app/src/main/java/c/i/a/f/i/b/m3.java
index 82e4420309..fc9c9286aa 100644
--- a/app/src/main/java/c/i/a/f/i/b/m3.java
+++ b/app/src/main/java/c/i/a/f/i/b/m3.java
@@ -8,6 +8,7 @@ import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteFullException;
 import android.os.SystemClock;
 import androidx.annotation.WorkerThread;
+import androidx.exifinterface.media.ExifInterface;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public final class m3 extends a5 {
 
@@ -22,7 +23,7 @@ public final class m3 extends a5 {
     public static long w(SQLiteDatabase sQLiteDatabase) {
         Cursor cursor = null;
         try {
-            Cursor query = sQLiteDatabase.query("messages", new String[]{"rowid"}, "type=?", new String[]{"3"}, null, null, "rowid desc", "1");
+            Cursor query = sQLiteDatabase.query("messages", new String[]{"rowid"}, "type=?", new String[]{ExifInterface.GPS_MEASUREMENT_3D}, null, null, "rowid desc", "1");
             if (query.moveToFirst()) {
                 long j = query.getLong(0);
                 query.close();
diff --git a/app/src/main/java/c/i/a/f/i/b/m4.java b/app/src/main/java/c/i/a/f/i/b/m4.java
index 436d3a4449..ac5ac1a9db 100644
--- a/app/src/main/java/c/i/a/f/i/b/m4.java
+++ b/app/src/main/java/c/i/a/f/i/b/m4.java
@@ -8,6 +8,7 @@ import android.content.pm.ServiceInfo;
 import androidx.annotation.WorkerThread;
 import c.i.a.f.e.n.a;
 import c.i.a.f.e.p.b;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.List;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public final class m4 {
@@ -50,7 +51,7 @@ public final class m4 {
                 return;
             }
             try {
-                this.a.g().n.b("Install Referrer Service is", a.b().a(this.a.b, new Intent(intent), l4Var, 1) ? "available" : "not available");
+                this.a.g().n.b("Install Referrer Service is", a.b().a(this.a.b, new Intent(intent), l4Var, 1) ? ModelAuditLogEntry.CHANGE_KEY_AVAILABLE : "not available");
             } catch (Exception e) {
                 this.a.g().f.b("Exception occurred while binding to Install Referrer Service", e.getMessage());
             }
diff --git a/app/src/main/java/c/i/a/f/i/b/n3.java b/app/src/main/java/c/i/a/f/i/b/n3.java
index 3e476c52dc..98ff769d32 100644
--- a/app/src/main/java/c/i/a/f/i/b/n3.java
+++ b/app/src/main/java/c/i/a/f/i/b/n3.java
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.TextUtils;
+import androidx.core.os.EnvironmentCompat;
 import c.i.a.f.e.h.j.h;
 import c.i.a.f.e.o.c;
 import c.i.a.f.h.l.da;
@@ -63,7 +64,7 @@ public final class n3 extends a5 {
         Bundle D;
         Integer num;
         String G0;
-        String str = "unknown";
+        String str = EnvironmentCompat.MEDIA_UNKNOWN;
         String str2 = "Unknown";
         String packageName = this.a.b.getPackageName();
         PackageManager packageManager = this.a.b.getPackageManager();
diff --git a/app/src/main/java/c/i/a/f/i/b/n6.java b/app/src/main/java/c/i/a/f/i/b/n6.java
index 743ded5b58..2a01e688e9 100644
--- a/app/src/main/java/c/i/a/f/i/b/n6.java
+++ b/app/src/main/java/c/i/a/f/i/b/n6.java
@@ -3,6 +3,7 @@ package c.i.a.f.i.b;
 import android.os.Bundle;
 import c.i.a.f.h.l.x7;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.measurement.internal.zzku;
 import com.google.android.gms.measurement.internal.zzz;
 import java.util.Objects;
@@ -23,7 +24,7 @@ public final class n6 implements Runnable {
         c6Var.b();
         c6Var.t();
         Objects.requireNonNull(bundle, "null reference");
-        AnimatableValueParser.w(bundle.getString("name"));
+        AnimatableValueParser.w(bundle.getString(ModelAuditLogEntry.CHANGE_KEY_NAME));
         AnimatableValueParser.w(bundle.getString("origin"));
         Objects.requireNonNull(bundle.get("value"), "null reference");
         if (!c6Var.a.d()) {
@@ -31,7 +32,7 @@ public final class n6 implements Runnable {
             return;
         }
         try {
-            c6Var.p().y(new zzz(bundle.getString("app_id"), bundle.getString("origin"), new zzku(bundle.getString("name"), bundle.getLong("triggered_timestamp"), bundle.get("value"), bundle.getString("origin")), bundle.getLong("creation_timestamp"), false, bundle.getString("trigger_event_name"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("timed_out_event_name"), bundle.getBundle("timed_out_event_params"), bundle.getString("origin"), 0, true, x7.b() && c6Var.a.h.o(p.L0)), bundle.getLong("trigger_timeout"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("triggered_event_name"), bundle.getBundle("triggered_event_params"), bundle.getString("origin"), 0, true, x7.b() && c6Var.a.h.o(p.L0)), bundle.getLong("time_to_live"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("expired_event_name"), bundle.getBundle("expired_event_params"), bundle.getString("origin"), 0, true, x7.b() && c6Var.a.h.o(p.L0))));
+            c6Var.p().y(new zzz(bundle.getString("app_id"), bundle.getString("origin"), new zzku(bundle.getString(ModelAuditLogEntry.CHANGE_KEY_NAME), bundle.getLong("triggered_timestamp"), bundle.get("value"), bundle.getString("origin")), bundle.getLong("creation_timestamp"), false, bundle.getString("trigger_event_name"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("timed_out_event_name"), bundle.getBundle("timed_out_event_params"), bundle.getString("origin"), 0, true, x7.b() && c6Var.a.h.o(p.L0)), bundle.getLong("trigger_timeout"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("triggered_event_name"), bundle.getBundle("triggered_event_params"), bundle.getString("origin"), 0, true, x7.b() && c6Var.a.h.o(p.L0)), bundle.getLong("time_to_live"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("expired_event_name"), bundle.getBundle("expired_event_params"), bundle.getString("origin"), 0, true, x7.b() && c6Var.a.h.o(p.L0))));
         } catch (IllegalArgumentException unused) {
         }
     }
diff --git a/app/src/main/java/c/i/a/f/i/b/o4.java b/app/src/main/java/c/i/a/f/i/b/o4.java
index 1c8fe89c73..a3822bf84b 100644
--- a/app/src/main/java/c/i/a/f/i/b/o4.java
+++ b/app/src/main/java/c/i/a/f/i/b/o4.java
@@ -7,6 +7,7 @@ import c.i.a.f.e.n.a;
 import c.i.a.f.h.l.e2;
 import c.i.a.f.h.l.g9;
 import c.i.a.f.h.l.j9;
+import com.adjust.sdk.Constants;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public final class o4 implements Runnable {
     public final /* synthetic */ e2 i;
@@ -50,7 +51,7 @@ public final class o4 implements Runnable {
                 if (j == 0) {
                     m4Var.a.g().i.a("Service response is missing Install Referrer install timestamp");
                 } else {
-                    String string = bundle.getString("install_referrer");
+                    String string = bundle.getString(Constants.INSTALL_REFERRER);
                     if (string == null || string.isEmpty()) {
                         m4Var.a.g().f.a("No referrer defined in Install Referrer response");
                     } else {
@@ -59,7 +60,7 @@ public final class o4 implements Runnable {
                         if (x2 == null) {
                             m4Var.a.g().f.a("No campaign params defined in Install Referrer result");
                         } else {
-                            String string2 = x2.getString("medium");
+                            String string2 = x2.getString(Constants.MEDIUM);
                             if (string2 != null && !"(not set)".equalsIgnoreCase(string2) && !"organic".equalsIgnoreCase(string2)) {
                                 long j2 = bundle.getLong("referrer_click_timestamp_seconds", 0) * 1000;
                                 if (j2 == 0) {
diff --git a/app/src/main/java/c/i/a/f/i/b/p.java b/app/src/main/java/c/i/a/f/i/b/p.java
index 0e873e9ac9..b1fcad4327 100644
--- a/app/src/main/java/c/i/a/f/i/b/p.java
+++ b/app/src/main/java/c/i/a/f/i/b/p.java
@@ -1,6 +1,7 @@
 package c.i.a.f.i.b;
 
 import androidx.annotation.Nullable;
+import com.adjust.sdk.Constants;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -66,7 +67,7 @@ public final class p {
 
     /* renamed from: d0  reason: collision with root package name */
     public static j3<Boolean> f1186d0;
-    public static j3<String> e = a("measurement.config.url_scheme", "https", "https", o0.a);
+    public static j3<String> e = a("measurement.config.url_scheme", Constants.SCHEME, Constants.SCHEME, o0.a);
 
     /* renamed from: e0  reason: collision with root package name */
     public static j3<Boolean> f1187e0;
diff --git a/app/src/main/java/c/i/a/f/i/b/p6.java b/app/src/main/java/c/i/a/f/i/b/p6.java
index f2fa7dad26..b5c15e802d 100644
--- a/app/src/main/java/c/i/a/f/i/b/p6.java
+++ b/app/src/main/java/c/i/a/f/i/b/p6.java
@@ -3,6 +3,7 @@ package c.i.a.f.i.b;
 import android.os.Bundle;
 import c.i.a.f.h.l.x7;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.measurement.internal.zzku;
 import com.google.android.gms.measurement.internal.zzz;
 import java.util.Objects;
@@ -23,13 +24,13 @@ public final class p6 implements Runnable {
         c6Var.b();
         c6Var.t();
         Objects.requireNonNull(bundle, "null reference");
-        AnimatableValueParser.w(bundle.getString("name"));
+        AnimatableValueParser.w(bundle.getString(ModelAuditLogEntry.CHANGE_KEY_NAME));
         if (!c6Var.a.d()) {
             c6Var.g().n.a("Conditional property not cleared since app measurement is disabled");
             return;
         }
         try {
-            c6Var.p().y(new zzz(bundle.getString("app_id"), bundle.getString("origin"), new zzku(bundle.getString("name"), 0, null, null), bundle.getLong("creation_timestamp"), bundle.getBoolean("active"), bundle.getString("trigger_event_name"), null, bundle.getLong("trigger_timeout"), null, bundle.getLong("time_to_live"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("expired_event_name"), bundle.getBundle("expired_event_params"), bundle.getString("origin"), bundle.getLong("creation_timestamp"), true, x7.b() && c6Var.a.h.o(p.L0))));
+            c6Var.p().y(new zzz(bundle.getString("app_id"), bundle.getString("origin"), new zzku(bundle.getString(ModelAuditLogEntry.CHANGE_KEY_NAME), 0, null, null), bundle.getLong("creation_timestamp"), bundle.getBoolean("active"), bundle.getString("trigger_event_name"), null, bundle.getLong("trigger_timeout"), null, bundle.getLong("time_to_live"), c6Var.e().B(bundle.getString("app_id"), bundle.getString("expired_event_name"), bundle.getBundle("expired_event_params"), bundle.getString("origin"), bundle.getLong("creation_timestamp"), true, x7.b() && c6Var.a.h.o(p.L0))));
         } catch (IllegalArgumentException unused) {
         }
     }
diff --git a/app/src/main/java/c/i/a/f/i/b/q9.java b/app/src/main/java/c/i/a/f/i/b/q9.java
index 9e7cfc8df6..f8a57e562f 100644
--- a/app/src/main/java/c/i/a/f/i/b/q9.java
+++ b/app/src/main/java/c/i/a/f/i/b/q9.java
@@ -30,6 +30,7 @@ import c.i.a.f.h.l.u4;
 import c.i.a.f.h.l.y0;
 import c.i.a.f.h.l.y1;
 import c.i.a.f.h.l.z0;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.common.internal.safeparcel.SafeParcelReader$ParseException;
 import com.google.android.gms.internal.measurement.zzij;
 import com.google.android.gms.measurement.internal.zzap;
@@ -537,7 +538,7 @@ public final class q9 extends i9 {
                     H(sb, i2);
                     sb.append("param {\n");
                     Double d = null;
-                    L(sb, i2, "name", c1Var.A() ? d().x(c1Var.B()) : null);
+                    L(sb, i2, ModelAuditLogEntry.CHANGE_KEY_NAME, c1Var.A() ? d().x(c1Var.B()) : null);
                     L(sb, i2, "string_value", c1Var.F() ? c1Var.G() : null);
                     L(sb, i2, "int_value", c1Var.I() ? Long.valueOf(c1Var.J()) : null);
                     if (c1Var.M()) {
@@ -791,7 +792,7 @@ public final class q9 extends i9 {
                             K.append("user_property {\n");
                             Double d = null;
                             L(K, 2, "set_timestamp_millis", i1Var.y() ? Long.valueOf(i1Var.z()) : null);
-                            L(K, 2, "name", d().y(i1Var.D()));
+                            L(K, 2, ModelAuditLogEntry.CHANGE_KEY_NAME, d().y(i1Var.D()));
                             L(K, 2, "string_value", i1Var.G());
                             L(K, 2, "int_value", i1Var.H() ? Long.valueOf(i1Var.I()) : null);
                             if (i1Var.J()) {
@@ -830,7 +831,7 @@ public final class q9 extends i9 {
                         if (a1Var != null) {
                             H(K, 2);
                             K.append("event {\n");
-                            L(K, 2, "name", d().u(a1Var.F()));
+                            L(K, 2, ModelAuditLogEntry.CHANGE_KEY_NAME, d().u(a1Var.F()));
                             if (a1Var.G()) {
                                 L(K, 2, "timestamp_millis", Long.valueOf(a1Var.H()));
                             }
diff --git a/app/src/main/java/c/i/a/f/i/b/s4.java b/app/src/main/java/c/i/a/f/i/b/s4.java
index 94dc203789..c8d16d7785 100644
--- a/app/src/main/java/c/i/a/f/i/b/s4.java
+++ b/app/src/main/java/c/i/a/f/i/b/s4.java
@@ -1,6 +1,7 @@
 package c.i.a.f.i.b;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
@@ -18,7 +19,7 @@ public final class s4<V> extends FutureTask<V> implements Comparable<s4<V>> {
         this.i = andIncrement;
         this.k = str;
         this.j = z2;
-        if (andIncrement == Long.MAX_VALUE) {
+        if (andIncrement == RecyclerView.FOREVER_NS) {
             r4Var.g().f.a("Tasks index overflow");
         }
     }
@@ -31,7 +32,7 @@ public final class s4<V> extends FutureTask<V> implements Comparable<s4<V>> {
         this.i = andIncrement;
         this.k = str;
         this.j = z2;
-        if (andIncrement == Long.MAX_VALUE) {
+        if (andIncrement == RecyclerView.FOREVER_NS) {
             r4Var.g().f.a("Tasks index overflow");
         }
     }
diff --git a/app/src/main/java/c/i/a/f/i/b/t3.java b/app/src/main/java/c/i/a/f/i/b/t3.java
index 17a88e6917..45ab742cc8 100644
--- a/app/src/main/java/c/i/a/f/i/b/t3.java
+++ b/app/src/main/java/c/i/a/f/i/b/t3.java
@@ -2,6 +2,8 @@ package c.i.a.f.i.b;
 
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
+import androidx.exifinterface.media.ExifInterface;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.f.e.o.g;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public final class t3 implements Runnable {
@@ -64,7 +66,7 @@ public final class t3 implements Runnable {
         long j = q3Var3.d;
         String u = q3.u(true, this.j, this.k, this.l, this.m);
         StringBuilder sb = new StringBuilder(String.valueOf(u).length() + 24);
-        sb.append("2");
+        sb.append(ExifInterface.GPS_MEASUREMENT_2D);
         sb.append(charAt);
         sb.append(c2);
         sb.append(j);
@@ -91,7 +93,7 @@ public final class t3 implements Runnable {
             return;
         }
         long j3 = j2 + 1;
-        if ((k4Var.e.e().v0().nextLong() & Long.MAX_VALUE) >= Long.MAX_VALUE / j3) {
+        if ((k4Var.e.e().v0().nextLong() & RecyclerView.FOREVER_NS) >= RecyclerView.FOREVER_NS / j3) {
             z2 = false;
         }
         SharedPreferences.Editor edit2 = k4Var.e.w().edit();
diff --git a/app/src/main/java/c/i/a/f/i/b/t9.java b/app/src/main/java/c/i/a/f/i/b/t9.java
index fb170256c1..e7915d5286 100644
--- a/app/src/main/java/c/i/a/f/i/b/t9.java
+++ b/app/src/main/java/c/i/a/f/i/b/t9.java
@@ -20,6 +20,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
+import androidx.core.app.NotificationCompat;
 import c.i.a.f.e.e;
 import c.i.a.f.e.o.c;
 import c.i.a.f.e.o.d;
@@ -28,7 +29,9 @@ import c.i.a.f.h.l.da;
 import c.i.a.f.h.l.fc;
 import c.i.a.f.h.l.g8;
 import c.i.a.f.h.l.h8;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.measurement.internal.zzap;
 import com.google.android.gms.measurement.internal.zzaq;
 import com.google.android.gms.measurement.internal.zzku;
@@ -183,7 +186,7 @@ public final class t9 extends r5 {
             bundle.putString("app_id", zzz.i);
             bundle.putString("origin", zzz.j);
             bundle.putLong("creation_timestamp", zzz.l);
-            bundle.putString("name", zzz.k.j);
+            bundle.putString(ModelAuditLogEntry.CHANGE_KEY_NAME, zzz.k.j);
             c.O0(bundle, zzz.k.v0());
             bundle.putBoolean("active", zzz.m);
             String str = zzz.n;
@@ -288,7 +291,7 @@ public final class t9 extends r5 {
     public static MessageDigest x0() {
         for (int i = 0; i < 2; i++) {
             try {
-                MessageDigest instance = MessageDigest.getInstance("MD5");
+                MessageDigest instance = MessageDigest.getInstance(Constants.MD5);
                 if (instance != null) {
                     return instance;
                 }
@@ -553,7 +556,7 @@ public final class t9 extends r5 {
     public final boolean Y(String str, double d2) {
         try {
             SharedPreferences.Editor edit = this.a.b.getSharedPreferences("google.analytics.deferred.deeplink.prefs", 0).edit();
-            edit.putString("deeplink", str);
+            edit.putString(Constants.DEEPLINK, str);
             edit.putLong("timestamp", Double.doubleToRawLongBits(d2));
             return edit.commit();
         } catch (Exception e) {
@@ -887,17 +890,17 @@ public final class t9 extends r5 {
     }
 
     public final int t(String str, boolean z2) {
-        if (!m0("event", str)) {
+        if (!m0(NotificationCompat.CATEGORY_EVENT, str)) {
             return 2;
         }
         if (z2) {
-            if (!f0("event", v5.a, v5.b, str)) {
+            if (!f0(NotificationCompat.CATEGORY_EVENT, v5.a, v5.b, str)) {
                 return 13;
             }
-        } else if (!f0("event", v5.a, null, str)) {
+        } else if (!f0(NotificationCompat.CATEGORY_EVENT, v5.a, null, str)) {
             return 13;
         }
-        return !Z("event", 40, str) ? 2 : 0;
+        return !Z(NotificationCompat.CATEGORY_EVENT, 40, str) ? 2 : 0;
     }
 
     public final long t0() {
@@ -981,7 +984,7 @@ public final class t9 extends r5 {
                 bundle.putString("source", str3);
             }
             if (!TextUtils.isEmpty(str2)) {
-                bundle.putString("medium", str2);
+                bundle.putString(Constants.MEDIUM, str2);
             }
             if (!TextUtils.isEmpty(str)) {
                 bundle.putString("gclid", str);
diff --git a/app/src/main/java/c/i/a/f/i/b/u5.java b/app/src/main/java/c/i/a/f/i/b/u5.java
index 31be8aa428..2839857089 100644
--- a/app/src/main/java/c/i/a/f/i/b/u5.java
+++ b/app/src/main/java/c/i/a/f/i/b/u5.java
@@ -1,7 +1,9 @@
 package c.i.a.f.i.b;
+
+import com.discord.models.domain.ModelAuditLogEntry;
 /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
 public final class u5 {
-    public static final String[] a = {"ga_conversion", "engagement_time_msec", "exposure_time", "ad_event_id", "ad_unit_id", "ga_error", "ga_error_value", "ga_error_length", "ga_event_origin", "ga_screen", "ga_screen_class", "ga_screen_id", "ga_previous_screen", "ga_previous_class", "ga_previous_id", "manual_tracking", "message_device_time", "message_id", "message_name", "message_time", "message_tracking_id", "message_type", "previous_app_version", "previous_os_version", "topic", "update_with_analytics", "previous_first_open_count", "system_app", "system_app_update", "previous_install_count", "ga_event_id", "ga_extra_params_ct", "ga_group_name", "ga_list_length", "ga_index", "ga_event_name", "campaign_info_source", "cached_campaign", "deferred_analytics_collection", "ga_session_number", "ga_session_id", "campaign_extra_referrer", "app_in_background", "firebase_feature_rollouts", "firebase_conversion", "firebase_error", "firebase_error_value", "firebase_error_length", "firebase_event_origin", "firebase_screen", "firebase_screen_class", "firebase_screen_id", "firebase_previous_screen", "firebase_previous_class", "firebase_previous_id", "session_number", "session_id"};
+    public static final String[] a = {"ga_conversion", "engagement_time_msec", "exposure_time", "ad_event_id", "ad_unit_id", "ga_error", "ga_error_value", "ga_error_length", "ga_event_origin", "ga_screen", "ga_screen_class", "ga_screen_id", "ga_previous_screen", "ga_previous_class", "ga_previous_id", "manual_tracking", "message_device_time", "message_id", "message_name", "message_time", "message_tracking_id", "message_type", "previous_app_version", "previous_os_version", ModelAuditLogEntry.CHANGE_KEY_TOPIC, "update_with_analytics", "previous_first_open_count", "system_app", "system_app_update", "previous_install_count", "ga_event_id", "ga_extra_params_ct", "ga_group_name", "ga_list_length", "ga_index", "ga_event_name", "campaign_info_source", "cached_campaign", "deferred_analytics_collection", "ga_session_number", "ga_session_id", "campaign_extra_referrer", "app_in_background", "firebase_feature_rollouts", "firebase_conversion", "firebase_error", "firebase_error_value", "firebase_error_length", "firebase_event_origin", "firebase_screen", "firebase_screen_class", "firebase_screen_id", "firebase_previous_screen", "firebase_previous_class", "firebase_previous_id", "session_number", "session_id"};
     public static final String[] b = {"_c", "_et", "_xt", "_aeid", "_ai", "_err", "_ev", "_el", "_o", "_sn", "_sc", "_si", "_pn", "_pc", "_pi", "_mst", "_ndt", "_nmid", "_nmn", "_nmt", "_nmtid", "_nmc", "_pv", "_po", "_nt", "_uwa", "_pfo", "_sys", "_sysu", "_pin", "_eid", "_epc", "_gn", "_ll", "_i", "_en", "_cis", "_cc", "_dac", "_sno", "_sid", "_cer", "_aib", "_ffr", "_c", "_err", "_ev", "_el", "_o", "_sn", "_sc", "_si", "_pn", "_pc", "_pi", "_sno", "_sid"};
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/a/f/i/b/y6.java b/app/src/main/java/c/i/a/f/i/b/y6.java
index a3ef98d6c3..85a345d272 100644
--- a/app/src/main/java/c/i/a/f/i/b/y6.java
+++ b/app/src/main/java/c/i/a/f/i/b/y6.java
@@ -9,6 +9,8 @@ import android.os.Bundle;
 import android.os.SystemClock;
 import androidx.annotation.MainThread;
 import c.i.a.f.e.o.d;
+import com.adjust.sdk.Constants;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 @TargetApi(14)
@@ -32,7 +34,7 @@ public final class y6 implements Application.ActivityLifecycleCallbacks {
                     return;
                 }
                 this.i.e();
-                this.i.f().v(new c7(this, bundle == null, data, t9.V(intent) ? "gs" : "auto", data.getQueryParameter("referrer")));
+                this.i.f().v(new c7(this, bundle == null, data, t9.V(intent) ? "gs" : "auto", data.getQueryParameter(Constants.REFERRER)));
                 this.i.q().y(activity, bundle);
             }
         } catch (Exception e) {
@@ -120,8 +122,8 @@ public final class y6 implements Application.ActivityLifecycleCallbacks {
         h7 q = this.i.q();
         if (q.a.h.z().booleanValue() && bundle != null && (i7Var = q.f.get(activity)) != null) {
             Bundle bundle2 = new Bundle();
-            bundle2.putLong("id", i7Var.f1165c);
-            bundle2.putString("name", i7Var.a);
+            bundle2.putLong(ModelAuditLogEntry.CHANGE_KEY_ID, i7Var.f1165c);
+            bundle2.putString(ModelAuditLogEntry.CHANGE_KEY_NAME, i7Var.a);
             bundle2.putString("referrer_name", i7Var.b);
             bundle.putBundle("com.google.app_measurement.screen_service", bundle2);
         }
diff --git a/app/src/main/java/c/i/a/f/l/c.java b/app/src/main/java/c/i/a/f/l/c.java
index 14177c6e9d..a67d98c842 100644
--- a/app/src/main/java/c/i/a/f/l/c.java
+++ b/app/src/main/java/c/i/a/f/l/c.java
@@ -1,5 +1,6 @@
 package c.i.a.f.l;
 
+import androidx.core.app.NotificationCompat;
 import c.i.a.f.e.h.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.google.android.gms.common.api.Scope;
@@ -22,7 +23,7 @@ public final class c {
         d dVar = new d();
         d = dVar;
         new Scope("profile");
-        new Scope("email");
+        new Scope(NotificationCompat.CATEGORY_EMAIL);
         AnimatableValueParser.z(eVar, "Cannot construct an Api with a null ClientBuilder");
         AnimatableValueParser.z(gVar, "Cannot construct an Api with a null ClientKey");
         AnimatableValueParser.z(dVar, "Cannot construct an Api with a null ClientBuilder");
diff --git a/app/src/main/java/c/i/a/g/a/b.java b/app/src/main/java/c/i/a/g/a/b.java
index e751462fdc..b2bd614cc7 100644
--- a/app/src/main/java/c/i/a/g/a/b.java
+++ b/app/src/main/java/c/i/a/g/a/b.java
@@ -7,11 +7,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.math.MathUtils;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import com.google.android.material.badge.BadgeDrawable;
 import java.util.List;
 /* compiled from: HeaderScrollingViewBehavior */
 public abstract class b extends c<View> {
@@ -28,10 +30,7 @@ public abstract class b extends c<View> {
     }
 
     private static int resolveGravity(int i) {
-        if (i == 0) {
-            return 8388659;
-        }
-        return i;
+        return i == 0 ? BadgeDrawable.TOP_START : i;
     }
 
     @Nullable
@@ -104,7 +103,7 @@ public abstract class b extends c<View> {
         } else {
             scrollRange -= measuredHeight;
         }
-        coordinatorLayout.onMeasureChild(view, i, i2, View.MeasureSpec.makeMeasureSpec(scrollRange, i5 == -1 ? 1073741824 : Integer.MIN_VALUE), i4);
+        coordinatorLayout.onMeasureChild(view, i, i2, View.MeasureSpec.makeMeasureSpec(scrollRange, i5 == -1 ? BasicMeasure.EXACTLY : Integer.MIN_VALUE), i4);
         return true;
     }
 
diff --git a/app/src/main/java/c/i/a/g/a/e.java b/app/src/main/java/c/i/a/g/a/e.java
index 342af1f82e..680aa67769 100644
--- a/app/src/main/java/c/i/a/g/a/e.java
+++ b/app/src/main/java/c/i/a/g/a/e.java
@@ -5,6 +5,7 @@ import android.animation.StateListAnimator;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+import androidx.constraintlayout.motion.widget.Key;
 import com.google.android.material.R;
 /* compiled from: ViewUtilsLollipop */
 @RequiresApi(21)
@@ -15,9 +16,9 @@ public class e {
         int integer = view.getResources().getInteger(R.integer.app_bar_elevation_anim_duration);
         StateListAnimator stateListAnimator = new StateListAnimator();
         long j = (long) integer;
-        stateListAnimator.addState(new int[]{16842766, R.attr.state_liftable, -R.attr.state_lifted}, ObjectAnimator.ofFloat(view, "elevation", 0.0f).setDuration(j));
-        stateListAnimator.addState(new int[]{16842766}, ObjectAnimator.ofFloat(view, "elevation", f).setDuration(j));
-        stateListAnimator.addState(new int[0], ObjectAnimator.ofFloat(view, "elevation", 0.0f).setDuration(0L));
+        stateListAnimator.addState(new int[]{16842766, R.attr.state_liftable, -R.attr.state_lifted}, ObjectAnimator.ofFloat(view, Key.ELEVATION, 0.0f).setDuration(j));
+        stateListAnimator.addState(new int[]{16842766}, ObjectAnimator.ofFloat(view, Key.ELEVATION, f).setDuration(j));
+        stateListAnimator.addState(new int[0], ObjectAnimator.ofFloat(view, Key.ELEVATION, 0.0f).setDuration(0L));
         view.setStateListAnimator(stateListAnimator);
     }
 }
diff --git a/app/src/main/java/c/i/a/g/e/i.java b/app/src/main/java/c/i/a/g/e/i.java
index 0ebebca46f..d18c0e558d 100644
--- a/app/src/main/java/c/i/a/g/e/i.java
+++ b/app/src/main/java/c/i/a/g/e/i.java
@@ -16,6 +16,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.constraintlayout.motion.widget.Key;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.util.Preconditions;
@@ -145,7 +146,7 @@ public class i extends f {
             stateListAnimator.addState(f.e, x(f, f2));
             AnimatorSet animatorSet = new AnimatorSet();
             ArrayList arrayList = new ArrayList();
-            arrayList.add(ObjectAnimator.ofFloat(this.F, "elevation", f).setDuration(0L));
+            arrayList.add(ObjectAnimator.ofFloat(this.F, Key.ELEVATION, f).setDuration(0L));
             if (i >= 22 && i <= 24) {
                 FloatingActionButton floatingActionButton = this.F;
                 arrayList.add(ObjectAnimator.ofFloat(floatingActionButton, View.TRANSLATION_Z, floatingActionButton.getTranslationZ()).setDuration(100L));
@@ -184,7 +185,7 @@ public class i extends f {
     @NonNull
     public final Animator x(float f, float f2) {
         AnimatorSet animatorSet = new AnimatorSet();
-        animatorSet.play(ObjectAnimator.ofFloat(this.F, "elevation", f).setDuration(0L)).with(ObjectAnimator.ofFloat(this.F, View.TRANSLATION_Z, f2).setDuration(100L));
+        animatorSet.play(ObjectAnimator.ofFloat(this.F, Key.ELEVATION, f).setDuration(0L)).with(ObjectAnimator.ofFloat(this.F, View.TRANSLATION_Z, f2).setDuration(100L));
         animatorSet.setInterpolator(f.a);
         return animatorSet;
     }
diff --git a/app/src/main/java/c/i/a/g/j/h.java b/app/src/main/java/c/i/a/g/j/h.java
index 5a610012b1..b0b6812dc9 100644
--- a/app/src/main/java/c/i/a/g/j/h.java
+++ b/app/src/main/java/c/i/a/g/j/h.java
@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.R;
 import com.google.android.material.animation.AnimationUtils;
 import com.google.android.material.color.MaterialColors;
@@ -39,7 +40,7 @@ public class h extends m {
     public final TextInputLayout.OnEndIconChangedListener h = new e();
     public boolean i = false;
     public boolean j = false;
-    public long k = Long.MAX_VALUE;
+    public long k = RecyclerView.FOREVER_NS;
     public StateListDrawable l;
     public MaterialShapeDrawable m;
     @Nullable
diff --git a/app/src/main/java/c/i/a/g/k/f.java b/app/src/main/java/c/i/a/g/k/f.java
index ad0a0aad41..a05d4baa07 100644
--- a/app/src/main/java/c/i/a/g/k/f.java
+++ b/app/src/main/java/c/i/a/g/k/f.java
@@ -3,6 +3,7 @@ package c.i.a.g.k;
 import android.view.accessibility.AccessibilityManager;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
+import androidx.exifinterface.media.ExifInterface;
 import com.google.android.material.R;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.timepicker.ClockHandView;
@@ -12,8 +13,8 @@ import java.util.Locale;
 import java.util.Objects;
 /* compiled from: TimePickerClockPresenter */
 public class f implements ClockHandView.OnRotateListener, TimePickerView.d, TimePickerView.c, ClockHandView.OnActionUpListener, g {
-    public static final String[] i = {"12", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"};
-    public static final String[] j = {"00", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22"};
+    public static final String[] i = {"12", "1", ExifInterface.GPS_MEASUREMENT_2D, ExifInterface.GPS_MEASUREMENT_3D, "4", "5", "6", "7", "8", "9", "10", "11"};
+    public static final String[] j = {"00", ExifInterface.GPS_MEASUREMENT_2D, "4", "6", "8", "10", "12", "14", "16", "18", "20", "22"};
     public static final String[] k = {"00", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55"};
     public TimePickerView l;
     public TimeModel m;
diff --git a/app/src/main/java/c/i/b/a/c.java b/app/src/main/java/c/i/b/a/c.java
index aaf9d99e1f..a508d194fe 100644
--- a/app/src/main/java/c/i/b/a/c.java
+++ b/app/src/main/java/c/i/b/a/c.java
@@ -1,5 +1,6 @@
 package c.i.b.a;
 
+import com.adjust.sdk.Constants;
 import java.nio.charset.Charset;
 /* compiled from: Charsets */
 public final class c {
@@ -7,7 +8,7 @@ public final class c {
     public static final Charset b = Charset.forName("ISO-8859-1");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Charset f1269c = Charset.forName("UTF-8");
+    public static final Charset f1269c = Charset.forName(Constants.ENCODING);
     public static final Charset d = Charset.forName("UTF-16LE");
     public static final Charset e = Charset.forName("UTF-16");
 
diff --git a/app/src/main/java/c/i/b/b/e0.java b/app/src/main/java/c/i/b/b/e0.java
index c9df17dc64..5e4269b8ec 100644
--- a/app/src/main/java/c/i/b/b/e0.java
+++ b/app/src/main/java/c/i/b/b/e0.java
@@ -1,5 +1,6 @@
 package c.i.b.b;
 
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.b.a.d;
 import c.i.b.b.e0.i;
 import c.i.b.b.e0.n;
@@ -1339,7 +1340,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
         this.keyEquivalence = (c.i.b.a.d) c.i.a.f.e.o.c.C(d0Var.f, d0Var.a().f());
         this.m = jVar;
         int i3 = d0Var.b;
-        int min = Math.min(i3 == -1 ? 16 : i3, 1073741824);
+        int min = Math.min(i3 == -1 ? 16 : i3, (int) BasicMeasure.EXACTLY);
         int i4 = 0;
         int i5 = 1;
         int i6 = 1;
diff --git a/app/src/main/java/c/i/b/b/l.java b/app/src/main/java/c/i/b/b/l.java
index e7cc7656f1..f5f642120c 100644
--- a/app/src/main/java/c/i/b/b/l.java
+++ b/app/src/main/java/c/i/b/b/l.java
@@ -1,5 +1,6 @@
 package c.i.b.b;
 
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -354,7 +355,7 @@ public class l<K, V> extends AbstractMap<K, V> implements Serializable {
         int max = Math.max(i2, 2);
         int highestOneBit = Integer.highestOneBit(max);
         if (max > ((int) (((double) f) * ((double) highestOneBit))) && (highestOneBit = highestOneBit << 1) <= 0) {
-            highestOneBit = 1073741824;
+            highestOneBit = BasicMeasure.EXACTLY;
         }
         int[] iArr = new int[highestOneBit];
         Arrays.fill(iArr, -1);
diff --git a/app/src/main/java/c/i/b/b/w.java b/app/src/main/java/c/i/b/b/w.java
index c7b3929e3a..f028b67b29 100644
--- a/app/src/main/java/c/i/b/b/w.java
+++ b/app/src/main/java/c/i/b/b/w.java
@@ -2,6 +2,7 @@ package c.i.b.b;
 
 import c.i.a.f.e.o.c;
 import c.i.b.b.s;
+import com.discord.api.permission.Permission;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.concurrent.LazyInit;
 import com.google.j2objc.annotations.RetainedWith;
@@ -250,7 +251,7 @@ public abstract class w<K, V> implements Map<K, V>, Serializable {
     public String toString() {
         int size = size();
         c.n(size, "size");
-        StringBuilder sb = new StringBuilder((int) Math.min(((long) size) * 8, 1073741824L));
+        StringBuilder sb = new StringBuilder((int) Math.min(((long) size) * 8, (long) Permission.MANAGE_EMOJIS_AND_STICKERS));
         sb.append('{');
         boolean z2 = true;
         for (Map.Entry entry : entrySet()) {
diff --git a/app/src/main/java/c/i/b/b/z.java b/app/src/main/java/c/i/b/b/z.java
index 8bb0f564ba..53e1654466 100644
--- a/app/src/main/java/c/i/b/b/z.java
+++ b/app/src/main/java/c/i/b/b/z.java
@@ -1,5 +1,6 @@
 package c.i.b.b;
 
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.a.f.e.o.c;
 import com.google.errorprone.annotations.concurrent.LazyInit;
 import com.google.j2objc.annotations.RetainedWith;
@@ -46,7 +47,7 @@ public abstract class z<E> extends s<E> implements Set<E> {
             z2 = false;
         }
         c.i(z2, "collection too large");
-        return 1073741824;
+        return BasicMeasure.EXACTLY;
     }
 
     public static <E> z<E> l(int i, Object... objArr) {
diff --git a/app/src/main/java/c/i/c/c.java b/app/src/main/java/c/i/c/c.java
index 566a704504..46ccb3fd13 100644
--- a/app/src/main/java/c/i/c/c.java
+++ b/app/src/main/java/c/i/c/c.java
@@ -26,6 +26,8 @@ import c.i.c.l.p;
 import c.i.c.l.q;
 import c.i.c.l.r;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.google.android.material.badge.BadgeDrawable;
 import com.google.firebase.FirebaseCommonRegistrar;
 import com.google.firebase.components.ComponentDiscoveryService;
 import java.lang.reflect.InvocationTargetException;
@@ -266,7 +268,7 @@ public class c {
         byte[] bytes = this.e.getBytes(Charset.defaultCharset());
         String str = null;
         sb.append(bytes == null ? null : Base64.encodeToString(bytes, 11));
-        sb.append("+");
+        sb.append(BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX);
         a();
         byte[] bytes2 = this.f.b.getBytes(Charset.defaultCharset());
         if (bytes2 != null) {
@@ -378,7 +380,7 @@ public class c {
 
     public String toString() {
         c.i.a.f.e.k.k kVar = new c.i.a.f.e.k.k(this, null);
-        kVar.a("name", this.e);
+        kVar.a(ModelAuditLogEntry.CHANGE_KEY_NAME, this.e);
         kVar.a("options", this.f);
         return kVar.toString();
     }
diff --git a/app/src/main/java/c/i/c/j/a/c/f.java b/app/src/main/java/c/i/c/j/a/c/f.java
index db8a932e8a..56d5960628 100644
--- a/app/src/main/java/c/i/c/j/a/c/f.java
+++ b/app/src/main/java/c/i/c/j/a/c/f.java
@@ -2,6 +2,7 @@ package c.i.c.j.a.c;
 
 import android.os.Bundle;
 import c.i.a.f.i.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 /* compiled from: com.google.android.gms:play-services-measurement-api@@18.0.0 */
 public final class f implements a.AbstractC0111a {
     public final /* synthetic */ d a;
@@ -14,7 +15,7 @@ public final class f implements a.AbstractC0111a {
     public final void a(String str, String str2, Bundle bundle, long j) {
         if (str != null && !str.equals("crash") && (!c.a.contains(str2))) {
             Bundle bundle2 = new Bundle();
-            bundle2.putString("name", str2);
+            bundle2.putString(ModelAuditLogEntry.CHANGE_KEY_NAME, str2);
             bundle2.putLong("timestampInMillis", j);
             bundle2.putBundle("params", bundle);
             ((c.i.c.m.a) this.a.a).a(3, bundle2);
diff --git a/app/src/main/java/c/i/c/m/a.java b/app/src/main/java/c/i/c/m/a.java
index 66e1cc856e..3376985c1a 100644
--- a/app/src/main/java/c/i/c/m/a.java
+++ b/app/src/main/java/c/i/c/m/a.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import androidx.annotation.Nullable;
 import c.i.c.j.a.a;
 import c.i.c.m.d.i.b;
+import com.discord.models.domain.ModelAuditLogEntry;
 /* compiled from: CrashlyticsAnalyticsListener */
 public class a implements a.b {
     public b a;
@@ -12,7 +13,7 @@ public class a implements a.b {
     public void a(int i, @Nullable Bundle bundle) {
         c.i.c.m.d.b bVar = c.i.c.m.d.b.a;
         bVar.b("Received Analytics message: " + i + " " + bundle);
-        String string = bundle.getString("name");
+        String string = bundle.getString(ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (string != null) {
             Bundle bundle2 = bundle.getBundle("params");
             if (bundle2 == null) {
diff --git a/app/src/main/java/c/i/c/m/d/i/d.java b/app/src/main/java/c/i/c/m/d/i/d.java
index c622afa9dd..8f34c29468 100644
--- a/app/src/main/java/c/i/c/m/d/i/d.java
+++ b/app/src/main/java/c/i/c/m/d/i/d.java
@@ -9,6 +9,7 @@ import c.i.c.m.d.k.i0;
 import c.i.c.m.d.k.k0;
 import c.i.c.m.d.k.n;
 import c.i.c.m.d.k.x;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Objects;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -24,7 +25,7 @@ public class d implements b, a {
         for (String str2 : bundle.keySet()) {
             jSONObject2.put(str2, bundle.get(str2));
         }
-        jSONObject.put("name", str);
+        jSONObject.put(ModelAuditLogEntry.CHANGE_KEY_NAME, str);
         jSONObject.put("parameters", jSONObject2);
         return jSONObject.toString();
     }
diff --git a/app/src/main/java/c/i/c/m/d/k/d1.java b/app/src/main/java/c/i/c/m/d/k/d1.java
index 8f726ec6b4..b0a1eebfa0 100644
--- a/app/src/main/java/c/i/c/m/d/k/d1.java
+++ b/app/src/main/java/c/i/c/m/d/k/d1.java
@@ -4,6 +4,8 @@ import android.app.ActivityManager;
 import android.content.Context;
 import android.os.Environment;
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import c.i.c.m.d.l.b;
 import c.i.c.m.d.m.j;
@@ -113,7 +115,7 @@ public class d1 {
                     long p = h.p();
                     Context context = n0Var.f1307c;
                     ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
-                    ((ActivityManager) context.getSystemService("activity")).getMemoryInfo(memoryInfo);
+                    ((ActivityManager) context.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY)).getMemoryInfo(memoryInfo);
                     long j2 = p - memoryInfo.availMem;
                     long a3 = h.a(Environment.getDataDirectory().getPath());
                     r.b bVar = new r.b();
@@ -167,7 +169,7 @@ public class d1 {
                                 str3 = "_";
                             }
                             try {
-                                g.l(new File(h, a.t("event", format, str3)), a6);
+                                g.l(new File(h, a.t(NotificationCompat.CATEGORY_EVENT, format, str3)), a6);
                             } catch (IOException e) {
                                 c.i.c.m.d.b.a.c("Could not persist event for session " + str, e);
                             }
diff --git a/app/src/main/java/c/i/c/m/d/k/h.java b/app/src/main/java/c/i/c/m/d/k/h.java
index 16e6c40d4c..606b429048 100644
--- a/app/src/main/java/c/i/c/m/d/k/h.java
+++ b/app/src/main/java/c/i/c/m/d/k/h.java
@@ -14,7 +14,10 @@ import android.os.StatFs;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.c.m.d.p.c;
+import com.adjust.sdk.Constants;
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.File;
@@ -211,7 +214,7 @@ public class h {
     }
 
     public static ActivityManager.RunningAppProcessInfo i(String str, Context context) {
-        List<ActivityManager.RunningAppProcessInfo> runningAppProcesses = ((ActivityManager) context.getSystemService("activity")).getRunningAppProcesses();
+        List<ActivityManager.RunningAppProcessInfo> runningAppProcesses = ((ActivityManager) context.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY)).getRunningAppProcesses();
         if (runningAppProcesses != null) {
             for (ActivityManager.RunningAppProcessInfo runningAppProcessInfo : runningAppProcesses) {
                 if (runningAppProcessInfo.processName.equals(str)) {
@@ -301,7 +304,7 @@ public class h {
                         } else if (upperCase.endsWith("MB")) {
                             j2 = e(upperCase, "MB", 1048576);
                         } else if (upperCase.endsWith("GB")) {
-                            j2 = e(upperCase, "GB", 1073741824);
+                            j2 = e(upperCase, "GB", BasicMeasure.EXACTLY);
                         } else {
                             c.i.c.m.d.b bVar = c.i.c.m.d.b.a;
                             bVar.b("Unexpected meminfo format while computing RAM: " + upperCase);
@@ -359,12 +362,12 @@ public class h {
     public static String v(String str) {
         byte[] bytes = str.getBytes();
         try {
-            MessageDigest instance = MessageDigest.getInstance("SHA-1");
+            MessageDigest instance = MessageDigest.getInstance(Constants.SHA1);
             instance.update(bytes);
             return q(instance.digest());
         } catch (NoSuchAlgorithmException e) {
             c.i.c.m.d.b bVar = c.i.c.m.d.b.a;
-            bVar.e("Could not create hashing algorithm: SHA-1, returning empty string.", e);
+            bVar.e("Could not create hashing algorithm: " + Constants.SHA1 + ", returning empty string.", e);
             return "";
         }
     }
diff --git a/app/src/main/java/c/i/c/m/d/k/v0.java b/app/src/main/java/c/i/c/m/d/k/v0.java
index 855884db9d..b7452bc5a6 100644
--- a/app/src/main/java/c/i/c/m/d/k/v0.java
+++ b/app/src/main/java/c/i/c/m/d/k/v0.java
@@ -6,6 +6,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import c.i.c.m.d.b;
 import c.i.c.u.g;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.google.android.gms.tasks.Task;
 import java.util.Locale;
 import java.util.UUID;
@@ -13,7 +14,7 @@ import java.util.regex.Pattern;
 /* compiled from: IdManager */
 public class v0 implements w0 {
     public static final Pattern a = Pattern.compile("[^\\p{Alnum}]");
-    public static final String b = Pattern.quote("/");
+    public static final String b = Pattern.quote(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
 
     /* renamed from: c  reason: collision with root package name */
     public final x0 f1314c;
diff --git a/app/src/main/java/c/i/c/m/d/k/x.java b/app/src/main/java/c/i/c/m/d/k/x.java
index 4a123a0261..0807a6b6cd 100644
--- a/app/src/main/java/c/i/c/m/d/k/x.java
+++ b/app/src/main/java/c/i/c/m/d/k/x.java
@@ -10,6 +10,8 @@ import android.util.JsonReader;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import c.i.a.f.n.b0;
 import c.i.c.m.d.k.h;
 import c.i.c.m.d.l.b;
@@ -1072,7 +1074,7 @@ public class x {
                                     arrayList4.add(b6);
                                     if (!z3) {
                                         String name3 = next.getName();
-                                        if (!(name3.startsWith("event") && name3.endsWith("_"))) {
+                                        if (!(name3.startsWith(NotificationCompat.CATEGORY_EVENT) && name3.endsWith("_"))) {
                                         }
                                     }
                                     z3 = true;
@@ -1336,7 +1338,7 @@ public class x {
         int i3 = context.getResources().getConfiguration().orientation;
         long p = h.p();
         ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
-        ((ActivityManager) context.getSystemService("activity")).getMemoryInfo(memoryInfo);
+        ((ActivityManager) context.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY)).getMemoryInfo(memoryInfo);
         long j3 = p - memoryInfo.availMem;
         long a3 = h.a(Environment.getDataDirectory().getPath());
         ActivityManager.RunningAppProcessInfo i4 = h.i(context.getPackageName(), context);
diff --git a/app/src/main/java/c/i/c/m/d/k/z0.java b/app/src/main/java/c/i/c/m/d/k/z0.java
index 555cde027f..637416232c 100644
--- a/app/src/main/java/c/i/c/m/d/k/z0.java
+++ b/app/src/main/java/c/i/c/m/d/k/z0.java
@@ -2,13 +2,14 @@ package c.i.c.m.d.k;
 
 import androidx.annotation.NonNull;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import java.io.File;
 import java.nio.charset.Charset;
 import org.json.JSONException;
 import org.json.JSONObject;
 /* compiled from: MetaDataStore */
 public class z0 {
-    public static final Charset a = Charset.forName("UTF-8");
+    public static final Charset a = Charset.forName(Constants.ENCODING);
     public final File b;
 
     public z0(File file) {
diff --git a/app/src/main/java/c/i/c/m/d/l/c.java b/app/src/main/java/c/i/c/m/d/l/c.java
index bf280b8e78..96b0394d01 100644
--- a/app/src/main/java/c/i/c/m/d/l/c.java
+++ b/app/src/main/java/c/i/c/m/d/l/c.java
@@ -1,5 +1,6 @@
 package c.i.c.m.d.l;
 
+import com.discord.api.permission.Permission;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
@@ -119,7 +120,7 @@ public class c implements Closeable {
             File file2 = new File(file.getPath() + ".tmp");
             RandomAccessFile randomAccessFile = new RandomAccessFile(file2, "rwd");
             try {
-                randomAccessFile.setLength(4096);
+                randomAccessFile.setLength(Permission.SEND_TTS_MESSAGES);
                 randomAccessFile.seek(0);
                 byte[] bArr = new byte[16];
                 int[] iArr = {4096, 0, 0, 0};
diff --git a/app/src/main/java/c/i/c/m/d/l/e.java b/app/src/main/java/c/i/c/m/d/l/e.java
index 46e367b504..ae332d85d8 100644
--- a/app/src/main/java/c/i/c/m/d/l/e.java
+++ b/app/src/main/java/c/i/c/m/d/l/e.java
@@ -3,13 +3,14 @@ package c.i.c.m.d.l;
 import android.util.Log;
 import c.i.c.m.d.b;
 import c.i.c.m.d.k.h;
+import com.adjust.sdk.Constants;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Locale;
 /* compiled from: QueueFileLogStore */
 public class e implements a {
-    public static final Charset a = Charset.forName("UTF-8");
+    public static final Charset a = Charset.forName(Constants.ENCODING);
     public final File b;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/c/m/d/m/a.java b/app/src/main/java/c/i/c/m/d/m/a.java
index fe45b604a8..54ad48561e 100644
--- a/app/src/main/java/c/i/c/m/d/m/a.java
+++ b/app/src/main/java/c/i/c/m/d/m/a.java
@@ -1,6 +1,8 @@
 package c.i.c.m.d.m;
 
 import c.i.c.m.d.m.v;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import java.io.IOException;
 /* compiled from: AutoCrashlyticsReportEncoder */
 public final class a implements c.i.c.p.g.a {
@@ -50,7 +52,7 @@ public final class a implements c.i.c.p.g.a {
         public void a(Object obj, c.i.c.p.d dVar) throws IOException {
             v.c cVar = (v.c) obj;
             c.i.c.p.d dVar2 = dVar;
-            dVar2.f("files", cVar.a());
+            dVar2.f(ChatInputComponentTypes.FILES, cVar.a());
             dVar2.f("orgId", cVar.b());
         }
     }
@@ -170,7 +172,7 @@ public final class a implements c.i.c.p.g.a {
             c.i.c.p.d dVar2 = dVar;
             dVar2.b("baseAddress", aVar.a());
             dVar2.b("size", aVar.c());
-            dVar2.f("name", aVar.b());
+            dVar2.f(ModelAuditLogEntry.CHANGE_KEY_NAME, aVar.b());
             String d = aVar.d();
             dVar2.f("uuid", d != null ? d.getBytes(v.a) : null);
         }
@@ -202,7 +204,7 @@ public final class a implements c.i.c.p.g.a {
             v.d.AbstractC0135d.a.b.AbstractC0138b bVar = (v.d.AbstractC0135d.a.b.AbstractC0138b) obj;
             c.i.c.p.d dVar2 = dVar;
             dVar2.f("type", bVar.e());
-            dVar2.f("reason", bVar.d());
+            dVar2.f(ModelAuditLogEntry.CHANGE_KEY_REASON, bVar.d());
             dVar2.f("frames", bVar.b());
             dVar2.f("causedBy", bVar.a());
             dVar2.c("overflowCount", bVar.c());
@@ -218,8 +220,8 @@ public final class a implements c.i.c.p.g.a {
         public void a(Object obj, c.i.c.p.d dVar) throws IOException {
             v.d.AbstractC0135d.a.b.c cVar = (v.d.AbstractC0135d.a.b.c) obj;
             c.i.c.p.d dVar2 = dVar;
-            dVar2.f("name", cVar.c());
-            dVar2.f("code", cVar.b());
+            dVar2.f(ModelAuditLogEntry.CHANGE_KEY_NAME, cVar.c());
+            dVar2.f(ModelAuditLogEntry.CHANGE_KEY_CODE, cVar.b());
             dVar2.b("address", cVar.a());
         }
     }
@@ -233,7 +235,7 @@ public final class a implements c.i.c.p.g.a {
         public void a(Object obj, c.i.c.p.d dVar) throws IOException {
             v.d.AbstractC0135d.a.b.AbstractC0139d dVar2 = (v.d.AbstractC0135d.a.b.AbstractC0139d) obj;
             c.i.c.p.d dVar3 = dVar;
-            dVar3.f("name", dVar2.c());
+            dVar3.f(ModelAuditLogEntry.CHANGE_KEY_NAME, dVar2.c());
             dVar3.c("importance", dVar2.b());
             dVar3.f("frames", dVar2.a());
         }
diff --git a/app/src/main/java/c/i/c/m/d/m/v.java b/app/src/main/java/c/i/c/m/d/m/v.java
index dddfc4db60..af76b73066 100644
--- a/app/src/main/java/c/i/c/m/d/m/v.java
+++ b/app/src/main/java/c/i/c/m/d/m/v.java
@@ -4,12 +4,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import c.i.c.m.d.m.b;
 import c.i.c.m.d.m.f;
+import com.adjust.sdk.Constants;
 import com.google.auto.value.AutoValue;
 import java.nio.charset.Charset;
 /* compiled from: CrashlyticsReport */
 @AutoValue
 public abstract class v {
-    public static final Charset a = Charset.forName("UTF-8");
+    public static final Charset a = Charset.forName(Constants.ENCODING);
 
     /* compiled from: CrashlyticsReport */
     @AutoValue.Builder
diff --git a/app/src/main/java/c/i/c/m/d/m/x/d.java b/app/src/main/java/c/i/c/m/d/m/x/d.java
index 47d49d66a4..b838727def 100644
--- a/app/src/main/java/c/i/c/m/d/m/x/d.java
+++ b/app/src/main/java/c/i/c/m/d/m/x/d.java
@@ -5,6 +5,7 @@ import c.i.c.m.d.m.p;
 import c.i.c.m.d.m.w;
 import c.i.c.m.d.m.x.h;
 import c.i.c.p.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Objects;
 /* compiled from: CrashlyticsReportJsonTransform */
 public final /* synthetic */ class d implements h.a {
@@ -30,7 +31,7 @@ public final /* synthetic */ class d implements h.a {
                     }
                     break;
                 case 3373707:
-                    if (nextName.equals("name")) {
+                    if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                         c2 = 1;
                         break;
                     }
diff --git a/app/src/main/java/c/i/c/m/d/m/x/e.java b/app/src/main/java/c/i/c/m/d/m/x/e.java
index e98577ff73..4971457781 100644
--- a/app/src/main/java/c/i/c/m/d/m/x/e.java
+++ b/app/src/main/java/c/i/c/m/d/m/x/e.java
@@ -6,6 +6,7 @@ import c.i.c.m.d.m.m;
 import c.i.c.m.d.m.v;
 import c.i.c.m.d.m.x.h;
 import c.i.c.p.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.Objects;
 /* compiled from: CrashlyticsReportJsonTransform */
 public final /* synthetic */ class e implements h.a {
@@ -26,7 +27,7 @@ public final /* synthetic */ class e implements h.a {
             char c2 = 65535;
             switch (nextName.hashCode()) {
                 case 3373707:
-                    if (nextName.equals("name")) {
+                    if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                         c2 = 0;
                         break;
                     }
diff --git a/app/src/main/java/c/i/c/m/d/m/x/h.java b/app/src/main/java/c/i/c/m/d/m/x/h.java
index f62befc61a..28a9e6333e 100644
--- a/app/src/main/java/c/i/c/m/d/m/x/h.java
+++ b/app/src/main/java/c/i/c/m/d/m/x/h.java
@@ -21,6 +21,8 @@ import c.i.c.m.d.m.v;
 import c.i.c.m.d.m.w;
 import c.i.c.p.h.d;
 import c.i.c.p.h.e;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import java.io.IOException;
 import java.io.StringReader;
 import java.nio.charset.Charset;
@@ -294,7 +296,7 @@ public class h {
                                             int hashCode = nextName5.hashCode();
                                             if (hashCode != -1147692044) {
                                                 if (hashCode != 3059181) {
-                                                    if (hashCode == 3373707 && nextName5.equals("name")) {
+                                                    if (hashCode == 3373707 && nextName5.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                                                         c6 = 2;
                                                         if (c6 != 0) {
                                                             l2 = Long.valueOf(jsonReader.nextLong());
@@ -310,7 +312,7 @@ public class h {
                                                             str3 = nextString2;
                                                         }
                                                     }
-                                                } else if (nextName5.equals("code")) {
+                                                } else if (nextName5.equals(ModelAuditLogEntry.CHANGE_KEY_CODE)) {
                                                     c6 = 1;
                                                     if (c6 != 0) {
                                                     }
@@ -459,7 +461,7 @@ public class h {
                     }
                     break;
                 case -934964668:
-                    if (nextName.equals("reason")) {
+                    if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
                         c2 = 1;
                         break;
                     }
@@ -672,7 +674,7 @@ public class h {
                     while (jsonReader.hasNext()) {
                         String nextName2 = jsonReader.nextName();
                         nextName2.hashCode();
-                        if (nextName2.equals("files")) {
+                        if (nextName2.equals(ChatInputComponentTypes.FILES)) {
                             wVar = a(jsonReader, b.a);
                         } else if (!nextName2.equals("orgId")) {
                             jsonReader.skipValue();
diff --git a/app/src/main/java/c/i/c/m/d/n/a.java b/app/src/main/java/c/i/c/m/d/n/a.java
index ce35f7bb44..2b82d823ff 100644
--- a/app/src/main/java/c/i/c/m/d/n/a.java
+++ b/app/src/main/java/c/i/c/m/d/n/a.java
@@ -1,6 +1,7 @@
 package c.i.c.m.d.n;
 
 import c.c.a.y.b;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import f0.d;
 import f0.f0.c;
@@ -94,9 +95,9 @@ public class a {
         }
         MultipartBody.a aVar2 = this.f;
         Objects.requireNonNull(aVar2);
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(str2, "value");
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(str2, "value");
         aVar2.a(MultipartBody.Part.b(str, null, RequestBody.Companion.a(str2, null)));
         this.f = aVar2;
@@ -113,7 +114,7 @@ public class a {
         }
         MultipartBody.a aVar3 = this.f;
         Objects.requireNonNull(aVar3);
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(create, "body");
         aVar3.a(MultipartBody.Part.b(str, str2, create));
         this.f = aVar3;
diff --git a/app/src/main/java/c/i/c/m/d/o/c.java b/app/src/main/java/c/i/c/m/d/o/c.java
index 6dd8922edd..6b44ac7785 100644
--- a/app/src/main/java/c/i/c/m/d/o/c.java
+++ b/app/src/main/java/c/i/c/m/d/o/c.java
@@ -1,5 +1,6 @@
 package c.i.c.m.d.o;
 
+import androidx.core.app.NotificationCompat;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.charset.Charset;
@@ -10,6 +11,6 @@ public final /* synthetic */ class c implements FilenameFilter {
     @Override // java.io.FilenameFilter
     public boolean accept(File file, String str) {
         Charset charset = g.a;
-        return str.startsWith("event") && !str.endsWith("_");
+        return str.startsWith(NotificationCompat.CATEGORY_EVENT) && !str.endsWith("_");
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/o/f.java b/app/src/main/java/c/i/c/m/d/o/f.java
index 253935fd0e..672a2a1946 100644
--- a/app/src/main/java/c/i/c/m/d/o/f.java
+++ b/app/src/main/java/c/i/c/m/d/o/f.java
@@ -1,5 +1,6 @@
 package c.i.c.m.d.o;
 
+import androidx.core.app.NotificationCompat;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.charset.Charset;
@@ -10,6 +11,6 @@ public final /* synthetic */ class f implements FilenameFilter {
     @Override // java.io.FilenameFilter
     public boolean accept(File file, String str) {
         Charset charset = g.a;
-        return str.startsWith("event");
+        return str.startsWith(NotificationCompat.CATEGORY_EVENT);
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/o/g.java b/app/src/main/java/c/i/c/m/d/o/g.java
index f125216e64..9b37571069 100644
--- a/app/src/main/java/c/i/c/m/d/o/g.java
+++ b/app/src/main/java/c/i/c/m/d/o/g.java
@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import c.i.c.m.d.m.x.h;
 import c.i.c.m.d.s.d;
+import com.adjust.sdk.Constants;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileFilter;
@@ -22,7 +23,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 /* compiled from: CrashlyticsReportPersistence */
 public class g {
-    public static final Charset a = Charset.forName("UTF-8");
+    public static final Charset a = Charset.forName(Constants.ENCODING);
     public static final int b = 15;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/c/m/d/p/a.java b/app/src/main/java/c/i/c/m/d/p/a.java
index 66b2f675a7..67e50535ef 100644
--- a/app/src/main/java/c/i/c/m/d/p/a.java
+++ b/app/src/main/java/c/i/c/m/d/p/a.java
@@ -1,5 +1,6 @@
 package c.i.c.m.d.p;
 
+import com.adjust.sdk.Constants;
 import java.io.UnsupportedEncodingException;
 /* compiled from: ByteString */
 public final class a {
@@ -12,7 +13,7 @@ public final class a {
 
     public static a a(String str) {
         try {
-            return new a(str.getBytes("UTF-8"));
+            return new a(str.getBytes(Constants.ENCODING));
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException("UTF-8 not supported.", e);
         }
diff --git a/app/src/main/java/c/i/c/m/d/r/b.java b/app/src/main/java/c/i/c/m/d/r/b.java
index 4341cb89b3..f66a0e7fa4 100644
--- a/app/src/main/java/c/i/c/m/d/r/b.java
+++ b/app/src/main/java/c/i/c/m/d/r/b.java
@@ -2,6 +2,7 @@ package c.i.c.m.d.r;
 
 import c.i.a.b.e;
 import c.i.c.m.d.m.v;
+import com.adjust.sdk.Constants;
 import java.nio.charset.Charset;
 /* compiled from: DataTransportCrashlyticsReportSender */
 public final /* synthetic */ class b implements e {
@@ -9,6 +10,6 @@ public final /* synthetic */ class b implements e {
 
     @Override // c.i.a.b.e
     public Object apply(Object obj) {
-        return c.a.g((v) obj).getBytes(Charset.forName("UTF-8"));
+        return c.a.g((v) obj).getBytes(Charset.forName(Constants.ENCODING));
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/s/i/a.java b/app/src/main/java/c/i/c/m/d/s/i/a.java
index aae0f25c5e..099dae7a12 100644
--- a/app/src/main/java/c/i/c/m/d/s/i/a.java
+++ b/app/src/main/java/c/i/c/m/d/s/i/a.java
@@ -1,6 +1,7 @@
 package c.i.c.m.d.s.i;
 
 import android.util.Log;
+import androidx.browser.trusted.sharing.ShareTarget;
 import c.i.c.m.d.k.h;
 import c.i.c.m.d.n.b;
 import c.i.c.m.d.n.c;
@@ -39,7 +40,7 @@ public abstract class a extends c.i.c.m.d.k.a {
             try {
                 c a = b.a();
                 int i = a.a;
-                String str = "POST".equalsIgnoreCase(c.c.a.y.b.n(b.b)) ? "Create" : "Update";
+                String str = ShareTarget.METHOD_POST.equalsIgnoreCase(c.c.a.y.b.n(b.b)) ? "Create" : "Update";
                 bVar.b(str + " app request ID: " + a.f1346c.c("X-REQUEST-ID"));
                 StringBuilder sb = new StringBuilder();
                 sb.append("Result was ");
diff --git a/app/src/main/java/c/i/c/m/d/s/i/c.java b/app/src/main/java/c/i/c/m/d/s/i/c.java
index 6046db72e0..a18fc2fb57 100644
--- a/app/src/main/java/c/i/c/m/d/s/i/c.java
+++ b/app/src/main/java/c/i/c/m/d/s/i/c.java
@@ -5,6 +5,7 @@ import c.i.c.m.d.k.a;
 import c.i.c.m.d.k.h;
 import c.i.c.m.d.k.v0;
 import c.i.c.m.d.s.h.g;
+import com.discord.restapi.RestAPIBuilder;
 import java.util.HashMap;
 import java.util.Map;
 import org.json.JSONObject;
@@ -23,7 +24,7 @@ public class c extends a implements d {
         e(aVar, "X-CRASHLYTICS-GOOGLE-APP-ID", gVar.a);
         e(aVar, "X-CRASHLYTICS-API-CLIENT-TYPE", "android");
         e(aVar, "X-CRASHLYTICS-API-CLIENT-VERSION", "17.3.0");
-        e(aVar, "Accept", "application/json");
+        e(aVar, "Accept", RestAPIBuilder.CONTENT_TYPE_JSON);
         e(aVar, "X-CRASHLYTICS-DEVICE-MODEL", gVar.b);
         e(aVar, "X-CRASHLYTICS-OS-BUILD-VERSION", gVar.f1356c);
         e(aVar, "X-CRASHLYTICS-OS-DISPLAY-VERSION", gVar.d);
diff --git a/app/src/main/java/c/i/c/m/e/a.java b/app/src/main/java/c/i/c/m/e/a.java
index 1ac8101920..f6c6599529 100644
--- a/app/src/main/java/c/i/c/m/e/a.java
+++ b/app/src/main/java/c/i/c/m/e/a.java
@@ -6,6 +6,7 @@ import androidx.annotation.Nullable;
 import c.i.c.m.d.b;
 import c.i.c.m.d.k.h;
 import c.i.c.m.e.g;
+import com.adjust.sdk.Constants;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -14,7 +15,7 @@ import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 /* compiled from: BreakpadController */
 public class a implements e {
-    public static final Charset a = Charset.forName("UTF-8");
+    public static final Charset a = Charset.forName(Constants.ENCODING);
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/c/s/b.java b/app/src/main/java/c/i/c/s/b.java
index 130c6aaf85..29198dc111 100644
--- a/app/src/main/java/c/i/c/s/b.java
+++ b/app/src/main/java/c/i/c/s/b.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.util.Log;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.util.Objects;
 import java.util.concurrent.Callable;
 /* compiled from: com.google.firebase:firebase-iid@@21.0.0 */
@@ -47,7 +48,7 @@ public final /* synthetic */ class b implements Callable {
                     StringBuilder sb = new StringBuilder(String.valueOf(str3).length() + 94 + String.valueOf(str4).length());
                     sb.append("Error resolving target intent service, skipping classname enforcement. Resolved service was: ");
                     sb.append(str3);
-                    sb.append("/");
+                    sb.append(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
                     sb.append(str4);
                     Log.e("FirebaseInstanceId", sb.toString());
                 } else {
diff --git a/app/src/main/java/c/i/c/s/n.java b/app/src/main/java/c/i/c/s/n.java
index 8a4fd97ee5..9ea05844fd 100644
--- a/app/src/main/java/c/i/c/s/n.java
+++ b/app/src/main/java/c/i/c/s/n.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
+import androidx.core.app.NotificationCompat;
 import c.i.a.f.d.b;
 import c.i.a.f.d.f;
 import c.i.a.f.d.r;
@@ -19,6 +20,7 @@ import c.i.c.t.a;
 import c.i.c.u.g;
 import c.i.c.u.k;
 import c.i.c.x.h;
+import com.adjust.sdk.Constants;
 import com.google.android.gms.tasks.Task;
 import java.io.IOException;
 import java.security.MessageDigest;
@@ -61,7 +63,7 @@ public class n {
         d.a a;
         PackageInfo c2;
         bundle.putString("scope", str3);
-        bundle.putString("sender", str2);
+        bundle.putString(NotificationCompat.MessagingStyle.Message.KEY_SENDER, str2);
         bundle.putString("subtype", str2);
         bundle.putString("appid", str);
         c cVar = this.a;
@@ -88,7 +90,7 @@ public class n {
         c cVar2 = this.a;
         cVar2.a();
         try {
-            str5 = Base64.encodeToString(MessageDigest.getInstance("SHA-1").digest(cVar2.e.getBytes()), 11);
+            str5 = Base64.encodeToString(MessageDigest.getInstance(Constants.SHA1).digest(cVar2.e.getBytes()), 11);
         } catch (NoSuchAlgorithmException unused) {
             str5 = "[HASH-ERROR]";
         }
diff --git a/app/src/main/java/c/i/c/u/f.java b/app/src/main/java/c/i/c/u/f.java
index 122fa6bc60..497bacf996 100644
--- a/app/src/main/java/c/i/c/u/f.java
+++ b/app/src/main/java/c/i/c/u/f.java
@@ -6,6 +6,7 @@ import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.browser.trusted.sharing.ShareTarget;
 import c.i.c.c;
 import c.i.c.r.d;
 import c.i.c.u.o.a;
@@ -154,7 +155,7 @@ public class f implements g {
             for (int i = 0; i <= 1; i++) {
                 HttpURLConnection c2 = cVar.c(a2, d);
                 try {
-                    c2.setRequestMethod("POST");
+                    c2.setRequestMethod(ShareTarget.METHOD_POST);
                     c2.addRequestProperty("Authorization", "FIS_v2 " + str2);
                     c2.setDoOutput(true);
                     cVar.h(c2);
@@ -336,7 +337,7 @@ public class f implements g {
             for (int i2 = 0; i2 <= 1; i2++) {
                 HttpURLConnection c2 = cVar.c(a2, d);
                 try {
-                    c2.setRequestMethod("POST");
+                    c2.setRequestMethod(ShareTarget.METHOD_POST);
                     c2.setDoOutput(true);
                     if (str2 != null) {
                         c2.addRequestProperty("x-goog-fis-android-iid-migration-auth", str2);
diff --git a/app/src/main/java/c/i/c/u/o/c.java b/app/src/main/java/c/i/c/u/o/c.java
index 45ca13d404..cf94eb75a0 100644
--- a/app/src/main/java/c/i/c/u/o/c.java
+++ b/app/src/main/java/c/i/c/u/o/c.java
@@ -2,6 +2,7 @@ package c.i.c.u.o;
 
 import androidx.annotation.NonNull;
 import c.i.c.u.o.a;
+import com.adjust.sdk.Constants;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -49,7 +50,7 @@ public class c {
             cVar.a();
             File createTempFile = File.createTempFile("PersistedInstallation", "tmp", cVar.d.getFilesDir());
             FileOutputStream fileOutputStream = new FileOutputStream(createTempFile);
-            fileOutputStream.write(jSONObject.toString().getBytes("UTF-8"));
+            fileOutputStream.write(jSONObject.toString().getBytes(Constants.ENCODING));
             fileOutputStream.close();
             if (createTempFile.renameTo(this.a)) {
                 return dVar;
diff --git a/app/src/main/java/c/i/c/u/p/c.java b/app/src/main/java/c/i/c/u/p/c.java
index 2063eb4582..1bbdcef654 100644
--- a/app/src/main/java/c/i/c/u/p/c.java
+++ b/app/src/main/java/c/i/c/u/p/c.java
@@ -17,7 +17,10 @@ import c.i.c.u.p.b;
 import c.i.c.u.p.d;
 import c.i.c.u.p.f;
 import c.i.c.x.h;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.restapi.RestAPIBuilder;
 import com.google.firebase.installations.FirebaseInstallationsException;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -37,7 +40,7 @@ import org.json.JSONObject;
 /* compiled from: FirebaseInstallationServiceClient */
 public class c {
     public static final Pattern a = Pattern.compile("[0-9]+s");
-    public static final Charset b = Charset.forName("UTF-8");
+    public static final Charset b = Charset.forName(Constants.ENCODING);
 
     /* renamed from: c  reason: collision with root package name */
     public final Context f1382c;
@@ -133,8 +136,8 @@ public class c {
             httpURLConnection.setConnectTimeout(10000);
             httpURLConnection.setUseCaches(false);
             httpURLConnection.setReadTimeout(10000);
-            httpURLConnection.addRequestProperty("Content-Type", "application/json");
-            httpURLConnection.addRequestProperty("Accept", "application/json");
+            httpURLConnection.addRequestProperty("Content-Type", RestAPIBuilder.CONTENT_TYPE_JSON);
+            httpURLConnection.addRequestProperty("Accept", RestAPIBuilder.CONTENT_TYPE_JSON);
             httpURLConnection.addRequestProperty("Content-Encoding", "gzip");
             httpURLConnection.addRequestProperty("Cache-Control", "no-cache");
             httpURLConnection.addRequestProperty("X-Android-Package", this.f1382c.getPackageName());
@@ -177,7 +180,7 @@ public class c {
         f fVar = null;
         while (jsonReader.hasNext()) {
             String nextName = jsonReader.nextName();
-            if (nextName.equals("name")) {
+            if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                 str = jsonReader.nextString();
             } else if (nextName.equals("fid")) {
                 str2 = jsonReader.nextString();
@@ -237,7 +240,7 @@ public class c {
             jSONObject.put("appId", str2);
             jSONObject.put("authVersion", "FIS_v2");
             jSONObject.put("sdkVersion", "a:16.3.4");
-            i(httpURLConnection, jSONObject.toString().getBytes("UTF-8"));
+            i(httpURLConnection, jSONObject.toString().getBytes(Constants.ENCODING));
         } catch (JSONException e) {
             throw new IllegalStateException(e);
         }
@@ -249,7 +252,7 @@ public class c {
             jSONObject.put("sdkVersion", "a:16.3.4");
             JSONObject jSONObject2 = new JSONObject();
             jSONObject2.put("installation", jSONObject);
-            i(httpURLConnection, jSONObject2.toString().getBytes("UTF-8"));
+            i(httpURLConnection, jSONObject2.toString().getBytes(Constants.ENCODING));
         } catch (JSONException e) {
             throw new IllegalStateException(e);
         }
diff --git a/app/src/main/java/c/i/c/w/a.java b/app/src/main/java/c/i/c/w/a.java
index 88cfeb531e..f12f700bd0 100644
--- a/app/src/main/java/c/i/c/w/a.java
+++ b/app/src/main/java/c/i/c/w/a.java
@@ -10,13 +10,14 @@ import android.graphics.drawable.AdaptiveIconDrawable;
 import android.os.Build;
 import android.os.SystemClock;
 import android.util.Log;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import java.util.concurrent.atomic.AtomicInteger;
 /* compiled from: com.google.firebase:firebase-messaging@@21.0.0 */
 public final class a {
     public static final AtomicInteger a = new AtomicInteger((int) SystemClock.elapsedRealtime());
 
     public static PendingIntent a(Context context, Intent intent) {
-        return PendingIntent.getBroadcast(context, a.incrementAndGet(), new Intent("com.google.firebase.MESSAGING_EVENT").setComponent(new ComponentName(context, "com.google.firebase.iid.FirebaseInstanceIdReceiver")).putExtra("wrapped_intent", intent), 1073741824);
+        return PendingIntent.getBroadcast(context, a.incrementAndGet(), new Intent("com.google.firebase.MESSAGING_EVENT").setComponent(new ComponentName(context, "com.google.firebase.iid.FirebaseInstanceIdReceiver")).putExtra("wrapped_intent", intent), BasicMeasure.EXACTLY);
     }
 
     @TargetApi(26)
diff --git a/app/src/main/java/c/i/c/w/c.java b/app/src/main/java/c/i/c/w/c.java
index e8ee3b340d..e2903c6b23 100644
--- a/app/src/main/java/c/i/c/w/c.java
+++ b/app/src/main/java/c/i/c/w/c.java
@@ -20,6 +20,8 @@ import android.os.Process;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import c.d.b.a.a;
@@ -129,7 +131,7 @@ public class c {
         }
         if (!((KeyguardManager) this.b.getSystemService("keyguard")).inKeyguardRestrictedInputMode()) {
             int myPid = Process.myPid();
-            List<ActivityManager.RunningAppProcessInfo> runningAppProcesses = ((ActivityManager) this.b.getSystemService("activity")).getRunningAppProcesses();
+            List<ActivityManager.RunningAppProcessInfo> runningAppProcesses = ((ActivityManager) this.b.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY)).getRunningAppProcesses();
             if (runningAppProcesses != null) {
                 Iterator<ActivityManager.RunningAppProcessInfo> it = runningAppProcesses.iterator();
                 while (true) {
@@ -249,7 +251,7 @@ public class c {
                                         }
                                     }
                                     intent.putExtras(bundle2);
-                                    pendingIntent = PendingIntent.getActivity(context, a.a.incrementAndGet(), intent, 1073741824);
+                                    pendingIntent = PendingIntent.getActivity(context, a.a.incrementAndGet(), intent, BasicMeasure.EXACTLY);
                                     if (rVar.a("google.c.a.e")) {
                                         pendingIntent = a.a(context, new Intent("com.google.firebase.messaging.NOTIFICATION_OPEN").putExtras(rVar.g()).putExtra("pending_intent", pendingIntent));
                                     }
diff --git a/app/src/main/java/c/i/c/w/m.java b/app/src/main/java/c/i/c/w/m.java
index b19ddf05b3..367d12a54d 100644
--- a/app/src/main/java/c/i/c/w/m.java
+++ b/app/src/main/java/c/i/c/w/m.java
@@ -2,8 +2,11 @@ package c.i.c.w;
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
 import c.i.c.p.d;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.firebase.iid.FirebaseInstanceId;
 import java.io.IOException;
 /* compiled from: com.google.firebase:firebase-messaging@@21.0.0 */
@@ -15,7 +18,7 @@ public final class m {
     public static class a implements c.i.c.p.c<m> {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
         /* JADX WARNING: Code restructure failed: missing block: B:31:0x00a6, code lost:
-            if ("normal".equals(r1) != false) goto L_0x00a8;
+            if (com.adjust.sdk.Constants.NORMAL.equals(r1) != false) goto L_0x00a8;
          */
         /* JADX WARNING: Code restructure failed: missing block: B:63:0x0161, code lost:
             if (r0.isEmpty() != false) goto L_0x0163;
@@ -55,7 +58,7 @@ public final class m {
                 i = 0;
             }
             dVar2.c("ttl", i);
-            dVar2.f("event", mVar.a);
+            dVar2.f(NotificationCompat.CATEGORY_EVENT, mVar.a);
             FirebaseInstanceId instance = FirebaseInstanceId.getInstance(c.i.c.c.b());
             FirebaseInstanceId.c(instance.f);
             if (instance.p(instance.j())) {
@@ -87,7 +90,7 @@ public final class m {
                 }
                 a = q.a(intent);
                 if (a != null) {
-                    dVar2.f("topic", a);
+                    dVar2.f(ModelAuditLogEntry.CHANGE_KEY_TOPIC, a);
                 }
                 stringExtra2 = intent.getStringExtra("collapse_key");
                 if (stringExtra2 != null) {
@@ -119,7 +122,7 @@ public final class m {
                 }
                 return;
             }
-            if ("high".equals(stringExtra3)) {
+            if (Constants.HIGH.equals(stringExtra3)) {
                 i2 = 1;
             }
             dVar2.c("priority", i2);
diff --git a/app/src/main/java/c/i/c/w/n.java b/app/src/main/java/c/i/c/w/n.java
index 78844a108e..f0908c2ca5 100644
--- a/app/src/main/java/c/i/c/w/n.java
+++ b/app/src/main/java/c/i/c/w/n.java
@@ -6,6 +6,7 @@ import android.util.Log;
 import c.i.a.f.h.i.b;
 import c.i.a.f.h.i.d;
 import c.i.a.f.h.i.e;
+import com.esotericsoftware.kryo.io.Util;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLConnection;
@@ -41,7 +42,7 @@ public final /* synthetic */ class n implements Callable {
                 loop0:
                 while (true) {
                     if (i3 < 2147483639) {
-                        int min = Math.min(i2, 2147483639 - i3);
+                        int min = Math.min(i2, Util.MAX_SAFE_ARRAY_SIZE - i3);
                         byte[] bArr = new byte[min];
                         arrayDeque.add(bArr);
                         int i4 = 0;
@@ -57,7 +58,7 @@ public final /* synthetic */ class n implements Callable {
                         long j = ((long) i2) << 1;
                         i2 = j > 2147483647L ? Integer.MAX_VALUE : j < -2147483648L ? Integer.MIN_VALUE : (int) j;
                     } else if (dVar.read() == -1) {
-                        a = b.a(arrayDeque, 2147483639);
+                        a = b.a(arrayDeque, Util.MAX_SAFE_ARRAY_SIZE);
                     } else {
                         throw new OutOfMemoryError("input is too large to fit in a byte array");
                     }
diff --git a/app/src/main/java/c/i/c/w/q.java b/app/src/main/java/c/i/c/w/q.java
index b195e680dc..c57a4a4e3a 100644
--- a/app/src/main/java/c/i/c/w/q.java
+++ b/app/src/main/java/c/i/c/w/q.java
@@ -11,6 +11,7 @@ import c.i.c.p.a;
 import c.i.c.p.h.d;
 import c.i.c.p.h.e;
 import c.i.c.w.m;
+import com.google.firebase.messaging.FirebaseMessagingService;
 /* compiled from: com.google.firebase:firebase-messaging@@21.0.0 */
 public class q {
     public static final a a;
@@ -91,7 +92,7 @@ public class q {
     }
 
     public static boolean c(Intent intent) {
-        if (intent == null || "com.google.firebase.messaging.RECEIVE_DIRECT_BOOT".equals(intent.getAction())) {
+        if (intent == null || FirebaseMessagingService.ACTION_DIRECT_BOOT_REMOTE_INTENT.equals(intent.getAction())) {
             return false;
         }
         return "1".equals(intent.getStringExtra("google.c.a.e"));
diff --git a/app/src/main/java/c/i/c/w/y.java b/app/src/main/java/c/i/c/w/y.java
index 6d67a53026..8b690f0a36 100644
--- a/app/src/main/java/c/i/c/w/y.java
+++ b/app/src/main/java/c/i/c/w/y.java
@@ -8,6 +8,7 @@ import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 import androidx.collection.ArrayMap;
+import androidx.exifinterface.media.ExifInterface;
 import c.i.a.f.e.o.c;
 import c.i.c.s.n;
 import c.i.c.s.o;
@@ -132,7 +133,7 @@ public class y {
                             c2 = 1;
                         }
                     }
-                } else if (str.equals("S")) {
+                } else if (str.equals(ExifInterface.LATITUDE_SOUTH)) {
                     c2 = 0;
                 }
                 if (c2 == 0) {
diff --git a/app/src/main/java/c/i/c/x/c.java b/app/src/main/java/c/i/c/x/c.java
index d462f83667..e38b6d6ac7 100644
--- a/app/src/main/java/c/i/c/x/c.java
+++ b/app/src/main/java/c/i/c/x/c.java
@@ -1,5 +1,6 @@
 package c.i.c.x;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
@@ -19,7 +20,7 @@ public class c implements h {
         while (it.hasNext()) {
             e next = it.next();
             sb.append(next.a());
-            sb.append('/');
+            sb.append(MentionUtilsKt.SLASH_CHAR);
             sb.append(next.b());
             if (it.hasNext()) {
                 sb.append(' ');
diff --git a/app/src/main/java/c/i/d/q/x/d/a.java b/app/src/main/java/c/i/d/q/x/d/a.java
index 056471e400..5911c94c35 100644
--- a/app/src/main/java/c/i/d/q/x/d/a.java
+++ b/app/src/main/java/c/i/d/q/x/d/a.java
@@ -1,5 +1,6 @@
 package c.i.d.q.x.d;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Date;
@@ -46,12 +47,12 @@ public class a {
                     int i11 = i10 + 1;
                     int i12 = i11 + 2;
                     i4 = c(str, i11, i12);
-                    if (a(str, i12, ':')) {
+                    if (a(str, i12, MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR)) {
                         i12++;
                     }
                     int i13 = i12 + 2;
                     i3 = c(str, i12, i13);
-                    if (a(str, i13, ':')) {
+                    if (a(str, i13, MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR)) {
                         i13++;
                     }
                     if (str.length() <= i13 || (charAt = str.charAt(i13)) == 'Z' || charAt == '+' || charAt == '-') {
diff --git a/app/src/main/java/c/i/e/f.java b/app/src/main/java/c/i/e/f.java
index 94123dcb67..cc45881601 100644
--- a/app/src/main/java/c/i/e/f.java
+++ b/app/src/main/java/c/i/e/f.java
@@ -1,4 +1,6 @@
 package c.i.e;
+
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: LuminanceSource */
 public abstract class f {
     public final int a;
@@ -29,7 +31,7 @@ public abstract class f {
             bArr = b(i2, bArr);
             for (int i3 = 0; i3 < this.a; i3++) {
                 int i4 = bArr[i3] & 255;
-                sb.append(i4 < 64 ? '#' : i4 < 128 ? '+' : i4 < 192 ? '.' : ' ');
+                sb.append(i4 < 64 ? MentionUtilsKt.CHANNELS_CHAR : i4 < 128 ? '+' : i4 < 192 ? '.' : ' ');
             }
             sb.append('\n');
         }
diff --git a/app/src/main/java/c/i/e/m/c/a.java b/app/src/main/java/c/i/e/m/c/a.java
index fbfc5f4564..fdd54b4169 100644
--- a/app/src/main/java/c/i/e/m/c/a.java
+++ b/app/src/main/java/c/i/e/m/c/a.java
@@ -1,21 +1,24 @@
 package c.i.e.m.c;
 
+import androidx.exifinterface.media.ExifInterface;
+import c.a.r.n0.c.e;
 import c.i.e.n.b;
-import c.i.e.n.e;
 import c.i.e.n.l.c;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
+import com.google.android.material.badge.BadgeDrawable;
 import com.google.zxing.FormatException;
 import com.google.zxing.ReaderException;
 import com.google.zxing.common.reedsolomon.ReedSolomonException;
 import java.util.Arrays;
 /* compiled from: Decoder */
 public final class a {
-    public static final String[] a = {"CTRL_PS", " ", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "CTRL_LL", "CTRL_ML", "CTRL_DL", "CTRL_BS"};
-    public static final String[] b = {"CTRL_PS", " ", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "CTRL_US", "CTRL_ML", "CTRL_DL", "CTRL_BS"};
+    public static final String[] a = {"CTRL_PS", " ", ExifInterface.GPS_MEASUREMENT_IN_PROGRESS, "B", "C", "D", ExifInterface.LONGITUDE_EAST, "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", ExifInterface.LATITUDE_SOUTH, ExifInterface.GPS_DIRECTION_TRUE, "U", ExifInterface.GPS_MEASUREMENT_INTERRUPTED, ExifInterface.LONGITUDE_WEST, "X", "Y", "Z", "CTRL_LL", "CTRL_ML", "CTRL_DL", "CTRL_BS"};
+    public static final String[] b = {"CTRL_PS", " ", "a", "b", "c", "d", e.a, "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "CTRL_US", "CTRL_ML", "CTRL_DL", "CTRL_BS"};
 
     /* renamed from: c  reason: collision with root package name */
     public static final String[] f1405c = {"CTRL_PS", " ", "\u0001", "\u0002", "\u0003", "\u0004", "\u0005", "\u0006", "\u0007", "\b", "\t", "\n", "\u000b", "\f", "\r", "\u001b", "\u001c", "\u001d", "\u001e", "\u001f", "@", "\\", "^", "_", "`", "|", "~", "", "CTRL_LL", "CTRL_UL", "CTRL_PL", "CTRL_BS"};
-    public static final String[] d = {"", "\r", "\r\n", ". ", ", ", ": ", "!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", ".", "/", ":", ";", "<", "=", ">", "?", "[", "]", "{", "}", "CTRL_UL"};
-    public static final String[] e = {"CTRL_PS", " ", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ",", ".", "CTRL_UL", "CTRL_US"};
+    public static final String[] d = {"", "\r", "\r\n", ". ", ", ", ": ", "!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX, ",", "-", ".", AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, ":", ";", "<", "=", ">", "?", "[", "]", "{", "}", "CTRL_UL"};
+    public static final String[] e = {"CTRL_PS", " ", "0", "1", ExifInterface.GPS_MEASUREMENT_2D, ExifInterface.GPS_MEASUREMENT_3D, "4", "5", "6", "7", "8", "9", ",", ".", "CTRL_UL", "CTRL_US"};
     public c.i.e.m.a f;
 
     public static int b(boolean[] zArr, int i, int i2) {
@@ -29,7 +32,7 @@ public final class a {
         return i3;
     }
 
-    public e a(c.i.e.m.a aVar) throws FormatException {
+    public c.i.e.n.e a(c.i.e.m.a aVar) throws FormatException {
         int i;
         c.i.e.n.l.a aVar2;
         String str;
@@ -245,7 +248,7 @@ public final class a {
                     i46 = i47;
                     i25 = 8;
                 }
-                e eVar = new e(bArr, sb.toString(), null, null);
+                c.i.e.n.e eVar = new c.i.e.n.e(bArr, sb.toString(), null, null);
                 eVar.b = i35;
                 return eVar;
             } catch (ReedSolomonException e2) {
diff --git a/app/src/main/java/c/i/e/n/d.java b/app/src/main/java/c/i/e/n/d.java
index 018910fc64..90b0e43296 100644
--- a/app/src/main/java/c/i/e/n/d.java
+++ b/app/src/main/java/c/i/e/n/d.java
@@ -1,5 +1,6 @@
 package c.i.e.n;
 
+import com.adjust.sdk.Constants;
 import com.google.zxing.FormatException;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,7 +28,7 @@ public enum d {
     Cp1252(23, "windows-1252"),
     Cp1256(24, "windows-1256"),
     UnicodeBigUnmarked(25, "UTF-16BE", "UnicodeBig"),
-    UTF8(26, "UTF-8"),
+    UTF8(26, Constants.ENCODING),
     ASCII(new int[]{27, 170}, "US-ASCII"),
     Big5(28),
     GB18030(29, "GB2312", "EUC_CN", "GBK"),
diff --git a/app/src/main/java/c/i/e/o/b/c.java b/app/src/main/java/c/i/e/o/b/c.java
index 299b062f4b..3aac8e9a6f 100644
--- a/app/src/main/java/c/i/e/o/b/c.java
+++ b/app/src/main/java/c/i/e/o/b/c.java
@@ -1,4 +1,6 @@
 package c.i.e.o.b;
+
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: DecodedBitStreamParser */
 public final class c {
     public static final char[] a = {'*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'};
@@ -10,7 +12,7 @@ public final class c {
     public static final char[] e = {'`', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', 127};
 
     static {
-        char[] cArr = {'!', '\"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '^', '_'};
+        char[] cArr = {'!', '\"', MentionUtilsKt.CHANNELS_CHAR, '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', MentionUtilsKt.SLASH_CHAR, MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, ';', '<', '=', '>', '?', MentionUtilsKt.MENTIONS_CHAR, '[', '\\', ']', '^', '_'};
         b = cArr;
         d = cArr;
     }
diff --git a/app/src/main/java/c/i/e/o/b/e.java b/app/src/main/java/c/i/e/o/b/e.java
index b909b4d91a..cbff3f7820 100644
--- a/app/src/main/java/c/i/e/o/b/e.java
+++ b/app/src/main/java/c/i/e/o/b/e.java
@@ -1,7 +1,9 @@
 package c.i.e.o.b;
+
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
 /* compiled from: Version */
 public final class e {
-    public static final e[] a = {new e(1, 10, 10, 8, 8, new c(5, new b(1, 3, null), null)), new e(2, 12, 12, 10, 10, new c(7, new b(1, 5, null), null)), new e(3, 14, 14, 12, 12, new c(10, new b(1, 8, null), null)), new e(4, 16, 16, 14, 14, new c(12, new b(1, 12, null), null)), new e(5, 18, 18, 16, 16, new c(14, new b(1, 18, null), null)), new e(6, 20, 20, 18, 18, new c(18, new b(1, 22, null), null)), new e(7, 22, 22, 20, 20, new c(20, new b(1, 30, null), null)), new e(8, 24, 24, 22, 22, new c(24, new b(1, 36, null), null)), new e(9, 26, 26, 24, 24, new c(28, new b(1, 44, null), null)), new e(10, 32, 32, 14, 14, new c(36, new b(1, 62, null), null)), new e(11, 36, 36, 16, 16, new c(42, new b(1, 86, null), null)), new e(12, 40, 40, 18, 18, new c(48, new b(1, 114, null), null)), new e(13, 44, 44, 20, 20, new c(56, new b(1, 144, null), null)), new e(14, 48, 48, 22, 22, new c(68, new b(1, 174, null), null)), new e(15, 52, 52, 24, 24, new c(42, new b(2, 102, null), null)), new e(16, 64, 64, 14, 14, new c(56, new b(2, 140, null), null)), new e(17, 72, 72, 16, 16, new c(36, new b(4, 92, null), null)), new e(18, 80, 80, 18, 18, new c(48, new b(4, 114, null), null)), new e(19, 88, 88, 20, 20, new c(56, new b(4, 144, null), null)), new e(20, 96, 96, 22, 22, new c(68, new b(4, 174, null), null)), new e(21, 104, 104, 24, 24, new c(56, new b(6, 136, null), null)), new e(22, 120, 120, 18, 18, new c(68, new b(6, 175, null), null)), new e(23, 132, 132, 20, 20, new c(62, new b(8, 163, null), null)), new e(24, 144, 144, 22, 22, new c(62, new b(8, 156, null), new b(2, 155, null), null)), new e(25, 8, 18, 6, 16, new c(7, new b(1, 5, null), null)), new e(26, 8, 32, 6, 14, new c(11, new b(1, 10, null), null)), new e(27, 12, 26, 10, 24, new c(14, new b(1, 16, null), null)), new e(28, 12, 36, 10, 16, new c(18, new b(1, 22, null), null)), new e(29, 16, 36, 14, 16, new c(24, new b(1, 32, null), null)), new e(30, 16, 48, 14, 22, new c(28, new b(1, 49, null), null))};
+    public static final e[] a = {new e(1, 10, 10, 8, 8, new c(5, new b(1, 3, null), null)), new e(2, 12, 12, 10, 10, new c(7, new b(1, 5, null), null)), new e(3, 14, 14, 12, 12, new c(10, new b(1, 8, null), null)), new e(4, 16, 16, 14, 14, new c(12, new b(1, 12, null), null)), new e(5, 18, 18, 16, 16, new c(14, new b(1, 18, null), null)), new e(6, 20, 20, 18, 18, new c(18, new b(1, 22, null), null)), new e(7, 22, 22, 20, 20, new c(20, new b(1, 30, null), null)), new e(8, 24, 24, 22, 22, new c(24, new b(1, 36, null), null)), new e(9, 26, 26, 24, 24, new c(28, new b(1, 44, null), null)), new e(10, 32, 32, 14, 14, new c(36, new b(1, 62, null), null)), new e(11, 36, 36, 16, 16, new c(42, new b(1, 86, null), null)), new e(12, 40, 40, 18, 18, new c(48, new b(1, 114, null), null)), new e(13, 44, 44, 20, 20, new c(56, new b(1, 144, null), null)), new e(14, 48, 48, 22, 22, new c(68, new b(1, 174, null), null)), new e(15, 52, 52, 24, 24, new c(42, new b(2, 102, null), null)), new e(16, 64, 64, 14, 14, new c(56, new b(2, 140, null), null)), new e(17, 72, 72, 16, 16, new c(36, new b(4, 92, null), null)), new e(18, 80, 80, 18, 18, new c(48, new b(4, 114, null), null)), new e(19, 88, 88, 20, 20, new c(56, new b(4, 144, null), null)), new e(20, 96, 96, 22, 22, new c(68, new b(4, 174, null), null)), new e(21, 104, 104, 24, 24, new c(56, new b(6, 136, null), null)), new e(22, 120, 120, 18, 18, new c(68, new b(6, HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION, null), null)), new e(23, 132, 132, 20, 20, new c(62, new b(8, 163, null), null)), new e(24, 144, 144, 22, 22, new c(62, new b(8, 156, null), new b(2, 155, null), null)), new e(25, 8, 18, 6, 16, new c(7, new b(1, 5, null), null)), new e(26, 8, 32, 6, 14, new c(11, new b(1, 10, null), null)), new e(27, 12, 26, 10, 24, new c(14, new b(1, 16, null), null)), new e(28, 12, 36, 10, 16, new c(18, new b(1, 22, null), null)), new e(29, 16, 36, 14, 16, new c(24, new b(1, 32, null), null)), new e(30, 16, 48, 14, 22, new c(28, new b(1, 49, null), null))};
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/e/o/c/a.java b/app/src/main/java/c/i/e/o/c/a.java
index b30293ab3e..48abe5471b 100644
--- a/app/src/main/java/c/i/e/o/c/a.java
+++ b/app/src/main/java/c/i/e/o/c/a.java
@@ -3,6 +3,8 @@ package c.i.e.o.c;
 import c.i.e.k;
 import c.i.e.n.f;
 import c.i.e.n.i;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.google.zxing.NotFoundException;
 import java.io.Serializable;
 import java.util.Comparator;
@@ -27,7 +29,7 @@ public final class a {
         }
 
         public String toString() {
-            return this.a + "/" + this.b + '/' + this.f1420c;
+            return this.a + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + this.b + MentionUtilsKt.SLASH_CHAR + this.f1420c;
         }
     }
 
diff --git a/app/src/main/java/c/i/e/p/a.java b/app/src/main/java/c/i/e/p/a.java
index 6c237d7eab..91eadc66ae 100644
--- a/app/src/main/java/c/i/e/p/a.java
+++ b/app/src/main/java/c/i/e/p/a.java
@@ -1,5 +1,6 @@
 package c.i.e.p;
 
+import androidx.exifinterface.media.ExifInterface;
 import c.i.e.d;
 import c.i.e.i;
 import c.i.e.j;
@@ -120,10 +121,10 @@ public final class a implements i {
             StringBuilder sb = new StringBuilder(144);
             if (i27 == 2 || i27 == 3) {
                 if (i27 == 2) {
-                    str = new DecimalFormat("0000000000".substring(0, c.i.e.p.b.b.a(bArr, new byte[]{39, 40, 41, 42, 31, 32}))).format((long) c.i.e.p.b.b.a(bArr, new byte[]{33, 34, 35, 36, 25, 26, 27, 28, 29, 30, 19, 20, 21, 22, 23, 24, 13, 14, 15, 16, 17, 18, 7, 8, 9, 10, 11, 12, 1, 2}));
+                    str = new DecimalFormat("0000000000".substring(0, c.i.e.p.b.b.a(bArr, new byte[]{39, 40, 41, ExifInterface.START_CODE, 31, 32}))).format((long) c.i.e.p.b.b.a(bArr, new byte[]{33, 34, 35, 36, 25, 26, 27, 28, 29, 30, 19, 20, 21, 22, 23, 24, 13, 14, 15, 16, 17, 18, 7, 8, 9, 10, 11, 12, 1, 2}));
                 } else {
                     String[] strArr = c.i.e.p.b.b.a;
-                    str = String.valueOf(new char[]{strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{39, 40, 41, 42, 31, 32})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{33, 34, 35, 36, 25, 26})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{27, 28, 29, 30, 19, 20})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{21, 22, 23, 24, 13, 14})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{15, 16, 17, 18, 7, 8})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{9, 10, 11, 12, 1, 2}))});
+                    str = String.valueOf(new char[]{strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{39, 40, 41, ExifInterface.START_CODE, 31, 32})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{33, 34, 35, 36, 25, 26})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{27, 28, 29, 30, 19, 20})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{21, 22, 23, 24, 13, 14})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{15, 16, 17, 18, 7, 8})), strArr[0].charAt(c.i.e.p.b.b.a(bArr, new byte[]{9, 10, 11, 12, 1, 2}))});
                 }
                 DecimalFormat decimalFormat = new DecimalFormat("000");
                 String format = decimalFormat.format((long) c.i.e.p.b.b.a(bArr, new byte[]{53, 54, 43, 44, 45, 46, 47, 48, 37, 38}));
diff --git a/app/src/main/java/c/i/e/p/b/a.java b/app/src/main/java/c/i/e/p/b/a.java
index 1f8640d04c..764fc2f5d0 100644
--- a/app/src/main/java/c/i/e/p/b/a.java
+++ b/app/src/main/java/c/i/e/p/b/a.java
@@ -1,5 +1,13 @@
 package c.i.e.p.b;
+
+import androidx.core.app.FrameMetricsAggregator;
+import androidx.core.view.InputDeviceCompat;
+import androidx.media.AudioAttributesCompat;
+import com.discord.utilities.font.FontUtils;
+import com.discord.utilities.voice.ScreenShareManager;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 /* compiled from: BitMatrixParser */
 public final class a {
-    public static final int[][] a = {new int[]{121, 120, 127, 126, 133, 132, 139, 138, 145, 144, 151, 150, 157, 156, 163, 162, 169, 168, 175, 174, 181, 180, 187, 186, 193, 192, 199, 198, -2, -2}, new int[]{123, 122, 129, 128, 135, 134, 141, 140, 147, 146, 153, 152, 159, 158, 165, 164, 171, 170, 177, 176, 183, 182, 189, 188, 195, 194, 201, 200, 816, -3}, new int[]{125, 124, 131, 130, 137, 136, 143, 142, 149, 148, 155, 154, 161, 160, 167, 166, 173, 172, 179, 178, 185, 184, 191, 190, 197, 196, 203, 202, 818, 817}, new int[]{283, 282, 277, 276, 271, 270, 265, 264, 259, 258, 253, 252, 247, 246, 241, 240, 235, 234, 229, 228, 223, 222, 217, 216, 211, 210, 205, 204, 819, -3}, new int[]{285, 284, 279, 278, 273, 272, 267, 266, 261, 260, 255, 254, 249, 248, 243, 242, 237, 236, 231, 230, 225, 224, 219, 218, 213, 212, 207, 206, 821, 820}, new int[]{287, 286, 281, 280, 275, 274, 269, 268, 263, 262, 257, 256, 251, 250, 245, 244, 239, 238, 233, 232, 227, 226, 221, 220, 215, 214, 209, 208, 822, -3}, new int[]{289, 288, 295, 294, 301, 300, 307, 306, 313, 312, 319, 318, 325, 324, 331, 330, 337, 336, 343, 342, 349, 348, 355, 354, 361, 360, 367, 366, 824, 823}, new int[]{291, 290, 297, 296, 303, 302, 309, 308, 315, 314, 321, 320, 327, 326, 333, 332, 339, 338, 345, 344, 351, 350, 357, 356, 363, 362, 369, 368, 825, -3}, new int[]{293, 292, 299, 298, 305, 304, 311, 310, 317, 316, 323, 322, 329, 328, 335, 334, 341, 340, 347, 346, 353, 352, 359, 358, 365, 364, 371, 370, 827, 826}, new int[]{409, 408, 403, 402, 397, 396, 391, 390, 79, 78, -2, -2, 13, 12, 37, 36, 2, -1, 44, 43, 109, 108, 385, 384, 379, 378, 373, 372, 828, -3}, new int[]{411, 410, 405, 404, 399, 398, 393, 392, 81, 80, 40, -2, 15, 14, 39, 38, 3, -1, -1, 45, 111, 110, 387, 386, 381, 380, 375, 374, 830, 829}, new int[]{413, 412, 407, 406, 401, 400, 395, 394, 83, 82, 41, -3, -3, -3, -3, -3, 5, 4, 47, 46, 113, 112, 389, 388, 383, 382, 377, 376, 831, -3}, new int[]{415, 414, 421, 420, 427, 426, 103, 102, 55, 54, 16, -3, -3, -3, -3, -3, -3, -3, 20, 19, 85, 84, 433, 432, 439, 438, 445, 444, 833, 832}, new int[]{417, 416, 423, 422, 429, 428, 105, 104, 57, 56, -3, -3, -3, -3, -3, -3, -3, -3, 22, 21, 87, 86, 435, 434, 441, 440, 447, 446, 834, -3}, new int[]{419, 418, 425, 424, 431, 430, 107, 106, 59, 58, -3, -3, -3, -3, -3, -3, -3, -3, -3, 23, 89, 88, 437, 436, 443, 442, 449, 448, 836, 835}, new int[]{481, 480, 475, 474, 469, 468, 48, -2, 30, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, 0, 53, 52, 463, 462, 457, 456, 451, 450, 837, -3}, new int[]{483, 482, 477, 476, 471, 470, 49, -1, -2, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -2, -1, 465, 464, 459, 458, 453, 452, 839, 838}, new int[]{485, 484, 479, 478, 473, 472, 51, 50, 31, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, 1, -2, 42, 467, 466, 461, 460, 455, 454, 840, -3}, new int[]{487, 486, 493, 492, 499, 498, 97, 96, 61, 60, -3, -3, -3, -3, -3, -3, -3, -3, -3, 26, 91, 90, 505, 504, 511, 510, 517, 516, 842, 841}, new int[]{489, 488, 495, 494, 501, 500, 99, 98, 63, 62, -3, -3, -3, -3, -3, -3, -3, -3, 28, 27, 93, 92, 507, 506, 513, 512, 519, 518, 843, -3}, new int[]{491, 490, 497, 496, 503, 502, 101, 100, 65, 64, 17, -3, -3, -3, -3, -3, -3, -3, 18, 29, 95, 94, 509, 508, 515, 514, 521, 520, 845, 844}, new int[]{559, 558, 553, 552, 547, 546, 541, 540, 73, 72, 32, -3, -3, -3, -3, -3, -3, 10, 67, 66, 115, 114, 535, 534, 529, 528, 523, 522, 846, -3}, new int[]{561, 560, 555, 554, 549, 548, 543, 542, 75, 74, -2, -1, 7, 6, 35, 34, 11, -2, 69, 68, 117, 116, 537, 536, 531, 530, 525, 524, 848, 847}, new int[]{563, 562, 557, 556, 551, 550, 545, 544, 77, 76, -2, 33, 9, 8, 25, 24, -1, -2, 71, 70, 119, 118, 539, 538, 533, 532, 527, 526, 849, -3}, new int[]{565, 564, 571, 570, 577, 576, 583, 582, 589, 588, 595, 594, 601, 600, 607, 606, 613, 612, 619, 618, 625, 624, 631, 630, 637, 636, 643, 642, 851, 850}, new int[]{567, 566, 573, 572, 579, 578, 585, 584, 591, 590, 597, 596, 603, 602, 609, 608, 615, 614, 621, 620, 627, 626, 633, 632, 639, 638, 645, 644, 852, -3}, new int[]{569, 568, 575, 574, 581, 580, 587, 586, 593, 592, 599, 598, 605, 604, 611, 610, 617, 616, 623, 622, 629, 628, 635, 634, 641, 640, 647, 646, 854, 853}, new int[]{727, 726, 721, 720, 715, 714, 709, 708, 703, 702, 697, 696, 691, 690, 685, 684, 679, 678, 673, 672, 667, 666, 661, 660, 655, 654, 649, 648, 855, -3}, new int[]{729, 728, 723, 722, 717, 716, 711, 710, 705, 704, 699, 698, 693, 692, 687, 686, 681, 680, 675, 674, 669, 668, 663, 662, 657, 656, 651, 650, 857, 856}, new int[]{731, 730, 725, 724, 719, 718, 713, 712, 707, 706, 701, 700, 695, 694, 689, 688, 683, 682, 677, 676, 671, 670, 665, 664, 659, 658, 653, 652, 858, -3}, new int[]{733, 732, 739, 738, 745, 744, 751, 750, 757, 756, 763, 762, 769, 768, 775, 774, 781, 780, 787, 786, 793, 792, 799, 798, 805, 804, 811, 810, 860, 859}, new int[]{735, 734, 741, 740, 747, 746, 753, 752, 759, 758, 765, 764, 771, 770, 777, 776, 783, 782, 789, 788, 795, 794, 801, 800, 807, 806, 813, 812, 861, -3}, new int[]{737, 736, 743, 742, 749, 748, 755, 754, 761, 760, 767, 766, 773, 772, 779, 778, 785, 784, 791, 790, 797, 796, 803, 802, 809, 808, 815, 814, 863, 862}};
+    public static final int[][] a = {new int[]{121, 120, 127, 126, 133, 132, 139, 138, 145, 144, 151, FontUtils.MAX_FONT_SCALING, 157, 156, 163, 162, 169, 168, HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION, 174, 181, BaseTransientBottomBar.ANIMATION_FADE_DURATION, 187, 186, 193, 192, 199, 198, -2, -2}, new int[]{123, 122, 129, 128, 135, 134, 141, 140, 147, 146, 153, 152, 159, 158, 165, 164, 171, 170, 177, 176, 183, 182, 189, 188, 195, 194, 201, 200, 816, -3}, new int[]{125, 124, 131, 130, 137, 136, 143, 142, 149, 148, 155, 154, 161, 160, 167, 166, 173, 172, 179, 178, 185, 184, 191, 190, 197, 196, 203, 202, 818, 817}, new int[]{283, 282, 277, 276, 271, 270, 265, 264, 259, 258, 253, 252, 247, 246, 241, 240, 235, 234, 229, 228, 223, 222, 217, 216, 211, 210, 205, 204, 819, -3}, new int[]{285, 284, 279, 278, AudioAttributesCompat.FLAG_ALL_PUBLIC, 272, 267, 266, 261, 260, 255, 254, 249, 248, 243, 242, 237, 236, 231, 230, HideBottomViewOnScrollBehavior.ENTER_ANIMATION_DURATION, 224, 219, 218, 213, 212, 207, 206, 821, 820}, new int[]{287, 286, 281, 280, 275, 274, 269, 268, 263, 262, 257, 256, 251, 250, 245, 244, 239, 238, 233, 232, 227, 226, 221, 220, 215, 214, 209, 208, 822, -3}, new int[]{289, ScreenShareManager.THUMBNAIL_HEIGHT_PX, 295, 294, 301, 300, 307, 306, 313, 312, 319, 318, 325, 324, 331, 330, 337, 336, 343, 342, 349, 348, 355, 354, 361, 360, 367, 366, 824, 823}, new int[]{291, 290, 297, 296, 303, 302, 309, 308, 315, 314, 321, 320, 327, 326, 333, 332, 339, 338, 345, 344, 351, 350, 357, 356, 363, 362, 369, 368, 825, -3}, new int[]{293, 292, 299, 298, 305, 304, 311, 310, 317, 316, 323, 322, 329, 328, 335, 334, 341, 340, 347, 346, 353, 352, 359, 358, 365, 364, 371, 370, 827, 826}, new int[]{409, 408, 403, 402, 397, 396, 391, 390, 79, 78, -2, -2, 13, 12, 37, 36, 2, -1, 44, 43, 109, 108, 385, 384, 379, 378, 373, 372, 828, -3}, new int[]{411, 410, 405, 404, 399, 398, 393, 392, 81, 80, 40, -2, 15, 14, 39, 38, 3, -1, -1, 45, 111, 110, 387, 386, 381, 380, 375, 374, 830, 829}, new int[]{413, 412, 407, 406, 401, 400, 395, 394, 83, 82, 41, -3, -3, -3, -3, -3, 5, 4, 47, 46, 113, 112, 389, 388, 383, 382, 377, 376, 831, -3}, new int[]{415, 414, 421, 420, 427, 426, 103, 102, 55, 54, 16, -3, -3, -3, -3, -3, -3, -3, 20, 19, 85, 84, 433, 432, 439, 438, 445, 444, 833, 832}, new int[]{417, 416, 423, 422, 429, 428, 105, 104, 57, 56, -3, -3, -3, -3, -3, -3, -3, -3, 22, 21, 87, 86, 435, 434, 441, 440, 447, 446, 834, -3}, new int[]{419, 418, 425, 424, 431, 430, 107, 106, 59, 58, -3, -3, -3, -3, -3, -3, -3, -3, -3, 23, 89, 88, 437, 436, 443, 442, 449, 448, 836, 835}, new int[]{481, 480, 475, 474, 469, 468, 48, -2, 30, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, 0, 53, 52, 463, 462, 457, 456, 451, 450, 837, -3}, new int[]{483, 482, 477, 476, 471, 470, 49, -1, -2, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -2, -1, 465, 464, 459, 458, 453, 452, 839, 838}, new int[]{485, 484, 479, 478, 473, 472, 51, 50, 31, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, 1, -2, 42, 467, 466, 461, 460, 455, 454, 840, -3}, new int[]{487, 486, 493, 492, 499, 498, 97, 96, 61, 60, -3, -3, -3, -3, -3, -3, -3, -3, -3, 26, 91, 90, 505, 504, FrameMetricsAggregator.EVERY_DURATION, 510, 517, 516, 842, 841}, new int[]{489, 488, 495, 494, 501, 500, 99, 98, 63, 62, -3, -3, -3, -3, -3, -3, -3, -3, 28, 27, 93, 92, 507, 506, InputDeviceCompat.SOURCE_DPAD, 512, 519, 518, 843, -3}, new int[]{491, 490, 497, 496, 503, 502, 101, 100, 65, 64, 17, -3, -3, -3, -3, -3, -3, -3, 18, 29, 95, 94, 509, 508, 515, 514, 521, 520, 845, 844}, new int[]{559, 558, 553, 552, 547, 546, 541, 540, 73, 72, 32, -3, -3, -3, -3, -3, -3, 10, 67, 66, 115, 114, 535, 534, 529, 528, 523, 522, 846, -3}, new int[]{561, 560, 555, 554, 549, 548, 543, 542, 75, 74, -2, -1, 7, 6, 35, 34, 11, -2, 69, 68, 117, 116, 537, 536, 531, 530, 525, 524, 848, 847}, new int[]{563, 562, 557, 556, 551, 550, 545, 544, 77, 76, -2, 33, 9, 8, 25, 24, -1, -2, 71, 70, 119, 118, 539, 538, 533, 532, 527, 526, 849, -3}, new int[]{565, 564, 571, 570, 577, 576, 583, 582, 589, 588, 595, 594, 601, 600, 607, 606, 613, 612, 619, 618, 625, 624, 631, 630, 637, 636, 643, 642, 851, 850}, new int[]{567, 566, 573, 572, 579, 578, 585, 584, 591, 590, 597, 596, 603, 602, 609, 608, 615, 614, 621, 620, 627, 626, 633, 632, 639, 638, 645, 644, 852, -3}, new int[]{569, 568, 575, 574, 581, 580, 587, 586, 593, 592, 599, 598, 605, 604, 611, 610, 617, 616, 623, 622, 629, 628, 635, 634, 641, 640, 647, 646, 854, 853}, new int[]{727, 726, 721, 720, 715, 714, 709, 708, 703, 702, 697, 696, 691, 690, 685, 684, 679, 678, 673, 672, 667, 666, 661, 660, 655, 654, 649, 648, 855, -3}, new int[]{729, 728, 723, 722, 717, 716, 711, 710, 705, 704, 699, 698, 693, 692, 687, 686, 681, 680, 675, 674, 669, 668, 663, 662, 657, 656, 651, 650, 857, 856}, new int[]{731, 730, 725, 724, 719, 718, 713, 712, 707, 706, 701, 700, 695, 694, 689, 688, 683, 682, 677, 676, 671, 670, 665, 664, 659, 658, 653, 652, 858, -3}, new int[]{733, 732, 739, 738, 745, 744, 751, 750, 757, 756, 763, 762, 769, 768, 775, 774, 781, 780, 787, 786, 793, 792, 799, 798, 805, 804, 811, 810, 860, 859}, new int[]{735, 734, 741, 740, 747, 746, 753, 752, 759, 758, 765, 764, 771, 770, 777, 776, 783, 782, 789, 788, 795, 794, 801, 800, 807, 806, 813, 812, 861, -3}, new int[]{737, 736, 743, 742, 749, 748, 755, 754, 761, 760, 767, 766, 773, 772, 779, 778, 785, 784, 791, 790, 797, 796, 803, 802, 809, 808, 815, 814, 863, 862}};
 }
diff --git a/app/src/main/java/c/i/e/q/d.java b/app/src/main/java/c/i/e/q/d.java
index e27d797821..43a11a21a8 100644
--- a/app/src/main/java/c/i/e/q/d.java
+++ b/app/src/main/java/c/i/e/q/d.java
@@ -168,7 +168,7 @@ public final class d extends k {
         if (r9 != 'Z') goto L_0x00fb;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:50:0x00f8, code lost:
-        r8 = ':';
+        r8 = com.discord.widgets.chat.input.MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:52:0x00ff, code lost:
         throw com.google.zxing.FormatException.a();
diff --git a/app/src/main/java/c/i/e/q/k.java b/app/src/main/java/c/i/e/q/k.java
index 6b5b62080b..5b71d25d4d 100644
--- a/app/src/main/java/c/i/e/q/k.java
+++ b/app/src/main/java/c/i/e/q/k.java
@@ -7,6 +7,7 @@ import c.i.e.i;
 import c.i.e.j;
 import c.i.e.n.a;
 import c.i.e.n.h;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.zxing.ChecksumException;
 import com.google.zxing.FormatException;
 import com.google.zxing.NotFoundException;
@@ -169,7 +170,7 @@ public abstract class k implements i {
                                 enumMap = enumMap2;
                                 Result b = kVar.b(i10, aVar, enumMap);
                                 if (i11 != i4) {
-                                    b.b(j.ORIENTATION, 180);
+                                    b.b(j.ORIENTATION, Integer.valueOf((int) BaseTransientBottomBar.ANIMATION_FADE_DURATION));
                                     c.i.e.k[] kVarArr = b.f2405c;
                                     if (kVarArr != null) {
                                         float f = (float) i2;
diff --git a/app/src/main/java/c/i/e/q/r/f/c.java b/app/src/main/java/c/i/e/q/r/f/c.java
index 6f74b89a1e..89b31855c2 100644
--- a/app/src/main/java/c/i/e/q/r/f/c.java
+++ b/app/src/main/java/c/i/e/q/r/f/c.java
@@ -8,6 +8,9 @@ import c.i.e.q.r.f.d.g;
 import c.i.e.q.r.f.d.j;
 import c.i.e.q.r.f.d.k;
 import c.i.e.q.r.f.d.s;
+import com.discord.utilities.font.FontUtils;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.zxing.FormatException;
 import com.google.zxing.NotFoundException;
 import com.google.zxing.Result;
@@ -22,7 +25,7 @@ public final class c extends a {
     public static final int[] h = {4, 20, 52, 104, 204};
     public static final int[] i = {0, 348, 1388, 2948, 3988};
     public static final int[][] j = {new int[]{1, 8, 4, 1}, new int[]{3, 6, 4, 1}, new int[]{3, 4, 6, 1}, new int[]{3, 2, 8, 1}, new int[]{2, 6, 5, 1}, new int[]{2, 2, 9, 1}};
-    public static final int[][] k = {new int[]{1, 3, 9, 27, 81, 32, 96, 77}, new int[]{20, 60, 180, 118, 143, 7, 21, 63}, new int[]{189, 145, 13, 39, 117, 140, 209, 205}, new int[]{193, 157, 49, 147, 19, 57, 171, 91}, new int[]{62, 186, 136, 197, 169, 85, 44, 132}, new int[]{185, 133, 188, 142, 4, 12, 36, 108}, new int[]{113, 128, 173, 97, 80, 29, 87, 50}, new int[]{150, 28, 84, 41, 123, 158, 52, 156}, new int[]{46, 138, 203, 187, 139, 206, 196, 166}, new int[]{76, 17, 51, 153, 37, 111, 122, 155}, new int[]{43, 129, 176, 106, 107, 110, 119, 146}, new int[]{16, 48, 144, 10, 30, 90, 59, 177}, new int[]{109, 116, 137, 200, 178, 112, 125, 164}, new int[]{70, 210, 208, 202, 184, 130, 179, 115}, new int[]{134, 191, 151, 31, 93, 68, 204, 190}, new int[]{148, 22, 66, 198, 172, 94, 71, 2}, new int[]{6, 18, 54, 162, 64, 192, 154, 40}, new int[]{120, 149, 25, 75, 14, 42, 126, 167}, new int[]{79, 26, 78, 23, 69, 207, 199, 175}, new int[]{103, 98, 83, 38, 114, 131, 182, 124}, new int[]{161, 61, 183, 127, 170, 88, 53, 159}, new int[]{55, 165, 73, 8, 24, 72, 5, 15}, new int[]{45, 135, 194, 160, 58, 174, 100, 89}};
+    public static final int[][] k = {new int[]{1, 3, 9, 27, 81, 32, 96, 77}, new int[]{20, 60, BaseTransientBottomBar.ANIMATION_FADE_DURATION, 118, 143, 7, 21, 63}, new int[]{189, 145, 13, 39, 117, 140, 209, 205}, new int[]{193, 157, 49, 147, 19, 57, 171, 91}, new int[]{62, 186, 136, 197, 169, 85, 44, 132}, new int[]{185, 133, 188, 142, 4, 12, 36, 108}, new int[]{113, 128, 173, 97, 80, 29, 87, 50}, new int[]{FontUtils.MAX_FONT_SCALING, 28, 84, 41, 123, 158, 52, 156}, new int[]{46, 138, 203, 187, 139, 206, 196, 166}, new int[]{76, 17, 51, 153, 37, 111, 122, 155}, new int[]{43, 129, 176, 106, 107, 110, 119, 146}, new int[]{16, 48, 144, 10, 30, 90, 59, 177}, new int[]{109, 116, 137, 200, 178, 112, 125, 164}, new int[]{70, 210, 208, 202, 184, 130, 179, 115}, new int[]{134, 191, 151, 31, 93, 68, 204, 190}, new int[]{148, 22, 66, 198, 172, 94, 71, 2}, new int[]{6, 18, 54, 162, 64, 192, 154, 40}, new int[]{120, 149, 25, 75, 14, 42, 126, 167}, new int[]{79, 26, 78, 23, 69, 207, 199, HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION}, new int[]{103, 98, 83, 38, 114, 131, 182, 124}, new int[]{161, 61, 183, 127, 170, 88, 53, 159}, new int[]{55, 165, 73, 8, 24, 72, 5, 15}, new int[]{45, 135, 194, 160, 58, 174, 100, 89}};
     public static final int[][] l = {new int[]{0, 0}, new int[]{0, 1, 1}, new int[]{0, 2, 1, 3}, new int[]{0, 4, 1, 3, 2}, new int[]{0, 4, 1, 3, 3, 5}, new int[]{0, 4, 1, 3, 4, 5, 5}, new int[]{0, 0, 1, 1, 2, 2, 3, 3}, new int[]{0, 0, 1, 1, 2, 2, 3, 4, 4}, new int[]{0, 0, 1, 1, 2, 2, 3, 4, 5, 5}, new int[]{0, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5}};
     public final List<a> m = new ArrayList(11);
     public final List<b> n = new ArrayList();
diff --git a/app/src/main/java/c/i/e/q/r/f/d/s.java b/app/src/main/java/c/i/e/q/r/f/d/s.java
index 7d3f33f5d9..6c323c86a0 100644
--- a/app/src/main/java/c/i/e/q/r/f/d/s.java
+++ b/app/src/main/java/c/i/e/q/r/f/d/s.java
@@ -1,6 +1,7 @@
 package c.i.e.q.r.f.d;
 
 import c.i.e.n.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.google.zxing.FormatException;
 import com.google.zxing.NotFoundException;
 /* compiled from: GeneralAppIdDecoder */
@@ -124,7 +125,7 @@ public final class s {
                                                 c3 = '.';
                                                 break;
                                             case 62:
-                                                c3 = '/';
+                                                c3 = MentionUtilsKt.SLASH_CHAR;
                                                 break;
                                             default:
                                                 throw new IllegalStateException("Decoding invalid alphanumeric value: ".concat(String.valueOf(d4)));
@@ -244,10 +245,10 @@ public final class s {
                                                     c2 = '.';
                                                     break;
                                                 case 244:
-                                                    c2 = '/';
+                                                    c2 = MentionUtilsKt.SLASH_CHAR;
                                                     break;
                                                 case 245:
-                                                    c2 = ':';
+                                                    c2 = MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
                                                     break;
                                                 case 246:
                                                     c2 = ';';
diff --git a/app/src/main/java/c/i/e/r/a.java b/app/src/main/java/c/i/e/r/a.java
index 0678dfeb1b..d95d789e60 100644
--- a/app/src/main/java/c/i/e/r/a.java
+++ b/app/src/main/java/c/i/e/r/a.java
@@ -1,14 +1,27 @@
 package c.i.e.r;
 
+import androidx.core.app.FrameMetricsAggregator;
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.PointerIconCompat;
+import androidx.media.AudioAttributesCompat;
+import androidx.room.RoomDatabase;
+import com.discord.models.domain.ModelInvite;
+import com.discord.restapi.RestAPIAbortCodes;
+import com.discord.utilities.font.FontUtils;
+import com.discord.utilities.guilds.GuildConstantsKt;
+import com.discord.utilities.voice.ScreenShareManager;
+import com.discord.widgets.settings.profile.WidgetSettingsUserProfile;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.util.Arrays;
 import java.util.Collection;
 /* compiled from: PDF417Common */
 public final class a {
     public static final int[] a = new int[0];
-    public static final int[] b = {66142, 66170, 66206, 66236, 66290, 66292, 66350, 66382, 66396, 66454, 66470, 66476, 66594, 66600, 66614, 66626, 66628, 66632, 66640, 66654, 66662, 66668, 66682, 66690, 66718, 66720, 66748, 66758, 66776, 66798, 66802, 66804, 66820, 66824, 66832, 66846, 66848, 66876, 66880, 66936, 66950, 66956, 66968, 66992, 67006, 67022, 67036, 67042, 67044, 67048, 67062, 67118, 67150, 67164, 67214, 67228, 67256, 67294, 67322, 67350, 67366, 67372, 67398, 67404, 67416, 67438, 67474, 67476, 67490, 67492, 67496, 67510, 67618, 67624, 67650, 67656, 67664, 67678, 67686, 67692, 67706, 67714, 67716, 67728, 67742, 67744, 67772, 67782, 67788, 67800, 67822, 67826, 67828, 67842, 67848, 67870, 67872, 67900, 67904, 67960, 67974, 67992, 68016, 68030, 68046, 68060, 68066, 68068, 68072, 68086, 68104, 68112, 68126, 68128, 68156, 68160, 68216, 68336, 68358, 68364, 68376, 68400, 68414, 68448, 68476, 68494, 68508, 68536, 68546, 68548, 68552, 68560, 68574, 68582, 68588, 68654, 68686, 68700, 68706, 68708, 68712, 68726, 68750, 68764, 68792, 68802, 68804, 68808, 68816, 68830, 68838, 68844, 68858, 68878, 68892, 68920, 68976, 68990, 68994, 68996, 69000, 69008, 69022, 69024, 69052, 69062, 69068, 69080, 69102, 69106, 69108, 69142, 69158, 69164, 69190, 69208, 69230, 69254, 69260, 69272, 69296, 69310, 69326, 69340, 69386, 69394, 69396, 69410, 69416, 69430, 69442, 69444, 69448, 69456, 69470, 69478, 69484, 69554, 69556, 69666, 69672, 69698, 69704, 69712, 69726, 69754, 69762, 69764, 69776, 69790, 69792, 69820, 69830, 69836, 69848, 69870, 69874, 69876, 69890, 69918, 69920, 69948, 69952, 70008, 70022, 70040, 70064, 70078, 70094, 70108, 70114, 70116, 70120, 70134, 70152, 70174, 70176, 70264, 70384, 70412, 70448, 70462, 70496, 70524, 70542, 70556, 70584, 70594, 70600, 70608, 70622, 70630, 70636, 70664, 70672, 70686, 70688, 70716, 70720, 70776, 70896, 71136, 71180, 71192, 71216, 71230, 71264, 71292, 71360, 71416, 71452, 71480, 71536, 71550, 71554, 71556, 71560, 71568, 71582, 71584, 71612, 71622, 71628, 71640, 71662, 71726, 71732, 71758, 71772, 71778, 71780, 71784, 71798, 71822, 71836, 71864, 71874, 71880, 71888, 71902, 71910, 71916, 71930, 71950, 71964, 71992, 72048, 72062, 72066, 72068, 72080, 72094, 72096, 72124, 72134, 72140, 72152, 72174, 72178, 72180, 72206, 72220, 72248, 72304, 72318, 72416, 72444, 72456, 72464, 72478, 72480, 72508, 72512, 72568, 72588, 72600, 72624, 72638, 72654, 72668, 72674, 72676, 72680, 72694, 72726, 72742, 72748, 72774, 72780, 72792, 72814, 72838, 72856, 72880, 72894, 72910, 72924, 72930, 72932, 72936, 72950, 72966, 72972, 72984, 73008, 73022, 73056, 73084, 73102, 73116, 73144, 73156, 73160, 73168, 73182, 73190, 73196, 73210, 73226, 73234, 73236, 73250, 73252, 73256, 73270, 73282, 73284, 73296, 73310, 73318, 73324, 73346, 73348, 73352, 73360, 73374, 73376, 73404, 73414, 73420, 73432, 73454, 73498, 73518, 73522, 73524, 73550, 73564, 73570, 73572, 73576, 73590, 73800, 73822, 73858, 73860, 73872, 73886, 73888, 73916, 73944, 73970, 73972, 73992, 74014, 74016, 74044, 74048, 74104, 74118, 74136, 74160, 74174, 74210, 74212, 74216, 74230, 74244, 74256, 74270, 74272, 74360, 74480, 74502, 74508, 74544, 74558, 74592, 74620, 74638, 74652, 74680, 74690, 74696, 74704, 74726, 74732, 74782, 74784, 74812, 74992, 75232, 75288, 75326, 75360, 75388, 75456, 75512, 75576, 75632, 75646, 75650, 75652, 75664, 75678, 75680, 75708, 75718, 75724, 75736, 75758, 75808, 75836, 75840, 75896, 76016, 76256, 76736, 76824, 76848, 76862, 76896, 76924, 76992, 77048, 77296, 77340, 77368, 77424, 77438, 77536, 77564, 77572, 77576, 77584, 77600, 77628, 77632, 77688, 77702, 77708, 77720, 77744, 77758, 77774, 77788, 77870, 77902, 77916, 77922, 77928, 77966, 77980, 78008, 78018, 78024, 78032, 78046, 78060, 78074, 78094, 78136, 78192, 78206, 78210, 78212, 78224, 78238, 78240, 78268, 78278, 78284, 78296, 78322, 78324, 78350, 78364, 78448, 78462, 78560, 78588, 78600, 78622, 78624, 78652, 78656, 78712, 78726, 78744, 78768, 78782, 78798, 78812, 78818, 78820, 78824, 78838, 78862, 78876, 78904, 78960, 78974, 79072, 79100, 79296, 79352, 79368, 79376, 79390, 79392, 79420, 79424, 79480, 79600, 79628, 79640, 79664, 79678, 79712, 79740, 79772, 79800, 79810, 79812, 79816, 79824, 79838, 79846, 79852, 79894, 79910, 79916, 79942, 79948, 79960, 79982, 79988, 80006, 80024, 80048, 80062, 80078, 80092, 80098, 80100, 80104, 80134, 80140, 80176, 80190, 80224, 80252, 80270, 80284, 80312, 80328, 80336, 80350, 80358, 80364, 80378, 80390, 80396, 80408, 80432, 80446, 80480, 80508, 80576, 80632, 80654, 80668, 80696, 80752, 80766, 80776, 80784, 80798, 80800, 80828, 80844, 80856, 80878, 80882, 80884, 80914, 80916, 80930, 80932, 80936, 80950, 80962, 80968, 80976, 80990, 80998, 81004, 81026, 81028, 81040, 81054, 81056, 81084, 81094, 81100, 81112, 81134, 81154, 81156, 81160, 81168, 81182, 81184, 81212, 81216, 81272, 81286, 81292, 81304, 81328, 81342, 81358, 81372, 81380, 81384, 81398, 81434, 81454, 81458, 81460, 81486, 81500, 81506, 81508, 81512, 81526, 81550, 81564, 81592, 81602, 81604, 81608, 81616, 81630, 81638, 81644, 81702, 81708, 81722, 81734, 81740, 81752, 81774, 81778, 81780, 82050, 82078, 82080, 82108, 82180, 82184, 82192, 82206, 82208, 82236, 82240, 82296, 82316, 82328, 82352, 82366, 82402, 82404, 82408, 82440, 82448, 82462, 82464, 82492, 82496, 82552, 82672, 82694, 82700, 82712, 82736, 82750, 82784, 82812, 82830, 82882, 82884, 82888, 82896, 82918, 82924, 82952, 82960, 82974, 82976, 83004, 83008, 83064, 83184, 83424, 83468, 83480, 83504, 83518, 83552, 83580, 83648, 83704, 83740, 83768, 83824, 83838, 83842, 83844, 83848, 83856, 83872, 83900, 83910, 83916, 83928, 83950, 83984, 84000, 84028, 84032, 84088, 84208, 84448, 84928, 85040, 85054, 85088, 85116, 85184, 85240, 85488, 85560, 85616, 85630, 85728, 85756, 85764, 85768, 85776, 85790, 85792, 85820, 85824, 85880, 85894, 85900, 85912, 85936, 85966, 85980, 86048, 86080, 86136, 86256, 86496, 86976, 88160, 88188, 88256, 88312, 88560, 89056, 89200, 89214, 89312, 89340, 89536, 89592, 89608, 89616, 89632, 89664, 89720, 89840, 89868, 89880, 89904, 89952, 89980, 89998, 90012, 90040, 90190, 90204, 90254, 90268, 90296, 90306, 90308, 90312, 90334, 90382, 90396, 90424, 90480, 90494, 90500, 90504, 90512, 90526, 90528, 90556, 90566, 90572, 90584, 90610, 90612, 90638, 90652, 90680, 90736, 90750, 90848, 90876, 90884, 90888, 90896, 90910, 90912, 90940, 90944, 91000, 91014, 91020, 91032, 91056, 91070, 91086, 91100, 91106, 91108, 91112, 91126, 91150, 91164, 91192, 91248, 91262, 91360, 91388, 91584, 91640, 91664, 91678, 91680, 91708, 91712, 91768, 91888, 91928, 91952, 91966, 92000, 92028, 92046, 92060, 92088, 92098, 92100, 92104, 92112, 92126, 92134, 92140, 92188, 92216, 92272, 92384, 92412, 92608, 92664, 93168, 93200, 93214, 93216, 93244, 93248, 93304, 93424, 93664, 93720, 93744, 93758, 93792, 93820, 93888, 93944, 93980, 94008, 94064, 94078, 94084, 94088, 94096, 94110, 94112, 94140, 94150, 94156, 94168, 94246, 94252, 94278, 94284, 94296, 94318, 94342, 94348, 94360, 94384, 94398, 94414, 94428, 94440, 94470, 94476, 94488, 94512, 94526, 94560, 94588, 94606, 94620, 94648, 94658, 94660, 94664, 94672, 94686, 94694, 94700, 94714, 94726, 94732, 94744, 94768, 94782, 94816, 94844, 94912, 94968, 94990, 95004, 95032, 95088, 95102, 95112, 95120, 95134, 95136, 95164, 95180, 95192, 95214, 95218, 95220, 95244, 95256, 95280, 95294, 95328, 95356, 95424, 95480, 95728, 95758, 95772, 95800, 95856, 95870, 95968, 95996, 96008, 96016, 96030, 96032, 96060, 96064, 96120, 96152, 96176, 96190, 96220, 96226, 96228, 96232, 96290, 96292, 96296, 96310, 96322, 96324, 96328, 96336, 96350, 96358, 96364, 96386, 96388, 96392, 96400, 96414, 96416, 96444, 96454, 96460, 96472, 96494, 96498, 96500, 96514, 96516, 96520, 96528, 96542, 96544, 96572, 96576, 96632, 96646, 96652, 96664, 96688, 96702, 96718, 96732, 96738, 96740, 96744, 96758, 96772, 96776, 96784, 96798, 96800, 96828, 96832, 96888, 97008, 97030, 97036, 97048, 97072, 97086, 97120, 97148, 97166, 97180, 97208, 97220, 97224, 97232, 97246, 97254, 97260, 97326, 97330, 97332, 97358, 97372, 97378, 97380, 97384, 97398, 97422, 97436, 97464, 97474, 97476, 97480, 97488, 97502, 97510, 97516, 97550, 97564, 97592, 97648, 97666, 97668, 97672, 97680, 97694, 97696, 97724, 97734, 97740, 97752, 97774, 97830, 97836, 97850, 97862, 97868, 97880, 97902, 97906, 97908, 97926, 97932, 97944, 97968, 97998, 98012, 98018, 98020, 98024, 98038, 98618, 98674, 98676, 98838, 98854, 98874, 98892, 98904, 98926, 98930, 98932, 98968, 99006, 99042, 99044, 99048, 99062, 99166, 99194, 99246, 99286, 99350, 99366, 99372, 99386, 99398, 99416, 99438, 99442, 99444, 99462, 99504, 99518, 99534, 99548, 99554, 99556, 99560, 99574, 99590, 99596, 99608, 99632, 99646, 99680, 99708, 99726, 99740, 99768, 99778, 99780, 99784, 99792, 99806, 99814, 99820, 99834, 99858, 99860, 99874, 99880, 99894, 99906, 99920, 99934, 99962, 99970, 99972, 99976, 99984, 99998, 100000, 100028, 100038, 100044, 100056, 100078, 100082, 100084, 100142, 100174, 100188, 100246, 100262, 100268, 100306, 100308, 100390, 100396, 100410, 100422, 100428, 100440, 100462, 100466, 100468, 100486, 100504, 100528, 100542, 100558, 100572, 100578, 100580, 100584, 100598, 100620, 100656, 100670, 100704, 100732, 100750, 100792, 100802, 100808, 100816, 100830, 100838, 100844, 100858, 100888, 100912, 100926, 100960, 100988, 101056, 101112, 101148, 101176, 101232, 101246, 101250, 101252, 101256, 101264, 101278, 101280, 101308, 101318, 101324, 101336, 101358, 101362, 101364, 101410, 101412, 101416, 101430, 101442, 101448, 101456, 101470, 101478, 101498, 101506, 101508, 101520, 101534, 101536, 101564, 101580, 101618, 101620, 101636, 101640, 101648, 101662, 101664, 101692, 101696, 101752, 101766, 101784, 101838, 101858, 101860, 101864, 101934, 101938, 101940, 101966, 101980, 101986, 101988, 101992, 102030, 102044, 102072, 102082, 102084, 102088, 102096, 102138, 102166, 102182, 102188, 102214, 102220, 102232, 102254, 102282, 102290, 102292, 102306, 102308, 102312, 102326, 102444, 102458, 102470, 102476, 102488, 102514, 102516, 102534, 102552, 102576, 102590, 102606, 102620, 102626, 102632, 102646, 102662, 102668, 102704, 102718, 102752, 102780, 102798, 102812, 102840, 102850, 102856, 102864, 102878, 102886, 102892, 102906, 102936, 102974, 103008, 103036, 103104, 103160, 103224, 103280, 103294, 103298, 103300, 103312, 103326, 103328, 103356, 103366, 103372, 103384, 103406, 103410, 103412, 103472, 103486, 103520, 103548, 103616, 103672, 103920, 103992, 104048, 104062, 104160, 104188, 104194, 104196, 104200, 104208, 104224, 104252, 104256, 104312, 104326, 104332, 104344, 104368, 104382, 104398, 104412, 104418, 104420, 104424, 104482, 104484, 104514, 104520, 104528, 104542, 104550, 104570, 104578, 104580, 104592, 104606, 104608, 104636, 104652, 104690, 104692, 104706, 104712, 104734, 104736, 104764, 104768, 104824, 104838, 104856, 104910, 104930, 104932, 104936, 104968, 104976, 104990, 104992, 105020, 105024, 105080, 105200, 105240, 105278, 105312, 105372, 105410, 105412, 105416, 105424, 105446, 105518, 105524, 105550, 105564, 105570, 105572, 105576, 105614, 105628, 105656, 105666, 105672, 105680, 105702, 105722, 105742, 105756, 105784, 105840, 105854, 105858, 105860, 105864, 105872, 105888, 105932, 105970, 105972, 106006, 106022, 106028, 106054, 106060, 106072, 106100, 106118, 106124, 106136, 106160, 106174, 106190, 106210, 106212, 106216, 106250, 106258, 106260, 106274, 106276, 106280, 106306, 106308, 106312, 106320, 106334, 106348, 106394, 106414, 106418, 106420, 106566, 106572, 106610, 106612, 106630, 106636, 106648, 106672, 106686, 106722, 106724, 106728, 106742, 106758, 106764, 106776, 106800, 106814, 106848, 106876, 106894, 106908, 106936, 106946, 106948, 106952, 106960, 106974, 106982, 106988, 107032, 107056, 107070, 107104, 107132, 107200, 107256, 107292, 107320, 107376, 107390, 107394, 107396, 107400, 107408, 107422, 107424, 107452, 107462, 107468, 107480, 107502, 107506, 107508, 107544, 107568, 107582, 107616, 107644, 107712, 107768, 108016, 108060, 108088, 108144, 108158, 108256, 108284, 108290, 108292, 108296, 108304, 108318, 108320, 108348, 108352, 108408, 108422, 108428, 108440, 108464, 108478, 108494, 108508, 108514, 108516, 108520, 108592, 108640, 108668, 108736, 108792, 109040, 109536, 109680, 109694, 109792, 109820, 110016, 110072, 110084, 110088, 110096, 110112, 110140, 110144, 110200, 110320, 110342, 110348, 110360, 110384, 110398, 110432, 110460, 110478, 110492, 110520, 110532, 110536, 110544, 110558, 110658, 110686, 110714, 110722, 110724, 110728, 110736, 110750, 110752, 110780, 110796, 110834, 110836, 110850, 110852, 110856, 110864, 110878, 110880, 110908, 110912, 110968, 110982, 111000, 111054, 111074, 111076, 111080, 111108, 111112, 111120, 111134, 111136, 111164, 111168, 111224, 111344, 111372, 111422, 111456, 111516, 111554, 111556, 111560, 111568, 111590, 111632, 111646, 111648, 111676, 111680, 111736, 111856, 112096, 112152, 112224, 112252, 112320, 112440, 112514, 112516, 112520, 112528, 112542, 112544, 112588, 112686, 112718, 112732, 112782, 112796, 112824, 112834, 112836, 112840, 112848, 112870, 112890, 112910, 112924, 112952, 113008, 113022, 113026, 113028, 113032, 113040, 113054, 113056, 113100, 113138, 113140, 113166, 113180, 113208, 113264, 113278, 113376, 113404, 113416, 113424, 113440, 113468, 113472, 113560, 113614, 113634, 113636, 113640, 113686, 113702, 113708, 113734, 113740, 113752, 113778, 113780, 113798, 113804, 113816, 113840, 113854, 113870, 113890, 113892, 113896, 113926, 113932, 113944, 113968, 113982, 114016, 114044, 114076, 114114, 114116, 114120, 114128, 114150, 114170, 114194, 114196, 114210, 114212, 114216, 114242, 114244, 114248, 114256, 114270, 114278, 114306, 114308, 114312, 114320, 114334, 114336, 114364, 114380, 114420, 114458, 114478, 114482, 114484, 114510, 114524, 114530, 114532, 114536, 114842, 114866, 114868, 114970, 114994, 114996, 115042, 115044, 115048, 115062, 115130, 115226, 115250, 115252, 115278, 115292, 115298, 115300, 115304, 115318, 115342, 115394, 115396, 115400, 115408, 115422, 115430, 115436, 115450, 115478, 115494, 115514, 115526, 115532, 115570, 115572, 115738, 115758, 115762, 115764, 115790, 115804, 115810, 115812, 115816, 115830, 115854, 115868, 115896, 115906, 115912, 115920, 115934, 115942, 115948, 115962, 115996, 116024, 116080, 116094, 116098, 116100, 116104, 116112, 116126, 116128, 116156, 116166, 116172, 116184, 116206, 116210, 116212, 116246, 116262, 116268, 116282, 116294, 116300, 116312, 116334, 116338, 116340, 116358, 116364, 116376, 116400, 116414, 116430, 116444, 116450, 116452, 116456, 116498, 116500, 116514, 116520, 116534, 116546, 116548, 116552, 116560, 116574, 116582, 116588, 116602, 116654, 116694, 116714, 116762, 116782, 116786, 116788, 116814, 116828, 116834, 116836, 116840, 116854, 116878, 116892, 116920, 116930, 116936, 116944, 116958, 116966, 116972, 116986, 117006, 117048, 117104, 117118, 117122, 117124, 117136, 117150, 117152, 117180, 117190, 117196, 117208, 117230, 117234, 117236, 117304, 117360, 117374, 117472, 117500, 117506, 117508, 117512, 117520, 117536, 117564, 117568, 117624, 117638, 117644, 117656, 117680, 117694, 117710, 117724, 117730, 117732, 117736, 117750, 117782, 117798, 117804, 117818, 117830, 117848, 117874, 117876, 117894, 117936, 117950, 117966, 117986, 117988, 117992, 118022, 118028, 118040, 118064, 118078, 118112, 118140, 118172, 118210, 118212, 118216, 118224, 118238, 118246, 118266, 118306, 118312, 118338, 118352, 118366, 118374, 118394, 118402, 118404, 118408, 118416, 118430, 118432, 118460, 118476, 118514, 118516, 118574, 118578, 118580, 118606, 118620, 118626, 118628, 118632, 118678, 118694, 118700, 118730, 118738, 118740, 118830, 118834, 118836, 118862, 118876, 118882, 118884, 118888, 118902, 118926, 118940, 118968, 118978, 118980, 118984, 118992, 119006, 119014, 119020, 119034, 119068, 119096, 119152, 119166, 119170, 119172, 119176, 119184, 119198, 119200, 119228, 119238, 119244, 119256, 119278, 119282, 119284, 119324, 119352, 119408, 119422, 119520, 119548, 119554, 119556, 119560, 119568, 119582, 119584, 119612, 119616, 119672, 119686, 119692, 119704, 119728, 119742, 119758, 119772, 119778, 119780, 119784, 119798, 119920, 119934, 120032, 120060, 120256, 120312, 120324, 120328, 120336, 120352, 120384, 120440, 120560, 120582, 120588, 120600, 120624, 120638, 120672, 120700, 120718, 120732, 120760, 120770, 120772, 120776, 120784, 120798, 120806, 120812, 120870, 120876, 120890, 120902, 120908, 120920, 120946, 120948, 120966, 120972, 120984, 121008, 121022, 121038, 121058, 121060, 121064, 121078, 121100, 121112, 121136, 121150, 121184, 121212, 121244, 121282, 121284, 121288, 121296, 121318, 121338, 121356, 121368, 121392, 121406, 121440, 121468, 121536, 121592, 121656, 121730, 121732, 121736, 121744, 121758, 121760, 121804, 121842, 121844, 121890, 121922, 121924, 121928, 121936, 121950, 121958, 121978, 121986, 121988, 121992, 122000, 122014, 122016, 122044, 122060, 122098, 122100, 122116, 122120, 122128, 122142, 122144, 122172, 122176, 122232, 122246, 122264, 122318, 122338, 122340, 122344, 122414, 122418, 122420, 122446, 122460, 122466, 122468, 122472, 122510, 122524, 122552, 122562, 122564, 122568, 122576, 122598, 122618, 122646, 122662, 122668, 122694, 122700, 122712, 122738, 122740, 122762, 122770, 122772, 122786, 122788, 122792, 123018, 123026, 123028, 123042, 123044, 123048, 123062, 123098, 123146, 123154, 123156, 123170, 123172, 123176, 123190, 123202, 123204, 123208, 123216, 123238, 123244, 123258, 123290, 123314, 123316, 123402, 123410, 123412, 123426, 123428, 123432, 123446, 123458, 123464, 123472, 123486, 123494, 123500, 123514, 123522, 123524, 123528, 123536, 123552, 123580, 123590, 123596, 123608, 123630, 123634, 123636, 123674, 123698, 123700, 123740, 123746, 123748, 123752, 123834, 123914, 123922, 123924, 123938, 123944, 123958, 123970, 123976, 123984, 123998, 124006, 124012, 124026, 124034, 124036, 124048, 124062, 124064, 124092, 124102, 124108, 124120, 124142, 124146, 124148, 124162, 124164, 124168, 124176, 124190, 124192, 124220, 124224, 124280, 124294, 124300, 124312, 124336, 124350, 124366, 124380, 124386, 124388, 124392, 124406, 124442, 124462, 124466, 124468, 124494, 124508, 124514, 124520, 124558, 124572, 124600, 124610, 124612, 124616, 124624, 124646, 124666, 124694, 124710, 124716, 124730, 124742, 124748, 124760, 124786, 124788, 124818, 124820, 124834, 124836, 124840, 124854, 124946, 124948, 124962, 124964, 124968, 124982, 124994, 124996, 125000, 125008, 125022, 125030, 125036, 125050, 125058, 125060, 125064, 125072, 125086, 125088, 125116, 125126, 125132, 125144, 125166, 125170, 125172, 125186, 125188, 125192, 125200, 125216, 125244, 125248, 125304, 125318, 125324, 125336, 125360, 125374, 125390, 125404, 125410, 125412, 125416, 125430, 125444, 125448, 125456, 125472, 125504, 125560, 125680, 125702, 125708, 125720, 125744, 125758, 125792, 125820, 125838, 125852, 125880, 125890, 125892, 125896, 125904, 125918, 125926, 125932, 125978, 125998, 126002, 126004, 126030, 126044, 126050, 126052, 126056, 126094, 126108, 126136, 126146, 126148, 126152, 126160, 126182, 126202, 126222, 126236, 126264, 126320, 126334, 126338, 126340, 126344, 126352, 126366, 126368, 126412, 126450, 126452, 126486, 126502, 126508, 126522, 126534, 126540, 126552, 126574, 126578, 126580, 126598, 126604, 126616, 126640, 126654, 126670, 126684, 126690, 126692, 126696, 126738, 126754, 126756, 126760, 126774, 126786, 126788, 126792, 126800, 126814, 126822, 126828, 126842, 126894, 126898, 126900, 126934, 127126, 127142, 127148, 127162, 127178, 127186, 127188, 127254, 127270, 127276, 127290, 127302, 127308, 127320, 127342, 127346, 127348, 127370, 127378, 127380, 127394, 127396, 127400, 127450, 127510, 127526, 127532, 127546, 127558, 127576, 127598, 127602, 127604, 127622, 127628, 127640, 127664, 127678, 127694, 127708, 127714, 127716, 127720, 127734, 127754, 127762, 127764, 127778, 127784, 127810, 127812, 127816, 127824, 127838, 127846, 127866, 127898, 127918, 127922, 127924, 128022, 128038, 128044, 128058, 128070, 128076, 128088, 128110, 128114, 128116, 128134, 128140, 128152, 128176, 128190, 128206, 128220, 128226, 128228, 128232, 128246, 128262, 128268, 128280, 128304, 128318, 128352, 128380, 128398, 128412, 128440, 128450, 128452, 128456, 128464, 128478, 128486, 128492, 128506, 128522, 128530, 128532, 128546, 128548, 128552, 128566, 128578, 128580, 128584, 128592, 128606, 128614, 128634, 128642, 128644, 128648, 128656, 128670, 128672, 128700, 128716, 128754, 128756, 128794, 128814, 128818, 128820, 128846, 128860, 128866, 128868, 128872, 128886, 128918, 128934, 128940, 128954, 128978, 128980, 129178, 129198, 129202, 129204, 129238, 129258, 129306, 129326, 129330, 129332, 129358, 129372, 129378, 129380, 129384, 129398, 129430, 129446, 129452, 129466, 129482, 129490, 129492, 129562, 129582, 129586, 129588, 129614, 129628, 129634, 129636, 129640, 129654, 129678, 129692, 129720, 129730, 129732, 129736, 129744, 129758, 129766, 129772, 129814, 129830, 129836, 129850, 129862, 129868, 129880, 129902, 129906, 129908, 129930, 129938, 129940, 129954, 129956, 129960, 129974, 130010};
+    public static final int[] b = {66142, 66170, 66206, 66236, 66290, 66292, 66350, 66382, 66396, 66454, 66470, 66476, 66594, 66600, 66614, 66626, 66628, 66632, 66640, 66654, 66662, 66668, 66682, 66690, 66718, 66720, 66748, 66758, 66776, 66798, 66802, 66804, 66820, 66824, 66832, 66846, 66848, 66876, 66880, 66936, 66950, 66956, 66968, 66992, 67006, 67022, 67036, 67042, 67044, 67048, 67062, 67118, 67150, 67164, 67214, 67228, 67256, 67294, 67322, 67350, 67366, 67372, 67398, 67404, 67416, 67438, 67474, 67476, 67490, 67492, 67496, 67510, 67618, 67624, 67650, 67656, 67664, 67678, 67686, 67692, 67706, 67714, 67716, 67728, 67742, 67744, 67772, 67782, 67788, 67800, 67822, 67826, 67828, 67842, 67848, 67870, 67872, 67900, 67904, 67960, 67974, 67992, 68016, 68030, 68046, 68060, 68066, 68068, 68072, 68086, 68104, 68112, 68126, 68128, 68156, 68160, 68216, 68336, 68358, 68364, 68376, 68400, 68414, 68448, 68476, 68494, 68508, 68536, 68546, 68548, 68552, 68560, 68574, 68582, 68588, 68654, 68686, 68700, 68706, 68708, 68712, 68726, 68750, 68764, 68792, 68802, 68804, 68808, 68816, 68830, 68838, 68844, 68858, 68878, 68892, 68920, 68976, 68990, 68994, 68996, 69000, 69008, 69022, 69024, 69052, 69062, 69068, 69080, 69102, 69106, 69108, 69142, 69158, 69164, 69190, 69208, 69230, 69254, 69260, 69272, 69296, 69310, 69326, 69340, 69386, 69394, 69396, 69410, 69416, 69430, 69442, 69444, 69448, 69456, 69470, 69478, 69484, 69554, 69556, 69666, 69672, 69698, 69704, 69712, 69726, 69754, 69762, 69764, 69776, 69790, 69792, 69820, 69830, 69836, 69848, 69870, 69874, 69876, 69890, 69918, 69920, 69948, 69952, 70008, 70022, 70040, 70064, 70078, 70094, 70108, 70114, 70116, 70120, 70134, 70152, 70174, 70176, 70264, 70384, 70412, 70448, 70462, 70496, 70524, 70542, 70556, 70584, 70594, 70600, 70608, 70622, 70630, 70636, 70664, 70672, 70686, 70688, 70716, 70720, 70776, 70896, 71136, 71180, 71192, 71216, 71230, 71264, 71292, 71360, 71416, 71452, 71480, 71536, 71550, 71554, 71556, 71560, 71568, 71582, 71584, 71612, 71622, 71628, 71640, 71662, 71726, 71732, 71758, 71772, 71778, 71780, 71784, 71798, 71822, 71836, 71864, 71874, 71880, 71888, 71902, 71910, 71916, 71930, 71950, 71964, 71992, 72048, 72062, 72066, 72068, 72080, 72094, 72096, 72124, 72134, 72140, 72152, 72174, 72178, 72180, 72206, 72220, 72248, 72304, 72318, 72416, 72444, 72456, 72464, 72478, 72480, 72508, 72512, 72568, 72588, 72600, 72624, 72638, 72654, 72668, 72674, 72676, 72680, 72694, 72726, 72742, 72748, 72774, 72780, 72792, 72814, 72838, 72856, 72880, 72894, 72910, 72924, 72930, 72932, 72936, 72950, 72966, 72972, 72984, 73008, 73022, 73056, 73084, 73102, 73116, 73144, 73156, 73160, 73168, 73182, 73190, 73196, 73210, 73226, 73234, 73236, 73250, 73252, 73256, 73270, 73282, 73284, 73296, 73310, 73318, 73324, 73346, 73348, 73352, 73360, 73374, 73376, 73404, 73414, 73420, 73432, 73454, 73498, 73518, 73522, 73524, 73550, 73564, 73570, 73572, 73576, 73590, 73800, 73822, 73858, 73860, 73872, 73886, 73888, 73916, 73944, 73970, 73972, 73992, 74014, 74016, 74044, 74048, 74104, 74118, 74136, 74160, 74174, 74210, 74212, 74216, 74230, 74244, 74256, 74270, 74272, 74360, 74480, 74502, 74508, 74544, 74558, 74592, 74620, 74638, 74652, 74680, 74690, 74696, 74704, 74726, 74732, 74782, 74784, 74812, 74992, 75232, 75288, 75326, 75360, 75388, 75456, 75512, 75576, 75632, 75646, 75650, 75652, 75664, 75678, 75680, 75708, 75718, 75724, 75736, 75758, 75808, 75836, 75840, 75896, 76016, 76256, 76736, 76824, 76848, 76862, 76896, 76924, 76992, 77048, 77296, 77340, 77368, 77424, 77438, 77536, 77564, 77572, 77576, 77584, 77600, 77628, 77632, 77688, 77702, 77708, 77720, 77744, 77758, 77774, 77788, 77870, 77902, 77916, 77922, 77928, 77966, 77980, 78008, 78018, 78024, 78032, 78046, 78060, 78074, 78094, 78136, 78192, 78206, 78210, 78212, 78224, 78238, 78240, 78268, 78278, 78284, 78296, 78322, 78324, 78350, 78364, 78448, 78462, 78560, 78588, 78600, 78622, 78624, 78652, 78656, 78712, 78726, 78744, 78768, 78782, 78798, 78812, 78818, 78820, 78824, 78838, 78862, 78876, 78904, 78960, 78974, 79072, 79100, 79296, 79352, 79368, 79376, 79390, 79392, 79420, 79424, 79480, 79600, 79628, 79640, 79664, 79678, 79712, 79740, 79772, 79800, 79810, 79812, 79816, 79824, 79838, 79846, 79852, 79894, 79910, 79916, 79942, 79948, 79960, 79982, 79988, 80006, 80024, 80048, 80062, 80078, 80092, 80098, 80100, 80104, 80134, 80140, 80176, 80190, 80224, 80252, 80270, 80284, 80312, 80328, 80336, 80350, 80358, 80364, 80378, 80390, 80396, 80408, 80432, 80446, 80480, 80508, 80576, 80632, 80654, 80668, 80696, 80752, 80766, 80776, 80784, 80798, 80800, 80828, 80844, 80856, 80878, 80882, 80884, 80914, 80916, 80930, 80932, 80936, 80950, 80962, 80968, 80976, 80990, 80998, 81004, 81026, 81028, 81040, 81054, 81056, 81084, 81094, 81100, 81112, 81134, 81154, 81156, 81160, 81168, 81182, 81184, 81212, 81216, 81272, 81286, 81292, 81304, 81328, 81342, 81358, 81372, 81380, 81384, 81398, 81434, 81454, 81458, 81460, 81486, 81500, 81506, 81508, 81512, 81526, 81550, 81564, 81592, 81602, 81604, 81608, 81616, 81630, 81638, 81644, 81702, 81708, 81722, 81734, 81740, 81752, 81774, 81778, 81780, 82050, 82078, 82080, 82108, 82180, 82184, 82192, 82206, 82208, 82236, 82240, 82296, 82316, 82328, 82352, 82366, 82402, 82404, 82408, 82440, 82448, 82462, 82464, 82492, 82496, 82552, 82672, 82694, 82700, 82712, 82736, 82750, 82784, 82812, 82830, 82882, 82884, 82888, 82896, 82918, 82924, 82952, 82960, 82974, 82976, 83004, 83008, 83064, 83184, 83424, 83468, 83480, 83504, 83518, 83552, 83580, 83648, 83704, 83740, 83768, 83824, 83838, 83842, 83844, 83848, 83856, 83872, 83900, 83910, 83916, 83928, 83950, 83984, 84000, 84028, 84032, 84088, 84208, 84448, 84928, 85040, 85054, 85088, 85116, 85184, 85240, 85488, 85560, 85616, 85630, 85728, 85756, 85764, 85768, 85776, 85790, 85792, 85820, 85824, 85880, 85894, 85900, 85912, 85936, 85966, 85980, 86048, 86080, 86136, 86256, 86496, 86976, 88160, 88188, 88256, 88312, 88560, 89056, 89200, 89214, 89312, 89340, 89536, 89592, 89608, 89616, 89632, 89664, 89720, 89840, 89868, 89880, 89904, 89952, 89980, 89998, 90012, 90040, 90190, 90204, 90254, 90268, 90296, 90306, 90308, 90312, 90334, 90382, 90396, 90424, 90480, 90494, 90500, 90504, 90512, 90526, 90528, 90556, 90566, 90572, 90584, 90610, 90612, 90638, 90652, 90680, 90736, 90750, 90848, 90876, 90884, 90888, 90896, 90910, 90912, 90940, 90944, 91000, 91014, 91020, 91032, 91056, 91070, 91086, 91100, 91106, 91108, 91112, 91126, 91150, 91164, 91192, 91248, 91262, 91360, 91388, 91584, 91640, 91664, 91678, 91680, 91708, 91712, 91768, 91888, 91928, 91952, 91966, 92000, 92028, 92046, 92060, 92088, 92098, 92100, 92104, 92112, 92126, 92134, 92140, 92188, 92216, 92272, 92384, 92412, 92608, 92664, 93168, 93200, 93214, 93216, 93244, 93248, 93304, 93424, 93664, 93720, 93744, 93758, 93792, 93820, 93888, 93944, 93980, 94008, 94064, 94078, 94084, 94088, 94096, 94110, 94112, 94140, 94150, 94156, 94168, 94246, 94252, 94278, 94284, 94296, 94318, 94342, 94348, 94360, 94384, 94398, 94414, 94428, 94440, 94470, 94476, 94488, 94512, 94526, 94560, 94588, 94606, 94620, 94648, 94658, 94660, 94664, 94672, 94686, 94694, 94700, 94714, 94726, 94732, 94744, 94768, 94782, 94816, 94844, 94912, 94968, 94990, 95004, 95032, 95088, 95102, 95112, 95120, 95134, 95136, 95164, 95180, 95192, 95214, 95218, 95220, 95244, 95256, 95280, 95294, 95328, 95356, 95424, 95480, 95728, 95758, 95772, 95800, 95856, 95870, 95968, 95996, 96008, 96016, 96030, 96032, 96060, 96064, 96120, 96152, 96176, 96190, 96220, 96226, 96228, 96232, 96290, 96292, 96296, 96310, 96322, 96324, 96328, 96336, 96350, 96358, 96364, 96386, 96388, 96392, 96400, 96414, 96416, 96444, 96454, 96460, 96472, 96494, 96498, 96500, 96514, 96516, 96520, 96528, 96542, 96544, 96572, 96576, 96632, 96646, 96652, 96664, 96688, 96702, 96718, 96732, 96738, 96740, 96744, 96758, 96772, 96776, 96784, 96798, 96800, 96828, 96832, 96888, 97008, 97030, 97036, 97048, 97072, 97086, 97120, 97148, 97166, 97180, 97208, 97220, 97224, 97232, 97246, 97254, 97260, 97326, 97330, 97332, 97358, 97372, 97378, 97380, 97384, 97398, 97422, 97436, 97464, 97474, 97476, 97480, 97488, 97502, 97510, 97516, 97550, 97564, 97592, 97648, 97666, 97668, 97672, 97680, 97694, 97696, 97724, 97734, 97740, 97752, 97774, 97830, 97836, 97850, 97862, 97868, 97880, 97902, 97906, 97908, 97926, 97932, 97944, 97968, 97998, 98012, 98018, 98020, 98024, 98038, 98618, 98674, 98676, 98838, 98854, 98874, 98892, 98904, 98926, 98930, 98932, 98968, 99006, 99042, 99044, 99048, 99062, 99166, 99194, 99246, 99286, 99350, 99366, 99372, 99386, 99398, 99416, 99438, 99442, 99444, 99462, 99504, 99518, 99534, 99548, 99554, 99556, 99560, 99574, 99590, 99596, 99608, 99632, 99646, 99680, 99708, 99726, 99740, 99768, 99778, 99780, 99784, 99792, 99806, 99814, 99820, 99834, 99858, 99860, 99874, 99880, 99894, 99906, 99920, 99934, 99962, 99970, 99972, 99976, 99984, 99998, 100000, 100028, 100038, 100044, 100056, 100078, 100082, 100084, 100142, 100174, 100188, 100246, 100262, 100268, 100306, 100308, 100390, 100396, 100410, 100422, 100428, 100440, 100462, 100466, 100468, 100486, 100504, 100528, 100542, 100558, 100572, 100578, 100580, 100584, 100598, 100620, 100656, 100670, 100704, 100732, 100750, 100792, 100802, 100808, 100816, 100830, 100838, 100844, 100858, 100888, 100912, 100926, 100960, 100988, 101056, 101112, 101148, 101176, 101232, 101246, 101250, 101252, 101256, 101264, 101278, 101280, 101308, 101318, 101324, 101336, 101358, 101362, 101364, 101410, 101412, 101416, 101430, 101442, 101448, 101456, 101470, 101478, 101498, 101506, 101508, 101520, 101534, 101536, 101564, 101580, 101618, 101620, 101636, 101640, 101648, 101662, 101664, 101692, 101696, 101752, 101766, 101784, 101838, 101858, 101860, 101864, 101934, 101938, 101940, 101966, 101980, 101986, 101988, 101992, 102030, 102044, 102072, 102082, 102084, 102088, 102096, 102138, 102166, 102182, 102188, 102214, 102220, 102232, 102254, 102282, 102290, 102292, 102306, 102308, 102312, 102326, 102444, 102458, 102470, 102476, 102488, 102514, 102516, 102534, 102552, 102576, 102590, 102606, 102620, 102626, 102632, 102646, 102662, 102668, 102704, 102718, 102752, 102780, 102798, 102812, 102840, 102850, 102856, 102864, 102878, 102886, 102892, 102906, 102936, 102974, 103008, 103036, 103104, 103160, 103224, 103280, 103294, 103298, 103300, 103312, 103326, 103328, 103356, 103366, 103372, 103384, 103406, 103410, 103412, 103472, 103486, 103520, 103548, 103616, 103672, 103920, 103992, 104048, 104062, 104160, 104188, 104194, 104196, 104200, 104208, 104224, 104252, 104256, 104312, 104326, 104332, 104344, 104368, 104382, 104398, 104412, 104418, 104420, 104424, 104482, 104484, 104514, 104520, 104528, 104542, 104550, 104570, 104578, 104580, 104592, 104606, 104608, 104636, 104652, 104690, 104692, 104706, 104712, 104734, 104736, 104764, 104768, 104824, 104838, 104856, 104910, 104930, 104932, 104936, 104968, 104976, 104990, 104992, 105020, 105024, 105080, 105200, 105240, 105278, 105312, 105372, 105410, 105412, 105416, 105424, 105446, 105518, 105524, 105550, 105564, 105570, 105572, 105576, 105614, 105628, 105656, 105666, 105672, 105680, 105702, 105722, 105742, 105756, 105784, 105840, 105854, 105858, 105860, 105864, 105872, 105888, 105932, 105970, 105972, 106006, 106022, 106028, 106054, 106060, 106072, 106100, 106118, 106124, 106136, 106160, 106174, 106190, 106210, 106212, 106216, 106250, 106258, 106260, 106274, 106276, 106280, 106306, 106308, 106312, 106320, 106334, 106348, 106394, 106414, 106418, 106420, 106566, 106572, 106610, 106612, 106630, 106636, 106648, 106672, 106686, 106722, 106724, 106728, 106742, 106758, 106764, 106776, 106800, 106814, 106848, 106876, 106894, 106908, 106936, 106946, 106948, 106952, 106960, 106974, 106982, 106988, 107032, 107056, 107070, 107104, 107132, 107200, 107256, 107292, 107320, 107376, 107390, 107394, 107396, 107400, 107408, 107422, 107424, 107452, 107462, 107468, 107480, 107502, 107506, 107508, 107544, 107568, 107582, 107616, 107644, 107712, 107768, 108016, 108060, 108088, 108144, 108158, 108256, 108284, 108290, 108292, 108296, 108304, 108318, 108320, 108348, 108352, 108408, 108422, 108428, 108440, 108464, 108478, 108494, 108508, 108514, 108516, 108520, 108592, 108640, 108668, 108736, 108792, 109040, 109536, 109680, 109694, 109792, 109820, 110016, 110072, 110084, 110088, 110096, 110112, 110140, 110144, 110200, 110320, 110342, 110348, 110360, 110384, 110398, 110432, 110460, 110478, 110492, 110520, 110532, 110536, 110544, 110558, 110658, 110686, 110714, 110722, 110724, 110728, 110736, 110750, 110752, 110780, 110796, 110834, 110836, 110850, 110852, 110856, 110864, 110878, 110880, 110908, 110912, 110968, 110982, RestAPIAbortCodes.SEARCH_INDEXING, 111054, 111074, 111076, 111080, 111108, 111112, 111120, 111134, 111136, 111164, 111168, 111224, 111344, 111372, 111422, 111456, 111516, 111554, 111556, 111560, 111568, 111590, 111632, 111646, 111648, 111676, 111680, 111736, 111856, 112096, 112152, 112224, 112252, 112320, 112440, 112514, 112516, 112520, 112528, 112542, 112544, 112588, 112686, 112718, 112732, 112782, 112796, 112824, 112834, 112836, 112840, 112848, 112870, 112890, 112910, 112924, 112952, 113008, 113022, 113026, 113028, 113032, 113040, 113054, 113056, 113100, 113138, 113140, 113166, 113180, 113208, 113264, 113278, 113376, 113404, 113416, 113424, 113440, 113468, 113472, 113560, 113614, 113634, 113636, 113640, 113686, 113702, 113708, 113734, 113740, 113752, 113778, 113780, 113798, 113804, 113816, 113840, 113854, 113870, 113890, 113892, 113896, 113926, 113932, 113944, 113968, 113982, 114016, 114044, 114076, 114114, 114116, 114120, 114128, 114150, 114170, 114194, 114196, 114210, 114212, 114216, 114242, 114244, 114248, 114256, 114270, 114278, 114306, 114308, 114312, 114320, 114334, 114336, 114364, 114380, 114420, 114458, 114478, 114482, 114484, 114510, 114524, 114530, 114532, 114536, 114842, 114866, 114868, 114970, 114994, 114996, 115042, 115044, 115048, 115062, 115130, 115226, 115250, 115252, 115278, 115292, 115298, 115300, 115304, 115318, 115342, 115394, 115396, 115400, 115408, 115422, 115430, 115436, 115450, 115478, 115494, 115514, 115526, 115532, 115570, 115572, 115738, 115758, 115762, 115764, 115790, 115804, 115810, 115812, 115816, 115830, 115854, 115868, 115896, 115906, 115912, 115920, 115934, 115942, 115948, 115962, 115996, 116024, 116080, 116094, 116098, 116100, 116104, 116112, 116126, 116128, 116156, 116166, 116172, 116184, 116206, 116210, 116212, 116246, 116262, 116268, 116282, 116294, 116300, 116312, 116334, 116338, 116340, 116358, 116364, 116376, 116400, 116414, 116430, 116444, 116450, 116452, 116456, 116498, 116500, 116514, 116520, 116534, 116546, 116548, 116552, 116560, 116574, 116582, 116588, 116602, 116654, 116694, 116714, 116762, 116782, 116786, 116788, 116814, 116828, 116834, 116836, 116840, 116854, 116878, 116892, 116920, 116930, 116936, 116944, 116958, 116966, 116972, 116986, 117006, 117048, 117104, 117118, 117122, 117124, 117136, 117150, 117152, 117180, 117190, 117196, 117208, 117230, 117234, 117236, 117304, 117360, 117374, 117472, 117500, 117506, 117508, 117512, 117520, 117536, 117564, 117568, 117624, 117638, 117644, 117656, 117680, 117694, 117710, 117724, 117730, 117732, 117736, 117750, 117782, 117798, 117804, 117818, 117830, 117848, 117874, 117876, 117894, 117936, 117950, 117966, 117986, 117988, 117992, 118022, 118028, 118040, 118064, 118078, 118112, 118140, 118172, 118210, 118212, 118216, 118224, 118238, 118246, 118266, 118306, 118312, 118338, 118352, 118366, 118374, 118394, 118402, 118404, 118408, 118416, 118430, 118432, 118460, 118476, 118514, 118516, 118574, 118578, 118580, 118606, 118620, 118626, 118628, 118632, 118678, 118694, 118700, 118730, 118738, 118740, 118830, 118834, 118836, 118862, 118876, 118882, 118884, 118888, 118902, 118926, 118940, 118968, 118978, 118980, 118984, 118992, 119006, 119014, 119020, 119034, 119068, 119096, 119152, 119166, 119170, 119172, 119176, 119184, 119198, 119200, 119228, 119238, 119244, 119256, 119278, 119282, 119284, 119324, 119352, 119408, 119422, 119520, 119548, 119554, 119556, 119560, 119568, 119582, 119584, 119612, 119616, 119672, 119686, 119692, 119704, 119728, 119742, 119758, 119772, 119778, 119780, 119784, 119798, 119920, 119934, 120032, 120060, 120256, 120312, 120324, 120328, 120336, 120352, 120384, 120440, 120560, 120582, 120588, 120600, 120624, 120638, 120672, 120700, 120718, 120732, 120760, 120770, 120772, 120776, 120784, 120798, 120806, 120812, 120870, 120876, 120890, 120902, 120908, 120920, 120946, 120948, 120966, 120972, 120984, 121008, 121022, 121038, 121058, 121060, 121064, 121078, 121100, 121112, 121136, 121150, 121184, 121212, 121244, 121282, 121284, 121288, 121296, 121318, 121338, 121356, 121368, 121392, 121406, 121440, 121468, 121536, 121592, 121656, 121730, 121732, 121736, 121744, 121758, 121760, 121804, 121842, 121844, 121890, 121922, 121924, 121928, 121936, 121950, 121958, 121978, 121986, 121988, 121992, 122000, 122014, 122016, 122044, 122060, 122098, 122100, 122116, 122120, 122128, 122142, 122144, 122172, 122176, 122232, 122246, 122264, 122318, 122338, 122340, 122344, 122414, 122418, 122420, 122446, 122460, 122466, 122468, 122472, 122510, 122524, 122552, 122562, 122564, 122568, 122576, 122598, 122618, 122646, 122662, 122668, 122694, 122700, 122712, 122738, 122740, 122762, 122770, 122772, 122786, 122788, 122792, 123018, 123026, 123028, 123042, 123044, 123048, 123062, 123098, 123146, 123154, 123156, 123170, 123172, 123176, 123190, 123202, 123204, 123208, 123216, 123238, 123244, 123258, 123290, 123314, 123316, 123402, 123410, 123412, 123426, 123428, 123432, 123446, 123458, 123464, 123472, 123486, 123494, 123500, 123514, 123522, 123524, 123528, 123536, 123552, 123580, 123590, 123596, 123608, 123630, 123634, 123636, 123674, 123698, 123700, 123740, 123746, 123748, 123752, 123834, 123914, 123922, 123924, 123938, 123944, 123958, 123970, 123976, 123984, 123998, 124006, 124012, 124026, 124034, 124036, 124048, 124062, 124064, 124092, 124102, 124108, 124120, 124142, 124146, 124148, 124162, 124164, 124168, 124176, 124190, 124192, 124220, 124224, 124280, 124294, 124300, 124312, 124336, 124350, 124366, 124380, 124386, 124388, 124392, 124406, 124442, 124462, 124466, 124468, 124494, 124508, 124514, 124520, 124558, 124572, 124600, 124610, 124612, 124616, 124624, 124646, 124666, 124694, 124710, 124716, 124730, 124742, 124748, 124760, 124786, 124788, 124818, 124820, 124834, 124836, 124840, 124854, 124946, 124948, 124962, 124964, 124968, 124982, 124994, 124996, 125000, 125008, 125022, 125030, 125036, 125050, 125058, 125060, 125064, 125072, 125086, 125088, 125116, 125126, 125132, 125144, 125166, 125170, 125172, 125186, 125188, 125192, 125200, 125216, 125244, 125248, 125304, 125318, 125324, 125336, 125360, 125374, 125390, 125404, 125410, 125412, 125416, 125430, 125444, 125448, 125456, 125472, 125504, 125560, 125680, 125702, 125708, 125720, 125744, 125758, 125792, 125820, 125838, 125852, 125880, 125890, 125892, 125896, 125904, 125918, 125926, 125932, 125978, 125998, 126002, 126004, 126030, 126044, 126050, 126052, 126056, 126094, 126108, 126136, 126146, 126148, 126152, 126160, 126182, 126202, 126222, 126236, 126264, 126320, 126334, 126338, 126340, 126344, 126352, 126366, 126368, 126412, 126450, 126452, 126486, 126502, 126508, 126522, 126534, 126540, 126552, 126574, 126578, 126580, 126598, 126604, 126616, 126640, 126654, 126670, 126684, 126690, 126692, 126696, 126738, 126754, 126756, 126760, 126774, 126786, 126788, 126792, 126800, 126814, 126822, 126828, 126842, 126894, 126898, 126900, 126934, 127126, 127142, 127148, 127162, 127178, 127186, 127188, 127254, 127270, 127276, 127290, 127302, 127308, 127320, 127342, 127346, 127348, 127370, 127378, 127380, 127394, 127396, 127400, 127450, 127510, 127526, 127532, 127546, 127558, 127576, 127598, 127602, 127604, 127622, 127628, 127640, 127664, 127678, 127694, 127708, 127714, 127716, 127720, 127734, 127754, 127762, 127764, 127778, 127784, 127810, 127812, 127816, 127824, 127838, 127846, 127866, 127898, 127918, 127922, 127924, 128022, 128038, 128044, 128058, 128070, 128076, 128088, 128110, 128114, 128116, 128134, 128140, 128152, 128176, 128190, 128206, 128220, 128226, 128228, 128232, 128246, 128262, 128268, 128280, 128304, 128318, 128352, 128380, 128398, 128412, 128440, 128450, 128452, 128456, 128464, 128478, 128486, 128492, 128506, 128522, 128530, 128532, 128546, 128548, 128552, 128566, 128578, 128580, 128584, 128592, 128606, 128614, 128634, 128642, 128644, 128648, 128656, 128670, 128672, 128700, 128716, 128754, 128756, 128794, 128814, 128818, 128820, 128846, 128860, 128866, 128868, 128872, 128886, 128918, 128934, 128940, 128954, 128978, 128980, 129178, 129198, 129202, 129204, 129238, 129258, 129306, 129326, 129330, 129332, 129358, 129372, 129378, 129380, 129384, 129398, 129430, 129446, 129452, 129466, 129482, 129490, 129492, 129562, 129582, 129586, 129588, 129614, 129628, 129634, 129636, 129640, 129654, 129678, 129692, 129720, 129730, 129732, 129736, 129744, 129758, 129766, 129772, 129814, 129830, 129836, 129850, 129862, 129868, 129880, 129902, 129906, 129908, 129930, 129938, 129940, 129954, 129956, 129960, 129974, 130010};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f1438c = {2627, 1819, 2622, 2621, 1813, 1812, 2729, 2724, 2723, 2779, 2774, 2773, 902, 896, 908, 868, 865, 861, 859, 2511, 873, 871, 1780, 835, 2493, 825, 2491, 842, 837, 844, 1764, 1762, 811, 810, 809, 2483, 807, 2482, 806, 2480, 815, 814, 813, 812, 2484, 817, 816, 1745, 1744, 1742, 1746, 2655, 2637, 2635, 2626, 2625, 2623, 2628, 1820, 2752, 2739, 2737, 2728, 2727, 2725, 2730, 2785, 2783, 2778, 2777, 2775, 2780, 787, 781, 747, 739, 736, 2413, 754, 752, 1719, 692, 689, 681, 2371, 678, 2369, 700, 697, 694, 703, 1688, 1686, 642, 638, 2343, 631, 2341, 627, 2338, 651, 646, 643, 2345, 654, 652, 1652, 1650, 1647, 1654, 601, 599, 2322, 596, 2321, 594, 2319, 2317, 611, 610, 608, 606, 2324, 603, 2323, 615, 614, 612, 1617, 1616, 1614, 1612, 616, 1619, 1618, 2575, 2538, 2536, 905, 901, 898, 909, 2509, 2507, 2504, 870, 867, 864, 860, 2512, 875, 872, 1781, 2490, 2489, 2487, 2485, 1748, 836, 834, 832, 830, 2494, 827, 2492, 843, 841, 839, 845, 1765, 1763, 2701, 2676, 2674, 2653, 2648, 2656, 2634, 2633, 2631, 2629, 1821, 2638, 2636, 2770, 2763, 2761, 2750, 2745, 2753, 2736, 2735, 2733, 2731, 1848, 2740, 2738, 2786, 2784, 591, 588, 576, 569, 566, 2296, 1590, 537, 534, 526, 2276, 522, 2274, 545, 542, 539, 548, 1572, 1570, 481, 2245, 466, 2242, 462, 2239, 492, 485, 482, 2249, 496, 494, 1534, 1531, 1528, 1538, 413, 2196, 406, 2191, 2188, 425, 419, 2202, 415, 2199, 432, 430, 427, 1472, 1467, 1464, 433, 1476, 1474, 368, 367, 2160, 365, 2159, 362, 2157, 2155, 2152, 378, 377, 375, 2166, 372, 2165, 369, 2162, 383, 381, 379, 2168, 1419, 1418, 1416, 1414, 385, 1411, 384, 1423, 1422, 1420, 1424, 2461, 802, 2441, 2439, 790, 786, 783, 794, 2409, 2406, 2403, 750, 742, 738, 2414, 756, 753, 1720, 2367, 2365, 2362, 2359, 1663, 693, 691, 684, 2373, 680, 2370, 702, 699, 696, 704, 1690, 1687, 2337, 2336, 2334, 2332, 1624, 2329, 1622, 640, 637, 2344, 634, 2342, 630, 2340, 650, 648, 645, 2346, 655, 653, 1653, 1651, 1649, 1655, 2612, 2597, 2595, 2571, 2568, 2565, 2576, 2534, 2529, 2526, 1787, 2540, 2537, 907, 904, 900, 910, 2503, 2502, 2500, 2498, 1768, 2495, 1767, 2510, 2508, 2506, 869, 866, 863, 2513, 876, 874, 1782, 2720, 2713, 2711, 2697, 2694, 2691, 2702, 2672, 2670, 2664, 1828, 2678, 2675, 2647, 2646, 2644, 2642, 1823, 2639, 1822, 2654, 2652, 2650, 2657, 2771, 1855, 2765, 2762, 1850, 1849, 2751, 2749, 2747, 2754, 353, 2148, 344, 342, 336, 2142, 332, 2140, 345, 1375, 1373, 306, 2130, 299, 2128, 295, 2125, 319, 314, 311, 2132, 1354, 1352, 1349, 1356, 262, 257, 2101, 253, 2096, 2093, 274, 273, 267, 2107, 263, 2104, 280, 278, 275, 1316, 1311, 1308, 1320, 1318, 2052, 202, 2050, 2044, 2040, 219, 2063, 212, 2060, 208, 2055, 224, 221, 2066, 1260, 1258, 1252, 231, 1248, 229, 1266, 1264, 1261, 1268, 155, 1998, 153, 1996, 1994, 1991, 1988, 165, 164, 2007, 162, 2006, 159, 2003, 2000, 172, 171, 169, 2012, 166, 2010, 1186, 1184, 1182, 1179, 175, 1176, 173, 1192, 1191, 1189, 1187, 176, 1194, 1193, 2313, 2307, 2305, 592, 589, 2294, 2292, 2289, 578, 572, 568, 2297, 580, 1591, 2272, 2267, 2264, 1547, 538, 536, 529, 2278, 525, 2275, 547, 544, 541, 1574, 1571, 2237, 2235, 2229, 1493, 2225, 1489, 478, 2247, 470, 2244, 465, 2241, 493, 488, 484, 2250, 498, 495, 1536, 1533, 1530, 1539, 2187, 2186, 2184, 2182, 1432, 2179, 1430, 2176, 1427, 414, 412, 2197, 409, 2195, 405, 2193, 2190, 426, 424, 421, 2203, 418, 2201, 431, 429, 1473, 1471, 1469, 1466, 434, 1477, 1475, 2478, 2472, 2470, 2459, 2457, 2454, 2462, 803, 2437, 2432, 2429, 1726, 2443, 2440, 792, 789, 785, 2401, 2399, 2393, 1702, 2389, 1699, 2411, 2408, 2405, 745, 741, 2415, 758, 755, 1721, 2358, 2357, 2355, 2353, 1661, 2350, 1660, 2347, 1657, 2368, 2366, 2364, 2361, 1666, 690, 687, 2374, 683, 2372, 701, 698, 705, 1691, 1689, 2619, 2617, 2610, 2608, 2605, 2613, 2593, 2588, 2585, 1803, 2599, 2596, 2563, 2561, 2555, 1797, 2551, 1795, 2573, 2570, 2567, 2577, 2525, 2524, 2522, 2520, 1786, 2517, 1785, 2514, 1783, 2535, 2533, 2531, 2528, 1788, 2541, 2539, 906, 903, 911, 2721, 1844, 2715, 2712, 1838, 1836, 2699, 2696, 2693, 2703, 1827, 1826, 1824, 2673, 2671, 2669, 2666, 1829, 2679, 2677, 1858, 1857, 2772, 1854, 1853, 1851, 1856, 2766, 2764, 143, 1987, 139, 1986, 135, 133, 131, 1984, 128, 1983, 125, 1981, 138, 137, 136, 1985, 1133, 1132, 1130, 112, 110, 1974, 107, 1973, 104, 1971, 1969, 122, 121, 119, 117, 1977, 114, 1976, 124, 1115, 1114, 1112, 1110, 1117, 1116, 84, 83, 1953, 81, 1952, 78, 1950, 1948, 1945, 94, 93, 91, 1959, 88, 1958, 85, 1955, 99, 97, 95, 1961, 1086, 1085, 1083, 1081, 1078, 100, 1090, 1089, 1087, 1091, 49, 47, 1917, 44, 1915, 1913, 1910, 1907, 59, 1926, 56, 1925, 53, 1922, 1919, 66, 64, 1931, 61, 1929, 1042, 1040, 1038, 71, 1035, 70, 1032, 68, 1048, 1047, 1045, 1043, 1050, 1049, 12, 10, 1869, 1867, 1864, 1861, 21, 1880, 19, 1877, 1874, 1871, 28, 1888, 25, 1886, 22, 1883, 982, 980, 977, 974, 32, 30, 991, 989, 987, 984, 34, 995, 994, 992, 2151, 2150, 2147, 2146, 2144, 356, 355, 354, 2149, 2139, 2138, 2136, 2134, 1359, 343, 341, 338, 2143, 335, 2141, 348, 347, 346, 1376, 1374, 2124, 2123, 2121, 2119, 1326, 2116, 1324, 310, 308, 305, 2131, 302, 2129, 298, 2127, 320, 318, 316, 313, 2133, 322, 321, 1355, 1353, 1351, 1357, 2092, 2091, 2089, 2087, 1276, 2084, 1274, 2081, 1271, 259, 2102, 256, 2100, 252, 2098, 2095, 272, 269, 2108, 266, 2106, 281, 279, 277, 1317, 1315, 1313, 1310, 282, 1321, 1319, 2039, 2037, 2035, 2032, 1203, 2029, 1200, 1197, 207, 2053, 205, 2051, 201, 2049, 2046, 2043, 220, 218, 2064, 215, 2062, 211, 2059, 228, 226, 223, 2069, 1259, 1257, 1254, 232, 1251, 230, 1267, 1265, 1263, 2316, 2315, 2312, 2311, 2309, 2314, 2304, 2303, 2301, 2299, 1593, 2308, 2306, 590, 2288, 2287, 2285, 2283, 1578, 2280, 1577, 2295, 2293, 2291, 579, 577, 574, 571, 2298, 582, 581, 1592, 2263, 2262, 2260, 2258, 1545, 2255, 1544, 2252, 1541, 2273, 2271, 2269, 2266, 1550, 535, 532, 2279, 528, 2277, 546, 543, 549, 1575, 1573, 2224, 2222, 2220, 1486, 2217, 1485, 2214, 1482, 1479, 2238, 2236, 2234, 2231, 1496, 2228, 1492, 480, 477, 2248, 473, 2246, 469, 2243, 490, 487, 2251, 497, 1537, 1535, 1532, 2477, 2476, 2474, 2479, 2469, 2468, 2466, 2464, 1730, 2473, 2471, 2453, 2452, 2450, 2448, 1729, 2445, 1728, 2460, 2458, 2456, 2463, 805, 804, 2428, 2427, 2425, 2423, 1725, 2420, 1724, 2417, 1722, 2438, 2436, 2434, 2431, 1727, 2444, 2442, 793, 791, 788, 795, 2388, 2386, 2384, 1697, 2381, 1696, 2378, 1694, 1692, 2402, 2400, 2398, 2395, 1703, 2392, 1701, 2412, 2410, 2407, 751, 748, 744, 2416, 759, 757, 1807, 2620, 2618, 1806, 1805, 2611, 2609, 2607, 2614, 1802, 1801, 1799, 2594, 2592, 2590, 2587, 1804, 2600, 2598, 1794, 1793, 1791, 1789, 2564, 2562, 2560, 2557, 1798, 2554, 1796, 2574, 2572, 2569, 2578, 1847, 1846, 2722, 1843, 1842, 1840, 1845, 2716, 2714, 1835, 1834, 1832, 1830, 1839, 1837, 2700, 2698, 2695, 2704, 1817, 1811, 1810, 897, 862, 1777, 829, 826, 838, 1760, 1758, 808, 2481, 1741, 1740, 1738, 1743, 2624, 1818, 2726, 2776, 782, 740, 737, 1715, 686, 679, 695, 1682, 1680, 639, 628, 2339, 647, 644, 1645, 1643, 1640, 1648, 602, 600, 597, 595, 2320, 593, 2318, 609, 607, 604, 1611, 1610, 1608, 1606, 613, 1615, 1613, 2328, 926, 924, 892, 886, 899, 857, 850, 2505, 1778, 824, 823, 821, 819, 2488, 818, 2486, 833, 831, 828, 840, 1761, 1759, 2649, 2632, 2630, 2746, 2734, 2732, 2782, 2781, 570, 567, 1587, 531, 527, 523, 540, 1566, 1564, 476, 467, 463, 2240, 486, 483, 1524, 1521, 1518, 1529, 411, 403, 2192, 399, 2189, 423, 416, 1462, 1457, 1454, 428, 1468, 1465, 2210, 366, 363, 2158, 360, 2156, 357, 2153, 376, 373, 370, 2163, 1410, 1409, 1407, 1405, 382, 1402, 380, 1417, 1415, 1412, 1421, 2175, 2174, 777, 774, 771, 784, 732, 725, 722, 2404, 743, 1716, 676, 674, 668, 2363, 665, 2360, 685, 1684, 1681, 626, 624, 622, 2335, 620, 2333, 617, 2330, 641, 635, 649, 1646, 1644, 1642, 2566, 928, 925, 2530, 2527, 894, 891, 888, 2501, 2499, 2496, 858, 856, 854, 851, 1779, 2692, 2668, 2665, 2645, 2643, 2640, 2651, 2768, 2759, 2757, 2744, 2743, 2741, 2748, 352, 1382, 340, 337, 333, 1371, 1369, 307, 300, 296, 2126, 315, 312, 1347, 1342, 1350, 261, 258, 250, 2097, 246, 2094, 271, 268, 264, 1306, 1301, 1298, 276, 1312, 1309, 2115, 203, 2048, 195, 2045, 191, 2041, 213, 209, 2056, 1246, 1244, 1238, 225, 1234, 222, 1256, 1253, 1249, 1262, 2080, 2079, 154, 1997, 150, 1995, 147, 1992, 1989, 163, 160, 2004, 156, 2001, 1175, 1174, 1172, 1170, 1167, 170, 1164, 167, 1185, 1183, 1180, 1177, 174, 1190, 1188, 2025, 2024, 2022, 587, 586, 564, 559, 556, 2290, 573, 1588, 520, 518, 512, 2268, 508, 2265, 530, 1568, 1565, 461, 457, 2233, 450, 2230, 446, 2226, 479, 471, 489, 1526, 1523, 1520, 397, 395, 2185, 392, 2183, 389, 2180, 2177, 410, 2194, 402, 422, 1463, 1461, 1459, 1456, 1470, 2455, 799, 2433, 2430, 779, 776, 773, 2397, 2394, 2390, 734, 728, 724, 746, 1717, 2356, 2354, 2351, 2348, 1658, 677, 675, 673, 670, 667, 688, 1685, 1683, 2606, 2589, 2586, 2559, 2556, 2552, 927, 2523, 2521, 2518, 2515, 1784, 2532, 895, 893, 890, 2718, 2709, 2707, 2689, 2687, 2684, 2663, 2662, 2660, 2658, 1825, 2667, 2769, 1852, 2760, 2758, 142, 141, 1139, 1138, 134, 132, 129, 126, 1982, 1129, 1128, 1126, 1131, 113, 111, 108, 105, 1972, 101, 1970, 120, 118, 115, 1109, 1108, 1106, 1104, 123, 1113, 1111, 82, 79, 1951, 75, 1949, 72, 1946, 92, 89, 86, 1956, 1077, 1076, 1074, 1072, 98, 1069, 96, 1084, 1082, 1079, 1088, 1968, 1967, 48, 45, 1916, 42, 1914, 39, 1911, 1908, 60, 57, 54, 1923, 50, 1920, 1031, 1030, 1028, 1026, 67, 1023, 65, 1020, 62, 1041, 1039, 1036, 1033, 69, 1046, 1044, 1944, 1943, 1941, 11, 9, 1868, 7, 1865, 1862, 1859, 20, 1878, 16, 1875, 13, 1872, 970, 968, 966, 963, 29, 960, 26, 23, 983, 981, 978, 975, 33, 971, 31, 990, 988, 985, 1906, 1904, 1902, 993, 351, 2145, 1383, 331, 330, 328, 326, 2137, 323, 2135, 339, 1372, 1370, 294, 293, 291, 289, 2122, 286, 2120, 283, 2117, 309, 303, 317, 1348, 1346, 1344, 245, 244, 242, 2090, 239, 2088, 236, 2085, 2082, 260, 2099, 249, 270, 1307, 1305, 1303, 1300, 1314, 189, 2038, 186, 2036, 183, 2033, 2030, 2026, 206, 198, 2047, 194, 216, 1247, 1245, 1243, 1240, 227, 1237, 1255, 2310, 2302, 2300, 2286, 2284, 2281, 565, 563, 561, 558, 575, 1589, 2261, 2259, 2256, 2253, 1542, 521, 519, 517, 514, 2270, 511, 533, 1569, 1567, 2223, 2221, 2218, 2215, 1483, 2211, 1480, 459, 456, 453, 2232, 449, 474, 491, 1527, 1525, 1522, 2475, 2467, 2465, 2451, 2449, 2446, 801, 800, 2426, 2424, 2421, 2418, 1723, 2435, 780, 778, 775, 2387, 2385, 2382, 2379, 1695, 2375, 1693, 2396, 735, 733, 730, 727, 749, 1718, 2616, 2615, 2604, 2603, 2601, 2584, 2583, 2581, 2579, 1800, 2591, 2550, 2549, 2547, 2545, 1792, 2542, 1790, 2558, 929, 2719, 1841, 2710, 2708, 1833, 1831, 2690, 2688, 2686, 1815, 1809, 1808, 1774, 1756, 1754, 1737, 1736, 1734, 1739, 1816, 1711, 1676, 1674, 633, 629, 1638, 1636, 1633, 1641, 598, 1605, 1604, 1602, 1600, 605, 1609, 1607, 2327, 887, 853, 1775, 822, 820, 1757, 1755, 1584, 524, 1560, 1558, 468, 464, 1514, 1511, 1508, 1519, 408, 404, 400, 1452, 1447, 1444, 417, 1458, 1455, 2208, 364, 361, 358, 2154, 1401, 1400, 1398, 1396, 374, 1393, 371, 1408, 1406, 1403, 1413, 2173, 2172, 772, 726, 723, 1712, 672, 669, 666, 682, 1678, 1675, 625, 623, 621, 618, 2331, 636, 632, 1639, 1637, 1635, 920, 918, 884, 880, 889, 849, 848, 847, 846, 2497, 855, 852, 1776, 2641, 2742, 2787, 1380, 334, 1367, 1365, 301, 297, 1340, 1338, 1335, 1343, 255, 251, 247, 1296, 1291, 1288, 265, 1302, 1299, 2113, 204, 196, 192, 2042, 1232, 1230, 1224, 214, 1220, 210, 1242, 1239, 1235, 1250, 2077, 2075, 151, 148, 1993, 144, 1990, 1163, 1162, 1160, 1158, 1155, 161, 1152, 157, 1173, 1171, 1168, 1165, 168, 1181, 1178, 2021, 2020, 2018, 2023, 585, 560, 557, 1585, 516, 509, 1562, 1559, 458, 447, 2227, 472, 1516, 1513, 1510, 398, 396, 393, 390, 2181, 386, 2178, 407, 1453, 1451, 1449, 1446, 420, 1460, 2209, 769, 764, 720, 712, 2391, 729, 1713, 664, 663, 661, 659, 2352, 656, 2349, 671, 1679, 1677, 2553, 922, 919, 2519, 2516, 885, 883, 881, 2685, 2661, 2659, 2767, 2756, 2755, 140, 1137, 1136, 130, 127, 1125, 1124, 1122, 1127, 109, 106, 102, 1103, 1102, 1100, 1098, 116, 1107, 1105, 1980, 80, 76, 73, 1947, 1068, 1067, 1065, 1063, 90, 1060, 87, 1075, 1073, 1070, 1080, 1966, 1965, 46, 43, 40, 1912, 36, 1909, 1019, 1018, 1016, 1014, 58, 1011, 55, 1008, 51, 1029, 1027, 1024, 1021, 63, 1037, 1034, 1940, 1939, 1937, 1942, 8, 1866, 4, 1863, 1, 1860, 956, 954, 952, 949, 946, 17, 14, 969, 967, 964, 961, 27, 957, 24, 979, 976, 972, 1901, 1900, 1898, 1896, 986, 1905, 1903, 350, 349, 1381, 329, 327, 324, 1368, 1366, 292, 290, 287, 284, 2118, 304, 1341, 1339, 1337, 1345, 243, 240, 237, 2086, 233, 2083, 254, 1297, 1295, 1293, 1290, 1304, 2114, 190, 187, 184, 2034, 180, 2031, 177, 2027, 199, 1233, 1231, 1229, 1226, 217, 1223, 1241, 2078, 2076, 584, 555, 554, 552, 550, 2282, 562, 1586, 507, 506, 504, 502, 2257, 499, 2254, 515, 1563, 1561, 445, 443, 441, 2219, 438, 2216, 435, 2212, 460, 454, 475, 1517, 1515, 1512, 2447, 798, 797, 2422, 2419, 770, 768, 766, 2383, 2380, 2376, 721, 719, 717, 714, 731, 1714, 2602, 2582, 2580, 2548, 2546, 2543, 923, 921, 2717, 2706, 2705, 2683, 2682, 2680, 1771, 1752, 1750, 1733, 1732, 1731, 1735, 1814, 1707, 1670, 1668, 1631, 1629, 1626, 1634, 1599, 1598, 1596, 1594, 1603, 1601, 2326, 1772, 1753, 1751, 1581, 1554, 1552, 1504, 1501, 1498, 1509, 1442, 1437, 1434, 401, 1448, 1445, 2206, 1392, 1391, 1389, 1387, 1384, 359, 1399, 1397, 1394, 1404, 2171, 2170, 1708, 1672, 1669, 619, 1632, 1630, 1628, 1773, 1378, 1363, 1361, 1333, 1328, 1336, 1286, 1281, 1278, 248, 1292, 1289, 2111, 1218, 1216, 1210, 197, 1206, 193, 1228, 1225, 1221, 1236, 2073, 2071, 1151, 1150, 1148, 1146, 152, 1143, 149, 1140, 145, 1161, 1159, 1156, 1153, 158, 1169, 1166, 2017, 2016, 2014, 2019, 1582, 510, 1556, 1553, 452, 448, 1506, 1500, 394, 391, 387, 1443, 1441, 1439, 1436, 1450, 2207, 765, 716, 713, 1709, 662, 660, 657, 1673, 1671, 916, 914, 879, 878, 877, 882, 1135, 1134, 1121, 1120, 1118, 1123, 1097, 1096, 1094, 1092, 103, 1101, 1099, 1979, 1059, 1058, 1056, 1054, 77, 1051, 74, 1066, 1064, 1061, 1071, 1964, 1963, 1007, 1006, 1004, 1002, 999, 41, 996, 37, 1017, 1015, 1012, 1009, 52, 1025, 1022, 1936, 1935, 1933, 1938, 942, 940, 938, 935, 932, 5, 2, 955, 953, 950, 947, 18, 943, 15, 965, 962, 958, 1895, 1894, 1892, 1890, 973, 1899, 1897, 1379, 325, 1364, 1362, 288, 285, 1334, 1332, 1330, 241, 238, 234, 1287, 1285, 1283, 1280, 1294, 2112, 188, 185, 181, 178, 2028, 1219, 1217, 1215, 1212, 200, 1209, 1227, 2074, 2072, 583, 553, 551, 1583, 505, 503, 500, 513, 1557, 1555, 444, 442, 439, 436, 2213, 455, 451, 1507, 1505, 1502, 796, 763, 762, 760, 767, 711, 710, 708, 706, 2377, 718, 715, 1710, 2544, 917, 915, 2681, 1627, 1597, 1595, 2325, 1769, 1749, 1747, 1499, 1438, 1435, 2204, 1390, 1388, 1385, 1395, 2169, 2167, 1704, 1665, 1662, 1625, 1623, 1620, 1770, 1329, 1282, 1279, 2109, 1214, 1207, 1222, 2068, 2065, 1149, 1147, 1144, 1141, 146, 1157, 1154, 2013, 2011, 2008, 2015, 1579, 1549, 1546, 1495, 1487, 1433, 1431, 1428, 1425, 388, 1440, 2205, 1705, 658, 1667, 1664, 1119, 1095, 1093, 1978, 1057, 1055, 1052, 1062, 1962, 1960, 1005, 1003, 1000, 997, 38, 1013, 1010, 1932, 1930, 1927, 1934, 941, 939, 936, 933, 6, 930, 3, 951, 948, 944, 1889, 1887, 1884, 1881, 959, 1893, 1891, 35, 1377, 1360, 1358, 1327, 1325, 1322, 1331, 1277, 1275, 1272, 1269, 235, 1284, 2110, 1205, 1204, 1201, 1198, 182, 1195, 179, 1213, 2070, 2067, 1580, 501, 1551, 1548, 440, 437, 1497, 1494, 1490, 1503, 761, 709, 707, 1706, 913, 912, 2198, 1386, 2164, 2161, 1621, 1766, 2103, 1208, 2058, 2054, 1145, 1142, 2005, 2002, 1999, 2009, 1488, 1429, 1426, 2200, 1698, 1659, 1656, 1975, 1053, 1957, 1954, 1001, 998, 1924, 1921, 1918, 1928, 937, 934, 931, 1879, 1876, 1873, 1870, 945, 1885, 1882, 1323, 1273, 1270, 2105, 1202, 1199, 1196, 1211, 2061, 2057, 1576, 1543, 1540, 1484, 1481, 1478, 1491, 1700};
+    public static final int[] f1438c = {2627, 1819, 2622, 2621, 1813, 1812, 2729, 2724, 2723, 2779, 2774, 2773, 902, 896, 908, 868, 865, 861, 859, 2511, 873, 871, 1780, 835, 2493, 825, 2491, 842, 837, 844, 1764, 1762, 811, 810, 809, 2483, 807, 2482, 806, 2480, 815, 814, 813, 812, 2484, 817, 816, 1745, 1744, 1742, 1746, 2655, 2637, 2635, 2626, 2625, 2623, 2628, 1820, 2752, 2739, 2737, 2728, 2727, 2725, 2730, 2785, 2783, 2778, 2777, 2775, 2780, 787, 781, 747, 739, 736, 2413, 754, 752, 1719, 692, 689, 681, 2371, 678, 2369, 700, 697, 694, 703, 1688, 1686, 642, 638, 2343, 631, 2341, 627, 2338, 651, 646, 643, 2345, 654, 652, 1652, 1650, 1647, 1654, 601, 599, 2322, 596, 2321, 594, 2319, 2317, 611, 610, 608, 606, 2324, 603, 2323, 615, 614, 612, 1617, 1616, 1614, 1612, 616, 1619, 1618, 2575, 2538, 2536, 905, 901, 898, 909, 2509, 2507, 2504, 870, 867, 864, 860, 2512, 875, 872, 1781, 2490, 2489, 2487, 2485, 1748, 836, 834, 832, 830, 2494, 827, 2492, 843, 841, 839, 845, 1765, 1763, 2701, 2676, 2674, 2653, 2648, 2656, 2634, 2633, 2631, 2629, 1821, 2638, 2636, 2770, 2763, 2761, 2750, 2745, 2753, 2736, 2735, 2733, 2731, 1848, 2740, 2738, 2786, 2784, 591, 588, 576, 569, 566, 2296, 1590, 537, 534, 526, 2276, 522, 2274, 545, 542, 539, 548, 1572, 1570, 481, 2245, 466, 2242, 462, 2239, 492, 485, 482, 2249, 496, 494, 1534, 1531, 1528, 1538, 413, 2196, 406, 2191, 2188, 425, 419, 2202, 415, 2199, 432, 430, 427, 1472, 1467, 1464, 433, 1476, 1474, 368, 367, 2160, 365, 2159, 362, 2157, 2155, 2152, 378, 377, 375, 2166, 372, 2165, 369, 2162, 383, 381, 379, 2168, 1419, 1418, 1416, 1414, 385, 1411, 384, 1423, 1422, 1420, 1424, 2461, 802, 2441, 2439, 790, 786, 783, 794, 2409, 2406, 2403, 750, 742, 738, 2414, 756, 753, 1720, 2367, 2365, 2362, 2359, 1663, 693, 691, 684, 2373, 680, 2370, 702, 699, 696, 704, 1690, 1687, 2337, 2336, 2334, 2332, 1624, 2329, 1622, 640, 637, 2344, 634, 2342, 630, 2340, 650, 648, 645, 2346, 655, 653, 1653, 1651, 1649, 1655, 2612, 2597, 2595, 2571, 2568, 2565, 2576, 2534, 2529, 2526, 1787, 2540, 2537, 907, 904, 900, 910, 2503, 2502, GuildConstantsKt.MAX_GUILD_MEMBERS_NOTIFY_ALL_MESSAGES, 2498, 1768, 2495, 1767, 2510, 2508, 2506, 869, 866, 863, 2513, 876, 874, 1782, 2720, 2713, 2711, 2697, 2694, 2691, 2702, 2672, 2670, 2664, 1828, 2678, 2675, 2647, 2646, 2644, 2642, 1823, 2639, 1822, 2654, 2652, 2650, 2657, 2771, 1855, 2765, 2762, 1850, 1849, 2751, 2749, 2747, 2754, 353, 2148, 344, 342, 336, 2142, 332, 2140, 345, 1375, 1373, 306, 2130, 299, 2128, 295, 2125, 319, 314, 311, 2132, 1354, 1352, 1349, 1356, 262, 257, 2101, 253, 2096, 2093, 274, AudioAttributesCompat.FLAG_ALL_PUBLIC, 267, 2107, 263, 2104, 280, 278, 275, 1316, 1311, 1308, 1320, 1318, 2052, 202, 2050, 2044, 2040, 219, 2063, 212, 2060, 208, 2055, 224, 221, 2066, 1260, 1258, 1252, 231, 1248, 229, 1266, 1264, 1261, 1268, 155, 1998, 153, 1996, 1994, 1991, 1988, 165, 164, 2007, 162, 2006, 159, 2003, 2000, 172, 171, 169, 2012, 166, 2010, 1186, 1184, 1182, 1179, HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION, 1176, 173, 1192, 1191, 1189, 1187, 176, 1194, 1193, 2313, 2307, 2305, 592, 589, 2294, 2292, 2289, 578, 572, 568, 2297, 580, 1591, 2272, 2267, 2264, 1547, 538, 536, 529, 2278, 525, 2275, 547, 544, 541, 1574, 1571, 2237, 2235, 2229, 1493, 2225, 1489, 478, 2247, 470, 2244, 465, 2241, 493, 488, 484, 2250, 498, 495, 1536, 1533, 1530, 1539, 2187, 2186, 2184, 2182, 1432, 2179, 1430, 2176, 1427, 414, 412, 2197, 409, 2195, 405, 2193, 2190, 426, 424, 421, 2203, 418, 2201, 431, 429, 1473, 1471, 1469, 1466, 434, 1477, 1475, 2478, 2472, 2470, 2459, 2457, 2454, 2462, 803, 2437, 2432, 2429, 1726, 2443, 2440, 792, 789, 785, 2401, 2399, 2393, 1702, 2389, 1699, 2411, 2408, 2405, 745, 741, 2415, 758, 755, 1721, 2358, 2357, 2355, 2353, 1661, 2350, 1660, 2347, 1657, 2368, 2366, 2364, 2361, 1666, 690, 687, 2374, 683, 2372, 701, 698, 705, 1691, 1689, 2619, 2617, 2610, 2608, 2605, 2613, 2593, 2588, 2585, 1803, 2599, 2596, 2563, 2561, 2555, 1797, 2551, 1795, 2573, 2570, 2567, 2577, 2525, 2524, 2522, 2520, 1786, 2517, 1785, 2514, 1783, 2535, 2533, 2531, 2528, 1788, 2541, 2539, 906, 903, 911, 2721, 1844, 2715, 2712, 1838, 1836, 2699, 2696, 2693, 2703, 1827, 1826, 1824, 2673, 2671, 2669, 2666, 1829, 2679, 2677, 1858, 1857, 2772, 1854, 1853, 1851, 1856, 2766, 2764, 143, 1987, 139, 1986, 135, 133, 131, 1984, 128, 1983, 125, 1981, 138, 137, 136, 1985, 1133, 1132, 1130, 112, 110, 1974, 107, 1973, 104, 1971, 1969, 122, 121, 119, 117, 1977, 114, 1976, 124, 1115, 1114, 1112, 1110, 1117, 1116, 84, 83, 1953, 81, 1952, 78, 1950, 1948, 1945, 94, 93, 91, 1959, 88, 1958, 85, 1955, 99, 97, 95, 1961, 1086, 1085, 1083, 1081, 1078, 100, 1090, 1089, 1087, 1091, 49, 47, 1917, 44, 1915, 1913, 1910, 1907, 59, 1926, 56, 1925, 53, 1922, 1919, 66, 64, 1931, 61, 1929, 1042, 1040, 1038, 71, 1035, 70, 1032, 68, 1048, 1047, 1045, 1043, 1050, 1049, 12, 10, 1869, 1867, 1864, 1861, 21, 1880, 19, 1877, 1874, 1871, 28, 1888, 25, 1886, 22, 1883, 982, 980, 977, 974, 32, 30, 991, 989, 987, 984, 34, 995, 994, 992, 2151, 2150, 2147, 2146, 2144, 356, 355, 354, 2149, 2139, 2138, 2136, 2134, 1359, 343, 341, 338, 2143, 335, 2141, 348, 347, 346, 1376, 1374, 2124, 2123, 2121, 2119, 1326, 2116, 1324, 310, 308, 305, 2131, 302, 2129, 298, 2127, 320, 318, 316, 313, 2133, 322, 321, 1355, 1353, 1351, 1357, 2092, 2091, 2089, 2087, 1276, 2084, 1274, 2081, 1271, 259, 2102, 256, 2100, 252, 2098, 2095, 272, 269, 2108, 266, 2106, 281, 279, 277, 1317, 1315, 1313, 1310, 282, 1321, 1319, 2039, 2037, 2035, 2032, 1203, 2029, 1200, 1197, 207, 2053, 205, 2051, 201, 2049, 2046, 2043, 220, 218, 2064, 215, 2062, 211, 2059, 228, 226, 223, 2069, 1259, 1257, 1254, 232, 1251, 230, 1267, 1265, 1263, 2316, 2315, 2312, 2311, 2309, 2314, 2304, 2303, 2301, 2299, 1593, 2308, 2306, 590, 2288, 2287, 2285, 2283, 1578, 2280, 1577, 2295, 2293, 2291, 579, 577, 574, 571, 2298, 582, 581, 1592, 2263, 2262, 2260, 2258, 1545, 2255, 1544, 2252, 1541, 2273, 2271, 2269, 2266, 1550, 535, 532, 2279, 528, 2277, 546, 543, 549, 1575, 1573, 2224, 2222, 2220, 1486, 2217, 1485, 2214, 1482, 1479, 2238, 2236, 2234, 2231, 1496, 2228, 1492, 480, 477, 2248, 473, 2246, 469, 2243, 490, 487, 2251, 497, 1537, 1535, 1532, 2477, 2476, 2474, 2479, 2469, 2468, 2466, 2464, 1730, 2473, 2471, 2453, 2452, 2450, 2448, 1729, 2445, 1728, 2460, 2458, 2456, 2463, 805, 804, 2428, 2427, 2425, 2423, 1725, 2420, 1724, 2417, 1722, 2438, 2436, 2434, 2431, 1727, 2444, 2442, 793, 791, 788, 795, 2388, 2386, 2384, 1697, 2381, 1696, 2378, 1694, 1692, 2402, 2400, 2398, 2395, 1703, 2392, 1701, 2412, 2410, 2407, 751, 748, 744, 2416, 759, 757, 1807, 2620, 2618, 1806, 1805, 2611, 2609, 2607, 2614, 1802, 1801, 1799, 2594, 2592, 2590, 2587, 1804, 2600, 2598, 1794, 1793, 1791, 1789, 2564, 2562, 2560, 2557, 1798, 2554, 1796, 2574, 2572, 2569, 2578, 1847, 1846, 2722, 1843, 1842, 1840, 1845, 2716, 2714, 1835, 1834, 1832, 1830, 1839, 1837, 2700, 2698, 2695, 2704, 1817, 1811, 1810, 897, 862, 1777, 829, 826, 838, 1760, 1758, 808, 2481, 1741, 1740, 1738, 1743, 2624, 1818, 2726, 2776, 782, 740, 737, 1715, 686, 679, 695, 1682, 1680, 639, 628, 2339, 647, 644, 1645, 1643, 1640, 1648, 602, 600, 597, 595, 2320, 593, 2318, 609, 607, 604, 1611, 1610, 1608, 1606, 613, 1615, 1613, 2328, 926, 924, 892, 886, 899, 857, 850, 2505, 1778, 824, 823, 821, 819, 2488, 818, 2486, 833, 831, 828, 840, 1761, 1759, 2649, 2632, 2630, 2746, 2734, 2732, 2782, 2781, 570, 567, 1587, 531, 527, 523, 540, 1566, 1564, 476, 467, 463, 2240, 486, 483, 1524, 1521, 1518, 1529, 411, 403, 2192, 399, 2189, 423, 416, 1462, 1457, 1454, 428, 1468, 1465, 2210, 366, 363, 2158, 360, 2156, 357, 2153, 376, 373, 370, 2163, 1410, 1409, 1407, 1405, 382, 1402, 380, 1417, 1415, 1412, 1421, 2175, 2174, 777, 774, 771, 784, 732, 725, 722, 2404, 743, 1716, 676, 674, 668, 2363, 665, 2360, 685, 1684, 1681, 626, 624, 622, 2335, 620, 2333, 617, 2330, 641, 635, 649, 1646, 1644, 1642, 2566, 928, 925, 2530, 2527, 894, 891, 888, 2501, 2499, 2496, 858, 856, 854, 851, 1779, 2692, 2668, 2665, 2645, 2643, 2640, 2651, 2768, 2759, 2757, 2744, 2743, 2741, 2748, 352, 1382, 340, 337, 333, 1371, 1369, 307, 300, 296, 2126, 315, 312, 1347, 1342, 1350, 261, 258, 250, 2097, 246, 2094, 271, 268, 264, 1306, 1301, 1298, 276, 1312, 1309, 2115, 203, 2048, 195, 2045, 191, 2041, 213, 209, 2056, 1246, 1244, 1238, HideBottomViewOnScrollBehavior.ENTER_ANIMATION_DURATION, 1234, 222, 1256, 1253, 1249, 1262, 2080, 2079, 154, 1997, FontUtils.MAX_FONT_SCALING, 1995, 147, 1992, 1989, 163, 160, 2004, 156, 2001, 1175, 1174, 1172, 1170, 1167, 170, 1164, 167, 1185, 1183, 1180, 1177, 174, 1190, 1188, 2025, 2024, 2022, 587, 586, 564, 559, 556, 2290, 573, 1588, 520, 518, 512, 2268, 508, 2265, 530, 1568, 1565, 461, 457, 2233, 450, 2230, 446, 2226, 479, 471, 489, 1526, 1523, 1520, 397, 395, 2185, 392, 2183, 389, 2180, 2177, 410, 2194, 402, 422, 1463, 1461, 1459, 1456, 1470, 2455, 799, 2433, 2430, 779, 776, 773, 2397, 2394, 2390, 734, 728, 724, 746, 1717, 2356, 2354, 2351, 2348, 1658, 677, 675, 673, 670, 667, 688, 1685, 1683, 2606, 2589, 2586, 2559, 2556, 2552, 927, 2523, 2521, 2518, 2515, 1784, 2532, 895, 893, 890, 2718, 2709, 2707, 2689, 2687, 2684, 2663, 2662, 2660, 2658, 1825, 2667, 2769, 1852, 2760, 2758, 142, 141, 1139, 1138, 134, 132, 129, 126, 1982, 1129, 1128, 1126, 1131, 113, 111, 108, 105, 1972, 101, 1970, 120, 118, 115, 1109, 1108, 1106, 1104, 123, 1113, 1111, 82, 79, 1951, 75, 1949, 72, 1946, 92, 89, 86, 1956, 1077, 1076, 1074, 1072, 98, 1069, 96, 1084, 1082, 1079, 1088, 1968, 1967, 48, 45, 1916, 42, 1914, 39, 1911, 1908, 60, 57, 54, 1923, 50, 1920, 1031, 1030, 1028, 1026, 67, AudioAttributesCompat.FLAG_ALL, 65, PointerIconCompat.TYPE_GRAB, 62, 1041, 1039, 1036, 1033, 69, 1046, 1044, 1944, 1943, 1941, 11, 9, 1868, 7, 1865, 1862, 1859, 20, 1878, 16, 1875, 13, 1872, 970, 968, 966, 963, 29, 960, 26, 23, 983, 981, 978, 975, 33, 971, 31, 990, 988, 985, 1906, 1904, 1902, 993, 351, 2145, 1383, 331, 330, 328, 326, 2137, 323, 2135, 339, 1372, 1370, 294, 293, 291, 289, 2122, 286, 2120, 283, 2117, 309, 303, 317, 1348, 1346, 1344, 245, 244, 242, 2090, 239, 2088, 236, 2085, 2082, 260, 2099, 249, 270, 1307, 1305, 1303, 1300, 1314, 189, 2038, 186, 2036, 183, 2033, 2030, 2026, 206, 198, 2047, 194, 216, 1247, 1245, 1243, 1240, 227, 1237, 1255, 2310, 2302, 2300, 2286, 2284, 2281, 565, 563, 561, 558, 575, 1589, 2261, 2259, 2256, 2253, 1542, 521, 519, 517, 514, 2270, FrameMetricsAggregator.EVERY_DURATION, 533, 1569, 1567, 2223, 2221, 2218, 2215, 1483, 2211, 1480, 459, 456, 453, 2232, 449, 474, 491, 1527, 1525, 1522, 2475, 2467, 2465, 2451, 2449, 2446, 801, 800, 2426, 2424, 2421, 2418, 1723, 2435, 780, 778, 775, 2387, 2385, 2382, 2379, 1695, 2375, 1693, 2396, 735, 733, 730, 727, 749, 1718, 2616, 2615, 2604, 2603, 2601, 2584, 2583, 2581, 2579, ModelInvite.Settings.HALF_HOUR, 2591, 2550, 2549, 2547, 2545, 1792, 2542, 1790, 2558, 929, 2719, 1841, 2710, 2708, 1833, 1831, 2690, 2688, 2686, 1815, 1809, 1808, 1774, 1756, 1754, 1737, 1736, 1734, 1739, 1816, 1711, 1676, 1674, 633, 629, 1638, 1636, 1633, 1641, 598, 1605, 1604, 1602, 1600, 605, 1609, 1607, 2327, 887, 853, 1775, 822, 820, 1757, 1755, 1584, 524, 1560, 1558, 468, 464, 1514, 1511, 1508, 1519, 408, 404, 400, 1452, 1447, 1444, 417, 1458, 1455, 2208, 364, 361, 358, 2154, 1401, 1400, 1398, 1396, 374, 1393, 371, 1408, 1406, 1403, 1413, 2173, 2172, 772, 726, 723, 1712, 672, 669, 666, 682, 1678, 1675, 625, 623, 621, 618, 2331, 636, 632, 1639, 1637, 1635, 920, 918, 884, 880, 889, 849, 848, 847, 846, 2497, 855, 852, 1776, 2641, 2742, 2787, 1380, 334, 1367, 1365, 301, 297, 1340, 1338, 1335, 1343, 255, 251, 247, 1296, 1291, 1288, 265, 1302, 1299, 2113, 204, 196, 192, 2042, 1232, 1230, 1224, 214, 1220, 210, 1242, 1239, 1235, 1250, 2077, 2075, 151, 148, 1993, 144, 1990, 1163, 1162, 1160, 1158, 1155, 161, 1152, 157, 1173, 1171, 1168, 1165, 168, 1181, 1178, 2021, 2020, 2018, 2023, 585, 560, 557, 1585, 516, 509, 1562, 1559, 458, 447, 2227, 472, 1516, 1513, 1510, 398, 396, 393, 390, 2181, 386, 2178, 407, 1453, 1451, 1449, 1446, 420, 1460, 2209, 769, 764, 720, 712, 2391, 729, 1713, 664, 663, 661, 659, 2352, 656, 2349, 671, 1679, 1677, 2553, 922, 919, 2519, 2516, 885, 883, 881, 2685, 2661, 2659, 2767, 2756, 2755, 140, 1137, 1136, 130, 127, 1125, 1124, 1122, 1127, 109, 106, 102, 1103, 1102, 1100, 1098, 116, 1107, 1105, 1980, 80, 76, 73, 1947, 1068, 1067, 1065, 1063, 90, 1060, 87, 1075, 1073, 1070, WidgetSettingsUserProfile.MAX_BANNER_IMAGE_SIZE, 1966, 1965, 46, 43, 40, 1912, 36, 1909, PointerIconCompat.TYPE_ZOOM_OUT, PointerIconCompat.TYPE_ZOOM_IN, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, PointerIconCompat.TYPE_HORIZONTAL_DOUBLE_ARROW, 58, PointerIconCompat.TYPE_COPY, 55, PointerIconCompat.TYPE_TEXT, 51, 1029, 1027, 1024, PointerIconCompat.TYPE_GRABBING, 63, 1037, 1034, 1940, 1939, 1937, 1942, 8, 1866, 4, 1863, 1, 1860, 956, 954, 952, 949, 946, 17, 14, 969, 967, 964, 961, 27, 957, 24, 979, 976, 972, 1901, 1900, 1898, 1896, 986, 1905, 1903, 350, 349, 1381, 329, 327, 324, 1368, 1366, 292, 290, 287, 284, 2118, 304, 1341, 1339, 1337, 1345, 243, 240, 237, 2086, 233, 2083, 254, 1297, 1295, 1293, 1290, 1304, 2114, 190, 187, 184, 2034, BaseTransientBottomBar.ANIMATION_FADE_DURATION, 2031, 177, 2027, 199, 1233, 1231, 1229, 1226, 217, 1223, 1241, 2078, 2076, 584, 555, 554, 552, 550, 2282, 562, 1586, 507, 506, 504, 502, 2257, 499, 2254, 515, 1563, 1561, 445, 443, 441, 2219, 438, 2216, 435, 2212, 460, 454, 475, 1517, 1515, 1512, 2447, 798, 797, 2422, 2419, 770, 768, 766, 2383, 2380, 2376, 721, 719, 717, 714, 731, 1714, 2602, 2582, 2580, 2548, 2546, 2543, 923, 921, 2717, 2706, 2705, 2683, 2682, 2680, 1771, 1752, 1750, 1733, 1732, 1731, 1735, 1814, 1707, 1670, 1668, 1631, 1629, 1626, 1634, 1599, 1598, 1596, 1594, 1603, 1601, 2326, 1772, 1753, 1751, 1581, 1554, 1552, 1504, 1501, 1498, 1509, 1442, 1437, 1434, 401, 1448, 1445, 2206, 1392, 1391, 1389, 1387, 1384, 359, 1399, 1397, 1394, 1404, 2171, 2170, 1708, 1672, 1669, 619, 1632, 1630, 1628, 1773, 1378, 1363, 1361, 1333, 1328, 1336, 1286, 1281, 1278, 248, 1292, 1289, 2111, 1218, 1216, 1210, 197, 1206, 193, 1228, 1225, 1221, 1236, 2073, 2071, 1151, 1150, 1148, 1146, 152, 1143, 149, 1140, 145, 1161, 1159, 1156, 1153, 158, 1169, 1166, 2017, 2016, 2014, 2019, 1582, 510, 1556, 1553, 452, 448, 1506, 1500, 394, 391, 387, 1443, 1441, 1439, 1436, 1450, 2207, 765, 716, 713, 1709, 662, 660, 657, 1673, 1671, 916, 914, 879, 878, 877, 882, 1135, 1134, 1121, 1120, 1118, 1123, 1097, 1096, 1094, 1092, 103, 1101, 1099, 1979, 1059, 1058, 1056, 1054, 77, 1051, 74, 1066, 1064, 1061, 1071, 1964, 1963, PointerIconCompat.TYPE_CROSSHAIR, PointerIconCompat.TYPE_CELL, PointerIconCompat.TYPE_WAIT, PointerIconCompat.TYPE_HAND, RoomDatabase.MAX_BIND_PARAMETER_CNT, 41, 996, 37, PointerIconCompat.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW, PointerIconCompat.TYPE_VERTICAL_DOUBLE_ARROW, PointerIconCompat.TYPE_NO_DROP, PointerIconCompat.TYPE_VERTICAL_TEXT, 52, InputDeviceCompat.SOURCE_GAMEPAD, 1022, 1936, 1935, 1933, 1938, 942, 940, 938, 935, 932, 5, 2, 955, 953, 950, 947, 18, 943, 15, 965, 962, 958, 1895, 1894, 1892, 1890, 973, 1899, 1897, 1379, 325, 1364, 1362, ScreenShareManager.THUMBNAIL_HEIGHT_PX, 285, 1334, 1332, 1330, 241, 238, 234, 1287, 1285, 1283, 1280, 1294, 2112, 188, 185, 181, 178, 2028, 1219, 1217, 1215, 1212, 200, 1209, 1227, 2074, 2072, 583, 553, 551, 1583, 505, 503, 500, InputDeviceCompat.SOURCE_DPAD, 1557, 1555, 444, 442, 439, 436, 2213, 455, 451, 1507, 1505, 1502, 796, 763, 762, 760, 767, 711, 710, 708, 706, 2377, 718, 715, 1710, 2544, 917, 915, 2681, 1627, 1597, 1595, 2325, 1769, 1749, 1747, 1499, 1438, 1435, 2204, 1390, 1388, 1385, 1395, 2169, 2167, 1704, 1665, 1662, 1625, 1623, 1620, 1770, 1329, 1282, 1279, 2109, 1214, 1207, 1222, 2068, 2065, 1149, 1147, 1144, 1141, 146, 1157, 1154, 2013, 2011, 2008, 2015, 1579, 1549, 1546, 1495, 1487, 1433, 1431, 1428, 1425, 388, 1440, 2205, 1705, 658, 1667, 1664, 1119, 1095, 1093, 1978, 1057, 1055, 1052, 1062, 1962, 1960, 1005, PointerIconCompat.TYPE_HELP, 1000, 997, 38, PointerIconCompat.TYPE_ALL_SCROLL, PointerIconCompat.TYPE_ALIAS, 1932, 1930, 1927, 1934, 941, 939, 936, 933, 6, 930, 3, 951, 948, 944, 1889, 1887, 1884, 1881, 959, 1893, 1891, 35, 1377, 1360, 1358, 1327, 1325, 1322, 1331, 1277, 1275, 1272, 1269, 235, 1284, 2110, 1205, 1204, 1201, 1198, 182, 1195, 179, 1213, 2070, 2067, 1580, 501, 1551, 1548, 440, 437, 1497, 1494, 1490, 1503, 761, 709, 707, 1706, 913, 912, 2198, 1386, 2164, 2161, 1621, 1766, 2103, 1208, 2058, 2054, 1145, 1142, 2005, 2002, 1999, 2009, 1488, 1429, 1426, 2200, 1698, 1659, 1656, 1975, 1053, 1957, 1954, PointerIconCompat.TYPE_CONTEXT_MENU, 998, 1924, 1921, 1918, 1928, 937, 934, 931, 1879, 1876, 1873, 1870, 945, 1885, 1882, 1323, 1273, 1270, 2105, 1202, 1199, 1196, 1211, 2061, 2057, 1576, 1543, 1540, 1484, 1481, 1478, 1491, 1700};
 
     public static int a(int i) {
         int binarySearch = Arrays.binarySearch(b, i & 262143);
diff --git a/app/src/main/java/c/i/e/s/b/j.java b/app/src/main/java/c/i/e/s/b/j.java
index 4937a854f8..3270358c26 100644
--- a/app/src/main/java/c/i/e/s/b/j.java
+++ b/app/src/main/java/c/i/e/s/b/j.java
@@ -1,4 +1,6 @@
 package c.i.e.s.b;
+
+import com.discord.utilities.font.FontUtils;
 /* compiled from: Version */
 public final class j {
     public static final int[] a = {31892, 34236, 39577, 42195, 48118, 51042, 55367, 58893, 63784, 68472, 70749, 76311, 79154, 84390, 87683, 92361, 96236, 102084, 102881, 110507, 110734, 117786, 119615, 126325, 127568, 133589, 136944, 141498, 145311, 150283, 152622, 158308, 161089, 167017};
@@ -46,7 +48,7 @@ public final class j {
     }
 
     public static j[] a() {
-        return new j[]{new j(1, new int[0], new b(7, new a(1, 19)), new b(10, new a(1, 16)), new b(13, new a(1, 13)), new b(17, new a(1, 9))), new j(2, new int[]{6, 18}, new b(10, new a(1, 34)), new b(16, new a(1, 28)), new b(22, new a(1, 22)), new b(28, new a(1, 16))), new j(3, new int[]{6, 22}, new b(15, new a(1, 55)), new b(26, new a(1, 44)), new b(18, new a(2, 17)), new b(22, new a(2, 13))), new j(4, new int[]{6, 26}, new b(20, new a(1, 80)), new b(18, new a(2, 32)), new b(26, new a(2, 24)), new b(16, new a(4, 9))), new j(5, new int[]{6, 30}, new b(26, new a(1, 108)), new b(24, new a(2, 43)), new b(18, new a(2, 15), new a(2, 16)), new b(22, new a(2, 11), new a(2, 12))), new j(6, new int[]{6, 34}, new b(18, new a(2, 68)), new b(16, new a(4, 27)), new b(24, new a(4, 19)), new b(28, new a(4, 15))), new j(7, new int[]{6, 22, 38}, new b(20, new a(2, 78)), new b(18, new a(4, 31)), new b(18, new a(2, 14), new a(4, 15)), new b(26, new a(4, 13), new a(1, 14))), new j(8, new int[]{6, 24, 42}, new b(24, new a(2, 97)), new b(22, new a(2, 38), new a(2, 39)), new b(22, new a(4, 18), new a(2, 19)), new b(26, new a(4, 14), new a(2, 15))), new j(9, new int[]{6, 26, 46}, new b(30, new a(2, 116)), new b(22, new a(3, 36), new a(2, 37)), new b(20, new a(4, 16), new a(4, 17)), new b(24, new a(4, 12), new a(4, 13))), new j(10, new int[]{6, 28, 50}, new b(18, new a(2, 68), new a(2, 69)), new b(26, new a(4, 43), new a(1, 44)), new b(24, new a(6, 19), new a(2, 20)), new b(28, new a(6, 15), new a(2, 16))), new j(11, new int[]{6, 30, 54}, new b(20, new a(4, 81)), new b(30, new a(1, 50), new a(4, 51)), new b(28, new a(4, 22), new a(4, 23)), new b(24, new a(3, 12), new a(8, 13))), new j(12, new int[]{6, 32, 58}, new b(24, new a(2, 92), new a(2, 93)), new b(22, new a(6, 36), new a(2, 37)), new b(26, new a(4, 20), new a(6, 21)), new b(28, new a(7, 14), new a(4, 15))), new j(13, new int[]{6, 34, 62}, new b(26, new a(4, 107)), new b(22, new a(8, 37), new a(1, 38)), new b(24, new a(8, 20), new a(4, 21)), new b(22, new a(12, 11), new a(4, 12))), new j(14, new int[]{6, 26, 46, 66}, new b(30, new a(3, 115), new a(1, 116)), new b(24, new a(4, 40), new a(5, 41)), new b(20, new a(11, 16), new a(5, 17)), new b(24, new a(11, 12), new a(5, 13))), new j(15, new int[]{6, 26, 48, 70}, new b(22, new a(5, 87), new a(1, 88)), new b(24, new a(5, 41), new a(5, 42)), new b(30, new a(5, 24), new a(7, 25)), new b(24, new a(11, 12), new a(7, 13))), new j(16, new int[]{6, 26, 50, 74}, new b(24, new a(5, 98), new a(1, 99)), new b(28, new a(7, 45), new a(3, 46)), new b(24, new a(15, 19), new a(2, 20)), new b(30, new a(3, 15), new a(13, 16))), new j(17, new int[]{6, 30, 54, 78}, new b(28, new a(1, 107), new a(5, 108)), new b(28, new a(10, 46), new a(1, 47)), new b(28, new a(1, 22), new a(15, 23)), new b(28, new a(2, 14), new a(17, 15))), new j(18, new int[]{6, 30, 56, 82}, new b(30, new a(5, 120), new a(1, 121)), new b(26, new a(9, 43), new a(4, 44)), new b(28, new a(17, 22), new a(1, 23)), new b(28, new a(2, 14), new a(19, 15))), new j(19, new int[]{6, 30, 58, 86}, new b(28, new a(3, 113), new a(4, 114)), new b(26, new a(3, 44), new a(11, 45)), new b(26, new a(17, 21), new a(4, 22)), new b(26, new a(9, 13), new a(16, 14))), new j(20, new int[]{6, 34, 62, 90}, new b(28, new a(3, 107), new a(5, 108)), new b(26, new a(3, 41), new a(13, 42)), new b(30, new a(15, 24), new a(5, 25)), new b(28, new a(15, 15), new a(10, 16))), new j(21, new int[]{6, 28, 50, 72, 94}, new b(28, new a(4, 116), new a(4, 117)), new b(26, new a(17, 42)), new b(28, new a(17, 22), new a(6, 23)), new b(30, new a(19, 16), new a(6, 17))), new j(22, new int[]{6, 26, 50, 74, 98}, new b(28, new a(2, 111), new a(7, 112)), new b(28, new a(17, 46)), new b(30, new a(7, 24), new a(16, 25)), new b(24, new a(34, 13))), new j(23, new int[]{6, 30, 54, 78, 102}, new b(30, new a(4, 121), new a(5, 122)), new b(28, new a(4, 47), new a(14, 48)), new b(30, new a(11, 24), new a(14, 25)), new b(30, new a(16, 15), new a(14, 16))), new j(24, new int[]{6, 28, 54, 80, 106}, new b(30, new a(6, 117), new a(4, 118)), new b(28, new a(6, 45), new a(14, 46)), new b(30, new a(11, 24), new a(16, 25)), new b(30, new a(30, 16), new a(2, 17))), new j(25, new int[]{6, 32, 58, 84, 110}, new b(26, new a(8, 106), new a(4, 107)), new b(28, new a(8, 47), new a(13, 48)), new b(30, new a(7, 24), new a(22, 25)), new b(30, new a(22, 15), new a(13, 16))), new j(26, new int[]{6, 30, 58, 86, 114}, new b(28, new a(10, 114), new a(2, 115)), new b(28, new a(19, 46), new a(4, 47)), new b(28, new a(28, 22), new a(6, 23)), new b(30, new a(33, 16), new a(4, 17))), new j(27, new int[]{6, 34, 62, 90, 118}, new b(30, new a(8, 122), new a(4, 123)), new b(28, new a(22, 45), new a(3, 46)), new b(30, new a(8, 23), new a(26, 24)), new b(30, new a(12, 15), new a(28, 16))), new j(28, new int[]{6, 26, 50, 74, 98, 122}, new b(30, new a(3, 117), new a(10, 118)), new b(28, new a(3, 45), new a(23, 46)), new b(30, new a(4, 24), new a(31, 25)), new b(30, new a(11, 15), new a(31, 16))), new j(29, new int[]{6, 30, 54, 78, 102, 126}, new b(30, new a(7, 116), new a(7, 117)), new b(28, new a(21, 45), new a(7, 46)), new b(30, new a(1, 23), new a(37, 24)), new b(30, new a(19, 15), new a(26, 16))), new j(30, new int[]{6, 26, 52, 78, 104, 130}, new b(30, new a(5, 115), new a(10, 116)), new b(28, new a(19, 47), new a(10, 48)), new b(30, new a(15, 24), new a(25, 25)), new b(30, new a(23, 15), new a(25, 16))), new j(31, new int[]{6, 30, 56, 82, 108, 134}, new b(30, new a(13, 115), new a(3, 116)), new b(28, new a(2, 46), new a(29, 47)), new b(30, new a(42, 24), new a(1, 25)), new b(30, new a(23, 15), new a(28, 16))), new j(32, new int[]{6, 34, 60, 86, 112, 138}, new b(30, new a(17, 115)), new b(28, new a(10, 46), new a(23, 47)), new b(30, new a(10, 24), new a(35, 25)), new b(30, new a(19, 15), new a(35, 16))), new j(33, new int[]{6, 30, 58, 86, 114, 142}, new b(30, new a(17, 115), new a(1, 116)), new b(28, new a(14, 46), new a(21, 47)), new b(30, new a(29, 24), new a(19, 25)), new b(30, new a(11, 15), new a(46, 16))), new j(34, new int[]{6, 34, 62, 90, 118, 146}, new b(30, new a(13, 115), new a(6, 116)), new b(28, new a(14, 46), new a(23, 47)), new b(30, new a(44, 24), new a(7, 25)), new b(30, new a(59, 16), new a(1, 17))), new j(35, new int[]{6, 30, 54, 78, 102, 126, 150}, new b(30, new a(12, 121), new a(7, 122)), new b(28, new a(12, 47), new a(26, 48)), new b(30, new a(39, 24), new a(14, 25)), new b(30, new a(22, 15), new a(41, 16))), new j(36, new int[]{6, 24, 50, 76, 102, 128, 154}, new b(30, new a(6, 121), new a(14, 122)), new b(28, new a(6, 47), new a(34, 48)), new b(30, new a(46, 24), new a(10, 25)), new b(30, new a(2, 15), new a(64, 16))), new j(37, new int[]{6, 28, 54, 80, 106, 132, 158}, new b(30, new a(17, 122), new a(4, 123)), new b(28, new a(29, 46), new a(14, 47)), new b(30, new a(49, 24), new a(10, 25)), new b(30, new a(24, 15), new a(46, 16))), new j(38, new int[]{6, 32, 58, 84, 110, 136, 162}, new b(30, new a(4, 122), new a(18, 123)), new b(28, new a(13, 46), new a(32, 47)), new b(30, new a(48, 24), new a(14, 25)), new b(30, new a(42, 15), new a(32, 16))), new j(39, new int[]{6, 26, 54, 82, 110, 138, 166}, new b(30, new a(20, 117), new a(4, 118)), new b(28, new a(40, 47), new a(7, 48)), new b(30, new a(43, 24), new a(22, 25)), new b(30, new a(10, 15), new a(67, 16))), new j(40, new int[]{6, 30, 58, 86, 114, 142, 170}, new b(30, new a(19, 118), new a(6, 119)), new b(28, new a(18, 47), new a(31, 48)), new b(30, new a(34, 24), new a(34, 25)), new b(30, new a(20, 15), new a(61, 16)))};
+        return new j[]{new j(1, new int[0], new b(7, new a(1, 19)), new b(10, new a(1, 16)), new b(13, new a(1, 13)), new b(17, new a(1, 9))), new j(2, new int[]{6, 18}, new b(10, new a(1, 34)), new b(16, new a(1, 28)), new b(22, new a(1, 22)), new b(28, new a(1, 16))), new j(3, new int[]{6, 22}, new b(15, new a(1, 55)), new b(26, new a(1, 44)), new b(18, new a(2, 17)), new b(22, new a(2, 13))), new j(4, new int[]{6, 26}, new b(20, new a(1, 80)), new b(18, new a(2, 32)), new b(26, new a(2, 24)), new b(16, new a(4, 9))), new j(5, new int[]{6, 30}, new b(26, new a(1, 108)), new b(24, new a(2, 43)), new b(18, new a(2, 15), new a(2, 16)), new b(22, new a(2, 11), new a(2, 12))), new j(6, new int[]{6, 34}, new b(18, new a(2, 68)), new b(16, new a(4, 27)), new b(24, new a(4, 19)), new b(28, new a(4, 15))), new j(7, new int[]{6, 22, 38}, new b(20, new a(2, 78)), new b(18, new a(4, 31)), new b(18, new a(2, 14), new a(4, 15)), new b(26, new a(4, 13), new a(1, 14))), new j(8, new int[]{6, 24, 42}, new b(24, new a(2, 97)), new b(22, new a(2, 38), new a(2, 39)), new b(22, new a(4, 18), new a(2, 19)), new b(26, new a(4, 14), new a(2, 15))), new j(9, new int[]{6, 26, 46}, new b(30, new a(2, 116)), new b(22, new a(3, 36), new a(2, 37)), new b(20, new a(4, 16), new a(4, 17)), new b(24, new a(4, 12), new a(4, 13))), new j(10, new int[]{6, 28, 50}, new b(18, new a(2, 68), new a(2, 69)), new b(26, new a(4, 43), new a(1, 44)), new b(24, new a(6, 19), new a(2, 20)), new b(28, new a(6, 15), new a(2, 16))), new j(11, new int[]{6, 30, 54}, new b(20, new a(4, 81)), new b(30, new a(1, 50), new a(4, 51)), new b(28, new a(4, 22), new a(4, 23)), new b(24, new a(3, 12), new a(8, 13))), new j(12, new int[]{6, 32, 58}, new b(24, new a(2, 92), new a(2, 93)), new b(22, new a(6, 36), new a(2, 37)), new b(26, new a(4, 20), new a(6, 21)), new b(28, new a(7, 14), new a(4, 15))), new j(13, new int[]{6, 34, 62}, new b(26, new a(4, 107)), new b(22, new a(8, 37), new a(1, 38)), new b(24, new a(8, 20), new a(4, 21)), new b(22, new a(12, 11), new a(4, 12))), new j(14, new int[]{6, 26, 46, 66}, new b(30, new a(3, 115), new a(1, 116)), new b(24, new a(4, 40), new a(5, 41)), new b(20, new a(11, 16), new a(5, 17)), new b(24, new a(11, 12), new a(5, 13))), new j(15, new int[]{6, 26, 48, 70}, new b(22, new a(5, 87), new a(1, 88)), new b(24, new a(5, 41), new a(5, 42)), new b(30, new a(5, 24), new a(7, 25)), new b(24, new a(11, 12), new a(7, 13))), new j(16, new int[]{6, 26, 50, 74}, new b(24, new a(5, 98), new a(1, 99)), new b(28, new a(7, 45), new a(3, 46)), new b(24, new a(15, 19), new a(2, 20)), new b(30, new a(3, 15), new a(13, 16))), new j(17, new int[]{6, 30, 54, 78}, new b(28, new a(1, 107), new a(5, 108)), new b(28, new a(10, 46), new a(1, 47)), new b(28, new a(1, 22), new a(15, 23)), new b(28, new a(2, 14), new a(17, 15))), new j(18, new int[]{6, 30, 56, 82}, new b(30, new a(5, 120), new a(1, 121)), new b(26, new a(9, 43), new a(4, 44)), new b(28, new a(17, 22), new a(1, 23)), new b(28, new a(2, 14), new a(19, 15))), new j(19, new int[]{6, 30, 58, 86}, new b(28, new a(3, 113), new a(4, 114)), new b(26, new a(3, 44), new a(11, 45)), new b(26, new a(17, 21), new a(4, 22)), new b(26, new a(9, 13), new a(16, 14))), new j(20, new int[]{6, 34, 62, 90}, new b(28, new a(3, 107), new a(5, 108)), new b(26, new a(3, 41), new a(13, 42)), new b(30, new a(15, 24), new a(5, 25)), new b(28, new a(15, 15), new a(10, 16))), new j(21, new int[]{6, 28, 50, 72, 94}, new b(28, new a(4, 116), new a(4, 117)), new b(26, new a(17, 42)), new b(28, new a(17, 22), new a(6, 23)), new b(30, new a(19, 16), new a(6, 17))), new j(22, new int[]{6, 26, 50, 74, 98}, new b(28, new a(2, 111), new a(7, 112)), new b(28, new a(17, 46)), new b(30, new a(7, 24), new a(16, 25)), new b(24, new a(34, 13))), new j(23, new int[]{6, 30, 54, 78, 102}, new b(30, new a(4, 121), new a(5, 122)), new b(28, new a(4, 47), new a(14, 48)), new b(30, new a(11, 24), new a(14, 25)), new b(30, new a(16, 15), new a(14, 16))), new j(24, new int[]{6, 28, 54, 80, 106}, new b(30, new a(6, 117), new a(4, 118)), new b(28, new a(6, 45), new a(14, 46)), new b(30, new a(11, 24), new a(16, 25)), new b(30, new a(30, 16), new a(2, 17))), new j(25, new int[]{6, 32, 58, 84, 110}, new b(26, new a(8, 106), new a(4, 107)), new b(28, new a(8, 47), new a(13, 48)), new b(30, new a(7, 24), new a(22, 25)), new b(30, new a(22, 15), new a(13, 16))), new j(26, new int[]{6, 30, 58, 86, 114}, new b(28, new a(10, 114), new a(2, 115)), new b(28, new a(19, 46), new a(4, 47)), new b(28, new a(28, 22), new a(6, 23)), new b(30, new a(33, 16), new a(4, 17))), new j(27, new int[]{6, 34, 62, 90, 118}, new b(30, new a(8, 122), new a(4, 123)), new b(28, new a(22, 45), new a(3, 46)), new b(30, new a(8, 23), new a(26, 24)), new b(30, new a(12, 15), new a(28, 16))), new j(28, new int[]{6, 26, 50, 74, 98, 122}, new b(30, new a(3, 117), new a(10, 118)), new b(28, new a(3, 45), new a(23, 46)), new b(30, new a(4, 24), new a(31, 25)), new b(30, new a(11, 15), new a(31, 16))), new j(29, new int[]{6, 30, 54, 78, 102, 126}, new b(30, new a(7, 116), new a(7, 117)), new b(28, new a(21, 45), new a(7, 46)), new b(30, new a(1, 23), new a(37, 24)), new b(30, new a(19, 15), new a(26, 16))), new j(30, new int[]{6, 26, 52, 78, 104, 130}, new b(30, new a(5, 115), new a(10, 116)), new b(28, new a(19, 47), new a(10, 48)), new b(30, new a(15, 24), new a(25, 25)), new b(30, new a(23, 15), new a(25, 16))), new j(31, new int[]{6, 30, 56, 82, 108, 134}, new b(30, new a(13, 115), new a(3, 116)), new b(28, new a(2, 46), new a(29, 47)), new b(30, new a(42, 24), new a(1, 25)), new b(30, new a(23, 15), new a(28, 16))), new j(32, new int[]{6, 34, 60, 86, 112, 138}, new b(30, new a(17, 115)), new b(28, new a(10, 46), new a(23, 47)), new b(30, new a(10, 24), new a(35, 25)), new b(30, new a(19, 15), new a(35, 16))), new j(33, new int[]{6, 30, 58, 86, 114, 142}, new b(30, new a(17, 115), new a(1, 116)), new b(28, new a(14, 46), new a(21, 47)), new b(30, new a(29, 24), new a(19, 25)), new b(30, new a(11, 15), new a(46, 16))), new j(34, new int[]{6, 34, 62, 90, 118, 146}, new b(30, new a(13, 115), new a(6, 116)), new b(28, new a(14, 46), new a(23, 47)), new b(30, new a(44, 24), new a(7, 25)), new b(30, new a(59, 16), new a(1, 17))), new j(35, new int[]{6, 30, 54, 78, 102, 126, FontUtils.MAX_FONT_SCALING}, new b(30, new a(12, 121), new a(7, 122)), new b(28, new a(12, 47), new a(26, 48)), new b(30, new a(39, 24), new a(14, 25)), new b(30, new a(22, 15), new a(41, 16))), new j(36, new int[]{6, 24, 50, 76, 102, 128, 154}, new b(30, new a(6, 121), new a(14, 122)), new b(28, new a(6, 47), new a(34, 48)), new b(30, new a(46, 24), new a(10, 25)), new b(30, new a(2, 15), new a(64, 16))), new j(37, new int[]{6, 28, 54, 80, 106, 132, 158}, new b(30, new a(17, 122), new a(4, 123)), new b(28, new a(29, 46), new a(14, 47)), new b(30, new a(49, 24), new a(10, 25)), new b(30, new a(24, 15), new a(46, 16))), new j(38, new int[]{6, 32, 58, 84, 110, 136, 162}, new b(30, new a(4, 122), new a(18, 123)), new b(28, new a(13, 46), new a(32, 47)), new b(30, new a(48, 24), new a(14, 25)), new b(30, new a(42, 15), new a(32, 16))), new j(39, new int[]{6, 26, 54, 82, 110, 138, 166}, new b(30, new a(20, 117), new a(4, 118)), new b(28, new a(40, 47), new a(7, 48)), new b(30, new a(43, 24), new a(22, 25)), new b(30, new a(10, 15), new a(67, 16))), new j(40, new int[]{6, 30, 58, 86, 114, 142, 170}, new b(30, new a(19, 118), new a(6, 119)), new b(28, new a(18, 47), new a(31, 48)), new b(30, new a(34, 24), new a(34, 25)), new b(30, new a(20, 15), new a(61, 16)))};
     }
 
     public static j b(int i) {
diff --git a/app/src/main/java/c/k/a/a/b.java b/app/src/main/java/c/k/a/a/b.java
index ba23f98e5d..c6b55a1718 100644
--- a/app/src/main/java/c/k/a/a/b.java
+++ b/app/src/main/java/c/k/a/a/b.java
@@ -9,6 +9,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.view.ViewCompat;
 import com.jaredrummler.android.colorpicker.ColorPanelView;
 import com.jaredrummler.android.colorpicker.R;
 /* compiled from: ColorPaletteAdapter */
@@ -84,11 +85,11 @@ public class b extends BaseAdapter {
             if (i != bVar2.k || ColorUtils.calculateLuminance(bVar2.j[i]) < 0.65d) {
                 bVar.f1458c.setColorFilter((ColorFilter) null);
             } else {
-                bVar.f1458c.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
+                bVar.f1458c.setColorFilter(ViewCompat.MEASURED_STATE_MASK, PorterDuff.Mode.SRC_IN);
             }
         } else if (alpha <= 165) {
-            bVar.b.setBorderColor(i2 | -16777216);
-            bVar.f1458c.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
+            bVar.b.setBorderColor(i2 | ViewCompat.MEASURED_STATE_MASK);
+            bVar.f1458c.setColorFilter(ViewCompat.MEASURED_STATE_MASK, PorterDuff.Mode.SRC_IN);
         } else {
             bVar.b.setBorderColor(bVar.d);
             bVar.f1458c.setColorFilter(-1, PorterDuff.Mode.SRC_IN);
diff --git a/app/src/main/java/c/k/a/a/e.java b/app/src/main/java/c/k/a/a/e.java
index 94a7167c90..ac6a772b0b 100644
--- a/app/src/main/java/c/k/a/a/e.java
+++ b/app/src/main/java/c/k/a/a/e.java
@@ -6,6 +6,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.view.ViewCompat;
 import com.jaredrummler.android.colorpicker.ColorPanelView;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.R;
@@ -45,15 +46,15 @@ public class e implements SeekBar.OnSeekBarChangeListener {
             int color = colorPanelView.getColor();
             int argb = Color.argb(i2, Color.red(color), Color.green(color), Color.blue(color));
             if (i2 <= 165) {
-                colorPanelView.setBorderColor(argb | -16777216);
+                colorPanelView.setBorderColor(argb | ViewCompat.MEASURED_STATE_MASK);
             } else {
                 colorPanelView.setBorderColor(((Integer) frameLayout.getTag()).intValue());
             }
             if (colorPanelView.getTag() != null && ((Boolean) colorPanelView.getTag()).booleanValue()) {
                 if (i2 <= 165) {
-                    imageView.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
+                    imageView.setColorFilter(ViewCompat.MEASURED_STATE_MASK, PorterDuff.Mode.SRC_IN);
                 } else if (ColorUtils.calculateLuminance(argb) >= 0.65d) {
-                    imageView.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
+                    imageView.setColorFilter(ViewCompat.MEASURED_STATE_MASK, PorterDuff.Mode.SRC_IN);
                 } else {
                     imageView.setColorFilter(-1, PorterDuff.Mode.SRC_IN);
                 }
diff --git a/app/src/main/java/c/m/a/g/d/e.java b/app/src/main/java/c/m/a/g/d/e.java
index af64c01d59..f94ce43870 100644
--- a/app/src/main/java/c/m/a/g/d/e.java
+++ b/app/src/main/java/c/m/a/g/d/e.java
@@ -1,5 +1,6 @@
 package c.m.a.g.d;
 
+import com.discord.api.permission.Permission;
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
@@ -89,7 +90,7 @@ public class e {
 
     public static long c(byte[] bArr, int i) {
         long b2 = b(bArr, i);
-        return ((b(bArr, i + 4) * 1000) / 4294967296L) + ((b2 - 2208988800L) * 1000);
+        return ((b(bArr, i + 4) * 1000) / Permission.REQUEST_TO_SPEAK) + ((b2 - 2208988800L) * 1000);
     }
 
     public b d(String str, Long l) throws IOException {
@@ -111,7 +112,7 @@ public class e {
             bArr[41] = (byte) ((int) (j3 >> 16));
             bArr[42] = (byte) ((int) (j3 >> 8));
             bArr[43] = (byte) ((int) (j3 >> 0));
-            long j4 = (j2 * 4294967296L) / 1000;
+            long j4 = (j2 * Permission.REQUEST_TO_SPEAK) / 1000;
             bArr[44] = (byte) ((int) (j4 >> 24));
             bArr[45] = (byte) ((int) (j4 >> 16));
             bArr[46] = (byte) ((int) (j4 >> 8));
diff --git a/app/src/main/java/c/n/a/a/a.java b/app/src/main/java/c/n/a/a/a.java
index a59dc38f09..58c68a43a2 100644
--- a/app/src/main/java/c/n/a/a/a.java
+++ b/app/src/main/java/c/n/a/a/a.java
@@ -9,6 +9,7 @@ import android.os.RemoteException;
 import android.util.Log;
 import c.a.s.d;
 import com.discord.samsung.SamsungConnectActivity;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.t;
 import d0.g0.y;
 import d0.z.d.m;
@@ -81,7 +82,7 @@ public interface a extends IInterface {
                         StringBuilder sb = new StringBuilder();
                         sb.append('[');
                         sb.append(string3);
-                        sb.append(':');
+                        sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
                         if (string != null) {
                             str = y.takeLast(string, 4);
                         }
diff --git a/app/src/main/java/c/o/a/n/d.java b/app/src/main/java/c/o/a/n/d.java
index c47653c496..960db48116 100644
--- a/app/src/main/java/c/o/a/n/d.java
+++ b/app/src/main/java/c/o/a/n/d.java
@@ -30,6 +30,7 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 import c.o.a.l;
 import c.o.a.n.i;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.otaliastudios.cameraview.CameraException;
@@ -582,7 +583,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         this.f1478j0 = c.o.a.n.q.b.a;
         this.o0 = new CopyOnWriteArrayList();
         this.q0 = new i();
-        this.f1471c0 = (CameraManager) ((CameraView.b) this.l).g().getSystemService("camera");
+        this.f1471c0 = (CameraManager) ((CameraView.b) this.l).g().getSystemService(ChatInputComponentTypes.CAMERA);
         new c.o.a.n.o.g().e(this);
     }
 
diff --git a/app/src/main/java/c/o/a/n/g.java b/app/src/main/java/c/o/a/n/g.java
index 1425ff132d..a77094097a 100644
--- a/app/src/main/java/c/o/a/n/g.java
+++ b/app/src/main/java/c/o/a/n/g.java
@@ -3,6 +3,7 @@ package c.o.a.n;
 import android.location.Location;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.o.a.l;
 import c.o.a.m.e;
 import c.o.a.m.f;
@@ -439,7 +440,7 @@ public abstract class g extends i {
 
     public final boolean a1() {
         long j = this.V;
-        return j > 0 && j != Long.MAX_VALUE;
+        return j > 0 && j != RecyclerView.FOREVER_NS;
     }
 
     @Override // c.o.a.n.i
diff --git a/app/src/main/java/c/o/a/n/s/b.java b/app/src/main/java/c/o/a/n/s/b.java
index 8e9594683c..95d59dc9af 100644
--- a/app/src/main/java/c/o/a/n/s/b.java
+++ b/app/src/main/java/c/o/a/n/s/b.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import c.o.a.n.t.a;
 import c.o.a.t.c;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 /* compiled from: Camera2MeteringTransform */
 @RequiresApi(21)
 public class b implements c<MeteringRectangle> {
@@ -70,7 +71,7 @@ public class b implements c<MeteringRectangle> {
         pointF2.x = (((float) bVar3.i) / ((float) i)) * pointF2.x;
         pointF2.y = (((float) bVar3.j) / ((float) i2)) * pointF2.y;
         int c2 = this.b.c(c.o.a.n.t.b.SENSOR, c.o.a.n.t.b.VIEW, 1);
-        boolean z2 = c2 % 180 != 0;
+        boolean z2 = c2 % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0;
         float f6 = pointF2.x;
         float f7 = pointF2.y;
         if (c2 == 0) {
diff --git a/app/src/main/java/c/o/a/n/t/a.java b/app/src/main/java/c/o/a/n/t/a.java
index b1a984b525..9503e433f9 100644
--- a/app/src/main/java/c/o/a/n/t/a.java
+++ b/app/src/main/java/c/o/a/n/t/a.java
@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import c.o.a.b;
 import c.o.a.m.e;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 /* compiled from: Angles */
 public class a {
     public static final b a = new b(a.class.getSimpleName());
@@ -42,7 +43,7 @@ public class a {
     }
 
     public boolean b(@NonNull b bVar, @NonNull b bVar2) {
-        return c(bVar, bVar2, 1) % 180 != 0;
+        return c(bVar, bVar2, 1) % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0;
     }
 
     public int c(@NonNull b bVar, @NonNull b bVar2, @NonNull int i) {
diff --git a/app/src/main/java/c/o/a/r/a.java b/app/src/main/java/c/o/a/r/a.java
index 4169323e1d..217b558781 100644
--- a/app/src/main/java/c/o/a/r/a.java
+++ b/app/src/main/java/c/o/a/r/a.java
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint;
 import android.media.CamcorderProfile;
 import androidx.annotation.NonNull;
 import c.o.a.b;
+import com.discord.utilities.voice.ScreenShareManager;
+import com.discord.widgets.settings.profile.WidgetSettingsUserProfile;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -42,10 +44,10 @@ public class a {
         b = hashMap;
         hashMap.put(new c.o.a.x.b(176, 144), 2);
         b.put(new c.o.a.x.b(320, 240), 7);
-        b.put(new c.o.a.x.b(352, 288), 3);
+        b.put(new c.o.a.x.b(352, ScreenShareManager.THUMBNAIL_HEIGHT_PX), 3);
         b.put(new c.o.a.x.b(720, 480), 4);
         b.put(new c.o.a.x.b(1280, 720), 5);
-        b.put(new c.o.a.x.b(1920, 1080), 6);
+        b.put(new c.o.a.x.b(1920, WidgetSettingsUserProfile.MAX_BANNER_IMAGE_SIZE), 6);
         b.put(new c.o.a.x.b(3840, 2160), 8);
     }
 
diff --git a/app/src/main/java/c/o/a/r/f.java b/app/src/main/java/c/o/a/r/f.java
index e59ccb9b58..672be47bac 100644
--- a/app/src/main/java/c/o/a/r/f.java
+++ b/app/src/main/java/c/o/a/r/f.java
@@ -9,6 +9,7 @@ import android.view.WindowManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import c.o.a.j;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.otaliastudios.cameraview.CameraView;
 /* compiled from: OrientationHelper */
 public class f {
@@ -49,7 +50,7 @@ public class f {
                     if (i2 == fVar.e) {
                     }
                 } else if (i >= 135 && i < 225) {
-                    i2 = 180;
+                    i2 = BaseTransientBottomBar.ANIMATION_FADE_DURATION;
                     fVar = f.this;
                     if (i2 == fVar.e) {
                     }
@@ -132,12 +133,9 @@ public class f {
 
     public final int a() {
         int rotation = ((WindowManager) this.b.getSystemService("window")).getDefaultDisplay().getRotation();
-        if (rotation == 1) {
-            return 90;
+        if (rotation != 1) {
+            return rotation != 2 ? rotation != 3 ? 0 : 270 : BaseTransientBottomBar.ANIMATION_FADE_DURATION;
         }
-        if (rotation != 2) {
-            return rotation != 3 ? 0 : 270;
-        }
-        return 180;
+        return 90;
     }
 }
diff --git a/app/src/main/java/c/o/a/v/a.java b/app/src/main/java/c/o/a/v/a.java
index 26c65def7a..65dd2cfbe5 100644
--- a/app/src/main/java/c/o/a/v/a.java
+++ b/app/src/main/java/c/o/a/v/a.java
@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.exifinterface.media.ExifInterface;
 import c.o.a.l;
 import c.o.a.n.v.e;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 /* compiled from: Full1PictureRecorder */
@@ -35,10 +36,10 @@ public class a extends c {
             int i;
             c.l.a(1, "take(): got picture callback.");
             try {
-                switch (new ExifInterface(new ByteArrayInputStream(bArr)).getAttributeInt("Orientation", 1)) {
+                switch (new ExifInterface(new ByteArrayInputStream(bArr)).getAttributeInt(ExifInterface.TAG_ORIENTATION, 1)) {
                     case 3:
                     case 4:
-                        i = 180;
+                        i = BaseTransientBottomBar.ANIMATION_FADE_DURATION;
                         break;
                     case 5:
                     case 6:
diff --git a/app/src/main/java/c/o/a/v/b.java b/app/src/main/java/c/o/a/v/b.java
index 545469aa02..eac8e8a49b 100644
--- a/app/src/main/java/c/o/a/v/b.java
+++ b/app/src/main/java/c/o/a/v/b.java
@@ -16,6 +16,7 @@ import c.o.a.n.d;
 import c.o.a.n.o.c;
 import c.o.a.n.o.e;
 import c.o.a.r.g;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -125,12 +126,12 @@ public class b extends c implements ImageReader.OnImageAvailableListener {
         aVar.f = bArr;
         aVar.f1467c = 0;
         try {
-            int attributeInt = new ExifInterface(new ByteArrayInputStream(this.i.f)).getAttributeInt("Orientation", 1);
+            int attributeInt = new ExifInterface(new ByteArrayInputStream(this.i.f)).getAttributeInt(ExifInterface.TAG_ORIENTATION, 1);
             l.a aVar2 = this.i;
             switch (attributeInt) {
                 case 3:
                 case 4:
-                    i = 180;
+                    i = BaseTransientBottomBar.ANIMATION_FADE_DURATION;
                     break;
                 case 5:
                 case 6:
diff --git a/app/src/main/java/c/o/a/v/e.java b/app/src/main/java/c/o/a/v/e.java
index bb2d10fbf5..9244ffad3d 100644
--- a/app/src/main/java/c/o/a/v/e.java
+++ b/app/src/main/java/c/o/a/v/e.java
@@ -8,6 +8,7 @@ import c.i.a.f.e.o.c;
 import c.o.a.l;
 import c.o.a.n.b;
 import c.o.a.r.g;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.io.ByteArrayOutputStream;
 /* compiled from: Snapshot1PictureRecorder */
 public class e extends i {
@@ -49,7 +50,7 @@ public class e extends i {
                     int i3 = bVar.j;
                     byte[] bArr3 = new byte[bArr2.length];
                     int i4 = i2 * i3;
-                    boolean z2 = i % 180 != 0;
+                    boolean z2 = i % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0;
                     boolean z3 = i % 270 != 0;
                     boolean z4 = i >= 180;
                     for (int i5 = 0; i5 < i3; i5++) {
diff --git a/app/src/main/java/c/o/a/w/j.java b/app/src/main/java/c/o/a/w/j.java
index cb220d9ac1..7b952afef8 100644
--- a/app/src/main/java/c/o/a/w/j.java
+++ b/app/src/main/java/c/o/a/w/j.java
@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
 import c.i.a.f.e.o.c;
 import c.o.a.w.a;
 import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.otaliastudios.cameraview.R;
 import java.util.concurrent.ExecutionException;
 /* compiled from: TextureCameraPreview */
@@ -81,7 +82,7 @@ public class j extends a<TextureView, SurfaceTexture> {
             float f = ((float) i) / 2.0f;
             int i2 = jVar.f;
             float f2 = ((float) i2) / 2.0f;
-            if (this.i % 180 != 0) {
+            if (this.i % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0) {
                 float f3 = ((float) i2) / ((float) i);
                 matrix.postScale(f3, 1.0f / f3, f, f2);
             }
diff --git a/app/src/main/java/c/o/b/a/b.java b/app/src/main/java/c/o/b/a/b.java
index 7e1e7ef828..21b38fc9e8 100644
--- a/app/src/main/java/c/o/b/a/b.java
+++ b/app/src/main/java/c/o/b/a/b.java
@@ -10,6 +10,7 @@ import d0.t.c0;
 import d0.t.k;
 import d0.z.d.m;
 import java.util.Iterator;
+import org.webrtc.EglBase;
 /* compiled from: EglNativeConfigChooser.kt */
 public class b {
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0055: APUT  (r4v0 int[]), (12 ??[int, float, short, byte, char]), (r1v1 int) */
@@ -29,7 +30,7 @@ public class b {
         iArr[9] = d.q | d.r;
         iArr[10] = d.f1507s;
         iArr[11] = i2;
-        iArr[12] = z2 ? 12610 : d.e;
+        iArr[12] = z2 ? EglBase.EGL_RECORDABLE_ANDROID : d.e;
         iArr[13] = z2 ? 1 : 0;
         iArr[14] = d.e;
         a[] aVarArr = new a[1];
diff --git a/app/src/main/java/c/o/b/c/f.java b/app/src/main/java/c/o/b/c/f.java
index 0000014cd7..25e8d2a14a 100644
--- a/app/src/main/java/c/o/b/c/f.java
+++ b/app/src/main/java/c/o/b/c/f.java
@@ -1,5 +1,6 @@
 package c.o.b.c;
 
+import androidx.work.Data;
 import d0.p;
 /* compiled from: gl.kt */
 public final class f {
@@ -10,7 +11,7 @@ public final class f {
     public static final int f1508c = p.m83constructorimpl(33984);
     public static final int d = p.m83constructorimpl(36197);
     public static final int e = p.m83constructorimpl(10241);
-    public static final int f = p.m83constructorimpl(10240);
+    public static final int f = p.m83constructorimpl(Data.MAX_DATA_BYTES);
     public static final int g = p.m83constructorimpl(10242);
     public static final int h = p.m83constructorimpl(10243);
     public static final int i = 33071;
diff --git a/app/src/main/java/c/o/b/d/d.java b/app/src/main/java/c/o/b/d/d.java
index 8a188cf233..97ae653477 100644
--- a/app/src/main/java/c/o/b/d/d.java
+++ b/app/src/main/java/c/o/b/d/d.java
@@ -3,6 +3,7 @@ package c.o.b.d;
 import android.graphics.RectF;
 import c.i.a.f.e.o.c;
 import c.o.b.b.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.nio.FloatBuffer;
 /* compiled from: GlTextureProgram.kt */
@@ -24,22 +25,22 @@ public class d extends a {
         m.checkNotNullParameter(str2, "vertexMvpMatrixName");
         m.checkNotNullParameter(str, "vertexPositionName");
         m.checkNotNullParameter(str2, "vertexMvpMatrixName");
-        m.checkNotNullParameter(str4, "name");
+        m.checkNotNullParameter(str4, ModelAuditLogEntry.CHANGE_KEY_NAME);
         int i2 = this.b;
-        m.checkNotNullParameter(str4, "name");
+        m.checkNotNullParameter(str4, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f = new b(i2, 2, str4, null);
         this.g = c.D(8);
-        m.checkNotNullParameter(str3, "name");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         int i3 = this.b;
-        m.checkNotNullParameter(str3, "name");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.h = new b(i3, 1, str3, null);
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         int i4 = this.b;
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.i = new b(i4, 1, str, null);
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         int i5 = this.b;
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.j = new b(i5, 2, str2, null);
         this.k = new RectF();
         this.l = -1;
diff --git a/app/src/main/java/c/p/a/b.java b/app/src/main/java/c/p/a/b.java
index 7d7933f989..b844c1ab3e 100644
--- a/app/src/main/java/c/p/a/b.java
+++ b/app/src/main/java/c/p/a/b.java
@@ -39,6 +39,7 @@ import androidx.annotation.StyleRes;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.TextViewCompat;
@@ -411,7 +412,7 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
     @Override // android.view.View
     @SuppressLint({"ClickableViewAccessibility"})
     public boolean onTouchEvent(MotionEvent motionEvent) {
-        m.checkNotNullParameter(motionEvent, "event");
+        m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
         performClick();
         return super.onTouchEvent(motionEvent);
     }
@@ -572,7 +573,7 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
         Drawable progressDrawable;
         ProgressBar progressBar = (ProgressBar) c(R.d.pbProgress);
         if (progressBar != null && (progressDrawable = progressBar.getProgressDrawable()) != null) {
-            progressDrawable.setColorFilter(new LightingColorFilter(-16777216, i));
+            progressDrawable.setColorFilter(new LightingColorFilter(ViewCompat.MEASURED_STATE_MASK, i));
         }
     }
 
@@ -580,7 +581,7 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
         Drawable progressDrawable;
         ProgressBar progressBar = (ProgressBar) c(R.d.pbProgress);
         if (progressBar != null && (progressDrawable = progressBar.getProgressDrawable()) != null) {
-            progressDrawable.setColorFilter(new LightingColorFilter(-16777216, ContextCompat.getColor(getContext(), i)));
+            progressDrawable.setColorFilter(new LightingColorFilter(ViewCompat.MEASURED_STATE_MASK, ContextCompat.getColor(getContext(), i)));
         }
     }
 
@@ -668,7 +669,7 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
     }
 
     public final void setText(CharSequence charSequence) {
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         if (!TextUtils.isEmpty(charSequence)) {
             int i = R.d.tvText;
             AppCompatTextView appCompatTextView = (AppCompatTextView) c(i);
diff --git a/app/src/main/java/c/q/a/j/a.java b/app/src/main/java/c/q/a/j/a.java
index e29116a530..974eb7b7e9 100644
--- a/app/src/main/java/c/q/a/j/a.java
+++ b/app/src/main/java/c/q/a/j/a.java
@@ -233,7 +233,7 @@ public class a extends AsyncTask<Void, Void, Throwable> {
                         int i3 = this.o;
                         String str = this.l;
                         byte[] bArr = c.q.a.k.c.a;
-                        String[] strArr = {"FNumber", "DateTime", "DateTimeDigitized", "ExposureTime", "Flash", "FocalLength", "GPSAltitude", "GPSAltitudeRef", "GPSDateStamp", "GPSLatitude", "GPSLatitudeRef", "GPSLongitude", "GPSLongitudeRef", "GPSProcessingMethod", "GPSTimeStamp", "PhotographicSensitivity", "Make", "Model", "SubSecTime", "SubSecTimeDigitized", "SubSecTimeOriginal", "WhiteBalance"};
+                        String[] strArr = {ExifInterface.TAG_F_NUMBER, ExifInterface.TAG_DATETIME, ExifInterface.TAG_DATETIME_DIGITIZED, ExifInterface.TAG_EXPOSURE_TIME, ExifInterface.TAG_FLASH, ExifInterface.TAG_FOCAL_LENGTH, ExifInterface.TAG_GPS_ALTITUDE, ExifInterface.TAG_GPS_ALTITUDE_REF, ExifInterface.TAG_GPS_DATESTAMP, ExifInterface.TAG_GPS_LATITUDE, ExifInterface.TAG_GPS_LATITUDE_REF, ExifInterface.TAG_GPS_LONGITUDE, ExifInterface.TAG_GPS_LONGITUDE_REF, ExifInterface.TAG_GPS_PROCESSING_METHOD, ExifInterface.TAG_GPS_TIMESTAMP, ExifInterface.TAG_PHOTOGRAPHIC_SENSITIVITY, ExifInterface.TAG_MAKE, ExifInterface.TAG_MODEL, ExifInterface.TAG_SUBSEC_TIME, ExifInterface.TAG_SUBSEC_TIME_DIGITIZED, ExifInterface.TAG_SUBSEC_TIME_ORIGINAL, ExifInterface.TAG_WHITE_BALANCE};
                         try {
                             ExifInterface exifInterface2 = new ExifInterface(str);
                             for (int i4 = 0; i4 < 22; i4++) {
@@ -243,9 +243,9 @@ public class a extends AsyncTask<Void, Void, Throwable> {
                                     exifInterface2.setAttribute(str2, attribute);
                                 }
                             }
-                            exifInterface2.setAttribute("ImageWidth", String.valueOf(i2));
-                            exifInterface2.setAttribute("ImageLength", String.valueOf(i3));
-                            exifInterface2.setAttribute("Orientation", "0");
+                            exifInterface2.setAttribute(ExifInterface.TAG_IMAGE_WIDTH, String.valueOf(i2));
+                            exifInterface2.setAttribute(ExifInterface.TAG_IMAGE_LENGTH, String.valueOf(i3));
+                            exifInterface2.setAttribute(ExifInterface.TAG_ORIENTATION, "0");
                             exifInterface2.saveAttributes();
                         } catch (IOException e5) {
                             Log.d("ImageHeaderParser", e5.getMessage());
diff --git a/app/src/main/java/c/q/a/j/b.java b/app/src/main/java/c/q/a/j/b.java
index 6977b8491e..03956e68a0 100644
--- a/app/src/main/java/c/q/a/j/b.java
+++ b/app/src/main/java/c/q/a/j/b.java
@@ -11,6 +11,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import c.q.a.k.c;
 import c.q.a.l.c;
+import com.adjust.sdk.Constants;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.yalantis.ucrop.UCropActivity;
 import d0.z.d.m;
 import f0.f0.g.e;
@@ -266,7 +268,7 @@ public class b extends AsyncTask<Void, Void, a> {
     public final void c() throws NullPointerException, IOException {
         String scheme = this.b.getScheme();
         Log.d("BitmapWorkerTask", "Uri scheme: " + scheme);
-        if ("http".equals(scheme) || "https".equals(scheme)) {
+        if ("http".equals(scheme) || Constants.SCHEME.equals(scheme)) {
             try {
                 b(this.b, this.f1523c);
             } catch (IOException | NullPointerException e) {
@@ -403,7 +405,7 @@ public class b extends AsyncTask<Void, Void, a> {
                             switch (i2) {
                                 case 3:
                                 case 4:
-                                    i3 = 180;
+                                    i3 = BaseTransientBottomBar.ANIMATION_FADE_DURATION;
                                     break;
                                 case 5:
                                 case 6:
diff --git a/app/src/main/java/c/q/a/k/a.java b/app/src/main/java/c/q/a/k/a.java
index 956cfcbd31..992605549b 100644
--- a/app/src/main/java/c/q/a/k/a.java
+++ b/app/src/main/java/c/q/a/k/a.java
@@ -12,6 +12,8 @@ import android.opengl.EGLSurface;
 import android.opengl.GLES20;
 import android.view.Display;
 import android.view.WindowManager;
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.d0.f;
 import d0.g0.s;
 import d0.g0.w;
@@ -261,8 +263,8 @@ public class a {
         long j3;
         do {
             j2 = atomicLong.get();
-            if (j2 == Long.MAX_VALUE) {
-                return Long.MAX_VALUE;
+            if (j2 == RecyclerView.FOREVER_NS) {
+                return RecyclerView.FOREVER_NS;
             }
             j3 = j2 - j;
             if (j3 < 0) {
@@ -572,7 +574,7 @@ public class a {
             j2 = 1;
         }
         if ((i & 8) != 0) {
-            j3 = Long.MAX_VALUE;
+            j3 = RecyclerView.FOREVER_NS;
         }
         return V(str, j, j2, j3);
     }
@@ -737,10 +739,7 @@ public class a {
 
     public static long d(long j, long j2) {
         long j3 = j + j2;
-        if (j3 < 0) {
-            return Long.MAX_VALUE;
-        }
-        return j3;
+        return j3 < 0 ? RecyclerView.FOREVER_NS : j3;
     }
 
     public static final String d0(Continuation<?> continuation) {
@@ -750,13 +749,13 @@ public class a {
         }
         try {
             k.a aVar = k.i;
-            obj = k.m75constructorimpl(continuation + '@' + u(continuation));
+            obj = k.m75constructorimpl(continuation + MentionUtilsKt.MENTIONS_CHAR + u(continuation));
         } catch (Throwable th) {
             k.a aVar2 = k.i;
             obj = k.m75constructorimpl(l.createFailure(th));
         }
         if (k.m77exceptionOrNullimpl(obj) != null) {
-            obj = continuation.getClass().getName() + '@' + u(continuation);
+            obj = continuation.getClass().getName() + MentionUtilsKt.MENTIONS_CHAR + u(continuation);
         }
         return (String) obj;
     }
@@ -1127,7 +1126,7 @@ public class a {
         }
         s.a.k kVar = new s.a.k(d0.w.g.b.intercepted(continuation), 1);
         kVar.A();
-        if (j < Long.MAX_VALUE) {
+        if (j < RecyclerView.FOREVER_NS) {
             t(kVar.n).b(j, kVar);
         }
         Object u = kVar.u();
diff --git a/app/src/main/java/c/q/a/k/c.java b/app/src/main/java/c/q/a/k/c.java
index 37de5ad206..4571889b15 100644
--- a/app/src/main/java/c/q/a/k/c.java
+++ b/app/src/main/java/c/q/a/k/c.java
@@ -1,6 +1,7 @@
 package c.q.a.k;
 
 import android.util.Log;
+import com.adjust.sdk.Constants;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -9,7 +10,7 @@ import java.nio.charset.Charset;
 import java.util.Objects;
 /* compiled from: ImageHeaderParser */
 public class c {
-    public static final byte[] a = "Exif\u0000\u0000".getBytes(Charset.forName("UTF-8"));
+    public static final byte[] a = "Exif\u0000\u0000".getBytes(Charset.forName(Constants.ENCODING));
     public static final int[] b = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8};
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/co/discord/media_engine/AudioDecoder.java b/app/src/main/java/co/discord/media_engine/AudioDecoder.java
index 45b7901774..2057e2f099 100644
--- a/app/src/main/java/co/discord/media_engine/AudioDecoder.java
+++ b/app/src/main/java/co/discord/media_engine/AudioDecoder.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.Map;
 import java.util.Objects;
@@ -15,7 +16,7 @@ public final class AudioDecoder {
     private final int type;
 
     public AudioDecoder(int i, String str, int i2, int i3, Map<String, String> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(map, "params");
         this.type = i;
         this.name = str;
@@ -72,7 +73,7 @@ public final class AudioDecoder {
     }
 
     public final AudioDecoder copy(int i, String str, int i2, int i3, Map<String, String> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(map, "params");
         return new AudioDecoder(i, str, i2, i3, map);
     }
diff --git a/app/src/main/java/co/discord/media_engine/AudioEncoder.java b/app/src/main/java/co/discord/media_engine/AudioEncoder.java
index 8c897d0a33..5cbd392ea0 100644
--- a/app/src/main/java/co/discord/media_engine/AudioEncoder.java
+++ b/app/src/main/java/co/discord/media_engine/AudioEncoder.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: Codecs.kt */
 public final class AudioEncoder {
@@ -12,7 +13,7 @@ public final class AudioEncoder {
     private final int type;
 
     public AudioEncoder(int i, String str, int i2, int i3, int i4, int i5) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.type = i;
         this.name = str;
         this.freq = i2;
@@ -68,7 +69,7 @@ public final class AudioEncoder {
     }
 
     public final AudioEncoder copy(int i, String str, int i2, int i3, int i4, int i5) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new AudioEncoder(i, str, i2, i3, i4, i5);
     }
 
diff --git a/app/src/main/java/co/discord/media_engine/AudioInputDeviceDescription.java b/app/src/main/java/co/discord/media_engine/AudioInputDeviceDescription.java
index 93097b5c7e..6b502dce0a 100644
--- a/app/src/main/java/co/discord/media_engine/AudioInputDeviceDescription.java
+++ b/app/src/main/java/co/discord/media_engine/AudioInputDeviceDescription.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: DeviceDescription.kt */
 public final class AudioInputDeviceDescription {
@@ -8,7 +9,7 @@ public final class AudioInputDeviceDescription {
     private final String name;
 
     public AudioInputDeviceDescription(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "guid");
         this.name = str;
         this.guid = str2;
@@ -33,7 +34,7 @@ public final class AudioInputDeviceDescription {
     }
 
     public final AudioInputDeviceDescription copy(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "guid");
         return new AudioInputDeviceDescription(str, str2);
     }
diff --git a/app/src/main/java/co/discord/media_engine/AudioOutputDeviceDescription.java b/app/src/main/java/co/discord/media_engine/AudioOutputDeviceDescription.java
index 9b0da49de6..e53569a69a 100644
--- a/app/src/main/java/co/discord/media_engine/AudioOutputDeviceDescription.java
+++ b/app/src/main/java/co/discord/media_engine/AudioOutputDeviceDescription.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: DeviceDescription.kt */
 public final class AudioOutputDeviceDescription {
@@ -8,7 +9,7 @@ public final class AudioOutputDeviceDescription {
     private final String name;
 
     public AudioOutputDeviceDescription(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "guid");
         this.name = str;
         this.guid = str2;
@@ -33,7 +34,7 @@ public final class AudioOutputDeviceDescription {
     }
 
     public final AudioOutputDeviceDescription copy(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "guid");
         return new AudioOutputDeviceDescription(str, str2);
     }
diff --git a/app/src/main/java/co/discord/media_engine/CameraEnumeratorProvider.java b/app/src/main/java/co/discord/media_engine/CameraEnumeratorProvider.java
index 73e9fac715..ac5b3c3a26 100644
--- a/app/src/main/java/co/discord/media_engine/CameraEnumeratorProvider.java
+++ b/app/src/main/java/co/discord/media_engine/CameraEnumeratorProvider.java
@@ -31,7 +31,7 @@ public final class CameraEnumeratorProvider {
         synchronized (CameraEnumeratorProvider.class) {
             cameraEnumerator = enumerator;
             if (cameraEnumerator == null) {
-                ExtensionFunctionsKt.logi("CameraEnumeratorProvider", "init was never called. Use Camera 1 API by default.");
+                ExtensionFunctionsKt.logi(TAG, "init was never called. Use Camera 1 API by default.");
                 cameraEnumerator = new Camera1Enumerator();
             }
         }
@@ -53,13 +53,13 @@ public final class CameraEnumeratorProvider {
         CameraEnumerator cameraEnumerator;
         m.checkNotNullParameter(context, "context");
         if (z2) {
-            ExtensionFunctionsKt.logi("CameraEnumeratorProvider", "Override: Forcing Camera 1 API");
+            ExtensionFunctionsKt.logi(TAG, "Override: Forcing Camera 1 API");
             cameraEnumerator = new Camera1Enumerator();
         } else if (Camera2Enumerator.isSupported(context)) {
-            ExtensionFunctionsKt.logi("CameraEnumeratorProvider", "Use Camera 2 API");
+            ExtensionFunctionsKt.logi(TAG, "Use Camera 2 API");
             cameraEnumerator = new Camera2Enumerator(context.getApplicationContext());
         } else {
-            ExtensionFunctionsKt.logi("CameraEnumeratorProvider", "Camera 2 API is not supported. Use Camera 1 API");
+            ExtensionFunctionsKt.logi(TAG, "Camera 2 API is not supported. Use Camera 1 API");
             cameraEnumerator = new Camera1Enumerator();
         }
         enumerator = cameraEnumerator;
diff --git a/app/src/main/java/co/discord/media_engine/ReceiverReport.java b/app/src/main/java/co/discord/media_engine/ReceiverReport.java
index 6e3ac4cb69..38a2e583b3 100644
--- a/app/src/main/java/co/discord/media_engine/ReceiverReport.java
+++ b/app/src/main/java/co/discord/media_engine/ReceiverReport.java
@@ -2,6 +2,7 @@ package co.discord.media_engine;
 
 import a0.a.a.b;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: Statistics.kt */
 public final class ReceiverReport {
@@ -12,7 +13,7 @@ public final class ReceiverReport {
     private final String f1532id;
 
     public ReceiverReport(String str, long j, int i) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         this.f1532id = str;
         this.bitrate = j;
         this.fractionLost = i;
@@ -44,7 +45,7 @@ public final class ReceiverReport {
     }
 
     public final ReceiverReport copy(String str, long j, int i) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         return new ReceiverReport(str, j, i);
     }
 
diff --git a/app/src/main/java/co/discord/media_engine/RtcRegion.java b/app/src/main/java/co/discord/media_engine/RtcRegion.java
index 85164bef97..a233275764 100644
--- a/app/src/main/java/co/discord/media_engine/RtcRegion.java
+++ b/app/src/main/java/co/discord/media_engine/RtcRegion.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.Arrays;
 /* compiled from: RtcRegion.kt */
@@ -9,7 +10,7 @@ public final class RtcRegion {
     private final String region;
 
     public RtcRegion(String str, String[] strArr) {
-        m.checkNotNullParameter(str, "region");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REGION);
         m.checkNotNullParameter(strArr, "ips");
         this.region = str;
         this.ips = strArr;
@@ -34,7 +35,7 @@ public final class RtcRegion {
     }
 
     public final RtcRegion copy(String str, String[] strArr) {
-        m.checkNotNullParameter(str, "region");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REGION);
         m.checkNotNullParameter(strArr, "ips");
         return new RtcRegion(str, strArr);
     }
diff --git a/app/src/main/java/co/discord/media_engine/SoundshareAudioSource.java b/app/src/main/java/co/discord/media_engine/SoundshareAudioSource.java
index cf274e84f6..b24cd514cc 100644
--- a/app/src/main/java/co/discord/media_engine/SoundshareAudioSource.java
+++ b/app/src/main/java/co/discord/media_engine/SoundshareAudioSource.java
@@ -4,6 +4,7 @@ import android.media.AudioRecord;
 import android.os.Process;
 import android.util.Log;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.nio.ByteBuffer;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -37,7 +38,7 @@ public final class SoundshareAudioSource {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AudioRecordThread(SoundshareAudioSource soundshareAudioSource, String str, AudioRecord audioRecord, ByteBuffer byteBuffer, long j) {
             super(str);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(audioRecord, "audioRecord");
             m.checkNotNullParameter(byteBuffer, "byteBuffer");
             this.this$0 = soundshareAudioSource;
@@ -66,7 +67,7 @@ public final class SoundshareAudioSource {
                     }
                 } else {
                     String str = "AudioRecord.read failed: " + read;
-                    Log.e("SoundshareAudioSource", str);
+                    Log.e(SoundshareAudioSource.TAG, str);
                     if (read == -3) {
                         this.keepAlive = false;
                         SoundshareAudioSource.access$reportSoundshareAudioSourceError(this.this$0, str);
@@ -78,7 +79,7 @@ public final class SoundshareAudioSource {
             } catch (IllegalStateException e) {
                 StringBuilder K = a.K("AudioRecord.stop failed: ");
                 K.append(e.getMessage());
-                Log.e("SoundshareAudioSource", K.toString());
+                Log.e(SoundshareAudioSource.TAG, K.toString());
             }
         }
 
@@ -107,7 +108,7 @@ public final class SoundshareAudioSource {
         }
 
         public final void setMicrophoneMute(boolean z2) {
-            Log.w("SoundshareAudioSource", "setMicrophoneMute(" + z2 + ')');
+            Log.w(SoundshareAudioSource.TAG, "setMicrophoneMute(" + z2 + ')');
             SoundshareAudioSource.access$setMicrophoneMute$cp(z2);
         }
     }
@@ -149,15 +150,15 @@ public final class SoundshareAudioSource {
     private final native void nativeSetSampleFormat(long j, int i, int i2, int i3);
 
     private final void reportSoundshareAudioSourceError(String str) {
-        Log.e("SoundshareAudioSource", "Run-time recording error: " + str);
+        Log.e(TAG, "Run-time recording error: " + str);
     }
 
     private final void reportSoundshareAudioSourceInitError(String str) {
-        Log.e("SoundshareAudioSource", "Init recording error: " + str);
+        Log.e(TAG, "Init recording error: " + str);
     }
 
     private final void reportSoundshareAudioSourceStartError(String str) {
-        Log.e("SoundshareAudioSource", "Start recording error: " + str);
+        Log.e(TAG, "Start recording error: " + str);
     }
 
     public final long getNativeInstance() {
@@ -225,11 +226,11 @@ public final class SoundshareAudioSource {
                     return false;
                 }
             } catch (Throwable th) {
-                Log.e("SoundshareAudioSource", "SoundshareAudioSource.startRecording fail hard!", th);
+                Log.e(TAG, "SoundshareAudioSource.startRecording fail hard!", th);
                 throw th;
             }
         } catch (Throwable th2) {
-            Log.e("SoundshareAudioSource", "WebrtcAudioRecord.startRecording: audioThread != null!", th2);
+            Log.e(TAG, "WebrtcAudioRecord.startRecording: audioThread != null!", th2);
             throw th2;
         }
     }
@@ -240,8 +241,8 @@ public final class SoundshareAudioSource {
             return false;
         }
         audioRecordThread.stopThread();
-        if (!ThreadUtils.joinUninterruptibly(audioRecordThread, 2000)) {
-            Log.e("SoundshareAudioSource", "Join of SoundshareThread timed out");
+        if (!ThreadUtils.joinUninterruptibly(audioRecordThread, AUDIO_RECORD_THREAD_JOIN_TIMEOUT_MS)) {
+            Log.e(TAG, "Join of SoundshareThread timed out");
         }
         this.audioThread = null;
         return true;
diff --git a/app/src/main/java/co/discord/media_engine/StatsCodec.java b/app/src/main/java/co/discord/media_engine/StatsCodec.java
index 42f22071ca..5f33dbd252 100644
--- a/app/src/main/java/co/discord/media_engine/StatsCodec.java
+++ b/app/src/main/java/co/discord/media_engine/StatsCodec.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: Statistics.kt */
 public final class StatsCodec {
@@ -10,7 +11,7 @@ public final class StatsCodec {
     private final String name;
 
     public StatsCodec(int i, String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f1533id = i;
         this.name = str;
     }
@@ -34,7 +35,7 @@ public final class StatsCodec {
     }
 
     public final StatsCodec copy(int i, String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new StatsCodec(i, str);
     }
 
diff --git a/app/src/main/java/co/discord/media_engine/VideoDecoder.java b/app/src/main/java/co/discord/media_engine/VideoDecoder.java
index d1e24f5c7c..65fb52e602 100644
--- a/app/src/main/java/co/discord/media_engine/VideoDecoder.java
+++ b/app/src/main/java/co/discord/media_engine/VideoDecoder.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.Map;
 import java.util.Objects;
@@ -14,7 +15,7 @@ public final class VideoDecoder {
     private final int type;
 
     public VideoDecoder(String str, int i, int i2, Map<String, String> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(map, "params");
         this.name = str;
         this.type = i;
@@ -63,7 +64,7 @@ public final class VideoDecoder {
     }
 
     public final VideoDecoder copy(String str, int i, int i2, Map<String, String> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(map, "params");
         return new VideoDecoder(str, i, i2, map);
     }
diff --git a/app/src/main/java/co/discord/media_engine/VideoEncoder.java b/app/src/main/java/co/discord/media_engine/VideoEncoder.java
index c7a8eb9036..2e0fe2f2d7 100644
--- a/app/src/main/java/co/discord/media_engine/VideoEncoder.java
+++ b/app/src/main/java/co/discord/media_engine/VideoEncoder.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.Map;
 import java.util.Objects;
@@ -14,7 +15,7 @@ public final class VideoEncoder {
     private final int type;
 
     public VideoEncoder(String str, int i, int i2, Map<String, String> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(map, "params");
         this.name = str;
         this.type = i;
@@ -63,7 +64,7 @@ public final class VideoEncoder {
     }
 
     public final VideoEncoder copy(String str, int i, int i2, Map<String, String> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(map, "params");
         return new VideoEncoder(str, i, i2, map);
     }
diff --git a/app/src/main/java/co/discord/media_engine/VideoInputDeviceDescription.java b/app/src/main/java/co/discord/media_engine/VideoInputDeviceDescription.java
index 03e199bd33..ec840ec17b 100644
--- a/app/src/main/java/co/discord/media_engine/VideoInputDeviceDescription.java
+++ b/app/src/main/java/co/discord/media_engine/VideoInputDeviceDescription.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: DeviceDescription.kt */
 public final class VideoInputDeviceDescription {
@@ -9,7 +10,7 @@ public final class VideoInputDeviceDescription {
     private final String name;
 
     public VideoInputDeviceDescription(String str, String str2, VideoInputDeviceFacing videoInputDeviceFacing) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "guid");
         m.checkNotNullParameter(videoInputDeviceFacing, "facing");
         this.name = str;
@@ -43,7 +44,7 @@ public final class VideoInputDeviceDescription {
     }
 
     public final VideoInputDeviceDescription copy(String str, String str2, VideoInputDeviceFacing videoInputDeviceFacing) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "guid");
         m.checkNotNullParameter(videoInputDeviceFacing, "facing");
         return new VideoInputDeviceDescription(str, str2, videoInputDeviceFacing);
diff --git a/app/src/main/java/co/discord/media_engine/VoiceQuality.java b/app/src/main/java/co/discord/media_engine/VoiceQuality.java
index 557e374b59..f32abf3627 100644
--- a/app/src/main/java/co/discord/media_engine/VoiceQuality.java
+++ b/app/src/main/java/co/discord/media_engine/VoiceQuality.java
@@ -1,5 +1,6 @@
 package co.discord.media_engine;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import d0.z.d.m;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -123,7 +124,7 @@ public final class VoiceQuality {
         m.checkNotNullParameter(map, "result");
         int i = 0;
         Object[] objArr = {0, 0, 0, 0, 0};
-        double d = 0.0d;
+        double d = ShadowDrawableWrapper.COS_45;
         int i2 = 0;
         for (Map.Entry<String, InboundAudio> entry : this._inboundStats.entrySet()) {
             InboundAudio value = entry.getValue();
@@ -201,7 +202,7 @@ public final class VoiceQuality {
                     d = 0.0d;
                 } else {
                     it = it2;
-                    double access$_calculateMos = VoiceQualityKt.access$_calculateMos((double) (ping + jitterBuffer), VoiceQualityKt.access$clamp(((double) packetsLost2) / ((double) (packetsReceived2 + packetsLost2)), 0.0d, 1.0d));
+                    double access$_calculateMos = VoiceQualityKt.access$_calculateMos((double) (ping + jitterBuffer), VoiceQualityKt.access$clamp(((double) packetsLost2) / ((double) (packetsReceived2 + packetsLost2)), ShadowDrawableWrapper.COS_45, 1.0d));
                     int floor = (int) Math.floor(access$_calculateMos);
                     mosBuckets[floor] = Integer.valueOf(mosBuckets[floor].intValue() + 1);
                     d = access$_calculateMos;
@@ -210,7 +211,7 @@ public final class VoiceQuality {
             } else {
                 it = it2;
                 j = j2;
-                inboundAudio = new InboundAudio(packetsReceived, packetsLost, 0.0d, 0.0d, 0, new Integer[]{0, 0, 0, 0, 0}, inboundBufferStats, inboundFrameOpStats);
+                inboundAudio = new InboundAudio(packetsReceived, packetsLost, ShadowDrawableWrapper.COS_45, ShadowDrawableWrapper.COS_45, 0, new Integer[]{0, 0, 0, 0, 0}, inboundBufferStats, inboundFrameOpStats);
             }
             map.put(key, inboundAudio);
             it2 = it;
diff --git a/app/src/main/java/co/discord/media_engine/VoiceQualityKt.java b/app/src/main/java/co/discord/media_engine/VoiceQualityKt.java
index ede8e4b6ff..808999cde9 100644
--- a/app/src/main/java/co/discord/media_engine/VoiceQualityKt.java
+++ b/app/src/main/java/co/discord/media_engine/VoiceQualityKt.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine;
 
 import c.d.b.a.a;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Map;
 /* compiled from: VoiceQuality.kt */
 public final class VoiceQualityKt {
@@ -17,7 +18,7 @@ public final class VoiceQualityKt {
     }
 
     private static final double _calculateR(double d, double d2) {
-        double d3 = (0.024d * d) + (d > 177.3d ? (d - 177.3d) * 0.11d : 0.0d);
+        double d3 = (0.024d * d) + (d > 177.3d ? (d - 177.3d) * 0.11d : ShadowDrawableWrapper.COS_45);
         double d4 = (double) 10;
         return (93.4d - d3) - (((((double) 122) * d2) / (d2 + d4)) + d4);
     }
diff --git a/app/src/main/java/co/discord/media_engine/internal/ExtensionFunctionsKt.java b/app/src/main/java/co/discord/media_engine/internal/ExtensionFunctionsKt.java
index cc505f714f..8601a5532f 100644
--- a/app/src/main/java/co/discord/media_engine/internal/ExtensionFunctionsKt.java
+++ b/app/src/main/java/co/discord/media_engine/internal/ExtensionFunctionsKt.java
@@ -1,12 +1,13 @@
 package co.discord.media_engine.internal;
 
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import org.webrtc.Logging;
 /* compiled from: ExtensionFunctions.kt */
 public final class ExtensionFunctionsKt {
     public static final void logi(String str, String str2) {
         m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
+        m.checkNotNullParameter(str2, NotificationCompat.CATEGORY_MESSAGE);
         Logging.log(Logging.Severity.LS_INFO, str, str2);
     }
 }
diff --git a/app/src/main/java/co/discord/media_engine/internal/Inbound.java b/app/src/main/java/co/discord/media_engine/internal/Inbound.java
index 143bd7e4b8..c206da692f 100644
--- a/app/src/main/java/co/discord/media_engine/internal/Inbound.java
+++ b/app/src/main/java/co/discord/media_engine/internal/Inbound.java
@@ -1,7 +1,9 @@
 package co.discord.media_engine.internal;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: NativeStatistics.kt */
 public final class Inbound {
     private final InboundAudio audio;
@@ -12,8 +14,8 @@ public final class Inbound {
     private final InboundVideo video;
 
     public Inbound(String str, InboundAudio inboundAudio, InboundVideo inboundVideo, InboundPlayout inboundPlayout) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(inboundAudio, "audio");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(inboundAudio, MediaStreamTrack.AUDIO_TRACK_KIND);
         this.f1534id = str;
         this.audio = inboundAudio;
         this.video = inboundVideo;
@@ -53,8 +55,8 @@ public final class Inbound {
     }
 
     public final Inbound copy(String str, InboundAudio inboundAudio, InboundVideo inboundVideo, InboundPlayout inboundPlayout) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(inboundAudio, "audio");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(inboundAudio, MediaStreamTrack.AUDIO_TRACK_KIND);
         return new Inbound(str, inboundAudio, inboundVideo, inboundPlayout);
     }
 
diff --git a/app/src/main/java/co/discord/media_engine/internal/Outbound.java b/app/src/main/java/co/discord/media_engine/internal/Outbound.java
index 26a7f4882e..264a07f511 100644
--- a/app/src/main/java/co/discord/media_engine/internal/Outbound.java
+++ b/app/src/main/java/co/discord/media_engine/internal/Outbound.java
@@ -1,6 +1,7 @@
 package co.discord.media_engine.internal;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.Arrays;
 /* compiled from: NativeStatistics.kt */
@@ -12,7 +13,7 @@ public final class Outbound {
     private final OutboundVideo[] videos;
 
     public Outbound(String str, OutboundAudio outboundAudio, OutboundVideo[] outboundVideoArr) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         this.f1535id = str;
         this.audio = outboundAudio;
         this.videos = outboundVideoArr;
@@ -44,7 +45,7 @@ public final class Outbound {
     }
 
     public final Outbound copy(String str, OutboundAudio outboundAudio, OutboundVideo[] outboundVideoArr) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         return new Outbound(str, outboundAudio, outboundVideoArr);
     }
 
diff --git a/app/src/main/java/co/discord/media_engine/internal/TransformStats.java b/app/src/main/java/co/discord/media_engine/internal/TransformStats.java
index c00d8c0e56..079a597001 100644
--- a/app/src/main/java/co/discord/media_engine/internal/TransformStats.java
+++ b/app/src/main/java/co/discord/media_engine/internal/TransformStats.java
@@ -14,6 +14,7 @@ import com.google.gson.Gson;
 import d0.t.k;
 import d0.z.d.m;
 import java.util.LinkedHashMap;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: TransformStats.kt */
 public final class TransformStats {
     public static final TransformStats INSTANCE = new TransformStats();
@@ -76,7 +77,7 @@ public final class TransformStats {
             Boolean voiceActivityDetectorIsEnabled = audio.getVoiceActivityDetectorIsEnabled();
             boolean booleanValue2 = voiceActivityDetectorIsEnabled != null ? voiceActivityDetectorIsEnabled.booleanValue() : false;
             Long voiceActivityDetectorProcessTime = audio.getVoiceActivityDetectorProcessTime();
-            outboundRtpAudio = new OutboundRtpAudio("audio", ssrc, statsCodec, j, packetsSent, max, fractionLost, audioLevel, z2, framesCaptured, framesRendered, booleanValue, longValue, booleanValue2, voiceActivityDetectorProcessTime != null ? voiceActivityDetectorProcessTime.longValue() : 0);
+            outboundRtpAudio = new OutboundRtpAudio(MediaStreamTrack.AUDIO_TRACK_KIND, ssrc, statsCodec, j, packetsSent, max, fractionLost, audioLevel, z2, framesCaptured, framesRendered, booleanValue, longValue, booleanValue2, voiceActivityDetectorProcessTime != null ? voiceActivityDetectorProcessTime.longValue() : 0);
         }
         Outbound outbound2 = nativeStats.getOutbound();
         OutboundVideo outboundVideo = (outbound2 == null || (videos = outbound2.getVideos()) == null) ? null : (OutboundVideo) k.firstOrNull(videos);
@@ -105,7 +106,7 @@ public final class TransformStats {
                 for (Substream substream3 : outboundVideo.getSubstreams()) {
                     j6 += INSTANCE.sumPackets(substream3.getRtpStats());
                 }
-                outboundRtpVideo = new OutboundRtpVideo("video", ssrc2, statsCodec2, j4, j6, substream.getRtcpStats().getPacketsLost(), (float) substream.getRtcpStats().getFractionLost(), outboundVideo.getMediaBitrate(), outboundVideo.getTargetMediaBitrate(), outboundVideo.getEncodeUsage(), outboundVideo.getEncoderImplementationName(), outboundVideo.getAvgEncodeTime(), new Resolution(substream.getWidth(), substream.getHeight()), (long) (substream.getFrameCounts().getKeyFrames() + substream.getFrameCounts().getDeltaFrames()), outboundVideo.getFramesEncoded(), outboundVideo.getInputFrameRate(), outboundVideo.getEncodeFrameRate(), substream.getRtcpStats().getFirPackets(), substream.getRtcpStats().getNackPackets(), substream.getRtcpStats().getPliPackets(), outboundVideo.getQpSum(), outboundVideo.getBwLimitedResolution(), outboundVideo.getCpuLimitedResolution());
+                outboundRtpVideo = new OutboundRtpVideo(MediaStreamTrack.VIDEO_TRACK_KIND, ssrc2, statsCodec2, j4, j6, substream.getRtcpStats().getPacketsLost(), (float) substream.getRtcpStats().getFractionLost(), outboundVideo.getMediaBitrate(), outboundVideo.getTargetMediaBitrate(), outboundVideo.getEncodeUsage(), outboundVideo.getEncoderImplementationName(), outboundVideo.getAvgEncodeTime(), new Resolution(substream.getWidth(), substream.getHeight()), (long) (substream.getFrameCounts().getKeyFrames() + substream.getFrameCounts().getDeltaFrames()), outboundVideo.getFramesEncoded(), outboundVideo.getInputFrameRate(), outboundVideo.getEncodeFrameRate(), substream.getRtcpStats().getFirPackets(), substream.getRtcpStats().getNackPackets(), substream.getRtcpStats().getPliPackets(), outboundVideo.getQpSum(), outboundVideo.getBwLimitedResolution(), outboundVideo.getCpuLimitedResolution());
                 j2 = j5;
             } else {
                 j2 = j;
@@ -121,12 +122,12 @@ public final class TransformStats {
                     long bytesReceived = inbound2.getAudio().getBytesReceived() + j7;
                     InboundAudio audio2 = inbound2.getAudio();
                     InboundPlayout transformPlayoutStats = inbound2.getPlayout() != null ? INSTANCE.transformPlayoutStats(inbound2.getPlayout()) : null;
-                    InboundRtpAudio inboundRtpAudio = (InboundRtpAudio) linkedHashMap.put(id2, new InboundRtpAudio("audio", audio2.getSsrc(), new StatsCodec(audio2.getCodecPayloadType(), audio2.getCodecName()), bytesReceived, audio2.getPacketsReceived(), audio2.getPacketsLost(), ((float) audio2.getAudioLevel()) / 32768.0f, audio2.getSpeaking() > 0, audio2.getJitter(), audio2.getJitterBuffer(), audio2.getJitterBufferPreferred(), audio2.getDelayEstimate(), audio2.getDecodingCNG(), audio2.getDecodingMutedOutput(), audio2.getDecodingNormal(), audio2.getDecodingPLC(), audio2.getDecodingPLCCNG(), Long.valueOf(audio2.getOpSilence()), Long.valueOf(audio2.getOpNormal()), Long.valueOf(audio2.getOpMerge()), Long.valueOf(audio2.getOpExpand()), Long.valueOf(audio2.getOpAccelerate()), Long.valueOf(audio2.getOpPreemptiveExpand()), Long.valueOf(audio2.getOpCNG()), transformPlayoutStats != null ? transformPlayoutStats.getAudioJitterBuffer() : null, transformPlayoutStats != null ? transformPlayoutStats.getAudioJitterDelay() : null, transformPlayoutStats != null ? transformPlayoutStats.getAudioJitterTarget() : null, transformPlayoutStats != null ? transformPlayoutStats.getAudioPlayoutUnderruns() : null, transformPlayoutStats != null ? transformPlayoutStats.getRelativeReceptionDelay() : null, transformPlayoutStats != null ? transformPlayoutStats.getRelativePlayoutDelay() : null));
+                    InboundRtpAudio inboundRtpAudio = (InboundRtpAudio) linkedHashMap.put(id2, new InboundRtpAudio(MediaStreamTrack.AUDIO_TRACK_KIND, audio2.getSsrc(), new StatsCodec(audio2.getCodecPayloadType(), audio2.getCodecName()), bytesReceived, audio2.getPacketsReceived(), audio2.getPacketsLost(), ((float) audio2.getAudioLevel()) / 32768.0f, audio2.getSpeaking() > 0, audio2.getJitter(), audio2.getJitterBuffer(), audio2.getJitterBufferPreferred(), audio2.getDelayEstimate(), audio2.getDecodingCNG(), audio2.getDecodingMutedOutput(), audio2.getDecodingNormal(), audio2.getDecodingPLC(), audio2.getDecodingPLCCNG(), Long.valueOf(audio2.getOpSilence()), Long.valueOf(audio2.getOpNormal()), Long.valueOf(audio2.getOpMerge()), Long.valueOf(audio2.getOpExpand()), Long.valueOf(audio2.getOpAccelerate()), Long.valueOf(audio2.getOpPreemptiveExpand()), Long.valueOf(audio2.getOpCNG()), transformPlayoutStats != null ? transformPlayoutStats.getAudioJitterBuffer() : null, transformPlayoutStats != null ? transformPlayoutStats.getAudioJitterDelay() : null, transformPlayoutStats != null ? transformPlayoutStats.getAudioJitterTarget() : null, transformPlayoutStats != null ? transformPlayoutStats.getAudioPlayoutUnderruns() : null, transformPlayoutStats != null ? transformPlayoutStats.getRelativeReceptionDelay() : null, transformPlayoutStats != null ? transformPlayoutStats.getRelativePlayoutDelay() : null));
                     if (inbound2.getVideo() != null) {
                         InboundVideo video = inbound2.getVideo();
                         long payloadBytes = video.getRtpStats().getPayloadBytes() + video.getRtpStats().getPaddingBytes() + video.getRtpStats().getHeaderBytes();
                         bytesReceived += payloadBytes;
-                        InboundRtpVideo inboundRtpVideo = (InboundRtpVideo) linkedHashMap2.put(id2, new InboundRtpVideo("video", video.getSsrc(), video.getCodecPayloadType() != -1 ? new StatsCodec(video.getCodecPayloadType(), video.getCodecName()) : null, payloadBytes, (int) video.getRtpStats().getPackets(), video.getRtpStats().getPacketsLost(), video.getTotalBitrate(), video.getDecode(), new Resolution(video.getWidth(), video.getHeight()), video.getDecoderImplementationName(), (int) video.getFramesDecoded(), video.getFramesDropped(), video.getFrameCounts().getKeyFrames() + video.getFrameCounts().getDeltaFrames(), video.getDecodeFrameRate(), video.getNetworkFrameRate(), video.getRenderFrameRate(), video.getRtcpStats().getFirPackets(), video.getRtcpStats().getNackPackets(), video.getRtcpStats().getPliPackets(), video.getQpSum()));
+                        InboundRtpVideo inboundRtpVideo = (InboundRtpVideo) linkedHashMap2.put(id2, new InboundRtpVideo(MediaStreamTrack.VIDEO_TRACK_KIND, video.getSsrc(), video.getCodecPayloadType() != -1 ? new StatsCodec(video.getCodecPayloadType(), video.getCodecName()) : null, payloadBytes, (int) video.getRtpStats().getPackets(), video.getRtpStats().getPacketsLost(), video.getTotalBitrate(), video.getDecode(), new Resolution(video.getWidth(), video.getHeight()), video.getDecoderImplementationName(), (int) video.getFramesDecoded(), video.getFramesDropped(), video.getFrameCounts().getKeyFrames() + video.getFrameCounts().getDeltaFrames(), video.getDecodeFrameRate(), video.getNetworkFrameRate(), video.getRenderFrameRate(), video.getRtcpStats().getFirPackets(), video.getRtcpStats().getNackPackets(), video.getRtcpStats().getPliPackets(), video.getQpSum()));
                     }
                     j7 = bytesReceived;
                 }
diff --git a/app/src/main/java/com/adjust/sdk/ActivityHandler.java b/app/src/main/java/com/adjust/sdk/ActivityHandler.java
index 6e0b99fb00..bae5d9a41b 100644
--- a/app/src/main/java/com/adjust/sdk/ActivityHandler.java
+++ b/app/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -6,11 +6,13 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Process;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.d.b.a.a;
 import com.adjust.sdk.scheduler.SingleThreadCachedScheduler;
 import com.adjust.sdk.scheduler.ThreadExecutor;
 import com.adjust.sdk.scheduler.TimerCycle;
 import com.adjust.sdk.scheduler.TimerOnce;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -421,7 +423,7 @@ public class ActivityHandler implements IActivityHandler {
 
         @Override // com.adjust.sdk.InstallReferrerReadListener
         public void onInstallReferrerRead(String str, long j, long j2) {
-            ActivityHandler.this.sendInstallReferrer(str, j, j2, "google");
+            ActivityHandler.this.sendInstallReferrer(str, j, j2, Constants.REFERRER_API_GOOGLE);
         }
     }
 
@@ -432,7 +434,7 @@ public class ActivityHandler implements IActivityHandler {
 
         @Override // com.adjust.sdk.InstallReferrerReadListener
         public void onInstallReferrerRead(String str, long j, long j2) {
-            ActivityHandler.this.sendInstallReferrer(str, j, j2, "huawei");
+            ActivityHandler.this.sendInstallReferrer(str, j, j2, Constants.REFERRER_API_HUAWEI);
         }
     }
 
@@ -901,7 +903,7 @@ public class ActivityHandler implements IActivityHandler {
     private void checkForInstallReferrerInfo(SdkClickResponseData sdkClickResponseData) {
         if (sdkClickResponseData.isInstallReferrer) {
             String str = sdkClickResponseData.referrerApi;
-            if (!(str != null && str.equalsIgnoreCase("huawei"))) {
+            if (!(str != null && str.equalsIgnoreCase(Constants.REFERRER_API_HUAWEI))) {
                 ActivityState activityState = this.activityState;
                 activityState.clickTime = sdkClickResponseData.clickTime;
                 activityState.installBegin = sdkClickResponseData.installBegin;
@@ -944,7 +946,7 @@ public class ActivityHandler implements IActivityHandler {
     private void delayStartI() {
         if (!this.internalState.isNotInDelayedStart() && !isToUpdatePackagesI()) {
             Double d = this.adjustConfig.delayStart;
-            double doubleValue = d != null ? d.doubleValue() : 0.0d;
+            double doubleValue = d != null ? d.doubleValue() : ShadowDrawableWrapper.COS_45;
             long maxDelayStart = AdjustFactory.getMaxDelayStart();
             long j = (long) (1000.0d * doubleValue);
             if (j > maxDelayStart) {
@@ -967,19 +969,19 @@ public class ActivityHandler implements IActivityHandler {
     }
 
     public static boolean deleteActivityState(Context context) {
-        return context.deleteFile("AdjustIoActivityState");
+        return context.deleteFile(Constants.ACTIVITY_STATE_FILENAME);
     }
 
     public static boolean deleteAttribution(Context context) {
-        return context.deleteFile("AdjustAttribution");
+        return context.deleteFile(Constants.ATTRIBUTION_FILENAME);
     }
 
     public static boolean deleteSessionCallbackParameters(Context context) {
-        return context.deleteFile("AdjustSessionCallbackParameters");
+        return context.deleteFile(Constants.SESSION_CALLBACK_PARAMETERS_FILENAME);
     }
 
     public static boolean deleteSessionPartnerParameters(Context context) {
-        return context.deleteFile("AdjustSessionPartnerParameters");
+        return context.deleteFile(Constants.SESSION_PARTNER_PARAMETERS_FILENAME);
     }
 
     public static void deleteState(Context context) {
@@ -1060,7 +1062,7 @@ public class ActivityHandler implements IActivityHandler {
         } else {
             if (adjustConfig.processName != null) {
                 int myPid = Process.myPid();
-                ActivityManager activityManager = (ActivityManager) adjustConfig.context.getSystemService("activity");
+                ActivityManager activityManager = (ActivityManager) adjustConfig.context.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY);
                 if (activityManager != null) {
                     Iterator<ActivityManager.RunningAppProcessInfo> it = activityManager.getRunningAppProcesses().iterator();
                     while (true) {
@@ -1169,15 +1171,15 @@ public class ActivityHandler implements IActivityHandler {
                 disableThirdPartySharing();
             }
         }
-        this.foregroundTimer = new TimerCycle(new AnonymousClass31(), FOREGROUND_TIMER_START, FOREGROUND_TIMER_INTERVAL, "Foreground timer");
+        this.foregroundTimer = new TimerCycle(new AnonymousClass31(), FOREGROUND_TIMER_START, FOREGROUND_TIMER_INTERVAL, FOREGROUND_TIMER_NAME);
         if (this.adjustConfig.sendInBackground) {
             this.logger.info("Send in background configured", new Object[0]);
-            this.backgroundTimer = new TimerOnce(new AnonymousClass32(), "Background timer");
+            this.backgroundTimer = new TimerOnce(new AnonymousClass32(), BACKGROUND_TIMER_NAME);
         }
-        if (this.internalState.hasFirstSdkStartNotOcurred() && (d = this.adjustConfig.delayStart) != null && d.doubleValue() > 0.0d) {
+        if (this.internalState.hasFirstSdkStartNotOcurred() && (d = this.adjustConfig.delayStart) != null && d.doubleValue() > ShadowDrawableWrapper.COS_45) {
             this.logger.info("Delay start configured", new Object[0]);
             this.internalState.delayStart = true;
-            this.delayStartTimer = new TimerOnce(new AnonymousClass33(), "Delay Start timer");
+            this.delayStartTimer = new TimerOnce(new AnonymousClass33(), DELAY_START_TIMER_NAME);
         }
         UtilNetworking.setUserAgent(this.adjustConfig.userAgent);
         AdjustConfig adjustConfig3 = this.adjustConfig;
@@ -1329,7 +1331,7 @@ public class ActivityHandler implements IActivityHandler {
             ActivityState activityState = this.activityState;
             long j = currentTimeMillis - activityState.lastActivity;
             if (j < 0) {
-                this.logger.error("Time travel!", new Object[0]);
+                this.logger.error(TIME_TRAVEL, new Object[0]);
                 this.activityState.lastActivity = currentTimeMillis;
                 writeActivityStateI();
             } else if (j > SESSION_INTERVAL) {
@@ -1352,9 +1354,9 @@ public class ActivityHandler implements IActivityHandler {
 
     private void readActivityStateI(Context context) {
         try {
-            this.activityState = (ActivityState) Util.readObject(context, "AdjustIoActivityState", "Activity state", ActivityState.class);
+            this.activityState = (ActivityState) Util.readObject(context, Constants.ACTIVITY_STATE_FILENAME, ACTIVITY_STATE_NAME, ActivityState.class);
         } catch (Exception e) {
-            this.logger.error("Failed to read %s file (%s)", "Activity state", e.getMessage());
+            this.logger.error("Failed to read %s file (%s)", ACTIVITY_STATE_NAME, e.getMessage());
             this.activityState = null;
         }
         if (this.activityState != null) {
@@ -1364,9 +1366,9 @@ public class ActivityHandler implements IActivityHandler {
 
     private void readAttributionI(Context context) {
         try {
-            this.attribution = (AdjustAttribution) Util.readObject(context, "AdjustAttribution", "Attribution", AdjustAttribution.class);
+            this.attribution = (AdjustAttribution) Util.readObject(context, Constants.ATTRIBUTION_FILENAME, ATTRIBUTION_NAME, AdjustAttribution.class);
         } catch (Exception e) {
-            this.logger.error("Failed to read %s file (%s)", "Attribution", e.getMessage());
+            this.logger.error("Failed to read %s file (%s)", ATTRIBUTION_NAME, e.getMessage());
             this.attribution = null;
         }
     }
@@ -1405,18 +1407,18 @@ public class ActivityHandler implements IActivityHandler {
 
     private void readSessionCallbackParametersI(Context context) {
         try {
-            this.sessionParameters.callbackParameters = (Map) Util.readObject(context, "AdjustSessionCallbackParameters", "Session Callback parameters", Map.class);
+            this.sessionParameters.callbackParameters = (Map) Util.readObject(context, Constants.SESSION_CALLBACK_PARAMETERS_FILENAME, SESSION_CALLBACK_PARAMETERS_NAME, Map.class);
         } catch (Exception e) {
-            this.logger.error("Failed to read %s file (%s)", "Session Callback parameters", e.getMessage());
+            this.logger.error("Failed to read %s file (%s)", SESSION_CALLBACK_PARAMETERS_NAME, e.getMessage());
             this.sessionParameters.callbackParameters = null;
         }
     }
 
     private void readSessionPartnerParametersI(Context context) {
         try {
-            this.sessionParameters.partnerParameters = (Map) Util.readObject(context, "AdjustSessionPartnerParameters", "Session Partner parameters", Map.class);
+            this.sessionParameters.partnerParameters = (Map) Util.readObject(context, Constants.SESSION_PARTNER_PARAMETERS_FILENAME, SESSION_PARTNER_PARAMETERS_NAME, Map.class);
         } catch (Exception e) {
-            this.logger.error("Failed to read %s file (%s)", "Session Partner parameters", e.getMessage());
+            this.logger.error("Failed to read %s file (%s)", SESSION_PARTNER_PARAMETERS_NAME, e.getMessage());
             this.sessionParameters.partnerParameters = null;
         }
     }
@@ -1441,12 +1443,12 @@ public class ActivityHandler implements IActivityHandler {
 
     private void sendInstallReferrerI(String str, long j, long j2, String str2) {
         if (isEnabledI() && str != null) {
-            if (str2.equals("google")) {
+            if (str2.equals(Constants.REFERRER_API_GOOGLE)) {
                 ActivityState activityState = this.activityState;
                 if (j == activityState.clickTime && j2 == activityState.installBegin && str.equals(activityState.installReferrer)) {
                     return;
                 }
-            } else if (str2.equals("huawei")) {
+            } else if (str2.equals(Constants.REFERRER_API_HUAWEI)) {
                 ActivityState activityState2 = this.activityState;
                 if (j == activityState2.clickTimeHuawei && j2 == activityState2.installBeginHuawei && str.equals(activityState2.installReferrerHuawei)) {
                     return;
@@ -1516,7 +1518,7 @@ public class ActivityHandler implements IActivityHandler {
             if (!activityState.isGdprForgotten && str != null && !str.equals(activityState.pushToken)) {
                 this.activityState.pushToken = str;
                 writeActivityStateI();
-                ActivityPackage buildInfoPackage = new PackageBuilder(this.adjustConfig, this.deviceInfo, this.activityState, this.sessionParameters, System.currentTimeMillis()).buildInfoPackage("push");
+                ActivityPackage buildInfoPackage = new PackageBuilder(this.adjustConfig, this.deviceInfo, this.activityState, this.sessionParameters, System.currentTimeMillis()).buildInfoPackage(Constants.PUSH);
                 this.packageHandler.addPackage(buildInfoPackage);
                 new SharedPreferencesManager(getContext()).removePushToken();
                 if (this.adjustConfig.eventBufferingEnabled) {
@@ -1689,7 +1691,7 @@ public class ActivityHandler implements IActivityHandler {
         }
         activityState.lastActivity = j;
         if (j2 < 0) {
-            this.logger.error("Time travel!", new Object[0]);
+            this.logger.error(TIME_TRAVEL, new Object[0]);
             return true;
         }
         activityState.sessionLength += j2;
@@ -1742,7 +1744,7 @@ public class ActivityHandler implements IActivityHandler {
         synchronized (ActivityState.class) {
             ActivityState activityState = this.activityState;
             if (activityState != null) {
-                Util.writeObject(activityState, this.adjustConfig.context, "AdjustIoActivityState", "Activity state");
+                Util.writeObject(activityState, this.adjustConfig.context, Constants.ACTIVITY_STATE_FILENAME, ACTIVITY_STATE_NAME);
             }
         }
     }
@@ -1751,7 +1753,7 @@ public class ActivityHandler implements IActivityHandler {
         synchronized (AdjustAttribution.class) {
             AdjustAttribution adjustAttribution = this.attribution;
             if (adjustAttribution != null) {
-                Util.writeObject(adjustAttribution, this.adjustConfig.context, "AdjustAttribution", "Attribution");
+                Util.writeObject(adjustAttribution, this.adjustConfig.context, Constants.ATTRIBUTION_FILENAME, ATTRIBUTION_NAME);
             }
         }
     }
@@ -1760,7 +1762,7 @@ public class ActivityHandler implements IActivityHandler {
         synchronized (SessionParameters.class) {
             SessionParameters sessionParameters = this.sessionParameters;
             if (sessionParameters != null) {
-                Util.writeObject(sessionParameters.callbackParameters, this.adjustConfig.context, "AdjustSessionCallbackParameters", "Session Callback parameters");
+                Util.writeObject(sessionParameters.callbackParameters, this.adjustConfig.context, Constants.SESSION_CALLBACK_PARAMETERS_FILENAME, SESSION_CALLBACK_PARAMETERS_NAME);
             }
         }
     }
@@ -1769,7 +1771,7 @@ public class ActivityHandler implements IActivityHandler {
         synchronized (SessionParameters.class) {
             SessionParameters sessionParameters = this.sessionParameters;
             if (sessionParameters != null) {
-                Util.writeObject(sessionParameters.partnerParameters, this.adjustConfig.context, "AdjustSessionPartnerParameters", "Session Partner parameters");
+                Util.writeObject(sessionParameters.partnerParameters, this.adjustConfig.context, Constants.SESSION_PARTNER_PARAMETERS_FILENAME, SESSION_PARTNER_PARAMETERS_NAME);
             }
         }
     }
diff --git a/app/src/main/java/com/adjust/sdk/ActivityKind.java b/app/src/main/java/com/adjust/sdk/ActivityKind.java
index f3dad5f8b2..54bd7825ff 100644
--- a/app/src/main/java/com/adjust/sdk/ActivityKind.java
+++ b/app/src/main/java/com/adjust/sdk/ActivityKind.java
@@ -1,4 +1,8 @@
 package com.adjust.sdk;
+
+import androidx.core.app.NotificationCompat;
+import androidx.core.os.EnvironmentCompat;
+import com.discord.utilities.analytics.Traits;
 public enum ActivityKind {
     UNKNOWN,
     SESSION,
@@ -61,7 +65,7 @@ public enum ActivityKind {
     }
 
     public static ActivityKind fromString(String str) {
-        return "session".equals(str) ? SESSION : "event".equals(str) ? EVENT : "click".equals(str) ? CLICK : "attribution".equals(str) ? ATTRIBUTION : "info".equals(str) ? INFO : "gdpr".equals(str) ? GDPR : "disable_third_party_sharing".equals(str) ? DISABLE_THIRD_PARTY_SHARING : "ad_revenue".equals(str) ? AD_REVENUE : "subscription".equals(str) ? SUBSCRIPTION : UNKNOWN;
+        return "session".equals(str) ? SESSION : NotificationCompat.CATEGORY_EVENT.equals(str) ? EVENT : "click".equals(str) ? CLICK : "attribution".equals(str) ? ATTRIBUTION : "info".equals(str) ? INFO : "gdpr".equals(str) ? GDPR : "disable_third_party_sharing".equals(str) ? DISABLE_THIRD_PARTY_SHARING : "ad_revenue".equals(str) ? AD_REVENUE : Traits.Payment.Type.SUBSCRIPTION.equals(str) ? SUBSCRIPTION : UNKNOWN;
     }
 
     @Override // java.lang.Enum, java.lang.Object
@@ -70,7 +74,7 @@ public enum ActivityKind {
             case 1:
                 return "session";
             case 2:
-                return "event";
+                return NotificationCompat.CATEGORY_EVENT;
             case 3:
                 return "click";
             case 4:
@@ -78,7 +82,7 @@ public enum ActivityKind {
             case 5:
             case 6:
             default:
-                return "unknown";
+                return EnvironmentCompat.MEDIA_UNKNOWN;
             case 7:
                 return "info";
             case 8:
@@ -88,7 +92,7 @@ public enum ActivityKind {
             case 10:
                 return "disable_third_party_sharing";
             case 11:
-                return "subscription";
+                return Traits.Payment.Type.SUBSCRIPTION;
         }
     }
 }
diff --git a/app/src/main/java/com/adjust/sdk/AdjustConfig.java b/app/src/main/java/com/adjust/sdk/AdjustConfig.java
index 0cbf516bb5..b37bdb7781 100644
--- a/app/src/main/java/com/adjust/sdk/AdjustConfig.java
+++ b/app/src/main/java/com/adjust/sdk/AdjustConfig.java
@@ -89,7 +89,7 @@ public class AdjustConfig {
         if (str == null) {
             this.logger.error("Missing environment", new Object[0]);
             return false;
-        } else if (str.equals("sandbox")) {
+        } else if (str.equals(ENVIRONMENT_SANDBOX)) {
             this.logger.warnInProduction("SANDBOX: Adjust is running in Sandbox mode. Use this setting for testing. Don't forget to set the environment to `production` before publishing!", new Object[0]);
             return true;
         } else if (str.equals("production")) {
diff --git a/app/src/main/java/com/adjust/sdk/AdjustEvent.java b/app/src/main/java/com/adjust/sdk/AdjustEvent.java
index 2950f0772e..3dd04c8854 100644
--- a/app/src/main/java/com/adjust/sdk/AdjustEvent.java
+++ b/app/src/main/java/com/adjust/sdk/AdjustEvent.java
@@ -1,5 +1,6 @@
 package com.adjust.sdk;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.LinkedHashMap;
 import java.util.Map;
 public class AdjustEvent {
@@ -32,7 +33,7 @@ public class AdjustEvent {
 
     private boolean checkRevenue(Double d, String str) {
         if (d != null) {
-            if (d.doubleValue() < 0.0d) {
+            if (d.doubleValue() < ShadowDrawableWrapper.COS_45) {
                 logger.error("Invalid amount %.5f", d);
                 return false;
             } else if (str == null) {
diff --git a/app/src/main/java/com/adjust/sdk/AdjustFactory.java b/app/src/main/java/com/adjust/sdk/AdjustFactory.java
index 3c9eeaa15a..66505a008f 100644
--- a/app/src/main/java/com/adjust/sdk/AdjustFactory.java
+++ b/app/src/main/java/com/adjust/sdk/AdjustFactory.java
@@ -157,7 +157,7 @@ public class AdjustFactory {
 
     public static String getBaseUrl() {
         String str = baseUrl;
-        return str == null ? "https://app.adjust.com" : str;
+        return str == null ? Constants.BASE_URL : str;
     }
 
     public static UtilNetworking.IConnectionOptions getConnectionOptions() {
@@ -167,7 +167,7 @@ public class AdjustFactory {
 
     public static String getGdprUrl() {
         String str = gdprUrl;
-        return str == null ? "https://gdpr.adjust.com" : str;
+        return str == null ? Constants.GDPR_URL : str;
     }
 
     public static HttpsURLConnection getHttpsURLConnection(URL url) throws IOException {
@@ -242,7 +242,7 @@ public class AdjustFactory {
 
     public static String getSubscriptionUrl() {
         String str = subscriptionUrl;
-        return str == null ? "https://subscription.adjust.com" : str;
+        return str == null ? Constants.SUBSCRIPTION_URL : str;
     }
 
     public static long getSubsessionInterval() {
@@ -360,9 +360,9 @@ public class AdjustFactory {
         sdkClickBackoffStrategy = null;
         packageHandlerBackoffStrategy = null;
         maxDelayStart = -1;
-        baseUrl = "https://app.adjust.com";
-        gdprUrl = "https://gdpr.adjust.com";
-        subscriptionUrl = "https://subscription.adjust.com";
+        baseUrl = Constants.BASE_URL;
+        gdprUrl = Constants.GDPR_URL;
+        subscriptionUrl = Constants.SUBSCRIPTION_URL;
         connectionOptions = null;
         tryInstallReferrer = true;
     }
diff --git a/app/src/main/java/com/adjust/sdk/AdjustInstance.java b/app/src/main/java/com/adjust/sdk/AdjustInstance.java
index 08b9f0b18b..f7ff5dd1a5 100644
--- a/app/src/main/java/com/adjust/sdk/AdjustInstance.java
+++ b/app/src/main/java/com/adjust/sdk/AdjustInstance.java
@@ -378,7 +378,7 @@ public class AdjustInstance {
         long currentTimeMillis = System.currentTimeMillis();
         if (str != null && str.length() != 0) {
             saveRawReferrer(str, currentTimeMillis, context);
-            if (checkActivityHandler("referrer") && this.activityHandler.isEnabled()) {
+            if (checkActivityHandler(Constants.REFERRER) && this.activityHandler.isEnabled()) {
                 this.activityHandler.sendReftagReferrer();
             }
         }
diff --git a/app/src/main/java/com/adjust/sdk/AdjustReferrerReceiver.java b/app/src/main/java/com/adjust/sdk/AdjustReferrerReceiver.java
index 775f13365a..818d8ec557 100644
--- a/app/src/main/java/com/adjust/sdk/AdjustReferrerReceiver.java
+++ b/app/src/main/java/com/adjust/sdk/AdjustReferrerReceiver.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 public class AdjustReferrerReceiver extends BroadcastReceiver {
     @Override // android.content.BroadcastReceiver
     public void onReceive(Context context, Intent intent) {
-        String stringExtra = intent.getStringExtra("referrer");
+        String stringExtra = intent.getStringExtra(Constants.REFERRER);
         if (stringExtra != null) {
             Adjust.getDefaultInstance().sendReferrer(stringExtra, context);
         }
diff --git a/app/src/main/java/com/adjust/sdk/AttributionHandler.java b/app/src/main/java/com/adjust/sdk/AttributionHandler.java
index 1624437c00..c8a971325e 100644
--- a/app/src/main/java/com/adjust/sdk/AttributionHandler.java
+++ b/app/src/main/java/com/adjust/sdk/AttributionHandler.java
@@ -15,7 +15,7 @@ public class AttributionHandler implements IAttributionHandler {
     private ILogger logger = AdjustFactory.getLogger();
     private boolean paused;
     private ThreadScheduler scheduler = new SingleThreadCachedScheduler("AttributionHandler");
-    private TimerOnce timer = new TimerOnce(new AnonymousClass1(), "Attribution timer");
+    private TimerOnce timer = new TimerOnce(new AnonymousClass1(), ATTRIBUTION_TIMER_NAME);
 
     /* renamed from: com.adjust.sdk.AttributionHandler$1  reason: invalid class name */
     public class AnonymousClass1 implements Runnable {
@@ -174,7 +174,7 @@ public class AttributionHandler implements IAttributionHandler {
         JSONObject optJSONObject;
         String optString;
         JSONObject jSONObject = attributionResponseData.jsonResponse;
-        if (jSONObject != null && (optJSONObject = jSONObject.optJSONObject("attribution")) != null && (optString = optJSONObject.optString("deeplink", null)) != null) {
+        if (jSONObject != null && (optJSONObject = jSONObject.optJSONObject("attribution")) != null && (optString = optJSONObject.optString(Constants.DEEPLINK, null)) != null) {
             attributionResponseData.deeplink = Uri.parse(optString);
         }
     }
diff --git a/app/src/main/java/com/adjust/sdk/DeviceInfo.java b/app/src/main/java/com/adjust/sdk/DeviceInfo.java
index ec2ef26b6c..cde7bedd7c 100644
--- a/app/src/main/java/com/adjust/sdk/DeviceInfo.java
+++ b/app/src/main/java/com/adjust/sdk/DeviceInfo.java
@@ -8,6 +8,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.util.DisplayMetrics;
+import androidx.core.app.NotificationCompat;
+import androidx.vectordrawable.graphics.drawable.PathInterpolatorCompat;
 import c.d.b.a.a;
 import com.adjust.sdk.GooglePlayServicesClient;
 import java.util.Date;
@@ -116,7 +118,7 @@ public class DeviceInfo {
     }
 
     private String getClientSdk(String str) {
-        return str == null ? "android4.22.0" : Util.formatString("%s@%s", str, "android4.22.0");
+        return str == null ? Constants.CLIENT_SDK : Util.formatString("%s@%s", str, Constants.CLIENT_SDK);
     }
 
     private String getCountry(Locale locale) {
@@ -156,7 +158,7 @@ public class DeviceInfo {
             Signature[] signatureArr = context.getPackageManager().getPackageInfo("com.facebook.katana", 64).signatures;
             if (signatureArr != null) {
                 if (signatureArr.length == 1) {
-                    if (!"30820268308201d102044a9c4610300d06092a864886f70d0101040500307a310b3009060355040613025553310b3009060355040813024341311230100603550407130950616c6f20416c746f31183016060355040a130f46616365626f6f6b204d6f62696c653111300f060355040b130846616365626f6f6b311d301b0603550403131446616365626f6f6b20436f72706f726174696f6e3020170d3039303833313231353231365a180f32303530303932353231353231365a307a310b3009060355040613025553310b3009060355040813024341311230100603550407130950616c6f20416c746f31183016060355040a130f46616365626f6f6b204d6f62696c653111300f060355040b130846616365626f6f6b311d301b0603550403131446616365626f6f6b20436f72706f726174696f6e30819f300d06092a864886f70d010101050003818d0030818902818100c207d51df8eb8c97d93ba0c8c1002c928fab00dc1b42fca5e66e99cc3023ed2d214d822bc59e8e35ddcf5f44c7ae8ade50d7e0c434f500e6c131f4a2834f987fc46406115de2018ebbb0d5a3c261bd97581ccfef76afc7135a6d59e8855ecd7eacc8f8737e794c60a761c536b72b11fac8e603f5da1a2d54aa103b8a13c0dbc10203010001300d06092a864886f70d0101040500038181005ee9be8bcbb250648d3b741290a82a1c9dc2e76a0af2f2228f1d9f9c4007529c446a70175c5a900d5141812866db46be6559e2141616483998211f4a673149fb2232a10d247663b26a9031e15f84bc1c74d141ff98a02d76f85b2c8ab2571b6469b232d8e768a7f7ca04f7abe4a775615916c07940656b58717457b42bd928a2".equals(signatureArr[0].toCharsString()) || (query = context.getContentResolver().query(Uri.parse("content://com.facebook.katana.provider.AttributionIdProvider"), new String[]{"aid"}, null, null, null)) == null) {
+                    if (!OFFICIAL_FACEBOOK_SIGNATURE.equals(signatureArr[0].toCharsString()) || (query = context.getContentResolver().query(Uri.parse("content://com.facebook.katana.provider.AttributionIdProvider"), new String[]{"aid"}, null, null, null)) == null) {
                         return null;
                     }
                     if (!query.moveToFirst()) {
@@ -222,35 +224,35 @@ public class DeviceInfo {
         if (i == 0) {
             return null;
         }
-        return i < 140 ? "low" : i > 200 ? "high" : "medium";
+        return i < 140 ? Constants.LOW : i > 200 ? Constants.HIGH : Constants.MEDIUM;
     }
 
     private String getScreenFormat(int i) {
         int i2 = i & 48;
         if (i2 == 16) {
-            return "normal";
+            return Constants.NORMAL;
         }
         if (i2 != 32) {
             return null;
         }
-        return "long";
+        return Constants.LONG;
     }
 
     private String getScreenSize(int i) {
         int i2 = i & 15;
         if (i2 == 1) {
-            return "small";
+            return Constants.SMALL;
         }
         if (i2 == 2) {
-            return "normal";
+            return Constants.NORMAL;
         }
         if (i2 == 3) {
-            return "large";
+            return Constants.LARGE;
         }
         if (i2 != 4) {
             return null;
         }
-        return "xlarge";
+        return Constants.XLARGE;
     }
 
     public void reloadNonPlayIds(Context context) {
@@ -275,7 +277,7 @@ public class DeviceInfo {
         this.playAdIdAttempt = -1;
         for (int i = 1; i <= 3; i++) {
             try {
-                GooglePlayServicesClient.GooglePlayServicesInfo googlePlayServicesInfo = GooglePlayServicesClient.getGooglePlayServicesInfo(context, (long) (i * 3000));
+                GooglePlayServicesClient.GooglePlayServicesInfo googlePlayServicesInfo = GooglePlayServicesClient.getGooglePlayServicesInfo(context, (long) (i * PathInterpolatorCompat.MAX_NUM_POINTS));
                 if (this.playAdId == null) {
                     this.playAdId = googlePlayServicesInfo.getGpsAdid();
                 }
@@ -283,7 +285,7 @@ public class DeviceInfo {
                     this.isTrackingEnabled = googlePlayServicesInfo.isTrackingEnabled();
                 }
                 if (!(this.playAdId == null || this.isTrackingEnabled == null)) {
-                    this.playAdIdSource = "service";
+                    this.playAdIdSource = NotificationCompat.CATEGORY_SERVICE;
                     this.playAdIdAttempt = i;
                     return;
                 }
diff --git a/app/src/main/java/com/adjust/sdk/InstallReferrer.java b/app/src/main/java/com/adjust/sdk/InstallReferrer.java
index 03f00bfa41..f444d5f90d 100644
--- a/app/src/main/java/com/adjust/sdk/InstallReferrer.java
+++ b/app/src/main/java/com/adjust/sdk/InstallReferrer.java
@@ -1,6 +1,7 @@
 package com.adjust.sdk;
 
 import android.content.Context;
+import androidx.vectordrawable.graphics.drawable.PathInterpolatorCompat;
 import com.adjust.sdk.scheduler.TimerOnce;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -21,7 +22,7 @@ public class InstallReferrer implements InvocationHandler {
     private Object referrerClient;
     private int retries;
     private TimerOnce retryTimer;
-    private int retryWaitTime = 3000;
+    private int retryWaitTime = PathInterpolatorCompat.MAX_NUM_POINTS;
     private final AtomicBoolean shouldTryToRead;
 
     /* renamed from: com.adjust.sdk.InstallReferrer$1  reason: invalid class name */
diff --git a/app/src/main/java/com/adjust/sdk/InstallReferrerHuawei.java b/app/src/main/java/com/adjust/sdk/InstallReferrerHuawei.java
index 258f74ebce..f1098536c1 100644
--- a/app/src/main/java/com/adjust/sdk/InstallReferrerHuawei.java
+++ b/app/src/main/java/com/adjust/sdk/InstallReferrerHuawei.java
@@ -36,9 +36,9 @@ public class InstallReferrerHuawei {
     public void readReferrer() {
         if (!this.shouldTryToRead.get()) {
             this.logger.debug("Should not try to read Install referrer Huawei", new Object[0]);
-        } else if (Util.resolveContentProvider(this.context, "com.huawei.appmarket.commondata")) {
+        } else if (Util.resolveContentProvider(this.context, REFERRER_PROVIDER_AUTHORITY)) {
             Cursor cursor = null;
-            Uri parse = Uri.parse("content://com.huawei.appmarket.commondata/item/5");
+            Uri parse = Uri.parse(REFERRER_PROVIDER_URI);
             try {
                 cursor = this.context.getContentResolver().query(parse, null, null, new String[]{this.context.getPackageName()}, null);
                 if (cursor == null || !cursor.moveToFirst()) {
diff --git a/app/src/main/java/com/adjust/sdk/Logger.java b/app/src/main/java/com/adjust/sdk/Logger.java
index 4c45eb846c..242525ed49 100644
--- a/app/src/main/java/com/adjust/sdk/Logger.java
+++ b/app/src/main/java/com/adjust/sdk/Logger.java
@@ -17,9 +17,9 @@ public class Logger implements ILogger {
     public void Assert(String str, Object... objArr) {
         if (!this.isProductionEnvironment && this.logLevel.androidLogLevel <= 7) {
             try {
-                Log.println(7, "Adjust", Util.formatString(str, objArr));
+                Log.println(7, Constants.LOGTAG, Util.formatString(str, objArr));
             } catch (Exception unused) {
-                Log.e("Adjust", Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
+                Log.e(Constants.LOGTAG, Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
             }
         }
     }
@@ -28,9 +28,9 @@ public class Logger implements ILogger {
     public void debug(String str, Object... objArr) {
         if (!this.isProductionEnvironment && this.logLevel.androidLogLevel <= 3) {
             try {
-                Log.d("Adjust", Util.formatString(str, objArr));
+                Log.d(Constants.LOGTAG, Util.formatString(str, objArr));
             } catch (Exception unused) {
-                Log.e("Adjust", Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
+                Log.e(Constants.LOGTAG, Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
             }
         }
     }
@@ -39,9 +39,9 @@ public class Logger implements ILogger {
     public void error(String str, Object... objArr) {
         if (!this.isProductionEnvironment && this.logLevel.androidLogLevel <= 6) {
             try {
-                Log.e("Adjust", Util.formatString(str, objArr));
+                Log.e(Constants.LOGTAG, Util.formatString(str, objArr));
             } catch (Exception unused) {
-                Log.e("Adjust", Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
+                Log.e(Constants.LOGTAG, Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
             }
         }
     }
@@ -50,9 +50,9 @@ public class Logger implements ILogger {
     public void info(String str, Object... objArr) {
         if (!this.isProductionEnvironment && this.logLevel.androidLogLevel <= 4) {
             try {
-                Log.i("Adjust", Util.formatString(str, objArr));
+                Log.i(Constants.LOGTAG, Util.formatString(str, objArr));
             } catch (Exception unused) {
-                Log.e("Adjust", Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
+                Log.e(Constants.LOGTAG, Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
             }
         }
     }
@@ -85,9 +85,9 @@ public class Logger implements ILogger {
     public void verbose(String str, Object... objArr) {
         if (!this.isProductionEnvironment && this.logLevel.androidLogLevel <= 2) {
             try {
-                Log.v("Adjust", Util.formatString(str, objArr));
+                Log.v(Constants.LOGTAG, Util.formatString(str, objArr));
             } catch (Exception unused) {
-                Log.e("Adjust", Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
+                Log.e(Constants.LOGTAG, Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
             }
         }
     }
@@ -96,9 +96,9 @@ public class Logger implements ILogger {
     public void warn(String str, Object... objArr) {
         if (!this.isProductionEnvironment && this.logLevel.androidLogLevel <= 5) {
             try {
-                Log.w("Adjust", Util.formatString(str, objArr));
+                Log.w(Constants.LOGTAG, Util.formatString(str, objArr));
             } catch (Exception unused) {
-                Log.e("Adjust", Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
+                Log.e(Constants.LOGTAG, Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
             }
         }
     }
@@ -107,9 +107,9 @@ public class Logger implements ILogger {
     public void warnInProduction(String str, Object... objArr) {
         if (this.logLevel.androidLogLevel <= 5) {
             try {
-                Log.w("Adjust", Util.formatString(str, objArr));
+                Log.w(Constants.LOGTAG, Util.formatString(str, objArr));
             } catch (Exception unused) {
-                Log.e("Adjust", Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
+                Log.e(Constants.LOGTAG, Util.formatString(formatErrorMessage, str, Arrays.toString(objArr)));
             }
         }
     }
diff --git a/app/src/main/java/com/adjust/sdk/PackageBuilder.java b/app/src/main/java/com/adjust/sdk/PackageBuilder.java
index 1f5f877df3..ad7b4aa3d7 100644
--- a/app/src/main/java/com/adjust/sdk/PackageBuilder.java
+++ b/app/src/main/java/com/adjust/sdk/PackageBuilder.java
@@ -291,14 +291,14 @@ public class PackageBuilder {
         addString(hashMap, "app_version", this.deviceInfo.appVersion);
         Boolean bool = Boolean.TRUE;
         addBoolean(hashMap, "attribution_deeplink", bool);
-        addMapJson(hashMap, "callback_params", this.sessionParameters.callbackParameters);
+        addMapJson(hashMap, Constants.CALLBACK_PARAMETERS, this.sessionParameters.callbackParameters);
         addDateInMilliseconds(hashMap, "click_time", this.clickTimeInMilliseconds);
         addDateInSeconds(hashMap, "click_time", this.clickTimeInSeconds);
         addLong(hashMap, "connectivity_type", (long) Util.getConnectivityType(this.adjustConfig.context));
         addString(hashMap, "country", this.deviceInfo.country);
         addString(hashMap, "cpu_type", this.deviceInfo.abi);
         addDateInMilliseconds(hashMap, "created_at", this.createdAt);
-        addString(hashMap, "deeplink", this.deeplink);
+        addString(hashMap, Constants.DEEPLINK, this.deeplink);
         addBoolean(hashMap, "device_known", this.adjustConfig.deviceKnown);
         addString(hashMap, "device_manufacturer", this.deviceInfo.deviceManufacturer);
         addString(hashMap, "device_name", this.deviceInfo.deviceName);
@@ -325,12 +325,12 @@ public class PackageBuilder {
         addString(hashMap, "os_version", this.deviceInfo.osVersion);
         addString(hashMap, "package_name", this.deviceInfo.packageName);
         addMapJson(hashMap, "params", this.extraParameters);
-        addMapJson(hashMap, "partner_params", this.sessionParameters.partnerParameters);
+        addMapJson(hashMap, Constants.PARTNER_PARAMETERS, this.sessionParameters.partnerParameters);
         addString(hashMap, "push_token", this.activityStateCopy.pushToken);
         addString(hashMap, "raw_referrer", this.rawReferrer);
-        addString(hashMap, "referrer", this.referrer);
+        addString(hashMap, Constants.REFERRER, this.referrer);
         addString(hashMap, "referrer_api", this.referrerApi);
-        addString(hashMap, "reftag", this.reftag);
+        addString(hashMap, Constants.REFTAG, this.reftag);
         addString(hashMap, "screen_density", this.deviceInfo.screenDensity);
         addString(hashMap, "screen_format", this.deviceInfo.screenFormat);
         addString(hashMap, "screen_size", this.deviceInfo.screenSize);
@@ -509,8 +509,8 @@ public class PackageBuilder {
             hashMap.putAll(oaidParameters);
         }
         if (!z2) {
-            addMapJson(hashMap, "callback_params", this.sessionParameters.callbackParameters);
-            addMapJson(hashMap, "partner_params", this.sessionParameters.partnerParameters);
+            addMapJson(hashMap, Constants.CALLBACK_PARAMETERS, this.sessionParameters.callbackParameters);
+            addMapJson(hashMap, Constants.PARTNER_PARAMETERS, this.sessionParameters.partnerParameters);
         }
         this.deviceInfo.reloadPlayIds(this.adjustConfig.context);
         addString(hashMap, "android_uuid", this.activityStateCopy.uuid);
@@ -599,8 +599,8 @@ public class PackageBuilder {
             addString(hashMap, "android_id", this.deviceInfo.androidId);
         }
         if (!z2) {
-            addMapJson(hashMap, "callback_params", Util.mergeParameters(this.sessionParameters.callbackParameters, adjustPlayStoreSubscription.getCallbackParameters(), "Callback"));
-            addMapJson(hashMap, "partner_params", Util.mergeParameters(this.sessionParameters.partnerParameters, adjustPlayStoreSubscription.getPartnerParameters(), "Partner"));
+            addMapJson(hashMap, Constants.CALLBACK_PARAMETERS, Util.mergeParameters(this.sessionParameters.callbackParameters, adjustPlayStoreSubscription.getCallbackParameters(), "Callback"));
+            addMapJson(hashMap, Constants.PARTNER_PARAMETERS, Util.mergeParameters(this.sessionParameters.partnerParameters, adjustPlayStoreSubscription.getPartnerParameters(), "Partner"));
         }
         addString(hashMap, "api_level", this.deviceInfo.apiLevel);
         addString(hashMap, "app_secret", this.adjustConfig.appSecret);
@@ -804,8 +804,8 @@ public class PackageBuilder {
             hashMap.putAll(oaidParameters);
         }
         if (!z2) {
-            addMapJson(hashMap, "callback_params", Util.mergeParameters(this.sessionParameters.callbackParameters, adjustEvent.callbackParameters, "Callback"));
-            addMapJson(hashMap, "partner_params", Util.mergeParameters(this.sessionParameters.partnerParameters, adjustEvent.partnerParameters, "Partner"));
+            addMapJson(hashMap, Constants.CALLBACK_PARAMETERS, Util.mergeParameters(this.sessionParameters.callbackParameters, adjustEvent.callbackParameters, "Callback"));
+            addMapJson(hashMap, Constants.PARTNER_PARAMETERS, Util.mergeParameters(this.sessionParameters.partnerParameters, adjustEvent.partnerParameters, "Partner"));
         }
         this.deviceInfo.reloadPlayIds(this.adjustConfig.context);
         addString(hashMap, "android_uuid", this.activityStateCopy.uuid);
diff --git a/app/src/main/java/com/adjust/sdk/PackageFactory.java b/app/src/main/java/com/adjust/sdk/PackageFactory.java
index 2b916b324a..9ce2c1fb8a 100644
--- a/app/src/main/java/com/adjust/sdk/PackageFactory.java
+++ b/app/src/main/java/com/adjust/sdk/PackageFactory.java
@@ -26,7 +26,7 @@ public class PackageFactory {
         }
         queryStringClickPackageBuilder.deeplink = uri.toString();
         queryStringClickPackageBuilder.clickTimeInMilliseconds = j;
-        return queryStringClickPackageBuilder.buildClickPackage("deeplink");
+        return queryStringClickPackageBuilder.buildClickPackage(Constants.DEEPLINK);
     }
 
     public static ActivityPackage buildInstallReferrerSdkClickPackage(String str, long j, long j2, String str2, ActivityState activityState, AdjustConfig adjustConfig, DeviceInfo deviceInfo, SessionParameters sessionParameters) {
@@ -38,16 +38,16 @@ public class PackageFactory {
         packageBuilder.clickTimeInSeconds = j;
         packageBuilder.installBeginTimeInSeconds = j2;
         packageBuilder.referrerApi = str2;
-        return packageBuilder.buildClickPackage("install_referrer");
+        return packageBuilder.buildClickPackage(Constants.INSTALL_REFERRER);
     }
 
     public static ActivityPackage buildReftagSdkClickPackage(String str, long j, ActivityState activityState, AdjustConfig adjustConfig, DeviceInfo deviceInfo, SessionParameters sessionParameters) {
-        String str2 = "malformed";
+        String str2 = Constants.MALFORMED;
         if (str == null || str.length() == 0) {
             return null;
         }
         try {
-            str2 = URLDecoder.decode(str, "UTF-8");
+            str2 = URLDecoder.decode(str, Constants.ENCODING);
         } catch (UnsupportedEncodingException e) {
             AdjustFactory.getLogger().error("Referrer decoding failed due to UnsupportedEncodingException. Message: (%s)", e.getMessage());
         } catch (IllegalArgumentException e2) {
@@ -67,7 +67,7 @@ public class PackageFactory {
         queryStringClickPackageBuilder.referrer = str2;
         queryStringClickPackageBuilder.clickTimeInMilliseconds = j;
         queryStringClickPackageBuilder.rawReferrer = str;
-        return queryStringClickPackageBuilder.buildClickPackage("reftag");
+        return queryStringClickPackageBuilder.buildClickPackage(Constants.REFTAG);
     }
 
     private static PackageBuilder queryStringClickPackageBuilder(List<UrlQuerySanitizer.ParameterValuePair> list, ActivityState activityState, AdjustConfig adjustConfig, DeviceInfo deviceInfo, SessionParameters sessionParameters) {
@@ -80,7 +80,7 @@ public class PackageFactory {
             readQueryString(parameterValuePair.mParameter, parameterValuePair.mValue, linkedHashMap, adjustAttribution);
         }
         long currentTimeMillis = System.currentTimeMillis();
-        String str = (String) linkedHashMap.remove("reftag");
+        String str = (String) linkedHashMap.remove(Constants.REFTAG);
         if (activityState != null) {
             activityState.lastInterval = currentTimeMillis - activityState.lastActivity;
         }
@@ -92,7 +92,7 @@ public class PackageFactory {
     }
 
     private static boolean readQueryString(String str, String str2, Map<String, String> map, AdjustAttribution adjustAttribution) {
-        if (str == null || str2 == null || !str.startsWith("adjust_")) {
+        if (str == null || str2 == null || !str.startsWith(ADJUST_PREFIX)) {
             return false;
         }
         String substring = str.substring(7);
diff --git a/app/src/main/java/com/adjust/sdk/PackageHandler.java b/app/src/main/java/com/adjust/sdk/PackageHandler.java
index a934fc7790..50a7419f1c 100644
--- a/app/src/main/java/com/adjust/sdk/PackageHandler.java
+++ b/app/src/main/java/com/adjust/sdk/PackageHandler.java
@@ -151,7 +151,7 @@ public class PackageHandler implements IPackageHandler {
     }
 
     public static Boolean deletePackageQueue(Context context) {
-        return Boolean.valueOf(context.deleteFile("AdjustIoPackageQueue"));
+        return Boolean.valueOf(context.deleteFile(PACKAGE_QUEUE_FILENAME));
     }
 
     public static void deleteState(Context context) {
@@ -171,9 +171,9 @@ public class PackageHandler implements IPackageHandler {
 
     private void readPackageQueueI() {
         try {
-            this.packageQueue = (List) Util.readObject(this.context, "AdjustIoPackageQueue", "Package queue", List.class);
+            this.packageQueue = (List) Util.readObject(this.context, PACKAGE_QUEUE_FILENAME, PACKAGE_QUEUE_NAME, List.class);
         } catch (Exception e) {
-            this.logger.error("Failed to read %s file (%s)", "Package queue", e.getMessage());
+            this.logger.error("Failed to read %s file (%s)", PACKAGE_QUEUE_NAME, e.getMessage());
             this.packageQueue = null;
         }
         List<ActivityPackage> list = this.packageQueue;
@@ -207,7 +207,7 @@ public class PackageHandler implements IPackageHandler {
     }
 
     private void writePackageQueueI() {
-        Util.writeObject(this.packageQueue, this.context, "AdjustIoPackageQueue", "Package queue");
+        Util.writeObject(this.packageQueue, this.context, PACKAGE_QUEUE_FILENAME, PACKAGE_QUEUE_NAME);
         this.logger.debug("Package handler wrote %d packages", Integer.valueOf(this.packageQueue.size()));
     }
 
@@ -329,8 +329,8 @@ public class PackageHandler implements IPackageHandler {
             this.logger.verbose("Session partner parameters: %s", sessionParameters.partnerParameters);
             for (ActivityPackage activityPackage : this.packageQueue) {
                 Map<String, String> parameters = activityPackage.getParameters();
-                PackageBuilder.addMapJson(parameters, "callback_params", Util.mergeParameters(sessionParameters.callbackParameters, activityPackage.getCallbackParameters(), "Callback"));
-                PackageBuilder.addMapJson(parameters, "partner_params", Util.mergeParameters(sessionParameters.partnerParameters, activityPackage.getPartnerParameters(), "Partner"));
+                PackageBuilder.addMapJson(parameters, Constants.CALLBACK_PARAMETERS, Util.mergeParameters(sessionParameters.callbackParameters, activityPackage.getCallbackParameters(), "Callback"));
+                PackageBuilder.addMapJson(parameters, Constants.PARTNER_PARAMETERS, Util.mergeParameters(sessionParameters.partnerParameters, activityPackage.getPartnerParameters(), "Partner"));
             }
             writePackageQueueI();
         }
diff --git a/app/src/main/java/com/adjust/sdk/SdkClickHandler.java b/app/src/main/java/com/adjust/sdk/SdkClickHandler.java
index 03de0e9c6b..7831110e5b 100644
--- a/app/src/main/java/com/adjust/sdk/SdkClickHandler.java
+++ b/app/src/main/java/com/adjust/sdk/SdkClickHandler.java
@@ -22,7 +22,7 @@ public class SdkClickHandler implements ISdkClickHandler {
     private ILogger logger = AdjustFactory.getLogger();
     private List<ActivityPackage> packageQueue;
     private boolean paused;
-    private ThreadScheduler scheduler = new SingleThreadCachedScheduler("SdkClickHandler");
+    private ThreadScheduler scheduler = new SingleThreadCachedScheduler(SCHEDULED_EXECUTOR_SOURCE);
 
     /* renamed from: com.adjust.sdk.SdkClickHandler$1  reason: invalid class name */
     public class AnonymousClass1 implements Runnable {
@@ -150,7 +150,7 @@ public class SdkClickHandler implements ISdkClickHandler {
                 return;
             }
             long waitingTime = Util.getWaitingTime(retries, this.backoffStrategy);
-            this.logger.verbose("Waiting for %s seconds before retrying sdk_click for the %d time", Util.SecondsDisplayFormat.format(((double) waitingTime) / 1000.0d), Integer.valueOf(retries));
+            this.logger.verbose("Waiting for %s seconds before retrying sdk_click for the %d time", Util.SecondsDisplayFormat.format(((double) waitingTime) / MILLISECONDS_TO_SECONDS_DIVISOR), Integer.valueOf(retries));
             this.scheduler.schedule(r3, waitingTime);
         }
     }
@@ -172,7 +172,7 @@ public class SdkClickHandler implements ISdkClickHandler {
             if (z2) {
                 j2 = activityPackage.getClickTimeInSeconds();
                 j = activityPackage.getInstallBeginTimeInSeconds();
-                str4 = activityPackage.getParameters().get("referrer");
+                str4 = activityPackage.getParameters().get(Constants.REFERRER);
                 str = activityPackage.getParameters().get("referrer_api");
             } else {
                 str = null;
diff --git a/app/src/main/java/com/adjust/sdk/SharedPreferencesManager.java b/app/src/main/java/com/adjust/sdk/SharedPreferencesManager.java
index ca1aa9177a..36eda77510 100644
--- a/app/src/main/java/com/adjust/sdk/SharedPreferencesManager.java
+++ b/app/src/main/java/com/adjust/sdk/SharedPreferencesManager.java
@@ -21,7 +21,7 @@ public class SharedPreferencesManager {
     private final SharedPreferences sharedPreferences;
 
     public SharedPreferencesManager(Context context) {
-        this.sharedPreferences = context.getSharedPreferences("adjust_preferences", 0);
+        this.sharedPreferences = context.getSharedPreferences(PREFS_NAME, 0);
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:10:0x000d, code lost:
@@ -62,8 +62,8 @@ public class SharedPreferencesManager {
         } catch (ClassCastException unused) {
             return null;
         } catch (Throwable unused2) {
-            if (str.equals("raw_referrers")) {
-                remove("raw_referrers");
+            if (str.equals(PREFS_KEY_RAW_REFERRERS)) {
+                remove(PREFS_KEY_RAW_REFERRERS);
             }
             return null;
         }
@@ -95,27 +95,27 @@ public class SharedPreferencesManager {
     }
 
     public synchronized long getDeeplinkClickTime() {
-        return getLong("deeplink_click_time", -1);
+        return getLong(PREFS_KEY_DEEPLINK_CLICK_TIME, -1);
     }
 
     public synchronized String getDeeplinkUrl() {
-        return getString("deeplink_url");
+        return getString(PREFS_KEY_DEEPLINK_URL);
     }
 
     public synchronized boolean getDisableThirdPartySharing() {
-        return getBoolean("disable_third_party_sharing", false);
+        return getBoolean(PREFS_KEY_DISABLE_THIRD_PARTY_SHARING, false);
     }
 
     public synchronized boolean getGdprForgetMe() {
-        return getBoolean("gdpr_forget_me", false);
+        return getBoolean(PREFS_KEY_GDPR_FORGET_ME, false);
     }
 
     public synchronized boolean getInstallTracked() {
-        return getBoolean("install_tracked", false);
+        return getBoolean(PREFS_KEY_INSTALL_TRACKED, false);
     }
 
     public synchronized String getPushToken() {
-        return getString("push_token");
+        return getString(PREFS_KEY_PUSH_TOKEN);
     }
 
     public synchronized JSONArray getRawReferrer(String str, long j) {
@@ -130,7 +130,7 @@ public class SharedPreferencesManager {
     }
 
     public synchronized JSONArray getRawReferrerArray() {
-        String string = getString("raw_referrers");
+        String string = getString(PREFS_KEY_RAW_REFERRERS);
         if (string != null) {
             JSONArray jSONArray = new JSONArray(string);
             if (jSONArray.length() > 10) {
@@ -150,20 +150,20 @@ public class SharedPreferencesManager {
     }
 
     public synchronized void removeDeeplink() {
-        remove("deeplink_url");
-        remove("deeplink_click_time");
+        remove(PREFS_KEY_DEEPLINK_URL);
+        remove(PREFS_KEY_DEEPLINK_CLICK_TIME);
     }
 
     public synchronized void removeDisableThirdPartySharing() {
-        remove("disable_third_party_sharing");
+        remove(PREFS_KEY_DISABLE_THIRD_PARTY_SHARING);
     }
 
     public synchronized void removeGdprForgetMe() {
-        remove("gdpr_forget_me");
+        remove(PREFS_KEY_GDPR_FORGET_ME);
     }
 
     public synchronized void removePushToken() {
-        remove("push_token");
+        remove(PREFS_KEY_PUSH_TOKEN);
     }
 
     public synchronized void removeRawReferrer(String str, long j) {
@@ -181,7 +181,7 @@ public class SharedPreferencesManager {
                             }
                         }
                     }
-                    saveString("raw_referrers", jSONArray.toString());
+                    saveString(PREFS_KEY_RAW_REFERRERS, jSONArray.toString());
                 }
             }
         }
@@ -189,13 +189,13 @@ public class SharedPreferencesManager {
 
     public synchronized void saveDeeplink(Uri uri, long j) {
         if (uri != null) {
-            saveString("deeplink_url", uri.toString());
-            saveLong("deeplink_click_time", j);
+            saveString(PREFS_KEY_DEEPLINK_URL, uri.toString());
+            saveLong(PREFS_KEY_DEEPLINK_CLICK_TIME, j);
         }
     }
 
     public synchronized void savePushToken(String str) {
-        saveString("push_token", str);
+        saveString(PREFS_KEY_PUSH_TOKEN, str);
     }
 
     /* JADX WARNING: Exception block dominator not found, dom blocks: [] */
@@ -215,23 +215,23 @@ public class SharedPreferencesManager {
 
     public synchronized void saveRawReferrerArray(JSONArray jSONArray) {
         try {
-            saveString("raw_referrers", jSONArray.toString());
+            saveString(PREFS_KEY_RAW_REFERRERS, jSONArray.toString());
         } catch (Throwable unused) {
-            remove("raw_referrers");
+            remove(PREFS_KEY_RAW_REFERRERS);
         }
         return;
     }
 
     public synchronized void setDisableThirdPartySharing() {
-        saveBoolean("disable_third_party_sharing", true);
+        saveBoolean(PREFS_KEY_DISABLE_THIRD_PARTY_SHARING, true);
     }
 
     public synchronized void setGdprForgetMe() {
-        saveBoolean("gdpr_forget_me", true);
+        saveBoolean(PREFS_KEY_GDPR_FORGET_ME, true);
     }
 
     public synchronized void setInstallTracked() {
-        saveBoolean("install_tracked", true);
+        saveBoolean(PREFS_KEY_INSTALL_TRACKED, true);
     }
 
     /* JADX WARNING: Exception block dominator not found, dom blocks: [] */
diff --git a/app/src/main/java/com/adjust/sdk/Util.java b/app/src/main/java/com/adjust/sdk/Util.java
index f3267bb1f4..4cbaa6bb3c 100644
--- a/app/src/main/java/com/adjust/sdk/Util.java
+++ b/app/src/main/java/com/adjust/sdk/Util.java
@@ -45,7 +45,7 @@ import java.util.regex.Pattern;
 public class Util {
     private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
     public static final DecimalFormat SecondsDisplayFormat = newLocalDecimalFormat();
-    public static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z", Locale.US);
+    public static final SimpleDateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT, Locale.US);
     private static final String fieldReadErrorMessage = "Unable to read '%s' field in migration device with message (%s)";
     private static volatile SingleThreadFutureScheduler playAdIdScheduler = null;
 
@@ -375,7 +375,7 @@ public class Util {
     }
 
     public static String getSdkVersion() {
-        return "android4.22.0";
+        return Constants.CLIENT_SDK;
     }
 
     public static String[] getSupportedAbis() {
@@ -398,7 +398,7 @@ public class Util {
 
     public static String hash(String str, String str2) {
         try {
-            byte[] bytes = str.getBytes("UTF-8");
+            byte[] bytes = str.getBytes(Constants.ENCODING);
             MessageDigest instance = MessageDigest.getInstance(str2);
             instance.update(bytes, 0, bytes.length);
             return convertToHex(instance.digest());
@@ -448,7 +448,7 @@ public class Util {
 
     public static boolean isUrlFilteredOut(Uri uri) {
         String uri2;
-        return uri == null || (uri2 = uri.toString()) == null || uri2.length() == 0 || uri2.matches("^(fb|vk)[0-9]{5,}[^:]*://authorize.*access_token=.*");
+        return uri == null || (uri2 = uri.toString()) == null || uri2.length() == 0 || uri2.matches(Constants.FB_AUTH_REGEX);
     }
 
     public static boolean isValidParameter(String str, String str2, String str3) {
@@ -464,7 +464,7 @@ public class Util {
     }
 
     public static String md5(String str) {
-        return hash(str, "MD5");
+        return hash(str, Constants.MD5);
     }
 
     public static Map<String, String> mergeParameters(Map<String, String> map, Map<String, String> map2, String str) {
@@ -504,7 +504,7 @@ public class Util {
         try {
             return getField.get(str, z2);
         } catch (Exception e) {
-            getLogger().debug("Unable to read '%s' field in migration device with message (%s)", str, e.getMessage());
+            getLogger().debug(fieldReadErrorMessage, str, e.getMessage());
             return z2;
         }
     }
@@ -513,7 +513,7 @@ public class Util {
         try {
             return getField.get(str, i);
         } catch (Exception e) {
-            getLogger().debug("Unable to read '%s' field in migration device with message (%s)", str, e.getMessage());
+            getLogger().debug(fieldReadErrorMessage, str, e.getMessage());
             return i;
         }
     }
@@ -522,7 +522,7 @@ public class Util {
         try {
             return getField.get(str, j);
         } catch (Exception e) {
-            getLogger().debug("Unable to read '%s' field in migration device with message (%s)", str, e.getMessage());
+            getLogger().debug(fieldReadErrorMessage, str, e.getMessage());
             return j;
         }
     }
@@ -623,7 +623,7 @@ public class Util {
         try {
             return (T) getField.get(str, t);
         } catch (Exception e) {
-            getLogger().debug("Unable to read '%s' field in migration device with message (%s)", str, e.getMessage());
+            getLogger().debug(fieldReadErrorMessage, str, e.getMessage());
             return t;
         }
     }
@@ -664,11 +664,11 @@ public class Util {
     }
 
     public static String sha1(String str) {
-        return hash(str, "SHA-1");
+        return hash(str, Constants.SHA1);
     }
 
     public static String sha256(String str) {
-        return hash(str, "SHA-256");
+        return hash(str, Constants.SHA256);
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:18:0x004a A[SYNTHETIC, Splitter:B:18:0x004a] */
diff --git a/app/src/main/java/com/adjust/sdk/UtilNetworking.java b/app/src/main/java/com/adjust/sdk/UtilNetworking.java
index 6db586bbfb..de28e84d7e 100644
--- a/app/src/main/java/com/adjust/sdk/UtilNetworking.java
+++ b/app/src/main/java/com/adjust/sdk/UtilNetworking.java
@@ -1,6 +1,7 @@
 package com.adjust.sdk;
 
 import android.net.Uri;
+import androidx.browser.trusted.sharing.ShareTarget;
 import c.d.b.a.a;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -82,8 +83,8 @@ public class UtilNetworking {
     private static Uri buildUri(String str, Map<String, String> map, String str2) {
         String str3;
         Uri.Builder builder = new Uri.Builder();
-        String str4 = "https";
-        String str5 = "app.adjust.com";
+        String str4 = Constants.SCHEME;
+        String str5 = Constants.AUTHORITY;
         try {
             String baseUrl = AdjustFactory.getBaseUrl();
             if (str2 != null) {
@@ -118,7 +119,7 @@ public class UtilNetworking {
             if (buildAuthorizationHeader != null) {
                 httpsURLConnection.setRequestProperty("Authorization", buildAuthorizationHeader);
             }
-            httpsURLConnection.setRequestMethod("GET");
+            httpsURLConnection.setRequestMethod(ShareTarget.METHOD_GET);
             return readHttpResponse(httpsURLConnection, activityPackage);
         } catch (Exception e) {
             throw e;
@@ -138,7 +139,7 @@ public class UtilNetworking {
             if (buildAuthorizationHeader != null) {
                 httpsURLConnection.setRequestProperty("Authorization", buildAuthorizationHeader);
             }
-            httpsURLConnection.setRequestMethod("POST");
+            httpsURLConnection.setRequestMethod(ShareTarget.METHOD_POST);
             httpsURLConnection.setUseCaches(false);
             httpsURLConnection.setDoInput(true);
             httpsURLConnection.setDoOutput(true);
@@ -220,10 +221,10 @@ public class UtilNetworking {
                 break;
             }
             Map.Entry<String, String> next = it.next();
-            String encode = URLEncoder.encode(next.getKey(), "UTF-8");
+            String encode = URLEncoder.encode(next.getKey(), Constants.ENCODING);
             String value = next.getValue();
             if (value != null) {
-                str = URLEncoder.encode(value, "UTF-8");
+                str = URLEncoder.encode(value, Constants.ENCODING);
             }
             if (sb.length() > 0) {
                 sb.append("&");
@@ -234,14 +235,14 @@ public class UtilNetworking {
         }
         String format = Util.dateFormatter.format(Long.valueOf(System.currentTimeMillis()));
         sb.append("&");
-        sb.append(URLEncoder.encode("sent_at", "UTF-8"));
+        sb.append(URLEncoder.encode("sent_at", Constants.ENCODING));
         sb.append("=");
-        sb.append(URLEncoder.encode(format, "UTF-8"));
+        sb.append(URLEncoder.encode(format, Constants.ENCODING));
         if (i > 0) {
             sb.append("&");
-            sb.append(URLEncoder.encode("queue_size", "UTF-8"));
+            sb.append(URLEncoder.encode("queue_size", Constants.ENCODING));
             sb.append("=");
-            sb.append(URLEncoder.encode(str + i, "UTF-8"));
+            sb.append(URLEncoder.encode(str + i, Constants.ENCODING));
         }
         return sb.toString();
     }
diff --git a/app/src/main/java/com/adjust/sdk/scheduler/ThreadFactoryWrapper.java b/app/src/main/java/com/adjust/sdk/scheduler/ThreadFactoryWrapper.java
index 56baa215ae..04dfa24a55 100644
--- a/app/src/main/java/com/adjust/sdk/scheduler/ThreadFactoryWrapper.java
+++ b/app/src/main/java/com/adjust/sdk/scheduler/ThreadFactoryWrapper.java
@@ -2,6 +2,7 @@ package com.adjust.sdk.scheduler;
 
 import c.d.b.a.a;
 import com.adjust.sdk.AdjustFactory;
+import com.adjust.sdk.Constants;
 import java.lang.Thread;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -27,7 +28,7 @@ public class ThreadFactoryWrapper implements ThreadFactory {
     public Thread newThread(Runnable runnable) {
         Thread newThread = Executors.defaultThreadFactory().newThread(runnable);
         newThread.setPriority(9);
-        StringBuilder K = a.K("Adjust-");
+        StringBuilder K = a.K(Constants.THREAD_PREFIX);
         K.append(newThread.getName());
         K.append("-");
         K.append(this.source);
diff --git a/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index 9bc8cbbafb..5f53d9c6f2 100644
--- a/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -36,6 +36,7 @@ import c.c.a.t;
 import c.c.a.u;
 import c.c.a.v;
 import c.c.a.y.f;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.ByteArrayInputStream;
 import java.io.InterruptedIOException;
 import java.lang.ref.WeakReference;
@@ -400,7 +401,7 @@ public class LottieAnimationView extends AppCompatImageView {
         return null;
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float getProgress() {
         return this.o.g();
     }
diff --git a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
index 5dcb239266..6a268c9967 100644
--- a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
+++ b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
@@ -34,7 +34,11 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RecentlyNonNull;
+import androidx.core.app.NotificationCompat;
+import androidx.core.internal.view.SupportMenu;
 import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import c.c.a.a0.e;
 import c.c.a.a0.g0;
 import c.c.a.a0.h;
@@ -65,6 +69,7 @@ import c.i.a.c.a2.y;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.s;
 import c.i.a.c.j2.x.d;
+import com.adjust.sdk.Constants;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelUtils$getDisplayName$1;
 import com.discord.api.channel.ChannelUtils$getSortByNameAndType$1;
@@ -101,6 +106,8 @@ import com.google.android.gms.common.api.ResolvableApiException;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.common.internal.safeparcel.SafeParcelReader$ParseException;
 import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import d0.t.k;
@@ -277,12 +284,12 @@ public class AnimatableValueParser {
     }
 
     public static int D0(InputStream inputStream) throws IOException {
-        return ((((byte) inputStream.read()) << 24) & -16777216) | ((((byte) inputStream.read()) << 16) & 16711680) | ((((byte) inputStream.read()) << 8) & 65280) | (((byte) inputStream.read()) & 255);
+        return ((((byte) inputStream.read()) << 24) & ViewCompat.MEASURED_STATE_MASK) | ((((byte) inputStream.read()) << 16) & ItemTouchHelper.ACTION_MODE_DRAG_MASK) | ((((byte) inputStream.read()) << 8) & 65280) | (((byte) inputStream.read()) & 255);
     }
 
     public static final void D1(String str, String str2) {
         m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
+        m.checkNotNullParameter(str2, NotificationCompat.CATEGORY_MESSAGE);
         Logger.d$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
@@ -321,7 +328,7 @@ public class AnimatableValueParser {
 
     public static final void E1(String str, String str2, Throwable th) {
         m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
+        m.checkNotNullParameter(str2, NotificationCompat.CATEGORY_MESSAGE);
         Logger.e$default(LoggingProvider.INSTANCE.get(), str, str2, th, null, 8, null);
     }
 
@@ -366,7 +373,7 @@ public class AnimatableValueParser {
 
     public static final void F1(String str, String str2) {
         m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
+        m.checkNotNullParameter(str2, NotificationCompat.CATEGORY_MESSAGE);
         Logger.i$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
@@ -398,7 +405,7 @@ public class AnimatableValueParser {
 
     public static final void G1(String str, String str2) {
         m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
+        m.checkNotNullParameter(str2, NotificationCompat.CATEGORY_MESSAGE);
         Logger.v$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
@@ -421,7 +428,7 @@ public class AnimatableValueParser {
 
     public static final void H1(String str, String str2) {
         m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
+        m.checkNotNullParameter(str2, NotificationCompat.CATEGORY_MESSAGE);
         Logger.w$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
@@ -1028,9 +1035,10 @@ public class AnimatableValueParser {
             return i;
         }
         if (i2 == 0) {
-            return i & 16777215;
+            return i & ViewCompat.MEASURED_SIZE_MASK;
         }
-        return (i & 16777215) | ((((i >>> 24) * (i2 + (i2 >> 7))) >> 8) << 24);
+        int i3 = i2 + (i2 >> 7);
+        return (i & ViewCompat.MEASURED_SIZE_MASK) | ((((i >>> 24) * i3) >> 8) << 24);
     }
 
     @RecentlyNonNull
@@ -1683,7 +1691,7 @@ public class AnimatableValueParser {
     }
 
     public static int Y2(Parcel parcel, int i) {
-        parcel.writeInt(i | -65536);
+        parcel.writeInt(i | SupportMenu.CATEGORY_MASK);
         parcel.writeInt(0);
         return parcel.dataPosition();
     }
@@ -2321,7 +2329,7 @@ public class AnimatableValueParser {
 
     public static void b3(Parcel parcel, int i, int i2) {
         if (i2 >= 65535) {
-            parcel.writeInt(i | -65536);
+            parcel.writeInt(i | SupportMenu.CATEGORY_MASK);
             parcel.writeInt(i2);
             return;
         }
@@ -2545,7 +2553,7 @@ public class AnimatableValueParser {
     }
 
     public static int e2(InputStream inputStream) throws IOException {
-        return ((((byte) (inputStream.read() & 255)) << 16) & 16711680) | ((((byte) (inputStream.read() & 255)) << 8) & 65280) | (((byte) (inputStream.read() & 255)) & 255);
+        return ((((byte) (inputStream.read() & 255)) << 16) & ItemTouchHelper.ACTION_MODE_DRAG_MASK) | ((((byte) (inputStream.read() & 255)) << 8) & 65280) | (((byte) (inputStream.read() & 255)) & 255);
     }
 
     public static byte[] f(String str) {
@@ -3048,7 +3056,7 @@ public class AnimatableValueParser {
 
     @RecentlyNonNull
     public static int n2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        return (i & -65536) != -65536 ? (i >> 16) & 65535 : parcel.readInt();
+        return (i & SupportMenu.CATEGORY_MASK) != -65536 ? (i >> 16) & 65535 : parcel.readInt();
     }
 
     public static void o(@RecentlyNonNull boolean z2, @RecentlyNonNull String str, @RecentlyNonNull Object... objArr) {
@@ -3343,7 +3351,7 @@ public class AnimatableValueParser {
 
     public static int u0(int i) {
         if (i == 3) {
-            return 180;
+            return BaseTransientBottomBar.ANIMATION_FADE_DURATION;
         }
         if (i != 6) {
             return i != 8 ? 0 : 270;
@@ -3407,9 +3415,9 @@ public class AnimatableValueParser {
     }
 
     public static String v2(CacheKey cacheKey) throws UnsupportedEncodingException {
-        byte[] bytes = cacheKey.b().getBytes("UTF-8");
+        byte[] bytes = cacheKey.b().getBytes(Constants.ENCODING);
         try {
-            MessageDigest instance = MessageDigest.getInstance("SHA-1");
+            MessageDigest instance = MessageDigest.getInstance(Constants.SHA1);
             instance.update(bytes, 0, bytes.length);
             return Base64.encodeToString(instance.digest(), 11);
         } catch (NoSuchAlgorithmException e) {
@@ -3439,7 +3447,7 @@ public class AnimatableValueParser {
                 return Boolean.FALSE;
             }
             if (v == Double.TYPE) {
-                return Double.valueOf(0.0d);
+                return Double.valueOf((double) ShadowDrawableWrapper.COS_45);
             }
             if (v == Float.TYPE) {
                 return Float.valueOf(0.0f);
@@ -3495,12 +3503,15 @@ public class AnimatableValueParser {
     public static final Integer x0(Channel channel) {
         m.checkNotNullParameter(channel, "$this$getDeletedMessage");
         if (f1(channel)) {
-            return 2131887218;
+            return Integer.valueOf((int) com.discord.R.string.category_has_been_deleted);
         }
         if (A1(channel)) {
-            return 2131894301;
+            return Integer.valueOf((int) com.discord.R.string.thread_has_been_deleted);
         }
-        return t1(channel) ? null : 2131887286;
+        if (t1(channel)) {
+            return null;
+        }
+        return Integer.valueOf((int) com.discord.R.string.channel_has_been_deleted);
     }
 
     public static boolean x1(XmlPullParser xmlPullParser, String str) throws XmlPullParserException {
@@ -3597,7 +3608,7 @@ public class AnimatableValueParser {
                 z3 = false;
             }
             if (z3) {
-                String string = context.getString(2131890773);
+                String string = context.getString(com.discord.R.string.invalid_text_channel);
                 m.checkNotNullExpressionValue(string, "context.getString(R.string.invalid_text_channel)");
                 return string;
             } else if (z2) {
@@ -3612,7 +3623,7 @@ public class AnimatableValueParser {
                 z3 = false;
             }
             if (z3) {
-                String string2 = context.getString(2131890774);
+                String string2 = context.getString(com.discord.R.string.invalid_voice_channel);
                 m.checkNotNullExpressionValue(string2, "context.getString(R.string.invalid_voice_channel)");
                 return string2;
             }
@@ -3621,7 +3632,7 @@ public class AnimatableValueParser {
                 z3 = false;
             }
             if (z3) {
-                String string3 = context.getString(2131894510);
+                String string3 = context.getString(com.discord.R.string.unnamed);
                 m.checkNotNullExpressionValue(string3, "context.getString(R.string.unnamed)");
                 return string3;
             }
@@ -3630,7 +3641,7 @@ public class AnimatableValueParser {
                 z3 = false;
             }
             if (z3) {
-                String string4 = context.getString(2131888138);
+                String string4 = context.getString(com.discord.R.string.direct_message);
                 m.checkNotNullExpressionValue(string4, "context.getString(R.string.direct_message)");
                 return string4;
             } else if (z2) {
diff --git a/app/src/main/java/com/android/billingclient/api/SkuDetails.java b/app/src/main/java/com/android/billingclient/api/SkuDetails.java
index 053baf4e24..f7fe4c3044 100644
--- a/app/src/main/java/com/android/billingclient/api/SkuDetails.java
+++ b/app/src/main/java/com/android/billingclient/api/SkuDetails.java
@@ -3,6 +3,7 @@ package com.android.billingclient.api;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.discord.models.domain.ModelAuditLogEntry;
 import org.json.JSONException;
 import org.json.JSONObject;
 /* compiled from: com.android.billingclient:billing@@3.0.3 */
@@ -23,7 +24,7 @@ public class SkuDetails {
 
     @NonNull
     public String a() {
-        return this.b.optString("description");
+        return this.b.optString(ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/android/installreferrer/api/ReferrerDetails.java b/app/src/main/java/com/android/installreferrer/api/ReferrerDetails.java
index e2d82af7ec..ab313e3a8b 100644
--- a/app/src/main/java/com/android/installreferrer/api/ReferrerDetails.java
+++ b/app/src/main/java/com/android/installreferrer/api/ReferrerDetails.java
@@ -16,15 +16,15 @@ public class ReferrerDetails {
     }
 
     public boolean getGooglePlayInstantParam() {
-        return this.mOriginalBundle.getBoolean("google_play_instant");
+        return this.mOriginalBundle.getBoolean(KEY_GOOGLE_PLAY_INSTANT);
     }
 
     public long getInstallBeginTimestampSeconds() {
-        return this.mOriginalBundle.getLong("install_begin_timestamp_seconds");
+        return this.mOriginalBundle.getLong(KEY_INSTALL_BEGIN_TIMESTAMP);
     }
 
     public long getInstallBeginTimestampServerSeconds() {
-        return this.mOriginalBundle.getLong("install_begin_timestamp_server_seconds");
+        return this.mOriginalBundle.getLong(KEY_INSTALL_BEGIN_TIMESTAMP_SERVER);
     }
 
     public String getInstallReferrer() {
@@ -32,14 +32,14 @@ public class ReferrerDetails {
     }
 
     public String getInstallVersion() {
-        return this.mOriginalBundle.getString("install_version");
+        return this.mOriginalBundle.getString(KEY_INSTALL_VERSION);
     }
 
     public long getReferrerClickTimestampSeconds() {
-        return this.mOriginalBundle.getLong("referrer_click_timestamp_seconds");
+        return this.mOriginalBundle.getLong(KEY_REFERRER_CLICK_TIMESTAMP);
     }
 
     public long getReferrerClickTimestampServerSeconds() {
-        return this.mOriginalBundle.getLong("referrer_click_timestamp_server_seconds");
+        return this.mOriginalBundle.getLong(KEY_REFERRER_CLICK_TIMESTAMP_SERVER);
     }
 }
diff --git a/app/src/main/java/com/discord/api/activity/Activity.java b/app/src/main/java/com/discord/api/activity/Activity.java
index a5fc2fc986..bb42b6a3e9 100644
--- a/app/src/main/java/com/discord/api/activity/Activity.java
+++ b/app/src/main/java/com/discord/api/activity/Activity.java
@@ -1,6 +1,7 @@
 package com.discord.api.activity;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: Activity.kt */
@@ -25,7 +26,7 @@ public final class Activity {
     private final String url = null;
 
     public Activity(String str, ActivityType activityType, String str2, long j, ActivityTimestamps activityTimestamps, Long l, String str3, String str4, ActivityEmoji activityEmoji, ActivityParty activityParty, ActivityAssets activityAssets, Integer num, String str5, String str6, ActivityMetadata activityMetadata, ActivityPlatform activityPlatform, List<? extends ActivityPlatform> list, List<String> list2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(activityType, "type");
         this.name = str;
         this.type = activityType;
diff --git a/app/src/main/java/com/discord/api/application/Application.java b/app/src/main/java/com/discord/api/application/Application.java
index 69ed31d201..543465dce4 100644
--- a/app/src/main/java/com/discord/api/application/Application.java
+++ b/app/src/main/java/com/discord/api/application/Application.java
@@ -1,6 +1,7 @@
 package com.discord.api.application;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.g0.w;
 import d0.t.n;
 import d0.z.d.m;
@@ -23,7 +24,7 @@ public final class Application {
         String removeSuffix;
         String s2;
         String str = this.deeplinkUri;
-        return (str == null || (removeSuffix = w.removeSuffix(str, "/")) == null || (s2 = a.s(removeSuffix, "/_discord")) == null) ? a.y(a.K("dscd"), this.f1547id, "://connect/_discord") : s2;
+        return (str == null || (removeSuffix = w.removeSuffix(str, AutocompleteViewModel.COMMAND_DISCOVER_TOKEN)) == null || (s2 = a.s(removeSuffix, "/_discord")) == null) ? a.y(a.K("dscd"), this.f1547id, "://connect/_discord") : s2;
     }
 
     public final String b() {
diff --git a/app/src/main/java/com/discord/api/auth/OAuthScope.java b/app/src/main/java/com/discord/api/auth/OAuthScope.java
index 7a58684cdc..c3bf5fa62e 100644
--- a/app/src/main/java/com/discord/api/auth/OAuthScope.java
+++ b/app/src/main/java/com/discord/api/auth/OAuthScope.java
@@ -1,5 +1,6 @@
 package com.discord.api.auth;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -102,7 +103,7 @@ public abstract class OAuthScope {
         public static final Email INSTANCE = new Email();
 
         public Email() {
-            super("email", null);
+            super(NotificationCompat.CATEGORY_EMAIL, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/api/auth/mfa/DisableMfaRequestBody.java b/app/src/main/java/com/discord/api/auth/mfa/DisableMfaRequestBody.java
index 83da4b0cb7..8eccc65f34 100644
--- a/app/src/main/java/com/discord/api/auth/mfa/DisableMfaRequestBody.java
+++ b/app/src/main/java/com/discord/api/auth/mfa/DisableMfaRequestBody.java
@@ -1,13 +1,14 @@
 package com.discord.api.auth.mfa;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: DisableMfaRequestBody.kt */
 public final class DisableMfaRequestBody {
     private final String code;
 
     public DisableMfaRequestBody(String str) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         this.code = str;
     }
 
diff --git a/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java b/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java
index 727d88a5c8..1c57aaf0c3 100644
--- a/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java
+++ b/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java
@@ -1,6 +1,7 @@
 package com.discord.api.channel;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: ChannelRecipientNick.kt */
 public final class ChannelRecipientNick {
@@ -10,7 +11,7 @@ public final class ChannelRecipientNick {
     private final String nick;
 
     public ChannelRecipientNick(long j, String str) {
-        m.checkNotNullParameter(str, "nick");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NICK);
         this.f1551id = j;
         this.nick = str;
     }
diff --git a/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java b/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java
index 28ede5a42b..760c2e9542 100644
--- a/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java
+++ b/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java
@@ -1,6 +1,7 @@
 package com.discord.api.commands;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: ApplicationCommandData.kt */
@@ -14,8 +15,8 @@ public final class ApplicationCommandData {
     private final String version;
 
     public ApplicationCommandData(String str, String str2, String str3, String str4, List<ApplicationCommandValue> list) {
-        m.checkNotNullParameter(str3, "id");
-        m.checkNotNullParameter(str4, "name");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str4, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.version = str;
         this.guildId = str2;
         this.f1554id = str3;
diff --git a/app/src/main/java/com/discord/api/commands/ApplicationCommandValue.java b/app/src/main/java/com/discord/api/commands/ApplicationCommandValue.java
index fc1c56189e..3e24fa650c 100644
--- a/app/src/main/java/com/discord/api/commands/ApplicationCommandValue.java
+++ b/app/src/main/java/com/discord/api/commands/ApplicationCommandValue.java
@@ -1,6 +1,7 @@
 package com.discord.api.commands;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: ApplicationCommandData.kt */
@@ -11,7 +12,7 @@ public final class ApplicationCommandValue {
     private final Object value;
 
     public ApplicationCommandValue(String str, Object obj, int i, List<ApplicationCommandValue> list) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.name = str;
         this.value = obj;
         this.type = i;
diff --git a/app/src/main/java/com/discord/api/commands/CommandChoice.java b/app/src/main/java/com/discord/api/commands/CommandChoice.java
index 815dbe570d..e275808036 100644
--- a/app/src/main/java/com/discord/api/commands/CommandChoice.java
+++ b/app/src/main/java/com/discord/api/commands/CommandChoice.java
@@ -1,6 +1,7 @@
 package com.discord.api.commands;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: CommandChoice.kt */
 public final class CommandChoice {
@@ -8,7 +9,7 @@ public final class CommandChoice {
     private final String value;
 
     public CommandChoice(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "value");
         this.name = str;
         this.value = str2;
diff --git a/app/src/main/java/com/discord/api/emoji/GuildEmoji.java b/app/src/main/java/com/discord/api/emoji/GuildEmoji.java
index 47c13df144..bbb1c6aeeb 100644
--- a/app/src/main/java/com/discord/api/emoji/GuildEmoji.java
+++ b/app/src/main/java/com/discord/api/emoji/GuildEmoji.java
@@ -1,6 +1,7 @@
 package com.discord.api.emoji;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: GuildEmoji.kt */
@@ -16,7 +17,7 @@ public final class GuildEmoji {
     private final List<Long> roles;
 
     public GuildEmoji(long j, String str, List<Long> list, boolean z2, boolean z3, boolean z4, Boolean bool) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f1556id = j;
         this.name = str;
         this.roles = list;
diff --git a/app/src/main/java/com/discord/api/guild/Guild.java b/app/src/main/java/com/discord/api/guild/Guild.java
index f05c658c9e..29479ca9a3 100644
--- a/app/src/main/java/com/discord/api/guild/Guild.java
+++ b/app/src/main/java/com/discord/api/guild/Guild.java
@@ -1,5 +1,6 @@
 package com.discord.api.guild;
 
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
 import com.discord.api.emoji.GuildEmoji;
@@ -11,6 +12,7 @@ import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.voice.state.VoiceState;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 import java.util.Objects;
@@ -65,7 +67,7 @@ public final class Guild {
     /* JADX DEBUG: Multi-variable search result rejected for r29v0, resolved type: java.util.List<? extends com.discord.api.guild.GuildFeature> */
     /* JADX WARN: Multi-variable type inference failed */
     public Guild(List<GuildRole> list, List<GuildEmoji> list2, List<Sticker> list3, String str, String str2, Integer num, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, List<Presence> list4, List<Channel> list5, List<GuildMember> list6, List<VoiceState> list7, boolean z2, int i, int i2, Long l, Long l2, List<? extends GuildFeature> list8, int i3, String str5, String str6, int i4, int i5, int i6, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i7, int i8, Integer num2, GuildHashes guildHashes, List<Channel> list9, List<Channel> list10, boolean z3, List<StageInstance> list11) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list8, "features");
         this.roles = list;
         this.emojis = list2;
@@ -144,7 +146,7 @@ public final class Guild {
         int i16 = (i9 & 134217728) != 0 ? guild.systemChannelFlags : i6;
         String str16 = (i9 & 268435456) != 0 ? guild.joinedAt : null;
         Long l7 = (i9 & 536870912) != 0 ? guild.rulesChannelId : l3;
-        Long l8 = (i9 & 1073741824) != 0 ? guild.publicUpdatesChannelId : l4;
+        Long l8 = (i9 & BasicMeasure.EXACTLY) != 0 ? guild.publicUpdatesChannelId : l4;
         String str17 = (i9 & Integer.MIN_VALUE) != 0 ? guild.preferredLocale : str8;
         GuildWelcomeScreen guildWelcomeScreen2 = (i10 & 1) != 0 ? guild.welcomeScreen : null;
         GuildMaxVideoChannelUsers guildMaxVideoChannelUsers2 = (i10 & 2) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers;
@@ -160,7 +162,7 @@ public final class Guild {
             list18 = guild.stageInstances;
         }
         Objects.requireNonNull(guild);
-        m.checkNotNullParameter(str10, "name");
+        m.checkNotNullParameter(str10, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list20, "features");
         return new Guild(list12, list13, list14, str10, str11, num3, j3, str12, j4, str13, guildVerificationLevel2, guildExplicitContentFilter2, list15, list16, list17, list19, z4, i11, i12, l5, l6, list20, i13, str14, str15, i14, i15, i16, str16, l7, l8, str17, guildWelcomeScreen2, guildMaxVideoChannelUsers2, str18, i17, i18, num4, guildHashes2, list21, list22, z5, list18);
     }
diff --git a/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionBenefit.java b/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionBenefit.java
index 4c3ed1a0db..1c0e8b64db 100644
--- a/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionBenefit.java
+++ b/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionBenefit.java
@@ -1,6 +1,7 @@
 package com.discord.api.guildrolesubscription;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: GuildRoleSubscriptionBenefit.kt */
 public final class GuildRoleSubscriptionBenefit {
@@ -12,7 +13,7 @@ public final class GuildRoleSubscriptionBenefit {
 
     public GuildRoleSubscriptionBenefit(String str, String str2, GuildRoleSubscriptionBenefitType guildRoleSubscriptionBenefitType, String str3, Long l) {
         m.checkNotNullParameter(str, "emojiId");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(guildRoleSubscriptionBenefitType, "refType");
         this.emojiId = str;
         this.name = str2;
diff --git a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java
index 9977954888..ea1a5e2464 100644
--- a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java
+++ b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java
@@ -3,6 +3,7 @@ package com.discord.api.guildscheduledevent;
 import c.d.b.a.a;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
 import com.discord.api.utcdatetime.UtcDateTime;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: GuildScheduledEvent.kt */
@@ -26,7 +27,7 @@ public final class GuildScheduledEvent {
     private final Integer userCount;
 
     public GuildScheduledEvent(long j, long j2, long j3, String str, String str2, String str3, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, StageInstancePrivacyLevel stageInstancePrivacyLevel, GuildScheduledEventStatus guildScheduledEventStatus, GuildScheduledEventEntityType guildScheduledEventEntityType, Long l, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, List<Long> list, Integer num) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(utcDateTime, "scheduledStartTime");
         m.checkNotNullParameter(stageInstancePrivacyLevel, "privacyLevel");
         m.checkNotNullParameter(guildScheduledEventStatus, "status");
@@ -65,7 +66,7 @@ public final class GuildScheduledEvent {
         GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata2 = (i & 4096) != 0 ? guildScheduledEvent.entityMetadata : null;
         List<Long> list2 = (i & 8192) != 0 ? guildScheduledEvent.skuIds : null;
         Integer num2 = (i & 16384) != 0 ? guildScheduledEvent.userCount : num;
-        m.checkNotNullParameter(str4, "name");
+        m.checkNotNullParameter(str4, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(utcDateTime3, "scheduledStartTime");
         m.checkNotNullParameter(stageInstancePrivacyLevel2, "privacyLevel");
         m.checkNotNullParameter(guildScheduledEventStatus2, "status");
diff --git a/app/src/main/java/com/discord/api/message/Message.java b/app/src/main/java/com/discord/api/message/Message.java
index 842ddbd34a..687633c4f7 100644
--- a/app/src/main/java/com/discord/api/message/Message.java
+++ b/app/src/main/java/com/discord/api/message/Message.java
@@ -1,5 +1,6 @@
 package com.discord.api.message;
 
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.d.b.a.a;
 import com.discord.api.application.Application;
 import com.discord.api.botuikit.Component;
@@ -83,7 +84,7 @@ public final class Message {
         List list16 = (i & 134217728) != 0 ? null : list8;
         MessageCall messageCall2 = (i & 268435456) != 0 ? null : messageCall;
         Long l8 = (i & 536870912) != 0 ? null : l4;
-        int i2 = i & 1073741824;
+        int i2 = i & BasicMeasure.EXACTLY;
         int i3 = i & Integer.MIN_VALUE;
         this.f1565id = j;
         this.channelId = j2;
diff --git a/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentionsTypes.java b/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentionsTypes.java
index e93f3c9982..b3d350efe6 100644
--- a/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentionsTypes.java
+++ b/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentionsTypes.java
@@ -1,9 +1,11 @@
 package com.discord.api.message.allowedmentions;
+
+import com.discord.models.domain.ModelGuildMemberListUpdate;
 /* compiled from: MessageAllowedMentions.kt */
 public enum MessageAllowedMentionsTypes {
     USERS("users"),
     ROLES("roles"),
-    EVERYONE("everyone");
+    EVERYONE(ModelGuildMemberListUpdate.EVERYONE_ID);
     
     private final String apiStringRepresentation;
 
diff --git a/app/src/main/java/com/discord/api/message/embed/EmbedType.java b/app/src/main/java/com/discord/api/message/embed/EmbedType.java
index df441db785..e7832a1b73 100644
--- a/app/src/main/java/com/discord/api/message/embed/EmbedType.java
+++ b/app/src/main/java/com/discord/api/message/embed/EmbedType.java
@@ -1,9 +1,12 @@
 package com.discord.api.message.embed;
+
+import androidx.core.os.EnvironmentCompat;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: EmbedType.kt */
 public enum EmbedType {
     ARTICLE("article"),
     IMAGE("image"),
-    VIDEO("video"),
+    VIDEO(MediaStreamTrack.VIDEO_TRACK_KIND),
     TWEET("tweet"),
     LINK("link"),
     HTML("html"),
@@ -11,7 +14,7 @@ public enum EmbedType {
     GIFV("gifv"),
     RICH("rich"),
     APPLICATION_NEWS("application_news"),
-    UNKNOWN("unknown");
+    UNKNOWN(EnvironmentCompat.MEDIA_UNKNOWN);
     
     private final String apiValue;
 
diff --git a/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java b/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java
index d18ddfee56..97faf38d83 100644
--- a/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java
+++ b/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java
@@ -1,6 +1,7 @@
 package com.discord.api.premium;
 
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import com.discord.api.utcdatetime.UtcDateTime;
 import d0.g0.t;
 import d0.z.d.m;
@@ -32,7 +33,7 @@ public final class ClaimedOutboundPromotion {
         String str;
         String e = this.promotion.e();
         if (e != null) {
-            String encode = URLEncoder.encode(this.code, "UTF-8");
+            String encode = URLEncoder.encode(this.code, Constants.ENCODING);
             m.checkNotNullExpressionValue(encode, "URLEncoder.encode(code, \"UTF-8\")");
             str = t.replace$default(e, "{code}", encode, false, 4, (Object) null);
         }
diff --git a/app/src/main/java/com/discord/api/report/ReportNodeChild.java b/app/src/main/java/com/discord/api/report/ReportNodeChild.java
index cafc050f0f..c0ff92734a 100644
--- a/app/src/main/java/com/discord/api/report/ReportNodeChild.java
+++ b/app/src/main/java/com/discord/api/report/ReportNodeChild.java
@@ -1,6 +1,7 @@
 package com.discord.api.report;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: InAppReportsMenu.kt */
 public final class ReportNodeChild {
@@ -8,7 +9,7 @@ public final class ReportNodeChild {
     private final int ref;
 
     public ReportNodeChild(String str, int i) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.name = str;
         this.ref = i;
     }
diff --git a/app/src/main/java/com/discord/api/report/ReportNodeChildTypeAdapter.java b/app/src/main/java/com/discord/api/report/ReportNodeChildTypeAdapter.java
index 2918edb714..45c9729c9c 100644
--- a/app/src/main/java/com/discord/api/report/ReportNodeChildTypeAdapter.java
+++ b/app/src/main/java/com/discord/api/report/ReportNodeChildTypeAdapter.java
@@ -1,5 +1,6 @@
 package com.discord.api.report;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
@@ -14,7 +15,7 @@ public final class ReportNodeChildTypeAdapter extends TypeAdapter<ReportNodeChil
         String K = jsonReader.K();
         int z2 = jsonReader.z();
         jsonReader.e();
-        m.checkNotNullExpressionValue(K, "name");
+        m.checkNotNullExpressionValue(K, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ReportNodeChild(K, z2);
     }
 
diff --git a/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java b/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java
index 09b02a8a04..7088fe0a8c 100644
--- a/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java
+++ b/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java
@@ -1,6 +1,7 @@
 package com.discord.api.report;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +36,7 @@ public final class ReportSubmissionBody {
     public ReportSubmissionBody(long j, Long l, long j2, Long l2, String str, String str2, String str3, String str4, List<Integer> list, Map<String, ? extends List<String>> map) {
         m.checkNotNullParameter(str, "language");
         m.checkNotNullParameter(str2, "variant");
-        m.checkNotNullParameter(str3, "name");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str4, "version");
         m.checkNotNullParameter(list, "breadcrumbs");
         m.checkNotNullParameter(map, "elements");
diff --git a/app/src/main/java/com/discord/api/sticker/Sticker.java b/app/src/main/java/com/discord/api/sticker/Sticker.java
index 71ab15ffab..d07b33ef44 100644
--- a/app/src/main/java/com/discord/api/sticker/Sticker.java
+++ b/app/src/main/java/com/discord/api/sticker/Sticker.java
@@ -1,6 +1,7 @@
 package com.discord.api.sticker;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.io.Serializable;
 import kotlin.NoWhenBranchMatchedException;
@@ -34,10 +35,10 @@ public final class Sticker implements Serializable, BaseSticker {
 
     public Sticker(long j, Long l, Long l2, String str, String str2, StickerFormatType stickerFormatType, String str3, StickerType stickerType, Boolean bool, int i) {
         int i2 = i & 256;
-        m.checkNotNullParameter(str, "name");
-        m.checkNotNullParameter(str2, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         m.checkNotNullParameter(stickerFormatType, "formatType");
-        m.checkNotNullParameter(str3, "tags");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_TAGS);
         m.checkNotNullParameter(stickerType, "type");
         this.f1577id = j;
         this.packId = l;
diff --git a/app/src/main/java/com/discord/api/sticker/StickerPartial.java b/app/src/main/java/com/discord/api/sticker/StickerPartial.java
index 408c6eb883..2bfb2753f0 100644
--- a/app/src/main/java/com/discord/api/sticker/StickerPartial.java
+++ b/app/src/main/java/com/discord/api/sticker/StickerPartial.java
@@ -1,6 +1,7 @@
 package com.discord.api.sticker;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.io.Serializable;
 import kotlin.NoWhenBranchMatchedException;
@@ -28,7 +29,7 @@ public final class StickerPartial implements Serializable, BaseSticker {
 
     public StickerPartial(long j, StickerFormatType stickerFormatType, String str) {
         m.checkNotNullParameter(stickerFormatType, "formatType");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f1578id = j;
         this.formatType = stickerFormatType;
         this.name = str;
diff --git a/app/src/main/java/com/discord/app/App.java b/app/src/main/java/com/discord/app/App.java
index 265ca2d86e..9fdfdce30a 100644
--- a/app/src/main/java/com/discord/app/App.java
+++ b/app/src/main/java/com/discord/app/App.java
@@ -7,6 +7,8 @@ import android.view.View;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
 import c.a.e.n0;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.models.domain.emoji.ModelEmojiCustom;
 import com.discord.utilities.analytics.AdjustConfig;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -44,7 +46,7 @@ import kotlin.jvm.functions.Function3;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: App.kt */
 public class App extends Application {
-    public static final boolean i = w.contains$default((CharSequence) "productionCanary", (CharSequence) "local", false, 2, (Object) null);
+    public static final boolean i = w.contains$default((CharSequence) BuildConfig.FLAVOR, (CharSequence) "local", false, 2, (Object) null);
     public static final a j = new a(null);
 
     /* compiled from: App.kt */
@@ -85,7 +87,7 @@ public class App extends Application {
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public Integer mo1invoke() {
-            return Integer.valueOf(ColorCompat.getThemedColor(ActivityProvider.Companion.getActivity(), 2130968987));
+            return Integer.valueOf(ColorCompat.getThemedColor(ActivityProvider.Companion.getActivity(), (int) R.attr.colorTextLink));
         }
     }
 
@@ -116,7 +118,7 @@ public class App extends Application {
     /* compiled from: App.kt */
     public static final /* synthetic */ class e extends k implements Function3<String, Throwable, Map<String, ? extends String>, Unit> {
         public e(AppLog appLog) {
-            super(3, appLog, AppLog.class, "e", "e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V", 0);
+            super(3, appLog, AppLog.class, c.a.r.n0.c.e.a, "e(Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -173,7 +175,7 @@ public class App extends Application {
         loggingProvider.init(appLog);
         c.i.c.c.e(this);
         String str = null;
-        if (BuildUtils.INSTANCE.isValidBuildVersionName("87.3 - Alpha")) {
+        if (BuildUtils.INSTANCE.isValidBuildVersionName(BuildConfig.VERSION_NAME)) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
         } else {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false);
@@ -217,7 +219,7 @@ public class App extends Application {
         MGImagesConfig.INSTANCE.init(this);
         Error.init(new c.a.e.a(new e(appLog)));
         LinkifiedTextView.Companion.init(f.i);
-        ModelEmojiCustom.setCdnUri("https://cdn.discordapp.com");
+        ModelEmojiCustom.setCdnUri(BuildConfig.HOST_CDN);
         SurveyUtils.INSTANCE.init(this);
         AppCompatDelegate.setDefaultNightMode(1);
         m.checkNotNullParameter(this, "context");
diff --git a/app/src/main/java/com/discord/app/AppActivity.java b/app/src/main/java/com/discord/app/AppActivity.java
index 21feca127f..2ba75b919a 100644
--- a/app/src/main/java/com/discord/app/AppActivity.java
+++ b/app/src/main/java/com/discord/app/AppActivity.java
@@ -23,6 +23,7 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
@@ -31,6 +32,7 @@ import androidx.preference.PreferenceManager;
 import c.a.e.j;
 import c.a.e.k;
 import c.a.e.l;
+import com.discord.R;
 import com.discord.app.AppTransitionActivity;
 import com.discord.models.domain.ModelUserSettings;
 import com.discord.screenshot_detection.ScreenshotDetector;
@@ -225,7 +227,7 @@ public class AppActivity extends c.a.e.d implements AppComponent {
                 Objects.requireNonNull((AppActivity) this.j);
                 AppActivity appActivity4 = (AppActivity) this.j;
                 if (appActivity4.t == null) {
-                    appActivity4.n((Toolbar) appActivity4.findViewById(2131361871));
+                    appActivity4.n((Toolbar) appActivity4.findViewById(R.id.action_bar_toolbar));
                 }
             } else {
                 throw null;
@@ -294,7 +296,7 @@ public class AppActivity extends c.a.e.d implements AppComponent {
                 String theme = settings2.getTheme();
                 c.a.e.c cVar = new c.a.e.c(appActivity);
                 TypedValue typedValue = new TypedValue();
-                cVar.this$0.getTheme().resolveAttribute(2130970206, typedValue, true);
+                cVar.this$0.getTheme().resolveAttribute(R.attr.theme_name, typedValue, true);
                 if (!(!m.areEqual(typedValue.string, theme))) {
                     int fontScale = settings2.getFontScale();
                     FontUtils fontUtils = FontUtils.INSTANCE;
@@ -409,7 +411,7 @@ public class AppActivity extends c.a.e.d implements AppComponent {
         this.u = d0.g.lazy(new e(this));
         this.v = m;
         int i = AppPermissionsRequests.a;
-        m.checkNotNullParameter(this, "activity");
+        m.checkNotNullParameter(this, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         this.w = new j(this);
     }
 
@@ -589,7 +591,7 @@ public class AppActivity extends c.a.e.d implements AppComponent {
             return null;
         }
         if (z2) {
-            int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(toolbar, 2130969371, 0, 2, (Object) null);
+            int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(toolbar, (int) R.attr.ic_action_bar_back, 0, 2, (Object) null);
             Context context = toolbar.getContext();
             if (num != null) {
                 themedDrawableRes$default = num.intValue();
@@ -598,7 +600,7 @@ public class AppActivity extends c.a.e.d implements AppComponent {
             if (!(num3 == null || drawable == null)) {
                 androidx.core.graphics.drawable.DrawableCompat.setTint(drawable, num3.intValue());
             }
-            toolbar.setNavigationContentDescription(getString(2131886813));
+            toolbar.setNavigationContentDescription(getString(R.string.back));
         }
         toolbar.setNavigationIcon(drawable);
         if (num2 == null) {
@@ -664,7 +666,7 @@ public class AppActivity extends c.a.e.d implements AppComponent {
             }
             ToolbarTitleLayout e2 = e();
             if (e2 != null) {
-                e2.setBackground(ContextCompat.getDrawable(this, DrawableCompat.getThemedDrawableRes$default(this, 2130969994, 0, 2, (Object) null)));
+                e2.setBackground(ContextCompat.getDrawable(this, DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.selectableItemBackground, 0, 2, (Object) null)));
             }
             Toolbar toolbar3 = this.t;
             if (toolbar3 != null) {
@@ -681,12 +683,13 @@ public class AppActivity extends c.a.e.d implements AppComponent {
         try {
             StoreStream.Companion companion = StoreStream.Companion;
             String theme = companion.getUserSettingsSystem().getTheme();
-            int i = 2131951648;
-            if (m.areEqual(theme, "light")) {
-                i = 2131951655;
-            } else if (!m.areEqual(theme, "dark")) {
-                if (m.areEqual(theme, "pureEvil")) {
-                    i = 2131951650;
+            boolean areEqual = m.areEqual(theme, ModelUserSettings.THEME_LIGHT);
+            int i = R.style.AppTheme_Dark;
+            if (areEqual) {
+                i = R.style.AppTheme_Light;
+            } else if (!m.areEqual(theme, ModelUserSettings.THEME_DARK)) {
+                if (m.areEqual(theme, ModelUserSettings.THEME_PURE_EVIL)) {
+                    i = R.style.AppTheme_Dark_Evil;
                 }
             }
             setTheme(i);
@@ -737,7 +740,7 @@ public class AppActivity extends c.a.e.d implements AppComponent {
     public void onResume() {
         super.onResume();
         l lVar = l.g;
-        m.checkNotNullParameter(this, "activity");
+        m.checkNotNullParameter(this, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         boolean booleanExtra = c().getBooleanExtra("INTENT_RECREATE", false);
         if (booleanExtra) {
             c().removeExtra("INTENT_RECREATE");
diff --git a/app/src/main/java/com/discord/app/AppBottomSheet.java b/app/src/main/java/com/discord/app/AppBottomSheet.java
index 81908b8e40..42d9fab80a 100644
--- a/app/src/main/java/com/discord/app/AppBottomSheet.java
+++ b/app/src/main/java/com/discord/app/AppBottomSheet.java
@@ -18,6 +18,7 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import com.discord.R;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import com.discord.utilities.display.DisplayUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -165,7 +166,7 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
 
         @Override // android.content.DialogInterface.OnShowListener
         public final void onShow(DialogInterface dialogInterface) {
-            BottomSheetBehavior from = BottomSheetBehavior.from(this.a.findViewById(2131362908));
+            BottomSheetBehavior from = BottomSheetBehavior.from(this.a.findViewById(R.id.design_bottom_sheet));
             m.checkNotNullExpressionValue(from, "BottomSheetBehavior.from(bottomSheet)");
             from.setSkipCollapsed(true);
             from.setState(3);
@@ -211,9 +212,9 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
     private final void fixWindowInsetHandling() {
         View findViewById;
         View view = getView();
-        if (view != null && (findViewById = view.getRootView().findViewById(2131362795)) != null) {
+        if (view != null && (findViewById = view.getRootView().findViewById(R.id.container)) != null) {
             ViewCompat.setOnApplyWindowInsetsListener(findViewById, a.a);
-            View findViewById2 = view.getRootView().findViewById(2131362908);
+            View findViewById2 = view.getRootView().findViewById(R.id.design_bottom_sheet);
             m.checkNotNullExpressionValue(findViewById2, "designBottomSheet");
             findViewById2.setFitsSystemWindows(true);
             ViewCompat.setOnApplyWindowInsetsListener(findViewById2, DisplayUtils.getNO_OP_WINDOW_INSETS_LISTENER());
@@ -309,7 +310,7 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         if (this.shouldAvoidKeyboard) {
-            setStyle(0, 2131952507);
+            setStyle(0, R.style.UiKit_Sheet_KeyboardAvoiding);
         }
     }
 
@@ -321,7 +322,7 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
             m.checkNotNullExpressionValue(onCreateDialog, "dialog");
             Window window = onCreateDialog.getWindow();
             if (window != null) {
-                window.setWindowAnimations(2131951955);
+                window.setWindowAnimations(R.style.FadeInOut);
             }
         }
         if (this.shouldAvoidKeyboard) {
diff --git a/app/src/main/java/com/discord/app/AppDialog.java b/app/src/main/java/com/discord/app/AppDialog.java
index 389e648019..a043331859 100644
--- a/app/src/main/java/com/discord/app/AppDialog.java
+++ b/app/src/main/java/com/discord/app/AppDialog.java
@@ -9,6 +9,7 @@ import androidx.annotation.LayoutRes;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import com.discord.R;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import com.discord.utilities.display.DisplayUtils;
 import com.discord.utilities.logging.Logger;
@@ -116,7 +117,7 @@ public abstract class AppDialog extends DialogFragment implements AppComponent {
         m.checkNotNullExpressionValue(onCreateDialog, "super.onCreateDialog(savedInstanceState)");
         onCreateDialog.requestWindowFeature(1);
         if (AccessibilityUtils.INSTANCE.isReducedMotionEnabled() && (window = onCreateDialog.getWindow()) != null) {
-            window.setWindowAnimations(2131951955);
+            window.setWindowAnimations(R.style.FadeInOut);
         }
         return onCreateDialog;
     }
@@ -160,7 +161,7 @@ public abstract class AppDialog extends DialogFragment implements AppComponent {
         }
         Dialog dialog = getDialog();
         if (dialog != null && (window = dialog.getWindow()) != null) {
-            window.setBackgroundDrawableResource(2131100384);
+            window.setBackgroundDrawableResource(R.color.transparent);
         }
     }
 
diff --git a/app/src/main/java/com/discord/app/AppFragment.java b/app/src/main/java/com/discord/app/AppFragment.java
index 72f2327e98..21531ff6f4 100644
--- a/app/src/main/java/com/discord/app/AppFragment.java
+++ b/app/src/main/java/com/discord/app/AppFragment.java
@@ -16,8 +16,10 @@ import androidx.annotation.LayoutRes;
 import androidx.annotation.MenuRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
-import c.a.e.e;
+import c.a.r.n0.c.e;
+import com.discord.R;
 import com.discord.api.science.AnalyticsSchema;
 import com.discord.app.AppLogger;
 import com.discord.media_picker.MediaPicker;
@@ -83,13 +85,13 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP
 
         @Override // com.discord.media_picker.MediaPicker.a
         public void a(Exception exc) {
-            m.checkNotNullParameter(exc, "e");
-            c.a.e.o.h(this.a.getContext(), c.a.l.b.k(this.a, 2131894580, new Object[]{exc.getMessage()}, null, 4), 0, null, 12);
+            m.checkNotNullParameter(exc, e.a);
+            c.a.e.o.h(this.a.getContext(), c.a.l.b.k(this.a, R.string.upload_open_file_failed, new Object[]{exc.getMessage()}, null, 4), 0, null, 12);
         }
 
         @Override // com.discord.media_picker.MediaPicker.a
         public void b(Uri uri, RequestType requestType) {
-            m.checkNotNullParameter(uri, "uri");
+            m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             m.checkNotNullParameter(requestType, "request");
             String mimeType$default = AttachmentUtilsKt.getMimeType$default(this.a.requireContext().getContentResolver(), uri, null, 4, null);
             if (requestType.ordinal() != 3) {
@@ -116,8 +118,8 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP
         public Unit mo1invoke() {
             MediaPicker mediaPicker = MediaPicker.a;
             AppFragment appFragment = this.this$0;
-            CharSequence k = c.a.l.b.k(appFragment, 2131887389, new Object[0], null, 4);
-            e eVar = new e(this);
+            CharSequence k = c.a.l.b.k(appFragment, R.string.choose_an_application, new Object[0], null, 4);
+            c.a.e.e eVar = new c.a.e.e(this);
             m.checkNotNullParameter(appFragment, "provider");
             m.checkNotNullParameter(k, "chooserTitle");
             m.checkNotNullParameter("image/*", "mimeType");
@@ -175,7 +177,7 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP
 
     private final Unit bindToolbar(AppActivity appActivity, View view) {
         Toolbar toolbar;
-        if (view == null || (toolbar = (Toolbar) view.findViewById(2131361871)) == null) {
+        if (view == null || (toolbar = (Toolbar) view.findViewById(R.id.action_bar_toolbar)) == null) {
             return null;
         }
         if (!m.areEqual(appActivity.t, toolbar)) {
@@ -399,12 +401,12 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP
     }
 
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
     }
 
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
     }
 
diff --git a/app/src/main/java/com/discord/app/AppLog.java b/app/src/main/java/com/discord/app/AppLog.java
index 1b0b22806e..7efd03a78e 100644
--- a/app/src/main/java/com/discord/app/AppLog.java
+++ b/app/src/main/java/com/discord/app/AppLog.java
@@ -3,8 +3,11 @@ package com.discord.app;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
+import androidx.core.app.NotificationCompat;
 import c.a.e.h;
 import c.a.e.i;
+import c.a.r.n0.c.e;
+import com.discord.BuildConfig;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
@@ -38,7 +41,7 @@ public final class AppLog extends Logger {
     public static SharedPreferences f1589c;
     public static final SerializedSubject<LoggedItem, LoggedItem> d = new SerializedSubject<>(new j0.q.a(new a.d(new a.c(5000))));
     public static boolean e;
-    public static final String[] f = {"com.discord", "co.discord"};
+    public static final String[] f = {BuildConfig.APPLICATION_ID, "co.discord"};
     public static final AppLog g = new AppLog();
 
     /* compiled from: AppLog.kt */
@@ -278,7 +281,7 @@ public final class AppLog extends Logger {
             StackTraceElement stackTraceElement2 = stackTraceElementArr[i3];
             String className2 = stackTraceElement2.getClassName();
             m.checkNotNullExpressionValue(className2, "stackTraceElement.className");
-            boolean z4 = w.contains$default(className2, "MediaEngineLegacy", false, 2, null) && m.areEqual(stackTraceElement2.getMethodName(), "e");
+            boolean z4 = w.contains$default(className2, "MediaEngineLegacy", false, 2, null) && m.areEqual(stackTraceElement2.getMethodName(), e.a);
             String className3 = stackTraceElement2.getClassName();
             m.checkNotNullExpressionValue(className3, "stackTraceElement.className");
             String name = Logger.class.getName();
@@ -443,7 +446,7 @@ public final class AppLog extends Logger {
     public final void f(String str, String str2) {
         m.checkNotNullParameter(str, "from");
         m.checkNotNullParameter(str2, "to");
-        recordBreadcrumb("Navigation [" + str + "] > [" + str2 + ']', "navigation");
+        recordBreadcrumb("Navigation [" + str + "] > [" + str2 + ']', NotificationCompat.CATEGORY_NAVIGATION);
     }
 
     @Override // com.discord.utilities.logging.Logger
diff --git a/app/src/main/java/com/discord/app/AppTransitionActivity.java b/app/src/main/java/com/discord/app/AppTransitionActivity.java
index dd7783b611..e2b00d3233 100644
--- a/app/src/main/java/com/discord/app/AppTransitionActivity.java
+++ b/app/src/main/java/com/discord/app/AppTransitionActivity.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import androidx.annotation.AnimRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityOptionsCompat;
+import com.discord.R;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import d0.z.d.m;
 /* compiled from: AppTransitionActivity.kt */
@@ -13,14 +14,14 @@ public abstract class AppTransitionActivity extends AppCompatActivity {
 
     /* compiled from: AppTransitionActivity.kt */
     public enum Transition {
-        TYPE_FADE(new a(2130771984, 2130771986, 2130771980, 2130771982)),
-        TYPE_FADE_FAST(new a(2130771985, 2130771987, 2130771981, 2130771983)),
-        TYPE_STANDARD(new a(2130772006, 2130772007, 2130772004, 2130772005)),
-        TYPE_SLIDE_HORIZONTAL(new a(2130771990, 2130771991, 2130771988, 2130771989)),
-        TYPE_SLIDE_VERTICAL(new a(2130772002, 2130772003, 2130772000, 2130772001)),
-        TYPE_SLIDE_VERTICAL_WITH_FADE(new a(2130772002, 2130771986, 2130771980, 2130772001)),
-        TYPE_SLIDE_POP_VERTICAL(new a(2130771998, 2130771999, 2130771996, 2130771997)),
-        TYPE_SLIDE_POP_HORIZONTAL(new a(2130771994, 2130771995, 2130771992, 2130771993)),
+        TYPE_FADE(new a(R.anim.activity_fade_open_in, R.anim.activity_fade_open_out, R.anim.activity_fade_close_in, R.anim.activity_fade_close_out)),
+        TYPE_FADE_FAST(new a(R.anim.activity_fade_open_in_fast, R.anim.activity_fade_open_out_fast, R.anim.activity_fade_close_in_fast, R.anim.activity_fade_close_out_fast)),
+        TYPE_STANDARD(new a(R.anim.activity_standard_open_in, R.anim.activity_standard_open_out, R.anim.activity_standard_close_in, R.anim.activity_standard_close_out)),
+        TYPE_SLIDE_HORIZONTAL(new a(R.anim.activity_slide_horizontal_open_in, R.anim.activity_slide_horizontal_open_out, R.anim.activity_slide_horizontal_close_in, R.anim.activity_slide_horizontal_close_out)),
+        TYPE_SLIDE_VERTICAL(new a(R.anim.activity_slide_vertical_open_in, R.anim.activity_slide_vertical_open_out, R.anim.activity_slide_vertical_close_in, R.anim.activity_slide_vertical_close_out)),
+        TYPE_SLIDE_VERTICAL_WITH_FADE(new a(R.anim.activity_slide_vertical_open_in, R.anim.activity_fade_open_out, R.anim.activity_fade_close_in, R.anim.activity_slide_vertical_close_out)),
+        TYPE_SLIDE_POP_VERTICAL(new a(R.anim.activity_slide_pop_vertical_open_in, R.anim.activity_slide_pop_vertical_open_out, R.anim.activity_slide_pop_vertical_close_in, R.anim.activity_slide_pop_vertical_close_out)),
+        TYPE_SLIDE_POP_HORIZONTAL(new a(R.anim.activity_slide_pop_horizontal_open_in, R.anim.activity_slide_pop_horizontal_open_out, R.anim.activity_slide_pop_horizontal_close_in, R.anim.activity_slide_pop_horizontal_close_out)),
         TYPE_NONE(new a(0, 0, 0, 0));
         
         private final a animations;
diff --git a/app/src/main/java/com/discord/app/DiscordConnectService.java b/app/src/main/java/com/discord/app/DiscordConnectService.java
index 2681a370a9..ede462c1b2 100644
--- a/app/src/main/java/com/discord/app/DiscordConnectService.java
+++ b/app/src/main/java/com/discord/app/DiscordConnectService.java
@@ -12,11 +12,13 @@ import androidx.core.content.ContextCompat;
 import c.a.e.k0;
 import c.a.e.m0;
 import c.a.e.n;
+import com.discord.R;
 import com.discord.stores.StoreConnectionOpen;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsUtils;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.error.Error;
+import com.discord.utilities.fcm.NotificationClient;
 import com.discord.utilities.intent.IntentUtils;
 import com.discord.utilities.intent.RouteHandlers;
 import com.discord.utilities.logging.Logger;
@@ -154,7 +156,7 @@ public final class DiscordConnectService extends Service {
         m.checkNotNullExpressionValue(simpleName, "DiscordConnectService::class.java.simpleName");
         Logger.i$default(appLog, simpleName, "onCreate", null, 4, null);
         n.f47c.a(this);
-        startForeground(100, new NotificationCompat.Builder(this, "Social").setAutoCancel(true).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231836).setColor(ColorCompat.getThemedColor(this, 2130969008)).setContentTitle(getString(2131887548)).setContentText(getString(2131887555)).build());
+        startForeground(100, new NotificationCompat.Builder(this, NotificationClient.NOTIF_CHANNEL_SOCIAL).setAutoCancel(true).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(R.drawable.ic_notification_24dp).setColor(ColorCompat.getThemedColor(this, (int) R.attr.color_brand_500)).setContentTitle(getString(R.string.connecting)).setContentText(getString(R.string.connection_status_awaiting_endpoint)).build());
         StoreStream.Companion companion = StoreStream.Companion;
         Application application = getApplication();
         m.checkNotNullExpressionValue(application, "application");
@@ -198,7 +200,7 @@ public final class DiscordConnectService extends Service {
         StoreStream.Companion companion = StoreStream.Companion;
         String authToken$app_productionCanaryRelease = companion.getAuthentication().getAuthToken$app_productionCanaryRelease();
         if (authToken$app_productionCanaryRelease == null || t.isBlank(authToken$app_productionCanaryRelease)) {
-            c.a.e.o.g(this, 2131892073, 0, null, 12);
+            c.a.e.o.g(this, R.string.overlay_mobile_unauthed, 0, null, 12);
             observable2 = Observable.w(new IllegalStateException("UNAUTHED"));
             m.checkNotNullExpressionValue(observable2, "Observable.error(Illegal…ateException(\"UNAUTHED\"))");
         } else {
@@ -215,7 +217,7 @@ public final class DiscordConnectService extends Service {
             }
             if (longOrNull != null) {
                 if (ContextCompat.checkSelfPermission(this, "android.permission.RECORD_AUDIO") != 0) {
-                    c.a.e.o.g(this, 2131892198, 0, null, 12);
+                    c.a.e.o.g(this, R.string.permission_microphone_denied, 0, null, 12);
                     observable2 = Observable.w(new IllegalStateException("Do not have microphone permissions, go to main app"));
                     m.checkNotNullExpressionValue(observable2, "Observable.error(\n      …to main app\")\n          )");
                 } else {
diff --git a/app/src/main/java/com/discord/chips_view/ChipsView.java b/app/src/main/java/com/discord/chips_view/ChipsView.java
index ace4fc7bf5..288ccf50ba 100644
--- a/app/src/main/java/com/discord/chips_view/ChipsView.java
+++ b/app/src/main/java/com/discord/chips_view/ChipsView.java
@@ -23,7 +23,9 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
 import c.a.g.a;
 import c.a.g.d;
 import c.a.g.e;
@@ -112,7 +114,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
 
         @Override // android.view.inputmethod.InputConnectionWrapper, android.view.inputmethod.InputConnection
         public boolean commitText(CharSequence charSequence, int i) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             return super.commitText(charSequence, i);
         }
 
@@ -123,7 +125,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
 
         @Override // android.view.inputmethod.InputConnectionWrapper, android.view.inputmethod.InputConnection
         public boolean sendKeyEvent(KeyEvent keyEvent) {
-            m.checkNotNullParameter(keyEvent, "event");
+            m.checkNotNullParameter(keyEvent, NotificationCompat.CATEGORY_EVENT);
             if (!(ChipsView.this.f1596z.length() == 0 && keyEvent.getAction() == 0 && keyEvent.getKeyCode() == 67)) {
                 return super.sendKeyEvent(keyEvent);
             }
@@ -217,11 +219,11 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
             this.p = obtainStyledAttributes.getColor(R.c.ChipsView_cv_bg_color, ContextCompat.getColor(context, 17170443));
             this.j = obtainStyledAttributes.getResourceId(R.c.ChipsView_cv_chip_bg_res, 0);
             this.q = obtainStyledAttributes.getColor(R.c.ChipsView_cv_bg_color_clicked, ContextCompat.getColor(context, 17170451));
-            this.r = obtainStyledAttributes.getColor(R.c.ChipsView_cv_text_color, -16777216);
+            this.r = obtainStyledAttributes.getColor(R.c.ChipsView_cv_text_color, ViewCompat.MEASURED_STATE_MASK);
             this.f1593s = obtainStyledAttributes.getColor(R.c.ChipsView_cv_text_color_clicked, -1);
             this.v = obtainStyledAttributes.getResourceId(R.c.ChipsView_cv_hint, 0);
             obtainStyledAttributes.getResourceId(R.c.ChipsView_cv_icon_placeholder, 0);
-            this.t = obtainStyledAttributes.getColor(R.c.ChipsView_cv_search_text_color, -16777216);
+            this.t = obtainStyledAttributes.getColor(R.c.ChipsView_cv_search_text_color, ViewCompat.MEASURED_STATE_MASK);
             this.u = (float) obtainStyledAttributes.getDimensionPixelSize(R.c.ChipsView_cv_search_text_size, 49);
             this.w = obtainStyledAttributes.getResourceId(R.c.ChipsView_cv_chip_layout, R.b.view_chip_default);
             obtainStyledAttributes.recycle();
@@ -494,7 +496,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
     }
 
     public final void setText(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         this.f1596z.setText(str);
     }
 
diff --git a/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java b/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java
index 13e9f5ca98..d0426e611b 100644
--- a/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 public final class EmptyFriendsStateContactSyncViewBinding implements ViewBinding {
     @NonNull
@@ -29,18 +30,18 @@ public final class EmptyFriendsStateContactSyncViewBinding implements ViewBindin
 
     @NonNull
     public static EmptyFriendsStateContactSyncViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558488, viewGroup);
-        int i = 2131362882;
-        TextView textView = (TextView) viewGroup.findViewById(2131362882);
+        layoutInflater.inflate(R.layout.empty_friends_state_contact_sync_view, viewGroup);
+        int i = R.id.cs_subtitle;
+        TextView textView = (TextView) viewGroup.findViewById(R.id.cs_subtitle);
         if (textView != null) {
-            i = 2131363116;
-            MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363116);
+            i = R.id.empty_friends_state_cs_button;
+            MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(R.id.empty_friends_state_cs_button);
             if (materialButton != null) {
-                i = 2131363117;
-                ImageView imageView = (ImageView) viewGroup.findViewById(2131363117);
+                i = R.id.empty_friends_state_cs_image;
+                ImageView imageView = (ImageView) viewGroup.findViewById(R.id.empty_friends_state_cs_image);
                 if (imageView != null) {
-                    i = 2131363118;
-                    TextView textView2 = (TextView) viewGroup.findViewById(2131363118);
+                    i = R.id.empty_friends_state_cs_title;
+                    TextView textView2 = (TextView) viewGroup.findViewById(R.id.empty_friends_state_cs_title);
                     if (textView2 != null) {
                         return new EmptyFriendsStateContactSyncViewBinding(viewGroup, textView, materialButton, imageView, textView2);
                     }
diff --git a/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java b/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java
index eddcc0373c..7aa7072d1a 100644
--- a/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 public final class EmptyFriendsStateViewBinding implements ViewBinding {
     @NonNull
@@ -27,16 +28,16 @@ public final class EmptyFriendsStateViewBinding implements ViewBinding {
 
     @NonNull
     public static EmptyFriendsStateViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558489, viewGroup);
-        int i = 2131363115;
-        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363115);
+        layoutInflater.inflate(R.layout.empty_friends_state_view, viewGroup);
+        int i = R.id.empty_friends_state_add_friend;
+        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(R.id.empty_friends_state_add_friend);
         if (materialButton != null) {
-            ImageView imageView = (ImageView) viewGroup.findViewById(2131363119);
-            i = 2131363120;
-            TextView textView = (TextView) viewGroup.findViewById(2131363120);
+            ImageView imageView = (ImageView) viewGroup.findViewById(R.id.empty_friends_state_image);
+            i = R.id.empty_friends_state_title;
+            TextView textView = (TextView) viewGroup.findViewById(R.id.empty_friends_state_title);
             if (textView != null) {
-                i = 2131365386;
-                TextView textView2 = (TextView) viewGroup.findViewById(2131365386);
+                i = R.id.subtitle;
+                TextView textView2 = (TextView) viewGroup.findViewById(R.id.subtitle);
                 if (textView2 != null) {
                     return new EmptyFriendsStateViewBinding(viewGroup, materialButton, imageView, textView, textView2);
                 }
diff --git a/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java b/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java
index 94c6ab9efa..77efe4e2d6 100644
--- a/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.exoplayer2.ui.PlayerView;
 public final class InlineMediaViewBinding implements ViewBinding {
@@ -39,24 +40,24 @@ public final class InlineMediaViewBinding implements ViewBinding {
 
     @NonNull
     public static InlineMediaViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558532, viewGroup);
-        int i = 2131363784;
-        ImageView imageView = (ImageView) viewGroup.findViewById(2131363784);
+        layoutInflater.inflate(R.layout.inline_media_view, viewGroup);
+        int i = R.id.inline_media_gif_indicator;
+        ImageView imageView = (ImageView) viewGroup.findViewById(R.id.inline_media_gif_indicator);
         if (imageView != null) {
-            i = 2131363785;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363785);
+            i = R.id.inline_media_image_preview;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(R.id.inline_media_image_preview);
             if (simpleDraweeView != null) {
-                i = 2131363786;
-                ProgressBar progressBar = (ProgressBar) viewGroup.findViewById(2131363786);
+                i = R.id.inline_media_loading_indicator;
+                ProgressBar progressBar = (ProgressBar) viewGroup.findViewById(R.id.inline_media_loading_indicator);
                 if (progressBar != null) {
-                    i = 2131363787;
-                    ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363787);
+                    i = R.id.inline_media_play_button;
+                    ImageView imageView2 = (ImageView) viewGroup.findViewById(R.id.inline_media_play_button);
                     if (imageView2 != null) {
-                        i = 2131363788;
-                        PlayerView playerView = (PlayerView) viewGroup.findViewById(2131363788);
+                        i = R.id.inline_media_player_view;
+                        PlayerView playerView = (PlayerView) viewGroup.findViewById(R.id.inline_media_player_view);
                         if (playerView != null) {
-                            i = 2131363789;
-                            ImageView imageView3 = (ImageView) viewGroup.findViewById(2131363789);
+                            i = R.id.inline_media_volume_toggle;
+                            ImageView imageView3 = (ImageView) viewGroup.findViewById(R.id.inline_media_volume_toggle);
                             if (imageView3 != null) {
                                 return new InlineMediaViewBinding(viewGroup, imageView, simpleDraweeView, progressBar, imageView2, playerView, imageView3);
                             }
diff --git a/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java b/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java
index 4e7b36a73a..38ba2ae0ab 100644
--- a/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java
@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.views.user.UserAvatarPresenceView;
 public final class TabsHostBottomNavigationViewBinding implements ViewBinding {
     @NonNull
@@ -69,54 +70,54 @@ public final class TabsHostBottomNavigationViewBinding implements ViewBinding {
 
     @NonNull
     public static TabsHostBottomNavigationViewBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558693, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.tabs_host_bottom_navigation_view, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131365427;
-        ImageView imageView = (ImageView) inflate.findViewById(2131365427);
+        int i = R.id.tabs_host_bottom_nav_friends_icon;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.tabs_host_bottom_nav_friends_icon);
         if (imageView != null) {
-            i = 2131365428;
-            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131365428);
+            i = R.id.tabs_host_bottom_nav_friends_item;
+            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(R.id.tabs_host_bottom_nav_friends_item);
             if (constraintLayout != null) {
-                i = 2131365429;
-                TextView textView = (TextView) inflate.findViewById(2131365429);
+                i = R.id.tabs_host_bottom_nav_friends_notifications_badge;
+                TextView textView = (TextView) inflate.findViewById(R.id.tabs_host_bottom_nav_friends_notifications_badge);
                 if (textView != null) {
-                    i = 2131365430;
-                    ImageView imageView2 = (ImageView) inflate.findViewById(2131365430);
+                    i = R.id.tabs_host_bottom_nav_home_icon;
+                    ImageView imageView2 = (ImageView) inflate.findViewById(R.id.tabs_host_bottom_nav_home_icon);
                     if (imageView2 != null) {
-                        i = 2131365431;
-                        ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131365431);
+                        i = R.id.tabs_host_bottom_nav_home_item;
+                        ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(R.id.tabs_host_bottom_nav_home_item);
                         if (constraintLayout2 != null) {
-                            i = 2131365432;
-                            TextView textView2 = (TextView) inflate.findViewById(2131365432);
+                            i = R.id.tabs_host_bottom_nav_home_notifications_badge;
+                            TextView textView2 = (TextView) inflate.findViewById(R.id.tabs_host_bottom_nav_home_notifications_badge);
                             if (textView2 != null) {
-                                i = 2131365433;
-                                ImageView imageView3 = (ImageView) inflate.findViewById(2131365433);
+                                i = R.id.tabs_host_bottom_nav_mentions_icon;
+                                ImageView imageView3 = (ImageView) inflate.findViewById(R.id.tabs_host_bottom_nav_mentions_icon);
                                 if (imageView3 != null) {
-                                    i = 2131365434;
-                                    FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131365434);
+                                    i = R.id.tabs_host_bottom_nav_mentions_item;
+                                    FrameLayout frameLayout = (FrameLayout) inflate.findViewById(R.id.tabs_host_bottom_nav_mentions_item);
                                     if (frameLayout != null) {
-                                        i = 2131365435;
-                                        ImageView imageView4 = (ImageView) inflate.findViewById(2131365435);
+                                        i = R.id.tabs_host_bottom_nav_search_icon;
+                                        ImageView imageView4 = (ImageView) inflate.findViewById(R.id.tabs_host_bottom_nav_search_icon);
                                         if (imageView4 != null) {
-                                            i = 2131365436;
-                                            FrameLayout frameLayout2 = (FrameLayout) inflate.findViewById(2131365436);
+                                            i = R.id.tabs_host_bottom_nav_search_item;
+                                            FrameLayout frameLayout2 = (FrameLayout) inflate.findViewById(R.id.tabs_host_bottom_nav_search_item);
                                             if (frameLayout2 != null) {
-                                                i = 2131365437;
-                                                ImageView imageView5 = (ImageView) inflate.findViewById(2131365437);
+                                                i = R.id.tabs_host_bottom_nav_stage_discovery_icon;
+                                                ImageView imageView5 = (ImageView) inflate.findViewById(R.id.tabs_host_bottom_nav_stage_discovery_icon);
                                                 if (imageView5 != null) {
-                                                    i = 2131365438;
-                                                    FrameLayout frameLayout3 = (FrameLayout) inflate.findViewById(2131365438);
+                                                    i = R.id.tabs_host_bottom_nav_stage_discovery_item;
+                                                    FrameLayout frameLayout3 = (FrameLayout) inflate.findViewById(R.id.tabs_host_bottom_nav_stage_discovery_item);
                                                     if (frameLayout3 != null) {
-                                                        i = 2131365439;
-                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365439);
+                                                        i = R.id.tabs_host_bottom_nav_tabs_container;
+                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.tabs_host_bottom_nav_tabs_container);
                                                         if (linearLayout != null) {
-                                                            i = 2131365440;
-                                                            UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131365440);
+                                                            i = R.id.tabs_host_bottom_nav_user_avatar_presence_view;
+                                                            UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(R.id.tabs_host_bottom_nav_user_avatar_presence_view);
                                                             if (userAvatarPresenceView != null) {
-                                                                i = 2131365441;
-                                                                FrameLayout frameLayout4 = (FrameLayout) inflate.findViewById(2131365441);
+                                                                i = R.id.tabs_host_bottom_nav_user_settings_item;
+                                                                FrameLayout frameLayout4 = (FrameLayout) inflate.findViewById(R.id.tabs_host_bottom_nav_user_settings_item);
                                                                 if (frameLayout4 != null) {
                                                                     return new TabsHostBottomNavigationViewBinding((LinearLayout) inflate, imageView, constraintLayout, textView, imageView2, constraintLayout2, textView2, imageView3, frameLayout, imageView4, frameLayout2, imageView5, frameLayout3, linearLayout, userAvatarPresenceView, frameLayout4);
                                                                 }
diff --git a/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java b/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java
index 653b808202..2962f42430 100644
--- a/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class ViewAddPermissionOwnerBinding implements ViewBinding {
     @NonNull
     public final View a;
@@ -20,15 +21,15 @@ public final class ViewAddPermissionOwnerBinding implements ViewBinding {
 
     @NonNull
     public static ViewAddPermissionOwnerBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558734, viewGroup);
-        int i = 2131361921;
-        ImageView imageView = (ImageView) viewGroup.findViewById(2131361921);
+        layoutInflater.inflate(R.layout.view_add_permission_owner, viewGroup);
+        int i = R.id.add_icon;
+        ImageView imageView = (ImageView) viewGroup.findViewById(R.id.add_icon);
         if (imageView != null) {
-            i = 2131363941;
-            TextView textView = (TextView) viewGroup.findViewById(2131363941);
+            i = R.id.label;
+            TextView textView = (TextView) viewGroup.findViewById(R.id.label);
             if (textView != null) {
-                i = 2131364175;
-                ImageView imageView2 = (ImageView) viewGroup.findViewById(2131364175);
+                i = R.id.more_arrow;
+                ImageView imageView2 = (ImageView) viewGroup.findViewById(R.id.more_arrow);
                 if (imageView2 != null) {
                     return new ViewAddPermissionOwnerBinding(viewGroup, imageView, textView, imageView2);
                 }
diff --git a/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java b/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java
index 45e0c68444..5ca1bb4288 100644
--- a/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java
@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
 public final class ViewChatEmbedGameInviteBinding implements ViewBinding {
@@ -46,33 +47,33 @@ public final class ViewChatEmbedGameInviteBinding implements ViewBinding {
 
     @NonNull
     public static ViewChatEmbedGameInviteBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558743, viewGroup);
-        int i = 2131363858;
-        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363858);
+        layoutInflater.inflate(R.layout.view_chat_embed_game_invite, viewGroup);
+        int i = R.id.item_game_invite_action_btn;
+        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(R.id.item_game_invite_action_btn);
         if (materialButton != null) {
-            i = 2131363859;
-            TextView textView = (TextView) viewGroup.findViewById(2131363859);
+            i = R.id.item_game_invite_application_name_tv;
+            TextView textView = (TextView) viewGroup.findViewById(R.id.item_game_invite_application_name_tv);
             if (textView != null) {
-                i = 2131363860;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363860);
+                i = R.id.item_game_invite_avatar_iv;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(R.id.item_game_invite_avatar_iv);
                 if (simpleDraweeView != null) {
-                    i = 2131363861;
-                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) viewGroup.findViewById(2131363861);
+                    i = R.id.item_game_invite_avatar_status_iv;
+                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) viewGroup.findViewById(R.id.item_game_invite_avatar_status_iv);
                     if (simpleDraweeView2 != null) {
-                        i = 2131363862;
-                        Barrier barrier = (Barrier) viewGroup.findViewById(2131363862);
+                        i = R.id.item_game_invite_barrier;
+                        Barrier barrier = (Barrier) viewGroup.findViewById(R.id.item_game_invite_barrier);
                         if (barrier != null) {
-                            i = 2131363863;
-                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) viewGroup.findViewById(2131363863);
+                            i = R.id.item_game_invite_cover_iv;
+                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) viewGroup.findViewById(R.id.item_game_invite_cover_iv);
                             if (simpleDraweeView3 != null) {
-                                i = 2131363864;
-                                TextView textView2 = (TextView) viewGroup.findViewById(2131363864);
+                                i = R.id.item_game_invite_header;
+                                TextView textView2 = (TextView) viewGroup.findViewById(R.id.item_game_invite_header);
                                 if (textView2 != null) {
-                                    i = 2131363865;
-                                    RecyclerView recyclerView = (RecyclerView) viewGroup.findViewById(2131363865);
+                                    i = R.id.item_game_invite_recycler;
+                                    RecyclerView recyclerView = (RecyclerView) viewGroup.findViewById(R.id.item_game_invite_recycler);
                                     if (recyclerView != null) {
-                                        i = 2131363866;
-                                        TextView textView3 = (TextView) viewGroup.findViewById(2131363866);
+                                        i = R.id.item_game_invite_subtext;
+                                        TextView textView3 = (TextView) viewGroup.findViewById(R.id.item_game_invite_subtext);
                                         if (textView3 != null) {
                                             return new ViewChatEmbedGameInviteBinding(viewGroup, materialButton, textView, simpleDraweeView, simpleDraweeView2, barrier, simpleDraweeView3, textView2, recyclerView, textView3);
                                         }
diff --git a/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java b/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java
index 616b5bebc8..fd291309a3 100644
--- a/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 public final class ViewDialogConfirmationBinding implements ViewBinding {
     @NonNull
@@ -30,17 +31,17 @@ public final class ViewDialogConfirmationBinding implements ViewBinding {
 
     @NonNull
     public static ViewDialogConfirmationBinding a(@NonNull View view) {
-        int i = 2131365774;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365774);
+        int i = R.id.view_dialog_confirmation_cancel;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.view_dialog_confirmation_cancel);
         if (materialButton != null) {
-            i = 2131365775;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365775);
+            i = R.id.view_dialog_confirmation_confirm;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.view_dialog_confirmation_confirm);
             if (materialButton2 != null) {
-                i = 2131365776;
-                TextView textView = (TextView) view.findViewById(2131365776);
+                i = R.id.view_dialog_confirmation_header;
+                TextView textView = (TextView) view.findViewById(R.id.view_dialog_confirmation_header);
                 if (textView != null) {
-                    i = 2131365777;
-                    TextView textView2 = (TextView) view.findViewById(2131365777);
+                    i = R.id.view_dialog_confirmation_text;
+                    TextView textView2 = (TextView) view.findViewById(R.id.view_dialog_confirmation_text);
                     if (textView2 != null) {
                         return new ViewDialogConfirmationBinding((LinearLayout) view, materialButton, materialButton2, textView, textView2);
                     }
diff --git a/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java
index a091d5c2cf..63c09c9eaa 100644
--- a/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java
@@ -7,6 +7,7 @@ import android.widget.RadioGroup;
 import android.widget.Spinner;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.views.CheckedSetting;
 import com.google.android.material.button.MaterialButton;
 public final class ViewGuildInviteBottomSheetBinding implements ViewBinding {
@@ -36,21 +37,21 @@ public final class ViewGuildInviteBottomSheetBinding implements ViewBinding {
 
     @NonNull
     public static ViewGuildInviteBottomSheetBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558770, viewGroup);
-        int i = 2131363464;
-        Spinner spinner = (Spinner) viewGroup.findViewById(2131363464);
+        layoutInflater.inflate(R.layout.view_guild_invite_bottom_sheet, viewGroup);
+        int i = R.id.guild_invite_channel_spinner;
+        Spinner spinner = (Spinner) viewGroup.findViewById(R.id.guild_invite_channel_spinner);
         if (spinner != null) {
-            i = 2131363470;
-            RadioGroup radioGroup = (RadioGroup) viewGroup.findViewById(2131363470);
+            i = R.id.guild_invite_expires_after_radiogroup;
+            RadioGroup radioGroup = (RadioGroup) viewGroup.findViewById(R.id.guild_invite_expires_after_radiogroup);
             if (radioGroup != null) {
-                i = 2131363471;
-                MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363471);
+                i = R.id.guild_invite_generate_link;
+                MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(R.id.guild_invite_generate_link);
                 if (materialButton != null) {
-                    i = 2131363474;
-                    RadioGroup radioGroup2 = (RadioGroup) viewGroup.findViewById(2131363474);
+                    i = R.id.guild_invite_max_uses_radiogroup;
+                    RadioGroup radioGroup2 = (RadioGroup) viewGroup.findViewById(R.id.guild_invite_max_uses_radiogroup);
                     if (radioGroup2 != null) {
-                        i = 2131363483;
-                        CheckedSetting checkedSetting = (CheckedSetting) viewGroup.findViewById(2131363483);
+                        i = R.id.guild_invite_temporary_membership;
+                        CheckedSetting checkedSetting = (CheckedSetting) viewGroup.findViewById(R.id.guild_invite_temporary_membership);
                         if (checkedSetting != null) {
                             return new ViewGuildInviteBottomSheetBinding(viewGroup, spinner, radioGroup, materialButton, radioGroup2, checkedSetting);
                         }
diff --git a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionBenefitItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionBenefitItemBinding.java
index 5b2b21eb2c..415d874c54 100644
--- a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionBenefitItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionBenefitItemBinding.java
@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 public final class ViewGuildRoleSubscriptionBenefitItemBinding implements ViewBinding {
     @NonNull
@@ -30,18 +31,18 @@ public final class ViewGuildRoleSubscriptionBenefitItemBinding implements ViewBi
 
     @NonNull
     public static ViewGuildRoleSubscriptionBenefitItemBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558772, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.view_guild_role_subscription_benefit_item, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131363548;
-        TextView textView = (TextView) inflate.findViewById(2131363548);
+        int i = R.id.guild_role_subscription_benefit_description;
+        TextView textView = (TextView) inflate.findViewById(R.id.guild_role_subscription_benefit_description);
         if (textView != null) {
-            i = 2131363549;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363549);
+            i = R.id.guild_role_subscription_benefit_image;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.guild_role_subscription_benefit_image);
             if (simpleDraweeView != null) {
-                i = 2131363550;
-                TextView textView2 = (TextView) inflate.findViewById(2131363550);
+                i = R.id.guild_role_subscription_benefit_name;
+                TextView textView2 = (TextView) inflate.findViewById(R.id.guild_role_subscription_benefit_name);
                 if (textView2 != null) {
                     return new ViewGuildRoleSubscriptionBenefitItemBinding((ConstraintLayout) inflate, textView, simpleDraweeView, textView2);
                 }
diff --git a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionImageUploadBinding.java b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionImageUploadBinding.java
index 11b1ee479d..c636b27f79 100644
--- a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionImageUploadBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionImageUploadBinding.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
 public final class ViewGuildRoleSubscriptionImageUploadBinding implements ViewBinding {
@@ -33,18 +34,18 @@ public final class ViewGuildRoleSubscriptionImageUploadBinding implements ViewBi
 
     @NonNull
     public static ViewGuildRoleSubscriptionImageUploadBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558774, viewGroup);
-        int i = 2131363644;
-        ImageView imageView = (ImageView) viewGroup.findViewById(2131363644);
+        layoutInflater.inflate(R.layout.view_guild_role_subscription_image_upload, viewGroup);
+        int i = R.id.guild_subscription_edit_image;
+        ImageView imageView = (ImageView) viewGroup.findViewById(R.id.guild_subscription_edit_image);
         if (imageView != null) {
-            i = 2131363645;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363645);
+            i = R.id.guild_subscription_image;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(R.id.guild_subscription_image);
             if (simpleDraweeView != null) {
-                i = 2131363651;
-                MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363651);
+                i = R.id.guild_subscription_upload_image;
+                MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(R.id.guild_subscription_upload_image);
                 if (materialButton != null) {
-                    i = 2131363652;
-                    TextView textView = (TextView) viewGroup.findViewById(2131363652);
+                    i = R.id.guild_subscription_upload_image_label;
+                    TextView textView = (TextView) viewGroup.findViewById(R.id.guild_subscription_upload_image_label);
                     if (textView != null) {
                         return new ViewGuildRoleSubscriptionImageUploadBinding(viewGroup, imageView, simpleDraweeView, materialButton, textView);
                     }
diff --git a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionPlanDetailsBinding.java b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionPlanDetailsBinding.java
index cc84910aca..b28ace6a31 100644
--- a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionPlanDetailsBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionPlanDetailsBinding.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
@@ -34,30 +35,30 @@ public final class ViewGuildRoleSubscriptionPlanDetailsBinding implements ViewBi
 
     @NonNull
     public static ViewGuildRoleSubscriptionPlanDetailsBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558775, viewGroup);
-        int i = 2131363572;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363572);
+        layoutInflater.inflate(R.layout.view_guild_role_subscription_plan_details, viewGroup);
+        int i = R.id.guild_role_subscription_plan_cover_image;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(R.id.guild_role_subscription_plan_cover_image);
         if (simpleDraweeView != null) {
-            i = 2131363573;
-            TextView textView = (TextView) viewGroup.findViewById(2131363573);
+            i = R.id.guild_role_subscription_plan_cover_image_info;
+            TextView textView = (TextView) viewGroup.findViewById(R.id.guild_role_subscription_plan_cover_image_info);
             if (textView != null) {
-                i = 2131363574;
-                TextView textView2 = (TextView) viewGroup.findViewById(2131363574);
+                i = R.id.guild_role_subscription_plan_cover_image_label;
+                TextView textView2 = (TextView) viewGroup.findViewById(R.id.guild_role_subscription_plan_cover_image_label);
                 if (textView2 != null) {
-                    i = 2131363575;
-                    TextInputEditText textInputEditText = (TextInputEditText) viewGroup.findViewById(2131363575);
+                    i = R.id.guild_role_subscription_plan_description;
+                    TextInputEditText textInputEditText = (TextInputEditText) viewGroup.findViewById(R.id.guild_role_subscription_plan_description);
                     if (textInputEditText != null) {
-                        i = 2131363576;
-                        TextView textView3 = (TextView) viewGroup.findViewById(2131363576);
+                        i = R.id.guild_role_subscription_plan_description_label;
+                        TextView textView3 = (TextView) viewGroup.findViewById(R.id.guild_role_subscription_plan_description_label);
                         if (textView3 != null) {
-                            i = 2131363577;
-                            TextInputLayout textInputLayout = (TextInputLayout) viewGroup.findViewById(2131363577);
+                            i = R.id.guild_role_subscription_plan_description_layout;
+                            TextInputLayout textInputLayout = (TextInputLayout) viewGroup.findViewById(R.id.guild_role_subscription_plan_description_layout);
                             if (textInputLayout != null) {
-                                i = 2131363578;
-                                View findViewById = viewGroup.findViewById(2131363578);
+                                i = R.id.guild_role_subscription_plan_details_divider;
+                                View findViewById = viewGroup.findViewById(R.id.guild_role_subscription_plan_details_divider);
                                 if (findViewById != null) {
-                                    i = 2131363647;
-                                    ImageView imageView = (ImageView) viewGroup.findViewById(2131363647);
+                                    i = R.id.guild_subscription_plan_details_edit_cover_image;
+                                    ImageView imageView = (ImageView) viewGroup.findViewById(R.id.guild_subscription_plan_details_edit_cover_image);
                                     if (imageView != null) {
                                         return new ViewGuildRoleSubscriptionPlanDetailsBinding(viewGroup, simpleDraweeView, textView, textView2, textInputEditText, textView3, textInputLayout, findViewById, imageView);
                                     }
diff --git a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionSectionHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionSectionHeaderItemBinding.java
index e3554f6623..de0828cf09 100644
--- a/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionSectionHeaderItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGuildRoleSubscriptionSectionHeaderItemBinding.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import java.util.Objects;
 public final class ViewGuildRoleSubscriptionSectionHeaderItemBinding implements ViewBinding {
     @NonNull
@@ -21,7 +22,7 @@ public final class ViewGuildRoleSubscriptionSectionHeaderItemBinding implements
 
     @NonNull
     public static ViewGuildRoleSubscriptionSectionHeaderItemBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558776, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.view_guild_role_subscription_section_header_item, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
diff --git a/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java b/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java
index d141d7551a..939cf45e3b 100644
--- a/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java
@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class ViewNitroBoostPerksBinding implements ViewBinding {
     @NonNull
     public final CardView a;
@@ -42,33 +43,33 @@ public final class ViewNitroBoostPerksBinding implements ViewBinding {
 
     @NonNull
     public static ViewNitroBoostPerksBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558792, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.view_nitro_boost_perks, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131362795;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362795);
+        int i = R.id.container;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.container);
         if (linearLayout != null) {
-            i = 2131364420;
-            TextView textView = (TextView) inflate.findViewById(2131364420);
+            i = R.id.perks_level_contents_header;
+            TextView textView = (TextView) inflate.findViewById(R.id.perks_level_contents_header);
             if (textView != null) {
-                i = 2131364421;
-                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364421);
+                i = R.id.perks_level_contents_recycler;
+                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.perks_level_contents_recycler);
                 if (recyclerView != null) {
-                    i = 2131364422;
-                    RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131364422);
+                    i = R.id.perks_level_header;
+                    RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(R.id.perks_level_header);
                     if (relativeLayout != null) {
-                        i = 2131364423;
-                        TextView textView2 = (TextView) inflate.findViewById(2131364423);
+                        i = R.id.perks_level_header_boosts;
+                        TextView textView2 = (TextView) inflate.findViewById(R.id.perks_level_header_boosts);
                         if (textView2 != null) {
-                            i = 2131364424;
-                            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131364424);
+                            i = R.id.perks_level_header_boosts_container;
+                            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(R.id.perks_level_header_boosts_container);
                             if (frameLayout != null) {
-                                i = 2131364425;
-                                TextView textView3 = (TextView) inflate.findViewById(2131364425);
+                                i = R.id.perks_level_header_text;
+                                TextView textView3 = (TextView) inflate.findViewById(R.id.perks_level_header_text);
                                 if (textView3 != null) {
-                                    i = 2131364426;
-                                    CardView cardView = (CardView) inflate.findViewById(2131364426);
+                                    i = R.id.perks_level_header_unlocked;
+                                    CardView cardView = (CardView) inflate.findViewById(R.id.perks_level_header_unlocked);
                                     if (cardView != null) {
                                         return new ViewNitroBoostPerksBinding((CardView) inflate, linearLayout, textView, recyclerView, relativeLayout, textView2, frameLayout, textView3, cardView);
                                     }
diff --git a/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java b/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java
index 14da664834..4f486761f4 100644
--- a/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java
@@ -14,6 +14,7 @@ import androidx.viewbinding.ViewBinding;
 import c.a.j.g2;
 import c.a.j.h2;
 import c.a.j.p4;
+import com.discord.R;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.widgets.mobile_reports.MobileReportsBottomButton;
 import com.discord.widgets.mobile_reports.MobileReportsBreadcrumbs;
@@ -71,111 +72,111 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding {
 
     @NonNull
     public static ViewReportsMenuNodeBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558813, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.view_reports_menu_node, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131364138;
-        View findViewById = inflate.findViewById(2131364138);
+        int i = R.id.mobile_reports_channel_preview;
+        View findViewById = inflate.findViewById(R.id.mobile_reports_channel_preview);
         if (findViewById != null) {
-            int i2 = 2131364139;
-            Guideline guideline = (Guideline) findViewById.findViewById(2131364139);
+            int i2 = R.id.mobile_reports_channel_preview_bottom_guideline;
+            Guideline guideline = (Guideline) findViewById.findViewById(R.id.mobile_reports_channel_preview_bottom_guideline);
             if (guideline != null) {
-                i2 = 2131364140;
-                TextView textView = (TextView) findViewById.findViewById(2131364140);
+                i2 = R.id.mobile_reports_channel_preview_channel_name;
+                TextView textView = (TextView) findViewById.findViewById(R.id.mobile_reports_channel_preview_channel_name);
                 if (textView != null) {
-                    i2 = 2131364141;
-                    Guideline guideline2 = (Guideline) findViewById.findViewById(2131364141);
+                    i2 = R.id.mobile_reports_channel_preview_end_guideline;
+                    Guideline guideline2 = (Guideline) findViewById.findViewById(R.id.mobile_reports_channel_preview_end_guideline);
                     if (guideline2 != null) {
-                        i2 = 2131364142;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(2131364142);
+                        i2 = R.id.mobile_reports_channel_preview_image;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(R.id.mobile_reports_channel_preview_image);
                         if (simpleDraweeView != null) {
-                            i2 = 2131364143;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131364143);
+                            i2 = R.id.mobile_reports_channel_preview_stage_title;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(R.id.mobile_reports_channel_preview_stage_title);
                             if (linkifiedTextView != null) {
-                                i2 = 2131364144;
-                                Guideline guideline3 = (Guideline) findViewById.findViewById(2131364144);
+                                i2 = R.id.mobile_reports_channel_preview_start_guideline;
+                                Guideline guideline3 = (Guideline) findViewById.findViewById(R.id.mobile_reports_channel_preview_start_guideline);
                                 if (guideline3 != null) {
-                                    i2 = 2131364145;
-                                    Guideline guideline4 = (Guideline) findViewById.findViewById(2131364145);
+                                    i2 = R.id.mobile_reports_channel_preview_top_guideline;
+                                    Guideline guideline4 = (Guideline) findViewById.findViewById(R.id.mobile_reports_channel_preview_top_guideline);
                                     if (guideline4 != null) {
                                         h2 h2Var = new h2((ConstraintLayout) findViewById, guideline, textView, guideline2, simpleDraweeView, linkifiedTextView, guideline3, guideline4);
-                                        i = 2131364148;
-                                        View findViewById2 = inflate.findViewById(2131364148);
+                                        i = R.id.mobile_reports_message_preview;
+                                        View findViewById2 = inflate.findViewById(R.id.mobile_reports_message_preview);
                                         if (findViewById2 != null) {
-                                            int i3 = 2131362544;
-                                            ImageView imageView = (ImageView) findViewById2.findViewById(2131362544);
+                                            int i3 = R.id.chat_list_adapter_item_chat_attachment_icon;
+                                            ImageView imageView = (ImageView) findViewById2.findViewById(R.id.chat_list_adapter_item_chat_attachment_icon);
                                             if (imageView != null) {
-                                                i3 = 2131362561;
-                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById2.findViewById(2131362561);
+                                                i3 = R.id.chat_list_adapter_item_text;
+                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById2.findViewById(R.id.chat_list_adapter_item_text);
                                                 if (linkifiedTextView2 != null) {
-                                                    i3 = 2131362562;
-                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById2.findViewById(2131362562);
+                                                    i3 = R.id.chat_list_adapter_item_text_avatar;
+                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById2.findViewById(R.id.chat_list_adapter_item_text_avatar);
                                                     if (simpleDraweeView2 != null) {
-                                                        i3 = 2131362573;
-                                                        TextView textView2 = (TextView) findViewById2.findViewById(2131362573);
+                                                        i3 = R.id.chat_list_adapter_item_text_name;
+                                                        TextView textView2 = (TextView) findViewById2.findViewById(R.id.chat_list_adapter_item_text_name);
                                                         if (textView2 != null) {
-                                                            i3 = 2131364639;
-                                                            Guideline guideline5 = (Guideline) findViewById2.findViewById(2131364639);
+                                                            i3 = R.id.report_message_end_guideline;
+                                                            Guideline guideline5 = (Guideline) findViewById2.findViewById(R.id.report_message_end_guideline);
                                                             if (guideline5 != null) {
-                                                                i3 = 2131364640;
-                                                                Guideline guideline6 = (Guideline) findViewById2.findViewById(2131364640);
+                                                                i3 = R.id.report_message_start_guideline;
+                                                                Guideline guideline6 = (Guideline) findViewById2.findViewById(R.id.report_message_start_guideline);
                                                                 if (guideline6 != null) {
-                                                                    i3 = 2131364641;
-                                                                    Guideline guideline7 = (Guideline) findViewById2.findViewById(2131364641);
+                                                                    i3 = R.id.report_message_top_guideline;
+                                                                    Guideline guideline7 = (Guideline) findViewById2.findViewById(R.id.report_message_top_guideline);
                                                                     if (guideline7 != null) {
                                                                         p4 p4Var = new p4((ConstraintLayout) findViewById2, imageView, linkifiedTextView2, simpleDraweeView2, textView2, guideline5, guideline6, guideline7);
-                                                                        i = 2131364149;
-                                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364149);
+                                                                        i = R.id.mobile_reports_multiselect;
+                                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.mobile_reports_multiselect);
                                                                         if (linearLayout != null) {
-                                                                            i = 2131364150;
-                                                                            View findViewById3 = inflate.findViewById(2131364150);
+                                                                            i = R.id.mobile_reports_node_block_user;
+                                                                            View findViewById3 = inflate.findViewById(R.id.mobile_reports_node_block_user);
                                                                             if (findViewById3 != null) {
-                                                                                int i4 = 2131364133;
-                                                                                SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById3.findViewById(2131364133);
+                                                                                int i4 = R.id.mobile_reports_block_user_avatar;
+                                                                                SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById3.findViewById(R.id.mobile_reports_block_user_avatar);
                                                                                 if (simpleDraweeView3 != null) {
-                                                                                    i4 = 2131364134;
-                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131364134);
+                                                                                    i4 = R.id.mobile_reports_block_user_button;
+                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(R.id.mobile_reports_block_user_button);
                                                                                     if (materialButton != null) {
-                                                                                        i4 = 2131364135;
-                                                                                        TextView textView3 = (TextView) findViewById3.findViewById(2131364135);
+                                                                                        i4 = R.id.mobile_reports_block_user_description;
+                                                                                        TextView textView3 = (TextView) findViewById3.findViewById(R.id.mobile_reports_block_user_description);
                                                                                         if (textView3 != null) {
-                                                                                            i4 = 2131364136;
-                                                                                            TextView textView4 = (TextView) findViewById3.findViewById(2131364136);
+                                                                                            i4 = R.id.mobile_reports_block_user_header;
+                                                                                            TextView textView4 = (TextView) findViewById3.findViewById(R.id.mobile_reports_block_user_header);
                                                                                             if (textView4 != null) {
-                                                                                                i4 = 2131364137;
-                                                                                                TextView textView5 = (TextView) findViewById3.findViewById(2131364137);
+                                                                                                i4 = R.id.mobile_reports_block_user_name;
+                                                                                                TextView textView5 = (TextView) findViewById3.findViewById(R.id.mobile_reports_block_user_name);
                                                                                                 if (textView5 != null) {
                                                                                                     g2 g2Var = new g2((LinearLayout) findViewById3, simpleDraweeView3, materialButton, textView3, textView4, textView5);
-                                                                                                    i = 2131364151;
-                                                                                                    MobileReportsBottomButton mobileReportsBottomButton = (MobileReportsBottomButton) inflate.findViewById(2131364151);
+                                                                                                    i = R.id.mobile_reports_node_bottom_button;
+                                                                                                    MobileReportsBottomButton mobileReportsBottomButton = (MobileReportsBottomButton) inflate.findViewById(R.id.mobile_reports_node_bottom_button);
                                                                                                     if (mobileReportsBottomButton != null) {
-                                                                                                        i = 2131364152;
-                                                                                                        MobileReportsBreadcrumbs mobileReportsBreadcrumbs = (MobileReportsBreadcrumbs) inflate.findViewById(2131364152);
+                                                                                                        i = R.id.mobile_reports_node_breadcrumbs;
+                                                                                                        MobileReportsBreadcrumbs mobileReportsBreadcrumbs = (MobileReportsBreadcrumbs) inflate.findViewById(R.id.mobile_reports_node_breadcrumbs);
                                                                                                         if (mobileReportsBreadcrumbs != null) {
-                                                                                                            i = 2131364153;
-                                                                                                            MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(2131364153);
+                                                                                                            i = R.id.mobile_reports_node_channel_preview;
+                                                                                                            MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(R.id.mobile_reports_node_channel_preview);
                                                                                                             if (materialCardView != null) {
-                                                                                                                i = 2131364154;
-                                                                                                                LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131364154);
+                                                                                                                i = R.id.mobile_reports_node_child_list;
+                                                                                                                LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(R.id.mobile_reports_node_child_list);
                                                                                                                 if (linearLayout2 != null) {
-                                                                                                                    i = 2131364155;
-                                                                                                                    TextView textView6 = (TextView) inflate.findViewById(2131364155);
+                                                                                                                    i = R.id.mobile_reports_node_header;
+                                                                                                                    TextView textView6 = (TextView) inflate.findViewById(R.id.mobile_reports_node_header);
                                                                                                                     if (textView6 != null) {
-                                                                                                                        i = 2131364156;
-                                                                                                                        MaterialCardView materialCardView2 = (MaterialCardView) inflate.findViewById(2131364156);
+                                                                                                                        i = R.id.mobile_reports_node_info_box;
+                                                                                                                        MaterialCardView materialCardView2 = (MaterialCardView) inflate.findViewById(R.id.mobile_reports_node_info_box);
                                                                                                                         if (materialCardView2 != null) {
-                                                                                                                            i = 2131364157;
-                                                                                                                            TextView textView7 = (TextView) inflate.findViewById(2131364157);
+                                                                                                                            i = R.id.mobile_reports_node_info_text;
+                                                                                                                            TextView textView7 = (TextView) inflate.findViewById(R.id.mobile_reports_node_info_text);
                                                                                                                             if (textView7 != null) {
-                                                                                                                                i = 2131364158;
-                                                                                                                                MaterialCardView materialCardView3 = (MaterialCardView) inflate.findViewById(2131364158);
+                                                                                                                                i = R.id.mobile_reports_node_message_preview;
+                                                                                                                                MaterialCardView materialCardView3 = (MaterialCardView) inflate.findViewById(R.id.mobile_reports_node_message_preview);
                                                                                                                                 if (materialCardView3 != null) {
-                                                                                                                                    i = 2131364159;
-                                                                                                                                    LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131364159);
+                                                                                                                                    i = R.id.mobile_reports_node_subheader;
+                                                                                                                                    LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(R.id.mobile_reports_node_subheader);
                                                                                                                                     if (linkifiedTextView3 != null) {
-                                                                                                                                        i = 2131364160;
-                                                                                                                                        ImageView imageView2 = (ImageView) inflate.findViewById(2131364160);
+                                                                                                                                        i = R.id.mobile_reports_node_success_shield;
+                                                                                                                                        ImageView imageView2 = (ImageView) inflate.findViewById(R.id.mobile_reports_node_success_shield);
                                                                                                                                         if (imageView2 != null) {
                                                                                                                                             return new ViewReportsMenuNodeBinding((ConstraintLayout) inflate, h2Var, p4Var, linearLayout, g2Var, mobileReportsBottomButton, mobileReportsBreadcrumbs, materialCardView, linearLayout2, textView6, materialCardView2, textView7, materialCardView3, linkifiedTextView3, imageView2);
                                                                                                                                         }
diff --git a/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java b/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java
index 8d04f51249..de5416c21d 100644
--- a/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.views.NumericBadgingView;
 import com.discord.views.calls.VolumeSliderView;
 import com.google.android.material.textview.MaterialTextView;
@@ -94,75 +95,75 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding {
 
     @NonNull
     public static VoiceControlsSheetViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558854, viewGroup);
-        int i = 2131361994;
-        ImageView imageView = (ImageView) viewGroup.findViewById(2131361994);
+        layoutInflater.inflate(R.layout.voice_controls_sheet_view, viewGroup);
+        int i = R.id.audio_output_button;
+        ImageView imageView = (ImageView) viewGroup.findViewById(R.id.audio_output_button);
         if (imageView != null) {
-            i = 2131361995;
-            FrameLayout frameLayout = (FrameLayout) viewGroup.findViewById(2131361995);
+            i = R.id.audio_output_container;
+            FrameLayout frameLayout = (FrameLayout) viewGroup.findViewById(R.id.audio_output_container);
             if (frameLayout != null) {
-                i = 2131361996;
-                ImageView imageView2 = (ImageView) viewGroup.findViewById(2131361996);
+                i = R.id.audio_output_more;
+                ImageView imageView2 = (ImageView) viewGroup.findViewById(R.id.audio_output_more);
                 if (imageView2 != null) {
-                    i = 2131361997;
-                    TextView textView = (TextView) viewGroup.findViewById(2131361997);
+                    i = R.id.audio_output_secondary_button;
+                    TextView textView = (TextView) viewGroup.findViewById(R.id.audio_output_secondary_button);
                     if (textView != null) {
-                        i = 2131362892;
-                        TextView textView2 = (TextView) viewGroup.findViewById(2131362892);
+                        i = R.id.deafen_secondary_button;
+                        TextView textView2 = (TextView) viewGroup.findViewById(R.id.deafen_secondary_button);
                         if (textView2 != null) {
-                            i = 2131362971;
-                            ImageView imageView3 = (ImageView) viewGroup.findViewById(2131362971);
+                            i = R.id.disconnect_button;
+                            ImageView imageView3 = (ImageView) viewGroup.findViewById(R.id.disconnect_button);
                             if (imageView3 != null) {
-                                i = 2131363707;
-                                View findViewById = viewGroup.findViewById(2131363707);
+                                i = R.id.handle;
+                                View findViewById = viewGroup.findViewById(R.id.handle);
                                 if (findViewById != null) {
-                                    i = 2131363820;
-                                    ImageView imageView4 = (ImageView) viewGroup.findViewById(2131363820);
+                                    i = R.id.invite_button;
+                                    ImageView imageView4 = (ImageView) viewGroup.findViewById(R.id.invite_button);
                                     if (imageView4 != null) {
-                                        i = 2131363837;
-                                        TextView textView3 = (TextView) viewGroup.findViewById(2131363837);
+                                        i = R.id.invite_secondary_button;
+                                        TextView textView3 = (TextView) viewGroup.findViewById(R.id.invite_secondary_button);
                                         if (textView3 != null) {
-                                            i = 2131364177;
-                                            ImageView imageView5 = (ImageView) viewGroup.findViewById(2131364177);
+                                            i = R.id.move_to_audience_button;
+                                            ImageView imageView5 = (ImageView) viewGroup.findViewById(R.id.move_to_audience_button);
                                             if (imageView5 != null) {
-                                                i = 2131364202;
-                                                ImageView imageView6 = (ImageView) viewGroup.findViewById(2131364202);
+                                                i = R.id.mute_button;
+                                                ImageView imageView6 = (ImageView) viewGroup.findViewById(R.id.mute_button);
                                                 if (imageView6 != null) {
-                                                    i = 2131364413;
-                                                    LinearLayout linearLayout = (LinearLayout) viewGroup.findViewById(2131364413);
+                                                    i = R.id.peek_container;
+                                                    LinearLayout linearLayout = (LinearLayout) viewGroup.findViewById(R.id.peek_container);
                                                     if (linearLayout != null) {
-                                                        i = 2131364609;
-                                                        Button button = (Button) viewGroup.findViewById(2131364609);
+                                                        i = R.id.push_to_talk_button;
+                                                        Button button = (Button) viewGroup.findViewById(R.id.push_to_talk_button);
                                                         if (button != null) {
-                                                            i = 2131364613;
-                                                            NumericBadgingView numericBadgingView = (NumericBadgingView) viewGroup.findViewById(2131364613);
+                                                            i = R.id.raise_hand_badge;
+                                                            NumericBadgingView numericBadgingView = (NumericBadgingView) viewGroup.findViewById(R.id.raise_hand_badge);
                                                             if (numericBadgingView != null) {
-                                                                i = 2131364614;
-                                                                ImageView imageView7 = (ImageView) viewGroup.findViewById(2131364614);
+                                                                i = R.id.raise_hand_button;
+                                                                ImageView imageView7 = (ImageView) viewGroup.findViewById(R.id.raise_hand_button);
                                                                 if (imageView7 != null) {
-                                                                    i = 2131364747;
-                                                                    ImageView imageView8 = (ImageView) viewGroup.findViewById(2131364747);
+                                                                    i = R.id.screen_share_button;
+                                                                    ImageView imageView8 = (ImageView) viewGroup.findViewById(R.id.screen_share_button);
                                                                     if (imageView8 != null) {
-                                                                        i = 2131364750;
-                                                                        TextView textView4 = (TextView) viewGroup.findViewById(2131364750);
+                                                                        i = R.id.screen_share_secondary_button;
+                                                                        TextView textView4 = (TextView) viewGroup.findViewById(R.id.screen_share_secondary_button);
                                                                         if (textView4 != null) {
-                                                                            i = 2131364791;
-                                                                            CardView cardView = (CardView) viewGroup.findViewById(2131364791);
+                                                                            i = R.id.secondary_actions_card;
+                                                                            CardView cardView = (CardView) viewGroup.findViewById(R.id.secondary_actions_card);
                                                                             if (cardView != null) {
-                                                                                i = 2131365247;
-                                                                                MaterialTextView materialTextView = (MaterialTextView) viewGroup.findViewById(2131365247);
+                                                                                i = R.id.stage_disconnect_button_large;
+                                                                                MaterialTextView materialTextView = (MaterialTextView) viewGroup.findViewById(R.id.stage_disconnect_button_large);
                                                                                 if (materialTextView != null) {
-                                                                                    i = 2131365372;
-                                                                                    ImageView imageView9 = (ImageView) viewGroup.findViewById(2131365372);
+                                                                                    i = R.id.stop_watching_button;
+                                                                                    ImageView imageView9 = (ImageView) viewGroup.findViewById(R.id.stop_watching_button);
                                                                                     if (imageView9 != null) {
-                                                                                        i = 2131365377;
-                                                                                        TextView textView5 = (TextView) viewGroup.findViewById(2131365377);
+                                                                                        i = R.id.stream_volume_label;
+                                                                                        TextView textView5 = (TextView) viewGroup.findViewById(R.id.stream_volume_label);
                                                                                         if (textView5 != null) {
-                                                                                            i = 2131365378;
-                                                                                            VolumeSliderView volumeSliderView = (VolumeSliderView) viewGroup.findViewById(2131365378);
+                                                                                            i = R.id.stream_volume_slider;
+                                                                                            VolumeSliderView volumeSliderView = (VolumeSliderView) viewGroup.findViewById(R.id.stream_volume_slider);
                                                                                             if (volumeSliderView != null) {
-                                                                                                i = 2131365772;
-                                                                                                ImageView imageView10 = (ImageView) viewGroup.findViewById(2131365772);
+                                                                                                i = R.id.video_button;
+                                                                                                ImageView imageView10 = (ImageView) viewGroup.findViewById(R.id.video_button);
                                                                                                 if (imageView10 != null) {
                                                                                                     return new VoiceControlsSheetViewBinding(viewGroup, imageView, frameLayout, imageView2, textView, textView2, imageView3, findViewById, imageView4, textView3, imageView5, imageView6, linearLayout, button, numericBadgingView, imageView7, imageView8, textView4, cardView, materialTextView, imageView9, textView5, volumeSliderView, imageView10);
                                                                                                 }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java
index 062a340381..f41436cef4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetChannelMembersListItemHeaderBinding implements ViewBinding {
     @NonNull
     public final FrameLayout a;
@@ -21,15 +22,15 @@ public final class WidgetChannelMembersListItemHeaderBinding implements ViewBind
 
     @NonNull
     public static WidgetChannelMembersListItemHeaderBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558893, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.widget_channel_members_list_item_header, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        TextView textView = (TextView) inflate.findViewById(2131362308);
+        TextView textView = (TextView) inflate.findViewById(R.id.channel_members_list_item_header_text);
         if (textView != null) {
             return new WidgetChannelMembersListItemHeaderBinding((FrameLayout) inflate, textView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362308)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.channel_members_list_item_header_text)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java
index 546ac8fd2c..1f934573ea 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java
@@ -7,6 +7,7 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetChannelMembersListItemPlaceholderHeaderBinding implements ViewBinding {
     @NonNull
     public final FrameLayout a;
@@ -17,15 +18,15 @@ public final class WidgetChannelMembersListItemPlaceholderHeaderBinding implemen
 
     @NonNull
     public static WidgetChannelMembersListItemPlaceholderHeaderBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558895, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.widget_channel_members_list_item_placeholder_header, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        View findViewById = inflate.findViewById(2131362307);
+        View findViewById = inflate.findViewById(R.id.channel_members_list_item_header_placeholder);
         if (findViewById != null) {
             return new WidgetChannelMembersListItemPlaceholderHeaderBinding((FrameLayout) inflate, findViewById);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362307)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.channel_members_list_item_header_placeholder)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java
index 130d8eb069..0edc389a02 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetChannelsListItemDirectoryBinding implements ViewBinding {
     @NonNull
     public final LinearLayout a;
@@ -24,11 +25,11 @@ public final class WidgetChannelsListItemDirectoryBinding implements ViewBinding
 
     @NonNull
     public static WidgetChannelsListItemDirectoryBinding a(@NonNull View view) {
-        int i = 2131362958;
-        ImageView imageView = (ImageView) view.findViewById(2131362958);
+        int i = R.id.directory_channel_icon;
+        ImageView imageView = (ImageView) view.findViewById(R.id.directory_channel_icon);
         if (imageView != null) {
-            i = 2131362959;
-            TextView textView = (TextView) view.findViewById(2131362959);
+            i = R.id.directory_channel_name;
+            TextView textView = (TextView) view.findViewById(R.id.directory_channel_name);
             if (textView != null) {
                 return new WidgetChannelsListItemDirectoryBinding((LinearLayout) view, imageView, textView);
             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
index 836ee2bc94..00f55d94e5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetChatInputCommandApplicationHeaderItemBinding implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
@@ -27,15 +28,15 @@ public final class WidgetChatInputCommandApplicationHeaderItemBinding implements
 
     @NonNull
     public static WidgetChatInputCommandApplicationHeaderItemBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558941, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.widget_chat_input_command_application_header_item, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131362479;
-        ImageView imageView = (ImageView) inflate.findViewById(2131362479);
+        int i = R.id.chat_input_application_avatar;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.chat_input_application_avatar);
         if (imageView != null) {
-            i = 2131362482;
-            TextView textView = (TextView) inflate.findViewById(2131362482);
+            i = R.id.chat_input_application_name;
+            TextView textView = (TextView) inflate.findViewById(R.id.chat_input_application_name);
             if (textView != null) {
                 return new WidgetChatInputCommandApplicationHeaderItemBinding((ConstraintLayout) inflate, imageView, textView);
             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java
index 9cd2fdf4f6..0447f0219d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextBinding.java
@@ -13,6 +13,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
 import com.discord.views.typing.TypingDots;
@@ -47,77 +48,77 @@ public final class WidgetChatListAdapterItemTextBinding implements ViewBinding {
 
     @NonNull
     public static WidgetChatListAdapterItemTextBinding a(@NonNull View view) {
-        int i = 2131362549;
-        View findViewById = view.findViewById(2131362549);
+        int i = R.id.chat_list_adapter_item_gutter_bg;
+        View findViewById = view.findViewById(R.id.chat_list_adapter_item_gutter_bg);
         if (findViewById != null) {
-            i = 2131362551;
-            View findViewById2 = view.findViewById(2131362551);
+            i = R.id.chat_list_adapter_item_highlighted_bg;
+            View findViewById2 = view.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
             if (findViewById2 != null) {
-                i = 2131362554;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362554);
+                i = R.id.chat_list_adapter_item_reply_leading_views;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.chat_list_adapter_item_reply_leading_views);
                 if (linearLayout != null) {
-                    i = 2131362555;
-                    View findViewById3 = view.findViewById(2131362555);
+                    i = R.id.chat_list_adapter_item_selectable_background;
+                    View findViewById3 = view.findViewById(R.id.chat_list_adapter_item_selectable_background);
                     if (findViewById3 != null) {
-                        i = 2131362561;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362561);
+                        i = R.id.chat_list_adapter_item_text;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.chat_list_adapter_item_text);
                         if (linkifiedTextView != null) {
-                            i = 2131362562;
-                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362562);
+                            i = R.id.chat_list_adapter_item_text_avatar;
+                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.chat_list_adapter_item_text_avatar);
                             if (simpleDraweeView != null) {
-                                i = 2131362564;
-                                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362564);
+                                i = R.id.chat_list_adapter_item_text_decorator;
+                                FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.chat_list_adapter_item_text_decorator);
                                 if (frameLayout != null) {
-                                    i = 2131362565;
-                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362565);
+                                    i = R.id.chat_list_adapter_item_text_decorator_avatar;
+                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.chat_list_adapter_item_text_decorator_avatar);
                                     if (simpleDraweeView2 != null) {
-                                        i = 2131362566;
-                                        ImageView imageView = (ImageView) view.findViewById(2131362566);
+                                        i = R.id.chat_list_adapter_item_text_decorator_reply_icon;
+                                        ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_adapter_item_text_decorator_reply_icon);
                                         if (imageView != null) {
-                                            i = 2131362567;
-                                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131362567);
+                                            i = R.id.chat_list_adapter_item_text_decorator_reply_link_icon;
+                                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.chat_list_adapter_item_text_decorator_reply_link_icon);
                                             if (frameLayout2 != null) {
-                                                i = 2131362568;
-                                                TextView textView = (TextView) view.findViewById(2131362568);
+                                                i = R.id.chat_list_adapter_item_text_decorator_reply_name;
+                                                TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_decorator_reply_name);
                                                 if (textView != null) {
-                                                    i = 2131362570;
-                                                    ImageView imageView2 = (ImageView) view.findViewById(2131362570);
+                                                    i = R.id.chat_list_adapter_item_text_error;
+                                                    ImageView imageView2 = (ImageView) view.findViewById(R.id.chat_list_adapter_item_text_error);
                                                     if (imageView2 != null) {
-                                                        i = 2131362571;
-                                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362571);
+                                                        i = R.id.chat_list_adapter_item_text_header;
+                                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.chat_list_adapter_item_text_header);
                                                         if (constraintLayout != null) {
-                                                            i = 2131362572;
-                                                            TextView textView2 = (TextView) view.findViewById(2131362572);
+                                                            i = R.id.chat_list_adapter_item_text_loading;
+                                                            TextView textView2 = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_loading);
                                                             if (textView2 != null) {
-                                                                i = 2131362573;
-                                                                TextView textView3 = (TextView) view.findViewById(2131362573);
+                                                                i = R.id.chat_list_adapter_item_text_name;
+                                                                TextView textView3 = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_name);
                                                                 if (textView3 != null) {
-                                                                    i = 2131362574;
-                                                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131362574);
+                                                                    i = R.id.chat_list_adapter_item_text_reply_content;
+                                                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.chat_list_adapter_item_text_reply_content);
                                                                     if (simpleDraweeSpanTextView != null) {
-                                                                        i = 2131362575;
-                                                                        TextView textView4 = (TextView) view.findViewById(2131362575);
+                                                                        i = R.id.chat_list_adapter_item_text_tag;
+                                                                        TextView textView4 = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_tag);
                                                                         if (textView4 != null) {
-                                                                            i = 2131362576;
-                                                                            TextView textView5 = (TextView) view.findViewById(2131362576);
+                                                                            i = R.id.chat_list_adapter_item_text_timestamp;
+                                                                            TextView textView5 = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_timestamp);
                                                                             if (textView5 != null) {
-                                                                                i = 2131362577;
-                                                                                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362577);
+                                                                                i = R.id.chat_list_adapter_item_thread_embed_spine;
+                                                                                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.chat_list_adapter_item_thread_embed_spine);
                                                                                 if (appCompatImageView != null) {
-                                                                                    i = 2131362628;
-                                                                                    TypingDots typingDots = (TypingDots) view.findViewById(2131362628);
+                                                                                    i = R.id.chat_overlay_typing_dots;
+                                                                                    TypingDots typingDots = (TypingDots) view.findViewById(R.id.chat_overlay_typing_dots);
                                                                                     if (typingDots != null) {
-                                                                                        i = 2131365547;
-                                                                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131365547);
+                                                                                        i = R.id.thread_starter_message_header;
+                                                                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(R.id.thread_starter_message_header);
                                                                                         if (constraintLayout2 != null) {
-                                                                                            i = 2131365548;
-                                                                                            ImageView imageView3 = (ImageView) view.findViewById(2131365548);
+                                                                                            i = R.id.thread_starter_message_header_icon;
+                                                                                            ImageView imageView3 = (ImageView) view.findViewById(R.id.thread_starter_message_header_icon);
                                                                                             if (imageView3 != null) {
-                                                                                                i = 2131365549;
-                                                                                                TextView textView6 = (TextView) view.findViewById(2131365549);
+                                                                                                i = R.id.thread_starter_message_header_text;
+                                                                                                TextView textView6 = (TextView) view.findViewById(R.id.thread_starter_message_header_text);
                                                                                                 if (textView6 != null) {
-                                                                                                    i = 2131365605;
-                                                                                                    Guideline guideline = (Guideline) view.findViewById(2131365605);
+                                                                                                    i = R.id.uikit_chat_guideline;
+                                                                                                    Guideline guideline = (Guideline) view.findViewById(R.id.uikit_chat_guideline);
                                                                                                     if (guideline != null) {
                                                                                                         ConstraintLayout constraintLayout3 = (ConstraintLayout) view;
                                                                                                         return new WidgetChatListAdapterItemTextBinding(constraintLayout3, findViewById, findViewById2, linearLayout, findViewById3, linkifiedTextView, simpleDraweeView, frameLayout, simpleDraweeView2, imageView, frameLayout2, textView, imageView2, constraintLayout, textView2, textView3, simpleDraweeSpanTextView, textView4, textView5, appCompatImageView, typingDots, constraintLayout2, imageView3, textView6, guideline, constraintLayout3);
@@ -150,7 +151,7 @@ public final class WidgetChatListAdapterItemTextBinding implements ViewBinding {
 
     @NonNull
     public static WidgetChatListAdapterItemTextBinding b(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558987, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.widget_chat_list_adapter_item_text, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
index ef8b53a476..76fa60a03c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
@@ -5,6 +5,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetChatListAdapterItemTextDividerBinding implements ViewBinding {
     @NonNull
     public final RelativeLayout a;
@@ -26,14 +27,14 @@ public final class WidgetChatListAdapterItemTextDividerBinding implements ViewBi
 
     @NonNull
     public static WidgetChatListAdapterItemTextDividerBinding a(@NonNull View view) {
-        int i = 2131363026;
-        View findViewById = view.findViewById(2131363026);
+        int i = R.id.divider_stroke_left;
+        View findViewById = view.findViewById(R.id.divider_stroke_left);
         if (findViewById != null) {
-            i = 2131363027;
-            View findViewById2 = view.findViewById(2131363027);
+            i = R.id.divider_stroke_right;
+            View findViewById2 = view.findViewById(R.id.divider_stroke_right);
             if (findViewById2 != null) {
-                i = 2131363028;
-                TextView textView = (TextView) view.findViewById(2131363028);
+                i = R.id.divider_text;
+                TextView textView = (TextView) view.findViewById(R.id.divider_text);
                 if (textView != null) {
                     return new WidgetChatListAdapterItemTextDividerBinding((RelativeLayout) view, findViewById, findViewById2, textView);
                 }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
index c1da239bcb..8c951a5cd5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.discord.views.typing.TypingDots;
 import com.discord.widgets.botuikit.views.ButtonComponentView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -36,20 +37,20 @@ public final class WidgetChatListBotUiButtonComponentBinding implements ViewBind
 
     @NonNull
     public static WidgetChatListBotUiButtonComponentBinding a(@NonNull View view) {
-        int i = 2131362212;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362212);
+        int i = R.id.button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.button);
         if (materialButton != null) {
-            i = 2131363090;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363090);
+            i = R.id.emoji;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.emoji);
             if (simpleDraweeView != null) {
-                i = 2131363941;
-                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131363941);
+                i = R.id.label;
+                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.label);
                 if (materialTextView != null) {
-                    i = 2131363967;
-                    AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363967);
+                    i = R.id.link_icon;
+                    AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.link_icon);
                     if (appCompatImageView != null) {
-                        i = 2131363980;
-                        TypingDots typingDots = (TypingDots) view.findViewById(2131363980);
+                        i = R.id.loading_dots;
+                        TypingDots typingDots = (TypingDots) view.findViewById(R.id.loading_dots);
                         if (typingDots != null) {
                             return new WidgetChatListBotUiButtonComponentBinding((ButtonComponentView) view, materialButton, simpleDraweeView, materialTextView, appCompatImageView, typingDots);
                         }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
index 42f14e74ea..c7edbb9830 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
@@ -5,6 +5,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.card.MaterialCardView;
 public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding {
     @NonNull
@@ -36,21 +37,21 @@ public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding
 
     @NonNull
     public static WidgetChoosePlanAdapterPlanItemBinding a(@NonNull View view) {
-        int i = 2131364449;
-        ImageView imageView = (ImageView) view.findViewById(2131364449);
+        int i = R.id.plan_item_border;
+        ImageView imageView = (ImageView) view.findViewById(R.id.plan_item_border);
         if (imageView != null) {
             MaterialCardView materialCardView = (MaterialCardView) view;
-            i = 2131364451;
-            TextView textView = (TextView) view.findViewById(2131364451);
+            i = R.id.plan_item_current_plan;
+            TextView textView = (TextView) view.findViewById(R.id.plan_item_current_plan);
             if (textView != null) {
-                i = 2131364452;
-                ImageView imageView2 = (ImageView) view.findViewById(2131364452);
+                i = R.id.plan_item_icon;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.plan_item_icon);
                 if (imageView2 != null) {
-                    i = 2131364453;
-                    TextView textView2 = (TextView) view.findViewById(2131364453);
+                    i = R.id.plan_item_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.plan_item_name);
                     if (textView2 != null) {
-                        i = 2131364454;
-                        TextView textView3 = (TextView) view.findViewById(2131364454);
+                        i = R.id.plan_item_price;
+                        TextView textView3 = (TextView) view.findViewById(R.id.plan_item_price);
                         if (textView3 != null) {
                             return new WidgetChoosePlanAdapterPlanItemBinding(materialCardView, imageView, materialCardView, textView, imageView2, textView2, textView3);
                         }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
index 28be2f07f6..9a547d1cf4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
@@ -5,6 +5,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetFolderContextMenuBinding implements ViewBinding {
     @NonNull
     public final CardView a;
@@ -30,17 +31,17 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding {
     @NonNull
     public static WidgetFolderContextMenuBinding a(@NonNull View view) {
         CardView cardView = (CardView) view;
-        int i = 2131363308;
-        TextView textView = (TextView) view.findViewById(2131363308);
+        int i = R.id.folder_context_menu_header;
+        TextView textView = (TextView) view.findViewById(R.id.folder_context_menu_header);
         if (textView != null) {
-            i = 2131363309;
-            View findViewById = view.findViewById(2131363309);
+            i = R.id.folder_context_menu_header_divider;
+            View findViewById = view.findViewById(R.id.folder_context_menu_header_divider);
             if (findViewById != null) {
-                i = 2131363310;
-                TextView textView2 = (TextView) view.findViewById(2131363310);
+                i = R.id.folder_context_menu_mark_as_read;
+                TextView textView2 = (TextView) view.findViewById(R.id.folder_context_menu_mark_as_read);
                 if (textView2 != null) {
-                    i = 2131363311;
-                    TextView textView3 = (TextView) view.findViewById(2131363311);
+                    i = R.id.folder_context_menu_settings;
+                    TextView textView3 = (TextView) view.findViewById(R.id.folder_context_menu_settings);
                     if (textView3 != null) {
                         return new WidgetFolderContextMenuBinding((CardView) view, cardView, textView, findViewById, textView2, textView3);
                     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
index b98b5377f9..32b8785d1c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
@@ -5,6 +5,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetFriendsListExpandableHeaderBinding implements ViewBinding {
     @NonNull
     public final FrameLayout a;
@@ -23,11 +24,11 @@ public final class WidgetFriendsListExpandableHeaderBinding implements ViewBindi
 
     @NonNull
     public static WidgetFriendsListExpandableHeaderBinding a(@NonNull View view) {
-        int i = 2131363338;
-        TextView textView = (TextView) view.findViewById(2131363338);
+        int i = R.id.friends_list_expandable_header_button;
+        TextView textView = (TextView) view.findViewById(R.id.friends_list_expandable_header_button);
         if (textView != null) {
-            i = 2131363355;
-            TextView textView2 = (TextView) view.findViewById(2131363355);
+            i = R.id.friends_list_pending_item_header_text;
+            TextView textView2 = (TextView) view.findViewById(R.id.friends_list_pending_item_header_text);
             if (textView2 != null) {
                 return new WidgetFriendsListExpandableHeaderBinding((FrameLayout) view, textView, textView2);
             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
index b547f9ce54..9f39737d75 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
@@ -5,6 +5,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 public final class WidgetGuildContextMenuBinding implements ViewBinding {
     @NonNull
     public final CardView a;
@@ -36,23 +37,23 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding {
     @NonNull
     public static WidgetGuildContextMenuBinding a(@NonNull View view) {
         CardView cardView = (CardView) view;
-        int i = 2131363443;
-        TextView textView = (TextView) view.findViewById(2131363443);
+        int i = R.id.guild_context_menu_header;
+        TextView textView = (TextView) view.findViewById(R.id.guild_context_menu_header);
         if (textView != null) {
-            i = 2131363444;
-            View findViewById = view.findViewById(2131363444);
+            i = R.id.guild_context_menu_header_divider;
+            View findViewById = view.findViewById(R.id.guild_context_menu_header_divider);
             if (findViewById != null) {
-                i = 2131363445;
-                TextView textView2 = (TextView) view.findViewById(2131363445);
+                i = R.id.guild_context_menu_leave_guild;
+                TextView textView2 = (TextView) view.findViewById(R.id.guild_context_menu_leave_guild);
                 if (textView2 != null) {
-                    i = 2131363446;
-                    TextView textView3 = (TextView) view.findViewById(2131363446);
+                    i = R.id.guild_context_menu_mark_as_read;
+                    TextView textView3 = (TextView) view.findViewById(R.id.guild_context_menu_mark_as_read);
                     if (textView3 != null) {
-                        i = 2131363447;
-                        TextView textView4 = (TextView) view.findViewById(2131363447);
+                        i = R.id.guild_context_menu_more_options;
+                        TextView textView4 = (TextView) view.findViewById(R.id.guild_context_menu_more_options);
                         if (textView4 != null) {
-                            i = 2131363448;
-                            TextView textView5 = (TextView) view.findViewById(2131363448);
+                            i = R.id.guild_context_menu_notifications;
+                            TextView textView5 = (TextView) view.findViewById(R.id.guild_context_menu_notifications);
                             if (textView5 != null) {
                                 return new WidgetGuildContextMenuBinding((CardView) view, cardView, textView, findViewById, textView2, textView3, textView4, textView5);
                             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java
index 92908e7d16..93c5b5819f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
 public final class WidgetGuildInviteShareItemBinding implements ViewBinding {
@@ -31,17 +32,17 @@ public final class WidgetGuildInviteShareItemBinding implements ViewBinding {
 
     @NonNull
     public static WidgetGuildInviteShareItemBinding a(@NonNull View view) {
-        int i = 2131363890;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363890);
+        int i = R.id.item_icon_iv;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.item_icon_iv);
         if (simpleDraweeView != null) {
-            i = 2131363891;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363891);
+            i = R.id.item_invite_btn;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.item_invite_btn);
             if (materialButton != null) {
-                i = 2131363922;
-                TextView textView = (TextView) view.findViewById(2131363922);
+                i = R.id.item_name_tv;
+                TextView textView = (TextView) view.findViewById(R.id.item_name_tv);
                 if (textView != null) {
-                    i = 2131363923;
-                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363923);
+                    i = R.id.item_sent;
+                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.item_sent);
                     if (materialButton2 != null) {
                         return new WidgetGuildInviteShareItemBinding((LinearLayout) view, simpleDraweeView, materialButton, textView, materialButton2);
                     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java
index d34399bd3d..e189e0c488 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 public final class WidgetGuildsListItemDmBinding implements ViewBinding {
     @NonNull
@@ -23,11 +24,11 @@ public final class WidgetGuildsListItemDmBinding implements ViewBinding {
 
     @NonNull
     public static WidgetGuildsListItemDmBinding a(@NonNull View view) {
-        int i = 2131363693;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363693);
+        int i = R.id.guilds_item_dm_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guilds_item_dm_avatar);
         if (simpleDraweeView != null) {
-            i = 2131363694;
-            TextView textView = (TextView) view.findViewById(2131363694);
+            i = R.id.guilds_item_dm_count;
+            TextView textView = (TextView) view.findViewById(R.id.guilds_item_dm_count);
             if (textView != null) {
                 return new WidgetGuildsListItemDmBinding(view, simpleDraweeView, textView);
             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java
index a90ffa2967..4c29d4a41c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 public final class WidgetGuildsListItemGuildBinding implements ViewBinding {
     @NonNull
@@ -40,26 +41,26 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding {
 
     @NonNull
     public static WidgetGuildsListItemGuildBinding a(@NonNull View view) {
-        int i = 2131363688;
-        ImageView imageView = (ImageView) view.findViewById(2131363688);
+        int i = R.id.guilds_item_application_status;
+        ImageView imageView = (ImageView) view.findViewById(R.id.guilds_item_application_status);
         if (imageView != null) {
-            i = 2131363689;
-            ImageView imageView2 = (ImageView) view.findViewById(2131363689);
+            i = R.id.guilds_item_application_stream;
+            ImageView imageView2 = (ImageView) view.findViewById(R.id.guilds_item_application_stream);
             if (imageView2 != null) {
-                i = 2131363690;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363690);
+                i = R.id.guilds_item_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guilds_item_avatar);
                 if (simpleDraweeView != null) {
-                    i = 2131363691;
-                    TextView textView = (TextView) view.findViewById(2131363691);
+                    i = R.id.guilds_item_avatar_text;
+                    TextView textView = (TextView) view.findViewById(R.id.guilds_item_avatar_text);
                     if (textView != null) {
-                        i = 2131363692;
-                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363692);
+                        i = R.id.guilds_item_avatar_wrap;
+                        FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.guilds_item_avatar_wrap);
                         if (frameLayout != null) {
-                            i = 2131363698;
-                            TextView textView2 = (TextView) view.findViewById(2131363698);
+                            i = R.id.guilds_item_mentions;
+                            TextView textView2 = (TextView) view.findViewById(R.id.guilds_item_mentions);
                             if (textView2 != null) {
-                                i = 2131363704;
-                                ImageView imageView3 = (ImageView) view.findViewById(2131363704);
+                                i = R.id.guilds_item_voice;
+                                ImageView imageView3 = (ImageView) view.findViewById(R.id.guilds_item_voice);
                                 if (imageView3 != null) {
                                     return new WidgetGuildsListItemGuildBinding(view, imageView, imageView2, simpleDraweeView, textView, frameLayout, textView2, imageView3);
                                 }
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
index e50031ac43..d04e39eea0 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.widget.NestedScrollView;
 import androidx.viewbinding.ViewBinding;
+import com.discord.R;
 import com.google.android.material.radiobutton.MaterialRadioButton;
 public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding {
     @NonNull
@@ -72,62 +73,62 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding
 
     @NonNull
     public static WidgetThreadArchiveActionsSheetBinding a(@NonNull View view) {
-        int i = 2131361986;
-        TextView textView = (TextView) view.findViewById(2131361986);
+        int i = R.id.archive_now;
+        TextView textView = (TextView) view.findViewById(R.id.archive_now);
         if (textView != null) {
-            i = 2131362081;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362081);
+            i = R.id.auto_archive_header;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.auto_archive_header);
             if (linearLayout != null) {
-                i = 2131362082;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362082);
+                i = R.id.auto_archive_sheet_duration_options;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.auto_archive_sheet_duration_options);
                 if (linearLayout2 != null) {
-                    i = 2131364319;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131364319);
+                    i = R.id.option_one_hour;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.option_one_hour);
                     if (constraintLayout != null) {
-                        i = 2131364320;
-                        MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(2131364320);
+                        i = R.id.option_one_hour_radio;
+                        MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(R.id.option_one_hour_radio);
                         if (materialRadioButton != null) {
-                            i = 2131364321;
-                            ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131364321);
+                            i = R.id.option_seven_days;
+                            ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(R.id.option_seven_days);
                             if (constraintLayout2 != null) {
-                                i = 2131364322;
-                                TextView textView2 = (TextView) view.findViewById(2131364322);
+                                i = R.id.option_seven_days_duration;
+                                TextView textView2 = (TextView) view.findViewById(R.id.option_seven_days_duration);
                                 if (textView2 != null) {
-                                    i = 2131364323;
-                                    ImageView imageView = (ImageView) view.findViewById(2131364323);
+                                    i = R.id.option_seven_days_icon;
+                                    ImageView imageView = (ImageView) view.findViewById(R.id.option_seven_days_icon);
                                     if (imageView != null) {
-                                        i = 2131364324;
-                                        TextView textView3 = (TextView) view.findViewById(2131364324);
+                                        i = R.id.option_seven_days_label;
+                                        TextView textView3 = (TextView) view.findViewById(R.id.option_seven_days_label);
                                         if (textView3 != null) {
-                                            i = 2131364325;
-                                            MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(2131364325);
+                                            i = R.id.option_seven_days_radio;
+                                            MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(R.id.option_seven_days_radio);
                                             if (materialRadioButton2 != null) {
-                                                i = 2131364326;
-                                                ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131364326);
+                                                i = R.id.option_three_days;
+                                                ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(R.id.option_three_days);
                                                 if (constraintLayout3 != null) {
-                                                    i = 2131364327;
-                                                    TextView textView4 = (TextView) view.findViewById(2131364327);
+                                                    i = R.id.option_three_days_duration;
+                                                    TextView textView4 = (TextView) view.findViewById(R.id.option_three_days_duration);
                                                     if (textView4 != null) {
-                                                        i = 2131364328;
-                                                        ImageView imageView2 = (ImageView) view.findViewById(2131364328);
+                                                        i = R.id.option_three_days_icon;
+                                                        ImageView imageView2 = (ImageView) view.findViewById(R.id.option_three_days_icon);
                                                         if (imageView2 != null) {
-                                                            i = 2131364329;
-                                                            TextView textView5 = (TextView) view.findViewById(2131364329);
+                                                            i = R.id.option_three_days_label;
+                                                            TextView textView5 = (TextView) view.findViewById(R.id.option_three_days_label);
                                                             if (textView5 != null) {
-                                                                i = 2131364330;
-                                                                MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(2131364330);
+                                                                i = R.id.option_three_days_radio;
+                                                                MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(R.id.option_three_days_radio);
                                                                 if (materialRadioButton3 != null) {
-                                                                    i = 2131364331;
-                                                                    ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131364331);
+                                                                    i = R.id.option_twenty_four_hours;
+                                                                    ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(R.id.option_twenty_four_hours);
                                                                     if (constraintLayout4 != null) {
-                                                                        i = 2131364332;
-                                                                        MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(2131364332);
+                                                                        i = R.id.option_twenty_four_hours_radio;
+                                                                        MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(R.id.option_twenty_four_hours_radio);
                                                                         if (materialRadioButton4 != null) {
-                                                                            i = 2131365386;
-                                                                            TextView textView6 = (TextView) view.findViewById(2131365386);
+                                                                            i = R.id.subtitle;
+                                                                            TextView textView6 = (TextView) view.findViewById(R.id.subtitle);
                                                                             if (textView6 != null) {
-                                                                                i = 2131365561;
-                                                                                TextView textView7 = (TextView) view.findViewById(2131365561);
+                                                                                i = R.id.title;
+                                                                                TextView textView7 = (TextView) view.findViewById(R.id.title);
                                                                                 if (textView7 != null) {
                                                                                     return new WidgetThreadArchiveActionsSheetBinding((NestedScrollView) view, textView, linearLayout, linearLayout2, constraintLayout, materialRadioButton, constraintLayout2, textView2, imageView, textView3, materialRadioButton2, constraintLayout3, textView4, imageView2, textView5, materialRadioButton3, constraintLayout4, materialRadioButton4, textView6, textView7);
                                                                                 }
diff --git a/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java b/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java
index 688fff5e8b..744092de4d 100644
--- a/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java
+++ b/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java
@@ -7,8 +7,10 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.DimenRes;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import c.a.j.t;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.media_picker.MediaPicker;
 import com.discord.utilities.color.ColorCompat;
@@ -36,10 +38,10 @@ public final class ImageUploadDialog extends AppDialog {
 
     /* compiled from: ImageUploadDialog.kt */
     public enum PreviewType {
-        EMOJI(2131165398),
-        USER_AVATAR(2131165287),
-        GUILD_AVATAR(2131165299),
-        GUILD_SUBSCRIPTION_ROLE_AVATAR(2131165289);
+        EMOJI(R.dimen.emoji_size),
+        USER_AVATAR(R.dimen.avatar_size_extra_large_account),
+        GUILD_AVATAR(R.dimen.avatar_size_xxlarge),
+        GUILD_SUBSCRIPTION_ROLE_AVATAR(R.dimen.avatar_size_huge);
         
         private final int previewSizeDimenId;
 
@@ -73,7 +75,7 @@ public final class ImageUploadDialog extends AppDialog {
                 }
                 Uri uri = ((ImageUploadDialog) this.j).l;
                 if (uri == null) {
-                    m.throwUninitializedPropertyAccessException("uri");
+                    m.throwUninitializedPropertyAccessException(NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
                 }
                 MGImages.requestImageCrop$default(context, provider, uri, 0.0f, 0.0f, 0, 56, null);
                 ((ImageUploadDialog) this.j).dismiss();
@@ -105,17 +107,17 @@ public final class ImageUploadDialog extends AppDialog {
         public t invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364247;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364247);
+            int i2 = R.id.notice_cancel;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(R.id.notice_cancel);
             if (materialButton != null) {
-                i2 = 2131364248;
-                TextView textView = (TextView) view2.findViewById(2131364248);
+                i2 = R.id.notice_crop;
+                TextView textView = (TextView) view2.findViewById(R.id.notice_crop);
                 if (textView != null) {
-                    i2 = 2131364251;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131364251);
+                    i2 = R.id.notice_image;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(R.id.notice_image);
                     if (simpleDraweeView != null) {
-                        i2 = 2131364253;
-                        MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364253);
+                        i2 = R.id.notice_upload;
+                        MaterialButton materialButton2 = (MaterialButton) view2.findViewById(R.id.notice_upload);
                         if (materialButton2 != null) {
                             return new t((LinearLayout) view2, materialButton, textView, simpleDraweeView, materialButton2);
                         }
@@ -141,7 +143,7 @@ public final class ImageUploadDialog extends AppDialog {
             Context context = this.i.getContext();
             Uri uri = this.i.l;
             if (uri == null) {
-                m.throwUninitializedPropertyAccessException("uri");
+                m.throwUninitializedPropertyAccessException(NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             }
             MGImages.requestDataUrl(context, uri, this.j, this.i.o);
             this.i.dismiss();
@@ -149,7 +151,7 @@ public final class ImageUploadDialog extends AppDialog {
     }
 
     public ImageUploadDialog() {
-        super(2131558530);
+        super(R.layout.image_upload_dialog);
     }
 
     public final t g() {
@@ -188,13 +190,13 @@ public final class ImageUploadDialog extends AppDialog {
         if (ordinal == 1 || ordinal == 2) {
             SimpleDraweeView simpleDraweeView3 = g().d;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.noticeImage");
-            MGImages.setRoundingParams$default(simpleDraweeView3, (float) dimensionPixelSize, true, Integer.valueOf(ColorCompat.getThemedColor(view, 2130969896)), null, null, 48, null);
+            MGImages.setRoundingParams$default(simpleDraweeView3, (float) dimensionPixelSize, true, Integer.valueOf(ColorCompat.getThemedColor(view, (int) R.attr.primary_600)), null, null, 48, null);
         }
         SimpleDraweeView simpleDraweeView4 = g().d;
         m.checkNotNullExpressionValue(simpleDraweeView4, "binding.noticeImage");
         Uri uri = this.l;
         if (uri == null) {
-            m.throwUninitializedPropertyAccessException("uri");
+            m.throwUninitializedPropertyAccessException(NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         }
         MGImages.setImage$default(simpleDraweeView4, uri.toString(), dimensionPixelSize, dimensionPixelSize, false, null, null, 112, null);
     }
diff --git a/app/src/main/java/com/discord/gateway/GatewayDiscovery.java b/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
index 5517b57d7c..472ab0e2b5 100644
--- a/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
+++ b/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
@@ -33,7 +33,7 @@ public final class GatewayDiscovery {
             if (sharedPreferences2 == null) {
                 m.throwUninitializedPropertyAccessException("sharedPreferences");
             }
-            return sharedPreferences2.getString("GATEWAY_URL_CACHE_KEY", null);
+            return sharedPreferences2.getString(GATEWAY_URL_CACHE_KEY, null);
         }
 
         public final void init(Context context) {
@@ -50,7 +50,7 @@ public final class GatewayDiscovery {
             }
             SharedPreferences.Editor edit = sharedPreferences2.edit();
             m.checkExpressionValueIsNotNull(edit, "editor");
-            edit.putString("GATEWAY_URL_CACHE_KEY", str);
+            edit.putString(GATEWAY_URL_CACHE_KEY, str);
             edit.apply();
         }
     }
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket$close$1.java b/app/src/main/java/com/discord/gateway/GatewaySocket$close$1.java
index b9f81b0e17..7b566b81a0 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket$close$1.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket$close$1.java
@@ -1,5 +1,6 @@
 package com.discord.gateway;
 
+import com.discord.utilities.rest.SendUtils;
 import com.discord.utilities.websocket.WebSocket;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -47,7 +48,7 @@ public final class GatewaySocket$close$1 extends o implements Function0<Unit> {
     /* renamed from: invoke */
     public final void mo1invoke() {
         if (GatewaySocket.access$getConnectionState$p(this.this$0) != 0) {
-            int i = this.$clean ? 1000 : 4000;
+            int i = this.$clean ? 1000 : SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM;
             GatewaySocket.access$cleanup(this.this$0, new AnonymousClass1(i));
             GatewaySocket.access$setConnectionState$p(this.this$0, 0);
             GatewaySocket.access$reset(this.this$0, this.$clean, i, "Disconnect requested by client");
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket$connect$2.java b/app/src/main/java/com/discord/gateway/GatewaySocket$connect$2.java
index a03e69c335..6053c27e3d 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket$connect$2.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket$connect$2.java
@@ -1,5 +1,6 @@
 package com.discord.gateway;
 
+import com.discord.utilities.rest.SendUtils;
 import com.discord.utilities.websocket.WebSocket;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -22,7 +23,7 @@ public final class GatewaySocket$connect$2 extends o implements Function1<WebSoc
 
     public final void invoke(WebSocket webSocket) {
         if (webSocket != null) {
-            webSocket.disconnect(4000, "Connect called with an existing web socket.");
+            webSocket.disconnect(SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, "Connect called with an existing web socket.");
         }
     }
 }
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.java b/app/src/main/java/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.java
index d64573c272..1fdaee5bea 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket$expeditedHeartbeat$1.java
@@ -2,6 +2,7 @@ package com.discord.gateway;
 
 import c.d.b.a.a;
 import com.discord.gateway.GatewaySocket;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.logging.Logger;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -35,7 +36,7 @@ public final class GatewaySocket$expeditedHeartbeat$1 extends o implements Funct
         }
 
         public final void invoke(String str) {
-            m.checkNotNullParameter(str, "reason");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
             GatewaySocket.Companion companion = GatewaySocket.Companion;
             Logger access$getLogger$p = GatewaySocket.access$getLogger$p(this.this$0.this$0);
             GatewaySocket.Companion.log$default(companion, access$getLogger$p, "Connection backoff reset " + str + '.', false, 2, null);
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.java b/app/src/main/java/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.java
index aa96481cd4..683386be83 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket$handleHeartbeatTimeout$1.java
@@ -1,5 +1,6 @@
 package com.discord.gateway;
 
+import com.discord.utilities.rest.SendUtils;
 import com.discord.utilities.websocket.WebSocket;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -22,7 +23,7 @@ public final class GatewaySocket$handleHeartbeatTimeout$1 extends o implements F
 
     public final void invoke(WebSocket webSocket) {
         if (webSocket != null) {
-            WebSocket.disconnect$default(webSocket, 4000, null, 2, null);
+            WebSocket.disconnect$default(webSocket, SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, null, 2, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket$handleReconnect$1.java b/app/src/main/java/com/discord/gateway/GatewaySocket$handleReconnect$1.java
index a336738a18..1f24510be1 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket$handleReconnect$1.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket$handleReconnect$1.java
@@ -1,5 +1,6 @@
 package com.discord.gateway;
 
+import com.discord.utilities.rest.SendUtils;
 import com.discord.utilities.websocket.WebSocket;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class GatewaySocket$handleReconnect$1 extends o implements Function
 
     public final void invoke(WebSocket webSocket) {
         if (webSocket != null) {
-            webSocket.disconnect(4000, this.$reason);
+            webSocket.disconnect(SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM, this.$reason);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket.java b/app/src/main/java/com/discord/gateway/GatewaySocket.java
index 9f267ef015..a73ee50daf 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket.java
@@ -1,6 +1,7 @@
 package com.discord.gateway;
 
 import android.content.Context;
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import c.i.d.c;
 import c.i.d.e;
@@ -453,7 +454,7 @@ public final class GatewaySocket {
         Backoff backoff = new Backoff(1000, 10000, 4, true, new Timer(scheduler));
         this.gatewayBackoff = backoff;
         this.heartbeatExpeditedTimeout = new Timer(scheduler);
-        this.heartbeatInterval = Long.MAX_VALUE;
+        this.heartbeatInterval = RecyclerView.FOREVER_NS;
         this.heartbeater = new Timer(scheduler);
         this.heartbeatAck = true;
         this.helloTimeout = new Timer(scheduler);
@@ -636,7 +637,7 @@ public final class GatewaySocket {
             Companion.log$default(Companion, this.logger, a.t("Connect to: ", str, ", encoding: json, version 9."), false, 2, null);
             cleanup(GatewaySocket$connect$2.INSTANCE);
             this.connectionStartTime = clock.currentTimeMillis();
-            this.helloTimeout.schedule(new GatewaySocket$connect$3(this), 20000);
+            this.helloTimeout.schedule(new GatewaySocket$connect$3(this), HELLO_TIMEOUT);
             WebSocket webSocket = new WebSocket(this.scheduler, new GatewaySocket$connect$4(this), this.sslSocketFactory);
             webSocket.setOnOpened(new GatewaySocket$connect$$inlined$apply$lambda$1(this, str));
             webSocket.setOnClosed(new GatewaySocket$connect$$inlined$apply$lambda$2(this, str));
@@ -676,14 +677,14 @@ public final class GatewaySocket {
         this.sessionId = null;
         IdentifyData invoke = this.identifyDataProvider.mo1invoke();
         if (invoke == null) {
-            handleClose(true, 4004, "No connection info provided.");
+            handleClose(true, CLOSE_CODE_UNAUTHORIZED, "No connection info provided.");
             return;
         }
         this.connectionState = 3;
         this.identifyStartTime = clock.currentTimeMillis();
         this.token = invoke.getToken();
         Companion.log$default(Companion, this.logger, "Sending identify.", false, 2, null);
-        send$default(this, new Outgoing(Opcode.IDENTIFY, new OutgoingPayload.Identify(invoke.getToken(), 100, true, 95, this.identifyProperties, invoke.getClientState())), false, null, 4, null);
+        send$default(this, new Outgoing(Opcode.IDENTIFY, new OutgoingPayload.Identify(invoke.getToken(), 100, true, CLIENT_CAPABILITIES, this.identifyProperties, invoke.getClientState())), false, null, 4, null);
     }
 
     private final void doResume() {
@@ -706,7 +707,7 @@ public final class GatewaySocket {
         Companion companion = Companion;
         long delay$default = Companion.getDelay$default(companion, this.heartbeatAckTimeMostRecent, null, 2, null);
         float f = this.heartbeatAckTimeMostRecent == 0 ? 0.0f : (((float) delay$default) / 1000.0f) / 60.0f;
-        if (this.sessionId != null && delay$default <= ((long) 180000)) {
+        if (this.sessionId != null && delay$default <= ((long) HEARTBEAT_MAX_RESUME_THRESHOLD)) {
             Logger logger = this.logger;
             StringBuilder K = a.K("Attempting to resume after elapsed duration of ");
             String format = String.format("%.2f", Arrays.copyOf(new Object[]{Float.valueOf(f)}, 1));
@@ -786,7 +787,7 @@ public final class GatewaySocket {
     private final void handleClose(boolean z2, int i, String str) {
         cleanup(GatewaySocket$handleClose$1.INSTANCE);
         handleConnected$default(this, null, Boolean.FALSE, 1, null);
-        if (i == 4004) {
+        if (i == CLOSE_CODE_UNAUTHORIZED) {
             this.connectionState = 0;
             reset(z2, i, str);
             return;
@@ -1078,7 +1079,7 @@ public final class GatewaySocket {
         Companion.log$default(companion, logger, "Reset " + str2 + ", with code " + i + ", at sequence " + this.seq + ". Reason: '" + str + "'.", false, 2, null);
         handleConnected(Boolean.valueOf(i == 4000 && this.connected), Boolean.FALSE);
         GatewayEventHandler gatewayEventHandler = this.eventHandler;
-        if (i == 4004) {
+        if (i == CLOSE_CODE_UNAUTHORIZED) {
             z3 = true;
         }
         gatewayEventHandler.handleDisconnect(z3);
@@ -1102,7 +1103,7 @@ public final class GatewaySocket {
             }
             String m = gson.m(outgoing);
             GatewaySocketLogger gatewaySocketLogger = this.gatewaySocketLogger;
-            m.checkNotNullExpressionValue(m, "json");
+            m.checkNotNullExpressionValue(m, GATEWAY_ENCODING);
             gatewaySocketLogger.logOutboundMessage(m);
             webSocket.message(m);
             return;
@@ -1178,7 +1179,7 @@ public final class GatewaySocket {
         }
         Function1<Map<String, ? extends Object>, Unit> function1 = this.trackReadyPayload;
         Companion companion = Companion;
-        function1.invoke(h0.mapOf(d0.o.to("duration_ms_since_connection_start", Long.valueOf(Companion.getDelay$default(companion, this.connectionStartTime, null, 2, null))), d0.o.to("duration_ms_since_identify_start", Long.valueOf(Companion.getDelay$default(companion, this.identifyStartTime, null, 2, null))), d0.o.to("identify_total_server_duration_ms", Integer.valueOf(i3)), d0.o.to("identify_api_duration_ms", Integer.valueOf(i6)), d0.o.to("identify_guilds_duration_ms", Integer.valueOf(i7)), d0.o.to("compressed_byte_size", Integer.valueOf(i)), d0.o.to("uncompressed_byte_size", Integer.valueOf(i2)), d0.o.to("compression_algorithm", "zlib"), d0.o.to("packing_algorithm", "json"), d0.o.to("unpack_duration_ms", Long.valueOf(j)), d0.o.to("is_reconnect", Boolean.valueOf(this.hasConnectedOnce)), d0.o.to("is_fast_connect", Boolean.FALSE), d0.o.to("num_guilds", Integer.valueOf(size)), d0.o.to("num_guild_channels", Integer.valueOf(i4)), d0.o.to("num_guild_category_channels", Integer.valueOf(i5))));
+        function1.invoke(h0.mapOf(d0.o.to("duration_ms_since_connection_start", Long.valueOf(Companion.getDelay$default(companion, this.connectionStartTime, null, 2, null))), d0.o.to("duration_ms_since_identify_start", Long.valueOf(Companion.getDelay$default(companion, this.identifyStartTime, null, 2, null))), d0.o.to("identify_total_server_duration_ms", Integer.valueOf(i3)), d0.o.to("identify_api_duration_ms", Integer.valueOf(i6)), d0.o.to("identify_guilds_duration_ms", Integer.valueOf(i7)), d0.o.to("compressed_byte_size", Integer.valueOf(i)), d0.o.to("uncompressed_byte_size", Integer.valueOf(i2)), d0.o.to("compression_algorithm", "zlib"), d0.o.to("packing_algorithm", GATEWAY_ENCODING), d0.o.to("unpack_duration_ms", Long.valueOf(j)), d0.o.to("is_reconnect", Boolean.valueOf(this.hasConnectedOnce)), d0.o.to("is_fast_connect", Boolean.FALSE), d0.o.to("num_guilds", Integer.valueOf(size)), d0.o.to("num_guild_channels", Integer.valueOf(i4)), d0.o.to("num_guild_category_channels", Integer.valueOf(i5))));
     }
 
     public final void callConnect(long j) {
diff --git a/app/src/main/java/com/discord/gateway/io/IncomingParser.java b/app/src/main/java/com/discord/gateway/io/IncomingParser.java
index 004bbdaaed..4244aa9e15 100644
--- a/app/src/main/java/com/discord/gateway/io/IncomingParser.java
+++ b/app/src/main/java/com/discord/gateway/io/IncomingParser.java
@@ -37,6 +37,7 @@ import com.discord.models.domain.StreamCreateOrUpdate;
 import com.discord.models.domain.StreamDelete;
 import com.discord.models.domain.StreamServerUpdate;
 import com.discord.models.thread.dto.ModelThreadListSync;
+import com.discord.utilities.fcm.NotificationData;
 import com.discord.utilities.time.ClockFactory;
 import d0.z.d.m;
 import java.io.IOException;
@@ -155,13 +156,13 @@ public final class IncomingParser implements Model {
         r6.data = r7.parse(new com.discord.models.domain.ModelBan());
      */
     /* JADX WARNING: Code restructure failed: missing block: B:194:0x0477, code lost:
-        if (r3.equals("STAGE_INSTANCE_CREATE") != false) goto L_0x0479;
+        if (r3.equals(com.discord.utilities.fcm.NotificationData.TYPE_STAGE_INSTANCE_CREATE) != false) goto L_0x0479;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:195:0x0479, code lost:
         r6.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r7, com.discord.api.stageinstance.StageInstance.class);
      */
     /* JADX WARNING: Code restructure failed: missing block: B:197:0x0489, code lost:
-        if (r3.equals("RELATIONSHIP_ADD") != false) goto L_0x048b;
+        if (r3.equals(com.discord.utilities.fcm.NotificationData.TYPE_RELATIONSHIP_ADD) != false) goto L_0x048b;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:198:0x048b, code lost:
         r6.data = r7.parse(new com.discord.models.domain.ModelUserRelationship());
@@ -270,7 +271,7 @@ public final class IncomingParser implements Model {
         if (r3.equals("MESSAGE_DELETE") != false) goto L_0x02ee;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:98:0x0214, code lost:
-        if (r3.equals("MESSAGE_CREATE") != false) goto L_0x0216;
+        if (r3.equals(com.discord.utilities.fcm.NotificationData.TYPE_MESSAGE_CREATE) != false) goto L_0x0216;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:99:0x0216, code lost:
         r6.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r7, com.discord.api.message.Message.class);
@@ -365,7 +366,7 @@ public final class IncomingParser implements Model {
                             case -1553064252:
                                 break;
                             case -1489275252:
-                                if (str.equals("GUILD_SCHEDULED_EVENT_UPDATE")) {
+                                if (str.equals(NotificationData.TYPE_GUILD_SCHEDULED_EVENT_UPDATE)) {
                                     this.data = InboundGatewayGsonParser.fromJson(jsonReader, GuildScheduledEvent.class);
                                     return;
                                 }
diff --git a/app/src/main/java/com/discord/models/commands/Application.java b/app/src/main/java/com/discord/models/commands/Application.java
index 8b1d30e45d..c702831cb7 100644
--- a/app/src/main/java/com/discord/models/commands/Application.java
+++ b/app/src/main/java/com/discord/models/commands/Application.java
@@ -3,6 +3,7 @@ package com.discord.models.commands;
 import a0.a.a.b;
 import c.d.b.a.a;
 import com.discord.api.user.User;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: Application.kt */
@@ -18,7 +19,7 @@ public final class Application {
     private final String name;
 
     public Application(long j, String str, String str2, Integer num, int i, User user, boolean z2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f2049id = j;
         this.name = str;
         this.icon = str2;
@@ -66,7 +67,7 @@ public final class Application {
     }
 
     public final Application copy(long j, String str, String str2, Integer num, int i, User user, boolean z2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new Application(j, str, str2, num, i, user, z2);
     }
 
diff --git a/app/src/main/java/com/discord/models/commands/ApplicationCommandOption.java b/app/src/main/java/com/discord/models/commands/ApplicationCommandOption.java
index ef0d3f506d..42bf305ee7 100644
--- a/app/src/main/java/com/discord/models/commands/ApplicationCommandOption.java
+++ b/app/src/main/java/com/discord/models/commands/ApplicationCommandOption.java
@@ -3,6 +3,7 @@ package com.discord.models.commands;
 import c.d.b.a.a;
 import com.discord.api.commands.ApplicationCommandType;
 import com.discord.api.commands.CommandChoice;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -21,7 +22,7 @@ public final class ApplicationCommandOption {
 
     public ApplicationCommandOption(ApplicationCommandType applicationCommandType, String str, String str2, Integer num, boolean z2, boolean z3, List<CommandChoice> list, List<ApplicationCommandOption> list2) {
         m.checkNotNullParameter(applicationCommandType, "type");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.type = applicationCommandType;
         this.name = str;
         this.description = str2;
@@ -75,7 +76,7 @@ public final class ApplicationCommandOption {
 
     public final ApplicationCommandOption copy(ApplicationCommandType applicationCommandType, String str, String str2, Integer num, boolean z2, boolean z3, List<CommandChoice> list, List<ApplicationCommandOption> list2) {
         m.checkNotNullParameter(applicationCommandType, "type");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ApplicationCommandOption(applicationCommandType, str, str2, num, z2, z3, list, list2);
     }
 
diff --git a/app/src/main/java/com/discord/models/commands/ApplicationSubCommand.java b/app/src/main/java/com/discord/models/commands/ApplicationSubCommand.java
index b43feb224b..aa47312b2e 100644
--- a/app/src/main/java/com/discord/models/commands/ApplicationSubCommand.java
+++ b/app/src/main/java/com/discord/models/commands/ApplicationSubCommand.java
@@ -1,6 +1,7 @@
 package com.discord.models.commands;
 
 import com.discord.api.commands.ApplicationCommandPermission;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.h0;
 import d0.t.o;
 import d0.z.d.m;
@@ -20,7 +21,7 @@ public final class ApplicationSubCommand extends ApplicationCommand {
         Map map;
         m.checkNotNullParameter(applicationCommand, "rootCommand");
         m.checkNotNullParameter(str, "subCommandName");
-        m.checkNotNullParameter(str3, "name");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "options");
         String str6 = applicationCommand.getId() + str2 + str3;
         if (list2 != null) {
diff --git a/app/src/main/java/com/discord/models/commands/BuiltInCommand.java b/app/src/main/java/com/discord/models/commands/BuiltInCommand.java
index 585558c05c..8504c7fadd 100644
--- a/app/src/main/java/com/discord/models/commands/BuiltInCommand.java
+++ b/app/src/main/java/com/discord/models/commands/BuiltInCommand.java
@@ -1,5 +1,6 @@
 package com.discord.models.commands;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 import java.util.Map;
@@ -10,8 +11,8 @@ public final class BuiltInCommand extends ApplicationCommand {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public BuiltInCommand(String str, long j, String str2, Integer num, List<ApplicationCommandOption> list, Function1<? super Map<String, ? extends Object>, String> function1) {
         super(str, j, str2, null, num, list, true, null, null, null, null, function1, 1928, null);
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "options");
     }
 
diff --git a/app/src/main/java/com/discord/models/commands/RemoteApplicationCommand.java b/app/src/main/java/com/discord/models/commands/RemoteApplicationCommand.java
index 7392905a0e..5e15a27378 100644
--- a/app/src/main/java/com/discord/models/commands/RemoteApplicationCommand.java
+++ b/app/src/main/java/com/discord/models/commands/RemoteApplicationCommand.java
@@ -1,6 +1,7 @@
 package com.discord.models.commands;
 
 import com.discord.api.commands.ApplicationCommandPermission;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.h0;
 import d0.t.o;
 import d0.z.d.m;
@@ -15,8 +16,8 @@ public final class RemoteApplicationCommand extends ApplicationCommand {
     public RemoteApplicationCommand(String str, long j, String str2, String str3, List<ApplicationCommandOption> list, Long l, String str4, Boolean bool, List<ApplicationCommandPermission> list2, Function1<? super Map<String, ? extends Object>, String> function1) {
         super(str, j, str2, str3, null, list, false, l, str4, bool, r0, function1, 80, null);
         Map map;
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "options");
         if (list2 != null) {
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list2, 10));
diff --git a/app/src/main/java/com/discord/models/domain/Consents.java b/app/src/main/java/com/discord/models/domain/Consents.java
index 14585877d3..3690b248c8 100644
--- a/app/src/main/java/com/discord/models/domain/Consents.java
+++ b/app/src/main/java/com/discord/models/domain/Consents.java
@@ -1,6 +1,7 @@
 package com.discord.models.domain;
 
 import c.d.b.a.a;
+import com.discord.restapi.RestAPIParams;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: ModelUserConsents.kt */
@@ -26,7 +27,7 @@ public final class Consents {
 
     public Consents(Consent consent, Consent consent2) {
         m.checkNotNullParameter(consent, "usageStatistics");
-        m.checkNotNullParameter(consent2, "personalization");
+        m.checkNotNullParameter(consent2, RestAPIParams.Consents.Type.PERSONALIZATION);
         this.usageStatistics = consent;
         this.personalization = consent2;
     }
@@ -55,7 +56,7 @@ public final class Consents {
 
     public final Consents copy(Consent consent, Consent consent2) {
         m.checkNotNullParameter(consent, "usageStatistics");
-        m.checkNotNullParameter(consent2, "personalization");
+        m.checkNotNullParameter(consent2, RestAPIParams.Consents.Type.PERSONALIZATION);
         return new Consents(consent, consent2);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/Harvest.java b/app/src/main/java/com/discord/models/domain/Harvest.java
index 9c33dc8193..7cbe489f70 100644
--- a/app/src/main/java/com/discord/models/domain/Harvest.java
+++ b/app/src/main/java/com/discord/models/domain/Harvest.java
@@ -3,6 +3,7 @@ package com.discord.models.domain;
 import c.d.b.a.a;
 import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.time.TimeUtils;
+import com.discord.widgets.chat.list.adapter.WidgetChatListAdapterItemGuildWelcomeKt;
 import d0.z.d.m;
 /* compiled from: ModelUserConsents.kt */
 public final class Harvest {
@@ -14,7 +15,7 @@ public final class Harvest {
     private final long userId;
 
     public Harvest(String str, long j, String str2, String str3) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "createdAt");
         this.f2051id = str;
         this.userId = j;
@@ -70,7 +71,7 @@ public final class Harvest {
     }
 
     public final Harvest copy(String str, long j, String str2, String str3) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "createdAt");
         return new Harvest(str, j, str2, str3);
     }
@@ -118,7 +119,7 @@ public final class Harvest {
     }
 
     public final long nextAvailableRequestInMillis() {
-        return createdAtInMillis() + 2592000000L;
+        return createdAtInMillis() + WidgetChatListAdapterItemGuildWelcomeKt.OLD_GUILD_AGE_THRESHOLD;
     }
 
     public String toString() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelApplicationStream.java b/app/src/main/java/com/discord/models/domain/ModelApplicationStream.java
index b2ea6881df..4f1e756a5a 100644
--- a/app/src/main/java/com/discord/models/domain/ModelApplicationStream.java
+++ b/app/src/main/java/com/discord/models/domain/ModelApplicationStream.java
@@ -1,6 +1,7 @@
 package com.discord.models.domain;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g;
 import d0.g0.w;
 import d0.z.d.m;
@@ -52,7 +53,7 @@ public abstract class ModelApplicationStream implements Serializable {
 
         @Override // com.discord.models.domain.ModelApplicationStream
         public String encodeStreamKey() {
-            return StreamType.CALL.getSerializedRepresentation() + ':' + getChannelId() + ':' + getOwnerId();
+            return StreamType.CALL.getSerializedRepresentation() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + getChannelId() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + getOwnerId();
         }
 
         @Override // java.lang.Object
@@ -181,7 +182,7 @@ public abstract class ModelApplicationStream implements Serializable {
 
         @Override // com.discord.models.domain.ModelApplicationStream
         public String encodeStreamKey() {
-            return StreamType.GUILD.getSerializedRepresentation() + ':' + this.guildId + ':' + getChannelId() + ':' + getOwnerId();
+            return StreamType.GUILD.getSerializedRepresentation() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + this.guildId + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + getChannelId() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + getOwnerId();
         }
 
         @Override // java.lang.Object
diff --git a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
index 353a982858..a0534e327f 100644
--- a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
+++ b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
@@ -306,9 +306,9 @@ public class ModelAuditLogEntry implements Model {
         public void assignField(Model.JsonReader jsonReader) throws IOException {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
-            if (nextName.equals("id")) {
+            if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 this.f2053id = jsonReader.nextLong(this.f2053id);
-            } else if (!nextName.equals("name")) {
+            } else if (!nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                 jsonReader.skipValue();
             } else {
                 this.name = jsonReader.nextString(this.name);
@@ -380,7 +380,7 @@ public class ModelAuditLogEntry implements Model {
             char c2 = 65535;
             switch (nextName.hashCode()) {
                 case -1930808873:
-                    if (nextName.equals("channel_id")) {
+                    if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
                         c2 = 0;
                         break;
                     }
@@ -398,7 +398,7 @@ public class ModelAuditLogEntry implements Model {
                     }
                     break;
                 case 3355:
-                    if (nextName.equals("id")) {
+                    if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                         c2 = 3;
                         break;
                     }
@@ -714,7 +714,7 @@ public class ModelAuditLogEntry implements Model {
                 }
                 break;
             case -934964668:
-                if (nextName.equals("reason")) {
+                if (nextName.equals(CHANGE_KEY_REASON)) {
                     c2 = 1;
                     break;
                 }
@@ -732,7 +732,7 @@ public class ModelAuditLogEntry implements Model {
                 }
                 break;
             case 3355:
-                if (nextName.equals("id")) {
+                if (nextName.equals(CHANGE_KEY_ID)) {
                     c2 = 4;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelBan.java b/app/src/main/java/com/discord/models/domain/ModelBan.java
index 15c7e3dd31..25e31f866c 100644
--- a/app/src/main/java/com/discord/models/domain/ModelBan.java
+++ b/app/src/main/java/com/discord/models/domain/ModelBan.java
@@ -19,13 +19,13 @@ public class ModelBan implements Model {
         char c2 = 65535;
         switch (nextName.hashCode()) {
             case -1306538777:
-                if (nextName.equals("guild_id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID)) {
                     c2 = 0;
                     break;
                 }
                 break;
             case -934964668:
-                if (nextName.equals("reason")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
                     c2 = 1;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelCall.java b/app/src/main/java/com/discord/models/domain/ModelCall.java
index 204634d1e9..31d77a6d3d 100644
--- a/app/src/main/java/com/discord/models/domain/ModelCall.java
+++ b/app/src/main/java/com/discord/models/domain/ModelCall.java
@@ -73,7 +73,7 @@ public class ModelCall implements Model {
         char c2 = 65535;
         switch (nextName.hashCode()) {
             case -1930808873:
-                if (nextName.equals("channel_id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
                     c2 = 0;
                     break;
                 }
@@ -85,7 +85,7 @@ public class ModelCall implements Model {
                 }
                 break;
             case -934795532:
-                if (nextName.equals("region")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_REGION)) {
                     c2 = 2;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
index 05bd4e0bb6..57e88b4551 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
@@ -44,13 +44,13 @@ public final class ModelConnectedAccount implements Model {
                 }
                 break;
             case 3355:
-                if (nextName.equals("id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     c2 = 1;
                     break;
                 }
                 break;
             case 3373707:
-                if (nextName.equals("name")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                     c2 = 2;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration$Parser$parse$1.java
index d7f07beeb2..2c6326457b 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration$Parser$parse$1.java
@@ -40,7 +40,7 @@ public final class ModelConnectedAccountIntegration$Parser$parse$1<T> implements
                         this.$type.element = (T) this.$reader.nextStringOrNull();
                         return;
                     }
-                } else if (str.equals("id")) {
+                } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     ReadWriteProperty readWriteProperty = this.$id;
                     KProperty<?> kProperty = this.$id$metadata;
                     String nextString = this.$reader.nextString("0");
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
index dfcc01ccd2..86cc0cb9ef 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
@@ -35,7 +35,7 @@ public final class ModelConnectedAccountIntegration {
 
     /* compiled from: ModelConnectedAccountIntegration.kt */
     public static final class Parser implements Model.Parser<ModelConnectedAccountIntegration> {
-        public static final /* synthetic */ KProperty[] $$delegatedProperties = {a0.mutableProperty0(new q(Parser.class, "id", "<v#0>", 0))};
+        public static final /* synthetic */ KProperty[] $$delegatedProperties = {a0.mutableProperty0(new q(Parser.class, ModelAuditLogEntry.CHANGE_KEY_ID, "<v#0>", 0))};
         public static final Parser INSTANCE = new Parser();
 
         private Parser() {
@@ -58,7 +58,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public ModelConnectedAccountIntegration(String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         this.f2056id = str;
         this.type = str2;
         this.account = modelConnectedIntegrationAccount;
@@ -98,7 +98,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public final ModelConnectedAccountIntegration copy(String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         return new ModelConnectedAccountIntegration(str, str2, modelConnectedIntegrationAccount, modelConnectedIntegrationGuild);
     }
 
@@ -120,7 +120,7 @@ public final class ModelConnectedAccountIntegration {
     public final String getDisplayName() {
         String str = null;
         if (m.areEqual("twitch", this.type)) {
-            StringBuilder K = c.d.b.a.a.K("twitch.tv/");
+            StringBuilder K = c.d.b.a.a.K(TWITCH_URL_PREFIX);
             ModelConnectedIntegrationAccount modelConnectedIntegrationAccount = this.account;
             if (modelConnectedIntegrationAccount != null) {
                 str = modelConnectedIntegrationAccount.getName();
@@ -128,7 +128,7 @@ public final class ModelConnectedAccountIntegration {
             K.append(str);
             return K.toString();
         } else if (m.areEqual("youtube", this.type)) {
-            StringBuilder K2 = c.d.b.a.a.K("youtube.com/channel/");
+            StringBuilder K2 = c.d.b.a.a.K(YOUTUBE_URL_PREFIX);
             ModelConnectedIntegrationAccount modelConnectedIntegrationAccount2 = this.account;
             if (modelConnectedIntegrationAccount2 != null) {
                 str = modelConnectedIntegrationAccount2.getName();
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount$Parser$parse$1.java
index 60f9a3aeab..310e7b8c74 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount$Parser$parse$1.java
@@ -25,7 +25,7 @@ public final class ModelConnectedIntegrationAccount$Parser$parse$1<T> implements
         if (str != null) {
             int hashCode = str.hashCode();
             if (hashCode != 3355) {
-                if (hashCode == 3373707 && str.equals("name")) {
+                if (hashCode == 3373707 && str.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                     ReadWriteProperty readWriteProperty = this.$name;
                     KProperty<?> kProperty = this.$name$metadata;
                     String nextString = this.$reader.nextString("");
@@ -33,7 +33,7 @@ public final class ModelConnectedIntegrationAccount$Parser$parse$1<T> implements
                     readWriteProperty.setValue(null, kProperty, nextString);
                     return;
                 }
-            } else if (str.equals("id")) {
+            } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 ReadWriteProperty readWriteProperty2 = this.$id;
                 KProperty<?> kProperty2 = this.$id$metadata;
                 String nextString2 = this.$reader.nextString("");
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
index 7033ced8f6..05144b98a2 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
@@ -16,7 +16,7 @@ public final class ModelConnectedIntegrationAccount {
 
     /* compiled from: ModelConnectedIntegrationAccount.kt */
     public static final class Parser implements Model.Parser<ModelConnectedIntegrationAccount> {
-        public static final /* synthetic */ KProperty[] $$delegatedProperties = {a0.mutableProperty0(new q(Parser.class, "id", "<v#0>", 0)), a0.mutableProperty0(new q(Parser.class, "name", "<v#1>", 0))};
+        public static final /* synthetic */ KProperty[] $$delegatedProperties = {a0.mutableProperty0(new q(Parser.class, ModelAuditLogEntry.CHANGE_KEY_ID, "<v#0>", 0)), a0.mutableProperty0(new q(Parser.class, ModelAuditLogEntry.CHANGE_KEY_NAME, "<v#1>", 0))};
         public static final Parser INSTANCE = new Parser();
 
         private Parser() {
@@ -37,8 +37,8 @@ public final class ModelConnectedIntegrationAccount {
     }
 
     public ModelConnectedIntegrationAccount(String str, String str2) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f2057id = str;
         this.name = str2;
     }
@@ -62,8 +62,8 @@ public final class ModelConnectedIntegrationAccount {
     }
 
     public final ModelConnectedIntegrationAccount copy(String str, String str2) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ModelConnectedIntegrationAccount(str, str2);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild$Parser$parse$1.java
index 0049adb379..a197048e0e 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild$Parser$parse$1.java
@@ -26,7 +26,7 @@ public final class ModelConnectedIntegrationGuild$Parser$parse$1<T> implements A
             int hashCode = str.hashCode();
             if (hashCode != 3355) {
                 if (hashCode != 3226745) {
-                    if (hashCode == 3373707 && str.equals("name")) {
+                    if (hashCode == 3373707 && str.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                         this.$name.element = (T) this.$reader.nextStringOrNull();
                         return;
                     }
@@ -34,7 +34,7 @@ public final class ModelConnectedIntegrationGuild$Parser$parse$1<T> implements A
                     this.$icon.element = (T) this.$reader.nextStringOrNull();
                     return;
                 }
-            } else if (str.equals("id")) {
+            } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 this.$id.setValue(null, this.$id$metadata, Long.valueOf(this.$reader.nextLong(0)));
                 return;
             }
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
index a0cb6f44c3..50ebb4f1ed 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
@@ -19,7 +19,7 @@ public final class ModelConnectedIntegrationGuild {
 
     /* compiled from: ModelConnectedIntegrationGuild.kt */
     public static final class Parser implements Model.Parser<ModelConnectedIntegrationGuild> {
-        public static final /* synthetic */ KProperty[] $$delegatedProperties = {a0.mutableProperty0(new q(Parser.class, "id", "<v#0>", 0))};
+        public static final /* synthetic */ KProperty[] $$delegatedProperties = {a0.mutableProperty0(new q(Parser.class, ModelAuditLogEntry.CHANGE_KEY_ID, "<v#0>", 0))};
         public static final Parser INSTANCE = new Parser();
 
         private Parser() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectionState.java b/app/src/main/java/com/discord/models/domain/ModelConnectionState.java
index bb0ca3d911..9343e04a2a 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectionState.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectionState.java
@@ -15,7 +15,7 @@ public class ModelConnectionState implements Model {
         char c2 = 65535;
         switch (nextName.hashCode()) {
             case 3059181:
-                if (nextName.equals("code")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CODE)) {
                     c2 = 0;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelCustomStatusSetting$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelCustomStatusSetting$Parser$parse$1.java
index 8e2d8a802b..50915046b6 100644
--- a/app/src/main/java/com/discord/models/domain/ModelCustomStatusSetting$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelCustomStatusSetting$Parser$parse$1.java
@@ -1,5 +1,6 @@
 package com.discord.models.domain;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.models.domain.Model;
 import kotlin.jvm.internal.Ref$ObjectRef;
 import rx.functions.Action1;
@@ -29,7 +30,7 @@ public final class ModelCustomStatusSetting$Parser$parse$1<T> implements Action1
                     }
                     break;
                 case 3556653:
-                    if (str.equals("text")) {
+                    if (str.equals(NotificationCompat.MessagingStyle.Message.KEY_TEXT)) {
                         this.$text.element = (T) this.$reader.nextStringOrNull();
                         return;
                     }
diff --git a/app/src/main/java/com/discord/models/domain/ModelGift.java b/app/src/main/java/com/discord/models/domain/ModelGift.java
index 5ba00d5949..52063e35eb 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGift.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGift.java
@@ -20,7 +20,7 @@ public final class ModelGift {
     private final int uses;
 
     public ModelGift(long j, boolean z2, String str, String str2, int i, ModelStoreListing modelStoreListing, int i2, User user, Long l, SubscriptionPlan subscriptionPlan) {
-        m.checkNotNullParameter(str2, "code");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_CODE);
         this.skuId = j;
         this.redeemed = z2;
         this.expiresAt = str;
@@ -78,7 +78,7 @@ public final class ModelGift {
     }
 
     public final ModelGift copy(long j, boolean z2, String str, String str2, int i, ModelStoreListing modelStoreListing, int i2, User user, Long l, SubscriptionPlan subscriptionPlan) {
-        m.checkNotNullParameter(str2, "code");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_CODE);
         return new ModelGift(j, z2, str, str2, i, modelStoreListing, i2, user, l, subscriptionPlan);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildFolder$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelGuildFolder$Parser$parse$1.java
index 4e9134b408..9eb29367e5 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildFolder$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildFolder$Parser$parse$1.java
@@ -40,15 +40,15 @@ public final class ModelGuildFolder$Parser$parse$1<T> implements Action1<String>
             if (hashCode != -1847996308) {
                 if (hashCode != 3355) {
                     if (hashCode != 3373707) {
-                        if (hashCode == 94842723 && str.equals("color")) {
+                        if (hashCode == 94842723 && str.equals(ModelAuditLogEntry.CHANGE_KEY_COLOR)) {
                             this.$color.element = (T) this.$reader.nextIntOrNull();
                             return;
                         }
-                    } else if (str.equals("name")) {
+                    } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                         this.$name.element = (T) this.$reader.nextStringOrNull();
                         return;
                     }
-                } else if (str.equals("id")) {
+                } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     this.$id.element = (T) this.$reader.nextLongOrNull();
                     return;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
index 7626365171..98c073856e 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
@@ -36,9 +36,9 @@ public class ModelGuildIntegration implements Model {
         public void assignField(Model.JsonReader jsonReader) throws IOException {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
-            if (nextName.equals("id")) {
+            if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 this.f2062id = jsonReader.nextString(this.f2062id);
-            } else if (!nextName.equals("name")) {
+            } else if (!nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                 jsonReader.skipValue();
             } else {
                 this.name = jsonReader.nextString(this.name);
@@ -107,7 +107,7 @@ public class ModelGuildIntegration implements Model {
         public void assignField(Model.JsonReader jsonReader) throws IOException {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
-            if (!nextName.equals("guild_id")) {
+            if (!nextName.equals(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID)) {
                 jsonReader.skipValue();
             } else {
                 this.guildId = jsonReader.nextLong(this.guildId);
@@ -153,7 +153,7 @@ public class ModelGuildIntegration implements Model {
         char c2 = 65535;
         switch (nextName.hashCode()) {
             case -1743820047:
-                if (nextName.equals("enable_emoticons")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ENABLE_EMOTICONS)) {
                     c2 = 0;
                     break;
                 }
@@ -177,19 +177,19 @@ public class ModelGuildIntegration implements Model {
                 }
                 break;
             case -486786702:
-                if (nextName.equals("expire_behavior")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_EXPIRE_BEHAVIOR)) {
                     c2 = 4;
                     break;
                 }
                 break;
             case 3355:
-                if (nextName.equals("id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     c2 = 5;
                     break;
                 }
                 break;
             case 3373707:
-                if (nextName.equals("name")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                     c2 = 6;
                     break;
                 }
@@ -219,7 +219,7 @@ public class ModelGuildIntegration implements Model {
                 }
                 break;
             case 1767574344:
-                if (nextName.equals("expire_grace_period")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_EXPIRE_GRACE_PERIOD)) {
                     c2 = 11;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.java
index 6ffd3b758b..f85791e110 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Group$Parser$parse$1.java
@@ -28,7 +28,7 @@ public final class ModelGuildMemberListUpdate$Group$Parser$parse$1<T> implements
                     ref$IntRef.element = nextIntOrNull.intValue();
                     return;
                 }
-            } else if (str.equals("id")) {
+            } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 Ref$ObjectRef ref$ObjectRef = this.$id;
                 T t = (T) this.$reader.nextString("");
                 m.checkNotNullExpressionValue(t, "reader.nextString(\"\")");
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.java
index dbe2323063..d8c0d190c6 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate$Parser$parse$1.java
@@ -60,7 +60,7 @@ public final class ModelGuildMemberListUpdate$Parser$parse$1<T> implements Actio
                             this.$operations.element = (T) this.$reader.nextList(new AnonymousClass1(this));
                             return;
                         }
-                    } else if (str.equals("id")) {
+                    } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                         this.$id.element = (T) this.$reader.nextStringOrNull();
                         return;
                     }
@@ -68,7 +68,7 @@ public final class ModelGuildMemberListUpdate$Parser$parse$1<T> implements Actio
                     this.$groups.element = (T) this.$reader.nextList(new AnonymousClass2(this));
                     return;
                 }
-            } else if (str.equals("guild_id")) {
+            } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID)) {
                 this.$guildId.element = (T) this.$reader.nextLongOrNull();
                 return;
             }
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
index fe356ae0d0..86d315f6d1 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
@@ -1,5 +1,6 @@
 package com.discord.models.domain;
 
+import androidx.browser.customtabs.CustomTabsCallback;
 import c.d.b.a.a;
 import com.discord.api.guildmember.GuildMember;
 import com.discord.models.domain.Model;
@@ -66,12 +67,12 @@ public final class ModelGuildMemberListUpdate {
 
         public Group(String str, int i) {
             Type type;
-            m.checkNotNullParameter(str, "id");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
             this.f2064id = str;
             this.count = i;
             int hashCode = str.hashCode();
             if (hashCode != -1548612125) {
-                if (hashCode == -1012222381 && str.equals("online")) {
+                if (hashCode == -1012222381 && str.equals(CustomTabsCallback.ONLINE_EXTRAS_KEY)) {
                     type = Type.ONLINE;
                     this.type = type;
                 }
@@ -102,7 +103,7 @@ public final class ModelGuildMemberListUpdate {
         }
 
         public final Group copy(String str, int i) {
-            m.checkNotNullParameter(str, "id");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
             return new Group(str, i);
         }
 
@@ -739,7 +740,7 @@ public final class ModelGuildMemberListUpdate {
             long longValue = l.longValue();
             String str = ref$ObjectRef.element;
             if (str == null) {
-                str = "everyone";
+                str = ModelGuildMemberListUpdate.EVERYONE_ID;
             }
             List list = ref$ObjectRef2.element;
             m.checkNotNull(list);
@@ -752,7 +753,7 @@ public final class ModelGuildMemberListUpdate {
     /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: java.util.List<? extends com.discord.models.domain.ModelGuildMemberListUpdate$Operation> */
     /* JADX WARN: Multi-variable type inference failed */
     public ModelGuildMemberListUpdate(long j, String str, List<? extends Operation> list, List<Group> list2) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(list, "operations");
         m.checkNotNullParameter(list2, "groups");
         this.guildId = j;
@@ -796,7 +797,7 @@ public final class ModelGuildMemberListUpdate {
     }
 
     public final ModelGuildMemberListUpdate copy(long j, String str, List<? extends Operation> list, List<Group> list2) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(list, "operations");
         m.checkNotNullParameter(list2, "groups");
         return new ModelGuildMemberListUpdate(j, str, list, list2);
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildTemplate.java b/app/src/main/java/com/discord/models/domain/ModelGuildTemplate.java
index cbbfaf25a4..ae32620400 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildTemplate.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildTemplate.java
@@ -20,9 +20,9 @@ public final class ModelGuildTemplate {
     public ModelGuildTemplate(long j, User user, long j2, Guild guild, String str, String str2, int i, String str3, String str4, String str5) {
         m.checkNotNullParameter(str, "createdAt");
         m.checkNotNullParameter(str2, "updatedAt");
-        m.checkNotNullParameter(str3, "code");
-        m.checkNotNullParameter(str4, "name");
-        m.checkNotNullParameter(str5, "description");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_CODE);
+        m.checkNotNullParameter(str4, ModelAuditLogEntry.CHANGE_KEY_NAME);
+        m.checkNotNullParameter(str5, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         this.creatorId = j;
         this.creator = user;
         this.sourceGuildId = j2;
@@ -82,9 +82,9 @@ public final class ModelGuildTemplate {
     public final ModelGuildTemplate copy(long j, User user, long j2, Guild guild, String str, String str2, int i, String str3, String str4, String str5) {
         m.checkNotNullParameter(str, "createdAt");
         m.checkNotNullParameter(str2, "updatedAt");
-        m.checkNotNullParameter(str3, "code");
-        m.checkNotNullParameter(str4, "name");
-        m.checkNotNullParameter(str5, "description");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_CODE);
+        m.checkNotNullParameter(str4, ModelAuditLogEntry.CHANGE_KEY_NAME);
+        m.checkNotNullParameter(str5, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         return new ModelGuildTemplate(j, user, j2, guild, str, str2, i, str3, str4, str5);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/ModelInvite.java b/app/src/main/java/com/discord/models/domain/ModelInvite.java
index bd398ac943..d2b8e23015 100644
--- a/app/src/main/java/com/discord/models/domain/ModelInvite.java
+++ b/app/src/main/java/com/discord/models/domain/ModelInvite.java
@@ -27,7 +27,7 @@ public class ModelInvite implements Serializable {
     private int uses;
 
     public static class Settings {
-        public static final int[] EXPIRES_AFTER_ARRAY = {0, 604800, 86400, 43200, 21600, 3600, 1800};
+        public static final int[] EXPIRES_AFTER_ARRAY = {0, SEVEN_DAYS, 86400, TWELVE_HOURS, SIX_HOURS, 3600, HALF_HOUR};
         public static final int HALF_HOUR = 1800;
         public static final int[] MAX_USES_ARRAY = {0, 1, 10, 100};
         public static final int NEVER = 0;
@@ -263,7 +263,7 @@ public class ModelInvite implements Serializable {
     }
 
     public String toLink(Resources resources, String str) {
-        return String.format("%1$s/%2$s", str, this.code);
+        return String.format(URL_FORMAT, str, this.code);
     }
 
     @Override // java.lang.Object
diff --git a/app/src/main/java/com/discord/models/domain/ModelMessageDelete.java b/app/src/main/java/com/discord/models/domain/ModelMessageDelete.java
index 47a9fce91d..cde3fc1ab5 100644
--- a/app/src/main/java/com/discord/models/domain/ModelMessageDelete.java
+++ b/app/src/main/java/com/discord/models/domain/ModelMessageDelete.java
@@ -24,13 +24,13 @@ public class ModelMessageDelete implements Model {
         char c2 = 65535;
         switch (nextName.hashCode()) {
             case -1930808873:
-                if (nextName.equals("channel_id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
                     c2 = 0;
                     break;
                 }
                 break;
             case 3355:
-                if (nextName.equals("id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     c2 = 1;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java b/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java
index 6d0b9aed03..25304f0576 100644
--- a/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java
+++ b/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java
@@ -1,5 +1,6 @@
 package com.discord.models.domain;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.a.n.a.l;
 import c.d.b.a.a;
 import com.discord.models.domain.Model;
@@ -63,7 +64,7 @@ public class ModelNotificationSettings implements Model {
                     }
                     break;
                 case -1930808873:
-                    if (nextName.equals("channel_id")) {
+                    if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
                         c2 = 1;
                         break;
                     }
@@ -227,7 +228,7 @@ public class ModelNotificationSettings implements Model {
                 }
                 break;
             case -1306538777:
-                if (nextName.equals("guild_id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID)) {
                     c2 = 2;
                     break;
                 }
@@ -383,7 +384,7 @@ public class ModelNotificationSettings implements Model {
         Long endTimeMs;
         long currentTimeMillis = clock.currentTimeMillis();
         ModelMuteConfig modelMuteConfig = this.muteConfig;
-        long longValue = (modelMuteConfig == null || (endTimeMs = modelMuteConfig.getEndTimeMs()) == null || endTimeMs.longValue() <= currentTimeMillis) ? Long.MAX_VALUE : endTimeMs.longValue();
+        long longValue = (modelMuteConfig == null || (endTimeMs = modelMuteConfig.getEndTimeMs()) == null || endTimeMs.longValue() <= currentTimeMillis) ? RecyclerView.FOREVER_NS : endTimeMs.longValue();
         for (ChannelOverride channelOverride : this.channelOverrides) {
             ModelMuteConfig access$000 = ChannelOverride.access$000(channelOverride);
             Long endTimeMs2 = access$000 != null ? access$000.getEndTimeMs() : Long.MIN_VALUE;
diff --git a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
index 4884afa873..e10232e475 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
@@ -1,5 +1,6 @@
 package com.discord.models.domain;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.discord.models.domain.billing.ModelBillingAddress;
 import d0.z.d.m;
@@ -70,7 +71,7 @@ public abstract class ModelPaymentSource {
             super(str3, z2, modelBillingAddress, z3, null);
             m.checkNotNullParameter(str, "brand");
             m.checkNotNullParameter(str2, "last4");
-            m.checkNotNullParameter(str3, "id");
+            m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(modelBillingAddress, "billingAddress");
             this.brand = str;
             this.last4 = str2;
@@ -121,7 +122,7 @@ public abstract class ModelPaymentSource {
         public final ModelPaymentSourceCard copy(String str, String str2, int i, int i2, String str3, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3) {
             m.checkNotNullParameter(str, "brand");
             m.checkNotNullParameter(str2, "last4");
-            m.checkNotNullParameter(str3, "id");
+            m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(modelBillingAddress, "billingAddress");
             return new ModelPaymentSourceCard(str, str2, i, i2, str3, z2, modelBillingAddress, z3);
         }
@@ -239,8 +240,8 @@ public abstract class ModelPaymentSource {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ModelPaymentSourcePaypal(String str, String str2, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3) {
             super(str2, z2, modelBillingAddress, z3, null);
-            m.checkNotNullParameter(str, "email");
-            m.checkNotNullParameter(str2, "id");
+            m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EMAIL);
+            m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(modelBillingAddress, "billingAddress");
             this.email = str;
             this.f2069id = str2;
@@ -289,8 +290,8 @@ public abstract class ModelPaymentSource {
         }
 
         public final ModelPaymentSourcePaypal copy(String str, String str2, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3) {
-            m.checkNotNullParameter(str, "email");
-            m.checkNotNullParameter(str2, "id");
+            m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EMAIL);
+            m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(modelBillingAddress, "billingAddress");
             return new ModelPaymentSourcePaypal(str, str2, z2, modelBillingAddress, z3);
         }
diff --git a/app/src/main/java/com/discord/models/domain/ModelReadState$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelReadState$Parser$parse$1.java
index bbf2891646..69d0767fd9 100644
--- a/app/src/main/java/com/discord/models/domain/ModelReadState$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelReadState$Parser$parse$1.java
@@ -28,7 +28,7 @@ public final class ModelReadState$Parser$parse$1<T> implements Action1<String> {
         if (str != null) {
             switch (str.hashCode()) {
                 case -1930808873:
-                    if (str.equals("channel_id")) {
+                    if (str.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
                         Ref$LongRef ref$LongRef = this.$channelId;
                         ref$LongRef.element = this.$reader.nextLong(ref$LongRef.element);
                         return;
@@ -49,7 +49,7 @@ public final class ModelReadState$Parser$parse$1<T> implements Action1<String> {
                     }
                     break;
                 case 3355:
-                    if (str.equals("id")) {
+                    if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                         this.$id.element = this.$reader.nextLong(0);
                         return;
                     }
diff --git a/app/src/main/java/com/discord/models/domain/ModelRtcLatencyRegion.java b/app/src/main/java/com/discord/models/domain/ModelRtcLatencyRegion.java
index 8e40823def..d1fe2041b6 100644
--- a/app/src/main/java/com/discord/models/domain/ModelRtcLatencyRegion.java
+++ b/app/src/main/java/com/discord/models/domain/ModelRtcLatencyRegion.java
@@ -9,7 +9,7 @@ public final class ModelRtcLatencyRegion {
     private final String region;
 
     public ModelRtcLatencyRegion(String str, List<String> list) {
-        m.checkNotNullParameter(str, "region");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REGION);
         m.checkNotNullParameter(list, "ips");
         this.region = str;
         this.ips = list;
@@ -36,7 +36,7 @@ public final class ModelRtcLatencyRegion {
     }
 
     public final ModelRtcLatencyRegion copy(String str, List<String> list) {
-        m.checkNotNullParameter(str, "region");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REGION);
         m.checkNotNullParameter(list, "ips");
         return new ModelRtcLatencyRegion(str, list);
     }
diff --git a/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java b/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java
index a945d9f56e..345bb19c67 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java
@@ -1,5 +1,6 @@
 package com.discord.models.domain;
 
+import androidx.core.app.FrameMetricsAggregator;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
 import com.discord.api.message.Message;
@@ -24,7 +25,7 @@ public final class ModelSearchResponse {
     private final int totalResults;
 
     public ModelSearchResponse() {
-        this(0, null, null, null, null, null, null, null, null, 511, null);
+        this(0, null, null, null, null, null, null, null, null, FrameMetricsAggregator.EVERY_DURATION, null);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List<? extends java.util.List<com.discord.api.message.Message>> */
diff --git a/app/src/main/java/com/discord/models/domain/ModelSku$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelSku$Parser$parse$1.java
index 674ca32548..aac4ec9af2 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSku$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSku$Parser$parse$1.java
@@ -34,7 +34,7 @@ public final class ModelSku$Parser$parse$1<T> implements Action1<String> {
         if (str != null) {
             switch (str.hashCode()) {
                 case -1287148950:
-                    if (str.equals("application_id")) {
+                    if (str.equals(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID)) {
                         this.$applicationId.element = (T) this.$reader.nextLongOrNull();
                         return;
                     }
@@ -46,13 +46,13 @@ public final class ModelSku$Parser$parse$1<T> implements Action1<String> {
                     }
                     break;
                 case 3355:
-                    if (str.equals("id")) {
+                    if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                         this.$id.element = (T) this.$reader.nextLongOrNull();
                         return;
                     }
                     break;
                 case 3373707:
-                    if (str.equals("name")) {
+                    if (str.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                         this.$name.element = (T) this.$reader.nextStringOrNull();
                         return;
                     }
diff --git a/app/src/main/java/com/discord/models/domain/ModelSku.java b/app/src/main/java/com/discord/models/domain/ModelSku.java
index 64526058ee..5cef57c130 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSku.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSku.java
@@ -356,7 +356,7 @@ public final class ModelSku {
     }
 
     public ModelSku(long j, String str, long j2, Application application, boolean z2, int i, Price price, int i2, Map<Integer, ExternalSkuStrategy> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.applicationId = j;
         this.name = str;
         this.f2072id = j2;
@@ -409,7 +409,7 @@ public final class ModelSku {
     }
 
     public final ModelSku copy(long j, String str, long j2, Application application, boolean z2, int i, Price price, int i2, Map<Integer, ExternalSkuStrategy> map) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ModelSku(j, str, j2, application, z2, i, price, i2, map);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/ModelStoreListing$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelStoreListing$Parser$parse$1.java
index b1c6dc80d3..4dd5754d6c 100644
--- a/app/src/main/java/com/discord/models/domain/ModelStoreListing$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelStoreListing$Parser$parse$1.java
@@ -24,7 +24,7 @@ public final class ModelStoreListing$Parser$parse$1<T> implements Action1<String
                     this.$sku.element = (T) ModelSku.Parser.INSTANCE.parse(this.$reader);
                     return;
                 }
-            } else if (str.equals("id")) {
+            } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 this.$id.element = (T) this.$reader.nextLongOrNull();
                 return;
             }
diff --git a/app/src/main/java/com/discord/models/domain/ModelSubscription.java b/app/src/main/java/com/discord/models/domain/ModelSubscription.java
index 924f05eca5..0b831a353c 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSubscription.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSubscription.java
@@ -384,7 +384,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
     }
 
     public ModelSubscription(String str, String str2, String str3, String str4, String str5, String str6, Integer num, String str7, String str8, SubscriptionRenewalMutations subscriptionRenewalMutations, List<SubscriptionItem> list, String str9, int i, int i2) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "createdAt");
         m.checkNotNullParameter(str4, "currentPeriodStart");
         m.checkNotNullParameter(str5, "currentPeriodEnd");
@@ -466,7 +466,7 @@ public final class ModelSubscription extends HasSubscriptionItems {
     }
 
     public final ModelSubscription copy(String str, String str2, String str3, String str4, String str5, String str6, Integer num, String str7, String str8, SubscriptionRenewalMutations subscriptionRenewalMutations, List<SubscriptionItem> list, String str9, int i, int i2) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "createdAt");
         m.checkNotNullParameter(str4, "currentPeriodStart");
         m.checkNotNullParameter(str5, "currentPeriodEnd");
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.java
index f64f3df17f..8fb7d0f2ce 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserNote$Update$Parser$parse$1.java
@@ -28,7 +28,7 @@ public final class ModelUserNote$Update$Parser$parse$1<T> implements Action1<Str
                     ref$ObjectRef.element = t;
                     return;
                 }
-            } else if (str.equals("id")) {
+            } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 this.$id.element = this.$reader.nextLong(0);
                 return;
             }
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserProfile.java b/app/src/main/java/com/discord/models/domain/ModelUserProfile.java
index d8a995bf97..a3e266b061 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserProfile.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserProfile.java
@@ -33,9 +33,9 @@ public class ModelUserProfile implements Model {
         public void assignField(Model.JsonReader jsonReader) throws IOException {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
-            if (nextName.equals("id")) {
+            if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                 this.guildId = jsonReader.nextLong(this.guildId);
-            } else if (!nextName.equals("nick")) {
+            } else if (!nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NICK)) {
                 jsonReader.skipValue();
             } else {
                 this.nick = jsonReader.nextString(this.nick);
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
index 1115404afa..7a43a94382 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
@@ -57,7 +57,7 @@ public class ModelUserRelationship implements Model {
                 }
                 break;
             case 3355:
-                if (nextName.equals("id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     c2 = 1;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserSettings.java b/app/src/main/java/com/discord/models/domain/ModelUserSettings.java
index a60e2c1a76..ec7edf01aa 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserSettings.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserSettings.java
@@ -181,7 +181,7 @@ public class ModelUserSettings implements Model {
                 }
                 break;
             case -1705139351:
-                if (nextName.equals("explicit_content_filter")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_EXPLICIT_CONTENT_FILTER)) {
                     c2 = 2;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
index de3497c96d..cdfc009c68 100644
--- a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
+++ b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
@@ -32,13 +32,13 @@ public class ModelVoiceRegion implements Model {
                 }
                 break;
             case 3355:
-                if (nextName.equals("id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case 3373707:
-                if (nextName.equals("name")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                     c2 = 3;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelWebhook.java b/app/src/main/java/com/discord/models/domain/ModelWebhook.java
index 417d0eec87..9220dc4685 100644
--- a/app/src/main/java/com/discord/models/domain/ModelWebhook.java
+++ b/app/src/main/java/com/discord/models/domain/ModelWebhook.java
@@ -19,7 +19,7 @@ public class ModelWebhook implements Model {
         char c2 = 65535;
         switch (nextName.hashCode()) {
             case -1930808873:
-                if (nextName.equals("channel_id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
                     c2 = 0;
                     break;
                 }
@@ -31,19 +31,19 @@ public class ModelWebhook implements Model {
                 }
                 break;
             case -1306538777:
-                if (nextName.equals("guild_id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID)) {
                     c2 = 2;
                     break;
                 }
                 break;
             case 3355:
-                if (nextName.equals("id")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     c2 = 3;
                     break;
                 }
                 break;
             case 3373707:
-                if (nextName.equals("name")) {
+                if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                     c2 = 4;
                     break;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/NonceGenerator.java b/app/src/main/java/com/discord/models/domain/NonceGenerator.java
index 87e7fbec90..b8866f2204 100644
--- a/app/src/main/java/com/discord/models/domain/NonceGenerator.java
+++ b/app/src/main/java/com/discord/models/domain/NonceGenerator.java
@@ -1,5 +1,6 @@
 package com.discord.models.domain;
 
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
 import d0.z.d.m;
@@ -27,7 +28,7 @@ public final class NonceGenerator {
 
         public final long computeNonce(Clock clock) {
             m.checkNotNullParameter(clock, "clock");
-            long currentTimeMillis = ((clock.currentTimeMillis() + 1471228928) - 1420070400000L) << 22;
+            long currentTimeMillis = ((clock.currentTimeMillis() + 1471228928) - SnowflakeUtils.DISCORD_EPOCH) << 22;
             if (currentTimeMillis <= NonceGenerator.access$getPreviousNonce$cp()) {
                 currentTimeMillis = NonceGenerator.access$getPreviousNonce$cp() + 1;
             }
diff --git a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
index 8bd1610da8..c6fdfd9d6a 100644
--- a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
+++ b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
@@ -21,7 +21,7 @@ public final class PaymentSourceRaw {
     private final int type;
 
     public PaymentSourceRaw(int i, String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3, String str2, String str3, String str4, int i2, int i3) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(modelBillingAddress, "billingAddress");
         this.type = i;
         this.f2080id = str;
@@ -80,7 +80,7 @@ public final class PaymentSourceRaw {
     }
 
     public final PaymentSourceRaw copy(int i, String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3, String str2, String str3, String str4, int i2, int i3) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(modelBillingAddress, "billingAddress");
         return new PaymentSourceRaw(i, str, z2, modelBillingAddress, z3, str2, str3, str4, i2, i3);
     }
diff --git a/app/src/main/java/com/discord/models/domain/StreamDelete$Parser$parse$1.java b/app/src/main/java/com/discord/models/domain/StreamDelete$Parser$parse$1.java
index 05576add21..600b3fdcfe 100644
--- a/app/src/main/java/com/discord/models/domain/StreamDelete$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/domain/StreamDelete$Parser$parse$1.java
@@ -27,7 +27,7 @@ public final class StreamDelete$Parser$parse$1<T> implements Action1<String> {
                         this.$unavailable.element = (T) this.$reader.nextBooleanOrNull();
                         return;
                     }
-                } else if (str.equals("reason")) {
+                } else if (str.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
                     this.$reasonStr.element = (T) this.$reader.nextStringOrNull();
                     return;
                 }
diff --git a/app/src/main/java/com/discord/models/domain/StreamDelete.java b/app/src/main/java/com/discord/models/domain/StreamDelete.java
index 2e6d8f6405..0fb63a4a4b 100644
--- a/app/src/main/java/com/discord/models/domain/StreamDelete.java
+++ b/app/src/main/java/com/discord/models/domain/StreamDelete.java
@@ -85,7 +85,7 @@ public final class StreamDelete {
 
     public StreamDelete(String str, Reason reason, boolean z2) {
         m.checkNotNullParameter(str, "streamKey");
-        m.checkNotNullParameter(reason, "reason");
+        m.checkNotNullParameter(reason, ModelAuditLogEntry.CHANGE_KEY_REASON);
         this.streamKey = str;
         this.reason = reason;
         this.unavailable = z2;
@@ -118,7 +118,7 @@ public final class StreamDelete {
 
     public final StreamDelete copy(String str, Reason reason, boolean z2) {
         m.checkNotNullParameter(str, "streamKey");
-        m.checkNotNullParameter(reason, "reason");
+        m.checkNotNullParameter(reason, ModelAuditLogEntry.CHANGE_KEY_REASON);
         return new StreamDelete(str, reason, z2);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/StreamType.java b/app/src/main/java/com/discord/models/domain/StreamType.java
index 058123908a..dc248980cc 100644
--- a/app/src/main/java/com/discord/models/domain/StreamType.java
+++ b/app/src/main/java/com/discord/models/domain/StreamType.java
@@ -1,12 +1,13 @@
 package com.discord.models.domain;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: ModelApplicationStream.kt */
 public enum StreamType {
     GUILD("guild"),
-    CALL("call");
+    CALL(NotificationCompat.CATEGORY_CALL);
     
     public static final Companion Companion = new Companion(null);
     private static final StreamType[] VALUES = values();
diff --git a/app/src/main/java/com/discord/models/domain/billing/ModelBillingAddress.java b/app/src/main/java/com/discord/models/domain/billing/ModelBillingAddress.java
index cec1865700..4d48665f0f 100644
--- a/app/src/main/java/com/discord/models/domain/billing/ModelBillingAddress.java
+++ b/app/src/main/java/com/discord/models/domain/billing/ModelBillingAddress.java
@@ -1,6 +1,7 @@
 package com.discord.models.domain.billing;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: ModelBillingAddress.kt */
 public final class ModelBillingAddress {
@@ -13,7 +14,7 @@ public final class ModelBillingAddress {
     private final String state;
 
     public ModelBillingAddress(String str, String str2, String str3, String str4, String str5, String str6, String str7) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "line_1");
         m.checkNotNullParameter(str3, "line_2");
         m.checkNotNullParameter(str4, "city");
@@ -83,7 +84,7 @@ public final class ModelBillingAddress {
     }
 
     public final ModelBillingAddress copy(String str, String str2, String str3, String str4, String str5, String str6, String str7) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "line_1");
         m.checkNotNullParameter(str3, "line_2");
         m.checkNotNullParameter(str4, "city");
diff --git a/app/src/main/java/com/discord/models/domain/emoji/EmojiCategory.java b/app/src/main/java/com/discord/models/domain/emoji/EmojiCategory.java
index 8eec62037d..f1710e6cb7 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/EmojiCategory.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/EmojiCategory.java
@@ -1,6 +1,7 @@
 package com.discord.models.domain.emoji;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.ActivityChooserModel;
 public enum EmojiCategory {
     FAVORITE("favorite", false),
     RECENT("recent", false),
@@ -8,7 +9,7 @@ public enum EmojiCategory {
     PEOPLE("people", true),
     NATURE("nature", true),
     FOOD("food", true),
-    ACTIVITY("activity", true),
+    ACTIVITY(ActivityChooserModel.ATTRIBUTE_ACTIVITY, true),
     TRAVEL("travel", true),
     OBJECTS("objects", true),
     SYMBOLS("symbols", true),
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
index d15a9f75fc..65c3f4cb65 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
@@ -5,7 +5,9 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import c.d.b.a.a;
 import com.discord.api.emoji.GuildEmoji;
+import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.string.StringUtilsKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -108,7 +110,7 @@ public class ModelEmojiCustom implements Emoji {
     }
 
     private String getColonRegex() {
-        return a.B(a.K("((?<!\\\\)):"), getNameDisambiguated(), ':');
+        return a.B(a.K("((?<!\\\\)):"), getNameDisambiguated(), MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0016: APUT  (r1v1 java.lang.Object[]), (1 ??[boolean, int, float, short, byte, char]), (r2v2 java.lang.String) */
@@ -116,7 +118,7 @@ public class ModelEmojiCustom implements Emoji {
         String str = emojiUriFormat;
         Object[] objArr = new Object[3];
         objArr[0] = Long.valueOf(j);
-        objArr[1] = z2 ? "gif" : StringUtilsKt.getSTATIC_IMAGE_EXTENSION();
+        objArr[1] = z2 ? IconUtils.ANIMATED_IMAGE_EXTENSION : StringUtilsKt.getSTATIC_IMAGE_EXTENSION();
         objArr[2] = Integer.valueOf(i);
         return String.format(str, objArr);
     }
@@ -228,7 +230,7 @@ public class ModelEmojiCustom implements Emoji {
         }
         sb.append(str);
         sb.append(this.name);
-        sb.append(':');
+        sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         sb.append(this.f2083id);
         sb.append('>');
         return sb.toString();
@@ -245,7 +247,7 @@ public class ModelEmojiCustom implements Emoji {
 
     @Override // com.discord.models.domain.emoji.Emoji
     public String getReactionKey() {
-        return this.name + ':' + this.f2083id;
+        return this.name + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + this.f2083id;
     }
 
     @Override // com.discord.models.domain.emoji.Emoji
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
index 32645c46be..d73cd68bdc 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
@@ -2,6 +2,7 @@ package com.discord.models.domain.emoji;
 
 import c.d.b.a.a;
 import com.discord.api.user.User;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: ModelEmojiGuild.kt */
@@ -18,7 +19,7 @@ public final class ModelEmojiGuild {
     private final User user;
 
     public ModelEmojiGuild(long j, String str, boolean z2, List<Long> list, boolean z3, User user, boolean z4, boolean z5) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "roles");
         m.checkNotNullParameter(user, "user");
         this.f2084id = j;
@@ -68,7 +69,7 @@ public final class ModelEmojiGuild {
     }
 
     public final ModelEmojiGuild copy(long j, String str, boolean z2, List<Long> list, boolean z3, User user, boolean z4, boolean z5) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "roles");
         m.checkNotNullParameter(user, "user");
         return new ModelEmojiGuild(j, str, z2, list, z3, user, z4, z5);
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java
index a2a06f96b0..8a67614037 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java
@@ -9,6 +9,7 @@ import c.a.n.a.l0.a;
 import c.a.n.a.l0.b;
 import c.a.n.a.l0.c;
 import com.discord.models.domain.Model;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -120,7 +121,7 @@ public class ModelEmojiUnicode implements Model, Emoji {
 
     @SuppressLint({"DefaultLocale"})
     public static String getImageUri(String str, Context context) {
-        return String.format("res:///%d", Integer.valueOf(context.getResources().getIdentifier(String.format("emoji_%s", str), "raw", context.getPackageName())));
+        return String.format(URI_FORMAT, Integer.valueOf(context.getResources().getIdentifier(String.format(FILENAME_FORMAT, str), "raw", context.getPackageName())));
     }
 
     private String toCodePoint() {
@@ -338,7 +339,7 @@ public class ModelEmojiUnicode implements Model, Emoji {
             str = getFirstName();
         }
         try {
-            return Pattern.compile("([^\\\\]|^):" + str + ':');
+            return Pattern.compile("([^\\\\]|^):" + str + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         } catch (PatternSyntaxException unused) {
             return Pattern.compile("$^");
         }
diff --git a/app/src/main/java/com/discord/models/domain/premium/SubscriptionPlanType.java b/app/src/main/java/com/discord/models/domain/premium/SubscriptionPlanType.java
index 56de65b289..91e4d073dc 100644
--- a/app/src/main/java/com/discord/models/domain/premium/SubscriptionPlanType.java
+++ b/app/src/main/java/com/discord/models/domain/premium/SubscriptionPlanType.java
@@ -1,5 +1,6 @@
 package com.discord.models.domain.premium;
 
+import androidx.room.RoomDatabase;
 import c.d.b.a.a;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.premium.SubscriptionInterval;
@@ -32,7 +33,7 @@ public enum SubscriptionPlanType {
     PREMIUM_YEAR_LEGACY(4999, r14, "premium_year", 511651860671627264L, r15),
     PREMIUM_MONTH_TIER_1(499, r11, "premium_month_tier_1", 511651871736201216L, r18),
     PREMIUM_YEAR_TIER_1(4999, r14, "premium_year_tier_1", 511651876987469824L, r18),
-    PREMIUM_MONTH_TIER_2(999, r11, "premium_month_tier_2", 511651880837840896L, r15),
+    PREMIUM_MONTH_TIER_2(RoomDatabase.MAX_BIND_PARAMETER_CNT, r11, "premium_month_tier_2", 511651880837840896L, r15),
     PREMIUM_YEAR_TIER_2(9999, r14, "premium_year_tier_2", 511651885459963904L, r15),
     PREMIUM_GUILD_MONTH(499, r11, null, 590665532894740483L, null),
     PREMIUM_GUILD_YEAR(4999, r14, null, 590665538238152709L, null);
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
index abaf3ff332..f3ef8c7aa3 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
@@ -1,6 +1,7 @@
 package com.discord.models.domain.spotify;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: ModelSpotifyAlbum.kt */
@@ -61,9 +62,9 @@ public final class ModelSpotifyAlbum {
 
     public ModelSpotifyAlbum(String str, String str2, List<AlbumImage> list, String str3) {
         m.checkNotNullParameter(str, "albumType");
-        m.checkNotNullParameter(str2, "id");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(list, "images");
-        m.checkNotNullParameter(str3, "name");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.albumType = str;
         this.f2085id = str2;
         this.images = list;
@@ -106,9 +107,9 @@ public final class ModelSpotifyAlbum {
 
     public final ModelSpotifyAlbum copy(String str, String str2, List<AlbumImage> list, String str3) {
         m.checkNotNullParameter(str, "albumType");
-        m.checkNotNullParameter(str2, "id");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(list, "images");
-        m.checkNotNullParameter(str3, "name");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ModelSpotifyAlbum(str, str2, list, str3);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
index cb946fbbc4..1ef65c0fbe 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
@@ -1,6 +1,7 @@
 package com.discord.models.domain.spotify;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: ModelSpotifyArtist.kt */
 public final class ModelSpotifyArtist {
@@ -10,8 +11,8 @@ public final class ModelSpotifyArtist {
     private final String name;
 
     public ModelSpotifyArtist(String str, String str2) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f2086id = str;
         this.name = str2;
     }
@@ -35,8 +36,8 @@ public final class ModelSpotifyArtist {
     }
 
     public final ModelSpotifyArtist copy(String str, String str2) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ModelSpotifyArtist(str, str2);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
index cab4b92f39..f30ce2b16e 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
@@ -1,6 +1,7 @@
 package com.discord.models.domain.spotify;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: ModelSpotifyTrack.kt */
@@ -15,8 +16,8 @@ public final class ModelSpotifyTrack {
     private final String name;
 
     public ModelSpotifyTrack(String str, String str2, long j, ModelSpotifyAlbum modelSpotifyAlbum, List<ModelSpotifyArtist> list, boolean z2) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "artists");
         this.f2087id = str;
         this.name = str2;
@@ -75,8 +76,8 @@ public final class ModelSpotifyTrack {
     }
 
     public final ModelSpotifyTrack copy(String str, String str2, long j, ModelSpotifyAlbum modelSpotifyAlbum, List<ModelSpotifyArtist> list, boolean z2) {
-        m.checkNotNullParameter(str, "id");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "artists");
         return new ModelSpotifyTrack(str, str2, j, modelSpotifyAlbum, list, z2);
     }
diff --git a/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java b/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java
index dfbb4770d3..4f8f3dd428 100644
--- a/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java
+++ b/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java
@@ -1,6 +1,8 @@
 package com.discord.models.experiments.domain;
 
 import c.q.a.k.a;
+import com.discord.api.permission.Permission;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: ExperimentHash.kt */
 public final class ExperimentHash {
@@ -10,8 +12,8 @@ public final class ExperimentHash {
     }
 
     public final long from(CharSequence charSequence) {
-        m.checkNotNullParameter(charSequence, "name");
+        m.checkNotNullParameter(charSequence, ModelAuditLogEntry.CHANGE_KEY_NAME);
         int H = a.H(charSequence, 0, charSequence.length(), 0);
-        return H < 0 ? ((long) H) + 4294967296L : (long) H;
+        return H < 0 ? ((long) H) + Permission.REQUEST_TO_SPEAK : (long) H;
     }
 }
diff --git a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentBucketDto$Parser$parsePosition$1.java b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentBucketDto$Parser$parsePosition$1.java
index f72848bd36..449eb55d9a 100644
--- a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentBucketDto$Parser$parsePosition$1.java
+++ b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentBucketDto$Parser$parsePosition$1.java
@@ -1,5 +1,6 @@
 package com.discord.models.experiments.dto;
 
+import c.a.r.n0.c.e;
 import com.discord.models.domain.Model;
 import kotlin.jvm.internal.Ref$IntRef;
 import rx.functions.Action1;
@@ -24,7 +25,7 @@ public final class GuildExperimentBucketDto$Parser$parsePosition$1<T> implements
                     ref$IntRef.element = this.$jsonReader.nextInt(ref$IntRef.element);
                     return;
                 }
-            } else if (str.equals("e")) {
+            } else if (str.equals(e.a)) {
                 Ref$IntRef ref$IntRef2 = this.$end;
                 ref$IntRef2.element = this.$jsonReader.nextInt(ref$IntRef2.element);
                 return;
diff --git a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java
index 461cf634da..d9015c2c5d 100644
--- a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java
+++ b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java
@@ -1,5 +1,6 @@
 package com.discord.models.experiments.dto;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.discord.api.guild.GuildFeature;
 import com.discord.models.domain.Model;
@@ -319,7 +320,7 @@ public abstract class GuildExperimentFilter {
             Long l = ref$ObjectRef.element;
             long longValue = l != null ? l.longValue() : 0;
             Long l2 = ref$ObjectRef2.element;
-            return new LongRange(longValue, l2 != null ? l2.longValue() : Long.MAX_VALUE);
+            return new LongRange(longValue, l2 != null ? l2.longValue() : RecyclerView.FOREVER_NS);
         }
 
         public final Map<Long, Function1<Model.JsonReader, GuildExperimentFilter>> getParsers() {
diff --git a/app/src/main/java/com/discord/models/gifpicker/dto/GifCategoryDto.java b/app/src/main/java/com/discord/models/gifpicker/dto/GifCategoryDto.java
index 02f9d5fa29..f23309cc2c 100644
--- a/app/src/main/java/com/discord/models/gifpicker/dto/GifCategoryDto.java
+++ b/app/src/main/java/com/discord/models/gifpicker/dto/GifCategoryDto.java
@@ -1,6 +1,7 @@
 package com.discord.models.gifpicker.dto;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: GifCategoryDto.kt */
 public final class GifCategoryDto {
@@ -8,7 +9,7 @@ public final class GifCategoryDto {
     private final String src;
 
     public GifCategoryDto(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "src");
         this.name = str;
         this.src = str2;
@@ -33,7 +34,7 @@ public final class GifCategoryDto {
     }
 
     public final GifCategoryDto copy(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "src");
         return new GifCategoryDto(str, str2);
     }
diff --git a/app/src/main/java/com/discord/models/guild/Guild.java b/app/src/main/java/com/discord/models/guild/Guild.java
index 641a4caf85..3e11407484 100644
--- a/app/src/main/java/com/discord/models/guild/Guild.java
+++ b/app/src/main/java/com/discord/models/guild/Guild.java
@@ -1,6 +1,7 @@
 package com.discord.models.guild;
 
 import a0.a.a.b;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.d.b.a.a;
 import com.discord.api.emoji.GuildEmoji;
 import com.discord.api.guild.GuildExplicitContentFilter;
@@ -10,6 +11,7 @@ import com.discord.api.guild.GuildVerificationLevel;
 import com.discord.api.guild.welcome.GuildWelcomeScreen;
 import com.discord.api.role.GuildRole;
 import com.discord.api.sticker.Sticker;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.utilities.guilds.GuildUtilsKt;
 import d0.t.n;
@@ -108,7 +110,7 @@ public final class Guild {
         m.checkNotNullParameter(list, "roles");
         m.checkNotNullParameter(list2, "emojis");
         m.checkNotNullParameter(list3, "stickers");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(guildVerificationLevel, "verificationLevel");
         m.checkNotNullParameter(guildExplicitContentFilter, "explicitContentFilter");
         m.checkNotNullParameter(set, "features");
@@ -151,11 +153,11 @@ public final class Guild {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ Guild(List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, int i9, int i10, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i9 & 1) != 0 ? n.emptyList() : list, (i9 & 2) != 0 ? n.emptyList() : list2, (i9 & 4) != 0 ? n.emptyList() : list3, (i9 & 8) != 0 ? "" : str, (i9 & 16) != 0 ? null : str2, (i9 & 32) != 0 ? ModelNotificationSettings.FREQUENCY_ALL : i, (i9 & 64) != 0 ? 0 : j, (i9 & 128) != 0 ? null : str3, (i9 & 256) == 0 ? j2 : 0, (i9 & 512) != 0 ? null : str4, (i9 & 1024) != 0 ? GuildVerificationLevel.NONE : guildVerificationLevel, (i9 & 2048) != 0 ? GuildExplicitContentFilter.NONE : guildExplicitContentFilter, (i9 & 4096) != 0 ? false : z2, (i9 & 8192) != 0 ? 0 : i2, (i9 & 16384) != 0 ? 0 : i3, (i9 & 32768) != 0 ? null : l, (i9 & 65536) != 0 ? null : l2, (i9 & 131072) != 0 ? n0.emptySet() : set, (i9 & 262144) != 0 ? 0 : i4, (i9 & 524288) != 0 ? null : str5, (i9 & 1048576) != 0 ? null : str6, (i9 & 2097152) != 0 ? 0 : i5, (i9 & 4194304) != 0 ? 0 : i6, (i9 & 8388608) != 0 ? 0 : i7, (i9 & 16777216) != 0 ? null : str7, (i9 & 33554432) != 0 ? null : l3, (i9 & 67108864) != 0 ? null : l4, (i9 & 134217728) != 0 ? null : str8, (i9 & 268435456) != 0 ? null : guildWelcomeScreen, (i9 & 536870912) != 0 ? GuildMaxVideoChannelUsers.Unlimited.INSTANCE : guildMaxVideoChannelUsers, (i9 & 1073741824) != 0 ? null : str9, (i9 & Integer.MIN_VALUE) != 0 ? 0 : i8, (i10 & 1) == 0 ? z3 : false);
+        this((i9 & 1) != 0 ? n.emptyList() : list, (i9 & 2) != 0 ? n.emptyList() : list2, (i9 & 4) != 0 ? n.emptyList() : list3, (i9 & 8) != 0 ? "" : str, (i9 & 16) != 0 ? null : str2, (i9 & 32) != 0 ? ModelNotificationSettings.FREQUENCY_ALL : i, (i9 & 64) != 0 ? 0 : j, (i9 & 128) != 0 ? null : str3, (i9 & 256) == 0 ? j2 : 0, (i9 & 512) != 0 ? null : str4, (i9 & 1024) != 0 ? GuildVerificationLevel.NONE : guildVerificationLevel, (i9 & 2048) != 0 ? GuildExplicitContentFilter.NONE : guildExplicitContentFilter, (i9 & 4096) != 0 ? false : z2, (i9 & 8192) != 0 ? 0 : i2, (i9 & 16384) != 0 ? 0 : i3, (i9 & 32768) != 0 ? null : l, (i9 & 65536) != 0 ? null : l2, (i9 & 131072) != 0 ? n0.emptySet() : set, (i9 & 262144) != 0 ? 0 : i4, (i9 & 524288) != 0 ? null : str5, (i9 & 1048576) != 0 ? null : str6, (i9 & 2097152) != 0 ? 0 : i5, (i9 & 4194304) != 0 ? 0 : i6, (i9 & 8388608) != 0 ? 0 : i7, (i9 & 16777216) != 0 ? null : str7, (i9 & 33554432) != 0 ? null : l3, (i9 & 67108864) != 0 ? null : l4, (i9 & 134217728) != 0 ? null : str8, (i9 & 268435456) != 0 ? null : guildWelcomeScreen, (i9 & 536870912) != 0 ? GuildMaxVideoChannelUsers.Unlimited.INSTANCE : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? null : str9, (i9 & Integer.MIN_VALUE) != 0 ? 0 : i8, (i10 & 1) == 0 ? z3 : false);
     }
 
     public static /* synthetic */ Guild copy$default(Guild guild, List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, int i9, int i10, Object obj) {
-        return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2088id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & 1073741824) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3);
+        return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2088id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & BasicMeasure.EXACTLY) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3);
     }
 
     public final boolean canHaveBanner() {
@@ -306,7 +308,7 @@ public final class Guild {
         m.checkNotNullParameter(list, "roles");
         m.checkNotNullParameter(list2, "emojis");
         m.checkNotNullParameter(list3, "stickers");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(guildVerificationLevel, "verificationLevel");
         m.checkNotNullParameter(guildExplicitContentFilter, "explicitContentFilter");
         m.checkNotNullParameter(set, "features");
diff --git a/app/src/main/java/com/discord/models/invite/InviteUtils.java b/app/src/main/java/com/discord/models/invite/InviteUtils.java
index 2a4713962e..b2a7ddb813 100644
--- a/app/src/main/java/com/discord/models/invite/InviteUtils.java
+++ b/app/src/main/java/com/discord/models/invite/InviteUtils.java
@@ -1,6 +1,9 @@
 package com.discord.models.invite;
 
 import c.d.b.a.a;
+import com.discord.BuildConfig;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.models.domain.ModelInvite;
 import d0.z.d.m;
 /* compiled from: InviteUtils.kt */
 public final class InviteUtils {
@@ -10,7 +13,7 @@ public final class InviteUtils {
     }
 
     public final String createLinkFromCode(String str) {
-        m.checkNotNullParameter(str, "code");
-        return a.G(new Object[]{"https://discord.gg", str}, 2, "%1$s/%2$s", "java.lang.String.format(format, *args)");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
+        return a.G(new Object[]{BuildConfig.HOST_INVITE, str}, 2, ModelInvite.URL_FORMAT, "java.lang.String.format(format, *args)");
     }
 }
diff --git a/app/src/main/java/com/discord/models/member/GuildMember.java b/app/src/main/java/com/discord/models/member/GuildMember.java
index 9a906f0b91..bf832f5586 100644
--- a/app/src/main/java/com/discord/models/member/GuildMember.java
+++ b/app/src/main/java/com/discord/models/member/GuildMember.java
@@ -2,6 +2,7 @@ package com.discord.models.member;
 
 import a0.a.a.b;
 import androidx.annotation.ColorInt;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelRecipientNick;
@@ -83,7 +84,7 @@ public final class GuildMember {
         }
 
         public final int getColor(GuildMember guildMember, @ColorInt int i) {
-            return getColor(guildMember != null ? guildMember.getColor() : -16777216, i);
+            return getColor(guildMember != null ? guildMember.getColor() : ViewCompat.MEASURED_STATE_MASK, i);
         }
 
         public final String getNickOrUsername(GuildMember guildMember, User user) {
diff --git a/app/src/main/java/com/discord/models/message/Message.java b/app/src/main/java/com/discord/models/message/Message.java
index 61efe70164..c4f07d4ef6 100644
--- a/app/src/main/java/com/discord/models/message/Message.java
+++ b/app/src/main/java/com/discord/models/message/Message.java
@@ -1,6 +1,7 @@
 package com.discord.models.message;
 
 import a0.a.a.b;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.d.b.a.a;
 import com.discord.api.application.Application;
 import com.discord.api.botuikit.Component;
@@ -135,7 +136,7 @@ public final class Message {
     }
 
     public static /* synthetic */ Message copy$default(Message message, long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List list6, List list7, com.discord.api.message.Message message2, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2, Object obj) {
-        return message.copy((i & 1) != 0 ? message.f2089id : j, (i & 2) != 0 ? message.channelId : j2, (i & 4) != 0 ? message.guildId : l, (i & 8) != 0 ? message.author : user, (i & 16) != 0 ? message.content : str, (i & 32) != 0 ? message.timestamp : utcDateTime, (i & 64) != 0 ? message.editedTimestamp : utcDateTime2, (i & 128) != 0 ? message.tts : bool, (i & 256) != 0 ? message.mentionEveryone : bool2, (i & 512) != 0 ? message.mentions : list, (i & 1024) != 0 ? message.mentionRoles : list2, (i & 2048) != 0 ? message.attachments : list3, (i & 4096) != 0 ? message.embeds : list4, (i & 8192) != 0 ? message.reactions : list5, (i & 16384) != 0 ? message.nonce : str2, (i & 32768) != 0 ? message.pinned : bool3, (i & 65536) != 0 ? message.webhookId : l2, (i & 131072) != 0 ? message.type : num, (i & 262144) != 0 ? message.activity : messageActivity, (i & 524288) != 0 ? message.application : application, (i & 1048576) != 0 ? message.applicationId : l3, (i & 2097152) != 0 ? message.messageReference : messageReference, (i & 4194304) != 0 ? message.flags : l4, (i & 8388608) != 0 ? message.stickers : list6, (i & 16777216) != 0 ? message.stickerItems : list7, (i & 33554432) != 0 ? message.referencedMessage : message2, (i & 67108864) != 0 ? message.interaction : interaction, (i & 134217728) != 0 ? message.thread : channel, (i & 268435456) != 0 ? message.components : list8, (i & 536870912) != 0 ? message.call : messageCall, (i & 1073741824) != 0 ? message.hit : bool4, (i & Integer.MIN_VALUE) != 0 ? message.hasLocalUploads : z2, (i2 & 1) != 0 ? message.allowedMentions : messageAllowedMentions, (i2 & 2) != 0 ? message.numRetries : num2, (i2 & 4) != 0 ? message.lastManualAttemptTimestamp : l5, (i2 & 8) != 0 ? message.initialAttemptTimestamp : l6, (i2 & 16) != 0 ? message.localAttachments : list9);
+        return message.copy((i & 1) != 0 ? message.f2089id : j, (i & 2) != 0 ? message.channelId : j2, (i & 4) != 0 ? message.guildId : l, (i & 8) != 0 ? message.author : user, (i & 16) != 0 ? message.content : str, (i & 32) != 0 ? message.timestamp : utcDateTime, (i & 64) != 0 ? message.editedTimestamp : utcDateTime2, (i & 128) != 0 ? message.tts : bool, (i & 256) != 0 ? message.mentionEveryone : bool2, (i & 512) != 0 ? message.mentions : list, (i & 1024) != 0 ? message.mentionRoles : list2, (i & 2048) != 0 ? message.attachments : list3, (i & 4096) != 0 ? message.embeds : list4, (i & 8192) != 0 ? message.reactions : list5, (i & 16384) != 0 ? message.nonce : str2, (i & 32768) != 0 ? message.pinned : bool3, (i & 65536) != 0 ? message.webhookId : l2, (i & 131072) != 0 ? message.type : num, (i & 262144) != 0 ? message.activity : messageActivity, (i & 524288) != 0 ? message.application : application, (i & 1048576) != 0 ? message.applicationId : l3, (i & 2097152) != 0 ? message.messageReference : messageReference, (i & 4194304) != 0 ? message.flags : l4, (i & 8388608) != 0 ? message.stickers : list6, (i & 16777216) != 0 ? message.stickerItems : list7, (i & 33554432) != 0 ? message.referencedMessage : message2, (i & 67108864) != 0 ? message.interaction : interaction, (i & 134217728) != 0 ? message.thread : channel, (i & 268435456) != 0 ? message.components : list8, (i & 536870912) != 0 ? message.call : messageCall, (i & BasicMeasure.EXACTLY) != 0 ? message.hit : bool4, (i & Integer.MIN_VALUE) != 0 ? message.hasLocalUploads : z2, (i2 & 1) != 0 ? message.allowedMentions : messageAllowedMentions, (i2 & 2) != 0 ? message.numRetries : num2, (i2 & 4) != 0 ? message.lastManualAttemptTimestamp : l5, (i2 & 8) != 0 ? message.initialAttemptTimestamp : l6, (i2 & 16) != 0 ? message.localAttachments : list9);
     }
 
     public final boolean canResend() {
diff --git a/app/src/main/java/com/discord/models/phone/PhoneCountryCode.java b/app/src/main/java/com/discord/models/phone/PhoneCountryCode.java
index 1d5bdff073..8bfc3227d6 100644
--- a/app/src/main/java/com/discord/models/phone/PhoneCountryCode.java
+++ b/app/src/main/java/com/discord/models/phone/PhoneCountryCode.java
@@ -1,6 +1,7 @@
 package com.discord.models.phone;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: PhoneCountryCode.kt */
@@ -31,7 +32,7 @@ public final class PhoneCountryCode {
     }
 
     public PhoneCountryCode(String str, String str2, String str3) {
-        a.h0(str, "alpha2", str2, "code", str3, "name");
+        a.h0(str, "alpha2", str2, ModelAuditLogEntry.CHANGE_KEY_CODE, str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.alpha2 = str;
         this.code = str2;
         this.name = str3;
@@ -72,8 +73,8 @@ public final class PhoneCountryCode {
 
     public final PhoneCountryCode copy(String str, String str2, String str3) {
         m.checkNotNullParameter(str, "alpha2");
-        m.checkNotNullParameter(str2, "code");
-        m.checkNotNullParameter(str3, "name");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_CODE);
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new PhoneCountryCode(str, str2, str3);
     }
 
diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
index 8ba395ce15..e1769398f4 100644
--- a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
+++ b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
@@ -2,6 +2,7 @@ package com.discord.models.sticker.dto;
 
 import c.d.b.a.a;
 import com.discord.api.sticker.Sticker;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelSku;
 import d0.z.d.m;
 import java.util.Collection;
@@ -22,7 +23,7 @@ public final class ModelStickerPack {
 
     public ModelStickerPack(long j, List<Sticker> list, String str, ModelStickerPackStoreListing modelStickerPackStoreListing, long j2, Long l, String str2, Long l2) {
         m.checkNotNullParameter(list, "stickers");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f2090id = j;
         this.stickers = list;
         this.name = str;
@@ -76,7 +77,7 @@ public final class ModelStickerPack {
 
     public final ModelStickerPack copy(long j, List<Sticker> list, String str, ModelStickerPackStoreListing modelStickerPackStoreListing, long j2, Long l, String str2, Long l2) {
         m.checkNotNullParameter(list, "stickers");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ModelStickerPack(j, list, str, modelStickerPackStoreListing, j2, l, str2, l2);
     }
 
diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
index fe3a73541c..03c089d00d 100644
--- a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
+++ b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
@@ -1,6 +1,7 @@
 package com.discord.models.sticker.dto;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelSku;
 import com.discord.models.store.dto.ModelStoreAsset;
 import com.discord.utilities.time.TimeUtils;
@@ -17,7 +18,7 @@ public final class ModelStickerPackStoreListing {
 
     public ModelStickerPackStoreListing(ModelSku modelSku, long j, String str, String str2, ModelStoreAsset modelStoreAsset) {
         m.checkNotNullParameter(modelSku, "sku");
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         this.sku = modelSku;
         this.f2091id = j;
         this.description = str;
@@ -66,7 +67,7 @@ public final class ModelStickerPackStoreListing {
 
     public final ModelStickerPackStoreListing copy(ModelSku modelSku, long j, String str, String str2, ModelStoreAsset modelStoreAsset) {
         m.checkNotNullParameter(modelSku, "sku");
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         return new ModelStickerPackStoreListing(modelSku, j, str, str2, modelStoreAsset);
     }
 
diff --git a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java
index aee4057d3a..bf8c07b769 100644
--- a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java
@@ -5,6 +5,7 @@ import com.discord.api.message.Message;
 import com.discord.api.thread.ThreadMember;
 import com.discord.models.deserialization.gson.InboundGatewayGsonParser;
 import com.discord.models.domain.Model;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.gson.stream.JsonToken;
 import d0.z.d.m;
 import kotlin.jvm.internal.Ref$LongRef;
@@ -97,7 +98,7 @@ public final class ModelThreadListSync$Parser$parse$1<T> implements Action1<Stri
                     }
                     break;
                 case -1306538777:
-                    if (str.equals("guild_id")) {
+                    if (str.equals(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID)) {
                         Ref$LongRef ref$LongRef = this.$guildId;
                         Long nextLongOrNull = this.$reader.nextLongOrNull();
                         m.checkNotNull(nextLongOrNull);
diff --git a/app/src/main/java/com/discord/overlay/OverlayService.java b/app/src/main/java/com/discord/overlay/OverlayService.java
index b368e00dd7..273a6cdd56 100644
--- a/app/src/main/java/com/discord/overlay/OverlayService.java
+++ b/app/src/main/java/com/discord/overlay/OverlayService.java
@@ -136,7 +136,7 @@ public abstract class OverlayService extends Service {
             intent = new Intent();
         }
         if (attachBubbleToWindow(intent)) {
-            startForeground(5858, createNotification(intent));
+            startForeground(NOTIFICATION_ID, createNotification(intent));
         }
     }
 
diff --git a/app/src/main/java/com/discord/panels/OverlappingPanelsLayout.java b/app/src/main/java/com/discord/panels/OverlappingPanelsLayout.java
index d638ea00d5..92388f6e34 100644
--- a/app/src/main/java/com/discord/panels/OverlappingPanelsLayout.java
+++ b/app/src/main/java/com/discord/panels/OverlappingPanelsLayout.java
@@ -13,6 +13,7 @@ import android.view.VelocityTracker;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import androidx.core.app.NotificationCompat;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
 import com.discord.panels.PanelState;
@@ -375,7 +376,7 @@ public class OverlappingPanelsLayout extends FrameLayout {
         if (this.centerPanel == null) {
             this.pendingUpdate = new c(this, z2);
         } else {
-            updateCenterPanelXWithAnimation(0.0f, z2, 200);
+            updateCenterPanelXWithAnimation(0.0f, z2, SIDE_PANEL_CLOSE_DURATION_MS);
         }
     }
 
@@ -732,7 +733,7 @@ public class OverlappingPanelsLayout extends FrameLayout {
         if (this.centerPanel == null) {
             this.pendingUpdate = new d(this, z2);
         } else {
-            updateCenterPanelXWithAnimation(this.endPanelOpenedCenterPanelX, z2, 250);
+            updateCenterPanelXWithAnimation(this.endPanelOpenedCenterPanelX, z2, SIDE_PANEL_OPEN_DURATION_MS);
         }
     }
 
@@ -764,7 +765,7 @@ public class OverlappingPanelsLayout extends FrameLayout {
         } else if (this.startPanelLockState == LockState.OPEN) {
             updateCenterPanelX(this.startPanelOpenedCenterPanelX);
         } else {
-            updateCenterPanelXWithAnimation(this.startPanelOpenedCenterPanelX, z2, 250);
+            updateCenterPanelXWithAnimation(this.startPanelOpenedCenterPanelX, z2, SIDE_PANEL_OPEN_DURATION_MS);
         }
     }
 
@@ -922,7 +923,7 @@ public class OverlappingPanelsLayout extends FrameLayout {
                 z2 = false;
             }
             if ((i & 4) != 0) {
-                j = 250;
+                j = SIDE_PANEL_OPEN_DURATION_MS;
             }
             overlappingPanelsLayout.updateCenterPanelXWithAnimation(f, z2, j);
             return;
@@ -984,7 +985,7 @@ public class OverlappingPanelsLayout extends FrameLayout {
 
     @Override // android.view.ViewGroup
     public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
-        m.checkParameterIsNotNull(motionEvent, "event");
+        m.checkParameterIsNotNull(motionEvent, NotificationCompat.CATEGORY_EVENT);
         int actionMasked = motionEvent.getActionMasked();
         boolean z2 = false;
         if (actionMasked != 0) {
@@ -1049,7 +1050,7 @@ public class OverlappingPanelsLayout extends FrameLayout {
 
     @Override // android.view.View
     public boolean onTouchEvent(MotionEvent motionEvent) {
-        m.checkParameterIsNotNull(motionEvent, "event");
+        m.checkParameterIsNotNull(motionEvent, NotificationCompat.CATEGORY_EVENT);
         if (this.isHomeSystemGesture) {
             return false;
         }
diff --git a/app/src/main/java/com/discord/player/AppMediaPlayer.java b/app/src/main/java/com/discord/player/AppMediaPlayer.java
index f1a452806e..1aa274d929 100644
--- a/app/src/main/java/com/discord/player/AppMediaPlayer.java
+++ b/app/src/main/java/com/discord/player/AppMediaPlayer.java
@@ -5,6 +5,7 @@ import android.net.Uri;
 import android.util.Log;
 import android.view.Surface;
 import androidx.annotation.MainThread;
+import androidx.core.view.PointerIconCompat;
 import c.a.q.a;
 import c.a.q.b;
 import c.a.q.c;
@@ -404,9 +405,9 @@ public final class AppMediaPlayer {
             c.i.a.c.u1.c1 c1Var = p1Var.k;
             d1.a d02 = c1Var.d0();
             c.i.a.c.u1.r0 r0Var = new c.i.a.c.u1.r0(d02, g);
-            c1Var.m.put(1019, d02);
+            c1Var.m.put(PointerIconCompat.TYPE_ZOOM_OUT, d02);
             o<d1, d1.b> oVar = c1Var.n;
-            oVar.b(1019, r0Var);
+            oVar.b(PointerIconCompat.TYPE_ZOOM_OUT, r0Var);
             oVar.a();
             Iterator<c.i.a.c.v1.p> it = p1Var.g.iterator();
             while (it.hasNext()) {
diff --git a/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java b/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
index a09d3f5e1f..af61f6c5ec 100644
--- a/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
@@ -1,5 +1,6 @@
 package com.discord.restapi;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.h0;
 import d0.z.d.m;
 import f0.f0.c;
@@ -50,21 +51,21 @@ public final class RequiredHeadersInterceptor implements Interceptor {
         RequestBody requestBody = c2.e;
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
-        m.checkParameterIsNotNull("User-Agent", "name");
+        m.checkParameterIsNotNull("User-Agent", ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(userAgent, "value");
         e.a("User-Agent", userAgent);
         if (authToken != null) {
-            m.checkParameterIsNotNull("Authorization", "name");
+            m.checkParameterIsNotNull("Authorization", ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(authToken, "value");
             e.a("Authorization", authToken);
         }
         if (fingerprint != null) {
-            m.checkParameterIsNotNull("X-Fingerprint", "name");
+            m.checkParameterIsNotNull("X-Fingerprint", ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(fingerprint, "value");
             e.a("X-Fingerprint", fingerprint);
         }
         if (locale != null) {
-            m.checkParameterIsNotNull("Accept-Language", "name");
+            m.checkParameterIsNotNull("Accept-Language", ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(locale, "value");
             e.a("Accept-Language", locale);
         }
diff --git a/app/src/main/java/com/discord/restapi/RestAPIBuilder.java b/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
index f429963deb..71611af3b5 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
@@ -91,7 +91,7 @@ public final class RestAPIBuilder {
         if ((i & 16) == 0) {
             str3 = str;
         }
-        return restAPIBuilder.build(cls, z4, j2, list2, str3, (i & 32) != 0 ? true : z3, (i & 64) != 0 ? "application/json" : str2);
+        return restAPIBuilder.build(cls, z4, j2, list2, str3, (i & 32) != 0 ? true : z3, (i & 64) != 0 ? CONTENT_TYPE_JSON : str2);
     }
 
     private final <T> T buildApi(x xVar, Class<T> cls, String str, boolean z2, boolean z3, String str2) {
@@ -124,7 +124,7 @@ public final class RestAPIBuilder {
         arrayList.add(new k());
         m.checkNotNullExpressionValue(a, "gson");
         arrayList.add(new PayloadJSON.ConverterFactory(a));
-        if (m.areEqual(str2, "application/json")) {
+        if (m.areEqual(str2, CONTENT_TYPE_JSON)) {
             arrayList.add(new i0.e0.a.a(a));
         }
         Objects.requireNonNull(s2, "baseUrl == null");
diff --git a/app/src/main/java/com/discord/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java
index ae5f4b41db..ae75b4aab1 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java
@@ -90,6 +90,7 @@ import com.discord.models.gifpicker.dto.TrendingGifCategoriesResponseDto;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import com.discord.models.sticker.dto.ModelStickerStoreDirectory;
 import com.discord.restapi.RestAPIParams;
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import com.google.gson.JsonObject;
 import d0.o;
 import d0.t.g0;
@@ -642,7 +643,7 @@ public interface RestAPIInterface {
     @b("users/@me/guilds/{guildId}")
     Observable<Void> leaveGuild(@s("guildId") long j);
 
-    @h(hasBody = true, method = "DELETE", path = "users/@me/guilds/{guildId}")
+    @h(hasBody = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS, method = "DELETE", path = "users/@me/guilds/{guildId}")
     Observable<Void> leaveGuild(@s("guildId") long j, @a RestAPIParams.LeaveGuildBody leaveGuildBody);
 
     @b("channels/{channelId}/thread-members/@me")
@@ -924,7 +925,7 @@ public interface RestAPIInterface {
     @f("users/{userId}")
     Observable<User> userGet(@s("userId") long j);
 
-    @h(hasBody = true, method = "DELETE", path = "users/@me/phone")
+    @h(hasBody = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS, method = "DELETE", path = "users/@me/phone")
     Observable<Void> userPhoneDelete(@a RestAPIParams.DeletePhone deletePhone);
 
     @i0.f0.o("users/@me/phone")
diff --git a/app/src/main/java/com/discord/restapi/RestAPIParams.java b/app/src/main/java/com/discord/restapi/RestAPIParams.java
index f0e03d02ed..465695b5af 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIParams.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIParams.java
@@ -1,5 +1,8 @@
 package com.discord.restapi;
 
+import androidx.core.app.NotificationCompat;
+import androidx.core.view.PointerIconCompat;
+import androidx.media.AudioAttributesCompat;
 import c.d.b.a.a;
 import c.i.d.j;
 import c.i.d.l;
@@ -22,6 +25,7 @@ import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelConnectedAccount;
 import com.discord.models.domain.ModelCustomStatusSetting;
 import com.discord.models.domain.ModelGuildFolder;
@@ -61,7 +65,7 @@ public final class RestAPIParams {
         private final String description;
 
         public AddServerBody(String str) {
-            m.checkNotNullParameter(str, "description");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
             this.description = str;
         }
 
@@ -77,7 +81,7 @@ public final class RestAPIParams {
         }
 
         public final AddServerBody copy(String str) {
-            m.checkNotNullParameter(str, "description");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
             return new AddServerBody(str);
         }
 
@@ -461,8 +465,8 @@ public final class RestAPIParams {
                     return null;
                 }
                 JsonObject jsonObject = new JsonObject();
-                jsonObject.i("id", Long.valueOf(channelPosition.getId()));
-                jsonObject.i("position", Integer.valueOf(channelPosition.getPosition()));
+                jsonObject.i(ModelAuditLogEntry.CHANGE_KEY_ID, Long.valueOf(channelPosition.getId()));
+                jsonObject.i(ModelAuditLogEntry.CHANGE_KEY_POSITION, Integer.valueOf(channelPosition.getPosition()));
                 Long parentId = channelPosition.getParentId();
                 if (parentId != null) {
                     long longValue = parentId.longValue();
@@ -1007,7 +1011,7 @@ public final class RestAPIParams {
         }
 
         public ConnectedAccount(boolean z2, String str, String str2, boolean z3, boolean z4, String str3, boolean z5, int i) {
-            m.checkNotNullParameter(str, "id");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(str3, "type");
             this.friend_sync = z2;
             this.f2100id = str;
@@ -1220,7 +1224,7 @@ public final class RestAPIParams {
         private final Long systemChannelId;
 
         public CreateGuild(String str, String str2, List<CreateGuildChannel> list, Long l) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.name = str;
             this.icon = str2;
             this.channels = list;
@@ -1260,7 +1264,7 @@ public final class RestAPIParams {
         private final String name;
 
         public CreateGuildFromTemplate(String str, String str2) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.name = str;
             this.icon = str2;
         }
@@ -1345,7 +1349,7 @@ public final class RestAPIParams {
         private final double priceTier;
 
         public CreateGuildRoleSubscriptionTier(String str, String str2, String str3, List<GuildRoleSubscriptionBenefit> list, double d) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(list, "benefits");
             this.name = str;
             this.image = str2;
@@ -1396,7 +1400,7 @@ public final class RestAPIParams {
         }
 
         public final CreateGuildRoleSubscriptionTier copy(String str, String str2, String str3, List<GuildRoleSubscriptionBenefit> list, double d) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(list, "benefits");
             return new CreateGuildRoleSubscriptionTier(str, str2, str3, list, d);
         }
@@ -1474,9 +1478,9 @@ public final class RestAPIParams {
         private final String scheduledStartTime;
 
         public CreateGuildScheduledEventBody(String str, GuildScheduledEventEntityType guildScheduledEventEntityType, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, long j) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(guildScheduledEventEntityType, "entityType");
-            m.checkNotNullParameter(stageInstancePrivacyLevel, "privacy_level");
+            m.checkNotNullParameter(stageInstancePrivacyLevel, ModelAuditLogEntry.CHANGE_KEY_PRIVACY_LEVEL);
             m.checkNotNullParameter(str3, "scheduledStartTime");
             this.name = str;
             this.entityType = guildScheduledEventEntityType;
@@ -1533,9 +1537,9 @@ public final class RestAPIParams {
         }
 
         public final CreateGuildScheduledEventBody copy(String str, GuildScheduledEventEntityType guildScheduledEventEntityType, String str2, StageInstancePrivacyLevel stageInstancePrivacyLevel, String str3, long j) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(guildScheduledEventEntityType, "entityType");
-            m.checkNotNullParameter(stageInstancePrivacyLevel, "privacy_level");
+            m.checkNotNullParameter(stageInstancePrivacyLevel, ModelAuditLogEntry.CHANGE_KEY_PRIVACY_LEVEL);
             m.checkNotNullParameter(str3, "scheduledStartTime");
             return new CreateGuildScheduledEventBody(str, guildScheduledEventEntityType, str2, stageInstancePrivacyLevel, str3, j);
         }
@@ -1760,7 +1764,7 @@ public final class RestAPIParams {
         private final String secret;
 
         public EnableMFA(String str, String str2, String str3) {
-            a.h0(str, "code", str2, "secret", str3, "password");
+            a.h0(str, ModelAuditLogEntry.CHANGE_KEY_CODE, str2, "secret", str3, "password");
             this.code = str;
             this.secret = str2;
             this.password = str3;
@@ -2479,7 +2483,7 @@ public final class RestAPIParams {
         private final String name;
 
         public PatchGuildEmoji(String str) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.name = str;
         }
     }
@@ -2499,7 +2503,7 @@ public final class RestAPIParams {
         private final String name;
 
         public PostGuildEmoji(String str, String str2) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(str2, "image");
             this.name = str;
             this.image = str2;
@@ -2791,7 +2795,7 @@ public final class RestAPIParams {
         private final String topic;
 
         public StartStageInstanceBody(long j, String str, StageInstancePrivacyLevel stageInstancePrivacyLevel, boolean z2) {
-            m.checkNotNullParameter(str, "topic");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
             m.checkNotNullParameter(stageInstancePrivacyLevel, "privacyLevel");
             this.channelId = j;
             this.topic = str;
@@ -2832,7 +2836,7 @@ public final class RestAPIParams {
         }
 
         public final StartStageInstanceBody copy(long j, String str, StageInstancePrivacyLevel stageInstancePrivacyLevel, boolean z2) {
-            m.checkNotNullParameter(str, "topic");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
             m.checkNotNullParameter(stageInstancePrivacyLevel, "privacyLevel");
             return new StartStageInstanceBody(j, str, stageInstancePrivacyLevel, z2);
         }
@@ -2923,7 +2927,7 @@ public final class RestAPIParams {
         private final int type;
 
         public ThreadCreationSettings(String str, int i, Integer num) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.name = str;
             this.type = i;
             this.autoArchiveDuration = num;
@@ -2960,7 +2964,7 @@ public final class RestAPIParams {
         }
 
         public final ThreadCreationSettings copy(String str, int i, Integer num) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return new ThreadCreationSettings(str, i, num);
         }
 
@@ -3594,14 +3598,14 @@ public final class RestAPIParams {
             }
 
             public final UserInfo createForEmail(CharSequence charSequence, CharSequence charSequence2) {
-                m.checkNotNullParameter(charSequence, "email");
+                m.checkNotNullParameter(charSequence, NotificationCompat.CATEGORY_EMAIL);
                 m.checkNotNullParameter(charSequence2, "password");
-                return new UserInfo(null, charSequence.toString(), charSequence2.toString(), null, null, null, null, null, null, null, 1017, null);
+                return new UserInfo(null, charSequence.toString(), charSequence2.toString(), null, null, null, null, null, null, null, PointerIconCompat.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW, null);
             }
         }
 
         public UserInfo() {
-            this(null, null, null, null, null, null, null, null, null, null, 1023, null);
+            this(null, null, null, null, null, null, null, null, null, null, AudioAttributesCompat.FLAG_ALL, null);
         }
 
         public UserInfo(String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, Integer num, String str9) {
@@ -3946,7 +3950,7 @@ public final class RestAPIParams {
 
         public VerificationCode(String str, String str2) {
             m.checkNotNullParameter(str, "phone");
-            m.checkNotNullParameter(str2, "code");
+            m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_CODE);
             this.phone = str;
             this.code = str2;
         }
@@ -3957,7 +3961,7 @@ public final class RestAPIParams {
         private final String code;
 
         public VerificationCodeOnly(String str) {
-            m.checkNotNullParameter(str, "code");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
             this.code = str;
         }
     }
@@ -3992,7 +3996,7 @@ public final class RestAPIParams {
         private final String email;
 
         public VerifyEmail(String str) {
-            m.checkNotNullParameter(str, "email");
+            m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EMAIL);
             this.email = str;
         }
 
@@ -4008,7 +4012,7 @@ public final class RestAPIParams {
         }
 
         public final VerifyEmail copy(String str) {
-            m.checkNotNullParameter(str, "email");
+            m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EMAIL);
             return new VerifyEmail(str);
         }
 
diff --git a/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java b/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
index eeaa5161ba..92b4e25c63 100644
--- a/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
@@ -1,6 +1,7 @@
 package com.discord.restapi;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.restapi.RequiredHeadersInterceptor;
 import d0.t.h0;
 import d0.z.d.m;
@@ -38,7 +39,7 @@ public final class SpotifyTokenInterceptor implements Interceptor {
         StringBuilder K = a.K("Bearer ");
         K.append(this.headersProvider.getSpotifyToken());
         String sb = K.toString();
-        m.checkParameterIsNotNull("Authorization", "name");
+        m.checkParameterIsNotNull("Authorization", ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(sb, "value");
         e.a("Authorization", sb);
         if (wVar != null) {
diff --git a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
index e4212f2440..c44794cfb4 100644
--- a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
+++ b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
@@ -1,5 +1,6 @@
 package com.discord.restapi.utils;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import d0.z.d.m;
 import d0.z.d.o;
 import f0.z;
@@ -32,7 +33,7 @@ public final class RetryWithDelay$restRetry$1 extends o implements Function1<Thr
             HttpException httpException = (HttpException) th;
             int a = httpException.a();
             retrofit2.Response<?> response2 = httpException.i;
-            if (!(response2 == null || (response = response2.a) == null || (zVar = response.i) == null || (str = zVar.f2814c) == null || !(!m.areEqual(str, "GET"))) || a == 401 || a == 429 || a == 503 || a == 403 || a == 404) {
+            if (!(response2 == null || (response = response2.a) == null || (zVar = response.i) == null || (str = zVar.f2814c) == null || !(!m.areEqual(str, ShareTarget.METHOD_GET))) || a == 401 || a == 429 || a == 503 || a == 403 || a == 404) {
                 return false;
             }
         } else if (th instanceof TimeoutException) {
diff --git a/app/src/main/java/com/discord/rlottie/RLottieDrawable.java b/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
index 641c998988..def45f805a 100644
--- a/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
+++ b/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
@@ -13,6 +13,7 @@ import android.os.SystemClock;
 import android.util.Log;
 import android.view.View;
 import androidx.annotation.RawRes;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.g0.c;
 import d0.t.k;
 import d0.z.d.m;
@@ -253,7 +254,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
 
     public RLottieDrawable(Context context, @RawRes int i2, String str, int i3, int i4, float f, boolean z2, int[] iArr) {
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.q = new int[3];
         this.t = new HashMap<>();
         this.u = new HashMap<>();
diff --git a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
index d8ce70e745..9d61871218 100644
--- a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
+++ b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
@@ -3,6 +3,7 @@ package com.discord.rtcconnection;
 import android.content.Intent;
 import android.util.Log;
 import androidx.annotation.AnyThread;
+import androidx.core.app.NotificationCompat;
 import c.a.r.a0;
 import c.a.r.b0;
 import c.a.r.f0;
@@ -19,6 +20,7 @@ import co.discord.media_engine.InboundRtpAudio;
 import co.discord.media_engine.OutboundRtpAudio;
 import co.discord.media_engine.Stats;
 import co.discord.media_engine.VoiceQuality;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.rtcconnection.MediaSinkWantsManager;
 import com.discord.rtcconnection.mediaengine.MediaEngine;
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
@@ -360,7 +362,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     public static abstract class b implements c {
         @Override // com.discord.rtcconnection.RtcConnection.c
         public void onAnalyticsEvent(AnalyticsEvent analyticsEvent, Map<String, Object> map) {
-            m.checkNotNullParameter(analyticsEvent, "event");
+            m.checkNotNullParameter(analyticsEvent, NotificationCompat.CATEGORY_EVENT);
             m.checkNotNullParameter(map, "properties");
         }
 
@@ -651,7 +653,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     @Override // com.discord.utilities.debug.DebugPrintable
     public void debugPrint(DebugPrintBuilder debugPrintBuilder) {
         m.checkNotNullParameter(debugPrintBuilder, "dp");
-        debugPrintBuilder.appendKeyValue("id", this.l);
+        debugPrintBuilder.appendKeyValue(ModelAuditLogEntry.CHANGE_KEY_ID, this.l);
         debugPrintBuilder.appendKeyValue("mediaSessionId", this.I);
         debugPrintBuilder.appendKeyValue("parentMediaSessionId", this.Y);
         debugPrintBuilder.appendKeyValue("hostname", this.f2114x);
@@ -746,9 +748,9 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         Long l = this.M;
         if (l != null) {
             l.longValue();
-            hashMap.put("guild_id", this.M);
+            hashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, this.M);
         }
-        hashMap.put("channel_id", Long.valueOf(this.N));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(this.N));
         hashMap.put("sender_user_id", Long.valueOf(j2));
         hashMap.putAll(map);
         q(AnalyticsEvent.VIDEO_STREAM_ENDED, hashMap);
@@ -762,7 +764,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
 
     public final void n(long j2, Map<String, ? extends Object> map) {
         if (map != null) {
-            l(j2, d0.t.h0.plus(map, d0.t.g0.mapOf(d0.o.to("participant_type", this.V instanceof d.b ? "streamer" : "sender"))));
+            l(j2, d0.t.h0.plus(map, d0.t.g0.mapOf(d0.o.to("participant_type", this.V instanceof d.b ? "streamer" : NotificationCompat.MessagingStyle.Message.KEY_SENDER))));
         }
     }
 
@@ -774,7 +776,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         b(mutableMapOf);
         mutableMapOf.put("reconnect", Boolean.valueOf(z2));
         if (str != null) {
-            mutableMapOf.put("reason", str);
+            mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_REASON, str);
         }
         double averageOfLong = u.averageOfLong(this.u);
         if (!Double.isNaN(averageOfLong)) {
diff --git a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
index 1708bc56c9..1c6cddfd96 100644
--- a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
+++ b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
@@ -36,6 +36,7 @@ import java.util.Set;
 import kotlin.Lazy;
 import kotlin.NoWhenBranchMatchedException;
 import kotlin.jvm.functions.Function0;
+import org.webrtc.MediaStreamTrack;
 import org.webrtc.ThreadUtils;
 import rx.subjects.BehaviorSubject;
 import rx.subjects.SerializedSubject;
@@ -537,7 +538,7 @@ public final class DiscordAudioManager {
     public DiscordAudioManager(Context context) {
         AudioDevice audioDevice;
         m.checkNotNullParameter(context, "context");
-        Object systemService = context.getSystemService("audio");
+        Object systemService = context.getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
         Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.media.AudioManager");
         this.e = (AudioManager) systemService;
         Object systemService2 = context.getSystemService("bluetooth");
diff --git a/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java b/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java
index 9253aaf040..de511a17c7 100644
--- a/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java
+++ b/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java
@@ -2,6 +2,7 @@ package com.discord.rtcconnection.socket.io;
 
 import c.d.b.a.a;
 import c.i.d.p.b;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.gson.JsonElement;
 import d0.z.d.m;
 import java.util.List;
@@ -568,7 +569,7 @@ public final class Payloads {
             private final String type;
 
             public CodecInfo(String str, int i, String str2, int i2, Integer num) {
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(str2, "type");
                 this.name = str;
                 this.priority = i;
@@ -617,7 +618,7 @@ public final class Payloads {
             }
 
             public final CodecInfo copy(String str, int i, String str2, int i2, Integer num) {
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(str2, "type");
                 return new CodecInfo(str, i, str2, i2, num);
             }
diff --git a/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java b/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java
index e8c7f7ae78..fcdb3553b5 100644
--- a/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java
+++ b/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java
@@ -12,6 +12,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.appcompat.app.AppCompatActivity;
 import c.a.s.d;
 import c.n.a.a.b;
+import com.discord.BuildConfig;
 import d0.g0.t;
 import d0.z.d.m;
 import java.util.Objects;
@@ -150,7 +151,7 @@ public final class SamsungConnectActivity extends AppCompatActivity {
                 if (aVar == null) {
                     m.throwUninitializedPropertyAccessException("samsungAccountServiceCallback");
                 }
-                String O = bVar.O("97t47j218f", "dummy", "com.discord", aVar);
+                String O = bVar.O("97t47j218f", "dummy", BuildConfig.APPLICATION_ID, aVar);
                 Log.i("Discord", "Samsung Account service connection established: " + O);
                 if (O == null) {
                     SamsungConnectActivity samsungConnectActivity = this.i;
diff --git a/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java b/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
index d33c6d3b2c..a6b7979cf5 100644
--- a/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
+++ b/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.ContentResolver;
 import android.content.SharedPreferences;
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import c.a.t.b;
 import com.discord.utilities.logging.Logger;
 import d0.z.d.m;
@@ -29,7 +30,7 @@ public final class ScreenshotDetector {
         public final String b;
 
         public Screenshot(Uri uri, String str) {
-            m.checkNotNullParameter(uri, "uri");
+            m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             m.checkNotNullParameter(str, "filename");
             this.a = uri;
             this.b = str;
@@ -81,7 +82,7 @@ public final class ScreenshotDetector {
         public Unit invoke(Uri uri, String str) {
             Uri uri2 = uri;
             String str2 = str;
-            m.checkNotNullParameter(uri2, "uri");
+            m.checkNotNullParameter(uri2, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             m.checkNotNullParameter(str2, "filename");
             ScreenshotDetector screenshotDetector = this.this$0;
             if (screenshotDetector.e) {
diff --git a/app/src/main/java/com/discord/simpleast/code/CodeNode.java b/app/src/main/java/com/discord/simpleast/code/CodeNode.java
index ac604673fb..2e2a8cfaf4 100644
--- a/app/src/main/java/com/discord/simpleast/code/CodeNode.java
+++ b/app/src/main/java/com/discord/simpleast/code/CodeNode.java
@@ -2,6 +2,7 @@ package com.discord.simpleast.code;
 
 import android.text.SpannableStringBuilder;
 import c.a.u.a.f;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.node.StyleNode;
 import d0.z.d.m;
@@ -55,7 +56,7 @@ public class CodeNode<RC> extends c.a.u.b.a.a<RC> {
         public b(String str, String str2, f<RC> fVar) {
             super(new StyleNode.b(str, fVar.d), new StyleNode.b(str2, fVar.f));
             m.checkNotNullParameter(str, "pre");
-            m.checkNotNullParameter(str2, "name");
+            m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(fVar, "codeStyleProviders");
         }
     }
diff --git a/app/src/main/java/com/discord/simpleast/core/parser/Parser.java b/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
index 136f6fb583..00769629d7 100644
--- a/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
+++ b/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
@@ -61,7 +61,7 @@ public class Parser<R, T extends Node<R>, S> {
             K.append(rule.getMatcher().pattern().toString());
             K.append(" to source: ");
             K.append(charSequence);
-            Log.i("Parser", K.toString());
+            Log.i(TAG, K.toString());
         }
     }
 
@@ -71,7 +71,7 @@ public class Parser<R, T extends Node<R>, S> {
             K.append(rule.getMatcher().pattern().toString());
             K.append(" to source: ");
             K.append(charSequence);
-            Log.i("Parser", K.toString());
+            Log.i(TAG, K.toString());
         }
     }
 
diff --git a/app/src/main/java/com/discord/stores/ArchivedThreadsStore$fetchListing$1.java b/app/src/main/java/com/discord/stores/ArchivedThreadsStore$fetchListing$1.java
index 3c1696b3e0..642d973048 100644
--- a/app/src/main/java/com/discord/stores/ArchivedThreadsStore$fetchListing$1.java
+++ b/app/src/main/java/com/discord/stores/ArchivedThreadsStore$fetchListing$1.java
@@ -5,6 +5,7 @@ import com.discord.api.channel.Channel;
 import com.discord.api.thread.ThreadListing;
 import com.discord.restapi.utils.RetryWithDelay;
 import com.discord.stores.ArchivedThreadsStore;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.t.n;
@@ -48,7 +49,7 @@ public final class ArchivedThreadsStore$fetchListing$1 extends o implements Func
         }
 
         public final void invoke(Subscription subscription) {
-            m.checkNotNullParameter(subscription, "subscription");
+            m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
             ArchivedThreadsStore.access$getFetchSubscriptions$p(this.this$0.this$0).put(this.$key, subscription);
         }
     }
diff --git a/app/src/main/java/com/discord/stores/BuiltInCommands.java b/app/src/main/java/com/discord/stores/BuiltInCommands.java
index b1e79e07a2..af95c50364 100644
--- a/app/src/main/java/com/discord/stores/BuiltInCommands.java
+++ b/app/src/main/java/com/discord/stores/BuiltInCommands.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.R;
 import com.discord.api.commands.ApplicationCommandType;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
@@ -27,9 +28,9 @@ public final class BuiltInCommands implements BuiltInCommandsProvider {
     }
 
     public BuiltInCommands() {
-        List<ApplicationCommand> listOf = n.listOf((Object[]) new ApplicationCommand[]{createAppendToEndSlashCommand(-1, "shrug", 2131887459, 2131887460, "¯\\\\_(ツ)\\_/¯"), createAppendToEndSlashCommand(-2, "tableflip", 2131887463, 2131887464, "(╯°□°）╯︵ ┻━┻"), createAppendToEndSlashCommand(-3, "unflip", 2131887465, 2131887466, "┬─┬ ノ( ゜-゜ノ)"), createWrappedSlashCommand(-5, "me", 2131887450, 2131887451, "_"), createWrappedSlashCommand(-6, "spoiler", 2131887461, 2131887462, "||")});
+        List<ApplicationCommand> listOf = n.listOf((Object[]) new ApplicationCommand[]{createAppendToEndSlashCommand(-1, "shrug", Integer.valueOf((int) R.string.command_shrug_description), Integer.valueOf((int) R.string.command_shrug_message_description), "¯\\\\_(ツ)\\_/¯"), createAppendToEndSlashCommand(-2, "tableflip", Integer.valueOf((int) R.string.command_tableflip_description), Integer.valueOf((int) R.string.command_tableflip_message_description), "(╯°□°）╯︵ ┻━┻"), createAppendToEndSlashCommand(-3, "unflip", Integer.valueOf((int) R.string.command_tableunflip_description), Integer.valueOf((int) R.string.command_tableunflip_message_description), "┬─┬ ノ( ゜-゜ノ)"), createWrappedSlashCommand(-5, "me", Integer.valueOf((int) R.string.command_me_description), Integer.valueOf((int) R.string.command_me_message_description), "_"), createWrappedSlashCommand(-6, "spoiler", Integer.valueOf((int) R.string.command_spoiler_description), Integer.valueOf((int) R.string.command_spoiler_message_description), "||")});
         this.builtInCommands = listOf;
-        this.builtInApplication = new Application(-1, "Built-In", null, 2131231985, listOf.size(), null, true, 36, null);
+        this.builtInApplication = new Application(-1, "Built-In", null, Integer.valueOf((int) R.drawable.ic_slash_command_24dp), listOf.size(), null, true, 36, null);
     }
 
     private final ApplicationCommand createAppendToEndSlashCommand(long j, String str, Integer num, Integer num2, String str2) {
diff --git a/app/src/main/java/com/discord/stores/ConnectionTimeStats.java b/app/src/main/java/com/discord/stores/ConnectionTimeStats.java
index eaffb5cbfe..7ceb7d1302 100644
--- a/app/src/main/java/com/discord/stores/ConnectionTimeStats.java
+++ b/app/src/main/java/com/discord/stores/ConnectionTimeStats.java
@@ -4,6 +4,7 @@ import c.d.b.a.a;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.app.AppLog;
 import com.discord.gateway.GatewaySocket;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelPayload;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.logging.Logger;
@@ -158,7 +159,7 @@ public final class ConnectionTimeStats {
         m.checkNotNullParameter(clock, "clock");
         StatType statType = StatType.VideoFirstFrame;
         if (!m.areEqual(statType.toString(), "VideoFirstFrame")) {
-            Logger.e$default(AppLog.g, "ConnectionTimeStats.StatType has been renamed!", null, g0.mapOf(o.to("name", statType.toString())), 2, null);
+            Logger.e$default(AppLog.g, "ConnectionTimeStats.StatType has been renamed!", null, g0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_NAME, statType.toString())), 2, null);
         }
         this.gatewayConnection = new Stat(clock, this, StatType.GatewayConnection);
         this.gatewayHello = new Stat(clock, this, StatType.GatewayHello);
diff --git a/app/src/main/java/com/discord/stores/NotificationTextUtils.java b/app/src/main/java/com/discord/stores/NotificationTextUtils.java
index 828143b2c0..db522c7030 100644
--- a/app/src/main/java/com/discord/stores/NotificationTextUtils.java
+++ b/app/src/main/java/com/discord/stores/NotificationTextUtils.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
@@ -224,7 +225,7 @@ public final class NotificationTextUtils {
         com.discord.api.user.User e;
         List<Long> list;
         m.checkNotNullParameter(user, "me");
-        m.checkNotNullParameter(message, "msg");
+        m.checkNotNullParameter(message, NotificationCompat.CATEGORY_MESSAGE);
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(map, "blockedRelationships");
         m.checkNotNullParameter(map2, "guildMembers");
diff --git a/app/src/main/java/com/discord/stores/StageChannelRoleContext.java b/app/src/main/java/com/discord/stores/StageChannelRoleContext.java
index 43e30ef89f..0f1289944c 100644
--- a/app/src/main/java/com/discord/stores/StageChannelRoleContext.java
+++ b/app/src/main/java/com/discord/stores/StageChannelRoleContext.java
@@ -2,6 +2,7 @@ package com.discord.stores;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
 import com.discord.api.voice.state.StageRequestToSpeakState;
@@ -44,7 +45,7 @@ public final class StageChannelRoleContext {
     }
 
     private final boolean isSpeaker(long j, GuildMember guildMember) {
-        return this.voiceStates.get(Long.valueOf(j)) != null ? getRequestToSpeakState(j) == StageRequestToSpeakState.ON_STAGE : can(2097152, j, guildMember);
+        return this.voiceStates.get(Long.valueOf(j)) != null ? getRequestToSpeakState(j) == StageRequestToSpeakState.ON_STAGE : can(Permission.SPEAK, j, guildMember);
     }
 
     public final StageRequestToSpeakState getRequestToSpeakState(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$onScreenViewed$1.java b/app/src/main/java/com/discord/stores/StoreAnalytics$onScreenViewed$1.java
index f2448d688b..3be1153906 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$onScreenViewed$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$onScreenViewed$1.java
@@ -2,6 +2,7 @@ package com.discord.stores;
 
 import com.discord.app.AppComponent;
 import com.discord.stores.StoreAnalytics;
+import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.AppStartAnalyticsTracker;
 import com.discord.widgets.auth.WidgetAuthLanding;
 import com.discord.widgets.guilds.invite.WidgetGuildInvite;
@@ -27,7 +28,7 @@ public final class StoreAnalytics$onScreenViewed$1 extends o implements Function
     /* renamed from: invoke */
     public final void mo1invoke() {
         Class<? extends AppComponent> screen = this.$screenViewed.getScreen();
-        String simpleName = m.areEqual(screen, WidgetHome.class) ? StoreAnalytics.access$getStores$p(this.this$0).getGuildSelected$app_productionCanaryRelease().getSelectedGuildId() == 0 ? "private_channel" : "guild" : m.areEqual(screen, WidgetGuildInvite.class) ? "invite" : m.areEqual(screen, WidgetIncomingShare.class) ? "share" : m.areEqual(screen, WidgetAuthLanding.class) ? "app_landing" : this.$screenViewed.getScreen().getSimpleName();
+        String simpleName = m.areEqual(screen, WidgetHome.class) ? StoreAnalytics.access$getStores$p(this.this$0).getGuildSelected$app_productionCanaryRelease().getSelectedGuildId() == 0 ? "private_channel" : "guild" : m.areEqual(screen, WidgetGuildInvite.class) ? "invite" : m.areEqual(screen, WidgetIncomingShare.class) ? AnalyticsTracker.ATTACHMENT_SOURCE_SHARE : m.areEqual(screen, WidgetAuthLanding.class) ? "app_landing" : this.$screenViewed.getScreen().getSimpleName();
         AppStartAnalyticsTracker instance = AppStartAnalyticsTracker.Companion.getInstance();
         m.checkNotNullExpressionValue(simpleName, "screenName");
         instance.appUiViewed(simpleName, this.$screenViewed.getTimestamp());
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics.java b/app/src/main/java/com/discord/stores/StoreAnalytics.java
index 14a5a99ca6..21dcd68d2e 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics.java
@@ -10,11 +10,13 @@ import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.message.Message;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.app.AppComponent;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelInvite;
 import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.models.domain.ModelPayload;
@@ -24,6 +26,7 @@ import com.discord.models.user.User;
 import com.discord.rtcconnection.RtcConnection;
 import com.discord.utilities.KotlinExtensionsKt;
 import com.discord.utilities.PermissionOverwriteUtilsKt;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.AnalyticsUtils;
 import com.discord.utilities.analytics.SearchType;
@@ -211,13 +214,13 @@ public final class StoreAnalytics extends Store {
         int ordinal = emojiPickerContextType.ordinal();
         if (ordinal == 0) {
             Channel channel = this.stores.getChannels$app_productionCanaryRelease().getChannel(this.stores.getChannelsSelected$app_productionCanaryRelease().getId());
-            str = (channel == null || channel.f() != 0) ? "Guild Channel" : "DM Channel";
+            str = (channel == null || channel.f() != 0) ? Traits.Location.Page.GUILD_CHANNEL : "DM Channel";
         } else if (ordinal == 1) {
             str = "Custom Status Modal";
         } else {
             throw new NoWhenBranchMatchedException();
         }
-        AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, premiumUpsellType, new Traits.Location((String) KotlinExtensionsKt.getExhaustive(str), "Emoji Picker Popout", "Button Upsell", "Search", null, 16, null), h0.plus(map, o.to("has_search_query", Boolean.TRUE)), null, 8, null);
+        AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, premiumUpsellType, new Traits.Location((String) KotlinExtensionsKt.getExhaustive(str), Traits.Location.Section.EMOJI_PICKER_POPOUT, Traits.Location.Obj.BUTTON_UPSELL, Traits.Location.ObjType.SEARCH, null, 16, null), h0.plus(map, o.to("has_search_query", Boolean.TRUE)), null, 8, null);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.stores.StoreAnalytics */
@@ -266,7 +269,7 @@ public final class StoreAnalytics extends Store {
             permissionOverwrite = null;
         }
         if (permissionOverwrite != null) {
-            bool = Boolean.valueOf(PermissionOverwriteUtilsKt.denies(permissionOverwrite, 1024));
+            bool = Boolean.valueOf(PermissionOverwriteUtilsKt.denies(permissionOverwrite, Permission.VIEW_CHANNEL));
         }
         return h0.plus(h0.plus(AnalyticsUtils.INSTANCE.getProperties$app_productionCanaryRelease(channel), h0.mapOf(o.to("channel_member_perms", l), o.to("channel_hidden", bool))), z2 ? g0.mapOf(o.to("channel_is_nsfw", Boolean.valueOf(channel.o()))) : h0.emptyMap());
     }
@@ -380,8 +383,8 @@ public final class StoreAnalytics extends Store {
         boolean z2 = false;
         int intValue = threadMessageCount != null ? threadMessageCount.intValue() : 0;
         Pair[] pairArr = new Pair[9];
-        pairArr[0] = o.to("channel_id", Long.valueOf(channel.h()));
-        pairArr[1] = o.to("guild_id", Long.valueOf(channel.f()));
+        pairArr[0] = o.to(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(channel.h()));
+        pairArr[1] = o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(channel.f()));
         pairArr[2] = o.to("parent_id", Long.valueOf(channel.r()));
         pairArr[3] = o.to("channel_type", Integer.valueOf(channel.A()));
         pairArr[4] = o.to("thread_approximate_message_count", Integer.valueOf(f.coerceAtMost(intValue, 50)));
@@ -394,7 +397,7 @@ public final class StoreAnalytics extends Store {
         pairArr[6] = o.to("thread_locked", Boolean.valueOf(z2));
         ThreadMetadata y4 = channel.y();
         pairArr[7] = o.to("thread_auto_archive_duration_minutes", y4 != null ? Integer.valueOf(y4.c()) : null);
-        pairArr[8] = o.to("thread_approximate_creation_date", Long.valueOf((channel.h() >>> 22) + 1420070400000L));
+        pairArr[8] = o.to("thread_approximate_creation_date", Long.valueOf((channel.h() >>> 22) + SnowflakeUtils.DISCORD_EPOCH));
         return h0.mapOf(pairArr);
     }
 
@@ -410,7 +413,7 @@ public final class StoreAnalytics extends Store {
         int i4;
         Pair[] pairArr = new Pair[9];
         int i5 = 0;
-        pairArr[0] = o.to("guild_id", Long.valueOf(j));
+        pairArr[0] = o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j));
         pairArr[1] = o.to("guild_size_total", Integer.valueOf(i));
         pairArr[2] = o.to("guild_num_channels", Integer.valueOf(collection.size()));
         if (collection.isEmpty()) {
@@ -587,7 +590,7 @@ public final class StoreAnalytics extends Store {
 
     public final Traits.Location getEmojiPickerUpsellLocation() {
         Channel channel = this.stores.getChannels$app_productionCanaryRelease().getChannel(this.stores.getChannelsSelected$app_productionCanaryRelease().getId());
-        return new Traits.Location((channel == null || channel.f() != 0) ? "Guild Channel" : "DM Channel", "Emoji Picker Popout", null, null, null, 28, null);
+        return new Traits.Location((channel == null || channel.f() != 0) ? Traits.Location.Page.GUILD_CHANNEL : "DM Channel", Traits.Location.Section.EMOJI_PICKER_POPOUT, null, null, null, 28, null);
     }
 
     @StoreThread
@@ -880,14 +883,14 @@ public final class StoreAnalytics extends Store {
         Long l2 = (Long) obj;
         if (l2 != null) {
             long longValue = l2.longValue();
-            Object obj2 = map.get("channel_id");
+            Object obj2 = map.get(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID);
             if (!(obj2 instanceof Long)) {
                 obj2 = null;
             }
             Long l3 = (Long) obj2;
             if (l3 != null) {
                 long longValue2 = l3.longValue();
-                Object obj3 = map.get("guild_id");
+                Object obj3 = map.get(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID);
                 if (obj3 instanceof Long) {
                     l = obj3;
                 }
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
index f9e027669a..748241ecf2 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
@@ -2,6 +2,7 @@ package com.discord.stores;
 
 import android.content.Context;
 import com.discord.api.commands.GuildApplicationCommands;
+import com.discord.api.permission.Permission;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.user.User;
@@ -395,7 +396,7 @@ public final class StoreApplicationCommands extends StoreV2 {
 
     private final boolean shouldReturnApplicationCommands(Long l) {
         Long l2 = this.discoverGuildId;
-        return l2 == null || (l2 != null && l2.longValue() == 0) || PermissionUtils.can(2147483648L, l);
+        return l2 == null || (l2 != null && l2.longValue() == 0) || PermissionUtils.can(Permission.USE_APPLICATION_COMMANDS, l);
     }
 
     public final void clearQueryCommands() {
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java
index b0e3e342f5..5964e1428e 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.content.res.Resources;
+import com.discord.R;
 import com.discord.api.commands.ApplicationCommandPermission;
 import com.discord.api.commands.ApplicationCommandType;
 import com.discord.api.commands.CommandChoice;
@@ -110,10 +111,10 @@ public final class StoreApplicationCommandsKt {
         if (applicationCommandOption.getType() == ApplicationCommandType.STRING) {
             List<CommandChoice> choices = applicationCommandOption.getChoices();
             if (!(choices == null || choices.isEmpty())) {
-                return resources.getString(2131887474);
+                return resources.getString(R.string.command_validation_choice_error);
             }
         }
-        return applicationCommandOption.getType() == ApplicationCommandType.INTEGER ? resources.getString(2131887476) : applicationCommandOption.getType() == ApplicationCommandType.NUMBER ? resources.getString(2131887478) : applicationCommandOption.getType() == ApplicationCommandType.BOOLEAN ? resources.getString(2131887472) : applicationCommandOption.getType() == ApplicationCommandType.USER ? resources.getString(2131887481) : applicationCommandOption.getType() == ApplicationCommandType.CHANNEL ? resources.getString(2131887473) : applicationCommandOption.getType() == ApplicationCommandType.ROLE ? resources.getString(2131887480) : applicationCommandOption.getType() == ApplicationCommandType.MENTIONABLE ? resources.getString(2131887477) : resources.getString(2131887479);
+        return applicationCommandOption.getType() == ApplicationCommandType.INTEGER ? resources.getString(R.string.command_validation_integer_error) : applicationCommandOption.getType() == ApplicationCommandType.NUMBER ? resources.getString(R.string.command_validation_number_error) : applicationCommandOption.getType() == ApplicationCommandType.BOOLEAN ? resources.getString(R.string.command_validation_boolean_error) : applicationCommandOption.getType() == ApplicationCommandType.USER ? resources.getString(R.string.command_validation_user_error) : applicationCommandOption.getType() == ApplicationCommandType.CHANNEL ? resources.getString(R.string.command_validation_channel_error) : applicationCommandOption.getType() == ApplicationCommandType.ROLE ? resources.getString(R.string.command_validation_role_error) : applicationCommandOption.getType() == ApplicationCommandType.MENTIONABLE ? resources.getString(R.string.command_validation_mentionable_error) : resources.getString(R.string.command_validation_required_error);
     }
 
     public static final Application toDomainApplication(com.discord.api.commands.Application application) {
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java
index 5db186c16b..398f9adc54 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import a0.a.a.b;
 import android.content.Context;
 import android.content.SharedPreferences;
+import androidx.core.app.FrameMetricsAggregator;
 import c.d.b.a.a;
 import c.i.d.e;
 import com.discord.api.commands.ApplicationCommandData;
@@ -390,7 +391,7 @@ public final class StoreApplicationInteractions extends StoreV2 {
     private final void clearCache() {
         SharedPreferences.Editor edit = this.sharedPrefs.edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putString("CACHE_KEY_APPLICATION_COMMAND_SEND_DATA_SET", null);
+        edit.putString(CACHE_KEY_APPLICATION_COMMAND_SEND_DATA_SET, null);
         edit.apply();
         this.applicationCommandLocalSendDataSet.clear();
         markChanged();
@@ -402,7 +403,7 @@ public final class StoreApplicationInteractions extends StoreV2 {
 
     @StoreThread
     private final void handleApplicationCommandRequestStateUpdate(ApplicationCommandLocalSendData applicationCommandLocalSendData, Long l) {
-        upsertApplicationCommandSendData(ApplicationCommandLocalSendData.copy$default(applicationCommandLocalSendData, 0, 0, null, null, null, null, null, null, null, l, 511, null));
+        upsertApplicationCommandSendData(ApplicationCommandLocalSendData.copy$default(applicationCommandLocalSendData, 0, 0, null, null, null, null, null, null, null, l, FrameMetricsAggregator.EVERY_DURATION, null));
     }
 
     public static /* synthetic */ void handleApplicationCommandRequestStateUpdate$default(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, Long l, int i, Object obj) {
@@ -506,7 +507,7 @@ public final class StoreApplicationInteractions extends StoreV2 {
         boolean z2;
         Map<String, ApplicationCommandLocalSendData> map;
         try {
-            String string = this.sharedPrefs.getString("CACHE_KEY_APPLICATION_COMMAND_SEND_DATA_SET", null);
+            String string = this.sharedPrefs.getString(CACHE_KEY_APPLICATION_COMMAND_SEND_DATA_SET, null);
             if (string != null) {
                 if (!t.isBlank(string)) {
                     z2 = false;
@@ -823,7 +824,7 @@ public final class StoreApplicationInteractions extends StoreV2 {
         String m = this.gson.m(hashMap);
         SharedPreferences.Editor edit = this.sharedPrefs.edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putString("CACHE_KEY_APPLICATION_COMMAND_SEND_DATA_SET", m);
+        edit.putString(CACHE_KEY_APPLICATION_COMMAND_SEND_DATA_SET, m);
         edit.apply();
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$fetchStreamPreview$2.java b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$fetchStreamPreview$2.java
index 6e2b15fda6..c5f52237a2 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$fetchStreamPreview$2.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$fetchStreamPreview$2.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -26,7 +27,7 @@ public final class StoreApplicationStreamPreviews$fetchStreamPreview$2 extends o
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         StoreApplicationStreamPreviews.access$getFetchStreamPreviewSubscriptions$p(this.this$0).put(this.$streamKey, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$handleFetchFailed$1.java b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$handleFetchFailed$1.java
index 9a80d9f293..43d9df74a5 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$handleFetchFailed$1.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews$handleFetchFailed$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -26,7 +27,7 @@ public final class StoreApplicationStreamPreviews$handleFetchFailed$1 extends o
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         StoreApplicationStreamPreviews.access$getFetchStreamPreviewSubscriptions$p(this.this$0).put(this.$streamKey, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchFailure$1.java b/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchFailure$1.java
index dfd3858982..1ea126b888 100644
--- a/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchFailure$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchFailure$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.media.AudioAttributesCompat;
 import com.discord.stores.StoreAuditLog;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -18,7 +19,7 @@ public final class StoreAuditLog$handleFetchFailure$1 extends o implements Funct
     /* renamed from: invoke */
     public final void mo1invoke() {
         StoreAuditLog storeAuditLog = this.this$0;
-        StoreAuditLog.access$setState$p(storeAuditLog, StoreAuditLog.AuditLogState.copy$default(StoreAuditLog.access$getState$p(storeAuditLog), 0, null, null, null, null, null, null, null, null, null, false, 1023, null));
+        StoreAuditLog.access$setState$p(storeAuditLog, StoreAuditLog.AuditLogState.copy$default(StoreAuditLog.access$getState$p(storeAuditLog), 0, null, null, null, null, null, null, null, null, null, false, AudioAttributesCompat.FLAG_ALL, null));
         this.this$0.markChanged();
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchSuccess$1.java b/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchSuccess$1.java
index 5ccd48bf55..2dab94432b 100644
--- a/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchSuccess$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuditLog$handleFetchSuccess$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.media.AudioAttributesCompat;
 import com.discord.api.channel.Channel;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
 import com.discord.api.user.User;
@@ -102,7 +103,7 @@ public final class StoreAuditLog$handleFetchSuccess$1 extends o implements Funct
         StoreAuditLog storeAuditLog7 = this.this$0;
         StoreAuditLog.access$setState$p(storeAuditLog7, StoreAuditLog.AuditLogState.copy$default(StoreAuditLog.access$getState$p(storeAuditLog7), 0, null, mutableList3, null, null, null, null, null, null, null, false, 2043, null));
         StoreAuditLog storeAuditLog8 = this.this$0;
-        StoreAuditLog.access$setState$p(storeAuditLog8, StoreAuditLog.AuditLogState.copy$default(StoreAuditLog.access$getState$p(storeAuditLog8), 0, null, null, null, null, null, null, null, null, null, false, 1023, null));
+        StoreAuditLog.access$setState$p(storeAuditLog8, StoreAuditLog.AuditLogState.copy$default(StoreAuditLog.access$getState$p(storeAuditLog8), 0, null, null, null, null, null, null, null, null, null, false, AudioAttributesCompat.FLAG_ALL, null));
         this.this$0.markChanged();
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAuditLog.java b/app/src/main/java/com/discord/stores/StoreAuditLog.java
index 300914b7f1..7a2ae7f7eb 100644
--- a/app/src/main/java/com/discord/stores/StoreAuditLog.java
+++ b/app/src/main/java/com/discord/stores/StoreAuditLog.java
@@ -17,6 +17,7 @@ import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.o;
 import d0.t.g0;
 import d0.t.h0;
@@ -454,7 +455,7 @@ public final class StoreAuditLog extends StoreV2 {
             for (ModelAuditLogEntry modelAuditLogEntry : s.asReversed(list)) {
                 ArrayList arrayList2 = new ArrayList();
                 if (modelAuditLogEntry.getReason() != null) {
-                    arrayList2.add(new ModelAuditLogEntry.Change("reason", null, modelAuditLogEntry.getReason()));
+                    arrayList2.add(new ModelAuditLogEntry.Change(ModelAuditLogEntry.CHANGE_KEY_REASON, null, modelAuditLogEntry.getReason()));
                 }
                 List<ModelAuditLogEntry.Change> changes2 = modelAuditLogEntry.getChanges();
                 if (changes2 != null) {
@@ -466,28 +467,28 @@ public final class StoreAuditLog extends StoreV2 {
                         if (key != null) {
                             switch (key.hashCode()) {
                                 case 3079692:
-                                    if (key.equals("deny")) {
+                                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED)) {
                                         arrayList2.addAll(AuditLogChangeUtils.INSTANCE.transformPermissionOverride(change5));
                                         break;
                                     } else {
                                         break;
                                     }
                                 case 92906313:
-                                    if (key.equals("allow")) {
+                                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED)) {
                                         arrayList2.addAll(AuditLogChangeUtils.INSTANCE.transformPermissionOverride(change5));
                                         break;
                                     } else {
                                         break;
                                     }
                                 case 108404047:
-                                    if (key.equals("reset")) {
+                                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_RESET)) {
                                         arrayList2.addAll(AuditLogChangeUtils.INSTANCE.transformPermissionOverride(change5));
                                         break;
                                     } else {
                                         break;
                                     }
                                 case 1133704324:
-                                    if (key.equals("permissions")) {
+                                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS)) {
                                         arrayList2.addAll(AuditLogChangeUtils.INSTANCE.transformPermissionChange(change5));
                                         break;
                                     } else {
@@ -503,7 +504,7 @@ public final class StoreAuditLog extends StoreV2 {
                                 if (hashCode == 3575610 && key2.equals("type")) {
                                     change4 = change5;
                                 }
-                            } else if (key2.equals("name")) {
+                            } else if (key2.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                                 change3 = change5;
                             }
                         }
@@ -516,7 +517,7 @@ public final class StoreAuditLog extends StoreV2 {
                 }
                 if (modelAuditLogEntry.getActionTypeId() == 21) {
                     ModelAuditLogEntry.Options options2 = modelAuditLogEntry.getOptions();
-                    arrayList2.add(new ModelAuditLogEntry.Change("prune_delete_days", null, Integer.valueOf(options2 != null ? options2.getDeleteMemberDays() : 1)));
+                    arrayList2.add(new ModelAuditLogEntry.Change(ModelAuditLogEntry.CHANGE_KEY_PRUNE_DELETE_DAYS, null, Integer.valueOf(options2 != null ? options2.getDeleteMemberDays() : 1)));
                 }
                 ModelAuditLogEntry modelAuditLogEntry2 = new ModelAuditLogEntry(modelAuditLogEntry.getId(), modelAuditLogEntry.getActionTypeId(), modelAuditLogEntry.getTargetId(), modelAuditLogEntry.getUserId(), arrayList2, modelAuditLogEntry.getOptions(), j, null);
                 ModelAuditLogEntry modelAuditLogEntry3 = (ModelAuditLogEntry) u.firstOrNull((List<? extends Object>) arrayList);
@@ -549,7 +550,7 @@ public final class StoreAuditLog extends StoreV2 {
                         String str = (String) change2.getOldValue();
                         if (modelAuditLogEntry2.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL) {
                             if (m.areEqual(change != null ? change.getOldValue() : null, 0)) {
-                                str = '#' + str;
+                                str = MentionUtilsKt.CHANNELS_CHAR + str;
                             }
                         }
                         if (mutableMap.get(modelAuditLogEntry2.getTargetType()) == null) {
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java
index 11693e06c1..479fd2e458 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import com.discord.api.channel.Channel;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreNavigation;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.time.TimeUtils;
 import rx.functions.Func3;
 /* compiled from: StoreAuthentication.kt */
@@ -11,7 +12,7 @@ public final class StoreAuthentication$getShouldShowAgeGate$1<T1, T2, T3, R> imp
 
     public final StoreNavigation.AgeGate call(MeUser meUser, String str, Channel channel) {
         long parseUTCDate = TimeUtils.parseUTCDate("2021-02-05T12:00:00+0000");
-        if (!meUser.getHasBirthday() && (meUser.getId() >>> 22) + 1420070400000L > parseUTCDate) {
+        if (!meUser.getHasBirthday() && (meUser.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH > parseUTCDate) {
             return StoreNavigation.AgeGate.REGISTER_AGE_GATE;
         }
         if (str != null || meUser.getHasBirthday() || channel == null || !channel.o()) {
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication.java b/app/src/main/java/com/discord/stores/StoreAuthentication.java
index 5cfdd2d7fa..5eef8d08dc 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication.java
@@ -7,10 +7,12 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.util.Patterns;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import c.d.b.a.a;
 import com.discord.api.auth.RegisterResponse;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.auth.ModelLoginResult;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreInviteSettings;
@@ -237,11 +239,11 @@ public final class StoreAuthentication extends Store {
     private final void setSavedLogin(String str) {
         this.savedLogin = str;
         AppLog.g(null, str, null);
-        getPrefsSessionDurable().edit().putString("STORE_AUTHED_LOGIN", str).apply();
+        getPrefsSessionDurable().edit().putString(CACHE_KEY_LOGIN, str).apply();
     }
 
     public final Observable<ModelLoginResult> authMFA(String str, String str2) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         m.checkNotNullParameter(str2, "ticket");
         Observable<ModelLoginResult> t = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postMFACode(new RestAPIParams.MFALogin(str2, str)), false, 1, null).t(new StoreAuthentication$authMFA$1(this));
         m.checkNotNullExpressionValue(t, "RestAPI\n        .api\n   …in(loginResult)\n        }");
@@ -314,7 +316,7 @@ public final class StoreAuthentication extends Store {
     @StoreThread
     public final void handleAuthToken$app_productionCanaryRelease(String str) {
         this.authToken = str;
-        getPrefs().edit().putString("STORE_AUTHED_TOKEN", str).apply();
+        getPrefs().edit().putString(CACHE_KEY_TOKEN, str).apply();
         if (str == null) {
             Persister.Companion.reset();
             SharedPreferences.Editor edit = getPrefs().edit();
@@ -348,15 +350,15 @@ public final class StoreAuthentication extends Store {
     public synchronized void init(Context context) {
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        String string = getPrefsSessionDurable().getString("STORE_AUTHED_FINGERPRINT", null);
+        String string = getPrefsSessionDurable().getString(CACHE_KEY_FINGERPRINT, null);
         if (string != null) {
             setFingerprint(string, false);
         }
-        String string2 = getPrefs().getString("STORE_AUTHED_TOKEN", null);
+        String string2 = getPrefs().getString(CACHE_KEY_TOKEN, null);
         this.authToken = string2;
         setAuthed(string2);
         handleAgeGateError(null);
-        setSavedLogin(getPrefsSessionDurable().getString("STORE_AUTHED_LOGIN", Companion.access$getDeviceEmail(Companion, context)));
+        setSavedLogin(getPrefsSessionDurable().getString(CACHE_KEY_LOGIN, Companion.access$getDeviceEmail(Companion, context)));
         Observable<Boolean> r = this.userInitiatedAuthEventSubject.r();
         m.checkNotNullExpressionValue(r, "userInitiatedAuthEventSu…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(r)), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAuthentication$init$1(context), 62, (Object) null);
@@ -428,7 +430,7 @@ public final class StoreAuthentication extends Store {
     public final synchronized void setFingerprint(String str, boolean z2) {
         if (!z2) {
         }
-        getPrefsSessionDurable().edit().putString("STORE_AUTHED_FINGERPRINT", str).apply();
+        getPrefsSessionDurable().edit().putString(CACHE_KEY_FINGERPRINT, str).apply();
         this.fingerprint = str;
         this.fingerprintSubject.j.onNext(str);
         if (str != null) {
@@ -443,7 +445,7 @@ public final class StoreAuthentication extends Store {
     }
 
     public final void setOAuthUriSubject(Uri uri) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         this.oauthUriSubject.j.onNext(uri);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreCalls.java b/app/src/main/java/com/discord/stores/StoreCalls.java
index dc93c30f2f..0170690918 100644
--- a/app/src/main/java/com/discord/stores/StoreCalls.java
+++ b/app/src/main/java/com/discord/stores/StoreCalls.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.content.Context;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.q;
 import com.discord.app.AppComponent;
@@ -113,7 +114,7 @@ public final class StoreCalls {
     }
 
     public final void handleCallCreateOrUpdate(ModelCall modelCall) {
-        m.checkNotNullParameter(modelCall, "call");
+        m.checkNotNullParameter(modelCall, NotificationCompat.CATEGORY_CALL);
         long channelId = modelCall.getChannelId();
         boolean z2 = true;
         if (!m.areEqual(modelCall, this.calls.get(Long.valueOf(channelId)))) {
diff --git a/app/src/main/java/com/discord/stores/StoreCallsIncoming.java b/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
index 14b8b59e42..21c9bb1b2c 100644
--- a/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
+++ b/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.models.domain.ModelCall;
 import com.discord.stores.updates.ObservationDeck;
 import d0.z.d.m;
@@ -41,7 +42,7 @@ public final class StoreCallsIncoming extends StoreV2 {
 
     @StoreThread
     public final void handleCallCreateOrUpdate(ModelCall modelCall) {
-        m.checkNotNullParameter(modelCall, "call");
+        m.checkNotNullParameter(modelCall, NotificationCompat.CATEGORY_CALL);
         long channelId = modelCall.getChannelId();
         if (!modelCall.getRinging().contains(Long.valueOf(this.userStore.getMe().getId()))) {
             clearIncomingCall(channelId);
diff --git a/app/src/main/java/com/discord/stores/StoreChangeLog.java b/app/src/main/java/com/discord/stores/StoreChangeLog.java
index 2d41f7f83b..53eb00030e 100644
--- a/app/src/main/java/com/discord/stores/StoreChangeLog.java
+++ b/app/src/main/java/com/discord/stores/StoreChangeLog.java
@@ -4,8 +4,10 @@ import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import c.q.a.k.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreNotices;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.string.StringUtilsKt;
 import com.discord.utilities.time.Clock;
 import com.discord.widgets.changelog.WidgetChangeLog;
@@ -69,7 +71,7 @@ public final class StoreChangeLog extends Store {
     private final boolean isTooYoung(long j) {
         long firstUseTimestamp = this.notices.getFirstUseTimestamp() + 432000000;
         long currentTimeMillis = this.clock.currentTimeMillis();
-        return currentTimeMillis < ((j >>> 22) + 1420070400000L) + 432000000 || currentTimeMillis < firstUseTimestamp;
+        return currentTimeMillis < ((j >>> 22) + SnowflakeUtils.DISCORD_EPOCH) + 432000000 || currentTimeMillis < firstUseTimestamp;
     }
 
     public static /* synthetic */ void openChangeLog$default(StoreChangeLog storeChangeLog, Context context, boolean z2, int i, Object obj) {
@@ -88,18 +90,18 @@ public final class StoreChangeLog extends Store {
 
     private final boolean shouldShowChangelog(Context context, long j, String str, Integer num) {
         String str2;
-        int identifier = (num != null && num.intValue() == 1) ? context.getResources().getIdentifier("change_log_md_experiment_body", "string", context.getPackageName()) : 2131887256;
+        int identifier = (num != null && num.intValue() == 1) ? context.getResources().getIdentifier("change_log_md_experiment_body", "string", context.getPackageName()) : R.string.change_log_md_body;
         CharSequence stringByLocale = StringUtilsKt.getStringByLocale(context, identifier, "en");
         CharSequence stringByLocale2 = StringUtilsKt.getStringByLocale(context, identifier, str);
         if ((!m.areEqual(str, "en")) && m.areEqual(stringByLocale, stringByLocale2)) {
             return false;
         }
         if (num != null && num.intValue() == 1) {
-            String string = context.getString(2131887257);
+            String string = context.getString(R.string.change_log_md_date);
             m.checkNotNullExpressionValue(string, "context.getString(R.string.change_log_md_date)");
             str2 = getChangelogExperimentString(context, "change_log_md_experiment_date", string);
         } else {
-            str2 = context.getString(2131887257);
+            str2 = context.getString(R.string.change_log_md_date);
             m.checkNotNullExpressionValue(str2, "context.getString(R.string.change_log_md_date)");
         }
         String lastSeenChangeLogVersion = getLastSeenChangeLogVersion();
@@ -153,19 +155,19 @@ public final class StoreChangeLog extends Store {
 
     public final void openChangeLog(Context context, boolean z2) {
         m.checkNotNullParameter(context, "context");
-        String string = context.getString(2131887257);
+        String string = context.getString(R.string.change_log_md_date);
         m.checkNotNullExpressionValue(string, "context.getString(R.string.change_log_md_date)");
         String changelogExperimentString = getChangelogExperimentString(context, "change_log_md_experiment_date", string);
-        String string2 = context.getString(2131887259);
+        String string2 = context.getString(R.string.change_log_md_revision);
         m.checkNotNullExpressionValue(string2, "context.getString(R.string.change_log_md_revision)");
         String changelogExperimentString2 = getChangelogExperimentString(context, "change_log_md_revision", string2);
-        String string3 = context.getString(2131887260);
+        String string3 = context.getString(R.string.change_log_md_video);
         m.checkNotNullExpressionValue(string3, "context.getString(R.string.change_log_md_video)");
         String changelogExperimentString3 = getChangelogExperimentString(context, "change_log_md_experiment_video", string3);
-        String string4 = context.getString(2131887256);
+        String string4 = context.getString(R.string.change_log_md_body);
         m.checkNotNullExpressionValue(string4, "context.getString(R.string.change_log_md_body)");
         String changelogExperimentString4 = getChangelogExperimentString(context, "change_log_md_experiment_body", string4);
-        String string5 = context.getString(2131886813);
+        String string5 = context.getString(R.string.back);
         m.checkNotNullExpressionValue(string5, "context.getString(R.string.back)");
         String changelogExperimentString5 = getChangelogExperimentString(context, "change_log_md_experiment_template", string5);
         WidgetChangeLogSpecial.Companion.ExitStyle exitStyle = z2 ? WidgetChangeLogSpecial.Companion.ExitStyle.BACK : WidgetChangeLogSpecial.Companion.ExitStyle.CLOSE;
@@ -175,13 +177,13 @@ public final class StoreChangeLog extends Store {
             WidgetChangeLog.Companion.launch(context, changelogExperimentString, changelogExperimentString2, changelogExperimentString3, changelogExperimentString4);
         } else {
             WidgetChangeLog.Companion companion = WidgetChangeLog.Companion;
-            String string6 = context.getString(2131887257);
+            String string6 = context.getString(R.string.change_log_md_date);
             m.checkNotNullExpressionValue(string6, "context.getString(R.string.change_log_md_date)");
-            String string7 = context.getString(2131887259);
+            String string7 = context.getString(R.string.change_log_md_revision);
             m.checkNotNullExpressionValue(string7, "context.getString(R.string.change_log_md_revision)");
-            String string8 = context.getString(2131887260);
+            String string8 = context.getString(R.string.change_log_md_video);
             m.checkNotNullExpressionValue(string8, "context.getString(R.string.change_log_md_video)");
-            String string9 = context.getString(2131887256);
+            String string9 = context.getString(R.string.change_log_md_body);
             m.checkNotNullExpressionValue(string9, "context.getString(R.string.change_log_md_body)");
             companion.launch(context, string6, string7, string8, string9);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreChannelMembers.java b/app/src/main/java/com/discord/stores/StoreChannelMembers.java
index 97fbc55373..b77a559243 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelMembers.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelMembers.java
@@ -1,8 +1,11 @@
 package com.discord.stores;
 
 import android.content.Context;
+import c.a.r.n0.c.e;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppLog;
@@ -20,6 +23,7 @@ import com.discord.utilities.logging.Logger;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.user.UserUtils;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import d0.t.g0;
 import d0.t.h0;
@@ -119,7 +123,7 @@ public final class StoreChannelMembers extends StoreV2 {
             if (guildMember.getColor() != -16777216) {
                 num = Integer.valueOf(guildMember.getColor());
             }
-            return new MemberListRow.Member(j, GuildMember.Companion.getNickOrUsername(guildMember, user), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131894149 : 2131887057), UserUtils.INSTANCE.isVerifiedBot(user), presence, num, IconUtils.getForGuildMemberOrUser$default(IconUtils.INSTANCE, user, guildMember, null, 4, null), z3, guildMember.getPremiumSince(), z2);
+            return new MemberListRow.Member(j, GuildMember.Companion.getNickOrUsername(guildMember, user), user.isBot(), Integer.valueOf(user.isSystemUser() ? R.string.system_dm_tag_system : R.string.bot_tag_bot), UserUtils.INSTANCE.isVerifiedBot(user), presence, num, IconUtils.getForGuildMemberOrUser$default(IconUtils.INSTANCE, user, guildMember, null, 4, null), z3, guildMember.getPremiumSince(), z2);
         }
     }
 
@@ -138,11 +142,11 @@ public final class StoreChannelMembers extends StoreV2 {
             if (list != null) {
                 ArrayList arrayList = new ArrayList();
                 for (PermissionOverwrite permissionOverwrite : list) {
-                    if (PermissionOverwriteUtilsKt.allows(permissionOverwrite, 1024)) {
+                    if (PermissionOverwriteUtilsKt.allows(permissionOverwrite, Permission.VIEW_CHANNEL)) {
                         StringBuilder K = a.K("allow:");
                         K.append(permissionOverwrite.e());
                         arrayList.add(K.toString());
-                    } else if (PermissionOverwriteUtilsKt.denies(permissionOverwrite, 1024)) {
+                    } else if (PermissionOverwriteUtilsKt.denies(permissionOverwrite, Permission.VIEW_CHANNEL)) {
                         StringBuilder K2 = a.K("deny:");
                         K2.append(permissionOverwrite.e());
                         arrayList.add(K2.toString());
@@ -176,11 +180,11 @@ public final class StoreChannelMembers extends StoreV2 {
                 if (map == null) {
                     map = h0.emptyMap();
                 }
-                if (!PermissionUtils.canEveryone(1024, invoke, null, map)) {
+                if (!PermissionUtils.canEveryone(Permission.VIEW_CHANNEL, invoke, null, map)) {
                     return computeIdFromOverwrites(invoke.s());
                 }
             }
-            return "everyone";
+            return ModelGuildMemberListUpdate.EVERYONE_ID;
         }
     }
 
@@ -189,7 +193,7 @@ public final class StoreChannelMembers extends StoreV2 {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public MemberListUpdateException(Exception exc) {
             super(exc);
-            m.checkNotNullParameter(exc, "e");
+            m.checkNotNullParameter(exc, e.a);
         }
     }
 
@@ -204,7 +208,7 @@ public final class StoreChannelMembers extends StoreV2 {
         }
 
         private final String makeLogKey(long j, String str) {
-            return j + ':' + str;
+            return j + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + str;
         }
 
         public final void dumpLogs(long j, String str, Exception exc) {
@@ -219,7 +223,7 @@ public final class StoreChannelMembers extends StoreV2 {
             sb.append(" -- LAST 20 UPDATES:\n");
             sb.append(list != null ? u.joinToString$default(list, "\n", null, null, 0, null, null, 62, null) : null);
             FirebaseCrashlytics.getInstance().log(sb.toString());
-            Logger.e$default(AppLog.g, "MemberListUpdateError", new MemberListUpdateException(exc), null, 4, null);
+            Logger.e$default(AppLog.g, ERROR_TAG, new MemberListUpdateException(exc), null, 4, null);
         }
 
         public final void logUpdate(ModelGuildMemberListUpdate modelGuildMemberListUpdate) {
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
index e7b2adf113..14c855674f 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.utilities.permissions.PermissionUtils;
 import d0.f0.q;
 import d0.t.u;
@@ -42,7 +43,7 @@ public final class StoreChannels$observeDefaultChannel$1<T, R> implements b<Map<
 
             public final boolean invoke(Channel channel) {
                 m.checkNotNullParameter(channel, "channel");
-                return PermissionUtils.can(1024, (Long) a.o0(channel, this.this$0.$guildChannelPermissions));
+                return PermissionUtils.can(Permission.VIEW_CHANNEL, (Long) a.o0(channel, this.this$0.$guildChannelPermissions));
             }
         }
 
diff --git a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
index 81339c3ff3..3718695a55 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
@@ -50,7 +50,7 @@ public final class StoreChannelsSelected extends StoreV2 {
     private final ObservationDeck observationDeck;
     private ResolvedSelectedChannel previouslySelectedChannel;
     private ResolvedSelectedChannel selectedChannel;
-    private final Persister<Map<Long, Long>> selectedChannelIdsCache = new Persister<>("CACHE_KEY_SELECTED_CHANNEL_IDS", new HashMap());
+    private final Persister<Map<Long, Long>> selectedChannelIdsCache = new Persister<>(CACHE_KEY_SELECTED_CHANNEL_IDS, new HashMap());
     private final StoreChannels storeChannels;
     private final StoreGuildSelected storeGuildSelected;
     private final StorePermissions storePermissions;
diff --git a/app/src/main/java/com/discord/stores/StoreChat.java b/app/src/main/java/com/discord/stores/StoreChat.java
index d7129cb38f..53847f4e6b 100644
--- a/app/src/main/java/com/discord/stores/StoreChat.java
+++ b/app/src/main/java/com/discord/stores/StoreChat.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import a0.a.a.b;
+import androidx.core.app.NotificationCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import c.d.b.a.a;
 import com.discord.models.message.Message;
@@ -113,7 +114,7 @@ public final class StoreChat extends StoreV2 {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public AppendChatText(String str) {
                 super(null);
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 this.text = str;
             }
 
@@ -129,7 +130,7 @@ public final class StoreChat extends StoreV2 {
             }
 
             public final AppendChatText copy(String str) {
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 return new AppendChatText(str);
             }
 
@@ -164,7 +165,7 @@ public final class StoreChat extends StoreV2 {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public ReplaceChatText(String str) {
                 super(null);
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 this.text = str;
             }
 
@@ -180,7 +181,7 @@ public final class StoreChat extends StoreV2 {
             }
 
             public final ReplaceChatText copy(String str) {
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 return new ReplaceChatText(str);
             }
 
@@ -470,7 +471,7 @@ public final class StoreChat extends StoreV2 {
     }
 
     public final void replaceChatText(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         PublishSubject<Event> publishSubject = this.eventSubject;
         publishSubject.j.onNext(new Event.ReplaceChatText(str + ' '));
     }
diff --git a/app/src/main/java/com/discord/stores/StoreClientVersion.java b/app/src/main/java/com/discord/stores/StoreClientVersion.java
index 6a5f733c04..ac1809b5b5 100644
--- a/app/src/main/java/com/discord/stores/StoreClientVersion.java
+++ b/app/src/main/java/com/discord/stores/StoreClientVersion.java
@@ -2,6 +2,7 @@ package com.discord.stores;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import com.discord.BuildConfig;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.m;
 import java.util.concurrent.TimeUnit;
@@ -15,7 +16,7 @@ public final class StoreClientVersion extends Store {
     private int clientMinVersion;
     private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY";
     private final SerializedSubject<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
-    private final int clientVersion = 87203;
+    private final int clientVersion = BuildConfig.VERSION_CODE;
 
     public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) {
         storeClientVersion.setClientMinVersion(i);
diff --git a/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java b/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java
index af24f64323..f50ef154c4 100644
--- a/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java
+++ b/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java
@@ -43,13 +43,13 @@ public final class StoreCollapsedChannelCategories extends StoreV2 {
         }
 
         private final Map<Long, Set<Long>> fromCache(SharedPreferences sharedPreferences) {
-            return SharedPreferenceExtensionsKt.getStringEntrySetAsMap$default(sharedPreferences, "STORE_COLLAPSED_CATEGORIES_V2", null, StoreCollapsedChannelCategories$Companion$fromCache$1.INSTANCE, 2, null);
+            return SharedPreferenceExtensionsKt.getStringEntrySetAsMap$default(sharedPreferences, StoreCollapsedChannelCategories.CACHE_KEY_COLLAPSED_CATEGORIES, null, StoreCollapsedChannelCategories$Companion$fromCache$1.INSTANCE, 2, null);
         }
 
         private final void toCache(SharedPreferences sharedPreferences, Map<Long, Set<Long>> map) {
             SharedPreferences.Editor edit = sharedPreferences.edit();
             m.checkExpressionValueIsNotNull(edit, "editor");
-            SharedPreferenceExtensionsKt.putStringEntrySetAsMap$default(edit, "STORE_COLLAPSED_CATEGORIES_V2", map, null, StoreCollapsedChannelCategories$Companion$toCache$1$1.INSTANCE, 4, null);
+            SharedPreferenceExtensionsKt.putStringEntrySetAsMap$default(edit, StoreCollapsedChannelCategories.CACHE_KEY_COLLAPSED_CATEGORIES, map, null, StoreCollapsedChannelCategories$Companion$toCache$1$1.INSTANCE, 4, null);
             edit.apply();
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreDirectories.java b/app/src/main/java/com/discord/stores/StoreDirectories.java
index c8cd5c6ee8..1968dd5132 100644
--- a/app/src/main/java/com/discord/stores/StoreDirectories.java
+++ b/app/src/main/java/com/discord/stores/StoreDirectories.java
@@ -57,8 +57,8 @@ public final class StoreDirectories extends StoreV2 {
         this.restApi = restAPI;
         this.directoriesMapSnapshot = h0.emptyMap();
         this.directoriesMap = new LinkedHashMap();
-        this.discordHubClickedPersister = new Persister<>("hub_verification_clicked_key", Boolean.FALSE);
-        this.hubNamePromptPersister = new Persister<>("hub_name_prompt", n0.emptySet());
+        this.discordHubClickedPersister = new Persister<>(DISCORD_HUB_VERIFICATION_CLICKED_KEY, Boolean.FALSE);
+        this.hubNamePromptPersister = new Persister<>(HUB_NAME_PROMPT, n0.emptySet());
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.java b/app/src/main/java/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.java
index 0bf4548cd8..da5b56357f 100644
--- a/app/src/main/java/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.java
+++ b/app/src/main/java/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import com.discord.stores.StoreDynamicLink;
 import d0.g0.t;
 import d0.z.d.m;
@@ -30,7 +31,7 @@ public final class StoreDynamicLink$storeLinkIfExists$1<T, R> implements b<Uri,
             return null;
         }
         c.a.e.o0.b bVar = c.a.e.o0.b.F;
-        m.checkNotNullExpressionValue(uri, "uri");
+        m.checkNotNullExpressionValue(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(uri, "$this$isInviteLink");
         boolean z2 = false;
         String str8 = "";
diff --git a/app/src/main/java/com/discord/stores/StoreDynamicLink.java b/app/src/main/java/com/discord/stores/StoreDynamicLink.java
index f98c6a1e7e..959de1630d 100644
--- a/app/src/main/java/com/discord/stores/StoreDynamicLink.java
+++ b/app/src/main/java/com/discord/stores/StoreDynamicLink.java
@@ -187,12 +187,12 @@ public final class StoreDynamicLink {
             IntentUtils.RouteBuilders routeBuilders = IntentUtils.RouteBuilders.INSTANCE;
             String inviteCode2 = dynamicLinkData.getInviteCode();
             Objects.requireNonNull(inviteCode2, "null cannot be cast to non-null type kotlin.CharSequence");
-            IntentUtils.consumeRoutingIntent$default(IntentUtils.INSTANCE, routeBuilders.selectInvite(w.trim(inviteCode2).toString(), "Deeplink"), context, null, 4, null);
+            IntentUtils.consumeRoutingIntent$default(IntentUtils.INSTANCE, routeBuilders.selectInvite(w.trim(inviteCode2).toString(), StoreInviteSettings.LOCATION_DEEPLINK), context, null, 4, null);
         } else if (dynamicLinkData != null && (guildTemplateCode = dynamicLinkData.getGuildTemplateCode()) != null && (!t.isBlank(guildTemplateCode))) {
             IntentUtils.RouteBuilders routeBuilders2 = IntentUtils.RouteBuilders.INSTANCE;
             String guildTemplateCode2 = dynamicLinkData.getGuildTemplateCode();
             Objects.requireNonNull(guildTemplateCode2, "null cannot be cast to non-null type kotlin.CharSequence");
-            IntentUtils.consumeRoutingIntent$default(IntentUtils.INSTANCE, routeBuilders2.selectGuildTemplate(w.trim(guildTemplateCode2).toString(), "Deeplink"), context, null, 4, null);
+            IntentUtils.consumeRoutingIntent$default(IntentUtils.INSTANCE, routeBuilders2.selectGuildTemplate(w.trim(guildTemplateCode2).toString(), StoreInviteSettings.LOCATION_DEEPLINK), context, null, 4, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.java b/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.java
index 03663a94f2..92ce9ebc9d 100644
--- a/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.java
+++ b/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.api.permission.Permission;
 import com.discord.utilities.permissions.PermissionUtils;
 import j0.k.b;
 /* compiled from: StoreEmoji.kt */
@@ -7,6 +8,6 @@ public final class StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1
     public static final StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1 INSTANCE = new StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1();
 
     public final Boolean call(Long l) {
-        return Boolean.valueOf(PermissionUtils.can(262144, l));
+        return Boolean.valueOf(PermissionUtils.can(Permission.USE_EXTERNAL_EMOJIS, l));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreEmoji.java b/app/src/main/java/com/discord/stores/StoreEmoji.java
index 95aba27cf5..40e8bf327b 100644
--- a/app/src/main/java/com/discord/stores/StoreEmoji.java
+++ b/app/src/main/java/com/discord/stores/StoreEmoji.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import a0.a.a.b;
 import android.content.Context;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import com.discord.models.domain.Model;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.models.domain.emoji.EmojiCategory;
@@ -390,7 +391,7 @@ public final class StoreEmoji implements Rules.EmojiDataProvider {
     }
 
     private final ModelEmojiUnicode.Bundle loadUnicodeEmojisFromDisk(Context context) {
-        Model parse = new Model.JsonReader(new InputStreamReader(context.getAssets().open("data/emojis.json"), "UTF-8")).parse(new ModelEmojiUnicode.Bundle());
+        Model parse = new Model.JsonReader(new InputStreamReader(context.getAssets().open("data/emojis.json"), Constants.ENCODING)).parse(new ModelEmojiUnicode.Bundle());
         m.checkNotNullExpressionValue(parse, "jsonReader.parse(ModelEmojiUnicode.Bundle())");
         return (ModelEmojiUnicode.Bundle) parse;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreExperiments.java b/app/src/main/java/com/discord/stores/StoreExperiments.java
index ba6ee4ed32..c808bde47a 100644
--- a/app/src/main/java/com/discord/stores/StoreExperiments.java
+++ b/app/src/main/java/com/discord/stores/StoreExperiments.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.content.Context;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelPayload;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.experiments.domain.ExperimentHash;
@@ -16,6 +17,7 @@ import com.discord.utilities.persister.Persister;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.time.Clock;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.google.gson.Gson;
 import d0.t.h0;
 import d0.z.d.m;
@@ -90,8 +92,8 @@ public final class StoreExperiments extends StoreV2 {
         this.storeAuthentication = storeAuthentication;
         this.storeGuildMemberCounts = storeGuildMemberCounts;
         this.observationDeck = observationDeck;
-        this.authToken = "UNINITIALIZED";
-        this.fingerprint = "UNINITIALIZED";
+        this.authToken = UNINITIALIZED;
+        this.fingerprint = UNINITIALIZED;
         this.userExperimentsSnapshot = h0.emptyMap();
         this.guildExperimentsSnapshot = h0.emptyMap();
         this.experimentOverridesSnapshot = h0.emptyMap();
@@ -100,9 +102,9 @@ public final class StoreExperiments extends StoreV2 {
         this.experimentOverrides = new HashMap<>();
         this.memoizedGuildExperiments = new HashMap<>();
         this.experimentTrackedExposureTimestamps = new HashMap<>();
-        this.userExperimentsCache = new Persister<>("USER_EXPERIMENTS_CACHE_KEY", new HashMap());
-        this.guildExperimentsCache = new Persister<>("GUILD_EXPERIMENTS_CACHE_KEY", new ArrayList());
-        this.experimentOverridesCache = new Persister<>("EXPERIMENT_OVERRIDES_CACHE_KEY", new HashMap());
+        this.userExperimentsCache = new Persister<>(USER_EXPERIMENTS_CACHE_KEY, new HashMap());
+        this.guildExperimentsCache = new Persister<>(GUILD_EXPERIMENTS_CACHE_KEY, new ArrayList());
+        this.experimentOverridesCache = new Persister<>(EXPERIMENT_OVERRIDES_CACHE_KEY, new HashMap());
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -163,7 +165,7 @@ public final class StoreExperiments extends StoreV2 {
     }
 
     private final void cacheExperimentTrackedExposureTimestamps() {
-        getPrefs().edit().putString("EXPERIMENT_TRIGGER_TIMESTAMPS_CACHE_KEY", new Gson().m(this.experimentTrackedExposureTimestamps)).apply();
+        getPrefs().edit().putString(EXPERIMENT_TRACKED_EXPOSURE_TIMESTAMPS_CACHE_KEY, new Gson().m(this.experimentTrackedExposureTimestamps)).apply();
     }
 
     private final void cacheGuildExperiments() {
@@ -294,7 +296,7 @@ public final class StoreExperiments extends StoreV2 {
     }
 
     private final Map<String, Long> loadCachedExperimentTrackedExposureTimestamps() {
-        String string = getPrefs().getString("EXPERIMENT_TRIGGER_TIMESTAMPS_CACHE_KEY", null);
+        String string = getPrefs().getString(EXPERIMENT_TRACKED_EXPOSURE_TIMESTAMPS_CACHE_KEY, null);
         if (string == null) {
             return h0.emptyMap();
         }
@@ -304,7 +306,7 @@ public final class StoreExperiments extends StoreV2 {
     }
 
     private final synchronized void memoizeGuildExperiment(String str, long j, Experiment experiment) {
-        this.memoizedGuildExperiments.put(str + ':' + j, experiment);
+        this.memoizedGuildExperiments.put(str + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + j, experiment);
     }
 
     @StoreThread
@@ -326,7 +328,7 @@ public final class StoreExperiments extends StoreV2 {
     }
 
     private final synchronized void trackExposureToGuildExperiment(String str, long j, int i, int i2) {
-        String str2 = str + ':' + j;
+        String str2 = str + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + j;
         if (!wasExperimentExposureTrackedRecently(str2, this.clock.currentTimeMillis())) {
             AnalyticsTracker.guildExperimentTriggered(str, i2, i, j);
             didTrackExposureToExperiment(str2);
@@ -342,7 +344,7 @@ public final class StoreExperiments extends StoreV2 {
 
     @StoreThread
     private final void tryInitializeExperiments() {
-        if (!this.initialized && !m.areEqual(this.authToken, "UNINITIALIZED") && !m.areEqual(this.fingerprint, "UNINITIALIZED")) {
+        if (!this.initialized && !m.areEqual(this.authToken, UNINITIALIZED) && !m.areEqual(this.fingerprint, UNINITIALIZED)) {
             this.initialized = true;
             if (this.authToken != null) {
                 setInitialized();
@@ -380,7 +382,7 @@ public final class StoreExperiments extends StoreV2 {
         if (num != null) {
             return new Experiment(guildExperimentDto != null ? guildExperimentDto.getRevision() : 0, num.intValue(), 0, true, StoreExperiments$getGuildExperiment$1.INSTANCE);
         }
-        Experiment memoizedGuildExperiment$app_productionCanaryRelease = getMemoizedGuildExperiment$app_productionCanaryRelease(j + ':' + str, j);
+        Experiment memoizedGuildExperiment$app_productionCanaryRelease = getMemoizedGuildExperiment$app_productionCanaryRelease(j + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + str, j);
         if (memoizedGuildExperiment$app_productionCanaryRelease != null) {
             return memoizedGuildExperiment$app_productionCanaryRelease;
         }
@@ -399,11 +401,11 @@ public final class StoreExperiments extends StoreV2 {
 
     public final synchronized Experiment getMemoizedGuildExperiment$app_productionCanaryRelease(String str, long j) {
         m.checkNotNullParameter(str, "experimentName");
-        return this.memoizedGuildExperiments.get(str + ':' + j);
+        return this.memoizedGuildExperiments.get(str + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + j);
     }
 
     public final Experiment getUserExperiment(String str, boolean z2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         long from = ExperimentHash.INSTANCE.from(str);
         Integer num = this.experimentOverridesSnapshot.get(str);
         UserExperimentDto userExperimentDto = this.userExperimentsSnapshot.get(Long.valueOf(from));
@@ -475,7 +477,7 @@ public final class StoreExperiments extends StoreV2 {
     }
 
     public final Observable<Experiment> observeUserExperiment(String str, boolean z2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         Observable<Experiment> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreExperiments$observeUserExperiment$1(this, str, z2), 14, null).r();
         m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
         return r;
diff --git a/app/src/main/java/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.java b/app/src/main/java/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.java
index 9f4a577066..7c32fee1d2 100644
--- a/app/src/main/java/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.java
+++ b/app/src/main/java/com/discord/stores/StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.w;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -15,6 +16,6 @@ public final class StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform
 
     public final String invoke(String str) {
         m.checkNotNullParameter(str, "gatewayUrl");
-        return a.s("ws://:", w.substringAfterLast$default(str, ':', null, 2, null));
+        return a.s("ws://:", w.substringAfterLast$default(str, MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, null, 2, null));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
index 9ec6b1ae70..d0c1808bbb 100644
--- a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import c.a.e.n;
 import c.a.f.d;
 import c.d.b.a.a;
+import com.discord.BuildConfig;
 import com.discord.api.activity.Activity;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelRecipient;
@@ -65,6 +66,7 @@ import com.discord.stores.StoreClientDataState;
 import com.discord.stores.utilities.BatchManager;
 import com.discord.stores.utilities.Batched;
 import com.discord.utilities.analytics.AnalyticSuperProperties;
+import com.discord.utilities.fcm.NotificationData;
 import com.discord.utilities.lazy.subscriptions.GuildSubscriptions;
 import com.discord.utilities.logging.AppGatewaySocketLogger;
 import com.discord.utilities.networking.NetworkMonitor;
@@ -455,7 +457,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
         List listOf = d0.t.n.listOf((Object[]) new Interceptor[]{companion.buildAnalyticsInterceptor(), companion.buildLoggingInterceptor()});
         App.a aVar = App.j;
         boolean z2 = App.i;
-        GatewaySocket gatewaySocket = new GatewaySocket(new StoreGatewayConnection$buildGatewaySocket$socket$1(this), StoreGatewayConnection$buildGatewaySocket$socket$2.INSTANCE, this, this.scheduler, AppLog.g, networkMonitor, new RestConfig("https://discord.com/api/", RestAPI.AppHeadersProvider.INSTANCE, listOf), context, z2 ? StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.INSTANCE : null, z2 ? null : SecureSocketsLayerUtils.createSocketFactory$default(null, 1, null), AnalyticSuperProperties.INSTANCE.getSuperProperties(), this.gatewaySocketLogger);
+        GatewaySocket gatewaySocket = new GatewaySocket(new StoreGatewayConnection$buildGatewaySocket$socket$1(this), StoreGatewayConnection$buildGatewaySocket$socket$2.INSTANCE, this, this.scheduler, AppLog.g, networkMonitor, new RestConfig(BuildConfig.HOST_API, RestAPI.AppHeadersProvider.INSTANCE, listOf), context, z2 ? StoreGatewayConnection$buildGatewaySocket$gatewayUrlTransform$1.INSTANCE : null, z2 ? null : SecureSocketsLayerUtils.createSocketFactory$default(null, 1, null), AnalyticSuperProperties.INSTANCE.getSuperProperties(), this.gatewaySocketLogger);
         this.stream.getConnectionTimeStats$app_productionCanaryRelease().addListener(gatewaySocket);
         return gatewaySocket;
     }
@@ -946,7 +948,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
                     }
                     return;
                 case -1489275252:
-                    if (str.equals("GUILD_SCHEDULED_EVENT_UPDATE")) {
+                    if (str.equals(NotificationData.TYPE_GUILD_SCHEDULED_EVENT_UPDATE)) {
                         this.guildScheduledEventUpdate.j.onNext(obj);
                         return;
                     }
@@ -964,13 +966,13 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
                     }
                     return;
                 case -1327124998:
-                    if (str.equals("RELATIONSHIP_ADD")) {
+                    if (str.equals(NotificationData.TYPE_RELATIONSHIP_ADD)) {
                         this.relationshipAdd.j.onNext(obj);
                         return;
                     }
                     return;
                 case -1263316859:
-                    if (str.equals("STAGE_INSTANCE_CREATE")) {
+                    if (str.equals(NotificationData.TYPE_STAGE_INSTANCE_CREATE)) {
                         this.stageInstanceCreate.j.onNext(obj);
                         return;
                     }
@@ -1198,7 +1200,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
                     }
                     return;
                 case 998188116:
-                    if (str.equals("MESSAGE_CREATE")) {
+                    if (str.equals(NotificationData.TYPE_MESSAGE_CREATE)) {
                         this.messageCreate.j.onNext(obj);
                         return;
                     }
diff --git a/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java b/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
index c2aad06e56..4b4e8df9e9 100644
--- a/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
+++ b/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
@@ -1,7 +1,9 @@
 package com.discord.stores;
 
 import android.content.Context;
+import androidx.core.view.PointerIconCompat;
 import com.discord.models.domain.ModelGift;
+import com.discord.restapi.RestAPIAbortCodes;
 import com.discord.stores.StoreGifting;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPI;
@@ -44,16 +46,16 @@ public final class StoreGifting$acceptGift$1 extends o implements Function0<Unit
                     Error.Response response = this.$error.getResponse();
                     m.checkNotNullExpressionValue(response, "error.response");
                     switch (response.getCode()) {
-                        case 50050:
+                        case RestAPIAbortCodes.GIFTING_ALREADY_USED_ERROR_CODE /* 50050 */:
                             StoreGifting$acceptGift$1 storeGifting$acceptGift$1 = this.this$0.this$0;
                             StoreGifting storeGifting = storeGifting$acceptGift$1.this$0;
                             String code = storeGifting$acceptGift$1.$gift.getCode();
                             ModelGift modelGift = this.this$0.this$0.$gift;
-                            StoreGifting.access$setGifts(storeGifting, code, new StoreGifting.GiftState.Resolved(ModelGift.copy$default(modelGift, 0, false, null, null, modelGift.getMaxUses(), null, 0, null, null, null, 1007, null)));
+                            StoreGifting.access$setGifts(storeGifting, code, new StoreGifting.GiftState.Resolved(ModelGift.copy$default(modelGift, 0, false, null, null, modelGift.getMaxUses(), null, 0, null, null, null, PointerIconCompat.TYPE_CROSSHAIR, null)));
                             return;
-                        case 50051:
+                        case RestAPIAbortCodes.GIFTING_ALREADY_OWNED_ERROR_CODE /* 50051 */:
                             StoreGifting$acceptGift$1 storeGifting$acceptGift$12 = this.this$0.this$0;
-                            StoreGifting.access$setGifts(storeGifting$acceptGift$12.this$0, storeGifting$acceptGift$12.$gift.getCode(), new StoreGifting.GiftState.Resolved(ModelGift.copy$default(this.this$0.this$0.$gift, 0, true, null, null, 0, null, 0, null, null, null, 1021, null)));
+                            StoreGifting.access$setGifts(storeGifting$acceptGift$12.this$0, storeGifting$acceptGift$12.$gift.getCode(), new StoreGifting.GiftState.Resolved(ModelGift.copy$default(this.this$0.this$0.$gift, 0, true, null, null, 0, null, 0, null, null, null, PointerIconCompat.TYPE_GRABBING, null)));
                             return;
                         default:
                             StoreGifting$acceptGift$1 storeGifting$acceptGift$13 = this.this$0.this$0;
@@ -112,7 +114,7 @@ public final class StoreGifting$acceptGift$1 extends o implements Function0<Unit
             /* renamed from: invoke */
             public final void mo1invoke() {
                 StoreGifting$acceptGift$1 storeGifting$acceptGift$1 = this.this$0.this$0;
-                StoreGifting.access$setGifts(storeGifting$acceptGift$1.this$0, storeGifting$acceptGift$1.$gift.getCode(), new StoreGifting.GiftState.Resolved(ModelGift.copy$default(this.this$0.this$0.$gift, 0, true, null, null, 0, null, 0, null, null, null, 1021, null)));
+                StoreGifting.access$setGifts(storeGifting$acceptGift$1.this$0, storeGifting$acceptGift$1.$gift.getCode(), new StoreGifting.GiftState.Resolved(ModelGift.copy$default(this.this$0.this$0.$gift, 0, true, null, null, 0, null, 0, null, null, null, PointerIconCompat.TYPE_GRABBING, null)));
             }
         }
 
diff --git a/app/src/main/java/com/discord/stores/StoreGifting.java b/app/src/main/java/com/discord/stores/StoreGifting.java
index f459878dbd..36a049270c 100644
--- a/app/src/main/java/com/discord/stores/StoreGifting.java
+++ b/app/src/main/java/com/discord/stores/StoreGifting.java
@@ -7,6 +7,7 @@ import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.t.h0;
 import d0.z.d.m;
 import java.util.HashMap;
@@ -36,11 +37,11 @@ public final class StoreGifting {
             this();
         }
 
-        /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(r2v0 long), (':' char), (r4v0 java.lang.Long)] */
+        /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(r2v0 long), (wrap: char : ?: SGET   com.discord.widgets.chat.input.MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR char), (r4v0 java.lang.Long)] */
         public final String makeComboId(long j, Long l) {
             StringBuilder sb = new StringBuilder();
             sb.append(j);
-            sb.append(':');
+            sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
             sb.append(l);
             return sb.toString();
         }
diff --git a/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java b/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
index 01e2d99650..9f88dbd8d0 100644
--- a/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
+++ b/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
@@ -620,7 +620,7 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
     }
 
     private final void cacheAnalyticsTraits(Map<String, AnalyticsTrait> map) {
-        getPrefs().edit().putString("CACHE_KEY_PAYMENT_FLOW_ANALYTICS", this.gson.m(map)).apply();
+        getPrefs().edit().putString(CACHE_KEY_PAYMENT_FLOW_ANALYTICS, this.gson.m(map)).apply();
     }
 
     private final void clearAnalyticsTraits(String str) {
@@ -642,7 +642,7 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
     }
 
     private final Map<String, AnalyticsTrait> getCachedAnalyticsTraitsMap() {
-        String string = getPrefs().getString("CACHE_KEY_PAYMENT_FLOW_ANALYTICS", null);
+        String string = getPrefs().getString(CACHE_KEY_PAYMENT_FLOW_ANALYTICS, null);
         if (string != null) {
             Map<String, AnalyticsTrait> map = (Map) this.gson.g(string, new StoreGooglePlayPurchases$getCachedAnalyticsTraitsMap$1$typeToken$1().getType());
             if (map != null) {
@@ -657,7 +657,7 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
         if (analyticsTrait == null) {
             return null;
         }
-        if (!(this.clock.currentTimeMillis() - analyticsTrait.getTimestamp() > 259200000)) {
+        if (!(this.clock.currentTimeMillis() - analyticsTrait.getTimestamp() > CACHED_ANALYTICS_TTL)) {
             return analyticsTrait;
         }
         clearAnalyticsTraits(str);
@@ -743,11 +743,11 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
     }
 
     public final boolean hasSeenGiftingWarning() {
-        return getPrefs().getBoolean("VIEWED_GIFTING_WARNING_DIALOG", false);
+        return getPrefs().getBoolean(VIEWED_GIFTING_WARNING_DIALOG, false);
     }
 
     public final void markViewedGiftingWarning() {
-        getPrefs().edit().putBoolean("VIEWED_GIFTING_WARNING_DIALOG", true).apply();
+        getPrefs().edit().putBoolean(VIEWED_GIFTING_WARNING_DIALOG, true).apply();
     }
 
     public final Observable<Event> observeEvents() {
diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$observeGuildScheduledEvents$1.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$observeGuildScheduledEvents$1.java
index e6b1e42002..21e9524743 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$observeGuildScheduledEvents$1.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$observeGuildScheduledEvents$1.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import android.content.Context;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
 import com.discord.api.guildscheduledevent.GuildScheduledEventStatus;
+import com.discord.api.permission.Permission;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.utilities.guildscheduledevent.GuildScheduledEventTiming;
 import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilitiesKt;
@@ -120,7 +121,7 @@ public final class StoreGuildScheduledEvents$observeGuildScheduledEvents$1<R> im
                 GuildScheduledEvent guildScheduledEvent2 = (GuildScheduledEvent) obj;
                 if (this.this$0.$filterInaccessible) {
                     Long l = permissionsByChannel.get(Long.valueOf(guildScheduledEvent2.b()));
-                    if (!(l != null ? PermissionUtils.can(1024, Long.valueOf(l.longValue())) : false)) {
+                    if (!(l != null ? PermissionUtils.can(Permission.VIEW_CHANNEL, Long.valueOf(l.longValue())) : false)) {
                         z2 = false;
                         if (!z2) {
                             arrayList2.add(obj);
diff --git a/app/src/main/java/com/discord/stores/StoreGuildsNsfw.java b/app/src/main/java/com/discord/stores/StoreGuildsNsfw.java
index 942d5f56aa..a62f58d779 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildsNsfw.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildsNsfw.java
@@ -79,7 +79,7 @@ public final class StoreGuildsNsfw extends StoreV2 {
         Set<Long> set;
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        Set<String> stringSet = getPrefs().getStringSet("GUILDS_ALLOWED_KEY", n0.emptySet());
+        Set<String> stringSet = getPrefs().getStringSet(GUILDS_ALLOWED_KEY, n0.emptySet());
         if (stringSet == null || (set = toGuildIdSet(stringSet)) == null) {
             set = n0.emptySet();
         }
@@ -98,7 +98,7 @@ public final class StoreGuildsNsfw extends StoreV2 {
         this.guildIdsAllowedSnapshot = new HashSet(this.guildIdsAllowed);
         SharedPreferences.Editor edit = getPrefs().edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putStringSet("GUILDS_ALLOWED_KEY", toStringSet(this.guildIdsAllowed));
+        edit.putStringSet(GUILDS_ALLOWED_KEY, toStringSet(this.guildIdsAllowed));
         edit.apply();
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreInviteSettings.java b/app/src/main/java/com/discord/stores/StoreInviteSettings.java
index 8965c5fdcc..19f4581121 100644
--- a/app/src/main/java/com/discord/stores/StoreInviteSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreInviteSettings.java
@@ -168,7 +168,7 @@ public final class StoreInviteSettings extends Store {
 
     public final ModelInvite.Settings getInviteSettings(long j) {
         Experiment inviteGuildExperiment$default = getInviteGuildExperiment$default(this, j, false, 2, null);
-        return (inviteGuildExperiment$default == null || inviteGuildExperiment$default.getBucket() != 1) ? new ModelInvite.Settings(86400) : new ModelInvite.Settings(604800);
+        return (inviteGuildExperiment$default == null || inviteGuildExperiment$default.getBucket() != 1) ? new ModelInvite.Settings(86400) : new ModelInvite.Settings(ModelInvite.Settings.SEVEN_DAYS);
     }
 
     public final Observable<ModelInvite.Settings> getInviteSettings() {
diff --git a/app/src/main/java/com/discord/stores/StoreLurking$startLurkingAndNavigate$1.java b/app/src/main/java/com/discord/stores/StoreLurking$startLurkingAndNavigate$1.java
index 1455edc60d..68e4641dce 100644
--- a/app/src/main/java/com/discord/stores/StoreLurking$startLurkingAndNavigate$1.java
+++ b/app/src/main/java/com/discord/stores/StoreLurking$startLurkingAndNavigate$1.java
@@ -7,6 +7,7 @@ import com.discord.app.AppLog;
 import com.discord.models.guild.Guild;
 import com.discord.stores.StoreLurking;
 import com.discord.stores.StoreNavigation;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -96,7 +97,7 @@ public final class StoreLurking$startLurkingAndNavigate$1 extends o implements F
         }
         StringBuilder K = a.K("Queue lurk request: ");
         K.append(this.$guildId);
-        K.append(':');
+        K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         K.append(this.$channelId);
         AppLog.i(K.toString());
         StoreLurking.access$setLurkRequest$p(this.this$0, new StoreLurking.LurkRequest(this.$guildId, this.$channelId));
diff --git a/app/src/main/java/com/discord/stores/StoreLurking.java b/app/src/main/java/com/discord/stores/StoreLurking.java
index 93030aaf4c..6e88246671 100644
--- a/app/src/main/java/com/discord/stores/StoreLurking.java
+++ b/app/src/main/java/com/discord/stores/StoreLurking.java
@@ -12,6 +12,7 @@ import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -275,7 +276,7 @@ public final class StoreLurking {
     private final void startLurkingInternal(long j, Long l, boolean z2, Function3<? super Guild, ? super Long, ? super Boolean, Unit> function3, Function0<Unit> function0, Context context) {
         if (this.sessionId == null) {
             AppLog appLog = AppLog.g;
-            Logger.w$default(appLog, "Cannot lurk " + j + ':' + l + " with no session", null, 2, null);
+            Logger.w$default(appLog, "Cannot lurk " + j + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + l + " with no session", null, 2, null);
             function0.mo1invoke();
         } else if (j != 0 || j == -1) {
             Guild guild = this.stream.getGuilds$app_productionCanaryRelease().getGuildsInternal$app_productionCanaryRelease().get(Long.valueOf(j));
@@ -288,7 +289,7 @@ public final class StoreLurking {
             function3.invoke(guild, l, Boolean.TRUE);
         } else {
             AppLog appLog2 = AppLog.g;
-            Logger.w$default(appLog2, "Invalid ids for lurking " + j + ':' + l, null, 2, null);
+            Logger.w$default(appLog2, "Invalid ids for lurking " + j + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + l, null, 2, null);
             function0.mo1invoke();
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMaskedLinks.java b/app/src/main/java/com/discord/stores/StoreMaskedLinks.java
index abe32df978..d582b187ed 100644
--- a/app/src/main/java/com/discord/stores/StoreMaskedLinks.java
+++ b/app/src/main/java/com/discord/stores/StoreMaskedLinks.java
@@ -5,7 +5,9 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import androidx.annotation.VisibleForTesting;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.BuildConfig;
 import com.discord.api.channel.Channel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelUserRelationship;
 import com.discord.models.user.User;
 import d0.t.n;
@@ -58,7 +60,7 @@ public final class StoreMaskedLinks extends StoreV2 {
 
         @VisibleForTesting
         public final boolean isImplicitlyTrustedDomain$app_productionCanaryRelease(String str) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return StoreMaskedLinks.access$getTRUSTED_DOMAINS$cp().contains(str) || StoreMaskedLinks.access$getDISCORD_DOMAINS_REGEX$cp().containsMatchIn(str);
         }
     }
@@ -66,7 +68,7 @@ public final class StoreMaskedLinks extends StoreV2 {
     static {
         Companion companion = new Companion(null);
         Companion = companion;
-        TRUSTED_DOMAINS = n.listOfNotNull((Object[]) new String[]{Companion.access$getDomainName(companion, "https://discord.com"), Companion.access$getDomainName(companion, "https://discordapp.com"), Companion.access$getDomainName(companion, "https://cdn.discordapp.com"), Companion.access$getDomainName(companion, "https://discord.gift"), Companion.access$getDomainName(companion, "https://discord.gg"), Companion.access$getDomainName(companion, "https://discord.new"), Companion.access$getDomainName(companion, "https://spotify.com"), Companion.access$getDomainName(companion, "https://open.spotify.com")});
+        TRUSTED_DOMAINS = n.listOfNotNull((Object[]) new String[]{Companion.access$getDomainName(companion, BuildConfig.HOST), Companion.access$getDomainName(companion, BuildConfig.HOST_ALTERNATE), Companion.access$getDomainName(companion, BuildConfig.HOST_CDN), Companion.access$getDomainName(companion, BuildConfig.HOST_GIFT), Companion.access$getDomainName(companion, BuildConfig.HOST_INVITE), Companion.access$getDomainName(companion, BuildConfig.HOST_GUILD_TEMPLATE), Companion.access$getDomainName(companion, HOST_SPOTIFY), Companion.access$getDomainName(companion, HOST_SPOTIFY_OPEN)});
     }
 
     public StoreMaskedLinks(Dispatcher dispatcher, StoreChannelsSelected storeChannelsSelected, StoreUserRelationships storeUserRelationships) {
@@ -109,7 +111,7 @@ public final class StoreMaskedLinks extends StoreV2 {
     public void init(Context context) {
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        Set<String> stringSet = getPrefs().getStringSet("USER_TRUSTED_DOMAINS_CACHE_KEY", n0.emptySet());
+        Set<String> stringSet = getPrefs().getStringSet(USER_TRUSTED_DOMAINS_CACHE_KEY, n0.emptySet());
         if (stringSet == null) {
             stringSet = new LinkedHashSet<>();
         }
@@ -143,7 +145,7 @@ public final class StoreMaskedLinks extends StoreV2 {
         this.userTrustedDomainsSnapshot = new HashSet(this.userTrustedDomains);
         SharedPreferences.Editor edit = getPrefs().edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putStringSet("USER_TRUSTED_DOMAINS_CACHE_KEY", this.userTrustedDomainsSnapshot);
+        edit.putStringSet(USER_TRUSTED_DOMAINS_CACHE_KEY, this.userTrustedDomainsSnapshot);
         edit.apply();
     }
 
diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java
index cb0073c003..4d03197e75 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import co.discord.media_engine.VideoInputDeviceDescription;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
 import d0.l;
 import d0.w.g.c;
 import d0.w.h.a.e;
@@ -12,7 +13,7 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.functions.Function2;
 import kotlinx.coroutines.CoroutineScope;
 /* compiled from: StoreMediaEngine.kt */
-@e(c = "com.discord.stores.StoreMediaEngine$selectDefaultVideoDevice$1", f = "StoreMediaEngine.kt", l = {175}, m = "invokeSuspend")
+@e(c = "com.discord.stores.StoreMediaEngine$selectDefaultVideoDevice$1", f = "StoreMediaEngine.kt", l = {HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION}, m = "invokeSuspend")
 public final class StoreMediaEngine$selectDefaultVideoDevice$1 extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
     public final /* synthetic */ Function1 $onSelected;
     public int label;
diff --git a/app/src/main/java/com/discord/stores/StoreMediaFavorites.java b/app/src/main/java/com/discord/stores/StoreMediaFavorites.java
index 33ca55354e..be82e43a80 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaFavorites.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaFavorites.java
@@ -222,7 +222,7 @@ public final class StoreMediaFavorites extends StoreV2 {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ StoreMediaFavorites(ObservationDeck observationDeck, Dispatcher dispatcher, Persister persister, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(observationDeck, dispatcher, (i & 4) != 0 ? new Persister("STORE_FAVORITES", n0.emptySet()) : persister);
+        this(observationDeck, dispatcher, (i & 4) != 0 ? new Persister(FAVORITES_CACHE_KEY, n0.emptySet()) : persister);
     }
 
     public static final /* synthetic */ Set access$getFavorites$p(StoreMediaFavorites storeMediaFavorites) {
diff --git a/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java b/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
index 1561f40fab..931cb57d11 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
@@ -2,6 +2,8 @@ package com.discord.stores;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.permissions.PermissionUtils;
 import d0.z.d.m;
 import j0.k.b;
@@ -23,7 +25,7 @@ public final class StoreMediaSettings$init$1<T, R> implements b<Long, Observable
             public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
 
             public final Boolean call(Long l) {
-                return Boolean.valueOf(PermissionUtils.can(33554432, l));
+                return Boolean.valueOf(PermissionUtils.can(Permission.USE_VAD, l));
             }
         }
 
@@ -38,7 +40,7 @@ public final class StoreMediaSettings$init$1<T, R> implements b<Long, Observable
             }
             StorePermissions access$getStorePermissions$p = StoreMediaSettings.access$getStorePermissions$p(this.this$0.this$0);
             Long l = this.$id;
-            m.checkNotNullExpressionValue(l, "id");
+            m.checkNotNullExpressionValue(l, ModelAuditLogEntry.CHANGE_KEY_ID);
             return access$getStorePermissions$p.observePermissionsForChannel(l.longValue()).F(AnonymousClass1.INSTANCE);
         }
     }
@@ -49,7 +51,7 @@ public final class StoreMediaSettings$init$1<T, R> implements b<Long, Observable
 
     public final Observable<? extends Boolean> call(Long l) {
         StoreChannels access$getStoreChannels$p = StoreMediaSettings.access$getStoreChannels$p(this.this$0);
-        m.checkNotNullExpressionValue(l, "id");
+        m.checkNotNullExpressionValue(l, ModelAuditLogEntry.CHANGE_KEY_ID);
         return access$getStoreChannels$p.observeChannel(l.longValue()).Y(new AnonymousClass1(this, l));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMentions.java b/app/src/main/java/com/discord/stores/StoreMentions.java
index e6a3985a6b..428069885f 100644
--- a/app/src/main/java/com/discord/stores/StoreMentions.java
+++ b/app/src/main/java/com/discord/stores/StoreMentions.java
@@ -5,6 +5,7 @@ import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.guildmember.GuildMember;
+import com.discord.api.permission.Permission;
 import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
@@ -213,7 +214,7 @@ public final class StoreMentions extends StoreV2 {
         if (j == this.selectedChannelId && !isLockedAck) {
             return false;
         }
-        return this.privateChannels.contains(Long.valueOf(j)) || PermissionUtils.can(1024, this.storePermissions.getPermissionsByChannel().get(Long.valueOf(j)));
+        return this.privateChannels.contains(Long.valueOf(j)) || PermissionUtils.can(Permission.VIEW_CHANNEL, this.storePermissions.getPermissionsByChannel().get(Long.valueOf(j)));
     }
 
     @StoreThread
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java
index cb48111b51..00b039e3b3 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import c.d.b.a.a;
 import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageAck;
+import com.discord.utilities.SnowflakeUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import j0.l.e.j;
@@ -79,7 +80,7 @@ public final class StoreMessageAck$markUnread$3 extends o implements Function1<P
                     R2.add(obj);
                 }
             }
-            StoreMessageAck.Ack ack = new StoreMessageAck.Ack(message2 != null ? message2.getId() : (((this.this$0.$messageId >>> 22) - 1) - 1420070400000L) << 22, false, true);
+            StoreMessageAck.Ack ack = new StoreMessageAck.Ack(message2 != null ? message2.getId() : (((this.this$0.$messageId >>> 22) - 1) - SnowflakeUtils.DISCORD_EPOCH) << 22, false, true);
             StoreMessageAck$markUnread$3 storeMessageAck$markUnread$3 = this.this$0;
             StoreMessageAck.access$updateAcks(storeMessageAck$markUnread$3.this$0, storeMessageAck$markUnread$3.$channelId, ack);
             int processMarkUnread$app_productionCanaryRelease = StoreStream.Companion.getMentions().processMarkUnread$app_productionCanaryRelease(this.this$0.$channelId, R2);
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java
index 850e79387f..630c899498 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck.java
@@ -14,6 +14,7 @@ import com.discord.models.domain.ModelPayload;
 import com.discord.models.domain.ModelReadState;
 import com.discord.stores.StoreThreadsActiveJoined;
 import com.discord.stores.updates.ObservationDeck;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.collections.CollectionExtensionsKt;
 import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.persister.Persister;
@@ -478,7 +479,7 @@ public final class StoreMessageAck extends StoreV2 {
         for (Number number2 : o0.minus((Set) set2, (Iterable) set)) {
             long longValue2 = number2.longValue();
             if (!this.acks.containsKey(Long.valueOf(longValue2)) && (activeJoinedThread = activeJoinedThreadsInternal$app_productionCanaryRelease.get(Long.valueOf(longValue2))) != null) {
-                this.acks.put(Long.valueOf(longValue2), new Ack((ThreadUtils.getThreadAckMessageTimestamp$default(ThreadUtils.INSTANCE, activeJoinedThread.getChannel(), guildsJoinedAtInternal$app_productionCanaryRelease.get(Long.valueOf(activeJoinedThread.getChannel().f())), Long.valueOf(activeJoinedThread.getJoinTimestamp().g()), null, 4, null) - 1420070400000L) << 22, false, false));
+                this.acks.put(Long.valueOf(longValue2), new Ack((ThreadUtils.getThreadAckMessageTimestamp$default(ThreadUtils.INSTANCE, activeJoinedThread.getChannel(), guildsJoinedAtInternal$app_productionCanaryRelease.get(Long.valueOf(activeJoinedThread.getChannel().f())), Long.valueOf(activeJoinedThread.getJoinTimestamp().g()), null, 4, null) - SnowflakeUtils.DISCORD_EPOCH) << 22, false, false));
                 markChanged();
             }
         }
@@ -577,7 +578,7 @@ public final class StoreMessageAck extends StoreV2 {
                         }
                         ArrayList<Channel> arrayList2 = new ArrayList();
                         for (Object obj3 : arrayList) {
-                            if ((((Channel) obj3).i() >>> 22) + 1420070400000L < j) {
+                            if ((((Channel) obj3).i() >>> 22) + SnowflakeUtils.DISCORD_EPOCH < j) {
                                 arrayList2.add(obj3);
                             }
                         }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageReactions.java b/app/src/main/java/com/discord/stores/StoreMessageReactions.java
index 75824f4296..0a9948de49 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageReactions.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageReactions.java
@@ -10,6 +10,7 @@ import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -322,7 +323,7 @@ public final class StoreMessageReactions extends StoreV2 {
 
     private final String getReactionEmojiRequestParam(MessageReactionEmoji messageReactionEmoji) {
         if (messageReactionEmoji.e()) {
-            return messageReactionEmoji.d() + ':' + messageReactionEmoji.b();
+            return messageReactionEmoji.d() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + messageReactionEmoji.b();
         }
         String d = messageReactionEmoji.d();
         return d != null ? d : "";
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.java
index 47081593dc..a3476fced3 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$2.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class StoreMessagesLoader$tryLoadMessages$2 extends o implements Fu
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         StoreMessagesLoader.access$setDelayLoadingMessagesSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.java
index 055fafc7e9..f3dbc97cd9 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import com.discord.app.AppActivity;
 import com.discord.stores.StoreNavigation;
 import com.discord.widgets.auth.WidgetAgeVerify;
@@ -23,7 +24,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$ageGateN
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         boolean h = appActivity.h(a0.getOrCreateKotlinClass(WidgetAgeVerify.class));
         boolean z2 = false;
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.java
index de02a6b3f2..9c7edd395e 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.content.Intent;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.e.l;
 import com.discord.app.AppActivity;
 import com.discord.stores.StoreNavigation;
@@ -49,7 +50,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavH
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         l lVar = l.g;
         boolean g = appActivity.g(l.a);
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.java
index 566e45336b..087cc4b3d3 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.e.l;
 import com.discord.app.AppActivity;
 import com.discord.stores.StoreNavigation;
@@ -26,7 +27,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$callNavH
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         if (appActivity.g(n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetVoiceCallIncoming.class), a0.getOrCreateKotlinClass(WidgetVoiceCallIncoming.SystemCallIncoming.class)})) || !modelGlobalNavigation.getIncomingCall()) {
             return modelGlobalNavigation.getIncomingCall();
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.java
index a86d59661a..50a4ab9ada 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOutdatedNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.e.l;
 import com.discord.app.AppActivity;
 import com.discord.stores.StoreNavigation;
@@ -24,7 +25,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$clientOu
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         boolean h = appActivity.h(a0.getOrCreateKotlinClass(WidgetClientOutdated.class));
         if (modelGlobalNavigation.getClientOutdated()) {
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.java
index 00e93c909d..306ba58c91 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import com.discord.app.AppActivity;
 import com.discord.stores.StoreNavigation;
 import com.discord.stores.StoreNux;
@@ -42,7 +43,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTem
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         String guildTemplateCode = modelGlobalNavigation.getGuildTemplateCode();
         if (guildTemplateCode == null || appActivity.h(a0.getOrCreateKotlinClass(WidgetGuildClone.class))) {
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.java
index 8d83348f8b..8d7ca12921 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCodeNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import com.discord.app.AppActivity;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.stores.StoreInviteSettings;
@@ -48,7 +49,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$inviteCo
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         StoreInviteSettings.InviteCode inviteCode = modelGlobalNavigation.getInviteCode();
         if (inviteCode == null) {
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.java
index 340a1e6303..4d46e89fd5 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHandler$1.java
@@ -1,5 +1,7 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import com.discord.app.AppActivity;
 import com.discord.app.AppComponent;
 import com.discord.app.AppLog;
@@ -31,7 +33,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHa
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         if (modelGlobalNavigation.getNotice() == null) {
             return false;
@@ -50,7 +52,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$noticeHa
         String name = modelGlobalNavigation.getNotice().getName();
         Objects.requireNonNull(appLog);
         m.checkNotNullParameter(name, "noticeName");
-        appLog.recordBreadcrumb("Notice [" + name + ']', "navigation");
+        appLog.recordBreadcrumb("Notice [" + name + ']', NotificationCompat.CATEGORY_NAVIGATION);
         if (modelGlobalNavigation.getNotice().getAutoMarkSeen()) {
             StoreNotices.markSeen$default(StoreStream.Companion.getNotices(), modelGlobalNavigation.getNotice().getName(), 0, 2, null);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.java
index b8716f023e..71402f3219 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxStateNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import com.discord.app.AppActivity;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.stores.StoreNavigation;
@@ -48,7 +49,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$nuxState
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         Experiment userExperiment = StoreNavigation.ActivityNavigationLifecycleCallbacks.access$getStream$p(this.this$0).getExperiments$app_productionCanaryRelease().getUserExperiment("2021-04_contact_sync_android_main", modelGlobalNavigation.getNuxState().getPostRegister());
         boolean z2 = userExperiment != null && userExperiment.getBucket() == 1;
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java
index f8ae7b21c6..02dc6b4e36 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.net.Uri;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.e.l;
 import com.discord.app.AppActivity;
 import com.discord.stores.StoreNavigation;
@@ -26,7 +27,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthSta
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         Uri oAuthUri = modelGlobalNavigation.getOAuthUri();
         if (!m.areEqual(oAuthUri, Uri.EMPTY)) {
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.java
index 43ae8d4c4d..d18142de28 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.e.l;
 import com.discord.app.AppActivity;
 import com.discord.models.requiredaction.RequiredAction;
@@ -25,7 +26,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHa
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         boolean h = appActivity.h(a0.getOrCreateKotlinClass(WidgetTosAccept.class));
         boolean z2 = modelGlobalNavigation.getUserRequiredAction() == RequiredAction.AGREEMENTS;
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.java
index da5f406f59..83bdf8114f 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$verificationNavHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.e.l;
 import com.discord.app.AppActivity;
 import com.discord.models.requiredaction.RequiredAction;
@@ -24,7 +25,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$verifica
     }
 
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
         l lVar = l.g;
         boolean g = appActivity.g(l.e);
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation.java b/app/src/main/java/com/discord/stores/StoreNavigation.java
index a372f8a7bd..453fcd90bf 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import c.d.b.a.a;
 import com.discord.app.AppActivity;
@@ -412,7 +413,7 @@ public final class StoreNavigation {
         @Override // com.discord.utilities.rx.ActivityLifecycleCallbacks
         public void onActivityCreatedOrResumed(AppActivity appActivity) {
             boolean z2;
-            m.checkNotNullParameter(appActivity, "activity");
+            m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             super.onActivityCreatedOrResumed(appActivity);
             if (!appActivity.isTaskRoot() && appActivity.getIntent().hasCategory("android.intent.category.LAUNCHER")) {
                 Intent intent = appActivity.getIntent();
diff --git a/app/src/main/java/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.java b/app/src/main/java/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.java
index c606041c56..7b1bd5a8bc 100644
--- a/app/src/main/java/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNotices$Dialog$Type$buildPassiveNotice$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import com.discord.stores.StoreNotices;
@@ -25,7 +26,7 @@ public final class StoreNotices$Dialog$Type$buildPassiveNotice$1 extends o imple
     }
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         StoreNotices.Dialog dialog = new StoreNotices.Dialog(this.this$0, null, 2, null);
         NoticeBuilders noticeBuilders = NoticeBuilders.INSTANCE;
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
diff --git a/app/src/main/java/com/discord/stores/StoreNotices.java b/app/src/main/java/com/discord/stores/StoreNotices.java
index 4d2be308af..3d5301fc97 100644
--- a/app/src/main/java/com/discord/stores/StoreNotices.java
+++ b/app/src/main/java/com/discord/stores/StoreNotices.java
@@ -2,9 +2,11 @@ package com.discord.stores;
 
 import android.content.Context;
 import androidx.annotation.MainThread;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import com.discord.app.AppComponent;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.persister.Persister;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -187,7 +189,7 @@ public final class StoreNotices extends Store {
         /* JADX DEBUG: Multi-variable search result rejected for r14v0, resolved type: kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentActivity, java.lang.Boolean> */
         /* JADX WARN: Multi-variable type inference failed */
         public Notice(String str, Clock clock, long j, int i, boolean z2, List<? extends c<? extends AppComponent>> list, long j2, boolean z3, long j3, Function1<? super FragmentActivity, Boolean> function1) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(clock, "clock");
             m.checkNotNullParameter(function1, "show");
             this.name = str;
@@ -260,11 +262,11 @@ public final class StoreNotices extends Store {
         }
 
         public final boolean isInAppNotification() {
-            return w.contains((CharSequence) this.name, (CharSequence) "InAppNotif", true);
+            return w.contains((CharSequence) this.name, (CharSequence) StoreNotices.IN_APP_NOTICE_TAG, true);
         }
 
         public final boolean isPopup() {
-            return w.contains((CharSequence) this.name, (CharSequence) "Popup", true);
+            return w.contains((CharSequence) this.name, (CharSequence) StoreNotices.NOTICE_POPUP_TAG, true);
         }
 
         public final void setHasShown(boolean z2) {
@@ -279,7 +281,7 @@ public final class StoreNotices extends Store {
 
         @MainThread
         public final boolean show(FragmentActivity fragmentActivity) {
-            m.checkNotNullParameter(fragmentActivity, "activity");
+            m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             if (this.hasShown || fragmentActivity.isFinishing()) {
                 return false;
             }
@@ -305,7 +307,7 @@ public final class StoreNotices extends Store {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PassiveNotice(String str, int i, boolean z2, long j, long j2, Function1<? super FragmentActivity, Boolean> function1) {
             super(str, null, 0, i, z2, null, j2, false, j, function1, 166, null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(function1, "show");
         }
 
@@ -447,7 +449,7 @@ public final class StoreNotices extends Store {
         PriorityQueue<Notice> priorityQueue = this.noticeQueue;
         ArrayList<Notice> arrayList = new ArrayList();
         for (Object obj : priorityQueue) {
-            if (w.contains$default((CharSequence) ((Notice) obj).getName(), (CharSequence) "InAppNotif", false, 2, (Object) null)) {
+            if (w.contains$default((CharSequence) ((Notice) obj).getName(), (CharSequence) IN_APP_NOTICE_TAG, false, 2, (Object) null)) {
                 arrayList.add(obj);
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreNotifications$configureContextSetter$1.java b/app/src/main/java/com/discord/stores/StoreNotifications$configureContextSetter$1.java
index bb09929c52..b2109d4d78 100644
--- a/app/src/main/java/com/discord/stores/StoreNotifications$configureContextSetter$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNotifications$configureContextSetter$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import com.discord.app.AppActivity;
 import com.discord.utilities.rx.ActivityLifecycleCallbacks;
 import d0.z.d.m;
@@ -13,14 +14,14 @@ public final class StoreNotifications$configureContextSetter$1 extends ActivityL
 
     @Override // com.discord.utilities.rx.ActivityLifecycleCallbacks
     public void onActivityCreatedOrResumed(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         super.onActivityCreatedOrResumed(appActivity);
         StoreNotifications.access$setContext$p(this.this$0, appActivity);
     }
 
     @Override // com.discord.utilities.rx.ActivityLifecycleCallbacks
     public void onActivityDestroyed(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         super.onActivityDestroyed(appActivity);
         StoreNotifications.access$setContext$p(this.this$0, null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.java b/app/src/main/java/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.java
index 16c90fb3cf..db6d5e48de 100644
--- a/app/src/main/java/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.api.permission.Permission;
 import com.discord.utilities.permissions.PermissionUtils;
 import d0.t.u;
 import d0.z.d.m;
@@ -22,7 +23,7 @@ public final class StoreNotifications$configureNotificationClient$completedSetti
         m.checkNotNullExpressionValue(map, "channelPermissions");
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Map.Entry<Long, Long> entry : map.entrySet()) {
-            if (!PermissionUtils.can(2048, Long.valueOf(entry.getValue().longValue()))) {
+            if (!PermissionUtils.can(Permission.SEND_MESSAGES, Long.valueOf(entry.getValue().longValue()))) {
                 linkedHashMap.put(entry.getKey(), entry.getValue());
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreNotifications.java b/app/src/main/java/com/discord/stores/StoreNotifications.java
index d187dd5f4d..a50cadfcbf 100644
--- a/app/src/main/java/com/discord/stores/StoreNotifications.java
+++ b/app/src/main/java/com/discord/stores/StoreNotifications.java
@@ -2,6 +2,7 @@ package com.discord.stores;
 
 import android.app.Application;
 import android.content.Context;
+import androidx.core.app.FrameMetricsAggregator;
 import c.a.e.q;
 import c.a.f.d;
 import c.d.b.a.a;
@@ -11,6 +12,7 @@ import com.discord.models.guild.Guild;
 import com.discord.models.message.Message;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.fcm.NotificationClient;
 import com.discord.utilities.persister.Persister;
@@ -34,7 +36,7 @@ public final class StoreNotifications extends Store {
     private String authToken;
     private final Clock clock;
     private Context context;
-    private final Persister<NotificationClient.SettingsV2> notificationSettings = new Persister<>("STORE_NOTIFICATIONS_SETTINGS_V2", new NotificationClient.SettingsV2(false, false, false, false, false, false, null, null, null, 511, null));
+    private final Persister<NotificationClient.SettingsV2> notificationSettings = new Persister<>("STORE_NOTIFICATIONS_SETTINGS_V2", new NotificationClient.SettingsV2(false, false, false, false, false, false, null, null, null, FrameMetricsAggregator.EVERY_DURATION, null));
     private String pushToken;
     private String pushTokenPersisted;
     private final StoreStream stream;
@@ -97,7 +99,7 @@ public final class StoreNotifications extends Store {
 
     private final void displayPopup(Message message, Channel channel) {
         Context context;
-        if ((message.getId() >>> 22) + 1420070400000L + 10000 > this.clock.currentTimeMillis() && (context = this.context) != null) {
+        if ((message.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH + 10000 > this.clock.currentTimeMillis() && (context = this.context) != null) {
             NoticePopupChannel noticePopupChannel = NoticePopupChannel.INSTANCE;
             StringBuilder K = a.K("{InAppNotif}#");
             K.append(message.getChannelId());
@@ -191,7 +193,7 @@ public final class StoreNotifications extends Store {
     }
 
     public final void handlePreLogout() {
-        Persister.set$default(this.notificationSettings, new NotificationClient.SettingsV2(false, false, false, false, false, false, null, null, null, 511, null), false, 2, null);
+        Persister.set$default(this.notificationSettings, new NotificationClient.SettingsV2(false, false, false, false, false, false, null, null, null, FrameMetricsAggregator.EVERY_DURATION, null), false, 2, null);
     }
 
     public final void init(Application application) {
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
index 7d50a2dfe6..5ee975da53 100644
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
+++ b/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
@@ -194,7 +194,7 @@ public final class StoreOutboundPromotions extends StoreV2 {
     }
 
     private final int getUnseenCount(List<OutboundPromotion> list) {
-        long j = getPrefs().getLong("LATEST_SEEN_PROMO_DATE", -1);
+        long j = getPrefs().getLong(LATEST_SEEN_PROMO_DATE, -1);
         if ((list instanceof Collection) && list.isEmpty()) {
             return 0;
         }
diff --git a/app/src/main/java/com/discord/stores/StorePaymentSources.java b/app/src/main/java/com/discord/stores/StorePaymentSources.java
index bbaebf150b..b08dfd9e69 100644
--- a/app/src/main/java/com/discord/stores/StorePaymentSources.java
+++ b/app/src/main/java/com/discord/stores/StorePaymentSources.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.core.view.PointerIconCompat;
 import c.d.b.a.a;
 import com.discord.models.domain.ModelPaymentSource;
 import com.discord.models.domain.PaymentSourceRaw;
@@ -171,7 +172,7 @@ public final class StorePaymentSources extends StoreV2 {
             return n.emptyList();
         }
         List<PaymentSourceRaw> mutableList = u.toMutableList((Collection) u.sortedWith(list, new StorePaymentSources$ensureDefaultPaymentSource$$inlined$sortedBy$1()));
-        mutableList.set(0, PaymentSourceRaw.copy$default((PaymentSourceRaw) u.first((List<? extends Object>) mutableList), 0, null, false, null, true, null, null, null, 0, 0, 1007, null));
+        mutableList.set(0, PaymentSourceRaw.copy$default((PaymentSourceRaw) u.first((List<? extends Object>) mutableList), 0, null, false, null, true, null, null, null, 0, 0, PointerIconCompat.TYPE_CROSSHAIR, null));
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(mutableList, 10));
         for (PaymentSourceRaw paymentSourceRaw : mutableList) {
             arrayList.add(ModelPaymentSource.Companion.wrap(paymentSourceRaw));
diff --git a/app/src/main/java/com/discord/stores/StorePermissions$observeChannelPermissionsForGuild$1.java b/app/src/main/java/com/discord/stores/StorePermissions$observeChannelPermissionsForGuild$1.java
index ab26bc422b..178116eaef 100644
--- a/app/src/main/java/com/discord/stores/StorePermissions$observeChannelPermissionsForGuild$1.java
+++ b/app/src/main/java/com/discord/stores/StorePermissions$observeChannelPermissionsForGuild$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.h0;
 import d0.z.d.m;
 import j0.k.b;
@@ -20,7 +21,7 @@ public final class StorePermissions$observeChannelPermissionsForGuild$1<T, R> im
     }
 
     public final Map<Long, Long> call(Map<Long, ? extends Map<Long, Long>> map) {
-        m.checkNotNullExpressionValue(map, "permissions");
+        m.checkNotNullExpressionValue(map, ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS);
         Object obj = map.get(Long.valueOf(this.$guildId));
         if (obj == null) {
             obj = h0.emptyMap();
diff --git a/app/src/main/java/com/discord/stores/StorePermissions.java b/app/src/main/java/com/discord/stores/StorePermissions.java
index 66c1f46fc1..b8a573f0f3 100644
--- a/app/src/main/java/com/discord/stores/StorePermissions.java
+++ b/app/src/main/java/com/discord/stores/StorePermissions.java
@@ -2,6 +2,7 @@ package com.discord.stores;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.thread.AugmentedThreadMember;
@@ -96,7 +97,7 @@ public final class StorePermissions extends StoreV2 {
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(iterable, 10)), 16));
         for (Channel channel : iterable) {
             boolean hasJoinedInternal = this.storeThreadsJoined.hasJoinedInternal(channel.h());
-            Pair pair = d0.o.to(Long.valueOf(channel.h()), Long.valueOf(AnimatableValueParser.t1(channel) ? 274877382399L : PermissionUtils.computePermissions(getMeId(), channel, this.storeChannels.getGuildChannelInternal$app_productionCanaryRelease(channel.f(), channel.r()), guild.getOwnerId(), map != null ? map.get(Long.valueOf(getMeId())) : null, map2, stageInstancesForGuildInternal, hasJoinedInternal)));
+            Pair pair = d0.o.to(Long.valueOf(channel.h()), Long.valueOf(AnimatableValueParser.t1(channel) ? Permission.ALL : PermissionUtils.computePermissions(getMeId(), channel, this.storeChannels.getGuildChannelInternal$app_productionCanaryRelease(channel.f(), channel.r()), guild.getOwnerId(), map != null ? map.get(Long.valueOf(getMeId())) : null, map2, stageInstancesForGuildInternal, hasJoinedInternal)));
             linkedHashMap.put(pair.getFirst(), pair.getSecond());
         }
         return linkedHashMap;
diff --git a/app/src/main/java/com/discord/stores/StorePhone.java b/app/src/main/java/com/discord/stores/StorePhone.java
index 06484d469c..ecc3c9d8c7 100644
--- a/app/src/main/java/com/discord/stores/StorePhone.java
+++ b/app/src/main/java/com/discord/stores/StorePhone.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.content.Context;
+import com.adjust.sdk.Constants;
 import com.discord.models.domain.ModelPayload;
 import com.discord.models.phone.PhoneCountryCode;
 import com.discord.utilities.persister.Persister;
@@ -64,7 +65,7 @@ public final class StorePhone extends StoreV2 {
         d0.y.b.closeFinally(r0, r3);
      */
     private final List<PhoneCountryCode> loadCountryCodesFromDisk(Context context) {
-        InputStreamReader inputStreamReader = new InputStreamReader(context.getAssets().open("data/country-codes.json"), "UTF-8");
+        InputStreamReader inputStreamReader = new InputStreamReader(context.getAssets().open("data/country-codes.json"), Constants.ENCODING);
         Object e = new Gson().e(inputStreamReader, PhoneCountryCode[].class);
         m.checkNotNullExpressionValue(e, "Gson().fromJson(it, Arra…CountryCode>::class.java)");
         List<PhoneCountryCode> list = k.toList((Object[]) e);
diff --git a/app/src/main/java/com/discord/stores/StoreReadStates.java b/app/src/main/java/com/discord/stores/StoreReadStates.java
index fa6b495597..2ebb2167c4 100644
--- a/app/src/main/java/com/discord/stores/StoreReadStates.java
+++ b/app/src/main/java/com/discord/stores/StoreReadStates.java
@@ -11,6 +11,7 @@ import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.stores.StoreMessageAck;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreThreadsActiveJoined;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.persister.Persister;
@@ -108,7 +109,7 @@ public final class StoreReadStates extends Store {
                             j = ack.getMessageId();
                         } else {
                             Long l = (Long) a.n0(channel, map3);
-                            j = ((l != null ? l.longValue() : this.clock.currentTimeMillis()) - 1420070400000L) << 22;
+                            j = ((l != null ? l.longValue() : this.clock.currentTimeMillis()) - SnowflakeUtils.DISCORD_EPOCH) << 22;
                         }
                         if (MessageUtils.isNewer(Long.valueOf(j), Long.valueOf(longValue2))) {
                             hashSet.add(Long.valueOf(longValue));
diff --git a/app/src/main/java/com/discord/stores/StoreReviewRequest.java b/app/src/main/java/com/discord/stores/StoreReviewRequest.java
index 9874b1e049..b2ba794882 100644
--- a/app/src/main/java/com/discord/stores/StoreReviewRequest.java
+++ b/app/src/main/java/com/discord/stores/StoreReviewRequest.java
@@ -77,8 +77,8 @@ public final class StoreReviewRequest extends Store {
         if (s2 != null) {
             z5 = s2.booleanValue();
         }
-        if (z4 && z5 && !this.hasUserAcceptedReviewRequest && this.requestedReviewRevision < 693) {
-            if (this.clock.currentTimeMillis() > this.stream.getNotices$app_productionCanaryRelease().getFirstUseTimestamp() + 864000000) {
+        if (z4 && z5 && !this.hasUserAcceptedReviewRequest && this.requestedReviewRevision < REVIEW_REQUEST_REVISION) {
+            if (this.clock.currentTimeMillis() > this.stream.getNotices$app_productionCanaryRelease().getFirstUseTimestamp() + MINIMUM_INSTALL_AGE) {
                 this.stream.getNotices$app_productionCanaryRelease().requestToShow(StoreNotices.Dialog.Type.buildPassiveNotice$default(StoreNotices.Dialog.Type.REQUEST_RATING_MODAL, 0, 31536000000L, 0, true, 5, null));
             }
         }
@@ -93,10 +93,10 @@ public final class StoreReviewRequest extends Store {
     }
 
     public final void onReviewRequestShown() {
-        this.requestedReviewRevision = 693;
+        this.requestedReviewRevision = REVIEW_REQUEST_REVISION;
         SharedPreferences.Editor edit = getPrefsSessionDurable().edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putInt("CACHE_KEY_VIEWED_REVIEW_REQUEST_REVISION", 693);
+        edit.putInt("CACHE_KEY_VIEWED_REVIEW_REQUEST_REVISION", REVIEW_REQUEST_REVISION);
         edit.apply();
         this.stream.getNotices$app_productionCanaryRelease().markSeen(StoreNotices.Dialog.Type.REQUEST_RATING_MODAL);
         AnalyticsTracker.INSTANCE.reviewRequestTriggered();
diff --git a/app/src/main/java/com/discord/stores/StoreRtcConnection.java b/app/src/main/java/com/discord/stores/StoreRtcConnection.java
index 1a7289b2df..5353665774 100644
--- a/app/src/main/java/com/discord/stores/StoreRtcConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreRtcConnection.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import a0.a.a.b;
 import android.content.Context;
 import android.util.Log;
+import androidx.core.app.NotificationCompat;
 import c.a.r.p0.e;
 import c.a.r.w;
 import c.d.b.a.a;
@@ -814,7 +815,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
 
     @Override // com.discord.rtcconnection.RtcConnection.b, com.discord.rtcconnection.RtcConnection.c
     public void onAnalyticsEvent(RtcConnection.AnalyticsEvent analyticsEvent, Map<String, Object> map) {
-        m.checkNotNullParameter(analyticsEvent, "event");
+        m.checkNotNullParameter(analyticsEvent, NotificationCompat.CATEGORY_EVENT);
         m.checkNotNullParameter(map, "properties");
         int ordinal = analyticsEvent.ordinal();
         if (ordinal == 0) {
diff --git a/app/src/main/java/com/discord/stores/StoreRtcRegion.java b/app/src/main/java/com/discord/stores/StoreRtcRegion.java
index c7961fc6bf..f6c7f11413 100644
--- a/app/src/main/java/com/discord/stores/StoreRtcRegion.java
+++ b/app/src/main/java/com/discord/stores/StoreRtcRegion.java
@@ -108,7 +108,7 @@ public final class StoreRtcRegion {
     }
 
     private final boolean shouldPerformLatencyTest(List<String> list, long j) {
-        return this.lastTestResult.getLatencyRankedRegions().isEmpty() || !areStringListsEqual(list, this.lastTestResult.getGeoRankedRegions()) || j - this.lastTestResult.getLastTestTimestampMs() >= ((long) 86400000);
+        return this.lastTestResult.getLatencyRankedRegions().isEmpty() || !areStringListsEqual(list, this.lastTestResult.getGeoRankedRegions()) || j - this.lastTestResult.getLastTestTimestampMs() >= ((long) LATENCY_TEST_CACHE_TTL_MS);
     }
 
     private final void updateLastTestResult(RtcLatencyTestResult rtcLatencyTestResult) {
diff --git a/app/src/main/java/com/discord/stores/StoreSearchQuery$makeQuery$2.java b/app/src/main/java/com/discord/stores/StoreSearchQuery$makeQuery$2.java
index 9f88c6ebbf..2bc2e2d16c 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchQuery$makeQuery$2.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchQuery$makeQuery$2.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class StoreSearchQuery$makeQuery$2 extends o implements Function1<S
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         StoreSearchQuery.access$setQuerySubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreSpotify.java b/app/src/main/java/com/discord/stores/StoreSpotify.java
index cadf854eb4..4365830ba3 100644
--- a/app/src/main/java/com/discord/stores/StoreSpotify.java
+++ b/app/src/main/java/com/discord/stores/StoreSpotify.java
@@ -15,6 +15,8 @@ import com.discord.utilities.presence.ActivityUtilsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.spotify.SpotifyApiClient;
 import com.discord.utilities.time.Clock;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.g0.t;
 import d0.g0.w;
 import d0.t.u;
@@ -246,9 +248,9 @@ public final class StoreSpotify {
                     return;
                 }
                 ModelSpotifyAlbum album = component1.getAlbum();
-                String str3 = (album == null || (images2 = album.getImages()) == null || (albumImage = (ModelSpotifyAlbum.AlbumImage) u.firstOrNull(images2)) == null || (url = albumImage.getUrl()) == null || (split$default = w.split$default(url, new String[]{"/"}, false, 0, 6, null)) == null) ? null : (String) u.last((List<? extends Object>) split$default);
+                String str3 = (album == null || (images2 = album.getImages()) == null || (albumImage = (ModelSpotifyAlbum.AlbumImage) u.firstOrNull(images2)) == null || (url = albumImage.getUrl()) == null || (split$default = w.split$default(url, new String[]{AutocompleteViewModel.COMMAND_DISCOVER_TOKEN}, false, 0, 6, null)) == null) ? null : (String) u.last((List<? extends Object>) split$default);
                 if (str3 != null) {
-                    str = Platform.SPOTIFY.getPlatformId() + ':' + str3;
+                    str = Platform.SPOTIFY.getPlatformId() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + str3;
                 } else {
                     str = null;
                 }
@@ -261,7 +263,7 @@ public final class StoreSpotify {
                 if (album2 != null) {
                     str2 = album2.getName();
                 }
-                this.stream.getPresences$app_productionCanaryRelease().updateActivity(ActivityType.LISTENING, ActivityUtilsKt.createSpotifyListeningActivity(currentTimeMillis, properName, name, id2, str2, str, u.joinToString$default(component1.getArtists(), null, null, null, 0, null, StoreSpotify$publishState$activity$1.INSTANCE, 31, null), component4, component1.getDurationMs() + component4, platform.getPlatformId() + ':' + this.stream.getUsers$app_productionCanaryRelease().getMeInternal$app_productionCanaryRelease().getId()), true);
+                this.stream.getPresences$app_productionCanaryRelease().updateActivity(ActivityType.LISTENING, ActivityUtilsKt.createSpotifyListeningActivity(currentTimeMillis, properName, name, id2, str2, str, u.joinToString$default(component1.getArtists(), null, null, null, 0, null, StoreSpotify$publishState$activity$1.INSTANCE, 31, null), component4, component1.getDurationMs() + component4, platform.getPlatformId() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + this.stream.getUsers$app_productionCanaryRelease().getMeInternal$app_productionCanaryRelease().getId()), true);
                 AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
                 String id3 = component1.getId();
                 ModelSpotifyAlbum album3 = component1.getAlbum();
diff --git a/app/src/main/java/com/discord/stores/StoreStageChannels.java b/app/src/main/java/com/discord/stores/StoreStageChannels.java
index c00791b94f..cb735328a0 100644
--- a/app/src/main/java/com/discord/stores/StoreStageChannels.java
+++ b/app/src/main/java/com/discord/stores/StoreStageChannels.java
@@ -3,6 +3,7 @@ package com.discord.stores;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.voice.state.StageRequestToSpeakState;
@@ -418,7 +419,7 @@ public final class StoreStageChannels extends StoreV2 {
                 Set set = u.toSet(arrayList5);
                 int size = arrayList3.size() - set.size();
                 Long l = (Long) a.o0(channel, storeStageChannels.permissionsStore.getPermissionsByChannel());
-                boolean z2 = PermissionUtils.can(1048576, l) && PermissionUtils.can(1024, l);
+                boolean z2 = PermissionUtils.can(Permission.CONNECT, l) && PermissionUtils.can(Permission.VIEW_CHANNEL, l);
                 Map<Long, GuildMember> map6 = storeStageChannels.guildsStore.getMembers().get(Long.valueOf(j));
                 ArrayList<User> arrayList6 = new ArrayList();
                 for (Object obj2 : arrayList3) {
diff --git a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
index ed812062f4..31fe960fda 100644
--- a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import androidx.core.app.NotificationCompat;
 import c.a.r.j;
 import c.a.r.p0.e;
 import c.a.r.w;
@@ -120,7 +121,7 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin
 
         @Override // com.discord.rtcconnection.RtcConnection.b, com.discord.rtcconnection.RtcConnection.c
         public void onAnalyticsEvent(RtcConnection.AnalyticsEvent analyticsEvent, Map<String, Object> map) {
-            m.checkNotNullParameter(analyticsEvent, "event");
+            m.checkNotNullParameter(analyticsEvent, NotificationCompat.CATEGORY_EVENT);
             m.checkNotNullParameter(map, "properties");
             int ordinal = analyticsEvent.ordinal();
             if (ordinal == 3) {
diff --git a/app/src/main/java/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.java b/app/src/main/java/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.java
index ee175f4ab6..9dad0d06ad 100644
--- a/app/src/main/java/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.java
+++ b/app/src/main/java/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class StoreUserGuildSettings$handleGuildSettings$1 extends o implem
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         Subscription access$getRecomputeSettingsSubscription$p = StoreUserGuildSettings.access$getRecomputeSettingsSubscription$p(this.this$0);
         if (access$getRecomputeSettingsSubscription$p != null) {
             access$getRecomputeSettingsSubscription$p.unsubscribe();
diff --git a/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java b/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
index ab26d7cf26..4e10906572 100644
--- a/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import android.content.Context;
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
 import com.discord.models.domain.ModelMuteConfig;
@@ -202,7 +203,7 @@ public final class StoreUserGuildSettings extends StoreV2 {
         for (ModelNotificationSettings modelNotificationSettings2 : this.guildSettings.values()) {
             j = Math.min(j, modelNotificationSettings2.getNextMuteEndTimeMs(this.clock));
         }
-        if (j < Long.MAX_VALUE) {
+        if (j < RecyclerView.FOREVER_NS) {
             Observable<Long> e02 = Observable.e0(j - this.clock.currentTimeMillis(), TimeUnit.MILLISECONDS, this.dispatcher.getScheduler());
             m.checkNotNullExpressionValue(e02, "Observable.timer(\n      …patcher.scheduler\n      )");
             ObservableExtensionsKt.appSubscribe$default(e02, StoreUserGuildSettings.class, (Context) null, new StoreUserGuildSettings$handleGuildSettings$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserGuildSettings$handleGuildSettings$2(this), 58, (Object) null);
diff --git a/app/src/main/java/com/discord/stores/StoreUserPresence.java b/app/src/main/java/com/discord/stores/StoreUserPresence.java
index 0f2d0d428c..25d09b0b41 100644
--- a/app/src/main/java/com/discord/stores/StoreUserPresence.java
+++ b/app/src/main/java/com/discord/stores/StoreUserPresence.java
@@ -1,6 +1,7 @@
 package com.discord.stores;
 
 import a0.a.a.b;
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityEmoji;
@@ -368,7 +369,7 @@ public final class StoreUserPresence extends StoreV2 {
                     this.localPresence = new Presence(clientStatus, null, list3);
                     markChanged(LocalPresenceUpdateSource);
                 }
-                handlePresenceUpdate(Long.MAX_VALUE, id2, clientStatus, null, list2);
+                handlePresenceUpdate(RecyclerView.FOREVER_NS, id2, clientStatus, null, list2);
                 if (!z2 && PresenceUtils.INSTANCE.getCustomStatusActivity(this.localPresence) == null) {
                     markUnchanged(LocalPresenceUpdateSource);
                     return;
@@ -381,7 +382,7 @@ public final class StoreUserPresence extends StoreV2 {
             }
             this.localPresence = new Presence(clientStatus, null, list3);
             markChanged(LocalPresenceUpdateSource);
-            handlePresenceUpdate(Long.MAX_VALUE, id2, clientStatus, null, list2);
+            handlePresenceUpdate(RecyclerView.FOREVER_NS, id2, clientStatus, null, list2);
             if (!z2) {
             }
         }
@@ -456,7 +457,7 @@ public final class StoreUserPresence extends StoreV2 {
         for (com.discord.api.presence.Presence presence : presences) {
             User f = presence.f();
             if (f != null) {
-                handlePresenceUpdate(Long.MAX_VALUE, f.i(), presence.e(), presence.c(), presence.b());
+                handlePresenceUpdate(RecyclerView.FOREVER_NS, f.i(), presence.e(), presence.c(), presence.b());
             }
         }
         updateSelfPresence(modelPayload.getUserSettings(), modelPayload.getSessions(), false);
@@ -494,7 +495,7 @@ public final class StoreUserPresence extends StoreV2 {
     @StoreThread
     public final void handlePresenceReplace(List<com.discord.api.presence.Presence> list) {
         m.checkNotNullParameter(list, "presencesList");
-        clearPresences(Long.MAX_VALUE);
+        clearPresences(RecyclerView.FOREVER_NS);
         for (com.discord.api.presence.Presence presence : list) {
             User f = presence.f();
             if (f != null) {
@@ -505,7 +506,7 @@ public final class StoreUserPresence extends StoreV2 {
                     ClientStatus clientStatus = ClientStatus.OFFLINE;
                     c2 = new ClientStatuses(clientStatus, clientStatus, clientStatus);
                 }
-                handlePresenceUpdate(Long.MAX_VALUE, i, e, c2, presence.b());
+                handlePresenceUpdate(RecyclerView.FOREVER_NS, i, e, c2, presence.b());
             }
         }
     }
@@ -517,7 +518,7 @@ public final class StoreUserPresence extends StoreV2 {
             j = Long.MAX_VALUE;
         }
         MeUser meUser = this.meUser;
-        if (meUser == null || meUser.getId() != j2 || j == Long.MAX_VALUE) {
+        if (meUser == null || meUser.getId() != j2 || j == RecyclerView.FOREVER_NS) {
             HashMap<Long, Map<Long, TimestampedPresence>> hashMap = this.userGuildPresences;
             Long valueOf = Long.valueOf(j2);
             Map<Long, TimestampedPresence> map = hashMap.get(valueOf);
diff --git a/app/src/main/java/com/discord/stores/StoreUserSettings$updateLocalCustomStatus$1.java b/app/src/main/java/com/discord/stores/StoreUserSettings$updateLocalCustomStatus$1.java
index 4a4f61cb5a..a82afe981d 100644
--- a/app/src/main/java/com/discord/stores/StoreUserSettings$updateLocalCustomStatus$1.java
+++ b/app/src/main/java/com/discord/stores/StoreUserSettings$updateLocalCustomStatus$1.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class StoreUserSettings$updateLocalCustomStatus$1 extends o impleme
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         StoreUserSettings.access$setExpireCustomStatusSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreUserSettings.java b/app/src/main/java/com/discord/stores/StoreUserSettings.java
index 9b49afa3b7..5c3355cd37 100644
--- a/app/src/main/java/com/discord/stores/StoreUserSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreUserSettings.java
@@ -2,6 +2,7 @@ package com.discord.stores;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.models.domain.Consents;
 import com.discord.models.domain.ModelCustomStatusSetting;
@@ -470,7 +471,7 @@ public final class StoreUserSettings extends Store {
     public final void setIsDeveloperMode(AppActivity appActivity, boolean z2) {
         if (getIsDeveloperMode() != z2) {
             if (appActivity != null) {
-                Companion.access$updateUserSettings(Companion, appActivity, RestAPIParams.UserSettings.Companion.createWithDeveloperMode(z2), 2131894270);
+                Companion.access$updateUserSettings(Companion, appActivity, RestAPIParams.UserSettings.Companion.createWithDeveloperMode(z2), Integer.valueOf((int) R.string.theme_updated));
             }
             setDeveloperModeInternal(z2);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
index fb46a9edde..d413f675d3 100644
--- a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
+++ b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
@@ -262,7 +262,7 @@ public final class StoreUserSettingsSystem extends StoreV2 {
         super.init(context);
         Resources resources = context.getResources();
         m.checkNotNullExpressionValue(resources, "context.resources");
-        this.settings = new Settings(SharedPreferenceExtensionsKt.getStringNonNull(getPrefsSessionDurable(), "CACHE_KEY_THEME", (resources.getConfiguration().uiMode & 48) != 32 ? "light" : "dark"), getPrefs().getString("CACHE_KEY_LOCALE", null), getPrefs().getInt("CACHE_KEY_FONT_SCALE", -1));
+        this.settings = new Settings(SharedPreferenceExtensionsKt.getStringNonNull(getPrefsSessionDurable(), "CACHE_KEY_THEME", (resources.getConfiguration().uiMode & 48) != 32 ? ModelUserSettings.THEME_LIGHT : ModelUserSettings.THEME_DARK), getPrefs().getString("CACHE_KEY_LOCALE", null), getPrefs().getInt("CACHE_KEY_FONT_SCALE", -1));
     }
 
     public final Observable<Settings> observeSettings(boolean z2) {
@@ -323,8 +323,8 @@ public final class StoreUserSettingsSystem extends StoreV2 {
     public final void setTheme(String str, boolean z2, Function0<Unit> function0) {
         m.checkNotNullParameter(str, "theme");
         if (!getIsThemeSyncEnabled() || !z2 || !(function0 == null || function0.mo1invoke() == null)) {
-            if (m.areEqual(getTheme(), "pureEvil") && m.areEqual(str, "dark")) {
-                str = "pureEvil";
+            if (m.areEqual(getTheme(), ModelUserSettings.THEME_PURE_EVIL) && m.areEqual(str, ModelUserSettings.THEME_DARK)) {
+                str = ModelUserSettings.THEME_PURE_EVIL;
             }
             Settings settings = this.settings;
             if (settings == null) {
diff --git a/app/src/main/java/com/discord/stores/StoreUserTyping$handleTypingStart$2.java b/app/src/main/java/com/discord/stores/StoreUserTyping$handleTypingStart$2.java
index 4965e7cec9..fa2363841a 100644
--- a/app/src/main/java/com/discord/stores/StoreUserTyping$handleTypingStart$2.java
+++ b/app/src/main/java/com/discord/stores/StoreUserTyping$handleTypingStart$2.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Map;
@@ -53,7 +54,7 @@ public final class StoreUserTyping$handleTypingStart$2 extends o implements Func
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         StoreUserTyping.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, subscription));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/updates/ObservationDeck.java b/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
index 99f3c8067a..3f5b1c20cc 100644
--- a/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
+++ b/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
@@ -152,7 +152,7 @@ public final class ObservationDeck {
 
     private final void logBreadcrumb(String str) {
         if (this.logLevel == LogLevel.VERBOSE) {
-            this.logger.recordBreadcrumb(str, "ObservationDeck");
+            this.logger.recordBreadcrumb(str, LOG_CATEGORY);
         }
     }
 
@@ -164,7 +164,7 @@ public final class ObservationDeck {
       (wrap: java.lang.String : 0x0071: INVOKE  (r3v5 java.lang.String) = 
       (r5v1 java.util.ArrayList)
       ("
-    ")
+")
       (null java.lang.CharSequence)
       (null java.lang.CharSequence)
       (0 int)
diff --git a/app/src/main/java/com/discord/tooltips/SparkleView.java b/app/src/main/java/com/discord/tooltips/SparkleView.java
index 8372dff4b5..11634bf816 100644
--- a/app/src/main/java/com/discord/tooltips/SparkleView.java
+++ b/app/src/main/java/com/discord/tooltips/SparkleView.java
@@ -9,6 +9,7 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 import c.a.j.k1;
 import c.a.w.c;
 import c.a.w.d;
+import com.discord.R;
 import d0.g;
 import d0.z.d.m;
 import kotlin.Lazy;
@@ -22,13 +23,13 @@ public final class SparkleView extends FrameLayout {
     public SparkleView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558676, this);
-        ImageView imageView = (ImageView) findViewById(2131365201);
+        LayoutInflater.from(getContext()).inflate(R.layout.sparkle_view, this);
+        ImageView imageView = (ImageView) findViewById(R.id.sparkle_view_image);
         if (imageView != null) {
             k1 k1Var = new k1(this, imageView);
             m.checkNotNullExpressionValue(k1Var, "SparkleViewBinding.infla…ater.from(context), this)");
             this.i = k1Var;
-            this.j = 2131232370;
+            this.j = R.drawable.sparkle_animated_vector;
             this.k = g.lazy(new c(this));
             setLayoutParams(new FrameLayout.LayoutParams(-2, -2));
             imageView.setImageDrawable(getSparkleDrawable());
@@ -43,7 +44,7 @@ public final class SparkleView extends FrameLayout {
             }
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131365201)));
+        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(R.id.sparkle_view_image)));
     }
 
     public static final /* synthetic */ AnimatedVectorDrawableCompat a(SparkleView sparkleView) {
diff --git a/app/src/main/java/com/discord/utilities/SnowflakeUtils.java b/app/src/main/java/com/discord/utilities/SnowflakeUtils.java
index 265d288255..7c4504a2d9 100644
--- a/app/src/main/java/com/discord/utilities/SnowflakeUtils.java
+++ b/app/src/main/java/com/discord/utilities/SnowflakeUtils.java
@@ -9,11 +9,11 @@ public final class SnowflakeUtils {
     }
 
     public static final long atPreviousMillisecond(long j) {
-        return (((j >>> 22) - 1) - 1420070400000L) << 22;
+        return (((j >>> 22) - 1) - DISCORD_EPOCH) << 22;
     }
 
     public static final long fromTimestamp(long j) {
-        return (j - 1420070400000L) << 22;
+        return (j - DISCORD_EPOCH) << 22;
     }
 
     public static final long getTimestampPart(long j) {
@@ -24,6 +24,6 @@ public final class SnowflakeUtils {
     }
 
     public static final long toTimestamp(long j) {
-        return (j >>> 22) + 1420070400000L;
+        return (j >>> 22) + DISCORD_EPOCH;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/StoreUIEventHandler$subscribeToStoreEvents$2.java b/app/src/main/java/com/discord/utilities/StoreUIEventHandler$subscribeToStoreEvents$2.java
index a7bf07ff42..0dc93c1c40 100644
--- a/app/src/main/java/com/discord/utilities/StoreUIEventHandler$subscribeToStoreEvents$2.java
+++ b/app/src/main/java/com/discord/utilities/StoreUIEventHandler$subscribeToStoreEvents$2.java
@@ -1,5 +1,6 @@
 package com.discord.utilities;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.stores.StoreUserGuildSettings;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class StoreUIEventHandler$subscribeToStoreEvents$2 extends o implem
     }
 
     public final void invoke(StoreUserGuildSettings.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         StoreUIEventHandler.access$handleUserGuildSettingsEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java b/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java
index 6ddc0e1cbd..86047a7b1a 100644
--- a/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java
+++ b/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import androidx.annotation.MainThread;
 import c.a.e.o;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.rtcconnection.KrispOveruseDetector;
 import com.discord.stores.StoreChannels;
@@ -79,11 +80,11 @@ public final class StoreUIEventHandler {
         if (status != KrispOveruseDetector.Status.FAILED || (channel = this.channelsStore.getChannel(this.voiceChannelSelectedStore.getSelectedVoiceChannelId())) == null || !AnimatableValueParser.w1(channel) || (r0 = this.stageChannelsStore.m10getMyRolesvisDeB4(channel.h())) == null || !StageRoles.m23isAudienceimpl(r0.m28unboximpl())) {
             int ordinal = status.ordinal();
             if (ordinal == 0) {
-                i = 2131891540;
+                i = R.string.mobile_noise_cancellation_cpu_overuse;
             } else if (ordinal == 1) {
-                i = 2131891541;
+                i = R.string.mobile_noise_cancellation_failed;
             } else if (ordinal == 2) {
-                i = 2131891530;
+                i = R.string.mobile_advanced_voice_activity_cpu_overuse;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -97,11 +98,11 @@ public final class StoreUIEventHandler {
         if (event instanceof StoreUserGuildSettings.Event.SettingsUpdated) {
             int ordinal = ((StoreUserGuildSettings.Event.SettingsUpdated) event).getType().ordinal();
             if (ordinal == 0) {
-                i = 2131893576;
+                i = R.string.server_settings_updated;
             } else if (ordinal == 1) {
-                i = 2131887343;
+                i = R.string.channel_settings_have_been_updated;
             } else if (ordinal == 2) {
-                i = 2131887224;
+                i = R.string.category_settings_have_been_updated;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
diff --git a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityFeatureFlags.java b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityFeatureFlags.java
index 8e12c01950..a716825118 100644
--- a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityFeatureFlags.java
+++ b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityFeatureFlags.java
@@ -1,4 +1,6 @@
 package com.discord.utilities.accessibility;
+
+import com.discord.api.permission.Permission;
 /* compiled from: AccessibilityFeatureFlags.kt */
 public enum AccessibilityFeatureFlags {
     NONE(0),
@@ -12,14 +14,14 @@ public enum AccessibilityFeatureFlags {
     PREFERS_COLOR_SCHEME_LIGHT(128),
     PREFERS_COLOR_SCHEME_DARK(256),
     CHAT_FONT_SCALE_INCREASED(512),
-    CHAT_FONT_SCALE_DECREASED(1024),
-    ZOOM_LEVEL_INCREASED(2048),
-    ZOOM_LEVEL_DECREASED(4096),
-    MESSAGE_GROUP_SPACING_INCREASED(8192),
-    MESSAGE_GROUP_SPACING_DECREASED(16384),
-    DARK_SIDEBAR(32768),
-    REDUCED_MOTION_FROM_USER_SETTINGS(65536),
-    SATURATION_LEVEL_DECREASED(131072);
+    CHAT_FONT_SCALE_DECREASED(Permission.VIEW_CHANNEL),
+    ZOOM_LEVEL_INCREASED(Permission.SEND_MESSAGES),
+    ZOOM_LEVEL_DECREASED(Permission.SEND_TTS_MESSAGES),
+    MESSAGE_GROUP_SPACING_INCREASED(Permission.MANAGE_MESSAGES),
+    MESSAGE_GROUP_SPACING_DECREASED(Permission.EMBED_LINKS),
+    DARK_SIDEBAR(Permission.ATTACH_FILES),
+    REDUCED_MOTION_FROM_USER_SETTINGS(Permission.READ_MESSAGE_HISTORY),
+    SATURATION_LEVEL_DECREASED(Permission.MENTION_EVERYONE);
     
     private final long value;
 
diff --git a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityUtils.java b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityUtils.java
index 5c8acd0626..69afcc5876 100644
--- a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityUtils.java
+++ b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityUtils.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 import androidx.core.view.ViewCompat;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
@@ -36,7 +37,7 @@ public final class AccessibilityUtils {
         AccessibilityManager accessibilityManager = (AccessibilityManager) systemService;
         if (accessibilityManager != null) {
             AccessibilityEvent obtain = AccessibilityEvent.obtain();
-            m.checkNotNullExpressionValue(obtain, "event");
+            m.checkNotNullExpressionValue(obtain, NotificationCompat.CATEGORY_EVENT);
             obtain.setEventType(16384);
             obtain.getText().add(str);
             try {
diff --git a/app/src/main/java/com/discord/utilities/analytics/AdjustConfig.java b/app/src/main/java/com/discord/utilities/analytics/AdjustConfig.java
index 6075ac6b0d..b8affd71d1 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AdjustConfig.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AdjustConfig.java
@@ -3,6 +3,7 @@ package com.discord.utilities.analytics;
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
+import androidx.appcompat.widget.ActivityChooserModel;
 import com.adjust.sdk.Adjust;
 import d0.z.d.m;
 /* compiled from: AdjustConfig.kt */
@@ -15,40 +16,40 @@ public final class AdjustConfig {
     public static final class AdjustLifecycleListener implements Application.ActivityLifecycleCallbacks {
         @Override // android.app.Application.ActivityLifecycleCallbacks
         public void onActivityCreated(Activity activity, Bundle bundle) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         }
 
         @Override // android.app.Application.ActivityLifecycleCallbacks
         public void onActivityDestroyed(Activity activity) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         }
 
         @Override // android.app.Application.ActivityLifecycleCallbacks
         public void onActivityPaused(Activity activity) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             Adjust.onPause();
         }
 
         @Override // android.app.Application.ActivityLifecycleCallbacks
         public void onActivityResumed(Activity activity) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             Adjust.onResume();
         }
 
         @Override // android.app.Application.ActivityLifecycleCallbacks
         public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(bundle, "bundle");
         }
 
         @Override // android.app.Application.ActivityLifecycleCallbacks
         public void onActivityStarted(Activity activity) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         }
 
         @Override // android.app.Application.ActivityLifecycleCallbacks
         public void onActivityStopped(Activity activity) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         }
     }
 
@@ -58,7 +59,7 @@ public final class AdjustConfig {
     public final void init(Application application, boolean z2) {
         m.checkNotNullParameter(application, "application");
         if (!z2) {
-            com.adjust.sdk.AdjustConfig adjustConfig = new com.adjust.sdk.AdjustConfig(application, "d8fcx8xdmrr4", ADJUST_ENVIRONMENT);
+            com.adjust.sdk.AdjustConfig adjustConfig = new com.adjust.sdk.AdjustConfig(application, ADJUST_APP_TOKEN, ADJUST_ENVIRONMENT);
             adjustConfig.setOnAttributionChangedListener(AdjustConfig$init$1$1.INSTANCE);
             Adjust.onCreate(adjustConfig);
             Adjust.getGoogleAdId(application, AdjustConfig$init$2.INSTANCE);
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java
index fe622e7be4..ba12ac3f02 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.analytics;
 
 import android.os.Build;
+import com.discord.BuildConfig;
 import com.discord.utilities.accessibility.AccessibilityFeatureFlags;
 import d0.g0.t;
 import d0.g0.w;
@@ -79,7 +80,7 @@ public final class AnalyticSuperProperties {
     private final void setBaselineProperties() {
         String locale = Locale.getDefault().toString();
         m.checkNotNullExpressionValue(locale, "Locale.getDefault().toString()");
-        updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/87203"), o.to("client_build_number", 87203), o.to("client_version", "87.3 - Alpha"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
+        updateSuperProperties(h0.mapOf(o.to(PROPERTY_BROWSER, "Discord Android"), o.to(PROPERTY_BROWSER_USER_AGENT, BuildConfig.USER_AGENT), o.to(PROPERTY_CLIENT_BUILD_NUMBER, Integer.valueOf((int) BuildConfig.VERSION_CODE)), o.to(PROPERTY_CLIENT_VERSION, BuildConfig.VERSION_NAME), o.to(PROPERTY_DEVICE, Build.MODEL + ", " + Build.PRODUCT), o.to(PROPERTY_OS, "Android"), o.to(PROPERTY_OS_SDK_VERSION, String.valueOf(Build.VERSION.SDK_INT)), o.to(PROPERTY_OS_VERSION, Build.VERSION.RELEASE), o.to(PROPERTY_SYSTEM_LOCALE, t.replace$default(locale, "_", "-", false, 4, (Object) null))));
     }
 
     private final void setSuperProperties(Map<String, ? extends Object> map) {
@@ -108,41 +109,41 @@ public final class AnalyticSuperProperties {
         for (AccessibilityFeatureFlags accessibilityFeatureFlags : enumSet) {
             j |= accessibilityFeatureFlags.getValue();
         }
-        updateSuperProperties(h0.mapOf(o.to("accessibility_support_enabled", Boolean.valueOf(z2)), o.to("accessibility_features", Long.valueOf(j))));
+        updateSuperProperties(h0.mapOf(o.to(PROPERTY_ACCESSIBILITY_SUPPORT_ENABLED, Boolean.valueOf(z2)), o.to(PROPERTY_ACCESSIBILITY_FEATURES, Long.valueOf(j))));
     }
 
     public final void setAdvertiserId(String str) {
         m.checkNotNullParameter(str, "advertiserId");
-        updateSuperProperties(g0.mapOf(o.to("device_advertiser_id", str)));
+        updateSuperProperties(g0.mapOf(o.to(PROPERTY_DEVICE_ADVERTISER_ID, str)));
     }
 
     /* JADX INFO: Can't fix incorrect switch cases order, some code will duplicate */
     /* JADX WARNING: Code restructure failed: missing block: B:19:0x00a5, code lost:
-        if (r5.equals("utm_source") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_UTM_SOURCE) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:21:0x00ae, code lost:
-        if (r5.equals("location") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_LOCATION) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:23:0x00b8, code lost:
-        if (r5.equals("utm_medium") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_UTM_MEDIUM) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:25:0x00c2, code lost:
-        if (r5.equals("search_engine") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_SEARCH_ENGINE) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:27:0x00cc, code lost:
-        if (r5.equals("mp_keyword") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_MP_KEYWORD) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:29:0x00d6, code lost:
-        if (r5.equals("utm_term") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_UTM_TERM) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:31:0x00e0, code lost:
-        if (r5.equals("utm_campaign") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_UTM_CAMPAIGN) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:33:0x00ea, code lost:
-        if (r5.equals("referring_domain") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_REFERRING_DOMAIN) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:35:0x00f4, code lost:
-        if (r5.equals("utm_content") != false) goto L_0x00f6;
+        if (r5.equals(com.discord.utilities.analytics.AnalyticSuperProperties.PROPERTY_UTM_CONTENT) != false) goto L_0x00f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:36:0x00f6, code lost:
         r5 = true;
@@ -199,6 +200,6 @@ public final class AnalyticSuperProperties {
     }
 
     public final void setClientPerformanceProperties(int i, long j) {
-        updateSuperProperties(h0.mapOf(o.to("client_performance_cpu", String.valueOf(i)), o.to("client_performance_memory", String.valueOf(j))));
+        updateSuperProperties(h0.mapOf(o.to(PROPERTY_CLIENT_PERFORMANCE_CPU, String.valueOf(i)), o.to(PROPERTY_CLIENT_PERFORMANCE_MEMORY, String.valueOf(j))));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java
index da231931a4..d76499cec3 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.analytics;
 
 import com.discord.api.channel.Channel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.o;
 import d0.t.h0;
 import d0.z.d.m;
@@ -19,7 +20,7 @@ public final class AnalyticsTracker$addAttachment$1<T, R> implements b<Channel,
     }
 
     public final Map<String, Object> call(Channel channel) {
-        Map mapOf = h0.mapOf(o.to("source", this.$source), o.to("action_type", 0), o.to("mime_type", this.$mimeType), o.to("total_attachments", Integer.valueOf(this.$totalAttachments)), o.to("guild_id", Long.valueOf(channel.f())));
+        Map mapOf = h0.mapOf(o.to("source", this.$source), o.to("action_type", 0), o.to("mime_type", this.$mimeType), o.to("total_attachments", Integer.valueOf(this.$totalAttachments)), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(channel.f())));
         AnalyticsUtils analyticsUtils = AnalyticsUtils.INSTANCE;
         m.checkNotNullExpressionValue(channel, "it");
         return h0.plus(mapOf, analyticsUtils.getProperties$app_productionCanaryRelease(channel));
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java
index dd027c1822..3812d4a295 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.analytics;
 
 import com.discord.api.channel.Channel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.h0;
 import d0.z.d.o;
 import java.util.ArrayList;
@@ -46,6 +47,6 @@ public final class AnalyticsTracker$inviteSuggestionOpened$2 extends o implement
         List list2 = (List) linkedHashMap.get(1);
         int size = list2 != null ? list2.size() : 0;
         List list3 = (List) linkedHashMap.get(3);
-        AnalyticsTracker.INSTANCE.getTracker().track("invite_suggestion_opened", h0.mapOf(d0.o.to("num_suggestions", Integer.valueOf(this.$userSuggestions.size() + this.$channelSuggestions.size())), d0.o.to("num_friends", Integer.valueOf(set.size())), d0.o.to("num_dms", Integer.valueOf(this.$userSuggestions.size() + size)), d0.o.to("num_group_dms", Integer.valueOf(list3 != null ? list3.size() : 0)), d0.o.to("guild_id", Long.valueOf(this.$guildId))));
+        AnalyticsTracker.INSTANCE.getTracker().track("invite_suggestion_opened", h0.mapOf(d0.o.to("num_suggestions", Integer.valueOf(this.$userSuggestions.size() + this.$channelSuggestions.size())), d0.o.to("num_friends", Integer.valueOf(set.size())), d0.o.to("num_dms", Integer.valueOf(this.$userSuggestions.size() + size)), d0.o.to("num_group_dms", Integer.valueOf(list3 != null ? list3.size() : 0)), d0.o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(this.$guildId))));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
index ef379cbeb3..458c02355f 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import c.a.d.a.a.b.b;
 import c.d.b.a.a;
@@ -16,6 +17,7 @@ import com.discord.api.activity.ActivityPlatform;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.sticker.Sticker;
@@ -24,6 +26,7 @@ import com.discord.api.user.User;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.app.AppLog;
 import com.discord.models.domain.ModelApplicationStream;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelGift;
 import com.discord.models.domain.ModelGuildTemplate;
 import com.discord.models.domain.ModelInvite;
@@ -58,6 +61,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
 import com.discord.utilities.time.ClockFactory;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.guilds.create.StockGuildTemplate;
 import com.discord.widgets.guilds.invite.GuildInvite;
 import com.discord.widgets.stage.model.StageAnalyticsRequestToSpeakState;
@@ -117,11 +121,11 @@ public final class AnalyticsTracker {
         }
 
         public final void trackLogin() {
-            Adjust.trackEvent(new AdjustEvent("ctt5aq"));
+            Adjust.trackEvent(new AdjustEvent(EVENT_TOKEN_LOGIN));
         }
 
         public final void trackRegister() {
-            Adjust.trackEvent(new AdjustEvent("ebn8ke"));
+            Adjust.trackEvent(new AdjustEvent(EVENT_TOKEN_REGISTER));
         }
     }
 
@@ -269,11 +273,11 @@ public final class AnalyticsTracker {
 
     private final void addVoiceConnectionProperties(Map<String, Object> map, Channel channel, String str) {
         if (channel != null) {
-            map.put("channel_id", Long.valueOf(Long.valueOf(channel.h()).longValue()));
+            map.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(Long.valueOf(channel.h()).longValue()));
         }
         Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
         if (valueOf != null && valueOf.longValue() > 0) {
-            map.put("guild_id", valueOf);
+            map.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, valueOf);
         }
         if (str != null) {
             map.put("cloudflare_best_region", str);
@@ -343,7 +347,7 @@ public final class AnalyticsTracker {
         linkedHashMap.put("tab", str);
         if (l2 != null) {
             l2.longValue();
-            linkedHashMap.put("guild_id", l2);
+            linkedHashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, l2);
         }
         if (l != null) {
             l.longValue();
@@ -435,7 +439,10 @@ public final class AnalyticsTracker {
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0069: APUT  
       (r5v1 kotlin.Pair[])
       (2 ??[int, float, short, byte, char])
-      (wrap: kotlin.Pair : 0x0065: INVOKE  (r10v4 kotlin.Pair) = ("topic"), (r10v3 java.lang.String) type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair)
+      (wrap: kotlin.Pair : 0x0065: INVOKE  (r10v4 kotlin.Pair) = 
+      (wrap: java.lang.String : ?: SGET   com.discord.models.domain.ModelAuditLogEntry.CHANGE_KEY_TOPIC java.lang.String)
+      (r10v3 java.lang.String)
+     type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair)
      */
     private final Map<String, Object> getStageChannelMetadata(long j) {
         String str;
@@ -451,15 +458,15 @@ public final class AnalyticsTracker {
         if (map == null) {
             map = h0.emptyMap();
         }
-        boolean canEveryoneRole = permissionUtils.canEveryoneRole(4294967296L, channel, map);
+        boolean canEveryoneRole = permissionUtils.canEveryoneRole(Permission.REQUEST_TO_SPEAK, channel, map);
         StageInstance stageInstanceForChannel = companion.getStageInstances().getStageInstanceForChannel(j);
         Pair[] pairArr = new Pair[5];
-        pairArr[0] = o.to("channel_id", Long.valueOf(j));
-        pairArr[1] = o.to("guild_id", Long.valueOf(channel.f()));
+        pairArr[0] = o.to(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(j));
+        pairArr[1] = o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(channel.f()));
         if (stageInstanceForChannel == null || (str = stageInstanceForChannel.f()) == null) {
             str = "";
         }
-        pairArr[2] = o.to("topic", str);
+        pairArr[2] = o.to(ModelAuditLogEntry.CHANGE_KEY_TOPIC, str);
         if (stageInstanceForChannel != null) {
             l = Long.valueOf(stageInstanceForChannel.c());
         }
@@ -498,10 +505,10 @@ public final class AnalyticsTracker {
                 }
             }
         }
-        Map<String, Object> mutableMapOf = h0.mutableMapOf(o.to("channel_id", Long.valueOf(channel.h())), o.to("channel_type", Integer.valueOf(channel.A())), o.to("voice_state_count", Integer.valueOf(i2)), o.to("video_stream_count", Integer.valueOf(i)));
+        Map<String, Object> mutableMapOf = h0.mutableMapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(channel.h())), o.to("channel_type", Integer.valueOf(channel.A())), o.to("voice_state_count", Integer.valueOf(i2)), o.to("video_stream_count", Integer.valueOf(i)));
         long f = channel.f();
         if (f > 0) {
-            mutableMapOf.put("guild_id", Long.valueOf(f));
+            mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(f));
         }
         if (videoInputDeviceDescription != null) {
             z2 = true;
@@ -521,8 +528,8 @@ public final class AnalyticsTracker {
     }
 
     public static final void guildExperimentTriggered(String str, int i, int i2, long j) {
-        m.checkNotNullParameter(str, "name");
-        tracker.track("experiment_guild_triggered", h0.mutableMapOf(o.to("name", str), o.to("revision", Integer.valueOf(i)), o.to("bucket", Integer.valueOf(i2)), o.to("guild_id", Long.valueOf(j))));
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
+        tracker.track("experiment_guild_triggered", h0.mutableMapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_NAME, str), o.to("revision", Integer.valueOf(i)), o.to("bucket", Integer.valueOf(i2)), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j))));
     }
 
     public static final void guildTemplateResolveFailed(String str) {
@@ -568,7 +575,7 @@ public final class AnalyticsTracker {
     }
 
     private final void inviteCopied(String str, Long l, Long l2, Integer num, String str2) {
-        tracker.track("copy_instant_invite", CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("code", str), o.to("server", l), o.to("channel", l2), o.to("channel_type", num), o.to("location", str2))));
+        tracker.track("copy_instant_invite", CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_CODE, str), o.to("server", l), o.to("channel", l2), o.to("channel_type", num), o.to("location", str2))));
     }
 
     public static final void inviteOpened(String str) {
@@ -580,7 +587,7 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(str, "inviteCode");
         m.checkNotNullParameter(str2, "location");
         AnalyticsUtils.Tracker tracker2 = tracker;
-        tracker2.track("resolve_invite", CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("code", str), o.to("resolved", Boolean.FALSE), o.to("authenticated", Boolean.valueOf(tracker2.isAuthed$app_productionCanaryRelease())), o.to("location", str2), o.to("error_message", str3), o.to("error_code", num))));
+        tracker2.track("resolve_invite", CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_CODE, str), o.to("resolved", Boolean.FALSE), o.to("authenticated", Boolean.valueOf(tracker2.isAuthed$app_productionCanaryRelease())), o.to("location", str2), o.to("error_message", str3), o.to("error_code", num))));
     }
 
     public static /* synthetic */ void inviteResolveFailed$default(String str, String str2, String str3, Integer num, int i, Object obj) {
@@ -612,10 +619,10 @@ public final class AnalyticsTracker {
     private final void inviteShareClicked(String str, Long l, Long l2, Integer num, Long l3) {
         Map<String, ? extends Object> mutableMapOf = h0.mutableMapOf(o.to("invite_code", str));
         if (l != null) {
-            mutableMapOf.put("guild_id", Long.valueOf(l.longValue()));
+            mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(l.longValue()));
         }
         if (l2 != null) {
-            mutableMapOf.put("channel_id", Long.valueOf(l2.longValue()));
+            mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(l2.longValue()));
         }
         if (num != null) {
             mutableMapOf.put("invite_channel_type", Integer.valueOf(num.intValue()));
@@ -656,7 +663,7 @@ public final class AnalyticsTracker {
         Map<String, ? extends Object> mutableMapOf = h0.mutableMapOf(o.to("location_section", str2), o.to("type", str));
         if (l != null) {
             l.longValue();
-            mutableMapOf.put("guild_id", String.valueOf(l.longValue()));
+            mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, String.valueOf(l.longValue()));
         }
         tracker.track("open_modal", mutableMapOf);
     }
@@ -800,7 +807,7 @@ public final class AnalyticsTracker {
         }
         hashMap.put("sku_id", Long.valueOf(modelSku.getId()));
         hashMap.put("sku_type", Integer.valueOf(modelSku.getType()));
-        hashMap.put("application_id", Long.valueOf(modelSku.getApplicationId()));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID, Long.valueOf(modelSku.getApplicationId()));
         hashMap.put("store_title", modelSku.getName());
         hashMap.put("distribution_type", modelSku.getPremium() ? "premium" : "distribution");
         Application application = modelSku.getApplication();
@@ -897,15 +904,15 @@ public final class AnalyticsTracker {
 
     public static final void userExperimentTriggered(String str, int i, int i2, int i3) {
         m.checkNotNullParameter(str, "experimentName");
-        tracker.track("experiment_user_triggered", h0.mutableMapOf(o.to("name", str), o.to("revision", Integer.valueOf(i)), o.to("population", Integer.valueOf(i2)), o.to("bucket", Integer.valueOf(i3))));
+        tracker.track("experiment_user_triggered", h0.mutableMapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_NAME, str), o.to("revision", Integer.valueOf(i)), o.to("population", Integer.valueOf(i2)), o.to("bucket", Integer.valueOf(i3))));
     }
 
     public static final void welcomeScreenChannelSelected(int i, long j, List<String> list, List<Long> list2, String str, boolean z2) {
         m.checkNotNullParameter(list, "optionDescriptions");
         m.checkNotNullParameter(list2, "channelIds");
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         HashMap hashMap = new HashMap();
-        hashMap.put("guild_id", Long.valueOf(j));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j));
         hashMap.put("index", Integer.valueOf(i));
         hashMap.put("options", list);
         hashMap.put("options_channel_ids", list2);
@@ -1010,12 +1017,12 @@ public final class AnalyticsTracker {
 
     public final void applicationCommandSelected(long j, long j2, Map<String, ? extends Object> map) {
         m.checkNotNullParameter(map, "snapshotProperties");
-        tracker.track("application_command_selected", h0.plus(h0.mapOf(o.to("application_id", Long.valueOf(j)), o.to("command_id", Long.valueOf(j2))), CollectionExtensionsKt.filterNonNullValues(map)));
+        tracker.track("application_command_selected", h0.plus(h0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID, Long.valueOf(j)), o.to("command_id", Long.valueOf(j2))), CollectionExtensionsKt.filterNonNullValues(map)));
     }
 
     public final void applicationCommandValidationFailure(long j, long j2, String str, boolean z2) {
         m.checkNotNullParameter(str, "argumentType");
-        tracker.track("application_command_validation_failed", h0.mapOf(o.to("application_id", Long.valueOf(j)), o.to("command_id", Long.valueOf(j2)), o.to("argument_type", str), o.to("is_required", Boolean.valueOf(z2))));
+        tracker.track("application_command_validation_failed", h0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID, Long.valueOf(j)), o.to("command_id", Long.valueOf(j2)), o.to("argument_type", str), o.to("is_required", Boolean.valueOf(z2))));
     }
 
     public final void attributionChange(AdjustAttribution adjustAttribution) {
@@ -1086,17 +1093,17 @@ public final class AnalyticsTracker {
     }
 
     public final void captchaFailed(String str) {
-        m.checkNotNullParameter(str, "reason");
-        tracker.track("captcha_failed", g0.mapOf(o.to("reason", str)));
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
+        tracker.track("captcha_failed", g0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_REASON, str)));
     }
 
     public final void changeLogEvent(String str, String str2, String str3, Map<String, ? extends Object> map) {
-        m.checkNotNullParameter(str, "event");
+        m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EVENT);
         m.checkNotNullParameter(str2, "version");
         m.checkNotNullParameter(str3, "revision");
         m.checkNotNullParameter(map, "properties");
         HashMap hashMap = new HashMap();
-        hashMap.put("change_log_id", str2 + ':' + str3);
+        hashMap.put("change_log_id", str2 + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + str3);
         tracker.track(str, h0.plus(hashMap, map));
     }
 
@@ -1143,7 +1150,7 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(intent, "intent");
         m.checkNotNullParameter(analyticsMetadata, "metadata");
         m.checkNotNullParameter(map, "snapshotProperties");
-        tracker.track("deep_link_received", h0.plus(CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("type", analyticsMetadata.getType()), o.to("guild_id", analyticsMetadata.getGuildId()), o.to("channel_id", analyticsMetadata.getChannelId()), o.to("voice_action", Boolean.valueOf(intent.getStringExtra("actions.fulfillment.extra.ACTION_TOKEN") != null)), o.to("source", intent.getStringExtra("com.discord.intent.extra.EXTRA_SOURCE")))), CollectionExtensionsKt.filterNonNullValues(map)));
+        tracker.track("deep_link_received", h0.plus(CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("type", analyticsMetadata.getType()), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, analyticsMetadata.getGuildId()), o.to(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, analyticsMetadata.getChannelId()), o.to("voice_action", Boolean.valueOf(intent.getStringExtra("actions.fulfillment.extra.ACTION_TOKEN") != null)), o.to("source", intent.getStringExtra("com.discord.intent.extra.EXTRA_SOURCE")))), CollectionExtensionsKt.filterNonNullValues(map)));
     }
 
     public final void dismissModal(String str, String str2, String str3, Long l) {
@@ -1151,7 +1158,7 @@ public final class AnalyticsTracker {
         Map<String, ? extends Object> mutableMapOf = h0.mutableMapOf(o.to("location_section", str2), o.to("type", str), o.to("dismiss_type", str3));
         if (l != null) {
             l.longValue();
-            mutableMapOf.put("guild_id", String.valueOf(l.longValue()));
+            mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, String.valueOf(l.longValue()));
         }
         tracker.track("modal_dismissed", mutableMapOf);
     }
@@ -1211,7 +1218,7 @@ public final class AnalyticsTracker {
     }
 
     public final void externalShare(Uri uri) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         tracker.trackFireBase("handle_ext_share", insertUriProperties(new HashMap(), uri));
     }
 
@@ -1276,7 +1283,7 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(str, "username");
         HashMap hashMap = new HashMap();
         if (str2 != null) {
-            hashMap.put("reason", str2);
+            hashMap.put(ModelAuditLogEntry.CHANGE_KEY_REASON, str2);
             hashMap.put("discrim_len", Integer.valueOf(String.valueOf(num).length()));
             hashMap.put("username_len", Integer.valueOf(str.length()));
             hashMap.put("is_email_like", Boolean.valueOf(EmailUtils.INSTANCE.isEmailLike(charSequence.toString())));
@@ -1364,19 +1371,19 @@ public final class AnalyticsTracker {
         if (modelInvite != null) {
             String code = modelInvite.getCode();
             m.checkNotNullExpressionValue(code, "invite.code");
-            mutableMapOf.put("code", code);
+            mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_CODE, code);
             Channel channel = modelInvite.getChannel();
             if (channel != null) {
-                mutableMapOf.put("channel_id", Long.valueOf(channel.h()));
+                mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(channel.h()));
                 mutableMapOf.put("channel_type", Integer.valueOf(channel.A()));
             }
             com.discord.api.guild.Guild guild = modelInvite.getGuild();
             if (guild != null) {
-                mutableMapOf.put("guild_id", Long.valueOf(guild.o()));
+                mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(guild.o()));
             }
             User inviter = modelInvite.getInviter();
             if (inviter != null) {
-                mutableMapOf.put("inviter_id", Long.valueOf(inviter.i()));
+                mutableMapOf.put(ModelAuditLogEntry.CHANGE_KEY_INVITER_ID, Long.valueOf(inviter.i()));
             }
         }
         tracker2.track("resolve_invite", mutableMapOf);
@@ -1471,11 +1478,11 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(map, "properties");
         Map<String, ? extends Object> mutableMap = h0.toMutableMap(map);
         if (channel != null) {
-            mutableMap.put("channel_id", Long.valueOf(channel.h()));
+            mutableMap.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(channel.h()));
             mutableMap.put("channel_type", Integer.valueOf(channel.A()));
             long f = channel.f();
             if (f > 0) {
-                mutableMap.put("guild_id", Long.valueOf(f));
+                mutableMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(f));
             }
         }
         tracker.track("media_session_joined", mutableMap);
@@ -1587,13 +1594,13 @@ public final class AnalyticsTracker {
     }
 
     public final void oauth2AuthorizedViewed(long j) {
-        tracker.track("oauth2_authorize_viewed", g0.mapOf(o.to("application_id", Long.valueOf(j))));
+        tracker.track("oauth2_authorize_viewed", g0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID, Long.valueOf(j))));
     }
 
     public final void openCallFeedbackSheet(long j, long j2, int i) {
         HashMap hashMap = new HashMap();
-        hashMap.put("guild_id", Long.valueOf(j));
-        hashMap.put("channel_id", Long.valueOf(j2));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(j2));
         hashMap.put("channel_type", Integer.valueOf(i));
         hashMap.put("type", "Call Session Feedback");
         tracker.track("open_popout", hashMap);
@@ -1603,18 +1610,18 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(map, "channelProperties");
         String str = (!z2 && z3) || (!z2 && !z3 && !z4) ? " (Upsell)" : !z2 && !z3 && z4 ? " (Soft Upsell)" : "";
         AnalyticsUtils.Tracker tracker2 = tracker;
-        tracker2.track("open_popout", h0.plus(map, h0.mapOf(o.to("type", "Custom Emoji Popout" + str), o.to("guild_id", Long.valueOf(j)), o.to("emoji_id", Long.valueOf(j2)))));
+        tracker2.track("open_popout", h0.plus(map, h0.mapOf(o.to("type", "Custom Emoji Popout" + str), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j)), o.to("emoji_id", Long.valueOf(j2)))));
     }
 
     public final void openGuildProfileSheet(long j) {
         HashMap hashMap = new HashMap();
-        hashMap.put("guild_id", Long.valueOf(j));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j));
         hashMap.put("type", "Guild Profile");
         tracker.track("open_popout", hashMap);
     }
 
     public final void openGuildScheduledEventSheet(long j, int i) {
-        tracker.track("open_modal", h0.mapOf(o.to("type", "Guild Events Modal"), o.to("guild_id", Long.valueOf(j)), o.to("guild_events_count", Integer.valueOf(i))));
+        tracker.track("open_modal", h0.mapOf(o.to("type", "Guild Events Modal"), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j)), o.to("guild_events_count", Integer.valueOf(i))));
     }
 
     public final void openModal(String str, Traits.Location location) {
@@ -1652,7 +1659,7 @@ public final class AnalyticsTracker {
 
     public final void openUnicodeEmojiPopout(long j, Map<String, ? extends Object> map) {
         m.checkNotNullParameter(map, "channelProperties");
-        tracker.track("open_popout", h0.plus(map, h0.mapOf(o.to("type", "Standard Emoji Popout"), o.to("guild_id", Long.valueOf(j)))));
+        tracker.track("open_popout", h0.plus(map, h0.mapOf(o.to("type", "Standard Emoji Popout"), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j)))));
     }
 
     public final void openUserSheet(boolean z2, String str, ActivityPlatform activityPlatform) {
@@ -1785,9 +1792,9 @@ public final class AnalyticsTracker {
     public final void premiumGuildPromotionOpened(long j, Traits.Location location, Long l) {
         m.checkNotNullParameter(location, "locationTrait");
         HashMap hashMap = new HashMap();
-        hashMap.put("guild_id", Long.valueOf(j));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j));
         if (l != null) {
-            hashMap.put("channel_id", Long.valueOf(l.longValue()));
+            hashMap.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(l.longValue()));
         }
         location.serializeTo(hashMap);
         tracker.track("premium_guild_promotion_opened", hashMap);
@@ -1797,9 +1804,9 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(premiumGuildUpsellType, "type");
         HashMap hashMap = new HashMap();
         hashMap.put("type", premiumGuildUpsellType.getAnalyticsName());
-        hashMap.put("guild_id", Long.valueOf(j));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j));
         if (l != null) {
-            hashMap.put("channel_id", Long.valueOf(l.longValue()));
+            hashMap.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(l.longValue()));
         }
         if (location != null) {
             location.serializeTo(hashMap);
@@ -1914,11 +1921,11 @@ public final class AnalyticsTracker {
         hashMap.put("streamer_user_id", String.valueOf(modelApplicationStream.getOwnerId()));
         hashMap.put("stream_channel_id", String.valueOf(modelApplicationStream.getChannelId()));
         if (modelApplicationStream instanceof ModelApplicationStream.GuildStream) {
-            hashMap.put("guild_id", String.valueOf(((ModelApplicationStream.GuildStream) modelApplicationStream).getGuildId()));
+            hashMap.put(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, String.valueOf(((ModelApplicationStream.GuildStream) modelApplicationStream).getGuildId()));
         }
         hashMap.put("rating", feedbackRating != null ? feedbackRating.getAnalyticsValue() : null);
         hashMap.put("media_session_id", str2);
-        hashMap.put("reason", str);
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_REASON, str);
         hashMap.put("feedback", str3);
         tracker.track("stream_report_problem", CollectionExtensionsKt.filterNonNullValues(hashMap));
     }
@@ -1926,7 +1933,7 @@ public final class AnalyticsTracker {
     public final void reportTosViolation(int i, long j, long j2) {
         HashMap hashMap = new HashMap();
         hashMap.put("reason_enum", Integer.valueOf(i));
-        hashMap.put("channel_id", Long.valueOf(j));
+        hashMap.put(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(j));
         hashMap.put("message_id", Long.valueOf(j2));
         hashMap.put("location_object", "android_report_modal");
         tracker.track("message_reported", CollectionExtensionsKt.filterNonNullValues(hashMap));
@@ -2141,7 +2148,7 @@ public final class AnalyticsTracker {
 
     public final void userReportSubmitted(String str, long j, String str2, String str3, boolean z2) {
         m.checkNotNullParameter(str, "reportName");
-        tracker.track("user_report_submitted", CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("report_name", str), o.to("guild_id", Long.valueOf(j)), o.to("reason", str2), o.to("feedback", str3), o.to("skipped", Boolean.valueOf(z2)))));
+        tracker.track("user_report_submitted", CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("report_name", str), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, Long.valueOf(j)), o.to(ModelAuditLogEntry.CHANGE_KEY_REASON, str2), o.to("feedback", str3), o.to("skipped", Boolean.valueOf(z2)))));
     }
 
     public final void userSpeaking(long j, Set<Long> set, String str, Channel channel) {
@@ -2188,7 +2195,7 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(map, "guildVoiceStates");
         if (channel != null) {
             Map voiceChannelProperties$default = getVoiceChannelProperties$default(this, j, channel, null, map, videoInputDeviceDescription, null, 36, null);
-            String str2 = "camera";
+            String str2 = ChatInputComponentTypes.CAMERA;
             String str3 = "screen";
             voiceChannelProperties$default.put("video_input_type", z2 ? str3 : videoInputDeviceDescription != null ? str2 : "none");
             String[] strArr = new String[2];
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
index 94cdc5c4bc..426716943f 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
@@ -4,11 +4,13 @@ import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
 import androidx.annotation.MainThread;
+import androidx.core.app.NotificationCompat;
 import com.discord.api.channel.Channel;
 import com.discord.api.science.AnalyticsSchema;
 import com.discord.api.science.Science;
 import com.discord.api.user.User;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.rtcconnection.RtcConnection;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.device.RtcCameraConfig;
@@ -168,7 +170,7 @@ public final class AnalyticsUtils {
         }
 
         public final void track(Science.Event event) {
-            m.checkNotNullParameter(event, "event");
+            m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
             this.eventsQueue.add(event);
             Observable<Long> d02 = Observable.d0(1500, TimeUnit.MILLISECONDS);
             m.checkNotNullExpressionValue(d02, "Observable\n          .ti…0, TimeUnit.MILLISECONDS)");
@@ -176,7 +178,7 @@ public final class AnalyticsUtils {
         }
 
         public final void track(String str, Map<String, ? extends Object> map) {
-            m.checkNotNullParameter(str, "event");
+            m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EVENT);
             if (map == null) {
                 map = h0.emptyMap();
             }
@@ -193,7 +195,7 @@ public final class AnalyticsUtils {
         }
 
         public final void trackFireBase(String str, Map<String, ? extends Object> map) {
-            m.checkNotNullParameter(str, "event");
+            m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EVENT);
             m.checkNotNullParameter(map, "properties");
             Bundle putMap = putMap(new Bundle(), map);
             FirebaseAnalytics access$getFireBaseInstance$p = AnalyticsUtils.access$getFireBaseInstance$p(AnalyticsUtils.INSTANCE);
@@ -226,7 +228,7 @@ public final class AnalyticsUtils {
         m.checkNotNullParameter(channel, "$this$properties");
         Pair[] pairArr = new Pair[3];
         int i = 0;
-        pairArr[0] = o.to("channel_id", Long.valueOf(channel.h()));
+        pairArr[0] = o.to(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(channel.h()));
         pairArr[1] = o.to("channel_type", Integer.valueOf(channel.A()));
         List<User> w = channel.w();
         if (w != null) {
diff --git a/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.java b/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.java
index 76e89f8a99..47e4d53480 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker$appOpen$1.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.analytics;
 
 import android.net.Uri;
+import com.adjust.sdk.Constants;
 import com.discord.utilities.analytics.AppStartAnalyticsTracker;
 import d0.t.h0;
 import d0.z.d.o;
@@ -33,7 +34,7 @@ public final class AppStartAnalyticsTracker$appOpen$1 extends o implements Funct
     /* renamed from: invoke */
     public final Map<String, ? extends Object> mo1invoke() {
         Pair[] pairArr = new Pair[2];
-        pairArr[0] = d0.o.to("opened_from", this.$isNotificationRoute ? "notification" : this.$uriCanBeRouted ? "deeplink" : "launcher");
+        pairArr[0] = d0.o.to("opened_from", this.$isNotificationRoute ? "notification" : this.$uriCanBeRouted ? Constants.DEEPLINK : "launcher");
         pairArr[1] = d0.o.to("theme", AppStartAnalyticsTracker.access$getStoreUserSettingsSystem$p(this.this$0).getTheme());
         Map<String, ? extends Object> mutableMapOf = h0.mutableMapOf(pairArr);
         AppStartAnalyticsTracker.Companion.access$insertUriProperties(AppStartAnalyticsTracker.Companion, mutableMapOf, this.$uri);
diff --git a/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java
index 60cb6a3bb6..c43e744843 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.analytics;
 
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import com.discord.stores.StoreUserSettingsSystem;
 import com.discord.utilities.analytics.AnalyticsUtils;
 import com.discord.utilities.persister.Persister;
@@ -104,11 +105,11 @@ public final class AppStartAnalyticsTracker {
     }
 
     public final void appOpen(Uri uri, boolean z2, boolean z3) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         this.tracker.track(o.to("app_opened", null), 300000, new AppStartAnalyticsTracker$appOpen$1(this, z3, z2, uri));
-        Persister persister = new Persister("app_first_launched", Boolean.TRUE);
+        Persister persister = new Persister(APP_FIRST_LAUNCHED, Boolean.TRUE);
         if (((Boolean) persister.get()).booleanValue()) {
-            this.tracker.track("app_first_launched", g0.mapOf(o.to("platform", "Android")));
+            this.tracker.track(APP_FIRST_LAUNCHED, g0.mapOf(o.to("platform", "Android")));
             persister.set(Boolean.FALSE, true);
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/analytics/InstallReferrer.java b/app/src/main/java/com/discord/utilities/analytics/InstallReferrer.java
index 362e1d54c6..dc557cc60a 100644
--- a/app/src/main/java/com/discord/utilities/analytics/InstallReferrer.java
+++ b/app/src/main/java/com/discord/utilities/analytics/InstallReferrer.java
@@ -96,12 +96,12 @@ public final class InstallReferrer {
     }
 
     private final void setFetchInstallReferrerFailed(Exception exc) {
-        int i = SharedPreferencesProvider.INSTANCE.get().getInt("CACHE_KEY_HAS_EXECUTED_ATTEMPTS", 0);
+        int i = SharedPreferencesProvider.INSTANCE.get().getInt(CACHE_KEY_HAS_EXECUTED_ATTEMPTS, 0);
         Logger logger = this.logger;
         logger.i("Unable to resolve referrer details, " + i + " attempt.", exc);
         SharedPreferences.Editor edit = getSharedPreferences().edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putInt("CACHE_KEY_HAS_EXECUTED_ATTEMPTS", i + 1);
+        edit.putInt(CACHE_KEY_HAS_EXECUTED_ATTEMPTS, i + 1);
         edit.apply();
     }
 
@@ -115,12 +115,12 @@ public final class InstallReferrer {
         Logger.i$default(this.logger, a.s("Retrieved install referrer, ", installReferrer.getInstallReferrer()), null, 2, null);
         SharedPreferences.Editor edit = getSharedPreferences().edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putBoolean("CACHE_KEY_HAS_EXECUTED", true);
+        edit.putBoolean(CACHE_KEY_HAS_EXECUTED, true);
         edit.apply();
     }
 
     private final boolean shouldFetchInstallReferrer() {
-        return !getSharedPreferences().getBoolean("CACHE_KEY_HAS_EXECUTED", false) && getSharedPreferences().getInt("CACHE_KEY_HAS_EXECUTED_ATTEMPTS", 0) < 10;
+        return !getSharedPreferences().getBoolean(CACHE_KEY_HAS_EXECUTED, false) && getSharedPreferences().getInt(CACHE_KEY_HAS_EXECUTED_ATTEMPTS, 0) < 10;
     }
 
     public final void init(Function1<? super String, Unit> function1) {
diff --git a/app/src/main/java/com/discord/utilities/analytics/Traits.java b/app/src/main/java/com/discord/utilities/analytics/Traits.java
index a00ac8065e..7a3cec2d9f 100644
--- a/app/src/main/java/com/discord/utilities/analytics/Traits.java
+++ b/app/src/main/java/com/discord/utilities/analytics/Traits.java
@@ -2,6 +2,7 @@ package com.discord.utilities.analytics;
 
 import a0.a.a.b;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.premium.SubscriptionPlanType;
 import d0.z.d.m;
 import java.io.Serializable;
@@ -625,7 +626,7 @@ public final class Traits {
             m.checkNotNullParameter(map, "properties");
             map.put("sku_id", Long.valueOf(this.skuId));
             map.put("sku_type", Integer.valueOf(this.skuType));
-            map.put("application_id", Long.valueOf(this.applicationId));
+            map.put(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID, Long.valueOf(this.applicationId));
             map.put("store_title", this.storeTitle);
         }
 
diff --git a/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java b/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java
index 293fe64f6e..1ce70fb7ee 100644
--- a/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java
@@ -4,6 +4,7 @@ import android.content.ClipDescription;
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 import com.discord.api.message.LocalAttachment;
 import com.discord.utilities.string.StringUtilsKt;
@@ -19,11 +20,12 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import kotlin.Lazy;
 import kotlin.ranges.IntRange;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: AttachmentUtils.kt */
 public final class AttachmentUtilsKt {
     private static final Lazy REGEX_FILE_NAME_PATTERN$delegate = g.lazy(AttachmentUtilsKt$REGEX_FILE_NAME_PATTERN$2.INSTANCE);
     private static final int UTF_8_RANGE_END_EXCLUSIVE = 126;
-    private static final IntRange UTF_8_RANGE_EXCLUSIVE = new IntRange(32, 126);
+    private static final IntRange UTF_8_RANGE_EXCLUSIVE = new IntRange(32, UTF_8_RANGE_END_EXCLUSIVE);
     private static final int UTF_8_RANGE_START_EXCLUSIVE = 32;
 
     public final /* synthetic */ class WhenMappings {
@@ -77,7 +79,7 @@ public final class AttachmentUtilsKt {
     }
 
     public static final String getMimeType(ContentResolver contentResolver, Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         String str2 = null;
         String type = contentResolver != null ? contentResolver.getType(uri) : null;
         if (type != null) {
@@ -136,7 +138,7 @@ public final class AttachmentUtilsKt {
     }
 
     public static final boolean isImage(ContentResolver contentResolver, Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         return t.startsWith$default(getMimeType(contentResolver, uri, str), "image", false, 2, null);
     }
 
@@ -161,13 +163,13 @@ public final class AttachmentUtilsKt {
     }
 
     public static final boolean isVideo(ContentResolver contentResolver, Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
-        return t.startsWith$default(getMimeType(contentResolver, uri, str), "video", false, 2, null);
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
+        return t.startsWith$default(getMimeType(contentResolver, uri, str), MediaStreamTrack.VIDEO_TRACK_KIND, false, 2, null);
     }
 
     public static final boolean isVideo(Attachment<?> attachment, ContentResolver contentResolver) {
         m.checkNotNullParameter(attachment, "$this$isVideo");
-        return t.startsWith$default(getMimeType(attachment, contentResolver), "video", false, 2, null);
+        return t.startsWith$default(getMimeType(attachment, contentResolver), MediaStreamTrack.VIDEO_TRACK_KIND, false, 2, null);
     }
 
     public static /* synthetic */ boolean isVideo$default(ContentResolver contentResolver, Uri uri, String str, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java
index 033a0bb6ce..e02b73c95e 100644
--- a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java
+++ b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java
@@ -9,10 +9,12 @@ import android.text.style.ForegroundColorSpan;
 import androidx.annotation.StringRes;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.GuildExplicitContentFilter;
 import com.discord.api.guild.GuildVerificationLevel;
 import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType;
 import com.discord.api.guildscheduledevent.GuildScheduledEventStatus;
+import com.discord.api.permission.Permission;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
 import com.discord.app.AppLog;
 import com.discord.models.domain.ModelAuditLogEntry;
@@ -44,7 +46,7 @@ import kotlin.NoWhenBranchMatchedException;
 import kotlin.Pair;
 /* compiled from: AuditLogChangeUtils.kt */
 public final class AuditLogChangeUtils {
-    private static final List<String> CHANGE_KEYS_REFERENCING_CHANNEL = n.listOf((Object[]) new String[]{"channel_id", "afk_channel_id", "system_channel_id", "rules_channel_id", "public_updates_channel_id"});
+    private static final List<String> CHANGE_KEYS_REFERENCING_CHANNEL = n.listOf((Object[]) new String[]{ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, ModelAuditLogEntry.CHANGE_KEY_AFK_CHANNEL_ID, ModelAuditLogEntry.CHANGE_KEY_SYSTEM_CHANNEL_ID, ModelAuditLogEntry.CHANGE_KEY_RULES_CHANNEL_ID, ModelAuditLogEntry.CHANGE_KEY_UPDATES_CHANNEL_ID});
     public static final AuditLogChangeUtils INSTANCE = new AuditLogChangeUtils();
     private static final List<Integer> RENDERABLE_DELETE_ACTION_TYPES = n.listOf((Object[]) new Integer[]{22, 20, 21});
 
@@ -168,7 +170,7 @@ public final class AuditLogChangeUtils {
       (wrap: java.lang.CharSequence : 0x0283: INVOKE  (r1v31 java.lang.CharSequence) = 
       (r2v9 android.content.res.Resources)
       (r11v0 android.content.Context)
-      (2131755149 int)
+      (wrap: ?? : ?: SGET   com.discord.R.plurals.guild_settings_audit_log_channel_rate_limit_per_user_change_newValue int)
       (r3v12 int)
       (r6v3 java.lang.Object[])
      type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getQuantityString(android.content.res.Resources, android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
@@ -193,7 +195,7 @@ public final class AuditLogChangeUtils {
       (wrap: java.lang.CharSequence : 0x02f9: INVOKE  (r1v22 java.lang.CharSequence) = 
       (r2v8 android.content.res.Resources)
       (r11v0 android.content.Context)
-      (2131755155 int)
+      (wrap: ?? : ?: SGET   com.discord.R.plurals.guild_settings_audit_log_member_prune_delete_days_newValue int)
       (r3v7 int)
       (r6v2 java.lang.Object[])
      type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getQuantityString(android.content.res.Resources, android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
@@ -251,7 +253,7 @@ public final class AuditLogChangeUtils {
                 charSequence2 = null;
                 if (charSequence == null) {
                 }
-            } else if (hasNewValue(change, "color")) {
+            } else if (hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_COLOR)) {
                 Object[] objArr = new Object[1];
                 Object[] objArr2 = new Object[1];
                 Object newValue2 = change.getNewValue();
@@ -263,7 +265,7 @@ public final class AuditLogChangeUtils {
                     return b.h(context, i, objArr, null, 4);
                 }
                 throw new NullPointerException("null cannot be cast to non-null type kotlin.Long");
-            } else if (hasNewValue(change, "max_age")) {
+            } else if (hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_MAX_AGE)) {
                 Object[] objArr3 = new Object[1];
                 Object newValue3 = change.getNewValue();
                 if (newValue3 != null) {
@@ -271,12 +273,12 @@ public final class AuditLogChangeUtils {
                     return b.h(context, i, objArr3, null, 4);
                 }
                 throw new NullPointerException("null cannot be cast to non-null type kotlin.Long");
-            } else if (change.getNewValue() != null && modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE && (m.areEqual(change.getKey(), "allow") || m.areEqual(change.getKey(), "deny") || m.areEqual(change.getKey(), "reset"))) {
+            } else if (change.getNewValue() != null && modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE && (m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED) || m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED) || m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_RESET))) {
                 return renderPermissions(change, modelAuditLogEntry, context, map);
             } else {
-                if (change.getNewValue() != null && (m.areEqual(change.getKey(), "allow") || m.areEqual(change.getKey(), "deny"))) {
+                if (change.getNewValue() != null && (m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED) || m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED))) {
                     return b.h(context, i, new Object[]{getPluralString(context, change).toString() + "\n" + renderPermissionList(change, modelAuditLogEntry, context)}, null, 4);
-                } else if (change.getNewValue() != null && (m.areEqual(change.getKey(), "$remove") || m.areEqual(change.getKey(), "$add"))) {
+                } else if (change.getNewValue() != null && (m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_ROLES_REMOVE) || m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_ROLES_ADD))) {
                     return b.h(context, i, new Object[]{renderRoles(context, change)}, null, 4);
                 } else {
                     if (change.getNewValue() != null && CHANGE_KEYS_REFERENCING_CHANNEL.contains(change.getKey())) {
@@ -284,7 +286,7 @@ public final class AuditLogChangeUtils {
                         Map map2 = (Map) map.get(ModelAuditLogEntry.TargetType.CHANNEL);
                         objArr4[0] = map2 != null ? (CharSequence) map2.get(Long.valueOf(Long.parseLong(change.getValue().toString()))) : null;
                         return b.h(context, i, objArr4, null, 4);
-                    } else if (hasNewValue(change, "bitrate")) {
+                    } else if (hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_BITRATE)) {
                         Object[] objArr5 = new Object[1];
                         Object newValue4 = change.getNewValue();
                         if (newValue4 != null) {
@@ -292,12 +294,12 @@ public final class AuditLogChangeUtils {
                             return b.h(context, i, objArr5, null, 4);
                         }
                         throw new NullPointerException("null cannot be cast to non-null type kotlin.Long");
-                    } else if (hasNewValue(change, "owner_id")) {
+                    } else if (hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_OWNER_ID)) {
                         Object[] objArr6 = new Object[1];
                         User user = StoreStream.Companion.getUsers().getUsers().get(Long.valueOf(Long.parseLong(change.getNewValue().toString())));
                         objArr6[0] = user != null ? user.getUsername() : null;
                         return b.h(context, i, objArr6, null, 4);
-                    } else if (hasNewValue(change, "rate_limit_per_user")) {
+                    } else if (hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_RATE_LIMIT_PER_USER)) {
                         Object[] objArr7 = new Object[1];
                         Resources resources = context.getResources();
                         m.checkNotNullExpressionValue(resources, "context.resources");
@@ -308,13 +310,13 @@ public final class AuditLogChangeUtils {
                             Object newValue6 = change.getNewValue();
                             if (newValue6 != null) {
                                 objArr8[0] = Integer.valueOf((int) ((Long) newValue6).longValue());
-                                objArr7[0] = StringResourceUtilsKt.getQuantityString(resources, context, 2131755149, longValue, objArr8);
+                                objArr7[0] = StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.guild_settings_audit_log_channel_rate_limit_per_user_change_newValue, longValue, objArr8);
                                 return b.h(context, i, objArr7, null, 4);
                             }
                             throw new NullPointerException("null cannot be cast to non-null type kotlin.Long");
                         }
                         throw new NullPointerException("null cannot be cast to non-null type kotlin.Long");
-                    } else if (hasNewValue(change, "afk_timeout")) {
+                    } else if (hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_AFK_TIMEOUT)) {
                         Object[] objArr9 = new Object[1];
                         Object newValue7 = change.getNewValue();
                         if (newValue7 != null) {
@@ -322,7 +324,7 @@ public final class AuditLogChangeUtils {
                             return b.h(context, i, objArr9, null, 4);
                         }
                         throw new NullPointerException("null cannot be cast to non-null type kotlin.Long");
-                    } else if (hasNewValue(change, "prune_delete_days")) {
+                    } else if (hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_PRUNE_DELETE_DAYS)) {
                         Object[] objArr10 = new Object[1];
                         Resources resources2 = context.getResources();
                         m.checkNotNullExpressionValue(resources2, "context.resources");
@@ -333,13 +335,13 @@ public final class AuditLogChangeUtils {
                             Object newValue9 = change.getNewValue();
                             if (newValue9 != null) {
                                 objArr11[0] = (Integer) newValue9;
-                                objArr10[0] = StringResourceUtilsKt.getQuantityString(resources2, context, 2131755155, intValue, objArr11);
+                                objArr10[0] = StringResourceUtilsKt.getQuantityString(resources2, context, (int) R.plurals.guild_settings_audit_log_member_prune_delete_days_newValue, intValue, objArr11);
                                 return b.h(context, i, objArr10, null, 4);
                             }
                             throw new NullPointerException("null cannot be cast to non-null type kotlin.Int");
                         }
                         throw new NullPointerException("null cannot be cast to non-null type kotlin.Int");
-                    } else if (!hasNewValue(change, "video_quality_mode")) {
+                    } else if (!hasNewValue(change, ModelAuditLogEntry.CHANGE_KEY_VIDEO_QUALITY_MODE)) {
                         return b.b(context, i, new Object[0], new AuditLogChangeUtils$getChangeTextWithParams$1(change));
                     } else {
                         Object[] objArr12 = new Object[1];
@@ -379,82 +381,82 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             switch (key.hashCode()) {
                 case -1920783726:
-                    if (key.equals("rtc_region")) {
-                        return getNullableNewOrOldValueString$default(this, change, 2131889606, 2131889607, 2131889608, null, 8, null);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REGION_OVERRIDE)) {
+                        return getNullableNewOrOldValueString$default(this, change, Integer.valueOf((int) R.string.guild_settings_audit_log_channel_rtc_region_override_change), Integer.valueOf((int) R.string.guild_settings_audit_log_channel_rtc_region_override_create), Integer.valueOf((int) R.string.guild_settings_audit_log_channel_rtc_region_override_delete), null, 8, null);
                     }
                     break;
                 case -1451708889:
-                    if (key.equals("video_quality_mode")) {
-                        return getNullableOldValueString(change, 2131889620, 2131889619);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_VIDEO_QUALITY_MODE)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_video_quality_mode_create, R.string.guild_settings_audit_log_channel_video_quality_mode_change);
                     }
                     break;
                 case -934964668:
-                    if (key.equals("reason")) {
-                        return 2131889622;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
+                        return R.string.guild_settings_audit_log_common_reason;
                     }
                     break;
                 case -102270099:
-                    if (key.equals("bitrate")) {
-                        return getNullableOldValueString(change, 2131889587, 2131889586);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_BITRATE)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_bitrate_create, R.string.guild_settings_audit_log_channel_bitrate_change);
                     }
                     break;
                 case 3079692:
-                    if (key.equals("deny")) {
-                        return 2131889599;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED)) {
+                        return R.string.guild_settings_audit_log_channel_permission_overrides_denied;
                     }
                     break;
                 case 3373707:
-                    if (key.equals("name")) {
-                        return getNullableOldValueString(change, 2131889593, 2131889592);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_name_create, R.string.guild_settings_audit_log_channel_name_change);
                     }
                     break;
                 case 3390806:
-                    if (key.equals("nsfw")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NSFW)) {
                         Object value = change.getValue();
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value).booleanValue();
                         if (!booleanValue) {
-                            return 2131889594;
+                            return R.string.guild_settings_audit_log_channel_nsfw_disabled;
                         }
                         if (booleanValue) {
-                            return 2131889595;
+                            return R.string.guild_settings_audit_log_channel_nsfw_enabled;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 3575610:
                     if (key.equals("type")) {
-                        return getNullableOldValueString(change, 2131889615, 2131889614);
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_type_create, R.string.guild_settings_audit_log_channel_type_change);
                     }
                     break;
                 case 92906313:
-                    if (key.equals("allow")) {
-                        return 2131889600;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED)) {
+                        return R.string.guild_settings_audit_log_channel_permission_overrides_granted;
                     }
                     break;
                 case 108404047:
-                    if (key.equals("reset")) {
-                        return 2131889601;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_RESET)) {
+                        return R.string.guild_settings_audit_log_channel_permission_overrides_reset;
                     }
                     break;
                 case 110546223:
-                    if (key.equals("topic")) {
-                        return getNullableNewOrOldValueString$default(this, change, 2131889611, 2131889613, 2131889612, null, 8, null);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_TOPIC)) {
+                        return getNullableNewOrOldValueString$default(this, change, Integer.valueOf((int) R.string.guild_settings_audit_log_channel_topic_change), Integer.valueOf((int) R.string.guild_settings_audit_log_channel_topic_create), Integer.valueOf((int) R.string.guild_settings_audit_log_channel_topic_clear), null, 8, null);
                     }
                     break;
                 case 747804969:
-                    if (key.equals("position")) {
-                        return getNullableOldValueString(change, 2131889603, 2131889602);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_POSITION)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_position_create, R.string.guild_settings_audit_log_channel_position_change);
                     }
                     break;
                 case 987155184:
-                    if (key.equals("rate_limit_per_user")) {
-                        return getNullableOldValueString(change, 2131889605, 2131889604);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_RATE_LIMIT_PER_USER)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_rate_limit_per_user_create, R.string.guild_settings_audit_log_channel_rate_limit_per_user_change);
                     }
                     break;
                 case 1702269315:
-                    if (key.equals("default_auto_archive_duration")) {
-                        return getNullableOldValueString(change, 2131889590, 2131889589);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_DEFAULT_AUTO_ARCHIVE_DURATION)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_default_auto_archive_duration_create, R.string.guild_settings_audit_log_channel_default_auto_archive_duration_change);
                     }
                     break;
             }
@@ -465,30 +467,33 @@ public final class AuditLogChangeUtils {
     @StringRes
     private final int getChannelTypeStringResIdFromValue(Integer num) {
         if (num != null && num.intValue() == 1) {
-            return 2131888202;
+            return R.string.dm;
         }
         if (num != null && num.intValue() == 3) {
-            return 2131889185;
+            return R.string.group_dm;
         }
         if (num != null && num.intValue() == 0) {
-            return 2131894253;
+            return R.string.text_channel;
         }
         if (num != null && num.intValue() == 2) {
-            return 2131894988;
+            return R.string.voice_channel;
         }
         if (num != null && num.intValue() == 5) {
-            return 2131891680;
+            return R.string.news_channel;
         }
         if (num != null && num.intValue() == 6) {
-            return 2131894017;
+            return R.string.store_channel;
         }
         if (num != null && num.intValue() == 13) {
-            return 2131893720;
+            return R.string.stage_channel;
         }
         if ((num != null && num.intValue() == 10) || ((num != null && num.intValue() == 11) || (num != null && num.intValue() == 12))) {
-            return 2131894273;
+            return R.string.thread;
         }
-        return (num != null && num.intValue() == 4) ? 2131887215 : 0;
+        if (num != null && num.intValue() == 4) {
+            return R.string.category;
+        }
+        return 0;
     }
 
     @StringRes
@@ -497,11 +502,11 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             int hashCode = key.hashCode();
             if (hashCode != -934964668) {
-                if (hashCode == 3373707 && key.equals("name")) {
-                    return getNullableOldValueString(change, 2131889628, 2131889627);
+                if (hashCode == 3373707 && key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                    return getNullableOldValueString(change, R.string.guild_settings_audit_log_emoji_name_create, R.string.guild_settings_audit_log_emoji_name_change);
                 }
-            } else if (key.equals("reason")) {
-                return 2131889622;
+            } else if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
+                return R.string.guild_settings_audit_log_common_reason;
             }
         }
         return 0;
@@ -509,34 +514,34 @@ public final class AuditLogChangeUtils {
 
     private final CharSequence getExpireAfterString(int i, Context context) {
         if (i == 0) {
-            return b.h(context, 2131891765, new Object[0], null, 4);
+            return b.h(context, R.string.no_user_limit, new Object[0], null, 4);
         }
         if (i == 1800) {
             Resources resources = context.getResources();
             m.checkNotNullExpressionValue(resources, "context.resources");
-            return StringResourceUtilsKt.getQuantityString(resources, context, 2131755067, 30, 30);
+            return StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.duration_mins_mins, 30, 30);
         } else if (i == 3600) {
             Resources resources2 = context.getResources();
             m.checkNotNullExpressionValue(resources2, "context.resources");
-            return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755065, 1, 1);
+            return StringResourceUtilsKt.getQuantityString(resources2, context, (int) R.plurals.duration_hours_hours, 1, 1);
         } else if (i == 21600) {
             Resources resources3 = context.getResources();
             m.checkNotNullExpressionValue(resources3, "context.resources");
-            return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755065, 6, 6);
+            return StringResourceUtilsKt.getQuantityString(resources3, context, (int) R.plurals.duration_hours_hours, 6, 6);
         } else if (i == 43200) {
             Resources resources4 = context.getResources();
             m.checkNotNullExpressionValue(resources4, "context.resources");
-            return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755065, 12, 12);
+            return StringResourceUtilsKt.getQuantityString(resources4, context, (int) R.plurals.duration_hours_hours, 12, 12);
         } else if (i == 86400) {
             Resources resources5 = context.getResources();
             m.checkNotNullExpressionValue(resources5, "context.resources");
-            return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755063, 1, 1);
+            return StringResourceUtilsKt.getQuantityString(resources5, context, (int) R.plurals.duration_days_days, 1, 1);
         } else if (i != 604800) {
             return "";
         } else {
             Resources resources6 = context.getResources();
             m.checkNotNullExpressionValue(resources6, "context.resources");
-            return StringResourceUtilsKt.getQuantityString(resources6, context, 2131755063, 7, 7);
+            return StringResourceUtilsKt.getQuantityString(resources6, context, (int) R.plurals.duration_days_days, 7, 7);
         }
     }
 
@@ -548,128 +553,170 @@ public final class AuditLogChangeUtils {
         }
         switch (key.hashCode()) {
             case -1907190207:
-                return key.equals("banner_hash") ? 2131889633 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_BANNER_HASH)) {
+                    return R.string.guild_settings_audit_log_guild_banner_hash_change;
+                }
+                return 0;
             case -1724546052:
-                if (key.equals("description")) {
-                    return getNullableNewValueString(change, 2131889637, 2131889636);
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION)) {
+                    return getNullableNewValueString(change, R.string.guild_settings_audit_log_guild_description_clear, R.string.guild_settings_audit_log_guild_description_change);
                 }
                 return 0;
             case -1705139351:
-                if (!key.equals("explicit_content_filter")) {
+                if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_EXPLICIT_CONTENT_FILTER)) {
                     return 0;
                 }
                 Object value = change.getValue();
                 Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
                 int longValue = (int) ((Long) value).longValue();
                 if (longValue == GuildExplicitContentFilter.NONE.getApiValue()) {
-                    return 2131889640;
+                    return R.string.guild_settings_audit_log_guild_explicit_content_filter_disable;
                 }
                 if (longValue == GuildExplicitContentFilter.SOME.getApiValue()) {
-                    return 2131889641;
+                    return R.string.guild_settings_audit_log_guild_explicit_content_filter_members_without_roles;
                 }
-                return longValue == GuildExplicitContentFilter.ALL.getApiValue() ? 2131889639 : 0;
+                if (longValue == GuildExplicitContentFilter.ALL.getApiValue()) {
+                    return R.string.guild_settings_audit_log_guild_explicit_content_filter_all_members;
+                }
+                return 0;
             case -1572429104:
-                if (key.equals("afk_channel_id")) {
-                    return getNullableNewValueString(change, 2131889631, 2131889630);
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_AFK_CHANNEL_ID)) {
+                    return getNullableNewValueString(change, R.string.guild_settings_audit_log_guild_afk_channel_id_clear, R.string.guild_settings_audit_log_guild_afk_channel_id_change);
                 }
                 return 0;
             case -1390796524:
-                return key.equals("icon_hash") ? 2131889642 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_ICON_HASH)) {
+                    return R.string.guild_settings_audit_log_guild_icon_hash_change;
+                }
+                return 0;
             case -1100074521:
-                if (key.equals("system_channel_id")) {
-                    return getNullableNewValueString(change, 2131889653, 2131889652);
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_SYSTEM_CHANNEL_ID)) {
+                    return getNullableNewValueString(change, R.string.guild_settings_audit_log_guild_system_channel_id_disable, R.string.guild_settings_audit_log_guild_system_channel_id_change);
                 }
                 return 0;
             case -934964668:
-                return key.equals("reason") ? 2131889622 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
+                    return R.string.guild_settings_audit_log_common_reason;
+                }
+                return 0;
             case -934795532:
-                return key.equals("region") ? 2131889648 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REGION)) {
+                    return R.string.guild_settings_audit_log_guild_region_change;
+                }
+                return 0;
             case -506227616:
-                if (!key.equals("verification_level")) {
+                if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_VERIFICATION_LEVEL)) {
                     return 0;
                 }
                 Object value2 = change.getValue();
                 Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
                 int longValue2 = (int) ((Long) value2).longValue();
                 if (longValue2 == GuildVerificationLevel.NONE.getApiValue()) {
-                    return 2131889662;
+                    return R.string.guild_settings_audit_log_guild_verification_level_change_none;
                 }
                 if (longValue2 == GuildVerificationLevel.LOW.getApiValue()) {
-                    return 2131889660;
+                    return R.string.guild_settings_audit_log_guild_verification_level_change_low;
                 }
                 if (longValue2 == GuildVerificationLevel.MEDIUM.getApiValue()) {
-                    return 2131889661;
+                    return R.string.guild_settings_audit_log_guild_verification_level_change_medium;
                 }
                 if (longValue2 == GuildVerificationLevel.HIGH.getApiValue()) {
-                    return 2131889659;
+                    return R.string.guild_settings_audit_log_guild_verification_level_change_high;
                 }
-                return longValue2 == GuildVerificationLevel.HIGHEST.getApiValue() ? 2131889663 : 0;
+                if (longValue2 == GuildVerificationLevel.HIGHEST.getApiValue()) {
+                    return R.string.guild_settings_audit_log_guild_verification_level_change_very_high;
+                }
+                return 0;
             case -154917112:
-                return key.equals("afk_timeout") ? 2131889632 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_AFK_TIMEOUT)) {
+                    return R.string.guild_settings_audit_log_guild_afk_timeout_change;
+                }
+                return 0;
             case 3373707:
-                return key.equals("name") ? 2131889645 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                    return R.string.guild_settings_audit_log_guild_name_change;
+                }
+                return 0;
             case 226923479:
-                return key.equals("discovery_splash_hash") ? 2131889638 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_DISCOVERY_SPLASH_HASH)) {
+                    return R.string.guild_settings_audit_log_guild_discovery_splash_hash_change;
+                }
+                return 0;
             case 643741670:
-                return key.equals("splash_hash") ? 2131889651 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_SPLASH_HASH)) {
+                    return R.string.guild_settings_audit_log_guild_splash_hash_change;
+                }
+                return 0;
             case 706006559:
-                if (key.equals("rules_channel_id")) {
-                    return getNullableNewValueString(change, 2131889650, 2131889649);
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_RULES_CHANNEL_ID)) {
+                    return getNullableNewValueString(change, R.string.guild_settings_audit_log_guild_rules_channel_id_clear, R.string.guild_settings_audit_log_guild_rules_channel_id_change);
                 }
                 return 0;
             case 945133165:
-                if (!key.equals("mfa_level")) {
+                if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_MFA_LEVEL)) {
                     return 0;
                 }
                 Object value3 = change.getValue();
                 Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Long");
                 int longValue3 = (int) ((Long) value3).longValue();
-                if (longValue3 != 0) {
-                    return longValue3 != 1 ? 0 : 2131889644;
+                if (longValue3 == 0) {
+                    return R.string.guild_settings_audit_log_guild_mfa_level_disabled;
                 }
-                return 2131889643;
+                if (longValue3 != 1) {
+                    return 0;
+                }
+                return R.string.guild_settings_audit_log_guild_mfa_level_enabled;
             case 950953474:
-                if (key.equals("public_updates_channel_id")) {
-                    return getNullableNewValueString(change, 2131889656, 2131889655);
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_UPDATES_CHANNEL_ID)) {
+                    return getNullableNewValueString(change, R.string.guild_settings_audit_log_guild_updates_channel_id_clear, R.string.guild_settings_audit_log_guild_updates_channel_id_change);
                 }
                 return 0;
             case 1207357234:
-                if (!key.equals("default_message_notifications")) {
+                if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_DEFAULT_MESSAGE_NOTIFICATIONS)) {
                     return 0;
                 }
                 Object value4 = change.getValue();
                 Objects.requireNonNull(value4, "null cannot be cast to non-null type kotlin.Long");
                 int longValue4 = (int) ((Long) value4).longValue();
-                if (longValue4 != 0) {
-                    return longValue4 != 1 ? 0 : 2131889635;
+                if (longValue4 == 0) {
+                    return R.string.guild_settings_audit_log_guild_default_message_notifications_change_all_messages;
                 }
-                return 2131889634;
+                if (longValue4 != 1) {
+                    return 0;
+                }
+                return R.string.guild_settings_audit_log_guild_default_message_notifications_change_only_mentions;
             case 1580684753:
-                if (key.equals("vanity_url_code")) {
-                    return getNullableNewValueString(change, 2131889658, 2131889657);
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_VANITY_URL_CODE)) {
+                    return getNullableNewValueString(change, R.string.guild_settings_audit_log_guild_vanity_url_code_delete, R.string.guild_settings_audit_log_guild_vanity_url_code_change);
                 }
                 return 0;
             case 1639242418:
-                if (key.equals("widget_channel_id")) {
-                    return getNullableNewValueString(change, 2131889665, 2131889664);
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_WIDGET_CHANNEL_ID)) {
+                    return getNullableNewValueString(change, R.string.guild_settings_audit_log_guild_widget_channel_id_delete, R.string.guild_settings_audit_log_guild_widget_channel_id_change);
                 }
                 return 0;
             case 1663147559:
-                return key.equals("owner_id") ? 2131889646 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_OWNER_ID)) {
+                    return R.string.guild_settings_audit_log_guild_owner_id_change;
+                }
+                return 0;
             case 1792613336:
-                return key.equals("preferred_locale") ? 2131889647 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PREFERRED_LOCALE)) {
+                    return R.string.guild_settings_audit_log_guild_preferred_locale_change;
+                }
+                return 0;
             case 2010777670:
-                if (!key.equals("widget_enabled")) {
+                if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_WIDGET_ENABLED)) {
                     return 0;
                 }
                 Object value5 = change.getValue();
                 Objects.requireNonNull(value5, "null cannot be cast to non-null type kotlin.Boolean");
                 boolean booleanValue = ((Boolean) value5).booleanValue();
                 if (booleanValue) {
-                    return 2131889667;
+                    return R.string.guild_settings_audit_log_guild_widget_enabled;
                 }
                 if (!booleanValue) {
-                    return 2131889666;
+                    return R.string.guild_settings_audit_log_guild_widget_disabled;
                 }
                 throw new NoWhenBranchMatchedException();
             default:
@@ -685,9 +732,15 @@ public final class AuditLogChangeUtils {
         }
         switch (key.hashCode()) {
             case -2136953706:
-                return key.equals("sku_ids") ? 2131889733 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_SKU_IDS)) {
+                    return R.string.guild_settings_audit_log_scheduled_event_skus_create;
+                }
+                return 0;
             case -1724546052:
-                return key.equals("description") ? 2131889729 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION)) {
+                    return R.string.guild_settings_audit_log_scheduled_event_description_create;
+                }
+                return 0;
             case -892481550:
                 if (!key.equals("status")) {
                     return 0;
@@ -696,39 +749,51 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
                 int longValue = (int) ((Long) value).longValue();
                 if (longValue == GuildScheduledEventStatus.SCHEDULED.getApiValue()) {
-                    return 2131889737;
+                    return R.string.guild_settings_audit_log_scheduled_event_status_scheduled;
                 }
                 if (longValue == GuildScheduledEventStatus.ACTIVE.getApiValue()) {
-                    return 2131889734;
+                    return R.string.guild_settings_audit_log_scheduled_event_status_active;
                 }
                 if (longValue == GuildScheduledEventStatus.COMPLETED.getApiValue()) {
-                    return 2131889736;
+                    return R.string.guild_settings_audit_log_scheduled_event_status_completed;
                 }
-                return longValue == GuildScheduledEventStatus.CANCELED.getApiValue() ? 2131889735 : 0;
+                if (longValue == GuildScheduledEventStatus.CANCELED.getApiValue()) {
+                    return R.string.guild_settings_audit_log_scheduled_event_status_canceled;
+                }
+                return 0;
             case 3373707:
-                return key.equals("name") ? 2131889732 : 0;
+                if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                    return R.string.guild_settings_audit_log_scheduled_event_name_create;
+                }
+                return 0;
             case 1281710614:
-                if (!key.equals("entity_type")) {
+                if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_ENTITY_TYPE)) {
                     return 0;
                 }
                 Object value2 = change.getValue();
                 Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
                 int longValue2 = (int) ((Long) value2).longValue();
                 if (longValue2 == GuildScheduledEventEntityType.NONE.getApiValue()) {
-                    return 2131889730;
+                    return R.string.guild_settings_audit_log_scheduled_event_entity_type_none;
                 }
-                return longValue2 == GuildScheduledEventEntityType.STAGE_INSTANCE.getApiValue() ? 2131889731 : 0;
+                if (longValue2 == GuildScheduledEventEntityType.STAGE_INSTANCE.getApiValue()) {
+                    return R.string.guild_settings_audit_log_scheduled_event_entity_type_stage_instance;
+                }
+                return 0;
             case 1965579277:
-                if (!key.equals("privacy_level")) {
+                if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_PRIVACY_LEVEL)) {
                     return 0;
                 }
                 Object value3 = change.getValue();
                 Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Long");
                 int longValue3 = (int) ((Long) value3).longValue();
                 if (longValue3 == StageInstancePrivacyLevel.GUILD_ONLY.getApiValue()) {
-                    return 2131889742;
+                    return R.string.guild_settings_audit_log_stage_instance_privacy_level_guild_only;
                 }
-                return longValue3 == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889743 : 0;
+                if (longValue3 == StageInstancePrivacyLevel.PUBLIC.getApiValue()) {
+                    return R.string.guild_settings_audit_log_stage_instance_privacy_level_public;
+                }
+                return 0;
             default:
                 return 0;
         }
@@ -743,29 +808,35 @@ public final class AuditLogChangeUtils {
         int hashCode = key.hashCode();
         if (hashCode != -1743820047) {
             if (hashCode != -486786702) {
-                return (hashCode == 1767574344 && key.equals("expire_grace_period")) ? 2131889674 : 0;
-            }
-            if (!key.equals("expire_behavior")) {
+                if (hashCode == 1767574344 && key.equals(ModelAuditLogEntry.CHANGE_KEY_EXPIRE_GRACE_PERIOD)) {
+                    return R.string.guild_settings_audit_log_integration_expire_grace_period;
+                }
                 return 0;
+            } else if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_EXPIRE_BEHAVIOR)) {
+                return 0;
+            } else {
+                Object value = change.getValue();
+                Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
+                int longValue = (int) ((Long) value).longValue();
+                if (longValue == 0) {
+                    return R.string.guild_settings_audit_log_integration_expire_behavior_remove_synced_role;
+                }
+                if (longValue != 1) {
+                    return 0;
+                }
+                return R.string.guild_settings_audit_log_integration_expire_behavior_kick_from_server;
             }
-            Object value = change.getValue();
-            Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
-            int longValue = (int) ((Long) value).longValue();
-            if (longValue != 0) {
-                return longValue != 1 ? 0 : 2131889672;
-            }
-            return 2131889673;
-        } else if (!key.equals("enable_emoticons")) {
+        } else if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_ENABLE_EMOTICONS)) {
             return 0;
         } else {
             Object value2 = change.getValue();
             Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Boolean");
             boolean booleanValue = ((Boolean) value2).booleanValue();
             if (booleanValue) {
-                return 2131889671;
+                return R.string.guild_settings_audit_log_integration_enable_emoticons_on;
             }
             if (!booleanValue) {
-                return 2131889670;
+                return R.string.guild_settings_audit_log_integration_enable_emoticons_off;
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -777,44 +848,44 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             switch (key.hashCode()) {
                 case -1930808873:
-                    if (key.equals("channel_id")) {
-                        return 2131889676;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
+                        return R.string.guild_settings_audit_log_invite_channel_create;
                     }
                     break;
                 case -934964668:
-                    if (key.equals("reason")) {
-                        return 2131889622;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
+                        return R.string.guild_settings_audit_log_common_reason;
                     }
                     break;
                 case 3059181:
-                    if (key.equals("code")) {
-                        return 2131889677;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_CODE)) {
+                        return R.string.guild_settings_audit_log_invite_code_create;
                     }
                     break;
                 case 408141255:
-                    if (key.equals("max_uses")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_MAX_USES)) {
                         Object value = change.getValue();
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
-                        return ((int) ((Long) value).longValue()) != 0 ? 2131889682 : 2131889683;
+                        return ((int) ((Long) value).longValue()) != 0 ? R.string.guild_settings_audit_log_invite_max_uses_create : R.string.guild_settings_audit_log_invite_max_uses_create_infinite;
                     }
                     break;
                 case 844430244:
-                    if (key.equals("max_age")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_MAX_AGE)) {
                         Object value2 = change.getValue();
                         Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
-                        return ((int) ((Long) value2).longValue()) != 0 ? 2131889680 : 2131889681;
+                        return ((int) ((Long) value2).longValue()) != 0 ? R.string.guild_settings_audit_log_invite_max_age_create : R.string.guild_settings_audit_log_invite_max_age_create_infinite;
                     }
                     break;
                 case 1984986705:
-                    if (key.equals("temporary")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_TEMPORARY)) {
                         Object value3 = change.getValue();
                         Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value3).booleanValue();
                         if (booleanValue) {
-                            return 2131889685;
+                            return R.string.guild_settings_audit_log_invite_temporary_on;
                         }
                         if (!booleanValue) {
-                            return 2131889684;
+                            return R.string.guild_settings_audit_log_invite_temporary_off;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
@@ -866,20 +937,20 @@ public final class AuditLogChangeUtils {
                     int hashCode = key.hashCode();
                     if (hashCode != 3079692) {
                         if (hashCode != 92906313) {
-                            if (hashCode == 108404047 && key.equals("reset")) {
+                            if (hashCode == 108404047 && key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_RESET)) {
                                 Resources resources = context.getResources();
                                 m.checkNotNullExpressionValue(resources, "context.resources");
-                                obj2 = b.h(context, 2131889601, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755148, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
+                                obj2 = b.h(context, R.string.guild_settings_audit_log_channel_permission_overrides_reset, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.guild_settings_audit_log_channel_permission_overrides_reset_count, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
                             }
-                        } else if (key.equals("allow")) {
+                        } else if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED)) {
                             Resources resources2 = context.getResources();
                             m.checkNotNullExpressionValue(resources2, "context.resources");
-                            obj2 = b.h(context, 2131889600, new Object[]{StringResourceUtilsKt.getQuantityString(resources2, context, 2131755147, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
+                            obj2 = b.h(context, R.string.guild_settings_audit_log_channel_permission_overrides_granted, new Object[]{StringResourceUtilsKt.getQuantityString(resources2, context, (int) R.plurals.guild_settings_audit_log_channel_permission_overrides_granted_count, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
                         }
-                    } else if (key.equals("deny")) {
+                    } else if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED)) {
                         Resources resources3 = context.getResources();
                         m.checkNotNullExpressionValue(resources3, "context.resources");
-                        obj2 = b.h(context, 2131889599, new Object[]{StringResourceUtilsKt.getQuantityString(resources3, context, 2131755146, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
+                        obj2 = b.h(context, R.string.guild_settings_audit_log_channel_permission_overrides_denied, new Object[]{StringResourceUtilsKt.getQuantityString(resources3, context, (int) R.plurals.guild_settings_audit_log_channel_permission_overrides_denied_count, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
                     }
                 }
                 return obj2.toString();
@@ -915,31 +986,31 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             switch (key.hashCode()) {
                 case 1168893:
-                    if (key.equals("$add")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_ROLES_ADD)) {
                         Resources resources = context.getResources();
                         m.checkNotNullExpressionValue(resources, "context.resources");
-                        return StringResourceUtilsKt.getQuantityString(resources, context, 2131755156, collection.size(), Integer.valueOf(collection.size()));
+                        return StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.guild_settings_audit_log_member_roles_add_count, collection.size(), Integer.valueOf(collection.size()));
                     }
                     break;
                 case 3079692:
-                    if (key.equals("deny")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED)) {
                         Resources resources2 = context.getResources();
                         m.checkNotNullExpressionValue(resources2, "context.resources");
-                        return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755146, collection.size(), Integer.valueOf(collection.size()));
+                        return StringResourceUtilsKt.getQuantityString(resources2, context, (int) R.plurals.guild_settings_audit_log_channel_permission_overrides_denied_count, collection.size(), Integer.valueOf(collection.size()));
                     }
                     break;
                 case 92906313:
-                    if (key.equals("allow")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED)) {
                         Resources resources3 = context.getResources();
                         m.checkNotNullExpressionValue(resources3, "context.resources");
-                        return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755147, collection.size(), Integer.valueOf(collection.size()));
+                        return StringResourceUtilsKt.getQuantityString(resources3, context, (int) R.plurals.guild_settings_audit_log_channel_permission_overrides_granted_count, collection.size(), Integer.valueOf(collection.size()));
                     }
                     break;
                 case 950750632:
-                    if (key.equals("$remove")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_ROLES_REMOVE)) {
                         Resources resources4 = context.getResources();
                         m.checkNotNullExpressionValue(resources4, "context.resources");
-                        return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755157, collection.size(), Integer.valueOf(collection.size()));
+                        return StringResourceUtilsKt.getQuantityString(resources4, context, (int) R.plurals.guild_settings_audit_log_member_roles_remove_count, collection.size(), Integer.valueOf(collection.size()));
                     }
                     break;
             }
@@ -953,56 +1024,56 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             switch (key.hashCode()) {
                 case -934964668:
-                    if (key.equals("reason")) {
-                        return 2131889622;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
+                        return R.string.guild_settings_audit_log_common_reason;
                     }
                     break;
                 case 3079692:
-                    if (key.equals("deny")) {
-                        return 2131889724;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED)) {
+                        return R.string.guild_settings_audit_log_role_permissions_denied;
                     }
                     break;
                 case 3373707:
-                    if (key.equals("name")) {
-                        return getNullableOldValueString(change, 2131889723, 2131889722);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_role_name_create, R.string.guild_settings_audit_log_role_name_change);
                     }
                     break;
                 case 64859716:
-                    if (key.equals("mentionable")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_MENTIONABLE)) {
                         Object value = change.getValue();
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value).booleanValue();
                         if (booleanValue) {
-                            return 2131889721;
+                            return R.string.guild_settings_audit_log_role_mentionable_on;
                         }
                         if (!booleanValue) {
-                            return 2131889720;
+                            return R.string.guild_settings_audit_log_role_mentionable_off;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 92906313:
-                    if (key.equals("allow")) {
-                        return 2131889725;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED)) {
+                        return R.string.guild_settings_audit_log_role_permissions_granted;
                     }
                     break;
                 case 94842723:
-                    if (key.equals("color")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_COLOR)) {
                         Object value2 = change.getValue();
                         Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
-                        return ((Long) value2).longValue() == 0 ? 2131889715 : 2131889713;
+                        return ((Long) value2).longValue() == 0 ? R.string.guild_settings_audit_log_role_color_none : R.string.guild_settings_audit_log_role_color;
                     }
                     break;
                 case 99457571:
-                    if (key.equals("hoist")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_HOIST)) {
                         Object value3 = change.getValue();
                         Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue2 = ((Boolean) value3).booleanValue();
                         if (booleanValue2) {
-                            return 2131889719;
+                            return R.string.guild_settings_audit_log_role_hoist_on;
                         }
                         if (!booleanValue2) {
-                            return 2131889718;
+                            return R.string.guild_settings_audit_log_role_hoist_off;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
@@ -1020,18 +1091,21 @@ public final class AuditLogChangeUtils {
         }
         int hashCode = key.hashCode();
         if (hashCode != 110546223) {
-            if (hashCode != 1965579277 || !key.equals("privacy_level")) {
+            if (hashCode != 1965579277 || !key.equals(ModelAuditLogEntry.CHANGE_KEY_PRIVACY_LEVEL)) {
                 return 0;
             }
             Object value = change.getValue();
             Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
             int longValue = (int) ((Long) value).longValue();
             if (longValue == StageInstancePrivacyLevel.GUILD_ONLY.getApiValue()) {
-                return 2131889742;
+                return R.string.guild_settings_audit_log_stage_instance_privacy_level_guild_only;
             }
-            return longValue == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889743 : 0;
-        } else if (key.equals("topic")) {
-            return getNullableOldValueString(change, 2131889613, 2131889611);
+            if (longValue == StageInstancePrivacyLevel.PUBLIC.getApiValue()) {
+                return R.string.guild_settings_audit_log_stage_instance_privacy_level_public;
+            }
+            return 0;
+        } else if (key.equals(ModelAuditLogEntry.CHANGE_KEY_TOPIC)) {
+            return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_topic_create, R.string.guild_settings_audit_log_channel_topic_change);
         } else {
             return 0;
         }
@@ -1044,14 +1118,14 @@ public final class AuditLogChangeUtils {
             int hashCode = key.hashCode();
             if (hashCode != -1724546052) {
                 if (hashCode != 3373707) {
-                    if (hashCode == 3552281 && key.equals("tags")) {
-                        return getNullableOldValueString(change, 2131889749, 2131889748);
+                    if (hashCode == 3552281 && key.equals(ModelAuditLogEntry.CHANGE_KEY_TAGS)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_tags_create, R.string.guild_settings_audit_log_tags_change);
                     }
-                } else if (key.equals("name")) {
-                    return getNullableOldValueString(change, 2131889711, 2131889710);
+                } else if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                    return getNullableOldValueString(change, R.string.guild_settings_audit_log_name_create, R.string.guild_settings_audit_log_name_change);
                 }
-            } else if (key.equals("description")) {
-                return getNullableOldValueString(change, 2131889624, 2131889623);
+            } else if (key.equals(ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION)) {
+                return getNullableOldValueString(change, R.string.guild_settings_audit_log_description_create, R.string.guild_settings_audit_log_description_change);
             }
         }
         return 0;
@@ -1060,126 +1134,129 @@ public final class AuditLogChangeUtils {
     @StringRes
     private final int getStringForPermission(long j, ModelAuditLogEntry modelAuditLogEntry) {
         if (j == 1) {
-            return 2131887936;
+            return R.string.create_instant_invite;
         }
         if (j == 2) {
-            return 2131891068;
+            return R.string.kick_members;
         }
         if (j == 4) {
-            return 2131886821;
+            return R.string.ban_members;
         }
         if (j == 8) {
-            return 2131886303;
+            return R.string.administrator;
         }
         if (j == 16) {
-            return (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) ? 2131891222 : 2131891224;
+            return (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) ? R.string.manage_channel : R.string.manage_channels;
         }
         if (j == 32) {
-            return 2131891239;
+            return R.string.manage_server;
         }
-        if (j == 524288) {
-            return 2131894973;
+        if (j == Permission.VIEW_GUILD_ANALYTICS) {
+            return R.string.view_guild_analytics;
         }
-        if (j == 67108864) {
-            return 2131887261;
+        if (j == Permission.CHANGE_NICKNAME) {
+            return R.string.change_nickname;
         }
-        if (j == 134217728) {
-            return 2131891232;
+        if (j == Permission.MANAGE_NICKNAMES) {
+            return R.string.manage_nicknames;
         }
-        if (j == 268435456) {
-            return 2131891237;
+        if (j == Permission.MANAGE_ROLES) {
+            return R.string.manage_roles;
         }
-        if (j == 536870912) {
-            return 2131891244;
+        if (j == Permission.MANAGE_WEBHOOKS) {
+            return R.string.manage_webhooks;
         }
-        if (j == 1073741824) {
-            return 2131891227;
+        if (j == Permission.MANAGE_EMOJIS_AND_STICKERS) {
+            return R.string.manage_emojis_and_stickers;
         }
-        if (j == 8589934592L) {
-            return 2131891228;
+        if (j == Permission.MANAGE_EVENTS) {
+            return R.string.manage_events;
         }
         if (j == 128) {
-            return 2131894969;
+            return R.string.view_audit_log;
         }
-        if (j == 1024) {
-            return 2131892908;
+        if (j == Permission.VIEW_CHANNEL) {
+            return R.string.read_messages;
         }
-        if (j == 2048) {
-            return 2131893549;
+        if (j == Permission.SEND_MESSAGES) {
+            return R.string.send_messages;
         }
-        if (j == 4096) {
-            return 2131893551;
+        if (j == Permission.SEND_TTS_MESSAGES) {
+            return R.string.send_tts_messages;
         }
-        if (j == 8192) {
-            return 2131891229;
+        if (j == Permission.MANAGE_MESSAGES) {
+            return R.string.manage_messages;
         }
-        if (j == 16384) {
-            return 2131888258;
+        if (j == Permission.EMBED_LINKS) {
+            return R.string.embed_links;
         }
-        if (j == 32768) {
-            return 2131886726;
+        if (j == Permission.ATTACH_FILES) {
+            return R.string.attach_files;
         }
-        if (j == 65536) {
-            return 2131892907;
+        if (j == Permission.READ_MESSAGE_HISTORY) {
+            return R.string.read_message_history;
         }
-        if (j == 131072) {
-            return 2131891461;
+        if (j == Permission.MENTION_EVERYONE) {
+            return R.string.mention_everyone_android;
         }
-        if (j == 262144) {
-            return 2131894597;
+        if (j == Permission.USE_EXTERNAL_EMOJIS) {
+            return R.string.use_external_emojis;
         }
-        if (j == 137438953472L) {
-            return 2131893260;
+        if (j == Permission.USE_EXTERNAL_STICKERS) {
+            return R.string.role_permissions_use_external_stickers;
         }
         if (j == 64) {
-            return 2131886293;
+            return R.string.add_reactions;
         }
-        if (j == 1048576) {
-            return 2131887525;
+        if (j == Permission.CONNECT) {
+            return R.string.connect;
         }
-        if (j == 2097152) {
-            return 2131893685;
+        if (j == Permission.SPEAK) {
+            return R.string.speak;
         }
-        if (j == 4194304) {
-            return 2131891629;
+        if (j == Permission.MUTE_MEMBERS) {
+            return R.string.mute_members;
         }
-        if (j == 8388608) {
-            return 2131888066;
+        if (j == Permission.DEAFEN_MEMBERS) {
+            return R.string.deafen_members;
         }
-        if (j == 16777216) {
-            return 2131891577;
+        if (j == Permission.MOVE_MEMBERS) {
+            return R.string.move_members;
         }
-        if (j == 33554432) {
-            return 2131894607;
+        if (j == Permission.USE_VAD) {
+            return R.string.use_vad;
         }
         if (j == 256) {
-            return 2131892751;
+            return R.string.priority_speaker;
         }
         if (j == 512) {
-            return 2131894942;
+            return R.string.video;
         }
-        if (j == 2147483648L) {
-            return 2131894593;
+        if (j == Permission.USE_APPLICATION_COMMANDS) {
+            return R.string.use_application_commands;
         }
-        if (j == 4294967296L) {
-            return 2131892998;
+        if (j == Permission.REQUEST_TO_SPEAK) {
+            return R.string.request_to_speak;
         }
-        if (j == 34359738368L) {
-            return 2131894603;
+        if (j == Permission.USE_PUBLIC_THREADS) {
+            return R.string.use_public_threads;
         }
-        if (j == 68719476736L) {
-            return 2131894602;
+        if (j == Permission.USE_PRIVATE_THREADS) {
+            return R.string.use_private_threads;
         }
-        return j == 17179869184L ? 2131891241 : 0;
+        if (j == Permission.MANAGE_THREADS) {
+            return R.string.manage_threads;
+        }
+        return 0;
     }
 
     private final CharSequence getStringForVideoQualityMode(MediaSinkWantsManager.VideoQualityMode videoQualityMode, Context context) {
         int ordinal = videoQualityMode.ordinal();
         if (ordinal == 0) {
-            return b.h(context, 2131894954, new Object[0], null, 4);
+            return b.h(context, R.string.video_quality_mode_auto, new Object[0], null, 4);
         }
         if (ordinal == 1) {
-            return b.h(context, 2131894955, new Object[0], null, 4);
+            return b.h(context, R.string.video_quality_mode_full, new Object[0], null, 4);
         }
         throw new NoWhenBranchMatchedException();
     }
@@ -1189,16 +1266,16 @@ public final class AuditLogChangeUtils {
         if (actionType != null) {
             int ordinal = actionType.ordinal();
             if (ordinal == 1) {
-                return ColorCompat.getColor(context, 2131100248);
+                return ColorCompat.getColor(context, (int) R.color.status_green_500);
             }
             if (ordinal == 2) {
-                return ColorCompat.getColor(context, 2131100353);
+                return ColorCompat.getColor(context, (int) R.color.status_yellow_400);
             }
             if (ordinal == 3) {
-                return ColorCompat.getColor(context, 2131100326);
+                return ColorCompat.getColor(context, (int) R.color.status_red_400);
             }
         }
-        return ColorCompat.getColor(context, 2131100126);
+        return ColorCompat.getColor(context, (int) R.color.primary_300);
     }
 
     @StringRes
@@ -1207,46 +1284,46 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             switch (key.hashCode()) {
                 case -1716307998:
-                    if (key.equals("archived")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_ARCHIVED)) {
                         Object value = change.getValue();
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value).booleanValue();
                         if (booleanValue) {
-                            return 2131889750;
+                            return R.string.guild_settings_audit_log_thread_archived;
                         }
                         if (!booleanValue) {
-                            return 2131889758;
+                            return R.string.guild_settings_audit_log_thread_unarchived;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case -1097452790:
-                    if (key.equals("locked")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_LOCKED)) {
                         Object value2 = change.getValue();
                         Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue2 = ((Boolean) value2).booleanValue();
                         if (booleanValue2) {
-                            return 2131889755;
+                            return R.string.guild_settings_audit_log_thread_locked;
                         }
                         if (!booleanValue2) {
-                            return 2131889759;
+                            return R.string.guild_settings_audit_log_thread_unlocked;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 3373707:
-                    if (key.equals("name")) {
-                        return getNullableOldValueString(change, 2131889757, 2131889756);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_thread_name_create, R.string.guild_settings_audit_log_thread_name_change);
                     }
                     break;
                 case 987155184:
-                    if (key.equals("rate_limit_per_user")) {
-                        return getNullableOldValueString(change, 2131889605, 2131889604);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_RATE_LIMIT_PER_USER)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_channel_rate_limit_per_user_create, R.string.guild_settings_audit_log_channel_rate_limit_per_user_change);
                     }
                     break;
                 case 1901007105:
-                    if (key.equals("auto_archive_duration")) {
-                        return getNullableOldValueString(change, 2131889752, 2131889751);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_AUTO_ARCHIVE_DURATION)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_thread_auto_archive_duration_create, R.string.guild_settings_audit_log_thread_auto_archive_duration_change);
                     }
                     break;
             }
@@ -1260,56 +1337,56 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             switch (key.hashCode()) {
                 case -1919744682:
-                    if (key.equals("prune_delete_days")) {
-                        return 2131889701;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_PRUNE_DELETE_DAYS)) {
+                        return R.string.guild_settings_audit_log_member_prune_delete_days;
                     }
                     break;
                 case -934964668:
-                    if (key.equals("reason")) {
-                        return 2131889622;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
+                        return R.string.guild_settings_audit_log_common_reason;
                     }
                     break;
                 case 1168893:
-                    if (key.equals("$add")) {
-                        return 2131889703;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_ROLES_ADD)) {
+                        return R.string.guild_settings_audit_log_member_roles_add;
                     }
                     break;
                 case 3079270:
-                    if (key.equals("deaf")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_DEAF)) {
                         Object value = change.getValue();
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value).booleanValue();
                         if (booleanValue) {
-                            return 2131889691;
+                            return R.string.guild_settings_audit_log_member_deaf_on;
                         }
                         if (!booleanValue) {
-                            return 2131889690;
+                            return R.string.guild_settings_audit_log_member_deaf_off;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 3363353:
-                    if (key.equals("mute")) {
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_MUTE)) {
                         Object value2 = change.getValue();
                         Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue2 = ((Boolean) value2).booleanValue();
                         if (booleanValue2) {
-                            return 2131889696;
+                            return R.string.guild_settings_audit_log_member_mute_on;
                         }
                         if (!booleanValue2) {
-                            return 2131889695;
+                            return R.string.guild_settings_audit_log_member_mute_off;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 3381091:
-                    if (key.equals("nick")) {
-                        return getNullableNewOrOldValueString$default(this, change, 2131889697, 2131889698, 2131889699, null, 8, null);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NICK)) {
+                        return getNullableNewOrOldValueString$default(this, change, Integer.valueOf((int) R.string.guild_settings_audit_log_member_nick_change), Integer.valueOf((int) R.string.guild_settings_audit_log_member_nick_create), Integer.valueOf((int) R.string.guild_settings_audit_log_member_nick_delete), null, 8, null);
                     }
                     break;
                 case 950750632:
-                    if (key.equals("$remove")) {
-                        return 2131889704;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_ROLES_REMOVE)) {
+                        return R.string.guild_settings_audit_log_member_roles_remove;
                     }
                     break;
             }
@@ -1323,23 +1400,23 @@ public final class AuditLogChangeUtils {
         if (key != null) {
             switch (key.hashCode()) {
                 case -1930808873:
-                    if (key.equals("channel_id")) {
-                        return getNullableOldValueString(change, 2131889765, 2131889764);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_webhook_channel_create, R.string.guild_settings_audit_log_webhook_channel_change);
                     }
                     break;
                 case -934964668:
-                    if (key.equals("reason")) {
-                        return 2131889622;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_REASON)) {
+                        return R.string.guild_settings_audit_log_common_reason;
                     }
                     break;
                 case 3373707:
-                    if (key.equals("name")) {
-                        return getNullableOldValueString(change, 2131889769, 2131889768);
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_NAME)) {
+                        return getNullableOldValueString(change, R.string.guild_settings_audit_log_webhook_name_create, R.string.guild_settings_audit_log_webhook_name_change);
                     }
                     break;
                 case 396929076:
-                    if (key.equals("avatar_hash")) {
-                        return 2131889763;
+                    if (key.equals(ModelAuditLogEntry.CHANGE_KEY_AVATAR_HASH)) {
+                        return R.string.guild_settings_audit_log_webhook_avatar;
                     }
                     break;
             }
@@ -1392,10 +1469,10 @@ public final class AuditLogChangeUtils {
                 }
                 int hashCode = key2.hashCode();
                 if (hashCode != 3355) {
-                    if (hashCode != 852040376 || !key2.equals("permission_overwrites")) {
+                    if (hashCode != 852040376 || !key2.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSION_OVERWRITES)) {
                         return false;
                     }
-                } else if (!key2.equals("id")) {
+                } else if (!key2.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     return false;
                 }
             } else if (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) {
@@ -1406,13 +1483,13 @@ public final class AuditLogChangeUtils {
                 int hashCode2 = key3.hashCode();
                 if (hashCode2 != 3355) {
                     if (hashCode2 != 3575610) {
-                        if (hashCode2 != 852040376 || !key3.equals("permission_overwrites")) {
+                        if (hashCode2 != 852040376 || !key3.equals(ModelAuditLogEntry.CHANGE_KEY_PERMISSION_OVERWRITES)) {
                             return false;
                         }
                     } else if (!key3.equals("type")) {
                         return false;
                     }
-                } else if (!key3.equals("id")) {
+                } else if (!key3.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                     return false;
                 }
             } else if (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.INVITE) {
@@ -1422,10 +1499,10 @@ public final class AuditLogChangeUtils {
                 }
                 int hashCode3 = key4.hashCode();
                 if (hashCode3 != 3599308) {
-                    if (hashCode3 != 1198966417 || !key4.equals("inviter_id")) {
+                    if (hashCode3 != 1198966417 || !key4.equals(ModelAuditLogEntry.CHANGE_KEY_INVITER_ID)) {
                         return false;
                     }
-                } else if (!key4.equals("uses")) {
+                } else if (!key4.equals(ModelAuditLogEntry.CHANGE_KEY_USES)) {
                     return false;
                 }
             } else if (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.WEBHOOK) {
@@ -1438,7 +1515,7 @@ public final class AuditLogChangeUtils {
                     if (hashCode4 != 3575610 || !key5.equals("type")) {
                         return false;
                     }
-                } else if (!key5.equals("application_id")) {
+                } else if (!key5.equals(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID)) {
                     return false;
                 }
             } else if (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.INTEGRATION) {
@@ -1451,22 +1528,22 @@ public final class AuditLogChangeUtils {
             } else {
                 switch (key.hashCode()) {
                     case -1724546052:
-                        if (key.equals("description")) {
+                        if (key.equals(ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION)) {
                             return t.isBlank(change.getValue().toString());
                         }
                         return false;
                     case -1306538777:
-                        if (!key.equals("guild_id")) {
+                        if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID)) {
                             return false;
                         }
                         break;
                     case -733902135:
-                        if (!key.equals("available")) {
+                        if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_AVAILABLE)) {
                             return false;
                         }
                         break;
                     case 3355:
-                        if (!key.equals("id")) {
+                        if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_ID)) {
                             return false;
                         }
                         break;
@@ -1476,12 +1553,12 @@ public final class AuditLogChangeUtils {
                         }
                         break;
                     case 93121264:
-                        if (!key.equals("asset")) {
+                        if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_ASSET)) {
                             return false;
                         }
                         break;
                     case 1458614914:
-                        if (!key.equals("format_type")) {
+                        if (!key.equals(ModelAuditLogEntry.CHANGE_KEY_FORMAT_TYPE)) {
                             return false;
                         }
                         break;
@@ -1503,7 +1580,7 @@ public final class AuditLogChangeUtils {
         m.checkNotNullParameter(modelAuditLogEntry, "auditLogEntry");
         m.checkNotNullParameter(map, "targets");
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder();
-        Typeface create = Typeface.create(FontUtils.INSTANCE.getThemedFont(context, 2130969325), 0);
+        Typeface create = Typeface.create(FontUtils.INSTANCE.getThemedFont(context, R.attr.font_monospace), 0);
         List<ModelAuditLogEntry.Change> changes = modelAuditLogEntry.getChanges();
         if (changes != null) {
             int i3 = 0;
@@ -1577,7 +1654,7 @@ public final class AuditLogChangeUtils {
                             spannableStringBuilder.setSpan(new TypefaceSpanCompat(create), max, length, 33);
                             Long l = null;
                             spannableStringBuilder.append(b.l(auditLogChangeUtils.getChangeTextWithParams(context, modelAuditLogEntry, change, i, map), new Object[0], null, 2));
-                            if (m.areEqual(change.getKey(), "color") && change.getValue() != null) {
+                            if (m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_COLOR) && change.getValue() != null) {
                                 Object value = change.getValue();
                                 if (value instanceof Long) {
                                     l = value;
@@ -1642,10 +1719,10 @@ public final class AuditLogChangeUtils {
         Pair<HashSet<Long>, HashSet<Long>> calculatePermissionChange = calculatePermissionChange(change);
         ArrayList arrayList = new ArrayList();
         if (!calculatePermissionChange.getFirst().isEmpty()) {
-            arrayList.add(new ModelAuditLogEntry.Change("allow", null, calculatePermissionChange.getFirst()));
+            arrayList.add(new ModelAuditLogEntry.Change(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED, null, calculatePermissionChange.getFirst()));
         }
         if (!calculatePermissionChange.getSecond().isEmpty()) {
-            arrayList.add(new ModelAuditLogEntry.Change("deny", null, calculatePermissionChange.getSecond()));
+            arrayList.add(new ModelAuditLogEntry.Change(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_DENIED, null, calculatePermissionChange.getSecond()));
         }
         return arrayList;
     }
@@ -1658,7 +1735,7 @@ public final class AuditLogChangeUtils {
             arrayList.add(new ModelAuditLogEntry.Change(change.getKey(), null, calculatePermissionChange.getFirst()));
         }
         if (!calculatePermissionChange.getSecond().isEmpty()) {
-            arrayList.add(new ModelAuditLogEntry.Change("reset", null, calculatePermissionChange.getSecond()));
+            arrayList.add(new ModelAuditLogEntry.Change(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_RESET, null, calculatePermissionChange.getSecond()));
         }
         return arrayList;
     }
diff --git a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java
index d060344369..cde099e78f 100644
--- a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java
+++ b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java
@@ -8,10 +8,12 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppLog;
 import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.resources.StringResourceUtilsKt;
@@ -88,25 +90,25 @@ public final class AuditLogUtils {
         ModelAuditLogEntry.Change change = null;
         switch (actionTypeId) {
             case 1:
-                return 2131889654;
+                return R.string.guild_settings_audit_log_guild_update;
             case 20:
-                return 2131889693;
+                return R.string.guild_settings_audit_log_member_kick;
             case 21:
-                return 2131889700;
+                return R.string.guild_settings_audit_log_member_prune;
             case 22:
-                return 2131889688;
+                return R.string.guild_settings_audit_log_member_ban_add;
             case 23:
-                return 2131889689;
+                return R.string.guild_settings_audit_log_member_ban_remove;
             case 24:
-                return 2131889705;
+                return R.string.guild_settings_audit_log_member_update;
             case 25:
-                return 2131889702;
+                return R.string.guild_settings_audit_log_member_role_update;
             case 26:
-                return 2131889694;
+                return R.string.guild_settings_audit_log_member_move;
             case 27:
-                return 2131889692;
+                return R.string.guild_settings_audit_log_member_disconnect;
             case 28:
-                return 2131889585;
+                return R.string.guild_settings_audit_log_bot_add;
             case 110:
                 List<ModelAuditLogEntry.Change> changes = modelAuditLogEntry.getChanges();
                 if (changes != null) {
@@ -129,14 +131,11 @@ public final class AuditLogUtils {
                 Object newValue = change.getNewValue();
                 Objects.requireNonNull(newValue, "null cannot be cast to non-null type kotlin.Long");
                 int longValue = (int) ((Long) newValue).longValue();
-                if (longValue != 10) {
-                    return longValue != 12 ? 2131889753 : 2131889712;
-                }
-                return 2131889584;
+                return longValue != 10 ? longValue != 12 ? R.string.guild_settings_audit_log_thread_create : R.string.guild_settings_audit_log_private_thread_create : R.string.guild_settings_audit_log_announcement_thread_create;
             case 111:
-                return 2131889760;
+                return R.string.guild_settings_audit_log_thread_update;
             case 112:
-                return 2131889754;
+                return R.string.guild_settings_audit_log_thread_delete;
             default:
                 switch (actionTypeId) {
                     case 10:
@@ -161,101 +160,95 @@ public final class AuditLogUtils {
                         Object newValue2 = change.getNewValue();
                         Objects.requireNonNull(newValue2, "null cannot be cast to non-null type kotlin.Long");
                         int longValue2 = (int) ((Long) newValue2).longValue();
-                        if (longValue2 == 2) {
-                            return 2131889621;
-                        }
-                        if (longValue2 != 4) {
-                            return longValue2 != 13 ? 2131889610 : 2131889609;
-                        }
-                        return 2131889588;
+                        return longValue2 != 2 ? longValue2 != 4 ? longValue2 != 13 ? R.string.guild_settings_audit_log_channel_text_create : R.string.guild_settings_audit_log_channel_stage_create : R.string.guild_settings_audit_log_channel_category_create : R.string.guild_settings_audit_log_channel_voice_create;
                     case 11:
-                        return 2131889616;
+                        return R.string.guild_settings_audit_log_channel_update;
                     case 12:
-                        return 2131889591;
+                        return R.string.guild_settings_audit_log_channel_delete;
                     case 13:
-                        return 2131889596;
+                        return R.string.guild_settings_audit_log_channel_overwrite_create;
                     case 14:
-                        return 2131889598;
+                        return R.string.guild_settings_audit_log_channel_overwrite_update;
                     case 15:
-                        return 2131889597;
+                        return R.string.guild_settings_audit_log_channel_overwrite_delete;
                     default:
                         switch (actionTypeId) {
                             case 30:
-                                return 2131889716;
+                                return R.string.guild_settings_audit_log_role_create;
                             case 31:
-                                return 2131889726;
+                                return R.string.guild_settings_audit_log_role_update;
                             case 32:
-                                return 2131889717;
+                                return R.string.guild_settings_audit_log_role_delete;
                             default:
                                 switch (actionTypeId) {
                                     case 40:
-                                        return 2131889678;
+                                        return R.string.guild_settings_audit_log_invite_create;
                                     case 41:
-                                        return 2131889686;
+                                        return R.string.guild_settings_audit_log_invite_update;
                                     case 42:
-                                        return 2131889679;
+                                        return R.string.guild_settings_audit_log_invite_delete;
                                     default:
                                         switch (actionTypeId) {
                                             case 50:
-                                                return 2131889766;
+                                                return R.string.guild_settings_audit_log_webhook_create;
                                             case 51:
-                                                return 2131889770;
+                                                return R.string.guild_settings_audit_log_webhook_update;
                                             case 52:
-                                                return 2131889767;
+                                                return R.string.guild_settings_audit_log_webhook_delete;
                                             default:
                                                 switch (actionTypeId) {
                                                     case 60:
-                                                        return 2131889625;
+                                                        return R.string.guild_settings_audit_log_emoji_create;
                                                     case 61:
-                                                        return 2131889629;
+                                                        return R.string.guild_settings_audit_log_emoji_update;
                                                     case 62:
-                                                        return 2131889626;
+                                                        return R.string.guild_settings_audit_log_emoji_delete;
                                                     default:
                                                         switch (actionTypeId) {
                                                             case 72:
-                                                                return 2131889707;
+                                                                return R.string.guild_settings_audit_log_message_delete;
                                                             case 73:
-                                                                return 2131889706;
+                                                                return R.string.guild_settings_audit_log_message_bulk_delete;
                                                             case 74:
-                                                                return 2131889708;
+                                                                return R.string.guild_settings_audit_log_message_pin;
                                                             case 75:
-                                                                return 2131889709;
+                                                                return R.string.guild_settings_audit_log_message_unpin;
                                                             default:
                                                                 switch (actionTypeId) {
                                                                     case 80:
-                                                                        return 2131889668;
+                                                                        return R.string.guild_settings_audit_log_integration_create;
                                                                     case 81:
-                                                                        return 2131889675;
+                                                                        return R.string.guild_settings_audit_log_integration_update;
                                                                     case 82:
-                                                                        return 2131889669;
+                                                                        return R.string.guild_settings_audit_log_integration_delete;
                                                                     case 83:
-                                                                        return 2131889739;
+                                                                        return R.string.guild_settings_audit_log_stage_instance_create;
                                                                     case 84:
-                                                                        return 2131889744;
+                                                                        return R.string.guild_settings_audit_log_stage_instance_update;
                                                                     case 85:
-                                                                        return modelAuditLogEntry.getUserId() == 0 ? 2131889741 : 2131889740;
+                                                                        return modelAuditLogEntry.getUserId() == 0 ? R.string.guild_settings_audit_log_stage_instance_delete_no_user : R.string.guild_settings_audit_log_stage_instance_delete;
                                                                     default:
                                                                         switch (actionTypeId) {
                                                                             case 90:
-                                                                                return 2131889745;
+                                                                                return R.string.guild_settings_audit_log_sticker_create;
                                                                             case 91:
-                                                                                return 2131889747;
+                                                                                return R.string.guild_settings_audit_log_sticker_update;
                                                                             case 92:
-                                                                                return 2131889746;
+                                                                                return R.string.guild_settings_audit_log_sticker_delete;
                                                                             default:
                                                                                 switch (actionTypeId) {
                                                                                     case 100:
-                                                                                        return 2131889727;
+                                                                                        return R.string.guild_settings_audit_log_scheduled_event_create;
                                                                                     case 101:
-                                                                                        return 2131889738;
+                                                                                        return R.string.guild_settings_audit_log_scheduled_event_update;
                                                                                     case 102:
-                                                                                        return 2131889728;
+                                                                                        return R.string.guild_settings_audit_log_scheduled_event_delete;
                                                                                     default:
                                                                                         AppLog appLog = AppLog.g;
                                                                                         StringBuilder K = a.K("Unknown audit log action type: ");
                                                                                         K.append(modelAuditLogEntry.getActionTypeId());
                                                                                         Logger.e$default(appLog, K.toString(), null, null, 6, null);
-                                                                                        return 2131889762;
+                                                                                        return R.string.guild_settings_audit_log_unknown_action;
                                                                                 }
                                                                         }
                                                                 }
@@ -287,19 +280,19 @@ public final class AuditLogUtils {
                 int ordinal = targetType.ordinal();
                 if (ordinal == 3) {
                     StringBuilder K = a.K(str);
-                    K.append(getTargetValue(modelAuditLogEntry, "name"));
+                    K.append(getTargetValue(modelAuditLogEntry, ModelAuditLogEntry.CHANGE_KEY_NAME));
                     obj = K.toString();
                 } else if (ordinal == 10) {
                     obj = getTargetValue(modelAuditLogEntry, "type");
                 } else if (ordinal == 6) {
                     ModelAuditLogEntry.Options options = modelAuditLogEntry.getOptions();
                     if (options == null || (obj = options.getRoleName()) == null) {
-                        obj = getTargetValue(modelAuditLogEntry, "name");
+                        obj = getTargetValue(modelAuditLogEntry, ModelAuditLogEntry.CHANGE_KEY_NAME);
                     }
                 } else if (ordinal == 7) {
-                    obj = getTargetValue(modelAuditLogEntry, "code");
+                    obj = getTargetValue(modelAuditLogEntry, ModelAuditLogEntry.CHANGE_KEY_CODE);
                 } else if (ordinal == 8) {
-                    obj = getTargetValue(modelAuditLogEntry, "name");
+                    obj = getTargetValue(modelAuditLogEntry, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 }
             }
             obj = null;
@@ -347,7 +340,7 @@ public final class AuditLogUtils {
         Clock clock = ClockFactory.get();
         CharSequence relativeTimeSpanString = DateUtils.getRelativeTimeSpanString(j, clock.currentTimeMillis(), 86400000, 131092);
         if (TimeUnit.MILLISECONDS.toDays(clock.currentTimeMillis() - j) < ((long) 7)) {
-            return b.h(context, 2131889761, new Object[]{relativeTimeSpanString, DateUtils.formatDateTime(context, j, 1)}, null, 4);
+            return b.h(context, R.string.guild_settings_audit_log_time_at_android, new Object[]{relativeTimeSpanString, DateUtils.formatDateTime(context, j, 1)}, null, 4);
         }
         m.checkNotNullExpressionValue(relativeTimeSpanString, "timeString");
         return relativeTimeSpanString;
@@ -360,120 +353,120 @@ public final class AuditLogUtils {
     @StringRes
     public final int getActionName(int i) {
         if (i == 0) {
-            return 2131889891;
+            return R.string.guild_settings_filter_all_actions;
         }
         if (i == 1) {
-            return 2131889550;
+            return R.string.guild_settings_action_filter_guild_update;
         }
         switch (i) {
             case 10:
-                return 2131889538;
+                return R.string.guild_settings_action_filter_channel_create;
             case 11:
-                return 2131889543;
+                return R.string.guild_settings_action_filter_channel_update;
             case 12:
-                return 2131889539;
+                return R.string.guild_settings_action_filter_channel_delete;
             case 13:
-                return 2131889540;
+                return R.string.guild_settings_action_filter_channel_overwrite_create;
             case 14:
-                return 2131889542;
+                return R.string.guild_settings_action_filter_channel_overwrite_update;
             case 15:
-                return 2131889541;
+                return R.string.guild_settings_action_filter_channel_overwrite_delete;
             default:
                 switch (i) {
                     case 20:
-                        return 2131889560;
+                        return R.string.guild_settings_action_filter_member_kick;
                     case 21:
-                        return 2131889562;
+                        return R.string.guild_settings_action_filter_member_prune;
                     case 22:
-                        return 2131889557;
+                        return R.string.guild_settings_action_filter_member_ban_add;
                     case 23:
-                        return 2131889558;
+                        return R.string.guild_settings_action_filter_member_ban_remove;
                     case 24:
-                        return 2131889564;
+                        return R.string.guild_settings_action_filter_member_update;
                     case 25:
-                        return 2131889563;
+                        return R.string.guild_settings_action_filter_member_role_update;
                     case 26:
-                        return 2131889561;
+                        return R.string.guild_settings_action_filter_member_move;
                     case 27:
-                        return 2131889559;
+                        return R.string.guild_settings_action_filter_member_disconnect;
                     case 28:
-                        return 2131889537;
+                        return R.string.guild_settings_action_filter_bot_add;
                     case 100:
-                        return 2131889547;
+                        return R.string.guild_settings_action_filter_guild_scheduled_event_create;
                     case 101:
-                        return 2131889549;
+                        return R.string.guild_settings_action_filter_guild_scheduled_event_update;
                     case 102:
-                        return 2131889548;
+                        return R.string.guild_settings_action_filter_guild_scheduled_event_delete;
                     case 110:
-                        return 2131889578;
+                        return R.string.guild_settings_action_filter_thread_create;
                     case 111:
-                        return 2131889580;
+                        return R.string.guild_settings_action_filter_thread_update;
                     case 112:
-                        return 2131889579;
+                        return R.string.guild_settings_action_filter_thread_delete;
                     default:
                         switch (i) {
                             case 30:
-                                return 2131889569;
+                                return R.string.guild_settings_action_filter_role_create;
                             case 31:
-                                return 2131889571;
+                                return R.string.guild_settings_action_filter_role_update;
                             case 32:
-                                return 2131889570;
+                                return R.string.guild_settings_action_filter_role_delete;
                             default:
                                 switch (i) {
                                     case 40:
-                                        return 2131889554;
+                                        return R.string.guild_settings_action_filter_invite_create;
                                     case 41:
-                                        return 2131889556;
+                                        return R.string.guild_settings_action_filter_invite_update;
                                     case 42:
-                                        return 2131889555;
+                                        return R.string.guild_settings_action_filter_invite_delete;
                                     default:
                                         switch (i) {
                                             case 50:
-                                                return 2131889581;
+                                                return R.string.guild_settings_action_filter_webhook_create;
                                             case 51:
-                                                return 2131889583;
+                                                return R.string.guild_settings_action_filter_webhook_update;
                                             case 52:
-                                                return 2131889582;
+                                                return R.string.guild_settings_action_filter_webhook_delete;
                                             default:
                                                 switch (i) {
                                                     case 60:
-                                                        return 2131889544;
+                                                        return R.string.guild_settings_action_filter_emoji_create;
                                                     case 61:
-                                                        return 2131889546;
+                                                        return R.string.guild_settings_action_filter_emoji_update;
                                                     case 62:
-                                                        return 2131889545;
+                                                        return R.string.guild_settings_action_filter_emoji_delete;
                                                     default:
                                                         switch (i) {
                                                             case 72:
-                                                                return 2131889566;
+                                                                return R.string.guild_settings_action_filter_message_delete;
                                                             case 73:
-                                                                return 2131889565;
+                                                                return R.string.guild_settings_action_filter_message_bulk_delete;
                                                             case 74:
-                                                                return 2131889567;
+                                                                return R.string.guild_settings_action_filter_message_pin;
                                                             case 75:
-                                                                return 2131889568;
+                                                                return R.string.guild_settings_action_filter_message_unpin;
                                                             default:
                                                                 switch (i) {
                                                                     case 80:
-                                                                        return 2131889551;
+                                                                        return R.string.guild_settings_action_filter_integration_create;
                                                                     case 81:
-                                                                        return 2131889553;
+                                                                        return R.string.guild_settings_action_filter_integration_update;
                                                                     case 82:
-                                                                        return 2131889552;
+                                                                        return R.string.guild_settings_action_filter_integration_delete;
                                                                     case 83:
-                                                                        return 2131889572;
+                                                                        return R.string.guild_settings_action_filter_stage_instance_create;
                                                                     case 84:
-                                                                        return 2131889574;
+                                                                        return R.string.guild_settings_action_filter_stage_instance_update;
                                                                     case 85:
-                                                                        return 2131889573;
+                                                                        return R.string.guild_settings_action_filter_stage_instance_delete;
                                                                     default:
                                                                         switch (i) {
                                                                             case 90:
-                                                                                return 2131889575;
+                                                                                return R.string.guild_settings_action_filter_sticker_create;
                                                                             case 91:
-                                                                                return 2131889577;
+                                                                                return R.string.guild_settings_action_filter_sticker_update;
                                                                             case 92:
-                                                                                return 2131889576;
+                                                                                return R.string.guild_settings_action_filter_sticker_delete;
                                                                             default:
                                                                                 return 0;
                                                                         }
@@ -493,13 +486,13 @@ public final class AuditLogUtils {
         if (actionType != null) {
             int ordinal = actionType.ordinal();
             if (ordinal == 1) {
-                return 2131231436;
+                return R.drawable.ic_audit_audit_create_24dp;
             }
             if (ordinal == 2) {
-                return 2131231438;
+                return R.drawable.ic_audit_audit_update_24dp;
             }
             if (ordinal == 3) {
-                return 2131231437;
+                return R.drawable.ic_audit_audit_delete_24dp;
             }
         }
         return 0;
@@ -510,7 +503,12 @@ public final class AuditLogUtils {
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x018f: APUT  
       (r7v13 java.lang.Object[])
       (1 ??[boolean, int, float, short, byte, char])
-      (wrap: java.lang.CharSequence : 0x018b: INVOKE  (r2v13 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755158 int), (r13v4 int), (r14v5 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
+      (wrap: java.lang.CharSequence : 0x018b: INVOKE  (r2v13 java.lang.CharSequence) = 
+      (r20v0 android.content.Context)
+      (wrap: ?? : ?: SGET   com.discord.R.plurals.guild_settings_audit_log_message_bulk_delete_count int)
+      (r13v4 int)
+      (r14v5 java.lang.Object[])
+     type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
      */
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0189: APUT  
       (r14v5 java.lang.Object[])
@@ -520,7 +518,12 @@ public final class AuditLogUtils {
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x01dd: APUT  
       (r13v2 java.lang.Object[])
       (1 ??[boolean, int, float, short, byte, char])
-      (wrap: java.lang.CharSequence : 0x01d9: INVOKE  (r2v11 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755159 int), (r14v2 int), (r9v5 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
+      (wrap: java.lang.CharSequence : 0x01d9: INVOKE  (r2v11 java.lang.CharSequence) = 
+      (r20v0 android.content.Context)
+      (wrap: ?? : ?: SGET   com.discord.R.plurals.guild_settings_audit_log_message_delete_count int)
+      (r14v2 int)
+      (r9v5 java.lang.Object[])
+     type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
      */
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x01d7: APUT  
       (r9v5 java.lang.Object[])
@@ -535,7 +538,12 @@ public final class AuditLogUtils {
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0282: APUT  
       (r5v8 java.lang.Object[])
       (1 ??[boolean, int, float, short, byte, char])
-      (wrap: java.lang.CharSequence : 0x027e: INVOKE  (r1v38 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755152 int), (r6v12 int), (r7v10 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
+      (wrap: java.lang.CharSequence : 0x027e: INVOKE  (r1v38 java.lang.CharSequence) = 
+      (r20v0 android.content.Context)
+      (wrap: ?? : ?: SGET   com.discord.R.plurals.guild_settings_audit_log_member_disconnect_count int)
+      (r6v12 int)
+      (r7v10 java.lang.Object[])
+     type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
      */
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x027c: APUT  
       (r7v10 java.lang.Object[])
@@ -545,7 +553,12 @@ public final class AuditLogUtils {
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x02ca: APUT  
       (r7v8 java.lang.Object[])
       (1 ??[boolean, int, float, short, byte, char])
-      (wrap: java.lang.CharSequence : 0x02c6: INVOKE  (r1v21 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755153 int), (r9v2 int), (r13v1 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
+      (wrap: java.lang.CharSequence : 0x02c6: INVOKE  (r1v21 java.lang.CharSequence) = 
+      (r20v0 android.content.Context)
+      (wrap: ?? : ?: SGET   com.discord.R.plurals.guild_settings_audit_log_member_move_count int)
+      (r9v2 int)
+      (r13v1 java.lang.Object[])
+     type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
      */
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x02c4: APUT  
       (r13v1 java.lang.Object[])
@@ -563,7 +576,7 @@ public final class AuditLogUtils {
       (wrap: java.lang.CharSequence : 0x036f: INVOKE  (r1v4 java.lang.CharSequence) = 
       (r2v1 android.content.res.Resources)
       (r20v0 android.content.Context)
-      (2131755154 int)
+      (wrap: ?? : ?: SGET   com.discord.R.plurals.guild_settings_audit_log_member_prune_count int)
       (r7v2 int)
       (r8v1 java.lang.Object[])
      type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getQuantityString(android.content.res.Resources, android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence)
@@ -600,7 +613,7 @@ public final class AuditLogUtils {
             Object[] objArr2 = new Object[1];
             ModelAuditLogEntry.Options options2 = modelAuditLogEntry.getOptions();
             objArr2[0] = Integer.valueOf(options2 != null ? options2.getMembersRemoved() : 0);
-            objArr[1] = StringResourceUtilsKt.getQuantityString(resources, context, 2131755154, membersRemoved, objArr2);
+            objArr[1] = StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.guild_settings_audit_log_member_prune_count, membersRemoved, objArr2);
             return b.h(context, entryTitle, objArr, null, 4);
         } else if (actionTypeId == 42) {
             int entryTitle2 = getEntryTitle(modelAuditLogEntry);
@@ -610,7 +623,7 @@ public final class AuditLogUtils {
             if (changes != null) {
                 for (ModelAuditLogEntry.Change change : changes) {
                     m.checkNotNullExpressionValue(change, "it");
-                    if (m.areEqual(change.getKey(), "code")) {
+                    if (m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_CODE)) {
                         if (change != null) {
                             obj = change.getOldValue();
                             objArr3[1] = String.valueOf(obj);
@@ -634,7 +647,7 @@ public final class AuditLogUtils {
             Object[] objArr5 = new Object[1];
             ModelAuditLogEntry.Options options5 = modelAuditLogEntry.getOptions();
             objArr5[0] = Integer.valueOf(options5 != null ? options5.getCount() : 0);
-            objArr4[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755153, count, objArr5);
+            objArr4[1] = StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_settings_audit_log_member_move_count, count, objArr5);
             Map map2 = (Map) map.get(ModelAuditLogEntry.TargetType.CHANNEL);
             if (map2 == null || (obj2 = (CharSequence) map2.get(valueOf)) == null) {
                 obj2 = valueOf != null ? String.valueOf(valueOf.longValue()) : null;
@@ -653,7 +666,7 @@ public final class AuditLogUtils {
                     if (changes2 != null) {
                         for (ModelAuditLogEntry.Change change2 : changes2) {
                             m.checkNotNullExpressionValue(change2, "it");
-                            if (m.areEqual(change2.getKey(), "name")) {
+                            if (m.areEqual(change2.getKey(), ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                                 if (change2 != null) {
                                     obj3 = change2.getValue();
                                     objArr6[1] = String.valueOf(obj3);
@@ -679,7 +692,7 @@ public final class AuditLogUtils {
                             Object[] objArr8 = new Object[1];
                             ModelAuditLogEntry.Options options8 = modelAuditLogEntry.getOptions();
                             objArr8[0] = Integer.valueOf(options8 != null ? options8.getCount() : 0);
-                            objArr7[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755159, count2, objArr8);
+                            objArr7[1] = StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_settings_audit_log_message_delete_count, count2, objArr8);
                             objArr7[2] = getTargetText(modelAuditLogEntry, map, str);
                             Map map3 = (Map) map.get(ModelAuditLogEntry.TargetType.CHANNEL);
                             if (map3 == null || (obj4 = (CharSequence) map3.get(valueOf2)) == null) {
@@ -696,7 +709,7 @@ public final class AuditLogUtils {
                             Object[] objArr10 = new Object[1];
                             ModelAuditLogEntry.Options options10 = modelAuditLogEntry.getOptions();
                             objArr10[0] = Integer.valueOf(options10 != null ? options10.getCount() : 0);
-                            objArr9[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755158, count3, objArr10);
+                            objArr9[1] = StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_settings_audit_log_message_bulk_delete_count, count3, objArr10);
                             objArr9[2] = getTargetText(modelAuditLogEntry, map, str);
                             return b.h(context, entryTitle6, objArr9, null, 4);
                         case 74:
@@ -743,7 +756,7 @@ public final class AuditLogUtils {
                                                             obj8 = it.next();
                                                             ModelAuditLogEntry.Change change3 = (ModelAuditLogEntry.Change) obj8;
                                                             m.checkNotNullExpressionValue(change3, "it");
-                                                            if (m.areEqual(change3.getKey(), "name")) {
+                                                            if (m.areEqual(change3.getKey(), ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                                                             }
                                                         } else {
                                                             obj8 = null;
@@ -775,7 +788,7 @@ public final class AuditLogUtils {
             Object[] objArr14 = new Object[1];
             ModelAuditLogEntry.Options options14 = modelAuditLogEntry.getOptions();
             objArr14[0] = Integer.valueOf(options14 != null ? options14.getCount() : 0);
-            objArr13[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755152, count4, objArr14);
+            objArr13[1] = StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_settings_audit_log_member_disconnect_count, count4, objArr14);
             return b.h(context, entryTitle9, objArr13, null, 4);
         }
     }
@@ -786,38 +799,38 @@ public final class AuditLogUtils {
         ModelAuditLogEntry.TargetType targetType = ModelAuditLogEntry.getTargetType(i);
         m.checkNotNullExpressionValue(targetType, "ModelAuditLogEntry.getTargetType(actionTypeId)");
         if (i == 72) {
-            return DrawableCompat.getThemedDrawableRes(view, 2130969384, 0);
+            return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_message, 0);
         }
         int ordinal = targetType.ordinal();
         if (ordinal == 0) {
-            return DrawableCompat.getThemedDrawableRes(view, 2130969376, 0);
+            return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_all, 0);
         }
         switch (ordinal) {
             case 2:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969386, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_server, 0);
             case 3:
             case 4:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969378, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_channel, 0);
             case 5:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969383, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_member, 0);
             case 6:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969385, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_role, 0);
             case 7:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969381, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_invite, 0);
             case 8:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969390, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_webhook, 0);
             case 9:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969379, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_emoji, 0);
             case 10:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969380, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_integration, 0);
             case 11:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969387, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_stage_instance, 0);
             case 12:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969377, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_calendar, 0);
             case 13:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969388, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_sticker, 0);
             case 14:
-                return DrawableCompat.getThemedDrawableRes(view, 2130969389, 0);
+                return DrawableCompat.getThemedDrawableRes(view, (int) R.attr.ic_audit_thread, 0);
             default:
                 return 0;
         }
@@ -825,7 +838,7 @@ public final class AuditLogUtils {
 
     public final long getTimestampStart(ModelAuditLogEntry modelAuditLogEntry) {
         m.checkNotNullParameter(modelAuditLogEntry, "$this$getTimestampStart");
-        return (modelAuditLogEntry.getId() >>> 22) + 1420070400000L;
+        return (modelAuditLogEntry.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH;
     }
 
     public final CharSequence getTimestampString(ModelAuditLogEntry modelAuditLogEntry, Context context) {
diff --git a/app/src/main/java/com/discord/utilities/auth/AuthUtils.java b/app/src/main/java/com/discord/utilities/auth/AuthUtils.java
index 4fedce3154..e76f734f6c 100644
--- a/app/src/main/java/com/discord/utilities/auth/AuthUtils.java
+++ b/app/src/main/java/com/discord/utilities/auth/AuthUtils.java
@@ -3,6 +3,8 @@ package com.discord.utilities.auth;
 import android.annotation.SuppressLint;
 import android.util.Patterns;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import com.discord.R;
 import com.discord.utilities.string.StringUtilsKt;
 import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
@@ -49,7 +51,7 @@ public final class AuthUtils {
 
     public final ValidationManager createEmailValidationManager(TextInputLayout textInputLayout) {
         m.checkNotNullParameter(textInputLayout, "emailInput");
-        return new ValidationManager(new Input.TextInputLayoutInput("email", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131888255), createEmailInputValidator(2131888254)));
+        return new ValidationManager(new Input.TextInputLayoutInput(NotificationCompat.CATEGORY_EMAIL, textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.email_required), createEmailInputValidator(R.string.email_invalid)));
     }
 
     public final BasicTextInputValidator createPasswordInputValidator(@StringRes int i) {
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$resolveResult$notice$1.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$resolveResult$notice$1.java
index 6c475c10d3..6c1237e33e 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$resolveResult$notice$1.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$resolveResult$notice$1.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.auth;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -32,7 +33,7 @@ public final class GoogleSmartLockManager$resolveResult$notice$1 extends o imple
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
         Object obj;
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
         m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
         List<Fragment> fragments = supportFragmentManager.getFragments();
@@ -52,7 +53,7 @@ public final class GoogleSmartLockManager$resolveResult$notice$1 extends o imple
         if (fragment == null) {
             return true;
         }
-        GoogleSmartLockManager.access$resolveResult(this.this$0, fragment, 4008, this.$rae);
+        GoogleSmartLockManager.access$resolveResult(this.this$0, fragment, GoogleSmartLockManager.GOOGLE_SMART_LOCK_REQUEST_CODE_RESOLVE, this.$rae);
         return true;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
index 03b5ddf869..3c338de839 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
@@ -17,6 +17,7 @@ import c.i.a.f.n.b0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.app.AppFragment;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
@@ -82,7 +83,7 @@ public final class GoogleSmartLockManager {
         private final String password;
 
         public SmartLockCredentials(String str, String str2) {
-            m.checkNotNullParameter(str, "id");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(str2, "password");
             this.f2142id = str;
             this.password = str2;
@@ -107,7 +108,7 @@ public final class GoogleSmartLockManager {
         }
 
         public final SmartLockCredentials copy(String str, String str2) {
-            m.checkNotNullParameter(str, "id");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
             m.checkNotNullParameter(str2, "password");
             return new SmartLockCredentials(str, str2);
         }
@@ -213,7 +214,7 @@ public final class GoogleSmartLockManager {
     private final void resolveResult(ResolvableApiException resolvableApiException, String str) {
         try {
             if (resolvableApiException.mStatus.o != 4) {
-                StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("smartlock_resolution_" + str, null, 0, 0, false, this.resolvableFragments, 0, false, 0, new GoogleSmartLockManager$resolveResult$notice$1(this, resolvableApiException), 134, null));
+                StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(SMART_LOCK_NOTICE_NAME + str, null, 0, 0, false, this.resolvableFragments, 0, false, 0, new GoogleSmartLockManager$resolveResult$notice$1(this, resolvableApiException), 134, null));
             }
         } catch (IntentSender.SendIntentException e) {
             AppLog.g.w("Google Smart Lock", "Failed to send resolution.", e);
@@ -223,7 +224,7 @@ public final class GoogleSmartLockManager {
     }
 
     public final void deleteCredentials(String str) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         if (this.smartLockRepo.getEnabled()) {
             CredentialsClient credentialsClient = this.credentialsClient;
             Credential credential = new Credential(str, null, null, null, null, null, null, null);
@@ -243,7 +244,7 @@ public final class GoogleSmartLockManager {
 
     public final void requestCredentials(AppFragment appFragment, int i) {
         m.checkNotNullParameter(appFragment, "fragment");
-        CredentialRequest credentialRequest = new CredentialRequest(4, true, new String[]{"https://discord.com/"}, null, null, false, null, null, false);
+        CredentialRequest credentialRequest = new CredentialRequest(4, true, new String[]{DISCORD_ACCOUNT_IDENTITY}, null, null, false, null, null, false);
         CredentialsClient credentialsClient = this.credentialsClient;
         Objects.requireNonNull(credentialsClient);
         c.i.a.f.c.a.d.c cVar = c.i.a.f.c.a.a.g;
@@ -263,7 +264,7 @@ public final class GoogleSmartLockManager {
     }
 
     public final void saveCredentials(String str, String str2) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "password");
         if (this.smartLockRepo.getEnabled()) {
             Observable Z = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Z(1);
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManagerKt.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManagerKt.java
index bda962472e..7c2d8208b2 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManagerKt.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManagerKt.java
@@ -3,13 +3,14 @@ package com.discord.utilities.auth;
 import android.content.Context;
 import android.content.Intent;
 import com.discord.utilities.auth.GoogleSmartLockManager;
+import com.discord.widgets.auth.WidgetAuthLogin;
 import d0.z.d.m;
 /* compiled from: GoogleSmartLockManager.kt */
 public final class GoogleSmartLockManagerKt {
     public static final void clearSmartLockCredentials(Intent intent) {
         m.checkNotNullParameter(intent, "$this$clearSmartLockCredentials");
-        intent.removeExtra("smartlock_extra_id");
-        intent.removeExtra("smartlock_extra_password");
+        intent.removeExtra(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_ID);
+        intent.removeExtra(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_PASSWORD);
     }
 
     public static final GoogleSmartLockManager googleSmartLockManager(Context context) {
@@ -19,16 +20,16 @@ public final class GoogleSmartLockManagerKt {
 
     public static final boolean hasSmartLockCredentials(Intent intent) {
         m.checkNotNullParameter(intent, "$this$hasSmartLockCredentials");
-        return intent.hasExtra("smartlock_extra_id");
+        return intent.hasExtra(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_ID);
     }
 
     public static final GoogleSmartLockManager.SmartLockCredentials toSmartLockCredentials(Intent intent) {
         m.checkNotNullParameter(intent, "$this$toSmartLockCredentials");
-        if (!intent.hasExtra("smartlock_extra_id")) {
+        if (!intent.hasExtra(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_ID)) {
             return null;
         }
-        String stringExtra = intent.getStringExtra("smartlock_extra_id");
-        String stringExtra2 = intent.getStringExtra("smartlock_extra_password");
+        String stringExtra = intent.getStringExtra(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_ID);
+        String stringExtra2 = intent.getStringExtra(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_PASSWORD);
         if (stringExtra == null || stringExtra2 == null) {
             return null;
         }
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
index 3f46accd63..c7f8ca8bb6 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.auth;
 
 import android.content.Context;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.stores.StoreAuthentication;
 import com.discord.stores.StoreExperiments;
@@ -195,7 +196,7 @@ public final class GoogleSmartLockRepo {
     }
 
     public final void setSmartLockLogin(String str, String str2) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         m.checkNotNullParameter(str2, "password");
         PublishSubject<GoogleSmartLockManager.SmartLockCredentials> publishSubject = this.smartLockLogin;
         publishSubject.j.onNext(new GoogleSmartLockManager.SmartLockCredentials(str, str2));
diff --git a/app/src/main/java/com/discord/utilities/auth/RegistrationFlowRepo.java b/app/src/main/java/com/discord/utilities/auth/RegistrationFlowRepo.java
index e293834617..dc29f38beb 100644
--- a/app/src/main/java/com/discord/utilities/auth/RegistrationFlowRepo.java
+++ b/app/src/main/java/com/discord/utilities/auth/RegistrationFlowRepo.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.auth;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.models.domain.ModelInvite;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import d0.g;
@@ -148,7 +149,7 @@ public final class RegistrationFlowRepo {
             }
             String str3 = null;
             if (this.email != null) {
-                str3 = "email";
+                str3 = NotificationCompat.CATEGORY_EMAIL;
             } else if (this.phone != null) {
                 str3 = "phone";
             }
diff --git a/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java b/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
index f22f4d5f0f..e7d7b1220a 100644
--- a/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
+++ b/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.e.l;
 import c.d.a.a.b;
 import c.d.a.a.c;
@@ -58,7 +59,7 @@ public final class GooglePlayBillingManager implements e, b, g, d {
     public static final class GooglePlayBillingManagerLifecycleListener extends ActivityLifecycleCallbacks {
         @Override // com.discord.utilities.rx.ActivityLifecycleCallbacks
         public void onActivityCreated(AppActivity appActivity, Bundle bundle) {
-            m.checkNotNullParameter(appActivity, "activity");
+            m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             super.onActivityCreated(appActivity, bundle);
             l lVar = l.g;
             if (appActivity.g(l.f)) {
@@ -71,7 +72,7 @@ public final class GooglePlayBillingManager implements e, b, g, d {
 
         @Override // com.discord.utilities.rx.ActivityLifecycleCallbacks
         public void onActivityDestroyed(AppActivity appActivity) {
-            m.checkNotNullParameter(appActivity, "activity");
+            m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             super.onActivityDestroyed(appActivity);
             l lVar = l.g;
             if (appActivity.g(l.f)) {
@@ -81,7 +82,7 @@ public final class GooglePlayBillingManager implements e, b, g, d {
 
         @Override // com.discord.utilities.rx.ActivityLifecycleCallbacks
         public void onActivityResumed(AppActivity appActivity) {
-            m.checkNotNullParameter(appActivity, "activity");
+            m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             super.onActivityResumed(appActivity);
             l lVar = l.g;
             if (appActivity.g(l.f)) {
@@ -355,7 +356,7 @@ public final class GooglePlayBillingManager implements e, b, g, d {
     }
 
     public final int launchBillingFlow(Activity activity, BillingFlowParams billingFlowParams) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(billingFlowParams, "params");
         BillingClient billingClient2 = billingClient;
         if (billingClient2 == null) {
diff --git a/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java b/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java
index 4cdf65207f..19b2ab806c 100644
--- a/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java
+++ b/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java
@@ -2,6 +2,7 @@ package com.discord.utilities.billing;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
+import com.discord.R;
 import com.discord.api.premium.SubscriptionInterval;
 import d0.d0.f;
 import d0.t.g0;
@@ -33,25 +34,25 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* JADX WARN: Init of enum PREMIUM_GUILD_1_MONTHLY can be incorrect */
 /* JADX WARN: Init of enum PREMIUM_GUILD_2_MONTHLY can be incorrect */
 public enum GooglePlaySku {
-    PREMIUM_TIER_2_YEARLY("premium_tier_2_yearly", 2131231891, r14, null, 2, r15, 8, null),
-    PREMIUM_TIER_2_MONTHLY("premium_tier_2_monthly", 2131231891, r14, r13, 2, r18),
-    PREMIUM_TIER_1_YEARLY("premium_tier_1_yearly", 2131231888, r14, null, 0, r15, 8, null),
-    PREMIUM_TIER_1_MONTHLY("premium_tier_1_monthly", 2131231888, r14, r13, 0, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_1_YEARLY("premium_tier_2_premium_guild_1_yearly", 2131231879, r14, null, 3, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_1_MONTHLY("premium_tier_2_premium_guild_1_monthly", 2131231879, r14, r13, 3, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_2_YEARLY("premium_tier_2_premium_guild_2_yearly", 2131231882, r14, null, 4, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_2_MONTHLY("premium_tier_2_premium_guild_2_monthly", 2131231882, r14, r13, 4, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_3_YEARLY("premium_tier_2_premium_guild_3_yearly", 2131231884, r14, null, 5, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_3_MONTHLY("premium_tier_2_premium_guild_3_monthly", 2131231884, r14, r13, 5, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_5_YEARLY("premium_tier_2_premium_guild_5_yearly", 2131231885, r14, null, 7, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_5_MONTHLY("premium_tier_2_premium_guild_5_monthly", 2131231885, r14, r13, 7, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_10_MONTHLY("premium_tier_2_premium_guild_10_monthly", 2131231880, r14, null, 12, r18, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_13_MONTHLY("premium_tier_2_premium_guild_13_monthly", 2131231881, r14, null, 15, r18, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_28_MONTHLY("premium_tier_2_premium_guild_28_monthly", 2131231883, r14, null, 30, r18, 8, null),
-    PREMIUM_TIER_1_PREMIUM_GUILD_1_YEARLY("premium_tier_1_premium_guild_1_yearly", 2131231889, r14, null, 1, r15, 8, null),
-    PREMIUM_TIER_1_PREMIUM_GUILD_1_MONTHLY("premium_tier_1_premium_guild_1_monthly", 2131231889, r14, r13, 1, r18),
-    PREMIUM_GUILD_1_MONTHLY("premium_guild_1_monthly", 2131231886, r13, r17, 1, r18),
-    PREMIUM_GUILD_2_MONTHLY("premium_guild_2_monthly", 2131231887, r13, r17, 2, r18);
+    PREMIUM_TIER_2_YEARLY("premium_tier_2_yearly", R.drawable.ic_plan_premium_tier_2, r14, null, 2, r15, 8, null),
+    PREMIUM_TIER_2_MONTHLY("premium_tier_2_monthly", R.drawable.ic_plan_premium_tier_2, r14, r13, 2, r18),
+    PREMIUM_TIER_1_YEARLY("premium_tier_1_yearly", R.drawable.ic_plan_premium_tier_1, r14, null, 0, r15, 8, null),
+    PREMIUM_TIER_1_MONTHLY("premium_tier_1_monthly", R.drawable.ic_plan_premium_tier_1, r14, r13, 0, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_1_YEARLY("premium_tier_2_premium_guild_1_yearly", R.drawable.ic_plan_premium_and_premium_guild_1, r14, null, 3, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_1_MONTHLY("premium_tier_2_premium_guild_1_monthly", R.drawable.ic_plan_premium_and_premium_guild_1, r14, r13, 3, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_2_YEARLY("premium_tier_2_premium_guild_2_yearly", R.drawable.ic_plan_premium_and_premium_guild_2, r14, null, 4, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_2_MONTHLY("premium_tier_2_premium_guild_2_monthly", R.drawable.ic_plan_premium_and_premium_guild_2, r14, r13, 4, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_3_YEARLY("premium_tier_2_premium_guild_3_yearly", R.drawable.ic_plan_premium_and_premium_guild_3, r14, null, 5, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_3_MONTHLY("premium_tier_2_premium_guild_3_monthly", R.drawable.ic_plan_premium_and_premium_guild_3, r14, r13, 5, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_5_YEARLY("premium_tier_2_premium_guild_5_yearly", R.drawable.ic_plan_premium_and_premium_guild_5, r14, null, 7, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_5_MONTHLY("premium_tier_2_premium_guild_5_monthly", R.drawable.ic_plan_premium_and_premium_guild_5, r14, r13, 7, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_10_MONTHLY("premium_tier_2_premium_guild_10_monthly", R.drawable.ic_plan_premium_and_premium_guild_10, r14, null, 12, r18, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_13_MONTHLY("premium_tier_2_premium_guild_13_monthly", R.drawable.ic_plan_premium_and_premium_guild_13, r14, null, 15, r18, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_28_MONTHLY("premium_tier_2_premium_guild_28_monthly", R.drawable.ic_plan_premium_and_premium_guild_28, r14, null, 30, r18, 8, null),
+    PREMIUM_TIER_1_PREMIUM_GUILD_1_YEARLY("premium_tier_1_premium_guild_1_yearly", R.drawable.ic_plan_premium_tier_1_and_premium_guild_1, r14, null, 1, r15, 8, null),
+    PREMIUM_TIER_1_PREMIUM_GUILD_1_MONTHLY("premium_tier_1_premium_guild_1_monthly", R.drawable.ic_plan_premium_tier_1_and_premium_guild_1, r14, r13, 1, r18),
+    PREMIUM_GUILD_1_MONTHLY("premium_guild_1_monthly", R.drawable.ic_plan_premium_guild_1, r13, r17, 1, r18),
+    PREMIUM_GUILD_2_MONTHLY("premium_guild_2_monthly", R.drawable.ic_plan_premium_guild_2, r13, r17, 2, r18);
     
     private static final List<String> ALL_SKU_NAMES;
     public static final Companion Companion = new Companion(null);
@@ -102,19 +103,19 @@ public enum GooglePlaySku {
             m.checkNotNullParameter(type, "skuType");
             int ordinal = type.ordinal();
             if (ordinal == 0) {
-                return 2131231039;
+                return R.drawable.drawable_bg_nitro_gradient_diagonal;
             }
             if (ordinal == 1) {
-                return 2131231037;
+                return R.drawable.drawable_bg_nitro_classic_gradient_diagonal;
             }
             if (ordinal == 2) {
-                return 2131231046;
+                return R.drawable.drawable_bg_premium_tier_2_and_premium_guild_gradient;
             }
             if (ordinal == 3) {
-                return 2131231045;
+                return R.drawable.drawable_bg_premium_tier_1_and_premium_guild_gradient;
             }
             if (ordinal == 4) {
-                return 2131231043;
+                return R.drawable.drawable_bg_premium_guild_gradient;
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -177,13 +178,13 @@ public enum GooglePlaySku {
                 m.checkNotNullParameter(section, "section");
                 int ordinal = section.ordinal();
                 if (ordinal == 0) {
-                    return 2131886949;
+                    return R.string.billing_premium_plans;
                 }
                 if (ordinal == 1) {
-                    return 2131886945;
+                    return R.string.billing_premium_and_premium_guild_plans;
                 }
                 if (ordinal == 2) {
-                    return 2131886948;
+                    return R.string.billing_premium_guild_plans;
                 }
                 throw new NoWhenBranchMatchedException();
             }
diff --git a/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java b/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java
index cf7ebaceba..36823e18f3 100644
--- a/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java
@@ -3,6 +3,7 @@ package com.discord.utilities.billing;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.annotation.DrawableRes;
+import com.discord.R;
 import com.discord.models.domain.ModelPaymentSource;
 import com.discord.models.domain.premium.SubscriptionPlanType;
 import com.discord.utilities.locale.LocaleManager;
@@ -85,10 +86,10 @@ public final class PremiumUtilsKt {
     public static final int getPaymentSourceIcon(ModelPaymentSource modelPaymentSource) {
         m.checkNotNullParameter(modelPaymentSource, "paymentSource");
         if (modelPaymentSource instanceof ModelPaymentSource.ModelPaymentSourcePaypal) {
-            return 2131231582;
+            return R.drawable.ic_creditcard_paypal;
         }
         if (!(modelPaymentSource instanceof ModelPaymentSource.ModelPaymentSourceCard)) {
-            return 2131231580;
+            return R.drawable.ic_creditcard_generic;
         }
         String brand = ((ModelPaymentSource.ModelPaymentSourceCard) modelPaymentSource).getBrand();
         Objects.requireNonNull(brand, "null cannot be cast to non-null type java.lang.String");
@@ -96,25 +97,25 @@ public final class PremiumUtilsKt {
         m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase()");
         switch (lowerCase.hashCode()) {
             case -2038717326:
-                return lowerCase.equals("mastercard") ? 2131231581 : 2131231580;
+                return lowerCase.equals("mastercard") ? R.drawable.ic_creditcard_mastercard : R.drawable.ic_creditcard_generic;
             case 2997727:
-                return lowerCase.equals("amex") ? 2131231578 : 2131231580;
+                return lowerCase.equals("amex") ? R.drawable.ic_creditcard_amex : R.drawable.ic_creditcard_generic;
             case 3619905:
-                return lowerCase.equals("visa") ? 2131231583 : 2131231580;
+                return lowerCase.equals("visa") ? R.drawable.ic_creditcard_visa : R.drawable.ic_creditcard_generic;
             case 61060803:
                 if (!lowerCase.equals("american-express")) {
-                    return 2131231580;
+                    return R.drawable.ic_creditcard_generic;
                 }
                 break;
             case 273184745:
-                return lowerCase.equals("discover") ? 2131231579 : 2131231580;
+                return lowerCase.equals("discover") ? R.drawable.ic_creditcard_discover : R.drawable.ic_creditcard_generic;
             case 1174445979:
                 if (!lowerCase.equals("master-card")) {
-                    return 2131231580;
+                    return R.drawable.ic_creditcard_generic;
                 }
                 break;
             default:
-                return 2131231580;
+                return R.drawable.ic_creditcard_generic;
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java b/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
index c7a234457a..586f1323a3 100644
--- a/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
+++ b/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
@@ -60,7 +60,7 @@ public final class BugReportManager {
         this.storeUser = storeUser;
         this.settingsEnabled = true;
         this.screenshotDetector$delegate = g.lazy(BugReportManager$screenshotDetector$2.INSTANCE);
-        this.settingsEnabled = sharedPreferences.getBoolean("prefs_ss_bug_reporting_enabled", true);
+        this.settingsEnabled = sharedPreferences.getBoolean(PREFS_SS_BUG_REPORTING_SETTINGS_ENABLED, true);
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -107,7 +107,7 @@ public final class BugReportManager {
     public final void setBugReportingSettingEnabled(boolean z2) {
         SharedPreferences.Editor edit = this.cache.edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putBoolean("prefs_ss_bug_reporting_enabled", z2);
+        edit.putBoolean(PREFS_SS_BUG_REPORTING_SETTINGS_ENABLED, z2);
         edit.apply();
         this.settingsEnabled = z2;
         getScreenshotDetector().a(isEnabled());
diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java
index a43f99b271..d4970738f6 100644
--- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java
+++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.captcha;
 
 import c.i.a.f.n.d;
+import com.discord.R;
 import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import kotlin.jvm.functions.Function1;
@@ -15,6 +16,6 @@ public final class CaptchaHelper$ensurePlayServicesAvailable$2 implements d {
     @Override // c.i.a.f.n.d
     public final void onFailure(Exception exc) {
         m.checkNotNullParameter(exc, "it");
-        this.$errorHandler.invoke(new CaptchaHelper.Failure(2131887208, "missing_dependencies"));
+        this.$errorHandler.invoke(new CaptchaHelper.Failure(R.string.captcha_failed_play_services, "missing_dependencies"));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java
index aafa71b9e7..b16ee531ab 100644
--- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java
+++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.captcha;
 
 import c.i.a.f.n.d;
+import com.discord.R;
 import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import kotlin.jvm.functions.Function1;
@@ -15,6 +16,6 @@ public final class CaptchaHelper$showCaptcha$2 implements d {
     @Override // c.i.a.f.n.d
     public final void onFailure(Exception exc) {
         m.checkNotNullParameter(exc, "it");
-        this.$errorHandler.invoke(new CaptchaHelper.Failure(2131887207, "expired"));
+        this.$errorHandler.invoke(new CaptchaHelper.Failure(R.string.captcha_failed, "expired"));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
index fe4c285ae8..c6ed622032 100644
--- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
+++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
@@ -6,6 +6,7 @@ import c.i.a.f.e.h.a;
 import c.i.a.f.h.o.l;
 import c.j.a.f.a;
 import c.j.a.f.c;
+import com.discord.R;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.captcha.CaptchaHelper;
 import com.google.android.gms.common.GoogleApiAvailability;
@@ -71,7 +72,7 @@ public final class CaptchaHelper$tryShowCaptcha$1<T> implements Action1<Emitter<
             Objects.requireNonNull(name, "null cannot be cast to non-null type java.lang.String");
             String lowerCase = name.toLowerCase(locale);
             m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
-            this.$errorHandler.invoke(new CaptchaHelper.Failure(2131887207, lowerCase));
+            this.$errorHandler.invoke(new CaptchaHelper.Failure(R.string.captcha_failed, lowerCase));
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper.java
index 2bc7c9eafd..5ed6b78831 100644
--- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper.java
+++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper.java
@@ -2,6 +2,7 @@ package com.discord.utilities.captcha;
 
 import android.app.Activity;
 import android.text.TextUtils;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
 import c.i.a.f.e.h.c;
@@ -13,6 +14,7 @@ import c.i.a.f.h.o.i;
 import c.i.a.f.h.o.j;
 import c.i.a.f.n.b0;
 import c.i.a.f.n.g;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import com.google.android.gms.common.GoogleApiAvailability;
@@ -51,7 +53,7 @@ public final class CaptchaHelper {
             public HCaptcha(String str, Activity activity) {
                 super(null);
                 m.checkNotNullParameter(str, "siteKey");
-                m.checkNotNullParameter(activity, "activity");
+                m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
                 this.siteKey = str;
                 this.activity = activity;
             }
@@ -76,7 +78,7 @@ public final class CaptchaHelper {
 
             public final HCaptcha copy(String str, Activity activity) {
                 m.checkNotNullParameter(str, "siteKey");
-                m.checkNotNullParameter(activity, "activity");
+                m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
                 return new HCaptcha(str, activity);
             }
 
@@ -127,7 +129,7 @@ public final class CaptchaHelper {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public ReCaptcha(Activity activity) {
                 super(null);
-                m.checkNotNullParameter(activity, "activity");
+                m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
                 this.activity = activity;
             }
 
@@ -143,7 +145,7 @@ public final class CaptchaHelper {
             }
 
             public final ReCaptcha copy(Activity activity) {
-                m.checkNotNullParameter(activity, "activity");
+                m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
                 return new ReCaptcha(activity);
             }
 
@@ -277,7 +279,7 @@ public final class CaptchaHelper {
         } else if (c2 == 0) {
             function0.mo1invoke();
         } else {
-            function1.invoke(new Failure(2131887209, "unsupported_device"));
+            function1.invoke(new Failure(R.string.captcha_failed_unsupported, FAILED_DEVICE_UNSUPPORTED));
         }
     }
 
@@ -286,8 +288,8 @@ public final class CaptchaHelper {
         SafetyNetApi safetyNetApi = c.i.a.f.k.a.d;
         c cVar = safetyNetClient.g;
         Objects.requireNonNull((i) safetyNetApi);
-        if (!TextUtils.isEmpty("6Lff5jIUAAAAAImNXvYYPv2VW2En3Dexy4oX2o4s")) {
-            d a = cVar.a(new j(cVar, "6Lff5jIUAAAAAImNXvYYPv2VW2En3Dexy4oX2o4s"));
+        if (!TextUtils.isEmpty(RECAPTCHA_SITE_KEY)) {
+            d a = cVar.a(new j(cVar, RECAPTCHA_SITE_KEY));
             w wVar = new w(new SafetyNetApi.RecaptchaTokenResponse());
             l.b bVar = l.a;
             TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
@@ -323,7 +325,7 @@ public final class CaptchaHelper {
     public final void showCaptchaHelpDialog(AppActivity appActivity, Function0<Unit> function0) {
         FragmentManager supportFragmentManager;
         if (appActivity != null && (supportFragmentManager = appActivity.getSupportFragmentManager()) != null) {
-            WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(appActivity).setTitle(2131887212).setMessage(2131887213).setPositiveButton(2131887211, new CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1(appActivity, function0)), 2131887193, (Function1) null, 2, (Object) null);
+            WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(appActivity).setTitle(R.string.captcha_problems).setMessage(R.string.captcha_problems_info).setPositiveButton(R.string.captcha_open_browser, new CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1(appActivity, function0)), (int) R.string.cancel, (Function1) null, 2, (Object) null);
             m.checkNotNullExpressionValue(supportFragmentManager, "it");
             negativeButton$default.show(supportFragmentManager);
         }
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java b/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java
index d6d69f208c..35adccdbc0 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import androidx.annotation.StringRes;
 import c.a.e.f;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import d0.o;
 import d0.t.h0;
@@ -13,65 +14,88 @@ import java.util.Map;
 public final class ChannelPermissionUtilsKt {
     public static final Map<Integer, PermissionLabelOverrides> getCategoryLabels(Context context) {
         m.checkNotNullParameter(context, "context");
-        String string = context.getString(2131893275);
-        String string2 = context.getString(2131893277);
+        Integer valueOf = Integer.valueOf((int) R.id.channel_permission_text_read_messages);
+        String string = context.getString(R.string.role_permissions_view_channel);
+        String string2 = context.getString(R.string.role_permissions_view_channel_description_category);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…nel_description_category)");
-        String string3 = context.getString(2131891224);
-        String string4 = context.getString(2131893178);
+        Integer valueOf2 = Integer.valueOf((int) R.id.channel_permission_general_manage_channel);
+        String string3 = context.getString(R.string.manage_channels);
+        String string4 = context.getString(R.string.role_permissions_manage_channel_description_category);
         m.checkNotNullExpressionValue(string4, "context.getString(R.stri…nel_description_category)");
-        String string5 = context.getString(2131893192);
+        Integer valueOf3 = Integer.valueOf((int) R.id.channel_permission_general_manage_permissions);
+        String string5 = context.getString(R.string.role_permissions_manage_roles_description_category);
         m.checkNotNullExpressionValue(string5, "context.getString(R.stri…les_description_category)");
-        String string6 = context.getString(2131893200);
+        Integer valueOf4 = Integer.valueOf((int) R.id.channel_permission_general_manage_webhooks);
+        String string6 = context.getString(R.string.role_permissions_manage_webhooks_description_category);
         m.checkNotNullExpressionValue(string6, "context.getString(R.stri…oks_description_category)");
-        String string7 = context.getString(2131893238);
+        Integer valueOf5 = Integer.valueOf((int) R.id.channel_permission_text_send_messages);
+        String string7 = context.getString(R.string.role_permissions_send_messages_description_category);
         m.checkNotNullExpressionValue(string7, "context.getString(R.stri…ges_description_category)");
         f fVar = f.a;
         Object[] objArr = {fVar.a(360032008192L, null)};
-        String string8 = context.getString(2131893167);
+        Integer valueOf6 = Integer.valueOf((int) R.id.channel_permission_general_create_instant_invite);
+        String string8 = context.getString(R.string.role_permissions_create_instant_invite_description_category);
         m.checkNotNullExpressionValue(string8, "context.getString(R.stri…ite_description_category)");
-        String string9 = context.getString(2131893174);
+        Integer valueOf7 = Integer.valueOf((int) R.id.channel_permission_text_embed_links);
+        String string9 = context.getString(R.string.role_permissions_embed_links_description_category);
         m.checkNotNullExpressionValue(string9, "context.getString(R.stri…nks_description_category)");
-        String string10 = context.getString(2131893154);
+        Integer valueOf8 = Integer.valueOf((int) R.id.channel_permission_text_attach_files);
+        String string10 = context.getString(R.string.role_permissions_attach_files_description_category);
         m.checkNotNullExpressionValue(string10, "context.getString(R.stri…les_description_category)");
-        String string11 = context.getString(2131893150);
+        Integer valueOf9 = Integer.valueOf((int) R.id.channel_permission_text_add_reactions);
+        String string11 = context.getString(R.string.role_permissions_add_reactions_description_category);
         m.checkNotNullExpressionValue(string11, "context.getString(R.stri…ons_description_category)");
-        String string12 = context.getString(2131893258);
+        Integer valueOf10 = Integer.valueOf((int) R.id.channel_permission_text_use_external_emojis);
+        String string12 = context.getString(R.string.role_permissions_use_external_emojis_description_category);
         m.checkNotNullExpressionValue(string12, "context.getString(R.stri…jis_description_category)");
-        String string13 = context.getString(2131893262);
+        Integer valueOf11 = Integer.valueOf((int) R.id.channel_permission_text_use_external_stickers);
+        String string13 = context.getString(R.string.role_permissions_use_external_stickers_description_category);
         m.checkNotNullExpressionValue(string13, "context.getString(R.stri…ers_description_category)");
-        String string14 = context.getString(2131893203);
+        Integer valueOf12 = Integer.valueOf((int) R.id.channel_permission_text_mention_everyone);
+        String string14 = context.getString(R.string.role_permissions_mention_everyone_description_category);
         m.checkNotNullExpressionValue(string14, "context.getString(R.stri…one_description_category)");
-        String string15 = context.getString(2131893188);
+        Integer valueOf13 = Integer.valueOf((int) R.id.channel_permission_text_manage_messages);
+        String string15 = context.getString(R.string.role_permissions_manage_messages_description_category);
         m.checkNotNullExpressionValue(string15, "context.getString(R.stri…ges_description_category)");
         Object[] objArr2 = {fVar.a(360032008192L, null)};
-        String string16 = context.getString(2131893221);
+        Integer valueOf14 = Integer.valueOf((int) R.id.channel_permission_text_read_message_history);
+        String string16 = context.getString(R.string.role_permissions_read_message_history_description_category);
         m.checkNotNullExpressionValue(string16, "context.getString(R.stri…ory_description_category)");
-        String string17 = context.getString(2131893242);
+        Integer valueOf15 = Integer.valueOf((int) R.id.channel_permission_text_send_tts_messages);
+        String string17 = context.getString(R.string.role_permissions_send_tts_messages_description_category);
         m.checkNotNullExpressionValue(string17, "context.getString(R.stri…ges_description_category)");
-        String string18 = context.getString(2131893160);
+        Integer valueOf16 = Integer.valueOf((int) R.id.channel_permission_voice_connect);
+        String string18 = context.getString(R.string.role_permissions_connect_description_category);
         m.checkNotNullExpressionValue(string18, "context.getString(R.stri…ect_description_category)");
-        String string19 = context.getString(2131893161);
-        String string20 = context.getString(2131893165);
-        String string21 = context.getString(2131893245);
+        String string19 = context.getString(R.string.role_permissions_connect_description_category_everyone);
+        String string20 = context.getString(R.string.role_permissions_connect_description_voice_everyone);
+        Integer valueOf17 = Integer.valueOf((int) R.id.channel_permission_voice_speak);
+        String string21 = context.getString(R.string.role_permissions_speak_description_category);
         m.checkNotNullExpressionValue(string21, "context.getString(R.stri…eak_description_category)");
-        String string22 = context.getString(2131893249);
+        Integer valueOf18 = Integer.valueOf((int) R.id.channel_permission_voice_video);
+        String string22 = context.getString(R.string.role_permissions_stream_description_category);
         m.checkNotNullExpressionValue(string22, "context.getString(R.stri…eam_description_category)");
-        String string23 = context.getString(2131893271);
+        Integer valueOf19 = Integer.valueOf((int) R.id.channel_permission_voice_use_vad);
+        String string23 = context.getString(R.string.role_permissions_use_vad_description_category);
         m.checkNotNullExpressionValue(string23, "context.getString(R.stri…vad_description_category)");
-        CharSequence h = b.h(context, 2131893216, new Object[]{b.h(context, 2131891048, new Object[0], null, 4)}, null, 4);
-        Object[] objArr3 = {b.h(context, 2131891048, new Object[0], null, 4)};
-        String string24 = context.getString(2131893171);
+        Integer valueOf20 = Integer.valueOf((int) R.id.channel_permission_voice_priority_speaker);
+        CharSequence h = b.h(context, R.string.role_permissions_priority_speaker_description_category_mobile, new Object[]{b.h(context, R.string.keybind_push_to_talk_priority, new Object[0], null, 4)}, null, 4);
+        Object[] objArr3 = {b.h(context, R.string.keybind_push_to_talk_priority, new Object[0], null, 4)};
+        Integer valueOf21 = Integer.valueOf((int) R.id.channel_permission_voice_deafen_members);
+        String string24 = context.getString(R.string.role_permissions_deafen_members_description_category);
         m.checkNotNullExpressionValue(string24, "context.getString(R.stri…ers_description_category)");
-        String string25 = context.getString(2131893206);
+        Integer valueOf22 = Integer.valueOf((int) R.id.channel_permission_voice_move_members);
+        String string25 = context.getString(R.string.role_permissions_move_members_description_category);
         m.checkNotNullExpressionValue(string25, "context.getString(R.stri…ers_description_category)");
-        String string26 = context.getString(2131893224);
+        Integer valueOf23 = Integer.valueOf((int) R.id.channel_permission_stage_request_to_speak);
+        String string26 = context.getString(R.string.role_permissions_request_to_speak_description_category);
         m.checkNotNullExpressionValue(string26, "context.getString(R.stri…eak_description_category)");
-        return h0.hashMapOf(o.to(2131362330, new PermissionLabelOverrides(string2, string, null, null, context.getString(2131893280), context.getString(2131893281), null, context.getString(2131893278), null, 332, null)), o.to(2131362318, new PermissionLabelOverrides(string4, string3, context.getString(2131893181), context.getString(2131893179), null, null, null, null, null, 496, null)), o.to(2131362319, new PermissionLabelOverrides(string5, null, null, context.getString(2131893194), null, null, null, null, null, 502, null)), o.to(2131362321, new PermissionLabelOverrides(string6, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362331, new PermissionLabelOverrides(string7, null, null, null, null, null, null, null, b.h(context, 2131893237, objArr, null, 4), 254, null)), o.to(2131362317, new PermissionLabelOverrides(string8, null, context.getString(2131893169), null, null, null, null, null, null, 506, null)), o.to(2131362326, new PermissionLabelOverrides(string9, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362325, new PermissionLabelOverrides(string10, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362324, new PermissionLabelOverrides(string11, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362333, new PermissionLabelOverrides(string12, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362334, new PermissionLabelOverrides(string13, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362328, new PermissionLabelOverrides(string14, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362327, new PermissionLabelOverrides(string15, null, null, null, null, null, null, null, b.h(context, 2131893187, objArr2, null, 4), 254, null)), o.to(2131362329, new PermissionLabelOverrides(string16, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362332, new PermissionLabelOverrides(string17, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362338, new PermissionLabelOverrides(string18, null, null, context.getString(2131893162), null, string20, context.getString(2131893163), string19, null, 278, null)), o.to(2131362343, new PermissionLabelOverrides(string21, null, null, context.getString(2131893246), null, null, null, null, null, 502, null)), o.to(2131362345, new PermissionLabelOverrides(string22, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362344, new PermissionLabelOverrides(string23, null, null, context.getString(2131893272), null, null, null, null, null, 502, null)), o.to(2131362342, new PermissionLabelOverrides(h, null, null, null, null, null, null, b.h(context, 2131893216, objArr3, null, 4), null, 382, null)), o.to(2131362341, new PermissionLabelOverrides(b.h(context, 2131893210, new Object[0], null, 4), null, null, b.h(context, 2131893211, new Object[0], null, 4), null, null, null, null, null, 502, null)), o.to(2131362339, new PermissionLabelOverrides(string24, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362340, new PermissionLabelOverrides(string25, null, null, context.getString(2131893207), null, null, null, null, null, 502, null)), o.to(2131362323, new PermissionLabelOverrides(string26, null, null, null, null, null, null, null, null, 510, null)));
+        return h0.hashMapOf(o.to(valueOf, new PermissionLabelOverrides(string2, string, null, null, context.getString(R.string.role_permissions_view_channel_description_text_everyone), context.getString(R.string.role_permissions_view_channel_description_voice_everyone), null, context.getString(R.string.role_permissions_view_channel_description_category_everyone), null, 332, null)), o.to(valueOf2, new PermissionLabelOverrides(string4, string3, context.getString(R.string.role_permissions_manage_channel_description_voice), context.getString(R.string.role_permissions_manage_channel_description_stage), null, null, null, null, null, 496, null)), o.to(valueOf3, new PermissionLabelOverrides(string5, null, null, context.getString(R.string.role_permissions_manage_roles_description_stage), null, null, null, null, null, 502, null)), o.to(valueOf4, new PermissionLabelOverrides(string6, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf5, new PermissionLabelOverrides(string7, null, null, null, null, null, null, null, b.h(context, R.string.role_permissions_send_messages_description_announcement, objArr, null, 4), 254, null)), o.to(valueOf6, new PermissionLabelOverrides(string8, null, context.getString(R.string.role_permissions_create_instant_invite_description_voice), null, null, null, null, null, null, 506, null)), o.to(valueOf7, new PermissionLabelOverrides(string9, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf8, new PermissionLabelOverrides(string10, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf9, new PermissionLabelOverrides(string11, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf10, new PermissionLabelOverrides(string12, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf11, new PermissionLabelOverrides(string13, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf12, new PermissionLabelOverrides(string14, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf13, new PermissionLabelOverrides(string15, null, null, null, null, null, null, null, b.h(context, R.string.role_permissions_manage_messages_description_announcement, objArr2, null, 4), 254, null)), o.to(valueOf14, new PermissionLabelOverrides(string16, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf15, new PermissionLabelOverrides(string17, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf16, new PermissionLabelOverrides(string18, null, null, context.getString(R.string.role_permissions_connect_description_stage), null, string20, context.getString(R.string.role_permissions_connect_description_stage_everyone), string19, null, 278, null)), o.to(valueOf17, new PermissionLabelOverrides(string21, null, null, context.getString(R.string.role_permissions_speak_description_stage), null, null, null, null, null, 502, null)), o.to(valueOf18, new PermissionLabelOverrides(string22, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf19, new PermissionLabelOverrides(string23, null, null, context.getString(R.string.role_permissions_use_vad_description_stage), null, null, null, null, null, 502, null)), o.to(valueOf20, new PermissionLabelOverrides(h, null, null, null, null, null, null, b.h(context, R.string.role_permissions_priority_speaker_description_category_mobile, objArr3, null, 4), null, 382, null)), o.to(Integer.valueOf((int) R.id.channel_permission_voice_mute_members), new PermissionLabelOverrides(b.h(context, R.string.role_permissions_mute_members_description_category, new Object[0], null, 4), null, null, b.h(context, R.string.role_permissions_mute_members_description_stage, new Object[0], null, 4), null, null, null, null, null, 502, null)), o.to(valueOf21, new PermissionLabelOverrides(string24, null, null, null, null, null, null, null, null, 510, null)), o.to(valueOf22, new PermissionLabelOverrides(string25, null, null, context.getString(R.string.role_permissions_move_members_description_stage), null, null, null, null, null, 502, null)), o.to(valueOf23, new PermissionLabelOverrides(string26, null, null, null, null, null, null, null, null, 510, null)));
     }
 
     @StringRes
     public static final int getChannelPermissionOwnerRoleLabel(GuildRole guildRole) {
         m.checkNotNullParameter(guildRole, "role");
-        return (guildRole.g() & 8) == 8 ? 2131892771 : 2131892774;
+        return (guildRole.g() & 8) == 8 ? R.string.private_channel_add_members_modal_row_administrator : R.string.private_channel_add_members_modal_row_role;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java
index 23b7514f20..bc1ce90dbb 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.channel;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import com.discord.utilities.permissions.PermissionUtils;
@@ -31,7 +32,7 @@ public final class ChannelSelector$findAndSet$1 extends o implements Function0<C
         Context context = this.$context;
         if (context != null) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
-            String string = context.getString(2131890626);
+            String string = context.getString(R.string.inaccessible_channel_link_title);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…sible_channel_link_title)");
             accessibilityUtils.sendAnnouncement(context, string);
         }
diff --git a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java
index 8d96796649..6a91a593a7 100644
--- a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java
@@ -1,7 +1,9 @@
 package com.discord.utilities.channel;
 
 import androidx.annotation.DrawableRes;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.utilities.PermissionOverwriteUtilsKt;
 import com.discord.utilities.channel.GuildChannelIconType;
@@ -53,7 +55,7 @@ public final class GuildChannelIconUtilsKt {
                             }
                         }
                         PermissionOverwrite permissionOverwrite = (PermissionOverwrite) obj;
-                        if (permissionOverwrite != null && PermissionOverwriteUtilsKt.denies(permissionOverwrite, 1024)) {
+                        if (permissionOverwrite != null && PermissionOverwriteUtilsKt.denies(permissionOverwrite, Permission.VIEW_CHANNEL)) {
                             return GuildChannelIconType.Locked.Text.INSTANCE;
                         }
                     }
@@ -83,7 +85,7 @@ public final class GuildChannelIconUtilsKt {
                     }
                 }
                 PermissionOverwrite permissionOverwrite2 = (PermissionOverwrite) obj;
-                if (permissionOverwrite2 != null && PermissionOverwriteUtilsKt.denies(permissionOverwrite2, 1024)) {
+                if (permissionOverwrite2 != null && PermissionOverwriteUtilsKt.denies(permissionOverwrite2, Permission.VIEW_CHANNEL)) {
                     return GuildChannelIconType.Locked.Announcements.INSTANCE;
                 }
             }
@@ -99,34 +101,34 @@ public final class GuildChannelIconUtilsKt {
     public static final int mapGuildChannelTypeToIcon(GuildChannelIconType guildChannelIconType) {
         m.checkNotNullParameter(guildChannelIconType, "guildChannelIconType");
         if (m.areEqual(guildChannelIconType, GuildChannelIconType.Text.INSTANCE)) {
-            return 2131231519;
+            return R.drawable.ic_channel_text;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Thread) {
-            return 2131232047;
+            return R.drawable.ic_thread;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Announcements) {
-            return 2131231504;
+            return R.drawable.ic_channel_announcements;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.NSFW.Text) {
-            return 2131231524;
+            return R.drawable.ic_channel_text_nsfw;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.NSFW.Announcements) {
-            return 2131231507;
+            return R.drawable.ic_channel_announcements_nsfw;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.NSFW.Thread) {
-            return 2131232050;
+            return R.drawable.ic_thread_nsfw;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Locked.Text) {
-            return 2131231523;
+            return R.drawable.ic_channel_text_locked;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Locked.Announcements) {
-            return 2131231506;
+            return R.drawable.ic_channel_announcements_locked;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Locked.Thread) {
-            return 2131232049;
+            return R.drawable.ic_thread_locked;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Directory) {
-            return 2131231747;
+            return R.drawable.ic_hub_24dp;
         }
         throw new NoWhenBranchMatchedException();
     }
diff --git a/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.java b/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.java
index 7f84f0f7b9..7e717d62ed 100644
--- a/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.java
+++ b/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.channel;
 
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.models.guild.Guild;
@@ -44,7 +45,7 @@ public final class GuildChannelsInfo$Companion$get$1<T1, T2, T3, T4, T5, T6, T7,
                 boolean z6 = l2 == null && meUser != null && meUser.getId() == guild.getOwnerId();
                 m.checkNotNullExpressionValue(map2, "channelPermissions");
                 ManageGuildContext from = companion.from(list, z6, l, map2, mfaLevel, meUser == null ? meUser.getMfaEnabled() : false);
-                boolean can = PermissionUtils.can(67108864, l);
+                boolean can = PermissionUtils.can(Permission.CHANGE_NICKNAME, l);
                 m.checkNotNullExpressionValue(modelNotificationSettings, "guildSettings");
                 m.checkNotNullExpressionValue(bool, "hideMuted");
                 return new GuildChannelsInfo(guild, guildRole, modelNotificationSettings, bool.booleanValue(), map2, z2, z5, contains, from, can);
@@ -65,7 +66,7 @@ public final class GuildChannelsInfo$Companion$get$1<T1, T2, T3, T4, T5, T6, T7,
         }
         m.checkNotNullExpressionValue(map2, "channelPermissions");
         ManageGuildContext from = companion.from(list, z6, l, map2, mfaLevel, meUser == null ? meUser.getMfaEnabled() : false);
-        boolean can = PermissionUtils.can(67108864, l);
+        boolean can = PermissionUtils.can(Permission.CHANGE_NICKNAME, l);
         m.checkNotNullExpressionValue(modelNotificationSettings, "guildSettings");
         m.checkNotNullExpressionValue(bool, "hideMuted");
         return new GuildChannelsInfo(guild, guildRole, modelNotificationSettings, bool.booleanValue(), map2, z2, z5, contains, from, can);
diff --git a/app/src/main/java/com/discord/utilities/color/ColorCompat.java b/app/src/main/java/com/discord/utilities/color/ColorCompat.java
index 16451029a2..498e25ec82 100644
--- a/app/src/main/java/com/discord/utilities/color/ColorCompat.java
+++ b/app/src/main/java/com/discord/utilities/color/ColorCompat.java
@@ -13,6 +13,7 @@ import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import c.d.b.a.a;
 import d0.z.d.m;
@@ -171,7 +172,7 @@ public final class ColorCompat {
     }
 
     public final String getColorHexFromColorInt(@ColorInt int i) {
-        return a.G(new Object[]{Integer.valueOf(i & 16777215)}, 1, "#%06X", "java.lang.String.format(format, *args)");
+        return a.G(new Object[]{Integer.valueOf(i & ViewCompat.MEASURED_SIZE_MASK)}, 1, "#%06X", "java.lang.String.format(format, *args)");
     }
 
     public final int removeAlphaComponent(@ColorInt int i) {
diff --git a/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java b/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java
index 785a14623e..3cd91ba133 100644
--- a/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java
+++ b/app/src/main/java/com/discord/utilities/colors/ColorPickerUtils.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import androidx.annotation.ColorInt;
 import androidx.annotation.StringRes;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.font.FontUtils;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
@@ -19,7 +20,7 @@ public final class ColorPickerUtils {
 
     @ColorInt
     private static final int[] getColorsToDisplayForPicker(Resources resources, @ColorInt int i) {
-        int[] intArray = resources.getIntArray(2130903044);
+        int[] intArray = resources.getIntArray(R.array.color_picker_palette);
         m.checkNotNullExpressionValue(intArray, "getIntArray(com.discord.…ray.color_picker_palette)");
         ArrayList arrayList = new ArrayList();
         boolean z2 = false;
@@ -40,29 +41,29 @@ public final class ColorPickerUtils {
         int[] iArr = ColorPickerDialog.i;
         ColorPickerDialog.k kVar = new ColorPickerDialog.k();
         kVar.h = i2;
-        kVar.f2413s = ColorCompat.getThemedColor(context, 2130968904);
+        kVar.f2413s = ColorCompat.getThemedColor(context, (int) R.attr.colorBackgroundPrimary);
         kVar.i = false;
         Resources resources = context.getResources();
         m.checkNotNullExpressionValue(resources, "context.resources");
         kVar.g = getColorsToDisplayForPicker(resources, i2);
         kVar.a = i;
-        kVar.r = ColorCompat.getThemedColor(context, 2130968932);
+        kVar.r = ColorCompat.getThemedColor(context, (int) R.attr.colorHeaderPrimary);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f2414x = fontUtils.getThemedFontResId(context, 2130969322);
-        kVar.o = ColorCompat.getThemedColor(context, 2130968892);
-        kVar.f2412c = 2131887434;
-        kVar.v = ColorCompat.getColor(context, 2131100433);
-        kVar.b = 2131887435;
-        kVar.p = ColorCompat.getThemedColor(context, 2130968995);
-        kVar.d = 2131893521;
+        kVar.f2414x = fontUtils.getThemedFontResId(context, R.attr.font_display_bold);
+        kVar.o = ColorCompat.getThemedColor(context, (int) R.attr.colorBackgroundAccent);
+        kVar.f2412c = R.string.color_picker_custom;
+        kVar.v = ColorCompat.getColor(context, (int) R.color.white);
+        kVar.b = R.string.color_picker_presets;
+        kVar.p = ColorCompat.getThemedColor(context, (int) R.attr.color_brand);
+        kVar.d = R.string.select;
         kVar.l = true;
-        kVar.e = 2131893022;
-        kVar.w = ColorCompat.getColor(context, 2131100433);
-        kVar.f2415y = fontUtils.getThemedFontResId(context, 2130969328);
-        kVar.q = ColorCompat.getThemedColor(context, 2130968900);
-        kVar.t = ColorCompat.getThemedColor(context, 2130968989);
-        kVar.u = 2131231123;
-        kVar.f2416z = fontUtils.getThemedFontResId(context, 2130969327);
+        kVar.e = R.string.reset;
+        kVar.w = ColorCompat.getColor(context, (int) R.color.white);
+        kVar.f2415y = fontUtils.getThemedFontResId(context, R.attr.font_primary_semibold);
+        kVar.q = ColorCompat.getThemedColor(context, (int) R.attr.colorBackgroundModifierAccent);
+        kVar.t = ColorCompat.getThemedColor(context, (int) R.attr.colorTextMuted);
+        kVar.u = R.drawable.drawable_cpv_edit_text_background;
+        kVar.f2416z = fontUtils.getThemedFontResId(context, R.attr.font_primary_normal);
         ColorPickerDialog a = kVar.a();
         m.checkNotNullExpressionValue(a, "ColorPickerDialog.newBui…mal))\n          .create()");
         return a;
diff --git a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java
index 247356cc7e..3cce562dc1 100644
--- a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java
+++ b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.colors;
 
 import android.graphics.Bitmap;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.colors.RepresentativeColors;
 import d0.l;
 import d0.o;
@@ -76,7 +77,7 @@ public final class RepresentativeColors$handleBitmap$1 extends k implements Func
             throw new NoWhenBranchMatchedException();
         }
         if (representativeColorResult instanceof RepresentativeColors.RepresentativeColorResult.Failure) {
-            AppLog.g.e("Failed to get representative color for entity", ((RepresentativeColors.RepresentativeColorResult.Failure) representativeColorResult).getException(), h0.mapOf(o.to("id", String.valueOf(this.$id)), o.to("bitmapWidth", String.valueOf(this.$bitmap.getWidth())), o.to("bitmapHeight", String.valueOf(this.$bitmap.getHeight()))));
+            AppLog.g.e("Failed to get representative color for entity", ((RepresentativeColors.RepresentativeColorResult.Failure) representativeColorResult).getException(), h0.mapOf(o.to(ModelAuditLogEntry.CHANGE_KEY_ID, String.valueOf(this.$id)), o.to("bitmapWidth", String.valueOf(this.$bitmap.getWidth())), o.to("bitmapHeight", String.valueOf(this.$bitmap.getHeight()))));
         }
         RepresentativeColors.access$getRepresentativeColors$p(this.this$0).put(this.$id, b.boxInt(i));
         RepresentativeColors.access$getRepresentativeColorsSubject$p(this.this$0).onNext(RepresentativeColors.access$getRepresentativeColors$p(this.this$0));
diff --git a/app/src/main/java/com/discord/utilities/contacts/ContactsProviderUtils.java b/app/src/main/java/com/discord/utilities/contacts/ContactsProviderUtils.java
index 56c5afb516..fbc97a435b 100644
--- a/app/src/main/java/com/discord/utilities/contacts/ContactsProviderUtils.java
+++ b/app/src/main/java/com/discord/utilities/contacts/ContactsProviderUtils.java
@@ -56,6 +56,6 @@ public final class ContactsProviderUtils {
 
     public final boolean hasContactPermissions(Context context) {
         m.checkNotNullParameter(context, "ctx");
-        return ContextCompat.checkSelfPermission(context, "android.permission.READ_CONTACTS") == 0;
+        return ContextCompat.checkSelfPermission(context, CONTACTS_PERMISSION) == 0;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt$showServerOptions$1.java b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt$showServerOptions$1.java
index 37d1dff565..5bbfe36e95 100644
--- a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt$showServerOptions$1.java
+++ b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt$showServerOptions$1.java
@@ -7,6 +7,7 @@ import c.a.a.d;
 import c.a.e.l;
 import c.a.l.b;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.directory.DirectoryEntry;
 import com.discord.app.AppFragment;
 import com.discord.dialogs.SimpleConfirmationDialogArgs;
@@ -69,7 +70,7 @@ public final class DirectoryUtilsKt$showServerOptions$1 extends o implements Fun
             d.c cVar = d.j;
             FragmentManager childFragmentManager = this.$this_showServerOptions.getChildFragmentManager();
             m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
-            SimpleConfirmationDialogArgs simpleConfirmationDialogArgs = new SimpleConfirmationDialogArgs(this.$this_showServerOptions.getString(2131890460), b.h(this.$context, 2131890461, new Object[]{this.$directoryEntry.c().h()}, null, 4).toString(), this.$this_showServerOptions.getString(2131892939), this.$this_showServerOptions.getString(2131887193));
+            SimpleConfirmationDialogArgs simpleConfirmationDialogArgs = new SimpleConfirmationDialogArgs(this.$this_showServerOptions.getString(R.string.hub_entry_remove), b.h(this.$context, R.string.hub_entry_remove_body, new Object[]{this.$directoryEntry.c().h()}, null, 4).toString(), this.$this_showServerOptions.getString(R.string.remove), this.$this_showServerOptions.getString(R.string.cancel));
             AnonymousClass1 r0 = new AnonymousClass1(this);
             Objects.requireNonNull(cVar);
             m.checkNotNullParameter(childFragmentManager, "fragmentManager");
diff --git a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java
index 182fd266d0..a250283b48 100644
--- a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java
@@ -5,6 +5,7 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import c.a.z.a0;
 import c.a.z.b0;
+import com.discord.R;
 import com.discord.api.directory.DirectoryEntry;
 import com.discord.app.AppFragment;
 import d0.t.n;
@@ -24,9 +25,9 @@ public final class DirectoryUtilsKt {
             a0.a aVar = a0.j;
             FragmentManager childFragmentManager = appFragment.getChildFragmentManager();
             m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
-            String string = appFragment.getString(2131893575);
+            String string = appFragment.getString(R.string.server_settings);
             m.checkNotNullExpressionValue(string, "getString(R.string.server_settings)");
-            aVar.a(childFragmentManager, string, n.listOf((Object[]) new b0[]{new b0(appFragment.getString(2131890462), null, 2131231608, null, null, null, null, 122), new b0(appFragment.getString(2131890460), null, 2131231591, null, Integer.valueOf(ContextCompat.getColor(context, 2131100316)), Integer.valueOf(ContextCompat.getColor(context, 2131100316)), null, 74)}), false, new DirectoryUtilsKt$showServerOptions$1(appFragment, context, directoryEntry, j, str, function0));
+            aVar.a(childFragmentManager, string, n.listOf((Object[]) new b0[]{new b0(appFragment.getString(R.string.hub_entry_update), null, Integer.valueOf((int) R.drawable.ic_edit_24dp), null, null, null, null, 122), new b0(appFragment.getString(R.string.hub_entry_remove), null, Integer.valueOf((int) R.drawable.ic_delete_24dp), null, Integer.valueOf(ContextCompat.getColor(context, R.color.status_red)), Integer.valueOf(ContextCompat.getColor(context, R.color.status_red)), null, 74)}), false, new DirectoryUtilsKt$showServerOptions$1(appFragment, context, directoryEntry, j, str, function0));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java b/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java
index f6839e0f11..f54267015b 100644
--- a/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java
@@ -2,6 +2,7 @@ package com.discord.utilities.duration;
 
 import android.content.Context;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import d0.a0.a;
 import d0.z.d.m;
@@ -12,44 +13,44 @@ public final class DurationUtilsKt {
     public static final CharSequence humanizeDuration(Context context, long j) {
         m.checkNotNullParameter(context, "context");
         if (j <= 30000) {
-            String string = context.getString(2131890484);
+            String string = context.getString(R.string.humanize_duration_a_few_seconds);
             m.checkNotNullExpressionValue(string, "context.getString(\n     …ation_a_few_seconds\n    )");
             return string;
         } else if (j <= 60000) {
             int i = (int) (j / 1000);
-            return b.h(context, 2131890488, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755200, i, Integer.valueOf(i))}, null, 4);
+            return b.h(context, R.string.humanize_duration_seconds, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_seconds_time, i, Integer.valueOf(i))}, null, 4);
         } else if (j <= 3600000) {
             int i2 = (int) (j / 60000);
-            return b.h(context, 2131890487, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755199, i2, Integer.valueOf(i2))}, null, 4);
+            return b.h(context, R.string.humanize_duration_minutes, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_minutes_time, i2, Integer.valueOf(i2))}, null, 4);
         } else if (j <= 86400000) {
             int i3 = (int) (j / 3600000);
-            return b.h(context, 2131890486, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755198, i3, Integer.valueOf(i3))}, null, 4);
+            return b.h(context, R.string.humanize_duration_hours, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_hours_time, i3, Integer.valueOf(i3))}, null, 4);
         } else {
             int i4 = (int) (j / 86400000);
-            return b.h(context, 2131890485, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755197, i4, Integer.valueOf(i4))}, null, 4);
+            return b.h(context, R.string.humanize_duration_days, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_days_time, i4, Integer.valueOf(i4))}, null, 4);
         }
     }
 
     public static final CharSequence humanizeDurationRounded(Context context, long j) {
         m.checkNotNullParameter(context, "context");
         if (j <= 30000) {
-            String string = context.getString(2131890484);
+            String string = context.getString(R.string.humanize_duration_a_few_seconds);
             m.checkNotNullExpressionValue(string, "context.getString(\n     …ation_a_few_seconds\n    )");
             return string;
         }
         double d = (double) j;
         if (d <= 54000.0d) {
             float f = ((float) j) / ((float) 1000);
-            return b.h(context, 2131890488, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755200, a.roundToInt(f), Integer.valueOf(a.roundToInt(f)))}, null, 4);
+            return b.h(context, R.string.humanize_duration_seconds, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_seconds_time, a.roundToInt(f), Integer.valueOf(a.roundToInt(f)))}, null, 4);
         } else if (d <= 3240000.0d) {
             float f2 = ((float) j) / ((float) 60000);
-            return b.h(context, 2131890487, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755199, a.roundToInt(f2), Integer.valueOf(a.roundToInt(f2)))}, null, 4);
+            return b.h(context, R.string.humanize_duration_minutes, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_minutes_time, a.roundToInt(f2), Integer.valueOf(a.roundToInt(f2)))}, null, 4);
         } else if (d <= 7.776E7d) {
             float f3 = ((float) j) / ((float) 3600000);
-            return b.h(context, 2131890486, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755198, a.roundToInt(f3), Integer.valueOf(a.roundToInt(f3)))}, null, 4);
+            return b.h(context, R.string.humanize_duration_hours, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_hours_time, a.roundToInt(f3), Integer.valueOf(a.roundToInt(f3)))}, null, 4);
         } else {
             float f4 = ((float) j) / ((float) 86400000);
-            return b.h(context, 2131890485, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755197, a.roundToInt(f4), Integer.valueOf(a.roundToInt(f4)))}, null, 4);
+            return b.h(context, R.string.humanize_duration_days, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.humanize_duration_days_time, a.roundToInt(f4), Integer.valueOf(a.roundToInt(f4)))}, null, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java b/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java
index 0a6484f5e9..f5801bf130 100644
--- a/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java
+++ b/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import androidx.annotation.DrawableRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.attachment.MessageAttachmentType;
 import com.discord.api.message.embed.EmbedImage;
@@ -94,7 +95,7 @@ public final class EmbedResourceUtils {
     }
 
     private final RenderableEmbedMedia createFileRenderableMedia(String str) {
-        StringBuilder K = a.K("res:///");
+        StringBuilder K = a.K(FILE_SCHEME);
         K.append(getFileDrawable(str));
         return new RenderableEmbedMedia(K.toString(), 30, 40);
     }
@@ -160,7 +161,7 @@ public final class EmbedResourceUtils {
     public final int computeMaximumImageWidthPx(Context context) {
         m.checkNotNullParameter(context, "context");
         Resources resources = context.getResources();
-        return Math.min(1440, DisplayUtils.getScreenSize(context).width() - (resources.getDimensionPixelSize(2131165772) + resources.getDimensionPixelSize(2131165311)));
+        return Math.min(1440, DisplayUtils.getScreenSize(context).width() - (resources.getDimensionPixelSize(R.dimen.uikit_guideline_chat) + resources.getDimensionPixelSize(R.dimen.chat_cell_horizontal_spacing_total)));
     }
 
     public final RenderableEmbedMedia createRenderableEmbedMediaFromAttachment(MessageAttachment messageAttachment) {
@@ -204,10 +205,7 @@ public final class EmbedResourceUtils {
             str2 = substringAfterLast;
         }
         FileType fromExtension = FileType.Companion.getFromExtension(str2);
-        if (fromExtension != null) {
-            return fromExtension.getFileDrawable();
-        }
-        return 2131231666;
+        return fromExtension != null ? fromExtension.getFileDrawable() : R.drawable.ic_file_unknown;
     }
 
     public final int getMAX_IMAGE_VIEW_HEIGHT_PX() {
@@ -278,7 +276,7 @@ public final class EmbedResourceUtils {
     public final List<String> getPreviewUrls(String str, int i, int i2, boolean z2) {
         m.checkNotNullParameter(str, "originalUrl");
         String str2 = str + "?width=" + i + "&height=" + i2;
-        if (z2 && (t.startsWith$default(str, "res:///", false, 2, null) || t.endsWith$default(str, ".gif", false, 2, null))) {
+        if (z2 && (t.startsWith$default(str, FILE_SCHEME, false, 2, null) || t.endsWith$default(str, ".gif", false, 2, null))) {
             return d0.t.m.listOf(str2);
         }
         StringBuilder O = a.O(str2, "&format=");
diff --git a/app/src/main/java/com/discord/utilities/embed/FileType.java b/app/src/main/java/com/discord/utilities/embed/FileType.java
index 22047c7d0c..21049765a7 100644
--- a/app/src/main/java/com/discord/utilities/embed/FileType.java
+++ b/app/src/main/java/com/discord/utilities/embed/FileType.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.embed;
 
 import androidx.annotation.DrawableRes;
+import com.discord.R;
 import d0.z.d.m;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -117,25 +118,25 @@ public enum FileType {
     public final int getFileDrawable() {
         switch (ordinal()) {
             case 0:
-                return 2131231668;
+                return R.drawable.ic_file_video;
             case 1:
-                return 2131231651;
+                return R.drawable.ic_file_acrobat;
             case 2:
-                return 2131231652;
+                return R.drawable.ic_file_ae;
             case 3:
-                return 2131231664;
+                return R.drawable.ic_file_sketch;
             case 4:
-                return 2131231653;
+                return R.drawable.ic_file_ai;
             case 5:
-                return 2131231654;
+                return R.drawable.ic_file_archive;
             case 6:
-                return 2131231656;
+                return R.drawable.ic_file_code;
             case 7:
-                return 2131231657;
+                return R.drawable.ic_file_document;
             case 8:
-                return 2131231665;
+                return R.drawable.ic_file_spreadsheet;
             case 9:
-                return 2131231669;
+                return R.drawable.ic_file_webcode;
             default:
                 throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/utilities/error/Error.java b/app/src/main/java/com/discord/utilities/error/Error.java
index 3e2db003bc..30a4c78a35 100644
--- a/app/src/main/java/com/discord/utilities/error/Error.java
+++ b/app/src/main/java/com/discord/utilities/error/Error.java
@@ -10,10 +10,13 @@ import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 import c.a.y.a.a;
 import c.a.y.a.b;
+import com.discord.R;
 import com.discord.models.domain.Model;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.images.MGImagesBitmap;
 import com.discord.utilities.rest.RestAPIAbortMessages;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.StringReader;
@@ -212,7 +215,7 @@ public class Error {
                     }
                     break;
                 case 3059181:
-                    if (nextName.equals("code")) {
+                    if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CODE)) {
                         c2 = 3;
                         break;
                     }
@@ -313,7 +316,7 @@ public class Error {
         @Nullable
         public Long getRetryAfterMs() {
             double d = this.retryAfter;
-            if (d > 0.0d) {
+            if (d > ShadowDrawableWrapper.COS_45) {
                 return Long.valueOf((long) (d * 1000.0d));
             }
             return null;
@@ -456,7 +459,7 @@ public class Error {
         public void assignField(Model.JsonReader jsonReader) throws IOException {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
-            if (nextName.equals("code")) {
+            if (nextName.equals(ModelAuditLogEntry.CHANGE_KEY_CODE)) {
                 this.code = jsonReader.nextString(null);
             } else if (!nextName.equals("message")) {
                 jsonReader.skipValue();
@@ -672,33 +675,33 @@ public class Error {
     private List<String> getToastMessages(@NonNull Context context) {
         switch (this.type.ordinal()) {
             case 0:
-                return Collections.singletonList(context.getString(2131891646));
+                return Collections.singletonList(context.getString(R.string.network_error_cloudflare_unauthorized));
             case 1:
-                return Collections.singletonList(Response.access$100(this.response, context, 2131891648));
+                return Collections.singletonList(Response.access$100(this.response, context, R.string.network_error_forbidden));
             case 2:
-                return Collections.singletonList(context.getString(2131891645));
+                return Collections.singletonList(context.getString(R.string.network_error_cloudflare_intermittent));
             case 3:
             case 9:
-                return Collections.singletonList(Response.access$100(this.response, context, 2131891650));
+                return Collections.singletonList(Response.access$100(this.response, context, R.string.network_error_rest_request));
             case 4:
             default:
-                return Collections.singletonList(context.getString(2131891653));
+                return Collections.singletonList(context.getString(R.string.network_error_unknown));
             case 5:
-                return Collections.singletonList(Response.access$100(this.response, context, 2131891644));
+                return Collections.singletonList(Response.access$100(this.response, context, R.string.network_error_bad_request));
             case 6:
-                return Collections.singletonList(context.getString(2131890764));
+                return Collections.singletonList(context.getString(R.string.internal_server_error));
             case 7:
-                return Collections.singletonList(context.getString(2131891649));
+                return Collections.singletonList(context.getString(R.string.network_error_request_too_large));
             case 8:
-                return Collections.singletonList(context.getString(2131891652));
+                return Collections.singletonList(context.getString(R.string.network_error_unauthorized));
             case 10:
-                return Collections.singletonList(context.getString(2131892894));
+                return Collections.singletonList(context.getString(R.string.rate_limited));
             case 11:
-                return Collections.singletonList(context.getString(2131891647));
+                return Collections.singletonList(context.getString(R.string.network_error_connection));
             case 12:
-                return Collections.singletonList(context.getString(2131891651));
+                return Collections.singletonList(context.getString(R.string.network_error_ssl));
             case 13:
-                return Collections.singletonList(context.getString(2131894333));
+                return Collections.singletonList(context.getString(R.string.timeout_error));
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java b/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java
index b720084281..afe7559092 100644
--- a/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java
+++ b/app/src/main/java/com/discord/utilities/experiments/ExperimentUtils.java
@@ -8,6 +8,7 @@ import com.discord.models.experiments.dto.GuildExperimentFilter;
 import com.discord.models.experiments.dto.GuildExperimentOverridesDto;
 import com.discord.models.experiments.dto.GuildExperimentPopulationDto;
 import com.discord.models.guild.Guild;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.d0.f;
 import d0.z.d.m;
 import java.util.Collection;
@@ -45,7 +46,7 @@ public final class ExperimentUtils {
             str = hashKey;
         }
         sb.append(str);
-        sb.append(':');
+        sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         sb.append(j);
         long from = ExperimentHash.INSTANCE.from(sb.toString()) % ((long) 10000);
         for (GuildExperimentPopulationDto guildExperimentPopulationDto : guildExperimentDto.getPopulations()) {
diff --git a/app/src/main/java/com/discord/utilities/experiments/RegisteredExperiment.java b/app/src/main/java/com/discord/utilities/experiments/RegisteredExperiment.java
index d58fe6873a..cc88c7b223 100644
--- a/app/src/main/java/com/discord/utilities/experiments/RegisteredExperiment.java
+++ b/app/src/main/java/com/discord/utilities/experiments/RegisteredExperiment.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.experiments;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: ExperimentRegistry.kt */
@@ -19,7 +20,7 @@ public final class RegisteredExperiment {
 
     public RegisteredExperiment(String str, String str2, Type type, List<String> list, boolean z2) {
         m.checkNotNullParameter(str, "readableName");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(type, "type");
         m.checkNotNullParameter(list, "buckets");
         this.readableName = str;
@@ -72,7 +73,7 @@ public final class RegisteredExperiment {
 
     public final RegisteredExperiment copy(String str, String str2, Type type, List<String> list, boolean z2) {
         m.checkNotNullParameter(str, "readableName");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(type, "type");
         m.checkNotNullParameter(list, "buckets");
         return new RegisteredExperiment(str, str2, type, list, z2);
diff --git a/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java b/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java
index 553340ecfe..a6f3c7fca5 100644
--- a/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java
@@ -3,6 +3,7 @@ package com.discord.utilities.extensions;
 import android.content.Context;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DimenRes;
+import com.discord.R;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.User;
 import com.discord.utilities.icon.IconUtils;
@@ -17,15 +18,15 @@ public final class SimpleDraweeViewExtensionsKt {
     public static final void setGuildIcon(SimpleDraweeView simpleDraweeView, boolean z2, Guild guild, float f, Integer num, @ColorInt Integer num2, @ColorInt Integer num3, Float f2, boolean z3, Function1<? super ImageRequestBuilder, Unit> function1) {
         CharSequence charSequence;
         m.checkNotNullParameter(simpleDraweeView, "$this$setGuildIcon");
-        String forGuild = IconUtils.getForGuild(guild, "asset://asset/images/default_icon_selected.jpg", z3, num);
-        if (!m.areEqual(forGuild, simpleDraweeView.getTag(2131365606))) {
-            simpleDraweeView.setTag(2131365606, forGuild);
+        String forGuild = IconUtils.getForGuild(guild, IconUtils.DEFAULT_ICON_BLURPLE, z3, num);
+        if (!m.areEqual(forGuild, simpleDraweeView.getTag(R.id.uikit_icon_url))) {
+            simpleDraweeView.setTag(R.id.uikit_icon_url, forGuild);
             IconUtils.setIcon$default(simpleDraweeView, forGuild, 0, function1, (MGImages.ChangeDetector) null, 20, (Object) null);
         }
         MGImages.setRoundingParams(simpleDraweeView, f, !z2, num2, num3, f2);
         if (guild == null || (charSequence = guild.getName()) == null) {
             Context context = simpleDraweeView.getContext();
-            charSequence = context != null ? context.getString(2131890399) : null;
+            charSequence = context != null ? context.getString(R.string.home) : null;
         }
         simpleDraweeView.setContentDescription(charSequence);
     }
@@ -49,8 +50,8 @@ public final class SimpleDraweeViewExtensionsKt {
         m.checkNotNullParameter(simpleDraweeView, "$this$setUserIcon");
         int dimensionPixelSize = simpleDraweeView.getResources().getDimensionPixelSize(i);
         String forUser = dimensionPixelSize > 0 ? IconUtils.getForUser(l, str, num, z2, Integer.valueOf(IconUtils.getMediaProxySize(dimensionPixelSize))) : IconUtils.getForUser$default(l, str, num, z2, null, 16, null);
-        if (!m.areEqual(forUser, simpleDraweeView.getTag(2131365606))) {
-            simpleDraweeView.setTag(2131365606, forUser);
+        if (!m.areEqual(forUser, simpleDraweeView.getTag(R.id.uikit_icon_url))) {
+            simpleDraweeView.setTag(R.id.uikit_icon_url, forUser);
             IconUtils.setIcon$default(simpleDraweeView, forUser, i, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
     }
@@ -60,7 +61,7 @@ public final class SimpleDraweeViewExtensionsKt {
             z2 = false;
         }
         if ((i2 & 4) != 0) {
-            i = 2131165298;
+            i = R.dimen.avatar_size_unrestricted;
         }
         setUserIcon(simpleDraweeView, user, z2, i);
     }
@@ -69,6 +70,6 @@ public final class SimpleDraweeViewExtensionsKt {
         if ((i2 & 4) != 0) {
             num = null;
         }
-        setUserIcon(simpleDraweeView, l, str, num, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131165298 : i);
+        setUserIcon(simpleDraweeView, l, str, num, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? R.dimen.avatar_size_unrestricted : i);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java b/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java
index 25cd0b0dd3..8bd50f6fa6 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.app.RemoteInput;
 import androidx.work.BackoffPolicy;
@@ -17,6 +18,7 @@ import androidx.work.WorkManager;
 import c.d.b.a.a;
 import com.discord.app.AppLog;
 import com.discord.app.DiscordConnectService;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.logging.Logger;
 import com.discord.workers.CallActionWorker;
 import com.discord.workers.MessageAckWorker;
@@ -53,14 +55,14 @@ public final class NotificationActions extends BroadcastReceiver {
 
         public final Intent cancel(Context context, int i) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent("com.discord.intent.action.NOTIFICATION_CANCEL", Uri.parse("discord://action/notif/cancel?id=" + i), context, NotificationActions.class).putExtra("com.discord.NOTIFICATION_ID", i);
+            Intent putExtra = new Intent("com.discord.intent.action.NOTIFICATION_CANCEL", Uri.parse("discord://action/notif/cancel?id=" + i), context, NotificationActions.class).putExtra(NotificationActions.NOTIFICATION_ID, i);
             m.checkNotNullExpressionValue(putExtra, "Intent(\n          Intent…ATION_ID, notificationId)");
             return putExtra;
         }
 
         public final Intent delete(Context context, long j) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent("com.discord.intent.action.NOTIFICATION_DELETED", Uri.parse("discord://action/notif/delete?channelId=" + j), context, NotificationActions.class).putExtra("com.discord.NOTIFICATION_DELETED_CHANNEL_ID", j);
+            Intent putExtra = new Intent("com.discord.intent.action.NOTIFICATION_DELETED", Uri.parse("discord://action/notif/delete?channelId=" + j), context, NotificationActions.class).putExtra(NotificationActions.NOTIFICATION_CHANNEL_ID, j);
             m.checkNotNullExpressionValue(putExtra, "Intent(\n          Intent…ON_CHANNEL_ID, channelId)");
             return putExtra;
         }
@@ -169,7 +171,7 @@ public final class NotificationActions extends BroadcastReceiver {
                         m.checkNotNullParameter(context, "context");
                         Data build = new Data.Builder().putAll(h0.mapOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(longValue)), o.to("com.discord.intent.extra.EXTRA_CHANNEL_ID", Long.valueOf(longValue2)), o.to("com.discord.intent.extra.EXTRA_UNTIL_TIMESTAMP_MS", Long.valueOf(longValue3)))).build();
                         m.checkNotNullExpressionValue(build, "Data.Builder()\n         …     )\n          .build()");
-                        OneTimeWorkRequest build2 = new OneTimeWorkRequest.Builder(TimedMuteWorker.class).setInputData(build).setBackoffCriteria(BackoffPolicy.LINEAR, 1, TimeUnit.SECONDS).addTag("channel").addTag("mute").setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()).build();
+                        OneTimeWorkRequest build2 = new OneTimeWorkRequest.Builder(TimedMuteWorker.class).setInputData(build).setBackoffCriteria(BackoffPolicy.LINEAR, 1, TimeUnit.SECONDS).addTag("channel").addTag(ModelAuditLogEntry.CHANGE_KEY_MUTE).setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()).build();
                         m.checkNotNullExpressionValue(build2, "OneTimeWorkRequestBuilde…     )\n          .build()");
                         WorkManager.getInstance(context).enqueue(build2);
                         NotificationClient.clear$default(NotificationClient.INSTANCE, longValue2, context, false, 4, null);
@@ -200,7 +202,7 @@ public final class NotificationActions extends BroadcastReceiver {
                         m.checkNotNullExpressionValue(build, "Data.Builder()\n         …     )\n          .build()");
                         BackoffPolicy backoffPolicy = BackoffPolicy.LINEAR;
                         TimeUnit timeUnit = TimeUnit.SECONDS;
-                        OneTimeWorkRequest build2 = new OneTimeWorkRequest.Builder(CallActionWorker.class).setInputData(build).setBackoffCriteria(backoffPolicy, 1, timeUnit).addTag("call").addTag("decline").setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).setTriggerContentMaxDelay(10, timeUnit).build()).build();
+                        OneTimeWorkRequest build2 = new OneTimeWorkRequest.Builder(CallActionWorker.class).setInputData(build).setBackoffCriteria(backoffPolicy, 1, timeUnit).addTag(NotificationCompat.CATEGORY_CALL).addTag("decline").setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).setTriggerContentMaxDelay(10, timeUnit).build()).build();
                         m.checkNotNullExpressionValue(build2, "OneTimeWorkRequestBuilde…     )\n          .build()");
                         WorkManager.getInstance(context).enqueue(build2);
                     }
@@ -280,14 +282,14 @@ public final class NotificationActions extends BroadcastReceiver {
                     AppLog.i("Got notification deleted: " + intent);
                     Bundle extras = intent.getExtras();
                     if (extras != null) {
-                        NotificationClient.clear$default(NotificationClient.INSTANCE, extras.getLong("com.discord.NOTIFICATION_DELETED_CHANNEL_ID"), context, false, 4, null);
+                        NotificationClient.clear$default(NotificationClient.INSTANCE, extras.getLong(NOTIFICATION_CHANNEL_ID), context, false, 4, null);
                     }
                 }
             } else if (action.equals("com.discord.intent.action.NOTIFICATION_CANCEL")) {
                 AppLog.i("Got notification cancel: " + intent);
                 Bundle extras2 = intent.getExtras();
                 if (extras2 != null) {
-                    NotificationManagerCompat.from(context).cancel(extras2.getInt("com.discord.NOTIFICATION_ID"));
+                    NotificationManagerCompat.from(context).cancel(extras2.getInt(NOTIFICATION_ID));
                 }
             }
         }
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationClient.java b/app/src/main/java/com/discord/utilities/fcm/NotificationClient.java
index 0a667d31e4..3dd39e529d 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationClient.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationClient.java
@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.collection.ArrayMap;
+import androidx.core.app.FrameMetricsAggregator;
 import c.d.b.a.a;
 import c.i.c.c;
 import c.i.c.w.i;
@@ -41,7 +42,7 @@ public final class NotificationClient {
     public static final String NOTIF_GUILD_SCHEDULED_EVENT_START = "Guild Event Live";
     private static Context context;
     private static boolean isBackgrounded = true;
-    private static final Persister<SettingsV2> settings = new Persister<>("NOTIFICATION_CLIENT_SETTINGS_V3", new SettingsV2(false, false, false, false, false, false, null, null, null, 511, null));
+    private static final Persister<SettingsV2> settings = new Persister<>("NOTIFICATION_CLIENT_SETTINGS_V3", new SettingsV2(false, false, false, false, false, false, null, null, null, FrameMetricsAggregator.EVERY_DURATION, null));
     private static String token;
     private static Function1<? super String, Unit> tokenCallback = NotificationClient$tokenCallback$1.INSTANCE;
 
@@ -88,7 +89,7 @@ public final class NotificationClient {
                 } else if (!NotificationClient.access$isBackgrounded$p(notificationClient2) && settings$app_productionCanaryRelease.isEnabledInApp()) {
                     NotificationRenderer.INSTANCE.displayInApp(access$getContext$p, notificationData);
                 }
-            } else if (m.areEqual(notificationData.getType(), "MESSAGE_CREATE")) {
+            } else if (m.areEqual(notificationData.getType(), NotificationData.TYPE_MESSAGE_CREATE)) {
                 Logger.e$default(AppLog.g, "Not showing invalid notification", null, h0.mapOf(o.to("messageId", String.valueOf(notificationData.getMessageId())), o.to("channelId", String.valueOf(notificationData.getChannelId())), o.to("isAuthed", String.valueOf(settings$app_productionCanaryRelease.isAuthed())), o.to("type", notificationData.getType())), 2, null);
             }
         }
@@ -114,7 +115,7 @@ public final class NotificationClient {
         private final String token;
 
         public SettingsV2() {
-            this(false, false, false, false, false, false, null, null, null, 511, null);
+            this(false, false, false, false, false, false, null, null, null, FrameMetricsAggregator.EVERY_DURATION, null);
         }
 
         public SettingsV2(boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, String str, String str2, Set<Long> set) {
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
index 1e4ef03010..f9be59d9a9 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
@@ -14,6 +14,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
 import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType;
@@ -23,7 +24,9 @@ import com.discord.api.message.activity.MessageActivityType;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.user.User;
 import com.discord.app.AppActivity;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.nullserializable.NullSerializable;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.extensions.PendingIntentExtensionsKt;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.intent.IntentUtils;
@@ -31,6 +34,7 @@ import com.discord.utilities.media.AppSound;
 import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.stickers.StickerUtils;
 import com.discord.utilities.time.Clock;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.d0.f;
 import d0.g0.s;
 import d0.g0.t;
@@ -180,18 +184,18 @@ public final class NotificationData {
         public final Map<String, Object> buildTrackingData(Intent intent) {
             String stringExtra;
             HashMap hashMap = new HashMap();
-            copyStringIntoMap(intent, hashMap, "notif_type");
-            copyLongIntoMap(intent, hashMap, "notif_user_id");
-            copyLongIntoMap(intent, hashMap, "message_id");
+            copyStringIntoMap(intent, hashMap, NotificationData.ANALYTICS_NOTIF_TYPE);
+            copyLongIntoMap(intent, hashMap, NotificationData.ANALYTICS_NOTIF_USER_ID);
+            copyLongIntoMap(intent, hashMap, NotificationData.ANALYTICS_MESSAGE_ID);
             copyLongIntoMap(intent, hashMap, "guild_id");
             copyLongIntoMap(intent, hashMap, "channel_id");
-            copyIntIntoMap(intent, hashMap, "message_type");
-            copyIntIntoMap(intent, hashMap, "channel_type");
-            copyIntIntoMap(intent, hashMap, "rel_type");
-            copyIntIntoMap(intent, hashMap, "activity_type");
-            copyStringIntoMap(intent, hashMap, "activity_name");
+            copyIntIntoMap(intent, hashMap, NotificationData.ANALYTICS_MESSAGE_TYPE);
+            copyIntIntoMap(intent, hashMap, NotificationData.ANALYTICS_CHANNEL_TYPE);
+            copyIntIntoMap(intent, hashMap, NotificationData.ANALYTICS_REL_TYPE);
+            copyIntIntoMap(intent, hashMap, NotificationData.ANALYTICS_ACTIVITY_TYPE);
+            copyStringIntoMap(intent, hashMap, NotificationData.ANALYTICS_ACTIVITY_NAME);
             if (!(intent == null || (stringExtra = intent.getStringExtra("com.discord.intent.ORIGIN_SOURCE")) == null)) {
-                hashMap.put("notif_in_app", Boolean.valueOf(t.equals(stringExtra, "com.discord.intent.ORIGIN_NOTIF_INAPP", true)));
+                hashMap.put(NotificationData.ANALYTICS_NOTIF_IN_APP, Boolean.valueOf(t.equals(stringExtra, "com.discord.intent.ORIGIN_NOTIF_INAPP", true)));
             }
             return hashMap;
         }
@@ -355,7 +359,7 @@ public final class NotificationData {
             }
         }
         this.guildId = j5;
-        if (m.areEqual(str, "MESSAGE_CREATE") && (channel.A() == 0 || channel.A() == 3 || channel.A() == 10 || channel.A() == 11 || channel.A() == 12)) {
+        if (m.areEqual(str, TYPE_MESSAGE_CREATE) && (channel.A() == 0 || channel.A() == 3 || channel.A() == 10 || channel.A() == 11 || channel.A() == 12)) {
             z2 = true;
         }
         this.isGroupConversation = z2;
@@ -380,7 +384,7 @@ public final class NotificationData {
         m.checkNotNullParameter(map, "data");
         String str = map.get("type");
         str = str == null ? "" : str;
-        String str2 = map.get("message_id");
+        String str2 = map.get(ANALYTICS_MESSAGE_ID);
         long longValue = (str2 == null || (longOrNull6 = s.toLongOrNull(str2)) == null) ? -1 : longOrNull6.longValue();
         String str3 = map.get("message_activity_type");
         MessageActivityType a = (str3 == null || (intOrNull6 = s.toIntOrNull(str3)) == null) ? null : MessageActivityType.Companion.a(intOrNull6);
@@ -388,14 +392,14 @@ public final class NotificationData {
         String str5 = map.get("message_type_");
         int intValue = (str5 == null || (intOrNull5 = s.toIntOrNull(str5)) == null) ? -1 : intOrNull5.intValue();
         String str6 = map.get("message_content");
-        String str7 = map.get("channel_type");
+        String str7 = map.get(ANALYTICS_CHANNEL_TYPE);
         int intValue2 = (str7 == null || (intOrNull4 = s.toIntOrNull(str7)) == null) ? -1 : intOrNull4.intValue();
         String str8 = map.get("guild_id");
         long longValue2 = (str8 == null || (longOrNull5 = s.toLongOrNull(str8)) == null) ? -1 : longOrNull5.longValue();
         String str9 = map.get("channel_name");
         String obj = str9 != null ? b.l(a.t("!!", str9, "!!"), new Object[0], null, 2).toString() : null;
         String str10 = map.get("channel_id");
-        Channel channel = new Channel(null, intValue2, longValue2, obj, 0, (str10 == null || (longOrNull4 = s.toLongOrNull(str10)) == null) ? -1 : longOrNull4.longValue(), 0, null, null, 0, null, 0, 0, map.get("channel_icon"), 0, 0, null, false, 0, null, 0, null, map.get("rtc_region"), null, null, null, null, null, null);
+        Channel channel = new Channel(null, intValue2, longValue2, obj, 0, (str10 == null || (longOrNull4 = s.toLongOrNull(str10)) == null) ? -1 : longOrNull4.longValue(), 0, null, null, 0, null, 0, 0, map.get("channel_icon"), 0, 0, null, false, 0, null, 0, null, map.get(ModelAuditLogEntry.CHANGE_KEY_REGION_OVERRIDE), null, null, null, null, null, null);
         List access$parseAckChannelIds = Companion.access$parseAckChannelIds(Companion, map.get("channel_ids"));
         String str11 = map.get("user_id");
         long longValue3 = (str11 == null || (longOrNull3 = s.toLongOrNull(str11)) == null) ? -1 : longOrNull3.longValue();
@@ -403,16 +407,16 @@ public final class NotificationData {
         String str13 = map.get("user_discriminator");
         Integer intOrNull7 = str13 != null ? s.toIntOrNull(str13) : null;
         String str14 = map.get("user_avatar");
-        String str15 = map.get("rel_type");
+        String str15 = map.get(ANALYTICS_REL_TYPE);
         int intValue3 = (str15 == null || (intOrNull3 = s.toIntOrNull(str15)) == null) ? -1 : intOrNull3.intValue();
         String str16 = map.get("guild_id");
         long longValue4 = (str16 == null || (longOrNull2 = s.toLongOrNull(str16)) == null) ? -1 : longOrNull2.longValue();
         String str17 = map.get("guild_name");
         String str18 = map.get("guild_icon");
-        String str19 = map.get("activity_type");
+        String str19 = map.get(ANALYTICS_ACTIVITY_TYPE);
         int intValue4 = (str19 == null || (intOrNull2 = s.toIntOrNull(str19)) == null) ? -1 : intOrNull2.intValue();
-        String str20 = map.get("activity_name");
-        String str21 = map.get("application_id");
+        String str20 = map.get(ANALYTICS_ACTIVITY_NAME);
+        String str21 = map.get(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID);
         long longValue5 = (str21 == null || (longOrNull = s.toLongOrNull(str21)) == null) ? -1 : longOrNull.longValue();
         String str22 = map.get("application_name");
         String str23 = map.get("application_icon");
@@ -431,13 +435,13 @@ public final class NotificationData {
     }
 
     private final Intent addTrackingData(Intent intent) {
-        Intent putExtra = intent.putExtra("notif_type", this.type).putExtra("notif_user_id", this.userId).putExtra("message_id", this.messageId).putExtra("message_type", this.messageType).putExtra("guild_id", this.guildId).putExtra("channel_id", this.channel.h()).putExtra("channel_type", this.channel.A()).putExtra("rel_type", this.relationshipType).putExtra("activity_type", this.activityType).putExtra("activity_name", this.activityName);
+        Intent putExtra = intent.putExtra(ANALYTICS_NOTIF_TYPE, this.type).putExtra(ANALYTICS_NOTIF_USER_ID, this.userId).putExtra(ANALYTICS_MESSAGE_ID, this.messageId).putExtra(ANALYTICS_MESSAGE_TYPE, this.messageType).putExtra("guild_id", this.guildId).putExtra("channel_id", this.channel.h()).putExtra(ANALYTICS_CHANNEL_TYPE, this.channel.A()).putExtra(ANALYTICS_REL_TYPE, this.relationshipType).putExtra(ANALYTICS_ACTIVITY_TYPE, this.activityType).putExtra(ANALYTICS_ACTIVITY_NAME, this.activityName);
         m.checkNotNullExpressionValue(putExtra, "intent\n        .putExtra…IVITY_NAME, activityName)");
         return putExtra;
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:11:0x0042, code lost:
-        if (r0.equals("RELATIONSHIP_ADD") != false) goto L_0x0044;
+        if (r0.equals(com.discord.utilities.fcm.NotificationData.TYPE_RELATIONSHIP_ADD) != false) goto L_0x0044;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:13:0x004a, code lost:
         if (r8.channel.A() == 1) goto L_0x005c;
@@ -449,13 +453,13 @@ public final class NotificationData {
         return com.discord.utilities.intent.IntentUtils.RouteBuilders.selectChannel$default(r8.channel.h(), 0, null, 4, null);
      */
     /* JADX WARNING: Code restructure failed: missing block: B:3:0x0012, code lost:
-        if (r0.equals("MESSAGE_CREATE") != false) goto L_0x0044;
+        if (r0.equals(com.discord.utilities.fcm.NotificationData.TYPE_MESSAGE_CREATE) != false) goto L_0x0044;
      */
     private final Intent getContentIntentInternal() {
         String str = this.type;
         switch (str.hashCode()) {
             case -1489275252:
-                if (str.equals("GUILD_SCHEDULED_EVENT_UPDATE")) {
+                if (str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE)) {
                     GuildScheduledEventEntityType guildScheduledEventEntityType = this.guildScheduledEventEntityType;
                     return (guildScheduledEventEntityType != null && guildScheduledEventEntityType.ordinal() == 1) ? IntentUtils.RouteBuilders.INSTANCE.connectVoice(this.channel.h()) : new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getApp());
                 }
@@ -463,12 +467,12 @@ public final class NotificationData {
             case -1327124998:
                 break;
             case -1263316859:
-                if (str.equals("STAGE_INSTANCE_CREATE")) {
+                if (str.equals(TYPE_STAGE_INSTANCE_CREATE)) {
                     return IntentUtils.RouteBuilders.INSTANCE.connectVoice(this.channel.h());
                 }
                 return IntentUtils.RouteBuilders.selectChannel$default(this.channel.h(), this.guildId, null, 4, null);
             case 974015250:
-                if (str.equals("ACTIVITY_START")) {
+                if (str.equals(TYPE_ACTIVITY_START)) {
                     return IntentUtils.RouteBuilders.INSTANCE.selectDirectMessage(this.userId);
                 }
                 return IntentUtils.RouteBuilders.selectChannel$default(this.channel.h(), this.guildId, null, 4, null);
@@ -500,10 +504,10 @@ public final class NotificationData {
     }
 
     public final boolean canDisplayInApp() {
-        if (m.areEqual(this.type, "STAGE_INSTANCE_CREATE")) {
+        if (m.areEqual(this.type, TYPE_STAGE_INSTANCE_CREATE)) {
             return true;
         }
-        if (!m.areEqual(this.type, "GUILD_SCHEDULED_EVENT_UPDATE")) {
+        if (!m.areEqual(this.type, TYPE_GUILD_SCHEDULED_EVENT_UPDATE)) {
             return this.channel.h() == -1;
         }
         GuildScheduledEventEntityType guildScheduledEventEntityType = this.guildScheduledEventEntityType;
@@ -539,7 +543,7 @@ public final class NotificationData {
         String str3 = this.guildName;
         String str4 = this.guildIcon;
         List<Sticker> A = message.A();
-        return new NotificationData("MESSAGE_CREATE", o, b, g, intValue, i, a4, emptyList, i2, str, intOrNull, str2, -1, j, str3, str4, -1, null, -1, null, null, A != null ? (Sticker) u.firstOrNull((List<? extends Object>) A) : null, null, null, null);
+        return new NotificationData(TYPE_MESSAGE_CREATE, o, b, g, intValue, i, a4, emptyList, i2, str, intOrNull, str2, -1, j, str3, str4, -1, null, -1, null, null, A != null ? (Sticker) u.firstOrNull((List<? extends Object>) A) : null, null, null, null);
     }
 
     public final List<Long> getAckChannelIds() {
@@ -550,17 +554,17 @@ public final class NotificationData {
     @SuppressLint({"UnspecifiedImmutableFlag"})
     public final NotificationCompat.Action getCallAction(Context context, boolean z2) {
         m.checkNotNullParameter(context, "ctx");
-        if (!m.areEqual(this.type, "CALL_RING")) {
+        if (!m.areEqual(this.type, TYPE_CALL_RING)) {
             return null;
         }
         PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.callAction(context, this.channel.h(), this.messageId, z2)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null));
-        Pair pair = z2 ? d0.o.to(2131890953, 2131100254) : d0.o.to(2131888071, 2131100329);
+        Pair pair = z2 ? d0.o.to(Integer.valueOf((int) R.string.join_call), Integer.valueOf((int) R.color.status_green_600)) : d0.o.to(Integer.valueOf((int) R.string.decline), Integer.valueOf((int) R.color.status_red_500));
         int intValue = ((Number) pair.component1()).intValue();
         int intValue2 = ((Number) pair.component2()).intValue();
         StringBuilder K = a.K("**");
         K.append(b.h(context, intValue, new Object[0], null, 4));
         K.append("**");
-        return new NotificationCompat.Action.Builder(z2 ? 2131231484 : 2131231485, b.g(K.toString(), new Object[0], new NotificationData$getCallAction$coloredString$1(context, intValue2)), broadcast).build();
+        return new NotificationCompat.Action.Builder(z2 ? R.drawable.ic_call_24dp : R.drawable.ic_call_disconnect_24dp, b.g(K.toString(), new Object[0], new NotificationData$getCallAction$coloredString$1(context, intValue2)), broadcast).build();
     }
 
     public final long getChannelId() {
@@ -574,32 +578,32 @@ public final class NotificationData {
         String str = this.type;
         switch (str.hashCode()) {
             case -1489275252:
-                return (!str.equals("GUILD_SCHEDULED_EVENT_UPDATE") || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) ? "" : b.h(context, 2131889526, new Object[]{this.stageInstanceTopic, this.userUsername}, null, 4);
+                return (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) ? "" : b.h(context, R.string.guild_scheduled_event_stage_start_body, new Object[]{this.stageInstanceTopic, this.userUsername}, null, 4);
             case -1327124998:
-                if (!str.equals("RELATIONSHIP_ADD")) {
+                if (!str.equals(TYPE_RELATIONSHIP_ADD)) {
                     return "";
                 }
                 int i = this.relationshipType;
-                return i != 1 ? i != 3 ? "" : b.h(context, 2131891868, new Object[0], null, 4) : b.h(context, 2131891855, new Object[0], null, 4);
+                return i != 1 ? i != 3 ? "" : b.h(context, R.string.notification_pending_friend_request, new Object[0], null, 4) : b.h(context, R.string.notification_accepted_friend_request, new Object[0], null, 4);
             case -1263316859:
-                return str.equals("STAGE_INSTANCE_CREATE") ? b.h(context, 2131893855, new Object[]{this.userUsername, this.stageInstanceTopic}, null, 4) : "";
+                return str.equals(TYPE_STAGE_INSTANCE_CREATE) ? b.h(context, R.string.stage_start_push_notification_body, new Object[]{this.userUsername, this.stageInstanceTopic}, null, 4) : "";
             case -1237752112:
-                return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.h(context, 2131888963, new Object[]{this.applicationName}, null, 4) : "";
+                return str.equals(TYPE_APPLICATION_LIBRARY_INSTALL_COMPLETE) ? b.h(context, R.string.game_library_notification_game_installed_body, new Object[]{this.applicationName}, null, 4) : "";
             case 974015250:
-                return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.h(context, 2131891857, new Object[]{this.userUsername, this.activityName}, null, 4);
+                return (!str.equals(TYPE_ACTIVITY_START) || this.activityType != 0) ? "" : b.h(context, R.string.notification_body_start_game, new Object[]{this.userUsername, this.activityName}, null, 4);
             case 998188116:
-                if (!str.equals("MESSAGE_CREATE")) {
+                if (!str.equals(TYPE_MESSAGE_CREATE)) {
                     return "";
                 }
                 int A = this.channel.A();
                 if (A != 0) {
                     if (A == 1 || A == 3) {
                         if (this.messageActivityType == MessageActivityType.JOIN) {
-                            return b.h(context, 2131891859, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
+                            return b.h(context, R.string.notification_message_create_dm_activity_join, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
                         }
                         Sticker sticker = this.sticker;
                         if (sticker != null) {
-                            return b.h(context, 2131893943, new Object[]{sticker.h()}, null, 4);
+                            return b.h(context, R.string.sticker_notification_body, new Object[]{sticker.h()}, null, 4);
                         }
                         String str2 = this.messageContent;
                         if (str2 != null) {
@@ -622,11 +626,11 @@ public final class NotificationData {
                     return b.h(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(context, this.messageId), new Object[]{this.userUsername}, null, 4);
                 }
                 if (this.messageActivityType == MessageActivityType.JOIN) {
-                    return b.h(context, 2131891864, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
+                    return b.h(context, R.string.notification_message_create_guild_activity_join, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
                 }
                 Sticker sticker2 = this.sticker;
                 if (sticker2 != null) {
-                    return b.h(context, 2131893943, new Object[]{sticker2.h()}, null, 4);
+                    return b.h(context, R.string.sticker_notification_body, new Object[]{sticker2.h()}, null, 4);
                 }
                 String str3 = this.messageContent;
                 if (str3 != null) {
@@ -635,7 +639,7 @@ public final class NotificationData {
                 }
                 return null;
             case 1770025841:
-                return str.equals("CALL_RING") ? b.l(b.h(context, 2131892060, new Object[]{a.C(a.K("**"), this.userUsername, "**")}, null, 4), new Object[0], null, 2) : "";
+                return str.equals(TYPE_CALL_RING) ? b.l(b.h(context, R.string.overlay_friend_calling, new Object[]{a.C(a.K("**"), this.userUsername, "**")}, null, 4), new Object[0], null, 2) : "";
             default:
                 return "";
         }
@@ -666,7 +670,7 @@ public final class NotificationData {
     public final CharSequence getConversationTitle(Context context) {
         m.checkNotNullParameter(context, "context");
         String str = this.type;
-        if (str.hashCode() != 998188116 || !str.equals("MESSAGE_CREATE")) {
+        if (str.hashCode() != 998188116 || !str.equals(TYPE_MESSAGE_CREATE)) {
             return null;
         }
         int A = this.channel.A();
@@ -701,18 +705,18 @@ public final class NotificationData {
     public final NotificationCompat.Action getDirectReplyAction(Context context, Set<Long> set) {
         m.checkNotNullParameter(context, "ctx");
         m.checkNotNullParameter(set, "deniedChannels");
-        if ((!m.areEqual(this.type, "MESSAGE_CREATE")) || set.contains(Long.valueOf(this.channel.h()))) {
+        if ((!m.areEqual(this.type, TYPE_MESSAGE_CREATE)) || set.contains(Long.valueOf(this.channel.h()))) {
             return null;
         }
-        RemoteInput build = new RemoteInput.Builder("discord_notif_text_input").setLabel(b.h(context, 2131893547, new Object[0], null, 4)).build();
+        RemoteInput build = new RemoteInput.Builder("discord_notif_text_input").setLabel(b.h(context, R.string.send_message, new Object[0], null, 4)).build();
         m.checkNotNullExpressionValue(build, "RemoteInput.Builder(Inte…essage))\n        .build()");
-        return new NotificationCompat.Action.Builder(2131231962, b.h(context, 2131891869, new Object[0], null, 4), PendingIntent.getBroadcast(context, (int) this.channel.h(), addTrackingData(NotificationActions.Companion.directReply(context, this.channel.h(), getTitle(context))), PendingIntentExtensionsKt.mutablePendingIntentFlag(134217728))).addRemoteInput(build).setAllowGeneratedReplies(true).build();
+        return new NotificationCompat.Action.Builder((int) R.drawable.ic_send_white_24dp, b.h(context, R.string.notification_reply, new Object[0], null, 4), PendingIntent.getBroadcast(context, (int) this.channel.h(), addTrackingData(NotificationActions.Companion.directReply(context, this.channel.h(), getTitle(context))), PendingIntentExtensionsKt.mutablePendingIntentFlag(134217728))).addRemoteInput(build).setAllowGeneratedReplies(true).build();
     }
 
     @SuppressLint({"UnspecifiedImmutableFlag"})
     public final PendingIntent getFullScreenIntent(Context context) {
         m.checkNotNullParameter(context, "context");
-        if (!m.areEqual(getNotificationCategory(), "call")) {
+        if (!m.areEqual(getNotificationCategory(), NotificationCompat.CATEGORY_CALL)) {
             return null;
         }
         Intent intent = new Intent(context, AppActivity.IncomingCall.class);
@@ -721,7 +725,7 @@ public final class NotificationData {
     }
 
     public final String getGroupKey() {
-        StringBuilder K = a.K("GROUP_");
+        StringBuilder K = a.K(GROUP_KEY_PREFIX);
         K.append(this.type);
         return K.toString();
     }
@@ -739,7 +743,7 @@ public final class NotificationData {
         String str2 = this.type;
         switch (str2.hashCode()) {
             case -1489275252:
-                if (!str2.equals("GUILD_SCHEDULED_EVENT_UPDATE")) {
+                if (!str2.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE)) {
                     return "";
                 }
                 str = IconUtils.getForGuild$default(Long.valueOf(this.guildId), this.guildIcon, "", false, null, 24, null);
@@ -748,13 +752,13 @@ public final class NotificationData {
                 }
                 return str;
             case -1327124998:
-                if (!str2.equals("RELATIONSHIP_ADD")) {
+                if (!str2.equals(TYPE_RELATIONSHIP_ADD)) {
                     return "";
                 }
                 String str3 = this.applicationIcon;
                 return str3 != null ? IconUtils.getApplicationIcon$default(this.applicationId, str3, 0, 4, null) : "";
             case -1263316859:
-                if (!str2.equals("STAGE_INSTANCE_CREATE")) {
+                if (!str2.equals(TYPE_STAGE_INSTANCE_CREATE)) {
                     return "";
                 }
                 str = IconUtils.getForGuild$default(Long.valueOf(this.guildId), this.guildIcon, "", false, null, 24, null);
@@ -762,7 +766,7 @@ public final class NotificationData {
                 }
                 return str;
             case -1237752112:
-                if (!str2.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE")) {
+                if (!str2.equals(TYPE_APPLICATION_LIBRARY_INSTALL_COMPLETE)) {
                     return "";
                 }
                 String str3 = this.applicationIcon;
@@ -770,7 +774,7 @@ public final class NotificationData {
                 }
                 break;
             case 974015250:
-                if (!str2.equals("ACTIVITY_START")) {
+                if (!str2.equals(TYPE_ACTIVITY_START)) {
                     return "";
                 }
                 String str3 = this.applicationIcon;
@@ -778,7 +782,7 @@ public final class NotificationData {
                 }
                 break;
             case 998188116:
-                if (!str2.equals("MESSAGE_CREATE")) {
+                if (!str2.equals(TYPE_MESSAGE_CREATE)) {
                     return "";
                 }
                 str = getIconUrlForChannel();
@@ -787,7 +791,7 @@ public final class NotificationData {
                 }
                 return str;
             case 1770025841:
-                if (!str2.equals("CALL_RING")) {
+                if (!str2.equals(TYPE_CALL_RING)) {
                     return "";
                 }
                 str = getIconUrlForChannel();
@@ -808,37 +812,37 @@ public final class NotificationData {
         String str = this.type;
         switch (str.hashCode()) {
             case -1489275252:
-                if (!str.equals("GUILD_SCHEDULED_EVENT_UPDATE") || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) {
+                if (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) {
                     return "";
                 }
                 return this.type + this.channel.h();
             case -1327124998:
-                if (!str.equals("RELATIONSHIP_ADD")) {
+                if (!str.equals(TYPE_RELATIONSHIP_ADD)) {
                     return "";
                 }
                 return this.type + this.userId;
             case -1263316859:
-                if (!str.equals("STAGE_INSTANCE_CREATE")) {
+                if (!str.equals(TYPE_STAGE_INSTANCE_CREATE)) {
                     return "";
                 }
                 break;
             case -1237752112:
-                if (!str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE")) {
+                if (!str.equals(TYPE_APPLICATION_LIBRARY_INSTALL_COMPLETE)) {
                     return "";
                 }
                 return this.type + this.applicationId;
             case 974015250:
-                if (!str.equals("ACTIVITY_START")) {
+                if (!str.equals(TYPE_ACTIVITY_START)) {
                     return "";
                 }
                 return this.type + this.activityType + this.activityName;
             case 998188116:
-                if (!str.equals("MESSAGE_CREATE")) {
+                if (!str.equals(TYPE_MESSAGE_CREATE)) {
                     return "";
                 }
                 break;
             case 1770025841:
-                if (!str.equals("CALL_RING")) {
+                if (!str.equals(TYPE_CALL_RING)) {
                     return "";
                 }
                 break;
@@ -852,10 +856,10 @@ public final class NotificationData {
     @SuppressLint({"UnspecifiedImmutableFlag"})
     public final NotificationCompat.Action getMarkAsReadAction(Context context) {
         m.checkNotNullParameter(context, "ctx");
-        if (!m.areEqual(this.type, "MESSAGE_CREATE")) {
+        if (!m.areEqual(this.type, TYPE_MESSAGE_CREATE)) {
             return null;
         }
-        return new NotificationCompat.Action.Builder(2131231544, b.h(context, 2131891249, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.markAsRead(context, this.channel.h(), this.messageId)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
+        return new NotificationCompat.Action.Builder((int) R.drawable.ic_check_grey_24dp, b.h(context, R.string.mark_as_read, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.markAsRead(context, this.channel.h(), this.messageId)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
     }
 
     public final long getMessageId() {
@@ -863,7 +867,7 @@ public final class NotificationData {
     }
 
     public final long getMessageIdTimestamp() {
-        return (this.messageId >>> 22) + 1420070400000L;
+        return (this.messageId >>> 22) + SnowflakeUtils.DISCORD_EPOCH;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:16:0x0044 A[RETURN, SYNTHETIC] */
@@ -872,27 +876,27 @@ public final class NotificationData {
         String str = this.type;
         switch (str.hashCode()) {
             case -1489275252:
-                return str.equals("GUILD_SCHEDULED_EVENT_UPDATE") ? "social" : "msg";
+                return str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) ? NotificationCompat.CATEGORY_SOCIAL : NotificationCompat.CATEGORY_MESSAGE;
             case -1327124998:
-                if (str.equals("RELATIONSHIP_ADD")) {
+                if (str.equals(TYPE_RELATIONSHIP_ADD)) {
                 }
                 break;
             case -1263316859:
-                if (str.equals("STAGE_INSTANCE_CREATE")) {
+                if (str.equals(TYPE_STAGE_INSTANCE_CREATE)) {
                 }
                 break;
             case -1237752112:
-                if (str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE")) {
+                if (str.equals(TYPE_APPLICATION_LIBRARY_INSTALL_COMPLETE)) {
                     return "progress";
                 }
                 break;
             case 974015250:
-                if (str.equals("ACTIVITY_START")) {
+                if (str.equals(TYPE_ACTIVITY_START)) {
                 }
                 break;
             case 1770025841:
-                if (str.equals("CALL_RING")) {
-                    return "call";
+                if (str.equals(TYPE_CALL_RING)) {
+                    return NotificationCompat.CATEGORY_CALL;
                 }
                 break;
         }
@@ -902,28 +906,28 @@ public final class NotificationData {
         String str = this.type;
         switch (str.hashCode()) {
             case -1489275252:
-                if (str.equals("GUILD_SCHEDULED_EVENT_UPDATE")) {
-                    return "Guild Event Live";
+                if (str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE)) {
+                    return NotificationClient.NOTIF_GUILD_SCHEDULED_EVENT_START;
                 }
                 break;
             case -1263316859:
-                if (str.equals("STAGE_INSTANCE_CREATE")) {
-                    return "Stage Live";
+                if (str.equals(TYPE_STAGE_INSTANCE_CREATE)) {
+                    return NotificationClient.NOTIF_CHANNEL_STAGE_START;
                 }
                 break;
             case 998188116:
-                if (str.equals("MESSAGE_CREATE")) {
+                if (str.equals(TYPE_MESSAGE_CREATE)) {
                     int A = this.channel.A();
-                    return (A == 1 || A == 3) ? "DirectMessages" : "Messages";
+                    return (A == 1 || A == 3) ? NotificationClient.NOTIF_CHANNEL_MESSAGES_DIRECT : NotificationClient.NOTIF_CHANNEL_MESSAGES;
                 }
                 break;
             case 1770025841:
-                if (str.equals("CALL_RING")) {
-                    return "Calls";
+                if (str.equals(TYPE_CALL_RING)) {
+                    return NotificationClient.NOTIF_CHANNEL_CALLS;
                 }
                 break;
         }
-        return "Social";
+        return NotificationClient.NOTIF_CHANNEL_SOCIAL;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:12:0x003b A[RETURN, SYNTHETIC] */
@@ -932,30 +936,30 @@ public final class NotificationData {
         String notificationChannelId = getNotificationChannelId();
         switch (notificationChannelId.hashCode()) {
             case -1917463435:
-                return notificationChannelId.equals("DirectMessages") ? 1 : -1;
+                return notificationChannelId.equals(NotificationClient.NOTIF_CHANNEL_MESSAGES_DIRECT) ? 1 : -1;
             case -1813183603:
-                notificationChannelId.equals("Social");
+                notificationChannelId.equals(NotificationClient.NOTIF_CHANNEL_SOCIAL);
             case -1241096946:
-                if (notificationChannelId.equals("Stage Live")) {
+                if (notificationChannelId.equals(NotificationClient.NOTIF_CHANNEL_STAGE_START)) {
                     return 0;
                 }
                 break;
             case -397449876:
-                if (notificationChannelId.equals("Messages")) {
+                if (notificationChannelId.equals(NotificationClient.NOTIF_CHANNEL_MESSAGES)) {
                 }
                 break;
             case 64872885:
-                if (notificationChannelId.equals("Calls")) {
+                if (notificationChannelId.equals(NotificationClient.NOTIF_CHANNEL_CALLS)) {
                     return 2;
                 }
                 break;
             case 526428889:
-                if (notificationChannelId.equals("Media Connections")) {
+                if (notificationChannelId.equals(NotificationClient.NOTIF_CHANNEL_MEDIA_CONNECTIONS)) {
                     return 2;
                 }
                 break;
             case 803834207:
-                if (notificationChannelId.equals("Guild Event Live")) {
+                if (notificationChannelId.equals(NotificationClient.NOTIF_GUILD_SCHEDULED_EVENT_START)) {
                 }
                 break;
         }
@@ -964,11 +968,11 @@ public final class NotificationData {
     public final Uri getNotificationSound(Context context) {
         m.checkNotNullParameter(context, "context");
         String str = this.type;
-        if (str.hashCode() != 1770025841 || !str.equals("CALL_RING")) {
+        if (str.hashCode() != 1770025841 || !str.equals(TYPE_CALL_RING)) {
             return null;
         }
         StringBuilder K = a.K("android.resource://");
-        K.append(context.getPackageName() + '/' + AppSound.Companion.getSOUND_CALL_RINGING().getResId());
+        K.append(context.getPackageName() + MentionUtilsKt.SLASH_CHAR + AppSound.Companion.getSOUND_CALL_RINGING().getResId());
         String sb = K.toString();
         m.checkNotNullExpressionValue(sb, "StringBuilder()\n        …)\n            .toString()");
         return Uri.parse(sb);
@@ -980,7 +984,7 @@ public final class NotificationData {
         m.checkNotNullParameter(context, "context");
         IconCompat iconCompat = null;
         boolean z2 = false;
-        CharSequence h = (!m.areEqual(this.type, "MESSAGE_CREATE") || this.messageType == 7 || (messageActivityType = this.messageActivityType) == MessageActivityType.SPECTATE || messageActivityType == MessageActivityType.JOIN) ? b.h(context, 2131888179, new Object[0], null, 4) : this.userUsername;
+        CharSequence h = (!m.areEqual(this.type, TYPE_MESSAGE_CREATE) || this.messageType == 7 || (messageActivityType = this.messageActivityType) == MessageActivityType.SPECTATE || messageActivityType == MessageActivityType.JOIN) ? b.h(context, R.string.discord, new Object[0], null, 4) : this.userUsername;
         String valueOf = String.valueOf(this.userId);
         String str = this.subtitle;
         if (!(str == null || h == null)) {
@@ -989,7 +993,7 @@ public final class NotificationData {
                 Objects.requireNonNull(str2, "null cannot be cast to non-null type java.lang.String");
                 String substring = str2.substring(0, 11);
                 m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
-                if (m.areEqual(substring, "replying to")) {
+                if (m.areEqual(substring, REPLYING_TO_UNTRANSLATED)) {
                     StringBuilder K = a.K("<b>");
                     K.append(Html.escapeHtml(h));
                     K.append("</b> ");
@@ -1036,7 +1040,7 @@ public final class NotificationData {
     public final boolean getShouldGroup() {
         String str = this.type;
         int hashCode = str.hashCode();
-        return hashCode == 974015250 ? str.equals("ACTIVITY_START") : !(hashCode != 998188116 || !str.equals("MESSAGE_CREATE"));
+        return hashCode == 974015250 ? str.equals(TYPE_ACTIVITY_START) : !(hashCode != 998188116 || !str.equals(TYPE_MESSAGE_CREATE));
     }
 
     public final int getSmallIcon() {
@@ -1044,16 +1048,16 @@ public final class NotificationData {
         int hashCode = str.hashCode();
         if (hashCode != -1327124998) {
             if (hashCode != 998188116) {
-                if (hashCode == 1770025841 && str.equals("CALL_RING")) {
-                    return 2131231837;
+                if (hashCode == 1770025841 && str.equals(TYPE_CALL_RING)) {
+                    return R.drawable.ic_notification_call_24dp;
                 }
-            } else if (str.equals("MESSAGE_CREATE")) {
-                return 2131231839;
+            } else if (str.equals(TYPE_MESSAGE_CREATE)) {
+                return R.drawable.ic_notification_message_24dp;
             }
-        } else if (str.equals("RELATIONSHIP_ADD")) {
-            return 2131231838;
+        } else if (str.equals(TYPE_RELATIONSHIP_ADD)) {
+            return R.drawable.ic_notification_friends_24dp;
         }
-        return 2131231836;
+        return R.drawable.ic_notification_24dp;
     }
 
     public final Sticker getSticker() {
@@ -1065,10 +1069,10 @@ public final class NotificationData {
     public final NotificationCompat.Action getTimedMute(Context context, Clock clock, int i) {
         m.checkNotNullParameter(context, "ctx");
         m.checkNotNullParameter(clock, "clock");
-        if ((!m.areEqual(this.type, "MESSAGE_CREATE")) || i < 2) {
+        if ((!m.areEqual(this.type, TYPE_MESSAGE_CREATE)) || i < 2) {
             return null;
         }
-        return new NotificationCompat.Action.Builder(2131231842, b.h(context, 2131891866, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.timedMute(context, this.guildId, this.channel.h(), clock.currentTimeMillis() + 3600000)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
+        return new NotificationCompat.Action.Builder((int) R.drawable.ic_notifications_off_grey_24dp, b.h(context, R.string.notification_mute_1_hour, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.timedMute(context, this.guildId, this.channel.h(), clock.currentTimeMillis() + 3600000)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
     }
 
     public final CharSequence getTitle(Context context) {
@@ -1077,17 +1081,17 @@ public final class NotificationData {
         String str = this.type;
         switch (str.hashCode()) {
             case -1489275252:
-                return (!str.equals("GUILD_SCHEDULED_EVENT_UPDATE") || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) ? "" : b.h(context, 2131889527, new Object[]{this.guildName}, null, 4);
+                return (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) ? "" : b.h(context, R.string.guild_scheduled_event_stage_start_title, new Object[]{this.guildName}, null, 4);
             case -1327124998:
-                return str.equals("RELATIONSHIP_ADD") ? this.userUsername : "";
+                return str.equals(TYPE_RELATIONSHIP_ADD) ? this.userUsername : "";
             case -1263316859:
-                return str.equals("STAGE_INSTANCE_CREATE") ? b.h(context, 2131893856, new Object[]{this.guildName}, null, 4) : "";
+                return str.equals(TYPE_STAGE_INSTANCE_CREATE) ? b.h(context, R.string.stage_start_push_notification_title, new Object[]{this.guildName}, null, 4) : "";
             case -1237752112:
-                return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.h(context, 2131888964, new Object[0], null, 4) : "";
+                return str.equals(TYPE_APPLICATION_LIBRARY_INSTALL_COMPLETE) ? b.h(context, R.string.game_library_notification_game_installed_title, new Object[0], null, 4) : "";
             case 974015250:
-                return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.h(context, 2131891874, new Object[0], null, 4);
+                return (!str.equals(TYPE_ACTIVITY_START) || this.activityType != 0) ? "" : b.h(context, R.string.notification_title_start_game, new Object[0], null, 4);
             case 998188116:
-                if (!str.equals("MESSAGE_CREATE")) {
+                if (!str.equals(TYPE_MESSAGE_CREATE)) {
                     return "";
                 }
                 int A = this.channel.A();
@@ -1111,7 +1115,7 @@ public final class NotificationData {
                 }
                 return b.l(this.guildName + " _" + AnimatableValueParser.A0(this.channel, context, false, 2) + '_', new Object[0], null, 2);
             case 1770025841:
-                return str.equals("CALL_RING") ? this.channel.A() != 1 ? AnimatableValueParser.y0(this.channel) : b.h(context, 2131890628, new Object[0], null, 4) : "";
+                return str.equals(TYPE_CALL_RING) ? this.channel.A() != 1 ? AnimatableValueParser.y0(this.channel) : b.h(context, R.string.incoming_call, new Object[0], null, 4) : "";
             default:
                 return "";
         }
@@ -1129,37 +1133,37 @@ public final class NotificationData {
         String str = this.type;
         switch (str.hashCode()) {
             case -1489275252:
-                if (!str.equals("GUILD_SCHEDULED_EVENT_UPDATE") || this.guildScheduledEventEntityType != GuildScheduledEventEntityType.STAGE_INSTANCE) {
+                if (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || this.guildScheduledEventEntityType != GuildScheduledEventEntityType.STAGE_INSTANCE) {
                     return false;
                 }
                 break;
             case -1327124998:
-                if (!str.equals("RELATIONSHIP_ADD")) {
+                if (!str.equals(TYPE_RELATIONSHIP_ADD)) {
                     return false;
                 }
                 break;
             case -1263316859:
-                if (!str.equals("STAGE_INSTANCE_CREATE")) {
+                if (!str.equals(TYPE_STAGE_INSTANCE_CREATE)) {
                     return false;
                 }
                 break;
             case -1237752112:
-                if (!str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE")) {
+                if (!str.equals(TYPE_APPLICATION_LIBRARY_INSTALL_COMPLETE)) {
                     return false;
                 }
                 break;
             case 974015250:
-                if (!str.equals("ACTIVITY_START") || this.activityType == 1) {
+                if (!str.equals(TYPE_ACTIVITY_START) || this.activityType == 1) {
                     return false;
                 }
                 break;
             case 998188116:
-                if (!str.equals("MESSAGE_CREATE")) {
+                if (!str.equals(TYPE_MESSAGE_CREATE)) {
                     return false;
                 }
                 break;
             case 1770025841:
-                if (!str.equals("CALL_RING")) {
+                if (!str.equals(TYPE_CALL_RING)) {
                     return false;
                 }
                 break;
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
index 102c255b42..4b6d3affb9 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
@@ -21,8 +21,10 @@ import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppLog;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.extensions.PendingIntentExtensionsKt;
 import com.discord.utilities.fcm.NotificationClient;
@@ -33,6 +35,7 @@ import com.discord.utilities.logging.Logger;
 import com.discord.utilities.media.AppSound;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.time.ClockFactory;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.notice.NoticePopup;
 import d0.g0.t;
 import d0.t.h0;
@@ -74,7 +77,7 @@ public final class NotificationRenderer {
         }
 
         public final void add(int i, Subscription subscription) {
-            m.checkNotNullParameter(subscription, "subscription");
+            m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
             HashMap<Integer, Subscription> hashMap = notificationDisplaySubscriptions;
             synchronized (hashMap) {
                 INSTANCE.cancel(i);
@@ -106,15 +109,15 @@ public final class NotificationRenderer {
 
     private final void autoDismissNotification(Context context, int i) {
         PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, NotificationActions.Companion.cancel(context, i), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null));
-        Object systemService = context.getSystemService("alarm");
+        Object systemService = context.getSystemService(NotificationCompat.CATEGORY_ALARM);
         Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.app.AlarmManager");
-        ((AlarmManager) systemService).set(2, SystemClock.elapsedRealtime() + 3000, broadcast);
+        ((AlarmManager) systemService).set(2, SystemClock.elapsedRealtime() + NOTIFICATION_AUTO_DISMISS, broadcast);
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:17:0x00df  */
     private final void displayAndUpdateCache(Context context, NotificationData notificationData, NotificationClient.SettingsV2 settingsV2) {
         boolean z2;
-        NotificationCompat.Builder contentIntent = new NotificationCompat.Builder(context, notificationData.getNotificationChannelId()).setAutoCancel(true).setOnlyAlertOnce(true).setSmallIcon(notificationData.getSmallIcon()).setColor(ColorCompat.getThemedColor(context, 2130969008)).setCategory(notificationData.getNotificationCategory()).setContentTitle(notificationData.getTitle(context)).setContentText(notificationData.getContent(context)).setDefaults(getNotificationDefaults(settingsV2.isDisableSound(), settingsV2.isDisableVibrate())).setDeleteIntent(notificationData.getDeleteIntent(context)).setContentIntent(notificationData.getContentIntent(context));
+        NotificationCompat.Builder contentIntent = new NotificationCompat.Builder(context, notificationData.getNotificationChannelId()).setAutoCancel(true).setOnlyAlertOnce(true).setSmallIcon(notificationData.getSmallIcon()).setColor(ColorCompat.getThemedColor(context, (int) R.attr.color_brand_500)).setCategory(notificationData.getNotificationCategory()).setContentTitle(notificationData.getTitle(context)).setContentText(notificationData.getContent(context)).setDefaults(getNotificationDefaults(settingsV2.isDisableSound(), settingsV2.isDisableVibrate())).setDeleteIntent(notificationData.getDeleteIntent(context)).setContentIntent(notificationData.getContentIntent(context));
         contentIntent.setGroup(notificationData.getGroupKey());
         NotificationData.DisplayPayload andUpdate = NotificationCache.INSTANCE.getAndUpdate(notificationData);
         List<NotificationData> extras = andUpdate.getExtras();
@@ -154,7 +157,7 @@ public final class NotificationRenderer {
         if (i < 26) {
             contentIntent.setPriority(notificationData.getNotificationPriority()).setVibrate(new long[]{0});
             if (!settingsV2.isDisableBlink()) {
-                contentIntent.setLights(ColorCompat.getThemedColor(context, 2130968995), 1500, 1500);
+                contentIntent.setLights(ColorCompat.getThemedColor(context, (int) R.attr.color_brand), NOTIFICATION_LIGHT_PERIOD, NOTIFICATION_LIGHT_PERIOD);
             }
             Uri notificationSound = notificationData.getNotificationSound(context);
             if (notificationSound != null) {
@@ -190,7 +193,7 @@ public final class NotificationRenderer {
         Set mutableSet = u.toMutableSet(arrayList2);
         Observable<MGImagesBitmap.CloseableBitmaps> Q = MGImagesBitmap.getBitmaps(mutableSet).Q();
         CompositeSubscription compositeSubscription = new CompositeSubscription();
-        Observable<Long> a02 = Observable.d0(250, TimeUnit.MILLISECONDS).a0(Observable.h0(new r(Q.i, new f1(new d1(d.j)))));
+        Observable<Long> a02 = Observable.d0(NOTIFICATION_ICON_FETCH_DELAY_MS, TimeUnit.MILLISECONDS).a0(Observable.h0(new r(Q.i, new f1(new d1(d.j)))));
         m.checkNotNullExpressionValue(a02, "Observable\n        .time…Next(Observable.never()))");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(a02), (Context) null, "Unable to display notification, timeout.", new NotificationRenderer$displayAndUpdateCache$4(compositeSubscription), new NotificationRenderer$displayAndUpdateCache$5(context, andUpdate, contentIntent), (Function1) null, (Function0) null, (Function0) null, 112, (Object) null);
         m.checkNotNullExpressionValue(Q, "bitmapsObservable");
@@ -211,7 +214,7 @@ public final class NotificationRenderer {
     }
 
     private final NotificationCompat.MessagingStyle getMessageStyle(Context context, NotificationData notificationData, List<NotificationData> list, Map<String, Bitmap> map) {
-        Person build = new Person.Builder().setName(context.getString(2131891324)).setKey("me").build();
+        Person build = new Person.Builder().setName(context.getString(R.string.f2927me)).setKey("me").build();
         m.checkNotNullExpressionValue(build, "Person.Builder()\n       …ey(\"me\")\n        .build()");
         NotificationCompat.MessagingStyle groupConversation = new NotificationCompat.MessagingStyle(build).setConversationTitle(notificationData.getConversationTitle(context)).setGroupConversation(notificationData.isGroupConversation());
         for (NotificationData notificationData2 : list) {
@@ -265,32 +268,32 @@ public final class NotificationRenderer {
     public final void displaySent(Context context, long j, CharSequence charSequence, boolean z2, int i) {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(charSequence, "channelName");
-        int i2 = z2 ? 2131891871 : 2131891870;
+        int i2 = z2 ? R.string.notification_reply_success : R.string.notification_reply_failed;
         PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, NotificationActions.Companion.delete(context, j), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728));
         Intent selectChannel$default = IntentUtils.RouteBuilders.selectChannel$default(j, 0, null, 6, null);
         selectChannel$default.setClass(context, AppActivity.Main.class);
-        NotificationManagerCompat.from(context).notify(i, new NotificationCompat.Builder(context, "Messages").setAutoCancel(true).setSmallIcon(2131231839).setCategory("msg").setContentText(b.h(context, i2, new Object[]{charSequence}, null, 4)).setDeleteIntent(broadcast).setContentIntent(PendingIntent.getActivity(context, 0, selectChannel$default, PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build());
+        NotificationManagerCompat.from(context).notify(i, new NotificationCompat.Builder(context, NotificationClient.NOTIF_CHANNEL_MESSAGES).setAutoCancel(true).setSmallIcon(R.drawable.ic_notification_message_24dp).setCategory(NotificationCompat.CATEGORY_MESSAGE).setContentText(b.h(context, i2, new Object[]{charSequence}, null, 4)).setDeleteIntent(broadcast).setContentIntent(PendingIntent.getActivity(context, 0, selectChannel$default, PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build());
         autoDismissNotification(context, i);
     }
 
     @RequiresApi(26)
     public final void initNotificationChannels(Application application) {
         m.checkNotNullParameter(application, "context");
-        NotificationChannel notificationChannel = new NotificationChannel("Calls", application.getString(2131887119), 4);
-        NotificationChannel notificationChannel2 = new NotificationChannel("Media Connections", application.getString(2131894984), 2);
-        List<NotificationChannel> listOf = n.listOf((Object[]) new NotificationChannel[]{notificationChannel, notificationChannel2, new NotificationChannel("Messages", application.getString(2131891502), 4), new NotificationChannel("DirectMessages", application.getString(2131888141), 4), new NotificationChannel("Social", application.getString(2131888856), 2), new NotificationChannel("Game Detection", application.getString(2131888930), 1), new NotificationChannel("Stage Live", application.getString(2131893851), 4), new NotificationChannel("Guild Event Live", application.getString(2131889525), 4)});
+        NotificationChannel notificationChannel = new NotificationChannel(NotificationClient.NOTIF_CHANNEL_CALLS, application.getString(R.string.call), 4);
+        NotificationChannel notificationChannel2 = new NotificationChannel(NotificationClient.NOTIF_CHANNEL_MEDIA_CONNECTIONS, application.getString(R.string.voice), 2);
+        List<NotificationChannel> listOf = n.listOf((Object[]) new NotificationChannel[]{notificationChannel, notificationChannel2, new NotificationChannel(NotificationClient.NOTIF_CHANNEL_MESSAGES, application.getString(R.string.messages), 4), new NotificationChannel(NotificationClient.NOTIF_CHANNEL_MESSAGES_DIRECT, application.getString(R.string.direct_messages), 4), new NotificationChannel(NotificationClient.NOTIF_CHANNEL_SOCIAL, application.getString(R.string.friends), 2), new NotificationChannel(NotificationClient.NOTIF_CHANNEL_GAME_DETECTION, application.getString(R.string.game_detection_service), 1), new NotificationChannel(NotificationClient.NOTIF_CHANNEL_STAGE_START, application.getString(R.string.stage_start_notification_category), 4), new NotificationChannel(NotificationClient.NOTIF_GUILD_SCHEDULED_EVENT_START, application.getString(R.string.guild_scheduled_event_live), 4)});
         for (NotificationChannel notificationChannel3 : listOf) {
             notificationChannel3.setShowBadge(true);
             notificationChannel3.enableVibration(true);
             notificationChannel3.enableLights(true);
-            notificationChannel3.setLightColor(ColorCompat.getThemedColor(application, 2130968995));
+            notificationChannel3.setLightColor(ColorCompat.getThemedColor(application, (int) R.attr.color_brand));
         }
-        notificationChannel.setDescription(application.getString(2131887119));
+        notificationChannel.setDescription(application.getString(R.string.call));
         notificationChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400});
         notificationChannel.setShowBadge(false);
         StringBuilder sb = new StringBuilder();
         sb.append("android.resource://");
-        sb.append(application.getPackageName() + '/' + AppSound.Companion.getSOUND_CALL_RINGING().getResId());
+        sb.append(application.getPackageName() + MentionUtilsKt.SLASH_CHAR + AppSound.Companion.getSOUND_CALL_RINGING().getResId());
         String sb2 = sb.toString();
         m.checkNotNullExpressionValue(sb2, "StringBuilder()\n        …)\n            .toString()");
         notificationChannel.setSound(Uri.parse(sb2), new AudioAttributes.Builder().setUsage(7).setContentType(2).build());
diff --git a/app/src/main/java/com/discord/utilities/file/DownloadUtils.java b/app/src/main/java/com/discord/utilities/file/DownloadUtils.java
index 99d2494bf3..70da873708 100644
--- a/app/src/main/java/com/discord/utilities/file/DownloadUtils.java
+++ b/app/src/main/java/com/discord/utilities/file/DownloadUtils.java
@@ -2,6 +2,7 @@ package com.discord.utilities.file;
 
 import android.content.Context;
 import androidx.annotation.RequiresPermission;
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import d0.z.d.m;
 import java.io.File;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -71,7 +72,7 @@ public final class DownloadUtils {
     private DownloadUtils() {
     }
 
-    @RequiresPermission(conditional = true, value = "android.permission.WRITE_EXTERNAL_STORAGE")
+    @RequiresPermission(conditional = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS, value = "android.permission.WRITE_EXTERNAL_STORAGE")
     public static final Observable<DownloadState> downloadFile(Context context, String str, String str2, File file) {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(str, "fileUrl");
diff --git a/app/src/main/java/com/discord/utilities/file/FileUtilsKt.java b/app/src/main/java/com/discord/utilities/file/FileUtilsKt.java
index b47a2e4519..1668ed88dc 100644
--- a/app/src/main/java/com/discord/utilities/file/FileUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/file/FileUtilsKt.java
@@ -3,9 +3,11 @@ package com.discord.utilities.file;
 import android.content.Context;
 import androidx.annotation.DrawableRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.utilities.drawable.DrawableCompat;
 import d0.g0.t;
 import d0.z.d.m;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: FileUtils.kt */
 public final class FileUtilsKt {
     private static final String getHumanReadableByteCount(long j) {
@@ -22,7 +24,7 @@ public final class FileUtilsKt {
     public static final int getIconForFiletype(Context context, String str) {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(str, "mimeType");
-        return DrawableCompat.getThemedDrawableRes$default(context, t.startsWith$default(str, "image", false, 2, null) ? 2130969471 : t.startsWith$default(str, "video", false, 2, null) ? 2130969472 : 2130969469, 0, 2, (Object) null);
+        return DrawableCompat.getThemedDrawableRes$default(context, t.startsWith$default(str, "image", false, 2, null) ? R.attr.ic_uploads_image : t.startsWith$default(str, MediaStreamTrack.VIDEO_TRACK_KIND, false, 2, null) ? R.attr.ic_uploads_video : R.attr.ic_uploads_file, 0, 2, (Object) null);
     }
 
     public static final String getSizeSubtitle(long j) {
diff --git a/app/src/main/java/com/discord/utilities/fragment/FragmentExtensionsKt.java b/app/src/main/java/com/discord/utilities/fragment/FragmentExtensionsKt.java
index eed4088138..9bbe87ad81 100644
--- a/app/src/main/java/com/discord/utilities/fragment/FragmentExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/fragment/FragmentExtensionsKt.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.fragment;
 
 import androidx.fragment.app.Fragment;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.g;
 import d0.z.d.m;
 import kotlin.Lazy;
@@ -8,7 +9,7 @@ import kotlin.Lazy;
 public final class FragmentExtensionsKt {
     public static final Lazy<Boolean> booleanExtra(Fragment fragment, String str, boolean z2) {
         m.checkNotNullParameter(fragment, "$this$booleanExtra");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return g.lazy(new FragmentExtensionsKt$booleanExtra$1(fragment, str, z2));
     }
 
diff --git a/app/src/main/java/com/discord/utilities/friendsuggestions/FriendSuggestionsFetcher$maybeFetch$1.java b/app/src/main/java/com/discord/utilities/friendsuggestions/FriendSuggestionsFetcher$maybeFetch$1.java
index e3863006fd..aad4aecd3b 100644
--- a/app/src/main/java/com/discord/utilities/friendsuggestions/FriendSuggestionsFetcher$maybeFetch$1.java
+++ b/app/src/main/java/com/discord/utilities/friendsuggestions/FriendSuggestionsFetcher$maybeFetch$1.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.friendsuggestions;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class FriendSuggestionsFetcher$maybeFetch$1 extends o implements Fu
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         FriendSuggestionsFetcher.access$setFetchSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
index 65be9b95d7..b0fc61fb5d 100644
--- a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
+++ b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
@@ -1,10 +1,12 @@
 package com.discord.utilities.gifting;
 
 import android.content.Context;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.SkuDetails;
+import com.discord.R;
 import com.discord.api.premium.PremiumTier;
 import com.discord.models.domain.ModelSkuKt;
 import com.discord.stores.StoreGooglePlayPurchases;
@@ -64,7 +66,7 @@ public final class GiftingUtils {
     }
 
     public final void buyGift(FragmentActivity fragmentActivity, GooglePlayInAppSku googlePlayInAppSku, Traits.Location location, Function0<Unit> function0) throws Exception {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(googlePlayInAppSku, "inAppSku");
         m.checkNotNullParameter(location, "location");
         SkuDetails skuDetails = googlePlayInAppSku.getSkuDetails();
@@ -99,7 +101,7 @@ public final class GiftingUtils {
                     Objects.requireNonNull(optString, "null cannot be cast to non-null type java.lang.String");
                     String lowerCase = optString.toLowerCase(locale);
                     m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
-                    googlePlayPurchases.trackPaymentFlowStarted(paymentGatewaySkuId, longValue, location, storeSku, new Traits.Payment("subscription", microAmountToMinor, microAmountToMinor2, lowerCase, true));
+                    googlePlayPurchases.trackPaymentFlowStarted(paymentGatewaySkuId, longValue, location, storeSku, new Traits.Payment(Traits.Payment.Type.SUBSCRIPTION, microAmountToMinor, microAmountToMinor2, lowerCase, true));
                     GiftingUtils$buyGift$1 giftingUtils$buyGift$1 = new GiftingUtils$buyGift$1(fragmentActivity, a);
                     if (companion.getGooglePlayPurchases().hasSeenGiftingWarning()) {
                         giftingUtils$buyGift$1.mo1invoke();
@@ -108,10 +110,10 @@ public final class GiftingUtils {
                     WidgetNoticeDialog.Companion companion2 = WidgetNoticeDialog.Companion;
                     FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
                     m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
-                    String string = fragmentActivity.getString(2131888137);
-                    String string2 = fragmentActivity.getString(2131889146);
+                    String string = fragmentActivity.getString(R.string.dialog_just_so_you_know);
+                    String string2 = fragmentActivity.getString(R.string.gift_purchase_google_play_notice_extended);
                     m.checkNotNullExpressionValue(string2, "activity.getString(R.str…gle_play_notice_extended)");
-                    WidgetNoticeDialog.Companion.show$default(companion2, supportFragmentManager, string, string2, fragmentActivity.getString(2131886443), fragmentActivity.getString(2131891657), h0.mapOf(o.to(2131364252, new GiftingUtils$buyGift$2(googlePlayInAppSku, giftingUtils$buyGift$1)), o.to(2131364247, new GiftingUtils$buyGift$3(function0))), null, null, null, null, null, null, 0, new GiftingUtils$buyGift$4(function0), 8128, null);
+                    WidgetNoticeDialog.Companion.show$default(companion2, supportFragmentManager, string, string2, fragmentActivity.getString(R.string.application_store_buy_gift), fragmentActivity.getString(R.string.nevermind), h0.mapOf(o.to(Integer.valueOf((int) R.id.notice_ok), new GiftingUtils$buyGift$2(googlePlayInAppSku, giftingUtils$buyGift$1)), o.to(Integer.valueOf((int) R.id.notice_cancel), new GiftingUtils$buyGift$3(function0))), null, null, null, null, null, null, 0, new GiftingUtils$buyGift$4(function0), 8128, null);
                     companion.getGooglePlayPurchases().markViewedGiftingWarning();
                     return;
                 }
@@ -130,15 +132,18 @@ public final class GiftingUtils {
     public final Integer getIconForSku(GooglePlayInAppSku googlePlayInAppSku) {
         m.checkNotNullParameter(googlePlayInAppSku, "inAppSku");
         if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier1Month())) {
-            return 2131231888;
+            return Integer.valueOf((int) R.drawable.ic_plan_premium_tier_1);
         }
         if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier1Year())) {
-            return 2131231890;
+            return Integer.valueOf((int) R.drawable.ic_plan_premium_tier_1_year);
         }
         if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Month())) {
-            return 2131231891;
+            return Integer.valueOf((int) R.drawable.ic_plan_premium_tier_2);
         }
-        return m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Year()) ? 2131231892 : null;
+        if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Year())) {
+            return Integer.valueOf((int) R.drawable.ic_plan_premium_tier_2_year);
+        }
+        return null;
     }
 
     public final PremiumTier getTierForSku(Long l) {
@@ -158,9 +163,9 @@ public final class GiftingUtils {
         TimeUtils timeUtils = TimeUtils.INSTANCE;
         int hoursFromMillis = timeUtils.getHoursFromMillis(j);
         if (hoursFromMillis > 0) {
-            return StringResourceUtilsKt.getI18nPluralString(context, 2131755065, hoursFromMillis, Integer.valueOf(hoursFromMillis));
+            return StringResourceUtilsKt.getI18nPluralString(context, R.plurals.duration_hours_hours, hoursFromMillis, Integer.valueOf(hoursFromMillis));
         }
         int minutesFromMillis = timeUtils.getMinutesFromMillis(j);
-        return StringResourceUtilsKt.getI18nPluralString(context, 2131755067, minutesFromMillis, Integer.valueOf(minutesFromMillis));
+        return StringResourceUtilsKt.getI18nPluralString(context, R.plurals.duration_mins_mins, minutesFromMillis, Integer.valueOf(minutesFromMillis));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java b/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java
index 643642d349..172b0fe993 100644
--- a/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java
@@ -5,6 +5,7 @@ import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.guildmember.GuildMember;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.premium.PremiumUtils;
 import com.discord.utilities.voice.Bitrate;
 import d0.d0.f;
@@ -28,7 +29,7 @@ public final class GuildUtilsKt {
     }
 
     public static final String computeShortName(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new Regex("\\s").replace(new Regex("(\\w)(\\w*)").replace(new Regex("'s ").replace(str, " "), "$1"), "");
     }
 
diff --git a/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java b/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java
index ac0b679e58..e0685b1085 100644
--- a/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java
+++ b/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java
@@ -18,6 +18,6 @@ public final class PublicGuildUtils {
         m.checkNotNullParameter(message, "message");
         MessageReference messageReference = message.getMessageReference();
         Long b = messageReference != null ? messageReference.b() : null;
-        return (b != null && b.longValue() == 667560445975986187L) || ((author = message.getAuthor()) != null && author.i() == 669627189624307712L);
+        return (b != null && b.longValue() == PUBLIC_GUILD_ANNOUNCEMENTS_GUILD_ID) || ((author = message.getAuthor()) != null && author.i() == PUBLIC_GUILD_UPDATES_WEBHOOK_USER_ID);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java b/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java
index 5dedefb474..4a9020cc2f 100644
--- a/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java
+++ b/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java
@@ -2,6 +2,8 @@ package com.discord.utilities.guilds;
 
 import android.content.Context;
 import androidx.annotation.ColorInt;
+import androidx.core.view.ViewCompat;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.models.member.GuildMember;
 import com.discord.utilities.color.ColorCompat;
@@ -81,10 +83,10 @@ public final class RoleUtils {
                     i = guildRole.b();
                 }
             } catch (Exception unused) {
-                return -16777216;
+                return ViewCompat.MEASURED_STATE_MASK;
             }
         }
-        return -16777216 + i;
+        return ViewCompat.MEASURED_STATE_MASK + i;
     }
 
     public static final Comparator<GuildRole> getROLE_COMPARATOR() {
@@ -103,7 +105,7 @@ public final class RoleUtils {
     public static final int getRoleColor(GuildRole guildRole, Context context, @ColorInt Integer num) {
         m.checkNotNullParameter(guildRole, "$this$getRoleColor");
         m.checkNotNullParameter(context, "context");
-        return isDefaultColor(guildRole) ? num != null ? num.intValue() : ColorCompat.getColor(context, 2131100126) : getOpaqueColor(guildRole);
+        return isDefaultColor(guildRole) ? num != null ? num.intValue() : ColorCompat.getColor(context, (int) R.color.primary_300) : getOpaqueColor(guildRole);
     }
 
     public static /* synthetic */ int getRoleColor$default(GuildRole guildRole, Context context, Integer num, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java b/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java
index aa12a1eabf..3d51f2c718 100644
--- a/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java
+++ b/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventUtilitiesKt.java
@@ -3,6 +3,7 @@ package com.discord.utilities.guildscheduledevent;
 import android.content.Context;
 import android.text.format.DateUtils;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
 import com.discord.api.guildscheduledevent.GuildScheduledEventStatus;
 import com.discord.utilities.time.ClockFactory;
@@ -37,13 +38,13 @@ public final class GuildScheduledEventUtilitiesKt {
         m.checkNotNullParameter(context, "context");
         int ordinal = getEventTiming(j).ordinal();
         if (ordinal == 1 || ordinal == 2) {
-            return b.h(context, 2131889297, new Object[]{DateUtils.getRelativeTimeSpanString(j, ClockFactory.get().currentTimeMillis(), 86400000), new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(j))}, null, 4);
+            return b.h(context, R.string.guild_event_date_at_time, new Object[]{DateUtils.getRelativeTimeSpanString(j, ClockFactory.get().currentTimeMillis(), 86400000), new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(j))}, null, 4);
         }
         if (ordinal == 3) {
-            return b.h(context, 2131893922, new Object[]{Integer.valueOf(minutesRelativeToTime(j))}, null, 4);
+            return b.h(context, R.string.starting_in_minutes, new Object[]{Integer.valueOf(minutesRelativeToTime(j))}, null, 4);
         }
         if (ordinal == 4 || ordinal == 6) {
-            return b.h(context, 2131893923, new Object[0], null, 4);
+            return b.h(context, R.string.starting_soon, new Object[0], null, 4);
         }
         String format = new SimpleDateFormat("EEE, MMM d · h:mm a", Locale.getDefault()).format(Long.valueOf(j));
         m.checkNotNullExpressionValue(format, "SimpleDateFormat(\"EEE, M…lt())\n      .format(this)");
@@ -53,7 +54,7 @@ public final class GuildScheduledEventUtilitiesKt {
     public static final CharSequence getEventStartingTimeString(GuildScheduledEvent guildScheduledEvent, Context context) {
         m.checkNotNullParameter(guildScheduledEvent, "$this$getEventStartingTimeString");
         m.checkNotNullParameter(context, "context");
-        return getEventTiming(guildScheduledEvent).ordinal() != 5 ? getEventStartingTimeString(guildScheduledEvent.g().g(), context) : b.h(context, 2131893743, new Object[0], null, 4);
+        return getEventTiming(guildScheduledEvent).ordinal() != 5 ? getEventStartingTimeString(guildScheduledEvent.g().g(), context) : b.h(context, R.string.stage_channel_live_now, new Object[0], null, 4);
     }
 
     public static final GuildScheduledEventTiming getEventTiming(long j) {
diff --git a/app/src/main/java/com/discord/utilities/icon/IconUtils.java b/app/src/main/java/com/discord/utilities/icon/IconUtils.java
index fc79de2b90..0dbf2d58e0 100644
--- a/app/src/main/java/com/discord/utilities/icon/IconUtils.java
+++ b/app/src/main/java/com/discord/utilities/icon/IconUtils.java
@@ -9,6 +9,8 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.DrawableRes;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationKt;
@@ -17,11 +19,13 @@ import com.discord.models.member.GuildMember;
 import com.discord.models.user.CoreUser;
 import com.discord.models.user.User;
 import com.discord.nullserializable.NullSerializable;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.premium.GuildMemberAvatarsFeatureFlag;
 import com.discord.utilities.string.StringUtilsKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import d0.g0.t;
 import d0.g0.w;
@@ -45,7 +49,7 @@ public final class IconUtils {
     private static final List<String> GROUP_DM_DEFAULT_ICONS;
     private static final int IMAGE_SIZE_ASSET_DEFAULT_PX = 160;
     public static final IconUtils INSTANCE = new IconUtils();
-    private static final Integer[] MEDIA_PROXY_SIZES = {16, 20, 32, 40, 64, 80, 128, 160, 256, 320, 512, 640, 1024, 1280, 1536, 2048, 3072, 4096};
+    private static final Integer[] MEDIA_PROXY_SIZES = {16, 20, 32, 40, 64, 80, 128, Integer.valueOf((int) IMAGE_SIZE_ASSET_DEFAULT_PX), 256, 320, 512, 640, 1024, 1280, 1536, 2048, 3072, 4096};
     @DimenRes
     private static final int UNRESTRICTED = 2131165298;
 
@@ -64,19 +68,19 @@ public final class IconUtils {
 
     public static final String getApplicationIcon(long j, String str, int i) {
         m.checkNotNullParameter(str, "imageId");
-        return "https://cdn.discordapp.com/app-icons/" + j + '/' + str + '.' + StringUtilsKt.getSTATIC_IMAGE_EXTENSION() + "?size=" + i;
+        return "https://cdn.discordapp.com/app-icons/" + j + MentionUtilsKt.SLASH_CHAR + str + '.' + StringUtilsKt.getSTATIC_IMAGE_EXTENSION() + "?size=" + i;
     }
 
     public static /* synthetic */ String getApplicationIcon$default(long j, String str, int i, int i2, Object obj) {
         if ((i2 & 4) != 0) {
-            i = 160;
+            i = IMAGE_SIZE_ASSET_DEFAULT_PX;
         }
         return getApplicationIcon(j, str, i);
     }
 
     public static /* synthetic */ String getAssetImage$default(IconUtils iconUtils, Long l, String str, int i, int i2, Object obj) {
         if ((i2 & 4) != 0) {
-            i = 160;
+            i = IMAGE_SIZE_ASSET_DEFAULT_PX;
         }
         return iconUtils.getAssetImage(l, str, i);
     }
@@ -105,14 +109,14 @@ public final class IconUtils {
     public static final String getForChannel(long j, String str, int i, boolean z2, Integer num) {
         boolean z3 = false;
         if (!(str == null || str.length() == 0)) {
-            if ("https://cdn.discordapp.com".length() == 0) {
+            if (BuildConfig.HOST_CDN.length() == 0) {
                 z3 = true;
             }
             if (z3) {
                 return "https://discord.com/api//channels/" + j + "/icons/" + str + ".jpg";
             }
             IconUtils iconUtils = INSTANCE;
-            return iconUtils.withSize("https://cdn.discordapp.com/channel-icons/" + j + '/' + str + '.' + StringUtilsKt.getSTATIC_IMAGE_EXTENSION(), num);
+            return iconUtils.withSize("https://cdn.discordapp.com/channel-icons/" + j + MentionUtilsKt.SLASH_CHAR + str + '.' + StringUtilsKt.getSTATIC_IMAGE_EXTENSION(), num);
         } else if (i == 3) {
             return INSTANCE.getDefaultForGroupDM(j);
         } else {
@@ -185,12 +189,12 @@ public final class IconUtils {
         String str4 = null;
         Integer valueOf = num != null ? Integer.valueOf(getMediaProxySize(num.intValue())) : null;
         StringBuilder sb = new StringBuilder();
-        if ("https://cdn.discordapp.com".length() == 0) {
+        if (BuildConfig.HOST_CDN.length() == 0) {
             str3 = "https://discord.com/api//guilds/" + l + "/icons/" + str + ".jpg";
         } else {
             IconUtils iconUtils = INSTANCE;
             m.checkNotNull(str);
-            str3 = "https://cdn.discordapp.com/icons/" + l + '/' + str + '.' + iconUtils.getImageExtension(str, z2);
+            str3 = "https://cdn.discordapp.com/icons/" + l + MentionUtilsKt.SLASH_CHAR + str + '.' + iconUtils.getImageExtension(str, z2);
         }
         sb.append(str3);
         if (valueOf != null) {
@@ -283,7 +287,7 @@ public final class IconUtils {
                 return str;
             }
             if (str != null) {
-                if ("https://cdn.discordapp.com".length() == 0) {
+                if (BuildConfig.HOST_CDN.length() == 0) {
                     i = 1;
                 }
                 if (i != 0) {
@@ -291,7 +295,7 @@ public final class IconUtils {
                 }
                 IconUtils iconUtils = INSTANCE;
                 String imageExtension = iconUtils.getImageExtension(str, z2);
-                return iconUtils.withSize("https://cdn.discordapp.com/avatars/" + l + '/' + str + '.' + imageExtension, num2);
+                return iconUtils.withSize("https://cdn.discordapp.com/avatars/" + l + MentionUtilsKt.SLASH_CHAR + str + '.' + imageExtension, num2);
             } else if (num != null) {
                 i = num.intValue() % 5;
             }
@@ -368,7 +372,7 @@ public final class IconUtils {
             MGImages.setImage$default(imageView, applicationIcon, 0, 0, false, null, null, 124, null);
             return;
         }
-        int themedColor = ColorCompat.getThemedColor(imageView, 2130968989);
+        int themedColor = ColorCompat.getThemedColor(imageView, (int) R.attr.colorTextMuted);
         Context context = imageView.getContext();
         m.checkNotNullExpressionValue(context, "imageView.context");
         Drawable drawable$default = DrawableCompat.getDrawable$default(context, application.getIconRes().intValue(), themedColor, false, 4, null);
@@ -501,14 +505,14 @@ public final class IconUtils {
     public static final void setIcon(ImageView imageView, String str, Long l, String str2, Integer num, @DimenRes int i, Function1<? super ImageRequestBuilder, Unit> function1, MGImages.ChangeDetector changeDetector, GuildMember guildMember) {
         m.checkNotNullParameter(imageView, "imageView");
         m.checkNotNullParameter(changeDetector, "changeDetector");
-        Integer valueOf = i != 2131165298 ? Integer.valueOf(imageView.getResources().getDimensionPixelSize(i)) : null;
+        Integer valueOf = i != R.dimen.avatar_size_unrestricted ? Integer.valueOf(imageView.getResources().getDimensionPixelSize(i)) : null;
         setIcon$default(imageView, (guildMember == null || !guildMember.hasAvatar() || !GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled()) ? getForUser$default(l, str2, num, false, valueOf, 8, null) : getForGuildMember$default(INSTANCE, guildMember, valueOf, false, 4, null), valueOf != null ? valueOf.intValue() : 0, valueOf != null ? valueOf.intValue() : 0, false, function1, changeDetector, 16, null);
         imageView.setContentDescription(str);
     }
 
     public static /* synthetic */ void setIcon$default(ImageView imageView, Channel channel, int i, MGImages.ChangeDetector changeDetector, int i2, Object obj) {
         if ((i2 & 4) != 0) {
-            i = 2131165298;
+            i = R.dimen.avatar_size_unrestricted;
         }
         if ((i2 & 8) != 0) {
             changeDetector = MGImages.AlwaysUpdateChangeDetector.INSTANCE;
@@ -518,7 +522,7 @@ public final class IconUtils {
 
     public static /* synthetic */ void setIcon$default(ImageView imageView, Guild guild, int i, MGImages.ChangeDetector changeDetector, boolean z2, int i2, Object obj) {
         if ((i2 & 4) != 0) {
-            i = 2131165298;
+            i = R.dimen.avatar_size_unrestricted;
         }
         if ((i2 & 8) != 0) {
             changeDetector = MGImages.AlwaysUpdateChangeDetector.INSTANCE;
@@ -530,7 +534,7 @@ public final class IconUtils {
     }
 
     public static /* synthetic */ void setIcon$default(ImageView imageView, User user, int i, Function1 function1, MGImages.ChangeDetector changeDetector, GuildMember guildMember, int i2, Object obj) {
-        int i3 = (i2 & 4) != 0 ? 2131165298 : i;
+        int i3 = (i2 & 4) != 0 ? R.dimen.avatar_size_unrestricted : i;
         Function1 function12 = (i2 & 8) != 0 ? null : function1;
         if ((i2 & 16) != 0) {
             changeDetector = MGImages.AlwaysUpdateChangeDetector.INSTANCE;
@@ -551,7 +555,7 @@ public final class IconUtils {
 
     public static /* synthetic */ void setIcon$default(ImageView imageView, String str, int i, Function1 function1, MGImages.ChangeDetector changeDetector, int i2, Object obj) {
         if ((i2 & 4) != 0) {
-            i = 2131165298;
+            i = R.dimen.avatar_size_unrestricted;
         }
         if ((i2 & 8) != 0) {
             function1 = null;
@@ -563,7 +567,7 @@ public final class IconUtils {
     }
 
     public static /* synthetic */ void setIcon$default(ImageView imageView, String str, Long l, String str2, Integer num, int i, Function1 function1, MGImages.ChangeDetector changeDetector, GuildMember guildMember, int i2, Object obj) {
-        setIcon(imageView, str, l, str2, num, (i2 & 32) != 0 ? 2131165298 : i, (i2 & 64) != 0 ? null : function1, (i2 & 128) != 0 ? MGImages.AlwaysUpdateChangeDetector.INSTANCE : changeDetector, (i2 & 256) != 0 ? null : guildMember);
+        setIcon(imageView, str, l, str2, num, (i2 & 32) != 0 ? R.dimen.avatar_size_unrestricted : i, (i2 & 64) != 0 ? null : function1, (i2 & 128) != 0 ? MGImages.AlwaysUpdateChangeDetector.INSTANCE : changeDetector, (i2 & 256) != 0 ? null : guildMember);
     }
 
     private final String withSize(String str, Integer num) {
@@ -589,7 +593,7 @@ public final class IconUtils {
         if (z2) {
             str = getForUser$default(coreUser, false, null, 6, null);
         } else if (icon != null) {
-            str = getApplicationIcon(application.getId(), icon, 160);
+            str = getApplicationIcon(application.getId(), icon, IMAGE_SIZE_ASSET_DEFAULT_PX);
         }
         return str != null ? str : a.k("asset://asset/images/default_avatar_", discriminator, ".png");
     }
@@ -597,8 +601,8 @@ public final class IconUtils {
     @SuppressLint({"DefaultLocale"})
     public final String getAssetImage(Long l, String str, int i) {
         m.checkNotNullParameter(str, "imageId");
-        if (w.contains$default((CharSequence) str, ':', false, 2, (Object) null)) {
-            List split$default = w.split$default((CharSequence) str, new char[]{':'}, false, 2, 2, (Object) null);
+        if (w.contains$default((CharSequence) str, (char) MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, false, 2, (Object) null)) {
+            List split$default = w.split$default((CharSequence) str, new char[]{MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR}, false, 2, 2, (Object) null);
             String str2 = (String) split$default.get(0);
             Objects.requireNonNull(str2, "null cannot be cast to non-null type java.lang.String");
             String lowerCase = str2.toLowerCase();
@@ -607,7 +611,7 @@ public final class IconUtils {
         } else if (l == null) {
             return null;
         } else {
-            return "https://cdn.discordapp.com/app-assets/" + l + '/' + str + ".jpg?size=" + i;
+            return "https://cdn.discordapp.com/app-assets/" + l + MentionUtilsKt.SLASH_CHAR + str + ".jpg?size=" + i;
         }
     }
 
@@ -626,13 +630,13 @@ public final class IconUtils {
             return null;
         }
         Integer valueOf = num != null ? Integer.valueOf(getMediaProxySize(num.intValue())) : null;
-        if ("https://cdn.discordapp.com".length() == 0) {
+        if (BuildConfig.HOST_CDN.length() == 0) {
             return "https://discord.com/api//guilds/" + l + "/banners/" + str + ".jpg";
         }
         StringBuilder sb = new StringBuilder();
         sb.append("https://cdn.discordapp.com/banners/");
         sb.append(l);
-        sb.append('/');
+        sb.append(MentionUtilsKt.SLASH_CHAR);
         sb.append(str);
         sb.append(".jpg");
         if (valueOf != null) {
@@ -646,8 +650,9 @@ public final class IconUtils {
     }
 
     public final String getDefaultForGroupDM(long j) {
+        long j2 = (j >>> 22) + SnowflakeUtils.DISCORD_EPOCH;
         List<String> list = GROUP_DM_DEFAULT_ICONS;
-        return list.get((int) (((j >>> 22) + 1420070400000L) % ((long) list.size())));
+        return list.get((int) (j2 % ((long) list.size())));
     }
 
     public final String getForGuildMember(GuildMember guildMember, Integer num, boolean z2) {
@@ -677,7 +682,7 @@ public final class IconUtils {
             return null;
         }
         String imageExtension = getImageExtension(str, z2);
-        return withSize("https://cdn.discordapp.com/banners/" + j + '/' + str + '.' + imageExtension, num);
+        return withSize("https://cdn.discordapp.com/banners/" + j + MentionUtilsKt.SLASH_CHAR + str + '.' + imageExtension, num);
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:20:0x005e, code lost:
@@ -714,7 +719,7 @@ public final class IconUtils {
         }
         str2 = "keep_aspect_ratio=true";
         K.append(str2);
-        return "https://cdn.discordapp.com/app-icons/" + j + '/' + str + '.' + StringUtilsKt.getSTATIC_IMAGE_EXTENSION() + K.toString();
+        return "https://cdn.discordapp.com/app-icons/" + j + MentionUtilsKt.SLASH_CHAR + str + '.' + StringUtilsKt.getSTATIC_IMAGE_EXTENSION() + K.toString();
     }
 
     public final String getGuildSplashUrl(long j, String str, Integer num) {
@@ -722,10 +727,10 @@ public final class IconUtils {
         m.checkNotNullParameter(str, "splashHash");
         String str3 = null;
         Integer valueOf = num != null ? Integer.valueOf(getMediaProxySize(num.intValue())) : null;
-        if ("https://cdn.discordapp.com".length() == 0) {
+        if (BuildConfig.HOST_CDN.length() == 0) {
             str2 = "https://discord.com/api//guilds/" + j + "/splashes/" + str + ".jpg";
         } else {
-            str2 = "https://cdn.discordapp.com/splashes/" + j + '/' + str + ".jpg";
+            str2 = "https://cdn.discordapp.com/splashes/" + j + MentionUtilsKt.SLASH_CHAR + str + ".jpg";
         }
         StringBuilder K = a.K(str2);
         if (valueOf != null) {
@@ -747,7 +752,7 @@ public final class IconUtils {
 
     public final String getImageExtension(String str, boolean z2) {
         m.checkNotNullParameter(str, "imageHash");
-        return (!z2 || !isImageHashAnimated(str)) ? StringUtilsKt.getSTATIC_IMAGE_EXTENSION() : "gif";
+        return (!z2 || !isImageHashAnimated(str)) ? StringUtilsKt.getSTATIC_IMAGE_EXTENSION() : ANIMATED_IMAGE_EXTENSION;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:40:0x00b1 A[RETURN, SYNTHETIC] */
@@ -758,17 +763,17 @@ public final class IconUtils {
             switch (str.hashCode()) {
                 case -1904464552:
                     if (str.equals("eu-central")) {
-                        return 2131232131;
+                        return R.drawable.icon_flag_eu;
                     }
                     break;
                 case -1867973154:
                     if (str.equals("us-south")) {
-                        return 2131232129;
+                        return R.drawable.icon_flag_en_us;
                     }
                     break;
                 case -1504353500:
                     if (str.equals("singapore")) {
-                        return 2131232149;
+                        return R.drawable.icon_flag_sg;
                     }
                     break;
                 case -1456593748:
@@ -781,27 +786,27 @@ public final class IconUtils {
                     break;
                 case -1381018772:
                     if (str.equals("brazil")) {
-                        return 2131232146;
+                        return R.drawable.icon_flag_pt_br;
                     }
                     break;
                 case -1097131496:
                     if (str.equals("london")) {
-                        return 2131232134;
+                        return R.drawable.icon_flag_gb;
                     }
                     break;
                 case -919652293:
                     if (str.equals("russia")) {
-                        return 2131232148;
+                        return R.drawable.icon_flag_ru;
                     }
                     break;
                 case -887780828:
                     if (str.equals("sydney")) {
-                        return 2131232122;
+                        return R.drawable.icon_flag_au;
                     }
                     break;
                 case -455031011:
                     if (str.equals("hongkong")) {
-                        return 2131232136;
+                        return R.drawable.icon_flag_hk;
                     }
                     break;
                 case -199235124:
@@ -814,22 +819,22 @@ public final class IconUtils {
                     break;
                 case -135164842:
                     if (str.equals("amsterdam")) {
-                        return 2131232143;
+                        return R.drawable.icon_flag_nl;
                     }
                     break;
                 case 100893702:
                     if (str.equals("japan")) {
-                        return 2131232140;
+                        return R.drawable.icon_flag_ja;
                     }
                     break;
                 case 579843043:
                     if (str.equals("frankfurt")) {
-                        return 2131232126;
+                        return R.drawable.icon_flag_de;
                     }
                     break;
             }
         }
-        return 2131232154;
+        return R.drawable.icon_flag_unknown;
     }
 
     public final boolean isDataUrlForGif(String str) {
diff --git a/app/src/main/java/com/discord/utilities/images/MGImages$requestImageCrop$1.java b/app/src/main/java/com/discord/utilities/images/MGImages$requestImageCrop$1.java
index f66f613d13..f4574ecc2a 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImages$requestImageCrop$1.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImages$requestImageCrop$1.java
@@ -2,6 +2,8 @@ package com.discord.utilities.images;
 
 import android.content.Context;
 import c.a.l.b;
+import c.a.r.n0.c.e;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -25,8 +27,8 @@ public final class MGImages$requestImageCrop$1 extends o implements Function1<Ex
     }
 
     public final void invoke(Exception exc) {
-        m.checkNotNullParameter(exc, "e");
+        m.checkNotNullParameter(exc, e.a);
         Context context = this.$context;
-        c.a.e.o.h(context, context != null ? b.h(context, 2131894482, new Object[]{exc.getMessage()}, null, 4) : null, 0, null, 12);
+        c.a.e.o.h(context, context != null ? b.h(context, R.string.unable_to_open_media_chooser, new Object[]{exc.getMessage()}, null, 4) : null, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImages.java b/app/src/main/java/com/discord/utilities/images/MGImages.java
index 04c79d6a2e..bb1fdead3d 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImages.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImages.java
@@ -17,6 +17,7 @@ import android.os.Bundle;
 import android.widget.ImageView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.o;
 import c.f.g.a.a.d;
@@ -24,10 +25,12 @@ import c.f.g.f.a;
 import c.f.g.f.c;
 import c.f.j.d.e;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.dialogs.ImageUploadDialog;
 import com.discord.media_picker.MediaPicker;
 import com.discord.media_picker.RequestType;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.icon.IconUtils;
 import com.facebook.drawee.controller.ControllerListener;
 import com.facebook.drawee.drawable.ScalingUtils$ScaleType;
 import com.facebook.drawee.generic.GenericDraweeHierarchy;
@@ -116,7 +119,7 @@ public final class MGImages {
         b.b = ImageRequest.c.FULL_FETCH;
         m.checkNotNullExpressionValue(b, "requestBuilder");
         boolean z3 = false;
-        b.f = (z2 || !w.contains$default(str, "gif", false, 2, null)) ? ImageRequest.b.SMALL : ImageRequest.b.DEFAULT;
+        b.f = (z2 || !w.contains$default(str, IconUtils.ANIMATED_IMAGE_EXTENSION, false, 2, null)) ? ImageRequest.b.SMALL : ImageRequest.b.DEFAULT;
         if (i > 0 && i2 > 0) {
             z3 = true;
         }
@@ -127,14 +130,14 @@ public final class MGImages {
     }
 
     public static final void prepareImageUpload(Uri uri, String str, FragmentManager fragmentManager, MediaPicker.Provider provider, Action1<String> action1, ImageUploadDialog.PreviewType previewType) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         m.checkNotNullParameter(fragmentManager, "fragmentManager");
         m.checkNotNullParameter(provider, "provider");
         m.checkNotNullParameter(previewType, "previewType");
         Objects.requireNonNull(ImageUploadDialog.j);
         m.checkNotNullParameter(fragmentManager, "fragmentManager");
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(provider, "provider");
         m.checkNotNullParameter(str, "mimeType");
         m.checkNotNullParameter(previewType, "previewType");
@@ -160,7 +163,7 @@ public final class MGImages {
      */
     public static final void requestDataUrl(Context context, Uri uri, String str, Action1<String> action1) {
         InputStream openInputStream;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         if (context != null) {
             try {
@@ -174,11 +177,11 @@ public final class MGImages {
                     b.closeFinally(openInputStream, null);
                 }
             } catch (IOException e) {
-                o.h(context, c.a.l.b.h(context, 2131886803, new Object[]{e.getMessage()}, null, 4), 0, null, 12);
+                o.h(context, c.a.l.b.h(context, R.string.avatar_convert_failure_mobile, new Object[]{e.getMessage()}, null, 4), 0, null, 12);
             } catch (NullPointerException e2) {
-                o.h(context, c.a.l.b.h(context, 2131886803, new Object[]{e2.getMessage()}, null, 4), 0, null, 12);
+                o.h(context, c.a.l.b.h(context, R.string.avatar_convert_failure_mobile, new Object[]{e2.getMessage()}, null, 4), 0, null, 12);
             } catch (IllegalStateException e3) {
-                o.h(context, c.a.l.b.h(context, 2131886803, new Object[]{e3.getMessage()}, null, 4), 0, null, 12);
+                o.h(context, c.a.l.b.h(context, R.string.avatar_convert_failure_mobile, new Object[]{e3.getMessage()}, null, 4), 0, null, 12);
             }
         }
     }
@@ -187,12 +190,12 @@ public final class MGImages {
         m.checkNotNullParameter(provider, "provider");
         m.checkNotNullParameter(uri, "inputUri");
         MGImages$requestImageCrop$1 mGImages$requestImageCrop$1 = new MGImages$requestImageCrop$1(context);
-        int themedColor = ColorCompat.getThemedColor(context, 2130969008);
-        int color = ColorCompat.getColor(context, 2131100433);
-        int themedColor2 = ColorCompat.getThemedColor(context, 2130969012);
-        int themedColor3 = ColorCompat.getThemedColor(context, 2130969008);
+        int themedColor = ColorCompat.getThemedColor(context, (int) R.attr.color_brand_500);
+        int color = ColorCompat.getColor(context, (int) R.color.white);
+        int themedColor2 = ColorCompat.getThemedColor(context, (int) R.attr.color_brand_630);
+        int themedColor3 = ColorCompat.getThemedColor(context, (int) R.attr.color_brand_500);
         m.checkNotNullParameter(provider, "provider");
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(mGImages$requestImageCrop$1, "onError");
         try {
             Bundle bundle = new Bundle();
@@ -473,7 +476,7 @@ public final class MGImages {
     public final void setImage(ImageView imageView, Uri uri, ChangeDetector changeDetector) {
         Integer intOrNull;
         m.checkNotNullParameter(imageView, "view");
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(changeDetector, "changeDetector");
         if (m.areEqual(uri.getScheme(), "android.resource")) {
             String host = uri.getHost();
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
index 7f75de6d30..d8b6a9c214 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
@@ -2,6 +2,7 @@ package com.discord.utilities.images;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import c.f.j.e.h;
 import c.f.j.e.l;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -353,7 +354,7 @@ public final class MGImagesBitmap {
 
     private final boolean isValidUri(String str) {
         Uri parse = Uri.parse(str);
-        m.checkNotNullExpressionValue(parse, "uri");
+        m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         String scheme = parse.getScheme();
         if (scheme == null || t.isBlank(scheme)) {
             return false;
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java b/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
index de0745d2e6..8e935a021f 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
@@ -3,6 +3,7 @@ package com.discord.utilities.images;
 import android.app.ActivityManager;
 import android.app.Application;
 import android.content.Context;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.f.d.d.k;
 import c.f.d.e.a;
 import c.f.g.a.a.e;
@@ -32,7 +33,7 @@ public final class MGImagesConfig {
     }
 
     private final DefaultBitmapMemoryCacheParamsSupplier getAppBitmapMemoryCacheParamsSupplier(Context context) {
-        Object systemService = context.getSystemService("activity");
+        Object systemService = context.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.app.ActivityManager");
         ActivityManager activityManager = (ActivityManager) systemService;
         return new MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1(activityManager, activityManager);
@@ -42,7 +43,7 @@ public final class MGImagesConfig {
         DiskCacheConfig.b bVar = new DiskCacheConfig.b(context, null);
         bVar.b = new k(context.getCacheDir());
         bVar.a = str;
-        bVar.f2196c = 41943040;
+        bVar.f2196c = MAX_DISK_CACHE_SIZE;
         DiskCacheConfig diskCacheConfig = new DiskCacheConfig(bVar);
         m.checkNotNullExpressionValue(diskCacheConfig, "DiskCacheConfig\n        …HE_SIZE)\n        .build()");
         return diskCacheConfig;
@@ -52,8 +53,8 @@ public final class MGImagesConfig {
         m.checkNotNullParameter(application, "context");
         j.a aVar = new j.a(application, null);
         aVar.f442c = true;
-        aVar.d = newDiskCacheConfig(application, "app_images_cache");
-        aVar.e = newDiskCacheConfig(application, "app_images_cache_small");
+        aVar.d = newDiskCacheConfig(application, CACHE_DIR);
+        aVar.e = newDiskCacheConfig(application, CACHE_DIR_SMALL);
         DefaultBitmapMemoryCacheParamsSupplier appBitmapMemoryCacheParamsSupplier = getAppBitmapMemoryCacheParamsSupplier(application);
         Objects.requireNonNull(appBitmapMemoryCacheParamsSupplier);
         aVar.a = appBitmapMemoryCacheParamsSupplier;
diff --git a/app/src/main/java/com/discord/utilities/integrations/SpotifyHelper.java b/app/src/main/java/com/discord/utilities/integrations/SpotifyHelper.java
index d7c097920c..8b67c9db82 100644
--- a/app/src/main/java/com/discord/utilities/integrations/SpotifyHelper.java
+++ b/app/src/main/java/com/discord/utilities/integrations/SpotifyHelper.java
@@ -56,7 +56,7 @@ public final class SpotifyHelper {
     public final boolean isSpotifyInstalled(Context context) {
         m.checkNotNullParameter(context, "context");
         try {
-            context.getPackageManager().getPackageInfo("com.spotify.music", 0);
+            context.getPackageManager().getPackageInfo(SPOTIFY_PACKAGE_NAME, 0);
             return true;
         } catch (PackageManager.NameNotFoundException unused) {
             return false;
@@ -90,7 +90,7 @@ public final class SpotifyHelper {
 
     public final void openSpotifyApp(Context context) {
         m.checkNotNullParameter(context, "context");
-        Intent launchIntentForPackage = context.getPackageManager().getLaunchIntentForPackage("com.spotify.music");
+        Intent launchIntentForPackage = context.getPackageManager().getLaunchIntentForPackage(SPOTIFY_PACKAGE_NAME);
         if (launchIntentForPackage != null) {
             context.startActivity(launchIntentForPackage);
         }
diff --git a/app/src/main/java/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.java b/app/src/main/java/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.java
index 18d509ea2c..7748cbd85c 100644
--- a/app/src/main/java/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.java
+++ b/app/src/main/java/com/discord/utilities/intent/IntentUtils$consumeExternalRoutingIntent$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.intent;
 
 import android.content.Intent;
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.AppStartAnalyticsTracker;
 import com.discord.utilities.fcm.NotificationClient;
@@ -29,7 +30,7 @@ public final class IntentUtils$consumeExternalRoutingIntent$1 extends o implemen
     }
 
     public final void invoke(Uri uri, boolean z2) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         Map<String, Object> buildTrackingData = NotificationClient.INSTANCE.buildTrackingData(this.$intent);
         for (String str : buildTrackingData.keySet()) {
             this.$intent.removeExtra(str);
diff --git a/app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.java b/app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.java
index a0f9510ad5..a18b4ebebe 100644
--- a/app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.java
+++ b/app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.intent;
 
 import android.content.Context;
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import com.discord.utilities.intent.RouteHandlers;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -16,7 +17,7 @@ public final class IntentUtils$pathRouterMap$1 extends o implements Function3<Ur
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         return RouteHandlers.INSTANCE.selectChannel(context, uri, matchResult);
     }
diff --git a/app/src/main/java/com/discord/utilities/intent/IntentUtils.java b/app/src/main/java/com/discord/utilities/intent/IntentUtils.java
index 5375201740..bee4921c54 100644
--- a/app/src/main/java/com/discord/utilities/intent/IntentUtils.java
+++ b/app/src/main/java/com/discord/utilities/intent/IntentUtils.java
@@ -3,14 +3,21 @@ package com.discord.utilities.intent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import c.a.e.o0.b;
 import c.i.c.c;
 import c.i.c.k.c.a;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.restapi.RestAPIBuilder;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.intent.RouteHandlers;
 import com.discord.utilities.logging.Logger;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.google.firebase.appindexing.internal.zza;
 import com.google.firebase.appindexing.internal.zzc;
 import d0.g0.i;
@@ -45,8 +52,8 @@ public final class IntentUtils {
             }
 
             public static final Intent join(String str, long j, String str2) {
-                m.checkNotNullParameter(str, "deeplink");
-                return new Intent("com.discord.intent.action.SDK", Uri.parse(str).buildUpon().appendPath("join").appendQueryParameter("application_id", String.valueOf(j)).appendQueryParameter("secret", str2).build());
+                m.checkNotNullParameter(str, Constants.DEEPLINK);
+                return new Intent("com.discord.intent.action.SDK", Uri.parse(str).buildUpon().appendPath("join").appendQueryParameter(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID, String.valueOf(j)).appendQueryParameter("secret", str2).build());
             }
         }
 
@@ -86,7 +93,7 @@ public final class IntentUtils {
             if (l == 0) {
                 l = "";
             }
-            return new Intent("android.intent.action.VIEW", Uri.parse("discord://app/channels/" + valueOf + '/' + j + '/' + l));
+            return new Intent("android.intent.action.VIEW", Uri.parse("discord://app/channels/" + valueOf + MentionUtilsKt.SLASH_CHAR + j + MentionUtilsKt.SLASH_CHAR + l));
         }
 
         public static /* synthetic */ Intent selectChannel$default(long j, long j2, Long l, int i, Object obj) {
@@ -113,7 +120,7 @@ public final class IntentUtils {
 
         public final Intent selectGuildTemplate(String str, String str2) {
             Uri parse = Uri.parse(str);
-            m.checkNotNullExpressionValue(parse, "uri");
+            m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             if (parse.getScheme() == null) {
                 if (str != null) {
                     b bVar = b.F;
@@ -130,7 +137,7 @@ public final class IntentUtils {
 
         public final Intent selectInvite(String str, String str2) {
             Uri parse = Uri.parse(str);
-            m.checkNotNullExpressionValue(parse, "uri");
+            m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             if (parse.getScheme() == null) {
                 if (str != null) {
                     b bVar = b.F;
@@ -166,7 +173,7 @@ public final class IntentUtils {
     }
 
     private final Uri externalize(Uri uri) {
-        Uri.Builder scheme = uri.buildUpon().scheme("https");
+        Uri.Builder scheme = uri.buildUpon().scheme(Constants.SCHEME);
         b bVar = b.F;
         return scheme.authority(b.a).build();
     }
@@ -198,7 +205,7 @@ public final class IntentUtils {
             c.i.c.k.b bVar = null;
             if ((aVar.f1287c == null ? null : new String(aVar.f1287c)) == null) {
                 aVar.f1287c = "AssistAction";
-                aVar.a("name", "AssistAction");
+                aVar.a(ModelAuditLogEntry.CHANGE_KEY_NAME, "AssistAction");
             }
             if ((aVar.d == null ? null : new String(aVar.d)) == null) {
                 String valueOf = String.valueOf(aVar.f);
@@ -232,14 +239,14 @@ public final class IntentUtils {
 
     public static final void performChooserSendIntent(Context context, String str, CharSequence charSequence) {
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         m.checkNotNullParameter(charSequence, "chooserText");
         context.startActivity(Intent.createChooser(INSTANCE.sendText(new Intent("android.intent.action.SEND"), str), charSequence));
     }
 
     public static /* synthetic */ void performChooserSendIntent$default(Context context, String str, CharSequence charSequence, int i, Object obj) {
         if ((i & 4) != 0) {
-            charSequence = context.getString(2131893624);
+            charSequence = context.getString(R.string.share);
             m.checkNotNullExpressionValue(charSequence, "context.getString(R.string.share)");
         }
         performChooserSendIntent(context, str, charSequence);
@@ -247,7 +254,7 @@ public final class IntentUtils {
 
     private final Intent sendText(Intent intent, String str) {
         intent.setAction("android.intent.action.SEND");
-        intent.setType("text/plain");
+        intent.setType(RestAPIBuilder.CONTENT_TYPE_TEXT);
         if (str == null) {
             str = "";
         }
@@ -272,7 +279,7 @@ public final class IntentUtils {
         if (data == null) {
             data = Uri.EMPTY;
         }
-        m.checkNotNullExpressionValue(data, "uri");
+        m.checkNotNullExpressionValue(data, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         boolean z2 = isDiscordAppUri(data) || isHttpDomainUrl(data);
         function2.invoke(data, Boolean.valueOf(z2));
         if (z2) {
@@ -318,7 +325,7 @@ public final class IntentUtils {
 
     public final Long getDirectShareId(Intent intent) {
         m.checkNotNullParameter(intent, "$this$getDirectShareId");
-        String stringExtra = intent.getStringExtra("android.intent.extra.shortcut.ID");
+        String stringExtra = intent.getStringExtra(ShortcutManagerCompat.EXTRA_SHORTCUT_ID);
         if (stringExtra != null) {
             return s.toLongOrNull(stringExtra);
         }
@@ -328,7 +335,7 @@ public final class IntentUtils {
     public final boolean isDiscordAppUri(Uri uri) {
         String str;
         int hashCode;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         if (t.equals(uri.getScheme(), "discord", true)) {
             String host = uri.getHost();
             if (host != null) {
diff --git a/app/src/main/java/com/discord/utilities/intent/IntentUtilsKt.java b/app/src/main/java/com/discord/utilities/intent/IntentUtilsKt.java
index 7b888c4dda..27614b781c 100644
--- a/app/src/main/java/com/discord/utilities/intent/IntentUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/intent/IntentUtilsKt.java
@@ -1,14 +1,16 @@
 package com.discord.utilities.intent;
 
 import android.content.Intent;
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: IntentUtils.kt */
 public final class IntentUtilsKt {
     public static final Long getLongExtraOrNull(Intent intent, String str) {
         m.checkNotNullParameter(intent, "$this$getLongExtraOrNull");
-        m.checkNotNullParameter(str, "name");
-        long longExtra = intent.getLongExtra(str, Long.MAX_VALUE);
-        if (longExtra != Long.MAX_VALUE) {
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
+        long longExtra = intent.getLongExtra(str, RecyclerView.FOREVER_NS);
+        if (longExtra != RecyclerView.FOREVER_NS) {
             return Long.valueOf(longExtra);
         }
         return null;
@@ -16,7 +18,7 @@ public final class IntentUtilsKt {
 
     public static final String getStringExtraOrDefault(Intent intent, String str, String str2) {
         m.checkNotNullParameter(intent, "$this$getStringExtraOrDefault");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "default");
         String stringExtra = intent.getStringExtra(str);
         if (stringExtra != null) {
diff --git a/app/src/main/java/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.java b/app/src/main/java/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.java
index 4a5c29e6cd..7b8394fe5e 100644
--- a/app/src/main/java/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.java
+++ b/app/src/main/java/com/discord/utilities/intent/RouteHandlers$selectFeature$settingMap$4.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.intent;
 
 import androidx.fragment.app.FragmentActivity;
+import com.discord.stores.StoreInviteSettings;
 import com.discord.widgets.guilds.create.WidgetGuildCreate;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,6 +25,6 @@ public final class RouteHandlers$selectFeature$settingMap$4 extends o implements
 
     public final void invoke(FragmentActivity fragmentActivity) {
         m.checkNotNullParameter(fragmentActivity, "ctx");
-        WidgetGuildCreate.Companion.show(fragmentActivity, new WidgetGuildCreate.Options("Deeplink", null, false, null, false, 30, null));
+        WidgetGuildCreate.Companion.show(fragmentActivity, new WidgetGuildCreate.Options(StoreInviteSettings.LOCATION_DEEPLINK, null, false, null, false, 30, null));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java b/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
index 2d29f5daa4..787f63b782 100644
--- a/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
+++ b/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
@@ -4,9 +4,13 @@ import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
+import androidx.core.app.NotificationCompat;
+import androidx.core.os.EnvironmentCompat;
 import c.a.a.z.c;
 import c.d.b.a.a;
+import com.discord.BuildConfig;
 import com.discord.stores.StoreAuthentication;
+import com.discord.stores.StoreInviteSettings;
 import com.discord.stores.StoreNavigation;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreTabsNavigation;
@@ -14,6 +18,7 @@ import com.discord.utilities.channel.ChannelSelector;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.guilds.join.WidgetGuildJoin;
 import com.discord.widgets.media.WidgetQRScanner;
 import com.discord.widgets.servers.premiumguild.WidgetPremiumGuildSubscription;
@@ -45,7 +50,7 @@ public final class RouteHandlers {
     /* compiled from: RouteHandlers.kt */
     public static final class AnalyticsMetadata {
         public static final Companion Companion = new Companion(null);
-        private static final AnalyticsMetadata UNKNOWN = new AnalyticsMetadata("unknown", null, null, 6, null);
+        private static final AnalyticsMetadata UNKNOWN = new AnalyticsMetadata(EnvironmentCompat.MEDIA_UNKNOWN, null, null, 6, null);
         private final Long channelId;
         private final Long guildId;
         private final String type;
@@ -110,7 +115,7 @@ public final class RouteHandlers {
                 str = queryParameter;
             }
         }
-        str = "Deeplink";
+        str = StoreInviteSettings.LOCATION_DEEPLINK;
         m.checkNotNullExpressionValue(str, "uri.getQueryParameter(\"s…ettings.LOCATION_DEEPLINK");
         if (str2 != null && (!t.isBlank(str2))) {
             c.j.a(str2, str, 0);
@@ -156,25 +161,25 @@ public final class RouteHandlers {
                 str = queryParameter;
             }
         }
-        str = "Deeplink";
+        str = StoreInviteSettings.LOCATION_DEEPLINK;
         m.checkNotNullExpressionValue(str, "uri.getQueryParameter(\"s…        ?: inviteLocation");
         if (str2 != null) {
             StoreStream.Companion.getInviteSettings().setInviteCode(str2, str);
         } else {
-            WidgetGuildJoin.Companion.show(context, "Deeplink");
+            WidgetGuildJoin.Companion.show(context, StoreInviteSettings.LOCATION_DEEPLINK);
         }
         return new AnalyticsMetadata("invite", null, null, 6, null);
     }
 
     public final AnalyticsMetadata authorize(Uri uri, MatchResult matchResult, Context context) {
         boolean z2;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         if (!(context instanceof Activity) || Build.VERSION.SDK_INT < 22) {
             z2 = false;
         } else {
             Uri referrer = ((Activity) context).getReferrer();
-            z2 = m.areEqual(referrer != null ? referrer.getAuthority() : null, "com.discord");
+            z2 = m.areEqual(referrer != null ? referrer.getAuthority() : null, BuildConfig.APPLICATION_ID);
         }
         Uri build = uri.buildUpon().appendQueryParameter("internal_referrer", String.valueOf(z2)).build();
         StoreAuthentication authentication = StoreStream.Companion.getAuthentication();
@@ -185,7 +190,7 @@ public final class RouteHandlers {
 
     public final AnalyticsMetadata handleQuery(Uri uri, MatchResult matchResult, Context context) {
         String str;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         String queryParameter = uri.getQueryParameter("type");
         String queryParameter2 = uri.getQueryParameter("channelName");
@@ -227,7 +232,7 @@ public final class RouteHandlers {
                         if (z2) {
                             str2 = ' ' + str5;
                         }
-                        str = '#' + str4 + str2;
+                        str = MentionUtilsKt.CHANNELS_CHAR + str4 + str2;
                     }
                 } else if (queryParameter.equals("user")) {
                     if (!(queryParameter4.length() > 0)) {
@@ -239,7 +244,7 @@ public final class RouteHandlers {
                     if (z2) {
                         return AnalyticsMetadata.Companion.getUNKNOWN();
                     }
-                    str = '@' + queryParameter4;
+                    str = MentionUtilsKt.MENTIONS_CHAR + queryParameter4;
                 }
             } else if (queryParameter.equals("server")) {
                 str = '*' + queryParameter3;
@@ -251,7 +256,7 @@ public final class RouteHandlers {
     }
 
     public final AnalyticsMetadata navigateToFriendsScreen(Uri uri, MatchResult matchResult, Context context) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         StoreStream.Companion.getTabsNavigation().selectTab(NavigationTab.FRIENDS, true);
         return new AnalyticsMetadata("friends", null, null, 6, null);
@@ -259,7 +264,7 @@ public final class RouteHandlers {
 
     public final AnalyticsMetadata remoteAuth(Uri uri, MatchResult matchResult, Context context) {
         List<String> groupValues;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         if (((matchResult == null || (groupValues = matchResult.getGroupValues()) == null) ? null : (String) u.last((List<? extends Object>) groupValues)) != null) {
             WidgetQRScanner.Companion.launch(context, true);
@@ -282,7 +287,7 @@ public final class RouteHandlers {
         List<String> groupValues3;
         String str3;
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         if (!(matchResult == null || (groupValues3 = matchResult.getGroupValues()) == null || (str3 = (String) u.getOrNull(groupValues3, 1)) == null)) {
             Long longOrNull3 = m.areEqual(str3, "@me") ? 0L : s.toLongOrNull(str3);
             if (longOrNull3 != null) {
@@ -321,7 +326,7 @@ public final class RouteHandlers {
         List<String> groupValues;
         String str;
         Long longOrNull;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         if (!(matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = (String) u.last((List<? extends Object>) groupValues)) == null || (longOrNull = s.toLongOrNull(str)) == null)) {
             ChannelSelector.Companion.getInstance().findAndSetDirectMessage(context, longOrNull.longValue());
@@ -330,7 +335,7 @@ public final class RouteHandlers {
     }
 
     public final AnalyticsMetadata selectDiscovery(Uri uri, MatchResult matchResult, Context context) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         if (StageDiscoveryUsersFeatureFlag.Companion.getINSTANCE().canAccessStageDiscovery()) {
             StoreStream.Companion.getTabsNavigation().selectTab(NavigationTab.DISCOVERY, true);
@@ -343,7 +348,7 @@ public final class RouteHandlers {
     public final AnalyticsMetadata selectFeature(Uri uri, MatchResult matchResult, Context context) {
         String str;
         List<String> groupValues;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         if (matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = (String) u.getOrNull(groupValues, 1)) == null) {
             str = "";
@@ -358,7 +363,7 @@ public final class RouteHandlers {
         String str;
         List<String> groupValues2;
         String str2;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         long parseLong = (matchResult == null || (groupValues2 = matchResult.getGroupValues()) == null || (str2 = groupValues2.get(1)) == null) ? 0 : Long.parseLong(str2);
         Long longOrNull = (matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = groupValues.get(2)) == null) ? null : s.toLongOrNull(str);
@@ -369,7 +374,7 @@ public final class RouteHandlers {
     public final AnalyticsMetadata selectPremiumGuild(Uri uri, MatchResult matchResult, Context context) {
         List<String> groupValues;
         String str;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         long parseLong = (matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = groupValues.get(1)) == null) ? 0 : Long.parseLong(str);
         if (parseLong != 0) {
@@ -381,7 +386,7 @@ public final class RouteHandlers {
     public final AnalyticsMetadata selectUserProfile(Uri uri, MatchResult matchResult, Context context) {
         List<String> groupValues;
         String str;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         Long longOrNull = (matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = (String) u.last(groupValues)) == null) ? null : s.toLongOrNull(str);
         String queryParameter = uri.getQueryParameter("friend_token");
@@ -395,7 +400,7 @@ public final class RouteHandlers {
         List<String> groupValues;
         String str;
         Long longOrNull;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         long longValue = (matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = groupValues.get(1)) == null || (longOrNull = s.toLongOrNull(str)) == null) ? 0 : longOrNull.longValue();
         boolean booleanQueryParameter = uri.getBooleanQueryParameter("service_denied", false);
@@ -408,7 +413,7 @@ public final class RouteHandlers {
 
     public final AnalyticsMetadata wildCardMatcher(Uri uri, MatchResult matchResult, Context context) {
         AnalyticsMetadata analyticsMetadata;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(context, "context");
         List<String> pathSegments = uri.getPathSegments();
         String str = pathSegments != null ? (String) u.firstOrNull((List<? extends Object>) pathSegments) : null;
diff --git a/app/src/main/java/com/discord/utilities/io/NetworkUtils.java b/app/src/main/java/com/discord/utilities/io/NetworkUtils.java
index 6df2a4b206..e95da43984 100644
--- a/app/src/main/java/com/discord/utilities/io/NetworkUtils.java
+++ b/app/src/main/java/com/discord/utilities/io/NetworkUtils.java
@@ -14,6 +14,8 @@ import android.os.Environment;
 import android.provider.Settings;
 import androidx.annotation.MainThread;
 import androidx.annotation.RequiresPermission;
+import androidx.core.app.NotificationCompat;
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.string.StringUtilsKt;
 import d0.t.j;
@@ -63,12 +65,12 @@ public final class NetworkUtils {
         return onDownloadListeners;
     }
 
-    @RequiresPermission(conditional = true, value = "android.permission.WRITE_EXTERNAL_STORAGE")
+    @RequiresPermission(conditional = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS, value = "android.permission.WRITE_EXTERNAL_STORAGE")
     @MainThread
     public static final void downloadFile(Context context, Uri uri, String str, String str2, Function1<? super String, Unit> function1, Function1<? super Throwable, Unit> function12) {
         long j;
         String str3;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(function1, "onSuccess");
         m.checkNotNullParameter(function12, "onError");
         DownloadManager downloadManager = null;
diff --git a/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
index 638e95b156..899703a5ad 100644
--- a/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
+++ b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
@@ -3,6 +3,7 @@ package com.discord.utilities.lazy.memberlist;
 import a0.a.a.b;
 import androidx.annotation.ColorInt;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.presence.Presence;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -27,7 +28,7 @@ public abstract class MemberListRow {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public Member(long j, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5) {
             super(String.valueOf(j), null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.userId = j;
             this.name = str;
             this.isBot = z2;
@@ -90,7 +91,7 @@ public abstract class MemberListRow {
         }
 
         public final Member copy(long j, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return new Member(j, str, z2, num, z3, presence, num2, str2, z4, str3, z5);
         }
 
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.java
index 9b2e9eec65..1d249315e0 100644
--- a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.java
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager$triggerUnsubscribe$1.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.lazy.subscriptions;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class GuildMemberSubscriptionsManager$triggerUnsubscribe$1 extends
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         GuildMemberSubscriptionsManager.access$setDelayedFlushSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/lifecycle/ActivityProvider.java b/app/src/main/java/com/discord/utilities/lifecycle/ActivityProvider.java
index 252edf9424..a71c96bbf2 100644
--- a/app/src/main/java/com/discord/utilities/lifecycle/ActivityProvider.java
+++ b/app/src/main/java/com/discord/utilities/lifecycle/ActivityProvider.java
@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
 import androidx.annotation.MainThread;
+import androidx.appcompat.widget.ActivityChooserModel;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: ActivityProvider.kt */
@@ -65,59 +66,59 @@ public final class ActivityProvider implements Application.ActivityLifecycleCall
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityCreated(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityDestroyed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityPaused(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityPostResumed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityPostStarted(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityPrePaused(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityPreStopped(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityResumed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(bundle, "outState");
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityStarted(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         this.currentActivity = activity;
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public void onActivityStopped(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         int hashCode = activity.hashCode();
         Activity activity2 = this.currentActivity;
         if (activity2 != null && hashCode == activity2.hashCode()) {
diff --git a/app/src/main/java/com/discord/utilities/media/AppSound.java b/app/src/main/java/com/discord/utilities/media/AppSound.java
index 7155d331ce..0965e8253c 100644
--- a/app/src/main/java/com/discord/utilities/media/AppSound.java
+++ b/app/src/main/java/com/discord/utilities/media/AppSound.java
@@ -1,24 +1,25 @@
 package com.discord.utilities.media;
 
 import c.d.b.a.a;
+import com.discord.R;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: AppSound.kt */
 public final class AppSound {
     public static final Companion Companion = new Companion(null);
-    private static final AppSound SOUND_CALL_CALLING = new AppSound(2131820545, true, 4, 3);
-    private static final AppSound SOUND_CALL_RINGING = new AppSound(2131820546, true, 4, 7);
-    private static final AppSound SOUND_DEAFEN = new AppSound(2131820547, false, 4, 13, 2, null);
-    private static final AppSound SOUND_MUTE = new AppSound(2131824086, false, 4, 13, 2, null);
-    private static final AppSound SOUND_RECONNECT = new AppSound(2131824087, false, 4, 3, 2, null);
-    private static final AppSound SOUND_STREAM_ENDED = new AppSound(2131824088, false, 4, 13, 2, null);
-    private static final AppSound SOUND_STREAM_STARTED = new AppSound(2131824089, false, 4, 13, 2, null);
-    private static final AppSound SOUND_STREAM_USER_JOINED = new AppSound(2131824090, false, 4, 13, 2, null);
-    private static final AppSound SOUND_STREAM_USER_LEFT = new AppSound(2131824091, false, 4, 13, 2, null);
-    private static final AppSound SOUND_UNDEAFEN = new AppSound(2131824092, false, 4, 13, 2, null);
-    private static final AppSound SOUND_UNMUTE = new AppSound(2131824093, false, 4, 13, 2, null);
-    private static final AppSound SOUND_USER_JOINED = new AppSound(2131824094, false, 4, 13, 2, null);
-    private static final AppSound SOUND_USER_LEFT = new AppSound(2131824095, false, 4, 13, 2, null);
-    private static final AppSound SOUND_USER_MOVED = new AppSound(2131824096, false, 4, 13, 2, null);
+    private static final AppSound SOUND_CALL_CALLING = new AppSound(R.raw.call_calling, true, 4, 3);
+    private static final AppSound SOUND_CALL_RINGING = new AppSound(R.raw.call_ringing, true, 4, 7);
+    private static final AppSound SOUND_DEAFEN = new AppSound(R.raw.deafen, false, 4, 13, 2, null);
+    private static final AppSound SOUND_MUTE = new AppSound(R.raw.mute, false, 4, 13, 2, null);
+    private static final AppSound SOUND_RECONNECT = new AppSound(R.raw.reconnect, false, 4, 3, 2, null);
+    private static final AppSound SOUND_STREAM_ENDED = new AppSound(R.raw.stream_ended, false, 4, 13, 2, null);
+    private static final AppSound SOUND_STREAM_STARTED = new AppSound(R.raw.stream_started, false, 4, 13, 2, null);
+    private static final AppSound SOUND_STREAM_USER_JOINED = new AppSound(R.raw.stream_user_joined, false, 4, 13, 2, null);
+    private static final AppSound SOUND_STREAM_USER_LEFT = new AppSound(R.raw.stream_user_left, false, 4, 13, 2, null);
+    private static final AppSound SOUND_UNDEAFEN = new AppSound(R.raw.undeafen, false, 4, 13, 2, null);
+    private static final AppSound SOUND_UNMUTE = new AppSound(R.raw.unmute, false, 4, 13, 2, null);
+    private static final AppSound SOUND_USER_JOINED = new AppSound(R.raw.user_join, false, 4, 13, 2, null);
+    private static final AppSound SOUND_USER_LEFT = new AppSound(R.raw.user_leave, false, 4, 13, 2, null);
+    private static final AppSound SOUND_USER_MOVED = new AppSound(R.raw.user_moved, false, 4, 13, 2, null);
     private final int contentType;
     private final int resId;
     private final boolean shouldLoop;
diff --git a/app/src/main/java/com/discord/utilities/message/MessageUtils.java b/app/src/main/java/com/discord/utilities/message/MessageUtils.java
index 614f8f7429..9615ff9b34 100644
--- a/app/src/main/java/com/discord/utilities/message/MessageUtils.java
+++ b/app/src/main/java/com/discord/utilities/message/MessageUtils.java
@@ -5,6 +5,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.LocaleList;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelRecipientNick;
 import com.discord.api.interaction.Interaction;
@@ -25,7 +26,7 @@ import java.util.Map;
 public final class MessageUtils {
     public static final MessageUtils INSTANCE = new MessageUtils();
     private static final Comparator<Long> SORT_BY_IDS_COMPARATOR = MessageUtils$SORT_BY_IDS_COMPARATOR$1.INSTANCE;
-    private static final int[] WELCOME_MESSAGES = {2131894173, 2131894174, 2131894175, 2131894176, 2131894177, 2131894178, 2131894179, 2131894180, 2131894181, 2131894182, 2131894183, 2131894184, 2131894185};
+    private static final int[] WELCOME_MESSAGES = {R.string.system_message_guild_member_join_001, R.string.system_message_guild_member_join_002, R.string.system_message_guild_member_join_003, R.string.system_message_guild_member_join_004, R.string.system_message_guild_member_join_005, R.string.system_message_guild_member_join_006, R.string.system_message_guild_member_join_007, R.string.system_message_guild_member_join_008, R.string.system_message_guild_member_join_009, R.string.system_message_guild_member_join_010, R.string.system_message_guild_member_join_011, R.string.system_message_guild_member_join_012, R.string.system_message_guild_member_join_013};
     private static final StickerPartial[] WELCOME_STICKERS;
 
     static {
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$4.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$4.java
index 67f9ed7cbd..f41e5ff70c 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$4.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$4.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.messagesend;
 
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.messagesend.MessageQueue;
 import com.discord.utilities.messagesend.MessageRequest;
 import d0.z.d.m;
@@ -30,7 +31,7 @@ public final class MessageQueue$doEdit$4 extends o implements Function1<Subscrip
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         MessageQueue.access$setInFlightRequest$p(this.this$0, new MessageQueue.InflightRequest(this.$editRequest, subscription, this.$drainListener));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$5.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$5.java
index 8b2e155a27..e8e375f435 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$5.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$5.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.messagesend;
 
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.messagesend.MessageQueue;
 import com.discord.utilities.messagesend.MessageRequest;
 import d0.z.d.m;
@@ -30,7 +31,7 @@ public final class MessageQueue$doSend$5 extends o implements Function1<Subscrip
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         MessageQueue.access$setInFlightRequest$p(this.this$0, new MessageQueue.InflightRequest(this.$request, subscription, this.$drainListener));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java
index a2493689ac..583b1b53d4 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSendApplicationCommand$3.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.messagesend;
 
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.messagesend.MessageQueue;
 import com.discord.utilities.messagesend.MessageRequest;
 import d0.z.d.m;
@@ -30,7 +31,7 @@ public final class MessageQueue$doSendApplicationCommand$3 extends o implements
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         MessageQueue.access$setInFlightRequest$p(this.this$0, new MessageQueue.InflightRequest(this.$sendApplicationCommandRequest, subscription, this.$drainListener));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
index 1fe83e9d20..83adfea370 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
@@ -46,7 +46,7 @@ public final class MessageQueue {
     private final ExecutorService executorService;
     private InflightRequest inFlightRequest;
     private boolean isDraining;
-    private final Backoff networkBackoff = new Backoff(5000, 3600000, 0, false, null, 28, null);
+    private final Backoff networkBackoff = new Backoff(5000, DEFAULT_MESSAGE_TIMEOUT_MS, 0, false, null, 28, null);
     private final ArrayDeque<MessageRequest> queue = new ArrayDeque<>();
     private Subscription retrySubscription;
 
@@ -277,7 +277,7 @@ public final class MessageQueue {
         if (this.queue.isEmpty() || this.retrySubscription != null || this.networkBackoff.isPending() || this.isDraining || (remove = this.queue.remove()) == null) {
             return;
         }
-        if (this.clock.currentTimeMillis() - remove.getAttemptTimestamp() > 3600000) {
+        if (this.clock.currentTimeMillis() - remove.getAttemptTimestamp() > DEFAULT_MESSAGE_TIMEOUT_MS) {
             remove.getOnCompleted().invoke(MessageResult.Timeout.INSTANCE, Boolean.valueOf(this.queue.isEmpty()));
             this.networkBackoff.succeed();
             processNextRequest();
diff --git a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapter.java b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapter.java
index 301d80e62d..aac3ee4c9f 100644
--- a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapter.java
+++ b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapter.java
@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.recycler.SelfHealingLinearLayoutManager;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -89,7 +90,7 @@ public abstract class MGRecyclerAdapter<D> extends RecyclerView.Adapter<MGRecycl
         Context context = getRecycler().getContext();
         CharSequence charSequence = null;
         if (context != null) {
-            charSequence = b.h(context, 2131886352, new Object[]{Integer.valueOf(i)}, null, 4);
+            charSequence = b.h(context, R.string.android_unknown_view_holder, new Object[]{Integer.valueOf(i)}, null, 4);
         }
         return new IllegalArgumentException(String.valueOf(charSequence));
     }
diff --git a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$setData$4.java b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$setData$4.java
index 9d143feaa2..af08d1f2dd 100644
--- a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$setData$4.java
+++ b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$setData$4.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.mg_recycler;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class MGRecyclerAdapterSimple$setData$4 extends o implements Functi
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         MGRecyclerAdapterSimple.access$setDiffingSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$2.java b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$2.java
index c051540038..fcc23c7515 100644
--- a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$2.java
+++ b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders$deleteConnectionModalBuilder$2.java
@@ -6,6 +6,7 @@ import com.discord.app.AppLog;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.logging.Logger;
+import com.discord.widgets.settings.connections.WidgetSettingsUserConnections;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -31,13 +32,13 @@ public final class NoticeBuilders$deleteConnectionModalBuilder$2 extends o imple
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
         if (this.$notice.getMetadata() != null) {
-            Object obj = this.$notice.getMetadata().get("platform_name");
+            Object obj = this.$notice.getMetadata().get(WidgetSettingsUserConnections.PLATFORM_NAME);
             String str = null;
             if (!(obj instanceof String)) {
                 obj = null;
             }
             String str2 = (String) obj;
-            Object obj2 = this.$notice.getMetadata().get("connection_id");
+            Object obj2 = this.$notice.getMetadata().get(WidgetSettingsUserConnections.CONNECTION_ID);
             if (obj2 instanceof String) {
                 str = obj2;
             }
diff --git a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java
index 8d5e152c5e..a03372916d 100644
--- a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java
+++ b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java
@@ -6,8 +6,10 @@ import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.stores.StoreNotices;
 import com.discord.widgets.notice.WidgetNoticeDialog;
+import com.discord.widgets.settings.connections.WidgetSettingsUserConnections;
 import d0.o;
 import d0.t.g0;
 import d0.t.h0;
@@ -195,12 +197,12 @@ public final class NoticeBuilders {
     private final DialogData deleteConnectionModalBuilder(Context context, StoreNotices.Dialog dialog) {
         Object[] objArr = new Object[1];
         Map<String, Object> metadata = dialog.getMetadata();
-        objArr[0] = metadata != null ? metadata.get("platform_title") : null;
-        return new DialogData(b.b(context, 2131888174, objArr, NoticeBuilders$deleteConnectionModalBuilder$1.INSTANCE), b.h(context, 2131888173, new Object[0], null, 4), b.h(context, 2131893583, new Object[0], null, 4), b.h(context, 2131887193, new Object[0], null, 4), g0.mapOf(o.to(2131364252, new NoticeBuilders$deleteConnectionModalBuilder$2(dialog))), null, 32, null);
+        objArr[0] = metadata != null ? metadata.get(WidgetSettingsUserConnections.PLATFORM_TITLE) : null;
+        return new DialogData(b.b(context, R.string.disconnect_account_title, objArr, NoticeBuilders$deleteConnectionModalBuilder$1.INSTANCE), b.h(context, R.string.disconnect_account_body, new Object[0], null, 4), b.h(context, R.string.service_connections_disconnect, new Object[0], null, 4), b.h(context, R.string.cancel, new Object[0], null, 4), g0.mapOf(o.to(Integer.valueOf((int) R.id.notice_ok), new NoticeBuilders$deleteConnectionModalBuilder$2(dialog))), null, 32, null);
     }
 
     private final DialogData requestRatingModalBuilder(Context context, StoreNotices.Dialog dialog) {
-        return new DialogData(b.h(context, 2131892896, new Object[0], null, 4), b.h(context, 2131892895, new Object[0], null, 4), b.h(context, 2131892004, new Object[0], null, 4), b.h(context, 2131891763, new Object[0], null, 4), h0.mapOf(o.to(0, NoticeBuilders$requestRatingModalBuilder$1.INSTANCE), o.to(2131364252, NoticeBuilders$requestRatingModalBuilder$2.INSTANCE), o.to(2131364247, NoticeBuilders$requestRatingModalBuilder$3.INSTANCE)), 2131558814);
+        return new DialogData(b.h(context, R.string.rating_request_title, new Object[0], null, 4), b.h(context, R.string.rating_request_body_android, new Object[0], null, 4), b.h(context, R.string.okay, new Object[0], null, 4), b.h(context, R.string.no_thanks, new Object[0], null, 4), h0.mapOf(o.to(0, NoticeBuilders$requestRatingModalBuilder$1.INSTANCE), o.to(Integer.valueOf((int) R.id.notice_ok), NoticeBuilders$requestRatingModalBuilder$2.INSTANCE), o.to(Integer.valueOf((int) R.id.notice_cancel), NoticeBuilders$requestRatingModalBuilder$3.INSTANCE)), Integer.valueOf((int) R.layout.view_review_request_modal_image));
     }
 
     public final void showNotice(Context context, FragmentManager fragmentManager, StoreNotices.Dialog dialog) {
diff --git a/app/src/main/java/com/discord/utilities/permissions/ManageGuildContext.java b/app/src/main/java/com/discord/utilities/permissions/ManageGuildContext.java
index 6bc63ee49b..726bb62bd4 100644
--- a/app/src/main/java/com/discord/utilities/permissions/ManageGuildContext.java
+++ b/app/src/main/java/com/discord/utilities/permissions/ManageGuildContext.java
@@ -2,6 +2,7 @@ package com.discord.utilities.permissions;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import d0.z.d.m;
 import java.util.Collection;
 import java.util.Iterator;
@@ -45,10 +46,10 @@ public final class ManageGuildContext {
                         break;
                     }
                 }
-                return new ManageGuildContext(!z2 || PermissionUtils.can(32, l), !z2 || PermissionUtils.can(16, l) || z4, !z2 || PermissionUtils.can(268435456, l), !z2 || PermissionUtils.can(4, l), !z2 || PermissionUtils.can(134217728, l), !z2 || PermissionUtils.can(1073741824, l), !z2 || PermissionUtils.can(128, l), !z2 && PermissionUtils.isElevated(z3, i));
+                return new ManageGuildContext(!z2 || PermissionUtils.can(32, l), !z2 || PermissionUtils.can(16, l) || z4, !z2 || PermissionUtils.can(Permission.MANAGE_ROLES, l), !z2 || PermissionUtils.can(4, l), !z2 || PermissionUtils.can(Permission.MANAGE_NICKNAMES, l), !z2 || PermissionUtils.can(Permission.MANAGE_EMOJIS_AND_STICKERS, l), !z2 || PermissionUtils.can(128, l), !z2 && PermissionUtils.isElevated(z3, i));
             }
             z4 = false;
-            return new ManageGuildContext(!z2 || PermissionUtils.can(32, l), !z2 || PermissionUtils.can(16, l) || z4, !z2 || PermissionUtils.can(268435456, l), !z2 || PermissionUtils.can(4, l), !z2 || PermissionUtils.can(134217728, l), !z2 || PermissionUtils.can(1073741824, l), !z2 || PermissionUtils.can(128, l), !z2 && PermissionUtils.isElevated(z3, i));
+            return new ManageGuildContext(!z2 || PermissionUtils.can(32, l), !z2 || PermissionUtils.can(16, l) || z4, !z2 || PermissionUtils.can(Permission.MANAGE_ROLES, l), !z2 || PermissionUtils.can(4, l), !z2 || PermissionUtils.can(Permission.MANAGE_NICKNAMES, l), !z2 || PermissionUtils.can(Permission.MANAGE_EMOJIS_AND_STICKERS, l), !z2 || PermissionUtils.can(128, l), !z2 && PermissionUtils.isElevated(z3, i));
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java b/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java
index 8ad9cadb16..f27ed78555 100644
--- a/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java
+++ b/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.permissions;
 
 import c.d.b.a.a;
+import com.discord.api.permission.Permission;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerPartial;
 import com.discord.api.user.User;
@@ -37,7 +38,7 @@ public final class ManageMessageContext {
             boolean z6 = false;
             boolean z7 = author != null && author.i() == meUser.getId();
             boolean z8 = z2 && !z3;
-            boolean z9 = num != null && PermissionUtils.canAndIsElevated(8192, l, meUser.getMfaEnabled(), num.intValue()) && !z4;
+            boolean z9 = num != null && PermissionUtils.canAndIsElevated(Permission.MANAGE_MESSAGES, l, meUser.getMfaEnabled(), num.intValue()) && !z4;
             boolean z10 = z9 || z8;
             boolean z11 = z9 || z7;
             if (z7 && isUserMessage) {
diff --git a/app/src/main/java/com/discord/utilities/permissions/ManageUserContext.java b/app/src/main/java/com/discord/utilities/permissions/ManageUserContext.java
index 9296efe1f8..4e2302c146 100644
--- a/app/src/main/java/com/discord/utilities/permissions/ManageUserContext.java
+++ b/app/src/main/java/com/discord/utilities/permissions/ManageUserContext.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.permissions;
 
 import c.d.b.a.a;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
@@ -46,7 +47,7 @@ public final class ManageUserContext {
             int mfaLevel = guild.getMfaLevel();
             boolean mfaEnabled = meUser.getMfaEnabled();
             boolean z5 = z3 || PermissionUtils.canAndIsElevated(8, l, mfaEnabled, mfaLevel);
-            return new ManageUserContext((z2 || z4) && (z5 || PermissionUtils.canAndIsElevated(268435456, l, mfaEnabled, mfaLevel)), !z2 && z4 && (z5 || PermissionUtils.canAndIsElevated(2, l, mfaEnabled, mfaLevel)), !z2 && z4 && (z5 || PermissionUtils.canAndIsElevated(4, l, mfaEnabled, mfaLevel)), z5 || PermissionUtils.can(4194304, l), z5 || PermissionUtils.can(8388608, l), z5 || PermissionUtils.can(16777216, l), !z2 ? !(!z4 || (!z5 && !PermissionUtils.canAndIsElevated(134217728, l, mfaEnabled, mfaLevel))) : !(!z5 && !PermissionUtils.can(67108864, l)), !z2 && z3);
+            return new ManageUserContext((z2 || z4) && (z5 || PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, l, mfaEnabled, mfaLevel)), !z2 && z4 && (z5 || PermissionUtils.canAndIsElevated(2, l, mfaEnabled, mfaLevel)), !z2 && z4 && (z5 || PermissionUtils.canAndIsElevated(4, l, mfaEnabled, mfaLevel)), z5 || PermissionUtils.can(Permission.MUTE_MEMBERS, l), z5 || PermissionUtils.can(Permission.DEAFEN_MEMBERS, l), z5 || PermissionUtils.can(Permission.MOVE_MEMBERS, l), !z2 ? !(!z4 || (!z5 && !PermissionUtils.canAndIsElevated(Permission.MANAGE_NICKNAMES, l, mfaEnabled, mfaLevel))) : !(!z5 && !PermissionUtils.can(Permission.CHANGE_NICKNAME, l)), !z2 && z3);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java b/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java
index 6d902d7188..18bed058d5 100644
--- a/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java
+++ b/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java
@@ -3,10 +3,12 @@ package com.discord.utilities.permissions;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.member.GuildMember;
 import com.discord.stores.StoreSlowMode;
 import com.discord.utilities.PermissionOverwriteUtilsKt;
@@ -27,10 +29,7 @@ public final class PermissionUtils {
 
     private final long applyEveryone(long j, Map<Long, GuildRole> map) {
         GuildRole guildRole = map != null ? map.get(Long.valueOf(j)) : null;
-        if (guildRole != null) {
-            return guildRole.g();
-        }
-        return 247064944193L;
+        return guildRole != null ? guildRole.g() : Permission.DEFAULT;
     }
 
     private final long applyEveryoneOverwrites(long j, Collection<PermissionOverwrite> collection, long j2) {
@@ -180,19 +179,16 @@ public final class PermissionUtils {
     }
 
     public static final boolean canManageGuildMembers(boolean z2, boolean z3, int i, Long l) {
-        return z2 || canAndIsElevated(8, l, z3, i) || canAndIsElevated(2, l, z3, i) || canAndIsElevated(4, l, z3, i) || canAndIsElevated(268435456, l, z3, i) || can(134217728, l);
+        return z2 || canAndIsElevated(8, l, z3, i) || canAndIsElevated(2, l, z3, i) || canAndIsElevated(4, l, z3, i) || canAndIsElevated(Permission.MANAGE_ROLES, l, z3, i) || can(Permission.MANAGE_NICKNAMES, l);
     }
 
     public static final long computeNonThreadPermissions(long j, long j2, long j3, GuildMember guildMember, Map<Long, GuildRole> map, Collection<PermissionOverwrite> collection) {
         if (j3 == j) {
-            return 274877382399L;
+            return Permission.ALL;
         }
         PermissionUtils permissionUtils = INSTANCE;
         long applyRoles = permissionUtils.applyRoles(guildMember, map, permissionUtils.applyEveryone(j2, map));
-        if ((applyRoles & 8) == 8) {
-            return 274877382399L;
-        }
-        return (collection == null || !(collection.isEmpty() ^ true)) ? applyRoles : permissionUtils.applyRoleOverwrites(guildMember, collection, permissionUtils.applyEveryoneOverwrites(j2, collection, applyRoles), j);
+        return (applyRoles & 8) == 8 ? Permission.ALL : (collection == null || !(collection.isEmpty() ^ true)) ? applyRoles : permissionUtils.applyRoleOverwrites(guildMember, collection, permissionUtils.applyEveryoneOverwrites(j2, collection, applyRoles), j);
     }
 
     public static final long computePermissions(long j, Channel channel, Channel channel2, long j2, GuildMember guildMember, Map<Long, GuildRole> map, Map<Long, StageInstance> map2, boolean z2) {
@@ -218,11 +214,11 @@ public final class PermissionUtils {
         if (AnimatableValueParser.w1(channel)) {
             StageInstance stageInstance = (StageInstance) a.o0(channel, emptyMap);
             if ((stageInstance != null ? stageInstance.e() : null) == StageInstancePrivacyLevel.PUBLIC) {
-                j4 = 4331734016L;
+                j4 = Permission.AllowList.LURKER_STAGE_CHANNEL;
                 return j3 & j4;
             }
         }
-        j4 = 66560;
+        j4 = Permission.AllowList.LURKER_DEFAULT;
         return j3 & j4;
     }
 
@@ -237,12 +233,12 @@ public final class PermissionUtils {
         long computeNonThreadPermissions = computeNonThreadPermissions(j, f, j2, guildMember, map, s2);
         m.checkNotNullParameter(channel, "$this$isPrivateThread");
         if (!(channel.A() == 12)) {
-            return can(34359738368L, Long.valueOf(computeNonThreadPermissions)) ? computeNonThreadPermissions | 2048 : computeNonThreadPermissions;
+            return can(Permission.USE_PUBLIC_THREADS, Long.valueOf(computeNonThreadPermissions)) ? computeNonThreadPermissions | Permission.SEND_MESSAGES : computeNonThreadPermissions;
         }
-        if (can(68719476736L, Long.valueOf(computeNonThreadPermissions))) {
-            computeNonThreadPermissions |= 2048;
+        if (can(Permission.USE_PRIVATE_THREADS, Long.valueOf(computeNonThreadPermissions))) {
+            computeNonThreadPermissions |= Permission.SEND_MESSAGES;
         }
-        if (z2 || can(17179869184L, Long.valueOf(computeNonThreadPermissions))) {
+        if (z2 || can(Permission.MANAGE_THREADS, Long.valueOf(computeNonThreadPermissions))) {
             return computeNonThreadPermissions;
         }
         return 0;
@@ -250,12 +246,12 @@ public final class PermissionUtils {
 
     public static final boolean hasAccess(Channel channel, Map<Long, Long> map) {
         m.checkNotNullParameter(channel, "channel");
-        m.checkNotNullParameter(map, "permissions");
+        m.checkNotNullParameter(map, ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS);
         return INSTANCE.hasAccess(channel, (Long) a.o0(channel, map));
     }
 
     public static final boolean isElevated(long j, boolean z2, int i) {
-        if ((26038247486L & j) != j) {
+        if ((Permission.ELEVATED & j) != j) {
             return true;
         }
         return isElevated(z2, i);
@@ -301,7 +297,7 @@ public final class PermissionUtils {
         if (AnimatableValueParser.t1(channel)) {
             return true;
         }
-        return can((AnimatableValueParser.l1(channel) || AnimatableValueParser.f1(channel)) ? 1024 : 1048576, l);
+        return can((AnimatableValueParser.l1(channel) || AnimatableValueParser.f1(channel)) ? Permission.VIEW_CHANNEL : Permission.CONNECT, l);
     }
 
     public final boolean hasAccessWrite(Channel channel, Long l) {
@@ -311,6 +307,6 @@ public final class PermissionUtils {
 
     public final boolean hasBypassSlowmodePermissions(Long l, StoreSlowMode.Type type) {
         m.checkNotNullParameter(type, "type");
-        return m.areEqual(type, StoreSlowMode.Type.MessageSend.INSTANCE) ? can(16, l) || can(8192, l) : can(17179869184L, l);
+        return m.areEqual(type, StoreSlowMode.Type.MessageSend.INSTANCE) ? can(16, l) || can(Permission.MANAGE_MESSAGES, l) : can(Permission.MANAGE_THREADS, l);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/persister/Persister.java b/app/src/main/java/com/discord/utilities/persister/Persister.java
index 8e2aedf647..2c33a88791 100644
--- a/app/src/main/java/com/discord/utilities/persister/Persister.java
+++ b/app/src/main/java/com/discord/utilities/persister/Persister.java
@@ -3,10 +3,13 @@ package com.discord.utilities.persister;
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.content.Context;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.TimeElapsed;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
@@ -71,13 +74,13 @@ public final class Persister<T> {
             if (access$getContext$cp == null) {
                 m.throwUninitializedPropertyAccessException("context");
             }
-            Object systemService = access$getContext$cp.getSystemService("activity");
+            Object systemService = access$getContext$cp.getSystemService(ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             if (!(systemService instanceof ActivityManager)) {
                 systemService = null;
             }
             ActivityManager activityManager = (ActivityManager) systemService;
             if (activityManager == null) {
-                return Long.MAX_VALUE;
+                return RecyclerView.FOREVER_NS;
             }
             ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
             activityManager.getMemoryInfo(memoryInfo);
@@ -317,7 +320,7 @@ public final class Persister<T> {
             m.throwUninitializedPropertyAccessException("context");
         }
         sb.append(context2.getFilesDir());
-        sb.append('/');
+        sb.append(MentionUtilsKt.SLASH_CHAR);
         sb.append(this.key);
         return new File(sb.toString());
     }
diff --git a/app/src/main/java/com/discord/utilities/platform/Platform.java b/app/src/main/java/com/discord/utilities/platform/Platform.java
index f95655d63d..f89def38f6 100644
--- a/app/src/main/java/com/discord/utilities/platform/Platform.java
+++ b/app/src/main/java/com/discord/utilities/platform/Platform.java
@@ -3,6 +3,7 @@ package com.discord.utilities.platform;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.activity.ActivityPlatform;
 import com.discord.models.domain.ModelConnectedAccount;
 import d0.g0.w;
@@ -12,23 +13,23 @@ import java.util.Objects;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: Platform.kt */
 public enum Platform {
-    XBOX("Xbox Live", 2131100473, 2131231393, 2131232119, false, true, true, 16, null),
-    BATTLENET("Battle.Net", 2131099687, 2131231375, 2131231476, false, false, false, 112, null),
-    FACEBOOK("Facebook", 2131099873, 2131231380, 2131231641, true, false, true, 32, null),
-    GOOGLE("Google", 2131099910, 2131231382, 2131231698, false, false, false, 112, null),
-    LEAGUEOFLEGENDS("League of Legends", 2131099927, 2131231383, 2131231774, false, false, false, 112, null),
-    OBS("OBS", null, 2131231385, null, false, false, false, 122, null),
-    PATREON("Patreon", null, 2131231386, null, false, false, false, 122, null),
-    REDDIT("Reddit", 2131100221, 2131231387, 2131231939, false, false, true, 48, null),
+    XBOX("Xbox Live", Integer.valueOf((int) R.color.xbox), Integer.valueOf((int) R.drawable.ic_account_xbox), Integer.valueOf((int) R.drawable.ic_xbox_white_24dp), false, true, true, 16, null),
+    BATTLENET("Battle.Net", Integer.valueOf((int) R.color.battlenet), Integer.valueOf((int) R.drawable.ic_account_bnet), Integer.valueOf((int) R.drawable.ic_bnet_white_24dp), false, false, false, 112, null),
+    FACEBOOK("Facebook", Integer.valueOf((int) R.color.facebook), Integer.valueOf((int) R.drawable.ic_account_facebook), Integer.valueOf((int) R.drawable.ic_facebook_white_24dp), true, false, true, 32, null),
+    GOOGLE("Google", Integer.valueOf((int) R.color.google), Integer.valueOf((int) R.drawable.ic_account_google), Integer.valueOf((int) R.drawable.ic_google_white_24dp), false, false, false, 112, null),
+    LEAGUEOFLEGENDS("League of Legends", Integer.valueOf((int) R.color.league_of_legends), Integer.valueOf((int) R.drawable.ic_account_lol), Integer.valueOf((int) R.drawable.ic_lol_white_24dp), false, false, false, 112, null),
+    OBS("OBS", null, Integer.valueOf((int) R.drawable.ic_account_obs), null, false, false, false, 122, null),
+    PATREON("Patreon", null, Integer.valueOf((int) R.drawable.ic_account_patreon), null, false, false, false, 122, null),
+    REDDIT("Reddit", Integer.valueOf((int) R.color.reddit), Integer.valueOf((int) R.drawable.ic_account_reddit), Integer.valueOf((int) R.drawable.ic_reddit_white_24dp), false, false, true, 48, null),
     SAMSUNG("Samsung Galaxy", null, null, null, false, true, false, 94, null),
-    SKYPE("Skype", 2131100231, 2131231388, 2131231984, false, false, false, 112, null),
-    SPOTIFY("Spotify", 2131100233, 2131231389, 2131232001, false, true, true, 16, null),
-    STEAM("Steam", 2131100370, 2131231390, 2131232021, false, false, true, 48, null),
-    TWITCH("Twitch", 2131100385, 2131231391, 2131232060, false, false, true, 48, null),
-    TWITTER("Twitter", 2131100387, 2131231392, 2131232062, false, false, true, 48, null),
-    XSPLIT("XSplit", null, 2131231394, null, false, false, false, 122, null),
-    YOUTUBE("Youtube", 2131100475, 2131231395, 2131232120, false, false, true, 48, null),
-    GITHUB("Github", 2131099906, 2131231381, 2131231694, false, false, true, 48, null),
+    SKYPE("Skype", Integer.valueOf((int) R.color.skype), Integer.valueOf((int) R.drawable.ic_account_skype), Integer.valueOf((int) R.drawable.ic_skype_white_24dp), false, false, false, 112, null),
+    SPOTIFY("Spotify", Integer.valueOf((int) R.color.spotify), Integer.valueOf((int) R.drawable.ic_account_spotify), Integer.valueOf((int) R.drawable.ic_spotify_white_24dp), false, true, true, 16, null),
+    STEAM("Steam", Integer.valueOf((int) R.color.steam), Integer.valueOf((int) R.drawable.ic_account_steam), Integer.valueOf((int) R.drawable.ic_steam_white_24dp), false, false, true, 48, null),
+    TWITCH("Twitch", Integer.valueOf((int) R.color.twitch), Integer.valueOf((int) R.drawable.ic_account_twitch), Integer.valueOf((int) R.drawable.ic_twitch_white_24dp), false, false, true, 48, null),
+    TWITTER("Twitter", Integer.valueOf((int) R.color.twitter), Integer.valueOf((int) R.drawable.ic_account_twitter), Integer.valueOf((int) R.drawable.ic_twitter_white_24dp), false, false, true, 48, null),
+    XSPLIT("XSplit", null, Integer.valueOf((int) R.drawable.ic_account_xsplit), null, false, false, false, 122, null),
+    YOUTUBE("Youtube", Integer.valueOf((int) R.color.youtube), Integer.valueOf((int) R.drawable.ic_account_youtube), Integer.valueOf((int) R.drawable.ic_youtube_gaming_white_24dp), false, false, true, 48, null),
+    GITHUB("Github", Integer.valueOf((int) R.color.github), Integer.valueOf((int) R.drawable.ic_account_github), Integer.valueOf((int) R.drawable.ic_github_white), false, false, true, 48, null),
     NONE(null, null, null, null, false, false, false, 127, null);
     
     public static final Companion Companion = new Companion(null);
diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
index 0f68fe85ed..ddec8a44d7 100644
--- a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
+++ b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
@@ -4,6 +4,7 @@ import com.discord.app.AppLog;
 import com.discord.models.domain.ModelSubscription;
 import com.discord.models.domain.premium.SubscriptionPlanType;
 import com.discord.stores.StorePremiumGuildSubscription;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.rest.RestAPI;
 import d0.t.n;
@@ -63,7 +64,7 @@ public final class PremiumGuildSubscriptionUtils {
     public final List<ModelSubscription.SubscriptionAdditionalPlan> calculateAdditionalPlansWithPremiumGuildAdjustment(ModelSubscription modelSubscription, int i) {
         List<ModelSubscription.SubscriptionAdditionalPlan> list;
         boolean z2;
-        m.checkNotNullParameter(modelSubscription, "subscription");
+        m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
         ModelSubscription.SubscriptionRenewalMutations renewalMutations = modelSubscription.getRenewalMutations();
         if (renewalMutations == null) {
             list = modelSubscription.getPremiumAdditionalPlans();
@@ -130,7 +131,7 @@ public final class PremiumGuildSubscriptionUtils {
 
     public final Observable<ModifySubscriptionSlotResult> cancelSubscriptionSlot(RestAPI restAPI, long j, ModelSubscription modelSubscription, StorePremiumGuildSubscription storePremiumGuildSubscription) {
         m.checkNotNullParameter(restAPI, "api");
-        m.checkNotNullParameter(modelSubscription, "subscription");
+        m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
         m.checkNotNullParameter(storePremiumGuildSubscription, "storePremiumGuild");
         return modifySubscriptionSlot(restAPI, j, modelSubscription, true, storePremiumGuildSubscription);
     }
@@ -147,7 +148,7 @@ public final class PremiumGuildSubscriptionUtils {
 
     public final Observable<ModifySubscriptionSlotResult> uncancelSubscriptionSlot(RestAPI restAPI, long j, ModelSubscription modelSubscription, StorePremiumGuildSubscription storePremiumGuildSubscription) {
         m.checkNotNullParameter(restAPI, "api");
-        m.checkNotNullParameter(modelSubscription, "subscription");
+        m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
         m.checkNotNullParameter(storePremiumGuildSubscription, "storePremiumGuild");
         return modifySubscriptionSlot(restAPI, j, modelSubscription, false, storePremiumGuildSubscription);
     }
diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java b/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java
index d19b7f7a91..75dda33ef9 100644
--- a/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java
+++ b/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java
@@ -2,11 +2,13 @@ package com.discord.utilities.premium;
 
 import android.content.Context;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.SkuDetails;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.premium.PremiumTier;
 import com.discord.app.AppLog;
@@ -20,7 +22,9 @@ import com.discord.models.user.User;
 import com.discord.stores.StoreGooglePlaySkuDetails;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.Traits;
+import com.discord.utilities.billing.GooglePlayBillingManager;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.uri.UriHandler;
 import com.discord.utilities.user.UserUtils;
@@ -58,7 +62,7 @@ public final class PremiumUtils {
         /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1<? super android.view.View, kotlin.Unit> */
         /* JADX WARN: Multi-variable type inference failed */
         public BoostFeatureBadgeData(Function1<? super View, Unit> function1, int i, CharSequence charSequence, int i2) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.onClickListener = function1;
             this.iconColor = i;
             this.text = charSequence;
@@ -100,7 +104,7 @@ public final class PremiumUtils {
         }
 
         public final BoostFeatureBadgeData copy(Function1<? super View, Unit> function1, int i, CharSequence charSequence, int i2) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             return new BoostFeatureBadgeData(function1, i, charSequence, i2);
         }
 
@@ -230,24 +234,21 @@ public final class PremiumUtils {
             if (premiumGuildTierShortText == null) {
                 premiumGuildTierShortText = "";
             }
-            return new BoostFeatureBadgeData(premiumUtils$getBoostFeatureBadgeDataForGuildFeature$1, ColorCompat.getThemedColor(context, 2130968949), premiumGuildTierShortText, ColorCompat.getThemedColor(context, 2130968989));
+            return new BoostFeatureBadgeData(premiumUtils$getBoostFeatureBadgeDataForGuildFeature$1, ColorCompat.getThemedColor(context, (int) R.attr.colorInteractiveNormal), premiumGuildTierShortText, ColorCompat.getThemedColor(context, (int) R.attr.colorTextMuted));
         }
-        String string = context.getString(2131890049);
+        String string = context.getString(R.string.guild_settings_premium_guild_unlocked);
         m.checkNotNullExpressionValue(string, "context.getString(R.stri…s_premium_guild_unlocked)");
-        return new BoostFeatureBadgeData(function1, ColorCompat.getColor(context, 2131100102), string, ColorCompat.getThemedColor(context, 2130968990));
+        return new BoostFeatureBadgeData(function1, ColorCompat.getColor(context, (int) R.color.premium_guild_pink), string, ColorCompat.getThemedColor(context, (int) R.attr.colorTextNormal));
     }
 
     public final int getGuildEmojiMaxCount(int i, boolean z2) {
         if (z2 && i <= 2) {
             return 200;
         }
-        if (i == 1) {
-            return 100;
+        if (i != 1) {
+            return i != 2 ? i != 3 ? 50 : 250 : FontUtils.MAX_FONT_SCALING;
         }
-        if (i != 2) {
-            return i != 3 ? 50 : 250;
-        }
-        return 150;
+        return 100;
     }
 
     public final int getGuildEmojiMaxCount(Guild guild) {
@@ -311,10 +312,10 @@ public final class PremiumUtils {
         if (skuCategory != null) {
             int ordinal = skuCategory.ordinal();
             if (ordinal == 1) {
-                return 2131231167;
+                return R.drawable.drawable_ic_nitro;
             }
             if (ordinal == 2) {
-                return 2131231168;
+                return R.drawable.drawable_ic_nitro_classic;
             }
         }
         return 0;
@@ -326,11 +327,11 @@ public final class PremiumUtils {
         String optString = skuDetails.b.optString("subscriptionPeriod");
         int hashCode = optString.hashCode();
         if (hashCode != 78476) {
-            if (hashCode == 78488 && optString.equals("P1Y")) {
-                return b.h(context, 2131886959, new Object[]{skuDetails.b()}, null, 4);
+            if (hashCode == 78488 && optString.equals(YEARLY_ISO8601)) {
+                return b.h(context, R.string.billing_price_per_year, new Object[]{skuDetails.b()}, null, 4);
             }
-        } else if (optString.equals("P1M")) {
-            return b.h(context, 2131886953, new Object[]{skuDetails.b()}, null, 4);
+        } else if (optString.equals(MONTHLY_ISO8601)) {
+            return b.h(context, R.string.billing_price_per_month, new Object[]{skuDetails.b()}, null, 4);
         }
         return "";
     }
@@ -343,13 +344,13 @@ public final class PremiumUtils {
     public final CharSequence getPremiumGuildTierShortText(Context context, Integer num) {
         m.checkNotNullParameter(context, "context");
         if (num != null && num.intValue() == 1) {
-            return b.h(context, 2131892509, new Object[0], null, 4);
+            return b.h(context, R.string.premium_guild_tier_1_short, new Object[0], null, 4);
         }
         if (num != null && num.intValue() == 2) {
-            return b.h(context, 2131892511, new Object[0], null, 4);
+            return b.h(context, R.string.premium_guild_tier_2_short, new Object[0], null, 4);
         }
         if (num != null && num.intValue() == 3) {
-            return b.h(context, 2131892513, new Object[0], null, 4);
+            return b.h(context, R.string.premium_guild_tier_3_short, new Object[0], null, 4);
         }
         return null;
     }
@@ -385,14 +386,14 @@ public final class PremiumUtils {
 
     public final void openAppleBilling(Context context) {
         m.checkNotNullParameter(context, "context");
-        UriHandler.handle$default(UriHandler.INSTANCE, context, b.h(context, 2131886375, new Object[0], null, 4).toString(), null, 4, null);
+        UriHandler.handle$default(UriHandler.INSTANCE, context, b.h(context, R.string.apple_billing_url, new Object[0], null, 4).toString(), null, 4, null);
     }
 
     public final void openGooglePlayBilling(Context context, String str) {
         String str2;
         m.checkNotNullParameter(context, "context");
-        if (str == null || (str2 = a.G(new Object[]{str, context.getPackageName()}, 2, "https://play.google.com/store/account/subscriptions?sku=%s&package=%s", "java.lang.String.format(this, *args)")) == null) {
-            str2 = "https://play.google.com/store/account/subscriptions";
+        if (str == null || (str2 = a.G(new Object[]{str, context.getPackageName()}, 2, GooglePlayBillingManager.PLAY_STORE_SUBSCRIPTION_DEEPLINK_URL, "java.lang.String.format(this, *args)")) == null) {
+            str2 = GooglePlayBillingManager.PLAY_STORE_SUBSCRIPTION_URL;
         }
         UriHandler.handle$default(UriHandler.INSTANCE, context, str2, null, 4, null);
     }
diff --git a/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java b/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java
index c4f4bac18f..58cf75c320 100644
--- a/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java
@@ -17,6 +17,7 @@ import com.discord.stores.StoreStream;
 import com.discord.stores.StoreThread;
 import com.discord.utilities.platform.Platform;
 import com.discord.utilities.time.ClockFactory;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.stage.StageRoles;
 import d0.d0.f;
 import d0.g0.a;
@@ -90,7 +91,7 @@ public final class ActivityUtilsKt {
             }
             int size = channelRolesInternal != null ? channelRolesInternal.size() : 0;
             StoreStream.Companion companion2 = StoreStream.Companion;
-            Activity applicationActivity = companion2.getPresences().getApplicationActivity(companion2.getUsers().getMe().getId(), 834488117758001152L);
+            Activity applicationActivity = companion2.getPresences().getApplicationActivity(companion2.getUsers().getMe().getId(), STAGE_PRESENCE_APPLICATION_ID);
             StageCallRichPresencePartyData unpackStageChannelParty = unpackStageChannelParty(applicationActivity);
             if (!(unpackStageChannelParty != null && unpackStageChannelParty.getGuildId() == guild.getId() && unpackStageChannelParty.getChannelId() == channel.h())) {
                 applicationActivity = null;
@@ -101,7 +102,7 @@ public final class ActivityUtilsKt {
             if (stageInstanceForChannelInternal.e() != StageInstancePrivacyLevel.PUBLIC) {
                 return null;
             }
-            return new Activity(stageInstanceForChannelInternal.f(), ActivityType.LISTENING, null, ClockFactory.get().currentTimeMillis(), new ActivityTimestamps(str, null), 834488117758001152L, null, null, null, new ActivityParty(r12, n.listOf((Object[]) new Integer[]{Integer.valueOf(i), Integer.valueOf(size)})), new ActivityAssets(null, null, guild.getIcon(), guild.getName()), null, null, null, null, null, null, null);
+            return new Activity(stageInstanceForChannelInternal.f(), ActivityType.LISTENING, null, ClockFactory.get().currentTimeMillis(), new ActivityTimestamps(str, null), Long.valueOf((long) STAGE_PRESENCE_APPLICATION_ID), null, null, null, new ActivityParty(r12, n.listOf((Object[]) new Integer[]{Integer.valueOf(i), Integer.valueOf(size)})), new ActivityAssets(null, null, guild.getIcon(), guild.getName()), null, null, null, null, null, null, null);
         }
         return null;
     }
@@ -184,7 +185,7 @@ public final class ActivityUtilsKt {
     public static final boolean isStageChannelActivity(Activity activity) {
         Long a;
         m.checkNotNullParameter(activity, "$this$isStageChannelActivity");
-        return activity.p() == ActivityType.LISTENING && (a = activity.a()) != null && a.longValue() == 834488117758001152L;
+        return activity.p() == ActivityType.LISTENING && (a = activity.a()) != null && a.longValue() == STAGE_PRESENCE_APPLICATION_ID;
     }
 
     public static final boolean isStreaming(Activity activity) {
@@ -195,20 +196,20 @@ public final class ActivityUtilsKt {
     public static final boolean isXboxActivity(Activity activity) {
         Long a;
         m.checkNotNullParameter(activity, "$this$isXboxActivity");
-        return (activity.j() != null && activity.j() == ActivityPlatform.XBOX) || !(activity.a() == null || (a = activity.a()) == null || a.longValue() != 438122941302046720L);
+        return (activity.j() != null && activity.j() == ActivityPlatform.XBOX) || !(activity.a() == null || (a = activity.a()) == null || a.longValue() != XBOX_APPLICATION_ID);
     }
 
     /* renamed from: packStageChannelPartyId-hLOU_GE  reason: not valid java name */
     private static final String m15packStageChannelPartyIdhLOU_GE(Channel channel, Guild guild, StageRoles stageRoles, StageInstance stageInstance) {
         String l = Long.toString((stageRoles == null || !StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl())) ? guild.hasFeature(GuildFeature.PARTNERED) ? 2 : guild.hasFeature(GuildFeature.VERIFIED) ? 4 : 0 : 1, a.checkRadix(16));
         m.checkNotNullExpressionValue(l, "java.lang.Long.toString(this, checkRadix(radix))");
-        StringBuilder K = c.d.b.a.a.K("stage:");
+        StringBuilder K = c.d.b.a.a.K(STAGE_PRESENCE_PARTY_PREFIX);
         K.append(channel.f());
-        K.append(':');
+        K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         K.append(channel.h());
-        K.append(':');
+        K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         K.append(l);
-        K.append(':');
+        K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         K.append(stageInstance.c());
         return K.toString();
     }
@@ -225,7 +226,7 @@ public final class ActivityUtilsKt {
         ActivityParty i;
         String a;
         boolean z2;
-        if (activity == null || (i = activity.i()) == null || (a = i.a()) == null || !t.startsWith$default(a, "stage:", false, 2, null)) {
+        if (activity == null || (i = activity.i()) == null || (a = i.a()) == null || !t.startsWith$default(a, STAGE_PRESENCE_PARTY_PREFIX, false, 2, null)) {
             return null;
         }
         try {
@@ -237,7 +238,7 @@ public final class ActivityUtilsKt {
                     Pair pair = !z2 ? o.to(0, 0) : b.size() != 2 ? o.to(0, 0) : o.to(b.get(0), b.get(1));
                     int intValue = ((Number) pair.component1()).intValue();
                     int coerceAtLeast = f.coerceAtLeast(0, ((Number) pair.component2()).intValue() - intValue);
-                    List split$default = w.split$default((CharSequence) a, new char[]{':'}, false, 0, 6, (Object) null);
+                    List split$default = w.split$default((CharSequence) a, new char[]{MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR}, false, 0, 6, (Object) null);
                     long parseLong = Long.parseLong((String) split$default.get(3), a.checkRadix(16));
                     return new StageCallRichPresencePartyData(Long.parseLong((String) split$default.get(4)), Long.parseLong((String) split$default.get(2)), (1 & parseLong) == 0, Long.parseLong((String) split$default.get(1)), (2 & parseLong) == 0, (4 & parseLong) == 0, intValue, coerceAtLeast);
                 }
@@ -247,7 +248,7 @@ public final class ActivityUtilsKt {
             }
             int intValue = ((Number) pair.component1()).intValue();
             int coerceAtLeast = f.coerceAtLeast(0, ((Number) pair.component2()).intValue() - intValue);
-            List split$default = w.split$default((CharSequence) a, new char[]{':'}, false, 0, 6, (Object) null);
+            List split$default = w.split$default((CharSequence) a, new char[]{MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR}, false, 0, 6, (Object) null);
             long parseLong = Long.parseLong((String) split$default.get(3), a.checkRadix(16));
             return new StageCallRichPresencePartyData(Long.parseLong((String) split$default.get(4)), Long.parseLong((String) split$default.get(2)), (1 & parseLong) == 0, Long.parseLong((String) split$default.get(1)), (2 & parseLong) == 0, (4 & parseLong) == 0, intValue, coerceAtLeast);
         } catch (Exception unused) {
diff --git a/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java b/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java
index 58cc14a475..b84ad1cb52 100644
--- a/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java
+++ b/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java
@@ -3,7 +3,9 @@ package com.discord.utilities.presence;
 import android.content.Context;
 import android.text.SpannableStringBuilder;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityEmoji;
 import com.discord.api.activity.ActivityParty;
@@ -68,10 +70,10 @@ public final class PresenceUtils {
 
     public static final CharSequence getActivityHeader(Context context, Activity activity) {
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         int ordinal = activity.p().ordinal();
         if (ordinal != 0) {
-            return ordinal != 1 ? ordinal != 2 ? ordinal != 3 ? ordinal != 5 ? b.h(context, 2131894628, new Object[0], null, 4) : b.h(context, 2131894625, new Object[]{activity.h()}, null, 4) : b.h(context, 2131894632, new Object[]{activity.h()}, null, 4) : b.h(context, 2131894626, new Object[]{activity.h()}, null, 4) : b.h(context, 2131894627, new Object[]{activity.h()}, null, 4);
+            return ordinal != 1 ? ordinal != 2 ? ordinal != 3 ? ordinal != 5 ? b.h(context, R.string.user_activity_header_playing, new Object[0], null, 4) : b.h(context, R.string.user_activity_header_competing, new Object[]{activity.h()}, null, 4) : b.h(context, R.string.user_activity_header_watching, new Object[]{activity.h()}, null, 4) : b.h(context, R.string.user_activity_header_listening, new Object[]{activity.h()}, null, 4) : b.h(context, R.string.user_activity_header_live_on_platform, new Object[]{activity.h()}, null, 4);
         }
         ActivityPlatform j = activity.j();
         if (j != null) {
@@ -81,10 +83,10 @@ public final class PresenceUtils {
                 str = from.getProperName();
             }
             if (str != null) {
-                return b.h(context, 2131894629, new Object[]{str}, null, 4);
+                return b.h(context, R.string.user_activity_header_playing_on_platform, new Object[]{str}, null, 4);
             }
         }
-        return b.h(context, 2131894628, new Object[0], null, 4);
+        return b.h(context, R.string.user_activity_header_playing, new Object[0], null, 4);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0042: APUT  (r4v4 java.lang.Object[]), (0 ??[int, short, byte, char]), (r5v6 java.lang.String) */
@@ -96,7 +98,7 @@ public final class PresenceUtils {
         }
         int ordinal = p.ordinal();
         if (ordinal == 0) {
-            return b.h(context, 2131892254, new Object[]{activity.h()}, null, 4);
+            return b.h(context, R.string.playing_game, new Object[]{activity.h()}, null, 4);
         }
         if (ordinal == 1) {
             Object[] objArr = new Object[1];
@@ -105,9 +107,9 @@ public final class PresenceUtils {
                 e = activity.h();
             }
             objArr[0] = e;
-            return b.h(context, 2131894095, objArr, null, 4);
+            return b.h(context, R.string.streaming, objArr, null, 4);
         } else if (ordinal == 2) {
-            return b.h(context, 2131891120, new Object[]{activity.h()}, null, 4);
+            return b.h(context, R.string.listening_to, new Object[]{activity.h()}, null, 4);
         } else {
             if (ordinal == 3) {
                 Object[] objArr2 = new Object[1];
@@ -116,18 +118,18 @@ public final class PresenceUtils {
                     e2 = activity.h();
                 }
                 objArr2[0] = e2;
-                return b.h(context, 2131895027, objArr2, null, 4);
+                return b.h(context, R.string.watching, objArr2, null, 4);
             } else if (ordinal != 5) {
                 return null;
             } else {
-                return b.h(context, 2131887510, new Object[]{activity.h()}, null, 4);
+                return b.h(context, R.string.competing, new Object[]{activity.h()}, null, 4);
             }
         }
     }
 
     private final CharSequence getApplicationStreamingString(Context context, Presence presence) {
         Activity playingActivity;
-        return (presence == null || (playingActivity = getPlayingActivity(presence)) == null) ? b.h(context, 2131894096, new Object[0], null, 4) : b.h(context, 2131894095, new Object[]{playingActivity.h()}, null, 4);
+        return (presence == null || (playingActivity = getPlayingActivity(presence)) == null) ? b.h(context, R.string.streaming_a_game, new Object[0], null, 4) : b.h(context, R.string.streaming, new Object[]{playingActivity.h()}, null, 4);
     }
 
     private final Activity getSpotifyListeningActivity(List<Activity> list) {
@@ -193,16 +195,16 @@ public final class PresenceUtils {
         if (status != null) {
             int ordinal = status.ordinal();
             if (ordinal == 0) {
-                return 2131893931;
+                return R.string.status_online;
             }
             if (ordinal == 1) {
-                return 2131893927;
+                return R.string.status_idle;
             }
             if (ordinal == 2) {
-                return 2131893925;
+                return R.string.status_dnd;
             }
         }
-        return 2131893930;
+        return R.string.status_offline;
     }
 
     private final CharSequence getStatusText(Context context, Presence presence, boolean z2, boolean z3) {
diff --git a/app/src/main/java/com/discord/utilities/press/OnPressListener.java b/app/src/main/java/com/discord/utilities/press/OnPressListener.java
index 65e1dcefc5..7f26ed6653 100644
--- a/app/src/main/java/com/discord/utilities/press/OnPressListener.java
+++ b/app/src/main/java/com/discord/utilities/press/OnPressListener.java
@@ -2,6 +2,7 @@ package com.discord.utilities.press;
 
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -60,7 +61,7 @@ public final class OnPressListener implements View.OnTouchListener {
     public boolean onTouch(View view, MotionEvent motionEvent) {
         boolean booleanValue;
         m.checkNotNullParameter(view, "view");
-        m.checkNotNullParameter(motionEvent, "event");
+        m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
         Boolean isPressed = isPressed(motionEvent);
         if (isPressed == null || this.pressed == (booleanValue = isPressed.booleanValue())) {
             return false;
diff --git a/app/src/main/java/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.java b/app/src/main/java/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.java
index 069cb985d6..567491822e 100644
--- a/app/src/main/java/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.java
+++ b/app/src/main/java/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import c.d.b.a.a;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.logging.Logger;
 import d0.g0.w;
@@ -16,7 +17,7 @@ public final class SpotifyMetadataReceiver extends BroadcastReceiver {
     @Override // android.content.BroadcastReceiver
     public void onReceive(Context context, Intent intent) {
         String stringExtra;
-        if (intent != null && (stringExtra = intent.getStringExtra("id")) != null) {
+        if (intent != null && (stringExtra = intent.getStringExtra(ModelAuditLogEntry.CHANGE_KEY_ID)) != null) {
             m.checkNotNullExpressionValue(stringExtra, "intent.getStringExtra(\"id\") ?: return");
             try {
                 StoreStream.Companion.getSpotify().setCurrentTrackId((String) u.last((List<? extends Object>) w.split$default((CharSequence) stringExtra, new String[]{":"}, false, 0, 6, (Object) null)));
diff --git a/app/src/main/java/com/discord/utilities/recycler/DiffCreator$subscribeToAsyncUpdateRequests$2.java b/app/src/main/java/com/discord/utilities/recycler/DiffCreator$subscribeToAsyncUpdateRequests$2.java
index d281df2d2c..999fb455b8 100644
--- a/app/src/main/java/com/discord/utilities/recycler/DiffCreator$subscribeToAsyncUpdateRequests$2.java
+++ b/app/src/main/java/com/discord/utilities/recycler/DiffCreator$subscribeToAsyncUpdateRequests$2.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.recycler;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class DiffCreator$subscribeToAsyncUpdateRequests$2 extends o implem
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         DiffCreator.access$setAsyncDiffSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
index 20ef808d06..8a54e5cd49 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.rest;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.analytics.AnalyticSuperProperties;
 import d0.t.h0;
 import d0.z.d.m;
@@ -28,7 +29,7 @@ public final class RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
         String superPropertiesStringBase64 = AnalyticSuperProperties.INSTANCE.getSuperPropertiesStringBase64();
-        m.checkParameterIsNotNull("X-Super-Properties", "name");
+        m.checkParameterIsNotNull("X-Super-Properties", ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(superPropertiesStringBase64, "value");
         e.a("X-Super-Properties", superPropertiesStringBase64);
         if (wVar != null) {
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI.java b/app/src/main/java/com/discord/utilities/rest/RestAPI.java
index 654a2c012d..8ce7a68ef1 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java
@@ -2,6 +2,8 @@ package com.discord.utilities.rest;
 
 import android.content.Context;
 import android.util.Base64;
+import androidx.core.app.NotificationCompat;
+import com.discord.BuildConfig;
 import com.discord.api.activity.ActivityActionConfirmation;
 import com.discord.api.activity.ActivityMetadata;
 import com.discord.api.application.Application;
@@ -50,6 +52,7 @@ import com.discord.models.domain.Consents;
 import com.discord.models.domain.Harvest;
 import com.discord.models.domain.ModelApplicationStreamPreview;
 import com.discord.models.domain.ModelAuditLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelBan;
 import com.discord.models.domain.ModelCall;
 import com.discord.models.domain.ModelChannelFollowerStatsDto;
@@ -102,6 +105,8 @@ import com.discord.restapi.RestAPIInterface;
 import com.discord.restapi.RestAPIParams;
 import com.discord.restapi.SpotifyTokenInterceptor;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.systemlog.SystemLogUtils;
@@ -183,7 +188,7 @@ public final class RestAPI implements RestAPIInterface {
 
         @Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider
         public String getUserAgent() {
-            return "Discord-Android/87203";
+            return BuildConfig.USER_AGENT;
         }
     }
 
@@ -276,7 +281,7 @@ public final class RestAPI implements RestAPIInterface {
             List mutableListOf = n.mutableListOf(requiredHeadersInterceptor, buildAnalyticsInterceptor, buildLoggingInterceptor(), breadcrumbInterceptor);
             List listOf = n.listOf((Object[]) new Interceptor[]{buildLoggingInterceptor, breadcrumbInterceptor});
             PersistentCookieJar persistentCookieJar = new PersistentCookieJar(new SetCookieCache(), new SharedPrefsCookiePersistor(context));
-            RestAPIBuilder restAPIBuilder = new RestAPIBuilder("https://discord.com/api/", persistentCookieJar);
+            RestAPIBuilder restAPIBuilder = new RestAPIBuilder(BuildConfig.HOST_API, persistentCookieJar);
             setApi(new RestAPI((RestAPIInterface) RestAPIBuilder.build$default(restAPIBuilder, RestAPIInterface.class, false, 0, mutableListOf, "client_base", false, null, 102, null)));
             setApiSerializeNulls(new RestAPI((RestAPIInterface) RestAPIBuilder.build$default(restAPIBuilder, RestAPIInterface.class, true, 0, mutableListOf, "client_serialize_nulls", false, null, 100, null)));
             setApiClientVersions((RestAPIInterface.Dynamic) RestAPIBuilder.build$default(restAPIBuilder, RestAPIInterface.Dynamic.class, false, 0, listOf, "client_dynamic", false, null, 102, null));
@@ -541,7 +546,7 @@ public final class RestAPI implements RestAPIInterface {
     @Override // com.discord.restapi.RestAPIInterface
     @o("entitlements/gift-codes/{code}/redeem")
     public Observable<Void> acceptGift(@s("code") String str) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         return this._api.acceptGift(str);
     }
 
@@ -752,7 +757,7 @@ public final class RestAPI implements RestAPIInterface {
     @Override // com.discord.restapi.RestAPIInterface
     @o("guilds/{guildId}/events")
     public Observable<GuildScheduledEvent> createGuildScheduledEvent(@s("guildId") long j, @i0.f0.a RestAPIParams.CreateGuildScheduledEventBody createGuildScheduledEventBody) {
-        m.checkNotNullParameter(createGuildScheduledEventBody, "event");
+        m.checkNotNullParameter(createGuildScheduledEventBody, NotificationCompat.CATEGORY_EVENT);
         return this._api.createGuildScheduledEvent(j, createGuildScheduledEventBody);
     }
 
@@ -1292,7 +1297,7 @@ public final class RestAPI implements RestAPIInterface {
     @Override // com.discord.restapi.RestAPIInterface
     @f("invites/{code}")
     public Observable<ModelInvite> getInviteCode(@s("code") String str, @t("with_counts") boolean z2) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         return this._api.getInviteCode(str, z2);
     }
 
@@ -1402,7 +1407,7 @@ public final class RestAPI implements RestAPIInterface {
     @Override // com.discord.restapi.RestAPIInterface
     @f("tracks/{id}")
     public Observable<ModelSpotifyTrack> getSpotifyTrack(@s("id") String str) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         return this._api.getSpotifyTrack(str);
     }
 
@@ -1551,7 +1556,7 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     @Override // com.discord.restapi.RestAPIInterface
-    @h(hasBody = true, method = "DELETE", path = "users/@me/guilds/{guildId}")
+    @h(hasBody = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS, method = "DELETE", path = "users/@me/guilds/{guildId}")
     public Observable<Void> leaveGuild(@s("guildId") long j, @i0.f0.a RestAPIParams.LeaveGuildBody leaveGuildBody) {
         m.checkNotNullParameter(leaveGuildBody, "leaveGuildBody");
         return this._api.leaveGuild(j, leaveGuildBody);
@@ -1694,7 +1699,7 @@ public final class RestAPI implements RestAPIInterface {
     @Override // com.discord.restapi.RestAPIInterface
     @o("invites/{code}")
     public Observable<ModelInvite> postInviteCode(@s("code") String str, @i0.f0.a RestAPIParams.EmptyBody emptyBody, @i("X-Context-Properties") String str2) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         m.checkNotNullParameter(emptyBody, "body");
         m.checkNotNullParameter(str2, "context");
         return this._api.postInviteCode(str, emptyBody, str2);
@@ -1838,7 +1843,7 @@ public final class RestAPI implements RestAPIInterface {
     @Override // com.discord.restapi.RestAPIInterface
     @f("entitlements/gift-codes/{code}")
     public Observable<ModelGift> resolveGiftCode(@s("code") String str, @t("with_application") boolean z2, @t("with_subscription_plan") boolean z3) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         return this._api.resolveGiftCode(str, z2, z3);
     }
 
@@ -1851,7 +1856,7 @@ public final class RestAPI implements RestAPIInterface {
     @Override // com.discord.restapi.RestAPIInterface
     @b("users/@me/entitlements/gift-codes/{code}")
     public Observable<Void> revokeGiftCode(@s("code") String str) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         return this._api.revokeGiftCode(str);
     }
 
@@ -1911,7 +1916,7 @@ public final class RestAPI implements RestAPIInterface {
     @o("private/bug-reports")
     @l
     public Observable<Unit> sendBugReport(@q("name") String str, @q("description") String str2, @q("priority") int i, @q MultipartBody.Part part) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return this._api.sendBugReport(str, str2, i, part);
     }
 
@@ -1934,7 +1939,7 @@ public final class RestAPI implements RestAPIInterface {
     @l
     public Observable<Message> sendMessage(@s("channelId") long j, @q("payload_json") PayloadJSON<RestAPIParams.Message> payloadJSON, @q MultipartBody.Part[] partArr) {
         m.checkNotNullParameter(payloadJSON, "payloadJson");
-        m.checkNotNullParameter(partArr, "files");
+        m.checkNotNullParameter(partArr, ChatInputComponentTypes.FILES);
         return this._api.sendMessage(j, payloadJSON, partArr);
     }
 
@@ -2218,7 +2223,7 @@ public final class RestAPI implements RestAPIInterface {
     @o("debug-logs/multi/4")
     @l
     public Observable<Void> uploadLogs(@q MultipartBody.Part[] partArr) {
-        m.checkNotNullParameter(partArr, "files");
+        m.checkNotNullParameter(partArr, ChatInputComponentTypes.FILES);
         return this._api.uploadLogs(partArr);
     }
 
@@ -2291,7 +2296,7 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     @Override // com.discord.restapi.RestAPIInterface
-    @h(hasBody = true, method = "DELETE", path = "users/@me/phone")
+    @h(hasBody = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS, method = "DELETE", path = "users/@me/phone")
     public Observable<Void> userPhoneDelete(@i0.f0.a RestAPIParams.DeletePhone deletePhone) {
         m.checkNotNullParameter(deletePhone, "body");
         return this._api.userPhoneDelete(deletePhone);
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java b/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java
index d4321aed2a..47e8b0c102 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java
@@ -2,6 +2,8 @@ package com.discord.utilities.rest;
 
 import android.content.Context;
 import c.a.l.b;
+import com.discord.R;
+import com.discord.restapi.RestAPIAbortCodes;
 import com.discord.utilities.error.Error;
 import d0.o;
 import d0.t.h0;
@@ -12,7 +14,7 @@ import kotlin.jvm.functions.Function0;
 /* compiled from: RestAPIAbortMessages.kt */
 public final class RestAPIAbortMessages {
     public static final RestAPIAbortMessages INSTANCE = new RestAPIAbortMessages();
-    private static final Map<Integer, Integer> MESSAGES = h0.mapOf(o.to(80000, 2131887055), o.to(50007, 2131887047), o.to(40003, 2131887046), o.to(40004, 2131887050), o.to(80000, 2131886260), o.to(30002, 2131886263), o.to(80001, 2131886262), o.to(80003, 2131886262), o.to(80002, 2131886262), o.to(80004, 2131886262), o.to(80007, 2131886258), o.to(160006, 2131894389), o.to(160007, 2131894384), o.to(20016, 2131887349));
+    private static final Map<Integer, Integer> MESSAGES;
 
     /* compiled from: RestAPIAbortMessages.kt */
     public static final class ResponseResolver {
@@ -24,7 +26,7 @@ public final class RestAPIAbortMessages {
         public final CharSequence getRelationshipResponse(Context context, int i, String str) {
             m.checkNotNullParameter(str, "username");
             Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(i);
-            int intValue = abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131886262;
+            int intValue = abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : R.string.add_friend_error_other;
             if (i != 80000) {
                 if (context != null) {
                     return b.h(context, intValue, new Object[0], null, 4);
@@ -38,6 +40,13 @@ public final class RestAPIAbortMessages {
         }
     }
 
+    static {
+        Integer valueOf = Integer.valueOf((int) RestAPIAbortCodes.RELATIONSHIP_INCOMING_DISABLED);
+        Integer valueOf2 = Integer.valueOf((int) RestAPIAbortCodes.RELATIONSHIP_INCOMING_BLOCKED);
+        Integer valueOf3 = Integer.valueOf((int) R.string.add_friend_error_other);
+        MESSAGES = h0.mapOf(o.to(valueOf, Integer.valueOf((int) R.string.bot_requires_email_verification)), o.to(Integer.valueOf((int) RestAPIAbortCodes.INVALID_MESSAGE_SEND_USER), Integer.valueOf((int) R.string.bot_dm_send_failed)), o.to(Integer.valueOf((int) RestAPIAbortCodes.RATE_LIMIT_DM_OPEN), Integer.valueOf((int) R.string.bot_dm_rate_limited)), o.to(Integer.valueOf((int) RestAPIAbortCodes.SEND_MESSAGE_TEMPORARILY_DISABLED), Integer.valueOf((int) R.string.bot_dm_send_message_temporarily_disabled)), o.to(valueOf, Integer.valueOf((int) R.string.add_friend_error_invalid_discord_tag)), o.to(Integer.valueOf((int) RestAPIAbortCodes.TOO_MANY_FRIENDS), Integer.valueOf((int) R.string.add_friend_error_too_many_friends)), o.to(valueOf2, valueOf3), o.to(Integer.valueOf((int) RestAPIAbortCodes.RELATIONSHIP_INVALID_SELF), valueOf3), o.to(Integer.valueOf((int) RestAPIAbortCodes.RELATIONSHIP_INVALID_USER_BOT), valueOf3), o.to(Integer.valueOf((int) RestAPIAbortCodes.RELATIONSHIP_INVALID_DISCORD_TAG), valueOf3), o.to(Integer.valueOf((int) RestAPIAbortCodes.RELATIONSHIP_ALREADY_FRIENDS), Integer.valueOf((int) R.string.add_friend_error_already_friends)), o.to(Integer.valueOf((int) RestAPIAbortCodes.TOO_MANY_THREADS), Integer.valueOf((int) R.string.too_many_threads_message)), o.to(Integer.valueOf((int) RestAPIAbortCodes.TOO_MANY_ANNOUNCEMENT_THREADS), Integer.valueOf((int) R.string.too_many_announcement_threads_message)), o.to(Integer.valueOf((int) RestAPIAbortCodes.SLOWMODE_RATE_LIMITED), Integer.valueOf((int) R.string.channel_slowmode_desc_short)));
+    }
+
     private RestAPIAbortMessages() {
     }
 
diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils.java b/app/src/main/java/com/discord/utilities/rest/SendUtils.java
index dbc2abae9c..2a0c68f5a3 100644
--- a/app/src/main/java/com/discord/utilities/rest/SendUtils.java
+++ b/app/src/main/java/com/discord/utilities/rest/SendUtils.java
@@ -7,6 +7,8 @@ import android.net.Uri;
 import androidx.annotation.MainThread;
 import androidx.annotation.VisibleForTesting;
 import c.d.b.a.a;
+import com.discord.R;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.attachments.AttachmentUtilsKt;
 import com.discord.utilities.error.Error;
@@ -60,7 +62,7 @@ public final class SendUtils {
         }
 
         public FileUpload(String str, long j, MultipartBody.Part part, String str2, Observable<Long> observable) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(part, "part");
             m.checkNotNullParameter(str2, "mimeType");
             m.checkNotNullParameter(observable, "bytesWrittenObservable");
@@ -113,7 +115,7 @@ public final class SendUtils {
         }
 
         public final FileUpload copy(String str, long j, MultipartBody.Part part, String str2, Observable<Long> observable) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(part, "part");
             m.checkNotNullParameter(str2, "mimeType");
             m.checkNotNullParameter(observable, "bytesWrittenObservable");
@@ -466,7 +468,7 @@ public final class SendUtils {
             if (response2.isKnownResponse() || error.getType() == Error.Type.NETWORK) {
                 error.setShowErrorToasts(true);
             } else {
-                c.a.e.o.g(context, 2131891644, 0, null, 12);
+                c.a.e.o.g(context, R.string.network_error_bad_request, 0, null, 12);
             }
         } else if (function02 != null) {
             function02.mo1invoke();
diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtilsKt.java b/app/src/main/java/com/discord/utilities/rest/SendUtilsKt.java
index 2196d44502..927c16741b 100644
--- a/app/src/main/java/com/discord/utilities/rest/SendUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/rest/SendUtilsKt.java
@@ -4,6 +4,7 @@ import android.content.ContentResolver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import androidx.core.app.NotificationCompat;
 import com.discord.app.AppLog;
 import com.discord.utilities.logging.Logger;
 import d0.y.b;
@@ -13,7 +14,7 @@ public final class SendUtilsKt {
     public static final long computeFileSizeBytes(Uri uri, ContentResolver contentResolver) {
         long j;
         Long l;
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(contentResolver, "contentResolver");
         try {
             Cursor query = contentResolver.query(uri, null, null, null, null);
@@ -51,7 +52,7 @@ public final class SendUtilsKt {
     }
 
     public static final float computeFileSizeMegabytes(Uri uri, ContentResolver contentResolver) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(contentResolver, "contentResolver");
         return ((float) computeFileSizeBytes(uri, contentResolver)) / ((float) 1048576);
     }
diff --git a/app/src/main/java/com/discord/utilities/rx/ActivityLifecycleCallbacks.java b/app/src/main/java/com/discord/utilities/rx/ActivityLifecycleCallbacks.java
index 04bde9a5e1..c55a355eea 100644
--- a/app/src/main/java/com/discord/utilities/rx/ActivityLifecycleCallbacks.java
+++ b/app/src/main/java/com/discord/utilities/rx/ActivityLifecycleCallbacks.java
@@ -3,6 +3,7 @@ package com.discord.utilities.rx;
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
+import androidx.appcompat.widget.ActivityChooserModel;
 import com.discord.app.AppActivity;
 import d0.z.d.m;
 import java.lang.ref.WeakReference;
@@ -12,56 +13,56 @@ public abstract class ActivityLifecycleCallbacks implements Application.Activity
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public final void onActivityCreated(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (activity instanceof AppActivity) {
             onActivityCreated((AppActivity) activity, bundle);
         }
     }
 
     public void onActivityCreated(AppActivity appActivity, Bundle bundle) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         this.onActivityCreatedInvoked = new WeakReference<>(appActivity);
         onActivityCreatedOrResumed(appActivity);
     }
 
     public void onActivityCreatedOrResumed(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public final void onActivityDestroyed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (activity instanceof AppActivity) {
             onActivityDestroyed((AppActivity) activity);
         }
     }
 
     public void onActivityDestroyed(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public final void onActivityPaused(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (activity instanceof AppActivity) {
             onActivityPaused((AppActivity) activity);
         }
     }
 
     public void onActivityPaused(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public final void onActivityResumed(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (activity instanceof AppActivity) {
             onActivityResumed((AppActivity) activity);
         }
     }
 
     public void onActivityResumed(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         WeakReference<AppActivity> weakReference = this.onActivityCreatedInvoked;
         if (m.areEqual(weakReference != null ? weakReference.get() : null, appActivity)) {
             this.onActivityCreatedInvoked = null;
@@ -72,7 +73,7 @@ public abstract class ActivityLifecycleCallbacks implements Application.Activity
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public final void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(bundle, "outState");
         if (activity instanceof AppActivity) {
             onActivitySaveInstanceState((AppActivity) activity, bundle);
@@ -80,31 +81,31 @@ public abstract class ActivityLifecycleCallbacks implements Application.Activity
     }
 
     public void onActivitySaveInstanceState(AppActivity appActivity, Bundle bundle) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(bundle, "outState");
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public final void onActivityStarted(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (activity instanceof AppActivity) {
             onActivityStarted((AppActivity) activity);
         }
     }
 
     public void onActivityStarted(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
     public final void onActivityStopped(Activity activity) {
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         if (activity instanceof AppActivity) {
             onActivityStopped((AppActivity) activity);
         }
     }
 
     public void onActivityStopped(AppActivity appActivity) {
-        m.checkNotNullParameter(appActivity, "activity");
+        m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java b/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java
index 0655123114..471c5e9487 100644
--- a/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java
+++ b/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.rx;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.q.a.k.a;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -73,7 +74,7 @@ public class LeadingEdgeThrottle<T> implements Observable.b<T, T> {
 
         @Override // rx.Subscriber
         public void onStart() {
-            request(Long.MAX_VALUE);
+            request(RecyclerView.FOREVER_NS);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.java b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.java
index 1b54c969d4..0c8205c4b0 100644
--- a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.java
+++ b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$1.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.rx;
 
+import androidx.exifinterface.media.ExifInterface;
 import d0.z.d.m;
 import j0.k.b;
 /* compiled from: ObservableExtensions.kt */
@@ -8,7 +9,7 @@ public final class ObservableExtensionsKt$filterIs$1<T, R> implements b<Object,
 
     @Override // j0.k.b
     public final Boolean call(Object obj) {
-        m.reifiedOperationMarker(3, "T");
+        m.reifiedOperationMarker(3, ExifInterface.GPS_DIRECTION_TRUE);
         return Boolean.valueOf(obj instanceof Object);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.java b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.java
index bc9e4a8aef..880e7dd290 100644
--- a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.java
+++ b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt$filterIs$2.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.rx;
 
+import androidx.exifinterface.media.ExifInterface;
 import d0.z.d.m;
 import j0.k.b;
 /* compiled from: ObservableExtensions.kt */
@@ -10,7 +11,7 @@ public final class ObservableExtensionsKt$filterIs$2<T, R> implements b<Object,
     /* JADX WARN: Multi-variable type inference failed */
     @Override // j0.k.b
     public final T call(Object obj) {
-        m.reifiedOperationMarker(1, "T");
+        m.reifiedOperationMarker(1, ExifInterface.GPS_DIRECTION_TRUE);
         return obj;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
index 47c864ddb7..1d7ca61888 100644
--- a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import androidx.fragment.app.Fragment;
 import com.discord.app.AppComponent;
 import com.discord.restapi.utils.RetryWithDelay;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
@@ -34,7 +35,7 @@ public final class ObservableExtensionsKt {
         Objects.requireNonNull(observable);
         Subscription U = observable.U(new b(observableExtensionsKt$sam$rx_functions_Action1$0, observableExtensionsKt$appSubscribe$subscription$1, observableExtensionsKt$appSubscribe$subscription$2));
         if (function1 != null) {
-            m.checkNotNullExpressionValue(U, "subscription");
+            m.checkNotNullExpressionValue(U, Traits.Payment.Type.SUBSCRIPTION);
             function1.invoke(U);
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
index ec57b5b885..6382718c9a 100644
--- a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
+++ b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.rx;
 
 import android.content.Context;
+import c.a.r.n0.c.e;
 import d0.z.d.m;
 import j0.l.e.j;
 import kotlin.jvm.functions.Function0;
@@ -38,7 +39,7 @@ public final class OnDelayedEmissionHandler$call$wrappedSubscriber$1 extends Sub
 
     @Override // j0.g
     public void onError(Throwable th) {
-        m.checkNotNullParameter(th, "e");
+        m.checkNotNullParameter(th, e.a);
         if (!this.$subscriber.isUnsubscribed()) {
             tryFinish();
             this.$subscriber.onError(th);
diff --git a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.java b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.java
index ab17f2f60d..2ba37dba60 100644
--- a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.java
+++ b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$getRestObservable$3.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.search.network;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelSearchResponse;
 import com.discord.stores.StoreSearch;
 import com.discord.utilities.rest.RestAPI;
@@ -25,7 +26,7 @@ public final class SearchFetcher$getRestObservable$3<T, R> implements b<Integer,
     public final Observable<? extends ModelSearchResponse> call(Integer num) {
         int ordinal = this.$searchTarget.getType().ordinal();
         if (ordinal == 0) {
-            return RestAPI.Companion.getApi().searchGuildMessages(this.$searchTarget.getId(), this.$oldestMessageId, (List) this.$queryParams.get("author_id"), (List) this.$queryParams.get("mentions"), (List) this.$queryParams.get("channel_id"), (List) this.$queryParams.get("has"), (List) this.$queryParams.get("content"), num, Boolean.valueOf(this.$searchQuery.getIncludeNsfw()));
+            return RestAPI.Companion.getApi().searchGuildMessages(this.$searchTarget.getId(), this.$oldestMessageId, (List) this.$queryParams.get("author_id"), (List) this.$queryParams.get("mentions"), (List) this.$queryParams.get(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID), (List) this.$queryParams.get("has"), (List) this.$queryParams.get("content"), num, Boolean.valueOf(this.$searchQuery.getIncludeNsfw()));
         }
         if (ordinal == 1) {
             return RestAPI.Companion.getApi().searchChannelMessages(this.$searchTarget.getId(), this.$oldestMessageId, (List) this.$queryParams.get("author_id"), (List) this.$queryParams.get("mentions"), (List) this.$queryParams.get("has"), (List) this.$queryParams.get("content"), num, Boolean.valueOf(this.$searchQuery.getIncludeNsfw()));
diff --git a/app/src/main/java/com/discord/utilities/search/query/node/answer/ChannelNode.java b/app/src/main/java/com/discord/utilities/search/query/node/answer/ChannelNode.java
index 88f6aaf70c..80bb77704b 100644
--- a/app/src/main/java/com/discord/utilities/search/query/node/answer/ChannelNode.java
+++ b/app/src/main/java/com/discord/utilities/search/query/node/answer/ChannelNode.java
@@ -1,9 +1,11 @@
 package com.discord.utilities.search.query.node.answer;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.search.network.SearchQuery;
 import com.discord.utilities.search.query.FilterType;
 import com.discord.utilities.search.validation.SearchData;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.t.m0;
 import d0.t.u;
 import d0.z.d.m;
@@ -46,7 +48,7 @@ public final class ChannelNode extends AnswerNode {
 
     @Override // com.discord.utilities.search.query.node.QueryNode
     public String getText() {
-        StringBuilder H = a.H('#');
+        StringBuilder H = a.H(MentionUtilsKt.CHANNELS_CHAR);
         H.append(this.channelName);
         return H.toString();
     }
@@ -80,7 +82,7 @@ public final class ChannelNode extends AnswerNode {
         m.checkNotNullParameter(builder, "queryBuilder");
         m.checkNotNullParameter(searchData, "searchData");
         if (u.contains(getValidFilters(), filterType) && (l = searchData.getChannelNameIndex().get(this.channelName)) != null) {
-            builder.appendParam("channel_id", String.valueOf(l.longValue()));
+            builder.appendParam(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, String.valueOf(l.longValue()));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/search/query/node/answer/HasAnswerOption.java b/app/src/main/java/com/discord/utilities/search/query/node/answer/HasAnswerOption.java
index 516c5f0f75..ad6759f347 100644
--- a/app/src/main/java/com/discord/utilities/search/query/node/answer/HasAnswerOption.java
+++ b/app/src/main/java/com/discord/utilities/search/query/node/answer/HasAnswerOption.java
@@ -5,12 +5,13 @@ import com.discord.utilities.search.strings.SearchStringProvider;
 import d0.z.d.m;
 import kotlin.NoWhenBranchMatchedException;
 import kotlin.jvm.internal.DefaultConstructorMarker;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: HasNode.kt */
 public enum HasAnswerOption {
     LINK("link"),
     EMBED("embed"),
     FILE("file"),
-    VIDEO("video"),
+    VIDEO(MediaStreamTrack.VIDEO_TRACK_KIND),
     IMAGE("image"),
     SOUND("sound"),
     STICKER("sticker");
diff --git a/app/src/main/java/com/discord/utilities/search/query/node/answer/HasNode.java b/app/src/main/java/com/discord/utilities/search/query/node/answer/HasNode.java
index 4b89b8c4b5..70eaa77cca 100644
--- a/app/src/main/java/com/discord/utilities/search/query/node/answer/HasNode.java
+++ b/app/src/main/java/com/discord/utilities/search/query/node/answer/HasNode.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.search.query.node.answer;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.discord.utilities.search.network.SearchQuery;
 import com.discord.utilities.search.query.FilterType;
@@ -16,7 +17,7 @@ public final class HasNode extends AnswerNode {
 
     public HasNode(HasAnswerOption hasAnswerOption, CharSequence charSequence) {
         m.checkNotNullParameter(hasAnswerOption, "hasAnswerOption");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         this.hasAnswerOption = hasAnswerOption;
         this.text = charSequence;
     }
@@ -48,7 +49,7 @@ public final class HasNode extends AnswerNode {
 
     public final HasNode copy(HasAnswerOption hasAnswerOption, CharSequence charSequence) {
         m.checkNotNullParameter(hasAnswerOption, "hasAnswerOption");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         return new HasNode(hasAnswerOption, charSequence);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/search/query/node/filter/FilterNode.java b/app/src/main/java/com/discord/utilities/search/query/node/filter/FilterNode.java
index 7abb78e077..468e7127c3 100644
--- a/app/src/main/java/com/discord/utilities/search/query/node/filter/FilterNode.java
+++ b/app/src/main/java/com/discord/utilities/search/query/node/filter/FilterNode.java
@@ -3,11 +3,14 @@ package com.discord.utilities.search.query.node.filter;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.text.SpannableStringBuilder;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.search.query.FilterType;
 import com.discord.utilities.search.query.node.QueryNode;
 import com.discord.utilities.spans.TypefaceSpanCompat;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 /* compiled from: FilterNode.kt */
 public final class FilterNode extends QueryNode {
@@ -16,7 +19,7 @@ public final class FilterNode extends QueryNode {
 
     public FilterNode(FilterType filterType, CharSequence charSequence) {
         m.checkNotNullParameter(filterType, "filterType");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         this.filterType = filterType;
         this.text = charSequence;
     }
@@ -41,7 +44,7 @@ public final class FilterNode extends QueryNode {
 
     public final FilterNode copy(FilterType filterType, CharSequence charSequence) {
         m.checkNotNullParameter(filterType, "filterType");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         return new FilterNode(filterType, charSequence);
     }
 
@@ -76,16 +79,16 @@ public final class FilterNode extends QueryNode {
         return hashCode + i;
     }
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: java.lang.CharSequence : 0x0026: INVOKE  (r2v0 java.lang.CharSequence) = (r3v0 'this' com.discord.utilities.search.query.node.filter.FilterNode A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.utilities.search.query.node.filter.FilterNode.getText():java.lang.CharSequence), (':' char)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: java.lang.CharSequence : 0x0026: INVOKE  (r2v0 java.lang.CharSequence) = (r3v0 'this' com.discord.utilities.search.query.node.filter.FilterNode A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.utilities.search.query.node.filter.FilterNode.getText():java.lang.CharSequence), (wrap: char : ?: SGET   com.discord.widgets.chat.input.MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR char)] */
     public void render(SpannableStringBuilder spannableStringBuilder, Context context) {
         m.checkNotNullParameter(spannableStringBuilder, "builder");
         m.checkNotNullParameter(context, "renderContext");
-        Typeface themedFont = FontUtils.INSTANCE.getThemedFont(context, 2130969326);
+        Typeface themedFont = FontUtils.INSTANCE.getThemedFont(context, R.attr.font_primary_bold);
         TypefaceSpanCompat typefaceSpanCompat = themedFont != null ? new TypefaceSpanCompat(themedFont) : null;
         int length = spannableStringBuilder.length();
         StringBuilder sb = new StringBuilder();
         sb.append(getText());
-        sb.append(':');
+        sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         spannableStringBuilder.append((CharSequence) sb.toString());
         spannableStringBuilder.setSpan(typefaceSpanCompat, length, spannableStringBuilder.length(), 33);
     }
diff --git a/app/src/main/java/com/discord/utilities/search/query/parsing/QueryParser.java b/app/src/main/java/com/discord/utilities/search/query/parsing/QueryParser.java
index f138e804a0..5fac40179b 100644
--- a/app/src/main/java/com/discord/utilities/search/query/parsing/QueryParser.java
+++ b/app/src/main/java/com/discord/utilities/search/query/parsing/QueryParser.java
@@ -6,6 +6,7 @@ import com.discord.simpleast.core.parser.Rule;
 import com.discord.utilities.search.query.node.QueryNode;
 import com.discord.utilities.search.query.node.answer.HasAnswerOption;
 import com.discord.utilities.search.strings.SearchStringProvider;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.util.ArrayList;
 import java.util.regex.Pattern;
@@ -59,7 +60,7 @@ public final class QueryParser extends Parser<Context, QueryNode, Object> {
         }
 
         private final Rule<Context, QueryNode, Object> getContentRule() {
-            Pattern compile = Pattern.compile("^[\\s]*[\\S]*[\\s]*", 64);
+            Pattern compile = Pattern.compile(QueryParser.ANY_TOKEN_REGEX, 64);
             m.checkNotNullExpressionValue(compile, "simpleTextPattern");
             return new QueryParser$Companion$getContentRule$1(compile, compile);
         }
@@ -86,7 +87,7 @@ public final class QueryParser extends Parser<Context, QueryNode, Object> {
 
         public final Rule<Context, QueryNode, Object> getHasFilterRule(CharSequence charSequence) {
             m.checkNotNullParameter(charSequence, "localizedHas");
-            Pattern compile = Pattern.compile('^' + ("^[\\s]*?" + charSequence + ':'), 64);
+            Pattern compile = Pattern.compile('^' + ("^[\\s]*?" + charSequence + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR), 64);
             m.checkNotNullExpressionValue(compile, "hasFilterPattern");
             return new QueryParser$Companion$getHasFilterRule$1(charSequence, compile, compile);
         }
@@ -99,14 +100,14 @@ public final class QueryParser extends Parser<Context, QueryNode, Object> {
 
         public final Rule<Context, QueryNode, Object> getInFilterRule(CharSequence charSequence) {
             m.checkNotNullParameter(charSequence, "localizedIn");
-            Pattern compile = Pattern.compile('^' + ("^[\\s]*?" + charSequence + ':'), 64);
+            Pattern compile = Pattern.compile('^' + ("^[\\s]*?" + charSequence + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR), 64);
             m.checkNotNullExpressionValue(compile, "fromUserPattern");
             return new QueryParser$Companion$getInFilterRule$1(charSequence, compile, compile);
         }
 
         public final Rule<Context, QueryNode, Object> getMentionsFilterRule(CharSequence charSequence) {
             m.checkNotNullParameter(charSequence, "localizedMentions");
-            Pattern compile = Pattern.compile('^' + ("^[\\s]*?" + charSequence + ':'), 64);
+            Pattern compile = Pattern.compile('^' + ("^[\\s]*?" + charSequence + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR), 64);
             m.checkNotNullExpressionValue(compile, "mentionsFilterPattern");
             return new QueryParser$Companion$getMentionsFilterRule$1(charSequence, compile, compile);
         }
diff --git a/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java b/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java
index a4831ce2c0..bb247e93e3 100644
--- a/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java
+++ b/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.search.strings;
 
 import android.content.Context;
+import com.discord.R;
 import d0.z.d.m;
 /* compiled from: ContextSearchStringProvider.kt */
 public final class ContextSearchStringProvider implements SearchStringProvider {
@@ -18,37 +19,37 @@ public final class ContextSearchStringProvider implements SearchStringProvider {
 
     public ContextSearchStringProvider(Context context) {
         m.checkNotNullParameter(context, "context");
-        String string = context.getString(2131893466);
+        String string = context.getString(R.string.search_filter_from);
         m.checkNotNullExpressionValue(string, "context.getString(R.string.search_filter_from)");
         this.fromFilterString = string;
-        String string2 = context.getString(2131893468);
+        String string2 = context.getString(R.string.search_filter_in);
         m.checkNotNullExpressionValue(string2, "context.getString(R.string.search_filter_in)");
         this.inFilterString = string2;
-        String string3 = context.getString(2131893470);
+        String string3 = context.getString(R.string.search_filter_mentions);
         m.checkNotNullExpressionValue(string3, "context.getString(R.string.search_filter_mentions)");
         this.mentionsFilterString = string3;
-        String string4 = context.getString(2131893467);
+        String string4 = context.getString(R.string.search_filter_has);
         m.checkNotNullExpressionValue(string4, "context.getString(R.string.search_filter_has)");
         this.hasFilterString = string4;
-        String string5 = context.getString(2131893444);
+        String string5 = context.getString(R.string.search_answer_has_link);
         m.checkNotNullExpressionValue(string5, "context.getString(R.string.search_answer_has_link)");
         this.linkAnswerString = string5;
-        String string6 = context.getString(2131893442);
+        String string6 = context.getString(R.string.search_answer_has_embed);
         m.checkNotNullExpressionValue(string6, "context.getString(R.stri….search_answer_has_embed)");
         this.embedAnswerString = string6;
-        String string7 = context.getString(2131893441);
+        String string7 = context.getString(R.string.search_answer_has_attachment);
         m.checkNotNullExpressionValue(string7, "context.getString(R.stri…ch_answer_has_attachment)");
         this.fileAnswerString = string7;
-        String string8 = context.getString(2131893447);
+        String string8 = context.getString(R.string.search_answer_has_video);
         m.checkNotNullExpressionValue(string8, "context.getString(R.stri….search_answer_has_video)");
         this.videoAnswerString = string8;
-        String string9 = context.getString(2131893443);
+        String string9 = context.getString(R.string.search_answer_has_image);
         m.checkNotNullExpressionValue(string9, "context.getString(R.stri….search_answer_has_image)");
         this.imageAnswerString = string9;
-        String string10 = context.getString(2131893445);
+        String string10 = context.getString(R.string.search_answer_has_sound);
         m.checkNotNullExpressionValue(string10, "context.getString(R.stri….search_answer_has_sound)");
         this.soundAnswerString = string10;
-        String string11 = context.getString(2131893446);
+        String string11 = context.getString(R.string.search_answer_has_sticker);
         m.checkNotNullExpressionValue(string11, "context.getString(R.stri…earch_answer_has_sticker)");
         this.stickerAnswerString = string11;
     }
diff --git a/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java b/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
index 86b4cf6add..aa2f0f0b68 100644
--- a/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
+++ b/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.models.guild.UserGuildMember;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
@@ -77,7 +78,7 @@ public final class SearchSuggestionEngine {
         Collection<Channel> values = map.values();
         ArrayList arrayList = new ArrayList();
         for (Object obj : values) {
-            if (PermissionUtils.can(1024, (Long) a.o0((Channel) obj, map2))) {
+            if (PermissionUtils.can(Permission.VIEW_CHANNEL, (Long) a.o0((Channel) obj, map2))) {
                 arrayList.add(obj);
             }
         }
diff --git a/app/src/main/java/com/discord/utilities/search/suggestion/entries/FilterSuggestion.java b/app/src/main/java/com/discord/utilities/search/suggestion/entries/FilterSuggestion.java
index 7d78b6fb9c..101daeb01a 100644
--- a/app/src/main/java/com/discord/utilities/search/suggestion/entries/FilterSuggestion.java
+++ b/app/src/main/java/com/discord/utilities/search/suggestion/entries/FilterSuggestion.java
@@ -4,6 +4,7 @@ import c.d.b.a.a;
 import com.discord.utilities.search.query.FilterType;
 import com.discord.utilities.search.strings.SearchStringProvider;
 import com.discord.utilities.search.suggestion.entries.SearchSuggestion;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.w;
 import d0.z.d.m;
 import kotlin.NoWhenBranchMatchedException;
@@ -52,7 +53,7 @@ public final class FilterSuggestion implements SearchSuggestion {
             } else {
                 throw new NoWhenBranchMatchedException();
             }
-            return str + ':';
+            return str + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
         }
 
         public final boolean canComplete(CharSequence charSequence, FilterType filterType, SearchStringProvider searchStringProvider) {
diff --git a/app/src/main/java/com/discord/utilities/simple_pager/SimplePager.java b/app/src/main/java/com/discord/utilities/simple_pager/SimplePager.java
index 740ee99e84..c7e20e5efc 100644
--- a/app/src/main/java/com/discord/utilities/simple_pager/SimplePager.java
+++ b/app/src/main/java/com/discord/utilities/simple_pager/SimplePager.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -124,7 +126,7 @@ public final class SimplePager extends ViewPager {
 
     @Override // androidx.viewpager.widget.ViewPager, android.view.ViewGroup
     public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
-        m.checkNotNullParameter(motionEvent, "event");
+        m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
         return this.isScrollingEnabled && super.onInterceptTouchEvent(motionEvent);
     }
 
@@ -146,14 +148,14 @@ public final class SimplePager extends ViewPager {
             }
         }
         if (i3 != 0) {
-            i2 = View.MeasureSpec.makeMeasureSpec(i3, 1073741824);
+            i2 = View.MeasureSpec.makeMeasureSpec(i3, BasicMeasure.EXACTLY);
         }
         super.onMeasure(i, i2);
     }
 
     @Override // androidx.viewpager.widget.ViewPager, android.view.View
     public boolean onTouchEvent(MotionEvent motionEvent) {
-        m.checkNotNullParameter(motionEvent, "event");
+        m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
         return this.isScrollingEnabled && super.onTouchEvent(motionEvent);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/spans/BlockBackgroundSpan.java b/app/src/main/java/com/discord/utilities/spans/BlockBackgroundSpan.java
index 5c3dd2ce1c..d40a54f0d8 100644
--- a/app/src/main/java/com/discord/utilities/spans/BlockBackgroundSpan.java
+++ b/app/src/main/java/com/discord/utilities/spans/BlockBackgroundSpan.java
@@ -6,6 +6,7 @@ import android.graphics.RectF;
 import android.text.Spanned;
 import android.text.style.LineBackgroundSpan;
 import androidx.annotation.ColorInt;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 /* compiled from: BlockBackgroundSpan.kt */
 public final class BlockBackgroundSpan implements LineBackgroundSpan {
@@ -44,7 +45,7 @@ public final class BlockBackgroundSpan implements LineBackgroundSpan {
     public void drawBackground(Canvas canvas, Paint paint, int i, int i2, int i3, int i4, int i5, CharSequence charSequence, int i6, int i7, int i8) {
         m.checkNotNullParameter(canvas, "canvas");
         m.checkNotNullParameter(paint, "paint");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         if (((Spanned) (!(charSequence instanceof Spanned) ? null : charSequence)) != null) {
             Spanned spanned = (Spanned) charSequence;
             if (spanned.getSpanStart(this) == i6) {
diff --git a/app/src/main/java/com/discord/utilities/spans/BulletSpan.java b/app/src/main/java/com/discord/utilities/spans/BulletSpan.java
index d08bef56c7..76351ae33d 100644
--- a/app/src/main/java/com/discord/utilities/spans/BulletSpan.java
+++ b/app/src/main/java/com/discord/utilities/spans/BulletSpan.java
@@ -7,6 +7,7 @@ import android.graphics.Path;
 import android.text.Layout;
 import android.text.Spanned;
 import android.text.style.LeadingMarginSpan;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: BulletSpan.kt */
@@ -75,7 +76,7 @@ public final class BulletSpan implements LeadingMarginSpan {
     public void drawLeadingMargin(Canvas canvas, Paint paint, int i, int i2, int i3, int i4, int i5, CharSequence charSequence, int i6, int i7, boolean z2, Layout layout) {
         m.checkNotNullParameter(canvas, "c");
         m.checkNotNullParameter(paint, "p");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         m.checkNotNullParameter(layout, "l");
         if (((Spanned) charSequence).getSpanStart(this) == i6) {
             Paint.Style style = paint.getStyle();
diff --git a/app/src/main/java/com/discord/utilities/spans/QuoteSpan.java b/app/src/main/java/com/discord/utilities/spans/QuoteSpan.java
index b6b8201bdd..2cfa6b8564 100644
--- a/app/src/main/java/com/discord/utilities/spans/QuoteSpan.java
+++ b/app/src/main/java/com/discord/utilities/spans/QuoteSpan.java
@@ -9,6 +9,7 @@ import android.text.style.LeadingMarginSpan;
 import androidx.annotation.ColorInt;
 import androidx.annotation.IntRange;
 import androidx.annotation.Px;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 /* compiled from: QuoteSpan.kt */
 public final class QuoteSpan implements LeadingMarginSpan {
@@ -41,7 +42,7 @@ public final class QuoteSpan implements LeadingMarginSpan {
     public void drawLeadingMargin(Canvas canvas, Paint paint, int i, int i2, int i3, int i4, int i5, CharSequence charSequence, int i6, int i7, boolean z2, Layout layout) {
         m.checkNotNullParameter(canvas, "c");
         m.checkNotNullParameter(paint, "p");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         m.checkNotNullParameter(layout, "layout");
         if (charSequence instanceof Spanned) {
             Spanned spanned = (Spanned) charSequence;
diff --git a/app/src/main/java/com/discord/utilities/spans/VerticalPaddingSpan.java b/app/src/main/java/com/discord/utilities/spans/VerticalPaddingSpan.java
index 9625e245c9..8cd251dc6d 100644
--- a/app/src/main/java/com/discord/utilities/spans/VerticalPaddingSpan.java
+++ b/app/src/main/java/com/discord/utilities/spans/VerticalPaddingSpan.java
@@ -3,6 +3,7 @@ package com.discord.utilities.spans;
 import android.graphics.Paint;
 import android.text.Spanned;
 import android.text.style.LineHeightSpan;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 /* compiled from: VerticalPaddingSpan.kt */
 public final class VerticalPaddingSpan implements LineHeightSpan {
@@ -21,7 +22,7 @@ public final class VerticalPaddingSpan implements LineHeightSpan {
 
     @Override // android.text.style.LineHeightSpan
     public void chooseHeight(CharSequence charSequence, int i, int i2, int i3, int i4, Paint.FontMetricsInt fontMetricsInt) {
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         m.checkNotNullParameter(fontMetricsInt, "fontMetrics");
         if (((Spanned) (!(charSequence instanceof Spanned) ? null : charSequence)) != null) {
             if (!this.initialized) {
diff --git a/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java b/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java
index ce20d871c8..11ca4890f7 100644
--- a/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java
+++ b/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java
@@ -3,6 +3,7 @@ package com.discord.utilities.stage;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.stores.StoreChannels;
@@ -33,7 +34,7 @@ public final class StageChannelUtils {
         }
         PermissionUtils permissionUtils = PermissionUtils.INSTANCE;
         Map<Long, GuildMember> map = storeGuilds.getMembers().get(Long.valueOf(j2));
-        return AnimatableValueParser.S0(Long.valueOf(permissionUtils.computeChannelOverwrite(j, j2, map != null ? map.get(Long.valueOf(j)) : null, channel.s())), 268435456);
+        return AnimatableValueParser.S0(Long.valueOf(permissionUtils.computeChannelOverwrite(j, j2, map != null ? map.get(Long.valueOf(j)) : null, channel.s())), Permission.MANAGE_ROLES);
     }
 
     public static /* synthetic */ boolean shouldShowEndStageBottomSheet$default(StageChannelUtils stageChannelUtils, long j, StoreChannels storeChannels, StoreStageChannels storeStageChannels, StoreStageInstances storeStageInstances, StoreUser storeUser, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java b/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java
index 57c432fde7..32bacda1f2 100644
--- a/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java
+++ b/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java
@@ -7,7 +7,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.ViewDialogConfirmationBinding;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -38,7 +40,7 @@ public final class StatefulViews {
         private final Function0<Boolean> hasAnythingChanged;
 
         public FragmentOnBackPressedHandler(Activity activity, Function0<Boolean> function0) {
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(function0, "hasAnythingChanged");
             this.activity = activity;
             this.hasAnythingChanged = function0;
@@ -60,14 +62,14 @@ public final class StatefulViews {
             if (!this.hasAnythingChanged.mo1invoke().booleanValue() || this.discardConfirmed.get()) {
                 return false;
             }
-            ViewDialogConfirmationBinding a = ViewDialogConfirmationBinding.a(LayoutInflater.from(this.activity).inflate(2131558757, (ViewGroup) null, false));
+            ViewDialogConfirmationBinding a = ViewDialogConfirmationBinding.a(LayoutInflater.from(this.activity).inflate(R.layout.view_dialog_confirmation, (ViewGroup) null, false));
             m.checkNotNullExpressionValue(a, "ViewDialogConfirmationBi…tInflater.from(activity))");
             AlertDialog create = new AlertDialog.Builder(this.activity).setView(a.a).create();
             m.checkNotNullExpressionValue(create, "AlertDialog.Builder(acti…logBinding.root).create()");
-            a.d.setText(2131888168);
-            a.e.setText(2131888169);
+            a.d.setText(R.string.discard_changes);
+            a.e.setText(R.string.discard_changes_description);
             a.b.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1(create));
-            a.f1655c.setText(2131892004);
+            a.f1655c.setText(R.string.okay);
             a.f1655c.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2(this, create));
             create.show();
             return true;
diff --git a/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$1.java b/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$1.java
index b8eb170541..438b5d7ca0 100644
--- a/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$1.java
+++ b/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$1.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.stickers;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -27,6 +28,6 @@ public final class StickerUtils$getStickerPackPremiumPriceLabel$1 extends o impl
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, 2131100433));
+        renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, (int) R.color.white));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$2.java b/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$2.java
index affd521bd2..aadebc1f77 100644
--- a/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$2.java
+++ b/app/src/main/java/com/discord/utilities/stickers/StickerUtils$getStickerPackPremiumPriceLabel$2.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.stickers;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -27,6 +28,6 @@ public final class StickerUtils$getStickerPackPremiumPriceLabel$2 extends o impl
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, 2131100433));
+        renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, (int) R.color.white));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java b/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java
index bfe1ebdbe4..e7e6eabe38 100644
--- a/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java
+++ b/app/src/main/java/com/discord/utilities/stickers/StickerUtils.java
@@ -4,13 +4,16 @@ import android.content.Context;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerFormatType;
 import com.discord.api.sticker.StickerType;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelSku;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import com.discord.models.sticker.dto.ModelStickerPackStoreListing;
@@ -373,13 +376,13 @@ public final class StickerUtils {
         TimeUtils timeUtils = TimeUtils.INSTANCE;
         int daysFromMillis = timeUtils.getDaysFromMillis(unpublishedAtDate);
         if (daysFromMillis > 0) {
-            return StringResourceUtilsKt.getI18nPluralString(context, 2131755063, daysFromMillis, Integer.valueOf(daysFromMillis));
+            return StringResourceUtilsKt.getI18nPluralString(context, R.plurals.duration_days_days, daysFromMillis, Integer.valueOf(daysFromMillis));
         }
         int hoursFromMillis = timeUtils.getHoursFromMillis(unpublishedAtDate);
         long j = unpublishedAtDate - (((long) hoursFromMillis) * 3600000);
         int minutesFromMillis = timeUtils.getMinutesFromMillis(j);
         int secondsFromMillis = timeUtils.getSecondsFromMillis(j - (((long) minutesFromMillis) * 60000));
-        return (hoursFromMillis < 0 || minutesFromMillis < 0 || secondsFromMillis < 0) ? b.h(context, 2131893958, new Object[0], null, 4) : b.h(context, 2131888221, new Object[]{a.G(new Object[]{Integer.valueOf(hoursFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.G(new Object[]{Integer.valueOf(minutesFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.G(new Object[]{Integer.valueOf(secondsFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)")}, null, 4);
+        return (hoursFromMillis < 0 || minutesFromMillis < 0 || secondsFromMillis < 0) ? b.h(context, R.string.sticker_picker_pack_expiring_soon, new Object[0], null, 4) : b.h(context, R.string.duration_hours_minutes_seconds, new Object[]{a.G(new Object[]{Integer.valueOf(hoursFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.G(new Object[]{Integer.valueOf(minutesFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.G(new Object[]{Integer.valueOf(secondsFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)")}, null, 4);
     }
 
     public final CharSequence getStickerPackPremiumPriceLabel(Context context, ModelStickerPack modelStickerPack, PremiumTier premiumTier, boolean z2) {
@@ -387,7 +390,7 @@ public final class StickerUtils {
         m.checkNotNullParameter(modelStickerPack, "stickerPack");
         m.checkNotNullParameter(premiumTier, "currentPremiumTier");
         if (z2 && premiumTier != PremiumTier.TIER_2) {
-            return b.h(context, 2131893945, new Object[0], null, 4);
+            return b.h(context, R.string.sticker_pack_premium_cta, new Object[0], null, 4);
         }
         PremiumTier premiumTier2 = PremiumTier.PREMIUM_GUILD_SUBSCRIPTION_ONLY;
         if (premiumTier != premiumTier2) {
@@ -395,22 +398,22 @@ public final class StickerUtils {
             Integer stickerPackPriceForPremiumTier2 = getStickerPackPriceForPremiumTier(modelStickerPack, premiumTier);
             if (!(stickerPackPriceForPremiumTier == null || stickerPackPriceForPremiumTier2 == null || !(!m.areEqual(stickerPackPriceForPremiumTier, stickerPackPriceForPremiumTier2)))) {
                 CharSequence formattedPriceUsd = PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier.intValue(), context);
-                return stickerPackPriceForPremiumTier2.intValue() == 0 ? b.b(context, 2131893952, new Object[]{formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$1(context)) : b.b(context, 2131893953, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier2.intValue(), context), formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$2(context));
+                return stickerPackPriceForPremiumTier2.intValue() == 0 ? b.b(context, R.string.sticker_picker_discounted_free_android, new Object[]{formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$1(context)) : b.b(context, R.string.sticker_picker_discounted_price_android, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier2.intValue(), context), formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$2(context));
             }
         }
         if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier)) {
-            return b.h(context, 2131893946, new Object[0], null, 4);
+            return b.h(context, R.string.sticker_pack_price_free, new Object[0], null, 4);
         }
         PremiumTier premiumTier3 = PremiumTier.TIER_1;
         if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier3) && !PremiumUtils.INSTANCE.isPremiumTierAtLeast(premiumTier, premiumTier3)) {
-            return b.h(context, 2131893947, new Object[0], null, 4);
+            return b.h(context, R.string.sticker_pack_price_free_with_premium_tier_1, new Object[0], null, 4);
         }
         PremiumTier premiumTier4 = PremiumTier.TIER_2;
         if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier4) && !PremiumUtils.INSTANCE.isPremiumTierAtLeast(premiumTier, premiumTier4)) {
-            return b.h(context, 2131893948, new Object[0], null, 4);
+            return b.h(context, R.string.sticker_pack_price_free_with_premium_tier_2, new Object[0], null, 4);
         }
         CharSequence formattedPriceUsd2 = PremiumUtilsKt.getFormattedPriceUsd(getStickerPackPrice(premiumTier4), context);
-        return premiumTier == premiumTier4 ? formattedPriceUsd2 : b.h(context, 2131893966, new Object[]{formattedPriceUsd2}, null, 4);
+        return premiumTier == premiumTier4 ? formattedPriceUsd2 : b.h(context, R.string.sticker_picker_price_with_premium_tier_2, new Object[]{formattedPriceUsd2}, null, 4);
     }
 
     public final StickerSendability getStickerSendability(Sticker sticker, User user, Channel channel, Long l) {
@@ -426,7 +429,7 @@ public final class StickerUtils {
         if (m.areEqual(sticker.e(), Boolean.FALSE)) {
             return StickerSendability.SENDABLE_WITH_PREMIUM_GUILD;
         }
-        return m.areEqual(sticker.g(), channel != null ? Long.valueOf(channel.f()) : null) ? StickerSendability.SENDABLE : (channel == null || AnimatableValueParser.t1(channel) || PermissionUtils.can(137438953472L, l)) ? z2 ? StickerSendability.SENDABLE : StickerSendability.SENDABLE_WITH_PREMIUM : StickerSendability.NONSENDABLE;
+        return m.areEqual(sticker.g(), channel != null ? Long.valueOf(channel.f()) : null) ? StickerSendability.SENDABLE : (channel == null || AnimatableValueParser.t1(channel) || PermissionUtils.can(Permission.USE_EXTERNAL_STICKERS, l)) ? z2 ? StickerSendability.SENDABLE : StickerSendability.SENDABLE_WITH_PREMIUM : StickerSendability.NONSENDABLE;
     }
 
     public final List<Sticker> getStickersForAutocomplete(StoreUser storeUser, StoreGuilds storeGuilds, StoreStickers storeStickers, StoreGuildSelected storeGuildSelected, StoreGuildStickers storeGuildStickers) {
@@ -464,13 +467,13 @@ public final class StickerUtils {
             JSONObject jSONObject = new JSONObject(str).getJSONArray("stickers").getJSONObject(0);
             m.checkNotNullExpressionValue(jSONObject, "JSONObject(data).getJSON…ickers\").getJSONObject(0)");
             try {
-                long parseLong = Long.parseLong(jSONObject.get("id").toString());
+                long parseLong = Long.parseLong(jSONObject.get(ModelAuditLogEntry.CHANGE_KEY_ID).toString());
                 Long valueOf = Long.valueOf(Long.parseLong(jSONObject.get("pack_id").toString()));
-                String string = jSONObject.getString("name");
+                String string = jSONObject.getString(ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullExpressionValue(string, "jsonSticker.getString(\"name\")");
-                String string2 = jSONObject.getString("description");
+                String string2 = jSONObject.getString(ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
                 m.checkNotNullExpressionValue(string2, "jsonSticker.getString(\"description\")");
-                return new Sticker(parseLong, valueOf, Long.valueOf(Long.parseLong(jSONObject.get("guild_id").toString())), string, string2, StickerFormatType.Companion.a(Integer.parseInt(jSONObject.get("format_type").toString())), jSONObject.has("tags") ? jSONObject.get("tags").toString() : "", StickerType.Companion.a(Integer.parseInt(jSONObject.get("type").toString())), null, 256);
+                return new Sticker(parseLong, valueOf, Long.valueOf(Long.parseLong(jSONObject.get(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID).toString())), string, string2, StickerFormatType.Companion.a(Integer.parseInt(jSONObject.get(ModelAuditLogEntry.CHANGE_KEY_FORMAT_TYPE).toString())), jSONObject.has(ModelAuditLogEntry.CHANGE_KEY_TAGS) ? jSONObject.get(ModelAuditLogEntry.CHANGE_KEY_TAGS).toString() : "", StickerType.Companion.a(Integer.parseInt(jSONObject.get("type").toString())), null, 256);
             } catch (JSONException e) {
                 Logger.e$default(AppLog.g, "Error parsing sticker from notification", e, null, 4, null);
                 return null;
diff --git a/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java b/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
index 45c133330e..70235b8102 100644
--- a/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
+++ b/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.streams;
 
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.models.domain.ModelApplicationStream;
 import com.discord.models.guild.Guild;
@@ -79,7 +80,7 @@ public final class StreamContextService$getForUser$1<T, R> implements b<ModelApp
                 return null;
             }
             int B = channel != null ? channel.B() : 0;
-            return new StreamContext(this.$stream, guild, streamPreview, (!(this.$stream instanceof ModelApplicationStream.GuildStream) || PermissionUtils.can(1048576, l) || (channel != null && (channel.h() > j ? 1 : (channel.h() == j ? 0 : -1)) == 0)) ? (!(B > 0 && map.size() >= B) || PermissionUtils.can(16, l)) ? StreamContext.Joinability.CAN_CONNECT : StreamContext.Joinability.VOICE_CHANNEL_FULL : StreamContext.Joinability.MISSING_PERMISSIONS, user, str, activeApplicationStream != null && activeApplicationStream.getState().isStreamActive() && m.areEqual(activeApplicationStream.getStream(), this.$stream), user.getId() == meUser.getId());
+            return new StreamContext(this.$stream, guild, streamPreview, (!(this.$stream instanceof ModelApplicationStream.GuildStream) || PermissionUtils.can(Permission.CONNECT, l) || (channel != null && (channel.h() > j ? 1 : (channel.h() == j ? 0 : -1)) == 0)) ? (!(B > 0 && map.size() >= B) || PermissionUtils.can(16, l)) ? StreamContext.Joinability.CAN_CONNECT : StreamContext.Joinability.VOICE_CHANNEL_FULL : StreamContext.Joinability.MISSING_PERMISSIONS, user, str, activeApplicationStream != null && activeApplicationStream.getState().isStreamActive() && m.areEqual(activeApplicationStream.getStream(), this.$stream), user.getId() == meUser.getId());
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/utilities/string/StringUtilsKt.java b/app/src/main/java/com/discord/utilities/string/StringUtilsKt.java
index 8499a4e2d0..39adec9337 100644
--- a/app/src/main/java/com/discord/utilities/string/StringUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/string/StringUtilsKt.java
@@ -7,6 +7,7 @@ import android.os.Build;
 import c.a.l.b;
 import com.discord.utilities.locale.LocaleManager;
 import com.discord.utils.R;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.t.n;
 import d0.z.d.m;
 import java.net.IDN;
@@ -101,7 +102,7 @@ public final class StringUtilsKt {
         URL url = new URL(str);
         StringBuilder sb = new StringBuilder(new URL(url.getProtocol(), IDN.toASCII(url.getHost(), 1), url.getPort(), url.getFile()).toString());
         if (url.getRef() != null) {
-            sb.append('#');
+            sb.append(MentionUtilsKt.CHANNELS_CHAR);
             sb.append(url.getRef());
         }
         String sb2 = sb.toString();
diff --git a/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java b/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
index 5992157156..52c59163a0 100644
--- a/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
+++ b/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
@@ -78,7 +78,7 @@ public final class SurveyUtils {
             if (application2 == null) {
                 m.throwUninitializedPropertyAccessException("applicationContext");
             }
-            return ClockFactory.get().currentTimeMillis() - packageManager.getPackageInfo(application2.getPackageName(), 0).firstInstallTime >= 604800000;
+            return ClockFactory.get().currentTimeMillis() - packageManager.getPackageInfo(application2.getPackageName(), 0).firstInstallTime >= MIN_APP_INSTALL_TIME;
         } catch (PackageManager.NameNotFoundException unused) {
             return false;
         }
diff --git a/app/src/main/java/com/discord/utilities/system/RemoteIntentService$IpcCallback$handler$1.java b/app/src/main/java/com/discord/utilities/system/RemoteIntentService$IpcCallback$handler$1.java
index d88844b506..d07ea48b2a 100644
--- a/app/src/main/java/com/discord/utilities/system/RemoteIntentService$IpcCallback$handler$1.java
+++ b/app/src/main/java/com/discord/utilities/system/RemoteIntentService$IpcCallback$handler$1.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Process;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.logging.LoggingProvider;
@@ -20,7 +21,7 @@ public final class RemoteIntentService$IpcCallback$handler$1 implements Handler.
 
     @Override // android.os.Handler.Callback
     public final boolean handleMessage(Message message) {
-        m.checkNotNullParameter(message, "msg");
+        m.checkNotNullParameter(message, NotificationCompat.CATEGORY_MESSAGE);
         Logger logger = LoggingProvider.INSTANCE.get();
         if (message.what == 1) {
             StringBuilder H = a.H('[');
diff --git a/app/src/main/java/com/discord/utilities/system/RemoteIntentService.java b/app/src/main/java/com/discord/utilities/system/RemoteIntentService.java
index 7191becc45..6632edee6c 100644
--- a/app/src/main/java/com/discord/utilities/system/RemoteIntentService.java
+++ b/app/src/main/java/com/discord/utilities/system/RemoteIntentService.java
@@ -11,6 +11,7 @@ import android.os.Messenger;
 import android.os.Process;
 import android.util.Log;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.logging.LoggingProvider;
 import com.discord.utilities.time.NtpClock;
@@ -61,10 +62,10 @@ public abstract class RemoteIntentService extends IntentService {
             K.append(cls.getSimpleName());
             K.append(", app pid=");
             K.append(Process.myPid());
-            Logger.d$default(logger, "RemoteIntentService", K.toString(), null, 4, null);
+            Logger.d$default(logger, RemoteIntentService.TAG, K.toString(), null, 4, null);
             Intent intent = new Intent(context, cls);
             Bundle bundle = new Bundle();
-            bundle.putParcelable("com.discord.utilities.analytics.RemoteIntentService.MESSENGER_KEY", ipcCallback.getMessenger());
+            bundle.putParcelable(RemoteIntentService.MESSENGER_KEY, ipcCallback.getMessenger());
             intent.putExtras(bundle);
             context.startService(intent);
         }
@@ -76,7 +77,7 @@ public abstract class RemoteIntentService extends IntentService {
         private final String name;
 
         public IpcCallback(String str, Looper looper) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(looper, "callbackLooper");
             this.name = str;
             this.handler = new Handler(looper, new RemoteIntentService$IpcCallback$handler$1(this));
@@ -98,7 +99,7 @@ public abstract class RemoteIntentService extends IntentService {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public RemoteIntentService(String str) {
         super(str);
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.name = str;
     }
 
@@ -111,7 +112,7 @@ public abstract class RemoteIntentService extends IntentService {
         H.append(this.name);
         H.append("] created, remote pid=");
         H.append(Process.myPid());
-        Log.d("RemoteIntentService", H.toString());
+        Log.d(TAG, H.toString());
     }
 
     @Override // android.app.IntentService, android.app.Service
@@ -119,7 +120,7 @@ public abstract class RemoteIntentService extends IntentService {
         StringBuilder H = a.H('[');
         H.append(this.name);
         H.append("] destroyed");
-        Log.d("RemoteIntentService", H.toString());
+        Log.d(TAG, H.toString());
         super.onDestroy();
     }
 
@@ -130,12 +131,12 @@ public abstract class RemoteIntentService extends IntentService {
         H.append(this.name);
         H.append("] onHandleIntent() start, pid=");
         H.append(Process.myPid());
-        Log.d("RemoteIntentService", H.toString());
+        Log.d(TAG, H.toString());
         if (intent == null) {
             StringBuilder H2 = a.H('[');
             H2.append(this.name);
             H2.append("] null intent");
-            Log.d("RemoteIntentService", H2.toString());
+            Log.d(TAG, H2.toString());
             return;
         }
         NtpClock ntpClock = new NtpClock(c.m.a.a.a(this, null, null, 0, 0, 0, 62));
@@ -148,7 +149,7 @@ public abstract class RemoteIntentService extends IntentService {
             H3.append(this.name);
             H3.append("] doWork returned error: ");
             H3.append(th);
-            Log.e("RemoteIntentService", H3.toString());
+            Log.e(TAG, H3.toString());
         }
         long currentTimeMillis2 = ntpClock.currentTimeMillis() - currentTimeMillis;
         StringBuilder H4 = a.H('[');
@@ -156,12 +157,12 @@ public abstract class RemoteIntentService extends IntentService {
         H4.append("] doWork finished: ");
         H4.append(currentTimeMillis2);
         H4.append(" ms");
-        Log.d("RemoteIntentService", H4.toString());
+        Log.d(TAG, H4.toString());
         Message obtain = Message.obtain();
         obtain.what = 1;
         obtain.arg1 = (int) currentTimeMillis2;
         obtain.obj = th;
-        Messenger messenger = (Messenger) intent.getParcelableExtra("com.discord.utilities.analytics.RemoteIntentService.MESSENGER_KEY");
+        Messenger messenger = (Messenger) intent.getParcelableExtra(MESSENGER_KEY);
         if (messenger != null) {
             messenger.send(obtain);
             return;
@@ -169,6 +170,6 @@ public abstract class RemoteIntentService extends IntentService {
         StringBuilder H5 = a.H('[');
         H5.append(this.name);
         H5.append("] reply-to Messenger not set by caller");
-        Log.e("RemoteIntentService", H5.toString());
+        Log.e(TAG, H5.toString());
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/system/SystemServiceExtensionsKt.java b/app/src/main/java/com/discord/utilities/system/SystemServiceExtensionsKt.java
index 3232753e36..8f0f6a0255 100644
--- a/app/src/main/java/com/discord/utilities/system/SystemServiceExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/system/SystemServiceExtensionsKt.java
@@ -20,7 +20,7 @@ public final class SystemServiceExtensionsKt {
             z2 = false;
         }
         if ((i & 2) != 0) {
-            str = "discord:com.discord.utils";
+            str = TAG;
         }
         return createPartialWakeLock(context, z2, str);
     }
@@ -36,7 +36,7 @@ public final class SystemServiceExtensionsKt {
             z2 = false;
         }
         if ((i & 2) != 0) {
-            str = "discord:com.discord.utils";
+            str = TAG;
         }
         return createProximityScreenWakeLock(context, z2, str);
     }
@@ -61,7 +61,7 @@ public final class SystemServiceExtensionsKt {
             num = null;
         }
         if ((i2 & 8) != 0) {
-            str = "discord:com.discord.utils";
+            str = TAG;
         }
         return createWakeLock(context, i, num, z2, str);
     }
@@ -85,7 +85,7 @@ public final class SystemServiceExtensionsKt {
             i = 3;
         }
         if ((i2 & 4) != 0) {
-            str = "discord:com.discord.utils";
+            str = TAG;
         }
         return createWifiLock(context, z2, i, str);
     }
diff --git a/app/src/main/java/com/discord/utilities/systemlog/DeviceResourceUsageMonitor.java b/app/src/main/java/com/discord/utilities/systemlog/DeviceResourceUsageMonitor.java
index a437d65a70..eaf406dd1c 100644
--- a/app/src/main/java/com/discord/utilities/systemlog/DeviceResourceUsageMonitor.java
+++ b/app/src/main/java/com/discord/utilities/systemlog/DeviceResourceUsageMonitor.java
@@ -4,6 +4,7 @@ import a0.a.a.b;
 import android.system.Os;
 import android.system.OsConstants;
 import c.d.b.a.a;
+import com.discord.api.permission.Permission;
 import com.discord.utilities.systemlog.ProcfsReader;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
@@ -130,8 +131,9 @@ public final class DeviceResourceUsageMonitor implements AutoCloseable {
             k.a aVar4 = k.i;
             l2 = k.m75constructorimpl(l.createFailure(th2));
         }
+        Long valueOf = Long.valueOf((long) Permission.SEND_TTS_MESSAGES);
         if (k.m79isFailureimpl(l2)) {
-            l2 = 4096L;
+            l2 = valueOf;
         }
         SC_PAGE_SIZE = ((Number) l2).longValue();
     }
diff --git a/app/src/main/java/com/discord/utilities/systemlog/SystemLogCapture.java b/app/src/main/java/com/discord/utilities/systemlog/SystemLogCapture.java
index a706e536b0..fd3392f2a3 100644
--- a/app/src/main/java/com/discord/utilities/systemlog/SystemLogCapture.java
+++ b/app/src/main/java/com/discord/utilities/systemlog/SystemLogCapture.java
@@ -37,14 +37,14 @@ public final class SystemLogCapture {
     }
 
     private final void start() {
-        if (!new File("/system/bin/logcat").exists()) {
+        if (!new File(SystemLogUtils.logcatPath).exists()) {
             this.buffer.addLine("Unable to locate '/system/bin/logcat'");
             return;
         }
         while (true) {
             Process process = null;
             try {
-                process = new ProcessBuilder("/system/bin/logcat").redirectErrorStream(true).start();
+                process = new ProcessBuilder(SystemLogUtils.logcatPath).redirectErrorStream(true).start();
                 m.checkNotNullExpressionValue(process, "logcatProcess");
                 InputStream inputStream = process.getInputStream();
                 m.checkNotNullExpressionValue(inputStream, "logcatProcess.inputStream");
diff --git a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils$fetch$1.java b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils$fetch$1.java
index df9576a7df..129636d19e 100644
--- a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils$fetch$1.java
+++ b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils$fetch$1.java
@@ -27,7 +27,7 @@ public final class SystemLogUtils$fetch$1<V> implements Callable<LinkedList<Stri
     public final LinkedList<String> call() {
         Process process = null;
         try {
-            process = new ProcessBuilder("/system/bin/logcat", "-d").redirectErrorStream(true).start();
+            process = new ProcessBuilder(SystemLogUtils.logcatPath, "-d").redirectErrorStream(true).start();
             SystemLogUtils systemLogUtils = SystemLogUtils.INSTANCE;
             m.checkNotNullExpressionValue(process, "logcatProcess");
             SystemLogUtils.access$waitFor(systemLogUtils, process);
diff --git a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
index bf3450dbf2..77f9cde251 100644
--- a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
+++ b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
@@ -1,6 +1,8 @@
 package com.discord.utilities.systemlog;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import com.discord.utilities.debug.DebugPrintableCollection;
 import d0.f0.q;
 import d0.g0.c;
@@ -45,7 +47,7 @@ public final class SystemLogUtils {
         private final String text;
 
         public Tombstone(String str, String str2, String str3, String str4) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(str2, "groupBy");
             m.checkNotNullParameter(str3, "origin");
             m.checkNotNullParameter(str4, "hash");
@@ -88,7 +90,7 @@ public final class SystemLogUtils {
         }
 
         public final Tombstone copy(String str, String str2, String str3, String str4) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(str2, "groupBy");
             m.checkNotNullParameter(str3, "origin");
             m.checkNotNullParameter(str4, "hash");
@@ -166,7 +168,7 @@ public final class SystemLogUtils {
     private final Observable<LinkedList<String>> fetch(Regex regex) {
         LinkedList linkedList = new LinkedList();
         boolean z2 = regex == null;
-        if (!new File("/system/bin/logcat").exists()) {
+        if (!new File(logcatPath).exists()) {
             if (z2) {
                 linkedList.add("Unable to locate '/system/bin/logcat'");
             }
@@ -180,7 +182,7 @@ public final class SystemLogUtils {
     }
 
     private final String hashString(String str) {
-        MessageDigest instance = MessageDigest.getInstance("SHA-1");
+        MessageDigest instance = MessageDigest.getInstance(Constants.SHA1);
         Charset charset = c.a;
         Objects.requireNonNull(str, "null cannot be cast to non-null type java.lang.String");
         byte[] bytes = str.getBytes(charset);
@@ -305,7 +307,7 @@ public final class SystemLogUtils {
                         int length = readLine.length() + 1 + i;
                         try {
                             linkedList.add(readLine);
-                            if (length > 2500000) {
+                            if (length > maxLogSize) {
                                 length -= linkedList.pop().length() - 1;
                             }
                             i = length;
@@ -315,7 +317,7 @@ public final class SystemLogUtils {
                             e.printStackTrace();
                             if (regex == null) {
                             }
-                            if (i > 2500000) {
+                            if (i > maxLogSize) {
                             }
                         }
                     }
@@ -326,11 +328,11 @@ public final class SystemLogUtils {
                 if (regex == null) {
                     linkedList.add("IOException: " + e);
                 }
-                if (i > 2500000) {
+                if (i > maxLogSize) {
                 }
             }
         }
-        if (i > 2500000) {
+        if (i > maxLogSize) {
             linkedList.pop().length();
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java
index 496d459a86..e27c87fbb7 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java
@@ -3,6 +3,7 @@ package com.discord.utilities.textprocessing;
 import a0.a.a.b;
 import android.content.Context;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
@@ -157,7 +158,7 @@ public final class MessageRenderContext implements BasicRenderContext, UserMenti
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ MessageRenderContext(Context context, long j, boolean z2, Map map, Map map2, Map map3, int i, Function3 function3, Function1 function1, int i2, int i3, Function1 function12, Function1 function13, Function1 function14, int i4, DefaultConstructorMarker defaultConstructorMarker) {
-        this(context, j, z2, (i4 & 8) != 0 ? null : map, (i4 & 16) != 0 ? null : map2, (i4 & 32) != 0 ? null : map3, (i4 & 64) != 0 ? 2130968987 : i, (i4 & 128) != 0 ? AnonymousClass1.INSTANCE : function3, (i4 & 256) != 0 ? AnonymousClass2.INSTANCE : function1, (i4 & 512) != 0 ? ColorCompat.getThemedColor(context, 2130970190) : i2, (i4 & 1024) != 0 ? ColorCompat.getThemedColor(context, 2130970191) : i3, (i4 & 2048) != 0 ? null : function12, (i4 & 4096) != 0 ? null : function13, (i4 & 8192) != 0 ? null : function14);
+        this(context, j, z2, (i4 & 8) != 0 ? null : map, (i4 & 16) != 0 ? null : map2, (i4 & 32) != 0 ? null : map3, (i4 & 64) != 0 ? R.attr.colorTextLink : i, (i4 & 128) != 0 ? AnonymousClass1.INSTANCE : function3, (i4 & 256) != 0 ? AnonymousClass2.INSTANCE : function1, (i4 & 512) != 0 ? ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_spoiler_bg) : i2, (i4 & 1024) != 0 ? ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_spoiler_bg_visible) : i3, (i4 & 2048) != 0 ? null : function12, (i4 & 4096) != 0 ? null : function13, (i4 & 8192) != 0 ? null : function14);
     }
 
     public static /* synthetic */ MessageRenderContext copy$default(MessageRenderContext messageRenderContext, Context context, long j, boolean z2, Map map, Map map2, Map map3, int i, Function3 function3, Function1 function1, int i2, int i3, Function1 function12, Function1 function13, Function1 function14, int i4, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.java
index 010d967e40..da33bfc9d9 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getChannelMentionRule$1.java
@@ -7,6 +7,7 @@ import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.parser.ParseSpec;
 import com.discord.simpleast.core.parser.Parser;
 import com.discord.simpleast.core.parser.Rule;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.s;
 import d0.z.d.m;
 import java.util.Map;
@@ -33,7 +34,7 @@ public final class MessageUnparser$getChannelMentionRule$1 extends Rule<T, Node<
         String group = matcher.group(1);
         Channel channel = (Channel) this.$channels.get(Long.valueOf((group == null || (longOrNull = s.toLongOrNull(group)) == null) ? -1 : longOrNull.longValue()));
         if (channel != null) {
-            StringBuilder H = a.H('#');
+            StringBuilder H = a.H(MentionUtilsKt.CHANNELS_CHAR);
             H.append(AnimatableValueParser.y0(channel));
             str = H.toString();
         } else {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.java
index ac8734c7c8..44e2c2c4d8 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getCustomEmojiRule$1.java
@@ -7,6 +7,7 @@ import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.parser.ParseSpec;
 import com.discord.simpleast.core.parser.Parser;
 import com.discord.simpleast.core.parser.Rule;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -28,7 +29,7 @@ public final class MessageUnparser$getCustomEmojiRule$1 extends Rule<T, Node<T>,
         m.checkNotNullParameter(parser, "parser");
         Emoji emoji = this.$emojiSet.emojiIndex.get(matcher.group(3));
         String firstName = emoji != null ? emoji.getFirstName() : matcher.group(2);
-        a aVar = new a(':' + firstName + ':');
+        a aVar = new a(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + firstName + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         m.checkNotNullParameter(aVar, "node");
         return new ParseSpec<>(aVar, s2);
     }
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.java
index 5151bac9f9..b546b00af3 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getRoleMentionRule$1.java
@@ -6,6 +6,7 @@ import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.parser.ParseSpec;
 import com.discord.simpleast.core.parser.Parser;
 import com.discord.simpleast.core.parser.Rule;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.s;
 import d0.z.d.m;
 import java.util.Iterator;
@@ -54,7 +55,7 @@ public final class MessageUnparser$getRoleMentionRule$1 extends Rule<T, Node<T>,
         }
         GuildRole guildRole = (GuildRole) obj;
         if (guildRole != null) {
-            StringBuilder H = a.H('@');
+            StringBuilder H = a.H(MentionUtilsKt.MENTIONS_CHAR);
             H.append(guildRole.f());
             str = H.toString();
         } else {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.java
index c369ad8405..ad556121ca 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser$getUserMentionRule$1.java
@@ -7,6 +7,7 @@ import com.discord.simpleast.core.parser.ParseSpec;
 import com.discord.simpleast.core.parser.Parser;
 import com.discord.simpleast.core.parser.Rule;
 import com.discord.utilities.user.UserUtils;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.s;
 import d0.z.d.m;
 import java.util.Map;
@@ -33,7 +34,7 @@ public final class MessageUnparser$getUserMentionRule$1 extends Rule<T, Node<T>,
         String group = matcher.group(1);
         User user = (User) this.$users.get(Long.valueOf((group == null || (longOrNull = s.toLongOrNull(group)) == null) ? -1 : longOrNull.longValue()));
         if (user != null) {
-            StringBuilder H = a.H('@');
+            StringBuilder H = a.H(MentionUtilsKt.MENTIONS_CHAR);
             H.append(user.getUsername());
             H.append(UserUtils.INSTANCE.getDiscriminatorWithPadding(user));
             str = H.toString();
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.java
index 2ef8ca3f8a..ae0410aa0e 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.textprocessing;
 
 import android.text.SpannableStringBuilder;
 import android.text.style.BackgroundColorSpan;
+import com.discord.R;
 import com.discord.simpleast.code.CodeNode;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
@@ -31,7 +32,7 @@ public final class Rules$createCodeBlockRule$1 extends o implements Function3<Co
             m.checkNotNullParameter(rc, "renderContext");
             int length = spannableStringBuilder.length();
             super.render(spannableStringBuilder, (SpannableStringBuilder) rc);
-            spannableStringBuilder.setSpan(new BackgroundColorSpan(ColorCompat.getThemedColor(rc.getContext(), 2130970174)), length, spannableStringBuilder.length(), 33);
+            spannableStringBuilder.setSpan(new BackgroundColorSpan(ColorCompat.getThemedColor(rc.getContext(), (int) R.attr.theme_chat_code)), length, spannableStringBuilder.length(), 33);
         }
 
         @Override // com.discord.simpleast.core.node.Node.a, com.discord.simpleast.core.node.Node
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$1.java
index cb0e16db17..0e2d671d51 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.textprocessing;
 
 import android.text.style.RelativeSizeSpan;
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.t.n;
@@ -12,7 +13,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$1<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return n.listOf(new TextAppearanceSpan(rc.getContext(), 2131951907), new RelativeSizeSpan(0.85f));
+        return n.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951907_code_textappearance), new RelativeSizeSpan(0.85f));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$1<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$2.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$2.java
index a017f781a5..f396fa3678 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$2.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$2.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.z.d.m;
@@ -10,7 +11,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$2<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), 2131951908));
+        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951908_code_textappearance_comment));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$2<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$3.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$3.java
index f16cfb959e..cfc801bbb7 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$3.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$3.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.z.d.m;
@@ -10,7 +11,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$3<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), 2131951912));
+        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951912_code_textappearance_literal));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$3<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$4.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$4.java
index c0d995e1ff..2a085a4694 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$4.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$4.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.z.d.m;
@@ -10,7 +11,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$4<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), 2131951911));
+        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951911_code_textappearance_keyword));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$4<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$5.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$5.java
index e9bf008fe0..2c9edcc3b2 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$5.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$5.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.z.d.m;
@@ -10,7 +11,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$5<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), 2131951910));
+        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951910_code_textappearance_identifier));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$5<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$6.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$6.java
index 70a66873b2..324f4c2545 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$6.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$6.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.z.d.m;
@@ -10,7 +11,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$6<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), 2131951914));
+        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951914_code_textappearance_types));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$6<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$7.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$7.java
index 497aa069d6..2d8dc56880 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$7.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$7.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.z.d.m;
@@ -10,7 +11,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$7<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), 2131951909));
+        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951909_code_textappearance_generics));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$7<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$8.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$8.java
index df95f40d05..80210b5cd2 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$8.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createCodeBlockRule$codeStyleProviders$8.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.z.d.m;
@@ -10,7 +11,7 @@ public final class Rules$createCodeBlockRule$codeStyleProviders$8<RC> implements
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), 2131951913));
+        return d0.t.m.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951913_code_textappearance_params));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createCodeBlockRule$codeStyleProviders$8<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.java
index 7a658d30fc..375b5918d4 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.textprocessing;
 
 import android.text.style.RelativeSizeSpan;
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
 import d0.t.n;
@@ -12,7 +13,7 @@ public final class Rules$createInlineCodeRule$1<RC> implements StyleNode.a<RC> {
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return n.listOf(new TextAppearanceSpan(rc.getContext(), 2131951907), new RelativeSizeSpan(0.85f));
+        return n.listOf(new TextAppearanceSpan(rc.getContext(), R.style.res_2131951907_code_textappearance), new RelativeSizeSpan(0.85f));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createInlineCodeRule$1<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$2.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$2.java
index d6a08031c3..20de133563 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$2.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createInlineCodeRule$2.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.textprocessing;
 
 import android.text.style.BackgroundColorSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.textprocessing.node.BasicRenderContext;
@@ -11,7 +12,7 @@ public final class Rules$createInlineCodeRule$2<RC> implements StyleNode.a<RC> {
 
     public final Iterable<?> get(RC rc) {
         m.checkNotNullParameter(rc, "it");
-        return d0.t.m.listOf(new BackgroundColorSpan(ColorCompat.getThemedColor(rc.getContext(), 2130970174)));
+        return d0.t.m.listOf(new BackgroundColorSpan(ColorCompat.getThemedColor(rc.getContext(), (int) R.attr.theme_chat_code)));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.Rules$createInlineCodeRule$2<RC> */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules.java
index c5b2fd469b..0cdbe88c3b 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules.java
@@ -53,8 +53,8 @@ public final class Rules {
     private static final Pattern PATTERN_BLOCK_QUOTE = Pattern.compile("^(?: *>>> +(.*)| *>(?!>>) +([^\\n]*\\n?))", 32);
     private static final Pattern PATTERN_CHANNEL_MENTION = Pattern.compile("^<#(\\d+)>");
     private static final Pattern PATTERN_CUSTOM_EMOJI = Pattern.compile("^<(a)?:([a-zA-Z_0-9]+):(\\d+)>");
-    private static final Pattern PATTERN_HOOKED_LINK = Pattern.compile("^\\$\\[((?:\\[[^]]*]|[^]]|](?=[^\\[]*]))*)?]\\(\\s*<?((?:[^\\s\\\\]|\\\\.)*?)>?(?:\\s+['\"]([\\s\\S]*?)['\"])?\\s*\\)");
-    private static final Pattern PATTERN_MASKED_LINK = Pattern.compile("^\\[((?:\\[[^]]*]|[^]]|](?=[^\\[]*]))*)]\\(\\s*<?((?:[^\\s\\\\]|\\\\.)*?)>?(?:\\s+['\"]([\\s\\S]*?)['\"])?\\s*\\)");
+    private static final Pattern PATTERN_HOOKED_LINK = Pattern.compile(HOOKED_LINK);
+    private static final Pattern PATTERN_MASKED_LINK = Pattern.compile(LINK);
     private static final Pattern PATTERN_MENTION = Pattern.compile("^<@!?(\\d+)>|^@(everyone|here)");
     private static final Pattern PATTERN_NAMED_EMOJI = Pattern.compile("^:([^\\s:]+?(?:::skin-tone-\\d)?):");
     private static final Pattern PATTERN_ROLE_MENTION = Pattern.compile("^<@&(\\d+)>");
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/SpannableUtilsKt.java b/app/src/main/java/com/discord/utilities/textprocessing/SpannableUtilsKt.java
index 97b84a7820..0efc9e1205 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/SpannableUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/SpannableUtilsKt.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Typeface;
 import android.text.SpannableStringBuilder;
 import androidx.annotation.AttrRes;
+import androidx.core.app.NotificationCompat;
 import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.spans.TypefaceSpanCompat;
 import d0.z.d.m;
@@ -12,7 +13,7 @@ public final class SpannableUtilsKt {
     public static final void appendWithFont(SpannableStringBuilder spannableStringBuilder, Context context, @AttrRes int i, CharSequence charSequence) {
         m.checkNotNullParameter(spannableStringBuilder, "$this$appendWithFont");
         m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         Typeface themedFont = FontUtils.INSTANCE.getThemedFont(context, i);
         if (themedFont != null) {
             appendWithSpan(spannableStringBuilder, new TypefaceSpanCompat(themedFont), charSequence);
@@ -24,7 +25,7 @@ public final class SpannableUtilsKt {
     public static final void appendWithSpan(SpannableStringBuilder spannableStringBuilder, Object obj, CharSequence charSequence) {
         m.checkNotNullParameter(spannableStringBuilder, "$this$appendWithSpan");
         m.checkNotNullParameter(obj, "span");
-        m.checkNotNullParameter(charSequence, "text");
+        m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         int length = spannableStringBuilder.length();
         spannableStringBuilder.append(charSequence);
         spannableStringBuilder.setSpan(obj, length, spannableStringBuilder.length(), 33);
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.java
index 6951e7551e..6552d122ff 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderClassSpanProvider$1.java
@@ -2,6 +2,7 @@ package com.discord.utilities.textprocessing;
 
 import android.content.Context;
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import com.discord.utilities.spans.VerticalPaddingSpan;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -23,7 +24,7 @@ public final class Spans$createHeaderClassSpanProvider$1 extends o implements Fu
         switch (str.hashCode()) {
             case -1269237627:
                 if (str.equals("changelogSpecial")) {
-                    return new TextAppearanceSpan(this.$context, 2131952026);
+                    return new TextAppearanceSpan(this.$context, R.style.Markdown_Header1_ChangelogSpecial);
                 }
                 break;
             case -1044792121:
@@ -33,22 +34,22 @@ public final class Spans$createHeaderClassSpanProvider$1 extends o implements Fu
                 break;
             case -1001078227:
                 if (str.equals("progress")) {
-                    return new TextAppearanceSpan(this.$context, 2131952029);
+                    return new TextAppearanceSpan(this.$context, R.style.Markdown_Header1_Progress);
                 }
                 break;
             case -419685396:
                 if (str.equals("improved")) {
-                    return new TextAppearanceSpan(this.$context, 2131952028);
+                    return new TextAppearanceSpan(this.$context, R.style.Markdown_Header1_Improved);
                 }
                 break;
             case 92659968:
                 if (str.equals("added")) {
-                    return new TextAppearanceSpan(this.$context, 2131952025);
+                    return new TextAppearanceSpan(this.$context, R.style.Markdown_Header1_Added);
                 }
                 break;
             case 97445748:
                 if (str.equals("fixed")) {
-                    return new TextAppearanceSpan(this.$context, 2131952027);
+                    return new TextAppearanceSpan(this.$context, R.style.Markdown_Header1_Fixed);
                 }
                 break;
         }
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.java
index 7d895d5927..46567d1d97 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Spans$createHeaderStyleSpanProvider$1.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.text.style.CharacterStyle;
 import android.text.style.StyleSpan;
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function1;
 /* compiled from: Spans.kt */
@@ -17,7 +18,7 @@ public final class Spans$createHeaderStyleSpanProvider$1 extends o implements Fu
     }
 
     public final CharacterStyle invoke(int i) {
-        return i != 1 ? i != 4 ? new StyleSpan(3) : new TextAppearanceSpan(this.$context, 2131952030) : new TextAppearanceSpan(this.$context, 2131952024);
+        return i != 1 ? i != 4 ? new StyleSpan(3) : new TextAppearanceSpan(this.$context, R.style.Markdown_Header4) : new TextAppearanceSpan(this.$context, R.style.Markdown_Header1);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Spans$createSpecialHeaderStyleSpanProvider$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Spans$createSpecialHeaderStyleSpanProvider$1.java
index 9ccc71699b..05a7a362b8 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Spans$createSpecialHeaderStyleSpanProvider$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Spans$createSpecialHeaderStyleSpanProvider$1.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.text.style.CharacterStyle;
 import android.text.style.StyleSpan;
 import android.text.style.TextAppearanceSpan;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function1;
 /* compiled from: Spans.kt */
@@ -17,7 +18,7 @@ public final class Spans$createSpecialHeaderStyleSpanProvider$1 extends o implem
     }
 
     public final CharacterStyle invoke(int i) {
-        return i != 1 ? i != 4 ? new StyleSpan(3) : new TextAppearanceSpan(this.$context, 2131952030) : new TextAppearanceSpan(this.$context, 2131952026);
+        return i != 1 ? i != 4 ? new StyleSpan(3) : new TextAppearanceSpan(this.$context, R.style.Markdown_Header4) : new TextAppearanceSpan(this.$context, R.style.Markdown_Header1_ChangelogSpecial);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Spans.java b/app/src/main/java/com/discord/utilities/textprocessing/Spans.java
index 10c015dd50..25461be4ff 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Spans.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Spans.java
@@ -3,6 +3,7 @@ package com.discord.utilities.textprocessing;
 import android.content.Context;
 import android.text.style.CharacterStyle;
 import android.text.style.ParagraphStyle;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.spans.VerticalPaddingSpan;
 import d0.z.d.m;
@@ -19,17 +20,17 @@ public final class Spans {
 
     public final Function0<List<VerticalPaddingSpan>> createChangelogSpecialHeaderPaddingSpansProvider(Context context) {
         m.checkNotNullParameter(context, "context");
-        return new Spans$createChangelogSpecialHeaderPaddingSpansProvider$1(context.getResources().getDimensionPixelSize(2131165467), context.getResources().getDimensionPixelSize(2131165466));
+        return new Spans$createChangelogSpecialHeaderPaddingSpansProvider$1(context.getResources().getDimensionPixelSize(R.dimen.markdown_header_1_changelog_special_top_padding), context.getResources().getDimensionPixelSize(R.dimen.markdown_header_1_bottom_padding));
     }
 
     public final Function1<String, Object> createHeaderClassSpanProvider(Context context) {
         m.checkNotNullParameter(context, "context");
-        return new Spans$createHeaderClassSpanProvider$1(context, context.getResources().getDimensionPixelSize(2131165471));
+        return new Spans$createHeaderClassSpanProvider$1(context, context.getResources().getDimensionPixelSize(R.dimen.markdown_header_class_marginTop));
     }
 
     public final Function0<List<VerticalPaddingSpan>> createHeaderPaddingSpansProvider(Context context) {
         m.checkNotNullParameter(context, "context");
-        return new Spans$createHeaderPaddingSpansProvider$1(context.getResources().getDimensionPixelSize(2131165469), context.getResources().getDimensionPixelSize(2131165466));
+        return new Spans$createHeaderPaddingSpansProvider$1(context.getResources().getDimensionPixelSize(R.dimen.markdown_header_1_top_padding), context.getResources().getDimensionPixelSize(R.dimen.markdown_header_1_bottom_padding));
     }
 
     public final Function1<Integer, CharacterStyle> createHeaderStyleSpanProvider(Context context) {
@@ -39,7 +40,7 @@ public final class Spans {
 
     public final Function0<List<ParagraphStyle>> createMarkdownBulletSpansProvider(Context context) {
         m.checkNotNullParameter(context, "context");
-        return new Spans$createMarkdownBulletSpansProvider$1$1(context.getResources().getDimensionPixelSize(2131165465), context.getResources().getDimensionPixelSize(2131165464), ColorCompat.getThemedColor(context, 2130969008));
+        return new Spans$createMarkdownBulletSpansProvider$1$1(context.getResources().getDimensionPixelSize(R.dimen.markdown_bullet_vertical_padding), context.getResources().getDimensionPixelSize(R.dimen.markdown_bullet_gap), ColorCompat.getThemedColor(context, (int) R.attr.color_brand_500));
     }
 
     public final Function1<Integer, CharacterStyle> createSpecialHeaderStyleSpanProvider(Context context) {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/BlockBackgroundNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/BlockBackgroundNode.java
index 0ce682bbb9..cc7066913a 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/BlockBackgroundNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/BlockBackgroundNode.java
@@ -3,6 +3,7 @@ package com.discord.utilities.textprocessing.node;
 import android.content.Context;
 import android.text.SpannableStringBuilder;
 import android.text.style.LeadingMarginSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.dimen.DimenUtils;
@@ -49,15 +50,15 @@ public final class BlockBackgroundNode<R extends BasicRenderContext> extends Nod
         ensureEndsWithNewline(spannableStringBuilder);
         Context context = r.getContext();
         if (isRevealed()) {
-            spoilerColorRes = ColorCompat.getThemedColor(context, 2130970174);
+            spoilerColorRes = ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_code);
         } else {
             if (!(r instanceof SpoilerNode.RenderContext)) {
                 r = null;
             }
             SpoilerNode.RenderContext renderContext = (SpoilerNode.RenderContext) r;
-            spoilerColorRes = renderContext != null ? renderContext.getSpoilerColorRes() : ColorCompat.getThemedColor(context, 2130970190);
+            spoilerColorRes = renderContext != null ? renderContext.getSpoilerColorRes() : ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_spoiler_bg);
         }
-        spannableStringBuilder.setSpan(new BlockBackgroundSpan(spoilerColorRes, ColorCompat.getThemedColor(context, 2130970175), DimenUtils.dpToPixels(1), DimenUtils.dpToPixels(4), this.inQuote ? BlockQuoteNode.Companion.getTOTAL_LEFT_MARGIN() : 0), length, spannableStringBuilder.length(), 33);
+        spannableStringBuilder.setSpan(new BlockBackgroundSpan(spoilerColorRes, ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_codeblock_border), DimenUtils.dpToPixels(1), DimenUtils.dpToPixels(4), this.inQuote ? BlockQuoteNode.Companion.getTOTAL_LEFT_MARGIN() : 0), length, spannableStringBuilder.length(), 33);
         spannableStringBuilder.setSpan(new LeadingMarginSpan.Standard(15), length, spannableStringBuilder.length(), 33);
         int dpToPixels = DimenUtils.dpToPixels(5);
         spannableStringBuilder.setSpan(new VerticalPaddingSpan(dpToPixels, dpToPixels), length, spannableStringBuilder.length(), 33);
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/BlockQuoteNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/BlockQuoteNode.java
index de4b348b27..582df81c0f 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/BlockQuoteNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/BlockQuoteNode.java
@@ -2,6 +2,7 @@ package com.discord.utilities.textprocessing.node;
 
 import android.text.SpannableStringBuilder;
 import android.text.style.AbsoluteSizeSpan;
+import com.discord.R;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.dimen.DimenUtils;
@@ -62,7 +63,7 @@ public final class BlockQuoteNode<T extends BasicRenderContext> extends Node<T>
         if (spannableStringBuilder.length() == length) {
             spannableStringBuilder.append(' ');
         }
-        spannableStringBuilder.setSpan(new QuoteSpan(ColorCompat.getThemedColor(t.getContext(), 2130970171), STRIPE_WIDTH, GAP_WIDTH), length, spannableStringBuilder.length(), 13107233);
+        spannableStringBuilder.setSpan(new QuoteSpan(ColorCompat.getThemedColor(t.getContext(), (int) R.attr.theme_chat_block_quote_divider), STRIPE_WIDTH, GAP_WIDTH), length, spannableStringBuilder.length(), 13107233);
         spannableStringBuilder.append('\n');
         spannableStringBuilder.setSpan(new AbsoluteSizeSpan(dpToPixels), spannableStringBuilder.length() - 1, spannableStringBuilder.length(), 13107233);
     }
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/ChannelMentionNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/ChannelMentionNode.java
index b97bbdf99e..ea72af5cb5 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/ChannelMentionNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/ChannelMentionNode.java
@@ -6,6 +6,7 @@ import android.text.style.BackgroundColorSpan;
 import android.text.style.CharacterStyle;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
@@ -55,11 +56,11 @@ public final class ChannelMentionNode<T extends RenderContext> extends Node<T> {
         }
         Function1<Long, Unit> channelMentionOnClick = t.getChannelMentionOnClick();
         if (channelMentionOnClick != null) {
-            arrayList.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(context, 2130970186)), false, null, new ChannelMentionNode$render$1(this, channelMentionOnClick), 4, null));
+            arrayList.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_mention_foreground)), false, null, new ChannelMentionNode$render$1(this, channelMentionOnClick), 4, null));
         } else {
-            arrayList.add(new ForegroundColorSpan(ColorCompat.getThemedColor(context, 2130970186)));
+            arrayList.add(new ForegroundColorSpan(ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_mention_foreground)));
         }
-        arrayList.add(new BackgroundColorSpan(ColorCompat.getThemedColor(context, 2130970185)));
+        arrayList.add(new BackgroundColorSpan(ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_mention_background)));
         StringBuilder sb = new StringBuilder();
         m.checkNotNullParameter(Channel.Companion, "$this$DISPLAY_PREFIX_GUILD");
         sb.append("#");
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java
index 818d953b60..dd4b095fea 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java
@@ -5,6 +5,7 @@ import android.text.style.CharacterStyle;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import c.a.u.b.a.a;
+import com.discord.R;
 import com.discord.simpleast.core.node.StyleNode;
 import com.discord.utilities.color.ColorCompat;
 import d0.t.n;
@@ -28,7 +29,7 @@ public final class EditedMessageNode<RC> extends StyleNode<RC, CharacterStyle> {
         }
 
         private final ForegroundColorSpan getForegroundColorSpan(Context context) {
-            return new ForegroundColorSpan(ColorCompat.getThemedColor(context, 2130968989));
+            return new ForegroundColorSpan(ColorCompat.getThemedColor(context, (int) R.attr.colorTextMuted));
         }
 
         private final RelativeSizeSpan getRelativeSizeSpan(float f) {
@@ -44,7 +45,7 @@ public final class EditedMessageNode<RC> extends StyleNode<RC, CharacterStyle> {
 
         public final String getEditedString(Context context) {
             m.checkNotNullParameter(context, "context");
-            String string = context.getString(2131891480);
+            String string = context.getString(R.string.message_edited);
             m.checkNotNullExpressionValue(string, "context.getString(R.string.message_edited)");
             return " (" + string + ')';
         }
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
index 5c07672ff6..d1d7e13de5 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
@@ -7,9 +7,11 @@ import android.text.SpannableStringBuilder;
 import c.a.u.b.a.a;
 import c.f.g.a.a.d;
 import c.f.g.e.v;
+import com.discord.R;
 import com.discord.api.activity.ActivityEmoji;
 import com.discord.api.message.reaction.MessageReactionEmoji;
 import com.discord.app.AppLog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.ModelEmojiCustom;
 import com.discord.models.domain.emoji.ModelEmojiUnicode;
 import com.discord.stores.StoreStream;
@@ -231,7 +233,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Custom(long j, boolean z2, String str) {
                 super(null);
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 this.f2146id = j;
                 this.isAnimated = z2;
                 this.name = str;
@@ -263,7 +265,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             }
 
             public final Custom copy(long j, boolean z2, String str) {
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 return new Custom(j, z2, str);
             }
 
@@ -324,7 +326,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Unicode(String str) {
                 super(null);
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 this.name = str;
             }
 
@@ -340,7 +342,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             }
 
             public final Unicode copy(String str) {
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 return new Unicode(str);
             }
 
@@ -488,12 +490,12 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
         aVar.n = v.l;
         if (!isRevealed()) {
             SpoilerNode.RenderContext renderContext = (SpoilerNode.RenderContext) (!(t instanceof SpoilerNode.RenderContext) ? null : t);
-            aVar.b(new ColorDrawable(renderContext != null ? renderContext.getSpoilerColorRes() : ColorCompat.getThemedColor(context, 2130970190)));
+            aVar.b(new ColorDrawable(renderContext != null ? renderContext.getSpoilerColorRes() : ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_spoiler_bg)));
         }
         int length2 = spannableStringBuilder.length() - 1;
         ((DraweeSpanStringBuilder) spannableStringBuilder).c(context, aVar.a(), a3, length, length2, i, i2, false, i3);
         if (!(getContent().length() == 0)) {
-            ClickableSpan clickableSpan = new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(context, 2130968995)), false, null, new EmojiNode$render$clickableSpan$1(this, t), 4, null);
+            ClickableSpan clickableSpan = new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(context, (int) R.attr.color_brand)), false, null, new EmojiNode$render$clickableSpan$1(this, t), 4, null);
             if (length <= length2) {
                 spannableStringBuilder.setSpan(clickableSpan, length, length2 + 1, 33);
                 return;
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/RoleMentionNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/RoleMentionNode.java
index be1fcd2be0..35d7776d67 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/RoleMentionNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/RoleMentionNode.java
@@ -7,11 +7,13 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import androidx.core.graphics.ColorUtils;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.guilds.RoleUtils;
 import com.discord.utilities.textprocessing.node.RoleMentionNode.RenderContext;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.t.n;
 import d0.z.d.m;
 import java.util.List;
@@ -50,10 +52,10 @@ public final class RoleMentionNode<T extends RenderContext> extends Node<T> {
             spannableStringBuilder.append("deleted-role");
             return;
         }
-        StringBuilder H = a.H('@');
+        StringBuilder H = a.H(MentionUtilsKt.MENTIONS_CHAR);
         H.append(guildRole.f());
         String sb = H.toString();
-        List<Object> listOf = n.listOf(new StyleSpan(1), new ForegroundColorSpan(!RoleUtils.isDefaultColor(guildRole) ? ColorUtils.setAlphaComponent(guildRole.b(), 255) : ColorCompat.getThemedColor(t.getContext(), 2130970186)), new BackgroundColorSpan(!RoleUtils.isDefaultColor(guildRole) ? ColorUtils.setAlphaComponent(guildRole.b(), 25) : ColorCompat.getThemedColor(t.getContext(), 2130970185)));
+        List<Object> listOf = n.listOf(new StyleSpan(1), new ForegroundColorSpan(!RoleUtils.isDefaultColor(guildRole) ? ColorUtils.setAlphaComponent(guildRole.b(), 255) : ColorCompat.getThemedColor(t.getContext(), (int) R.attr.theme_chat_mention_foreground)), new BackgroundColorSpan(!RoleUtils.isDefaultColor(guildRole) ? ColorUtils.setAlphaComponent(guildRole.b(), 25) : ColorCompat.getThemedColor(t.getContext(), (int) R.attr.theme_chat_mention_background)));
         spannableStringBuilder.append((CharSequence) sb);
         for (Object obj : listOf) {
             spannableStringBuilder.setSpan(obj, length, spannableStringBuilder.length(), 33);
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
index d32d17ca18..0d1c66f80f 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
@@ -2,6 +2,7 @@ package com.discord.utilities.textprocessing.node;
 
 import android.content.Context;
 import android.text.SpannableStringBuilder;
+import com.discord.R;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.spans.ClickableSpan;
@@ -49,7 +50,7 @@ public final class SpoilerNode<T extends RenderContext> extends Node<T> implemen
         Object[] objArr = new Object[2];
         objArr[0] = spoilerSpan;
         Function1<SpoilerNode<?>, Unit> spoilerOnClick = t.getSpoilerOnClick();
-        objArr[1] = spoilerOnClick != null ? new ClickableSpan(Integer.valueOf(ColorCompat.getColor(context, 2131100384)), false, null, new SpoilerNode$createStyles$$inlined$let$lambda$1(spoilerOnClick, this, context), 4, null) : null;
+        objArr[1] = spoilerOnClick != null ? new ClickableSpan(Integer.valueOf(ColorCompat.getColor(context, (int) R.color.transparent)), false, null, new SpoilerNode$createStyles$$inlined$let$lambda$1(spoilerOnClick, this, context), 4, null) : null;
         return n.listOfNotNull(objArr);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode.java
index 7411283e0b..2765f799ed 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode.java
@@ -3,6 +3,8 @@ package com.discord.utilities.textprocessing.node;
 import android.text.SpannableStringBuilder;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
+import androidx.exifinterface.media.ExifInterface;
+import com.discord.R;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.spans.ClickableSpan;
@@ -66,7 +68,7 @@ public final class TimestampNode<T extends RenderContext> extends Node<T> {
                                 charSequence = dateFormat.format(date);
                                 m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n  …ORT)\n      }.format(date)");
                             }
-                        } else if (str2.equals("T")) {
+                        } else if (str2.equals(ExifInterface.GPS_DIRECTION_TRUE)) {
                             dateFormat = DateFormat.getTimeInstance(2);
                             charSequence = dateFormat.format(date);
                             m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n  …ORT)\n      }.format(date)");
@@ -100,7 +102,7 @@ public final class TimestampNode<T extends RenderContext> extends Node<T> {
     public void render(SpannableStringBuilder spannableStringBuilder, T t) {
         m.checkNotNullParameter(spannableStringBuilder, "builder");
         m.checkNotNullParameter(t, "renderContext");
-        List<Object> listOf = n.listOf(new ClickableSpan(null, false, null, new TimestampNode$render$styles$1(this, t), 4, null), new BackgroundColorSpan(ColorCompat.getThemedColor(t.getContext(), 2130968900)));
+        List<Object> listOf = n.listOf(new ClickableSpan(null, false, null, new TimestampNode$render$styles$1(this, t), 4, null), new BackgroundColorSpan(ColorCompat.getThemedColor(t.getContext(), (int) R.attr.colorBackgroundModifierAccent)));
         int length = spannableStringBuilder.length();
         spannableStringBuilder.append(this.formatted);
         for (Object obj : listOf) {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/UserMentionNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/UserMentionNode.java
index d653c7fef9..dd05d2c061 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/UserMentionNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/UserMentionNode.java
@@ -7,6 +7,7 @@ import android.text.style.CharacterStyle;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.simpleast.core.node.Node;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.spans.ClickableSpan;
@@ -70,12 +71,12 @@ public final class UserMentionNode<T extends RenderContext> extends Node<T> {
         String sb = K.toString();
         ArrayList<CharacterStyle> arrayList = new ArrayList();
         arrayList.add(new StyleSpan(1));
-        arrayList.add(new BackgroundColorSpan(ColorCompat.getThemedColor(context, 2130970185)));
+        arrayList.add(new BackgroundColorSpan(ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_mention_background)));
         Function1<Long, Unit> userMentionOnClick = t.getUserMentionOnClick();
         if (!containsKey || userMentionOnClick == null) {
-            arrayList.add(new ForegroundColorSpan(ColorCompat.getThemedColor(context, 2130970186)));
+            arrayList.add(new ForegroundColorSpan(ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_mention_foreground)));
         } else {
-            arrayList.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(context, 2130970186)), false, null, new UserMentionNode$renderUserMention$1(this, userMentionOnClick), 4, null));
+            arrayList.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_mention_foreground)), false, null, new UserMentionNode$renderUserMention$1(this, userMentionOnClick), 4, null));
         }
         spannableStringBuilder.append((CharSequence) sb);
         for (CharacterStyle characterStyle : arrayList) {
@@ -102,7 +103,7 @@ public final class UserMentionNode<T extends RenderContext> extends Node<T> {
             renderUserMention(spannableStringBuilder, t);
             return;
         }
-        List<Object> listOf = n.listOf(new StyleSpan(1), new BackgroundColorSpan(ColorCompat.getThemedColor(t.getContext(), 2130970185)), new ForegroundColorSpan(ColorCompat.getThemedColor(t.getContext(), 2130970186)));
+        List<Object> listOf = n.listOf(new StyleSpan(1), new BackgroundColorSpan(ColorCompat.getThemedColor(t.getContext(), (int) R.attr.theme_chat_mention_background)), new ForegroundColorSpan(ColorCompat.getThemedColor(t.getContext(), (int) R.attr.theme_chat_mention_foreground)));
         int length = spannableStringBuilder.length();
         spannableStringBuilder.append((CharSequence) (this.type == Type.HERE ? "@here" : "@everyone"));
         for (Object obj : listOf) {
diff --git a/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java b/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java
index d5935b9c91..b4899955c9 100644
--- a/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java
+++ b/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java
@@ -2,15 +2,19 @@ package com.discord.utilities.threads;
 
 import android.content.Context;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
+import com.discord.api.permission.Permission;
 import com.discord.api.thread.ThreadMetadata;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.guild.Guild;
 import com.discord.models.message.Message;
 import com.discord.models.user.User;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreThreadsActiveJoined;
 import com.discord.stores.StoreThreadsJoined;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.time.Clock;
@@ -38,7 +42,7 @@ public final class ThreadUtils {
     public static final int DEFAULT_AUTO_ARCHIVE_DURATION = 1440;
     public static final ThreadUtils INSTANCE = new ThreadUtils();
     public static final int MAX_DISPLAYED_THREAD_BROWSER_ICON_COUNT = 99;
-    private static final LinkedHashMap<Integer, Integer> THREAD_AUTO_ARCHIVE_DURATION_NAMES = h0.linkedMapOf(o.to(60, 2131886783), o.to(1440, 2131886785), o.to(4320, 2131886786), o.to(10080, 2131886784));
+    private static final LinkedHashMap<Integer, Integer> THREAD_AUTO_ARCHIVE_DURATION_NAMES = h0.linkedMapOf(o.to(60, Integer.valueOf((int) R.string.auto_archive_duration_1_hour)), o.to(1440, Integer.valueOf((int) R.string.auto_archive_duration_24_hours)), o.to(Integer.valueOf((int) ThreadArchiveDurations.THREE_DAYS_IN_MINUTES), Integer.valueOf((int) R.string.auto_archive_duration_3_days)), o.to(Integer.valueOf((int) ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES), Integer.valueOf((int) R.string.auto_archive_duration_1_week)));
 
     /* compiled from: ThreadUtils.kt */
     public static final class ThreadArchiveDurations {
@@ -146,7 +150,7 @@ public final class ThreadUtils {
                 return string;
             }
         }
-        String quantityString = context.getResources().getQuantityString(2131755065, i / 60);
+        String quantityString = context.getResources().getQuantityString(R.plurals.duration_hours_hours, i / 60);
         m.checkNotNullExpressionValue(quantityString, "context.resources.getQua…ours_hours, minutes / 60)");
         return quantityString;
     }
@@ -155,14 +159,14 @@ public final class ThreadUtils {
         if (guild == null || channel == null) {
             return false;
         }
-        return isThreadsEnabled(guild.getId()) && (PermissionUtils.INSTANCE.hasAccessWrite(channel, l) && PermissionUtils.can(68719476736L, l) && PermissionUtils.can(65536, l)) && (AnimatableValueParser.A1(channel) ^ true) && (!z2 || guild.hasFeature(GuildFeature.PRIVATE_THREADS)) && !AnimatableValueParser.d1(channel);
+        return isThreadsEnabled(guild.getId()) && (PermissionUtils.INSTANCE.hasAccessWrite(channel, l) && PermissionUtils.can(Permission.USE_PRIVATE_THREADS, l) && PermissionUtils.can(Permission.READ_MESSAGE_HISTORY, l)) && (AnimatableValueParser.A1(channel) ^ true) && (!z2 || guild.hasFeature(GuildFeature.PRIVATE_THREADS)) && !AnimatableValueParser.d1(channel);
     }
 
     public final boolean canCreatePublicThread(Long l, Channel channel, Message message, Guild guild) {
         if (guild == null || channel == null) {
             return false;
         }
-        return isThreadsEnabled(guild.getId()) && (PermissionUtils.INSTANCE.hasAccessWrite(channel, l) && PermissionUtils.can(34359738368L, l)) && ((message == null || !message.isSystemMessage()) && !AnimatableValueParser.A1(channel) && (message == null || !message.hasThread()));
+        return isThreadsEnabled(guild.getId()) && (PermissionUtils.INSTANCE.hasAccessWrite(channel, l) && PermissionUtils.can(Permission.USE_PUBLIC_THREADS, l)) && ((message == null || !message.isSystemMessage()) && !AnimatableValueParser.A1(channel) && (message == null || !message.hasThread()));
     }
 
     public final boolean canCreateThread(Long l, Channel channel, Message message, Guild guild) {
@@ -173,7 +177,7 @@ public final class ThreadUtils {
         m.checkNotNullParameter(user, "user");
         m.checkNotNullParameter(channel, "channel");
         if (channel.q() != user.getId() || !PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) {
-            return PermissionUtils.can(17179869184L, l) && PermissionUtils.INSTANCE.hasAccess(channel, l);
+            return PermissionUtils.can(Permission.MANAGE_THREADS, l) && PermissionUtils.INSTANCE.hasAccess(channel, l);
         }
         return true;
     }
@@ -181,21 +185,21 @@ public final class ThreadUtils {
     public final boolean canUnarchiveThread(Channel channel, Long l) {
         m.checkNotNullParameter(channel, "channel");
         ThreadMetadata y2 = channel.y();
-        return m.areEqual(y2 != null ? Boolean.valueOf(y2.d()) : null, Boolean.TRUE) ? PermissionUtils.can(17179869184L, l) && PermissionUtils.INSTANCE.hasAccessWrite(channel, l) : PermissionUtils.INSTANCE.hasAccessWrite(channel, l);
+        return m.areEqual(y2 != null ? Boolean.valueOf(y2.d()) : null, Boolean.TRUE) ? PermissionUtils.can(Permission.MANAGE_THREADS, l) && PermissionUtils.INSTANCE.hasAccessWrite(channel, l) : PermissionUtils.INSTANCE.hasAccessWrite(channel, l);
     }
 
     public final boolean canViewAllPrivateThreads(Long l) {
-        return PermissionUtils.can(17179869184L, l) && PermissionUtils.can(65536, l);
+        return PermissionUtils.can(Permission.MANAGE_THREADS, l) && PermissionUtils.can(Permission.READ_MESSAGE_HISTORY, l);
     }
 
     public final boolean canViewAllPublicArchivedThreads(Channel channel, Long l) {
-        return channel != null && PermissionUtils.INSTANCE.hasAccess(channel, l) && PermissionUtils.can(65536, l);
+        return channel != null && PermissionUtils.INSTANCE.hasAccess(channel, l) && PermissionUtils.can(Permission.READ_MESSAGE_HISTORY, l);
     }
 
     public final long computeThreadAutoArchiveTimeMs(Channel channel) {
         String a;
         m.checkNotNullParameter(channel, "channel");
-        long i = (channel.i() >>> 22) + 1420070400000L;
+        long i = (channel.i() >>> 22) + SnowflakeUtils.DISCORD_EPOCH;
         ThreadMetadata y2 = channel.y();
         int c2 = (y2 != null ? y2.c() : 0) * 60 * 1000;
         ThreadMetadata y3 = channel.y();
@@ -221,7 +225,7 @@ public final class ThreadUtils {
     }
 
     public final Observable<Channel> createThread(long j, Long l, int i, String str, Integer num) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         RestAPIParams.ThreadCreationSettings threadCreationSettings = new RestAPIParams.ThreadCreationSettings(str, i, num);
         return l == null ? RestAPI.Companion.getApi().createThread(j, threadCreationSettings) : RestAPI.Companion.getApi().createThreadFromMessage(j, l.longValue(), threadCreationSettings);
     }
@@ -245,7 +249,7 @@ public final class ThreadUtils {
     }
 
     public final boolean isThreadModerator(Long l) {
-        return PermissionUtils.can(17179869184L, l);
+        return PermissionUtils.can(Permission.MANAGE_THREADS, l);
     }
 
     public final boolean isThreadsEnabled(long j) {
diff --git a/app/src/main/java/com/discord/utilities/time/TimeUtils.java b/app/src/main/java/com/discord/utilities/time/TimeUtils.java
index 92706f8e62..3c94feca69 100644
--- a/app/src/main/java/com/discord/utilities/time/TimeUtils.java
+++ b/app/src/main/java/com/discord/utilities/time/TimeUtils.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.text.format.DateUtils;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.locale.LocaleManager;
 import d0.z.d.m;
 import java.text.DateFormat;
@@ -71,14 +73,14 @@ public final class TimeUtils {
     }
 
     public static final long millisToSnowflake(long j) {
-        return (j - 1420070400000L) << 22;
+        return (j - SnowflakeUtils.DISCORD_EPOCH) << 22;
     }
 
     public static final long parseSnowflake(Long l) {
         if (l == null) {
             l = 0L;
         }
-        return (l.longValue() >> 22) + 1420070400000L;
+        return (l.longValue() >> 22) + SnowflakeUtils.DISCORD_EPOCH;
     }
 
     public static final long parseUTCDate(String str) {
@@ -222,7 +224,7 @@ public final class TimeUtils {
     }
 
     public final int getHoursFromMillis(long j) {
-        long j2 = (long) 3600000;
+        long j2 = (long) Constants.ONE_HOUR;
         if (j < j2) {
             return 0;
         }
diff --git a/app/src/main/java/com/discord/utilities/uri/UriHandler$directToPlayStore$1.java b/app/src/main/java/com/discord/utilities/uri/UriHandler$directToPlayStore$1.java
index 3fe2f5c17d..7003b68458 100644
--- a/app/src/main/java/com/discord/utilities/uri/UriHandler$directToPlayStore$1.java
+++ b/app/src/main/java/com/discord/utilities/uri/UriHandler$directToPlayStore$1.java
@@ -1,7 +1,10 @@
 package com.discord.utilities.uri;
 
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function1;
@@ -18,11 +21,11 @@ public final class UriHandler$directToPlayStore$1 extends o implements Function1
     }
 
     public final String invoke(String str) {
-        m.checkNotNullParameter(str, "uri");
-        Uri.Builder appendQueryParameter = Uri.parse(str).buildUpon().appendQueryParameter("id", this.$packageName);
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
+        Uri.Builder appendQueryParameter = Uri.parse(str).buildUpon().appendQueryParameter(ModelAuditLogEntry.CHANGE_KEY_ID, this.$packageName);
         StringBuilder K = a.K("utm_source=");
         K.append(this.$source);
-        String uri = appendQueryParameter.appendQueryParameter("referrer", K.toString()).build().toString();
+        String uri = appendQueryParameter.appendQueryParameter(Constants.REFERRER, K.toString()).build().toString();
         m.checkNotNullExpressionValue(uri, "Uri.parse(uri).buildUpon…ild()\n        .toString()");
         return uri;
     }
diff --git a/app/src/main/java/com/discord/utilities/uri/UriHandler$handleOrUntrusted$notice$1.java b/app/src/main/java/com/discord/utilities/uri/UriHandler$handleOrUntrusted$notice$1.java
index b465f1feba..fe14bab021 100644
--- a/app/src/main/java/com/discord/utilities/uri/UriHandler$handleOrUntrusted$notice$1.java
+++ b/app/src/main/java/com/discord/utilities/uri/UriHandler$handleOrUntrusted$notice$1.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.uri;
 
 import android.os.Bundle;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.g.a;
@@ -26,7 +27,7 @@ public final class UriHandler$handleOrUntrusted$notice$1 extends o implements Fu
     }
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         a.b bVar = a.j;
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
         m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
diff --git a/app/src/main/java/com/discord/utilities/uri/UriHandler.java b/app/src/main/java/com/discord/utilities/uri/UriHandler.java
index ae27840b7f..9ca8754ee3 100644
--- a/app/src/main/java/com/discord/utilities/uri/UriHandler.java
+++ b/app/src/main/java/com/discord/utilities/uri/UriHandler.java
@@ -12,7 +12,9 @@ import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import androidx.browser.customtabs.CustomTabColorSchemeParams;
 import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.app.NotificationCompat;
 import c.a.a.g.a;
+import com.discord.R;
 import com.discord.app.AppTransitionActivity;
 import com.discord.databinding.LayoutUnhandledUriBinding;
 import com.discord.stores.StoreNotices;
@@ -60,7 +62,7 @@ public final class UriHandler {
         m.checkNotNullParameter(str, "packageName");
         m.checkNotNullParameter(str2, "source");
         UriHandler$directToPlayStore$1 uriHandler$directToPlayStore$1 = new UriHandler$directToPlayStore$1(str, str2);
-        INSTANCE.handle(context, uriHandler$directToPlayStore$1.invoke("market://details"), new UriHandler$directToPlayStore$2(context, uriHandler$directToPlayStore$1));
+        INSTANCE.handle(context, uriHandler$directToPlayStore$1.invoke(URL_PLAY_STORE_DIRECT), new UriHandler$directToPlayStore$2(context, uriHandler$directToPlayStore$1));
     }
 
     public static /* synthetic */ void directToPlayStore$default(Context context, String str, String str2, int i, Object obj) {
@@ -125,12 +127,12 @@ public final class UriHandler {
 
     private final void showUnhandledUrlDialog(Context context, String str) {
         AnalyticsTracker.INSTANCE.unhandledUrl(str);
-        View inflate = LayoutInflater.from(context).inflate(2131558550, (ViewGroup) null, false);
-        int i = 2131365612;
-        TextView textView = (TextView) inflate.findViewById(2131365612);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.layout_unhandled_uri, (ViewGroup) null, false);
+        int i = R.id.unhandled_uri_display;
+        TextView textView = (TextView) inflate.findViewById(R.id.unhandled_uri_display);
         if (textView != null) {
-            i = 2131365613;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365613);
+            i = R.id.unhandled_uri_okay;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.unhandled_uri_okay);
             if (materialButton != null) {
                 LinearLayout linearLayout = (LinearLayout) inflate;
                 LayoutUnhandledUriBinding layoutUnhandledUriBinding = new LayoutUnhandledUriBinding(linearLayout, textView, materialButton);
@@ -161,15 +163,15 @@ public final class UriHandler {
             }
             if (StoreStream.Companion.getUserSettings().getIsChromeCustomTabsEnabled()) {
                 AppTransitionActivity.i = true;
-                int themedColor = ColorCompat.getThemedColor(context, 2130968957);
+                int themedColor = ColorCompat.getThemedColor(context, (int) R.attr.colorPrimary);
                 UriHandler$handle$1 uriHandler$handle$1 = new UriHandler$handle$1(context, uri, str, function0);
                 m.checkNotNullParameter(context, "context");
-                m.checkNotNullParameter(uri, "uri");
+                m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
                 m.checkNotNullParameter(uriHandler$handle$1, "onFailure");
                 if (c.a.i.a.a(context) != null) {
                     CustomTabColorSchemeParams build = new CustomTabColorSchemeParams.Builder().setNavigationBarColor(themedColor).setToolbarColor(themedColor).setSecondaryToolbarColor(themedColor).build();
                     m.checkNotNullExpressionValue(build, "CustomTabColorSchemePara…lor)\n            .build()");
-                    CustomTabsIntent build2 = new CustomTabsIntent.Builder().setDefaultColorSchemeParams(build).setShowTitle(false).setStartAnimations(context, 2130771990, 2130771991).setExitAnimations(context, 2130771988, 2130771989).build();
+                    CustomTabsIntent build2 = new CustomTabsIntent.Builder().setDefaultColorSchemeParams(build).setShowTitle(false).setStartAnimations(context, R.anim.activity_slide_horizontal_open_in, R.anim.activity_slide_horizontal_open_out).setExitAnimations(context, R.anim.activity_slide_horizontal_close_in, R.anim.activity_slide_horizontal_close_out).build();
                     m.checkNotNullExpressionValue(build2, "CustomTabsIntent.Builder…sId)\n            .build()");
                     try {
                         Intent intent = build2.intent;
diff --git a/app/src/main/java/com/discord/utilities/user/UserUtils.java b/app/src/main/java/com/discord/utilities/user/UserUtils.java
index f51ba5ebf7..c30ef52167 100644
--- a/app/src/main/java/com/discord/utilities/user/UserUtils.java
+++ b/app/src/main/java/com/discord/utilities/user/UserUtils.java
@@ -5,12 +5,14 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import androidx.annotation.ColorInt;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.user.CoreUser;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
 import com.discord.nullserializable.NullSerializable;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
 import d0.g0.c;
@@ -111,7 +113,7 @@ public final class UserUtils {
     public final long getAgeMs(User user, Clock clock) {
         m.checkNotNullParameter(user, "$this$getAgeMs");
         m.checkNotNullParameter(clock, "clock");
-        return clock.currentTimeMillis() - ((user.getId() >>> 22) + 1420070400000L);
+        return clock.currentTimeMillis() - ((user.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH);
     }
 
     public final String getDiscriminatorWithPadding(User user) {
@@ -142,7 +144,7 @@ public final class UserUtils {
         if (l == null) {
             return null;
         }
-        MessageDigest instance = MessageDigest.getInstance("SHA-256");
+        MessageDigest instance = MessageDigest.getInstance(Constants.SHA256);
         String valueOf = String.valueOf(l.longValue());
         Charset charset = c.a;
         Objects.requireNonNull(valueOf, "null cannot be cast to non-null type java.lang.String");
@@ -180,7 +182,7 @@ public final class UserUtils {
     public final boolean isAccountOldEnough(User user, Clock clock) {
         m.checkNotNullParameter(user, "$this$isAccountOldEnough");
         m.checkNotNullParameter(clock, "clock");
-        return getAgeMs(user, clock) > ((long) 300000);
+        return getAgeMs(user, clock) > ((long) GUILD_VERIFICATION_ACCOUNT_AGE_THRESHOLD);
     }
 
     public final boolean isBugHunterLevel1(User user) {
@@ -231,7 +233,7 @@ public final class UserUtils {
     public final boolean isNewUser(User user, Clock clock) {
         m.checkNotNullParameter(user, "$this$isNewUser");
         m.checkNotNullParameter(clock, "clock");
-        return (user.getId() >>> 22) + 1420070400000L >= clock.currentTimeMillis() - ((long) 604800000);
+        return (user.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH >= clock.currentTimeMillis() - ((long) NEW_USER_THRESHOLD);
     }
 
     public final boolean isPartner(User user) {
@@ -277,7 +279,7 @@ public final class UserUtils {
         m.checkNotNullParameter(user, "$this$since");
         m.checkNotNullParameter(clock, "clock");
         m.checkNotNullParameter(utcDateTime, "date");
-        return new UtcDateTime((user.getId() >>> 22) + 1420070400000L).compareTo(utcDateTime) <= 0;
+        return new UtcDateTime((user.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH).compareTo(utcDateTime) <= 0;
     }
 
     public final com.discord.api.user.User synthesizeApiUser(User user) {
diff --git a/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java b/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java
index ba56821152..34b5b56354 100644
--- a/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java
+++ b/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java
@@ -110,7 +110,7 @@ public final class ViewExtensions {
 
     public static /* synthetic */ void fadeBy$default(View view, boolean z2, long j, int i, Object obj) {
         if ((i & 2) != 0) {
-            j = 350;
+            j = DEFAULT_FADE_MILLIS_RES;
         }
         fadeBy(view, z2, j);
     }
@@ -169,7 +169,7 @@ public final class ViewExtensions {
 
     public static /* synthetic */ void fadeIn$default(View view, long j, Function1 function1, Function1 function12, Function0 function0, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = 350;
+            j = DEFAULT_FADE_MILLIS_RES;
         }
         if ((i & 2) != 0) {
             function1 = ViewExtensions$fadeIn$1.INSTANCE;
@@ -226,7 +226,7 @@ public final class ViewExtensions {
 
     public static /* synthetic */ void fadeOut$default(View view, long j, Function1 function1, Function0 function0, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = 350;
+            j = DEFAULT_FADE_MILLIS_RES;
         }
         if ((i & 2) != 0) {
             function1 = ViewExtensions$fadeOut$1.INSTANCE;
@@ -261,7 +261,7 @@ public final class ViewExtensions {
 
     public static /* synthetic */ void hintWithRipple$default(View view, long j, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = 250;
+            j = HINT_DELAY_MILLIS;
         }
         hintWithRipple(view, j);
     }
diff --git a/app/src/main/java/com/discord/utilities/view/grid/FrameGridLayout.java b/app/src/main/java/com/discord/utilities/view/grid/FrameGridLayout.java
index 1f937157d4..94d401ba9a 100644
--- a/app/src/main/java/com/discord/utilities/view/grid/FrameGridLayout.java
+++ b/app/src/main/java/com/discord/utilities/view/grid/FrameGridLayout.java
@@ -6,6 +6,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 import androidx.annotation.MainThread;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.d.b.a.a;
 import com.discord.utils.R;
 import d0.d0.f;
@@ -417,7 +418,7 @@ public final class FrameGridLayout extends FrameLayout {
     }
 
     private final void measure(View view, PositionSpec positionSpec) {
-        view.measure(View.MeasureSpec.makeMeasureSpec(positionSpec.getWidth(), 1073741824), View.MeasureSpec.makeMeasureSpec(positionSpec.getHeight(), 1073741824));
+        view.measure(View.MeasureSpec.makeMeasureSpec(positionSpec.getWidth(), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(positionSpec.getHeight(), BasicMeasure.EXACTLY));
     }
 
     private final void removeStaleViews() {
diff --git a/app/src/main/java/com/discord/utilities/view/scrolling/NestedScrollableHost.java b/app/src/main/java/com/discord/utilities/view/scrolling/NestedScrollableHost.java
index f447f2b2a8..c1ff9e209c 100644
--- a/app/src/main/java/com/discord/utilities/view/scrolling/NestedScrollableHost.java
+++ b/app/src/main/java/com/discord/utilities/view/scrolling/NestedScrollableHost.java
@@ -8,6 +8,7 @@ import android.view.ViewConfiguration;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 import androidx.viewpager2.widget.ViewPager2;
+import c.a.r.n0.c.e;
 import d0.z.d.m;
 /* compiled from: NestedScrollableHost.kt */
 public final class NestedScrollableHost extends FrameLayout {
@@ -122,7 +123,7 @@ public final class NestedScrollableHost extends FrameLayout {
 
     @Override // android.view.ViewGroup
     public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
-        m.checkNotNullParameter(motionEvent, "e");
+        m.checkNotNullParameter(motionEvent, e.a);
         handleInterceptTouchEvent(motionEvent);
         return super.onInterceptTouchEvent(motionEvent);
     }
diff --git a/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java b/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java
index bed9af3c26..b261d30a13 100644
--- a/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java
+++ b/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java
@@ -13,6 +13,7 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import c.q.a.k.a;
 import com.discord.utilities.logging.Logger;
 import d0.g;
@@ -122,7 +123,7 @@ public final class LinkifiedTextView extends SimpleDraweeSpanTextView {
           (r7v2 kotlin.Pair[])
           (0 ??[int, short, byte, char])
           (wrap: kotlin.Pair : 0x0048: INVOKE  (r8v3 kotlin.Pair) = 
-          ("text")
+          (wrap: java.lang.String : ?: SGET   androidx.core.app.NotificationCompat.MessagingStyle.Message.KEY_TEXT java.lang.String)
           (wrap: java.lang.String : 0x0041: INVOKE  (r8v2 java.lang.String) = (r8v1 java.lang.CharSequence) type: STATIC call: java.lang.String.valueOf(java.lang.Object):java.lang.String)
          type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair)
          */
@@ -135,7 +136,7 @@ public final class LinkifiedTextView extends SimpleDraweeSpanTextView {
         public boolean onTouch(View view, MotionEvent motionEvent) {
             T t;
             m.checkNotNullParameter(view, "view");
-            m.checkNotNullParameter(motionEvent, "event");
+            m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
             TextView textView = (TextView) (!(view instanceof TextView) ? null : view);
             Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef();
             ref$ObjectRef.element = null;
@@ -197,7 +198,7 @@ public final class LinkifiedTextView extends SimpleDraweeSpanTextView {
                     }
                 } catch (IndexOutOfBoundsException e) {
                     Pair[] pairArr = new Pair[8];
-                    pairArr[0] = o.to("text", String.valueOf(textView != null ? textView.getText() : null));
+                    pairArr[0] = o.to(NotificationCompat.MessagingStyle.Message.KEY_TEXT, String.valueOf(textView != null ? textView.getText() : null));
                     pairArr[1] = o.to("view_x", String.valueOf(textView != null ? Float.valueOf(textView.getX()) : null));
                     pairArr[2] = o.to("view_y", String.valueOf(textView != null ? Float.valueOf(textView.getY()) : null));
                     pairArr[3] = o.to("event_x", String.valueOf(motionEvent.getX()));
diff --git a/app/src/main/java/com/discord/utilities/view/validators/Input.java b/app/src/main/java/com/discord/utilities/view/validators/Input.java
index c7f1bdab5d..efb971466a 100644
--- a/app/src/main/java/com/discord/utilities/view/validators/Input.java
+++ b/app/src/main/java/com/discord/utilities/view/validators/Input.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.view.validators;
 
 import android.view.View;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.g0.t;
 import d0.z.d.m;
@@ -17,7 +18,7 @@ public class Input<T extends View> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public EditTextInput(String str, TextInputLayout textInputLayout, InputValidator<? super TextInputLayout>... inputValidatorArr) {
             super(str, textInputLayout, (InputValidator[]) Arrays.copyOf(inputValidatorArr, inputValidatorArr.length));
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(textInputLayout, "view");
             m.checkNotNullParameter(inputValidatorArr, "validators");
         }
@@ -42,7 +43,7 @@ public class Input<T extends View> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GenericInput(String str, T t, InputValidator<? super T> inputValidator, Function2<? super T, ? super CharSequence, Boolean> function2) {
             super(str, t, inputValidator);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(t, "view");
             m.checkNotNullParameter(inputValidator, "validator");
             m.checkNotNullParameter(function2, "onError");
@@ -63,7 +64,7 @@ public class Input<T extends View> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public TextInputLayoutInput(String str, TextInputLayout textInputLayout, InputValidator<? super TextInputLayout>... inputValidatorArr) {
             super(str, textInputLayout, (InputValidator[]) Arrays.copyOf(inputValidatorArr, inputValidatorArr.length));
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(textInputLayout, "view");
             m.checkNotNullParameter(inputValidatorArr, "validators");
         }
@@ -90,7 +91,7 @@ public class Input<T extends View> {
     /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.utilities.view.validators.InputValidator<? super T extends android.view.View>[] */
     /* JADX WARN: Multi-variable type inference failed */
     public Input(String str, T t, InputValidator<? super T>... inputValidatorArr) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(t, "view");
         m.checkNotNullParameter(inputValidatorArr, "validators");
         this.name = str;
diff --git a/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.java b/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.java
index 74116466a9..5ff697a44d 100644
--- a/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.java
+++ b/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.viewcontroller;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -27,7 +28,7 @@ public final class RxViewController$connectViewRx$2 extends o implements Functio
     /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: rx.Subscription */
     /* JADX WARN: Multi-variable type inference failed */
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         this.$subscriptionResult.element = subscription;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java b/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java
index d693ee4158..4ef0ecb434 100644
--- a/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java
+++ b/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.widget.TableRow;
+import com.discord.R;
 import d0.z.d.m;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,7 +56,7 @@ public final class FloatingButtonMenuInitializer {
     }
 
     private final Animator createDefaultMenuRowAnimation(ViewGroup viewGroup, View view) {
-        return viewGroup.getId() == 2131363247 ? this.animatorFactoryFadeIn.createAnimator(viewGroup) : createMenuRowAnimation(viewGroup, this.animatorFactoryFadeIn, getAnimatorFactoryScaleUp(view), this.animatorFactorySlideUp);
+        return viewGroup.getId() == R.id.fab_menu_main ? this.animatorFactoryFadeIn.createAnimator(viewGroup) : createMenuRowAnimation(viewGroup, this.animatorFactoryFadeIn, getAnimatorFactoryScaleUp(view), this.animatorFactorySlideUp);
     }
 
     private final Animator createMenuRowAnimation(ViewGroup viewGroup, AnimatorFactory<? super ViewGroup>... animatorFactoryArr) {
diff --git a/app/src/main/java/com/discord/utilities/views/SimpleRecyclerAdapter.java b/app/src/main/java/com/discord/utilities/views/SimpleRecyclerAdapter.java
index a658cff32c..5c6f97a7dd 100644
--- a/app/src/main/java/com/discord/utilities/views/SimpleRecyclerAdapter.java
+++ b/app/src/main/java/com/discord/utilities/views/SimpleRecyclerAdapter.java
@@ -10,6 +10,7 @@ import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.views.SimpleRecyclerAdapter.ViewHolder;
 import d0.t.n;
@@ -35,7 +36,7 @@ public class SimpleRecyclerAdapter<T, VH extends ViewHolder<T>> extends Recycler
 
         public final void addThemedDivider(RecyclerView recyclerView) {
             m.checkNotNullParameter(recyclerView, "$this$addThemedDivider");
-            int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(recyclerView, 2130968961, 0, 2, (Object) null);
+            int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(recyclerView, (int) R.attr.colorPrimaryDivider, 0, 2, (Object) null);
             Resources resources = recyclerView.getResources();
             Context context = recyclerView.getContext();
             m.checkNotNullExpressionValue(context, "context");
diff --git a/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.java b/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.java
index 2ce82c1c3b..dc605c3af9 100644
--- a/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.java
+++ b/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration$blockClicks$1.java
@@ -1,7 +1,9 @@
 package com.discord.utilities.views;
 
 import android.view.MotionEvent;
+import androidx.core.app.NotificationCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import d0.z.d.m;
 /* compiled from: StickyHeaderItemDecoration.kt */
 public final class StickyHeaderItemDecoration$blockClicks$1 extends RecyclerView.SimpleOnItemTouchListener {
@@ -15,7 +17,7 @@ public final class StickyHeaderItemDecoration$blockClicks$1 extends RecyclerView
     public boolean onInterceptTouchEvent(RecyclerView recyclerView, MotionEvent motionEvent) {
         boolean z2;
         m.checkNotNullParameter(recyclerView, "recyclerView");
-        m.checkNotNullParameter(motionEvent, "event");
+        m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
         int action = motionEvent.getAction();
         if (action == 0) {
             StickyHeaderItemDecoration.access$setActionDownRawX$p(this.this$0, Float.valueOf(motionEvent.getRawX()));
@@ -26,7 +28,7 @@ public final class StickyHeaderItemDecoration$blockClicks$1 extends RecyclerView
             if (!(access$getActionDownRawX$p == null || access$getActionDownRawY$p == null)) {
                 float abs = Math.abs(motionEvent.getRawX() - access$getActionDownRawX$p.floatValue());
                 float abs2 = Math.abs(motionEvent.getRawY() - access$getActionDownRawY$p.floatValue());
-                float dimensionPixelSize = (float) recyclerView.getResources().getDimensionPixelSize(2131165341);
+                float dimensionPixelSize = (float) recyclerView.getResources().getDimensionPixelSize(R.dimen.default_scroll_slop);
                 if (abs < dimensionPixelSize && abs2 < dimensionPixelSize) {
                     z2 = true;
                     StickyHeaderItemDecoration.access$resetActionDownCoordinates(this.this$0);
diff --git a/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration.java b/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration.java
index 7e357c7b35..9a73448801 100644
--- a/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration.java
+++ b/app/src/main/java/com/discord/utilities/views/StickyHeaderItemDecoration.java
@@ -3,6 +3,7 @@ package com.discord.utilities.views;
 import android.graphics.Canvas;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.recyclerview.widget.RecyclerView;
 import d0.z.d.m;
 /* compiled from: StickyHeaderItemDecoration.kt */
@@ -22,7 +23,7 @@ public final class StickyHeaderItemDecoration extends RecyclerView.ItemDecoratio
         public static final void layoutHeaderView(ViewGroup viewGroup, View view) {
             m.checkNotNullParameter(viewGroup, "parent");
             m.checkNotNullParameter(view, "view");
-            int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(viewGroup.getWidth(), 1073741824);
+            int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(viewGroup.getWidth(), BasicMeasure.EXACTLY);
             int makeMeasureSpec2 = View.MeasureSpec.makeMeasureSpec(viewGroup.getHeight(), 0);
             view.measure(ViewGroup.getChildMeasureSpec(makeMeasureSpec, viewGroup.getPaddingRight() + viewGroup.getPaddingLeft(), view.getLayoutParams().width), ViewGroup.getChildMeasureSpec(makeMeasureSpec2, viewGroup.getPaddingBottom() + viewGroup.getPaddingTop(), view.getLayoutParams().height));
             view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
diff --git a/app/src/main/java/com/discord/utilities/voice/CallSoundManager$subscribeToStoreState$1.java b/app/src/main/java/com/discord/utilities/voice/CallSoundManager$subscribeToStoreState$1.java
index e7e3404f35..145a54f060 100644
--- a/app/src/main/java/com/discord/utilities/voice/CallSoundManager$subscribeToStoreState$1.java
+++ b/app/src/main/java/com/discord/utilities/voice/CallSoundManager$subscribeToStoreState$1.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.voice;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class CallSoundManager$subscribeToStoreState$1 extends o implements
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         CallSoundManager.access$setStoreStateSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java b/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
index 41ba2a1353..91da1a6b02 100644
--- a/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
+++ b/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
@@ -327,7 +327,7 @@ public final class CallSoundManager {
         	at jadx.core.codegen.ClassGen.addMethod(ClassGen.java:298)
         	at jadx.core.codegen.ClassGen.lambda$addInnerClsAndMethods$3(ClassGen.java:267)
         	at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183)
-        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
+        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1541)
         	at java.base/java.util.stream.SortedOps$RefSortingSink.end(SortedOps.java:395)
         	at java.base/java.util.stream.Sink$ChainedReference.end(Sink.java:258)
         */
diff --git a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
index c98e575a3d..7406daa061 100644
--- a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
+++ b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
@@ -12,6 +12,7 @@ import c.a.o.d;
 import c.a.z.v;
 import c.a.z.y;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppLog;
 import com.discord.overlay.OverlayManager;
 import com.discord.overlay.OverlayService;
@@ -20,6 +21,7 @@ import com.discord.stores.StoreStream;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.device.DeviceUtils;
 import com.discord.utilities.extensions.PendingIntentExtensionsKt;
+import com.discord.utilities.fcm.NotificationClient;
 import com.discord.utilities.intent.IntentUtils;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -64,7 +66,7 @@ public final class DiscordOverlayService extends OverlayService {
                 try {
                     context.startService(createOverlayIntent(context, str));
                 } catch (Exception e) {
-                    AppLog.g.v("OverlayService", "Overlay request failed.", e);
+                    AppLog.g.v(DiscordOverlayService.LOG_TAG, "Overlay request failed.", e);
                 }
             }
         }
@@ -78,7 +80,7 @@ public final class DiscordOverlayService extends OverlayService {
 
         public final void launchForClose(Context context) {
             m.checkNotNullParameter(context, "context");
-            tryStartOverlayService(context, "com.discord.actions.OVERLAY_CLOSE", false);
+            tryStartOverlayService(context, DiscordOverlayService.ACTION_CLOSE, false);
         }
 
         public final void launchForConnect(Context context) {
@@ -91,17 +93,17 @@ public final class DiscordOverlayService extends OverlayService {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(F), DiscordOverlayService.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$Companion$launchForConnect$2(weakReference), 60, (Object) null);
                 return;
             }
-            o.g(context, 2131892070, 1, null, 8);
+            o.g(context, R.string.overlay_mobile_required, 1, null, 8);
         }
 
         public final void launchForVoice(Context context) {
             m.checkNotNullParameter(context, "context");
-            tryStartOverlayService$default(this, context, "com.discord.actions.OVERLAY_VOICE", false, 4, null);
+            tryStartOverlayService$default(this, context, DiscordOverlayService.ACTION_VOICE, false, 4, null);
         }
 
         public final void launchForVoiceChannelSelect(Context context) {
             m.checkNotNullParameter(context, "context");
-            tryStartOverlayService$default(this, context, "com.discord.actions.OVERLAY_SELECTOR", false, 4, null);
+            tryStartOverlayService$default(this, context, DiscordOverlayService.ACTION_SELECTOR, false, 4, null);
         }
     }
 
@@ -125,13 +127,13 @@ public final class DiscordOverlayService extends OverlayService {
         Context applicationContext = getApplicationContext();
         m.checkNotNullExpressionValue(applicationContext, "applicationContext");
         OverlayMenuBubbleDialog overlayMenuBubbleDialog = new OverlayMenuBubbleDialog(applicationContext);
-        overlayMenuBubbleDialog.getInsetMargins().top = overlayMenuBubbleDialog.getResources().getDimensionPixelOffset(2131165785);
+        overlayMenuBubbleDialog.getInsetMargins().top = overlayMenuBubbleDialog.getResources().getDimensionPixelOffset(R.dimen.vertical_safe_margin);
         overlayMenuBubbleDialog.setOnDialogClosed(new DiscordOverlayService$createMenu$1(this));
         return overlayMenuBubbleDialog;
     }
 
     private final OverlayBubbleWrap createVoiceBubble() {
-        int dimensionPixelOffset = getResources().getDimensionPixelOffset(2131165708);
+        int dimensionPixelOffset = getResources().getDimensionPixelOffset(R.dimen.overlay_safe_margin);
         Context applicationContext = getApplicationContext();
         m.checkNotNullExpressionValue(applicationContext, "applicationContext");
         v vVar = new v(applicationContext);
@@ -162,8 +164,8 @@ public final class DiscordOverlayService extends OverlayService {
 
     @Override // com.discord.overlay.OverlayService
     public Notification createNotification(Intent intent) {
-        PendingIntent service = PendingIntent.getService(this, 1010, Companion.access$createOverlayIntent(Companion, this, "com.discord.actions.OVERLAY_CLOSE"), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728));
-        Notification build = new NotificationCompat.Builder(this, "Media Connections").setCategory("service").setPriority(-2).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231836).setColor(ColorCompat.getColor(this, 2131100254)).setContentTitle(getString(2131892052)).setContentText(getString(2131892071)).setOngoing(true).addAction(2131231565, getString(2131887410), service).addAction(2131231966, getString(2131893590), PendingIntent.getActivity(this, 1010, new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getSelectSettingsVoice()).setPackage(getPackageName()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build();
+        PendingIntent service = PendingIntent.getService(this, 1010, Companion.access$createOverlayIntent(Companion, this, ACTION_CLOSE), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728));
+        Notification build = new NotificationCompat.Builder(this, NotificationClient.NOTIF_CHANNEL_MEDIA_CONNECTIONS).setCategory(NotificationCompat.CATEGORY_SERVICE).setPriority(-2).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(R.drawable.ic_notification_24dp).setColor(ColorCompat.getColor(this, (int) R.color.status_green_600)).setContentTitle(getString(R.string.overlay)).setContentText(getString(R.string.overlay_mobile_toggle_desc)).setOngoing(true).addAction(R.drawable.ic_close_grey_24dp, getString(R.string.close), service).addAction(R.drawable.ic_settings_grey_a60_24dp, getString(R.string.settings), PendingIntent.getActivity(this, 1010, new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getSelectSettingsVoice()).setPackage(getPackageName()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build();
         m.checkNotNullExpressionValue(build, "NotificationCompat.Build…       )\n        .build()");
         return build;
     }
@@ -180,11 +182,11 @@ public final class DiscordOverlayService extends OverlayService {
         int hashCode = action.hashCode();
         if (hashCode != -753952221) {
             if (hashCode != -440170727) {
-                if (hashCode == 557534510 && action.equals("com.discord.actions.OVERLAY_SELECTOR")) {
+                if (hashCode == 557534510 && action.equals(ACTION_SELECTOR)) {
                     return createVoiceSelector();
                 }
                 return null;
-            } else if (!action.equals("com.discord.actions.OVERLAY_OPEN")) {
+            } else if (!action.equals(ACTION_OPEN)) {
                 return null;
             } else {
                 Iterator<T> it = getOverlayManager().j.iterator();
@@ -205,7 +207,7 @@ public final class DiscordOverlayService extends OverlayService {
                 overlayBubbleWrap.performClick();
                 return null;
             }
-        } else if (!action.equals("com.discord.actions.OVERLAY_VOICE")) {
+        } else if (!action.equals(ACTION_VOICE)) {
             return null;
         } else {
             Iterator<T> it2 = getOverlayManager().j.iterator();
@@ -251,11 +253,11 @@ public final class DiscordOverlayService extends OverlayService {
         StringBuilder K = a.K("onStartCommand: ");
         String str = null;
         K.append(intent != null ? intent.getAction() : null);
-        Logger.v$default(appLog, "OverlayService", K.toString(), null, 4, null);
+        Logger.v$default(appLog, LOG_TAG, K.toString(), null, 4, null);
         if (intent != null) {
             str = intent.getAction();
         }
-        if (m.areEqual(str, "com.discord.actions.OVERLAY_CLOSE") || !DeviceUtils.INSTANCE.canDrawOverlays(this)) {
+        if (m.areEqual(str, ACTION_CLOSE) || !DeviceUtils.INSTANCE.canDrawOverlays(this)) {
             stopForeground(true);
             stopSelf(i2);
             return 2;
diff --git a/app/src/main/java/com/discord/utilities/voice/PerceptualVolumeUtils.java b/app/src/main/java/com/discord/utilities/voice/PerceptualVolumeUtils.java
index 9235466bf9..709e9789bc 100644
--- a/app/src/main/java/com/discord/utilities/voice/PerceptualVolumeUtils.java
+++ b/app/src/main/java/com/discord/utilities/voice/PerceptualVolumeUtils.java
@@ -27,13 +27,13 @@ public final class PerceptualVolumeUtils {
             return 0.0f;
         }
         float log10 = ((float) Math.log10((double) (f / f2))) * 20.0f;
-        return f2 * (log10 > 0.0f ? (log10 / 6.0f) + 1.0f : (log10 + 50.0f) / 50.0f);
+        return f2 * (log10 > 0.0f ? (log10 / VOLUME_BOOST_DYNAMIC_RANGE_DB) + 1.0f : (log10 + 50.0f) / 50.0f);
     }
 
     public final float perceptualToAmplitude(float f, float f2) {
         if (f <= 0.0f) {
             return 0.0f;
         }
-        return f2 * ((float) Math.pow((double) 10.0f, (double) ((f > f2 ? ((f - f2) / f2) * 6.0f : ((f / f2) * 50.0f) - 50.0f) / 20.0f)));
+        return f2 * ((float) Math.pow((double) 10.0f, (double) ((f > f2 ? ((f - f2) / f2) * VOLUME_BOOST_DYNAMIC_RANGE_DB : ((f / f2) * 50.0f) - 50.0f) / 20.0f)));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$2.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$2.java
index 83db86f548..432403cd32 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$2.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$2.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.voice;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class ScreenShareManager$startStream$2 extends o implements Functio
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         ScreenShareManager.access$getCompositeSubscription$p(this.this$0).a(subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$2.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$2.java
index 897c5929a1..16b6c7c596 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$2.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$subscribeToStores$2.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.voice;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class ScreenShareManager$subscribeToStores$2 extends o implements F
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         ScreenShareManager.access$getCompositeSubscription$p(this.this$0).a(subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$uploadScreenSharePreviews$2.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$uploadScreenSharePreviews$2.java
index 4c561bf6b1..1d1f945c06 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$uploadScreenSharePreviews$2.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$uploadScreenSharePreviews$2.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.voice;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class ScreenShareManager$uploadScreenSharePreviews$2 extends o impl
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         ScreenShareManager.access$getCompositeSubscription$p(this.this$0).a(subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
index 89b6e14662..09642164a5 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
@@ -281,7 +281,7 @@ public final class ScreenShareManager {
     }
 
     private final ThumbnailEmitter createThumbnailEmitter() {
-        return new ThumbnailEmitter(512, 288, 300000, 5000, null, new ScreenShareManager$createThumbnailEmitter$1(this), 16);
+        return new ThumbnailEmitter(512, THUMBNAIL_HEIGHT_PX, 300000, 5000, null, new ScreenShareManager$createThumbnailEmitter$1(this), 16);
     }
 
     @MainThread
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
index 68a8d06b30..40c6d05bf9 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
@@ -5,6 +5,7 @@ import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildMaxVideoChannelUsers;
 import com.discord.api.guild.GuildVerificationLevel;
+import com.discord.api.permission.Permission;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.models.guild.Guild;
@@ -48,7 +49,7 @@ public final class VoiceChannelJoinabilityUtils {
         if (l2 != null && h == l2.longValue()) {
             return VoiceChannelJoinability.CAN_JOIN;
         }
-        if (!PermissionUtils.can(1048576, l)) {
+        if (!PermissionUtils.can(Permission.CONNECT, l)) {
             return VoiceChannelJoinability.PERMISSIONS_MISSING;
         }
         boolean z3 = true;
@@ -77,7 +78,7 @@ public final class VoiceChannelJoinabilityUtils {
             }
         }
         z2 = false;
-        boolean can = PermissionUtils.can(16777216, l);
+        boolean can = PermissionUtils.can(Permission.MOVE_MEMBERS, l);
         if (size >= (channel.B() != 0 ? channel.B() : Integer.MAX_VALUE) && !can) {
             return VoiceChannelJoinability.CHANNEL_FULL;
         }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
index 3694196b6d..ae5533b430 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
@@ -11,12 +11,14 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.os.PowerManager;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.PointerIconCompat;
 import c.a.e.n;
 import c.d.b.a.a;
 import com.discord.app.AppActivity;
 import com.discord.app.AppComponent;
 import com.discord.app.AppLog;
 import com.discord.utilities.extensions.PendingIntentExtensionsKt;
+import com.discord.utilities.fcm.NotificationClient;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.system.SystemServiceExtensionsKt;
@@ -177,7 +179,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
             m.checkNotNullParameter(charSequence, "title");
             m.checkNotNullParameter(charSequence2, "subtitle");
             try {
-                Logger.v$default(AppLog.g, "DiscordVoiceService", "Bind service connection.", null, 4, null);
+                Logger.v$default(AppLog.g, VoiceEngineForegroundService.LOG_TAG, "Bind service connection.", null, 4, null);
                 Context context = connection.getContext();
                 Intent intent = new Intent(connection.getContext(), VoiceEngineForegroundService.class);
                 intent.setAction("com.discord.utilities.voice.action.start_foreground");
@@ -193,7 +195,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
                 context.startService(intent);
                 connection.getContext().bindService(new Intent(connection.getContext(), VoiceEngineForegroundService.class), connection.getConnection(), 1);
             } catch (Exception e) {
-                AppLog.g.v("DiscordVoiceService", "Unable to bind service connection.", e);
+                AppLog.g.v(VoiceEngineForegroundService.LOG_TAG, "Unable to bind service connection.", e);
             }
         }
 
@@ -211,7 +213,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
             m.checkNotNullParameter(connection, "connection");
             try {
                 if (connection.getService() != null && !connection.isUnbinding()) {
-                    Logger.v$default(AppLog.g, "DiscordVoiceService", "Unbind service connection.", null, 4, null);
+                    Logger.v$default(AppLog.g, VoiceEngineForegroundService.LOG_TAG, "Unbind service connection.", null, 4, null);
                     connection.setUnbinding(true);
                     Context context = connection.getContext();
                     Intent intent = new Intent(connection.getContext(), VoiceEngineForegroundService.class);
@@ -220,7 +222,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
                     connection.getContext().unbindService(connection.getConnection());
                 }
             } catch (Exception e) {
-                AppLog.g.v("DiscordVoiceService", "Unable to unbind service connection.", e);
+                AppLog.g.v(VoiceEngineForegroundService.LOG_TAG, "Unable to unbind service connection.", e);
             }
         }
 
@@ -324,7 +326,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
         if (ackInvitationToSpeak != null) {
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(ackInvitationToSpeak, false, 1, null)), VoiceEngineForegroundService.class, (Context) null, (Function1) null, new VoiceEngineForegroundService$ackStageInvite$1(longExtra), (Function0) null, (Function0) null, new VoiceEngineForegroundService$ackStageInvite$2(this, z2, longExtra), 54, (Object) null);
         } else {
-            Logger.w$default(AppLog.g, "DiscordVoiceService", a.o("Unable to ack stage invite for unknown channel ", longExtra), null, 4, null);
+            Logger.w$default(AppLog.g, LOG_TAG, a.o("Unable to ack stage invite for unknown channel ", longExtra), null, 4, null);
         }
     }
 
@@ -342,7 +344,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
     @Override // android.app.IntentService, android.app.Service
     public void onCreate() {
         super.onCreate();
-        Logger.v$default(AppLog.g, "DiscordVoiceService", "Service created.", null, 4, null);
+        Logger.v$default(AppLog.g, LOG_TAG, "Service created.", null, 4, null);
         n.f47c.a(this);
         Application application = getApplication();
         m.checkNotNullExpressionValue(application, "application");
@@ -356,21 +358,21 @@ public final class VoiceEngineForegroundService extends IntentService implements
         PowerManager.WakeLock createPartialWakeLock$default = SystemServiceExtensionsKt.createPartialWakeLock$default(application2, false, null, 3, null);
         this.wakeLockPartial = createPartialWakeLock$default;
         if (createPartialWakeLock$default != null) {
-            createPartialWakeLock$default.acquire(7200000);
+            createPartialWakeLock$default.acquire(WAKELOCK_TIMEOUT);
         }
         Application application3 = getApplication();
         m.checkNotNullExpressionValue(application3, "application");
         PowerManager.WakeLock createProximityScreenWakeLock$default = SystemServiceExtensionsKt.createProximityScreenWakeLock$default(application3, false, null, 3, null);
         this.wakeLockProximity = createProximityScreenWakeLock$default;
         if (createProximityScreenWakeLock$default != null) {
-            createProximityScreenWakeLock$default.acquire(7200000);
+            createProximityScreenWakeLock$default.acquire(WAKELOCK_TIMEOUT);
         }
     }
 
     @Override // android.app.IntentService, android.app.Service
     public void onDestroy() {
         super.onDestroy();
-        Logger.v$default(AppLog.g, "DiscordVoiceService", "Service destroyed.", null, 4, null);
+        Logger.v$default(AppLog.g, LOG_TAG, "Service destroyed.", null, 4, null);
         StageChannelNotifications.Companion.getINSTANCE().onInviteToSpeakRescinded();
         n.f47c.b(this);
         WifiManager.WifiLock wifiLock = this.wakeLockWifi;
@@ -404,7 +406,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
         Long l;
         if (intent != null && (action = intent.getAction()) != null) {
             m.checkNotNullExpressionValue(action, "intent?.action ?: return");
-            Logger.v$default(AppLog.g, "DiscordVoiceService", a.s("Received action: ", action), null, 4, null);
+            Logger.v$default(AppLog.g, LOG_TAG, a.s("Received action: ", action), null, 4, null);
             switch (action.hashCode()) {
                 case -2024885008:
                     if (action.equals("com.discord.utilities.voice.action.toggle_deafened")) {
@@ -448,7 +450,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
                         if (intent.getBooleanExtra("com.discord.utilities.voice.extra.proximity_lock_enabled", false)) {
                             PowerManager.WakeLock wakeLock = this.wakeLockProximity;
                             if (wakeLock != null) {
-                                wakeLock.acquire(7200000);
+                                wakeLock.acquire(WAKELOCK_TIMEOUT);
                             }
                         } else {
                             PowerManager.WakeLock wakeLock2 = this.wakeLockProximity;
@@ -471,15 +473,15 @@ public final class VoiceEngineForegroundService extends IntentService implements
                             }
                             l = l3;
                             str = "com.discord.utilities.voice.action.toggle_muted";
-                            this.screenShareManager = new ScreenShareManager(this, l3.longValue(), l2, null, null, null, null, null, null, null, 1016, null);
-                            startForeground(101, VoiceEngineNotificationBuilder.INSTANCE.buildNotification(this, "com.discord.utilities.voice.action.main", "com.discord.utilities.voice.action.disconnect", "com.discord.utilities.voice.action.stop_stream", !intent.getBooleanExtra("com.discord.utilities.voice.extra.item_can_speak", true) ? str : null, "com.discord.utilities.voice.action.toggle_deafened", VoiceEngineForegroundService.class, "Media Connections", l == null ? l.longValue() : 0, intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title"), intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title_subtext"), AppActivity.Main.class, intent.getBooleanExtra("com.discord.utilities.voice.extra.item_streaming", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_muted", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_deafened", false)));
+                            this.screenShareManager = new ScreenShareManager(this, l3.longValue(), l2, null, null, null, null, null, null, null, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, null);
+                            startForeground(101, VoiceEngineNotificationBuilder.INSTANCE.buildNotification(this, "com.discord.utilities.voice.action.main", "com.discord.utilities.voice.action.disconnect", "com.discord.utilities.voice.action.stop_stream", !intent.getBooleanExtra("com.discord.utilities.voice.extra.item_can_speak", true) ? str : null, "com.discord.utilities.voice.action.toggle_deafened", VoiceEngineForegroundService.class, NotificationClient.NOTIF_CHANNEL_MEDIA_CONNECTIONS, l == null ? l.longValue() : 0, intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title"), intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title_subtext"), AppActivity.Main.class, intent.getBooleanExtra("com.discord.utilities.voice.extra.item_streaming", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_muted", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_deafened", false)));
                             return;
                         }
                         l = l3;
                         str = "com.discord.utilities.voice.action.toggle_muted";
                         if (!intent.getBooleanExtra("com.discord.utilities.voice.extra.item_can_speak", true)) {
                         }
-                        startForeground(101, VoiceEngineNotificationBuilder.INSTANCE.buildNotification(this, "com.discord.utilities.voice.action.main", "com.discord.utilities.voice.action.disconnect", "com.discord.utilities.voice.action.stop_stream", !intent.getBooleanExtra("com.discord.utilities.voice.extra.item_can_speak", true) ? str : null, "com.discord.utilities.voice.action.toggle_deafened", VoiceEngineForegroundService.class, "Media Connections", l == null ? l.longValue() : 0, intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title"), intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title_subtext"), AppActivity.Main.class, intent.getBooleanExtra("com.discord.utilities.voice.extra.item_streaming", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_muted", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_deafened", false)));
+                        startForeground(101, VoiceEngineNotificationBuilder.INSTANCE.buildNotification(this, "com.discord.utilities.voice.action.main", "com.discord.utilities.voice.action.disconnect", "com.discord.utilities.voice.action.stop_stream", !intent.getBooleanExtra("com.discord.utilities.voice.extra.item_can_speak", true) ? str : null, "com.discord.utilities.voice.action.toggle_deafened", VoiceEngineForegroundService.class, NotificationClient.NOTIF_CHANNEL_MEDIA_CONNECTIONS, l == null ? l.longValue() : 0, intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title"), intent.getCharSequenceExtra("com.discord.utilities.voice.extra.title_subtext"), AppActivity.Main.class, intent.getBooleanExtra("com.discord.utilities.voice.extra.item_streaming", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_muted", false), intent.getBooleanExtra("com.discord.utilities.voice.extra.item_deafened", false)));
                         return;
                     }
                     break;
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java
index becb7ecef9..09f6c97666 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java
@@ -5,6 +5,7 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import androidx.core.app.NotificationCompat;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.extensions.PendingIntentExtensionsKt;
@@ -42,17 +43,17 @@ public final class VoiceEngineNotificationBuilder {
         m.checkNotNullParameter(cls, "notificationServiceClass");
         m.checkNotNullParameter(str6, "notificationChannel");
         m.checkNotNullParameter(cls2, "notificationClass");
-        NotificationCompat.Builder ongoing = new NotificationCompat.Builder(context, str6).setContentTitle(charSequence).setContentText(charSequence2).setColor(ColorCompat.getThemedColor(context, 2130968995)).setColorized(true).setSmallIcon(2131231836).setContentIntent(getCallScreenNavigationIntent(context, j, str, cls2)).setOngoing(true);
-        String string = context.getResources().getString(2131888177);
+        NotificationCompat.Builder ongoing = new NotificationCompat.Builder(context, str6).setContentTitle(charSequence).setContentText(charSequence2).setColor(ColorCompat.getThemedColor(context, (int) R.attr.color_brand)).setColorized(true).setSmallIcon(R.drawable.ic_notification_24dp).setContentIntent(getCallScreenNavigationIntent(context, j, str, cls2)).setOngoing(true);
+        String string = context.getResources().getString(R.string.disconnect_self);
         VoiceEngineNotificationBuilder voiceEngineNotificationBuilder = INSTANCE;
-        ongoing.addAction(new NotificationCompat.Action(2131231485, string, voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str2)));
+        ongoing.addAction(new NotificationCompat.Action((int) R.drawable.ic_call_disconnect_24dp, string, voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str2)));
         if (z2) {
-            ongoing.addAction(new NotificationCompat.Action(2131231805, context.getResources().getString(2131894013), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str3)));
+            ongoing.addAction(new NotificationCompat.Action((int) R.drawable.ic_mobile_screenshare_end_24dp, context.getResources().getString(R.string.stop_streaming), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str3)));
         } else {
             if (str4 != null) {
-                ongoing.addAction(new NotificationCompat.Action(z3 ? 2131231800 : 2131231799, z3 ? context.getResources().getString(2131894504) : context.getResources().getString(2131891618), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str4)));
+                ongoing.addAction(new NotificationCompat.Action(z3 ? R.drawable.ic_mic_white_18dp_muted : R.drawable.ic_mic_white_18dp, z3 ? context.getResources().getString(R.string.unmute) : context.getResources().getString(R.string.mute), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str4)));
             }
-            ongoing.addAction(new NotificationCompat.Action(z4 ? 2131231738 : 2131231737, z4 ? context.getResources().getString(2131894496) : context.getResources().getString(2131888065), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str5)));
+            ongoing.addAction(new NotificationCompat.Action(z4 ? R.drawable.ic_headset_white_18dp_deafened : R.drawable.ic_headset_white_18dp, z4 ? context.getResources().getString(R.string.undeafen) : context.getResources().getString(R.string.deafen), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str5)));
         }
         Notification build = ongoing.build();
         m.checkNotNullExpressionValue(build, "NotificationCompat.Build…     }\n          .build()");
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java
index ebbdbcd173..3a673bec84 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java
@@ -1,6 +1,7 @@
 package com.discord.utilities.voice;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.stores.StoreMediaSettings;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -22,7 +23,7 @@ public final class VoiceEngineServiceController$init$3 extends o implements Func
     public final void mo1invoke() {
         StoreMediaSettings.SelfMuteFailure selfMuteFailure = VoiceEngineServiceController.access$getMediaSettingsStore$p(this.this$0).toggleSelfMuted();
         if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) {
-            c.a.e.o.g(this.$context, 2131894885, 0, null, 12);
+            c.a.e.o.g(this.$context, R.string.vad_permission_small, 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java
index 4293b6b262..7b237b36fd 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java
@@ -2,6 +2,7 @@ package com.discord.utilities.voice;
 
 import android.content.Context;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.rtcconnection.RtcConnection;
 import com.discord.utilities.voice.VoiceEngineServiceController;
 import d0.z.d.m;
@@ -35,7 +36,7 @@ public final class VoiceEngineServiceController$init$4 extends o implements Func
             return;
         }
         Context context = this.$context;
-        VoiceEngineForegroundService.Companion.startForegroundAndBind(VoiceEngineServiceController.access$getServiceBinding$p(this.this$0), b.h(context, 2131887141, new Object[]{b.h(context, notificationData.getStateString(), new Object[0], null, 4)}, null, 4), notificationData.getChannelName(), notificationData.isSelfMuted(), notificationData.isSelfDeafened(), notificationData.isSelfStreaming(), notificationData.getChannelId(), notificationData.getGuildId(), notificationData.getProximityLockEnabled(), notificationData.getCanSpeak());
+        VoiceEngineForegroundService.Companion.startForegroundAndBind(VoiceEngineServiceController.access$getServiceBinding$p(this.this$0), b.h(context, R.string.call_mobile_tap_to_return, new Object[]{b.h(context, notificationData.getStateString(), new Object[0], null, 4)}, null, 4), notificationData.getChannelName(), notificationData.isSelfMuted(), notificationData.isSelfDeafened(), notificationData.isSelfStreaming(), notificationData.getChannelId(), notificationData.getGuildId(), notificationData.getProximityLockEnabled(), notificationData.getCanSpeak());
         if (m.areEqual(notificationData.getRtcConnectionState(), RtcConnection.State.f.a)) {
             DiscordOverlayService.Companion.launchForVoice(this.$context);
         }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
index 835e0f269d..7018d5bcb7 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.rtcconnection.RtcConnection;
 import com.discord.stores.StoreAudioManagerV2;
 import com.discord.stores.StoreMediaSettings;
@@ -77,21 +78,21 @@ public final class VoiceEngineServiceController {
             this.proximityLockEnabled = z6;
             this.canSpeak = z7;
             if (state instanceof RtcConnection.State.d) {
-                i = 2131887558;
+                i = R.string.connection_status_disconnected;
             } else if (m.areEqual(state, RtcConnection.State.b.a)) {
-                i = 2131887555;
+                i = R.string.connection_status_awaiting_endpoint;
             } else if (m.areEqual(state, RtcConnection.State.a.a)) {
-                i = 2131887554;
+                i = R.string.connection_status_authenticating;
             } else if (m.areEqual(state, RtcConnection.State.c.a)) {
-                i = 2131887557;
+                i = R.string.connection_status_connecting;
             } else if (m.areEqual(state, RtcConnection.State.h.a)) {
-                i = 2131887562;
+                i = R.string.connection_status_rtc_disconnected;
             } else if (m.areEqual(state, RtcConnection.State.g.a)) {
-                i = 2131887561;
+                i = R.string.connection_status_rtc_connecting;
             } else if (m.areEqual(state, RtcConnection.State.f.a)) {
-                i = z4 ? 2131887564 : z5 ? 2131887565 : 2131887566;
+                i = z4 ? R.string.connection_status_stream_self_connected : z5 ? R.string.connection_status_video_connected : R.string.connection_status_voice_connected;
             } else if (m.areEqual(state, RtcConnection.State.e.a)) {
-                i = 2131887560;
+                i = R.string.connection_status_no_route;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java b/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java
index e07997b78b..921ecc1a8f 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java
@@ -5,6 +5,7 @@ import android.os.Build;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.rtcconnection.RtcConnection;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.streams.StreamContext;
@@ -51,7 +52,7 @@ public final class VoiceViewUtils {
     }
 
     public final int getCallIndicatorIcon(boolean z2, StreamContext streamContext) {
-        return (streamContext == null || !streamContext.isCurrentUserParticipating()) ? z2 ? 2131232101 : 2131231488 : streamContext.isSelfStream() ? 2131231486 : 2131231487;
+        return (streamContext == null || !streamContext.isCurrentUserParticipating()) ? z2 ? R.drawable.ic_videocam_white_16dp : R.drawable.ic_call_indicator_voice_16dp : streamContext.isSelfStream() ? R.drawable.ic_call_indicator_mobile_screenshare_16dp : R.drawable.ic_call_indicator_streaming_16dp;
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0039: APUT  (r2v1 java.lang.Object[]), (0 ??[int, short, byte, char]), (r3v1 java.lang.String) */
@@ -61,27 +62,27 @@ public final class VoiceViewUtils {
         RtcConnection.State.f fVar = RtcConnection.State.f.a;
         if (state != fVar || streamContext == null || !streamContext.isCurrentUserParticipating()) {
             if (m.areEqual(state, RtcConnection.State.c.a)) {
-                i = 2131887557;
+                i = R.string.connection_status_connecting;
             } else if (m.areEqual(state, RtcConnection.State.e.a)) {
-                i = 2131887560;
+                i = R.string.connection_status_no_route;
             } else if (m.areEqual(state, RtcConnection.State.b.a)) {
-                i = 2131887555;
+                i = R.string.connection_status_awaiting_endpoint;
             } else if (m.areEqual(state, RtcConnection.State.a.a)) {
-                i = 2131887554;
+                i = R.string.connection_status_authenticating;
             } else if (m.areEqual(state, RtcConnection.State.g.a)) {
-                i = 2131887561;
+                i = R.string.connection_status_rtc_connecting;
             } else if (m.areEqual(state, fVar)) {
-                i = z2 ? 2131887565 : 2131887566;
+                i = z2 ? R.string.connection_status_video_connected : R.string.connection_status_voice_connected;
             } else if (!(state instanceof RtcConnection.State.d) && !m.areEqual(state, RtcConnection.State.h.a) && state != null) {
                 throw new NoWhenBranchMatchedException();
             } else {
-                i = 2131887558;
+                i = R.string.connection_status_disconnected;
             }
             String string = context.getString(i);
             m.checkNotNullExpressionValue(string, "context.getString(resId)");
             return string;
         } else if (streamContext.isSelfStream()) {
-            return b.h(context, 2131887564, new Object[0], null, 4);
+            return b.h(context, R.string.connection_status_stream_self_connected, new Object[0], null, 4);
         } else {
             Object[] objArr = new Object[1];
             String userNickname = streamContext.getUserNickname();
@@ -89,7 +90,7 @@ public final class VoiceViewUtils {
                 userNickname = streamContext.getUser().getUsername();
             }
             objArr[0] = userNickname;
-            return b.h(context, 2131887563, objArr, null, 4);
+            return b.h(context, R.string.connection_status_stream_connected, objArr, null, 4);
         }
     }
 
@@ -100,21 +101,21 @@ public final class VoiceViewUtils {
     public final int getConnectionStatusColor(RtcConnection.State state, RtcConnection.Quality quality, Context context) {
         m.checkNotNullParameter(context, "context");
         if (!m.areEqual(state, RtcConnection.State.f.a)) {
-            return (!m.areEqual(state, RtcConnection.State.b.a) && !m.areEqual(state, RtcConnection.State.c.a) && !m.areEqual(state, RtcConnection.State.a.a) && !m.areEqual(state, RtcConnection.State.g.a)) ? m.areEqual(state, RtcConnection.State.e.a) ? ColorCompat.getColor(context, 2131100329) : (!(state instanceof RtcConnection.State.d) && !m.areEqual(state, RtcConnection.State.h.a)) ? ColorCompat.getColor(context, 2131100329) : ColorCompat.getColor(context, 2131100329) : ColorCompat.getColor(context, 2131100356);
+            return (!m.areEqual(state, RtcConnection.State.b.a) && !m.areEqual(state, RtcConnection.State.c.a) && !m.areEqual(state, RtcConnection.State.a.a) && !m.areEqual(state, RtcConnection.State.g.a)) ? m.areEqual(state, RtcConnection.State.e.a) ? ColorCompat.getColor(context, (int) R.color.status_red_500) : (!(state instanceof RtcConnection.State.d) && !m.areEqual(state, RtcConnection.State.h.a)) ? ColorCompat.getColor(context, (int) R.color.status_red_500) : ColorCompat.getColor(context, (int) R.color.status_red_500) : ColorCompat.getColor(context, (int) R.color.status_yellow_500);
         }
         if (quality != null) {
             int ordinal = quality.ordinal();
             if (ordinal != 0) {
                 if (ordinal == 1) {
-                    return ColorCompat.getColor(context, 2131100329);
+                    return ColorCompat.getColor(context, (int) R.color.status_red_500);
                 }
                 if (ordinal == 2) {
-                    return ColorCompat.getColor(context, 2131100356);
+                    return ColorCompat.getColor(context, (int) R.color.status_yellow_500);
                 }
             }
-            return ColorCompat.getColor(context, 2131100254);
+            return ColorCompat.getColor(context, (int) R.color.status_green_600);
         }
-        return ColorCompat.getColor(context, 2131100254);
+        return ColorCompat.getColor(context, (int) R.color.status_green_600);
     }
 
     public final boolean getIsSoundshareSupported() {
@@ -124,15 +125,6 @@ public final class VoiceViewUtils {
     @DrawableRes
     public final int getQualityIndicator(RtcConnection.Quality quality) {
         int ordinal;
-        if (quality == null || (ordinal = quality.ordinal()) == 0) {
-            return 2131232110;
-        }
-        if (ordinal == 1) {
-            return 2131232108;
-        }
-        if (ordinal != 2) {
-            return ordinal != 3 ? 2131232110 : 2131232109;
-        }
-        return 2131232107;
+        return (quality == null || (ordinal = quality.ordinal()) == 0) ? R.drawable.ic_voice_quality_unknown : ordinal != 1 ? ordinal != 2 ? ordinal != 3 ? R.drawable.ic_voice_quality_unknown : R.drawable.ic_voice_quality_fine : R.drawable.ic_voice_quality_average : R.drawable.ic_voice_quality_bad;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/websocket/WebSocket$connect$1.java b/app/src/main/java/com/discord/utilities/websocket/WebSocket$connect$1.java
index 72ffb75fab..5c921ba53d 100644
--- a/app/src/main/java/com/discord/utilities/websocket/WebSocket$connect$1.java
+++ b/app/src/main/java/com/discord/utilities/websocket/WebSocket$connect$1.java
@@ -1,5 +1,7 @@
 package com.discord.utilities.websocket;
 
+import c.a.r.n0.c.e;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.websocket.WebSocket;
 import com.discord.utilities.websocket.ZLibWebSocketListener;
 import d0.o;
@@ -44,14 +46,14 @@ public final class WebSocket$connect$1 extends ZLibWebSocketListener.Listener {
     @Override // okhttp3.WebSocketListener
     public void onClosed(WebSocket webSocket, int i, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         WebSocket.access$schedule(this.this$0, new WebSocket$connect$1$onClosed$1(this, i, str));
     }
 
     @Override // okhttp3.WebSocketListener
     public void onClosing(WebSocket webSocket, int i, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         WebSocket.access$setState$p(this.this$0, WebSocket.State.CLOSING);
         this.this$0.getOnClosed().invoke(new WebSocket.Closed(i, str));
     }
@@ -65,7 +67,7 @@ public final class WebSocket$connect$1 extends ZLibWebSocketListener.Listener {
 
     @Override // com.discord.utilities.websocket.ZLibWebSocketListener.Listener
     public void onInflateError(Exception exc) {
-        m.checkNotNullParameter(exc, "e");
+        m.checkNotNullParameter(exc, e.a);
         handleError$default(this, exc, "Unable to inflate message.", null, 4, null);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/websocket/WebSocket.java b/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
index 41cbb118d4..d0f0c48cd8 100644
--- a/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
+++ b/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
@@ -1,5 +1,6 @@
 package com.discord.utilities.websocket;
 
+import androidx.core.view.PointerIconCompat;
 import d0.z.d.m;
 import f0.f0.k.h;
 import f0.x;
@@ -209,7 +210,7 @@ public final class WebSocket {
 
     private final void handleOnFailure(Throwable th, Response response, boolean z2) {
         if (!z2) {
-            disconnect(1011, "Closing due to failure " + th + ", " + response);
+            disconnect(PointerIconCompat.TYPE_COPY, "Closing due to failure " + th + ", " + response);
         } else {
             this.state = State.CLOSED;
         }
diff --git a/app/src/main/java/com/discord/utilities/websocket/ZLibWebSocketListener.java b/app/src/main/java/com/discord/utilities/websocket/ZLibWebSocketListener.java
index b384be5ba3..e39e8f7e3f 100644
--- a/app/src/main/java/com/discord/utilities/websocket/ZLibWebSocketListener.java
+++ b/app/src/main/java/com/discord/utilities/websocket/ZLibWebSocketListener.java
@@ -1,5 +1,8 @@
 package com.discord.utilities.websocket;
 
+import androidx.core.app.NotificationCompat;
+import com.adjust.sdk.Constants;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.y.b;
 import d0.y.i;
 import d0.z.d.m;
@@ -36,7 +39,7 @@ public final class ZLibWebSocketListener extends WebSocketListener {
         @Override // okhttp3.WebSocketListener
         public final void onMessage(WebSocket webSocket, String str) {
             m.checkNotNullParameter(webSocket, "webSocket");
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             throw new UnsupportedOperationException();
         }
 
@@ -53,7 +56,7 @@ public final class ZLibWebSocketListener extends WebSocketListener {
         public static final Companion Companion = new Companion(null);
         private static final int INFLATE_BUFFER_SIZE = 4096;
         private static final int INITIAL_BUFFER_SIZE_MULTIPLIER = 2;
-        private static final CharsetDecoder UTF8_DECODER = Charset.forName("UTF-8").newDecoder();
+        private static final CharsetDecoder UTF8_DECODER = Charset.forName(Constants.ENCODING).newDecoder();
 
         /* compiled from: ZLibWebSocketListener.kt */
         public static final class Companion {
@@ -97,7 +100,7 @@ public final class ZLibWebSocketListener extends WebSocketListener {
     @Override // okhttp3.WebSocketListener
     public void onClosed(WebSocket webSocket, int i, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         resetInflaters();
         this.listener.onClosed(webSocket, i, str);
     }
@@ -105,7 +108,7 @@ public final class ZLibWebSocketListener extends WebSocketListener {
     @Override // okhttp3.WebSocketListener
     public void onClosing(WebSocket webSocket, int i, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         resetInflaters();
         this.listener.onClosing(webSocket, i, str);
     }
@@ -121,7 +124,7 @@ public final class ZLibWebSocketListener extends WebSocketListener {
     @Override // okhttp3.WebSocketListener
     public void onMessage(WebSocket webSocket, String str) {
         m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         this.listener.onMessage(webSocket, str);
     }
 
diff --git a/app/src/main/java/com/discord/views/ActiveSubscriptionView.java b/app/src/main/java/com/discord/views/ActiveSubscriptionView.java
index db876ae34c..cc3c19903c 100644
--- a/app/src/main/java/com/discord/views/ActiveSubscriptionView.java
+++ b/app/src/main/java/com/discord/views/ActiveSubscriptionView.java
@@ -13,7 +13,9 @@ import androidx.annotation.AttrRes;
 import androidx.annotation.DrawableRes;
 import c.a.j.s1;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.models.domain.ModelSubscription;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.billing.GooglePlaySku;
 import com.discord.utilities.billing.GooglePlaySkuKt;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -30,10 +32,10 @@ public final class ActiveSubscriptionView extends FrameLayout {
 
     /* compiled from: ActiveSubscriptionView.kt */
     public enum ActiveSubscriptionType {
-        PREMIUM_CLASSIC(2130969527, 2131232267, 2131232270, 2131232268, 2131230945, 2131230951, 2131230950),
-        PREMIUM(2130969529, 2131232279, 2131232282, 2131232280, 2131230949, 2131230951, 2131230950),
-        PREMIUM_GUILD(2130969528, 2131232271, 2131232274, 2131232272, 2131230946, 2131230948, 2131230947),
-        PREMIUM_AND_PREMIUM_GUILD(2130969516, 2131232266, 2131232266, 2131232266, 2131230944, 2131230951, 2131230950);
+        PREMIUM_CLASSIC(R.attr.img_premium_classic_subscription_header_logo, R.drawable.img_premium_classic_subscription_header, R.drawable.img_premium_classic_subscription_header_resub, R.drawable.img_premium_classic_subscription_header_error, R.drawable.bg_premium_classic_subscription_header, R.drawable.bg_premium_subscription_header_resub, R.drawable.bg_premium_subscription_header_error),
+        PREMIUM(R.attr.img_premium_subscription_header_logo, R.drawable.img_premium_subscription_header, R.drawable.img_premium_subscription_header_resub, R.drawable.img_premium_subscription_header_error, R.drawable.bg_premium_subscription_header, R.drawable.bg_premium_subscription_header_resub, R.drawable.bg_premium_subscription_header_error),
+        PREMIUM_GUILD(R.attr.img_premium_guild_subscription_header_logo, R.drawable.img_premium_guild_subscription_header, R.drawable.img_premium_guild_subscription_header_resub, R.drawable.img_premium_guild_subscription_header_error, R.drawable.bg_premium_guild_subscription_header, R.drawable.bg_premium_guild_subscription_header_resub, R.drawable.bg_premium_guild_subscription_header_error),
+        PREMIUM_AND_PREMIUM_GUILD(R.attr.img_logo_discord_nitro_and_boost_horizontal, R.drawable.img_premium_and_premium_guild_subscription_header, R.drawable.img_premium_and_premium_guild_subscription_header, R.drawable.img_premium_and_premium_guild_subscription_header, R.drawable.bg_premium_bundle_header, R.drawable.bg_premium_subscription_header_resub, R.drawable.bg_premium_subscription_header_error);
         
         private final int headerBackground;
         private final int headerBackgroundError;
@@ -120,31 +122,31 @@ public final class ActiveSubscriptionView extends FrameLayout {
     public ActiveSubscriptionView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558732, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_active_subscription, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131361892;
-        TextView textView = (TextView) inflate.findViewById(2131361892);
+        int i2 = R.id.active_subscription_cancel_button;
+        TextView textView = (TextView) inflate.findViewById(R.id.active_subscription_cancel_button);
         if (textView != null) {
-            i2 = 2131361893;
-            ImageView imageView = (ImageView) inflate.findViewById(2131361893);
+            i2 = R.id.active_subscription_header_background;
+            ImageView imageView = (ImageView) inflate.findViewById(R.id.active_subscription_header_background);
             if (imageView != null) {
-                i2 = 2131361894;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131361894);
+                i2 = R.id.active_subscription_header_icon;
+                ImageView imageView2 = (ImageView) inflate.findViewById(R.id.active_subscription_header_icon);
                 if (imageView2 != null) {
-                    i2 = 2131361895;
-                    ImageView imageView3 = (ImageView) inflate.findViewById(2131361895);
+                    i2 = R.id.active_subscription_header_logo;
+                    ImageView imageView3 = (ImageView) inflate.findViewById(R.id.active_subscription_header_logo);
                     if (imageView3 != null) {
-                        i2 = 2131361896;
-                        TextView textView2 = (TextView) inflate.findViewById(2131361896);
+                        i2 = R.id.active_subscription_header_text;
+                        TextView textView2 = (TextView) inflate.findViewById(R.id.active_subscription_header_text);
                         if (textView2 != null) {
-                            i2 = 2131361897;
-                            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131361897);
+                            i2 = R.id.active_subscription_manage_premium_guild_button;
+                            MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.active_subscription_manage_premium_guild_button);
                             if (materialButton != null) {
-                                i2 = 2131361898;
-                                ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131361898);
+                                i2 = R.id.active_subscription_progress;
+                                ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.id.active_subscription_progress);
                                 if (progressBar != null) {
-                                    i2 = 2131361899;
-                                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131361899);
+                                    i2 = R.id.active_subscription_top_button;
+                                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.active_subscription_top_button);
                                     if (materialButton2 != null) {
                                         s1 s1Var = new s1((FrameLayout) inflate, textView, imageView, imageView2, imageView3, textView2, materialButton, progressBar, materialButton2);
                                         m.checkNotNullExpressionValue(s1Var, "ViewActiveSubscriptionBi…rom(context), this, true)");
@@ -162,7 +164,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
     }
 
     public static final ActiveSubscriptionType b(ModelSubscription modelSubscription) {
-        m.checkNotNullParameter(modelSubscription, "subscription");
+        m.checkNotNullParameter(modelSubscription, Traits.Payment.Type.SUBSCRIPTION);
         if (modelSubscription.isGoogleSubscription()) {
             String paymentGatewayPlanId = modelSubscription.getPaymentGatewayPlanId();
             GooglePlaySku.Type type = null;
@@ -251,14 +253,14 @@ public final class ActiveSubscriptionView extends FrameLayout {
                 if (ordinal2 != 0) {
                     if (ordinal2 != 1) {
                         if (ordinal2 == 2) {
-                            i5 = 2131892488;
+                            i5 = R.string.premium_guild_subscription_title;
                         } else if (ordinal2 != 3) {
                             throw new NoWhenBranchMatchedException();
                         }
                     }
-                    i5 = 2131892678;
+                    i5 = R.string.premium_tier_2;
                 } else {
-                    i5 = 2131892675;
+                    i5 = R.string.premium_tier_1;
                 }
                 imageView3.setContentDescription(b.j(this, i5, new Object[0], null, 4));
                 TextView textView = this.j.f;
@@ -266,19 +268,19 @@ public final class ActiveSubscriptionView extends FrameLayout {
                 ordinal3 = activeSubscriptionType.ordinal();
                 if (ordinal3 == 0) {
                     int ordinal5 = status.ordinal();
-                    charSequence2 = ordinal5 != 3 ? ordinal5 != 4 ? b.j(this, 2131892638, new Object[]{charSequence}, null, 4) : b.j(this, 2131892639, new Object[]{charSequence}, null, 4) : b.j(this, 2131892642, new Object[]{charSequence}, null, 4);
+                    charSequence2 = ordinal5 != 3 ? ordinal5 != 4 ? b.j(this, R.string.premium_subscription_description_tier_1, new Object[]{charSequence}, null, 4) : b.j(this, R.string.premium_subscription_description_tier_1_account_hold, new Object[]{charSequence}, null, 4) : b.j(this, R.string.premium_subscription_description_tier_1_pending_cancelation, new Object[]{charSequence}, null, 4);
                 } else if (ordinal3 == 1) {
                     int ordinal6 = status.ordinal();
-                    charSequence2 = ordinal6 != 3 ? ordinal6 != 4 ? b.j(this, 2131892644, new Object[]{2, charSequence}, null, 4) : b.j(this, 2131892645, new Object[]{2, charSequence}, null, 4) : b.j(this, 2131892648, new Object[]{2, charSequence}, null, 4);
+                    charSequence2 = ordinal6 != 3 ? ordinal6 != 4 ? b.j(this, R.string.premium_subscription_description_tier_2, new Object[]{2, charSequence}, null, 4) : b.j(this, R.string.premium_subscription_description_tier_2_account_hold, new Object[]{2, charSequence}, null, 4) : b.j(this, R.string.premium_subscription_description_tier_2_pending_cancelation, new Object[]{2, charSequence}, null, 4);
                 } else if (ordinal3 == 2) {
                     Context context = getContext();
                     m.checkNotNullExpressionValue(context, "context");
-                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755289, i2, Integer.valueOf(i2));
+                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, R.plurals.premium_guild_subscriptions_renewal_info_quantity, i2, Integer.valueOf(i2));
                     int ordinal7 = status.ordinal();
-                    charSequence2 = ordinal7 != 3 ? ordinal7 != 4 ? b.j(this, 2131892502, new Object[]{String.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.j(this, 2131892500, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.j(this, 2131892505, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4);
+                    charSequence2 = ordinal7 != 3 ? ordinal7 != 4 ? b.j(this, R.string.premium_guild_subscriptions_renewal_info_android, new Object[]{String.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.j(this, R.string.premium_guild_subscriptions_renewal_info_account_hold, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.j(this, R.string.premium_guild_subscriptions_renewal_info_pending_cancelation_android, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4);
                 } else if (ordinal3 == 3) {
                     int ordinal8 = status.ordinal();
-                    charSequence2 = ordinal8 != 3 ? ordinal8 != 4 ? b.j(this, 2131892644, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.j(this, 2131892645, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.j(this, 2131892648, new Object[]{Integer.valueOf(i2), charSequence}, null, 4);
+                    charSequence2 = ordinal8 != 3 ? ordinal8 != 4 ? b.j(this, R.string.premium_subscription_description_tier_2, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.j(this, R.string.premium_subscription_description_tier_2_account_hold, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.j(this, R.string.premium_subscription_description_tier_2_pending_cancelation, new Object[]{Integer.valueOf(i2), charSequence}, null, 4);
                 } else {
                     throw new NoWhenBranchMatchedException();
                 }
@@ -291,7 +293,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
                 textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8);
                 MaterialButton materialButton2 = this.j.i;
                 int ordinal9 = status.ordinal();
-                materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892670 : 2131886917 : 2131893032);
+                materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? R.string.premium_switch_plans : R.string.billing_manage_billing : R.string.resubscribe);
                 this.j.i.setOnClickListener(new a(0, function0));
                 MaterialButton materialButton3 = this.j.i;
                 m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton");
@@ -335,7 +337,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
             textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8);
             MaterialButton materialButton2 = this.j.i;
             int ordinal9 = status.ordinal();
-            materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892670 : 2131886917 : 2131893032);
+            materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? R.string.premium_switch_plans : R.string.billing_manage_billing : R.string.resubscribe);
             this.j.i.setOnClickListener(new a(0, function0));
             MaterialButton materialButton3 = this.j.i;
             m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton");
@@ -384,7 +386,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
         textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8);
         MaterialButton materialButton2 = this.j.i;
         int ordinal9 = status.ordinal();
-        materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892670 : 2131886917 : 2131893032);
+        materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? R.string.premium_switch_plans : R.string.billing_manage_billing : R.string.resubscribe);
         this.j.i.setOnClickListener(new a(0, function0));
         MaterialButton materialButton3 = this.j.i;
         m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton");
diff --git a/app/src/main/java/com/discord/views/ChatActionItem.java b/app/src/main/java/com/discord/views/ChatActionItem.java
index cada65b771..dea3d432dd 100644
--- a/app/src/main/java/com/discord/views/ChatActionItem.java
+++ b/app/src/main/java/com/discord/views/ChatActionItem.java
@@ -18,12 +18,12 @@ public final class ChatActionItem extends CardView {
     public ChatActionItem(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558742, this);
-        int i = 2131362476;
-        ImageView imageView = (ImageView) findViewById(2131362476);
+        LayoutInflater.from(getContext()).inflate(R.layout.view_chat_action_item, this);
+        int i = R.id.chat_action_item_image;
+        ImageView imageView = (ImageView) findViewById(R.id.chat_action_item_image);
         if (imageView != null) {
-            i = 2131362478;
-            TextView textView = (TextView) findViewById(2131362478);
+            i = R.id.chat_action_item_text;
+            TextView textView = (TextView) findViewById(R.id.chat_action_item_text);
             if (textView != null) {
                 u1 u1Var = new u1(this, imageView, textView);
                 m.checkNotNullExpressionValue(u1Var, "ViewChatActionItemBindin…ater.from(context), this)");
@@ -32,7 +32,7 @@ public final class ChatActionItem extends CardView {
                 m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…hatActionItem, 0, 0\n    )");
                 m.checkNotNullExpressionValue(textView, "binding.chatActionItemText");
                 textView.setText(obtainStyledAttributes.getString(1));
-                imageView.setImageResource(obtainStyledAttributes.getResourceId(0, 2131231112));
+                imageView.setImageResource(obtainStyledAttributes.getResourceId(0, R.drawable.drawable_circle_white_1));
                 obtainStyledAttributes.recycle();
                 return;
             }
diff --git a/app/src/main/java/com/discord/views/CheckedSetting.java b/app/src/main/java/com/discord/views/CheckedSetting.java
index 93e720bcff..cc891cbb0b 100644
--- a/app/src/main/java/com/discord/views/CheckedSetting.java
+++ b/app/src/main/java/com/discord/views/CheckedSetting.java
@@ -22,6 +22,7 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.StringRes;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
@@ -166,17 +167,17 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             public c(ViewGroup viewGroup, l3 l3Var, int i) {
                 l3 l3Var2;
                 if ((i & 2) != 0) {
-                    int i2 = 2131364972;
-                    ImageView imageView = (ImageView) viewGroup.findViewById(2131364972);
+                    int i2 = R.id.setting_drawable_left;
+                    ImageView imageView = (ImageView) viewGroup.findViewById(R.id.setting_drawable_left);
                     if (imageView != null) {
-                        i2 = 2131364973;
-                        TextView textView = (TextView) viewGroup.findViewById(2131364973);
+                        i2 = R.id.setting_label;
+                        TextView textView = (TextView) viewGroup.findViewById(R.id.setting_label);
                         if (textView != null) {
-                            i2 = 2131364974;
-                            TextView textView2 = (TextView) viewGroup.findViewById(2131364974);
+                            i2 = R.id.setting_subtext;
+                            TextView textView2 = (TextView) viewGroup.findViewById(R.id.setting_subtext);
                             if (textView2 != null) {
-                                i2 = 2131364975;
-                                TextView textView3 = (TextView) viewGroup.findViewById(2131364975);
+                                i2 = R.id.setting_tag;
+                                TextView textView3 = (TextView) viewGroup.findViewById(R.id.setting_tag);
                                 if (textView3 != null) {
                                     l3Var2 = new l3(viewGroup, imageView, textView, textView2, textView3);
                                     m.checkNotNullExpressionValue(l3Var2, "ViewSettingSharedBinding.bind(container)");
@@ -298,7 +299,7 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
         @Override // androidx.core.view.AccessibilityDelegateCompat
         public void onInitializeAccessibilityEvent(View view, AccessibilityEvent accessibilityEvent) {
             m.checkNotNullParameter(view, "host");
-            m.checkNotNullParameter(accessibilityEvent, "event");
+            m.checkNotNullParameter(accessibilityEvent, NotificationCompat.CATEGORY_EVENT);
             super.onInitializeAccessibilityEvent(view, accessibilityEvent);
             accessibilityEvent.setChecked(this.a.isChecked());
         }
@@ -314,11 +315,11 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             Resources resources = view.getResources();
             int ordinal = this.b.ordinal();
             if (ordinal == 0) {
-                i = 2131886083;
+                i = R.string.a11y_role_checkbox;
             } else if (ordinal == 1) {
-                i = 2131886084;
+                i = R.string.a11y_role_radio_button;
             } else if (ordinal == 2) {
-                i = 2131886085;
+                i = R.string.a11y_role_switch;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -473,7 +474,7 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             if (drawable2 != null) {
                 setBackground(drawable2);
             } else {
-                setBackgroundResource(2131231055);
+                setBackgroundResource(R.drawable.drawable_bg_settings_item_white);
             }
             ColorStateList colorStateList4 = obtainStyledAttributes.getColorStateList(1);
             if (colorStateList4 != null) {
@@ -553,49 +554,49 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
         b bVar;
         LayoutInflater from = LayoutInflater.from(getContext());
         int ordinal = viewType.ordinal();
-        int i2 = 2131364969;
+        int i2 = R.id.setting_button;
         if (ordinal == 0) {
-            from.inflate(2131558829, this);
-            MaterialCheckBox materialCheckBox = (MaterialCheckBox) findViewById(2131364969);
+            from.inflate(R.layout.view_setting_check, this);
+            MaterialCheckBox materialCheckBox = (MaterialCheckBox) findViewById(R.id.setting_button);
             if (materialCheckBox != null) {
-                ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364970);
+                ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(R.id.setting_container);
                 if (constraintLayout != null) {
                     j3 j3Var = new j3(this, materialCheckBox, constraintLayout);
                     m.checkNotNullExpressionValue(j3Var, "ViewSettingCheckBinding.…ate(layoutInflater, this)");
                     m.checkNotNullParameter(j3Var, "binding");
                     bVar = new b.a(j3Var);
                 } else {
-                    i2 = 2131364970;
+                    i2 = R.id.setting_container;
                 }
             }
             throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2)));
         } else if (ordinal == 1) {
-            from.inflate(2131558830, this);
-            MaterialRadioButton materialRadioButton = (MaterialRadioButton) findViewById(2131364969);
+            from.inflate(R.layout.view_setting_radio, this);
+            MaterialRadioButton materialRadioButton = (MaterialRadioButton) findViewById(R.id.setting_button);
             if (materialRadioButton != null) {
-                ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364970);
+                ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(R.id.setting_container);
                 if (constraintLayout2 != null) {
                     k3 k3Var = new k3(this, materialRadioButton, constraintLayout2);
                     m.checkNotNullExpressionValue(k3Var, "ViewSettingRadioBinding.…ate(layoutInflater, this)");
                     m.checkNotNullParameter(k3Var, "binding");
                     bVar = new b.C0181b(k3Var);
                 } else {
-                    i2 = 2131364970;
+                    i2 = R.id.setting_container;
                 }
             }
             throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2)));
         } else if (ordinal == 2) {
-            from.inflate(2131558832, this);
-            SwitchMaterial switchMaterial = (SwitchMaterial) findViewById(2131364969);
+            from.inflate(R.layout.view_setting_switch, this);
+            SwitchMaterial switchMaterial = (SwitchMaterial) findViewById(R.id.setting_button);
             if (switchMaterial != null) {
-                ConstraintLayout constraintLayout3 = (ConstraintLayout) findViewById(2131364970);
+                ConstraintLayout constraintLayout3 = (ConstraintLayout) findViewById(R.id.setting_container);
                 if (constraintLayout3 != null) {
                     m3 m3Var = new m3(this, switchMaterial, constraintLayout3);
                     m.checkNotNullExpressionValue(m3Var, "ViewSettingSwitchBinding…ate(layoutInflater, this)");
                     m.checkNotNullParameter(m3Var, "binding");
                     bVar = new b.d(m3Var);
                 } else {
-                    i2 = 2131364970;
+                    i2 = R.id.setting_container;
                 }
             }
             throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2)));
diff --git a/app/src/main/java/com/discord/views/CodeVerificationView.java b/app/src/main/java/com/discord/views/CodeVerificationView.java
index 0d74869673..1cd1cc80f0 100644
--- a/app/src/main/java/com/discord/views/CodeVerificationView.java
+++ b/app/src/main/java/com/discord/views/CodeVerificationView.java
@@ -21,6 +21,7 @@ import c.a.z.c;
 import c.a.z.d;
 import c.a.z.e;
 import com.discord.R;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.g0.w;
 import d0.t.n;
 import d0.z.d.m;
@@ -61,25 +62,25 @@ public final class CodeVerificationView extends LinearLayout {
     public CodeVerificationView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558753, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_code_verification, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131365765;
-        TextView textView = (TextView) inflate.findViewById(2131365765);
+        int i2 = R.id.verify_char_1;
+        TextView textView = (TextView) inflate.findViewById(R.id.verify_char_1);
         if (textView != null) {
-            i2 = 2131365766;
-            TextView textView2 = (TextView) inflate.findViewById(2131365766);
+            i2 = R.id.verify_char_2;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.verify_char_2);
             if (textView2 != null) {
-                i2 = 2131365767;
-                TextView textView3 = (TextView) inflate.findViewById(2131365767);
+                i2 = R.id.verify_char_3;
+                TextView textView3 = (TextView) inflate.findViewById(R.id.verify_char_3);
                 if (textView3 != null) {
-                    i2 = 2131365768;
-                    TextView textView4 = (TextView) inflate.findViewById(2131365768);
+                    i2 = R.id.verify_char_4;
+                    TextView textView4 = (TextView) inflate.findViewById(R.id.verify_char_4);
                     if (textView4 != null) {
-                        i2 = 2131365769;
-                        TextView textView5 = (TextView) inflate.findViewById(2131365769);
+                        i2 = R.id.verify_char_5;
+                        TextView textView5 = (TextView) inflate.findViewById(R.id.verify_char_5);
                         if (textView5 != null) {
-                            i2 = 2131365770;
-                            TextView textView6 = (TextView) inflate.findViewById(2131365770);
+                            i2 = R.id.verify_char_6;
+                            TextView textView6 = (TextView) inflate.findViewById(R.id.verify_char_6);
                             if (textView6 != null) {
                                 x1 x1Var = new x1((LinearLayout) inflate, textView, textView2, textView3, textView4, textView5, textView6);
                                 m.checkNotNullExpressionValue(x1Var, "ViewCodeVerificationBind…rom(context), this, true)");
@@ -118,8 +119,8 @@ public final class CodeVerificationView extends LinearLayout {
                                 } else {
                                     a(this);
                                 }
-                                this.l = ContextCompat.getDrawable(context, 2131231247);
-                                this.m = ContextCompat.getDrawable(context, 2131231248);
+                                this.l = ContextCompat.getDrawable(context, R.drawable.drawable_uikit_background_tertiary_button);
+                                this.m = ContextCompat.getDrawable(context, R.drawable.drawable_uikit_background_tertiary_button_outline);
                                 e();
                                 return;
                             }
@@ -216,7 +217,7 @@ public final class CodeVerificationView extends LinearLayout {
     }
 
     public final void setCode(CharSequence charSequence) {
-        m.checkNotNullParameter(charSequence, "code");
+        m.checkNotNullParameter(charSequence, ModelAuditLogEntry.CHANGE_KEY_CODE);
         String str = this.o;
         String obj = charSequence.toString();
         this.o = obj;
diff --git a/app/src/main/java/com/discord/views/FailedUploadList.java b/app/src/main/java/com/discord/views/FailedUploadList.java
index 961a0670d8..ac2d667db1 100644
--- a/app/src/main/java/com/discord/views/FailedUploadList.java
+++ b/app/src/main/java/com/discord/views/FailedUploadList.java
@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import c.a.j.w1;
+import com.discord.R;
 import com.discord.api.message.LocalAttachment;
 import com.discord.utilities.attachments.AttachmentUtilsKt;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -152,16 +153,16 @@ public final class FailedUploadList extends LinearLayout {
 
     public FailedUploadList(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558747, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_chat_upload_list, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362635;
-        FailedUploadView failedUploadView = (FailedUploadView) inflate.findViewById(2131362635);
+        int i = R.id.chat_upload_1;
+        FailedUploadView failedUploadView = (FailedUploadView) inflate.findViewById(R.id.chat_upload_1);
         if (failedUploadView != null) {
-            i = 2131362636;
-            FailedUploadView failedUploadView2 = (FailedUploadView) inflate.findViewById(2131362636);
+            i = R.id.chat_upload_2;
+            FailedUploadView failedUploadView2 = (FailedUploadView) inflate.findViewById(R.id.chat_upload_2);
             if (failedUploadView2 != null) {
-                i = 2131362637;
-                FailedUploadView failedUploadView3 = (FailedUploadView) inflate.findViewById(2131362637);
+                i = R.id.chat_upload_3;
+                FailedUploadView failedUploadView3 = (FailedUploadView) inflate.findViewById(R.id.chat_upload_3);
                 if (failedUploadView3 != null) {
                     w1 w1Var = new w1((LinearLayout) inflate, failedUploadView, failedUploadView2, failedUploadView3);
                     m.checkNotNullExpressionValue(w1Var, "ViewChatUploadListBindin…rom(context), this, true)");
@@ -246,10 +247,10 @@ public final class FailedUploadList extends LinearLayout {
                 m.checkNotNullExpressionValue(resources, "resources");
                 Context context5 = failedUploadView3.getContext();
                 m.checkNotNullExpressionValue(context5, "context");
-                CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, context5, 2131755354, i2, Integer.valueOf(i2));
+                CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, context5, (int) R.plurals.uploading_files_failed_count, i2, Integer.valueOf(i2));
                 Context context6 = failedUploadView3.getContext();
                 m.checkNotNullExpressionValue(context6, "context");
-                failedUploadView3.a(quantityString, DrawableCompat.getThemedDrawableRes$default(context6, 2130969470, 0, 2, (Object) null), FileUtilsKt.getSizeSubtitle(j2));
+                failedUploadView3.a(quantityString, DrawableCompat.getThemedDrawableRes$default(context6, (int) R.attr.ic_uploads_generic, 0, 2, (Object) null), FileUtilsKt.getSizeSubtitle(j2));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/views/FailedUploadView.java b/app/src/main/java/com/discord/views/FailedUploadView.java
index f457dfe92e..6546e7fc98 100644
--- a/app/src/main/java/com/discord/views/FailedUploadView.java
+++ b/app/src/main/java/com/discord/views/FailedUploadView.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.v1;
+import com.discord.R;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import d0.z.d.m;
 /* compiled from: FailedUploadView.kt */
@@ -20,19 +21,19 @@ public final class FailedUploadView extends ConstraintLayout {
     public FailedUploadView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558746, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_chat_upload, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131363022;
-        TextView textView = (TextView) inflate.findViewById(2131363022);
+        int i = R.id.display_name;
+        TextView textView = (TextView) inflate.findViewById(R.id.display_name);
         if (textView != null) {
-            i = 2131363251;
-            ImageView imageView = (ImageView) inflate.findViewById(2131363251);
+            i = R.id.failed_alert_icon;
+            ImageView imageView = (ImageView) inflate.findViewById(R.id.failed_alert_icon);
             if (imageView != null) {
-                i = 2131363274;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131363274);
+                i = R.id.file_image;
+                ImageView imageView2 = (ImageView) inflate.findViewById(R.id.file_image);
                 if (imageView2 != null) {
-                    i = 2131365387;
-                    TextView textView2 = (TextView) inflate.findViewById(2131365387);
+                    i = R.id.subtitle_text;
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.subtitle_text);
                     if (textView2 != null) {
                         v1 v1Var = new v1((ConstraintLayout) inflate, textView, imageView, imageView2, textView2);
                         m.checkNotNullExpressionValue(v1Var, "ViewChatUploadBinding.in…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/views/GuildView.java b/app/src/main/java/com/discord/views/GuildView.java
index d31a0c8125..4cf4d54b08 100644
--- a/app/src/main/java/com/discord/views/GuildView.java
+++ b/app/src/main/java/com/discord/views/GuildView.java
@@ -25,12 +25,12 @@ public final class GuildView extends FrameLayout {
     public GuildView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558769, this);
-        int i = 2131363439;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363439);
+        LayoutInflater.from(context).inflate(R.layout.view_guild, this);
+        int i = R.id.guild_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.guild_avatar);
         if (simpleDraweeView != null) {
-            i = 2131363660;
-            TextView textView = (TextView) findViewById(2131363660);
+            i = R.id.guild_text;
+            TextView textView = (TextView) findViewById(R.id.guild_text);
             if (textView != null) {
                 d2 d2Var = new d2(this, simpleDraweeView, textView);
                 m.checkNotNullExpressionValue(d2Var, "ViewGuildBinding.inflate…ater.from(context), this)");
@@ -76,7 +76,7 @@ public final class GuildView extends FrameLayout {
         SimpleDraweeView simpleDraweeView = this.i.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildAvatar");
         if (!z2) {
-            str2 = "asset://asset/images/default_icon_selected.jpg";
+            str2 = IconUtils.DEFAULT_ICON_BLURPLE;
         }
         MGImages.setImage$default(simpleDraweeView, str2, mediaProxySize, mediaProxySize, false, null, null, 112, null);
         TextView textView = this.i.f83c;
@@ -91,7 +91,7 @@ public final class GuildView extends FrameLayout {
     }
 
     public final void b() {
-        float dimensionPixelSize = (float) getResources().getDimensionPixelSize(2131165446);
+        float dimensionPixelSize = (float) getResources().getDimensionPixelSize(R.dimen.guild_icon_radius);
         c cVar = new c();
         if (cVar.f405c == null) {
             cVar.f405c = new float[8];
diff --git a/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java b/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java
index ead6b8352f..5f53e06cd3 100644
--- a/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java
+++ b/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java
@@ -5,6 +5,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import androidx.annotation.StringRes;
 import c.a.e.o;
+import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
 /* compiled from: JoinVoiceChannelButton.kt */
@@ -30,7 +31,7 @@ public final class JoinVoiceChannelButton extends MaterialButton {
     public JoinVoiceChannelButton(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        setText(2131887529);
+        setText(R.string.connect_to_voice);
     }
 
     public final void a(MaterialButton materialButton, @StringRes int i) {
diff --git a/app/src/main/java/com/discord/views/LoadingButton.java b/app/src/main/java/com/discord/views/LoadingButton.java
index b9b304c9bc..e89711edc6 100644
--- a/app/src/main/java/com/discord/views/LoadingButton.java
+++ b/app/src/main/java/com/discord/views/LoadingButton.java
@@ -34,12 +34,12 @@ public final class LoadingButton extends FrameLayout {
         int color;
         int i = 4;
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558783, this);
-        int i2 = 2131363978;
-        MaterialButton materialButton = (MaterialButton) findViewById(2131363978);
+        LayoutInflater.from(context).inflate(R.layout.view_loading_button, this);
+        int i2 = R.id.loading_button_button;
+        MaterialButton materialButton = (MaterialButton) findViewById(R.id.loading_button_button);
         if (materialButton != null) {
-            i2 = 2131363979;
-            ProgressBar progressBar = (ProgressBar) findViewById(2131363979);
+            i2 = R.id.loading_button_progress;
+            ProgressBar progressBar = (ProgressBar) findViewById(R.id.loading_button_progress);
             if (progressBar != null) {
                 f2 f2Var = new f2(this, materialButton, progressBar);
                 m.checkNotNullExpressionValue(f2Var, "ViewLoadingButtonBinding…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java b/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java
index 304e264995..74bd06b6f3 100644
--- a/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java
+++ b/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import c.a.j.m0;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: MemberVerificationAvatarView.kt */
@@ -16,12 +17,12 @@ public final class MemberVerificationAvatarView extends FrameLayout {
     public MemberVerificationAvatarView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558569, this);
-        int i = 2131364038;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364038);
+        LayoutInflater.from(context).inflate(R.layout.member_verification_avatar_view, this);
+        int i = R.id.member_verification_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.member_verification_avatar);
         if (simpleDraweeView != null) {
-            i = 2131364061;
-            TextView textView = (TextView) findViewById(2131364061);
+            i = R.id.member_verification_text;
+            TextView textView = (TextView) findViewById(R.id.member_verification_text);
             if (textView != null) {
                 m0 m0Var = new m0(this, simpleDraweeView, textView);
                 m.checkNotNullExpressionValue(m0Var, "MemberVerificationAvatar…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/NumericBadgingView.java b/app/src/main/java/com/discord/views/NumericBadgingView.java
index d74a01c145..1a07a53ecf 100644
--- a/app/src/main/java/com/discord/views/NumericBadgingView.java
+++ b/app/src/main/java/com/discord/views/NumericBadgingView.java
@@ -105,13 +105,13 @@ public final class NumericBadgingView extends CutoutView {
         m.checkNotNullExpressionValue(obtainStyledAttributes, "obtainStyledAttributes(attrs, styleable)");
         paint.setColor(obtainStyledAttributes.getColor(0, 0));
         if (paint.getColor() == 0) {
-            paint.setColor(ContextCompat.getColor(context, 2131100329));
+            paint.setColor(ContextCompat.getColor(context, R.color.status_red_500));
         }
         paint2.setColor(obtainStyledAttributes.getColor(1, 0));
         if (paint2.getColor() == 0) {
-            paint2.setColor(ContextCompat.getColor(context, 2131100433));
+            paint2.setColor(ContextCompat.getColor(context, R.color.white));
         }
-        paint2.setTypeface(FontUtils.INSTANCE.getThemedFont(context, 2130969328));
+        paint2.setTypeface(FontUtils.INSTANCE.getThemedFont(context, R.attr.font_primary_semibold));
         obtainStyledAttributes.recycle();
     }
 
diff --git a/app/src/main/java/com/discord/views/OAuthPermissionViews.java b/app/src/main/java/com/discord/views/OAuthPermissionViews.java
index 40c29725d1..4bd393cf81 100644
--- a/app/src/main/java/com/discord/views/OAuthPermissionViews.java
+++ b/app/src/main/java/com/discord/views/OAuthPermissionViews.java
@@ -2,6 +2,7 @@ package com.discord.views;
 
 import android.widget.TextView;
 import c.a.j.o0;
+import com.discord.R;
 import com.discord.api.auth.OAuthScope;
 import com.discord.utilities.views.SimpleRecyclerAdapter;
 import d0.z.d.m;
@@ -54,51 +55,51 @@ public final class OAuthPermissionViews {
         m.checkNotNullParameter(textView, "$this$setScopePermissionText");
         m.checkNotNullParameter(oAuthScope, "scope");
         if (m.areEqual(oAuthScope, OAuthScope.Identify.INSTANCE)) {
-            i = 2131893391;
+            i = R.string.scope_identify;
         } else if (m.areEqual(oAuthScope, OAuthScope.Email.INSTANCE)) {
-            i = 2131893383;
+            i = R.string.scope_email;
         } else if (m.areEqual(oAuthScope, OAuthScope.Connections.INSTANCE)) {
-            i = 2131893381;
+            i = R.string.scope_connections;
         } else if (m.areEqual(oAuthScope, OAuthScope.Guilds.INSTANCE)) {
-            i = 2131893387;
+            i = R.string.scope_guilds;
         } else if (m.areEqual(oAuthScope, OAuthScope.GuildsJoin.INSTANCE)) {
-            i = 2131893389;
+            i = R.string.scope_guilds_join;
         } else if (m.areEqual(oAuthScope, OAuthScope.GdmJoin.INSTANCE)) {
-            i = 2131893385;
+            i = R.string.scope_gdm_join;
         } else if (m.areEqual(oAuthScope, OAuthScope.Bot.INSTANCE)) {
-            i = 2131893378;
+            i = R.string.scope_bot;
         } else if (m.areEqual(oAuthScope, OAuthScope.WebhookIncoming.INSTANCE)) {
-            i = 2131893405;
+            i = R.string.scope_webhook_incoming;
         } else if (m.areEqual(oAuthScope, OAuthScope.Rpc.INSTANCE)) {
-            i = 2131893396;
+            i = R.string.scope_rpc;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcNotificationsRead.INSTANCE)) {
-            i = 2131893399;
+            i = R.string.scope_rpc_notifications_read;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcVoiceRead.INSTANCE)) {
-            i = 2131893401;
+            i = R.string.scope_rpc_voice_read;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcVoiceWrite.INSTANCE)) {
-            i = 2131893402;
+            i = R.string.scope_rpc_voice_write;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcActivitiesWrite.INSTANCE)) {
-            i = 2131893397;
+            i = R.string.scope_rpc_activities_write;
         } else if (m.areEqual(oAuthScope, OAuthScope.MessagesRead.INSTANCE)) {
-            i = 2131893392;
+            i = R.string.scope_messages_read;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsBuildsUpload.INSTANCE)) {
-            i = 2131893368;
+            i = R.string.scope_applications_builds_upload;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsBuildsRead.INSTANCE)) {
-            i = 2131893366;
+            i = R.string.scope_applications_builds_read;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsCommands.INSTANCE)) {
-            i = 2131893370;
+            i = R.string.scope_applications_commands;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsCommandsUpdate.INSTANCE)) {
-            i = 2131893372;
+            i = R.string.scope_applications_commands_update;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsStoreUpdate.INSTANCE)) {
-            i = 2131893376;
+            i = R.string.scope_applications_store_update;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsEntitlements.INSTANCE)) {
-            i = 2131893374;
+            i = R.string.scope_applications_entitlements;
         } else if (m.areEqual(oAuthScope, OAuthScope.ActivitiesRead.INSTANCE)) {
-            i = 2131893362;
+            i = R.string.scope_activities_read;
         } else if (m.areEqual(oAuthScope, OAuthScope.ActivitiesWrite.INSTANCE)) {
-            i = 2131893364;
+            i = R.string.scope_activities_write;
         } else if (m.areEqual(oAuthScope, OAuthScope.RelationshipsRead.INSTANCE)) {
-            i = 2131893394;
+            i = R.string.scope_relationships_read;
         } else if (oAuthScope instanceof OAuthScope.Invalid) {
             throw new InvalidScopeException(((OAuthScope.Invalid) oAuthScope).b());
         } else {
diff --git a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
index d2732439bd..8df8eb66a5 100644
--- a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
+++ b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
@@ -15,6 +15,7 @@ import c.a.j.p0;
 import c.a.j.q0;
 import c.a.z.k;
 import c.a.z.o;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreStream;
@@ -58,7 +59,7 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
         public void bind(StoreVoiceParticipants.VoiceUser voiceUser) {
             StoreVoiceParticipants.VoiceUser voiceUser2 = voiceUser;
             m.checkNotNullParameter(voiceUser2, "data");
-            this.a.a.a(voiceUser2, 2131165286);
+            this.a.a.a(voiceUser2, R.dimen.avatar_size_extra_large);
         }
     }
 
@@ -136,22 +137,22 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
     public OverlayMenuBubbleDialog(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558623, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.overlay_bubble_menu, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364341;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364341);
+        int i = R.id.overlay_header;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.overlay_header);
         if (linearLayout != null) {
-            i = 2131364343;
-            View findViewById = inflate.findViewById(2131364343);
+            i = R.id.overlay_linked_anchor_view;
+            View findViewById = inflate.findViewById(R.id.overlay_linked_anchor_view);
             if (findViewById != null) {
-                i = 2131364344;
-                TextView textView = (TextView) inflate.findViewById(2131364344);
+                i = R.id.overlay_members_overflow_tv;
+                TextView textView = (TextView) inflate.findViewById(R.id.overlay_members_overflow_tv);
                 if (textView != null) {
-                    i = 2131364345;
-                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364345);
+                    i = R.id.overlay_members_rv;
+                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.overlay_members_rv);
                     if (recyclerView != null) {
-                        i = 2131364346;
-                        OverlayMenuView overlayMenuView = (OverlayMenuView) inflate.findViewById(2131364346);
+                        i = R.id.overlay_menu;
+                        OverlayMenuView overlayMenuView = (OverlayMenuView) inflate.findViewById(R.id.overlay_menu);
                         if (overlayMenuView != null) {
                             p0 p0Var = new p0((LinearLayout) inflate, linearLayout, findViewById, textView, recyclerView, overlayMenuView);
                             m.checkNotNullExpressionValue(p0Var, "OverlayBubbleMenuBinding…rom(context), this, true)");
@@ -174,9 +175,9 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
         animatorSet.setStartDelay((long) getResources().getInteger(17694720));
         OverlayMenuView overlayMenuView = this.f2152y.f;
         m.checkNotNullExpressionValue(overlayMenuView, "binding.overlayMenu");
-        Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView.getContext(), 2130837533);
+        Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView.getContext(), R.animator.overlay_slide_down_fade_out);
         loadAnimator.setTarget(this.f2152y.f);
-        Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), 2130837535);
+        Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), R.animator.overlay_slide_up_fade_out);
         loadAnimator2.setTarget(this.f2152y.b);
         animatorSet.playTogether(loadAnimator, loadAnimator2);
         return animatorSet;
@@ -200,9 +201,9 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
         AnimatorSet animatorSet = new AnimatorSet();
         OverlayMenuView overlayMenuView2 = this.f2152y.f;
         m.checkNotNullExpressionValue(overlayMenuView2, "binding.overlayMenu");
-        Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView2.getContext(), 2130837534);
+        Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView2.getContext(), R.animator.overlay_slide_up_fade_in);
         loadAnimator.setTarget(this.f2152y.f);
-        Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), 2130837532);
+        Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), R.animator.overlay_slide_down_fade_in);
         loadAnimator2.setTarget(this.f2152y.b);
         animatorSet.playTogether(loadAnimator, loadAnimator2);
         animatorSet.setStartDelay((long) getResources().getInteger(17694720));
diff --git a/app/src/main/java/com/discord/views/OverlayMenuView.java b/app/src/main/java/com/discord/views/OverlayMenuView.java
index 48ae0bd96a..ca6a2a7bb9 100644
--- a/app/src/main/java/com/discord/views/OverlayMenuView.java
+++ b/app/src/main/java/com/discord/views/OverlayMenuView.java
@@ -13,6 +13,7 @@ import c.a.j.k2;
 import c.a.j.l2;
 import c.a.z.q;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.models.guild.Guild;
 import com.discord.rtcconnection.RtcConnection;
@@ -85,7 +86,7 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                     overlayMenuView.j.b.f.setOnClickListener(new e(1, overlayMenuView, aVar2));
                     ImageView imageView = overlayMenuView.j.e;
                     m.checkNotNullExpressionValue(imageView, "binding.srcToggle");
-                    ColorStateList valueOf = aVar2.f2154c.getAudioManagerState().getActiveAudioDevice() == DiscordAudioManager.DeviceTypes.SPEAKERPHONE ? ColorStateList.valueOf(-1) : ColorStateList.valueOf(ColorCompat.getColor(overlayMenuView.getContext(), 2131100167));
+                    ColorStateList valueOf = aVar2.f2154c.getAudioManagerState().getActiveAudioDevice() == DiscordAudioManager.DeviceTypes.SPEAKERPHONE ? ColorStateList.valueOf(-1) : ColorStateList.valueOf(ColorCompat.getColor(overlayMenuView.getContext(), (int) R.color.primary_dark_400));
                     m.checkNotNullExpressionValue(valueOf, "if (selectedOutputDevice…rimary_dark_400))\n      }");
                     imageView.setImageTintList(valueOf);
                     overlayMenuView.j.e.setOnClickListener(new h(1, aVar2));
@@ -116,37 +117,37 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
     public OverlayMenuView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558795, this);
-        int i2 = 2131362796;
-        View findViewById = findViewById(2131362796);
+        LayoutInflater.from(getContext()).inflate(R.layout.view_overlay_menu, this);
+        int i2 = R.id.content;
+        View findViewById = findViewById(R.id.content);
         if (findViewById != null) {
-            int i3 = 2131364338;
-            TextView textView = (TextView) findViewById.findViewById(2131364338);
+            int i3 = R.id.overlay_channel_name;
+            TextView textView = (TextView) findViewById.findViewById(R.id.overlay_channel_name);
             if (textView != null) {
-                i3 = 2131364340;
-                TextView textView2 = (TextView) findViewById.findViewById(2131364340);
+                i3 = R.id.overlay_guild_name;
+                TextView textView2 = (TextView) findViewById.findViewById(R.id.overlay_guild_name);
                 if (textView2 != null) {
-                    i3 = 2131364342;
-                    TextView textView3 = (TextView) findViewById.findViewById(2131364342);
+                    i3 = R.id.overlay_invite_link;
+                    TextView textView3 = (TextView) findViewById.findViewById(R.id.overlay_invite_link);
                     if (textView3 != null) {
-                        i3 = 2131364347;
-                        ImageView imageView = (ImageView) findViewById.findViewById(2131364347);
+                        i3 = R.id.overlay_network_icon;
+                        ImageView imageView = (ImageView) findViewById.findViewById(R.id.overlay_network_icon);
                         if (imageView != null) {
-                            i3 = 2131364348;
-                            TextView textView4 = (TextView) findViewById.findViewById(2131364348);
+                            i3 = R.id.overlay_open_app;
+                            TextView textView4 = (TextView) findViewById.findViewById(R.id.overlay_open_app);
                             if (textView4 != null) {
-                                i3 = 2131364349;
-                                TextView textView5 = (TextView) findViewById.findViewById(2131364349);
+                                i3 = R.id.overlay_switch_channels;
+                                TextView textView5 = (TextView) findViewById.findViewById(R.id.overlay_switch_channels);
                                 if (textView5 != null) {
                                     l2 l2Var = new l2((CardView) findViewById, textView, textView2, textView3, imageView, textView4, textView5);
-                                    i2 = 2131362970;
-                                    ImageView imageView2 = (ImageView) findViewById(2131362970);
+                                    i2 = R.id.disconnect_btn;
+                                    ImageView imageView2 = (ImageView) findViewById(R.id.disconnect_btn);
                                     if (imageView2 != null) {
-                                        i2 = 2131364205;
-                                        ImageView imageView3 = (ImageView) findViewById(2131364205);
+                                        i2 = R.id.mute_toggle;
+                                        ImageView imageView3 = (ImageView) findViewById(R.id.mute_toggle);
                                         if (imageView3 != null) {
-                                            i2 = 2131365214;
-                                            ImageView imageView4 = (ImageView) findViewById(2131365214);
+                                            i2 = R.id.src_toggle;
+                                            ImageView imageView4 = (ImageView) findViewById(R.id.src_toggle);
                                             if (imageView4 != null) {
                                                 k2 k2Var = new k2(this, l2Var, imageView2, imageView3, imageView4);
                                                 m.checkNotNullExpressionValue(k2Var, "ViewOverlayMenuBinding.i…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/PileView.java b/app/src/main/java/com/discord/views/PileView.java
index acfe1aa00b..58da80a4f9 100644
--- a/app/src/main/java/com/discord/views/PileView.java
+++ b/app/src/main/java/com/discord/views/PileView.java
@@ -110,12 +110,12 @@ public final class PileView extends FrameLayout {
             b bVar = (b) obj;
             int i4 = this.l * i2;
             int i5 = this.m * i2;
-            View inflate = LayoutInflater.from(getContext()).inflate(2131558799, (ViewGroup) this, false);
-            int i6 = 2131364444;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364444);
+            View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_pile_item, (ViewGroup) this, false);
+            int i6 = R.id.pileItemBg;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.pileItemBg);
             if (simpleDraweeView != null) {
-                i6 = 2131364445;
-                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364445);
+                i6 = R.id.pileItemImage;
+                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(R.id.pileItemImage);
                 if (simpleDraweeView2 != null) {
                     CutoutView cutoutView = (CutoutView) inflate;
                     m.checkNotNullExpressionValue(new n2(cutoutView, simpleDraweeView, simpleDraweeView2), "ViewPileItemBinding.infl…om(context), this, false)");
diff --git a/app/src/main/java/com/discord/views/ScreenTitleView.java b/app/src/main/java/com/discord/views/ScreenTitleView.java
index e4577d8287..eb2e9e0648 100644
--- a/app/src/main/java/com/discord/views/ScreenTitleView.java
+++ b/app/src/main/java/com/discord/views/ScreenTitleView.java
@@ -20,13 +20,13 @@ public final class ScreenTitleView extends LinearLayout {
     public ScreenTitleView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558815, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_screen_title, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364752;
-        TextView textView = (TextView) inflate.findViewById(2131364752);
+        int i = R.id.screen_title_subtitle;
+        TextView textView = (TextView) inflate.findViewById(R.id.screen_title_subtitle);
         if (textView != null) {
-            i = 2131364753;
-            TextView textView2 = (TextView) inflate.findViewById(2131364753);
+            i = R.id.screen_title_title;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.screen_title_title);
             if (textView2 != null) {
                 x2 x2Var = new x2((LinearLayout) inflate, textView, textView2);
                 m.checkNotNullExpressionValue(x2Var, "ViewScreenTitleBinding.i…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/views/SearchInputView.java b/app/src/main/java/com/discord/views/SearchInputView.java
index 989b41aa00..b437268525 100644
--- a/app/src/main/java/com/discord/views/SearchInputView.java
+++ b/app/src/main/java/com/discord/views/SearchInputView.java
@@ -73,12 +73,12 @@ public final class SearchInputView extends ConstraintLayout {
     public SearchInputView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558662, this);
-        int i2 = 2131364766;
-        ImageView imageView = (ImageView) findViewById(2131364766);
+        LayoutInflater.from(getContext()).inflate(R.layout.search_input_view, this);
+        int i2 = R.id.search_clear;
+        ImageView imageView = (ImageView) findViewById(R.id.search_clear);
         if (imageView != null) {
-            i2 = 2131364773;
-            TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364773);
+            i2 = R.id.search_input_edit_text;
+            TextInputEditText textInputEditText = (TextInputEditText) findViewById(R.id.search_input_edit_text);
             if (textInputEditText != null) {
                 e1 e1Var = new e1(this, imageView, textInputEditText);
                 m.checkNotNullExpressionValue(e1Var, "SearchInputViewBinding.i…ater.from(context), this)");
@@ -86,9 +86,9 @@ public final class SearchInputView extends ConstraintLayout {
                 this.k = "";
                 this.l = new q(1, this);
                 Drawable drawable = null;
-                Drawable drawable2 = ResourcesCompat.getDrawable(getResources(), 2131231031, null);
+                Drawable drawable2 = ResourcesCompat.getDrawable(getResources(), R.drawable.drawable_bg_corners_4dp, null);
                 if (drawable2 != null) {
-                    drawable2.setTint(ColorCompat.getThemedColor(this, 2130968907));
+                    drawable2.setTint(ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundTertiary));
                     drawable = drawable2;
                 }
                 setBackground(drawable);
@@ -120,13 +120,13 @@ public final class SearchInputView extends ConstraintLayout {
         int i2 = 0;
         boolean z2 = str.length() == 0;
         e1 e1Var = this.j;
-        e1Var.b.setImageResource(z2 ? 2131231955 : 2131231558);
+        e1Var.b.setImageResource(z2 ? R.drawable.ic_search_16dp : R.drawable.ic_clear_white_24dp);
         ImageView imageView = e1Var.b;
         m.checkNotNullExpressionValue(imageView, "searchClear");
-        imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968989)) : ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968990)));
+        imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorTextMuted)) : ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorTextNormal)));
         ImageView imageView2 = e1Var.b;
         m.checkNotNullExpressionValue(imageView2, "searchClear");
-        imageView2.setContentDescription(z2 ? this.k : getContext().getString(2131893022));
+        imageView2.setContentDescription(z2 ? this.k : getContext().getString(R.string.reset));
         ImageView imageView3 = e1Var.b;
         m.checkNotNullExpressionValue(imageView3, "searchClear");
         if (z2) {
diff --git a/app/src/main/java/com/discord/views/ServerFolderView.java b/app/src/main/java/com/discord/views/ServerFolderView.java
index 378eafec5b..c1fe4bd91e 100644
--- a/app/src/main/java/com/discord/views/ServerFolderView.java
+++ b/app/src/main/java/com/discord/views/ServerFolderView.java
@@ -10,6 +10,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.annotation.AnimRes;
 import c.a.j.a3;
+import com.discord.R;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import d0.z.d.m;
 /* compiled from: ServerFolderView.kt */
@@ -47,24 +48,24 @@ public final class ServerFolderView extends LinearLayout {
     public ServerFolderView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558819, this);
-        int i2 = 2131363312;
-        ImageView imageView = (ImageView) findViewById(2131363312);
+        LayoutInflater.from(context).inflate(R.layout.view_server_folder, this);
+        int i2 = R.id.folder_view_folder_image;
+        ImageView imageView = (ImageView) findViewById(R.id.folder_view_folder_image);
         if (imageView != null) {
-            i2 = 2131363667;
-            GuildView guildView = (GuildView) findViewById(2131363667);
+            i2 = R.id.guild_view_1;
+            GuildView guildView = (GuildView) findViewById(R.id.guild_view_1);
             if (guildView != null) {
-                i2 = 2131363668;
-                GuildView guildView2 = (GuildView) findViewById(2131363668);
+                i2 = R.id.guild_view_2;
+                GuildView guildView2 = (GuildView) findViewById(R.id.guild_view_2);
                 if (guildView2 != null) {
-                    i2 = 2131363669;
-                    GuildView guildView3 = (GuildView) findViewById(2131363669);
+                    i2 = R.id.guild_view_3;
+                    GuildView guildView3 = (GuildView) findViewById(R.id.guild_view_3);
                     if (guildView3 != null) {
-                        i2 = 2131363670;
-                        GuildView guildView4 = (GuildView) findViewById(2131363670);
+                        i2 = R.id.guild_view_4;
+                        GuildView guildView4 = (GuildView) findViewById(R.id.guild_view_4);
                         if (guildView4 != null) {
-                            i2 = 2131363671;
-                            GridLayout gridLayout = (GridLayout) findViewById(2131363671);
+                            i2 = R.id.guild_views;
+                            GridLayout gridLayout = (GridLayout) findViewById(R.id.guild_views);
                             if (gridLayout != null) {
                                 a3 a3Var = new a3(this, imageView, guildView, guildView2, guildView3, guildView4, gridLayout);
                                 m.checkNotNullExpressionValue(a3Var, "ViewServerFolderBinding.…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/StatusView.java b/app/src/main/java/com/discord/views/StatusView.java
index b2e4ddc858..199934bcd9 100644
--- a/app/src/main/java/com/discord/views/StatusView.java
+++ b/app/src/main/java/com/discord/views/StatusView.java
@@ -94,7 +94,7 @@ public final class StatusView extends AppCompatImageView {
         if (!this.k || presence == null || (clientStatuses2 = presence.getClientStatuses()) == null || !PresenceUtils.INSTANCE.isMobile(clientStatuses2)) {
             ClientStatus clientStatus = null;
             if ((presence != null ? PresenceUtils.INSTANCE.getStreamingActivity(presence) : null) != null) {
-                i = 2131232020;
+                i = R.drawable.ic_status_streaming_16dp;
             } else {
                 if (presence != null) {
                     clientStatus = presence.getStatus();
@@ -102,17 +102,17 @@ public final class StatusView extends AppCompatImageView {
                 if (clientStatus != null) {
                     int ordinal = clientStatus.ordinal();
                     if (ordinal == 0) {
-                        i = 2131232019;
+                        i = R.drawable.ic_status_online_16dp;
                     } else if (ordinal == 1) {
-                        i = 2131232017;
+                        i = R.drawable.ic_status_idle_16dp;
                     } else if (ordinal == 2) {
-                        i = 2131232016;
+                        i = R.drawable.ic_status_dnd_16dp;
                     }
                 }
-                i = 2131232018;
+                i = R.drawable.ic_status_invisible_16dp;
             }
         } else {
-            i = 2131231803;
+            i = R.drawable.ic_mobile;
         }
         setImageResource(i);
         this.l = !(this.k && presence != null && (clientStatuses = presence.getClientStatuses()) != null && PresenceUtils.INSTANCE.isMobile(clientStatuses));
diff --git a/app/src/main/java/com/discord/views/StreamPreviewView.java b/app/src/main/java/com/discord/views/StreamPreviewView.java
index 40bed6e0df..f47f99b164 100644
--- a/app/src/main/java/com/discord/views/StreamPreviewView.java
+++ b/app/src/main/java/com/discord/views/StreamPreviewView.java
@@ -11,6 +11,7 @@ import androidx.annotation.MainThread;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.s3;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.stores.StoreApplicationStreamPreviews;
 import com.discord.utilities.streams.StreamContext;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -25,16 +26,16 @@ public final class StreamPreviewView extends FrameLayout {
     public StreamPreviewView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558843, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_stream_preview, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365374;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365374);
+        int i = R.id.stream_preview_image;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.stream_preview_image);
         if (simpleDraweeView != null) {
-            i = 2131365375;
-            TextView textView = (TextView) inflate.findViewById(2131365375);
+            i = R.id.stream_preview_overlay_text;
+            TextView textView = (TextView) inflate.findViewById(R.id.stream_preview_overlay_text);
             if (textView != null) {
-                i = 2131365376;
-                TextView textView2 = (TextView) inflate.findViewById(2131365376);
+                i = R.id.stream_preview_placeholder_caption;
+                TextView textView2 = (TextView) inflate.findViewById(R.id.stream_preview_placeholder_caption);
                 if (textView2 != null) {
                     s3 s3Var = new s3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2);
                     m.checkNotNullExpressionValue(s3Var, "ViewStreamPreviewBinding…rom(context), this, true)");
@@ -70,7 +71,7 @@ public final class StreamPreviewView extends FrameLayout {
         m.checkNotNullParameter(streamPreview, "preview");
         m.checkNotNullParameter(joinability, "joinability");
         if (streamPreview instanceof StoreApplicationStreamPreviews.StreamPreview.Fetching) {
-            setCaptionText(getContext().getString(2131894046));
+            setCaptionText(getContext().getString(R.string.stream_preview_loading));
         } else if (streamPreview instanceof StoreApplicationStreamPreviews.StreamPreview.Resolved) {
             StoreApplicationStreamPreviews.StreamPreview.Resolved resolved = (StoreApplicationStreamPreviews.StreamPreview.Resolved) streamPreview;
             if (resolved.getUrl() != null) {
@@ -79,7 +80,7 @@ public final class StreamPreviewView extends FrameLayout {
             } else {
                 setImage(null);
                 if (joinability == StreamContext.Joinability.CAN_CONNECT) {
-                    setCaptionText(getContext().getString(2131894034));
+                    setCaptionText(getContext().getString(R.string.stream_no_preview));
                 } else {
                     setCaptionText(null);
                 }
@@ -88,16 +89,16 @@ public final class StreamPreviewView extends FrameLayout {
             throw new NoWhenBranchMatchedException();
         }
         if (z2) {
-            setOverlayCaptionText(b.j(this, 2131895025, new Object[0], null, 4));
+            setOverlayCaptionText(b.j(this, R.string.watch_stream_watching, new Object[0], null, 4));
             return;
         }
         int ordinal = joinability.ordinal();
         if (ordinal == 0) {
-            setOverlayCaptionText(b.j(this, 2131890972, new Object[0], null, 4));
+            setOverlayCaptionText(b.j(this, R.string.join_stream, new Object[0], null, 4));
         } else if (ordinal == 1) {
-            setOverlayCaptionText(b.j(this, 2131894479, new Object[0], null, 4));
+            setOverlayCaptionText(b.j(this, R.string.unable_to_join_channel_full, new Object[0], null, 4));
         } else if (ordinal == 2) {
-            setOverlayCaptionText(b.j(this, 2131887289, new Object[0], null, 4));
+            setOverlayCaptionText(b.j(this, R.string.channel_locked_short, new Object[0], null, 4));
         } else {
             throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/views/TernaryCheckBox.java b/app/src/main/java/com/discord/views/TernaryCheckBox.java
index ffd8511d8f..c86e4af753 100644
--- a/app/src/main/java/com/discord/views/TernaryCheckBox.java
+++ b/app/src/main/java/com/discord/views/TernaryCheckBox.java
@@ -71,34 +71,34 @@ public final class TernaryCheckBox extends RelativeLayout {
     public TernaryCheckBox(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558844, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_ternary_checkbox, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131362639;
-        FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131362639);
+        int i2 = R.id.checkable_off_container;
+        FrameLayout frameLayout = (FrameLayout) inflate.findViewById(R.id.checkable_off_container);
         if (frameLayout != null) {
-            i2 = 2131362641;
-            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362641);
+            i2 = R.id.checkboxes_container;
+            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.checkboxes_container);
             if (linearLayout != null) {
-                i2 = 2131364311;
-                View findViewById = inflate.findViewById(2131364311);
+                i2 = R.id.off_disabled_overlay;
+                View findViewById = inflate.findViewById(R.id.off_disabled_overlay);
                 if (findViewById != null) {
-                    i2 = 2131364971;
-                    View findViewById2 = inflate.findViewById(2131364971);
+                    i2 = R.id.setting_disabled_overlay;
+                    View findViewById2 = inflate.findViewById(R.id.setting_disabled_overlay);
                     if (findViewById2 != null) {
-                        i2 = 2131364973;
-                        TextView textView = (TextView) inflate.findViewById(2131364973);
+                        i2 = R.id.setting_label;
+                        TextView textView = (TextView) inflate.findViewById(R.id.setting_label);
                         if (textView != null) {
-                            i2 = 2131364974;
-                            TextView textView2 = (TextView) inflate.findViewById(2131364974);
+                            i2 = R.id.setting_subtext;
+                            TextView textView2 = (TextView) inflate.findViewById(R.id.setting_subtext);
                             if (textView2 != null) {
-                                i2 = 2131365453;
-                                CheckableImageView checkableImageView = (CheckableImageView) inflate.findViewById(2131365453);
+                                i2 = R.id.ternary_check_neutral;
+                                CheckableImageView checkableImageView = (CheckableImageView) inflate.findViewById(R.id.ternary_check_neutral);
                                 if (checkableImageView != null) {
-                                    i2 = 2131365454;
-                                    CheckableImageView checkableImageView2 = (CheckableImageView) inflate.findViewById(2131365454);
+                                    i2 = R.id.ternary_check_off;
+                                    CheckableImageView checkableImageView2 = (CheckableImageView) inflate.findViewById(R.id.ternary_check_off);
                                     if (checkableImageView2 != null) {
-                                        i2 = 2131365455;
-                                        CheckableImageView checkableImageView3 = (CheckableImageView) inflate.findViewById(2131365455);
+                                        i2 = R.id.ternary_check_on;
+                                        CheckableImageView checkableImageView3 = (CheckableImageView) inflate.findViewById(R.id.ternary_check_on);
                                         if (checkableImageView3 != null) {
                                             t3 t3Var = new t3((LinearLayout) inflate, frameLayout, linearLayout, findViewById, findViewById2, textView, textView2, checkableImageView, checkableImageView2, checkableImageView3);
                                             m.checkNotNullExpressionValue(t3Var, "ViewTernaryCheckboxBindi…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/views/ToolbarTitleLayout.java b/app/src/main/java/com/discord/views/ToolbarTitleLayout.java
index fcadb5204a..d6bb6284c0 100644
--- a/app/src/main/java/com/discord/views/ToolbarTitleLayout.java
+++ b/app/src/main/java/com/discord/views/ToolbarTitleLayout.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.u3;
+import com.discord.R;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import d0.z.d.m;
 /* compiled from: ToolbarTitleLayout.kt */
@@ -17,18 +18,18 @@ public final class ToolbarTitleLayout extends ConstraintLayout {
     public ToolbarTitleLayout(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558845, this);
-        int i = 2131365570;
-        ImageView imageView = (ImageView) findViewById(2131365570);
+        LayoutInflater.from(getContext()).inflate(R.layout.view_toolbar_title, this);
+        int i = R.id.toolbar_icon;
+        ImageView imageView = (ImageView) findViewById(R.id.toolbar_icon);
         if (imageView != null) {
-            i = 2131365571;
-            StatusView statusView = (StatusView) findViewById(2131365571);
+            i = R.id.toolbar_presence;
+            StatusView statusView = (StatusView) findViewById(R.id.toolbar_presence);
             if (statusView != null) {
-                i = 2131365572;
-                TextView textView = (TextView) findViewById(2131365572);
+                i = R.id.toolbar_title;
+                TextView textView = (TextView) findViewById(R.id.toolbar_title);
                 if (textView != null) {
-                    i = 2131365573;
-                    TextView textView2 = (TextView) findViewById(2131365573);
+                    i = R.id.toolbar_title_subtext;
+                    TextView textView2 = (TextView) findViewById(R.id.toolbar_title_subtext);
                     if (textView2 != null) {
                         u3 u3Var = new u3(this, imageView, statusView, textView, textView2);
                         m.checkNotNullExpressionValue(u3Var, "ViewToolbarTitleBinding.…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/UploadProgressView.java b/app/src/main/java/com/discord/views/UploadProgressView.java
index 99fbde8719..2505a1bb4b 100644
--- a/app/src/main/java/com/discord/views/UploadProgressView.java
+++ b/app/src/main/java/com/discord/views/UploadProgressView.java
@@ -15,6 +15,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import c.a.j.v3;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import d0.z.d.m;
@@ -29,25 +30,25 @@ public final class UploadProgressView extends ConstraintLayout {
     public UploadProgressView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558846, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_upload_progress, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131364579;
-        ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364579);
+        int i2 = R.id.progress_bar;
+        ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.id.progress_bar);
         if (progressBar != null) {
-            i2 = 2131364583;
-            ImageView imageView = (ImageView) inflate.findViewById(2131364583);
+            i2 = R.id.progress_file_image;
+            ImageView imageView = (ImageView) inflate.findViewById(R.id.progress_file_image);
             if (imageView != null) {
-                i2 = 2131364588;
-                TextView textView = (TextView) inflate.findViewById(2131364588);
+                i2 = R.id.progress_subtext;
+                TextView textView = (TextView) inflate.findViewById(R.id.progress_subtext);
                 if (textView != null) {
-                    i2 = 2131364589;
-                    TextView textView2 = (TextView) inflate.findViewById(2131364589);
+                    i2 = R.id.progress_text;
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.progress_text);
                     if (textView2 != null) {
                         v3 v3Var = new v3((ConstraintLayout) inflate, progressBar, imageView, textView, textView2);
                         m.checkNotNullExpressionValue(v3Var, "ViewUploadProgressBindin…rom(context), this, true)");
                         this.j = v3Var;
-                        this.k = ContextCompat.getDrawable(getContext(), 2131231209);
-                        this.l = ContextCompat.getDrawable(getContext(), DrawableCompat.getThemedDrawableRes$default(this, 2130969921, 0, 2, (Object) null));
+                        this.k = ContextCompat.getDrawable(getContext(), R.drawable.drawable_progress_green);
+                        this.l = ContextCompat.getDrawable(getContext(), DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.progress_gradient, 0, 2, (Object) null));
                         return;
                     }
                 }
diff --git a/app/src/main/java/com/discord/views/UserListItemView.java b/app/src/main/java/com/discord/views/UserListItemView.java
index 27518fa1c0..079576141b 100644
--- a/app/src/main/java/com/discord/views/UserListItemView.java
+++ b/app/src/main/java/com/discord/views/UserListItemView.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import c.a.j.w3;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: UserListItemView.kt */
@@ -17,18 +18,18 @@ public final class UserListItemView extends RelativeLayout {
     public UserListItemView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558847, this);
-        int i2 = 2131365654;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365654);
+        LayoutInflater.from(context).inflate(R.layout.view_user_list_item, this);
+        int i2 = R.id.user_list_item_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.user_list_item_avatar);
         if (simpleDraweeView != null) {
-            i2 = 2131365655;
-            TextView textView = (TextView) findViewById(2131365655);
+            i2 = R.id.user_list_item_name;
+            TextView textView = (TextView) findViewById(R.id.user_list_item_name);
             if (textView != null) {
-                i2 = 2131365656;
-                TextView textView2 = (TextView) findViewById(2131365656);
+                i2 = R.id.user_list_item_name_secondary;
+                TextView textView2 = (TextView) findViewById(R.id.user_list_item_name_secondary);
                 if (textView2 != null) {
-                    i2 = 2131365657;
-                    StatusView statusView = (StatusView) findViewById(2131365657);
+                    i2 = R.id.user_list_item_status;
+                    StatusView statusView = (StatusView) findViewById(R.id.user_list_item_status);
                     if (statusView != null) {
                         w3 w3Var = new w3(this, simpleDraweeView, textView, textView2, statusView);
                         m.checkNotNullExpressionValue(w3Var, "ViewUserListItemBinding.…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/UsernameView.java b/app/src/main/java/com/discord/views/UsernameView.java
index 60041cbc62..406ab952c6 100644
--- a/app/src/main/java/com/discord/views/UsernameView.java
+++ b/app/src/main/java/com/discord/views/UsernameView.java
@@ -23,12 +23,12 @@ public final class UsernameView extends ConstraintLayout {
     public UsernameView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558851, this);
-        int i = 2131365756;
-        TextView textView = (TextView) findViewById(2131365756);
+        LayoutInflater.from(getContext()).inflate(R.layout.view_username, this);
+        int i = R.id.username_tag;
+        TextView textView = (TextView) findViewById(R.id.username_tag);
         if (textView != null) {
-            i = 2131365757;
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365757);
+            i = R.id.username_text;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(R.id.username_text);
             if (simpleDraweeSpanTextView != null) {
                 z3 z3Var = new z3(this, textView, simpleDraweeSpanTextView);
                 m.checkNotNullExpressionValue(z3Var, "ViewUsernameBinding.infl…ater.from(context), this)");
@@ -45,7 +45,7 @@ public final class UsernameView extends ConstraintLayout {
                         if (resourceId != 0) {
                             TextViewCompat.setTextAppearance(simpleDraweeSpanTextView, resourceId);
                         }
-                        simpleDraweeSpanTextView.setTextSize(0, getResources().getDimension(obtainStyledAttributes.getResourceId(5, 2131165780)));
+                        simpleDraweeSpanTextView.setTextSize(0, getResources().getDimension(obtainStyledAttributes.getResourceId(5, R.dimen.uikit_textsize_medium)));
                         m.checkNotNullExpressionValue(textView, "binding.usernameTag");
                         textView.setText(obtainStyledAttributes.getText(0));
                         float f = obtainStyledAttributes.getFloat(2, 0.0f);
@@ -72,7 +72,7 @@ public final class UsernameView extends ConstraintLayout {
     }
 
     private final void setIsVerified(boolean z2) {
-        this.i.b.setCompoundDrawablesWithIntrinsicBounds(z2 ? 2131232094 : 0, 0, 0, 0);
+        this.i.b.setCompoundDrawablesWithIntrinsicBounds(z2 ? R.drawable.ic_verified_10dp : 0, 0, 0, 0);
     }
 
     public final void a(boolean z2, @StringRes int i, boolean z3) {
diff --git a/app/src/main/java/com/discord/views/VoiceUserLimitView.java b/app/src/main/java/com/discord/views/VoiceUserLimitView.java
index 6c63d08cda..365dd51b89 100644
--- a/app/src/main/java/com/discord/views/VoiceUserLimitView.java
+++ b/app/src/main/java/com/discord/views/VoiceUserLimitView.java
@@ -14,6 +14,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.j.c4;
 import c.a.z.e0;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import d0.a0.a;
 import d0.g;
@@ -34,12 +35,12 @@ public final class VoiceUserLimitView extends LinearLayout {
     public VoiceUserLimitView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558855, this);
-        int i = 2131365841;
-        TextView textView = (TextView) findViewById(2131365841);
+        LayoutInflater.from(getContext()).inflate(R.layout.voice_user_limit_view, this);
+        int i = R.id.voice_user_limit_current;
+        TextView textView = (TextView) findViewById(R.id.voice_user_limit_current);
         if (textView != null) {
-            i = 2131365842;
-            TextView textView2 = (TextView) findViewById(2131365842);
+            i = R.id.voice_user_limit_max;
+            TextView textView2 = (TextView) findViewById(R.id.voice_user_limit_max);
             if (textView2 != null) {
                 c4 c4Var = new c4(this, textView, textView2);
                 m.checkNotNullExpressionValue(c4Var, "VoiceUserLimitViewBindin…ater.from(context), this)");
@@ -55,7 +56,7 @@ public final class VoiceUserLimitView extends LinearLayout {
                 Resources resources = getResources();
                 m.checkNotNullExpressionValue(resources, "resources");
                 this.k = a.roundToInt(TypedValue.applyDimension(1, 6.0f, resources.getDisplayMetrics()));
-                paint.setColor(ColorCompat.getThemedColor(getContext(), 2130968898));
+                paint.setColor(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundMobilePrimary));
                 paint.setStrokeWidth(2.0f);
                 paint.setStyle(Paint.Style.FILL_AND_STROKE);
                 paint.setAntiAlias(true);
diff --git a/app/src/main/java/com/discord/views/VoiceUserView.java b/app/src/main/java/com/discord/views/VoiceUserView.java
index fe831aecbd..520768828a 100644
--- a/app/src/main/java/com/discord/views/VoiceUserView.java
+++ b/app/src/main/java/com/discord/views/VoiceUserView.java
@@ -116,12 +116,12 @@ public final class VoiceUserView extends FrameLayout {
         i2 = (i3 & 4) != 0 ? 0 : i2;
         m.checkNotNullParameter(context, "context");
         this.j = 17170445;
-        LayoutInflater.from(context).inflate(2131558853, this);
-        int i4 = 2131365840;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365840);
+        LayoutInflater.from(context).inflate(R.layout.view_voice_user, this);
+        int i4 = R.id.voice_user_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.voice_user_avatar);
         if (simpleDraweeView != null) {
-            i4 = 2131365853;
-            TextView textView = (TextView) findViewById(2131365853);
+            i4 = R.id.voice_user_name_display;
+            TextView textView = (TextView) findViewById(R.id.voice_user_name_display);
             if (textView != null) {
                 b4 b4Var = new b4(this, simpleDraweeView, textView);
                 m.checkNotNullExpressionValue(b4Var, "ViewVoiceUserBinding.inf…ater.from(context), this)");
@@ -156,7 +156,7 @@ public final class VoiceUserView extends FrameLayout {
     private final void setVoiceState(a aVar) {
         if (aVar != this.l) {
             this.l = aVar;
-            setBackgroundResource(aVar.ordinal() != 1 ? this.j : 2131231287);
+            setBackgroundResource(aVar.ordinal() != 1 ? this.j : R.drawable.drawable_voice_user_background_speaking);
             float f = (aVar != a.DISCONNECTED || !this.q) ? 1.0f : 0.3f;
             SimpleDraweeView simpleDraweeView = this.k.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.voiceUserAvatar");
@@ -250,6 +250,6 @@ public final class VoiceUserView extends FrameLayout {
 
     @MainThread
     public final void setVoiceUser(StoreVoiceParticipants.VoiceUser voiceUser) {
-        a(voiceUser, 2131165298);
+        a(voiceUser, R.dimen.avatar_size_unrestricted);
     }
 }
diff --git a/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java b/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java
index 3cc94552b3..79b7b5b769 100644
--- a/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java
+++ b/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java
@@ -8,6 +8,7 @@ import android.view.ViewPropertyAnimator;
 import android.view.animation.PathInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import com.discord.R;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import com.discord.utilities.animations.AnimationCoroutineUtilsKt;
 import com.discord.utilities.views.ViewCoroutineScopeKt;
@@ -330,7 +331,7 @@ public final class SpeakerPulseView extends FrameLayout {
         ViewGroup.LayoutParams layoutParams = childAt.getLayoutParams();
         Integer valueOf = layoutParams != null ? Integer.valueOf(layoutParams.width + ((int) (((float) 2) * paddingLeft * ((float) i3)))) : null;
         imageView.setAlpha(0.0f);
-        imageView.setImageResource(2131231111);
+        imageView.setImageResource(R.drawable.drawable_circle_white);
         int coerceAtLeast = d0.d0.f.coerceAtLeast(speakerPulseView.getChildCount() - 1, 0);
         int intValue = valueOf != null ? valueOf.intValue() : -1;
         if (valueOf != null) {
diff --git a/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java b/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java
index b6a0d18e21..8b78dce88c 100644
--- a/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java
+++ b/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import c.a.j.p3;
+import com.discord.R;
 import com.discord.views.VoiceUserView;
 import d0.z.d.m;
 import rx.Subscription;
@@ -19,27 +20,27 @@ public final class StageCallSpeakerView extends CardView {
     public StageCallSpeakerView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558840, this);
-        int i = 2131365238;
-        VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131365238);
+        LayoutInflater.from(context).inflate(R.layout.view_stage_channel_speaker, this);
+        int i = R.id.stage_channel_speaker;
+        VoiceUserView voiceUserView = (VoiceUserView) findViewById(R.id.stage_channel_speaker);
         if (voiceUserView != null) {
-            i = 2131365239;
-            ImageView imageView = (ImageView) findViewById(2131365239);
+            i = R.id.stage_channel_speaker_blocked;
+            ImageView imageView = (ImageView) findViewById(R.id.stage_channel_speaker_blocked);
             if (imageView != null) {
-                i = 2131365241;
-                ImageView imageView2 = (ImageView) findViewById(2131365241);
+                i = R.id.stage_channel_speaker_deafen_indicator;
+                ImageView imageView2 = (ImageView) findViewById(R.id.stage_channel_speaker_deafen_indicator);
                 if (imageView2 != null) {
-                    i = 2131365242;
-                    ImageView imageView3 = (ImageView) findViewById(2131365242);
+                    i = R.id.stage_channel_speaker_mod_indicator;
+                    ImageView imageView3 = (ImageView) findViewById(R.id.stage_channel_speaker_mod_indicator);
                     if (imageView3 != null) {
-                        i = 2131365243;
-                        ImageView imageView4 = (ImageView) findViewById(2131365243);
+                        i = R.id.stage_channel_speaker_mute_indicator;
+                        ImageView imageView4 = (ImageView) findViewById(R.id.stage_channel_speaker_mute_indicator);
                         if (imageView4 != null) {
-                            i = 2131365244;
-                            TextView textView = (TextView) findViewById(2131365244);
+                            i = R.id.stage_channel_speaker_name;
+                            TextView textView = (TextView) findViewById(R.id.stage_channel_speaker_name);
                             if (textView != null) {
-                                i = 2131365245;
-                                SpeakerPulseView speakerPulseView = (SpeakerPulseView) findViewById(2131365245);
+                                i = R.id.stage_channel_speaker_pulse;
+                                SpeakerPulseView speakerPulseView = (SpeakerPulseView) findViewById(R.id.stage_channel_speaker_pulse);
                                 if (speakerPulseView != null) {
                                     p3 p3Var = new p3(this, voiceUserView, imageView, imageView2, imageView3, imageView4, textView, speakerPulseView);
                                     m.checkNotNullExpressionValue(p3Var, "ViewStageChannelSpeakerB…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java b/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java
index 9cee627aab..ebceda950d 100644
--- a/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java
+++ b/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java
@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.q3;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: StageCallVisitCommunityView.kt */
@@ -18,16 +19,16 @@ public final class StageCallVisitCommunityView extends ConstraintLayout {
     public StageCallVisitCommunityView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558841, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_stage_channel_visit_community, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365803;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365803);
+        int i = R.id.visit_community_icon;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.visit_community_icon);
         if (simpleDraweeView != null) {
-            i = 2131365804;
-            TextView textView = (TextView) inflate.findViewById(2131365804);
+            i = R.id.visit_community_icon_text;
+            TextView textView = (TextView) inflate.findViewById(R.id.visit_community_icon_text);
             if (textView != null) {
-                i = 2131365805;
-                TextView textView2 = (TextView) inflate.findViewById(2131365805);
+                i = R.id.visit_community_text;
+                TextView textView2 = (TextView) inflate.findViewById(R.id.visit_community_text);
                 if (textView2 != null) {
                     q3 q3Var = new q3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2);
                     m.checkNotNullExpressionValue(q3Var, "ViewStageChannelVisitCom…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
index a14559dd1e..4117ce1368 100644
--- a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
+++ b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 import androidx.annotation.MainThread;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.DisplayCutoutCompat;
 import androidx.core.view.ViewGroupKt;
@@ -368,7 +369,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             @Override // com.discord.views.calls.VideoCallParticipantView.StreamResolution
             public CharSequence a(Context context) {
                 m.checkNotNullParameter(context, "context");
-                return c.a.l.b.h(context, 2131893423, new Object[]{Integer.valueOf(this.a)}, null, 4);
+                return c.a.l.b.h(context, R.string.screenshare_resolution_abbreviated, new Object[]{Integer.valueOf(this.a)}, null, 4);
             }
 
             public boolean equals(Object obj) {
@@ -398,7 +399,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             @Override // com.discord.views.calls.VideoCallParticipantView.StreamResolution
             public CharSequence a(Context context) {
                 m.checkNotNullParameter(context, "context");
-                return c.a.l.b.h(context, 2131893427, new Object[0], null, 4);
+                return c.a.l.b.h(context, R.string.screenshare_source, new Object[0], null, 4);
             }
         }
 
@@ -445,80 +446,80 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         AttributeSet attributeSet2 = (i2 & 2) != 0 ? null : attributeSet;
         int i3 = (i2 & 4) != 0 ? 0 : i;
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558852, this);
-        int i4 = 2131364365;
-        View findViewById = findViewById(2131364365);
+        LayoutInflater.from(context).inflate(R.layout.view_video_call_participant, this);
+        int i4 = R.id.participant_bg_avatar;
+        View findViewById = findViewById(R.id.participant_bg_avatar);
         if (findViewById != null) {
-            i4 = 2131364366;
-            View findViewById2 = findViewById(2131364366);
+            i4 = R.id.participant_bg_letterbox;
+            View findViewById2 = findViewById(R.id.participant_bg_letterbox);
             if (findViewById2 != null) {
-                i4 = 2131364367;
-                ImageView imageView = (ImageView) findViewById(2131364367);
+                i4 = R.id.participant_deafen_status_indicator;
+                ImageView imageView = (ImageView) findViewById(R.id.participant_deafen_status_indicator);
                 if (imageView != null) {
-                    i4 = 2131364368;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364368);
+                    i4 = R.id.participant_fullscreen_streamqual_container;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(R.id.participant_fullscreen_streamqual_container);
                     if (constraintLayout != null) {
-                        i4 = 2131364369;
-                        Space space = (Space) findViewById(2131364369);
+                        i4 = R.id.participant_fullscreen_streamqual_divider;
+                        Space space = (Space) findViewById(R.id.participant_fullscreen_streamqual_divider);
                         if (space != null) {
-                            i4 = 2131364370;
-                            ImageView imageView2 = (ImageView) findViewById(2131364370);
+                            i4 = R.id.participant_fullscreen_streamqual_icon;
+                            ImageView imageView2 = (ImageView) findViewById(R.id.participant_fullscreen_streamqual_icon);
                             if (imageView2 != null) {
-                                i4 = 2131364371;
-                                TextView textView = (TextView) findViewById(2131364371);
+                                i4 = R.id.participant_fullscreen_streamqual_info;
+                                TextView textView = (TextView) findViewById(R.id.participant_fullscreen_streamqual_info);
                                 if (textView != null) {
-                                    i4 = 2131364372;
-                                    LinearLayout linearLayout = (LinearLayout) findViewById(2131364372);
+                                    i4 = R.id.participant_fullscreen_streamqual_info_container;
+                                    LinearLayout linearLayout = (LinearLayout) findViewById(R.id.participant_fullscreen_streamqual_info_container);
                                     if (linearLayout != null) {
-                                        i4 = 2131364373;
-                                        TextView textView2 = (TextView) findViewById(2131364373);
+                                        i4 = R.id.participant_fullscreen_streamqual_live_indicator;
+                                        TextView textView2 = (TextView) findViewById(R.id.participant_fullscreen_streamqual_live_indicator);
                                         if (textView2 != null) {
-                                            i4 = 2131364374;
-                                            TextView textView3 = (TextView) findViewById(2131364374);
+                                            i4 = R.id.participant_live_indicator;
+                                            TextView textView3 = (TextView) findViewById(R.id.participant_live_indicator);
                                             if (textView3 != null) {
-                                                i4 = 2131364375;
-                                                ImageView imageView3 = (ImageView) findViewById(2131364375);
+                                                i4 = R.id.participant_mute_status_indicator;
+                                                ImageView imageView3 = (ImageView) findViewById(R.id.participant_mute_status_indicator);
                                                 if (imageView3 != null) {
-                                                    i4 = 2131364376;
-                                                    ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364376);
+                                                    i4 = R.id.participant_stream_ended;
+                                                    ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(R.id.participant_stream_ended);
                                                     if (constraintLayout2 != null) {
-                                                        i4 = 2131364377;
-                                                        ImageView imageView4 = (ImageView) findViewById(2131364377);
+                                                        i4 = R.id.participant_stream_ended_img;
+                                                        ImageView imageView4 = (ImageView) findViewById(R.id.participant_stream_ended_img);
                                                         if (imageView4 != null) {
-                                                            i4 = 2131364378;
-                                                            TextView textView4 = (TextView) findViewById(2131364378);
+                                                            i4 = R.id.participant_stream_ended_label;
+                                                            TextView textView4 = (TextView) findViewById(R.id.participant_stream_ended_label);
                                                             if (textView4 != null) {
-                                                                i4 = 2131364379;
-                                                                TextView textView5 = (TextView) findViewById(2131364379);
+                                                                i4 = R.id.participant_stream_paused;
+                                                                TextView textView5 = (TextView) findViewById(R.id.participant_stream_paused);
                                                                 if (textView5 != null) {
-                                                                    i4 = 2131364380;
-                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364380);
+                                                                    i4 = R.id.participant_stream_preview_image;
+                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.participant_stream_preview_image);
                                                                     if (simpleDraweeView != null) {
-                                                                        i4 = 2131364381;
-                                                                        TextView textView6 = (TextView) findViewById(2131364381);
+                                                                        i4 = R.id.participant_stream_preview_text;
+                                                                        TextView textView6 = (TextView) findViewById(R.id.participant_stream_preview_text);
                                                                         if (textView6 != null) {
-                                                                            i4 = 2131364382;
-                                                                            TextView textView7 = (TextView) findViewById(2131364382);
+                                                                            i4 = R.id.participant_video_label;
+                                                                            TextView textView7 = (TextView) findViewById(R.id.participant_video_label);
                                                                             if (textView7 != null) {
-                                                                                i4 = 2131364383;
-                                                                                ProgressBar progressBar = (ProgressBar) findViewById(2131364383);
+                                                                                i4 = R.id.participant_video_loading_indicator;
+                                                                                ProgressBar progressBar = (ProgressBar) findViewById(R.id.participant_video_loading_indicator);
                                                                                 if (progressBar != null) {
-                                                                                    i4 = 2131364384;
-                                                                                    AppVideoStreamRenderer appVideoStreamRenderer2 = (AppVideoStreamRenderer) findViewById(2131364384);
+                                                                                    i4 = R.id.participant_video_stream_renderer;
+                                                                                    AppVideoStreamRenderer appVideoStreamRenderer2 = (AppVideoStreamRenderer) findViewById(R.id.participant_video_stream_renderer);
                                                                                     if (appVideoStreamRenderer2 != null) {
-                                                                                        i4 = 2131364385;
-                                                                                        LinearLayout linearLayout2 = (LinearLayout) findViewById(2131364385);
+                                                                                        i4 = R.id.participant_voice_indicators;
+                                                                                        LinearLayout linearLayout2 = (LinearLayout) findViewById(R.id.participant_voice_indicators);
                                                                                         if (linearLayout2 != null) {
-                                                                                            i4 = 2131364386;
-                                                                                            VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364386);
+                                                                                            i4 = R.id.participant_voice_user_view;
+                                                                                            VoiceUserView voiceUserView = (VoiceUserView) findViewById(R.id.participant_voice_user_view);
                                                                                             if (voiceUserView != null) {
                                                                                                 a4 a4Var = new a4(this, findViewById, findViewById2, imageView, constraintLayout, space, imageView2, textView, linearLayout, textView2, textView3, imageView3, constraintLayout2, imageView4, textView4, textView5, simpleDraweeView, textView6, textView7, progressBar, appVideoStreamRenderer2, linearLayout2, voiceUserView);
                                                                                                 m.checkNotNullExpressionValue(a4Var, "ViewVideoCallParticipant…ater.from(context), this)");
                                                                                                 this.i = a4Var;
                                                                                                 this.m = j.i;
                                                                                                 this.f2156s = new VideoCallGridAdapter.CallUiInsets(0, 0, 0, 0);
-                                                                                                this.u = ContextCompat.getDrawable(context, 2131230960);
-                                                                                                this.v = ContextCompat.getDrawable(context, 2131230961);
+                                                                                                this.u = ContextCompat.getDrawable(context, R.drawable.bg_stream_live_indicator);
+                                                                                                this.v = ContextCompat.getDrawable(context, R.drawable.bg_stream_live_indicator_split_pill);
                                                                                                 this.w = t.i;
                                                                                                 this.f2157x = t.j;
                                                                                                 if (attributeSet2 != null) {
@@ -601,7 +602,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
             m.checkNotNullParameter(context2, "context");
-            charSequence = b.h(context2, 2131893416, new Object[]{Integer.valueOf(streamFps.a)}, null, 4);
+            charSequence = b.h(context2, R.string.screenshare_fps_abbreviated, new Object[]{Integer.valueOf(streamFps.a)}, null, 4);
         } else {
             charSequence = "";
         }
@@ -616,11 +617,11 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         TextView textView = this.i.h;
         m.checkNotNullExpressionValue(textView, "binding.participantFulls…enStreamqualLiveIndicator");
         textView.setBackground(drawable);
-        int i2 = aVar.d ? 2131100126 : 2131100433;
+        int i2 = aVar.d ? R.color.primary_300 : R.color.white;
         TextView textView2 = this.i.g;
         textView2.setText(obj);
         CharSequence text = textView2.getText();
-        m.checkNotNullExpressionValue(text, "text");
+        m.checkNotNullExpressionValue(text, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         if (!(text.length() > 0)) {
             i = 8;
         }
@@ -665,7 +666,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         if (voiceUser != null) {
             String colorId = RepresentativeColorsKt.getColorId(voiceUser.getUser());
             this.i.f66s.setOnBitmapLoadedListener(new k(colorId));
-            this.i.f66s.a(voiceUser, 2131165288);
+            this.i.f66s.a(voiceUser, R.dimen.avatar_size_hero);
             Subscription subscription2 = this.n;
             if (subscription2 != null) {
                 subscription2.unsubscribe();
@@ -971,8 +972,8 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                     if (participantData.g == ParticipantData.Type.APPLICATION_STREAMING) {
                         Context context = getContext();
                         m.checkNotNullExpressionValue(context, "context");
-                        setContentDescription(b.h(context, 2131889174, new Object[]{voiceUser.getDisplayName()}, null, 4));
-                        this.i.o.setCompoundDrawablesWithIntrinsicBounds(2131231953, 0, 0, 0);
+                        setContentDescription(b.h(context, R.string.go_live_tile_screen, new Object[]{voiceUser.getDisplayName()}, null, 4));
+                        this.i.o.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_screen_14dp, 0, 0, 0);
                     } else {
                         setContentDescription(voiceUser.getDisplayName());
                         this.i.o.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
diff --git a/app/src/main/java/com/discord/views/calls/VolumeSliderView.java b/app/src/main/java/com/discord/views/calls/VolumeSliderView.java
index d4da3f0b8b..280ca255e0 100644
--- a/app/src/main/java/com/discord/views/calls/VolumeSliderView.java
+++ b/app/src/main/java/com/discord/views/calls/VolumeSliderView.java
@@ -38,15 +38,15 @@ public final class VolumeSliderView extends LinearLayout {
     public VolumeSliderView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558860, this);
-        int i = 2131365854;
-        ImageView imageView = (ImageView) findViewById(2131365854);
+        LayoutInflater.from(getContext()).inflate(R.layout.volume_slider_view, this);
+        int i = R.id.volume_slider_max_vol;
+        ImageView imageView = (ImageView) findViewById(R.id.volume_slider_max_vol);
         if (imageView != null) {
-            i = 2131365855;
-            ImageView imageView2 = (ImageView) findViewById(2131365855);
+            i = R.id.volume_slider_min_vol;
+            ImageView imageView2 = (ImageView) findViewById(R.id.volume_slider_min_vol);
             if (imageView2 != null) {
-                i = 2131365856;
-                SeekBar seekBar = (SeekBar) findViewById(2131365856);
+                i = R.id.volume_slider_seek_bar;
+                SeekBar seekBar = (SeekBar) findViewById(R.id.volume_slider_seek_bar);
                 if (seekBar != null) {
                     d4 d4Var = new d4(this, imageView, imageView2, seekBar);
                     m.checkNotNullExpressionValue(d4Var, "VolumeSliderViewBinding.…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java b/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java
index 1a3898f989..4ae1339ade 100644
--- a/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java
+++ b/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java
@@ -10,6 +10,7 @@ import androidx.core.content.ContextCompat;
 import c.a.j.q;
 import c.a.z.j0.a;
 import c.a.z.j0.b;
+import com.discord.R;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
@@ -23,18 +24,18 @@ public final class GuildChannelSideBarActionsView extends LinearLayout {
     public GuildChannelSideBarActionsView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558516, this);
-        int i = 2131362393;
-        MaterialButton materialButton = (MaterialButton) findViewById(2131362393);
+        LayoutInflater.from(getContext()).inflate(R.layout.guild_channel_side_bar_actions_view, this);
+        int i = R.id.channel_sidebar_actions_notifications;
+        MaterialButton materialButton = (MaterialButton) findViewById(R.id.channel_sidebar_actions_notifications);
         if (materialButton != null) {
-            i = 2131362394;
-            MaterialButton materialButton2 = (MaterialButton) findViewById(2131362394);
+            i = R.id.channel_sidebar_actions_pins;
+            MaterialButton materialButton2 = (MaterialButton) findViewById(R.id.channel_sidebar_actions_pins);
             if (materialButton2 != null) {
-                i = 2131362395;
-                MaterialButton materialButton3 = (MaterialButton) findViewById(2131362395);
+                i = R.id.channel_sidebar_actions_search;
+                MaterialButton materialButton3 = (MaterialButton) findViewById(R.id.channel_sidebar_actions_search);
                 if (materialButton3 != null) {
-                    i = 2131362396;
-                    MaterialButton materialButton4 = (MaterialButton) findViewById(2131362396);
+                    i = R.id.channel_sidebar_actions_settings;
+                    MaterialButton materialButton4 = (MaterialButton) findViewById(R.id.channel_sidebar_actions_settings);
                     if (materialButton4 != null) {
                         q qVar = new q(this, materialButton, materialButton2, materialButton3, materialButton4);
                         m.checkNotNullExpressionValue(qVar, "GuildChannelSideBarActio…ater.from(context), this)");
@@ -53,8 +54,8 @@ public final class GuildChannelSideBarActionsView extends LinearLayout {
         m.checkNotNullParameter(function12, "onNotificationsClicked");
         m.checkNotNullParameter(function13, "onPinsClicked");
         m.checkNotNullParameter(function14, "onSettingsClicked");
-        int themedDrawableRes$default = z2 ? DrawableCompat.getThemedDrawableRes$default(this, 2130969460, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969459, 0, 2, (Object) null);
-        int themedDrawableRes$default2 = z3 ? DrawableCompat.getThemedDrawableRes$default(this, 2130969457, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969458, 0, 2, (Object) null);
+        int themedDrawableRes$default = z2 ? DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_sidebar_pins_on_24dp, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_sidebar_pins_off_24dp, 0, 2, (Object) null);
+        int themedDrawableRes$default2 = z3 ? DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_sidebar_notifications_off_24dp, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_sidebar_notifications_on_24dp, 0, 2, (Object) null);
         this.i.d.setOnClickListener(new a(function1));
         this.i.e.setOnClickListener(new a(function14));
         MaterialButton materialButton = this.i.f148c;
@@ -66,6 +67,6 @@ public final class GuildChannelSideBarActionsView extends LinearLayout {
         MaterialButton materialButton3 = this.i.b;
         DrawableCompat.setCompoundDrawablesCompat(materialButton3, (Drawable) null, ContextCompat.getDrawable(materialButton3.getContext(), themedDrawableRes$default2), (Drawable) null, (Drawable) null);
         materialButton3.setOnClickListener(new b(function12));
-        materialButton3.setContentDescription(z3 ? materialButton3.getContext().getString(2131891876) : materialButton3.getContext().getString(2131891875));
+        materialButton3.setContentDescription(z3 ? materialButton3.getContext().getString(R.string.notifications_muted) : materialButton3.getContext().getString(R.string.notifications));
     }
 }
diff --git a/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java b/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java
index 5f5fd4bda6..5b98c3d858 100644
--- a/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java
+++ b/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java
@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.core.content.ContextCompat;
 import c.a.j.b1;
+import com.discord.R;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
@@ -19,18 +20,18 @@ public final class PrivateChannelSideBarActionsView extends LinearLayout {
     public PrivateChannelSideBarActionsView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558656, this);
-        int i = 2131364561;
-        MaterialButton materialButton = (MaterialButton) findViewById(2131364561);
+        LayoutInflater.from(getContext()).inflate(R.layout.private_channel_side_bar_actions_view, this);
+        int i = R.id.private_channel_sidebar_actions_call;
+        MaterialButton materialButton = (MaterialButton) findViewById(R.id.private_channel_sidebar_actions_call);
         if (materialButton != null) {
-            i = 2131364562;
-            MaterialButton materialButton2 = (MaterialButton) findViewById(2131364562);
+            i = R.id.private_channel_sidebar_actions_notifications;
+            MaterialButton materialButton2 = (MaterialButton) findViewById(R.id.private_channel_sidebar_actions_notifications);
             if (materialButton2 != null) {
-                i = 2131364563;
-                MaterialButton materialButton3 = (MaterialButton) findViewById(2131364563);
+                i = R.id.private_channel_sidebar_actions_search;
+                MaterialButton materialButton3 = (MaterialButton) findViewById(R.id.private_channel_sidebar_actions_search);
                 if (materialButton3 != null) {
-                    i = 2131364564;
-                    MaterialButton materialButton4 = (MaterialButton) findViewById(2131364564);
+                    i = R.id.private_channel_sidebar_actions_video;
+                    MaterialButton materialButton4 = (MaterialButton) findViewById(R.id.private_channel_sidebar_actions_video);
                     if (materialButton4 != null) {
                         b1 b1Var = new b1(this, materialButton, materialButton2, materialButton3, materialButton4);
                         m.checkNotNullExpressionValue(b1Var, "PrivateChannelSideBarAct…ater.from(context), this)");
@@ -49,7 +50,7 @@ public final class PrivateChannelSideBarActionsView extends LinearLayout {
         m.checkNotNullParameter(onClickListener2, "onVideoClicked");
         m.checkNotNullParameter(onClickListener3, "onNotificationsClicked");
         m.checkNotNullParameter(onClickListener4, "onSearchClicked");
-        int themedDrawableRes$default = z2 ? DrawableCompat.getThemedDrawableRes$default(this, 2130969457, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969458, 0, 2, (Object) null);
+        int themedDrawableRes$default = z2 ? DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_sidebar_notifications_off_24dp, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_sidebar_notifications_on_24dp, 0, 2, (Object) null);
         this.i.b.setOnClickListener(onClickListener);
         this.i.e.setOnClickListener(onClickListener2);
         MaterialButton materialButton = this.i.f70c;
diff --git a/app/src/main/java/com/discord/views/directories/ServerDiscoveryHeader.java b/app/src/main/java/com/discord/views/directories/ServerDiscoveryHeader.java
index 7fb9a2566d..8f1e6670a6 100644
--- a/app/src/main/java/com/discord/views/directories/ServerDiscoveryHeader.java
+++ b/app/src/main/java/com/discord/views/directories/ServerDiscoveryHeader.java
@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.y2;
+import com.discord.R;
 import d0.z.d.m;
 /* compiled from: ServerDiscoveryHeader.kt */
 public final class ServerDiscoveryHeader extends ConstraintLayout {
@@ -18,18 +19,18 @@ public final class ServerDiscoveryHeader extends ConstraintLayout {
     public ServerDiscoveryHeader(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558817, this);
-        int i = 2131364816;
-        TextView textView = (TextView) findViewById(2131364816);
+        LayoutInflater.from(context).inflate(R.layout.view_server_discovery_header, this);
+        int i = R.id.server_discovery_header_description;
+        TextView textView = (TextView) findViewById(R.id.server_discovery_header_description);
         if (textView != null) {
-            i = 2131364817;
-            ImageView imageView = (ImageView) findViewById(2131364817);
+            i = R.id.server_discovery_header_image;
+            ImageView imageView = (ImageView) findViewById(R.id.server_discovery_header_image);
             if (imageView != null) {
-                i = 2131364818;
-                FrameLayout frameLayout = (FrameLayout) findViewById(2131364818);
+                i = R.id.server_discovery_header_search_layout;
+                FrameLayout frameLayout = (FrameLayout) findViewById(R.id.server_discovery_header_search_layout);
                 if (frameLayout != null) {
-                    i = 2131364819;
-                    TextView textView2 = (TextView) findViewById(2131364819);
+                    i = R.id.server_discovery_header_title;
+                    TextView textView2 = (TextView) findViewById(R.id.server_discovery_header_title);
                     if (textView2 != null) {
                         y2 y2Var = new y2(this, textView, imageView, frameLayout, textView2);
                         m.checkNotNullExpressionValue(y2Var, "ViewServerDiscoveryHeade…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/directories/ServerDiscoveryItem.java b/app/src/main/java/com/discord/views/directories/ServerDiscoveryItem.java
index 3349e41683..83cea50d59 100644
--- a/app/src/main/java/com/discord/views/directories/ServerDiscoveryItem.java
+++ b/app/src/main/java/com/discord/views/directories/ServerDiscoveryItem.java
@@ -11,6 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.b3;
 import c.a.j.z2;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.views.GuildView;
 import com.google.android.material.button.MaterialButton;
@@ -23,30 +24,30 @@ public final class ServerDiscoveryItem extends ConstraintLayout {
     public ServerDiscoveryItem(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558818, this);
-        int i = 2131362214;
-        Barrier barrier = (Barrier) findViewById(2131362214);
+        LayoutInflater.from(context).inflate(R.layout.view_server_discovery_item, this);
+        int i = R.id.button_barrier;
+        Barrier barrier = (Barrier) findViewById(R.id.button_barrier);
         if (barrier != null) {
-            i = 2131364820;
-            Barrier barrier2 = (Barrier) findViewById(2131364820);
+            i = R.id.server_discovery_item_barrier;
+            Barrier barrier2 = (Barrier) findViewById(R.id.server_discovery_item_barrier);
             if (barrier2 != null) {
-                i = 2131364821;
-                MaterialButton materialButton = (MaterialButton) findViewById(2131364821);
+                i = R.id.server_discovery_item_button;
+                MaterialButton materialButton = (MaterialButton) findViewById(R.id.server_discovery_item_button);
                 if (materialButton != null) {
-                    i = 2131364822;
-                    MaterialButton materialButton2 = (MaterialButton) findViewById(2131364822);
+                    i = R.id.server_discovery_item_button_joined;
+                    MaterialButton materialButton2 = (MaterialButton) findViewById(R.id.server_discovery_item_button_joined);
                     if (materialButton2 != null) {
-                        i = 2131364823;
-                        View findViewById = findViewById(2131364823);
+                        i = R.id.server_discovery_item_count_container;
+                        View findViewById = findViewById(R.id.server_discovery_item_count_container);
                         if (findViewById != null) {
                             b3 a = b3.a(findViewById);
-                            TextView textView = (TextView) findViewById(2131364824);
+                            TextView textView = (TextView) findViewById(R.id.server_discovery_item_description);
                             if (textView != null) {
-                                GuildView guildView = (GuildView) findViewById(2131364825);
+                                GuildView guildView = (GuildView) findViewById(R.id.server_discovery_item_image);
                                 if (guildView != null) {
-                                    ImageView imageView = (ImageView) findViewById(2131364826);
+                                    ImageView imageView = (ImageView) findViewById(R.id.server_discovery_item_overflow);
                                     if (imageView != null) {
-                                        TextView textView2 = (TextView) findViewById(2131364827);
+                                        TextView textView2 = (TextView) findViewById(R.id.server_discovery_item_title);
                                         if (textView2 != null) {
                                             z2 z2Var = new z2(this, barrier, barrier2, materialButton, materialButton2, a, textView, guildView, imageView, textView2);
                                             m.checkNotNullExpressionValue(z2Var, "ViewServerDiscoveryItemB…ater.from(context), this)");
@@ -60,15 +61,15 @@ public final class ServerDiscoveryItem extends ConstraintLayout {
                                             imageView3.setVisibility(0);
                                             return;
                                         }
-                                        i = 2131364827;
+                                        i = R.id.server_discovery_item_title;
                                     } else {
-                                        i = 2131364826;
+                                        i = R.id.server_discovery_item_overflow;
                                     }
                                 } else {
-                                    i = 2131364825;
+                                    i = R.id.server_discovery_item_image;
                                 }
                             } else {
-                                i = 2131364824;
+                                i = R.id.server_discovery_item_description;
                             }
                         }
                     }
@@ -110,13 +111,13 @@ public final class ServerDiscoveryItem extends ConstraintLayout {
         m.checkNotNullExpressionValue(textView, "binding.serverDiscoveryI…itemInviteTotalMemberText");
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        textView.setText(StringResourceUtilsKt.getI18nPluralString(context, 2131755229, i, Integer.valueOf(i)));
+        textView.setText(StringResourceUtilsKt.getI18nPluralString(context, R.plurals.members_header_members, i, Integer.valueOf(i)));
     }
 
     public final void setOnline(int i) {
         TextView textView = this.i.d.f72c;
         m.checkNotNullExpressionValue(textView, "binding.serverDiscoveryI…iner.itemInviteOnlineText");
-        textView.setText(b.j(this, 2131890667, new Object[]{Integer.valueOf(i)}, null, 4));
+        textView.setText(b.j(this, R.string.instant_invite_guild_members_online, new Object[]{Integer.valueOf(i)}, null, 4));
     }
 
     public final void setOverflowOnClickListener(View.OnClickListener onClickListener) {
diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java
index db9f7c30da..5d343768a7 100644
--- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java
+++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.y1;
+import com.discord.R;
 import com.discord.utilities.locale.LocaleManager;
 import com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -23,33 +24,33 @@ public final class DiscoveryStageCardBodyView extends ConstraintLayout {
     public DiscoveryStageCardBodyView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558758, this);
-        int i = 2131365248;
-        LinearLayout linearLayout = (LinearLayout) findViewById(2131365248);
+        LayoutInflater.from(context).inflate(R.layout.view_discovery_stage_card_body, this);
+        int i = R.id.stage_discovery_audience_badge;
+        LinearLayout linearLayout = (LinearLayout) findViewById(R.id.stage_discovery_audience_badge);
         if (linearLayout != null) {
-            i = 2131365249;
-            TextView textView = (TextView) findViewById(2131365249);
+            i = R.id.stage_discovery_audience_badge_text;
+            TextView textView = (TextView) findViewById(R.id.stage_discovery_audience_badge_text);
             if (textView != null) {
-                i = 2131365250;
-                Barrier barrier = (Barrier) findViewById(2131365250);
+                i = R.id.stage_discovery_badge_barrier;
+                Barrier barrier = (Barrier) findViewById(R.id.stage_discovery_badge_barrier);
                 if (barrier != null) {
-                    i = 2131365251;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365251);
+                    i = R.id.stage_discovery_guild_icon;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.stage_discovery_guild_icon);
                     if (simpleDraweeView != null) {
-                        i = 2131365252;
-                        TextView textView2 = (TextView) findViewById(2131365252);
+                        i = R.id.stage_discovery_guild_icon_text;
+                        TextView textView2 = (TextView) findViewById(R.id.stage_discovery_guild_icon_text);
                         if (textView2 != null) {
-                            i = 2131365253;
-                            FrameLayout frameLayout = (FrameLayout) findViewById(2131365253);
+                            i = R.id.stage_discovery_guild_icon_wrap;
+                            FrameLayout frameLayout = (FrameLayout) findViewById(R.id.stage_discovery_guild_icon_wrap);
                             if (frameLayout != null) {
-                                i = 2131365254;
-                                TextView textView3 = (TextView) findViewById(2131365254);
+                                i = R.id.stage_discovery_guild_name;
+                                TextView textView3 = (TextView) findViewById(R.id.stage_discovery_guild_name);
                                 if (textView3 != null) {
-                                    i = 2131365255;
-                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) findViewById(2131365255);
+                                    i = R.id.stage_discovery_speakers_view;
+                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) findViewById(R.id.stage_discovery_speakers_view);
                                     if (discoveryStageCardSpeakersView != null) {
-                                        i = 2131365256;
-                                        TextView textView4 = (TextView) findViewById(2131365256);
+                                        i = R.id.stage_discovery_stage_name;
+                                        TextView textView4 = (TextView) findViewById(R.id.stage_discovery_stage_name);
                                         if (textView4 != null) {
                                             y1 y1Var = new y1(this, linearLayout, textView, barrier, simpleDraweeView, textView2, frameLayout, textView3, discoveryStageCardSpeakersView, textView4);
                                             m.checkNotNullExpressionValue(y1Var, "ViewDiscoveryStageCardBo…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java
index 4044e3d348..67ad0d535d 100644
--- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java
+++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.z1;
+import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
 /* compiled from: DiscoveryStageCardControlsView.kt */
@@ -17,18 +18,18 @@ public final class DiscoveryStageCardControlsView extends ConstraintLayout {
     public DiscoveryStageCardControlsView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558759, this);
-        int i = 2131362996;
-        ImageView imageView = (ImageView) findViewById(2131362996);
+        LayoutInflater.from(context).inflate(R.layout.view_discovery_stage_card_controls, this);
+        int i = R.id.discovery_control_audio_icon;
+        ImageView imageView = (ImageView) findViewById(R.id.discovery_control_audio_icon);
         if (imageView != null) {
-            i = 2131362997;
-            MaterialButton materialButton = (MaterialButton) findViewById(2131362997);
+            i = R.id.discovery_control_exit_quietly;
+            MaterialButton materialButton = (MaterialButton) findViewById(R.id.discovery_control_exit_quietly);
             if (materialButton != null) {
-                i = 2131362998;
-                TextView textView = (TextView) findViewById(2131362998);
+                i = R.id.discovery_control_joined_as;
+                TextView textView = (TextView) findViewById(R.id.discovery_control_joined_as);
                 if (textView != null) {
-                    i = 2131362999;
-                    MaterialButton materialButton2 = (MaterialButton) findViewById(2131362999);
+                    i = R.id.discovery_control_open_stage;
+                    MaterialButton materialButton2 = (MaterialButton) findViewById(R.id.discovery_control_open_stage);
                     if (materialButton2 != null) {
                         z1 z1Var = new z1(this, imageView, materialButton, textView, materialButton2);
                         m.checkNotNullExpressionValue(z1Var, "ViewDiscoveryStageCardCo…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java
index 1036de9b1b..0c8156fcac 100644
--- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java
+++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.j.b2;
+import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: DiscoveryStageCardTopHatView.kt */
@@ -16,12 +17,12 @@ public final class DiscoveryStageCardTopHatView extends LinearLayout {
     public DiscoveryStageCardTopHatView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558761, this);
-        int i = 2131363016;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363016);
+        LayoutInflater.from(context).inflate(R.layout.view_discovery_stage_card_top_hat, this);
+        int i = R.id.discovery_stage_card_top_hat_icon;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.discovery_stage_card_top_hat_icon);
         if (simpleDraweeView != null) {
-            i = 2131363017;
-            TextView textView = (TextView) findViewById(2131363017);
+            i = R.id.discovery_stage_card_top_hat_text;
+            TextView textView = (TextView) findViewById(R.id.discovery_stage_card_top_hat_text);
             if (textView != null) {
                 b2 b2Var = new b2(this, simpleDraweeView, textView);
                 m.checkNotNullExpressionValue(b2Var, "ViewDiscoveryStageCardTo…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java b/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java
index d6c8b974b4..397303dc28 100644
--- a/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java
+++ b/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.a2;
 import c.a.z.k0.c.c;
 import c.a.z.k0.c.d;
+import com.discord.R;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
 import com.discord.widgets.stage.discovery.StageCardSpeaker;
@@ -54,8 +55,8 @@ public final class DiscoveryStageCardSpeakersView extends LinearLayout {
     public DiscoveryStageCardSpeakersView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558760, this);
-        SpeakersRecyclerView speakersRecyclerView = (SpeakersRecyclerView) findViewById(2131363008);
+        LayoutInflater.from(context).inflate(R.layout.view_discovery_stage_card_speakers, this);
+        SpeakersRecyclerView speakersRecyclerView = (SpeakersRecyclerView) findViewById(R.id.discovery_speakers_recycler);
         if (speakersRecyclerView != null) {
             a2 a2Var = new a2(this, speakersRecyclerView);
             m.checkNotNullExpressionValue(a2Var, "ViewDiscoveryStageCardSp…ater.from(context), this)");
@@ -74,7 +75,7 @@ public final class DiscoveryStageCardSpeakersView extends LinearLayout {
             recycler.setHasFixedSize(false);
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131363008)));
+        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(R.id.discovery_speakers_recycler)));
     }
 
     /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(r12v1 int), ('-' char), (r14v6 int)] */
diff --git a/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java b/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java
index 32723a52e3..1289cbe267 100644
--- a/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java
+++ b/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java
@@ -9,8 +9,10 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.app.NotificationCompat;
 import c.a.j.c2;
 import c.a.j.o3;
+import com.discord.R;
 import com.google.android.material.card.MaterialCardView;
 import d0.z.d.m;
 import java.util.List;
@@ -25,7 +27,7 @@ public final class ExperimentOverrideView extends ConstraintLayout {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public a(Context context, List<b> list) {
-            super(context, 2131558839, list);
+            super(context, (int) R.layout.view_simple_spinner_dropdown_item, list);
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(list, "items");
             this.i = list;
@@ -35,7 +37,7 @@ public final class ExperimentOverrideView extends ConstraintLayout {
         /* JADX WARN: Multi-variable type inference failed */
         public final View a(int i, View view) {
             if (view == 0) {
-                View inflate = LayoutInflater.from(getContext()).inflate(2131558839, (ViewGroup) null, false);
+                View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_simple_spinner_dropdown_item, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 view = (TextView) inflate;
                 m.checkNotNullExpressionValue(new o3(view), "ViewSimpleSpinnerDropdow…om(context), null, false)");
@@ -83,7 +85,7 @@ public final class ExperimentOverrideView extends ConstraintLayout {
         public final String b;
 
         public b(Integer num, String str) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.a = num;
             this.b = str;
         }
@@ -122,24 +124,24 @@ public final class ExperimentOverrideView extends ConstraintLayout {
     public ExperimentOverrideView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558762, this);
-        int i = 2131363209;
-        TextView textView = (TextView) findViewById(2131363209);
+        LayoutInflater.from(context).inflate(R.layout.view_experiment_override, this);
+        int i = R.id.experiment_override_bucket_descriptions;
+        TextView textView = (TextView) findViewById(R.id.experiment_override_bucket_descriptions);
         if (textView != null) {
-            i = 2131363210;
-            Spinner spinner = (Spinner) findViewById(2131363210);
+            i = R.id.experiment_override_buckets_spinner;
+            Spinner spinner = (Spinner) findViewById(R.id.experiment_override_buckets_spinner);
             if (spinner != null) {
-                i = 2131363211;
-                MaterialCardView materialCardView = (MaterialCardView) findViewById(2131363211);
+                i = R.id.experiment_override_buckets_spinner_container;
+                MaterialCardView materialCardView = (MaterialCardView) findViewById(R.id.experiment_override_buckets_spinner_container);
                 if (materialCardView != null) {
-                    i = 2131363212;
-                    TextView textView2 = (TextView) findViewById(2131363212);
+                    i = R.id.experiment_override_clear;
+                    TextView textView2 = (TextView) findViewById(R.id.experiment_override_clear);
                     if (textView2 != null) {
-                        i = 2131363213;
-                        TextView textView3 = (TextView) findViewById(2131363213);
+                        i = R.id.experiment_override_experiment_api_name;
+                        TextView textView3 = (TextView) findViewById(R.id.experiment_override_experiment_api_name);
                         if (textView3 != null) {
-                            i = 2131363214;
-                            TextView textView4 = (TextView) findViewById(2131363214);
+                            i = R.id.experiment_override_experiment_name;
+                            TextView textView4 = (TextView) findViewById(R.id.experiment_override_experiment_name);
                             if (textView4 != null) {
                                 c2 c2Var = new c2(this, textView, spinner, materialCardView, textView2, textView3, textView4);
                                 m.checkNotNullExpressionValue(c2Var, "ViewExperimentOverrideBi…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java b/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java
index eddff8a68c..d7333744a5 100644
--- a/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java
+++ b/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java
@@ -10,6 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import c.a.j.g;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.models.user.User;
 import com.discord.utilities.channel.ChannelPermissionUtilsKt;
@@ -30,18 +31,18 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        LayoutInflater.from(context).inflate(2131558444, this);
-        int i = 2131362881;
-        ImageView imageView = (ImageView) findViewById(2131362881);
+        LayoutInflater.from(context).inflate(R.layout.channel_permission_owner_view, this);
+        int i = R.id.crown;
+        ImageView imageView = (ImageView) findViewById(R.id.crown);
         if (imageView != null) {
-            i = 2131362904;
-            TextView textView = (TextView) findViewById(2131362904);
+            i = R.id.description;
+            TextView textView = (TextView) findViewById(R.id.description);
             if (textView != null) {
-                i = 2131363745;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363745);
+                i = R.id.image;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.image);
                 if (simpleDraweeView != null) {
-                    i = 2131364210;
-                    TextView textView2 = (TextView) findViewById(2131364210);
+                    i = R.id.name;
+                    TextView textView2 = (TextView) findViewById(R.id.name);
                     if (textView2 != null) {
                         g gVar = new g(this, imageView, textView, simpleDraweeView, textView2);
                         m.checkNotNullExpressionValue(gVar, "ChannelPermissionOwnerVi…ater.from(context), this)");
@@ -59,7 +60,7 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout {
         int i = 8;
         if (permissionOwner instanceof PermissionOwner.Role) {
             GuildRole role = ((PermissionOwner.Role) permissionOwner).getRole();
-            Drawable drawable = ContextCompat.getDrawable(getContext(), 2131231872);
+            Drawable drawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_person_shield_24dp);
             m.checkNotNull(drawable);
             m.checkNotNullExpressionValue(drawable, "ContextCompat.getDrawabl….ic_person_shield_24dp)!!");
             Context context = getContext();
@@ -86,7 +87,7 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout {
             User user = member.getUser();
             SimpleDraweeView simpleDraweeView3 = this.i.d;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.image");
-            IconUtils.setIcon$default(simpleDraweeView3, member.getUser(), 2131165290, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView3, member.getUser(), R.dimen.avatar_size_large, null, null, null, 56, null);
             TextView textView3 = this.i.e;
             m.checkNotNullExpressionValue(textView3, "binding.name");
             String nickname = member.getNickname();
diff --git a/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java b/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java
index c12c5aa87c..aea6bd1a7f 100644
--- a/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java
+++ b/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java
@@ -134,15 +134,15 @@ public final class PhoneOrEmailInputView extends LinearLayout {
     public PhoneOrEmailInputView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558798, this);
-        int i2 = 2131364440;
-        TextInputLayout textInputLayout = (TextInputLayout) findViewById(2131364440);
+        LayoutInflater.from(context).inflate(R.layout.view_phone_or_email_input, this);
+        int i2 = R.id.phone_or_email_country_code_wrap;
+        TextInputLayout textInputLayout = (TextInputLayout) findViewById(R.id.phone_or_email_country_code_wrap);
         if (textInputLayout != null) {
-            i2 = 2131364441;
-            TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364441);
+            i2 = R.id.phone_or_email_main_input;
+            TextInputEditText textInputEditText = (TextInputEditText) findViewById(R.id.phone_or_email_main_input);
             if (textInputEditText != null) {
-                i2 = 2131364442;
-                TextInputLayout textInputLayout2 = (TextInputLayout) findViewById(2131364442);
+                i2 = R.id.phone_or_email_main_input_wrap;
+                TextInputLayout textInputLayout2 = (TextInputLayout) findViewById(R.id.phone_or_email_main_input_wrap);
                 if (textInputLayout2 != null) {
                     m2 m2Var = new m2(this, textInputLayout, textInputEditText, textInputLayout2);
                     m.checkNotNullExpressionValue(m2Var, "ViewPhoneOrEmailInputBin…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/premium/AccountCreditView.java b/app/src/main/java/com/discord/views/premium/AccountCreditView.java
index 3a6babf80e..25140989e9 100644
--- a/app/src/main/java/com/discord/views/premium/AccountCreditView.java
+++ b/app/src/main/java/com/discord/views/premium/AccountCreditView.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.r1;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.models.domain.ModelSubscription;
 import com.discord.models.domain.premium.SubscriptionPlanType;
 import com.discord.utilities.resources.StringResourceUtilsKt;
@@ -26,22 +27,22 @@ public final class AccountCreditView extends ConstraintLayout {
     public AccountCreditView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558731, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_account_credit, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362873;
-        TextView textView = (TextView) inflate.findViewById(2131362873);
+        int i = R.id.credit_header;
+        TextView textView = (TextView) inflate.findViewById(R.id.credit_header);
         if (textView != null) {
-            i = 2131362874;
-            ImageView imageView = (ImageView) inflate.findViewById(2131362874);
+            i = R.id.credit_icon;
+            ImageView imageView = (ImageView) inflate.findViewById(R.id.credit_icon);
             if (imageView != null) {
-                i = 2131362875;
-                TextView textView2 = (TextView) inflate.findViewById(2131362875);
+                i = R.id.credit_info;
+                TextView textView2 = (TextView) inflate.findViewById(R.id.credit_info);
                 if (textView2 != null) {
-                    i = 2131362876;
-                    LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362876);
+                    i = R.id.credit_info_container;
+                    LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.credit_info_container);
                     if (linearLayout != null) {
-                        i = 2131362880;
-                        TextView textView3 = (TextView) inflate.findViewById(2131362880);
+                        i = R.id.credit_time;
+                        TextView textView3 = (TextView) inflate.findViewById(R.id.credit_time);
                         if (textView3 != null) {
                             r1 r1Var = new r1((ConstraintLayout) inflate, textView, imageView, textView2, linearLayout, textView3);
                             m.checkNotNullExpressionValue(r1Var, "ViewAccountCreditBinding…rom(context), this, true)");
@@ -60,24 +61,24 @@ public final class AccountCreditView extends ConstraintLayout {
         setVisibility(i > 0 ? 0 : 8);
         if (i > 0) {
             if (j == SubscriptionPlanType.PREMIUM_MONTH_TIER_1.getPlanId()) {
-                obj = b.j(this, 2131892675, new Object[0], null, 4);
-                this.i.f153c.setImageResource(2131231168);
+                obj = b.j(this, R.string.premium_tier_1, new Object[0], null, 4);
+                this.i.f153c.setImageResource(R.drawable.drawable_ic_nitro_classic);
                 TextView textView = this.i.b;
                 m.checkNotNullExpressionValue(textView, "binding.creditHeader");
-                b.n(textView, 2131892632, new Object[]{obj}, null, 4);
+                b.n(textView, R.string.premium_subscription_credit, new Object[]{obj}, null, 4);
             } else if (j == SubscriptionPlanType.PREMIUM_MONTH_TIER_2.getPlanId()) {
-                obj = b.j(this, 2131892678, new Object[0], null, 4);
-                this.i.f153c.setImageResource(2131231167);
+                obj = b.j(this, R.string.premium_tier_2, new Object[0], null, 4);
+                this.i.f153c.setImageResource(R.drawable.drawable_ic_nitro);
                 TextView textView2 = this.i.b;
                 m.checkNotNullExpressionValue(textView2, "binding.creditHeader");
-                b.n(textView2, 2131892632, new Object[]{obj}, null, 4);
+                b.n(textView2, R.string.premium_subscription_credit, new Object[]{obj}, null, 4);
             } else {
                 obj = "";
             }
             if ((modelSubscription != null && modelSubscription.isGoogleSubscription()) || modelSubscription == null || !modelSubscription.hasPlan(j)) {
                 TextView textView3 = this.i.d;
                 m.checkNotNullExpressionValue(textView3, "binding.creditInfo");
-                b.n(textView3, 2131892634, new Object[]{obj}, null, 4);
+                b.n(textView3, R.string.premium_subscription_credit_applied_mismatched_plan_android, new Object[]{obj}, null, 4);
             } else {
                 TimeUtils timeUtils = TimeUtils.INSTANCE;
                 String currentPeriodEnd = modelSubscription.getCurrentPeriodEnd();
@@ -86,7 +87,7 @@ public final class AccountCreditView extends ConstraintLayout {
                 String renderUtcDate$default = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodEnd, context, (String) null, (DateFormat) null, 0, 28, (Object) null);
                 TextView textView4 = this.i.d;
                 m.checkNotNullExpressionValue(textView4, "binding.creditInfo");
-                b.n(textView4, 2131892635, new Object[]{renderUtcDate$default}, null, 4);
+                b.n(textView4, R.string.premium_subscription_credit_applied_on, new Object[]{renderUtcDate$default}, null, 4);
             }
             TextView textView5 = this.i.e;
             m.checkNotNullExpressionValue(textView5, "binding.creditTime");
@@ -94,7 +95,7 @@ public final class AccountCreditView extends ConstraintLayout {
             m.checkNotNullExpressionValue(resources, "resources");
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            textView5.setText(StringResourceUtilsKt.getQuantityString(resources, context2, 2131755298, i, Integer.valueOf(i)));
+            textView5.setText(StringResourceUtilsKt.getQuantityString(resources, context2, (int) R.plurals.premium_subscription_credit_count_months_count, i, Integer.valueOf(i)));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/views/premium/GiftSelectView.java b/app/src/main/java/com/discord/views/premium/GiftSelectView.java
index f8a93bbe19..ac665f3010 100644
--- a/app/src/main/java/com/discord/views/premium/GiftSelectView.java
+++ b/app/src/main/java/com/discord/views/premium/GiftSelectView.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetChoosePlanAdapterPlanItemBinding;
 import com.discord.utilities.billing.GooglePlayInAppSku;
 import d0.z.d.m;
@@ -21,7 +22,7 @@ public final class GiftSelectView extends FrameLayout {
     public GiftSelectView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131559002, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.widget_choose_plan_adapter_plan_item, (ViewGroup) this, false);
         addView(inflate);
         WidgetChoosePlanAdapterPlanItemBinding a = WidgetChoosePlanAdapterPlanItemBinding.a(inflate);
         m.checkNotNullExpressionValue(a, "WidgetChoosePlanAdapterP…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/views/premium/ShinyButton.java b/app/src/main/java/com/discord/views/premium/ShinyButton.java
index 71d16a1fdf..5a956e96c3 100644
--- a/app/src/main/java/com/discord/views/premium/ShinyButton.java
+++ b/app/src/main/java/com/discord/views/premium/ShinyButton.java
@@ -9,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import c.a.j.h1;
 import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
@@ -22,9 +23,9 @@ public final class ShinyButton extends RelativeLayout {
     public ShinyButton(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558671, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.shiny_button, (ViewGroup) this, false);
         addView(inflate);
-        TextView textView = (TextView) inflate.findViewById(2131365461);
+        TextView textView = (TextView) inflate.findViewById(R.id.text);
         if (textView != null) {
             h1 h1Var = new h1((RelativeLayout) inflate, textView);
             m.checkNotNullExpressionValue(h1Var, "ShinyButtonBinding.infla…rom(context), this, true)");
@@ -42,14 +43,14 @@ public final class ShinyButton extends RelativeLayout {
                         m.checkNotNullExpressionValue(drawable, "it");
                         setDrawableStart(drawable);
                     }
-                    setBackgroundTint(obtainStyledAttributes.getColor(0, ColorCompat.getColor(context, 2131100417)));
-                    setTextColor(obtainStyledAttributes.getColor(1, ColorCompat.getColor(context, 2131100433)));
+                    setBackgroundTint(obtainStyledAttributes.getColor(0, ColorCompat.getColor(context, (int) R.color.uikit_btn_bg_color_selector_green)));
+                    setTextColor(obtainStyledAttributes.getColor(1, ColorCompat.getColor(context, (int) R.color.white)));
                 } finally {
                     obtainStyledAttributes.recycle();
                 }
             }
         } else {
-            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131365461)));
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.text)));
         }
     }
 
@@ -67,7 +68,7 @@ public final class ShinyButton extends RelativeLayout {
     }
 
     public final void setText(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         TextView textView = this.i.b;
         m.checkNotNullExpressionValue(textView, "binding.text");
         textView.setText(str);
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java
index f807787e7a..9e13dee561 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
 import c.a.j.o2;
+import com.discord.R;
 import com.discord.models.guild.Guild;
 import com.discord.utilities.color.ColorCompatKt;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -26,21 +27,21 @@ public final class PremiumGuildConfirmationView extends CardView {
     public PremiumGuildConfirmationView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558800, this);
-        int i = 2131364474;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364474);
+        LayoutInflater.from(getContext()).inflate(R.layout.view_premium_guild_confirmation, this);
+        int i = R.id.premium_guild_confirmation_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.premium_guild_confirmation_avatar);
         if (simpleDraweeView != null) {
-            i = 2131364475;
-            TextView textView = (TextView) findViewById(2131364475);
+            i = R.id.premium_guild_confirmation_guild_name;
+            TextView textView = (TextView) findViewById(R.id.premium_guild_confirmation_guild_name);
             if (textView != null) {
-                i = 2131364476;
-                Chip chip = (Chip) findViewById(2131364476);
+                i = R.id.premium_guild_confirmation_level_info_previous;
+                Chip chip = (Chip) findViewById(R.id.premium_guild_confirmation_level_info_previous);
                 if (chip != null) {
-                    i = 2131364477;
-                    Chip chip2 = (Chip) findViewById(2131364477);
+                    i = R.id.premium_guild_confirmation_level_info_upgrade;
+                    Chip chip2 = (Chip) findViewById(R.id.premium_guild_confirmation_level_info_upgrade);
                     if (chip2 != null) {
-                        i = 2131364478;
-                        ImageView imageView = (ImageView) findViewById(2131364478);
+                        i = R.id.premium_guild_confirmation_upgrade_arrow;
+                        ImageView imageView = (ImageView) findViewById(R.id.premium_guild_confirmation_upgrade_arrow);
                         if (imageView != null) {
                             o2 o2Var = new o2(this, simpleDraweeView, textView, chip, chip2, imageView);
                             m.checkNotNullExpressionValue(o2Var, "ViewPremiumGuildConfirma…ater.from(context), this)");
@@ -85,7 +86,7 @@ public final class PremiumGuildConfirmationView extends CardView {
         }
         chip3.setVisibility(i2);
         if (c2 != 3) {
-            int i3 = c2 == 2 ? 2131100329 : 2131100254;
+            int i3 = c2 == 2 ? R.color.status_red_500 : R.color.status_green_600;
             ImageView imageView2 = this.i.f;
             m.checkNotNullExpressionValue(imageView2, "binding.premiumGuildConfirmationUpgradeArrow");
             ColorCompatKt.tintWithColorResource(imageView2, i3);
@@ -100,27 +101,27 @@ public final class PremiumGuildConfirmationView extends CardView {
 
     public final int c(int i) {
         if (i == 0) {
-            return 2131231716;
+            return R.drawable.ic_guild_nitro_progress_banner;
         }
         if (i == 1) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            return DrawableCompat.getThemedDrawableRes$default(context, 2130969342, 0, 2, (Object) null);
+            return DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.guild_boost_badge_tier_1, 0, 2, (Object) null);
         } else if (i == 2) {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return DrawableCompat.getThemedDrawableRes$default(context2, 2130969343, 0, 2, (Object) null);
+            return DrawableCompat.getThemedDrawableRes$default(context2, (int) R.attr.guild_boost_badge_tier_2, 0, 2, (Object) null);
         } else if (i != 3) {
             return 0;
         } else {
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
-            return DrawableCompat.getThemedDrawableRes$default(context3, 2130969344, 0, 2, (Object) null);
+            return DrawableCompat.getThemedDrawableRes$default(context3, (int) R.attr.guild_boost_badge_tier_3, 0, 2, (Object) null);
         }
     }
 
     public final String d(int i) {
-        String string = i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892512) : getContext().getString(2131892510) : getContext().getString(2131892508) : getContext().getString(2131892356);
+        String string = i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(R.string.premium_guild_tier_3) : getContext().getString(R.string.premium_guild_tier_2) : getContext().getString(R.string.premium_guild_tier_1) : getContext().getString(R.string.premium_guild_header_badge_no_tier);
         m.checkNotNullExpressionValue(string, "when (premiumTier) {\n   …       else -> \"\"\n      }");
         return string;
     }
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java
index df4c93a4c9..8018bce9ae 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java
@@ -10,6 +10,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import c.a.j.q2;
+import com.discord.R;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
 import d0.z.d.m;
@@ -21,16 +22,16 @@ public final class PremiumGuildProgressView extends FrameLayout {
     public PremiumGuildProgressView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558803, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_premium_guild_progress, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364584;
-        ImageView imageView = (ImageView) inflate.findViewById(2131364584);
+        int i = R.id.progress_gem_icon;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.progress_gem_icon);
         if (imageView != null) {
-            i = 2131364586;
-            TextView textView = (TextView) inflate.findViewById(2131364586);
+            i = R.id.progress_level_text;
+            TextView textView = (TextView) inflate.findViewById(R.id.progress_level_text);
             if (textView != null) {
-                i = 2131364587;
-                ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364587);
+                i = R.id.progress_progress;
+                ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.id.progress_progress);
                 if (progressBar != null) {
                     q2 q2Var = new q2((FrameLayout) inflate, imageView, textView, progressBar);
                     m.checkNotNullExpressionValue(q2Var, "ViewPremiumGuildProgress…rom(context), this, true)");
@@ -48,18 +49,18 @@ public final class PremiumGuildProgressView extends FrameLayout {
         if (i == 0) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            i3 = DrawableCompat.getThemedDrawableRes$default(context, 2130968721, 0, 2, (Object) null);
+            i3 = DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.boosted_guild_tier_0, 0, 2, (Object) null);
         } else if (i == 1) {
-            i3 = 2131231480;
+            i3 = R.drawable.ic_boosted_guild_tier_1;
         } else if (i == 2) {
-            i3 = 2131231481;
+            i3 = R.drawable.ic_boosted_guild_tier_2;
         } else if (i == 3) {
-            i3 = 2131231482;
+            i3 = R.drawable.ic_boosted_guild_tier_3;
         }
         imageView.setImageResource(i3);
         TextView textView = this.i.f149c;
         m.checkNotNullExpressionValue(textView, "binding.progressLevelText");
-        textView.setText(i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892512) : getContext().getString(2131892510) : getContext().getString(2131892508) : getContext().getString(2131892356));
+        textView.setText(i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(R.string.premium_guild_tier_3) : getContext().getString(R.string.premium_guild_tier_2) : getContext().getString(R.string.premium_guild_tier_1) : getContext().getString(R.string.premium_guild_header_badge_no_tier));
         ProgressBar progressBar = this.i.d;
         m.checkNotNullExpressionValue(progressBar, "binding.progressProgress");
         progressBar.setProgress(PremiumGuildSubscriptionUtils.INSTANCE.calculatePercentToNextTier(i, i2));
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java
index 286449670d..380699db1f 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java
@@ -10,6 +10,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.j.v2;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.premium.PremiumTier;
 import com.discord.i18n.RenderContext;
 import com.discord.models.domain.premium.SubscriptionPlanType;
@@ -41,7 +42,7 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout {
         public Unit invoke(RenderContext renderContext) {
             RenderContext renderContext2 = renderContext;
             m.checkNotNullParameter(renderContext2, "$receiver");
-            renderContext2.e = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968989));
+            renderContext2.e = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.colorTextMuted));
             return Unit.a;
         }
     }
@@ -50,16 +51,16 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout {
     public PremiumGuildSubscriptionUpsellView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558809, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_premium_upsell_info, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365792;
-        TextView textView = (TextView) inflate.findViewById(2131365792);
+        int i = R.id.view_premium_upsell_info_subheading;
+        TextView textView = (TextView) inflate.findViewById(R.id.view_premium_upsell_info_subheading);
         if (textView != null) {
-            i = 2131365793;
-            TextView textView2 = (TextView) inflate.findViewById(2131365793);
+            i = R.id.view_premium_upsell_info_subheading_blurb;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.view_premium_upsell_info_subheading_blurb);
             if (textView2 != null) {
-                i = 2131365794;
-                TextView textView3 = (TextView) inflate.findViewById(2131365794);
+                i = R.id.view_premium_upsell_info_subheading_price;
+                TextView textView3 = (TextView) inflate.findViewById(R.id.view_premium_upsell_info_subheading_price);
                 if (textView3 != null) {
                     v2 v2Var = new v2((LinearLayout) inflate, textView, textView2, textView3);
                     m.checkNotNullExpressionValue(v2Var, "ViewPremiumUpsellInfoBin…rom(context), this, true)");
@@ -80,33 +81,33 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout {
         int price = subscriptionPlanType.getPrice();
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        CharSequence j = b.j(this, 2131886953, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(price, context)}, null, 4);
+        CharSequence j = b.j(this, R.string.billing_price_per_month, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(price, context)}, null, 4);
         Context context2 = getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        CharSequence j2 = b.j(this, 2131886953, new Object[]{PremiumUtilsKt.getFormattedPriceUsd((int) (((float) subscriptionPlanType.getPrice()) * 0.7f), context2)}, null, 4);
-        CharSequence j3 = b.j(this, 2131890050, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4);
+        CharSequence j2 = b.j(this, R.string.billing_price_per_month, new Object[]{PremiumUtilsKt.getFormattedPriceUsd((int) (((float) subscriptionPlanType.getPrice()) * 0.7f), context2)}, null, 4);
+        CharSequence j3 = b.j(this, R.string.guild_settings_premium_upsell_body_perk_guild_subscription_discount, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4);
         Context context3 = getContext();
         m.checkNotNullExpressionValue(context3, "context");
-        CharSequence b = b.b(context3, 2131890059, new Object[]{j2, j}, new a(this));
+        CharSequence b = b.b(context3, R.string.guild_settings_premium_upsell_subheading_extra_android, new Object[]{j2, j}, new a(this));
         int ordinal = premiumTier.ordinal();
         if (ordinal == 0 || ordinal == 1) {
             TextView textView2 = this.i.b;
             m.checkNotNullExpressionValue(textView2, "binding.viewPremiumUpsellInfoSubheading");
-            b.n(textView2, 2131890058, new Object[]{j}, null, 4);
+            b.n(textView2, R.string.guild_settings_premium_upsell_subheading, new Object[]{j}, null, 4);
             TextView textView3 = this.i.d;
             m.checkNotNullExpressionValue(textView3, "binding.viewPremiumUpsellInfoSubheadingPrice");
             ViewExtensions.setTextAndVisibilityBy(textView3, null);
         } else if (ordinal == 2) {
             TextView textView4 = this.i.b;
             m.checkNotNullExpressionValue(textView4, "binding.viewPremiumUpsellInfoSubheading");
-            b.n(textView4, 2131890063, new Object[]{j3}, null, 4);
+            b.n(textView4, R.string.guild_settings_premium_upsell_subheading_tier_1_mobile, new Object[]{j3}, null, 4);
             TextView textView5 = this.i.d;
             m.checkNotNullExpressionValue(textView5, "binding.viewPremiumUpsellInfoSubheadingPrice");
             ViewExtensions.setTextAndVisibilityBy(textView5, b);
         } else if (ordinal == 3) {
             TextView textView6 = this.i.b;
             m.checkNotNullExpressionValue(textView6, "binding.viewPremiumUpsellInfoSubheading");
-            b.n(textView6, 2131890065, new Object[]{String.valueOf(2), j3}, null, 4);
+            b.n(textView6, R.string.guild_settings_premium_upsell_subheading_tier_2_mobile, new Object[]{String.valueOf(2), j3}, null, 4);
             TextView textView7 = this.i.d;
             m.checkNotNullExpressionValue(textView7, "binding.viewPremiumUpsellInfoSubheadingPrice");
             ViewExtensions.setTextAndVisibilityBy(textView7, b);
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java
index 2bd34c2cd1..999f3522c1 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java
@@ -10,6 +10,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.j.r2;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.premium.PremiumTier;
 import com.discord.utilities.KotlinExtensionsKt;
 import com.discord.utilities.resources.StringResourceUtilsKt;
@@ -42,32 +43,32 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
     public PremiumSubscriptionMarketingView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558805, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_premium_marketing, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365783;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365783);
+        int i = R.id.view_premium_marketing_container_tier1;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.view_premium_marketing_container_tier1);
         if (linearLayout != null) {
-            i = 2131365784;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365784);
+            i = R.id.view_premium_marketing_learn_more;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.view_premium_marketing_learn_more);
             if (materialButton != null) {
                 LinearLayout linearLayout2 = (LinearLayout) inflate;
-                i = 2131365786;
-                TextView textView = (TextView) inflate.findViewById(2131365786);
+                i = R.id.view_premium_marketing_marketing_subtitle;
+                TextView textView = (TextView) inflate.findViewById(R.id.view_premium_marketing_marketing_subtitle);
                 if (textView != null) {
-                    i = 2131365787;
-                    TextView textView2 = (TextView) inflate.findViewById(2131365787);
+                    i = R.id.view_premium_marketing_marketing_title;
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.view_premium_marketing_marketing_title);
                     if (textView2 != null) {
-                        i = 2131365788;
-                        TextView textView3 = (TextView) inflate.findViewById(2131365788);
+                        i = R.id.view_premium_marketing_nitro_boost_count;
+                        TextView textView3 = (TextView) inflate.findViewById(R.id.view_premium_marketing_nitro_boost_count);
                         if (textView3 != null) {
-                            i = 2131365789;
-                            TextView textView4 = (TextView) inflate.findViewById(2131365789);
+                            i = R.id.view_premium_marketing_nitro_boost_discount;
+                            TextView textView4 = (TextView) inflate.findViewById(R.id.view_premium_marketing_nitro_boost_discount);
                             if (textView4 != null) {
-                                i = 2131365790;
-                                TextView textView5 = (TextView) inflate.findViewById(2131365790);
+                                i = R.id.view_premium_marketing_nitro_classic_boost_count;
+                                TextView textView5 = (TextView) inflate.findViewById(R.id.view_premium_marketing_nitro_classic_boost_count);
                                 if (textView5 != null) {
-                                    i = 2131365791;
-                                    TextView textView6 = (TextView) inflate.findViewById(2131365791);
+                                    i = R.id.view_premium_marketing_nitro_classic_boost_discount;
+                                    TextView textView6 = (TextView) inflate.findViewById(R.id.view_premium_marketing_nitro_classic_boost_discount);
                                     if (textView6 != null) {
                                         r2 r2Var = new r2(linearLayout2, linearLayout, materialButton, linearLayout2, textView, textView2, textView3, textView4, textView5, textView6);
                                         m.checkNotNullExpressionValue(r2Var, "ViewPremiumMarketingBind…rom(context), this, true)");
@@ -90,21 +91,21 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
         m.checkNotNullParameter(function0, "onlearnMoreClickCallback");
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755173, 2, 2);
+        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions_numFreeGuildSubscriptions, 2, 2);
         TextView textView = this.i.h;
         m.checkNotNullExpressionValue(textView, "binding.viewPremiumMarketingNitroBoostDiscount");
         NumberFormat percentInstance = NumberFormat.getPercentInstance();
         Float valueOf = Float.valueOf(0.3f);
-        b.n(textView, 2131890050, new Object[]{percentInstance.format(valueOf)}, null, 4);
+        b.n(textView, R.string.guild_settings_premium_upsell_body_perk_guild_subscription_discount, new Object[]{percentInstance.format(valueOf)}, null, 4);
         TextView textView2 = this.i.g;
         m.checkNotNullExpressionValue(textView2, "binding.viewPremiumMarketingNitroBoostCount");
-        b.n(textView2, 2131890052, new Object[]{i18nPluralString}, null, 4);
+        b.n(textView2, R.string.guild_settings_premium_upsell_body_perk_num_guild_subscriptions, new Object[]{i18nPluralString}, null, 4);
         TextView textView3 = this.i.j;
         m.checkNotNullExpressionValue(textView3, "binding.viewPremiumMarke…NitroClassicBoostDiscount");
-        b.n(textView3, 2131890050, new Object[]{NumberFormat.getPercentInstance().format(valueOf)}, null, 4);
+        b.n(textView3, R.string.guild_settings_premium_upsell_body_perk_guild_subscription_discount, new Object[]{NumberFormat.getPercentInstance().format(valueOf)}, null, 4);
         TextView textView4 = this.i.i;
         m.checkNotNullExpressionValue(textView4, "binding.viewPremiumMarketingNitroClassicBoostCount");
-        b.n(textView4, 2131890051, new Object[]{i18nPluralString}, null, 4);
+        b.n(textView4, R.string.guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions, new Object[]{i18nPluralString}, null, 4);
         this.i.f154c.setOnClickListener(new a(function0));
         int ordinal = premiumTier.ordinal();
         if (ordinal == 0) {
@@ -121,7 +122,7 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
             linearLayout2.setVisibility(0);
             TextView textView6 = this.i.f;
             m.checkNotNullExpressionValue(textView6, "binding.viewPremiumMarketingMarketingTitle");
-            ViewExtensions.setTextAndVisibilityBy(textView6, b.j(this, 2131890054, new Object[0], null, 4));
+            ViewExtensions.setTextAndVisibilityBy(textView6, b.j(this, R.string.guild_settings_premium_upsell_heading_secondary, new Object[0], null, 4));
             TextView textView7 = this.i.e;
             m.checkNotNullExpressionValue(textView7, "binding.viewPremiumMarketingMarketingSubtitle");
             textView7.setVisibility(8);
@@ -135,10 +136,10 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
             linearLayout4.setVisibility(8);
             TextView textView8 = this.i.f;
             m.checkNotNullExpressionValue(textView8, "binding.viewPremiumMarketingMarketingTitle");
-            ViewExtensions.setTextAndVisibilityBy(textView8, b.j(this, 2131890055, new Object[0], null, 4));
+            ViewExtensions.setTextAndVisibilityBy(textView8, b.j(this, R.string.guild_settings_premium_upsell_heading_secondary_premium_user, new Object[0], null, 4));
             TextView textView9 = this.i.e;
             m.checkNotNullExpressionValue(textView9, "binding.viewPremiumMarketingMarketingSubtitle");
-            ViewExtensions.setTextAndVisibilityBy(textView9, b.j(this, 2131890056, new Object[]{String.valueOf(2)}, null, 4));
+            ViewExtensions.setTextAndVisibilityBy(textView9, b.j(this, R.string.guild_settings_premium_upsell_heading_tertiary_premium_user, new Object[]{String.valueOf(2)}, null, 4));
             unit = Unit.a;
         } else if (ordinal == 3) {
             LinearLayout linearLayout5 = this.i.d;
diff --git a/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java b/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java
index 2d4cfb3938..b45c965114 100644
--- a/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java
+++ b/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java
@@ -22,12 +22,12 @@ public final class CardSegment extends CardView implements a {
     public CardSegment(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558443, this);
-        int i = 2131362249;
-        TextView textView = (TextView) findViewById(2131362249);
+        LayoutInflater.from(getContext()).inflate(R.layout.card_segment_view, this);
+        int i = R.id.card_segment_badge;
+        TextView textView = (TextView) findViewById(R.id.card_segment_badge);
         if (textView != null) {
-            i = 2131362250;
-            TextView textView2 = (TextView) findViewById(2131362250);
+            i = R.id.card_segment_text;
+            TextView textView2 = (TextView) findViewById(R.id.card_segment_text);
             if (textView2 != null) {
                 f fVar = new f(this, textView, textView2);
                 m.checkNotNullExpressionValue(fVar, "CardSegmentViewBinding.i…ater.from(context), this)");
@@ -50,8 +50,8 @@ public final class CardSegment extends CardView implements a {
 
     @Override // c.a.z.n0.a
     public void a(boolean z2) {
-        int themedColor = z2 ? ColorCompat.getThemedColor(this, 2130968892) : ColorCompat.getColor(this, 2131100384);
-        int color = z2 ? ColorCompat.getColor(this, 2131100433) : ColorCompat.getThemedColor(this, 2130968948);
+        int themedColor = z2 ? ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundAccent) : ColorCompat.getColor(this, (int) R.color.transparent);
+        int color = z2 ? ColorCompat.getColor(this, (int) R.color.white) : ColorCompat.getThemedColor(this, (int) R.attr.colorInteractiveMuted);
         setCardBackgroundColor(themedColor);
         this.i.f92c.setTextColor(color);
     }
diff --git a/app/src/main/java/com/discord/views/steps/StepsView.java b/app/src/main/java/com/discord/views/steps/StepsView.java
index 194e2315f3..ccee91589c 100644
--- a/app/src/main/java/com/discord/views/steps/StepsView.java
+++ b/app/src/main/java/com/discord/views/steps/StepsView.java
@@ -15,6 +15,7 @@ import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 import c.a.j.r3;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
@@ -114,9 +115,9 @@ public final class StepsView extends RelativeLayout {
             /* JADX WARNING: Illegal instructions before constructor call */
             public a(Class cls, int i, int i2, int i3, Bundle bundle, Function1 function1, Function1 function12, Function1 function13, boolean z2, boolean z3, boolean z4, int i4) {
                 super(r3, r4, r5, r8, null, r7, r10, r12, r11, null);
-                int i5 = (i4 & 2) != 0 ? 2131891686 : i;
-                int i6 = (i4 & 4) != 0 ? 2131886813 : i2;
-                int i7 = (i4 & 8) != 0 ? 2131888207 : i3;
+                int i5 = (i4 & 2) != 0 ? R.string.next : i;
+                int i6 = (i4 & 4) != 0 ? R.string.back : i2;
+                int i7 = (i4 & 8) != 0 ? R.string.done : i3;
                 Function1 function14 = null;
                 Bundle bundle2 = (i4 & 16) != 0 ? null : bundle;
                 Function1 function15 = (i4 & 32) != 0 ? null : function1;
@@ -374,28 +375,28 @@ public final class StepsView extends RelativeLayout {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558842, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_steps, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131365312;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365312);
+        int i2 = R.id.steps_button_container;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.steps_button_container);
         if (linearLayout != null) {
-            i2 = 2131365313;
-            TextView textView = (TextView) inflate.findViewById(2131365313);
+            i2 = R.id.steps_cancel;
+            TextView textView = (TextView) inflate.findViewById(R.id.steps_cancel);
             if (textView != null) {
-                i2 = 2131365314;
-                ImageView imageView = (ImageView) inflate.findViewById(2131365314);
+                i2 = R.id.steps_close;
+                ImageView imageView = (ImageView) inflate.findViewById(R.id.steps_close);
                 if (imageView != null) {
-                    i2 = 2131365315;
-                    LoadingButton loadingButton = (LoadingButton) inflate.findViewById(2131365315);
+                    i2 = R.id.steps_done;
+                    LoadingButton loadingButton = (LoadingButton) inflate.findViewById(R.id.steps_done);
                     if (loadingButton != null) {
-                        i2 = 2131365316;
-                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365316);
+                        i2 = R.id.steps_next;
+                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.steps_next);
                         if (materialButton != null) {
-                            i2 = 2131365317;
-                            TextView textView2 = (TextView) inflate.findViewById(2131365317);
+                            i2 = R.id.steps_title;
+                            TextView textView2 = (TextView) inflate.findViewById(R.id.steps_title);
                             if (textView2 != null) {
-                                i2 = 2131365318;
-                                ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(2131365318);
+                                i2 = R.id.steps_viewpager;
+                                ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(R.id.steps_viewpager);
                                 if (viewPager2 != null) {
                                     r3 r3Var = new r3((RelativeLayout) inflate, linearLayout, textView, imageView, loadingButton, materialButton, textView2, viewPager2);
                                     m.checkNotNullExpressionValue(r3Var, "ViewStepsBinding.inflate…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/views/sticker/StickerView.java b/app/src/main/java/com/discord/views/sticker/StickerView.java
index dac2b7974c..4107f0cd85 100644
--- a/app/src/main/java/com/discord/views/sticker/StickerView.java
+++ b/app/src/main/java/com/discord/views/sticker/StickerView.java
@@ -14,6 +14,7 @@ import c.a.z.p0.e;
 import c.a.z.p0.f;
 import c.a.z.p0.h;
 import c.f.g.e.v;
+import com.discord.R;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerFormatType;
@@ -49,15 +50,15 @@ public final class StickerView extends FrameLayout {
     public StickerView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558689, this);
-        int i = 2131365360;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365360);
+        LayoutInflater.from(getContext()).inflate(R.layout.sticker_view, this);
+        int i = R.id.sticker_view_imageview;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.sticker_view_imageview);
         if (simpleDraweeView != null) {
-            i = 2131365361;
-            RLottieImageView rLottieImageView = (RLottieImageView) findViewById(2131365361);
+            i = R.id.sticker_view_lottie;
+            RLottieImageView rLottieImageView = (RLottieImageView) findViewById(R.id.sticker_view_lottie);
             if (rLottieImageView != null) {
-                i = 2131365362;
-                ImageView imageView = (ImageView) findViewById(2131365362);
+                i = R.id.sticker_view_placeholder;
+                ImageView imageView = (ImageView) findViewById(R.id.sticker_view_placeholder);
                 if (imageView != null) {
                     l1 l1Var = new l1(this, simpleDraweeView, rLottieImageView, imageView);
                     m.checkNotNullExpressionValue(l1Var, "StickerViewBinding.infla…ater.from(context), this)");
@@ -101,13 +102,13 @@ public final class StickerView extends FrameLayout {
             sb.append(sticker.h());
             sb.append(", ");
             sb.append(sticker.f());
-            return b.h(context, 2131893937, new Object[]{sb.toString()}, null, 4);
+            return b.h(context, R.string.sticker_a11y_label, new Object[]{sb.toString()}, null, 4);
         } else if (!(baseSticker instanceof StickerPartial)) {
             return null;
         } else {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return b.h(context2, 2131893937, new Object[]{((StickerPartial) baseSticker).e()}, null, 4);
+            return b.h(context2, R.string.sticker_a11y_label, new Object[]{((StickerPartial) baseSticker).e()}, null, 4);
         }
     }
 
diff --git a/app/src/main/java/com/discord/views/typing/TypingDot.java b/app/src/main/java/com/discord/views/typing/TypingDot.java
index 5579b96744..9d99494898 100644
--- a/app/src/main/java/com/discord/views/typing/TypingDot.java
+++ b/app/src/main/java/com/discord/views/typing/TypingDot.java
@@ -5,6 +5,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -75,10 +76,10 @@ public final class TypingDot extends View {
     public TypingDot(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        Animation loadAnimation = AnimationUtils.loadAnimation(context, 2130772026);
+        Animation loadAnimation = AnimationUtils.loadAnimation(context, R.anim.anim_typing_dots_scale_up);
         m.checkNotNullExpressionValue(loadAnimation, "AnimationUtils.loadAnima…nim_typing_dots_scale_up)");
         this.i = loadAnimation;
-        Animation loadAnimation2 = AnimationUtils.loadAnimation(context, 2130772025);
+        Animation loadAnimation2 = AnimationUtils.loadAnimation(context, R.anim.anim_typing_dots_scale_down);
         m.checkNotNullExpressionValue(loadAnimation2, "AnimationUtils.loadAnima…m_typing_dots_scale_down)");
         this.j = loadAnimation2;
     }
diff --git a/app/src/main/java/com/discord/views/typing/TypingDots.java b/app/src/main/java/com/discord/views/typing/TypingDots.java
index 98ca16c1f6..7cfe93ba02 100644
--- a/app/src/main/java/com/discord/views/typing/TypingDots.java
+++ b/app/src/main/java/com/discord/views/typing/TypingDots.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.n1;
 import c.a.z.q0.a;
+import com.discord.R;
 import d0.t.n;
 import d0.z.d.m;
 /* compiled from: TypingDots.kt */
@@ -20,20 +21,20 @@ public final class TypingDots extends ConstraintLayout {
     public TypingDots(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558714, this);
-        int i2 = 2131365798;
-        TypingDot typingDot = (TypingDot) findViewById(2131365798);
+        LayoutInflater.from(context).inflate(R.layout.typing_dots_view, this);
+        int i2 = R.id.view_typing_dots_1;
+        TypingDot typingDot = (TypingDot) findViewById(R.id.view_typing_dots_1);
         if (typingDot != null) {
-            i2 = 2131365799;
-            TypingDot typingDot2 = (TypingDot) findViewById(2131365799);
+            i2 = R.id.view_typing_dots_2;
+            TypingDot typingDot2 = (TypingDot) findViewById(R.id.view_typing_dots_2);
             if (typingDot2 != null) {
-                i2 = 2131365800;
-                TypingDot typingDot3 = (TypingDot) findViewById(2131365800);
+                i2 = R.id.view_typing_dots_3;
+                TypingDot typingDot3 = (TypingDot) findViewById(R.id.view_typing_dots_3);
                 if (typingDot3 != null) {
                     n1 n1Var = new n1(this, typingDot, typingDot2, typingDot3);
                     m.checkNotNullExpressionValue(n1Var, "TypingDotsViewBinding.in…ater.from(context), this)");
                     this.j = n1Var;
-                    int integer = getResources().getInteger(2131427332);
+                    int integer = getResources().getInteger(R.integer.animation_time_standard);
                     this.k = integer;
                     this.l = (long) (((double) integer) / 1.5d);
                     typingDot3.setOnScaleDownCompleteListener(new a(this));
diff --git a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
index ce4b2a28dc..b875d339a5 100644
--- a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
+++ b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
@@ -182,23 +182,23 @@ public final class UserAvatarPresenceView extends RelativeLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558723, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.user_avatar_presence_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362084;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362084);
+        int i = R.id.avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.avatar);
         if (simpleDraweeView != null) {
-            i = 2131362085;
-            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131362085);
+            i = R.id.avatar_container;
+            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(R.id.avatar_container);
             if (frameLayout != null) {
-                i = 2131362086;
-                ImageView imageView = (ImageView) inflate.findViewById(2131362086);
+                i = R.id.avatar_cutout;
+                ImageView imageView = (ImageView) inflate.findViewById(R.id.avatar_cutout);
                 if (imageView != null) {
-                    i = 2131365310;
-                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131365310);
+                    i = R.id.static_avatar;
+                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(R.id.static_avatar);
                     if (simpleDraweeView2 != null) {
                         RelativeLayout relativeLayout = (RelativeLayout) inflate;
-                        i = 2131365650;
-                        StatusView statusView = (StatusView) inflate.findViewById(2131365650);
+                        i = R.id.user_avatar_presence_status;
+                        StatusView statusView = (StatusView) inflate.findViewById(R.id.user_avatar_presence_status);
                         if (statusView != null) {
                             p1 p1Var = new p1(relativeLayout, simpleDraweeView, frameLayout, imageView, simpleDraweeView2, relativeLayout, statusView);
                             m.checkNotNullExpressionValue(p1Var, "UserAvatarPresenceViewBi…rom(context), this, true)");
@@ -207,7 +207,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
                             this.l = b.i;
                             TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.UserAvatarPresenceView);
                             m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…e.UserAvatarPresenceView)");
-                            int color = obtainStyledAttributes.getColor(0, ColorCompat.getThemedColor(this, 2130969904));
+                            int color = obtainStyledAttributes.getColor(0, ColorCompat.getThemedColor(this, (int) R.attr.primary_700));
                             this.k = obtainStyledAttributes.getDimensionPixelSize(1, 0);
                             obtainStyledAttributes.recycle();
                             setAvatarBackgroundColor(color);
diff --git a/app/src/main/java/com/discord/views/user/UserSummaryView.java b/app/src/main/java/com/discord/views/user/UserSummaryView.java
index 286acd099f..4edfbbb0d1 100644
--- a/app/src/main/java/com/discord/views/user/UserSummaryView.java
+++ b/app/src/main/java/com/discord/views/user/UserSummaryView.java
@@ -75,7 +75,7 @@ public final class UserSummaryView extends ConstraintLayout {
                     break;
                 }
                 int childCount = getChildCount();
-                y3 a = y3.a(LayoutInflater.from(getContext()).inflate(2131558850, (ViewGroup) this, false));
+                y3 a = y3.a(LayoutInflater.from(getContext()).inflate(R.layout.view_user_summary_item, (ViewGroup) this, false));
                 m.checkNotNullExpressionValue(a, "ViewUserSummaryItemBindi…ext), this, false\n      )");
                 CutoutView cutoutView = a.a;
                 cutoutView.setId(childCount + 10);
@@ -108,7 +108,7 @@ public final class UserSummaryView extends ConstraintLayout {
                     simpleDraweeView2.setTag(forGuildMemberOrUser);
                     SimpleDraweeView simpleDraweeView3 = a2.b;
                     m.checkNotNullExpressionValue(simpleDraweeView3, "cutout.avatar");
-                    IconUtils.setIcon$default(simpleDraweeView3, forGuildMemberOrUser, 2131165295, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+                    IconUtils.setIcon$default(simpleDraweeView3, forGuildMemberOrUser, (int) R.dimen.avatar_size_reply, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
                 }
                 i++;
             }
diff --git a/app/src/main/java/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.java b/app/src/main/java/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.java
index b7f542026a..9ad5f429e7 100644
--- a/app/src/main/java/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.java
+++ b/app/src/main/java/com/discord/widgets/accessibility/AccessibilityDetectionNavigator$showAccessibilityDetectionDialog$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.accessibility;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.h;
@@ -23,7 +24,7 @@ public final class AccessibilityDetectionNavigator$showAccessibilityDetectionDia
     }
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         h.b bVar = h.j;
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
         m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java
index ade2620e0c..c7cb41c2cf 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetChannelFollowSheetBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -22,38 +23,38 @@ public final /* synthetic */ class WidgetChannelFollowSheet$binding$2 extends k
 
     public final WidgetChannelFollowSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362285;
-        ImageView imageView = (ImageView) view.findViewById(2131362285);
+        int i = R.id.channel_follow_channel_dropdown_icon;
+        ImageView imageView = (ImageView) view.findViewById(R.id.channel_follow_channel_dropdown_icon);
         if (imageView != null) {
-            i = 2131362286;
-            TextView textView = (TextView) view.findViewById(2131362286);
+            i = R.id.channel_follow_channel_name;
+            TextView textView = (TextView) view.findViewById(R.id.channel_follow_channel_name);
             if (textView != null) {
-                i = 2131362287;
-                TextView textView2 = (TextView) view.findViewById(2131362287);
+                i = R.id.channel_follow_error_text;
+                TextView textView2 = (TextView) view.findViewById(R.id.channel_follow_error_text);
                 if (textView2 != null) {
-                    i = 2131362288;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131362288);
+                    i = R.id.channel_follow_guild_dropdown_icon;
+                    ImageView imageView2 = (ImageView) view.findViewById(R.id.channel_follow_guild_dropdown_icon);
                     if (imageView2 != null) {
-                        i = 2131362289;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362289);
+                        i = R.id.channel_follow_guild_icon;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channel_follow_guild_icon);
                         if (simpleDraweeView != null) {
-                            i = 2131362290;
-                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362290);
+                            i = R.id.channel_follow_select_channel;
+                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(R.id.channel_follow_select_channel);
                             if (materialCardView != null) {
-                                i = 2131362291;
-                                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131362291);
+                                i = R.id.channel_follow_select_guild;
+                                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(R.id.channel_follow_select_guild);
                                 if (materialCardView2 != null) {
-                                    i = 2131362292;
-                                    TextView textView3 = (TextView) view.findViewById(2131362292);
+                                    i = R.id.channel_follow_selected_channel_name;
+                                    TextView textView3 = (TextView) view.findViewById(R.id.channel_follow_selected_channel_name);
                                     if (textView3 != null) {
-                                        i = 2131362293;
-                                        TextView textView4 = (TextView) view.findViewById(2131362293);
+                                        i = R.id.channel_follow_selected_guild_name;
+                                        TextView textView4 = (TextView) view.findViewById(R.id.channel_follow_selected_guild_name);
                                         if (textView4 != null) {
-                                            i = 2131362836;
-                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362836);
+                                            i = R.id.create_channel_follower_button;
+                                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.create_channel_follower_button);
                                             if (materialButton != null) {
-                                                i = 2131363313;
-                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363313);
+                                                i = R.id.follow_sheet_view_flipper;
+                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.follow_sheet_view_flipper);
                                                 if (appViewFlipper != null) {
                                                     return new WidgetChannelFollowSheetBinding((NestedScrollView) view, imageView, textView, textView2, imageView2, simpleDraweeView, materialCardView, materialCardView2, textView3, textView4, materialButton, appViewFlipper);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java
index 1625e6a4f2..78f3d41457 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.announcements;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.models.guild.Guild;
 import com.discord.widgets.announcements.WidgetChannelFollowSheet;
 import com.discord.widgets.announcements.WidgetChannelFollowSheetViewModel;
@@ -19,6 +20,6 @@ public final class WidgetChannelFollowSheet$configureChannelSelector$1 implement
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSelector.Companion.launch(this.this$0, this.$selectedGuild.getId(), "REQUEST_KEY_CHANNEL_FOLLOW_CHANNEL", false, 2131891780, new WidgetChannelFollowSheet.ChannelFollowChannelFilterFunction(this.$selectedGuild.getId(), this.$viewState.getAvailableChannels()));
+        WidgetChannelSelector.Companion.launch(this.this$0, this.$selectedGuild.getId(), "REQUEST_KEY_CHANNEL_FOLLOW_CHANNEL", false, R.string.none, new WidgetChannelFollowSheet.ChannelFollowChannelFilterFunction(this.$selectedGuild.getId(), this.$viewState.getAvailableChannels()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
index 08bf630938..d6b5498c1e 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppViewFlipper;
@@ -165,7 +166,7 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
             getBinding().e.setOnClickListener(new WidgetChannelFollowSheet$configureChannelSelector$1(this, selectedGuild, loaded));
         }
         if (selectedChannel != null) {
-            i = 2130968946;
+            i = R.attr.colorInteractiveActive;
             TextView textView = getBinding().g;
             m.checkNotNullExpressionValue(textView, "binding.channelFollowSelectedChannelName");
             Context requireContext = requireContext();
@@ -176,10 +177,10 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
             materialButton.setEnabled(true);
             getBinding().i.setOnClickListener(new WidgetChannelFollowSheet$configureChannelSelector$2(this, selectedChannel));
         } else {
-            i = 2130968949;
+            i = R.attr.colorInteractiveNormal;
             TextView textView2 = getBinding().g;
             m.checkNotNullExpressionValue(textView2, "binding.channelFollowSelectedChannelName");
-            textView2.setText(getString(2131893521));
+            textView2.setText(getString(R.string.select));
             MaterialButton materialButton2 = getBinding().i;
             m.checkNotNullExpressionValue(materialButton2, "binding.createChannelFollowerButton");
             materialButton2.setEnabled(false);
@@ -197,10 +198,10 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
         TextView textView = getBinding().h;
         m.checkNotNullExpressionValue(textView, "binding.channelFollowSelectedGuildName");
         if (selectedGuild == null || (str = selectedGuild.getName()) == null) {
-            str = getString(2131893521);
+            str = getString(R.string.select);
         }
         textView.setText(str);
-        int i = selectedGuild != null ? 2130968946 : 2130968949;
+        int i = selectedGuild != null ? R.attr.colorInteractiveActive : R.attr.colorInteractiveNormal;
         TextView textView2 = getBinding().h;
         TextView textView3 = getBinding().h;
         m.checkNotNullExpressionValue(textView3, "binding.channelFollowSelectedGuildName");
@@ -256,13 +257,13 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558888;
+        return R.layout.widget_channel_follow_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        WidgetChannelSelector.Companion.registerForResult(this, "REQUEST_KEY_CHANNEL_FOLLOW_CHANNEL", true, new WidgetChannelFollowSheet$onCreate$1(this));
+        WidgetChannelSelector.Companion.registerForResult(this, REQUEST_KEY_CHANNEL_FOLLOW, true, new WidgetChannelFollowSheet$onCreate$1(this));
         WidgetGuildSelector.Companion.registerForResult$default(WidgetGuildSelector.Companion, this, null, true, new WidgetChannelFollowSheet$onCreate$2(this), 2, null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
index 486f1b1ec7..7857d7d0d9 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.announcements;
 
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.utilities.permissions.PermissionUtils;
 import d0.z.d.m;
 import j0.k.b;
@@ -41,7 +42,7 @@ public final class WidgetChannelFollowSheetViewModel$calculateChannelsWithPermis
                 Channel value = entry.getValue();
                 if (value.A() == 5 || value.A() == 0) {
                     Long l = (Long) this.$perms.get(Long.valueOf(longValue));
-                    if (PermissionUtils.can(536870912, Long.valueOf(l != null ? l.longValue() : 0))) {
+                    if (PermissionUtils.can(Permission.MANAGE_WEBHOOKS, Long.valueOf(l != null ? l.longValue() : 0))) {
                         z2 = true;
                         if (!z2) {
                             linkedHashMap.put(entry.getKey(), entry.getValue());
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
index 0ceb03f6af..40c913b25b 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
@@ -2,6 +2,7 @@ package com.discord.widgets.announcements;
 
 import android.content.Context;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppComponent;
 import com.discord.app.AppViewModel;
@@ -312,7 +313,7 @@ public final class WidgetChannelFollowSheetViewModel extends AppViewModel<ViewSt
     private final void handleChannelFollowError(Error error) {
         Error.Response response = error.getResponse();
         m.checkNotNullExpressionValue(response, "error.response");
-        int i = response.getCode() != 30007 ? 2131888562 : 2131888566;
+        int i = response.getCode() != 30007 ? R.string.follow_modal_fail : R.string.follow_modal_too_many_webhooks;
         ViewState viewState = getViewState();
         Objects.requireNonNull(viewState, "null cannot be cast to non-null type com.discord.widgets.announcements.WidgetChannelFollowSheetViewModel.ViewState.Loaded");
         updateViewState(ViewState.Loaded.copy$default((ViewState.Loaded) viewState, null, null, null, null, null, null, Integer.valueOf(i), 63, null));
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java
index 863a288b99..04bff51a87 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.announcements;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelFollowSuccessDialogBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetChannelFollowSuccessDialog$binding$2 ex
 
     public final WidgetChannelFollowSuccessDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362294;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362294);
+        int i = R.id.channel_follow_success_confirm;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.channel_follow_success_confirm);
         if (materialButton != null) {
-            i = 2131362295;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362295);
+            i = R.id.channel_follow_success_image;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channel_follow_success_image);
             if (simpleDraweeView != null) {
-                i = 2131362296;
-                TextView textView = (TextView) view.findViewById(2131362296);
+                i = R.id.channel_follow_success_text;
+                TextView textView = (TextView) view.findViewById(R.id.channel_follow_success_text);
                 if (textView != null) {
                     return new WidgetChannelFollowSuccessDialogBinding((NestedScrollView) view, materialButton, simpleDraweeView, textView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java
index 0a62ef0a3f..51035fd163 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetChannelFollowSuccessDialogBinding;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -23,8 +24,8 @@ public final class WidgetChannelFollowSuccessDialog extends AppDialog {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.V(WidgetChannelFollowSuccessDialog.class, "binding", "getBinding()Lcom/discord/databinding/WidgetChannelFollowSuccessDialogBinding;", 0)};
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetChannelFollowSuccessDialog$binding$2.INSTANCE, null, 2, null);
-    private final Integer[] successImageOptions = {2130969502, 2130969503, 2130969504};
-    private final Integer[] successTextOptions = {2131888571, 2131888572, 2131888573, 2131888574, 2131888575, 2131888576, 2131888577, 2131888578, 2131888579, 2131888580};
+    private final Integer[] successImageOptions = {Integer.valueOf((int) R.attr.img_channel_following_success_1), Integer.valueOf((int) R.attr.img_channel_following_success_2), Integer.valueOf((int) R.attr.img_channel_following_success_3)};
+    private final Integer[] successTextOptions = {Integer.valueOf((int) R.string.follow_success_modal_header_01), Integer.valueOf((int) R.string.follow_success_modal_header_02), Integer.valueOf((int) R.string.follow_success_modal_header_03), Integer.valueOf((int) R.string.follow_success_modal_header_04), Integer.valueOf((int) R.string.follow_success_modal_header_05), Integer.valueOf((int) R.string.follow_success_modal_header_06), Integer.valueOf((int) R.string.follow_success_modal_header_07), Integer.valueOf((int) R.string.follow_success_modal_header_08), Integer.valueOf((int) R.string.follow_success_modal_header_09), Integer.valueOf((int) R.string.follow_success_modal_header_10)};
 
     /* compiled from: WidgetChannelFollowSuccessDialog.kt */
     public static final class Companion {
@@ -42,7 +43,7 @@ public final class WidgetChannelFollowSuccessDialog extends AppDialog {
     }
 
     public WidgetChannelFollowSuccessDialog() {
-        super(2131558889);
+        super(R.layout.widget_channel_follow_success_dialog);
     }
 
     private final WidgetChannelFollowSuccessDialogBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java b/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java
index 44010a0405..a3c99ff402 100644
--- a/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java
+++ b/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.user.User;
@@ -43,22 +44,22 @@ public final class AuthInviteInfoView extends RelativeLayout {
     public AuthInviteInfoView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558739, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_auth_invite_info, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131362025;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362025);
+        int i2 = R.id.auth_invite_info_content;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.auth_invite_info_content);
         if (linearLayout != null) {
-            i2 = 2131362026;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362026);
+            i2 = R.id.auth_invite_info_guild_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.auth_invite_info_guild_avatar);
             if (simpleDraweeView != null) {
-                i2 = 2131362027;
-                TextView textView = (TextView) inflate.findViewById(2131362027);
+                i2 = R.id.auth_invite_info_guild_name;
+                TextView textView = (TextView) inflate.findViewById(R.id.auth_invite_info_guild_name);
                 if (textView != null) {
-                    i2 = 2131362028;
-                    TextView textView2 = (TextView) inflate.findViewById(2131362028);
+                    i2 = R.id.auth_invite_info_invited_text;
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.auth_invite_info_invited_text);
                     if (textView2 != null) {
-                        i2 = 2131362029;
-                        ImageView imageView = (ImageView) inflate.findViewById(2131362029);
+                        i2 = R.id.auth_invite_info_template_icon;
+                        ImageView imageView = (ImageView) inflate.findViewById(R.id.auth_invite_info_template_icon);
                         if (imageView != null) {
                             ViewAuthInviteInfoBinding viewAuthInviteInfoBinding = new ViewAuthInviteInfoBinding((RelativeLayout) inflate, linearLayout, simpleDraweeView, textView, textView2, imageView);
                             m.checkNotNullExpressionValue(viewAuthInviteInfoBinding, "ViewAuthInviteInfoBindin…rom(context), this, true)");
@@ -85,7 +86,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
         if (modelInvite.getChannel() == null && modelInvite.getGuild() == null && z2) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            return b.h(context, 2131890680, new Object[0], null, 4);
+            return b.h(context, R.string.instant_invite_you_have_been_invited_to_chat_with, new Object[0], null, 4);
         }
         Channel channel = modelInvite.getChannel();
         m.checkNotNullExpressionValue(channel, "channel");
@@ -95,22 +96,22 @@ public final class AuthInviteInfoView extends RelativeLayout {
             if ((AnimatableValueParser.y0(channel2).length() == 0) || !z2) {
                 Context context2 = getContext();
                 m.checkNotNullExpressionValue(context2, "context");
-                return b.h(context2, 2131890683, new Object[0], null, 4);
+                return b.h(context2, R.string.instant_invite_you_have_been_invited_to_join_group_dm, new Object[0], null, 4);
             }
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
             Object[] objArr = new Object[1];
             User inviter2 = modelInvite.getInviter();
             objArr[0] = inviter2 != null ? inviter2.r() : null;
-            return b.h(context3, 2131886769, objArr, null, 4);
+            return b.h(context3, R.string.auth_message_invited_by, objArr, null, 4);
         } else if (modelInvite.getApproximateMemberCount() >= 200 || !z2) {
             Context context4 = getContext();
             m.checkNotNullExpressionValue(context4, "context");
-            return b.h(context4, 2131890681, new Object[0], null, 4);
+            return b.h(context4, R.string.instant_invite_you_have_been_invited_to_join, new Object[0], null, 4);
         } else {
             Context context5 = getContext();
             m.checkNotNullExpressionValue(context5, "context");
-            return b.h(context5, 2131886769, new Object[]{r}, null, 4);
+            return b.h(context5, R.string.auth_message_invited_by, new Object[]{r}, null, 4);
         }
     }
 
@@ -124,7 +125,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
         imageView.setVisibility(0);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.authInviteInfoInvitedText");
-        b.n(textView, 2131890245, new Object[0], null, 4);
+        b.n(textView, R.string.guild_template_modal_title, new Object[0], null, 4);
         TextView textView2 = this.binding.f1648c;
         m.checkNotNullExpressionValue(textView2, "binding.authInviteInfoGuildName");
         textView2.setText(modelGuildTemplate.getName());
@@ -151,7 +152,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
                 SimpleDraweeView simpleDraweeView2 = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.authInviteInfoGuildAvatar");
                 m.checkNotNullExpressionValue(guild, "inviteGuild");
-                IconUtils.setIcon$default(simpleDraweeView2, IconUtils.getForGuild$default(new com.discord.models.guild.Guild(guild), "asset://asset/images/default_icon_selected.jpg", true, null, 8, null), 2131165290, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+                IconUtils.setIcon$default(simpleDraweeView2, IconUtils.getForGuild$default(new com.discord.models.guild.Guild(guild), IconUtils.DEFAULT_ICON_BLURPLE, true, null, 8, null), (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
                 TextView textView = this.binding.d;
                 m.checkNotNullExpressionValue(textView, "binding.authInviteInfoInvitedText");
                 textView.setText(b.l(getIntroText(modelInvite), new Object[0], null, 2));
@@ -171,7 +172,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
             SimpleDraweeView simpleDraweeView3 = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.authInviteInfoGuildAvatar");
             User inviter2 = modelInvite.getInviter();
-            IconUtils.setIcon$default(simpleDraweeView3, (inviter2 == null || (a = inviter2.a()) == null) ? null : a.a(), 2131165290, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView3, (inviter2 == null || (a = inviter2.a()) == null) ? null : a.a(), (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
             TextView textView3 = this.binding.d;
             m.checkNotNullExpressionValue(textView3, "binding.authInviteInfoInvitedText");
             textView3.setText(b.l(getIntroText(modelInvite), new Object[0], null, 2));
@@ -203,7 +204,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
             SimpleDraweeView simpleDraweeView4 = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView4, "binding.authInviteInfoGuildAvatar");
             User inviter5 = modelInvite.getInviter();
-            IconUtils.setIcon$default(simpleDraweeView4, inviter5 != null ? new CoreUser(inviter5) : null, 2131165290, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView4, inviter5 != null ? new CoreUser(inviter5) : null, R.dimen.avatar_size_large, null, null, null, 56, null);
             TextView textView5 = this.binding.d;
             m.checkNotNullExpressionValue(textView5, "binding.authInviteInfoInvitedText");
             textView5.setText(b.l(getIntroText(modelInvite), new Object[0], null, 2));
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java
index 9f019c31cb..fd6c52fd95 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java
@@ -7,6 +7,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import c.a.j.a0;
 import c.a.j.y;
 import c.a.j.z;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetAgeVerifyBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -26,53 +27,53 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement
 
     public final WidgetAgeVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361949;
-        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131361949);
+        int i = R.id.age_verify_view_flipper;
+        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.age_verify_view_flipper);
         if (appViewFlipper != null) {
-            i = 2131362715;
-            View findViewById = view.findViewById(2131362715);
+            i = R.id.confirm;
+            View findViewById = view.findViewById(R.id.confirm);
             if (findViewById != null) {
-                int i2 = 2131361938;
-                MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131361938);
+                int i2 = R.id.age_verify_confirm_back_button;
+                MaterialButton materialButton = (MaterialButton) findViewById.findViewById(R.id.age_verify_confirm_back_button);
                 if (materialButton != null) {
-                    i2 = 2131361939;
-                    LoadingButton loadingButton = (LoadingButton) findViewById.findViewById(2131361939);
+                    i2 = R.id.age_verify_confirm_button;
+                    LoadingButton loadingButton = (LoadingButton) findViewById.findViewById(R.id.age_verify_confirm_button);
                     if (loadingButton != null) {
-                        i2 = 2131361940;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131361940);
+                        i2 = R.id.age_verify_confirm_description;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(R.id.age_verify_confirm_description);
                         if (linkifiedTextView != null) {
-                            i2 = 2131361941;
-                            TextView textView = (TextView) findViewById.findViewById(2131361941);
+                            i2 = R.id.age_verify_confirm_title;
+                            TextView textView = (TextView) findViewById.findViewById(R.id.age_verify_confirm_title);
                             if (textView != null) {
                                 z zVar = new z((ConstraintLayout) findViewById, materialButton, loadingButton, linkifiedTextView, textView);
-                                View findViewById2 = view.findViewById(2131365610);
+                                View findViewById2 = view.findViewById(R.id.underage);
                                 if (findViewById2 != null) {
-                                    int i3 = 2131361945;
-                                    MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131361945);
+                                    int i3 = R.id.age_verify_return_to_login_button;
+                                    MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(R.id.age_verify_return_to_login_button);
                                     if (materialButton2 != null) {
-                                        i3 = 2131361947;
-                                        LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById2.findViewById(2131361947);
+                                        i3 = R.id.age_verify_underage_description;
+                                        LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById2.findViewById(R.id.age_verify_underage_description);
                                         if (linkifiedTextView2 != null) {
-                                            i3 = 2131361948;
-                                            TextView textView2 = (TextView) findViewById2.findViewById(2131361948);
+                                            i3 = R.id.age_verify_underage_title;
+                                            TextView textView2 = (TextView) findViewById2.findViewById(R.id.age_verify_underage_title);
                                             if (textView2 != null) {
-                                                i3 = 2131365611;
-                                                TextView textView3 = (TextView) findViewById2.findViewById(2131365611);
+                                                i3 = R.id.underage_warning;
+                                                TextView textView3 = (TextView) findViewById2.findViewById(R.id.underage_warning);
                                                 if (textView3 != null) {
                                                     a0 a0Var = new a0((ConstraintLayout) findViewById2, materialButton2, linkifiedTextView2, textView2, textView3);
-                                                    View findViewById3 = view.findViewById(2131365760);
+                                                    View findViewById3 = view.findViewById(R.id.verify);
                                                     if (findViewById3 != null) {
-                                                        int i4 = 2131361942;
-                                                        LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById3.findViewById(2131361942);
+                                                        int i4 = R.id.age_verify_description;
+                                                        LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById3.findViewById(R.id.age_verify_description);
                                                         if (linkifiedTextView3 != null) {
-                                                            i4 = 2131361943;
-                                                            TextInputLayout textInputLayout = (TextInputLayout) findViewById3.findViewById(2131361943);
+                                                            i4 = R.id.age_verify_input_wrapper;
+                                                            TextInputLayout textInputLayout = (TextInputLayout) findViewById3.findViewById(R.id.age_verify_input_wrapper);
                                                             if (textInputLayout != null) {
-                                                                i4 = 2131361944;
-                                                                LoadingButton loadingButton2 = (LoadingButton) findViewById3.findViewById(2131361944);
+                                                                i4 = R.id.age_verify_next_button;
+                                                                LoadingButton loadingButton2 = (LoadingButton) findViewById3.findViewById(R.id.age_verify_next_button);
                                                                 if (loadingButton2 != null) {
-                                                                    i4 = 2131361946;
-                                                                    TextView textView4 = (TextView) findViewById3.findViewById(2131361946);
+                                                                    i4 = R.id.age_verify_title;
+                                                                    TextView textView4 = (TextView) findViewById3.findViewById(R.id.age_verify_title);
                                                                     if (textView4 != null) {
                                                                         return new WidgetAgeVerifyBinding((CoordinatorLayout) view, appViewFlipper, zVar, a0Var, new y((ConstraintLayout) findViewById3, linkifiedTextView3, textInputLayout, loadingButton2, textView4));
                                                                     }
@@ -81,14 +82,14 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement
                                                         }
                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i4)));
                                                     }
-                                                    i = 2131365760;
+                                                    i = R.id.verify;
                                                 }
                                             }
                                         }
                                     }
                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i3)));
                                 }
-                                i = 2131365610;
+                                i = R.id.underage;
                             }
                         }
                     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.java
index 77b3e00880..f9f4f54d9e 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.k;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.birthday.BirthdayHelper;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -34,7 +35,7 @@ public final class WidgetAgeVerify$configureBirthdayInput$1 extends o implements
         k.a aVar = k.j;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        CharSequence k = b.k(this.this$0, 2131886315, new Object[0], null, 4);
+        CharSequence k = b.k(this.this$0, R.string.age_gate_date_of_birth, new Object[0], null, 4);
         Long l = this.$timeOfBirth;
         aVar.a(parentFragmentManager, k, l != null ? l.longValue() : BirthdayHelper.INSTANCE.defaultInputAge(), BirthdayHelper.INSTANCE.getMaxDateOfBirth()).k = new WidgetAgeVerify$configureBirthdayInput$1$$special$$inlined$apply$lambda$1(this);
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java
index 1d73893266..a6b4890cf9 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java
@@ -17,6 +17,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetAgeVerifyBinding;
@@ -68,13 +69,13 @@ public final class WidgetAgeVerify extends AppFragment {
             m.checkNotNullParameter(context, "context");
             AnalyticsTracker.openModal$default("Age Gate", "", null, 4, null);
             Bundle bundle = new Bundle();
-            bundle.putBoolean("INTENT_EXTRA_NSFW_CHANNEL", z2);
+            bundle.putBoolean(WidgetAgeVerify.INTENT_EXTRA_NSFW_CHANNEL, z2);
             l.d(context, WidgetAgeVerify.class, new Intent().putExtras(bundle));
         }
     }
 
     public WidgetAgeVerify() {
-        super(2131558863);
+        super(R.layout.widget_age_verify);
         WidgetAgeVerify$viewModel$2 widgetAgeVerify$viewModel$2 = WidgetAgeVerify$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetAgeVerifyViewModel.class), new WidgetAgeVerify$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetAgeVerify$viewModel$2));
@@ -136,10 +137,10 @@ public final class WidgetAgeVerify extends AppFragment {
         loadingButton2.setEnabled(viewState.getDateOfBirth() != null);
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755015, 30, 30);
+        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), (int) R.plurals.age_gate_underage_existing_body_deletion_with_days_days, 30, 30);
         TextView textView = getBinding().d.d;
         m.checkNotNullExpressionValue(textView, "binding.underage.underageWarning");
-        b.n(textView, 2131886335, new Object[]{quantityString}, null, 4);
+        b.n(textView, R.string.age_gate_underage_existing_body_deletion_with_days, new Object[]{quantityString}, null, 4);
         LinkifiedTextView linkifiedTextView = getBinding().d.f62c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.underage.ageVerifyUnderageDescription");
         Object[] objArr = new Object[2];
@@ -149,7 +150,7 @@ public final class WidgetAgeVerify extends AppFragment {
         }
         objArr[0] = underageMessage;
         objArr[1] = f.a.a(360040724612L, null);
-        b.n(linkifiedTextView, 2131886331, objArr, null, 4);
+        b.n(linkifiedTextView, R.string.age_gate_underage_body, objArr, null, 4);
         if (viewState.getDisplayedChild() == 2) {
             requireAppActivity().r = false;
             AppFragment.hideKeyboard$default(this, null, 1, null);
@@ -158,7 +159,7 @@ public final class WidgetAgeVerify extends AppFragment {
             int age = BirthdayHelper.INSTANCE.getAge(dateOfBirth.longValue());
             TextView textView2 = getBinding().f1680c.e;
             m.checkNotNullExpressionValue(textView2, "binding.confirm.ageVerifyConfirmTitle");
-            b.n(textView2, 2131886313, new Object[]{String.valueOf(age)}, null, 4);
+            b.n(textView2, R.string.age_gate_confirm_header, new Object[]{String.valueOf(age)}, null, 4);
         }
         configureBirthdayInput(viewState);
         configureViewFlipper(viewState.getDisplayedChild());
@@ -171,20 +172,20 @@ public final class WidgetAgeVerify extends AppFragment {
         if (i > appViewFlipper.getDisplayedChild()) {
             AppViewFlipper appViewFlipper2 = getBinding().b;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.ageVerifyViewFlipper");
-            appViewFlipper2.setInAnimation(AnimationUtils.loadAnimation(getContext(), 2130771990));
+            appViewFlipper2.setInAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_open_in));
             AppViewFlipper appViewFlipper3 = getBinding().b;
             m.checkNotNullExpressionValue(appViewFlipper3, "binding.ageVerifyViewFlipper");
-            appViewFlipper3.setOutAnimation(AnimationUtils.loadAnimation(getContext(), 2130771991));
+            appViewFlipper3.setOutAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_open_out));
         } else {
             AppViewFlipper appViewFlipper4 = getBinding().b;
             m.checkNotNullExpressionValue(appViewFlipper4, "binding.ageVerifyViewFlipper");
             if (i < appViewFlipper4.getDisplayedChild()) {
                 AppViewFlipper appViewFlipper5 = getBinding().b;
                 m.checkNotNullExpressionValue(appViewFlipper5, "binding.ageVerifyViewFlipper");
-                appViewFlipper5.setInAnimation(AnimationUtils.loadAnimation(getContext(), 2130771988));
+                appViewFlipper5.setInAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_close_in));
                 AppViewFlipper appViewFlipper6 = getBinding().b;
                 m.checkNotNullExpressionValue(appViewFlipper6, "binding.ageVerifyViewFlipper");
-                appViewFlipper6.setOutAnimation(AnimationUtils.loadAnimation(getContext(), 2130771989));
+                appViewFlipper6.setOutAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_close_out));
             }
         }
         AppViewFlipper appViewFlipper7 = getBinding().b;
@@ -203,7 +204,7 @@ public final class WidgetAgeVerify extends AppFragment {
     private final void handleEvent(WidgetAgeVerifyViewModel.Event event) {
         if (m.areEqual(event, WidgetAgeVerifyViewModel.Event.Verified.INSTANCE)) {
             Context context = getContext();
-            o.f(this, context != null ? context.getString(2131886308) : null, 1);
+            o.f(this, context != null ? context.getString(R.string.age_gate_age_verified) : null, 1);
             requireActivity().finish();
         }
     }
@@ -220,10 +221,10 @@ public final class WidgetAgeVerify extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         getBinding().d.b.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$1(this));
-        boolean booleanExtra = getMostRecentIntent().getBooleanExtra("INTENT_EXTRA_NSFW_CHANNEL", false);
+        boolean booleanExtra = getMostRecentIntent().getBooleanExtra(INTENT_EXTRA_NSFW_CHANNEL, false);
         LinkifiedTextView linkifiedTextView = getBinding().e.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.verify.ageVerifyDescription");
-        b.n(linkifiedTextView, booleanExtra ? 2131886325 : 2131886310, new Object[]{f.a.a(360040724612L, null)}, null, 4);
+        b.n(linkifiedTextView, booleanExtra ? R.string.age_gate_nsfw_body : R.string.age_gate_body, new Object[]{f.a.a(360040724612L, null)}, null, 4);
         LinkifiedTextView linkifiedTextView2 = getBinding().f1680c.d;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.confirm.ageVerifyConfirmDescription");
         LinkifiedTextView linkifiedTextView3 = getBinding().e.b;
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
index e7a7a18a3b..6531d69851 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
@@ -2,7 +2,9 @@ package com.discord.widgets.auth;
 
 import android.content.Context;
 import androidx.annotation.MainThread;
+import androidx.core.app.FrameMetricsAggregator;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.user.NsfwAllowance;
 import com.discord.app.AppViewModel;
@@ -423,12 +425,12 @@ public final class WidgetAgeVerifyViewModel extends AppViewModel<ViewState> {
             m.checkNotNullExpressionValue(response, "error.response");
             Map<String, List<String>> messages = response.getMessages();
             m.checkNotNullExpressionValue(messages, "error.response.messages");
-            if (messages.containsKey("date_of_birth")) {
+            if (messages.containsKey(BirthdayHelper.DATE_OF_BIRTH_KEY)) {
                 Error.Response response2 = error.getResponse();
                 m.checkNotNullExpressionValue(response2, "error.response");
                 Map<String, List<String>> messages2 = response2.getMessages();
                 m.checkNotNullExpressionValue(messages2, "error.response.messages");
-                List<String> list = messages2.get("date_of_birth");
+                List<String> list = messages2.get(BirthdayHelper.DATE_OF_BIRTH_KEY);
                 if (list == null) {
                     list = n.emptyList();
                 }
@@ -438,7 +440,7 @@ public final class WidgetAgeVerifyViewModel extends AppViewModel<ViewState> {
                 this.storeAuth.setAgeGateError(joinToString$default);
                 return;
             }
-            updateViewState(ViewState.copy$default(viewState, false, 2131886321, 0, null, null, null, false, 124, null));
+            updateViewState(ViewState.copy$default(viewState, false, Integer.valueOf((int) R.string.age_gate_failed_to_update_birthday), 0, null, null, null, false, 124, null));
         }
     }
 
@@ -494,7 +496,7 @@ public final class WidgetAgeVerifyViewModel extends AppViewModel<ViewState> {
             long longValue = dateOfBirth.longValue();
             boolean z3 = BirthdayHelper.INSTANCE.getAge(longValue) < 18;
             if (!z2 || !z3 || viewState.getDisplayedChild() != 0) {
-                RestAPIParams.UserInfo userInfo = new RestAPIParams.UserInfo(null, null, null, null, null, null, null, null, null, TimeUtils.toUTCDateTime(Long.valueOf(longValue), "yyyy-MM-dd"), 511, null);
+                RestAPIParams.UserInfo userInfo = new RestAPIParams.UserInfo(null, null, null, null, null, null, null, null, null, TimeUtils.toUTCDateTime(Long.valueOf(longValue), TimeUtils.UTCFormat.SHORT), FrameMetricsAggregator.EVERY_DURATION, null);
                 updateViewState(ViewState.copy$default(viewState, true, null, 0, null, null, null, false, 124, null));
                 AnalyticsTracker.INSTANCE.ageGateSubmitted(longValue, z2 ? "NSFW Channel" : "Public Server");
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.patchUser(userInfo), false, 1, null), this, null, 2, null), WidgetAgeVerifyViewModel.class, (Context) null, (Function1) null, new WidgetAgeVerifyViewModel$submit$2(this), (Function0) null, (Function0) null, new WidgetAgeVerifyViewModel$submit$1(this), 54, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java
index 5fbd58f218..93bb0839d4 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthAgeGatedBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.google.android.material.button.MaterialButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetAuthAgeGated$binding$2 extends k implem
 
     public final WidgetAuthAgeGatedBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362057;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362057);
+        int i = R.id.auth_register_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.auth_register_container);
         if (linearLayout != null) {
-            i = 2131362064;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362064);
+            i = R.id.auth_register_underage_button;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_register_underage_button);
             if (materialButton != null) {
-                i = 2131362065;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362065);
+                i = R.id.auth_register_underage_description;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.auth_register_underage_description);
                 if (linkifiedTextView != null) {
                     return new WidgetAuthAgeGatedBinding((CoordinatorLayout) view, linearLayout, materialButton, linkifiedTextView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java
index 06a5f94a4d..f9ff792ed9 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java
@@ -7,6 +7,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthAgeGatedBinding;
 import com.discord.utilities.auth.RegistrationFlowRepo;
@@ -35,13 +36,13 @@ public final class WidgetAuthAgeGated extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "message");
             Bundle bundle = new Bundle();
-            bundle.putString("INTENT_UNDERAGE_MESSAGE", str);
+            bundle.putString(WidgetAuthAgeGated.INTENT_UNDERAGE_MESSAGE, str);
             l.d(context, WidgetAuthAgeGated.class, new Intent().putExtras(bundle));
         }
     }
 
     public WidgetAuthAgeGated() {
-        super(2131558867);
+        super(R.layout.widget_auth_age_gated);
     }
 
     private final WidgetAuthAgeGatedBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java
index 5fc4d81169..f8e6b9a9f5 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthBirthdayBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -22,23 +23,23 @@ public final /* synthetic */ class WidgetAuthBirthday$binding$2 extends k implem
 
     public final WidgetAuthBirthdayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362051;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362051);
+        int i = R.id.auth_policy_links;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.auth_policy_links);
         if (linkifiedTextView != null) {
-            i = 2131362055;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362055);
+            i = R.id.auth_register_birthday;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.auth_register_birthday);
             if (textInputLayout != null) {
-                i = 2131362056;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362056);
+                i = R.id.auth_register_button;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_register_button);
                 if (materialButton != null) {
-                    i = 2131362057;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362057);
+                    i = R.id.auth_register_container;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.auth_register_container);
                     if (linearLayout != null) {
-                        i = 2131362069;
-                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362069);
+                        i = R.id.auth_tos_opt_in;
+                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(R.id.auth_tos_opt_in);
                         if (materialCheckBox != null) {
-                            i = 2131362956;
-                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                            i = R.id.dimmer_view;
+                            DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                             if (dimmerView != null) {
                                 return new WidgetAuthBirthdayBinding((CoordinatorLayout) view, linkifiedTextView, textInputLayout, materialButton, linearLayout, materialCheckBox, dimmerView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.java
index 56976fd73e..5014c21dbe 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.k;
+import com.discord.R;
 import com.discord.utilities.birthday.BirthdayHelper;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -31,7 +32,7 @@ public final class WidgetAuthBirthday$onViewBoundOrOnResume$1 extends o implemen
         k.a aVar = k.j;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        String string = this.this$0.getString(2131886315);
+        String string = this.this$0.getString(R.string.age_gate_date_of_birth);
         m.checkNotNullExpressionValue(string, "getString(R.string.age_gate_date_of_birth)");
         Long access$getBirthday = WidgetAuthBirthday.access$getBirthday(this.this$0);
         aVar.a(parentFragmentManager, string, access$getBirthday != null ? access$getBirthday.longValue() : BirthdayHelper.INSTANCE.defaultInputAge(), BirthdayHelper.INSTANCE.getMaxDateOfBirth()).k = new WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1(this);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java
index 509fb1aec2..467a8574f0 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.auth;
 
 import android.widget.CheckBox;
+import com.discord.R;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
@@ -30,7 +31,7 @@ public final class WidgetAuthBirthday$validationManager$2 extends o implements F
             if ((WidgetAuthBirthday.access$isConsentRequired$p(this.this$0.this$0) && checkBox.isChecked()) || !WidgetAuthBirthday.access$isConsentRequired$p(this.this$0.this$0)) {
                 return null;
             }
-            return checkBox.getContext().getString(2131894246);
+            return checkBox.getContext().getString(R.string.terms_privacy_opt_in_tooltip);
         }
     }
 
@@ -70,6 +71,6 @@ public final class WidgetAuthBirthday$validationManager$2 extends o implements F
     public final ValidationManager mo1invoke() {
         TextInputLayout textInputLayout = WidgetAuthBirthday.access$getBinding$p(this.this$0).f1683c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday");
-        return new ValidationManager(new Input.TextInputLayoutInput("dateOfBirth", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131886324)), new Input.GenericInput("tos", WidgetAuthBirthday.access$getBinding$p(this.this$0).e, new AnonymousClass1(this), AnonymousClass2.INSTANCE));
+        return new ValidationManager(new Input.TextInputLayoutInput("dateOfBirth", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.age_gate_invalid_birthday)), new Input.GenericInput("tos", WidgetAuthBirthday.access$getBinding$p(this.this$0).e, new AnonymousClass1(this), AnonymousClass2.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java
index 147561c4dd..5fda43e14f 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthBirthdayBinding;
 import com.discord.stores.StoreStream;
@@ -69,7 +70,7 @@ public final class WidgetAuthBirthday extends AppFragment {
     }
 
     public WidgetAuthBirthday() {
-        super(2131558868);
+        super(R.layout.widget_auth_birthday);
     }
 
     public static final /* synthetic */ WidgetAuthBirthdayBinding access$getBinding$p(WidgetAuthBirthday widgetAuthBirthday) {
@@ -143,7 +144,7 @@ public final class WidgetAuthBirthday extends AppFragment {
         materialCheckBox.setVisibility(this.isConsentRequired ? 0 : 8);
         LinkifiedTextView linkifiedTextView = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.authPolicyLinks");
-        b.n(linkifiedTextView, this.isConsentRequired ? 2131894245 : 2131894244, new Object[]{getString(2131894243), getString(2131892756)}, null, 4);
+        b.n(linkifiedTextView, this.isConsentRequired ? R.string.terms_privacy_opt_in : R.string.terms_privacy, new Object[]{getString(R.string.terms_of_service_url), getString(R.string.privacy_policy_url)}, null, 4);
         TextInputLayout textInputLayout = getBinding().f1683c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday");
         ViewExtensions.setOnEditTextClickListener(textInputLayout, new WidgetAuthBirthday$onViewBoundOrOnResume$1(this));
@@ -156,7 +157,7 @@ public final class WidgetAuthBirthday extends AppFragment {
         if (ValidationManager.validate$default(getValidationManager(), false, 1, null)) {
             RegistrationFlowRepo.trackTransition$default(companion.getINSTANCE(), "Age Gate", "success", null, 4, null);
             Intent intent = new Intent();
-            intent.putExtra("RESULT_EXTRA_BIRTHDAY", getBirthday());
+            intent.putExtra(RESULT_EXTRA_BIRTHDAY, getBirthday());
             requireActivity().setResult(-1, intent);
             requireActivity().onBackPressed();
             return;
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java
index 320ea21818..60b535e8e3 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthCaptchaBinding;
 import com.discord.views.ScreenTitleView;
 import com.google.android.material.button.MaterialButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetAuthCaptcha$binding$2 extends k impleme
 
     public final WidgetAuthCaptchaBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362023;
-        TextView textView = (TextView) view.findViewById(2131362023);
+        int i = R.id.auth_captcha_help;
+        TextView textView = (TextView) view.findViewById(R.id.auth_captcha_help);
         if (textView != null) {
-            i = 2131362024;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362024);
+            i = R.id.auth_captcha_verify;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_captcha_verify);
             if (materialButton != null) {
-                i = 2131364751;
-                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364751);
+                i = R.id.screen_title;
+                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.screen_title);
                 if (screenTitleView != null) {
                     return new WidgetAuthCaptchaBinding((CoordinatorLayout) view, textView, materialButton, screenTitleView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java
index 3c3742ef90..b777b5ad06 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthCaptchaBinding;
 import com.discord.utilities.auth.RegistrationFlowRepo;
@@ -47,7 +48,7 @@ public final class WidgetAuthCaptcha extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             Intent intent = new Intent();
-            intent.putExtra("EXTRA_CAPTCHA_ERROR_BODY", captchaErrorBody);
+            intent.putExtra(WidgetAuthCaptcha.EXTRA_CAPTCHA_ERROR_BODY, captchaErrorBody);
             l.g.f(context, activityResultLauncher, WidgetAuthCaptcha.class, intent);
         }
 
@@ -56,7 +57,7 @@ public final class WidgetAuthCaptcha extends AppFragment {
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             m.checkNotNullParameter(list, "unhandledErrors");
             m.checkNotNullParameter(error, "error");
-            if (list.remove("captcha_key")) {
+            if (list.remove(CaptchaHelper.CAPTCHA_KEY)) {
                 launch(context, activityResultLauncher, CaptchaErrorBody.Companion.createFromError(error));
                 error.setShowErrorToasts(false);
             }
@@ -72,7 +73,7 @@ public final class WidgetAuthCaptcha extends AppFragment {
     }
 
     public WidgetAuthCaptcha() {
-        super(2131558869);
+        super(R.layout.widget_auth_captcha);
     }
 
     public static final /* synthetic */ void access$finishIfCaptchaTokenReceived(WidgetAuthCaptcha widgetAuthCaptcha, Activity activity) {
@@ -86,7 +87,7 @@ public final class WidgetAuthCaptcha extends AppFragment {
             captchaHelper.setCaptchaToken(null);
             RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Captcha", "submitted", null, 4, null);
             Intent intent = new Intent();
-            intent.putExtra("RESULT_EXTRA_UNDELETE", captchaToken);
+            intent.putExtra(RESULT_EXTRA_TOKEN, captchaToken);
             activity.setResult(-1, intent);
             activity.finish();
         }
@@ -107,7 +108,7 @@ public final class WidgetAuthCaptcha extends AppFragment {
         CaptchaHelper.CaptchaRequest captchaRequest;
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("EXTRA_CAPTCHA_ERROR_BODY");
+        Serializable serializableExtra = getMostRecentIntent().getSerializableExtra(EXTRA_CAPTCHA_ERROR_BODY);
         CaptchaService captchaService = null;
         if (!(serializableExtra instanceof CaptchaErrorBody)) {
             serializableExtra = null;
@@ -126,7 +127,7 @@ public final class WidgetAuthCaptcha extends AppFragment {
             m.checkNotNullExpressionValue(requireActivity2, "requireActivity()");
             captchaRequest = new CaptchaHelper.CaptchaRequest.HCaptcha(captchaSitekey, requireActivity2);
         }
-        String string = captchaRequest instanceof CaptchaHelper.CaptchaRequest.HCaptcha ? getString(2131894928) : getString(2131894931);
+        String string = captchaRequest instanceof CaptchaHelper.CaptchaRequest.HCaptcha ? getString(R.string.verify_by_hcaptcha) : getString(R.string.verify_by_recaptcha);
         m.checkNotNullExpressionValue(string, "if (captchaRequest is Ca…erify_by_recaptcha)\n    }");
         getBinding().d.setTitle(string);
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Captcha", "viewed", null, 4, null);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$binding$2.java
index 19f676892c..07a5725cb7 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetAuthLandingBinding;
 import com.discord.views.ScreenTitleView;
@@ -21,26 +22,26 @@ public final /* synthetic */ class WidgetAuthLanding$binding$2 extends k impleme
 
     public final WidgetAuthLandingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362022;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362022);
+        int i = R.id.auth_bottom_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.auth_bottom_container);
         if (linearLayout != null) {
-            i = 2131362030;
-            AuthInviteInfoView authInviteInfoView = (AuthInviteInfoView) view.findViewById(2131362030);
+            i = R.id.auth_landing_invite_info;
+            AuthInviteInfoView authInviteInfoView = (AuthInviteInfoView) view.findViewById(R.id.auth_landing_invite_info);
             if (authInviteInfoView != null) {
-                i = 2131362031;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362031);
+                i = R.id.auth_landing_login;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_landing_login);
                 if (materialButton != null) {
-                    i = 2131362032;
-                    ImageView imageView = (ImageView) view.findViewById(2131362032);
+                    i = R.id.auth_landing_logo;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.auth_landing_logo);
                     if (imageView != null) {
-                        i = 2131362033;
-                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362033);
+                        i = R.id.auth_landing_register;
+                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.auth_landing_register);
                         if (materialButton2 != null) {
-                            i = 2131362034;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362034);
+                            i = R.id.auth_landing_switch_flipper;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.auth_landing_switch_flipper);
                             if (appViewFlipper != null) {
-                                i = 2131362035;
-                                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362035);
+                                i = R.id.auth_landing_title;
+                                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.auth_landing_title);
                                 if (screenTitleView != null) {
                                     return new WidgetAuthLandingBinding((RelativeLayout) view, linearLayout, authInviteInfoView, materialButton, imageView, materialButton2, appViewFlipper, screenTitleView);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$onViewBoundOrOnResume$2.java
index b10945d3b8..883e0e7461 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.auth;
 
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -25,7 +26,7 @@ public final class WidgetAuthLanding$onViewBoundOrOnResume$2 extends o implement
     public final void invoke(Boolean bool) {
         m.checkNotNullExpressionValue(bool, "experimentEnabled");
         if (bool.booleanValue() && !WidgetAuthLanding.access$getViewModel$p(this.this$0).getSmartLockCredentialRequestDisabled()) {
-            WidgetAuthLanding.access$getViewModel$p(this.this$0).getGoogleSmartLockManager().requestCredentials(this.this$0, 4009);
+            WidgetAuthLanding.access$getViewModel$p(this.this$0).getGoogleSmartLockManager().requestCredentials(this.this$0, GoogleSmartLockManager.GOOGLE_SMART_LOCK_REQUEST_CODE_RESOLVE_FOR_REQUEST);
             WidgetAuthLanding.access$getViewModel$p(this.this$0).setSmartLockCredentialRequestDisabled(true);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
index b7aa8e4587..d1e59849c7 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
@@ -10,6 +10,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetAuthLandingBinding;
@@ -53,7 +54,7 @@ public final class WidgetAuthLanding extends AppFragment {
     }
 
     public WidgetAuthLanding() {
-        super(2131558871);
+        super(R.layout.widget_auth_landing);
         WidgetAuthLanding$viewModel$2 widgetAuthLanding$viewModel$2 = new WidgetAuthLanding$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetAuthLandingViewModel.class), new WidgetAuthLanding$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetAuthLanding$viewModel$2));
@@ -95,7 +96,7 @@ public final class WidgetAuthLanding extends AppFragment {
         if (viewState instanceof WidgetAuthLandingViewModel.ViewState.Empty) {
             WidgetAuthLandingBinding binding = getBinding();
             m.checkNotNullExpressionValue(binding, "binding");
-            binding.a.setBackgroundColor(ColorCompat.getThemedColor(getContext(), 2130968904));
+            binding.a.setBackgroundColor(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundPrimary));
             AppViewFlipper appViewFlipper = getBinding().e;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.authLandingSwitchFlipper");
             appViewFlipper.setDisplayedChild(0);
@@ -130,8 +131,8 @@ public final class WidgetAuthLanding extends AppFragment {
 
     private final void loginWithSmartLock(String str, String str2) {
         Bundle bundle = new Bundle();
-        bundle.putString("smartlock_extra_id", str);
-        bundle.putString("smartlock_extra_password", str2);
+        bundle.putString(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_ID, str);
+        bundle.putString(WidgetAuthLogin.GOOGLE_SMARTLOCK_LOGIN_EXTRA_PASSWORD, str2);
         l.d(requireContext(), WidgetAuthLogin.class, new Intent().putExtras(bundle));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java
index bd0a285a6f..24f67aa2f2 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthLoginBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.phone.PhoneOrEmailInputView;
@@ -22,26 +23,26 @@ public final /* synthetic */ class WidgetAuthLogin$binding$2 extends k implement
 
     public final WidgetAuthLoginBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362036;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362036);
+        int i = R.id.auth_login;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_login);
         if (materialButton != null) {
-            i = 2131362037;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362037);
+            i = R.id.auth_login_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.auth_login_container);
             if (linearLayout != null) {
-                i = 2131362038;
-                TextView textView = (TextView) view.findViewById(2131362038);
+                i = R.id.auth_login_forgot_password;
+                TextView textView = (TextView) view.findViewById(R.id.auth_login_forgot_password);
                 if (textView != null) {
-                    i = 2131362039;
-                    PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131362039);
+                    i = R.id.auth_login_login_input;
+                    PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(R.id.auth_login_login_input);
                     if (phoneOrEmailInputView != null) {
-                        i = 2131362041;
-                        TextView textView2 = (TextView) view.findViewById(2131362041);
+                        i = R.id.auth_login_password_manager_link;
+                        TextView textView2 = (TextView) view.findViewById(R.id.auth_login_password_manager_link);
                         if (textView2 != null) {
-                            i = 2131362042;
-                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362042);
+                            i = R.id.auth_login_password_wrap;
+                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.auth_login_password_wrap);
                             if (textInputLayout != null) {
-                                i = 2131362956;
-                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                                i = R.id.dimmer_view;
+                                DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                                 if (dimmerView != null) {
                                     return new WidgetAuthLoginBinding((CoordinatorLayout) view, materialButton, linearLayout, textView, phoneOrEmailInputView, textView2, textInputLayout, dimmerView);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java
index 8768813518..8cd5870293 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.content.Context;
 import android.content.Intent;
 import androidx.activity.result.ActivityResultLauncher;
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.view.validators.ValidationManager;
 import com.discord.widgets.auth.WidgetAuthPhoneVerify;
@@ -43,9 +44,9 @@ public final class WidgetAuthLogin$forgotPassword$2 extends o implements Functio
             Context requireContext = this.this$0.requireContext();
             ActivityResultLauncher<Intent> access$getPhoneVerifyPasswordLauncher$p = WidgetAuthLogin.access$getPhoneVerifyPasswordLauncher$p(this.this$0);
             String str = this.$login;
-            String string = this.this$0.getString(2131892123);
+            String string = this.this$0.getString(R.string.password_recovery_verify_phone_title);
             m.checkNotNullExpressionValue(string, "getString(R.string.passw…overy_verify_phone_title)");
-            String string2 = this.this$0.getString(2131892121);
+            String string2 = this.this$0.getString(R.string.password_recovery_verify_phone_subtitle);
             m.checkNotNullExpressionValue(string2, "getString(R.string.passw…ry_verify_phone_subtitle)");
             companion.launch(requireContext, access$getPhoneVerifyPasswordLauncher$p, str, string, string2);
             error.setShowErrorToasts(false);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java
index b0aa19f6c5..51dc091d67 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java
@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -35,7 +36,7 @@ public final class WidgetAuthLogin$onViewBound$5 implements View.OnClickListener
             try {
                 view.getContext().startActivity(new Intent("android.settings.ACCESSIBILITY_SETTINGS"));
             } catch (ActivityNotFoundException unused) {
-                c.a.e.o.g(view.getContext(), 2131892117, 0, null, 12);
+                c.a.e.o.g(view.getContext(), R.string.password_manager_open_settings_error, 0, null, 12);
             }
         }
     }
@@ -46,7 +47,7 @@ public final class WidgetAuthLogin$onViewBound$5 implements View.OnClickListener
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.this$0.requireContext()).setTitle(2131892114).setMessage(2131892115).setPositiveButton(2131892116, AnonymousClass1.INSTANCE), 2131887193, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.this$0.requireContext()).setTitle(R.string.password_manager).setMessage(R.string.password_manager_info_android).setPositiveButton(R.string.password_manager_open_settings, AnonymousClass1.INSTANCE), (int) R.string.cancel, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         negativeButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java
index 193b3ca4bc..c8f66be849 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.auth;
 
+import com.discord.R;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
 import com.discord.utilities.view.validators.InputValidator;
@@ -23,9 +24,9 @@ public final class WidgetAuthLogin$validationManager$2 extends o implements Func
     public final ValidationManager mo1invoke() {
         TextInputLayout mainTextInputLayout = WidgetAuthLogin.access$getBinding$p(this.this$0).e.getMainTextInputLayout();
         BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion;
-        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131891196)};
+        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(R.string.login_required)};
         TextInputLayout textInputLayout = WidgetAuthLogin.access$getBinding$p(this.this$0).g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authLoginPasswordWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("binding.authLogin", mainTextInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout, companion.createRequiredInputValidator(2131892124)));
+        return new ValidationManager(new Input.TextInputLayoutInput("binding.authLogin", mainTextInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout, companion.createRequiredInputValidator(R.string.password_required)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java
index 65fd895a76..016011907c 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java
@@ -10,8 +10,10 @@ import androidx.fragment.app.FragmentActivity;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthLoginBinding;
+import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StorePhone;
 import com.discord.stores.StoreStream;
 import com.discord.stores.updates.ObservationDeck;
@@ -67,7 +69,7 @@ public final class WidgetAuthLogin extends AppFragment {
     }
 
     public WidgetAuthLogin() {
-        super(2131558872);
+        super(R.layout.widget_auth_login);
         WidgetAuthCaptcha.Companion companion = WidgetAuthCaptcha.Companion;
         this.captchaForgotPasswordLauncher = companion.registerForResult(this, new WidgetAuthLogin$captchaForgotPasswordLauncher$1(this));
         this.captchaLoginLauncher = companion.registerForResult(this, new WidgetAuthLogin$captchaLoginLauncher$1(this));
@@ -113,7 +115,7 @@ public final class WidgetAuthLogin extends AppFragment {
     private final void forgotPassword(String str) {
         String textOrEmpty = getBinding().e.getTextOrEmpty();
         if (textOrEmpty.length() == 0) {
-            o.g(getContext(), 2131891196, 0, null, 12);
+            o.g(getContext(), R.string.login_required, 0, null, 12);
         } else {
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui(StoreStream.Companion.getAuthentication().forgotPassword(textOrEmpty, str)), getBinding().h, 0, 2, null), getContext(), "REST: forgotPassword", (Function1) null, new WidgetAuthLogin$forgotPassword$1(this, textOrEmpty), new WidgetAuthLogin$forgotPassword$2(this, textOrEmpty), (Function0) null, (Function0) null, 100, (Object) null);
         }
@@ -164,9 +166,9 @@ public final class WidgetAuthLogin extends AppFragment {
             Context requireContext = requireContext();
             ActivityResultLauncher<Intent> activityResultLauncher = this.phoneVerifyLoginLauncher;
             String textOrEmpty = getBinding().e.getTextOrEmpty();
-            String string = getString(2131892215);
+            String string = getString(R.string.phone_ip_authorization_title);
             m.checkNotNullExpressionValue(string, "getString(R.string.phone_ip_authorization_title)");
-            String string2 = getString(2131892213);
+            String string2 = getString(R.string.phone_ip_authorization_subtitle);
             m.checkNotNullExpressionValue(string2, "getString(R.string.phone…p_authorization_subtitle)");
             companion.launch(requireContext, activityResultLauncher, textOrEmpty, string, string2);
         } else {
@@ -204,7 +206,7 @@ public final class WidgetAuthLogin extends AppFragment {
         Context context = getContext();
         if (context != null) {
             m.checkNotNullExpressionValue(context, "context ?: return");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getAuthentication().login(str, str2, str3, z2, GoogleSmartLockManagerKt.hasSmartLockCredentials(getMostRecentIntent()) ? "keychain_auto_login" : null), this, null, 2, null), getBinding().h, 0, 2, null), context, "REST: login", (Function1) null, new WidgetAuthLogin$login$1(this, str, str2, context), new WidgetAuthLogin$login$2(this, str), (Function0) null, (Function0) null, 100, (Object) null);
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getAuthentication().login(str, str2, str3, z2, GoogleSmartLockManagerKt.hasSmartLockCredentials(getMostRecentIntent()) ? RestAPIParams.AuthLogin.LoginSource.LOGIN_SOURCE_KEYCHAIN_AUTO : null), this, null, 2, null), getBinding().h, 0, 2, null), context, "REST: login", (Function1) null, new WidgetAuthLogin$login$1(this, str, str2, context), new WidgetAuthLogin$login$2(this, str), (Function0) null, (Function0) null, 100, (Object) null);
         }
     }
 
@@ -253,7 +255,7 @@ public final class WidgetAuthLogin extends AppFragment {
     }
 
     private final void showEmailSentToast(String str) {
-        o.h(getContext(), b.h(requireContext(), 2131888256, new Object[]{str}, null, 4), 0, null, 12);
+        o.h(getContext(), b.h(requireContext(), R.string.email_verification_instructions_body, new Object[]{str}, null, 4), 0, null, 12);
     }
 
     public final GoogleSmartLockManager getGoogleSmartLockManager() {
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java
index 17d2087eea..fa41505ab2 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthMfaBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.CodeVerificationView;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetAuthMfa$binding$2 extends k implements
 
     public final WidgetAuthMfaBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362038;
-        TextView textView = (TextView) view.findViewById(2131362038);
+        int i = R.id.auth_login_forgot_password;
+        TextView textView = (TextView) view.findViewById(R.id.auth_login_forgot_password);
         if (textView != null) {
-            i = 2131362043;
-            CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362043);
+            i = R.id.auth_mfa_verification;
+            CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(R.id.auth_mfa_verification);
             if (codeVerificationView != null) {
-                i = 2131362956;
-                DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                i = R.id.dimmer_view;
+                DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                 if (dimmerView != null) {
                     return new WidgetAuthMfaBinding((CoordinatorLayout) view, textView, codeVerificationView, dimmerView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
index f55d1b1ab6..fcee2f4884 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.auth;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action2;
 /* compiled from: WidgetAuthMfa.kt */
@@ -15,10 +16,10 @@ public final class WidgetAuthMfa$onViewBound$1<T1, T2> implements Action2<MenuIt
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364073:
+            case R.id.menu_auth_mfa_backup_codes /* 2131364073 */:
                 WidgetAuthMfa.access$showBackupCodesDialog(this.this$0);
                 return;
-            case 2131364074:
+            case R.id.menu_auth_mfa_info /* 2131364074 */:
                 WidgetAuthMfa.access$showInfoDialog(this.this$0);
                 return;
             default:
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
index 38493ae2aa..8950394602 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
@@ -21,12 +21,14 @@ import c.a.e.q;
 import c.a.j.f4;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthMfaBackupCodesBinding;
 import com.discord.databinding.WidgetAuthMfaBinding;
 import com.discord.stores.StoreAuthentication;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.auth.AuthUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -66,13 +68,13 @@ public final class WidgetAuthMfa extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "ticket");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_TICKET", str);
+            intent.putExtra(WidgetAuthMfa.INTENT_TICKET, str);
             l.d(context, WidgetAuthMfa.class, intent);
         }
     }
 
     public WidgetAuthMfa() {
-        super(2131558873);
+        super(R.layout.widget_auth_mfa);
     }
 
     public static final /* synthetic */ void access$evaluateBackupCode(WidgetAuthMfa widgetAuthMfa, AlertDialog alertDialog, String str) {
@@ -101,7 +103,7 @@ public final class WidgetAuthMfa extends AppFragment {
 
     private final void evaluateBackupCode(AlertDialog alertDialog, String str) {
         if (str.length() < 8) {
-            o.i(this, 2131894421, 0, 4);
+            o.i(this, R.string.two_fa_backup_code_enter_wrong, 0, 4);
             return;
         }
         alertDialog.hide();
@@ -110,7 +112,7 @@ public final class WidgetAuthMfa extends AppFragment {
 
     private final void evaluateCode(String str) {
         if (TextUtils.isEmpty(str)) {
-            o.i(this, 2131894465, 0, 4);
+            o.i(this, R.string.two_fa_token_required, 0, 4);
             return;
         }
         StoreAuthentication authentication = StoreStream.Companion.getAuthentication();
@@ -127,18 +129,18 @@ public final class WidgetAuthMfa extends AppFragment {
 
     @MainThread
     private final void showBackupCodesDialog() {
-        View inflate = getLayoutInflater().inflate(2131558874, (ViewGroup) null, false);
-        int i = 2131364866;
-        TextView textView = (TextView) inflate.findViewById(2131364866);
+        View inflate = getLayoutInflater().inflate(R.layout.widget_auth_mfa_backup_codes, (ViewGroup) null, false);
+        int i = R.id.server_settings_delete_server_header;
+        TextView textView = (TextView) inflate.findViewById(R.id.server_settings_delete_server_header);
         if (textView != null) {
-            i = 2131365864;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365864);
+            i = R.id.widget_auth_mfa_backup_codes_cancel;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.widget_auth_mfa_backup_codes_cancel);
             if (materialButton != null) {
-                i = 2131365865;
-                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131365865);
+                i = R.id.widget_auth_mfa_backup_codes_edittext;
+                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(R.id.widget_auth_mfa_backup_codes_edittext);
                 if (textInputLayout != null) {
-                    i = 2131365866;
-                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131365866);
+                    i = R.id.widget_auth_mfa_backup_codes_send;
+                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.widget_auth_mfa_backup_codes_send);
                     if (materialButton2 != null) {
                         LinearLayout linearLayout = (LinearLayout) inflate;
                         WidgetAuthMfaBackupCodesBinding widgetAuthMfaBackupCodesBinding = new WidgetAuthMfaBackupCodesBinding(linearLayout, textView, materialButton, textInputLayout, materialButton2);
@@ -157,22 +159,22 @@ public final class WidgetAuthMfa extends AppFragment {
 
     @MainThread
     private final void showInfoDialog() {
-        View inflate = getLayoutInflater().inflate(2131558875, (ViewGroup) null, false);
-        int i = 2131364866;
-        TextView textView = (TextView) inflate.findViewById(2131364866);
+        View inflate = getLayoutInflater().inflate(R.layout.widget_auth_mfa_info, (ViewGroup) null, false);
+        int i = R.id.server_settings_delete_server_header;
+        TextView textView = (TextView) inflate.findViewById(R.id.server_settings_delete_server_header);
         if (textView != null) {
-            i = 2131365867;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365867);
+            i = R.id.widget_auth_mfa_info_okay;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.widget_auth_mfa_info_okay);
             if (materialButton != null) {
-                i = 2131365868;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(2131365868);
+                i = R.id.widget_auth_mfa_info_text;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(R.id.widget_auth_mfa_info_text);
                 if (linkifiedTextView != null) {
                     LinearLayout linearLayout = (LinearLayout) inflate;
                     m.checkNotNullExpressionValue(new f4(linearLayout, textView, materialButton, linkifiedTextView), "WidgetAuthMfaInfoBinding…outInflater, null, false)");
                     m.checkNotNullExpressionValue(linearLayout, "binding.root");
                     AlertDialog show = new AlertDialog.Builder(linearLayout.getContext()).setView(linearLayout).show();
                     m.checkNotNullExpressionValue(linkifiedTextView, "binding.widgetAuthMfaInfoText");
-                    b.n(linkifiedTextView, 2131894435, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4);
+                    b.n(linkifiedTextView, R.string.two_fa_download_app_body, new Object[]{AuthUtils.URL_AUTHY, AuthUtils.URL_GOOGLE_AUTHENTICATOR}, null, 4);
                     materialButton.setOnClickListener(new WidgetAuthMfa$showInfoDialog$1(show));
                     return;
                 }
@@ -213,7 +215,7 @@ public final class WidgetAuthMfa extends AppFragment {
     @Override // androidx.fragment.app.Fragment
     public boolean onContextItemSelected(MenuItem menuItem) {
         m.checkNotNullParameter(menuItem, "item");
-        if (menuItem.getItemId() != 2131364089) {
+        if (menuItem.getItemId() != R.id.menu_code_verification_paste) {
             return super.onContextItemSelected(menuItem);
         }
         tryPasteCodeFromClipboard();
@@ -225,7 +227,7 @@ public final class WidgetAuthMfa extends AppFragment {
         m.checkNotNullParameter(contextMenu, "menu");
         m.checkNotNullParameter(view, "v");
         super.onCreateContextMenu(contextMenu, view, contextMenuInfo);
-        new MenuInflater(requireContext()).inflate(2131623944, contextMenu);
+        new MenuInflater(requireContext()).inflate(R.menu.menu_code_verification, contextMenu);
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
@@ -245,8 +247,8 @@ public final class WidgetAuthMfa extends AppFragment {
         AppActivity appActivity;
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623938, new WidgetAuthMfa$onViewBound$1(this), null, 4, null);
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_TICKET");
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_auth_mfa, new WidgetAuthMfa$onViewBound$1(this), null, 4, null);
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_TICKET);
         if (stringExtra == null) {
             stringExtra = "";
         }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java
index 935afa8fad..63ced2c49d 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthPhoneVerifyBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.CodeVerificationView;
@@ -19,29 +20,29 @@ public final /* synthetic */ class WidgetAuthPhoneVerify$binding$2 extends k imp
 
     public final WidgetAuthPhoneVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362044;
-        TextView textView = (TextView) view.findViewById(2131362044);
+        int i = R.id.auth_phone_bailout;
+        TextView textView = (TextView) view.findViewById(R.id.auth_phone_bailout);
         if (textView != null) {
-            i = 2131362045;
-            TextView textView2 = (TextView) view.findViewById(2131362045);
+            i = R.id.auth_phone_verify_action_separator;
+            TextView textView2 = (TextView) view.findViewById(R.id.auth_phone_verify_action_separator);
             if (textView2 != null) {
-                i = 2131362046;
-                TextView textView3 = (TextView) view.findViewById(2131362046);
+                i = R.id.auth_phone_verify_call;
+                TextView textView3 = (TextView) view.findViewById(R.id.auth_phone_verify_call);
                 if (textView3 != null) {
-                    i = 2131362047;
-                    CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362047);
+                    i = R.id.auth_phone_verify_code;
+                    CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(R.id.auth_phone_verify_code);
                     if (codeVerificationView != null) {
-                        i = 2131362048;
-                        TextView textView4 = (TextView) view.findViewById(2131362048);
+                        i = R.id.auth_phone_verify_resend;
+                        TextView textView4 = (TextView) view.findViewById(R.id.auth_phone_verify_resend);
                         if (textView4 != null) {
-                            i = 2131362049;
-                            TextView textView5 = (TextView) view.findViewById(2131362049);
+                            i = R.id.auth_phone_verify_subtitle;
+                            TextView textView5 = (TextView) view.findViewById(R.id.auth_phone_verify_subtitle);
                             if (textView5 != null) {
-                                i = 2131362050;
-                                TextView textView6 = (TextView) view.findViewById(2131362050);
+                                i = R.id.auth_phone_verify_title;
+                                TextView textView6 = (TextView) view.findViewById(R.id.auth_phone_verify_title);
                                 if (textView6 != null) {
-                                    i = 2131362956;
-                                    DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                                    i = R.id.dimmer_view;
+                                    DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                                     if (dimmerView != null) {
                                         return new WidgetAuthPhoneVerifyBinding((CoordinatorLayout) view, textView, textView2, textView3, codeVerificationView, textView4, textView5, textView6, dimmerView);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java
index 7cefd35b3f..8962f691c5 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.auth;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.auth.RegistrationFlowRepo;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
@@ -26,7 +27,7 @@ public final class WidgetAuthPhoneVerify$evaluateCode$2 extends o implements Fun
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        RegistrationFlowRepo.Companion.getINSTANCE().trackTransition("Phone Verification", "response_error", d0.t.m.listOf("code"));
+        RegistrationFlowRepo.Companion.getINSTANCE().trackTransition("Phone Verification", "response_error", d0.t.m.listOf(ModelAuditLogEntry.CHANGE_KEY_CODE));
         WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).e.b();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$2.java
index 30142166fa..de60b65b19 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.auth;
 
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 /* compiled from: WidgetAuthPhoneVerify.kt */
 public final class WidgetAuthPhoneVerify$onViewBound$2 implements View.OnClickListener {
     public final /* synthetic */ WidgetAuthPhoneVerify this$0;
@@ -11,6 +12,6 @@ public final class WidgetAuthPhoneVerify$onViewBound$2 implements View.OnClickLi
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetAuthPhoneVerify.access$resendCode(this.this$0, "call");
+        WidgetAuthPhoneVerify.access$resendCode(this.this$0, NotificationCompat.CATEGORY_CALL);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$4.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$4.java
index 666ab48548..25cfa3c5ed 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$4.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$4.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.auth;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -23,7 +24,7 @@ public final class WidgetAuthPhoneVerify$onViewBound$4 extends o implements Func
     }
 
     public final void invoke(String str) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         WidgetAuthPhoneVerify.access$evaluateCode(this.this$0, str);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
index 294278ced5..81012ddd57 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
@@ -18,6 +18,7 @@ import c.a.e.l;
 import c.d.b.a.a;
 import c.i.a.f.h.b.h;
 import c.i.a.f.h.b.i;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.app.AppTransitionActivity;
@@ -70,9 +71,9 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
             m.checkNotNullParameter(charSequence, "title");
             m.checkNotNullParameter(charSequence2, "subtitle");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_EXTRA_PHONE", str);
-            intent.putExtra("INTENT_EXTRA_TITLE", charSequence);
-            intent.putExtra("INTENT_EXTRA_SUBTITLE", charSequence2);
+            intent.putExtra(WidgetAuthPhoneVerify.INTENT_EXTRA_PHONE, str);
+            intent.putExtra(WidgetAuthPhoneVerify.INTENT_EXTRA_TITLE, charSequence);
+            intent.putExtra(WidgetAuthPhoneVerify.INTENT_EXTRA_SUBTITLE, charSequence2);
             l.g.f(context, activityResultLauncher, WidgetAuthPhoneVerify.class, intent);
         }
 
@@ -157,7 +158,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     }
 
     public WidgetAuthPhoneVerify() {
-        super(2131558876);
+        super(R.layout.widget_auth_phone_verify);
     }
 
     public static final /* synthetic */ void access$bailoutToEmail(WidgetAuthPhoneVerify widgetAuthPhoneVerify) {
@@ -192,7 +193,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         AppTransitionActivity.i = true;
         AppActivity appActivity2 = getAppActivity();
         if (appActivity2 != null) {
-            appActivity2.overridePendingTransition(2130771990, 2130771989);
+            appActivity2.overridePendingTransition(R.anim.activity_slide_horizontal_open_in, R.anim.activity_slide_horizontal_close_out);
         }
         AppActivity appActivity3 = getAppActivity();
         if (appActivity3 != null) {
@@ -276,7 +277,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     @Override // androidx.fragment.app.Fragment
     public boolean onContextItemSelected(MenuItem menuItem) {
         m.checkNotNullParameter(menuItem, "item");
-        if (menuItem.getItemId() != 2131364089) {
+        if (menuItem.getItemId() != R.id.menu_code_verification_paste) {
             return super.onContextItemSelected(menuItem);
         }
         tryPasteCodeFromClipboard();
@@ -288,7 +289,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         m.checkNotNullParameter(contextMenu, "menu");
         m.checkNotNullParameter(view, "v");
         super.onCreateContextMenu(contextMenu, view, contextMenuInfo);
-        new MenuInflater(requireContext()).inflate(2131623944, contextMenu);
+        new MenuInflater(requireContext()).inflate(R.menu.menu_code_verification, contextMenu);
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
@@ -320,18 +321,18 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_PHONE");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_PHONE);
         if (stringExtra == null) {
             stringExtra = "";
         }
         this.phone = stringExtra;
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Phone Verification", "viewed", null, 4, null);
-        CharSequence charSequenceExtra = getMostRecentIntent().getCharSequenceExtra("INTENT_EXTRA_TITLE");
+        CharSequence charSequenceExtra = getMostRecentIntent().getCharSequenceExtra(INTENT_EXTRA_TITLE);
         if (charSequenceExtra == null) {
             charSequenceExtra = "";
         }
         m.checkNotNullExpressionValue(charSequenceExtra, "mostRecentIntent.getChar…INTENT_EXTRA_TITLE) ?: \"\"");
-        CharSequence charSequenceExtra2 = getMostRecentIntent().getCharSequenceExtra("INTENT_EXTRA_SUBTITLE");
+        CharSequence charSequenceExtra2 = getMostRecentIntent().getCharSequenceExtra(INTENT_EXTRA_SUBTITLE);
         if (charSequenceExtra2 == null) {
             charSequenceExtra2 = "";
         }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java
index 91f4122b22..26dcab013f 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.auth;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthRegisterAccountInformationBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.LoadingButton;
@@ -20,20 +21,20 @@ public final /* synthetic */ class WidgetAuthRegisterAccountInformation$binding$
 
     public final WidgetAuthRegisterAccountInformationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362051;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362051);
+        int i = R.id.auth_policy_links;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.auth_policy_links);
         if (linkifiedTextView != null) {
-            i = 2131362052;
-            LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362052);
+            i = R.id.auth_register_account_information_button;
+            LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.auth_register_account_information_button);
             if (loadingButton != null) {
-                i = 2131362053;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362053);
+                i = R.id.auth_register_account_information_password_wrap;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.auth_register_account_information_password_wrap);
                 if (textInputLayout != null) {
-                    i = 2131362054;
-                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362054);
+                    i = R.id.auth_register_account_information_username_wrap;
+                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.auth_register_account_information_username_wrap);
                     if (textInputLayout2 != null) {
-                        i = 2131362069;
-                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362069);
+                        i = R.id.auth_tos_opt_in;
+                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(R.id.auth_tos_opt_in);
                         if (materialCheckBox != null) {
                             return new WidgetAuthRegisterAccountInformationBinding((CoordinatorLayout) view, linkifiedTextView, loadingButton, textInputLayout, textInputLayout2, materialCheckBox);
                         }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java
index 59e6782cab..8616644a0c 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.auth;
 
 import android.widget.CheckBox;
+import com.discord.R;
 import com.discord.utilities.auth.AuthUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
@@ -31,7 +32,7 @@ public final class WidgetAuthRegisterAccountInformation$validationManager$2 exte
             if ((WidgetAuthRegisterAccountInformation.access$isConsentRequired$p(this.this$0.this$0) && checkBox.isChecked()) || !WidgetAuthRegisterAccountInformation.access$isConsentRequired$p(this.this$0.this$0)) {
                 return null;
             }
-            return checkBox.getContext().getString(2131894246);
+            return checkBox.getContext().getString(R.string.terms_privacy_opt_in_tooltip);
         }
     }
 
@@ -72,9 +73,9 @@ public final class WidgetAuthRegisterAccountInformation$validationManager$2 exte
         TextInputLayout textInputLayout = WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterAccountInformationUsernameWrap");
         BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion;
-        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131894878)};
+        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(R.string.username_required)};
         TextInputLayout textInputLayout2 = WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.authRegisterAccountInformationPasswordWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout2, companion.createRequiredInputValidator(2131892124), AuthUtils.INSTANCE.createPasswordInputValidator(2131892113)), new Input.GenericInput("tos", WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).f, new AnonymousClass1(this), AnonymousClass2.INSTANCE));
+        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout2, companion.createRequiredInputValidator(R.string.password_required), AuthUtils.INSTANCE.createPasswordInputValidator(R.string.password_length_error)), new Input.GenericInput("tos", WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).f, new AnonymousClass1(this), AnonymousClass2.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java
index d7f0fb3efe..4f268b3326 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java
@@ -4,10 +4,12 @@ import android.content.Intent;
 import android.view.View;
 import android.widget.EditText;
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthRegisterAccountInformationBinding;
 import com.discord.models.experiments.domain.Experiment;
@@ -15,6 +17,7 @@ import com.discord.stores.StoreAuthentication;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.auth.RegistrationFlowRepo;
+import com.discord.utilities.birthday.BirthdayHelper;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.time.TimeUtils;
@@ -52,7 +55,7 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
     private final Lazy validationManager$delegate = g.lazy(new WidgetAuthRegisterAccountInformation$validationManager$2(this));
 
     public WidgetAuthRegisterAccountInformation() {
-        super(2131558877);
+        super(R.layout.widget_auth_register_account_information);
     }
 
     public static final /* synthetic */ WidgetAuthRegisterAccountInformationBinding access$getBinding$p(WidgetAuthRegisterAccountInformation widgetAuthRegisterAccountInformation) {
@@ -91,9 +94,9 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         }
         getBinding().f1690c.setOnClickListener(new WidgetAuthRegisterAccountInformation$configureUI$2(this));
         if (RegistrationFlowRepo.Companion.getINSTANCE().getBirthday() != null || !this.shouldShowAgeGate) {
-            getBinding().f1690c.setText(getText(2131892932));
+            getBinding().f1690c.setText(getText(R.string.register));
         } else {
-            getBinding().f1690c.setText(getText(2131891686));
+            getBinding().f1690c.setText(getText(R.string.next));
         }
     }
 
@@ -110,14 +113,14 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         m.checkNotNullExpressionValue(response, "error.response");
         Map<String, List<String>> messages = response.getMessages();
         m.checkNotNullExpressionValue(messages, "error.response.messages");
-        if (messages.containsKey("date_of_birth")) {
-            RegistrationFlowRepo.Companion.getINSTANCE().trackTransition("Account Information", "response_error", d0.t.m.listOf("date_of_birth"));
+        if (messages.containsKey(BirthdayHelper.DATE_OF_BIRTH_KEY)) {
+            RegistrationFlowRepo.Companion.getINSTANCE().trackTransition("Account Information", "response_error", d0.t.m.listOf(BirthdayHelper.DATE_OF_BIRTH_KEY));
             error.setShowErrorToasts(false);
             Error.Response response2 = error.getResponse();
             m.checkNotNullExpressionValue(response2, "error.response");
             Map<String, List<String>> messages2 = response2.getMessages();
             m.checkNotNullExpressionValue(messages2, "error.response.messages");
-            List<String> list = messages2.get("date_of_birth");
+            List<String> list = messages2.get(BirthdayHelper.DATE_OF_BIRTH_KEY);
             if (list == null) {
                 list = n.emptyList();
             }
@@ -150,10 +153,10 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         m.checkNotNullExpressionValue(response7, "error.response");
         instance2.setErrors(response7.getMessages());
         WidgetAuthCaptcha.Companion.processErrorsForCaptcha(requireContext(), this.captchaLauncher, mutableList, error);
-        if (mutableList.contains("email")) {
+        if (mutableList.contains(NotificationCompat.CATEGORY_EMAIL)) {
             requireActivity().onBackPressed();
-            mutableList.remove("email");
-            mutableList2.remove("email");
+            mutableList.remove(NotificationCompat.CATEGORY_EMAIL);
+            mutableList2.remove(NotificationCompat.CATEGORY_EMAIL);
         }
         companion.getINSTANCE().trackTransition("Account Information", "response_error", mutableList2);
         error.setShowErrorToasts(!mutableList.isEmpty());
@@ -174,7 +177,7 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         if (!this.shouldValidateInputs || ValidationManager.validate$default(getValidationManager(), false, 1, null)) {
             RegistrationFlowRepo.Companion companion = RegistrationFlowRepo.Companion;
             if (companion.getINSTANCE().getBirthday() != null || !this.shouldShowAgeGate) {
-                String uTCDateTime = companion.getINSTANCE().getBirthday() != null ? TimeUtils.toUTCDateTime(companion.getINSTANCE().getBirthday(), "yyyy-MM-dd") : null;
+                String uTCDateTime = companion.getINSTANCE().getBirthday() != null ? TimeUtils.toUTCDateTime(companion.getINSTANCE().getBirthday(), TimeUtils.UTCFormat.SHORT) : null;
                 getBinding().f1690c.setIsLoading(true);
                 StoreAuthentication authentication = StoreStream.Companion.getAuthentication();
                 TextInputLayout textInputLayout = getBinding().e;
@@ -230,7 +233,7 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         materialCheckBox.setVisibility(i);
         LinkifiedTextView linkifiedTextView2 = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.authPolicyLinks");
-        b.n(linkifiedTextView2, this.isConsentRequired ? 2131894245 : 2131894244, new Object[]{getString(2131894243), getString(2131892756)}, null, 4);
+        b.n(linkifiedTextView2, this.isConsentRequired ? R.string.terms_privacy_opt_in : R.string.terms_privacy, new Object[]{getString(R.string.terms_of_service_url), getString(R.string.privacy_policy_url)}, null, 4);
         getBinding().f1690c.setIsLoading(false);
         RegistrationFlowRepo.trackTransition$default(companion.getINSTANCE(), "Account Information", "viewed", null, 4, null);
         TextInputLayout textInputLayout = getBinding().e;
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java
index a26951a9fc..307e7e4df5 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.auth;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthRegisterIdentityBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -22,26 +23,26 @@ public final /* synthetic */ class WidgetAuthRegisterIdentity$binding$2 extends
 
     public final WidgetAuthRegisterIdentityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362058;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362058);
+        int i = R.id.auth_register_identity_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_register_identity_button);
         if (materialButton != null) {
-            i = 2131362059;
-            CardSegment cardSegment = (CardSegment) view.findViewById(2131362059);
+            i = R.id.auth_register_identity_first_segment_card;
+            CardSegment cardSegment = (CardSegment) view.findViewById(R.id.auth_register_identity_first_segment_card);
             if (cardSegment != null) {
-                i = 2131362060;
-                PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131362060);
+                i = R.id.auth_register_identity_input;
+                PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(R.id.auth_register_identity_input);
                 if (phoneOrEmailInputView != null) {
-                    i = 2131362061;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362061);
+                    i = R.id.auth_register_identity_policy_link;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.auth_register_identity_policy_link);
                     if (linkifiedTextView != null) {
-                        i = 2131362062;
-                        CardSegment cardSegment2 = (CardSegment) view.findViewById(2131362062);
+                        i = R.id.auth_register_identity_second_segment_card;
+                        CardSegment cardSegment2 = (CardSegment) view.findViewById(R.id.auth_register_identity_second_segment_card);
                         if (cardSegment2 != null) {
-                            i = 2131362063;
-                            SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131362063);
+                            i = R.id.auth_register_identity_segmented_control;
+                            SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(R.id.auth_register_identity_segmented_control);
                             if (segmentedControlContainer != null) {
-                                i = 2131362956;
-                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                                i = R.id.dimmer_view;
+                                DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                                 if (dimmerView != null) {
                                     return new WidgetAuthRegisterIdentityBinding((CoordinatorLayout) view, materialButton, cardSegment, phoneOrEmailInputView, linkifiedTextView, cardSegment2, segmentedControlContainer, dimmerView);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java
index 14382c1b32..bd53702fa6 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.auth;
 
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.auth.RegistrationFlowRepo;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -27,6 +28,6 @@ public final class WidgetAuthRegisterIdentity$handleNext$1 extends o implements
 
     public final void invoke(Void r13) {
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Account Identity", "success", null, 4, null);
-        WidgetAuthPhoneVerify.Companion.launch(this.this$0.requireContext(), WidgetAuthRegisterIdentity.access$getPhoneVerifyLauncher$p(this.this$0), WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getTextOrEmpty(), b.h(this.this$0.requireContext(), 2131893656, new Object[0], null, 4), b.h(this.this$0.requireContext(), 2131893655, new Object[]{this.$phone}, null, 4));
+        WidgetAuthPhoneVerify.Companion.launch(this.this$0.requireContext(), WidgetAuthRegisterIdentity.access$getPhoneVerifyLauncher$p(this.this$0), WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getTextOrEmpty(), b.h(this.this$0.requireContext(), R.string.sms_confirmation_title, new Object[0], null, 4), b.h(this.this$0.requireContext(), R.string.sms_confirmation_description, new Object[]{this.$phone}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java
index afebd09a82..fa3232a123 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.auth;
 
+import com.discord.R;
 import com.discord.utilities.auth.AuthUtils;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
@@ -19,6 +20,6 @@ public final class WidgetAuthRegisterIdentity$phoneValidationManager$2 extends o
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ValidationManager mo1invoke() {
-        return new ValidationManager(new Input.TextInputLayoutInput("phone", WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getMainTextInputLayout(), BasicTextInputValidator.Companion.createRequiredInputValidator(2131892216), AuthUtils.INSTANCE.createPhoneInputValidator(2131892212)));
+        return new ValidationManager(new Input.TextInputLayoutInput("phone", WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getMainTextInputLayout(), BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.phone_required), AuthUtils.INSTANCE.createPhoneInputValidator(R.string.phone_invalid)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java
index 9bc1ac960a..1edf199068 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java
@@ -5,10 +5,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthRegisterIdentityBinding;
 import com.discord.models.experiments.domain.Experiment;
@@ -64,7 +66,7 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
     }
 
     public WidgetAuthRegisterIdentity() {
-        super(2131558878);
+        super(R.layout.widget_auth_register_identity);
     }
 
     public static final /* synthetic */ WidgetAuthRegisterIdentityBinding access$getBinding$p(WidgetAuthRegisterIdentity widgetAuthRegisterIdentity) {
@@ -86,9 +88,9 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
     private final void configurePhoneInput() {
         getBinding().d.setMode(this.inputMode);
         if (this.inputMode == PhoneOrEmailInputView.Mode.PHONE) {
-            getBinding().d.setHint(getString(2131888751));
+            getBinding().d.setHint(getString(R.string.form_label_phone_number));
         } else {
-            getBinding().d.setHint(getString(2131888679));
+            getBinding().d.setHint(getString(R.string.form_label_email));
         }
         getBinding().d.getMainEditText().setImeOptions(6);
         ViewExtensions.setOnImeActionDone$default(getBinding().d.getMainTextInputLayout(), false, new WidgetAuthRegisterIdentity$configurePhoneInput$1(this), 1, null);
@@ -107,11 +109,11 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
         }
         getBinding().g.setSelectedIndex(i2);
         CardSegment cardSegmentForMode = getCardSegmentForMode(mode2);
-        cardSegmentForMode.setText(getString(2131892210));
-        cardSegmentForMode.setContentDescription(getString(2131894601));
+        cardSegmentForMode.setText(getString(R.string.phone));
+        cardSegmentForMode.setContentDescription(getString(R.string.use_phone));
         CardSegment cardSegmentForMode2 = getCardSegmentForMode(PhoneOrEmailInputView.Mode.EMAIL);
-        cardSegmentForMode2.setText(getString(2131888253));
-        cardSegmentForMode2.setContentDescription(getString(2131894596));
+        cardSegmentForMode2.setText(getString(R.string.email));
+        cardSegmentForMode2.setContentDescription(getString(R.string.use_email));
     }
 
     private final void configureUI() {
@@ -123,7 +125,7 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
         getBinding().d.requestFocus();
         LinkifiedTextView linkifiedTextView = getBinding().e;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.authRegisterIdentityPolicyLink");
-        b.n(linkifiedTextView, 2131892934, new Object[]{getString(2131892756)}, null, 4);
+        b.n(linkifiedTextView, R.string.register_login_privacy_notice, new Object[]{getString(R.string.privacy_policy_url)}, null, 4);
         getBinding().b.setOnClickListener(new WidgetAuthRegisterIdentity$configureUI$3(this));
     }
 
@@ -194,7 +196,7 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
                 }
                 Object next = it.next();
                 String str = (String) next;
-                if (!m.areEqual(str, "email") && !m.areEqual(str, "phone")) {
+                if (!m.areEqual(str, NotificationCompat.CATEGORY_EMAIL) && !m.areEqual(str, "phone")) {
                     z2 = false;
                 }
                 if (z2) {
@@ -212,14 +214,14 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
     public void onSaveInstanceState(Bundle bundle) {
         m.checkNotNullParameter(bundle, "outState");
         super.onSaveInstanceState(bundle);
-        bundle.putBoolean("IS_PHONE_MODE", this.inputMode == PhoneOrEmailInputView.Mode.PHONE);
+        bundle.putBoolean(IS_PHONE_MODE, this.inputMode == PhoneOrEmailInputView.Mode.PHONE);
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        this.inputMode = (bundle == null || bundle.getBoolean("IS_PHONE_MODE")) ? PhoneOrEmailInputView.Mode.PHONE : PhoneOrEmailInputView.Mode.EMAIL;
+        this.inputMode = (bundle == null || bundle.getBoolean(IS_PHONE_MODE)) ? PhoneOrEmailInputView.Mode.PHONE : PhoneOrEmailInputView.Mode.EMAIL;
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Account Identity", "submitted", null, 4, null);
         StoreStream.Companion companion = StoreStream.Companion;
         boolean z2 = true;
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java
index b2bfacad66..14079c3f2e 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.auth;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthResetPasswordBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -17,11 +18,11 @@ public final /* synthetic */ class WidgetAuthResetPassword$binding$2 extends k i
 
     public final WidgetAuthResetPasswordBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362066;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362066);
+        int i = R.id.auth_reset_password_back;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_reset_password_back);
         if (materialButton != null) {
-            i = 2131362067;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362067);
+            i = R.id.auth_reset_password_submit;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.auth_reset_password_submit);
             if (materialButton2 != null) {
                 return new WidgetAuthResetPasswordBinding((CoordinatorLayout) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java
index e852a4a7a8..5f2cbaaf5f 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java
@@ -6,6 +6,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthResetPasswordBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -34,13 +35,13 @@ public final class WidgetAuthResetPassword extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "token");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_EXTRA_TOKEN", str);
+            intent.putExtra(WidgetAuthResetPassword.INTENT_EXTRA_TOKEN, str);
             l.d(context, WidgetAuthResetPassword.class, intent);
         }
     }
 
     public WidgetAuthResetPassword() {
-        super(2131558879);
+        super(R.layout.widget_auth_reset_password);
     }
 
     public static final /* synthetic */ String access$getToken$p(WidgetAuthResetPassword widgetAuthResetPassword) {
@@ -63,7 +64,7 @@ public final class WidgetAuthResetPassword extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_TOKEN");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_TOKEN);
         if (stringExtra == null) {
             stringExtra = "";
         }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java
index 94b226e7a4..2ba54ae40a 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.auth;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetAuthUndeleteAccountBinding;
 import com.discord.views.ScreenTitleView;
 import com.google.android.material.button.MaterialButton;
@@ -18,14 +19,14 @@ public final /* synthetic */ class WidgetAuthUndeleteAccount$binding$2 extends k
 
     public final WidgetAuthUndeleteAccountBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362070;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362070);
+        int i = R.id.auth_undelete_cancel;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.auth_undelete_cancel);
         if (materialButton != null) {
-            i = 2131362071;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362071);
+            i = R.id.auth_undelete_delete;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.auth_undelete_delete);
             if (materialButton2 != null) {
-                i = 2131362072;
-                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362072);
+                i = R.id.auth_undelete_title;
+                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.auth_undelete_title);
                 if (screenTitleView != null) {
                     return new WidgetAuthUndeleteAccountBinding((CoordinatorLayout) view, materialButton, materialButton2, screenTitleView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java
index 4f26b48a6a..e4244b8940 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java
@@ -8,6 +8,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuthUndeleteAccountBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -38,7 +39,7 @@ public final class WidgetAuthUndeleteAccount extends AppFragment {
         public final void launch(Context context, ActivityResultLauncher<Intent> activityResultLauncher, boolean z2) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(activityResultLauncher, "launcher");
-            Intent putExtra = new Intent().putExtra("ARG_DISABLED_KEY", z2);
+            Intent putExtra = new Intent().putExtra(WidgetAuthUndeleteAccount.ARG_DISABLED_KEY, z2);
             m.checkNotNullExpressionValue(putExtra, "Intent().putExtra(ARG_DISABLED_KEY, disabled)");
             l.g.f(context, activityResultLauncher, WidgetAuthUndeleteAccount.class, putExtra);
         }
@@ -53,7 +54,7 @@ public final class WidgetAuthUndeleteAccount extends AppFragment {
     }
 
     public WidgetAuthUndeleteAccount() {
-        super(2131558880);
+        super(R.layout.widget_auth_undelete_account);
     }
 
     private final WidgetAuthUndeleteAccountBinding getBinding() {
@@ -69,18 +70,18 @@ public final class WidgetAuthUndeleteAccount extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        if (getMostRecentIntent().getBooleanExtra("ARG_DISABLED_KEY", false)) {
+        if (getMostRecentIntent().getBooleanExtra(ARG_DISABLED_KEY, false)) {
             ScreenTitleView screenTitleView = getBinding().d;
-            String string = getString(2131886145);
+            String string = getString(R.string.account_disabled_title);
             m.checkNotNullExpressionValue(string, "getString(R.string.account_disabled_title)");
             screenTitleView.setTitle(string);
-            getBinding().d.setSubtitle(getString(2131886144));
+            getBinding().d.setSubtitle(getString(R.string.account_disabled_description));
         } else {
             ScreenTitleView screenTitleView2 = getBinding().d;
-            String string2 = getString(2131886151);
+            String string2 = getString(R.string.account_scheduled_for_deletion_title);
             m.checkNotNullExpressionValue(string2, "getString(R.string.accou…duled_for_deletion_title)");
             screenTitleView2.setTitle(string2);
-            getBinding().d.setSubtitle(getString(2131886150));
+            getBinding().d.setSubtitle(getString(R.string.account_scheduled_for_deletion_description));
         }
         getBinding().f1693c.setOnClickListener(WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.INSTANCE);
         getBinding().b.setOnClickListener(new WidgetAuthUndeleteAccount$onViewBoundOrOnResume$2(this));
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java
index 64927cc97b..bf85610046 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.OauthTokenPermissionDetailedListItemBinding;
 import com.discord.widgets.auth.WidgetOauth2Authorize;
 import d0.z.d.m;
@@ -22,12 +23,12 @@ public final class WidgetOauth2Authorize$adapter$1 extends o implements Function
     public final WidgetOauth2Authorize.OAuthPermissionViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) {
         m.checkNotNullParameter(layoutInflater, "layoutInflater");
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = layoutInflater.inflate(2131558621, viewGroup, false);
-        int i = 2131364308;
-        ImageView imageView = (ImageView) inflate.findViewById(2131364308);
+        View inflate = layoutInflater.inflate(R.layout.oauth_token_permission_detailed_list_item, viewGroup, false);
+        int i = R.id.oauth_token_permission_detailed_icon;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.oauth_token_permission_detailed_icon);
         if (imageView != null) {
-            i = 2131364309;
-            TextView textView = (TextView) inflate.findViewById(2131364309);
+            i = R.id.oauth_token_permission_detailed_name;
+            TextView textView = (TextView) inflate.findViewById(R.id.oauth_token_permission_detailed_name);
             if (textView != null) {
                 OauthTokenPermissionDetailedListItemBinding oauthTokenPermissionDetailedListItemBinding = new OauthTokenPermissionDetailedListItemBinding((ConstraintLayout) inflate, imageView, textView);
                 m.checkNotNullExpressionValue(oauthTokenPermissionDetailedListItemBinding, "OauthTokenPermissionDeta…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java
index 34fdd5c1e4..5ac9f2c603 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetOauthAuthorizeBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -23,65 +24,65 @@ public final /* synthetic */ class WidgetOauth2Authorize$binding$2 extends k imp
 
     public final WidgetOauthAuthorizeBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364288;
-        TextView textView = (TextView) view.findViewById(2131364288);
+        int i = R.id.oauth_authorize_age_notice;
+        TextView textView = (TextView) view.findViewById(R.id.oauth_authorize_age_notice);
         if (textView != null) {
-            i = 2131364289;
-            ImageView imageView = (ImageView) view.findViewById(2131364289);
+            i = R.id.oauth_authorize_age_notice_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.oauth_authorize_age_notice_icon);
             if (imageView != null) {
-                i = 2131364290;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364290);
+                i = R.id.oauth_authorize_application_icon;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.oauth_authorize_application_icon);
                 if (simpleDraweeView != null) {
-                    i = 2131364291;
-                    TextView textView2 = (TextView) view.findViewById(2131364291);
+                    i = R.id.oauth_authorize_application_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.oauth_authorize_application_name);
                     if (textView2 != null) {
-                        i = 2131364292;
-                        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131364292);
+                        i = R.id.oauth_authorize_card;
+                        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(R.id.oauth_authorize_card);
                         if (materialCardView != null) {
-                            i = 2131364293;
-                            TextView textView3 = (TextView) view.findViewById(2131364293);
+                            i = R.id.oauth_authorize_connect_label;
+                            TextView textView3 = (TextView) view.findViewById(R.id.oauth_authorize_connect_label);
                             if (textView3 != null) {
-                                i = 2131364294;
-                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364294);
+                                i = R.id.oauth_authorize_content;
+                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.oauth_authorize_content);
                                 if (linearLayout != null) {
-                                    i = 2131364295;
-                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364295);
+                                    i = R.id.oauth_authorize_deny;
+                                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.oauth_authorize_deny);
                                     if (materialButton != null) {
-                                        i = 2131364296;
-                                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364296);
+                                        i = R.id.oauth_authorize_grant;
+                                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.oauth_authorize_grant);
                                         if (materialButton2 != null) {
-                                            i = 2131364297;
-                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364297);
+                                            i = R.id.oauth_authorize_loading;
+                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.oauth_authorize_loading);
                                             if (linearLayout2 != null) {
-                                                i = 2131364298;
-                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131364298);
+                                                i = R.id.oauth_authorize_loading_cancel;
+                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.oauth_authorize_loading_cancel);
                                                 if (materialButton3 != null) {
-                                                    i = 2131364299;
-                                                    ImageView imageView2 = (ImageView) view.findViewById(2131364299);
+                                                    i = R.id.oauth_authorize_logo;
+                                                    ImageView imageView2 = (ImageView) view.findViewById(R.id.oauth_authorize_logo);
                                                     if (imageView2 != null) {
-                                                        i = 2131364300;
-                                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364300);
+                                                        i = R.id.oauth_authorize_not_supported;
+                                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.oauth_authorize_not_supported);
                                                         if (linearLayout3 != null) {
-                                                            i = 2131364301;
-                                                            TextView textView4 = (TextView) view.findViewById(2131364301);
+                                                            i = R.id.oauth_authorize_permissions_label_tv;
+                                                            TextView textView4 = (TextView) view.findViewById(R.id.oauth_authorize_permissions_label_tv);
                                                             if (textView4 != null) {
-                                                                i = 2131364302;
-                                                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364302);
+                                                                i = R.id.oauth_authorize_permissions_list;
+                                                                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.oauth_authorize_permissions_list);
                                                                 if (recyclerView != null) {
-                                                                    i = 2131364303;
-                                                                    TextView textView5 = (TextView) view.findViewById(2131364303);
+                                                                    i = R.id.oauth_authorize_security_notice;
+                                                                    TextView textView5 = (TextView) view.findViewById(R.id.oauth_authorize_security_notice);
                                                                     if (textView5 != null) {
-                                                                        i = 2131364304;
-                                                                        ImageView imageView3 = (ImageView) view.findViewById(2131364304);
+                                                                        i = R.id.oauth_authorize_security_notice_icon;
+                                                                        ImageView imageView3 = (ImageView) view.findViewById(R.id.oauth_authorize_security_notice_icon);
                                                                         if (imageView3 != null) {
-                                                                            i = 2131364305;
-                                                                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364305);
+                                                                            i = R.id.oauth_authorize_unsupported_browser;
+                                                                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(R.id.oauth_authorize_unsupported_browser);
                                                                             if (materialButton4 != null) {
-                                                                                i = 2131364306;
-                                                                                MaterialButton materialButton5 = (MaterialButton) view.findViewById(2131364306);
+                                                                                i = R.id.oauth_authorize_unsupported_cancel;
+                                                                                MaterialButton materialButton5 = (MaterialButton) view.findViewById(R.id.oauth_authorize_unsupported_cancel);
                                                                                 if (materialButton5 != null) {
-                                                                                    i = 2131364307;
-                                                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364307);
+                                                                                    i = R.id.oauth_authorize_user_icon;
+                                                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.oauth_authorize_user_icon);
                                                                                     if (simpleDraweeView2 != null) {
                                                                                         return new WidgetOauthAuthorizeBinding((CoordinatorLayout) view, textView, imageView, simpleDraweeView, textView2, materialCardView, textView3, linearLayout, materialButton, materialButton2, linearLayout2, materialButton3, imageView2, linearLayout3, textView4, recyclerView, textView5, imageView3, materialButton4, materialButton5, simpleDraweeView2);
                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$configureSecurityNoticeUI$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$configureSecurityNoticeUI$1.java
index 8bc7cc398c..0220e94598 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$configureSecurityNoticeUI$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$configureSecurityNoticeUI$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.auth;
 
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -26,6 +27,6 @@ public final class WidgetOauth2Authorize$configureSecurityNoticeUI$1 extends o i
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.requireContext(), 2130968932));
+        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.requireContext(), (int) R.attr.colorHeaderPrimary));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java
index 46749c28c4..f0afca4925 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.view.View;
 import android.widget.LinearLayout;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.view.validators.Input;
 import com.discord.utilities.view.validators.InputValidator;
 import com.discord.utilities.view.validators.ValidationManager;
@@ -63,7 +64,7 @@ public final class WidgetOauth2Authorize$validationManager$2 extends o implement
                 sb.append(']');
                 str = sb.toString();
             }
-            c.a.e.o.h(getView().getContext(), b.j(getView(), 2131891997, new Object[]{str}, null, 4), 1, null, 8);
+            c.a.e.o.h(getView().getContext(), b.j(getView(), R.string.oauth2_request_invalid_scope, new Object[]{str}, null, 4), 1, null, 8);
             return true;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java
index e3c8610783..530efae976 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java
@@ -17,6 +17,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.application.Application;
 import com.discord.api.auth.OAuthScope;
 import com.discord.api.auth.OAuthScopeTypeAdapter;
@@ -32,6 +33,7 @@ import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.logging.Logger;
@@ -106,7 +108,7 @@ public class WidgetOauth2Authorize extends AppFragment {
 
         private final Intent createLaunchIntent(Uri uri, OAuth2Authorize oAuth2Authorize) {
             Intent intent = new Intent("android.intent.action.VIEW");
-            intent.putExtra("REQ_URI", uri);
+            intent.putExtra(WidgetOauth2Authorize.INTENT_PARAM_URI, uri);
             String internalReferrer = oAuth2Authorize.getInternalReferrer();
             if ((internalReferrer == null || !Boolean.parseBoolean(internalReferrer)) && !oAuth2Authorize.isUnsupported()) {
                 intent.addFlags(268468224);
@@ -116,13 +118,13 @@ public class WidgetOauth2Authorize extends AppFragment {
 
         private final OAuth2Authorize createOauthAuthorize(Uri uri) {
             WidgetOauth2Authorize$Companion$createOauthAuthorize$1 widgetOauth2Authorize$Companion$createOauthAuthorize$1 = WidgetOauth2Authorize$Companion$createOauthAuthorize$1.INSTANCE;
-            long parseLong = Long.parseLong(widgetOauth2Authorize$Companion$createOauthAuthorize$1.invoke(uri, "client_id"));
-            String queryParameter = uri.getQueryParameter("redirect_uri");
-            return new OAuth2Authorize(parseLong, uri.getQueryParameter("state"), uri.getQueryParameter("response_type"), queryParameter, null, widgetOauth2Authorize$Companion$createOauthAuthorize$1.invoke(uri, "scope"), uri.getQueryParameter("permissions"), uri.getQueryParameter("code_challenge"), uri.getQueryParameter("code_challenge_method"), uri.getQueryParameter("internal_referrer"), 16, null);
+            long parseLong = Long.parseLong(widgetOauth2Authorize$Companion$createOauthAuthorize$1.invoke(uri, WidgetOauth2Authorize.QUERY_PARAM_CLIENT_ID));
+            String queryParameter = uri.getQueryParameter(WidgetOauth2Authorize.QUERY_PARAM_REDIRECT);
+            return new OAuth2Authorize(parseLong, uri.getQueryParameter(WidgetOauth2Authorize.QUERY_PARAM_STATE), uri.getQueryParameter(WidgetOauth2Authorize.QUERY_PARAM_RESPONSE_TYPE), queryParameter, null, widgetOauth2Authorize$Companion$createOauthAuthorize$1.invoke(uri, WidgetOauth2Authorize.QUERY_PARAM_SCOPE), uri.getQueryParameter("permissions"), uri.getQueryParameter(WidgetOauth2Authorize.QUERY_PARAM_CODE_CHALLENGE), uri.getQueryParameter(WidgetOauth2Authorize.QUERY_PARAM_CODE_CHALLENGE_METHOD), uri.getQueryParameter(WidgetOauth2Authorize.QUERY_INTERNAL_REFERRER), 16, null);
         }
 
         private final void handleError(Context context, Exception exc, Function0<Unit> function0) {
-            String obj = b.h(context, 2131891998, new Object[]{exc.getMessage()}, null, 4).toString();
+            String obj = b.h(context, R.string.oauth2_request_missing_param, new Object[]{exc.getMessage()}, null, 4).toString();
             AppLog.g.w(obj, exc);
             o.h(context, obj, 1, null, 8);
             function0.mo1invoke();
@@ -181,7 +183,7 @@ public class WidgetOauth2Authorize extends AppFragment {
 
         public OAuth2Authorize(long j, String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9) {
             m.checkNotNullParameter(str4, "prompt");
-            m.checkNotNullParameter(str5, "scope");
+            m.checkNotNullParameter(str5, WidgetOauth2Authorize.QUERY_PARAM_SCOPE);
             this.clientId = j;
             this.state = str;
             this.responseType = str2;
@@ -273,7 +275,7 @@ public class WidgetOauth2Authorize extends AppFragment {
 
         public final OAuth2Authorize copy(long j, String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9) {
             m.checkNotNullParameter(str4, "prompt");
-            m.checkNotNullParameter(str5, "scope");
+            m.checkNotNullParameter(str5, WidgetOauth2Authorize.QUERY_PARAM_SCOPE);
             return new OAuth2Authorize(j, str, str2, str3, str4, str5, str6, str7, str8, str9);
         }
 
@@ -363,7 +365,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         }
 
         public final Observable<RestAPIParams.OAuth2Authorize.ResponsePost> post(String str) {
-            return RestAPI.Companion.getApi().postOauth2Authorize(String.valueOf(this.clientId), this.state, this.responseType, this.redirectUrl, this.prompt, this.scope, this.permissions, this.codeChallenge, this.codeChallengeMethod, h0.plus(g0.mapOf(d0.o.to("authorize", "true")), str != null ? g0.mapOf(d0.o.to("captcha_key", str)) : h0.emptyMap()));
+            return RestAPI.Companion.getApi().postOauth2Authorize(String.valueOf(this.clientId), this.state, this.responseType, this.redirectUrl, this.prompt, this.scope, this.permissions, this.codeChallenge, this.codeChallengeMethod, h0.plus(g0.mapOf(d0.o.to("authorize", "true")), str != null ? g0.mapOf(d0.o.to(CaptchaHelper.CAPTCHA_KEY, str)) : h0.emptyMap()));
         }
 
         public String toString() {
@@ -437,12 +439,12 @@ public class WidgetOauth2Authorize extends AppFragment {
         public void bind(PermissionModel permissionModel) {
             m.checkNotNullParameter(permissionModel, "data");
             if (permissionModel.getScope() != null) {
-                this.binding.b.setImageResource(2131231542);
+                this.binding.b.setImageResource(R.drawable.ic_check_circle_green_24dp);
                 TextView textView = this.binding.f1622c;
                 m.checkNotNullExpressionValue(textView, "binding.oauthTokenPermissionDetailedName");
                 OAuthPermissionViews.a(textView, permissionModel.getScope());
             } else if (permissionModel.getFakeText() != null) {
-                this.binding.b.setImageResource(2131231563);
+                this.binding.b.setImageResource(R.drawable.ic_close_circle_grey_24dp);
                 this.binding.f1622c.setText(permissionModel.getFakeText().intValue());
             }
         }
@@ -468,7 +470,7 @@ public class WidgetOauth2Authorize extends AppFragment {
     }
 
     public WidgetOauth2Authorize() {
-        super(2131559160);
+        super(R.layout.widget_oauth_authorize);
         WidgetOauth2Authorize$oauth2ViewModel$2 widgetOauth2Authorize$oauth2ViewModel$2 = WidgetOauth2Authorize$oauth2ViewModel$2.INSTANCE;
         c.a.e.h0 h0Var = new c.a.e.h0(this);
         this.oauth2ViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(OAuth2ViewModel.class), new WidgetOauth2Authorize$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetOauth2Authorize$oauth2ViewModel$2));
@@ -492,7 +494,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         long parseSnowflake = TimeUtils.parseSnowflake(Long.valueOf(j));
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.oauthAuthorizeAgeNotice");
-        b.n(textView, 2131891975, new Object[]{DateUtils.formatDateTime(requireContext(), parseSnowflake, 65536)}, null, 4);
+        b.n(textView, R.string.oauth2_details_creation_date, new Object[]{DateUtils.formatDateTime(requireContext(), parseSnowflake, 65536)}, null, 4);
     }
 
     private final void configureNotSupportedUI(Uri uri) {
@@ -509,7 +511,7 @@ public class WidgetOauth2Authorize extends AppFragment {
     }
 
     private final void configureSecurityNoticeUI(List<String> list) {
-        int i = list.contains(OAuthScope.MessagesRead.INSTANCE.a()) ? 2131891971 : 2131891972;
+        int i = list.contains(OAuthScope.MessagesRead.INSTANCE.a()) ? R.string.oauth2_can_read_notice : R.string.oauth2_cannot_read_send_notice;
         TextView textView = getBinding().m;
         m.checkNotNullExpressionValue(textView, "binding.oauthAuthorizeSecurityNotice");
         b.m(textView, i, new Object[0], new WidgetOauth2Authorize$configureSecurityNoticeUI$1(this));
@@ -521,21 +523,21 @@ public class WidgetOauth2Authorize extends AppFragment {
     private final int getRandomFakeScopeText() {
         switch (c.b.nextInt(8)) {
             case 0:
-                return 2131891987;
+                return R.string.oauth2_fake_scope_1;
             case 1:
-                return 2131891988;
+                return R.string.oauth2_fake_scope_2;
             case 2:
-                return 2131891989;
+                return R.string.oauth2_fake_scope_3;
             case 3:
-                return 2131891990;
+                return R.string.oauth2_fake_scope_4;
             case 4:
-                return 2131891991;
+                return R.string.oauth2_fake_scope_5;
             case 5:
-                return 2131891992;
+                return R.string.oauth2_fake_scope_6;
             case 6:
-                return 2131891993;
+                return R.string.oauth2_fake_scope_7;
             default:
-                return 2131891994;
+                return R.string.oauth2_fake_scope_8;
         }
     }
 
@@ -550,7 +552,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         K.append(" in ");
         K.append(getClass().getSimpleName());
         Logger.e$default(appLog, K.toString(), invalidScopeException, null, 4, null);
-        o.h(requireContext(), b.h(requireContext(), 2131891997, new Object[]{invalidScopeException.a()}, null, 4), 1, null, 8);
+        o.h(requireContext(), b.h(requireContext(), R.string.oauth2_request_invalid_scope, new Object[]{invalidScopeException.a()}, null, 4), 1, null, 8);
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
             appActivity.setResult(0);
@@ -581,7 +583,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         textView.setText(application.g());
         TextView textView2 = getBinding().k;
         m.checkNotNullExpressionValue(textView2, "binding.oauthAuthorizePermissionsLabelTv");
-        b.n(textView2, 2131892000, new Object[]{application.g()}, null, 4);
+        b.n(textView2, R.string.oauth2_scopes_label, new Object[]{application.g()}, null, 4);
         SimpleDraweeView simpleDraweeView2 = getBinding().f1876c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.oauthAuthorizeApplicationIcon");
         String e = application.e();
@@ -631,7 +633,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         RecyclerView recyclerView = getBinding().l;
         m.checkNotNullExpressionValue(recyclerView, "binding.oauthAuthorizePermissionsList");
         recyclerView.setAdapter(this.adapter);
-        Uri uri = (Uri) getMostRecentIntent().getParcelableExtra("REQ_URI");
+        Uri uri = (Uri) getMostRecentIntent().getParcelableExtra(INTENT_PARAM_URI);
         if (uri == null) {
             uri = Uri.EMPTY;
         }
@@ -659,7 +661,7 @@ public class WidgetOauth2Authorize extends AppFragment {
             return;
         }
         if (getOauth2ViewModel().getOauthAuthorize().isUnsupported()) {
-            Uri uri = (Uri) getMostRecentIntent().getParcelableExtra("REQ_URI");
+            Uri uri = (Uri) getMostRecentIntent().getParcelableExtra(INTENT_PARAM_URI);
             if (uri == null) {
                 uri = Uri.EMPTY;
             }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.java
index 3ada7cde26..f2d20580de 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.auth;
 
 import com.discord.utilities.captcha.CaptchaErrorBody;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.error.Error;
 import com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung;
 import d0.g0.w;
@@ -31,7 +32,7 @@ public final class WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1 extends o
         WidgetOauth2AuthorizeSamsung.Companion companion = WidgetOauth2AuthorizeSamsung.Companion;
         WidgetOauth2AuthorizeSamsung.Companion.access$logI(companion, "POST /authorize: error " + error);
         String bodyText = error.getBodyText();
-        if (bodyText != null && w.contains$default((CharSequence) bodyText, (CharSequence) "captcha_key", false, 2, (Object) null)) {
+        if (bodyText != null && w.contains$default((CharSequence) bodyText, (CharSequence) CaptchaHelper.CAPTCHA_KEY, false, 2, (Object) null)) {
             WidgetAuthCaptcha.Companion.launch(this.this$0.requireContext(), this.this$0.getCaptchaLauncher(), CaptchaErrorBody.Companion.createFromError(error));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.java
index f380809dc1..74fb97ad8b 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$configureUI$1.java
@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.view.View;
 import androidx.activity.result.ActivityResultLauncher;
 import com.discord.app.AppActivity;
+import com.discord.models.domain.ModelUserSettings;
 import com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung;
 import d0.z.d.m;
 /* compiled from: WidgetOauth2AuthorizeSamsung.kt */
@@ -33,7 +34,7 @@ public final class WidgetOauth2AuthorizeSamsung$configureUI$1 implements View.On
             ActivityResultLauncher access$getSamsungDisclaimerLauncher$p = WidgetOauth2AuthorizeSamsung.access$getSamsungDisclaimerLauncher$p(this.this$0);
             Intent intent = new Intent("com.msc.action.samsungaccount.REQUEST_NEW_THIRD_PARTY_INTEGRATION_WITH_SAMSUNG_ACCOUNT");
             intent.putExtra("client_id", "97t47j218f");
-            intent.putExtra("progress_theme", "dark");
+            intent.putExtra("progress_theme", ModelUserSettings.THEME_DARK);
             access$getSamsungDisclaimerLauncher$p.launch(intent);
         } catch (ActivityNotFoundException unused) {
             AppActivity appActivity = this.this$0.getAppActivity();
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.java
index be28734186..479697acd8 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.auth;
 
 import c.a.e.o;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import d0.l;
 import d0.w.g.c;
@@ -40,7 +41,7 @@ public final class WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2 exten
         c.getCOROUTINE_SUSPENDED();
         if (this.label == 0) {
             l.throwOnFailure(obj);
-            o.i(this.this$0, 2131886779, 0, 4);
+            o.i(this.this$0, R.string.authorized, 0, 4);
             AppActivity appActivity = this.this$0.getAppActivity();
             if (appActivity == null) {
                 return null;
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java
index 10d05a65cc..998de11fb2 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultCallback;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.samsung.SamsungConnectActivity;
 import com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung;
@@ -31,7 +32,7 @@ public final class WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1<O> i
         Object obj2 = (data2 == null || (extras = data2.getExtras()) == null) ? null : extras.get("error_code");
         WidgetOauth2AuthorizeSamsung.Companion companion = WidgetOauth2AuthorizeSamsung.Companion;
         WidgetOauth2AuthorizeSamsung.Companion.logW$default(companion, "Connection requires disclaimer acceptance. [" + obj2 + "] " + obj, null, 2, null);
-        o.i(this.this$0, 2131888528, 0, 4);
+        o.i(this.this$0, R.string.failed, 0, 4);
         AppActivity appActivity = this.this$0.getAppActivity();
         if (appActivity != null) {
             appActivity.finish();
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java
index 01646904cb..d50825f2ae 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.core.view.PointerIconCompat;
 import c.a.s.b;
 import c.a.s.c;
 import c.d.b.a.a;
@@ -184,7 +185,7 @@ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize {
         if (state == null) {
             state = Companion.access$createSAStateId(Companion);
         }
-        return WidgetOauth2Authorize.OAuth2Authorize.copy$default(createOauthAuthorize, 0, state, null, "https://discord.com/api/v6/oauth2/samsung/authorize/callback", null, null, null, null, null, null, 1013, null);
+        return WidgetOauth2Authorize.OAuth2Authorize.copy$default(createOauthAuthorize, 0, state, null, "https://discord.com/api/v6/oauth2/samsung/authorize/callback", null, null, null, null, null, null, PointerIconCompat.TYPE_ALL_SCROLL, null);
     }
 
     @Override // com.discord.widgets.auth.WidgetOauth2Authorize
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java
index 9935ae4d51..513c66318e 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.RelativeLayout;
 import c.a.j.l5;
 import c.a.j.m5;
 import c.a.j.n5;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetRemoteAuthBinding;
 import com.google.android.material.button.MaterialButton;
@@ -23,33 +24,33 @@ public final /* synthetic */ class WidgetRemoteAuth$binding$2 extends k implemen
 
     public final WidgetRemoteAuthBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362068;
-        View findViewById = view.findViewById(2131362068);
+        int i = R.id.auth_success;
+        View findViewById = view.findViewById(R.id.auth_success);
         if (findViewById != null) {
-            MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131364630);
+            MaterialButton materialButton = (MaterialButton) findViewById.findViewById(R.id.remote_auth_finish_button);
             if (materialButton != null) {
                 n5 n5Var = new n5((LinearLayout) findViewById, materialButton);
-                i = 2131364244;
-                View findViewById2 = view.findViewById(2131364244);
+                i = R.id.not_found;
+                View findViewById2 = view.findViewById(R.id.not_found);
                 if (findViewById2 != null) {
-                    MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131364632);
+                    MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(R.id.remote_auth_not_found_cancel_button);
                     if (materialButton2 != null) {
                         l5 l5Var = new l5((LinearLayout) findViewById2, materialButton2);
-                        i = 2131364417;
-                        View findViewById3 = view.findViewById(2131364417);
+                        i = R.id.pending_login;
+                        View findViewById3 = view.findViewById(R.id.pending_login);
                         if (findViewById3 != null) {
-                            int i2 = 2131364629;
-                            MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131364629);
+                            int i2 = R.id.remote_auth_cancel_button;
+                            MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(R.id.remote_auth_cancel_button);
                             if (materialButton3 != null) {
-                                i2 = 2131364631;
-                                MaterialButton materialButton4 = (MaterialButton) findViewById3.findViewById(2131364631);
+                                i2 = R.id.remote_auth_login_button;
+                                MaterialButton materialButton4 = (MaterialButton) findViewById3.findViewById(R.id.remote_auth_login_button);
                                 if (materialButton4 != null) {
-                                    i2 = 2131364633;
-                                    SwitchMaterial switchMaterial = (SwitchMaterial) findViewById3.findViewById(2131364633);
+                                    i2 = R.id.remote_auth_temporary_switch;
+                                    SwitchMaterial switchMaterial = (SwitchMaterial) findViewById3.findViewById(R.id.remote_auth_temporary_switch);
                                     if (switchMaterial != null) {
                                         m5 m5Var = new m5((LinearLayout) findViewById3, materialButton3, materialButton4, switchMaterial);
-                                        i = 2131364634;
-                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364634);
+                                        i = R.id.remote_auth_view_flipper;
+                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.remote_auth_view_flipper);
                                         if (appViewFlipper != null) {
                                             return new WidgetRemoteAuthBinding((RelativeLayout) view, n5Var, l5Var, m5Var, appViewFlipper);
                                         }
@@ -59,11 +60,11 @@ public final /* synthetic */ class WidgetRemoteAuth$binding$2 extends k implemen
                             throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i2)));
                         }
                     } else {
-                        throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(2131364632)));
+                        throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(R.id.remote_auth_not_found_cancel_button)));
                     }
                 }
             } else {
-                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131364630)));
+                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(R.id.remote_auth_finish_button)));
             }
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
index 7840195047..c2364f21ee 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
@@ -9,6 +9,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetRemoteAuthBinding;
@@ -51,13 +52,13 @@ public final class WidgetRemoteAuth extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "fingerprint");
             Intent intent = new Intent("android.intent.action.VIEW");
-            intent.putExtra("REMOTE_AUTH_FINGERPRINT", str);
+            intent.putExtra(WidgetRemoteAuth.EXTRA_REMOTE_AUTH_FINGERPRINT, str);
             l.d(context, WidgetRemoteAuth.class, intent);
         }
     }
 
     public WidgetRemoteAuth() {
-        super(2131559173);
+        super(R.layout.widget_remote_auth);
         WidgetRemoteAuth$viewModel$2 widgetRemoteAuth$viewModel$2 = new WidgetRemoteAuth$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetRemoteAuthViewModel.class), new WidgetRemoteAuth$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetRemoteAuth$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java
index fc4d699991..b7200fed8f 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.e2;
 import c.a.j.q4;
+import com.discord.R;
 import com.discord.api.botuikit.ComponentType;
 import com.discord.models.botuikit.ActionInteractionComponentState;
 import com.discord.models.botuikit.ActionRowMessageComponent;
@@ -40,7 +41,7 @@ public final class ActionRowComponentView extends LinearLayout implements Compon
         public final ActionRowComponentView inflateComponent(Context context, ViewGroup viewGroup) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(viewGroup, "root");
-            q4 a = q4.a(LayoutInflater.from(context).inflate(2131558993, viewGroup, false));
+            q4 a = q4.a(LayoutInflater.from(context).inflate(R.layout.widget_chat_list_bot_ui_action_row_component, viewGroup, false));
             m.checkNotNullExpressionValue(a, "WidgetChatListBotUiActio…om(context), root, false)");
             ActionRowComponentView actionRowComponentView = a.a;
             m.checkNotNullExpressionValue(actionRowComponentView, "WidgetChatListBotUiActio…ntext), root, false).root");
@@ -95,7 +96,7 @@ public final class ActionRowComponentView extends LinearLayout implements Compon
         if (childError != null) {
             String errorMessage = childError.getErrorMessage();
             if (errorMessage == null) {
-                errorMessage = getResources().getString(2131886382);
+                errorMessage = getResources().getString(R.string.application_command_failed);
                 m.checkNotNullExpressionValue(errorMessage, "resources.getString(R.st…plication_command_failed)");
             }
             TextView textView = a.f151c.b;
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
index a29de6d9fe..6720be1c6b 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
@@ -12,6 +12,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.ViewCompat;
+import com.discord.R;
 import com.discord.api.botuikit.ButtonStyle;
 import com.discord.api.botuikit.ComponentEmoji;
 import com.discord.api.botuikit.ComponentType;
@@ -44,7 +45,7 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo
         public final ButtonComponentView inflateComponent(Context context, ViewGroup viewGroup) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(viewGroup, "root");
-            WidgetChatListBotUiButtonComponentBinding a = WidgetChatListBotUiButtonComponentBinding.a(LayoutInflater.from(context).inflate(2131558994, viewGroup, false));
+            WidgetChatListBotUiButtonComponentBinding a = WidgetChatListBotUiButtonComponentBinding.a(LayoutInflater.from(context).inflate(R.layout.widget_chat_list_bot_ui_button_component, viewGroup, false));
             m.checkNotNullExpressionValue(a, "WidgetChatListBotUiButto…om(context), root, false)");
             ButtonComponentView buttonComponentView = a.a;
             m.checkNotNullExpressionValue(buttonComponentView, "WidgetChatListBotUiButto…ntext), root, false).root");
@@ -159,15 +160,15 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo
         m.checkNotNullParameter(button, "button");
         m.checkNotNullParameter(buttonStyle, "style");
         int ordinal = buttonStyle.ordinal();
-        int i = 2131100419;
+        int i = R.color.uikit_btn_bg_color_selector_secondary;
         if (ordinal != 0) {
             if (ordinal == 1) {
-                i = 2131100416;
+                i = R.color.uikit_btn_bg_color_selector_brand;
             } else if (ordinal != 2) {
                 if (ordinal == 3) {
-                    i = 2131100417;
+                    i = R.color.uikit_btn_bg_color_selector_green;
                 } else if (ordinal == 4) {
-                    i = 2131100418;
+                    i = R.color.uikit_btn_bg_color_selector_red;
                 } else if (ordinal != 5) {
                     throw new NoWhenBranchMatchedException();
                 }
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ComponentViewUtils.java b/app/src/main/java/com/discord/widgets/botuikit/views/ComponentViewUtils.java
index e5b7dbba26..fe638d94c7 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/ComponentViewUtils.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/ComponentViewUtils.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.botuikit.views;
 
+import com.discord.R;
 import com.discord.api.botuikit.ComponentEmoji;
 import com.discord.models.domain.emoji.ModelEmojiCustom;
 import com.discord.models.domain.emoji.ModelEmojiUnicode;
@@ -40,9 +41,9 @@ public final class ComponentViewUtils {
             }
             str = ModelEmojiUnicode.getImageUri(str2, simpleDraweeView.getContext());
         }
-        if (!m.areEqual(simpleDraweeView.getTag(2131894232), str)) {
-            simpleDraweeView.setTag(2131894232, str);
-            MGImages.setImage$default(simpleDraweeView, str, 2131165398, 2131165398, true, null, null, 96, null);
+        if (!m.areEqual(simpleDraweeView.getTag(R.string.tag_emoji_url), str)) {
+            simpleDraweeView.setTag(R.string.tag_emoji_url, str);
+            MGImages.setImage$default(simpleDraweeView, str, R.dimen.emoji_size, R.dimen.emoji_size, true, null, null, 96, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java
index 0101f03cb0..eaa50e6eb1 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.botuikit.views.select;
 import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSelectComponentBottomSheetBinding;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import d0.z.d.k;
@@ -18,20 +19,20 @@ public final /* synthetic */ class SelectComponentBottomSheet$binding$2 extends
 
     public final WidgetSelectComponentBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365913;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365913);
+        int i = R.id.widget_sheet_component_bottom_sheet_header;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.widget_sheet_component_bottom_sheet_header);
         if (constraintLayout != null) {
-            i = 2131365914;
-            TextView textView = (TextView) view.findViewById(2131365914);
+            i = R.id.widget_sheet_component_bottom_sheet_placeholder;
+            TextView textView = (TextView) view.findViewById(R.id.widget_sheet_component_bottom_sheet_placeholder);
             if (textView != null) {
-                i = 2131365915;
-                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365915);
+                i = R.id.widget_sheet_component_bottom_sheet_recycler;
+                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(R.id.widget_sheet_component_bottom_sheet_recycler);
                 if (maxHeightRecyclerView != null) {
-                    i = 2131365916;
-                    TextView textView2 = (TextView) view.findViewById(2131365916);
+                    i = R.id.widget_sheet_component_bottom_sheet_select;
+                    TextView textView2 = (TextView) view.findViewById(R.id.widget_sheet_component_bottom_sheet_select);
                     if (textView2 != null) {
-                        i = 2131365917;
-                        TextView textView3 = (TextView) view.findViewById(2131365917);
+                        i = R.id.widget_sheet_component_bottom_sheet_subtitle;
+                        TextView textView3 = (TextView) view.findViewById(R.id.widget_sheet_component_bottom_sheet_subtitle);
                         if (textView3 != null) {
                             return new WidgetSelectComponentBottomSheetBinding((ConstraintLayout) view, constraintLayout, textView, maxHeightRecyclerView, textView2, textView3);
                         }
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$viewModel$2.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$viewModel$2.java
index 8bed08f9c6..0fd1bb5781 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$viewModel$2.java
@@ -22,16 +22,16 @@ public final class SelectComponentBottomSheet$viewModel$2 extends o implements F
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<SelectComponentBottomSheetViewModel.ViewState> mo1invoke() {
-        Serializable serializable = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getSerializable("extra_component_context");
+        Serializable serializable = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getSerializable(SelectComponentBottomSheet.EXTRA_COMPONENT_CONTEXT);
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.widgets.botuikit.views.select.ComponentContext");
         ComponentContext componentContext = (ComponentContext) serializable;
-        int i = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getInt("extra_component_index");
-        String string = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString("extra_custom_id", "");
-        String string2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString("extra_hash", "");
-        String string3 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString("extra_placeholder");
-        int i2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getInt("extra_min");
-        int i3 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getInt("extra_max");
-        Serializable serializable2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getSerializable("extra_options");
+        int i = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getInt(SelectComponentBottomSheet.EXTRA_COMPONENT_INDEX);
+        String string = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString(SelectComponentBottomSheet.EXTRA_CUSTOM_ID, "");
+        String string2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString(SelectComponentBottomSheet.EXTRA_HASH, "");
+        String string3 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString(SelectComponentBottomSheet.EXTRA_PLACEHOLDER);
+        int i2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getInt(SelectComponentBottomSheet.EXTRA_MIN);
+        int i3 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getInt(SelectComponentBottomSheet.EXTRA_MAX);
+        Serializable serializable2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getSerializable(SelectComponentBottomSheet.EXTRA_OPTIONS);
         List list = null;
         if (!(serializable2 instanceof List)) {
             serializable2 = null;
@@ -40,13 +40,13 @@ public final class SelectComponentBottomSheet$viewModel$2 extends o implements F
         if (list2 == null) {
             list2 = n.emptyList();
         }
-        Serializable serializable3 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getSerializable("extra_selected");
+        Serializable serializable3 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getSerializable(SelectComponentBottomSheet.EXTRA_SELECTED);
         if (serializable3 instanceof List) {
             list = serializable3;
         }
         List list3 = list;
         List emptyList = list3 != null ? list3 : n.emptyList();
-        boolean z2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getBoolean("extra_emoji_animations_enabled");
+        boolean z2 = SelectComponentBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getBoolean(SelectComponentBottomSheet.EXTRA_EMOJI_ANIMATIONS_ENABLED);
         m.checkNotNullExpressionValue(string, "customId");
         m.checkNotNullExpressionValue(string2, "hash");
         return new SelectComponentBottomSheetViewModel(componentContext, i, string, string2, string3, list2, i2, i3, emptyList, z2);
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
index 2062aa8d6c..bf86bff331 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
@@ -12,6 +12,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.botuikit.SelectItem;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetSelectComponentBottomSheetBinding;
@@ -65,7 +66,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet {
             m.checkNotNullParameter(list, "options");
             m.checkNotNullParameter(list2, "selectedItems");
             SelectComponentBottomSheet selectComponentBottomSheet = new SelectComponentBottomSheet();
-            selectComponentBottomSheet.setArguments(BundleKt.bundleOf(o.to("extra_component_context", componentContext), o.to("extra_component_index", Integer.valueOf(i)), o.to("extra_custom_id", str), o.to("extra_hash", str2), o.to("extra_placeholder", str3), o.to("extra_min", Integer.valueOf(i2)), o.to("extra_max", Integer.valueOf(i3)), o.to("extra_options", list), o.to("extra_selected", list2), o.to("extra_emoji_animations_enabled", Boolean.valueOf(z2))));
+            selectComponentBottomSheet.setArguments(BundleKt.bundleOf(o.to(SelectComponentBottomSheet.EXTRA_COMPONENT_CONTEXT, componentContext), o.to(SelectComponentBottomSheet.EXTRA_COMPONENT_INDEX, Integer.valueOf(i)), o.to(SelectComponentBottomSheet.EXTRA_CUSTOM_ID, str), o.to(SelectComponentBottomSheet.EXTRA_HASH, str2), o.to(SelectComponentBottomSheet.EXTRA_PLACEHOLDER, str3), o.to(SelectComponentBottomSheet.EXTRA_MIN, Integer.valueOf(i2)), o.to(SelectComponentBottomSheet.EXTRA_MAX, Integer.valueOf(i3)), o.to(SelectComponentBottomSheet.EXTRA_OPTIONS, list), o.to(SelectComponentBottomSheet.EXTRA_SELECTED, list2), o.to(SelectComponentBottomSheet.EXTRA_EMOJI_ANIMATIONS_ENABLED, Boolean.valueOf(z2))));
             selectComponentBottomSheet.show(fragmentManager, SelectComponentBottomSheet.class.getSimpleName());
         }
     }
@@ -104,7 +105,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet {
         if (viewState.isMultiSelect()) {
             TextView textView3 = getBinding().e;
             m.checkNotNullExpressionValue(textView3, "binding.widgetSheetComponentBottomSheetSubtitle");
-            textView3.setText(b.k(this, 2131891492, new Object[]{Integer.valueOf(viewState.getMinSelections())}, null, 4));
+            textView3.setText(b.k(this, R.string.message_select_component_select_requirement, new Object[]{Integer.valueOf(viewState.getMinSelections())}, null, 4));
         }
         TextView textView4 = getBinding().d;
         m.checkNotNullExpressionValue(textView4, "binding.widgetSheetComponentBottomSheetSelect");
@@ -138,7 +139,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559188;
+        return R.layout.widget_select_component_bottom_sheet;
     }
 
     public final void onItemSelected(SelectItem selectItem, boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java
index 01478447f6..5122132aaa 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.api.botuikit.SelectItem;
 import com.discord.databinding.WidgetSelectComponentBottomSheetItemBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -54,24 +55,24 @@ public final class SelectComponentBottomSheetAdapter extends RecyclerView.Adapte
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559189, viewGroup, false);
-        int i2 = 2131364802;
-        MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364802);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.widget_select_component_bottom_sheet_item, viewGroup, false);
+        int i2 = R.id.select_component_sheet_item_description;
+        MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(R.id.select_component_sheet_item_description);
         if (materialTextView != null) {
-            i2 = 2131364803;
-            View findViewById = inflate.findViewById(2131364803);
+            i2 = R.id.select_component_sheet_item_divider;
+            View findViewById = inflate.findViewById(R.id.select_component_sheet_item_divider);
             if (findViewById != null) {
-                i2 = 2131364804;
-                View findViewById2 = inflate.findViewById(2131364804);
+                i2 = R.id.select_component_sheet_item_divider_icon;
+                View findViewById2 = inflate.findViewById(R.id.select_component_sheet_item_divider_icon);
                 if (findViewById2 != null) {
-                    i2 = 2131364805;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364805);
+                    i2 = R.id.select_component_sheet_item_icon;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.select_component_sheet_item_icon);
                     if (simpleDraweeView != null) {
-                        i2 = 2131364806;
-                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) inflate.findViewById(2131364806);
+                        i2 = R.id.select_component_sheet_item_selected;
+                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) inflate.findViewById(R.id.select_component_sheet_item_selected);
                         if (materialCheckBox != null) {
-                            i2 = 2131364807;
-                            MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364807);
+                            i2 = R.id.select_component_sheet_item_title;
+                            MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(R.id.select_component_sheet_item_title);
                             if (materialTextView2 != null) {
                                 WidgetSelectComponentBottomSheetItemBinding widgetSelectComponentBottomSheetItemBinding = new WidgetSelectComponentBottomSheetItemBinding((ConstraintLayout) inflate, materialTextView, findViewById, findViewById2, simpleDraweeView, materialCheckBox, materialTextView2);
                                 m.checkNotNullExpressionValue(widgetSelectComponentBottomSheetItemBinding, "WidgetSelectComponentBot…          false\n        )");
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java
index 5aa434c536..e3e4036f39 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java
@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.r4;
 import c.a.j.s4;
+import com.discord.R;
 import com.discord.api.botuikit.ComponentType;
 import com.discord.api.botuikit.SelectItem;
 import com.discord.models.botuikit.ActionInteractionComponentState;
@@ -44,7 +45,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
         public final SelectComponentView inflateComponent(Context context, ViewGroup viewGroup) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(viewGroup, "root");
-            r4 a = r4.a(LayoutInflater.from(context).inflate(2131558995, viewGroup, false));
+            r4 a = r4.a(LayoutInflater.from(context).inflate(R.layout.widget_chat_list_bot_ui_select_component, viewGroup, false));
             m.checkNotNullExpressionValue(a, "WidgetChatListBotUiSelec…om(context), root, false)");
             SelectComponentView selectComponentView = a.a;
             m.checkNotNullExpressionValue(selectComponentView, "WidgetChatListBotUiSelec…ntext), root, false).root");
@@ -74,7 +75,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
         m.checkNotNullExpressionValue(a, "WidgetChatListBotUiSelec…mponentBinding.bind(this)");
         String placeholder = selectMessageComponent.getPlaceholder();
         if (placeholder == null) {
-            placeholder = getResources().getString(2131891491);
+            placeholder = getResources().getString(R.string.message_select_component_default_placeholder);
             m.checkNotNullExpressionValue(placeholder, "resources.getString(R.st…nent_default_placeholder)");
         }
         boolean z2 = true;
@@ -85,7 +86,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
             FlexboxLayout flexboxLayout = a.f;
             m.checkNotNullExpressionValue(flexboxLayout, "binding.selectComponentSelectionsRoot");
             flexboxLayout.setVisibility(8);
-            a.e.setTextColor(ColorCompat.getThemedColor(getContext(), 2130968949));
+            a.e.setTextColor(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorInteractiveNormal));
             MaterialTextView materialTextView2 = a.e;
             m.checkNotNullExpressionValue(materialTextView2, "binding.selectComponentSelectionText");
             materialTextView2.setText(placeholder);
@@ -96,7 +97,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
             FlexboxLayout flexboxLayout2 = a.f;
             m.checkNotNullExpressionValue(flexboxLayout2, "binding.selectComponentSelectionsRoot");
             flexboxLayout2.setVisibility(8);
-            a.e.setTextColor(ColorCompat.getThemedColor(getContext(), 2130968990));
+            a.e.setTextColor(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorTextNormal));
             SelectItem selectItem = (SelectItem) u.firstOrNull((List<? extends Object>) selectMessageComponent.getSelectedOptions());
             if (selectItem != null) {
                 MaterialTextView materialTextView4 = a.e;
@@ -117,7 +118,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
             flexboxLayout3.removeAllViews();
             LayoutInflater from = LayoutInflater.from(getContext());
             for (SelectItem selectItem2 : selectMessageComponent.getSelectedOptions()) {
-                View inflate = from.inflate(2131558996, (ViewGroup) null, false);
+                View inflate = from.inflate(R.layout.widget_chat_list_bot_ui_select_component_pill, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 MaterialTextView materialTextView6 = (MaterialTextView) inflate;
                 m.checkNotNullExpressionValue(new s4(materialTextView6), "WidgetChatListBotUiSelec…Binding.inflate(inflater)");
diff --git a/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java b/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
index 86273b6a7b..30421ee9fa 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
@@ -8,6 +8,7 @@ import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerFormatType;
 import com.discord.api.sticker.StickerType;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -513,14 +514,14 @@ public final class BugReportViewModel extends AppViewModel<ViewState> {
 
     @MainThread
     public final void updateReportDescription(String str) {
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         this.reportDescription = str;
         updateViewState$default(this, null, 1, null);
     }
 
     @MainThread
     public final void updateReportName(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.reportName = str;
         updateViewState$default(this, null, 1, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java
index b94053c091..4cb2578f90 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetBugReportBinding;
 import com.discord.views.sticker.StickerView;
@@ -25,53 +26,53 @@ public final /* synthetic */ class WidgetBugReport$binding$2 extends k implement
 
     public final WidgetBugReportBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362190;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362190);
+        int i = R.id.bug_report_clear_screenshot;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.bug_report_clear_screenshot);
         if (appCompatImageView != null) {
-            i = 2131362191;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362191);
+            i = R.id.bug_report_description;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.bug_report_description);
             if (textInputLayout != null) {
-                i = 2131362192;
-                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362192);
+                i = R.id.bug_report_name;
+                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.bug_report_name);
                 if (textInputLayout2 != null) {
-                    i = 2131362193;
-                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362193);
+                    i = R.id.bug_report_no_screenshot_label;
+                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.bug_report_no_screenshot_label);
                     if (materialTextView != null) {
-                        i = 2131362194;
-                        TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131362194);
+                        i = R.id.bug_report_priority;
+                        TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(R.id.bug_report_priority);
                         if (textInputLayout3 != null) {
-                            i = 2131362195;
-                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362195);
+                            i = R.id.bug_report_priority_card;
+                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(R.id.bug_report_priority_card);
                             if (materialCardView != null) {
-                                i = 2131362196;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362196);
+                                i = R.id.bug_report_priority_icon;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.bug_report_priority_icon);
                                 if (simpleDraweeView != null) {
-                                    i = 2131362197;
-                                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131362197);
+                                    i = R.id.bug_report_screenshot;
+                                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(R.id.bug_report_screenshot);
                                     if (appCompatImageView2 != null) {
-                                        i = 2131362198;
-                                        ImageView imageView = (ImageView) view.findViewById(2131362198);
+                                        i = R.id.bug_report_select_component_chevron;
+                                        ImageView imageView = (ImageView) view.findViewById(R.id.bug_report_select_component_chevron);
                                         if (imageView != null) {
-                                            i = 2131362199;
-                                            StickerView stickerView = (StickerView) view.findViewById(2131362199);
+                                            i = R.id.bug_report_status_expression;
+                                            StickerView stickerView = (StickerView) view.findViewById(R.id.bug_report_status_expression);
                                             if (stickerView != null) {
-                                                i = 2131362200;
-                                                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131362200);
+                                                i = R.id.bug_report_status_text;
+                                                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(R.id.bug_report_status_text);
                                                 if (materialTextView2 != null) {
-                                                    i = 2131362201;
-                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362201);
+                                                    i = R.id.bug_report_submit;
+                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.bug_report_submit);
                                                     if (materialButton != null) {
-                                                        i = 2131362202;
-                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362202);
+                                                        i = R.id.bug_report_switch_flipper;
+                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.bug_report_switch_flipper);
                                                         if (appViewFlipper != null) {
-                                                            i = 2131362203;
-                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362203);
+                                                            i = R.id.bug_report_undo_screenshot_remove;
+                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.bug_report_undo_screenshot_remove);
                                                             if (materialButton2 != null) {
-                                                                i = 2131365382;
-                                                                MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131365382);
+                                                                i = R.id.submit_report_error;
+                                                                MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(R.id.submit_report_error);
                                                                 if (materialTextView3 != null) {
-                                                                    i = 2131365869;
-                                                                    View findViewById = view.findViewById(2131365869);
+                                                                    i = R.id.widget_bug_report_severity_touch_delegate;
+                                                                    View findViewById = view.findViewById(R.id.widget_bug_report_severity_touch_delegate);
                                                                     if (findViewById != null) {
                                                                         return new WidgetBugReportBinding((CoordinatorLayout) view, appCompatImageView, textInputLayout, textInputLayout2, materialTextView, textInputLayout3, materialCardView, simpleDraweeView, appCompatImageView2, imageView, stickerView, materialTextView2, materialButton, appViewFlipper, materialButton2, materialTextView3, findViewById);
                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java
index 8162bc20e2..8ced391a4e 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java
@@ -3,6 +3,7 @@ package com.discord.widgets.bugreports;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.z.a0;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -46,7 +47,7 @@ public final class WidgetBugReport$onViewBound$5 implements View.OnClickListener
         a0.a aVar = a0.j;
         FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
         m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
-        String string = this.this$0.getString(2131887085);
+        String string = this.this$0.getString(R.string.bug_report_priority);
         m.checkNotNullExpressionValue(string, "getString(R.string.bug_report_priority)");
         a0.a.b(aVar, childFragmentManager, string, this.this$0.getItems(), false, new AnonymousClass1(this), 8);
     }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java
index c5c8ae1835..abf9d94488 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java
@@ -1,5 +1,7 @@
 package com.discord.widgets.bugreports;
 
+import com.discord.R;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
 import com.discord.utilities.view.validators.InputValidator;
@@ -24,9 +26,9 @@ public final class WidgetBugReport$validationManager$2 extends o implements Func
         TextInputLayout textInputLayout = WidgetBugReport.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.bugReportName");
         BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion;
-        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131887081)};
+        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(R.string.bug_report_error_name_required)};
         TextInputLayout textInputLayout2 = WidgetBugReport.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.bugReportPriority");
-        return new ValidationManager(new Input.TextInputLayoutInput("name", textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("priority", textInputLayout2, companion.createRequiredInputValidator(2131887082)));
+        return new ValidationManager(new Input.TextInputLayoutInput(ModelAuditLogEntry.CHANGE_KEY_NAME, textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("priority", textInputLayout2, companion.createRequiredInputValidator(R.string.bug_report_error_priority_required)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$viewModel$2.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$viewModel$2.java
index 1d5b48a594..196d85c6e1 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$viewModel$2.java
@@ -19,8 +19,8 @@ public final class WidgetBugReport$viewModel$2 extends o implements Function0<Ap
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<BugReportViewModel.ViewState> mo1invoke() {
-        Uri parse = Uri.parse(this.this$0.getMostRecentIntent().getStringExtra("extra_screenshot_uri"));
-        String stringExtra = this.this$0.getMostRecentIntent().getStringExtra("extra_screenshot_filename");
+        Uri parse = Uri.parse(this.this$0.getMostRecentIntent().getStringExtra(WidgetBugReport.INTENT_EXTRA_SCREENSHOT_URI));
+        String stringExtra = this.this$0.getMostRecentIntent().getStringExtra(WidgetBugReport.INTENT_EXTRA_SCREENSHOT_FILENAME);
         if (stringExtra == null) {
             stringExtra = "";
         }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
index 1241d7cb31..26abdbbda5 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
@@ -13,6 +13,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.z.b0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -52,7 +53,7 @@ public final class WidgetBugReport extends AppFragment {
     public static final String INTENT_EXTRA_SCREENSHOT_URI = "extra_screenshot_uri";
     public static final int VIEW_INDEX_REPORT = 0;
     public static final int VIEW_INDEX_STATUS = 1;
-    private static final List<Priority> priorityLevels = n.listOf((Object[]) new Priority[]{new Priority(2131887087, 2131887086, 801497159479722084L), new Priority(2131887089, 2131887088, 410336837563973632L), new Priority(2131887091, 2131887090, 841420679643529296L), new Priority(2131887093, 2131887092, 827645852352512021L)});
+    private static final List<Priority> priorityLevels = n.listOf((Object[]) new Priority[]{new Priority(R.string.bug_report_priority_critical_title, R.string.bug_report_priority_critical_description, 801497159479722084L), new Priority(R.string.bug_report_priority_high_title, R.string.bug_report_priority_high_description, 410336837563973632L), new Priority(R.string.bug_report_priority_low_title, R.string.bug_report_priority_low_description, 841420679643529296L), new Priority(R.string.bug_report_priority_very_low_title, R.string.bug_report_priority_very_low_description, 827645852352512021L)});
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetBugReport$binding$2.INSTANCE, null, 2, null);
     private final MGImages.DistinctChangeDetector imagesChangeDetector;
     private final Lazy items$delegate;
@@ -76,14 +77,14 @@ public final class WidgetBugReport extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(screenshot, "screenshot");
             Intent intent = new Intent();
-            intent.putExtra("extra_screenshot_uri", screenshot.a.toString());
-            intent.putExtra("extra_screenshot_filename", screenshot.b);
+            intent.putExtra(WidgetBugReport.INTENT_EXTRA_SCREENSHOT_URI, screenshot.a.toString());
+            intent.putExtra(WidgetBugReport.INTENT_EXTRA_SCREENSHOT_FILENAME, screenshot.b);
             l.d(context, WidgetBugReport.class, intent);
         }
     }
 
     public WidgetBugReport() {
-        super(2131558882);
+        super(R.layout.widget_bug_report);
         WidgetBugReport$viewModel$2 widgetBugReport$viewModel$2 = new WidgetBugReport$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(BugReportViewModel.class), new WidgetBugReport$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetBugReport$viewModel$2));
@@ -168,9 +169,9 @@ public final class WidgetBugReport extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarTitle(2131894099);
+        setActionBarTitle(R.string.submit_bug);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        getBinding().h.setImageURI(Uri.parse(getMostRecentIntent().getStringExtra("extra_screenshot_uri")));
+        getBinding().h.setImageURI(Uri.parse(getMostRecentIntent().getStringExtra(INTENT_EXTRA_SCREENSHOT_URI)));
         getBinding().b.setOnClickListener(new WidgetBugReport$onViewBound$1(this));
         TextInputLayout textInputLayout = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.bugReportName");
@@ -237,20 +238,20 @@ public final class WidgetBugReport extends AppFragment {
                 ViewExtensions.setText(textInputLayout3, priorityLevels.get(intValue).getTitle());
                 SimpleDraweeView simpleDraweeView = getBinding().g;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.bugReportPriorityIcon");
-                MGImages.setImage$default(simpleDraweeView, getItems().get(intValue).d(), 2131165398, 2131165398, true, null, this.imagesChangeDetector, 32, null);
+                MGImages.setImage$default(simpleDraweeView, getItems().get(intValue).d(), R.dimen.emoji_size, R.dimen.emoji_size, true, null, this.imagesChangeDetector, 32, null);
             }
         } else if (viewState instanceof BugReportViewModel.ViewState.Sending) {
             AppViewFlipper appViewFlipper2 = getBinding().l;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.bugReportSwitchFlipper");
             appViewFlipper2.setDisplayedChild(1);
             StickerView.e(getBinding().i, getViewModel().getSendingSticker(), null, 2);
-            getBinding().j.setText(2131887094);
+            getBinding().j.setText(R.string.bug_report_status_sending);
         } else if (viewState instanceof BugReportViewModel.ViewState.Success) {
             AppViewFlipper appViewFlipper3 = getBinding().l;
             m.checkNotNullExpressionValue(appViewFlipper3, "binding.bugReportSwitchFlipper");
             appViewFlipper3.setDisplayedChild(1);
             StickerView.e(getBinding().i, getViewModel().getSuccessSticker(), null, 2);
-            getBinding().j.setText(2131887095);
+            getBinding().j.setText(R.string.bug_report_status_sent);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser$parse$renderContext$1.java b/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser$parse$renderContext$1.java
index a5d1c74ab4..11761294d9 100644
--- a/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser$parse$renderContext$1.java
+++ b/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser$parse$renderContext$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.changelog;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.utilities.textprocessing.node.UrlNode;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -10,7 +11,7 @@ public final class ChangeLogParser$parse$renderContext$1 implements UrlNode.Rend
     public final /* synthetic */ Context $context;
     public final /* synthetic */ Function3 $onClickListener;
     private final Context context;
-    private final int linkColorAttrResId = 2130968987;
+    private final int linkColorAttrResId = R.attr.colorTextLink;
     private final Function1<String, Unit> onLongPressUrl = new ChangeLogParser$parse$renderContext$1$onLongPressUrl$1(this);
 
     public ChangeLogParser$parse$renderContext$1(Function3 function3, Context context) {
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java
index c71c4f36dc..3c9d1f44d0 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.VideoView;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetChangeLogBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -21,32 +22,32 @@ public final /* synthetic */ class WidgetChangeLog$binding$2 extends k implement
 
     public final WidgetChangeLogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362261;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362261);
+        int i = R.id.change_log_body;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.change_log_body);
         if (linkifiedTextView != null) {
-            i = 2131362262;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362262);
+            i = R.id.change_log_contents;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.change_log_contents);
             if (linearLayout != null) {
-                i = 2131362263;
-                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(2131362263);
+                i = R.id.change_log_facebook;
+                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(R.id.change_log_facebook);
                 if (appCompatImageButton != null) {
-                    i = 2131362264;
-                    AppCompatImageButton appCompatImageButton2 = (AppCompatImageButton) view.findViewById(2131362264);
+                    i = R.id.change_log_instagram;
+                    AppCompatImageButton appCompatImageButton2 = (AppCompatImageButton) view.findViewById(R.id.change_log_instagram);
                     if (appCompatImageButton2 != null) {
-                        i = 2131362265;
-                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362265);
+                        i = R.id.change_log_scrollview;
+                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.change_log_scrollview);
                         if (nestedScrollView != null) {
-                            i = 2131362273;
-                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362273);
+                            i = R.id.change_log_thumbnail;
+                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.change_log_thumbnail);
                             if (simpleDraweeView != null) {
-                                i = 2131362274;
-                                AppCompatImageButton appCompatImageButton3 = (AppCompatImageButton) view.findViewById(2131362274);
+                                i = R.id.change_log_twitter;
+                                AppCompatImageButton appCompatImageButton3 = (AppCompatImageButton) view.findViewById(R.id.change_log_twitter);
                                 if (appCompatImageButton3 != null) {
-                                    i = 2131362275;
-                                    VideoView videoView = (VideoView) view.findViewById(2131362275);
+                                    i = R.id.change_log_video;
+                                    VideoView videoView = (VideoView) view.findViewById(R.id.change_log_video);
                                     if (videoView != null) {
-                                        i = 2131362276;
-                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362276);
+                                        i = R.id.change_log_video_overlay;
+                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.change_log_video_overlay);
                                         if (simpleDraweeView2 != null) {
                                             return new WidgetChangeLogBinding((LinearLayout) view, linkifiedTextView, linearLayout, appCompatImageButton, appCompatImageButton2, nestedScrollView, simpleDraweeView, appCompatImageButton3, videoView, simpleDraweeView2);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java
index bf82a525f0..53e5c96b1d 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.changelog;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.utilities.uri.UriHandler;
 /* compiled from: WidgetChangeLog.kt */
 public final class WidgetChangeLog$configureFooter$1 implements View.OnClickListener {
@@ -12,6 +13,6 @@ public final class WidgetChangeLog$configureFooter$1 implements View.OnClickList
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        UriHandler.handle$default(UriHandler.INSTANCE, this.this$0.requireContext(), this.this$0.getString(2131894413), null, 4, null);
+        UriHandler.handle$default(UriHandler.INSTANCE, this.this$0.requireContext(), this.this$0.getString(R.string.twitter_page_url), null, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java
index dc879bc8f3..5f0e44536f 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java
@@ -11,11 +11,13 @@ import c.a.e.l;
 import c.d.b.a.a;
 import c.f.g.a.a.b;
 import c.f.g.a.a.d;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChangeLogBinding;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.time.ClockFactory;
+import com.discord.utilities.time.TimeUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -31,6 +33,7 @@ import java.util.HashMap;
 import java.util.Map;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: WidgetChangeLog.kt */
 public final class WidgetChangeLog extends AppFragment {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.V(WidgetChangeLog.class, "binding", "getBinding()Lcom/discord/databinding/WidgetChangeLogBinding;", 0)};
@@ -58,19 +61,19 @@ public final class WidgetChangeLog extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "version");
             m.checkNotNullParameter(str2, "revision");
-            m.checkNotNullParameter(str3, "video");
+            m.checkNotNullParameter(str3, MediaStreamTrack.VIDEO_TRACK_KIND);
             m.checkNotNullParameter(str4, "body");
             Bundle bundle = new Bundle();
-            bundle.putString("INTENT_EXTRA_VERSION", str);
-            bundle.putString("INTENT_EXTRA_REVISION", str2);
-            bundle.putString("INTENT_EXTRA_VIDEO", str3);
-            bundle.putString("INTENT_EXTRA_BODY", str4);
+            bundle.putString(WidgetChangeLog.INTENT_EXTRA_VERSION, str);
+            bundle.putString(WidgetChangeLog.INTENT_EXTRA_REVISION, str2);
+            bundle.putString(WidgetChangeLog.INTENT_EXTRA_VIDEO, str3);
+            bundle.putString(WidgetChangeLog.INTENT_EXTRA_BODY, str4);
             l.d(context, WidgetChangeLog.class, new Intent().putExtras(bundle));
         }
     }
 
     public WidgetChangeLog() {
-        super(2131558886);
+        super(R.layout.widget_change_log);
     }
 
     public static final /* synthetic */ WidgetChangeLogBinding access$getBinding$p(WidgetChangeLog widgetChangeLog) {
@@ -144,13 +147,13 @@ public final class WidgetChangeLog extends AppFragment {
     }
 
     private final CharSequence getDateString(Context context) {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VERSION);
         if (stringExtra == null) {
-            stringExtra = getString(2131887257);
+            stringExtra = getString(R.string.change_log_md_date);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)");
         try {
-            Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(stringExtra);
+            Date parse = new SimpleDateFormat(TimeUtils.UTCFormat.SHORT).parse(stringExtra);
             if (parse == null) {
                 parse = new Date();
             }
@@ -184,14 +187,14 @@ public final class WidgetChangeLog extends AppFragment {
     }
 
     private final void track(String str, Map<String, ? extends Object> map, boolean z2) {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VERSION);
         if (stringExtra == null) {
-            stringExtra = getString(2131887257);
+            stringExtra = getString(R.string.change_log_md_date);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)");
-        String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_REVISION");
+        String stringExtra2 = getMostRecentIntent().getStringExtra(INTENT_EXTRA_REVISION);
         if (stringExtra2 == null) {
-            stringExtra2 = getString(2131887259);
+            stringExtra2 = getString(R.string.change_log_md_revision);
         }
         m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…g.change_log_md_revision)");
         HashMap hashMap = new HashMap();
@@ -216,9 +219,9 @@ public final class WidgetChangeLog extends AppFragment {
 
     @Override // androidx.fragment.app.Fragment
     public void onDestroy() {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VERSION);
         if (stringExtra == null) {
-            stringExtra = getString(2131887257);
+            stringExtra = getString(R.string.change_log_md_date);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)");
         StoreStream.Companion.getChangeLog().markSeen(stringExtra);
@@ -243,17 +246,17 @@ public final class WidgetChangeLog extends AppFragment {
         this.openedTimestamp = ClockFactory.get().currentTimeMillis();
         track$default(this, "change_log_opened", null, false, 2, null);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131895096);
+        setActionBarTitle(R.string.whats_new);
         setActionBarSubtitle(getDateString(requireContext()));
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_BODY");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_BODY);
         if (stringExtra == null) {
-            stringExtra = getString(2131887256);
+            stringExtra = getString(R.string.change_log_md_body);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_body)");
         getBinding().b.setDraweeSpanStringBuilder(ChangeLogParser.parse$default(ChangeLogParser.INSTANCE, requireContext(), stringExtra, false, new WidgetChangeLog$onViewBound$1(this), 4, null));
-        String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VIDEO");
+        String stringExtra2 = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VIDEO);
         if (stringExtra2 == null) {
-            stringExtra2 = getString(2131887260);
+            stringExtra2 = getString(R.string.change_log_md_video);
         }
         m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…ring.change_log_md_video)");
         configureMedia(stringExtra2);
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java
index f57a5682d1..0ecf32de18 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import android.widget.VideoView;
 import androidx.cardview.widget.CardView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetChangeLogSpecialBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -24,44 +25,44 @@ public final /* synthetic */ class WidgetChangeLogSpecial$binding$2 extends k im
 
     public final WidgetChangeLogSpecialBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362261;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362261);
+        int i = R.id.change_log_body;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.change_log_body);
         if (linkifiedTextView != null) {
-            i = 2131362266;
-            ImageButton imageButton = (ImageButton) view.findViewById(2131362266);
+            i = R.id.change_log_special_back;
+            ImageButton imageButton = (ImageButton) view.findViewById(R.id.change_log_special_back);
             if (imageButton != null) {
-                i = 2131362267;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362267);
+                i = R.id.change_log_special_button;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.change_log_special_button);
                 if (materialButton != null) {
-                    i = 2131362268;
-                    ImageButton imageButton2 = (ImageButton) view.findViewById(2131362268);
+                    i = R.id.change_log_special_close;
+                    ImageButton imageButton2 = (ImageButton) view.findViewById(R.id.change_log_special_close);
                     if (imageButton2 != null) {
-                        i = 2131362269;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362269);
+                        i = R.id.change_log_special_contents;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.change_log_special_contents);
                         if (linearLayout != null) {
-                            i = 2131362270;
-                            TextView textView = (TextView) view.findViewById(2131362270);
+                            i = R.id.change_log_special_cta_body;
+                            TextView textView = (TextView) view.findViewById(R.id.change_log_special_cta_body);
                             if (textView != null) {
-                                i = 2131362271;
-                                TextView textView2 = (TextView) view.findViewById(2131362271);
+                                i = R.id.change_log_special_date;
+                                TextView textView2 = (TextView) view.findViewById(R.id.change_log_special_date);
                                 if (textView2 != null) {
-                                    i = 2131362272;
-                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362272);
+                                    i = R.id.change_log_special_scrollview;
+                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.change_log_special_scrollview);
                                     if (nestedScrollView != null) {
-                                        i = 2131362273;
-                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362273);
+                                        i = R.id.change_log_thumbnail;
+                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.change_log_thumbnail);
                                         if (simpleDraweeView != null) {
-                                            i = 2131362275;
-                                            VideoView videoView = (VideoView) view.findViewById(2131362275);
+                                            i = R.id.change_log_video;
+                                            VideoView videoView = (VideoView) view.findViewById(R.id.change_log_video);
                                             if (videoView != null) {
-                                                i = 2131362276;
-                                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362276);
+                                                i = R.id.change_log_video_overlay;
+                                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.change_log_video_overlay);
                                                 if (simpleDraweeView2 != null) {
-                                                    i = 2131362282;
-                                                    CardView cardView = (CardView) view.findViewById(2131362282);
+                                                    i = R.id.changelog_special_header_container;
+                                                    CardView cardView = (CardView) view.findViewById(R.id.changelog_special_header_container);
                                                     if (cardView != null) {
-                                                        i = 2131362283;
-                                                        CardView cardView2 = (CardView) view.findViewById(2131362283);
+                                                        i = R.id.changelog_special_video;
+                                                        CardView cardView2 = (CardView) view.findViewById(R.id.changelog_special_video);
                                                         if (cardView2 != null) {
                                                             return new WidgetChangeLogSpecialBinding((LinearLayout) view, linkifiedTextView, imageButton, materialButton, imageButton2, linearLayout, textView, textView2, nestedScrollView, simpleDraweeView, videoView, simpleDraweeView2, cardView, cardView2);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java
index 5a62eab157..f03016b1fa 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java
@@ -17,12 +17,14 @@ import c.a.e.l;
 import c.d.b.a.a;
 import c.f.g.a.a.b;
 import c.f.g.a.a.d;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChangeLogSpecialBinding;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.utilities.time.ClockFactory;
+import com.discord.utilities.time.TimeUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -40,6 +42,7 @@ import java.util.Map;
 import java.util.Objects;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: WidgetChangeLogSpecial.kt */
 public final class WidgetChangeLogSpecial extends AppFragment {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.V(WidgetChangeLogSpecial.class, "binding", "getBinding()Lcom/discord/databinding/WidgetChangeLogSpecialBinding;", 0)};
@@ -80,22 +83,22 @@ public final class WidgetChangeLogSpecial extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "version");
             m.checkNotNullParameter(str2, "revision");
-            m.checkNotNullParameter(str3, "video");
+            m.checkNotNullParameter(str3, MediaStreamTrack.VIDEO_TRACK_KIND);
             m.checkNotNullParameter(str4, "body");
             m.checkNotNullParameter(exitStyle, "exitStyle");
             Bundle bundle = new Bundle();
-            bundle.putSerializable("INTENT_EXTRA_EXIT_STYLE", exitStyle);
-            bundle.putString("INTENT_EXTRA_VERSION", str);
-            bundle.putString("INTENT_EXTRA_REVISION", str2);
-            bundle.putString("INTENT_EXTRA_VIDEO", str3);
-            bundle.putString("INTENT_EXTRA_BODY", str4);
-            bundle.putBoolean("INTENT_EXTRA_HIDE_VIDEO", z2);
+            bundle.putSerializable(WidgetChangeLogSpecial.INTENT_EXTRA_EXIT_STYLE, exitStyle);
+            bundle.putString(WidgetChangeLogSpecial.INTENT_EXTRA_VERSION, str);
+            bundle.putString(WidgetChangeLogSpecial.INTENT_EXTRA_REVISION, str2);
+            bundle.putString(WidgetChangeLogSpecial.INTENT_EXTRA_VIDEO, str3);
+            bundle.putString(WidgetChangeLogSpecial.INTENT_EXTRA_BODY, str4);
+            bundle.putBoolean(WidgetChangeLogSpecial.INTENT_EXTRA_HIDE_VIDEO, z2);
             l.d(context, WidgetChangeLogSpecial.class, new Intent().putExtras(bundle));
         }
     }
 
     public WidgetChangeLogSpecial() {
-        super(2131558887);
+        super(R.layout.widget_change_log_special);
     }
 
     public static final /* synthetic */ WidgetChangeLogSpecialBinding access$getBinding$p(WidgetChangeLogSpecial widgetChangeLogSpecial) {
@@ -163,13 +166,13 @@ public final class WidgetChangeLogSpecial extends AppFragment {
     }
 
     private final CharSequence getDateString(Context context) {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VERSION);
         if (stringExtra == null) {
-            stringExtra = getString(2131887257);
+            stringExtra = getString(R.string.change_log_md_date);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)");
         try {
-            Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(stringExtra);
+            Date parse = new SimpleDateFormat(TimeUtils.UTCFormat.SHORT).parse(stringExtra);
             if (parse == null) {
                 parse = new Date();
             }
@@ -201,14 +204,14 @@ public final class WidgetChangeLogSpecial extends AppFragment {
     }
 
     private final void track(String str, Map<String, ? extends Object> map, boolean z2) {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VERSION);
         if (stringExtra == null) {
-            stringExtra = getString(2131887257);
+            stringExtra = getString(R.string.change_log_md_date);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)");
-        String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_REVISION");
+        String stringExtra2 = getMostRecentIntent().getStringExtra(INTENT_EXTRA_REVISION);
         if (stringExtra2 == null) {
-            stringExtra2 = getString(2131887259);
+            stringExtra2 = getString(R.string.change_log_md_revision);
         }
         m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…g.change_log_md_revision)");
         HashMap hashMap = new HashMap();
@@ -233,9 +236,9 @@ public final class WidgetChangeLogSpecial extends AppFragment {
 
     @Override // androidx.fragment.app.Fragment
     public void onDestroy() {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VERSION);
         if (stringExtra == null) {
-            stringExtra = getString(2131887257);
+            stringExtra = getString(R.string.change_log_md_date);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)");
         StoreStream.Companion.getChangeLog().markSeen(stringExtra);
@@ -260,12 +263,12 @@ public final class WidgetChangeLogSpecial extends AppFragment {
         this.openedTimestamp = ClockFactory.get().currentTimeMillis();
         track$default(this, "change_log_opened", null, false, 2, null);
         setActionBarSubtitle(getDateString(requireContext()));
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_BODY");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_BODY);
         if (stringExtra == null) {
-            stringExtra = getString(2131887256);
+            stringExtra = getString(R.string.change_log_md_body);
         }
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_body)");
-        if (getMostRecentIntent().getSerializableExtra("INTENT_EXTRA_EXIT_STYLE") == Companion.ExitStyle.BACK) {
+        if (getMostRecentIntent().getSerializableExtra(INTENT_EXTRA_EXIT_STYLE) == Companion.ExitStyle.BACK) {
             ImageButton imageButton = getBinding().e;
             m.checkNotNullExpressionValue(imageButton, "binding.changeLogSpecialClose");
             imageButton.setVisibility(8);
@@ -277,9 +280,9 @@ public final class WidgetChangeLogSpecial extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.changeLogSpecialDate");
         textView.setText(getDateString(requireContext()));
         getBinding().b.setDraweeSpanStringBuilder(ChangeLogParser.INSTANCE.parse(requireContext(), stringExtra, true, new WidgetChangeLogSpecial$onViewBound$1(this)));
-        String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VIDEO");
+        String stringExtra2 = getMostRecentIntent().getStringExtra(INTENT_EXTRA_VIDEO);
         if (stringExtra2 == null) {
-            stringExtra2 = getString(2131887260);
+            stringExtra2 = getString(R.string.change_log_md_video);
         }
         m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…ring.change_log_md_video)");
         configureMedia(stringExtra2);
@@ -287,12 +290,12 @@ public final class WidgetChangeLogSpecial extends AppFragment {
         getBinding().e.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$3(this));
         LinkifiedTextView linkifiedTextView = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.changeLogBody");
-        c.a.l.b.n(linkifiedTextView, 2131887276, new Object[0], null, 4);
+        c.a.l.b.n(linkifiedTextView, R.string.changelog_stickers_cta_body, new Object[0], null, 4);
         LinkifiedTextView linkifiedTextView2 = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.changeLogBody");
         linkifiedTextView2.setMovementMethod(LinkMovementMethod.getInstance());
         getBinding().d.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$4(this));
-        if (getMostRecentIntent().getBooleanExtra("INTENT_EXTRA_HIDE_VIDEO", false)) {
+        if (getMostRecentIntent().getBooleanExtra(INTENT_EXTRA_HIDE_VIDEO, false)) {
             VideoView videoView = getBinding().i;
             m.checkNotNullExpressionValue(videoView, "binding.changeLogVideo");
             videoView.setVisibility(8);
diff --git a/app/src/main/java/com/discord/widgets/channels/ChannelPickerViewHolder.java b/app/src/main/java/com/discord/widgets/channels/ChannelPickerViewHolder.java
index 188712b889..fe8254884b 100644
--- a/app/src/main/java/com/discord/widgets/channels/ChannelPickerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/channels/ChannelPickerViewHolder.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.databinding.ViewGuildRoleSubscriptionChannelItemBinding;
 import com.discord.utilities.channel.GuildChannelIconUtilsKt;
 import com.discord.utilities.color.ColorCompat;
@@ -109,14 +110,14 @@ public abstract class ChannelPickerViewHolder extends RecyclerView.ViewHolder {
             LinearLayout linearLayout = viewGuildRoleSubscriptionChannelItemBinding.a;
             m.checkNotNullExpressionValue(linearLayout, "binding.root");
             Drawable drawable = null;
-            viewGuildRoleSubscriptionChannelItemBinding.b.setText(2131889493);
+            viewGuildRoleSubscriptionChannelItemBinding.b.setText(R.string.guild_role_subscription_tier_benefits_create_a_channel_label);
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            int themedColor = ColorCompat.getThemedColor(view, 2130968987);
+            int themedColor = ColorCompat.getThemedColor(view, (int) R.attr.colorTextLink);
             viewGuildRoleSubscriptionChannelItemBinding.b.setTextColor(themedColor);
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            Drawable drawable2 = ContextCompat.getDrawable(view2.getContext(), 2131231397);
+            Drawable drawable2 = ContextCompat.getDrawable(view2.getContext(), R.drawable.ic_add_24dp);
             if (drawable2 != null) {
                 m.checkNotNullExpressionValue(drawable2, "drawable");
                 ColorCompatKt.setTint(drawable2, themedColor, false);
diff --git a/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java b/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java
index 9701dcdf82..1411ed86ff 100644
--- a/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.SimpleMemberListItemBinding;
 import com.discord.models.user.User;
 import com.discord.utilities.icon.IconUtils;
@@ -28,14 +29,14 @@ public final class SimpleMembersAdapter extends MGRecyclerAdapterSimple<MemberIt
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public MemberAdapterItem(SimpleMembersAdapter simpleMembersAdapter) {
-            super(2131558673, simpleMembersAdapter);
+            super((int) R.layout.simple_member_list_item, simpleMembersAdapter);
             m.checkNotNullParameter(simpleMembersAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364032;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364032);
+            int i = R.id.member_list_item_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.member_list_item_avatar);
             if (simpleDraweeView != null) {
-                i = 2131364035;
-                TextView textView = (TextView) view.findViewById(2131364035);
+                i = R.id.member_list_item_name;
+                TextView textView = (TextView) view.findViewById(R.id.member_list_item_name);
                 if (textView != null) {
                     SimpleMemberListItemBinding simpleMemberListItemBinding = new SimpleMemberListItemBinding((LinearLayout) view, simpleDraweeView, textView);
                     m.checkNotNullExpressionValue(simpleMemberListItemBinding, "SimpleMemberListItemBinding.bind(itemView)");
@@ -59,7 +60,7 @@ public final class SimpleMembersAdapter extends MGRecyclerAdapterSimple<MemberIt
             this.binding.a.setOnClickListener(new SimpleMembersAdapter$MemberAdapterItem$onConfigure$1(this, memberItem));
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.memberListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, memberItem.getUser(), 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, memberItem.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java b/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java
index ab8d02a05f..8792a19b6f 100644
--- a/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.databinding.SimpleRoleListItemBinding;
 import com.discord.utilities.guilds.RoleUtils;
@@ -28,7 +29,7 @@ public final class SimpleRolesAdapter extends MGRecyclerAdapterSimple<RoleItem>
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RoleAdapterItem(SimpleRolesAdapter simpleRolesAdapter) {
-            super(2131558674, simpleRolesAdapter);
+            super((int) R.layout.simple_role_list_item, simpleRolesAdapter);
             m.checkNotNullParameter(simpleRolesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
diff --git a/app/src/main/java/com/discord/widgets/channels/ThreadOnboardingManager.java b/app/src/main/java/com/discord/widgets/channels/ThreadOnboardingManager.java
index 75751a5781..b71d24a669 100644
--- a/app/src/main/java/com/discord/widgets/channels/ThreadOnboardingManager.java
+++ b/app/src/main/java/com/discord/widgets/channels/ThreadOnboardingManager.java
@@ -1,7 +1,9 @@
 package com.discord.widgets.channels;
 
+import androidx.recyclerview.widget.RecyclerView;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.threads.ThreadUtils;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
@@ -20,7 +22,7 @@ public final class ThreadOnboardingManager {
     }
 
     private final boolean isTooYoung(long j) {
-        long j2 = (j >>> 22) + 1420070400000L;
+        long j2 = (j >>> 22) + SnowflakeUtils.DISCORD_EPOCH;
         Date parse = new SimpleDateFormat("dd-MM-yyyy", Locale.US).parse("30-06-2021");
         return this.clock.currentTimeMillis() < 604800000 + j2 && parse != null && j2 < parse.getTime();
     }
@@ -38,6 +40,6 @@ public final class ThreadOnboardingManager {
     }
 
     public final void show() {
-        StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("NOTICE_NAME_THREAD_ONBOARDED", null, 0, 0, true, m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, Long.MAX_VALUE, ThreadOnboardingManager$show$threadOnboardingNotice$1.INSTANCE, 134, null));
+        StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("NOTICE_NAME_THREAD_ONBOARDED", null, 0, 0, true, m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, RecyclerView.FOREVER_NS, ThreadOnboardingManager$show$threadOnboardingNotice$1.INSTANCE, 134, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java
index c05017e2e4..a57e49f97b 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelOnboardingBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetChannelOnboarding$binding$2 extends k i
 
     public final WidgetChannelOnboardingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362284);
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.channel_actions_view);
         if (materialButton != null) {
             return new WidgetChannelOnboardingBinding((LinearLayout) view, materialButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362284)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.channel_actions_view)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java
index a6256cb189..5fc4a0c6ec 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetChannelOnboardingBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -43,7 +44,7 @@ public final class WidgetChannelOnboarding extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558898;
+        return R.layout.widget_channel_onboarding;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet$binding$2.java
index 5d59f411b4..82a0ff8c02 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetChannelPickerSheetBinding;
 import com.discord.views.SearchInputView;
@@ -21,20 +22,20 @@ public final /* synthetic */ class WidgetChannelPickerBottomSheet$binding$2 exte
 
     public final WidgetChannelPickerSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362353;
-        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131362353);
+        int i = R.id.channel_picker_app_bar;
+        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.channel_picker_app_bar);
         if (appBarLayout != null) {
-            i = 2131362354;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362354);
+            i = R.id.channel_picker_app_flipper;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.channel_picker_app_flipper);
             if (appViewFlipper != null) {
-                i = 2131362355;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362355);
+                i = R.id.channel_picker_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.channel_picker_recycler);
                 if (recyclerView != null) {
-                    i = 2131362356;
-                    SearchInputView searchInputView = (SearchInputView) view.findViewById(2131362356);
+                    i = R.id.channel_picker_search_input;
+                    SearchInputView searchInputView = (SearchInputView) view.findViewById(R.id.channel_picker_search_input);
                     if (searchInputView != null) {
-                        i = 2131362357;
-                        Toolbar toolbar = (Toolbar) view.findViewById(2131362357);
+                        i = R.id.channel_picker_toolbar;
+                        Toolbar toolbar = (Toolbar) view.findViewById(R.id.channel_picker_toolbar);
                         if (toolbar != null) {
                             return new WidgetChannelPickerSheetBinding((CoordinatorLayout) view, appBarLayout, appViewFlipper, recyclerView, searchInputView, toolbar);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet.java
index 96ee549a60..efa442b82f 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetChannelPickerSheetBinding;
@@ -84,9 +85,9 @@ public final class WidgetChannelPickerBottomSheet extends AppBottomSheet {
             m.checkNotNullParameter(str, "requestKey");
             WidgetChannelPickerBottomSheet widgetChannelPickerBottomSheet = new WidgetChannelPickerBottomSheet();
             Bundle bundle = new Bundle();
-            bundle.putString("INTENT_EXTRA_REQUEST_CODE", str);
+            bundle.putString(WidgetChannelPickerBottomSheet.ARG_REQUEST_KEY, str);
             if (l != null) {
-                bundle.putLong("ARG_SELECTED_CHANNEL_ID", l.longValue());
+                bundle.putLong(WidgetChannelPickerBottomSheet.ARG_SELECTED_CHANNEL_ID, l.longValue());
             }
             widgetChannelPickerBottomSheet.setArguments(bundle);
             FragmentManager parentFragmentManager = fragment.getParentFragmentManager();
@@ -195,7 +196,7 @@ public final class WidgetChannelPickerBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558899;
+        return R.layout.widget_channel_picker_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java
index 0807d629ef..a01490b93a 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelSelectorBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetChannelSelector$binding$2 extends k imp
 
     public final WidgetChannelSelectorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362359;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362359);
+        int i = R.id.channel_selector_list;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.channel_selector_list);
         if (recyclerView != null) {
-            i = 2131363438;
-            TextView textView = (TextView) view.findViewById(2131363438);
+            i = R.id.guild_actions_overview_header_tv;
+            TextView textView = (TextView) view.findViewById(R.id.guild_actions_overview_header_tv);
             if (textView != null) {
                 return new WidgetChannelSelectorBinding((NestedScrollView) view, recyclerView, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
index 7cb5ca55d4..3d1a69d0bd 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetChannelSelectorBinding;
@@ -107,7 +108,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
                 m.checkNotNullExpressionValue(view, "itemView");
                 Channel channel2 = item.getChannel();
                 Integer valueOf = channel2 != null ? Integer.valueOf(channel2.A()) : null;
-                int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(view, (valueOf != null && valueOf.intValue() == 2) ? 2130969482 : (valueOf != null && valueOf.intValue() == 13) ? 2130969394 : (valueOf != null && valueOf.intValue() == 0) ? 2130969395 : 0, 0, 2, (Object) null);
+                int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(view, (valueOf != null && valueOf.intValue() == 2) ? R.attr.ic_volume_up : (valueOf != null && valueOf.intValue() == 13) ? R.attr.ic_channel_stage : (valueOf != null && valueOf.intValue() == 0) ? R.attr.ic_channel_text : 0, 0, 2, (Object) null);
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.itemName");
                 DrawableCompat.setCompoundDrawablesCompat$default(textView3, themedDrawableRes$default, 0, 0, 0, 14, (Object) null);
@@ -130,7 +131,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public ItemChannel onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ItemChannel(2131558904, this, this.noChannelStringId);
+            return new ItemChannel(R.layout.widget_channel_selector_item, this, this.noChannelStringId);
         }
     }
 
@@ -157,19 +158,19 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         }
 
         public static /* synthetic */ void launchForInactiveStages$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForInactiveStages(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891780 : i);
+            companion.launchForInactiveStages(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? R.string.none : i);
         }
 
         public static /* synthetic */ void launchForText$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForText(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891780 : i);
+            companion.launchForText(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? R.string.none : i);
         }
 
         public static /* synthetic */ void launchForVocal$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForVocal(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891780 : i);
+            companion.launchForVocal(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? R.string.none : i);
         }
 
         public static /* synthetic */ void launchForVoice$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForVoice(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891780 : i);
+            companion.launchForVoice(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? R.string.none : i);
         }
 
         public static /* synthetic */ void registerForResult$default(Companion companion, Fragment fragment, String str, boolean z2, Function2 function2, int i, Object obj) {
@@ -184,11 +185,11 @@ public final class WidgetChannelSelector extends AppBottomSheet {
             m.checkNotNullParameter(str, "requestKey");
             WidgetChannelSelector widgetChannelSelector = new WidgetChannelSelector();
             Bundle bundle = new Bundle();
-            bundle.putString("INTENT_EXTRA_REQUEST_CODE", str);
+            bundle.putString(WidgetChannelSelector.ARG_REQUEST_KEY, str);
             bundle.putLong("INTENT_EXTRA_GUILD_ID", j);
-            bundle.putBoolean("INTENT_EXTRA_INCLUDE_NO_CHANNEL", z2);
-            bundle.putInt("INTENT_EXTRA_NO_CHANNEL_STRING_ID", i);
-            bundle.putSerializable("INTENT_EXTRA_FILTER_FUNCTION", filterFunction);
+            bundle.putBoolean(WidgetChannelSelector.ARG_INCLUDE_NO_CHANNEL, z2);
+            bundle.putInt(WidgetChannelSelector.ARG_NO_CHANNEL_STRING_ID, i);
+            bundle.putSerializable(WidgetChannelSelector.ARG_FILTER_FUNCTION, filterFunction);
             widgetChannelSelector.setArguments(bundle);
             FragmentManager parentFragmentManager = fragment.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "fragment.parentFragmentManager");
@@ -476,8 +477,8 @@ public final class WidgetChannelSelector extends AppBottomSheet {
     private final void onChannelSelected(Channel channel) {
         String requestCode = getRequestCode();
         Bundle bundle = new Bundle();
-        bundle.putLong("INTENT_EXTRA_CHANNEL_ID", channel != null ? channel.h() : -1);
-        bundle.putString("INTENT_EXTRA_CHANNEL_NAME", channel != null ? AnimatableValueParser.y0(channel) : null);
+        bundle.putLong(RESULT_EXTRA_CHANNEL_ID, channel != null ? channel.h() : -1);
+        bundle.putString(RESULT_EXTRA_CHANNEL_NAME, channel != null ? AnimatableValueParser.y0(channel) : null);
         FragmentKt.setFragmentResult(this, requestCode, bundle);
         dismiss();
     }
@@ -488,8 +489,8 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         super.bindSubscriptions(compositeSubscription);
         Model.Companion companion = Model.Companion;
         long j = getArgumentsOrDefault().getLong("INTENT_EXTRA_GUILD_ID", -1);
-        boolean z2 = getArgumentsOrDefault().getBoolean("INTENT_EXTRA_INCLUDE_NO_CHANNEL", false);
-        Serializable serializable = getArgumentsOrDefault().getSerializable("INTENT_EXTRA_FILTER_FUNCTION");
+        boolean z2 = getArgumentsOrDefault().getBoolean(ARG_INCLUDE_NO_CHANNEL, false);
+        Serializable serializable = getArgumentsOrDefault().getSerializable(ARG_FILTER_FUNCTION);
         if (!(serializable instanceof FilterFunction)) {
             serializable = null;
         }
@@ -507,7 +508,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558903;
+        return R.layout.widget_channel_selector;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -517,6 +518,6 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.channelSelectorList");
-        this.adapter = (Adapter) companion.configure(new Adapter(recyclerView, this, getArgumentsOrDefault().getInt("INTENT_EXTRA_NO_CHANNEL_STRING_ID")));
+        this.adapter = (Adapter) companion.configure(new Adapter(recyclerView, this, getArgumentsOrDefault().getInt(ARG_NO_CHANNEL_STRING_ID)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java
index da4ce1685f..97a4e1b2ff 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels;
 
 import android.view.View;
 import android.widget.FrameLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelSidebarActionsBinding;
 import com.discord.views.channelsidebar.GuildChannelSideBarActionsView;
 import com.discord.views.channelsidebar.PrivateChannelSideBarActionsView;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetChannelSidebarActions$binding$2 extends
 
     public final WidgetChannelSidebarActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365873;
-        GuildChannelSideBarActionsView guildChannelSideBarActionsView = (GuildChannelSideBarActionsView) view.findViewById(2131365873);
+        int i = R.id.widget_channel_sidebar_actions_guild_view;
+        GuildChannelSideBarActionsView guildChannelSideBarActionsView = (GuildChannelSideBarActionsView) view.findViewById(R.id.widget_channel_sidebar_actions_guild_view);
         if (guildChannelSideBarActionsView != null) {
-            i = 2131365874;
-            PrivateChannelSideBarActionsView privateChannelSideBarActionsView = (PrivateChannelSideBarActionsView) view.findViewById(2131365874);
+            i = R.id.widget_channel_sidebar_actions_private_view;
+            PrivateChannelSideBarActionsView privateChannelSideBarActionsView = (PrivateChannelSideBarActionsView) view.findViewById(R.id.widget_channel_sidebar_actions_private_view);
             if (privateChannelSideBarActionsView != null) {
                 return new WidgetChannelSidebarActionsBinding((FrameLayout) view, guildChannelSideBarActionsView, privateChannelSideBarActionsView);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java
index 414d123cd4..32dec53253 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChannelSidebarActionsBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -31,7 +32,7 @@ public final class WidgetChannelSidebarActions extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetChannelSidebarActions() {
-        super(2131558916);
+        super(R.layout.widget_channel_sidebar_actions);
         WidgetChannelSidebarActions$viewModel$2 widgetChannelSidebarActions$viewModel$2 = WidgetChannelSidebarActions$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelSidebarActionsViewModel.class), new WidgetChannelSidebarActions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelSidebarActions$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java
index 14c9edc311..dbfc4f2341 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelTopicBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -21,20 +22,20 @@ public final /* synthetic */ class WidgetChannelTopic$binding$2 extends k implem
     public final WidgetChannelTopicBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         LinearLayout linearLayout = (LinearLayout) view;
-        int i = 2131362400;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362400);
+        int i = R.id.channel_topic_channel_icon;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channel_topic_channel_icon);
         if (simpleDraweeView != null) {
-            i = 2131362401;
-            ImageView imageView = (ImageView) view.findViewById(2131362401);
+            i = R.id.channel_topic_ellipsis;
+            ImageView imageView = (ImageView) view.findViewById(R.id.channel_topic_ellipsis);
             if (imageView != null) {
-                i = 2131362402;
-                ImageView imageView2 = (ImageView) view.findViewById(2131362402);
+                i = R.id.channel_topic_more_icon;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.channel_topic_more_icon);
                 if (imageView2 != null) {
-                    i = 2131362403;
-                    TextView textView = (TextView) view.findViewById(2131362403);
+                    i = R.id.channel_topic_name;
+                    TextView textView = (TextView) view.findViewById(R.id.channel_topic_name);
                     if (textView != null) {
-                        i = 2131362404;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362404);
+                        i = R.id.channel_topic_title;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.channel_topic_title);
                         if (linkifiedTextView != null) {
                             return new WidgetChannelTopicBinding((LinearLayout) view, linearLayout, simpleDraweeView, imageView, imageView2, textView, linkifiedTextView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.java
index b9e9c6a6a4..9d813ef434 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$onViewBoundOrOnResume$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.channels.WidgetChannelTopicViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetChannelTopic$onViewBoundOrOnResume$1 extends o implemen
     }
 
     public final void invoke(WidgetChannelTopicViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetChannelTopic.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java
index bfcc6f1899..563b0af646 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java
@@ -5,6 +5,7 @@ import android.view.MenuItem;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import d0.t.g0;
 import d0.z.d.m;
@@ -54,7 +55,7 @@ public final class WidgetChannelTopic$showContextMenu$4 implements MenuItem.OnMe
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this.this$0, 2131891098, new Object[]{this.$channelTitle}, null, 4), b.k(this.this$0, 2131891095, new Object[]{this.$channelTitle}, null, 4), b.k(this.this$0, 2131891094, new Object[0], null, 4), b.k(this.this$0, 2131887193, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364252, new AnonymousClass1(this))), null, null, null, 2130969796, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this.this$0, R.string.leave_group_dm_title, new Object[]{this.$channelTitle}, null, 4), b.k(this.this$0, R.string.leave_group_dm_body, new Object[]{this.$channelTitle}, null, 4), b.k(this.this$0, R.string.leave_group_dm, new Object[0], null, 4), b.k(this.this$0, R.string.cancel, new Object[0], null, 4), g0.mapOf(d0.o.to(Integer.valueOf((int) R.id.notice_ok), new AnonymousClass1(this))), null, null, null, Integer.valueOf((int) R.attr.notice_theme_positive_red), null, null, 0, null, 15808, null);
         return true;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java
index 95bff502e6..982c878edf 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java
@@ -18,6 +18,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChannelTopicBinding;
@@ -35,6 +36,7 @@ import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.widgets.channels.WidgetChannelTopicViewModel;
 import com.facebook.drawee.span.DraweeSpanStringBuilder;
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.badge.BadgeDrawable;
 import d0.t.u;
 import d0.z.d.a0;
 import d0.z.d.m;
@@ -160,7 +162,7 @@ public final class WidgetChannelTopic extends AppFragment {
     }
 
     public WidgetChannelTopic() {
-        super(2131558917);
+        super(R.layout.widget_channel_topic);
         WidgetChannelTopic$viewModel$2 widgetChannelTopic$viewModel$2 = WidgetChannelTopic$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelTopicViewModel.class), new WidgetChannelTopic$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelTopic$viewModel$2));
@@ -264,7 +266,7 @@ public final class WidgetChannelTopic extends AppFragment {
             ImageView imageView3 = getBinding().d;
             m.checkNotNullExpressionValue(imageView3, "binding.channelTopicMoreIcon");
             imageView3.setVisibility(0);
-            setChannelIcon(2131231599);
+            setChannelIcon(R.drawable.ic_direct_message_header);
             renderedTopic = getRenderedTopicForDM((WidgetChannelTopicViewModel.ViewState.DM) viewState);
         } else if (viewState instanceof WidgetChannelTopicViewModel.ViewState.GDM) {
             View view4 = getView();
@@ -318,7 +320,7 @@ public final class WidgetChannelTopic extends AppFragment {
     private final RenderedTopic getRenderedTopicForDM(WidgetChannelTopicViewModel.ViewState.DM dm) {
         String str;
         if (!dm.getRecipientNicknames().isEmpty()) {
-            String string = requireContext().getString(2131886340);
+            String string = requireContext().getString(R.string.aka);
             m.checkNotNullExpressionValue(string, "requireContext().getString(R.string.aka)");
             String joinToString$default = u.joinToString$default(dm.getRecipientNicknames(), ", ", null, null, 0, null, null, 62, null);
             SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(string + ' ' + joinToString$default);
@@ -391,7 +393,7 @@ public final class WidgetChannelTopic extends AppFragment {
     private final void setChannelIconForGDM(Channel channel) {
         SimpleDraweeView simpleDraweeView = getBinding().b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.channelTopicChannelIcon");
-        IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForChannel$default(channel, null, 2, null), 2131165290, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForChannel$default(channel, null, 2, null), (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         SimpleDraweeView simpleDraweeView2 = getBinding().b;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.channelTopicChannelIcon");
         ViewGroup.LayoutParams layoutParams = simpleDraweeView2.getLayoutParams();
@@ -403,23 +405,23 @@ public final class WidgetChannelTopic extends AppFragment {
     private final void showContextMenu(boolean z2, long j, CharSequence charSequence, boolean z3) {
         ImageView imageView = getBinding().d;
         m.checkNotNullExpressionValue(imageView, "binding.channelTopicMoreIcon");
-        PopupMenu popupMenu = new PopupMenu(imageView.getContext(), getBinding().d, 8388691);
-        popupMenu.inflate(2131623958);
-        popupMenu.getMenu().findItem(2131364111).setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$1(this, j));
-        MenuItem findItem = popupMenu.getMenu().findItem(2131364109);
+        PopupMenu popupMenu = new PopupMenu(imageView.getContext(), getBinding().d, BadgeDrawable.BOTTOM_START);
+        popupMenu.inflate(R.menu.menu_private_channel_sidebar);
+        popupMenu.getMenu().findItem(R.id.menu_private_channel_sidebar_pinned_messages).setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$1(this, j));
+        MenuItem findItem = popupMenu.getMenu().findItem(R.id.menu_private_channel_sidebar_copy_id);
         m.checkNotNullExpressionValue(findItem, "copyChannelIdAction");
         findItem.setVisible(z3);
         findItem.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$2(this, j));
-        MenuItem findItem2 = popupMenu.getMenu().findItem(2131364110);
+        MenuItem findItem2 = popupMenu.getMenu().findItem(R.id.menu_private_channel_sidebar_customize_gorup);
         m.checkNotNullExpressionValue(findItem2, "customizeGroupAction");
         findItem2.setVisible(z2);
         findItem2.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$3(this, j));
-        MenuItem findItem3 = popupMenu.getMenu().findItem(2131364108);
+        MenuItem findItem3 = popupMenu.getMenu().findItem(R.id.menu_private_channel_sidebar_close);
         if (z2) {
-            findItem3.setTitle(2131891094);
+            findItem3.setTitle(R.string.leave_group_dm);
             findItem3.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$4(this, charSequence));
         } else {
-            findItem3.setTitle(2131887412);
+            findItem3.setTitle(R.string.close_dm);
             findItem3.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$5(this));
         }
         popupMenu.show();
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$Model$Companion$get$1.java
index a8de2d23f4..79528cf3cd 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$Model$Companion$get$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.channels;
 
 import com.discord.api.guild.GuildFeature;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
@@ -20,7 +21,7 @@ public final class WidgetCreateChannel$Model$Companion$get$1<T1, T2, T3, T4, T5,
         }
         boolean canAndIsElevated = PermissionUtils.canAndIsElevated(16, Long.valueOf(l2 != null ? l2.longValue() : l.longValue()), meUser.getMfaEnabled(), guild.getMfaLevel());
         boolean contains = guild.getFeatures().contains(GuildFeature.COMMUNITY);
-        boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(268435456, Long.valueOf(l2 != null ? l2.longValue() : l.longValue()), meUser.getMfaEnabled(), guild.getMfaLevel());
+        boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, Long.valueOf(l2 != null ? l2.longValue() : l.longValue()), meUser.getMfaEnabled(), guild.getMfaLevel());
         ArrayList arrayList = new ArrayList();
         for (GuildRole guildRole : list) {
             SingleTypePayload singleTypePayload = guildRole.getId() != guild.getId() ? new SingleTypePayload(guildRole, String.valueOf(guildRole.getId()), 0) : null;
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java
index 5fa981b7f6..8f5067c0f4 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java
@@ -10,6 +10,7 @@ import androidx.appcompat.widget.SwitchCompat;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetCreateChannelBinding;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.k;
@@ -25,80 +26,80 @@ public final /* synthetic */ class WidgetCreateChannel$binding$2 extends k imple
 
     public final WidgetCreateChannelBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362832;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362832);
+        int i = R.id.create_channel_announcements_container;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.create_channel_announcements_container);
         if (constraintLayout != null) {
-            i = 2131362833;
-            ImageView imageView = (ImageView) view.findViewById(2131362833);
+            i = R.id.create_channel_announcements_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.create_channel_announcements_icon);
             if (imageView != null) {
-                i = 2131362834;
-                RadioButton radioButton = (RadioButton) view.findViewById(2131362834);
+                i = R.id.create_channel_announcements_radio;
+                RadioButton radioButton = (RadioButton) view.findViewById(R.id.create_channel_announcements_radio);
                 if (radioButton != null) {
-                    i = 2131362835;
-                    TextView textView = (TextView) view.findViewById(2131362835);
+                    i = R.id.create_channel_announcements_title;
+                    TextView textView = (TextView) view.findViewById(R.id.create_channel_announcements_title);
                     if (textView != null) {
-                        i = 2131362837;
-                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362837);
+                        i = R.id.create_channel_name_layout;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.create_channel_name_layout);
                         if (textInputLayout != null) {
-                            i = 2131362838;
-                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362838);
+                            i = R.id.create_channel_private_container;
+                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.create_channel_private_container);
                             if (relativeLayout != null) {
-                                i = 2131362839;
-                                TextView textView2 = (TextView) view.findViewById(2131362839);
+                                i = R.id.create_channel_private_info;
+                                TextView textView2 = (TextView) view.findViewById(R.id.create_channel_private_info);
                                 if (textView2 != null) {
-                                    i = 2131362840;
-                                    SwitchCompat switchCompat = (SwitchCompat) view.findViewById(2131362840);
+                                    i = R.id.create_channel_private_switch;
+                                    SwitchCompat switchCompat = (SwitchCompat) view.findViewById(R.id.create_channel_private_switch);
                                     if (switchCompat != null) {
-                                        i = 2131362841;
-                                        TextView textView3 = (TextView) view.findViewById(2131362841);
+                                        i = R.id.create_channel_private_title;
+                                        TextView textView3 = (TextView) view.findViewById(R.id.create_channel_private_title);
                                         if (textView3 != null) {
-                                            i = 2131362842;
-                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362842);
+                                            i = R.id.create_channel_role_access_recycler;
+                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.create_channel_role_access_recycler);
                                             if (recyclerView != null) {
-                                                i = 2131362843;
-                                                View findViewById = view.findViewById(2131362843);
+                                                i = R.id.create_channel_role_divider;
+                                                View findViewById = view.findViewById(R.id.create_channel_role_divider);
                                                 if (findViewById != null) {
-                                                    i = 2131362844;
-                                                    TextView textView4 = (TextView) view.findViewById(2131362844);
+                                                    i = R.id.create_channel_role_header;
+                                                    TextView textView4 = (TextView) view.findViewById(R.id.create_channel_role_header);
                                                     if (textView4 != null) {
-                                                        i = 2131362845;
-                                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131362845);
+                                                        i = R.id.create_channel_stage_container;
+                                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(R.id.create_channel_stage_container);
                                                         if (constraintLayout2 != null) {
-                                                            i = 2131362846;
-                                                            ImageView imageView2 = (ImageView) view.findViewById(2131362846);
+                                                            i = R.id.create_channel_stage_icon;
+                                                            ImageView imageView2 = (ImageView) view.findViewById(R.id.create_channel_stage_icon);
                                                             if (imageView2 != null) {
-                                                                i = 2131362847;
-                                                                RadioButton radioButton2 = (RadioButton) view.findViewById(2131362847);
+                                                                i = R.id.create_channel_stage_radio;
+                                                                RadioButton radioButton2 = (RadioButton) view.findViewById(R.id.create_channel_stage_radio);
                                                                 if (radioButton2 != null) {
-                                                                    i = 2131362848;
-                                                                    TextView textView5 = (TextView) view.findViewById(2131362848);
+                                                                    i = R.id.create_channel_stage_title;
+                                                                    TextView textView5 = (TextView) view.findViewById(R.id.create_channel_stage_title);
                                                                     if (textView5 != null) {
-                                                                        i = 2131362849;
-                                                                        ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131362849);
+                                                                        i = R.id.create_channel_text_container;
+                                                                        ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(R.id.create_channel_text_container);
                                                                         if (constraintLayout3 != null) {
-                                                                            i = 2131362850;
-                                                                            ImageView imageView3 = (ImageView) view.findViewById(2131362850);
+                                                                            i = R.id.create_channel_text_icon;
+                                                                            ImageView imageView3 = (ImageView) view.findViewById(R.id.create_channel_text_icon);
                                                                             if (imageView3 != null) {
-                                                                                i = 2131362851;
-                                                                                RadioButton radioButton3 = (RadioButton) view.findViewById(2131362851);
+                                                                                i = R.id.create_channel_text_radio;
+                                                                                RadioButton radioButton3 = (RadioButton) view.findViewById(R.id.create_channel_text_radio);
                                                                                 if (radioButton3 != null) {
-                                                                                    i = 2131362852;
-                                                                                    TextView textView6 = (TextView) view.findViewById(2131362852);
+                                                                                    i = R.id.create_channel_text_title;
+                                                                                    TextView textView6 = (TextView) view.findViewById(R.id.create_channel_text_title);
                                                                                     if (textView6 != null) {
-                                                                                        i = 2131362853;
-                                                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362853);
+                                                                                        i = R.id.create_channel_type_container;
+                                                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.create_channel_type_container);
                                                                                         if (linearLayout != null) {
-                                                                                            i = 2131362854;
-                                                                                            ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131362854);
+                                                                                            i = R.id.create_channel_voice_container;
+                                                                                            ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(R.id.create_channel_voice_container);
                                                                                             if (constraintLayout4 != null) {
-                                                                                                i = 2131362855;
-                                                                                                ImageView imageView4 = (ImageView) view.findViewById(2131362855);
+                                                                                                i = R.id.create_channel_voice_icon;
+                                                                                                ImageView imageView4 = (ImageView) view.findViewById(R.id.create_channel_voice_icon);
                                                                                                 if (imageView4 != null) {
-                                                                                                    i = 2131362856;
-                                                                                                    RadioButton radioButton4 = (RadioButton) view.findViewById(2131362856);
+                                                                                                    i = R.id.create_channel_voice_radio;
+                                                                                                    RadioButton radioButton4 = (RadioButton) view.findViewById(R.id.create_channel_voice_radio);
                                                                                                     if (radioButton4 != null) {
-                                                                                                        i = 2131362857;
-                                                                                                        TextView textView7 = (TextView) view.findViewById(2131362857);
+                                                                                                        i = R.id.create_channel_voice_title;
+                                                                                                        TextView textView7 = (TextView) view.findViewById(R.id.create_channel_voice_title);
                                                                                                         if (textView7 != null) {
                                                                                                             return new WidgetCreateChannelBinding((CoordinatorLayout) view, constraintLayout, imageView, radioButton, textView, textInputLayout, relativeLayout, textView2, switchCompat, textView3, recyclerView, findViewById, textView4, constraintLayout2, imageView2, radioButton2, textView5, constraintLayout3, imageView3, radioButton3, textView6, linearLayout, constraintLayout4, imageView4, radioButton4, textView7);
                                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java
index 15ebd7a1c9..5b7eb7b9b0 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.rest.RestAPI;
@@ -45,7 +46,7 @@ public final class WidgetCreateChannel$configureUI$1<T1, T2> implements Action2<
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullParameter(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364122) {
+        if (menuItem.getItemId() == R.id.menu_sort_channel) {
             RestAPI api = RestAPI.Companion.getApi();
             long access$getGuildId$p = WidgetCreateChannel.access$getGuildId$p(this.this$0);
             int access$getChannelType$p = WidgetCreateChannel.access$getChannelType$p(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
index 9952db51c1..c5c1b86737 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
@@ -18,7 +18,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -105,11 +107,11 @@ public final class WidgetCreateChannel extends AppFragment {
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             l lVar = l.g;
             Intent intent = new Intent();
-            intent.putExtra("INTENT_GUILD_ID", j);
-            intent.putExtra("INTENT_TYPE", i);
-            intent.putExtra("INTENT_CATEGORY_ID", l);
-            intent.putExtra("INTENT_GUILD_ROLE_SUBSCRIPTION_CHANNEL", z3);
-            intent.putExtra("INTENT_SHOULD_CHANNEL_DEFAULT_PRIVATE", z2);
+            intent.putExtra(WidgetCreateChannel.INTENT_GUILD_ID, j);
+            intent.putExtra(WidgetCreateChannel.INTENT_TYPE, i);
+            intent.putExtra(WidgetCreateChannel.INTENT_CATEGORY_ID, l);
+            intent.putExtra(WidgetCreateChannel.INTENT_PROVIDE_RESULT_ONLY, z3);
+            intent.putExtra(WidgetCreateChannel.INTENT_SHOULD_CHANNEL_DEFAULT_PRIVATE, z2);
             lVar.f(context, activityResultLauncher, WidgetCreateChannel.class, intent);
         }
 
@@ -124,9 +126,9 @@ public final class WidgetCreateChannel extends AppFragment {
         public final void show(Context context, long j, int i, Long l) {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_GUILD_ID", j);
-            intent.putExtra("INTENT_TYPE", i);
-            intent.putExtra("INTENT_CATEGORY_ID", l);
+            intent.putExtra(WidgetCreateChannel.INTENT_GUILD_ID, j);
+            intent.putExtra(WidgetCreateChannel.INTENT_TYPE, i);
+            intent.putExtra(WidgetCreateChannel.INTENT_CATEGORY_ID, l);
             l.d(context, WidgetCreateChannel.class, intent);
         }
     }
@@ -196,7 +198,7 @@ public final class WidgetCreateChannel extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public RoleListItem(RolesAdapter rolesAdapter) {
-                super(2131558749, rolesAdapter);
+                super((int) R.layout.view_checkable_role_list_item_themed, rolesAdapter);
                 m.checkNotNullParameter(rolesAdapter, "adapter");
                 View view = this.itemView;
                 Objects.requireNonNull(view, "rootView");
@@ -278,7 +280,7 @@ public final class WidgetCreateChannel extends AppFragment {
     }
 
     public WidgetCreateChannel() {
-        super(2131559009);
+        super(R.layout.widget_create_channel);
     }
 
     public static final /* synthetic */ void access$configurePrivateRoles(WidgetCreateChannel widgetCreateChannel) {
@@ -351,8 +353,8 @@ public final class WidgetCreateChannel extends AppFragment {
         }
         boolean z2 = true;
         setActionBarDisplayHomeAsUpEnabled(true);
-        setActionBarTitle(getType() == 4 ? 2131887919 : 2131887920);
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623941, new WidgetCreateChannel$configureUI$1(this), null, 4, null);
+        setActionBarTitle(getType() == 4 ? R.string.create_category : R.string.create_channel);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_channel_create, new WidgetCreateChannel$configureUI$1(this), null, 4, null);
         ConstraintLayout constraintLayout = getBinding().b;
         m.checkNotNullExpressionValue(constraintLayout, "binding.createChannelAnnouncementsContainer");
         int i = 8;
@@ -424,7 +426,7 @@ public final class WidgetCreateChannel extends AppFragment {
                 if (!(rolesAdapter == null || (checkedRoles2 = rolesAdapter.getCheckedRoles()) == null || (keySet2 = checkedRoles2.keySet()) == null || !keySet2.contains(Long.valueOf(getGuildId())))) {
                     return null;
                 }
-                long j = (getChannelType() == 2 || getChannelType() == 13) ? 1048576 : 1024;
+                long j = (getChannelType() == 2 || getChannelType() == 13) ? Permission.CONNECT : Permission.VIEW_CHANNEL;
                 ArrayList arrayList = new ArrayList();
                 arrayList.add(RestAPIParams.ChannelPermissionOverwrites.Companion.createForRole(getGuildId(), 0L, Long.valueOf(j)));
                 RolesAdapter rolesAdapter2 = this.rolesAdapter;
@@ -455,9 +457,9 @@ public final class WidgetCreateChannel extends AppFragment {
         if (getProvideResultOnly()) {
             FragmentActivity requireActivity = requireActivity();
             Intent intent = new Intent();
-            intent.putExtra("RESULT_EXTRA_CHANNEL_ID", channel.h());
-            intent.putExtra("RESULT_EXTRA_CHANNEL_NAME", AnimatableValueParser.y0(channel));
-            intent.putExtra("RESULT_EXTRA_CHANNEL_ICON_RES_ID", GuildChannelIconUtilsKt.guildChannelIcon(channel));
+            intent.putExtra(RESULT_EXTRA_CHANNEL_ID, channel.h());
+            intent.putExtra(RESULT_EXTRA_CHANNEL_NAME, AnimatableValueParser.y0(channel));
+            intent.putExtra(RESULT_EXTRA_CHANNEL_ICON_RES_ID, GuildChannelIconUtilsKt.guildChannelIcon(channel));
             requireActivity.setResult(-1, intent);
             finishActivity();
             return;
@@ -530,11 +532,11 @@ public final class WidgetCreateChannel extends AppFragment {
             i = 8;
         }
         linearLayout.setVisibility(i);
-        getBinding().h.setText(getType() == 4 ? 2131892758 : 2131892761);
-        getBinding().f.setText(getType() == 4 ? 2131892760 : 2131892786);
-        getBinding().k.setText(getType() == 4 ? 2131888660 : 2131888663);
+        getBinding().h.setText(getType() == 4 ? R.string.private_category : R.string.private_channel);
+        getBinding().f.setText(getType() == 4 ? R.string.private_category_note : R.string.private_channel_note);
+        getBinding().k.setText(getType() == 4 ? R.string.form_label_category_permissions : R.string.form_label_channel_permissions);
         TextInputLayout textInputLayout = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.createChannelNameLayout");
-        textInputLayout.setHint(getString(getType() == 4 ? 2131887219 : 2131888661));
+        textInputLayout.setHint(getString(getType() == 4 ? R.string.category_name : R.string.form_label_channel_name));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java
index 46feabdbed..a0147f44e8 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.chips_view.ChipsView;
 import com.discord.databinding.WidgetGroupInviteFriendsBinding;
@@ -22,23 +23,23 @@ public final /* synthetic */ class WidgetGroupInviteFriends$binding$2 extends k
 
     public final WidgetGroupInviteFriendsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363425;
-        ChipsView chipsView = (ChipsView) view.findViewById(2131363425);
+        int i = R.id.group_invite_friends_chips;
+        ChipsView chipsView = (ChipsView) view.findViewById(R.id.group_invite_friends_chips);
         if (chipsView != null) {
-            i = 2131363426;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363426);
+            i = R.id.group_invite_friends_recipients_container;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.group_invite_friends_recipients_container);
             if (relativeLayout != null) {
-                i = 2131363427;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363427);
+                i = R.id.group_invite_friends_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.group_invite_friends_recycler);
                 if (recyclerView != null) {
-                    i = 2131363428;
-                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363428);
+                    i = R.id.group_invite_friends_save_fab;
+                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.group_invite_friends_save_fab);
                     if (floatingActionButton != null) {
-                        i = 2131363429;
-                        TextView textView = (TextView) view.findViewById(2131363429);
+                        i = R.id.group_invite_friends_text_to;
+                        TextView textView = (TextView) view.findViewById(R.id.group_invite_friends_text_to);
                         if (textView != null) {
-                            i = 2131363430;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363430);
+                            i = R.id.group_invite_friends_view_flipper;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.group_invite_friends_view_flipper);
                             if (appViewFlipper != null) {
                                 return new WidgetGroupInviteFriendsBinding((CoordinatorLayout) view, chipsView, relativeLayout, recyclerView, floatingActionButton, textView, appViewFlipper);
                             }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java
index fba66150cc..d390b7dbc6 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels;
 
+import com.discord.R;
 import com.discord.models.user.User;
 import com.discord.widgets.channels.WidgetGroupInviteFriends;
 import d0.z.d.m;
@@ -31,7 +32,7 @@ public final class WidgetGroupInviteFriends$configureUI$1 extends o implements F
         if (!z2) {
             WidgetGroupInviteFriends.access$unselectUser(this.this$0, user);
         } else if (this.$data.getTotalNumRecipients() >= this.$data.getMaxGroupMemberCount()) {
-            c.a.e.o.i(this.this$0, 2131889193, 0, 4);
+            c.a.e.o.i(this.this$0, R.string.group_dm_invite_full_sub, 0, 4);
         } else {
             WidgetGroupInviteFriends.access$selectUser(this.this$0, user);
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java
index e9648f330f..2c8b2eca7c 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels;
 
 import android.view.View;
 import c.a.e.o;
+import com.discord.R;
 /* compiled from: WidgetGroupInviteFriends.kt */
 public final class WidgetGroupInviteFriends$setupFAB$1 implements View.OnClickListener {
     public final /* synthetic */ WidgetGroupInviteFriends this$0;
@@ -12,6 +13,6 @@ public final class WidgetGroupInviteFriends$setupFAB$1 implements View.OnClickLi
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        o.g(this.this$0.getContext(), 2131889193, 0, null, 12);
+        o.g(this.this$0.getContext(), R.string.group_dm_invite_full_sub, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
index 85363b0913..353f8f471a 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
@@ -12,6 +12,7 @@ import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -81,7 +82,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
             m.checkNotNullParameter(str, "source");
             AnalyticsTracker.openModal$default("DM Group Add", str, null, 4, null);
             Intent intent = new Intent();
-            intent.putExtra("INTENT_EXTRA_CHANNEL_ID", j);
+            intent.putExtra(WidgetGroupInviteFriends.INTENT_EXTRA_CHANNEL_ID, j);
             l.d(context, WidgetGroupInviteFriends.class, intent);
         }
 
@@ -693,7 +694,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
     }
 
     public WidgetGroupInviteFriends() {
-        super(2131559065);
+        super(R.layout.widget_group_invite_friends);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGroupInviteFriends widgetGroupInviteFriends, Model model) {
@@ -731,7 +732,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
                 break;
             }
             User next = it.next();
-            getBinding().b.b(next.getUsername(), b.k(this, 2131892954, new Object[]{next.getUsername()}, null, 4).toString(), Long.valueOf(next.getId()), new UserDataContract(next));
+            getBinding().b.b(next.getUsername(), b.k(this, R.string.remove_role_or_user, new Object[]{next.getUsername()}, null, 4).toString(), Long.valueOf(next.getId()), new UserDataContract(next));
             hashSet.add(Long.valueOf(next.getId()));
         }
         String filterText = model.getFilterText();
@@ -771,7 +772,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
     }
 
     private final void selectUser(User user) {
-        getBinding().b.b(user.getUsername(), b.k(this, 2131892954, new Object[]{user.getUsername()}, null, 4).toString(), Long.valueOf(user.getId()), new UserDataContract(user));
+        getBinding().b.b(user.getUsername(), b.k(this, R.string.remove_role_or_user, new Object[]{user.getUsername()}, null, 4).toString(), Long.valueOf(user.getId()), new UserDataContract(user));
         this.addedUsers.put(Long.valueOf(user.getId()), user);
         this.addedUsersPublisher.onNext(new ArrayList(this.addedUsers.values()));
     }
@@ -797,14 +798,14 @@ public final class WidgetGroupInviteFriends extends AppFragment {
     private final void setupToolbar(Model model) {
         CharSequence charSequence;
         if (model.getChannel() != null) {
-            setActionBarTitle(b.k(this, 2131889205, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4));
+            setActionBarTitle(b.k(this, R.string.group_dm_invite_with_name, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4));
         } else {
-            setActionBarTitle(getString(2131890854));
+            setActionBarTitle(getString(R.string.invite_friend_modal_title));
         }
         if (model.getChannel() != null) {
             List<com.discord.api.user.User> w = model.getChannel().w();
             if ((w != null ? w.size() : 1) >= model.getMaxGroupMemberCount()) {
-                charSequence = getString(2131889192);
+                charSequence = getString(R.string.group_dm_invite_full_main);
                 m.checkNotNullExpressionValue(charSequence, "getString(R.string.group_dm_invite_full_main)");
                 RelativeLayout relativeLayout = getBinding().f1814c;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.groupInviteFriendsRecipientsContainer");
@@ -816,15 +817,15 @@ public final class WidgetGroupInviteFriends extends AppFragment {
         if (maxGroupMemberCount > 0) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755130, maxGroupMemberCount, Integer.valueOf(maxGroupMemberCount));
+            charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), (int) R.plurals.group_dm_invite_remaining_number, maxGroupMemberCount, Integer.valueOf(maxGroupMemberCount));
         } else if (maxGroupMemberCount == 0) {
-            charSequence = getString(2131889204);
+            charSequence = getString(R.string.group_dm_invite_will_fill_mobile);
             m.checkNotNullExpressionValue(charSequence, "getString(R.string.group…_invite_will_fill_mobile)");
         } else {
             int i = maxGroupMemberCount * -1;
             Resources resources2 = getResources();
             m.checkNotNullExpressionValue(resources2, "resources");
-            charSequence = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755131, i, Integer.valueOf(i));
+            charSequence = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.group_dm_invite_unselect_users_number, i, Integer.valueOf(i));
         }
         RelativeLayout relativeLayout2 = getBinding().f1814c;
         m.checkNotNullExpressionValue(relativeLayout2, "binding.groupInviteFriendsRecipientsContainer");
@@ -859,7 +860,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
         BehaviorSubject<Collection<User>> behaviorSubject = this.addedUsersPublisher;
         m.checkNotNullExpressionValue(behaviorSubject, "addedUsersPublisher");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(companion.getFriendChanges(behaviorSubject), this, this.adapter), WidgetGroupInviteFriends.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGroupInviteFriends$onViewBoundOrOnResume$3(this.addedUsersPublisher), 62, (Object) null);
-        long longExtra = getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", -1);
+        long longExtra = getMostRecentIntent().getLongExtra(INTENT_EXTRA_CHANNEL_ID, -1);
         BehaviorSubject<Collection<User>> behaviorSubject2 = this.addedUsersPublisher;
         m.checkNotNullExpressionValue(behaviorSubject2, "addedUsersPublisher");
         BehaviorSubject<String> behaviorSubject3 = this.filterPublisher;
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
index e7debe336c..9babed1d08 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
@@ -7,6 +7,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGroupInviteFriendsItemBinding;
 import com.discord.models.presence.Presence;
 import com.discord.models.user.User;
@@ -33,30 +34,30 @@ public final class WidgetGroupInviteFriendsAdapter extends MGRecyclerAdapterSimp
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public WidgetGroupInviteFriendsListItem(WidgetGroupInviteFriendsAdapter widgetGroupInviteFriendsAdapter, WidgetGroupInviteFriendsAdapter widgetGroupInviteFriendsAdapter2) {
-            super(2131559066, widgetGroupInviteFriendsAdapter2);
+            super((int) R.layout.widget_group_invite_friends_item, widgetGroupInviteFriendsAdapter2);
             m.checkNotNullParameter(widgetGroupInviteFriendsAdapter2, "adapter");
             this.this$0 = widgetGroupInviteFriendsAdapter;
             View view = this.itemView;
-            int i = 2131363321;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363321);
+            int i = R.id.friend_container;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.friend_container);
             if (relativeLayout != null) {
-                i = 2131363342;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363342);
+                i = R.id.friends_list_item_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.friends_list_item_avatar);
                 if (simpleDraweeView != null) {
-                    i = 2131363343;
-                    RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131363343);
+                    i = R.id.friends_list_item_avatar_wrap;
+                    RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(R.id.friends_list_item_avatar_wrap);
                     if (relativeLayout2 != null) {
-                        i = 2131363349;
-                        SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363349);
+                        i = R.id.friends_list_item_game;
+                        SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.friends_list_item_game);
                         if (simpleDraweeSpanTextView != null) {
-                            i = 2131363351;
-                            TextView textView = (TextView) view.findViewById(2131363351);
+                            i = R.id.friends_list_item_name;
+                            TextView textView = (TextView) view.findViewById(R.id.friends_list_item_name);
                             if (textView != null) {
-                                i = 2131363352;
-                                StatusView statusView = (StatusView) view.findViewById(2131363352);
+                                i = R.id.friends_list_item_status;
+                                StatusView statusView = (StatusView) view.findViewById(R.id.friends_list_item_status);
                                 if (statusView != null) {
-                                    i = 2131365699;
-                                    CheckBox checkBox = (CheckBox) view.findViewById(2131365699);
+                                    i = R.id.user_selected_checkbox;
+                                    CheckBox checkBox = (CheckBox) view.findViewById(R.id.user_selected_checkbox);
                                     if (checkBox != null) {
                                         WidgetGroupInviteFriendsItemBinding widgetGroupInviteFriendsItemBinding = new WidgetGroupInviteFriendsItemBinding((LinearLayout) view, relativeLayout, simpleDraweeView, relativeLayout2, simpleDraweeSpanTextView, textView, statusView, checkBox);
                                         m.checkNotNullExpressionValue(widgetGroupInviteFriendsItemBinding, "WidgetGroupInviteFriendsItemBinding.bind(itemView)");
@@ -95,7 +96,7 @@ public final class WidgetGroupInviteFriendsAdapter extends MGRecyclerAdapterSimp
             PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, true, false, 16, null);
             SimpleDraweeView simpleDraweeView = this.binding.f1815c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, friendItem.getUser(), 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, friendItem.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$binding$2.java
index 7629050078..4d59783a8e 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.VideoView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadOnboardingBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -22,41 +23,41 @@ public final /* synthetic */ class WidgetThreadOnboarding$binding$2 extends k im
 
     public final WidgetThreadOnboardingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365525;
-        ImageView imageView = (ImageView) view.findViewById(2131365525);
+        int i = R.id.thread_onboarding_archive_icon;
+        ImageView imageView = (ImageView) view.findViewById(R.id.thread_onboarding_archive_icon);
         if (imageView != null) {
-            i = 2131365526;
-            TextView textView = (TextView) view.findViewById(2131365526);
+            i = R.id.thread_onboarding_archive_text;
+            TextView textView = (TextView) view.findViewById(R.id.thread_onboarding_archive_text);
             if (textView != null) {
-                i = 2131365527;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365527);
+                i = R.id.thread_onboarding_close;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.thread_onboarding_close);
                 if (materialButton != null) {
-                    i = 2131365528;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131365528);
+                    i = R.id.thread_onboarding_create_icon;
+                    ImageView imageView2 = (ImageView) view.findViewById(R.id.thread_onboarding_create_icon);
                     if (imageView2 != null) {
-                        i = 2131365529;
-                        TextView textView2 = (TextView) view.findViewById(2131365529);
+                        i = R.id.thread_onboarding_create_text;
+                        TextView textView2 = (TextView) view.findViewById(R.id.thread_onboarding_create_text);
                         if (textView2 != null) {
-                            i = 2131365530;
-                            ImageView imageView3 = (ImageView) view.findViewById(2131365530);
+                            i = R.id.thread_onboarding_join_icon;
+                            ImageView imageView3 = (ImageView) view.findViewById(R.id.thread_onboarding_join_icon);
                             if (imageView3 != null) {
-                                i = 2131365531;
-                                TextView textView3 = (TextView) view.findViewById(2131365531);
+                                i = R.id.thread_onboarding_join_text;
+                                TextView textView3 = (TextView) view.findViewById(R.id.thread_onboarding_join_text);
                                 if (textView3 != null) {
-                                    i = 2131365532;
-                                    VideoView videoView = (VideoView) view.findViewById(2131365532);
+                                    i = R.id.thread_onboarding_video;
+                                    VideoView videoView = (VideoView) view.findViewById(R.id.thread_onboarding_video);
                                     if (videoView != null) {
-                                        i = 2131365533;
-                                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365533);
+                                        i = R.id.thread_onboarding_video_container;
+                                        FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.thread_onboarding_video_container);
                                         if (frameLayout != null) {
-                                            i = 2131365534;
-                                            ImageView imageView4 = (ImageView) view.findViewById(2131365534);
+                                            i = R.id.thread_onboarding_video_frame;
+                                            ImageView imageView4 = (ImageView) view.findViewById(R.id.thread_onboarding_video_frame);
                                             if (imageView4 != null) {
-                                                i = 2131365535;
-                                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365535);
+                                                i = R.id.thread_onboarding_video_overlay;
+                                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.thread_onboarding_video_overlay);
                                                 if (simpleDraweeView != null) {
-                                                    i = 2131365536;
-                                                    ImageView imageView5 = (ImageView) view.findViewById(2131365536);
+                                                    i = R.id.thread_onboarding_video_placeholder;
+                                                    ImageView imageView5 = (ImageView) view.findViewById(R.id.thread_onboarding_video_placeholder);
                                                     if (imageView5 != null) {
                                                         return new WidgetThreadOnboardingBinding((ConstraintLayout) view, imageView, textView, materialButton, imageView2, textView2, imageView3, textView3, videoView, frameLayout, imageView4, simpleDraweeView, imageView5);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$configureMedia$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$configureMedia$1.java
index 1a89335f3c..e409c35572 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$configureMedia$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding$configureMedia$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels;
 import android.app.Dialog;
 import android.view.View;
 import android.view.ViewGroup;
+import com.discord.R;
 /* compiled from: WidgetThreadOnboarding.kt */
 public final class WidgetThreadOnboarding$configureMedia$1 implements Runnable {
     public final /* synthetic */ WidgetThreadOnboarding this$0;
@@ -17,7 +18,7 @@ public final class WidgetThreadOnboarding$configureMedia$1 implements Runnable {
         ViewGroup.LayoutParams layoutParams = null;
         Integer valueOf = view != null ? Integer.valueOf(view.getMeasuredHeight()) : null;
         Dialog dialog = this.this$0.getDialog();
-        View findViewById = dialog != null ? dialog.findViewById(2131362908) : null;
+        View findViewById = dialog != null ? dialog.findViewById(R.id.design_bottom_sheet) : null;
         if (findViewById != null) {
             layoutParams = findViewById.getLayoutParams();
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding.java
index c1bfd7a925..6810eae72b 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadOnboarding.java
@@ -6,6 +6,7 @@ import android.widget.FrameLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetThreadOnboardingBinding;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -81,7 +82,7 @@ public final class WidgetThreadOnboarding extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559311;
+        return R.layout.widget_thread_onboarding;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -91,6 +92,6 @@ public final class WidgetThreadOnboarding extends AppBottomSheet {
         setBottomSheetCollapsedStateDisabled();
         new ThreadOnboardingManager().markSeen();
         getBinding().b.setOnClickListener(new WidgetThreadOnboarding$onViewCreated$1(this));
-        configureMedia("https://cdn.discordapp.com/attachments/784538423687381042/865642464415842324/NUX_Mobile_v2.mp4");
+        configureMedia(VIDEO_URL);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetchannelPickerAdapter.java b/app/src/main/java/com/discord/widgets/channels/WidgetchannelPickerAdapter.java
index 5ddb937641..15da3b7111 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetchannelPickerAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetchannelPickerAdapter.java
@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.databinding.ViewGuildRoleSubscriptionChannelItemBinding;
 import com.discord.utilities.recycler.DiffCreator;
@@ -94,15 +95,15 @@ public final class WidgetchannelPickerAdapter extends RecyclerView.Adapter<Chann
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public ChannelPickerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558773, viewGroup, false);
-        int i2 = 2131362297;
-        TextView textView = (TextView) inflate.findViewById(2131362297);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.view_guild_role_subscription_channel_item, viewGroup, false);
+        int i2 = R.id.channel_item_name;
+        TextView textView = (TextView) inflate.findViewById(R.id.channel_item_name);
         if (textView != null) {
-            i2 = 2131362298;
-            ImageView imageView = (ImageView) inflate.findViewById(2131362298);
+            i2 = R.id.channel_item_selected;
+            ImageView imageView = (ImageView) inflate.findViewById(R.id.channel_item_selected);
             if (imageView != null) {
-                i2 = 2131362299;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131362299);
+                i2 = R.id.channel_item_type_icon;
+                ImageView imageView2 = (ImageView) inflate.findViewById(R.id.channel_item_type_icon);
                 if (imageView2 != null) {
                     ViewGuildRoleSubscriptionChannelItemBinding viewGuildRoleSubscriptionChannelItemBinding = new ViewGuildRoleSubscriptionChannelItemBinding((LinearLayout) inflate, textView, imageView, imageView2);
                     m.checkNotNullExpressionValue(viewGuildRoleSubscriptionChannelItemBinding, "ViewGuildRoleSubscriptio…rent,\n        false\n    )");
@@ -114,7 +115,7 @@ public final class WidgetchannelPickerAdapter extends RecyclerView.Adapter<Chann
                     }
                     Context context = viewGroup.getContext();
                     m.checkNotNullExpressionValue(context, "parent.context");
-                    throw new IllegalArgumentException(b.h(context, 2131886352, new Object[]{Integer.valueOf(i)}, null, 4).toString());
+                    throw new IllegalArgumentException(b.h(context, R.string.android_unknown_view_holder, new Object[]{Integer.valueOf(i)}, null, 4).toString());
                 }
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java
index 0b2a11e501..50994210c6 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.chips_view.ChipsView;
 import com.discord.databinding.GroupInviteFriendsBottomSheetBinding;
 import d0.z.d.k;
@@ -19,15 +20,15 @@ public final /* synthetic */ class GroupInviteFriendsSheet$binding$2 extends k i
 
     public final GroupInviteFriendsBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362650;
-        ChipsView chipsView = (ChipsView) view.findViewById(2131362650);
+        int i = R.id.chips_view;
+        ChipsView chipsView = (ChipsView) view.findViewById(R.id.chips_view);
         if (chipsView != null) {
-            i = 2131364624;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+            i = R.id.recycler_view;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
             if (recyclerView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131364771;
-                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364771);
+                i = R.id.search_icon;
+                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.search_icon);
                 if (appCompatImageView != null) {
                     return new GroupInviteFriendsBottomSheetBinding(constraintLayout, chipsView, recyclerView, constraintLayout, appCompatImageView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java
index 7df40d8ee5..993745ea4f 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java
@@ -17,6 +17,7 @@ import c.a.e.j0;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.chips_view.ChipsView;
 import com.discord.databinding.GroupInviteFriendsBottomSheetBinding;
@@ -131,7 +132,7 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet {
 
     private final void handleEvent(GroupInviteFriendsSheetViewModel.Event event) {
         if (event instanceof GroupInviteFriendsSheetViewModel.Event.ChannelFull) {
-            o.i(this, 2131889193, 0, 4);
+            o.i(this, R.string.group_dm_invite_full_sub, 0, 4);
         }
     }
 
@@ -177,7 +178,7 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet {
             User next = it.next();
             ChipsView chipsView = getBinding().b;
             String username = next.getUsername();
-            String obj = b.k(this, 2131892939, new Object[]{next.getUsername()}, null, 4).toString();
+            String obj = b.k(this, R.string.remove, new Object[]{next.getUsername()}, null, 4).toString();
             Long valueOf = Long.valueOf(next.getId());
             m.checkNotNullExpressionValue(next, "user");
             chipsView.b(username, obj, valueOf, new UserDataContract(next));
@@ -193,7 +194,7 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558514;
+        return R.layout.group_invite_friends_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java
index c6a94874af..b344cec260 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java
@@ -7,6 +7,7 @@ import androidx.annotation.LayoutRes;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.GroupInviteFriendsSheetItemBinding;
 import com.discord.models.user.User;
 import com.discord.utilities.icon.IconUtils;
@@ -144,14 +145,14 @@ public final class GroupInviteFriendsSheetAdapter extends MGRecyclerAdapterSimpl
             super(i, groupInviteFriendsSheetAdapter);
             m.checkNotNullParameter(groupInviteFriendsSheetAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131363342;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363342);
+            int i2 = R.id.friends_list_item_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.friends_list_item_avatar);
             if (simpleDraweeView != null) {
-                i2 = 2131363351;
-                TextView textView = (TextView) view.findViewById(2131363351);
+                i2 = R.id.friends_list_item_name;
+                TextView textView = (TextView) view.findViewById(R.id.friends_list_item_name);
                 if (textView != null) {
-                    i2 = 2131365699;
-                    MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131365699);
+                    i2 = R.id.user_selected_checkbox;
+                    MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(R.id.user_selected_checkbox);
                     if (materialCheckBox != null) {
                         GroupInviteFriendsSheetItemBinding groupInviteFriendsSheetItemBinding = new GroupInviteFriendsSheetItemBinding((ConstraintLayout) view, simpleDraweeView, textView, materialCheckBox);
                         m.checkNotNullExpressionValue(groupInviteFriendsSheetItemBinding, "GroupInviteFriendsSheetItemBinding.bind(itemView)");
@@ -180,7 +181,7 @@ public final class GroupInviteFriendsSheetAdapter extends MGRecyclerAdapterSimpl
             textView.setText(user.getUsername());
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, user, 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, user, R.dimen.avatar_size_standard, null, null, null, 56, null);
             MaterialCheckBox materialCheckBox = this.binding.d;
             m.checkNotNullExpressionValue(materialCheckBox, "binding.userSelectedCheckbox");
             materialCheckBox.setChecked(friendItem.isSelected());
@@ -206,7 +207,7 @@ public final class GroupInviteFriendsSheetAdapter extends MGRecyclerAdapterSimpl
     public MGRecyclerViewHolder<?, FriendItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            return new GroupInviteFriendsListItem(2131558515, this);
+            return new GroupInviteFriendsListItem(R.layout.group_invite_friends_sheet_item, this);
         }
         throw invalidViewTypeException(i);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java
index 1d15fed125..119a529121 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.list;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.PermissionOverwriteUtilsKt;
@@ -186,7 +187,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
                 }
             }
             PermissionOverwrite permissionOverwrite = (PermissionOverwrite) obj;
-            if (permissionOverwrite != null && PermissionOverwriteUtilsKt.denies(permissionOverwrite, 1024)) {
+            if (permissionOverwrite != null && PermissionOverwriteUtilsKt.denies(permissionOverwrite, Permission.VIEW_CHANNEL)) {
                 z3 = true;
                 return new WidgetChannelListModel.Companion.TextLikeChannelData(z5, intValue, contains, z3, !AnimatableValueParser.A1(channel) ? new AnonymousClass1(this, channel, bool).mo1invoke() : new AnonymousClass2(this, intValue, channel, z5, z2, contains, h).mo1invoke());
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java
index 52ec9b72dd..01c83054fd 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.list;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
 import com.discord.utilities.channel.GuildChannelsInfo;
@@ -103,8 +104,8 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
         } else {
             permissionOverwrite = null;
         }
-        boolean z4 = !permissionUtils.canRole(1048576, everyoneRole, permissionOverwrite);
-        if (!PermissionUtils.can(1024, this.$permissions) && !z3) {
+        boolean z4 = !permissionUtils.canRole(Permission.CONNECT, everyoneRole, permissionOverwrite);
+        if (!PermissionUtils.can(Permission.VIEW_CHANNEL, this.$permissions) && !z3) {
             return null;
         }
         if (!this.$collapsedCategories$inlined.contains(Long.valueOf(channel.r())) || size != 0 || z3) {
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
index c2b73cd2c4..7630b85e26 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.list;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
+import com.discord.api.permission.Permission;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.models.domain.ModelApplicationStream;
 import com.discord.models.guild.Guild;
@@ -346,7 +347,7 @@ public final class WidgetChannelListModel {
 
         /*  JADX ERROR: IndexOutOfBoundsException in pass: SSATransform
             java.lang.IndexOutOfBoundsException: bitIndex < 0: -109
-            	at java.base/java.util.BitSet.get(BitSet.java:626)
+            	at java.base/java.util.BitSet.get(BitSet.java:624)
             	at jadx.core.dex.visitors.ssa.LiveVarAnalysis.fillBasicBlockInfo(LiveVarAnalysis.java:65)
             	at jadx.core.dex.visitors.ssa.LiveVarAnalysis.runAnalysis(LiveVarAnalysis.java:36)
             	at jadx.core.dex.visitors.ssa.SSATransform.process(SSATransform.java:55)
@@ -432,7 +433,7 @@ public final class WidgetChannelListModel {
                 User user = (User) map2.get(Long.valueOf(m));
                 if (user != null && (a = voiceState.a()) != null) {
                     long longValue = a.longValue();
-                    boolean can = PermissionUtils.can(1048576, map6.get(Long.valueOf(longValue)));
+                    boolean can = PermissionUtils.can(Permission.CONNECT, map6.get(Long.valueOf(longValue)));
                     Long valueOf = Long.valueOf(longValue);
                     Object obj = hashMap.get(valueOf);
                     if (obj == null) {
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java
index 6ce30588ac..60bbe54038 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelsListUnreadsBinding;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -22,11 +23,11 @@ public final class WidgetChannelListUnreads$binding$2 extends o implements Funct
     /* renamed from: invoke */
     public final WidgetChannelsListUnreadsBinding mo1invoke() {
         View inflate = WidgetChannelListUnreads.access$getUnreadsStub$p(this.this$0).inflate();
-        int i = 2131362471;
-        TextView textView = (TextView) inflate.findViewById(2131362471);
+        int i = R.id.channels_list_unreads;
+        TextView textView = (TextView) inflate.findViewById(R.id.channels_list_unreads);
         if (textView != null) {
-            i = 2131362472;
-            RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131362472);
+            i = R.id.channels_list_unreads_background;
+            RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(R.id.channels_list_unreads_background);
             if (relativeLayout != null) {
                 WidgetChannelsListUnreadsBinding widgetChannelsListUnreadsBinding = new WidgetChannelsListUnreadsBinding((FrameLayout) inflate, textView, relativeLayout);
                 m.checkNotNullExpressionValue(widgetChannelsListUnreadsBinding, "WidgetChannelsListUnread…nd(unreadsStub.inflate())");
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
index a95203e85d..42ac9e8bcd 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
@@ -9,6 +9,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelsListUnreadsBinding;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -352,7 +353,7 @@ public final class WidgetChannelListUnreads {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetChannelListUnreads(ViewStub viewStub, RecyclerView recyclerView, AppBarLayout appBarLayout, Function0 function0, int i, int i2, boolean z2, int i3, DefaultConstructorMarker defaultConstructorMarker) {
-        this(viewStub, recyclerView, (i3 & 4) != 0 ? null : appBarLayout, function0, (i3 & 16) != 0 ? 2131891665 : i, (i3 & 32) != 0 ? 2131891679 : i2, (i3 & 64) != 0 ? true : z2);
+        this(viewStub, recyclerView, (i3 & 4) != 0 ? null : appBarLayout, function0, (i3 & 16) != 0 ? R.string.new_mentions : i, (i3 & 32) != 0 ? R.string.new_unreads : i2, (i3 & 64) != 0 ? true : z2);
     }
 
     public static final /* synthetic */ ViewStub access$getUnreadsStub$p(WidgetChannelListUnreads widgetChannelListUnreads) {
@@ -372,7 +373,7 @@ public final class WidgetChannelListUnreads {
     }
 
     private final int getIcon(Model.Indicator indicator) {
-        return indicator.getType() != 0 ? 2131231080 : 2131231082;
+        return indicator.getType() != 0 ? R.drawable.drawable_button_grey : R.drawable.drawable_button_red;
     }
 
     private final int getText(Model.Indicator indicator) {
@@ -421,7 +422,7 @@ public final class WidgetChannelListUnreads {
         getBinding().b.setText(getText(indicator));
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.channelsListUnreads");
-        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, z2 ? 2131231430 : 2131231423, 0, 11, (Object) null);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, z2 ? R.drawable.ic_arrow_upward_white_16dp : R.drawable.ic_arrow_downward_white_16dp, 0, 11, (Object) null);
         FrameLayout frameLayout = getBinding().a;
         m.checkNotNullExpressionValue(frameLayout, "it");
         ViewGroup.LayoutParams layoutParams = frameLayout.getLayoutParams();
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java
index c3661cb8c4..34b154d379 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java
@@ -8,6 +8,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelsListBinding;
 import com.discord.utilities.view.rounded.RoundedCoordinatorLayout;
 import com.discord.views.CustomAppBarLayout;
@@ -29,66 +30,66 @@ public final /* synthetic */ class WidgetChannelsList$binding$2 extends k implem
 
     public final WidgetChannelsListBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361975;
-        CustomAppBarLayout customAppBarLayout = (CustomAppBarLayout) view.findViewById(2131361975);
+        int i = R.id.app_bar_layout;
+        CustomAppBarLayout customAppBarLayout = (CustomAppBarLayout) view.findViewById(R.id.app_bar_layout);
         if (customAppBarLayout != null) {
-            i = 2131362426;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362426);
+            i = R.id.channels_list;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.channels_list);
             if (recyclerView != null) {
-                i = 2131362432;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362432);
+                i = R.id.channels_list_banner;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channels_list_banner);
                 if (simpleDraweeView != null) {
-                    i = 2131362433;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362433);
+                    i = R.id.channels_list_banner_foreground;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.channels_list_banner_foreground);
                     if (frameLayout != null) {
-                        i = 2131362434;
-                        TextView textView = (TextView) view.findViewById(2131362434);
+                        i = R.id.channels_list_direct_messages_title;
+                        TextView textView = (TextView) view.findViewById(R.id.channels_list_direct_messages_title);
                         if (textView != null) {
-                            i = 2131362435;
-                            TextView textView2 = (TextView) view.findViewById(2131362435);
+                            i = R.id.channels_list_header;
+                            TextView textView2 = (TextView) view.findViewById(R.id.channels_list_header);
                             if (textView2 != null) {
-                                i = 2131362462;
-                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362462);
+                                i = R.id.channels_list_premium_guild_hint;
+                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.channels_list_premium_guild_hint);
                                 if (constraintLayout != null) {
-                                    i = 2131362463;
-                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362463);
+                                    i = R.id.channels_list_premium_guild_hint_button;
+                                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.channels_list_premium_guild_hint_button);
                                     if (materialButton != null) {
-                                        i = 2131362464;
-                                        TextView textView3 = (TextView) view.findViewById(2131362464);
+                                        i = R.id.channels_list_premium_guild_hint_subtitle;
+                                        TextView textView3 = (TextView) view.findViewById(R.id.channels_list_premium_guild_hint_subtitle);
                                         if (textView3 != null) {
-                                            i = 2131362465;
-                                            TextView textView4 = (TextView) view.findViewById(2131362465);
+                                            i = R.id.channels_list_premium_guild_hint_title;
+                                            TextView textView4 = (TextView) view.findViewById(R.id.channels_list_premium_guild_hint_title);
                                             if (textView4 != null) {
-                                                i = 2131362466;
-                                                Toolbar toolbar = (Toolbar) view.findViewById(2131362466);
+                                                i = R.id.channels_list_private_channels_header;
+                                                Toolbar toolbar = (Toolbar) view.findViewById(R.id.channels_list_private_channels_header);
                                                 if (toolbar != null) {
-                                                    i = 2131362467;
-                                                    TextView textView5 = (TextView) view.findViewById(2131362467);
+                                                    i = R.id.channels_list_search;
+                                                    TextView textView5 = (TextView) view.findViewById(R.id.channels_list_search);
                                                     if (textView5 != null) {
-                                                        i = 2131362468;
-                                                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362468);
+                                                        i = R.id.channels_list_start_group;
+                                                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.channels_list_start_group);
                                                         if (appCompatImageView != null) {
-                                                            i = 2131362469;
-                                                            View findViewById = view.findViewById(2131362469);
+                                                            i = R.id.channels_list_tooltip_background;
+                                                            View findViewById = view.findViewById(R.id.channels_list_tooltip_background);
                                                             if (findViewById != null) {
-                                                                i = 2131362470;
-                                                                View findViewById2 = view.findViewById(2131362470);
+                                                                i = R.id.channels_list_tooltip_top_tail;
+                                                                View findViewById2 = view.findViewById(R.id.channels_list_tooltip_top_tail);
                                                                 if (findViewById2 != null) {
-                                                                    i = 2131362473;
-                                                                    ViewStub viewStub = (ViewStub) view.findViewById(2131362473);
+                                                                    i = R.id.channels_list_unreads_stub;
+                                                                    ViewStub viewStub = (ViewStub) view.findViewById(R.id.channels_list_unreads_stub);
                                                                     if (viewStub != null) {
-                                                                        i = 2131362474;
-                                                                        Toolbar toolbar2 = (Toolbar) view.findViewById(2131362474);
+                                                                        i = R.id.channels_toolbar;
+                                                                        Toolbar toolbar2 = (Toolbar) view.findViewById(R.id.channels_toolbar);
                                                                         if (toolbar2 != null) {
-                                                                            i = 2131362678;
-                                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131362678);
+                                                                            i = R.id.collapsing_toolbar;
+                                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(R.id.collapsing_toolbar);
                                                                             if (collapsingToolbarLayout != null) {
                                                                                 RoundedCoordinatorLayout roundedCoordinatorLayout = (RoundedCoordinatorLayout) view;
-                                                                                i = 2131365878;
-                                                                                EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131365878);
+                                                                                i = R.id.widget_channels_list_empty_friends_state_cs_view;
+                                                                                EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(R.id.widget_channels_list_empty_friends_state_cs_view);
                                                                                 if (emptyFriendsStateContactSyncView != null) {
-                                                                                    i = 2131365879;
-                                                                                    EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131365879);
+                                                                                    i = R.id.widget_channels_list_empty_friends_state_view;
+                                                                                    EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(R.id.widget_channels_list_empty_friends_state_view);
                                                                                     if (emptyFriendsStateView != null) {
                                                                                         return new WidgetChannelsListBinding(roundedCoordinatorLayout, customAppBarLayout, recyclerView, simpleDraweeView, frameLayout, textView, textView2, constraintLayout, materialButton, textView3, textView4, toolbar, textView5, appCompatImageView, findViewById, findViewById2, viewStub, toolbar2, collapsingToolbarLayout, roundedCoordinatorLayout, emptyFriendsStateContactSyncView, emptyFriendsStateView);
                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$14.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$14.java
index 5ab0fb72b2..924f1dbe0c 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$14.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$14.java
@@ -20,9 +20,9 @@ public final class WidgetChannelsList$onViewBound$14 implements View.OnClickList
             GroupInviteFriendsSheet.Companion companion = GroupInviteFriendsSheet.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            GroupInviteFriendsSheet.Companion.show$default(companion, parentFragmentManager, 0, "Channels List", 2, null);
+            GroupInviteFriendsSheet.Companion.show$default(companion, parentFragmentManager, 0, WidgetChannelsList.ANALYTICS_SOURCE, 2, null);
             return;
         }
-        WidgetGroupInviteFriends.Companion.launch(this.this$0.requireContext(), "Channels List");
+        WidgetGroupInviteFriends.Companion.launch(this.this$0.requireContext(), WidgetChannelsList.ANALYTICS_SOURCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java
index d922dd5427..78f638ce42 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.list;
 
 import android.content.Context;
 import android.view.View;
+import androidx.core.view.PointerIconCompat;
 import androidx.fragment.app.FragmentManager;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
@@ -53,7 +54,7 @@ public final class WidgetChannelsList$onViewBound$3 extends o implements Functio
                 Context requireContext2 = this.this$0.this$0.requireContext();
                 FragmentManager parentFragmentManager = this.this$0.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-                StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext2, parentFragmentManager, this.$channel.h(), false, false, null, null, null, null, null, 1016, null);
+                StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext2, parentFragmentManager, this.$channel.h(), false, false, null, null, null, null, null, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, null);
             } else if (this.$hasUserSeenVoiceChannelOnboarding || !this.$isNewUser) {
                 WidgetVoiceBottomSheet.Companion companion = WidgetVoiceBottomSheet.Companion;
                 FragmentManager parentFragmentManager2 = this.this$0.this$0.getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java
index c456705303..d837f0bf22 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.channels.list;
 
 import android.content.Context;
+import androidx.core.view.PointerIconCompat;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -41,7 +42,7 @@ public final class WidgetChannelsList$onViewBound$4 extends o implements Functio
             Context requireContext = this.this$0.this$0.requireContext();
             FragmentManager parentFragmentManager = this.this$0.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, this.$channel.h(), false, false, null, null, null, null, null, 1016, null);
+            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, this.$channel.h(), false, false, null, null, null, null, null, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, null);
         }
     }
 
@@ -69,7 +70,7 @@ public final class WidgetChannelsList$onViewBound$4 extends o implements Functio
             Context requireContext = this.this$0.requireContext();
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, channel.h(), false, false, null, null, null, null, null, 1016, null);
+            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, channel.h(), false, false, null, null, null, null, null, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, null);
         } else if (stageInstanceForChannel != null || l == null || !PermissionUtils.can(20971536, Long.valueOf(l.longValue())) || !StageEventsCreationGuildsFeatureFlag.Companion.getINSTANCE().canGuildCreateStageEvents(channel.f())) {
             MemberVerificationUtils memberVerificationUtils = MemberVerificationUtils.INSTANCE;
             Context requireContext2 = this.this$0.requireContext();
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java
index d0dd738b1a..c9c4d04637 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java
@@ -2,8 +2,10 @@ package com.discord.widgets.channels.list;
 
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
@@ -38,10 +40,10 @@ public final class WidgetChannelsList$onViewBound$5 extends o implements Functio
         Object systemService = WidgetChannelsList.access$getAdapter$p(this.this$0).getContext().getSystemService("accessibility");
         if (systemService instanceof AccessibilityManager) {
             AccessibilityEvent obtain = AccessibilityEvent.obtain();
-            m.checkNotNullExpressionValue(obtain, "event");
+            m.checkNotNullExpressionValue(obtain, NotificationCompat.CATEGORY_EVENT);
             obtain.setEventType(16384);
             Object[] objArr = new Object[2];
-            objArr[0] = this.this$0.getString(z2 ? 2131888493 : 2131887433);
+            objArr[0] = this.this$0.getString(z2 ? R.string.expanded : R.string.collapsed);
             objArr[1] = AnimatableValueParser.y0(channel);
             obtain.getText().add(a.G(objArr, 2, "%s %s", "java.lang.String.format(format, *args)"));
             try {
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java
index 74f8aa349b..decbfbc4d6 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java
@@ -2,6 +2,8 @@ package com.discord.widgets.channels.list;
 
 import android.content.Context;
 import android.view.View;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.models.domain.ModelInvite;
 import com.discord.models.guild.Guild;
 import com.discord.models.invite.InviteUtils;
@@ -35,11 +37,11 @@ public final class WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda
     public final void invoke(ModelInvite modelInvite) {
         String vanityUrlCode;
         if (modelInvite != null) {
-            String link = modelInvite.toLink(this.this$0.this$0.getResources(), "https://discord.gg");
+            String link = modelInvite.toLink(this.this$0.this$0.getResources(), BuildConfig.HOST_INVITE);
             Context context = this.$it$inlined.getContext();
             m.checkNotNullExpressionValue(context, "it.context");
             m.checkNotNullExpressionValue(link, "inviteLink");
-            c.a.e.o.a(context, link, 2131890858);
+            c.a.e.o.a(context, link, R.string.invite_link_copied);
             return;
         }
         Guild guild = StoreStream.Companion.getGuilds().getGuild(this.$selectedGuildId);
@@ -47,7 +49,7 @@ public final class WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda
             String createLinkFromCode = InviteUtils.INSTANCE.createLinkFromCode(vanityUrlCode);
             Context context2 = this.$it$inlined.getContext();
             m.checkNotNullExpressionValue(context2, "it.context");
-            c.a.e.o.a(context2, createLinkFromCode, 2131890858);
+            c.a.e.o.a(context2, createLinkFromCode, R.string.invite_link_copied);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
index 546ea56fbf..156295af60 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
@@ -17,6 +17,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChannelsListBinding;
@@ -76,7 +77,7 @@ public final class WidgetChannelsList extends AppFragment {
     }
 
     public WidgetChannelsList() {
-        super(2131558918);
+        super(R.layout.widget_channels_list);
     }
 
     public static final /* synthetic */ void access$ackPremiumGuildHint(WidgetChannelsList widgetChannelsList) {
@@ -157,7 +158,7 @@ public final class WidgetChannelsList extends AppFragment {
 
     private final void configureHeaderColors(Guild guild, boolean z2) {
         getBinding().g.setTextColor(getTintColor(requireContext(), guild, this.isCollapsed));
-        getBinding().g.setShadowLayer(1.0f, 0.0f, 4.0f, (!z2 || this.isCollapsed) ? ColorCompat.getThemedColor(this, 2130968905) : ColorCompat.getColor(this, 2131099722));
+        getBinding().g.setShadowLayer(1.0f, 0.0f, 4.0f, (!z2 || this.isCollapsed) ? ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundSecondary) : ColorCompat.getColor(this, (int) R.color.black_alpha_80));
         FrameLayout frameLayout = getBinding().e;
         m.checkNotNullExpressionValue(frameLayout, "binding.channelsListBannerForeground");
         int i = 0;
@@ -176,21 +177,21 @@ public final class WidgetChannelsList extends AppFragment {
         Drawable drawable;
         if (guild != null) {
             if (guild.getFeatures().contains(GuildFeature.VERIFIED)) {
-                i = getBinding().b.a() ? 2131232095 : 2131232096;
+                i = getBinding().b.a() ? R.drawable.ic_verified_badge : R.drawable.ic_verified_badge_banner;
             } else if (guild.getFeatures().contains(GuildFeature.PARTNERED)) {
-                i = getBinding().b.a() ? 2131231857 : 2131231858;
+                i = getBinding().b.a() ? R.drawable.ic_partnered_badge : R.drawable.ic_partnered_badge_banner;
             } else if (guild.getPremiumTier() == 0 && guild.getPremiumSubscriptionCount() > 0) {
-                i = getBinding().b.a() ? 2131231715 : 2131231716;
+                i = getBinding().b.a() ? R.drawable.ic_guild_nitro_progress : R.drawable.ic_guild_nitro_progress_banner;
             } else if (guild.getPremiumTier() == 1) {
-                i = getBinding().b.a() ? 2131231704 : 2131231705;
+                i = getBinding().b.a() ? R.drawable.ic_guild_badge_premium_tier_1 : R.drawable.ic_guild_badge_premium_tier_1_banner;
             } else if (guild.getPremiumTier() == 2) {
-                i = getBinding().b.a() ? 2131231706 : 2131231707;
+                i = getBinding().b.a() ? R.drawable.ic_guild_badge_premium_tier_2 : R.drawable.ic_guild_badge_premium_tier_2_banner;
             } else if (guild.getPremiumTier() == 3) {
-                i = getBinding().b.a() ? 2131231708 : 2131231709;
+                i = getBinding().b.a() ? R.drawable.ic_guild_badge_premium_tier_3 : R.drawable.ic_guild_badge_premium_tier_3_banner;
             }
             TextView textView = getBinding().g;
             Drawable drawable2 = i != 0 ? null : ContextCompat.getDrawable(requireContext(), i);
-            drawable = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969431, 0, 2, (Object) null));
+            drawable = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_more, 0, 2, (Object) null));
             if (drawable == null) {
                 ColorCompatKt.setTint(drawable, getTintColor(requireContext(), guild, z2), false);
             } else {
@@ -202,7 +203,7 @@ public final class WidgetChannelsList extends AppFragment {
         TextView textView = getBinding().g;
         if (i != 0) {
         }
-        drawable = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969431, 0, 2, (Object) null));
+        drawable = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_more, 0, 2, (Object) null));
         if (drawable == null) {
         }
         textView.setCompoundDrawablesWithIntrinsicBounds(drawable2, (Drawable) null, drawable, (Drawable) null);
@@ -288,7 +289,7 @@ public final class WidgetChannelsList extends AppFragment {
             ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) layoutParams3;
             marginLayoutParams.bottomMargin = !widgetChannelListModel.getStartsWithPaddedElement() ? DimenUtils.dpToPixels(8) : 0;
             simpleDraweeView2.setLayoutParams(marginLayoutParams);
-            simpleDraweeView2.setImageURI(IconUtils.INSTANCE.getBannerForGuild(selectedGuild, Integer.valueOf(simpleDraweeView2.getResources().getDimensionPixelSize(2131165685))));
+            simpleDraweeView2.setImageURI(IconUtils.INSTANCE.getBannerForGuild(selectedGuild, Integer.valueOf(simpleDraweeView2.getResources().getDimensionPixelSize(R.dimen.nav_panel_width))));
         }
         getBinding().b.setOnPercentCollapsedCallback(new WidgetChannelsList$configureUI$5(this, selectedGuild, widgetChannelListModel, z3));
         ConstraintLayout constraintLayout = getBinding().h;
@@ -304,7 +305,7 @@ public final class WidgetChannelsList extends AppFragment {
     }
 
     private final int getTintColor(Context context, Guild guild, boolean z2) {
-        return ((guild != null ? guild.getBanner() : null) == null || z2) ? ColorCompat.getThemedColor(context, 2130968946) : ColorCompat.getColor(context, 2131100433);
+        return ((guild != null ? guild.getBanner() : null) == null || z2) ? ColorCompat.getThemedColor(context, (int) R.attr.colorInteractiveActive) : ColorCompat.getColor(context, (int) R.color.white);
     }
 
     private final void handleGlobalStatusIndicatorState(WidgetGlobalStatusIndicatorState.State state) {
@@ -330,7 +331,7 @@ public final class WidgetChannelsList extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().q.updateView("Channels List");
+        getBinding().q.updateView(ANALYTICS_SOURCE);
         getBinding().p.updateView(true);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().f1719c;
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
index 42be420a96..da7a953ad7 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
@@ -22,8 +22,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildMaxVideoChannelUsers;
+import com.discord.api.permission.Permission;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.databinding.WidgetChannelsListItemActiveStageEventBinding;
@@ -117,11 +119,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (!z2 || AnimatableValueParser.m1(channel)) {
                 Context context = view.getContext();
                 m.checkNotNullExpressionValue(context, "context");
-                i = DrawableCompat.getThemedDrawableRes$default(context, 2130969209, 0, 2, (Object) null);
+                i = DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.drawable_overlay_channels, 0, 2, (Object) null);
             } else {
                 Context context2 = view.getContext();
                 m.checkNotNullExpressionValue(context2, "context");
-                i = DrawableCompat.getThemedDrawableRes$default(context2, 2130969210, 0, 2, (Object) null);
+                i = DrawableCompat.getThemedDrawableRes$default(context2, (int) R.attr.drawable_overlay_channels_selected, 0, 2, (Object) null);
             }
             ViewExtensions.setBackgroundAndKeepPadding(view, ContextCompat.getDrawable(view.getContext(), i));
         }
@@ -148,8 +150,8 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullParameter(channelListItem, "data");
             super.onConfigure(i, (int) channelListItem);
             if (channelListItem instanceof ChannelListItemAddServer) {
-                this.binding.f1727c.setText(2131890474);
-                this.binding.b.setImageResource(2131231397);
+                this.binding.f1727c.setText(R.string.hub_sidebar_add_servers);
+                this.binding.b.setImageResource(R.drawable.ic_add_24dp);
                 this.binding.a.setOnClickListener(new WidgetChannelsListAdapter$ItemChannelAddServer$onConfigure$$inlined$apply$lambda$1(this));
             }
         }
@@ -195,14 +197,17 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             @DrawableRes
             private final int getArrowDrawable(ChannelListItemCategory channelListItemCategory) {
                 if (channelListItemCategory.isCollapsed()) {
-                    return 2131231553;
+                    return R.drawable.ic_chevron_right_grey_12dp;
                 }
-                return !channelListItemCategory.isCollapsed() ? 2131231549 : 0;
+                if (!channelListItemCategory.isCollapsed()) {
+                    return R.drawable.ic_chevron_down_grey_12dp;
+                }
+                return 0;
             }
 
             @ColorInt
             private final int getChannelColor(ChannelListItemCategory channelListItemCategory, Context context) {
-                return channelListItemCategory.isMuted() ? ColorCompat.getThemedColor(context, 2130968948) : ColorCompat.getThemedColor(context, 2130968910);
+                return channelListItemCategory.isMuted() ? ColorCompat.getThemedColor(context, (int) R.attr.colorInteractiveMuted) : ColorCompat.getThemedColor(context, (int) R.attr.colorChannelDefault);
             }
         }
 
@@ -218,14 +223,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362405;
-            ImageView imageView = (ImageView) view.findViewById(2131362405);
+            int i2 = R.id.channels_item_category_add;
+            ImageView imageView = (ImageView) view.findViewById(R.id.channels_item_category_add);
             if (imageView != null) {
-                i2 = 2131362406;
-                ImageView imageView2 = (ImageView) view.findViewById(2131362406);
+                i2 = R.id.channels_item_category_arrow;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.channels_item_category_arrow);
                 if (imageView2 != null) {
-                    i2 = 2131362407;
-                    TextView textView = (TextView) view.findViewById(2131362407);
+                    i2 = R.id.channels_item_category_name;
+                    TextView textView = (TextView) view.findViewById(R.id.channels_item_category_name);
                     if (textView != null) {
                         WidgetChannelsListItemCategoryBinding widgetChannelsListItemCategoryBinding = new WidgetChannelsListItemCategoryBinding((LinearLayout) view, imageView, imageView2, textView);
                         m.checkNotNullExpressionValue(widgetChannelsListItemCategoryBinding, "WidgetChannelsListItemCa…oryBinding.bind(itemView)");
@@ -272,8 +277,8 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             objArr[0] = AnimatableValueParser.y0(channelListItemCategory.getChannel());
             TextView textView4 = this.binding.d;
             m.checkNotNullExpressionValue(textView4, "binding.channelsItemCategoryName");
-            objArr[1] = b.j(textView4, channelListItemCategory.isCollapsed() ? 2131887433 : 2131888493, new Object[0], null, 4);
-            textView2.setContentDescription(b.j(textView3, 2131887217, objArr, null, 4));
+            objArr[1] = b.j(textView4, channelListItemCategory.isCollapsed() ? R.string.collapsed : R.string.expanded, new Object[0], null, 4);
+            textView2.setContentDescription(b.j(textView3, R.string.category_a11y_label_with_expanded_state, objArr, null, 4));
             Companion companion = Companion;
             TextView textView5 = this.binding.d;
             m.checkNotNullExpressionValue(textView5, "binding.channelsItemCategoryName");
@@ -324,7 +329,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullParameter(channelListItem, "data");
             super.onConfigure(i, (int) channelListItem);
             ChannelListItemDirectory channelListItemDirectory = (ChannelListItemDirectory) channelListItem;
-            this.binding.f1727c.setText(2131890476);
+            this.binding.f1727c.setText(R.string.hub_sidebar_join_servers);
             LinearLayout linearLayout = this.binding.a;
             linearLayout.setOnClickListener(new WidgetChannelsListAdapter$ItemChannelDirectory$onConfigure$$inlined$apply$lambda$1(this, channelListItemDirectory));
             linearLayout.setSelected(channelListItemDirectory.getSelected());
@@ -340,23 +345,23 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362300;
-            StatusView statusView = (StatusView) view.findViewById(2131362300);
+            int i2 = R.id.channel_list_item_private_status;
+            StatusView statusView = (StatusView) view.findViewById(R.id.channel_list_item_private_status);
             if (statusView != null) {
-                i2 = 2131362441;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362441);
+                i2 = R.id.channels_list_item_private_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channels_list_item_private_avatar);
                 if (simpleDraweeView != null) {
-                    i2 = 2131362442;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131362442);
+                    i2 = R.id.channels_list_item_private_desc;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.channels_list_item_private_desc);
                     if (simpleDraweeSpanTextView != null) {
-                        i2 = 2131362443;
-                        TextView textView = (TextView) view.findViewById(2131362443);
+                        i2 = R.id.channels_list_item_private_mentions;
+                        TextView textView = (TextView) view.findViewById(R.id.channels_list_item_private_mentions);
                         if (textView != null) {
-                            i2 = 2131362444;
-                            TextView textView2 = (TextView) view.findViewById(2131362444);
+                            i2 = R.id.channels_list_item_private_name;
+                            TextView textView2 = (TextView) view.findViewById(R.id.channels_list_item_private_name);
                             if (textView2 != null) {
-                                i2 = 2131362445;
-                                TextView textView3 = (TextView) view.findViewById(2131362445);
+                                i2 = R.id.channels_list_item_private_tag;
+                                TextView textView3 = (TextView) view.findViewById(R.id.channels_list_item_private_tag);
                                 if (textView3 != null) {
                                     WidgetChannelsListItemChannelPrivateBinding widgetChannelsListItemChannelPrivateBinding = new WidgetChannelsListItemChannelPrivateBinding((RelativeLayout) view, statusView, simpleDraweeView, simpleDraweeSpanTextView, textView, textView2, textView3);
                                     m.checkNotNullExpressionValue(widgetChannelsListItemChannelPrivateBinding, "WidgetChannelsListItemCh…ateBinding.bind(itemView)");
@@ -379,19 +384,19 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (AnimatableValueParser.k1(channelListItemPrivate.getChannel()) && channelListItemPrivate.getMentionCount() > 0) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return b.j(view, 2131889209, new Object[]{charSequence}, null, 4);
+                return b.j(view, R.string.group_message_a11y_label_with_unreads, new Object[]{charSequence}, null, 4);
             } else if (AnimatableValueParser.k1(channelListItemPrivate.getChannel())) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return b.j(view2, 2131889208, new Object[]{charSequence}, null, 4);
+                return b.j(view2, R.string.group_message_a11y_label, new Object[]{charSequence}, null, 4);
             } else if (channelListItemPrivate.getMentionCount() > 0) {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return b.j(view3, 2131888140, new Object[]{charSequence}, null, 4);
+                return b.j(view3, R.string.direct_message_a11y_label_with_unreads, new Object[]{charSequence}, null, 4);
             } else {
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                return b.j(view4, 2131888139, new Object[]{charSequence}, null, 4);
+                return b.j(view4, R.string.direct_message_a11y_label, new Object[]{charSequence}, null, 4);
             }
         }
 
@@ -400,7 +405,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
         private final String getMemberCount(Channel channel, Context context) {
             List<com.discord.api.user.User> w = channel.w();
             int size = w != null ? w.size() : 0;
-            CharSequence h = b.h(context, 2131891455, new Object[0], null, 4);
+            CharSequence h = b.h(context, R.string.members, new Object[0], null, 4);
             StringBuilder sb = new StringBuilder();
             sb.append(size + 1);
             sb.append(' ');
@@ -412,11 +417,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (z2) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return ColorCompat.getThemedColor(view, 2130968994);
+                return ColorCompat.getThemedColor(view, (int) R.attr.color_bg_private_channel_presence_selected);
             }
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            return ColorCompat.getThemedColor(view2, 2130968905);
+            return ColorCompat.getThemedColor(view2, (int) R.attr.colorBackgroundSecondary);
         }
 
         @ColorInt
@@ -424,15 +429,15 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (channelListItemPrivate.getSelected()) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return ColorCompat.getThemedColor(view, 2130968946);
+                return ColorCompat.getThemedColor(view, (int) R.attr.colorInteractiveActive);
             } else if (channelListItemPrivate.getMuted()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return ColorCompat.getThemedColor(view2, 2130968948);
+                return ColorCompat.getThemedColor(view2, (int) R.attr.colorInteractiveMuted);
             } else {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return ColorCompat.getThemedColor(view3, 2130968910);
+                return ColorCompat.getThemedColor(view3, (int) R.attr.colorChannelDefault);
             }
         }
 
@@ -478,7 +483,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             textView3.setVisibility(AnimatableValueParser.y1(component1) ? 0 : 8);
             SimpleDraweeView simpleDraweeView = this.binding.f1724c;
             m.checkNotNullExpressionValue(simpleDraweeView, "it");
-            IconUtils.setIcon$default(simpleDraweeView, component1, 2131165297, null, 8, null);
+            IconUtils.setIcon$default(simpleDraweeView, component1, R.dimen.avatar_size_standard, null, 8, null);
             StatusView statusView = this.binding.b;
             m.checkNotNullExpressionValue(statusView, "binding.channelListItemPrivateStatus");
             statusView.setVisibility(AnimatableValueParser.h1(component1) && !AnimatableValueParser.y1(component1) ? 0 : 8);
@@ -489,7 +494,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.channelsListItemPrivateDesc");
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.d;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.channelsListItemPrivateDesc");
-                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.j(simpleDraweeSpanTextView2, 2131894145, new Object[0], null, 4));
+                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.j(simpleDraweeSpanTextView2, R.string.system_dm_activity_text, new Object[0], null, 4));
             } else if (AnimatableValueParser.r1(component1)) {
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.binding.d;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.channelsListItemPrivateDesc");
@@ -556,7 +561,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
 
             @ColorInt
             private final int getVoiceChannelColor(boolean z2, Context context) {
-                return z2 ? ColorCompat.getThemedColor(context, 2130968946) : ColorCompat.getThemedColor(context, 2130968910);
+                return z2 ? ColorCompat.getThemedColor(context, (int) R.attr.colorInteractiveActive) : ColorCompat.getThemedColor(context, (int) R.attr.colorChannelDefault);
             }
         }
 
@@ -565,14 +570,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131365235;
-            ImageView imageView = (ImageView) view.findViewById(2131365235);
+            int i2 = R.id.stage_channel_item_stage_channel_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.stage_channel_item_stage_channel_icon);
             if (imageView != null) {
-                i2 = 2131365236;
-                TextView textView = (TextView) view.findViewById(2131365236);
+                i2 = R.id.stage_channel_item_voice_channel_name;
+                TextView textView = (TextView) view.findViewById(R.id.stage_channel_item_voice_channel_name);
                 if (textView != null) {
-                    i2 = 2131365237;
-                    TextView textView2 = (TextView) view.findViewById(2131365237);
+                    i2 = R.id.stage_channel_item_voice_channel_topic;
+                    TextView textView2 = (TextView) view.findViewById(R.id.stage_channel_item_voice_channel_topic);
                     if (textView2 != null) {
                         WidgetChannelsListItemChannelStageVoiceBinding widgetChannelsListItemChannelStageVoiceBinding = new WidgetChannelsListItemChannelStageVoiceBinding((RelativeLayout) view, imageView, textView, textView2);
                         m.checkNotNullExpressionValue(widgetChannelsListItemChannelStageVoiceBinding, "WidgetChannelsListItemCh…iceBinding.bind(itemView)");
@@ -592,7 +597,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (i > 0) {
                 RelativeLayout relativeLayout = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.root");
-                return b.j(relativeLayout, 2131890140, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), Integer.valueOf(channelListVocalItem.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
+                return b.j(relativeLayout, R.string.guild_sidebar_voice_channel_a11y_label_with_limit, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), Integer.valueOf(channelListVocalItem.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
             } else if (channelListVocalItem.getNumUsersConnected() > 0) {
                 RelativeLayout relativeLayout2 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout2, "binding.root");
@@ -600,11 +605,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 m.checkNotNullExpressionValue(relativeLayout3, "binding.root");
                 Context context = relativeLayout3.getContext();
                 m.checkNotNullExpressionValue(context, "binding.root.context");
-                return b.j(relativeLayout2, 2131890141, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, 2131755180, channelListVocalItem.getNumUsersConnected(), Integer.valueOf(channelListVocalItem.getNumUsersConnected()))}, null, 4);
+                return b.j(relativeLayout2, R.string.guild_sidebar_voice_channel_a11y_label_with_users, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_sidebar_voice_channel_a11y_label_with_users_userCount, channelListVocalItem.getNumUsersConnected(), Integer.valueOf(channelListVocalItem.getNumUsersConnected()))}, null, 4);
             } else {
                 RelativeLayout relativeLayout4 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout4, "binding.root");
-                return b.j(relativeLayout4, 2131890139, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel())}, null, 4);
+                return b.j(relativeLayout4, R.string.guild_sidebar_voice_channel_a11y_label, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel())}, null, 4);
             }
         }
 
@@ -622,7 +627,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             boolean z2 = true;
             int i2 = 0;
             boolean z3 = component6 != null;
-            boolean can = PermissionUtils.can(1048576, component3);
+            boolean can = PermissionUtils.can(Permission.CONNECT, component3);
             Companion companion = Companion;
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
@@ -648,7 +653,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             }
             textView2.setVisibility(i2);
             textView2.setText(component6 != null ? component6.f() : null);
-            int i3 = !can ? 2131231511 : component4 ? 2131231518 : 2131231514;
+            int i3 = !can ? R.drawable.ic_channel_lock_16dp : component4 ? R.drawable.ic_channel_stage_locked : R.drawable.ic_channel_stage_24dp;
             ImageView imageView = this.binding.b;
             imageView.setImageResource(i3);
             if (!z3 || !can) {
@@ -656,7 +661,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             } else {
                 RelativeLayout relativeLayout3 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout3, "binding.root");
-                colorStateList = ColorStateList.valueOf(ColorCompat.getColor(relativeLayout3.getContext(), 2131100254));
+                colorStateList = ColorStateList.valueOf(ColorCompat.getColor(relativeLayout3.getContext(), (int) R.color.status_green_600));
             }
             imageView.setImageTintList(colorStateList);
             RelativeLayout relativeLayout4 = this.binding.a;
@@ -677,17 +682,17 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362408;
-            ImageView imageView = (ImageView) view.findViewById(2131362408);
+            int i2 = R.id.channels_item_channel_hash;
+            ImageView imageView = (ImageView) view.findViewById(R.id.channels_item_channel_hash);
             if (imageView != null) {
-                i2 = 2131362409;
-                TextView textView = (TextView) view.findViewById(2131362409);
+                i2 = R.id.channels_item_channel_mentions;
+                TextView textView = (TextView) view.findViewById(R.id.channels_item_channel_mentions);
                 if (textView != null) {
-                    i2 = 2131362410;
-                    TextView textView2 = (TextView) view.findViewById(2131362410);
+                    i2 = R.id.channels_item_channel_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.channels_item_channel_name);
                     if (textView2 != null) {
-                        i2 = 2131362411;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131362411);
+                        i2 = R.id.channels_item_channel_unread;
+                        ImageView imageView2 = (ImageView) view.findViewById(R.id.channels_item_channel_unread);
                         if (imageView2 != null) {
                             WidgetChannelsListItemChannelBinding widgetChannelsListItemChannelBinding = new WidgetChannelsListItemChannelBinding((RelativeLayout) view, imageView, textView, textView2, imageView2);
                             m.checkNotNullExpressionValue(widgetChannelsListItemChannelBinding, "WidgetChannelsListItemCh…nelBinding.bind(itemView)");
@@ -706,34 +711,34 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
 
         @DrawableRes
         private final int getAnnouncementsIcon(ChannelListItemTextChannel channelListItemTextChannel) {
-            return channelListItemTextChannel.getChannel().o() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231510 : 2131231507 : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231509 : 2131231506 : channelListItemTextChannel.getHasActiveThreads() ? 2131231508 : 2131231504;
+            return channelListItemTextChannel.getChannel().o() ? channelListItemTextChannel.getHasActiveThreads() ? R.drawable.ic_channel_announcements_thread_nsfw : R.drawable.ic_channel_announcements_nsfw : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? R.drawable.ic_channel_announcements_thread_locked : R.drawable.ic_channel_announcements_locked : channelListItemTextChannel.getHasActiveThreads() ? R.drawable.ic_channel_announcements_thread : R.drawable.ic_channel_announcements;
         }
 
         private final CharSequence getContentDescription(ChannelListItemTextChannel channelListItemTextChannel, boolean z2) {
             if (z2 && channelListItemTextChannel.getMentionCount() > 0) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return b.j(view, 2131890127, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755176, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.j(view, R.string.guild_sidebar_announcement_channel_a11y_label_with_mentions, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.guild_sidebar_announcement_channel_a11y_label_with_mentions_mentionCount, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (z2 && channelListItemTextChannel.isUnread()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return b.j(view2, 2131890128, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.j(view2, R.string.guild_sidebar_announcement_channel_a11y_label_with_unreads, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (z2) {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return b.j(view3, 2131890126, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.j(view3, R.string.guild_sidebar_announcement_channel_a11y_label, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (channelListItemTextChannel.getMentionCount() > 0) {
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                return b.j(view4, 2131890130, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755177, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.j(view4, R.string.guild_sidebar_default_channel_a11y_label_with_mentions, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.guild_sidebar_default_channel_a11y_label_with_mentions_mentionCount, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (channelListItemTextChannel.isUnread()) {
                 View view5 = this.itemView;
                 m.checkNotNullExpressionValue(view5, "itemView");
-                return b.j(view5, 2131890131, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.j(view5, R.string.guild_sidebar_default_channel_a11y_label_with_unreads, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else {
                 View view6 = this.itemView;
                 m.checkNotNullExpressionValue(view6, "itemView");
-                return b.j(view6, 2131890129, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.j(view6, R.string.guild_sidebar_default_channel_a11y_label, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             }
         }
 
@@ -742,21 +747,21 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (channelListItemTextChannel.getMuted()) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return ColorCompat.getThemedColor(view, 2130968948);
+                return ColorCompat.getThemedColor(view, (int) R.attr.colorInteractiveMuted);
             } else if (channelListItemTextChannel.isUnread()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return ColorCompat.getThemedColor(view2, 2130968946);
+                return ColorCompat.getThemedColor(view2, (int) R.attr.colorInteractiveActive);
             } else {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return ColorCompat.getThemedColor(view3, 2130968910);
+                return ColorCompat.getThemedColor(view3, (int) R.attr.colorChannelDefault);
             }
         }
 
         @DrawableRes
         private final int getHashIcon(ChannelListItemTextChannel channelListItemTextChannel) {
-            return channelListItemTextChannel.getChannel().o() ? channelListItemTextChannel.getHasActiveThreads() ? 2131232050 : 2131231524 : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? 2131232049 : 2131231523 : channelListItemTextChannel.getHasActiveThreads() ? 2131232047 : 2131231519;
+            return channelListItemTextChannel.getChannel().o() ? channelListItemTextChannel.getHasActiveThreads() ? R.drawable.ic_thread_nsfw : R.drawable.ic_channel_text_nsfw : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? R.drawable.ic_thread_locked : R.drawable.ic_channel_text_locked : channelListItemTextChannel.getHasActiveThreads() ? R.drawable.ic_thread : R.drawable.ic_channel_text;
         }
 
         @ColorInt
@@ -764,19 +769,19 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (z2) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return ColorCompat.getThemedColor(view, 2130968946);
+                return ColorCompat.getThemedColor(view, (int) R.attr.colorInteractiveActive);
             } else if (channelListItemTextChannel.getMuted()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return ColorCompat.getThemedColor(view2, 2130968948);
+                return ColorCompat.getThemedColor(view2, (int) R.attr.colorInteractiveMuted);
             } else if (channelListItemTextChannel.isUnread()) {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return ColorCompat.getThemedColor(view3, 2130968946);
+                return ColorCompat.getThemedColor(view3, (int) R.attr.colorInteractiveActive);
             } else {
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                return ColorCompat.getThemedColor(view4, 2130968910);
+                return ColorCompat.getThemedColor(view4, (int) R.attr.colorChannelDefault);
             }
         }
 
@@ -827,7 +832,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullExpressionValue(relativeLayout4, "binding.root");
             Context context = relativeLayout4.getContext();
             m.checkNotNullExpressionValue(context, "binding.root.context");
-            textView4.setTypeface(fontUtils.getThemedFont(context, (channelListItemTextChannel.isUnread() || channelListItemTextChannel.getSelected()) ? 2130969328 : 2130969327));
+            textView4.setTypeface(fontUtils.getThemedFont(context, (channelListItemTextChannel.isUnread() || channelListItemTextChannel.getSelected()) ? R.attr.font_primary_semibold : R.attr.font_primary_normal));
         }
     }
 
@@ -840,20 +845,20 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362412;
-            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362412);
+            int i2 = R.id.channels_item_thread_content;
+            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.channels_item_thread_content);
             if (constraintLayout != null) {
-                i2 = 2131362413;
-                TextView textView = (TextView) view.findViewById(2131362413);
+                i2 = R.id.channels_item_thread_mentions;
+                TextView textView = (TextView) view.findViewById(R.id.channels_item_thread_mentions);
                 if (textView != null) {
-                    i2 = 2131362414;
-                    TextView textView2 = (TextView) view.findViewById(2131362414);
+                    i2 = R.id.channels_item_thread_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.channels_item_thread_name);
                     if (textView2 != null) {
-                        i2 = 2131362415;
-                        ImageView imageView = (ImageView) view.findViewById(2131362415);
+                        i2 = R.id.channels_item_thread_spine;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.channels_item_thread_spine);
                         if (imageView != null) {
-                            i2 = 2131362416;
-                            ImageView imageView2 = (ImageView) view.findViewById(2131362416);
+                            i2 = R.id.channels_item_thread_unread;
+                            ImageView imageView2 = (ImageView) view.findViewById(R.id.channels_item_thread_unread);
                             if (imageView2 != null) {
                                 WidgetChannelsListItemThreadBinding widgetChannelsListItemThreadBinding = new WidgetChannelsListItemThreadBinding((ConstraintLayout) view, constraintLayout, textView, textView2, imageView, imageView2);
                                 m.checkNotNullExpressionValue(widgetChannelsListItemThreadBinding, "WidgetChannelsListItemThreadBinding.bind(itemView)");
@@ -875,26 +880,20 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (channelListItemThread.getMentionCount() > 0) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return b.j(view, 2131890130, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755177, channelListItemThread.getMentionCount(), Integer.valueOf(channelListItemThread.getMentionCount())), channelListItemThread.getChannel().m()}, null, 4);
+                return b.j(view, R.string.guild_sidebar_default_channel_a11y_label_with_mentions, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.guild_sidebar_default_channel_a11y_label_with_mentions_mentionCount, channelListItemThread.getMentionCount(), Integer.valueOf(channelListItemThread.getMentionCount())), channelListItemThread.getChannel().m()}, null, 4);
             } else if (channelListItemThread.isUnread()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return b.j(view2, 2131890131, new Object[]{channelListItemThread.getChannel().m()}, null, 4);
+                return b.j(view2, R.string.guild_sidebar_default_channel_a11y_label_with_unreads, new Object[]{channelListItemThread.getChannel().m()}, null, 4);
             } else {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return b.j(view3, 2131890129, new Object[]{channelListItemThread.getChannel().m()}, null, 4);
+                return b.j(view3, R.string.guild_sidebar_default_channel_a11y_label, new Object[]{channelListItemThread.getChannel().m()}, null, 4);
             }
         }
 
         private final int getSpineResourceId(WidgetChannelListModel.ThreadSpineType threadSpineType) {
-            if (m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Single.INSTANCE)) {
-                return 2131231998;
-            }
-            if (m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Start.INSTANCE)) {
-                return 2131231996;
-            }
-            return m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.End.INSTANCE) ? 2131231999 : 2131231997;
+            return m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Single.INSTANCE) ? R.drawable.ic_spine_short_cap : m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Start.INSTANCE) ? R.drawable.ic_spine_long_cap : m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.End.INSTANCE) ? R.drawable.ic_spine_short_no_cap : R.drawable.ic_spine_long_no_cap;
         }
 
         @ColorInt
@@ -902,15 +901,15 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (z2) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return ColorCompat.getThemedColor(view, 2130968946);
+                return ColorCompat.getThemedColor(view, (int) R.attr.colorInteractiveActive);
             } else if (channelListItemThread.isUnread()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return ColorCompat.getThemedColor(view2, 2130968946);
+                return ColorCompat.getThemedColor(view2, (int) R.attr.colorInteractiveActive);
             } else {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return ColorCompat.getThemedColor(view3, 2130968910);
+                return ColorCompat.getThemedColor(view3, (int) R.attr.colorChannelDefault);
             }
         }
 
@@ -956,7 +955,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullExpressionValue(constraintLayout4, "binding.root");
             Context context = constraintLayout4.getContext();
             m.checkNotNullExpressionValue(context, "binding.root.context");
-            textView4.setTypeface(fontUtils.getThemedFont(context, (channelListItemThread.isUnread() || channelListItemThread.getSelected()) ? 2130969328 : 2130969327));
+            textView4.setTypeface(fontUtils.getThemedFont(context, (channelListItemThread.isUnread() || channelListItemThread.getSelected()) ? R.attr.font_primary_semibold : R.attr.font_primary_normal));
             this.binding.e.setImageResource(getSpineResourceId(channelListItemThread.getSpineType()));
         }
     }
@@ -981,7 +980,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
 
             @ColorInt
             private final int getVoiceChannelColor(boolean z2, Context context) {
-                return z2 ? ColorCompat.getThemedColor(context, 2130968946) : ColorCompat.getThemedColor(context, 2130968910);
+                return z2 ? ColorCompat.getThemedColor(context, (int) R.attr.colorInteractiveActive) : ColorCompat.getThemedColor(context, (int) R.attr.colorChannelDefault);
             }
         }
 
@@ -990,14 +989,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362417;
-            TextView textView = (TextView) view.findViewById(2131362417);
+            int i2 = R.id.channels_item_voice_channel_name;
+            TextView textView = (TextView) view.findViewById(R.id.channels_item_voice_channel_name);
             if (textView != null) {
-                i2 = 2131362418;
-                ImageView imageView = (ImageView) view.findViewById(2131362418);
+                i2 = R.id.channels_item_voice_channel_speaker;
+                ImageView imageView = (ImageView) view.findViewById(R.id.channels_item_voice_channel_speaker);
                 if (imageView != null) {
-                    i2 = 2131362419;
-                    VoiceUserLimitView voiceUserLimitView = (VoiceUserLimitView) view.findViewById(2131362419);
+                    i2 = R.id.channels_item_voice_channel_user_limit;
+                    VoiceUserLimitView voiceUserLimitView = (VoiceUserLimitView) view.findViewById(R.id.channels_item_voice_channel_user_limit);
                     if (voiceUserLimitView != null) {
                         WidgetChannelsListItemChannelVoiceBinding widgetChannelsListItemChannelVoiceBinding = new WidgetChannelsListItemChannelVoiceBinding((RelativeLayout) view, textView, imageView, voiceUserLimitView);
                         m.checkNotNullExpressionValue(widgetChannelsListItemChannelVoiceBinding, "WidgetChannelsListItemCh…iceBinding.bind(itemView)");
@@ -1017,7 +1016,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (i > 0) {
                 RelativeLayout relativeLayout = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.root");
-                return b.j(relativeLayout, 2131890140, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
+                return b.j(relativeLayout, R.string.guild_sidebar_voice_channel_a11y_label_with_limit, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
             } else if (channelListItemVoiceChannel.getNumUsersConnected() > 0) {
                 RelativeLayout relativeLayout2 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout2, "binding.root");
@@ -1025,11 +1024,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 m.checkNotNullExpressionValue(relativeLayout3, "binding.root");
                 Context context = relativeLayout3.getContext();
                 m.checkNotNullExpressionValue(context, "binding.root.context");
-                return b.j(relativeLayout2, 2131890141, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, 2131755180, channelListItemVoiceChannel.getNumUsersConnected(), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()))}, null, 4);
+                return b.j(relativeLayout2, R.string.guild_sidebar_voice_channel_a11y_label_with_users, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_sidebar_voice_channel_a11y_label_with_users_userCount, channelListItemVoiceChannel.getNumUsersConnected(), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()))}, null, 4);
             } else {
                 RelativeLayout relativeLayout4 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout4, "binding.root");
-                return b.j(relativeLayout4, 2131890139, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel())}, null, 4);
+                return b.j(relativeLayout4, R.string.guild_sidebar_voice_channel_a11y_label, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel())}, null, 4);
             }
         }
 
@@ -1045,7 +1044,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             boolean component5 = channelListItemVoiceChannel.component5();
             boolean component6 = channelListItemVoiceChannel.component6();
             GuildMaxVideoChannelUsers component7 = channelListItemVoiceChannel.component7();
-            boolean can = PermissionUtils.can(1048576, component3);
+            boolean can = PermissionUtils.can(Permission.CONNECT, component3);
             Companion companion = Companion;
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
@@ -1063,7 +1062,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullExpressionValue(textView, "binding.channelsItemVoiceChannelName");
             textView.setText(AnimatableValueParser.y0(component1));
             this.binding.b.setTextColor(access$getVoiceChannelColor);
-            this.binding.f1726c.setImageResource(!can ? 2131231511 : component5 ? 2131231531 : 2131231528);
+            this.binding.f1726c.setImageResource(!can ? R.drawable.ic_channel_lock_16dp : component5 ? R.drawable.ic_channel_voice_locked : R.drawable.ic_channel_voice);
             ImageView imageView = this.binding.f1726c;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemVoiceChannelSpeaker");
             imageView.setImageTintList(ColorStateList.valueOf(access$getVoiceChannelColor));
@@ -1122,14 +1121,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362436;
-            TextView textView = (TextView) view.findViewById(2131362436);
+            int i2 = R.id.channels_list_item_guild_scheduled_event_count;
+            TextView textView = (TextView) view.findViewById(R.id.channels_list_item_guild_scheduled_event_count);
             if (textView != null) {
-                i2 = 2131362437;
-                ImageView imageView = (ImageView) view.findViewById(2131362437);
+                i2 = R.id.channels_list_item_guild_scheduled_event_icon;
+                ImageView imageView = (ImageView) view.findViewById(R.id.channels_list_item_guild_scheduled_event_icon);
                 if (imageView != null) {
-                    i2 = 2131362438;
-                    TextView textView2 = (TextView) view.findViewById(2131362438);
+                    i2 = R.id.channels_list_item_guild_scheduled_event_label;
+                    TextView textView2 = (TextView) view.findViewById(R.id.channels_list_item_guild_scheduled_event_label);
                     if (textView2 != null) {
                         WidgetChannelsListItemGuildScheduledEventsBinding widgetChannelsListItemGuildScheduledEventsBinding = new WidgetChannelsListItemGuildScheduledEventsBinding((ConstraintLayout) view, textView, imageView, textView2);
                         m.checkNotNullExpressionValue(widgetChannelsListItemGuildScheduledEventsBinding, "WidgetChannelsListItemGu…ntsBinding.bind(itemView)");
@@ -1165,11 +1164,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362439;
-            TextView textView = (TextView) view.findViewById(2131362439);
+            int i2 = R.id.channels_list_item_header;
+            TextView textView = (TextView) view.findViewById(R.id.channels_list_item_header);
             if (textView != null) {
-                i2 = 2131362461;
-                ImageView imageView = (ImageView) view.findViewById(2131362461);
+                i2 = R.id.channels_list_new;
+                ImageView imageView = (ImageView) view.findViewById(R.id.channels_list_new);
                 if (imageView != null) {
                     WidgetChannelsListItemHeaderBinding widgetChannelsListItemHeaderBinding = new WidgetChannelsListItemHeaderBinding((RelativeLayout) view, textView, imageView);
                     m.checkNotNullExpressionValue(widgetChannelsListItemHeaderBinding, "WidgetChannelsListItemHeaderBinding.bind(itemView)");
@@ -1192,17 +1191,17 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 m.checkNotNullExpressionValue(imageView, "binding.channelsListNew");
                 imageView.setVisibility(4);
                 this.binding.f1728c.setOnClickListener(null);
-            } else if (component2 == 2131892034) {
+            } else if (component2 == R.string.others_online) {
                 ImageView imageView2 = this.binding.f1728c;
                 m.checkNotNullExpressionValue(imageView2, "binding.channelsListNew");
                 imageView2.setVisibility(4);
                 this.binding.f1728c.setOnClickListener(null);
-            } else if (component2 == 2131894255) {
+            } else if (component2 == R.string.text_channels) {
                 ImageView imageView3 = this.binding.f1728c;
                 m.checkNotNullExpressionValue(imageView3, "binding.channelsListNew");
                 imageView3.setVisibility(0);
                 this.binding.f1728c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$1(component4));
-            } else if (component2 == 2131895000) {
+            } else if (component2 == R.string.voice_channels) {
                 ImageView imageView4 = this.binding.f1728c;
                 m.checkNotNullExpressionValue(imageView4, "binding.channelsListNew");
                 imageView4.setVisibility(0);
@@ -1235,8 +1234,8 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 if (((ChannelListItemInvite) channelListItem).isHub()) {
                     WidgetChannelsListItemDirectoryBinding a = WidgetChannelsListItemDirectoryBinding.a(this.itemView);
                     m.checkNotNullExpressionValue(a, "WidgetChannelsListItemDi…oryBinding.bind(itemView)");
-                    a.f1727c.setText(2131890775);
-                    a.b.setImageResource(2131231711);
+                    a.f1727c.setText(R.string.invite_a_friend);
+                    a.b.setImageResource(R.drawable.ic_guild_invite_24dp);
                 }
             }
         }
@@ -1251,14 +1250,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362440);
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.channels_list_item_mfa_text);
             if (linkifiedTextView != null) {
                 WidgetChannelsListItemMfaBinding widgetChannelsListItemMfaBinding = new WidgetChannelsListItemMfaBinding((LinearLayout) view, linkifiedTextView);
                 m.checkNotNullExpressionValue(widgetChannelsListItemMfaBinding, "WidgetChannelsListItemMfaBinding.bind(itemView)");
                 this.binding = widgetChannelsListItemMfaBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362440)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.channels_list_item_mfa_text)));
         }
 
         public void onConfigure(int i, ChannelListItem channelListItem) {
@@ -1266,7 +1265,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super.onConfigure(i, (int) channelListItem);
             LinkifiedTextView linkifiedTextView = this.binding.b;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.channelsListItemMfaText");
-            b.m(linkifiedTextView, 2131894449, new Object[0], WidgetChannelsListAdapter$ItemMFA$onConfigure$1.INSTANCE);
+            b.m(linkifiedTextView, R.string.two_fa_guild_mfa_warning, new Object[0], WidgetChannelsListAdapter$ItemMFA$onConfigure$1.INSTANCE);
         }
     }
 
@@ -1328,32 +1327,32 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362360;
-            ImageView imageView = (ImageView) view.findViewById(2131362360);
+            int i2 = R.id.channel_separator;
+            ImageView imageView = (ImageView) view.findViewById(R.id.channel_separator);
             if (imageView != null) {
-                i2 = 2131363972;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363972);
+                i2 = R.id.live_now_dot;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.live_now_dot);
                 if (imageView2 != null) {
-                    i2 = 2131363973;
-                    TextView textView = (TextView) view.findViewById(2131363973);
+                    i2 = R.id.live_now_label;
+                    TextView textView = (TextView) view.findViewById(R.id.live_now_label);
                     if (textView != null) {
-                        i2 = 2131365257;
-                        TextView textView2 = (TextView) view.findViewById(2131365257);
+                        i2 = R.id.stage_event_channel;
+                        TextView textView2 = (TextView) view.findViewById(R.id.stage_event_channel);
                         if (textView2 != null) {
-                            i2 = 2131365258;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365258);
+                            i2 = R.id.stage_event_listen_button;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.stage_event_listen_button);
                             if (materialButton != null) {
-                                i2 = 2131365259;
-                                TextView textView3 = (TextView) view.findViewById(2131365259);
+                                i2 = R.id.stage_event_listeners;
+                                TextView textView3 = (TextView) view.findViewById(R.id.stage_event_listeners);
                                 if (textView3 != null) {
-                                    i2 = 2131365260;
-                                    TextView textView4 = (TextView) view.findViewById(2131365260);
+                                    i2 = R.id.stage_event_topic;
+                                    TextView textView4 = (TextView) view.findViewById(R.id.stage_event_topic);
                                     if (textView4 != null) {
-                                        i2 = 2131365753;
-                                        UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131365753);
+                                        i2 = R.id.user_summary;
+                                        UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(R.id.user_summary);
                                         if (userSummaryView != null) {
-                                            i2 = 2131365754;
-                                            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131365754);
+                                            i2 = R.id.user_summary_label;
+                                            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.user_summary_label);
                                             if (materialTextView != null) {
                                                 WidgetChannelsListItemActiveStageEventBinding widgetChannelsListItemActiveStageEventBinding = new WidgetChannelsListItemActiveStageEventBinding((ConstraintLayout) view, imageView, imageView2, textView, textView2, materialButton, textView3, textView4, userSummaryView, materialTextView);
                                                 m.checkNotNullExpressionValue(widgetChannelsListItemActiveStageEventBinding, "WidgetChannelsListItemAc…entBinding.bind(itemView)");
@@ -1393,7 +1392,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             textView2.setText(AnimatableValueParser.A0(channel, context, false, 2));
             TextView textView3 = this.binding.d;
             m.checkNotNullExpressionValue(textView3, "binding.stageEventListeners");
-            b.n(textView3, 2131891119, new Object[]{Integer.valueOf(audienceSize)}, null, 4);
+            b.n(textView3, R.string.listening_count, new Object[]{Integer.valueOf(audienceSize)}, null, 4);
             UserSummaryView userSummaryView = this.binding.f;
             int i3 = 8;
             userSummaryView.setVisibility(data.getSpeakers().isEmpty() ^ true ? 0 : 8);
@@ -1409,7 +1408,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 if (data.getSpeakers().size() != 1) {
                     Context context2 = materialTextView.getContext();
                     m.checkNotNullExpressionValue(context2, "context");
-                    charSequence = b.j(materialTextView, 2131894873, new Object[]{data.getSpeakers().get(0).getUser().getUsername(), StringResourceUtilsKt.getI18nPluralString(context2, 2131755366, data.getSpeakers().size() - 1, Integer.valueOf(data.getSpeakers().size() - 1))}, null, 4);
+                    charSequence = b.j(materialTextView, R.string.user_summary_with_others, new Object[]{data.getSpeakers().get(0).getUser().getUsername(), StringResourceUtilsKt.getI18nPluralString(context2, R.plurals.user_summary_with_others_count, data.getSpeakers().size() - 1, Integer.valueOf(data.getSpeakers().size() - 1))}, null, 4);
                 } else {
                     charSequence = data.getSpeakers().get(0).getUser().getUsername();
                 }
@@ -1417,10 +1416,10 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             }
             MaterialButton materialButton = this.binding.f1721c;
             if (!data.getContainsMe()) {
-                i2 = 2131893738;
+                i2 = R.string.stage_channel_join_button;
             } else {
                 StageRoles r12 = data.m43getMyRolestwRsX0();
-                i2 = (r12 == null || !StageRoles.m26isSpeakerimpl(r12.m28unboximpl())) ? 2131893739 : 2131893740;
+                i2 = (r12 == null || !StageRoles.m26isSpeakerimpl(r12.m28unboximpl())) ? R.string.stage_channel_joined_audience_button : R.string.stage_channel_joined_speaker_button;
             }
             materialButton.setText(i2);
         }
@@ -1435,11 +1434,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131365220;
-            ImageView imageView = (ImageView) view.findViewById(2131365220);
+            int i2 = R.id.stage_channel_audience_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.stage_channel_audience_icon);
             if (imageView != null) {
-                i2 = 2131365246;
-                TextView textView = (TextView) view.findViewById(2131365246);
+                i2 = R.id.stage_channels_audience_count;
+                TextView textView = (TextView) view.findViewById(R.id.stage_channels_audience_count);
                 if (textView != null) {
                     WidgetChannelsListItemAudienceCountBinding widgetChannelsListItemAudienceCountBinding = new WidgetChannelsListItemAudienceCountBinding((RelativeLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(widgetChannelsListItemAudienceCountBinding, "WidgetChannelsListItemAu…untBinding.bind(itemView)");
@@ -1456,9 +1455,9 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             ChannelListItemStageAudienceCount channelListItemStageAudienceCount = (ChannelListItemStageAudienceCount) channelListItem;
             TextView textView = this.binding.b;
             if (channelListItemStageAudienceCount.getAudienceSize() != 0) {
-                b.n(textView, 2131893723, new Object[]{Integer.valueOf(channelListItemStageAudienceCount.getAudienceSize())}, null, 4);
+                b.n(textView, R.string.stage_channel_audience_count, new Object[]{Integer.valueOf(channelListItemStageAudienceCount.getAudienceSize())}, null, 4);
             } else {
-                textView.setText(2131893744);
+                textView.setText(R.string.stage_channel_no_audience);
             }
         }
     }
@@ -1472,26 +1471,26 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362420;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362420);
+            int i2 = R.id.channels_item_voice_user_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channels_item_voice_user_avatar);
             if (simpleDraweeView != null) {
-                i2 = 2131362421;
-                ImageView imageView = (ImageView) view.findViewById(2131362421);
+                i2 = R.id.channels_item_voice_user_camera;
+                ImageView imageView = (ImageView) view.findViewById(R.id.channels_item_voice_user_camera);
                 if (imageView != null) {
-                    i2 = 2131362422;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131362422);
+                    i2 = R.id.channels_item_voice_user_headphones;
+                    ImageView imageView2 = (ImageView) view.findViewById(R.id.channels_item_voice_user_headphones);
                     if (imageView2 != null) {
-                        i2 = 2131362423;
-                        TextView textView = (TextView) view.findViewById(2131362423);
+                        i2 = R.id.channels_item_voice_user_live;
+                        TextView textView = (TextView) view.findViewById(R.id.channels_item_voice_user_live);
                         if (textView != null) {
-                            i2 = 2131362424;
-                            ImageView imageView3 = (ImageView) view.findViewById(2131362424);
+                            i2 = R.id.channels_item_voice_user_microphone;
+                            ImageView imageView3 = (ImageView) view.findViewById(R.id.channels_item_voice_user_microphone);
                             if (imageView3 != null) {
-                                i2 = 2131362425;
-                                TextView textView2 = (TextView) view.findViewById(2131362425);
+                                i2 = R.id.channels_item_voice_user_name;
+                                TextView textView2 = (TextView) view.findViewById(R.id.channels_item_voice_user_name);
                                 if (textView2 != null) {
-                                    i2 = 2131363782;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363782);
+                                    i2 = R.id.indicators_container;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.indicators_container);
                                     if (linearLayout != null) {
                                         WidgetChannelsListItemVoiceUserBinding widgetChannelsListItemVoiceUserBinding = new WidgetChannelsListItemVoiceUserBinding((RelativeLayout) view, simpleDraweeView, imageView, imageView2, textView, imageView3, textView2, linearLayout);
                                         m.checkNotNullExpressionValue(widgetChannelsListItemVoiceUserBinding, "WidgetChannelsListItemVo…serBinding.bind(itemView)");
@@ -1523,7 +1522,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             boolean component6 = channelListItemVoiceUser.component6();
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.channelsItemVoiceUserAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, component3, 2131165296, null, null, channelListItemVoiceUser.getComputed(), 24, null);
+            IconUtils.setIcon$default(simpleDraweeView, component3, R.dimen.avatar_size_small, null, null, channelListItemVoiceUser.getComputed(), 24, null);
             RelativeLayout relativeLayout = this.binding.a;
             m.checkNotNullExpressionValue(relativeLayout, "binding.root");
             ViewExtensions.setOnLongClickListenerConsumeClick(relativeLayout, new WidgetChannelsListAdapter$ItemVoiceUser$onConfigure$1(this, channelListItem));
@@ -1632,46 +1631,46 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
         m.checkNotNullParameter(viewGroup, "parent");
         switch (i) {
             case 0:
-                return new ItemChannelText(2131558924, this);
+                return new ItemChannelText(R.layout.widget_channels_list_item_channel, this);
             case 1:
-                return new ItemChannelVoice(2131558927, this);
+                return new ItemChannelVoice(R.layout.widget_channels_list_item_channel_voice, this);
             case 2:
-                return new ItemVoiceUser(2131558936, this);
+                return new ItemVoiceUser(R.layout.widget_channels_list_item_voice_user, this);
             case 3:
-                return new ItemChannelPrivate(2131558925, this);
+                return new ItemChannelPrivate(R.layout.widget_channels_list_item_channel_private, this);
             case 4:
             case 5:
             case 10:
             default:
                 throw invalidViewTypeException(i);
             case 6:
-                return new ItemHeader(2131558930, this);
+                return new ItemHeader(R.layout.widget_channels_list_item_header, this);
             case 7:
-                return new ItemMFA(2131558932, this);
+                return new ItemMFA(R.layout.widget_channels_list_item_mfa, this);
             case 8:
-                return new ItemChannelCategory(2131558923, this);
+                return new ItemChannelCategory(R.layout.widget_channels_list_item_category, this);
             case 9:
-                return new ItemInvite(2131558931, this);
+                return new ItemInvite(R.layout.widget_channels_list_item_invite, this);
             case 11:
-                return new ItemSpace(2131558660, this);
+                return new ItemSpace(R.layout.recycler_item_bottom_nav_space, this);
             case 12:
-                return new ItemChannelThread(2131558934, this);
+                return new ItemChannelThread(R.layout.widget_channels_list_item_thread, this);
             case 13:
-                return new ItemChannelStageVoice(2131558926, this);
+                return new ItemChannelStageVoice(R.layout.widget_channels_list_item_channel_stage_voice, this);
             case 14:
-                return new MGRecyclerViewHolder<>(2131558933, this);
+                return new MGRecyclerViewHolder<>((int) R.layout.widget_channels_list_item_stage_events_separator, this);
             case 15:
-                return new ItemStageActiveEvent(2131558921, this);
+                return new ItemStageActiveEvent(R.layout.widget_channels_list_item_active_stage_event, this);
             case 16:
-                return new ItemStageChannelAudienceCount(2131558922, this);
+                return new ItemStageChannelAudienceCount(R.layout.widget_channels_list_item_audience_count, this);
             case 17:
-                return new ItemChannelDirectory(2131558928, this);
+                return new ItemChannelDirectory(R.layout.widget_channels_list_item_directory, this);
             case 18:
-                return new ItemChannelAddServer(2131558928, this);
+                return new ItemChannelAddServer(R.layout.widget_channels_list_item_directory, this);
             case 19:
-                return new ItemGuildScheduledEvents(2131558929, this);
+                return new ItemGuildScheduledEvents(R.layout.widget_channels_list_item_guild_scheduled_events, this);
             case 20:
-                return new ItemInvite(2131558928, this);
+                return new ItemInvite(R.layout.widget_channels_list_item_directory, this);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java
index bea9fe3663..f4a2ab3294 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.list;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelsListItemActionsBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.k;
@@ -18,38 +19,38 @@ public final /* synthetic */ class WidgetChannelsListItemChannelActions$binding$
 
     public final WidgetChannelsListItemActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361875;
-        TextView textView = (TextView) view.findViewById(2131361875);
+        int i = R.id.action_channel_notifications;
+        TextView textView = (TextView) view.findViewById(R.id.action_channel_notifications);
         if (textView != null) {
-            i = 2131361876;
-            TextView textView2 = (TextView) view.findViewById(2131361876);
+            i = R.id.action_channel_settings;
+            TextView textView2 = (TextView) view.findViewById(R.id.action_channel_settings);
             if (textView2 != null) {
-                i = 2131361879;
-                TextView textView3 = (TextView) view.findViewById(2131361879);
+                i = R.id.action_copy_id;
+                TextView textView3 = (TextView) view.findViewById(R.id.action_copy_id);
                 if (textView3 != null) {
-                    i = 2131361882;
-                    TextView textView4 = (TextView) view.findViewById(2131361882);
+                    i = R.id.action_invite;
+                    TextView textView4 = (TextView) view.findViewById(R.id.action_invite);
                     if (textView4 != null) {
-                        i = 2131362446;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362446);
+                        i = R.id.channels_list_item_text_actions_icon;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channels_list_item_text_actions_icon);
                         if (simpleDraweeView != null) {
-                            i = 2131362447;
-                            TextView textView5 = (TextView) view.findViewById(2131362447);
+                            i = R.id.channels_list_item_text_actions_title;
+                            TextView textView5 = (TextView) view.findViewById(R.id.channels_list_item_text_actions_title);
                             if (textView5 != null) {
-                                i = 2131362913;
-                                View findViewById = view.findViewById(2131362913);
+                                i = R.id.developer_divider;
+                                View findViewById = view.findViewById(R.id.developer_divider);
                                 if (findViewById != null) {
-                                    i = 2131363029;
-                                    TextView textView6 = (TextView) view.findViewById(2131363029);
+                                    i = R.id.dm_action_profile;
+                                    TextView textView6 = (TextView) view.findViewById(R.id.dm_action_profile);
                                     if (textView6 != null) {
-                                        i = 2131365470;
-                                        TextView textView7 = (TextView) view.findViewById(2131365470);
+                                        i = R.id.text_action_mark_as_read;
+                                        TextView textView7 = (TextView) view.findViewById(R.id.text_action_mark_as_read);
                                         if (textView7 != null) {
-                                            i = 2131365471;
-                                            TextView textView8 = (TextView) view.findViewById(2131365471);
+                                            i = R.id.text_action_mute;
+                                            TextView textView8 = (TextView) view.findViewById(R.id.text_action_mute);
                                             if (textView8 != null) {
-                                                i = 2131365472;
-                                                TextView textView9 = (TextView) view.findViewById(2131365472);
+                                                i = R.id.text_action_thread_browser;
+                                                TextView textView9 = (TextView) view.findViewById(R.id.text_action_thread_browser);
                                                 if (textView9 != null) {
                                                     return new WidgetChannelsListItemActionsBinding((NestedScrollView) view, textView, textView2, textView3, textView4, simpleDraweeView, textView5, findViewById, textView6, textView7, textView8, textView9);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
index 0d40413c4d..06b1ee8801 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetChannelsListItemActionsBinding;
@@ -52,7 +53,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetChannelsListItemChannelActions widgetChannelsListItemChannelActions = new WidgetChannelsListItemChannelActions();
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_EXTRA_CHANNEL_ID", j);
+            bundle.putLong(WidgetChannelsListItemChannelActions.INTENT_EXTRA_CHANNEL_ID, j);
             widgetChannelsListItemChannelActions.setArguments(bundle);
             widgetChannelsListItemChannelActions.show(fragmentManager, WidgetChannelsListItemChannelActions.class.getName());
         }
@@ -172,12 +173,12 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
 
         public final CharSequence getMuteChannelText(Context context) {
             m.checkNotNullParameter(context, "context");
-            return this.isMuted ? b.h(context, 2131894504, new Object[0], null, 4) : b.h(context, 2131891620, new Object[]{AnimatableValueParser.A0(this.channel, context, false, 2)}, null, 4);
+            return this.isMuted ? b.h(context, R.string.unmute, new Object[0], null, 4) : b.h(context, R.string.mute_channel, new Object[]{AnimatableValueParser.A0(this.channel, context, false, 2)}, null, 4);
         }
 
         public final int getMuteIconResId(Context context) {
             m.checkNotNullParameter(context, "context");
-            return DrawableCompat.getThemedDrawableRes$default(context, this.isMuted ? 2130969393 : 2130969392, 0, 2, (Object) null);
+            return DrawableCompat.getThemedDrawableRes$default(context, this.isMuted ? R.attr.ic_channel_muted : R.attr.ic_channel_mute, 0, 2, (Object) null);
         }
 
         public final Long getPermissions() {
@@ -315,7 +316,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
     }
 
     private final String getSettingsText(Channel channel, boolean z2) {
-        String string = getString(AnimatableValueParser.f1(channel) ? 2131888231 : z2 ? 2131888232 : !z2 ? 2131887342 : 2131893324);
+        String string = getString(AnimatableValueParser.f1(channel) ? R.string.edit_category : z2 ? R.string.edit_channel : !z2 ? R.string.channel_settings : R.string.sample_empty_string);
         m.checkNotNullExpressionValue(string, "getString(\n      when {\n…_empty_string\n      }\n  )");
         return string;
     }
@@ -328,12 +329,12 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
     public void bindSubscriptions(CompositeSubscription compositeSubscription) {
         m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
         super.bindSubscriptions(compositeSubscription);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong("INTENT_EXTRA_CHANNEL_ID", -1)), this, null, 2, null), WidgetChannelsListItemChannelActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelsListItemChannelActions$bindSubscriptions$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong(INTENT_EXTRA_CHANNEL_ID, -1)), this, null, 2, null), WidgetChannelsListItemChannelActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelsListItemChannelActions$bindSubscriptions$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558920;
+        return R.layout.widget_channels_list_item_actions;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java
index fcf729eda9..e11d7ad6fa 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelsListItemThreadActionsBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.k;
@@ -19,44 +20,44 @@ public final /* synthetic */ class WidgetChannelsListItemThreadActions$binding$2
 
     public final WidgetChannelsListItemThreadActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362448;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362448);
+        int i = R.id.channels_list_item_thread_actions_archive_settings;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.channels_list_item_thread_actions_archive_settings);
         if (linearLayout != null) {
-            i = 2131362449;
-            TextView textView = (TextView) view.findViewById(2131362449);
+            i = R.id.channels_list_item_thread_actions_archive_settings_header;
+            TextView textView = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_archive_settings_header);
             if (textView != null) {
-                i = 2131362450;
-                TextView textView2 = (TextView) view.findViewById(2131362450);
+                i = R.id.channels_list_item_thread_actions_archive_settings_subheader;
+                TextView textView2 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_archive_settings_subheader);
                 if (textView2 != null) {
-                    i = 2131362451;
-                    TextView textView3 = (TextView) view.findViewById(2131362451);
+                    i = R.id.channels_list_item_thread_actions_channel_notifications;
+                    TextView textView3 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_channel_notifications);
                     if (textView3 != null) {
-                        i = 2131362452;
-                        TextView textView4 = (TextView) view.findViewById(2131362452);
+                        i = R.id.channels_list_item_thread_actions_copy_id;
+                        TextView textView4 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_copy_id);
                         if (textView4 != null) {
-                            i = 2131362453;
-                            View findViewById = view.findViewById(2131362453);
+                            i = R.id.channels_list_item_thread_actions_developer_divider;
+                            View findViewById = view.findViewById(R.id.channels_list_item_thread_actions_developer_divider);
                             if (findViewById != null) {
-                                i = 2131362454;
-                                View findViewById2 = view.findViewById(2131362454);
+                                i = R.id.channels_list_item_thread_actions_divider;
+                                View findViewById2 = view.findViewById(R.id.channels_list_item_thread_actions_divider);
                                 if (findViewById2 != null) {
-                                    i = 2131362455;
-                                    TextView textView5 = (TextView) view.findViewById(2131362455);
+                                    i = R.id.channels_list_item_thread_actions_edit;
+                                    TextView textView5 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_edit);
                                     if (textView5 != null) {
-                                        i = 2131362456;
-                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362456);
+                                        i = R.id.channels_list_item_thread_actions_icon;
+                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channels_list_item_thread_actions_icon);
                                         if (simpleDraweeView != null) {
-                                            i = 2131362457;
-                                            TextView textView6 = (TextView) view.findViewById(2131362457);
+                                            i = R.id.channels_list_item_thread_actions_leave;
+                                            TextView textView6 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_leave);
                                             if (textView6 != null) {
-                                                i = 2131362458;
-                                                TextView textView7 = (TextView) view.findViewById(2131362458);
+                                                i = R.id.channels_list_item_thread_actions_mark_as_read;
+                                                TextView textView7 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_mark_as_read);
                                                 if (textView7 != null) {
-                                                    i = 2131362459;
-                                                    TextView textView8 = (TextView) view.findViewById(2131362459);
+                                                    i = R.id.channels_list_item_thread_actions_title;
+                                                    TextView textView8 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_title);
                                                     if (textView8 != null) {
-                                                        i = 2131362460;
-                                                        TextView textView9 = (TextView) view.findViewById(2131362460);
+                                                        i = R.id.channels_list_item_thread_actions_unarchive;
+                                                        TextView textView9 = (TextView) view.findViewById(R.id.channels_list_item_thread_actions_unarchive);
                                                         if (textView9 != null) {
                                                             return new WidgetChannelsListItemThreadActionsBinding((NestedScrollView) view, linearLayout, textView, textView2, textView3, textView4, findViewById, findViewById2, textView5, simpleDraweeView, textView6, textView7, textView8, textView9);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java
index f104a0acaf..f876598dd1 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.list;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPIAbortMessages;
 import d0.z.d.m;
@@ -29,6 +30,6 @@ public final class WidgetChannelsListItemThreadActions$unarchiveThread$1 extends
         Error.Response response = error.getResponse();
         m.checkNotNullExpressionValue(response, "error.response");
         Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(response.getCode());
-        c.a.e.o.g(this.this$0.getContext(), abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891644, 0, null, 12);
+        c.a.e.o.g(this.this$0.getContext(), abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : R.string.network_error_bad_request, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
index b9a80cf8b8..6038778143 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.app.AppBottomSheet;
@@ -57,7 +58,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetChannelsListItemThreadActions widgetChannelsListItemThreadActions = new WidgetChannelsListItemThreadActions();
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_EXTRA_CHANNEL_ID", j);
+            bundle.putLong(WidgetChannelsListItemThreadActions.INTENT_EXTRA_CHANNEL_ID, j);
             widgetChannelsListItemThreadActions.setArguments(bundle);
             widgetChannelsListItemThreadActions.show(fragmentManager, WidgetChannelsListItemThreadActions.class.getName());
         }
@@ -358,7 +359,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
             Objects.requireNonNull(autoArchiveDurationName, "null cannot be cast to non-null type java.lang.String");
             String lowerCase = autoArchiveDurationName.toLowerCase(locale);
             m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
-            textView5.setText(b.k(this, 2131886787, new Object[]{lowerCase}, null, 4));
+            textView5.setText(b.k(this, R.string.auto_archive_thread_after, new Object[]{lowerCase}, null, 4));
         }
         LinearLayout linearLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(linearLayout2, "binding.channelsListItem…eadActionsArchiveSettings");
@@ -411,12 +412,12 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
     public void bindSubscriptions(CompositeSubscription compositeSubscription) {
         m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
         super.bindSubscriptions(compositeSubscription);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong("INTENT_EXTRA_CHANNEL_ID", -1)), this, null, 2, null), WidgetChannelsListItemThreadActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelsListItemThreadActions$bindSubscriptions$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong(INTENT_EXTRA_CHANNEL_ID, -1)), this, null, 2, null), WidgetChannelsListItemThreadActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelsListItemThreadActions$bindSubscriptions$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558935;
+        return R.layout.widget_channels_list_item_thread_actions;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
index c6c08c635d..67a599db83 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
@@ -8,6 +8,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 import androidx.annotation.LayoutRes;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetCollapsedVoiceUserListItemBinding;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -50,11 +51,11 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp
             super(i, widgetCollapsedUsersListAdapter);
             m.checkNotNullParameter(widgetCollapsedUsersListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131365886;
-            TextView textView = (TextView) view.findViewById(2131365886);
+            int i2 = R.id.widget_collapsed_user_count;
+            TextView textView = (TextView) view.findViewById(R.id.widget_collapsed_user_count);
             if (textView != null) {
-                i2 = 2131365887;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365887);
+                i2 = R.id.widget_collapsed_user_imageview;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.widget_collapsed_user_imageview);
                 if (simpleDraweeView != null) {
                     WidgetCollapsedVoiceUserListItemBinding widgetCollapsedVoiceUserListItemBinding = new WidgetCollapsedVoiceUserListItemBinding((FrameLayout) view, textView, simpleDraweeView);
                     m.checkNotNullExpressionValue(widgetCollapsedVoiceUserListItemBinding, "WidgetCollapsedVoiceUser…temBinding.bind(itemView)");
@@ -79,14 +80,14 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp
                 MGImages mGImages = MGImages.INSTANCE;
                 SimpleDraweeView simpleDraweeView = this.binding.f1773c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.widgetCollapsedUserImageview");
-                MGImages.setImage$default(mGImages, simpleDraweeView, 2131231150, (MGImages.ChangeDetector) null, 4, (Object) null);
+                MGImages.setImage$default(mGImages, simpleDraweeView, (int) R.drawable.drawable_grey_user_icon, (MGImages.ChangeDetector) null, 4, (Object) null);
             } else if (!collapsedUser.getEmptySlot()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.widgetCollapsedUserCount");
                 textView2.setVisibility(8);
                 SimpleDraweeView simpleDraweeView2 = this.binding.f1773c;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.widgetCollapsedUserImageview");
-                IconUtils.setIcon$default(simpleDraweeView2, collapsedUser.getUser(), 2131165291, null, null, null, 56, null);
+                IconUtils.setIcon$default(simpleDraweeView2, collapsedUser.getUser(), R.dimen.avatar_size_medium, null, null, null, 56, null);
             }
         }
     }
@@ -97,12 +98,12 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp
         m.checkNotNullParameter(recyclerView, "recycler");
         Context context = recyclerView.getContext();
         m.checkNotNullExpressionValue(context, "recycler.context");
-        recyclerView.addItemDecoration(new OverlapDecoration(-context.getResources().getDimensionPixelSize(2131165284)));
+        recyclerView.addItemDecoration(new OverlapDecoration(-context.getResources().getDimensionPixelSize(R.dimen.avatar_overlap)));
     }
 
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public MGRecyclerViewHolder<?, CollapsedUser> onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        return new WidgetCollapsedUserListItem(2131559005, this);
+        return new WidgetCollapsedUserListItem(R.layout.widget_collapsed_voice_user_list_item, this);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$sevenDayArchiveOption$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$sevenDayArchiveOption$1.java
index e836ff3f29..62e1017374 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$sevenDayArchiveOption$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$sevenDayArchiveOption$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.list;
 
 import android.view.View;
 import com.discord.api.channel.Channel;
+import com.discord.utilities.threads.ThreadUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -28,6 +29,6 @@ public final class WidgetThreadArchiveActions$configureUI$sevenDayArchiveOption$
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        WidgetThreadArchiveActions.access$setAutoArchiveDuration(this.this$0, this.$channel, 10080);
+        WidgetThreadArchiveActions.access$setAutoArchiveDuration(this.this$0, this.$channel, ThreadUtils.ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$threeDayArchiveOption$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$threeDayArchiveOption$1.java
index 1a7b2980a4..04dd34a9e9 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$threeDayArchiveOption$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$configureUI$threeDayArchiveOption$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.list;
 
 import android.view.View;
 import com.discord.api.channel.Channel;
+import com.discord.utilities.threads.ThreadUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -28,6 +29,6 @@ public final class WidgetThreadArchiveActions$configureUI$threeDayArchiveOption$
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        WidgetThreadArchiveActions.access$setAutoArchiveDuration(this.this$0, this.$channel, 4320);
+        WidgetThreadArchiveActions.access$setAutoArchiveDuration(this.this$0, this.$channel, ThreadUtils.ThreadArchiveDurations.THREE_DAYS_IN_MINUTES);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
index 4ded6ec296..0ab22b10a6 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.thread.ThreadMetadata;
@@ -60,7 +61,7 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetThreadArchiveActions widgetThreadArchiveActions = new WidgetThreadArchiveActions();
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_EXTRA_CHANNEL_ID", j);
+            bundle.putLong(WidgetThreadArchiveActions.INTENT_EXTRA_CHANNEL_ID, j);
             bundle.putLong("INTENT_EXTRA_GUILD_ID", j2);
             widgetThreadArchiveActions.setArguments(bundle);
             widgetThreadArchiveActions.show(fragmentManager, WidgetThreadArchiveActions.class.getName());
@@ -216,11 +217,11 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
         Channel channel = model.getChannel();
         Guild guild = model.getGuild();
-        Traits.Location location = new Traits.Location("Guild Channel", "Thread Archival Duration Sheet", "List Item", null, null, 24, null);
+        Traits.Location location = new Traits.Location(Traits.Location.Page.GUILD_CHANNEL, Traits.Location.Section.THREAD_ARCHIVAL_DURATION_SHEET, Traits.Location.Obj.LIST_ITEM, null, null, 24, null);
         if (!this.hasFiredAnalytics) {
             AnalyticsTracker.PremiumGuildUpsellType threadTypeForGuild = AnalyticsTracker.PremiumGuildUpsellType.Companion.getThreadTypeForGuild(guild);
             if (!(guild == null || threadTypeForGuild == null)) {
-                AnalyticsTracker.INSTANCE.premiumGuildUpsellViewed(threadTypeForGuild, guild.getId(), Long.valueOf(channel.h()), new Traits.Location(null, "Thread Archival Duration Sheet", null, null, null, 29, null));
+                AnalyticsTracker.INSTANCE.premiumGuildUpsellViewed(threadTypeForGuild, guild.getId(), Long.valueOf(channel.h()), new Traits.Location(null, Traits.Location.Section.THREAD_ARCHIVAL_DURATION_SHEET, null, null, null, 29, null));
                 this.hasFiredAnalytics = true;
             }
         }
@@ -232,7 +233,7 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView, "binding.subtitle");
         Object[] objArr = {TimeUtils.toReadableTimeString$default(requireContext, computeThreadAutoArchiveTimeMs, null, 4, null)};
         Integer num = null;
-        textView.setText(b.h(requireContext, 2131886789, objArr, null, 4));
+        textView.setText(b.h(requireContext, R.string.auto_archive_thread_at_long, objArr, null, 4));
         ThreadMetadata y2 = channel.y();
         if (y2 != null) {
             num = Integer.valueOf(y2.c());
@@ -314,12 +315,12 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
     public void bindSubscriptions(CompositeSubscription compositeSubscription) {
         m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
         super.bindSubscriptions(compositeSubscription);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong("INTENT_EXTRA_CHANNEL_ID", -1), getArgumentsOrDefault().getLong("INTENT_EXTRA_GUILD_ID", -1)), this, null, 2, null), WidgetThreadArchiveActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadArchiveActions$bindSubscriptions$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong(INTENT_EXTRA_CHANNEL_ID, -1), getArgumentsOrDefault().getLong("INTENT_EXTRA_GUILD_ID", -1)), this, null, 2, null), WidgetThreadArchiveActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadArchiveActions$bindSubscriptions$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559305;
+        return R.layout.widget_thread_archive_actions_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java
index e5bca3a44e..9c7971e519 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java
@@ -1,8 +1,10 @@
 package com.discord.widgets.channels.memberlist;
 
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityEmoji;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.presence.Presence;
@@ -55,7 +57,7 @@ public final class GuildMemberListItemGeneratorKt {
         String b;
         Long longOrNull;
         long f2 = channel.f();
-        if (PermissionUtils.can(262144, Long.valueOf(PermissionUtils.computeNonThreadPermissions(j, channel.f(), guild != null ? guild.getOwnerId() : 0, storeGuilds.getMember(f2, j), map, channel.s()))) || presence == null || (customStatusActivity = PresenceUtils.INSTANCE.getCustomStatusActivity(presence)) == null || (f = customStatusActivity.f()) == null || (b = f.b()) == null || (longOrNull = s.toLongOrNull(b)) == null) {
+        if (PermissionUtils.can(Permission.USE_EXTERNAL_EMOJIS, Long.valueOf(PermissionUtils.computeNonThreadPermissions(j, channel.f(), guild != null ? guild.getOwnerId() : 0, storeGuilds.getMember(f2, j), map, channel.s()))) || presence == null || (customStatusActivity = PresenceUtils.INSTANCE.getCustomStatusActivity(presence)) == null || (f = customStatusActivity.f()) == null || (b = f.b()) == null || (longOrNull = s.toLongOrNull(b)) == null) {
             return true;
         }
         return storeEmojiCustom.getEmojiForGuild(f2).get(Long.valueOf(longOrNull.longValue())) != null;
@@ -74,7 +76,7 @@ public final class GuildMemberListItemGeneratorKt {
         SortedMap<Integer, String> groupIndices = memberList.getGroupIndices();
         int size = memberList.getSize();
         if (z2) {
-            deepCopy.add(0, new ChannelMembersListAdapter.Item.AddMember(memberList.getListId(), 2131890865));
+            deepCopy.add(0, new ChannelMembersListAdapter.Item.AddMember(memberList.getListId(), R.string.invite_members));
             LinkedHashMap linkedHashMap = new LinkedHashMap(g0.mapCapacity(groupIndices.size()));
             Iterator<T> it = groupIndices.entrySet().iterator();
             while (it.hasNext()) {
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java
index 905fbccf15..b1bc8f6cca 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.memberlist;
 
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelRecipientNick;
 import com.discord.models.domain.ModelApplicationStream;
@@ -27,7 +28,7 @@ public final class PrivateChannelMemberListItemGeneratorKt {
     }
 
     private static final ChannelMembersListAdapter.Item.Member createMemberListItem(User user, Presence presence, boolean z2, String str, boolean z3) {
-        return new ChannelMembersListAdapter.Item.Member(user.getId(), null, str != null ? str : user.getUsername(), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131894149 : 2131887057), UserUtils.INSTANCE.isVerifiedBot(user), presence, null, IconUtils.getForUser$default(user, false, null, 6, null), z2, null, z3, true);
+        return new ChannelMembersListAdapter.Item.Member(user.getId(), null, str != null ? str : user.getUsername(), user.isBot(), Integer.valueOf(user.isSystemUser() ? R.string.system_dm_tag_system : R.string.bot_tag_bot), UserUtils.INSTANCE.isVerifiedBot(user), presence, null, IconUtils.getForUser$default(user, false, null, 6, null), z2, null, z3, true);
     }
 
     /* JADX WARN: Multi-variable type inference failed */
@@ -97,7 +98,7 @@ public final class PrivateChannelMemberListItemGeneratorKt {
         int size = map.size();
         ArrayList arrayList = new ArrayList(size + 1);
         if (z2) {
-            arrayList.add(0, new ChannelMembersListAdapter.Item.AddMember(String.valueOf(channel.h()), AnimatableValueParser.k1(channel) ? 2131889186 : 2131887933));
+            arrayList.add(0, new ChannelMembersListAdapter.Item.AddMember(String.valueOf(channel.h()), AnimatableValueParser.k1(channel) ? R.string.group_dm_add_friends : R.string.create_group_dm));
         }
         arrayList.add(createGroupDmHeader(size));
         arrayList.addAll(treeMap.values());
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.java
index 6ceaf38fab..1b6c968f43 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.memberlist;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetChannelMembersList$onViewBoundOrOnResume$2 extends o im
     }
 
     public final void invoke(WidgetChannelMembersListViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (m.areEqual(event, WidgetChannelMembersListViewModel.Event.ScrollToTop.INSTANCE)) {
             WidgetChannelMembersList.access$scrollToTop(this.this$0);
         } else if (m.areEqual(event, WidgetChannelMembersListViewModel.Event.UpdateRanges.INSTANCE)) {
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
index a7aeaa1b93..4e84c357e0 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.views.StickyHeaderItemDecoration;
@@ -67,7 +68,7 @@ public final class WidgetChannelMembersList extends AppFragment {
     }
 
     public WidgetChannelMembersList() {
-        super(2131558891);
+        super(R.layout.widget_channel_members_list);
         WidgetChannelMembersList$viewModel$2 widgetChannelMembersList$viewModel$2 = WidgetChannelMembersList$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelMembersListViewModel.class), new WidgetChannelMembersList$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelMembersList$viewModel$2));
@@ -124,7 +125,7 @@ public final class WidgetChannelMembersList extends AppFragment {
     }
 
     private final void setupRecyclerView() {
-        this.memberCellHeightPx = getResources().getDimensionPixelSize(2131165308);
+        this.memberCellHeightPx = getResources().getDimensionPixelSize(R.dimen.channel_list_row_height);
         getRecycler().setHasFixedSize(true);
         getRecycler().removeOnScrollListener(this.scrollListener);
         getRecycler().addOnScrollListener(this.scrollListener);
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
index d8c63fe8c0..a141244aa0 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
@@ -16,12 +16,14 @@ import androidx.constraintlayout.widget.Guideline;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetChannelMembersListItemAddBinding;
 import com.discord.databinding.WidgetChannelMembersListItemHeaderBinding;
 import com.discord.databinding.WidgetChannelMembersListItemLoadingBinding;
 import com.discord.databinding.WidgetChannelMembersListItemPlaceholderHeaderBinding;
 import com.discord.databinding.WidgetChannelMembersListItemUserBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.presence.Presence;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -373,7 +375,7 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Member(long j, Long l, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5, boolean z6) {
                 super(ViewType.MEMBER, Long.valueOf(j), null);
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 this.userId = j;
                 this.guildId = l;
                 this.name = str;
@@ -446,7 +448,7 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             }
 
             public final Member copy(long j, Long l, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5, boolean z6) {
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 return new Member(j, l, str, z2, num, z3, presence, num2, str2, z4, str3, z5, z6);
             }
 
@@ -1247,27 +1249,27 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             m.checkNotNullExpressionValue(a3, "WidgetChannelMembersList…(inflater, parent, false)");
             return new ChannelMembersListViewHolderHeader(a3);
         } else if (ordinal == 3) {
-            View inflate = from.inflate(2131558896, viewGroup, false);
-            int i2 = 2131362303;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362303);
+            View inflate = from.inflate(R.layout.widget_channel_members_list_item_user, viewGroup, false);
+            int i2 = R.id.channel_members_list_item_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.channel_members_list_item_avatar);
             if (simpleDraweeView != null) {
-                i2 = 2131362304;
-                ImageView imageView = (ImageView) inflate.findViewById(2131362304);
+                i2 = R.id.channel_members_list_item_boosted_indicator;
+                ImageView imageView = (ImageView) inflate.findViewById(R.id.channel_members_list_item_boosted_indicator);
                 if (imageView != null) {
-                    i2 = 2131362305;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131362305);
+                    i2 = R.id.channel_members_list_item_game;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(R.id.channel_members_list_item_game);
                     if (simpleDraweeSpanTextView != null) {
-                        i2 = 2131362306;
-                        ImageView imageView2 = (ImageView) inflate.findViewById(2131362306);
+                        i2 = R.id.channel_members_list_item_group_owner_indicator;
+                        ImageView imageView2 = (ImageView) inflate.findViewById(R.id.channel_members_list_item_group_owner_indicator);
                         if (imageView2 != null) {
-                            i2 = 2131362309;
-                            UsernameView usernameView = (UsernameView) inflate.findViewById(2131362309);
+                            i2 = R.id.channel_members_list_item_name;
+                            UsernameView usernameView = (UsernameView) inflate.findViewById(R.id.channel_members_list_item_name);
                             if (usernameView != null) {
-                                i2 = 2131362310;
-                                StatusView statusView = (StatusView) inflate.findViewById(2131362310);
+                                i2 = R.id.channel_members_list_item_presence;
+                                StatusView statusView = (StatusView) inflate.findViewById(R.id.channel_members_list_item_presence);
                                 if (statusView != null) {
-                                    i2 = 2131362311;
-                                    ImageView imageView3 = (ImageView) inflate.findViewById(2131362311);
+                                    i2 = R.id.channel_members_list_item_rich_presence_iv;
+                                    ImageView imageView3 = (ImageView) inflate.findViewById(R.id.channel_members_list_item_rich_presence_iv);
                                     if (imageView3 != null) {
                                         WidgetChannelMembersListItemUserBinding widgetChannelMembersListItemUserBinding = new WidgetChannelMembersListItemUserBinding((ConstraintLayout) inflate, simpleDraweeView, imageView, simpleDraweeSpanTextView, imageView2, usernameView, statusView, imageView3);
                                         m.checkNotNullExpressionValue(widgetChannelMembersListItemUserBinding, "WidgetChannelMembersList…(inflater, parent, false)");
@@ -1281,12 +1283,12 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
         } else if (ordinal == 4) {
-            View inflate2 = from.inflate(2131558892, viewGroup, false);
-            int i3 = 2131362301;
-            ImageView imageView4 = (ImageView) inflate2.findViewById(2131362301);
+            View inflate2 = from.inflate(R.layout.widget_channel_members_list_item_add, viewGroup, false);
+            int i3 = R.id.channel_members_list_item_add;
+            ImageView imageView4 = (ImageView) inflate2.findViewById(R.id.channel_members_list_item_add);
             if (imageView4 != null) {
-                i3 = 2131362302;
-                TextView textView = (TextView) inflate2.findViewById(2131362302);
+                i3 = R.id.channel_members_list_item_add_title;
+                TextView textView = (TextView) inflate2.findViewById(R.id.channel_members_list_item_add_title);
                 if (textView != null) {
                     WidgetChannelMembersListItemAddBinding widgetChannelMembersListItemAddBinding = new WidgetChannelMembersListItemAddBinding((LinearLayout) inflate2, imageView4, textView);
                     m.checkNotNullExpressionValue(widgetChannelMembersListItemAddBinding, "WidgetChannelMembersList…(inflater, parent, false)");
@@ -1295,15 +1297,15 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i3)));
         } else if (ordinal == 5) {
-            View inflate3 = from.inflate(2131558894, viewGroup, false);
-            int i4 = 2131362130;
-            View findViewById = inflate3.findViewById(2131362130);
+            View inflate3 = from.inflate(R.layout.widget_channel_members_list_item_loading, viewGroup, false);
+            int i4 = R.id.blank_item_avatar_placeholder;
+            View findViewById = inflate3.findViewById(R.id.blank_item_avatar_placeholder);
             if (findViewById != null) {
-                i4 = 2131362131;
-                View findViewById2 = inflate3.findViewById(2131362131);
+                i4 = R.id.blank_item_username_placeholder;
+                View findViewById2 = inflate3.findViewById(R.id.blank_item_username_placeholder);
                 if (findViewById2 != null) {
-                    i4 = 2131365755;
-                    Guideline guideline = (Guideline) inflate3.findViewById(2131365755);
+                    i4 = R.id.username_placeholder_end_guideline;
+                    Guideline guideline = (Guideline) inflate3.findViewById(R.id.username_placeholder_end_guideline);
                     if (guideline != null) {
                         WidgetChannelMembersListItemLoadingBinding widgetChannelMembersListItemLoadingBinding = new WidgetChannelMembersListItemLoadingBinding((ConstraintLayout) inflate3, findViewById, findViewById2, guideline);
                         m.checkNotNullExpressionValue(widgetChannelMembersListItemLoadingBinding, "WidgetChannelMembersList…(inflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java
index 3af006c119..9fe10eefa2 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.memberlist.adapter;
 
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelMembersListItemHeaderBinding;
 import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter;
 import d0.z.d.m;
@@ -35,11 +36,11 @@ public final class ChannelMembersListViewHolderHeader extends RecyclerView.ViewH
         m.checkNotNullParameter(header, "data");
         int ordinal = header.getHeaderType().ordinal();
         if (ordinal == 0) {
-            i = 2131893931;
+            i = R.string.status_online;
         } else if (ordinal == 1) {
-            i = 2131893930;
+            i = R.string.status_offline;
         } else if (ordinal == 2) {
-            i = 2131891455;
+            i = R.string.members;
         } else {
             throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java
index 5049d73e96..b1ebb3f27a 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java
@@ -5,6 +5,7 @@ import android.view.View;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.utilities.time.TimeUtils;
 import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter;
 import d0.z.d.m;
@@ -25,7 +26,7 @@ public final class ChannelMembersListViewHolderMember$bind$3 implements View.OnC
             Context context = view.getContext();
             Context context2 = view.getContext();
             m.checkNotNullExpressionValue(context2, "it.context");
-            o.h(context, b.h(context2, 2131892489, new Object[]{readableTimeString}, null, 4), 0, null, 12);
+            o.h(context, b.h(context2, R.string.premium_guild_subscription_tooltip, new Object[]{readableTimeString}, null, 4), 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java
index fe3812923e..2aabeeb46f 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.memberlist.adapter;
 
 import android.widget.ImageView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelMembersListItemUserBinding;
 import com.discord.models.presence.Presence;
 import com.discord.utilities.color.ColorCompat;
@@ -39,7 +40,7 @@ public final class ChannelMembersListViewHolderMember extends RecyclerView.ViewH
             i = color.intValue();
         } else {
             m.checkNotNullExpressionValue(usernameView, "this");
-            i = ColorCompat.getThemedColor(usernameView, 2130969877);
+            i = ColorCompat.getThemedColor(usernameView, (int) R.attr.primary_000);
         }
         usernameView.setUsernameColor(i);
         int i2 = 0;
@@ -47,7 +48,7 @@ public final class ChannelMembersListViewHolderMember extends RecyclerView.ViewH
         UsernameView usernameView2 = this.binding.f;
         boolean isBot = member.isBot();
         Integer tagText = member.getTagText();
-        usernameView2.a(isBot, tagText != null ? tagText.intValue() : 2131887057, member.getTagVerified());
+        usernameView2.a(isBot, tagText != null ? tagText.intValue() : R.string.bot_tag_bot, member.getTagVerified());
         ImageView imageView = this.binding.e;
         m.checkNotNullExpressionValue(imageView, "binding.channelMembersListItemGroupOwnerIndicator");
         imageView.setVisibility(member.getShowOwnerIndicator() ? 0 : 8);
@@ -69,6 +70,6 @@ public final class ChannelMembersListViewHolderMember extends RecyclerView.ViewH
         PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, false, !member.getCanDisplayStatusEmoji(), 8, null);
         SimpleDraweeView simpleDraweeView = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.channelMembersListItemAvatar");
-        IconUtils.setIcon$default(simpleDraweeView, member.getAvatarUrl(), 2131165297, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView, member.getAvatarUrl(), (int) R.dimen.avatar_size_standard, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java b/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java
index 9ee0f8fb5b..1dba9be916 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java
@@ -9,9 +9,11 @@ import android.widget.Toast;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.databinding.WidgetChannelSettingsAddMemberCategoryBinding;
 import com.discord.databinding.WidgetChannelSettingsAddMemberItemBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -46,17 +48,17 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AddMemberAdapterCategoryItem(AddMemberAdapter addMemberAdapter) {
-            super(2131558906, addMemberAdapter);
+            super((int) R.layout.widget_channel_settings_add_member_category, addMemberAdapter);
             m.checkNotNullParameter(addMemberAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363941);
+            TextView textView = (TextView) view.findViewById(R.id.label);
             if (textView != null) {
                 WidgetChannelSettingsAddMemberCategoryBinding widgetChannelSettingsAddMemberCategoryBinding = new WidgetChannelSettingsAddMemberCategoryBinding((LinearLayout) view, textView);
                 m.checkNotNullExpressionValue(widgetChannelSettingsAddMemberCategoryBinding, "WidgetChannelSettingsAdd…oryBinding.bind(itemView)");
                 this.binding = widgetChannelSettingsAddMemberCategoryBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363941)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.label)));
         }
 
         public void onConfigure(int i, Item item) {
@@ -67,9 +69,9 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
             m.checkNotNullExpressionValue(textView, "binding.label");
             int ordinal = ((Item.CategoryItem) item).getCategoryType().ordinal();
             if (ordinal == 0) {
-                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131893294);
+                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(R.string.roles);
             } else if (ordinal == 1) {
-                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131891455);
+                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(R.string.members);
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -94,17 +96,17 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AddMemberAdapterItemItem(AddMemberAdapter addMemberAdapter) {
-            super(2131558907, addMemberAdapter);
+            super((int) R.layout.widget_channel_settings_add_member_item, addMemberAdapter);
             m.checkNotNullParameter(addMemberAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362322;
-            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) view.findViewById(2131362322);
+            int i = R.id.channel_permission_owner_view;
+            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) view.findViewById(R.id.channel_permission_owner_view);
             if (channelPermissionOwnerView != null) {
-                i = 2131362640;
-                MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362640);
+                i = R.id.checkbox;
+                MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(R.id.checkbox);
                 if (materialCheckBox != null) {
-                    i = 2131362795;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362795);
+                    i = R.id.container;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.container);
                     if (constraintLayout != null) {
                         WidgetChannelSettingsAddMemberItemBinding widgetChannelSettingsAddMemberItemBinding = new WidgetChannelSettingsAddMemberItemBinding((FrameLayout) view, channelPermissionOwnerView, materialCheckBox, constraintLayout);
                         m.checkNotNullExpressionValue(widgetChannelSettingsAddMemberItemBinding, "WidgetChannelSettingsAdd…temBinding.bind(itemView)");
@@ -128,7 +130,7 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
             } else if ((addStatus instanceof Item.PermissionOwnerItem.Companion.AddStatus.CannotAdd) && ((Item.PermissionOwnerItem.Companion.AddStatus.CannotAdd) permissionOwnerItem.getAddStatus()).getReason().ordinal() == 0) {
                 FrameLayout frameLayout = this.binding.a;
                 m.checkNotNullExpressionValue(frameLayout, "binding.root");
-                Toast.makeText(frameLayout.getContext(), 2131887306, 0).show();
+                Toast.makeText(frameLayout.getContext(), (int) R.string.channel_permissions_add_has_guild_permissions, 0).show();
             }
         }
 
@@ -297,7 +299,7 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
                         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
                         public CannotAdd(Reason reason) {
                             super(null);
-                            m.checkNotNullParameter(reason, "reason");
+                            m.checkNotNullParameter(reason, ModelAuditLogEntry.CHANGE_KEY_REASON);
                             this.reason = reason;
                         }
 
@@ -313,7 +315,7 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
                         }
 
                         public final CannotAdd copy(Reason reason) {
-                            m.checkNotNullParameter(reason, "reason");
+                            m.checkNotNullParameter(reason, ModelAuditLogEntry.CHANGE_KEY_REASON);
                             return new CannotAdd(reason);
                         }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java
index 69dd6f7a1b..99722b2463 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.permissions;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.ConfirmRemovePermissionDialogBinding;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
@@ -19,17 +20,17 @@ public final /* synthetic */ class ConfirmRemovePermissionDialog$binding$2 exten
 
     public final ConfirmRemovePermissionDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362139;
-        TextView textView = (TextView) view.findViewById(2131362139);
+        int i = R.id.body;
+        TextView textView = (TextView) view.findViewById(R.id.body);
         if (textView != null) {
-            i = 2131362243;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362243);
+            i = R.id.cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.cancel);
             if (materialButton != null) {
-                i = 2131362715;
-                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362715);
+                i = R.id.confirm;
+                LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.confirm);
                 if (loadingButton != null) {
-                    i = 2131364250;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364250);
+                    i = R.id.notice_header_container;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.notice_header_container);
                     if (linearLayout != null) {
                         return new ConfirmRemovePermissionDialogBinding((LinearLayout) view, textView, materialButton, loadingButton, linearLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java
index 3cbe10176e..c37337500b 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java
@@ -10,6 +10,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.ConfirmRemovePermissionDialogBinding;
 import com.discord.utilities.KotlinExtensionsKt;
@@ -51,7 +52,7 @@ public final class ConfirmRemovePermissionDialog extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             ConfirmRemovePermissionDialog confirmRemovePermissionDialog = new ConfirmRemovePermissionDialog();
             Bundle bundle = new Bundle();
-            bundle.putSerializable("ARG_PERMISSION_OWNER", permissionOwner);
+            bundle.putSerializable(ConfirmRemovePermissionDialog.ARG_PERMISSION_OWNER, permissionOwner);
             bundle.putLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", j);
             confirmRemovePermissionDialog.setArguments(bundle);
             confirmRemovePermissionDialog.show(fragmentManager, ConfirmRemovePermissionDialog.class.getSimpleName());
@@ -59,7 +60,7 @@ public final class ConfirmRemovePermissionDialog extends AppDialog {
     }
 
     public ConfirmRemovePermissionDialog() {
-        super(2131558446);
+        super(R.layout.confirm_remove_permission_dialog);
         ConfirmRemovePermissionDialog$viewModel$2 confirmRemovePermissionDialog$viewModel$2 = new ConfirmRemovePermissionDialog$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ConfirmRemovePermissionDialogViewModel.class), new ConfirmRemovePermissionDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(confirmRemovePermissionDialog$viewModel$2));
@@ -104,7 +105,7 @@ public final class ConfirmRemovePermissionDialog extends AppDialog {
     }
 
     private final PermissionOwner getPermissionOwnerFromArgs() {
-        Serializable serializable = requireArguments().getSerializable("ARG_PERMISSION_OWNER");
+        Serializable serializable = requireArguments().getSerializable(ARG_PERMISSION_OWNER);
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.widgets.channels.permissions.PermissionOwner");
         return (PermissionOwner) serializable;
     }
@@ -131,7 +132,7 @@ public final class ConfirmRemovePermissionDialog extends AppDialog {
         }
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.body");
-        b.n(textView, 2131893612, new Object[]{str}, null, 4);
+        b.n(textView, R.string.settings_permissions_delete_body, new Object[]{str}, null, 4);
         getBinding().d.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$2(this));
         getBinding().f1599c.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$3(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java
index 83c5024953..c89682b044 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.permissions;
 import android.view.View;
 import android.widget.Toast;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.widgets.channels.permissions.PermissionOwnerListView;
 import d0.z.d.m;
 import kotlin.jvm.functions.Function0;
@@ -28,11 +29,11 @@ public final class PermissionOwnerListView$PermissionOwnerViewHolder$configure$1
             if (ordinal == 2) {
                 ConstraintLayout constraintLayout = PermissionOwnerListView.PermissionOwnerViewHolder.access$getBinding$p(this.this$0).a;
                 m.checkNotNullExpressionValue(constraintLayout, "binding.root");
-                Toast.makeText(constraintLayout.getContext(), 2131887337, 0).show();
+                Toast.makeText(constraintLayout.getContext(), (int) R.string.channel_permissions_remove_not_overwrite, 0).show();
             } else if (ordinal == 3) {
                 ConstraintLayout constraintLayout2 = PermissionOwnerListView.PermissionOwnerViewHolder.access$getBinding$p(this.this$0).a;
                 m.checkNotNullExpressionValue(constraintLayout2, "binding.root");
-                Toast.makeText(constraintLayout2.getContext(), 2131887316, 0).show();
+                Toast.makeText(constraintLayout2.getContext(), (int) R.string.channel_permissions_cannot_edit_moderators, 0).show();
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java
index 2d6f962a6f..6b6b4ceac3 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java
@@ -10,7 +10,9 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.RemovablePermissionOwnerViewBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.views.permissions.ChannelPermissionOwnerView;
 import d0.t.n;
@@ -47,12 +49,12 @@ public final class PermissionOwnerListView extends RecyclerView {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public PermissionOwnerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558661, viewGroup, false);
-            int i2 = 2131364428;
-            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) inflate.findViewById(2131364428);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.removable_permission_owner_view, viewGroup, false);
+            int i2 = R.id.permission_owner_view;
+            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) inflate.findViewById(R.id.permission_owner_view);
             if (channelPermissionOwnerView != null) {
-                i2 = 2131364635;
-                ImageView imageView = (ImageView) inflate.findViewById(2131364635);
+                i2 = R.id.remove;
+                ImageView imageView = (ImageView) inflate.findViewById(R.id.remove);
                 if (imageView != null) {
                     RemovablePermissionOwnerViewBinding removablePermissionOwnerViewBinding = new RemovablePermissionOwnerViewBinding((ConstraintLayout) inflate, channelPermissionOwnerView, imageView);
                     m.checkNotNullExpressionValue(removablePermissionOwnerViewBinding, "RemovablePermissionOwner…,\n          false\n      )");
@@ -215,7 +217,7 @@ public final class PermissionOwnerListView extends RecyclerView {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public CannotRemove(Reason reason) {
                 super(null);
-                m.checkNotNullParameter(reason, "reason");
+                m.checkNotNullParameter(reason, ModelAuditLogEntry.CHANGE_KEY_REASON);
                 this.reason = reason;
             }
 
@@ -231,7 +233,7 @@ public final class PermissionOwnerListView extends RecyclerView {
             }
 
             public final CannotRemove copy(Reason reason) {
-                m.checkNotNullParameter(reason, "reason");
+                m.checkNotNullParameter(reason, ModelAuditLogEntry.CHANGE_KEY_REASON);
                 return new CannotRemove(reason);
             }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java
index a9f90ff378..0c945ba361 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.permissions;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelSettingsAddMemberBinding;
 import com.discord.views.SearchInputView;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetChannelSettingsAddMemberFragment$bindin
 
     public final WidgetChannelSettingsAddMemberBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364623;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364623);
+        int i = R.id.recycler;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler);
         if (recyclerView != null) {
-            i = 2131364772;
-            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364772);
+            i = R.id.search_input;
+            SearchInputView searchInputView = (SearchInputView) view.findViewById(R.id.search_input);
             if (searchInputView != null) {
                 return new WidgetChannelSettingsAddMemberBinding((CoordinatorLayout) view, recyclerView, searchInputView);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
index 6348ebd363..8b5709ec09 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChannelSettingsAddMemberBinding;
@@ -57,7 +58,7 @@ public final class WidgetChannelSettingsAddMemberFragment extends AppFragment {
     }
 
     public WidgetChannelSettingsAddMemberFragment() {
-        super(2131558905);
+        super(R.layout.widget_channel_settings_add_member);
         WidgetChannelSettingsAddMemberFragment$viewModel$2 widgetChannelSettingsAddMemberFragment$viewModel$2 = new WidgetChannelSettingsAddMemberFragment$viewModel$2(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelSettingsAddMemberFragmentViewModel.class), new WidgetChannelSettingsAddMemberFragment$appViewModels$$inlined$viewModels$1(widgetChannelSettingsAddMemberFragment$viewModel$2), new j0(new WidgetChannelSettingsAddMemberFragment$viewModel$3(this)));
         this.querySubject = BehaviorSubject.l0("");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java
index 12620be9e2..6813b0fb4b 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.FragmentContainerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelSettingsAddMemberSheetBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,17 +19,17 @@ public final /* synthetic */ class WidgetChannelSettingsAddMemberSheet$binding$2
 
     public final WidgetChannelSettingsAddMemberSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361906;
-        TextView textView = (TextView) view.findViewById(2131361906);
+        int i = R.id.add_button;
+        TextView textView = (TextView) view.findViewById(R.id.add_button);
         if (textView != null) {
-            i = 2131362796;
-            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362796);
+            i = R.id.content;
+            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.content);
             if (fragmentContainerView != null) {
-                i = 2131365386;
-                TextView textView2 = (TextView) view.findViewById(2131365386);
+                i = R.id.subtitle;
+                TextView textView2 = (TextView) view.findViewById(R.id.subtitle);
                 if (textView2 != null) {
-                    i = 2131365561;
-                    TextView textView3 = (TextView) view.findViewById(2131365561);
+                    i = R.id.title;
+                    TextView textView3 = (TextView) view.findViewById(R.id.title);
                     if (textView3 != null) {
                         return new WidgetChannelSettingsAddMemberSheetBinding((LinearLayout) view, textView, fragmentContainerView, textView2, textView3);
                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
index 5042ae419c..7333aa468c 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
@@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.app.AppBottomSheet;
@@ -110,7 +111,7 @@ public final class WidgetChannelSettingsAddMemberSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558908;
+        return R.layout.widget_channel_settings_add_member_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java
index 7cb61a4c52..fdd7dad8f6 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelSettingsEditPermissionsBinding;
 import com.discord.views.TernaryCheckBox;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -21,113 +22,113 @@ public final /* synthetic */ class WidgetChannelSettingsEditPermissions$binding$
 
     public final WidgetChannelSettingsEditPermissionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362317;
-        TernaryCheckBox ternaryCheckBox = (TernaryCheckBox) view.findViewById(2131362317);
+        int i = R.id.channel_permission_general_create_instant_invite;
+        TernaryCheckBox ternaryCheckBox = (TernaryCheckBox) view.findViewById(R.id.channel_permission_general_create_instant_invite);
         if (ternaryCheckBox != null) {
-            i = 2131362318;
-            TernaryCheckBox ternaryCheckBox2 = (TernaryCheckBox) view.findViewById(2131362318);
+            i = R.id.channel_permission_general_manage_channel;
+            TernaryCheckBox ternaryCheckBox2 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_general_manage_channel);
             if (ternaryCheckBox2 != null) {
-                i = 2131362319;
-                TernaryCheckBox ternaryCheckBox3 = (TernaryCheckBox) view.findViewById(2131362319);
+                i = R.id.channel_permission_general_manage_permissions;
+                TernaryCheckBox ternaryCheckBox3 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_general_manage_permissions);
                 if (ternaryCheckBox3 != null) {
-                    i = 2131362320;
-                    TernaryCheckBox ternaryCheckBox4 = (TernaryCheckBox) view.findViewById(2131362320);
+                    i = R.id.channel_permission_general_manage_threads;
+                    TernaryCheckBox ternaryCheckBox4 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_general_manage_threads);
                     if (ternaryCheckBox4 != null) {
-                        i = 2131362321;
-                        TernaryCheckBox ternaryCheckBox5 = (TernaryCheckBox) view.findViewById(2131362321);
+                        i = R.id.channel_permission_general_manage_webhooks;
+                        TernaryCheckBox ternaryCheckBox5 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_general_manage_webhooks);
                         if (ternaryCheckBox5 != null) {
-                            i = 2131362323;
-                            TernaryCheckBox ternaryCheckBox6 = (TernaryCheckBox) view.findViewById(2131362323);
+                            i = R.id.channel_permission_stage_request_to_speak;
+                            TernaryCheckBox ternaryCheckBox6 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_stage_request_to_speak);
                             if (ternaryCheckBox6 != null) {
-                                i = 2131362324;
-                                TernaryCheckBox ternaryCheckBox7 = (TernaryCheckBox) view.findViewById(2131362324);
+                                i = R.id.channel_permission_text_add_reactions;
+                                TernaryCheckBox ternaryCheckBox7 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_add_reactions);
                                 if (ternaryCheckBox7 != null) {
-                                    i = 2131362325;
-                                    TernaryCheckBox ternaryCheckBox8 = (TernaryCheckBox) view.findViewById(2131362325);
+                                    i = R.id.channel_permission_text_attach_files;
+                                    TernaryCheckBox ternaryCheckBox8 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_attach_files);
                                     if (ternaryCheckBox8 != null) {
-                                        i = 2131362326;
-                                        TernaryCheckBox ternaryCheckBox9 = (TernaryCheckBox) view.findViewById(2131362326);
+                                        i = R.id.channel_permission_text_embed_links;
+                                        TernaryCheckBox ternaryCheckBox9 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_embed_links);
                                         if (ternaryCheckBox9 != null) {
-                                            i = 2131362327;
-                                            TernaryCheckBox ternaryCheckBox10 = (TernaryCheckBox) view.findViewById(2131362327);
+                                            i = R.id.channel_permission_text_manage_messages;
+                                            TernaryCheckBox ternaryCheckBox10 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_manage_messages);
                                             if (ternaryCheckBox10 != null) {
-                                                i = 2131362328;
-                                                TernaryCheckBox ternaryCheckBox11 = (TernaryCheckBox) view.findViewById(2131362328);
+                                                i = R.id.channel_permission_text_mention_everyone;
+                                                TernaryCheckBox ternaryCheckBox11 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_mention_everyone);
                                                 if (ternaryCheckBox11 != null) {
-                                                    i = 2131362329;
-                                                    TernaryCheckBox ternaryCheckBox12 = (TernaryCheckBox) view.findViewById(2131362329);
+                                                    i = R.id.channel_permission_text_read_message_history;
+                                                    TernaryCheckBox ternaryCheckBox12 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_read_message_history);
                                                     if (ternaryCheckBox12 != null) {
-                                                        i = 2131362330;
-                                                        TernaryCheckBox ternaryCheckBox13 = (TernaryCheckBox) view.findViewById(2131362330);
+                                                        i = R.id.channel_permission_text_read_messages;
+                                                        TernaryCheckBox ternaryCheckBox13 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_read_messages);
                                                         if (ternaryCheckBox13 != null) {
-                                                            i = 2131362331;
-                                                            TernaryCheckBox ternaryCheckBox14 = (TernaryCheckBox) view.findViewById(2131362331);
+                                                            i = R.id.channel_permission_text_send_messages;
+                                                            TernaryCheckBox ternaryCheckBox14 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_send_messages);
                                                             if (ternaryCheckBox14 != null) {
-                                                                i = 2131362332;
-                                                                TernaryCheckBox ternaryCheckBox15 = (TernaryCheckBox) view.findViewById(2131362332);
+                                                                i = R.id.channel_permission_text_send_tts_messages;
+                                                                TernaryCheckBox ternaryCheckBox15 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_send_tts_messages);
                                                                 if (ternaryCheckBox15 != null) {
-                                                                    i = 2131362333;
-                                                                    TernaryCheckBox ternaryCheckBox16 = (TernaryCheckBox) view.findViewById(2131362333);
+                                                                    i = R.id.channel_permission_text_use_external_emojis;
+                                                                    TernaryCheckBox ternaryCheckBox16 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_use_external_emojis);
                                                                     if (ternaryCheckBox16 != null) {
-                                                                        i = 2131362334;
-                                                                        TernaryCheckBox ternaryCheckBox17 = (TernaryCheckBox) view.findViewById(2131362334);
+                                                                        i = R.id.channel_permission_text_use_external_stickers;
+                                                                        TernaryCheckBox ternaryCheckBox17 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_use_external_stickers);
                                                                         if (ternaryCheckBox17 != null) {
-                                                                            i = 2131362335;
-                                                                            TernaryCheckBox ternaryCheckBox18 = (TernaryCheckBox) view.findViewById(2131362335);
+                                                                            i = R.id.channel_permission_text_use_private_threads;
+                                                                            TernaryCheckBox ternaryCheckBox18 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_use_private_threads);
                                                                             if (ternaryCheckBox18 != null) {
-                                                                                i = 2131362336;
-                                                                                TernaryCheckBox ternaryCheckBox19 = (TernaryCheckBox) view.findViewById(2131362336);
+                                                                                i = R.id.channel_permission_text_use_public_threads;
+                                                                                TernaryCheckBox ternaryCheckBox19 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_text_use_public_threads);
                                                                                 if (ternaryCheckBox19 != null) {
-                                                                                    i = 2131362337;
-                                                                                    TernaryCheckBox ternaryCheckBox20 = (TernaryCheckBox) view.findViewById(2131362337);
+                                                                                    i = R.id.channel_permission_use_application_commands;
+                                                                                    TernaryCheckBox ternaryCheckBox20 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_use_application_commands);
                                                                                     if (ternaryCheckBox20 != null) {
-                                                                                        i = 2131362338;
-                                                                                        TernaryCheckBox ternaryCheckBox21 = (TernaryCheckBox) view.findViewById(2131362338);
+                                                                                        i = R.id.channel_permission_voice_connect;
+                                                                                        TernaryCheckBox ternaryCheckBox21 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_connect);
                                                                                         if (ternaryCheckBox21 != null) {
-                                                                                            i = 2131362339;
-                                                                                            TernaryCheckBox ternaryCheckBox22 = (TernaryCheckBox) view.findViewById(2131362339);
+                                                                                            i = R.id.channel_permission_voice_deafen_members;
+                                                                                            TernaryCheckBox ternaryCheckBox22 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_deafen_members);
                                                                                             if (ternaryCheckBox22 != null) {
-                                                                                                i = 2131362340;
-                                                                                                TernaryCheckBox ternaryCheckBox23 = (TernaryCheckBox) view.findViewById(2131362340);
+                                                                                                i = R.id.channel_permission_voice_move_members;
+                                                                                                TernaryCheckBox ternaryCheckBox23 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_move_members);
                                                                                                 if (ternaryCheckBox23 != null) {
-                                                                                                    i = 2131362341;
-                                                                                                    TernaryCheckBox ternaryCheckBox24 = (TernaryCheckBox) view.findViewById(2131362341);
+                                                                                                    i = R.id.channel_permission_voice_mute_members;
+                                                                                                    TernaryCheckBox ternaryCheckBox24 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_mute_members);
                                                                                                     if (ternaryCheckBox24 != null) {
-                                                                                                        i = 2131362342;
-                                                                                                        TernaryCheckBox ternaryCheckBox25 = (TernaryCheckBox) view.findViewById(2131362342);
+                                                                                                        i = R.id.channel_permission_voice_priority_speaker;
+                                                                                                        TernaryCheckBox ternaryCheckBox25 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_priority_speaker);
                                                                                                         if (ternaryCheckBox25 != null) {
-                                                                                                            i = 2131362343;
-                                                                                                            TernaryCheckBox ternaryCheckBox26 = (TernaryCheckBox) view.findViewById(2131362343);
+                                                                                                            i = R.id.channel_permission_voice_speak;
+                                                                                                            TernaryCheckBox ternaryCheckBox26 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_speak);
                                                                                                             if (ternaryCheckBox26 != null) {
-                                                                                                                i = 2131362344;
-                                                                                                                TernaryCheckBox ternaryCheckBox27 = (TernaryCheckBox) view.findViewById(2131362344);
+                                                                                                                i = R.id.channel_permission_voice_use_vad;
+                                                                                                                TernaryCheckBox ternaryCheckBox27 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_use_vad);
                                                                                                                 if (ternaryCheckBox27 != null) {
-                                                                                                                    i = 2131362345;
-                                                                                                                    TernaryCheckBox ternaryCheckBox28 = (TernaryCheckBox) view.findViewById(2131362345);
+                                                                                                                    i = R.id.channel_permission_voice_video;
+                                                                                                                    TernaryCheckBox ternaryCheckBox28 = (TernaryCheckBox) view.findViewById(R.id.channel_permission_voice_video);
                                                                                                                     if (ternaryCheckBox28 != null) {
-                                                                                                                        i = 2131362346;
-                                                                                                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362346);
+                                                                                                                        i = R.id.channel_permissions_avatar;
+                                                                                                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.channel_permissions_avatar);
                                                                                                                         if (simpleDraweeView != null) {
-                                                                                                                            i = 2131362347;
-                                                                                                                            TextView textView = (TextView) view.findViewById(2131362347);
+                                                                                                                            i = R.id.channel_permissions_channel_name;
+                                                                                                                            TextView textView = (TextView) view.findViewById(R.id.channel_permissions_channel_name);
                                                                                                                             if (textView != null) {
-                                                                                                                                i = 2131362348;
-                                                                                                                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362348);
+                                                                                                                                i = R.id.channel_permissions_save;
+                                                                                                                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.channel_permissions_save);
                                                                                                                                 if (floatingActionButton != null) {
-                                                                                                                                    i = 2131362349;
-                                                                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362349);
+                                                                                                                                    i = R.id.channel_permissions_stage_container;
+                                                                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.channel_permissions_stage_container);
                                                                                                                                     if (linearLayout != null) {
-                                                                                                                                        i = 2131362350;
-                                                                                                                                        TextView textView2 = (TextView) view.findViewById(2131362350);
+                                                                                                                                        i = R.id.channel_permissions_target_name;
+                                                                                                                                        TextView textView2 = (TextView) view.findViewById(R.id.channel_permissions_target_name);
                                                                                                                                         if (textView2 != null) {
-                                                                                                                                            i = 2131362351;
-                                                                                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362351);
+                                                                                                                                            i = R.id.channel_permissions_text_container;
+                                                                                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.channel_permissions_text_container);
                                                                                                                                             if (linearLayout2 != null) {
-                                                                                                                                                i = 2131362352;
-                                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362352);
+                                                                                                                                                i = R.id.channel_permissions_voice_container;
+                                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.channel_permissions_voice_container);
                                                                                                                                                 if (linearLayout3 != null) {
-                                                                                                                                                    i = 2131364792;
-                                                                                                                                                    TextView textView3 = (TextView) view.findViewById(2131364792);
+                                                                                                                                                    i = R.id.section_general_permissions;
+                                                                                                                                                    TextView textView3 = (TextView) view.findViewById(R.id.section_general_permissions);
                                                                                                                                                     if (textView3 != null) {
                                                                                                                                                         return new WidgetChannelSettingsEditPermissionsBinding((CoordinatorLayout) view, ternaryCheckBox, ternaryCheckBox2, ternaryCheckBox3, ternaryCheckBox4, ternaryCheckBox5, ternaryCheckBox6, ternaryCheckBox7, ternaryCheckBox8, ternaryCheckBox9, ternaryCheckBox10, ternaryCheckBox11, ternaryCheckBox12, ternaryCheckBox13, ternaryCheckBox14, ternaryCheckBox15, ternaryCheckBox16, ternaryCheckBox17, ternaryCheckBox18, ternaryCheckBox19, ternaryCheckBox20, ternaryCheckBox21, ternaryCheckBox22, ternaryCheckBox23, ternaryCheckBox24, ternaryCheckBox25, ternaryCheckBox26, ternaryCheckBox27, ternaryCheckBox28, simpleDraweeView, textView, floatingActionButton, linearLayout, textView2, linearLayout2, linearLayout3, textView3);
                                                                                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java
index f76f0aa52a..6de33cb0b5 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.permissions;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action2;
 /* compiled from: WidgetChannelSettingsEditPermissions.kt */
@@ -16,7 +17,7 @@ public final class WidgetChannelSettingsEditPermissions$configureUI$1<T1, T2> im
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364096) {
+        if (menuItem.getItemId() == R.id.menu_edit_overwrite_delete) {
             WidgetChannelSettingsEditPermissions.access$deletePermissionOverwrites(this.this$0, this.$model.getChannel().h(), WidgetChannelSettingsEditPermissions.access$getTargetId$p(this.this$0));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$guildId$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$guildId$2.java
index abd819c4b9..7d20b08b2f 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$guildId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.permissions;
 
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetChannelSettingsEditPermissions.kt */
@@ -17,6 +18,6 @@ public final class WidgetChannelSettingsEditPermissions$guildId$2 extends o impl
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$targetId$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$targetId$2.java
index 002c2dd4e8..d570f786d3 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$targetId$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$targetId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.permissions;
 
+import com.discord.widgets.search.WidgetSearch;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetChannelSettingsEditPermissions.kt */
@@ -17,6 +18,6 @@ public final class WidgetChannelSettingsEditPermissions$targetId$2 extends o imp
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_TARGET_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetSearch.INTENT_EXTRA_TARGET_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java
index 34623782b2..1a7ea0301c 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java
@@ -16,6 +16,8 @@ import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -55,8 +57,8 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private static final String INTENT_EXTRA_TARGET_ID = "INTENT_EXTRA_TARGET_ID";
     private static final String INTENT_EXTRA_TYPE = "INTENT_EXTRA_TYPE";
-    private static final Set<Long> STAGE_DISABLED_PERMISSIONS = m0.setOf(4294967296L);
-    private static final Set<Long> STAGE_HIDDEN_PERMISSIONS = n0.setOf((Object[]) new Long[]{512L, 256L, 2097152L, 33554432L});
+    private static final Set<Long> STAGE_DISABLED_PERMISSIONS = m0.setOf(Long.valueOf((long) Permission.REQUEST_TO_SPEAK));
+    private static final Set<Long> STAGE_HIDDEN_PERMISSIONS = n0.setOf((Object[]) new Long[]{512L, 256L, Long.valueOf((long) Permission.SPEAK), Long.valueOf((long) Permission.USE_VAD)});
     public static final int TYPE_ROLE = 1;
     public static final int TYPE_USER = 0;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetChannelSettingsEditPermissions$binding$2.INSTANCE, null, 2, null);
@@ -87,73 +89,73 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         private final void create(Context context, long j, long j2, long j3, int i) {
             Intent intent = new Intent();
             intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-            intent.putExtra("INTENT_EXTRA_CHANNEL_ID", j2);
+            intent.putExtra(WidgetChannelSettingsEditPermissions.INTENT_EXTRA_CHANNEL_ID, j2);
             intent.putExtra("INTENT_EXTRA_TARGET_ID", j3);
-            intent.putExtra("INTENT_EXTRA_TYPE", i);
+            intent.putExtra(WidgetChannelSettingsEditPermissions.INTENT_EXTRA_TYPE, i);
             l.d(context, WidgetChannelSettingsEditPermissions.class, intent);
         }
 
         @SuppressLint({"NonConstantResourceId"})
         private final long getPermission(@IdRes int i) {
             switch (i) {
-                case 2131362317:
+                case R.id.channel_permission_general_create_instant_invite /* 2131362317 */:
                     return 1;
-                case 2131362318:
+                case R.id.channel_permission_general_manage_channel /* 2131362318 */:
                     return 16;
-                case 2131362319:
-                    return 268435456;
-                case 2131362320:
-                    return 17179869184L;
-                case 2131362321:
-                    return 536870912;
-                case 2131362322:
+                case R.id.channel_permission_general_manage_permissions /* 2131362319 */:
+                    return Permission.MANAGE_ROLES;
+                case R.id.channel_permission_general_manage_threads /* 2131362320 */:
+                    return Permission.MANAGE_THREADS;
+                case R.id.channel_permission_general_manage_webhooks /* 2131362321 */:
+                    return Permission.MANAGE_WEBHOOKS;
+                case R.id.channel_permission_owner_view /* 2131362322 */:
                 default:
                     throw new IllegalArgumentException(a.j("Invalid ID: ", i));
-                case 2131362323:
-                    return 4294967296L;
-                case 2131362324:
+                case R.id.channel_permission_stage_request_to_speak /* 2131362323 */:
+                    return Permission.REQUEST_TO_SPEAK;
+                case R.id.channel_permission_text_add_reactions /* 2131362324 */:
                     return 64;
-                case 2131362325:
-                    return 32768;
-                case 2131362326:
-                    return 16384;
-                case 2131362327:
-                    return 8192;
-                case 2131362328:
-                    return 131072;
-                case 2131362329:
-                    return 65536;
-                case 2131362330:
-                    return 1024;
-                case 2131362331:
-                    return 2048;
-                case 2131362332:
-                    return 4096;
-                case 2131362333:
-                    return 262144;
-                case 2131362334:
-                    return 137438953472L;
-                case 2131362335:
-                    return 68719476736L;
-                case 2131362336:
-                    return 34359738368L;
-                case 2131362337:
-                    return 2147483648L;
-                case 2131362338:
-                    return 1048576;
-                case 2131362339:
-                    return 8388608;
-                case 2131362340:
-                    return 16777216;
-                case 2131362341:
-                    return 4194304;
-                case 2131362342:
+                case R.id.channel_permission_text_attach_files /* 2131362325 */:
+                    return Permission.ATTACH_FILES;
+                case R.id.channel_permission_text_embed_links /* 2131362326 */:
+                    return Permission.EMBED_LINKS;
+                case R.id.channel_permission_text_manage_messages /* 2131362327 */:
+                    return Permission.MANAGE_MESSAGES;
+                case R.id.channel_permission_text_mention_everyone /* 2131362328 */:
+                    return Permission.MENTION_EVERYONE;
+                case R.id.channel_permission_text_read_message_history /* 2131362329 */:
+                    return Permission.READ_MESSAGE_HISTORY;
+                case R.id.channel_permission_text_read_messages /* 2131362330 */:
+                    return Permission.VIEW_CHANNEL;
+                case R.id.channel_permission_text_send_messages /* 2131362331 */:
+                    return Permission.SEND_MESSAGES;
+                case R.id.channel_permission_text_send_tts_messages /* 2131362332 */:
+                    return Permission.SEND_TTS_MESSAGES;
+                case R.id.channel_permission_text_use_external_emojis /* 2131362333 */:
+                    return Permission.USE_EXTERNAL_EMOJIS;
+                case R.id.channel_permission_text_use_external_stickers /* 2131362334 */:
+                    return Permission.USE_EXTERNAL_STICKERS;
+                case R.id.channel_permission_text_use_private_threads /* 2131362335 */:
+                    return Permission.USE_PRIVATE_THREADS;
+                case R.id.channel_permission_text_use_public_threads /* 2131362336 */:
+                    return Permission.USE_PUBLIC_THREADS;
+                case R.id.channel_permission_use_application_commands /* 2131362337 */:
+                    return Permission.USE_APPLICATION_COMMANDS;
+                case R.id.channel_permission_voice_connect /* 2131362338 */:
+                    return Permission.CONNECT;
+                case R.id.channel_permission_voice_deafen_members /* 2131362339 */:
+                    return Permission.DEAFEN_MEMBERS;
+                case R.id.channel_permission_voice_move_members /* 2131362340 */:
+                    return Permission.MOVE_MEMBERS;
+                case R.id.channel_permission_voice_mute_members /* 2131362341 */:
+                    return Permission.MUTE_MEMBERS;
+                case R.id.channel_permission_voice_priority_speaker /* 2131362342 */:
                     return 256;
-                case 2131362343:
-                    return 2097152;
-                case 2131362344:
-                    return 33554432;
-                case 2131362345:
+                case R.id.channel_permission_voice_speak /* 2131362343 */:
+                    return Permission.SPEAK;
+                case R.id.channel_permission_voice_use_vad /* 2131362344 */:
+                    return Permission.USE_VAD;
+                case R.id.channel_permission_voice_video /* 2131362345 */:
                     return 512;
             }
         }
@@ -183,7 +185,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
     }
 
     public WidgetChannelSettingsEditPermissions() {
-        super(2131558911);
+        super(R.layout.widget_channel_settings_edit_permissions);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelSettingsEditPermissions widgetChannelSettingsEditPermissions, WidgetChannelSettingsEditPermissionsModel widgetChannelSettingsEditPermissionsModel) {
@@ -255,8 +257,8 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         } else {
             permissionOverwrite = null;
         }
-        int i = permissionOverwrite != null ? 2131623949 : 2131623951;
-        setActionBarTitle(AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 2131887223 : 2131887342);
+        int i = permissionOverwrite != null ? R.menu.menu_edit_permission_overwrite : R.menu.menu_empty;
+        setActionBarTitle(AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? R.string.category_settings : R.string.channel_settings);
         setActionBarSubtitle(AnimatableValueParser.z0(widgetChannelSettingsEditPermissionsModel.getChannel(), requireContext(), true));
         AppFragment.setActionBarOptionsMenu$default(this, i, new WidgetChannelSettingsEditPermissions$configureUI$1(this, widgetChannelSettingsEditPermissionsModel), null, 4, null);
         if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForRole) {
@@ -267,7 +269,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
             TextView textView = getBinding().H;
             m.checkNotNullExpressionValue(textView, "binding.channelPermissionsTargetName");
             WidgetChannelSettingsEditPermissionsModel.ModelForRole modelForRole = (WidgetChannelSettingsEditPermissionsModel.ModelForRole) widgetChannelSettingsEditPermissionsModel;
-            Companion.access$setTextWithFont(companion, textView, modelForRole.getGuildRole().f(), 2130969328);
+            Companion.access$setTextWithFont(companion, textView, modelForRole.getGuildRole().f(), R.attr.font_primary_semibold);
             getBinding().H.setTextColor(RoleUtils.getRoleColor$default(modelForRole.getGuildRole(), requireContext(), null, 2, null));
         } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForUser) {
             SimpleDraweeView simpleDraweeView2 = getBinding().D;
@@ -277,10 +279,10 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
             TextView textView2 = getBinding().H;
             m.checkNotNullExpressionValue(textView2, "binding.channelPermissionsTargetName");
             WidgetChannelSettingsEditPermissionsModel.ModelForUser modelForUser = (WidgetChannelSettingsEditPermissionsModel.ModelForUser) widgetChannelSettingsEditPermissionsModel;
-            Companion.access$setTextWithFont(companion2, textView2, modelForUser.getUser().getUsername(), 2130969327);
+            Companion.access$setTextWithFont(companion2, textView2, modelForUser.getUser().getUsername(), R.attr.font_primary_normal);
             SimpleDraweeView simpleDraweeView3 = getBinding().D;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.channelPermissionsAvatar");
-            IconUtils.setIcon$default(simpleDraweeView3, modelForUser.getUser(), 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView3, modelForUser.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
         }
         TextView textView3 = getBinding().E;
         m.checkNotNullExpressionValue(textView3, "binding.channelPermissionsChannelName");
@@ -298,7 +300,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         m.checkNotNullExpressionValue(ternaryCheckBox, "binding.channelPermissionGeneralManageWebhooks");
         ternaryCheckBox.setVisibility(AnimatableValueParser.l1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
         if (AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel())) {
-            getBinding().K.setText(2131893228);
+            getBinding().K.setText(R.string.role_permissions_section_general_category);
         }
         Map<Integer, PermissionLabelOverrides> categoryLabels = ChannelPermissionUtilsKt.getCategoryLabels(requireContext());
         boolean z3 = widgetChannelSettingsEditPermissionsModel.getType() == 1 && widgetChannelSettingsEditPermissionsModel.getTargetId() == widgetChannelSettingsEditPermissionsModel.getChannel().f();
@@ -323,13 +325,13 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
             }
             setupPermissionEnabledState(ternaryCheckBox2, access$getPermission, widgetChannelSettingsEditPermissionsModel);
             setupPermissionCheckedState(ternaryCheckBox2, permissionOverwrite2);
-            if (id2 == 2131362342) {
-                ternaryCheckBox2.setSubtext(b.j(ternaryCheckBox2, 2131893219, new Object[]{getString(2131891048)}, null, 4));
+            if (id2 == R.id.channel_permission_voice_priority_speaker) {
+                ternaryCheckBox2.setSubtext(b.j(ternaryCheckBox2, R.string.role_permissions_priority_speaker_description_voice_mobile, new Object[]{getString(R.string.keybind_push_to_talk_priority)}, null, 4));
             }
-            if (id2 == 2131362335) {
+            if (id2 == R.id.channel_permission_text_use_private_threads) {
                 ternaryCheckBox2.setVisibility(AnimatableValueParser.d1(widgetChannelSettingsEditPermissionsModel.getChannel()) ^ true ? 0 : 8);
             }
-            if (id2 == 2131362320) {
+            if (id2 == R.id.channel_permission_general_manage_threads) {
                 ternaryCheckBox2.setVisibility(AnimatableValueParser.m1(widgetChannelSettingsEditPermissionsModel.getChannel()) ^ true ? 0 : 8);
             }
             updateCheckboxLabels(ternaryCheckBox2, widgetChannelSettingsEditPermissionsModel.getChannel().A(), z3, categoryLabels.get(Integer.valueOf(id2)));
@@ -404,19 +406,19 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
 
     private final void setupPermissionEnabledState(TernaryCheckBox ternaryCheckBox, long j, WidgetChannelSettingsEditPermissionsModel widgetChannelSettingsEditPermissionsModel) {
         if (AnimatableValueParser.w1(widgetChannelSettingsEditPermissionsModel.getChannel()) && STAGE_DISABLED_PERMISSIONS.contains(Long.valueOf(j))) {
-            ternaryCheckBox.setDisabled(2131893733);
+            ternaryCheckBox.setDisabled(R.string.stage_channel_cannot_overwrite_permission);
         } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForUser) {
             WidgetChannelSettingsEditPermissionsModel.ModelForUser modelForUser = (WidgetChannelSettingsEditPermissionsModel.ModelForUser) widgetChannelSettingsEditPermissionsModel;
             if (modelForUser.isMe()) {
                 if (ternaryCheckBox.b()) {
-                    ternaryCheckBox.setDisabled(2131887199);
+                    ternaryCheckBox.setDisabled(R.string.cannot_deny_self_simple);
                 } else {
-                    ternaryCheckBox.setOffDisabled(2131887199);
+                    ternaryCheckBox.setOffDisabled(R.string.cannot_deny_self_simple);
                 }
             } else if ((modelForUser.getMyPermissionsForChannel() & j) == j) {
                 ternaryCheckBox.c();
             } else {
-                ternaryCheckBox.setDisabled(2131887198);
+                ternaryCheckBox.setDisabled(R.string.cannot_deny_missing_permission);
             }
         } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForRole) {
             WidgetChannelSettingsEditPermissionsModel.ModelForRole modelForRole = (WidgetChannelSettingsEditPermissionsModel.ModelForRole) widgetChannelSettingsEditPermissionsModel;
@@ -438,9 +440,9 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
                 } else if (!ternaryCheckBox.b()) {
                 } else {
                     if (!modelForRole.canNeutralizeRolePermission(j)) {
-                        ternaryCheckBox.setDisabled(2131887200);
+                        ternaryCheckBox.setDisabled(R.string.cannot_deny_singular_permission);
                     } else if (modelForRole.canNeutralizeRolePermission(j) && !modelForRole.canDenyRolePermission(j)) {
-                        ternaryCheckBox.setOffDisabled(2131887200);
+                        ternaryCheckBox.setOffDisabled(R.string.cannot_deny_singular_permission);
                     } else if (modelForRole.canNeutralizeRolePermission(j) && modelForRole.canDenyRolePermission(j)) {
                         ternaryCheckBox.c();
                     }
@@ -448,9 +450,9 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
             } else if (modelForRole.canDenyRolePermission(j)) {
                 ternaryCheckBox.c();
             } else if ((modelForRole.getMyPermissionsForChannel() & j) == j) {
-                ternaryCheckBox.setOffDisabled(2131887200);
+                ternaryCheckBox.setOffDisabled(R.string.cannot_deny_singular_permission);
             } else {
-                ternaryCheckBox.setOffDisabled(2131887198);
+                ternaryCheckBox.setOffDisabled(R.string.cannot_deny_missing_permission);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java
index 5b27fb148f..b912371f54 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.channels.permissions;
 
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
@@ -82,7 +83,7 @@ public final class WidgetChannelSettingsEditPermissionsModel$Companion$getForRol
                 ArrayList arrayList = new ArrayList(channel.s() != null ? channel.s() : n.emptyList());
                 long j = this.$targetRoleId;
                 PermissionOverwrite.Type type = PermissionOverwrite.Type.ROLE;
-                PermissionOverwrite permissionOverwrite = new PermissionOverwrite(j, type, 0, 274877382399L);
+                PermissionOverwrite permissionOverwrite = new PermissionOverwrite(j, type, 0, Permission.ALL);
                 r.removeAll((List) arrayList, (Function1) new AnonymousClass1(this));
                 arrayList.add(permissionOverwrite);
                 PermissionOverwrite permissionOverwrite2 = new PermissionOverwrite(this.$targetRoleId, type, 0, 0);
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java
index 5b036cf250..434b8131db 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.permissions;
 import a0.a.a.b;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
@@ -54,7 +55,7 @@ public abstract class WidgetChannelSettingsEditPermissionsModel {
         }
 
         private final boolean isAbleToManagePerms(Guild guild, MeUser meUser, long j) {
-            return ((guild.getOwnerId() > meUser.getId() ? 1 : (guild.getOwnerId() == meUser.getId() ? 0 : -1)) == 0) || PermissionUtils.canAndIsElevated(268435456, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel());
+            return ((guild.getOwnerId() > meUser.getId() ? 1 : (guild.getOwnerId() == meUser.getId() ? 0 : -1)) == 0) || PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel());
         }
 
         public final Observable<WidgetChannelSettingsEditPermissionsModel> get(long j, long j2, long j3, int i) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
index e2bdad6321..9e5e8ed973 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
@@ -18,7 +18,9 @@ import c.a.e.l;
 import c.a.e.q;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.app.AppFragment;
 import com.discord.models.guild.Guild;
@@ -58,7 +60,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
             this.channel = channel;
             this.memberItems = list;
             boolean mfaEnabled = meUser.getMfaEnabled();
-            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(268435456, l, mfaEnabled, guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, l, mfaEnabled, guild.getMfaLevel());
+            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, l, mfaEnabled, guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, l, mfaEnabled, guild.getMfaLevel());
         }
 
         public static /* synthetic */ boolean access$000(Model model) {
@@ -145,11 +147,11 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     }
 
     public WidgetChannelSettingsPermissionsAddMember() {
-        super(2131558912);
+        super(R.layout.widget_channel_settings_permissions_add_member);
     }
 
     private void configureToolbar(Channel channel) {
-        setActionBarTitle(2131886237);
+        setActionBarTitle(R.string.add_a_member);
         setActionBarSubtitle(AnimatableValueParser.z0(channel, requireContext(), true));
     }
 
@@ -169,7 +171,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     public static void create(Context context, long j, long j2) {
         Intent intent = new Intent();
         intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-        intent.putExtra("INTENT_EXTRA_CHANNEL_ID", j2);
+        intent.putExtra(INTENT_EXTRA_CHANNEL_ID, j2);
         l.d(context, WidgetChannelSettingsPermissionsAddMember.class, intent);
     }
 
@@ -185,9 +187,9 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBound(@NonNull View view) {
         super.onViewBound(view);
-        this.membersRecycler = (RecyclerView) view.findViewById(2131362376);
-        this.searchBox = (TextInputLayout) view.findViewById(2131362375);
-        this.viewFlipper = (ViewFlipper) view.findViewById(2131362377);
+        this.membersRecycler = (RecyclerView) view.findViewById(R.id.channel_settings_permissions_add_member_recycler);
+        this.searchBox = (TextInputLayout) view.findViewById(R.id.channel_settings_permissions_add_member_name_search);
+        this.viewFlipper = (ViewFlipper) view.findViewById(R.id.channel_settings_permissions_add_member_view_flipper);
         setActionBarDisplayHomeAsUpEnabled();
         this.membersAdapter = (SimpleMembersAdapter) MGRecyclerAdapter.configure(new SimpleMembersAdapter(this.membersRecycler));
     }
@@ -196,7 +198,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         long longExtra = getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
-        long longExtra2 = getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", -1);
+        long longExtra2 = getMostRecentIntent().getLongExtra(INTENT_EXTRA_CHANNEL_ID, -1);
         ViewExtensions.addBindedTextWatcher(this.searchBox, this, new m(this));
         this.nameFilterPublisher.onNext(ViewExtensions.getTextOrEmpty(this.searchBox));
         this.nameFilterPublisher.o(750, TimeUnit.MILLISECONDS).x(n.i).k(q.e(new b(longExtra), getClass()));
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
index 40bd7bbc57..68597c55e0 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
@@ -12,7 +12,9 @@ import c.a.e.l;
 import c.a.e.q;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.app.AppFragment;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
@@ -38,7 +40,7 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
             this.channel = channel;
             this.roleItems = list;
             boolean mfaEnabled = meUser.getMfaEnabled();
-            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(268435456, l, mfaEnabled, guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, l, mfaEnabled, guild.getMfaLevel());
+            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, l, mfaEnabled, guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, l, mfaEnabled, guild.getMfaLevel());
         }
 
         public static /* synthetic */ boolean access$000(Model model) {
@@ -117,11 +119,11 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
     }
 
     public WidgetChannelSettingsPermissionsAddRole() {
-        super(2131558913);
+        super(R.layout.widget_channel_settings_permissions_add_role);
     }
 
     private void configureToolbar(Channel channel) {
-        setActionBarTitle(2131886238);
+        setActionBarTitle(R.string.add_a_role);
         setActionBarSubtitle(AnimatableValueParser.z0(channel, requireContext(), true));
     }
 
@@ -136,7 +138,7 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
 
     public static void create(Context context, long j) {
         Intent intent = new Intent();
-        intent.putExtra("INTENT_EXTRA_CHANNEL_ID", j);
+        intent.putExtra(INTENT_EXTRA_CHANNEL_ID, j);
         l.d(context, WidgetChannelSettingsPermissionsAddRole.class, intent);
     }
 
@@ -148,14 +150,14 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
     public void onViewBound(@NonNull View view) {
         super.onViewBound(view);
         setActionBarDisplayHomeAsUpEnabled();
-        this.rolesRecycler = (RecyclerView) view.findViewById(2131362378);
+        this.rolesRecycler = (RecyclerView) view.findViewById(R.id.channel_settings_permissions_add_role_recycler);
         this.rolesAdapter = (SimpleRolesAdapter) MGRecyclerAdapter.configure(new SimpleRolesAdapter(this.rolesRecycler));
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<Model> observable = Model.get(getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", -1));
+        Observable<Model> observable = Model.get(getMostRecentIntent().getLongExtra(INTENT_EXTRA_CHANNEL_ID, -1));
         m.checkNotNullParameter(this, "appComponent");
         m.checkNotNullExpressionValue(observable, "it");
         ObservableExtensionsKt.ui(observable, this, null).k(q.e(new o(this), getClass()));
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java
index 387a3ab713..055e0fa802 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.permissions;
 
 import android.view.View;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.widgets.channels.permissions.WidgetChannelSettingsPermissionsAdvanced;
 /* compiled from: WidgetChannelSettingsPermissionsAdvanced.kt */
 public final class WidgetChannelSettingsPermissionsAdvanced$configureUI$1 implements View.OnClickListener {
@@ -18,7 +19,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced$configureUI$1 implem
         if (this.$model.getCanAddRole()) {
             WidgetChannelSettingsPermissionsAddRole.create(this.this$0.getContext(), this.$model.getChannel().h());
         } else {
-            o.i(this.this$0, 2131892102, 0, 4);
+            o.i(this.this$0, R.string.overwrite_no_role_to_add, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java
index 3826362e63..166bad384f 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelSettingsPermissionsAdvancedBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -19,23 +20,23 @@ public final /* synthetic */ class WidgetChannelSettingsPermissionsAdvanced$view
 
     public final WidgetChannelSettingsPermissionsAdvancedBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361922;
-        TextView textView = (TextView) view.findViewById(2131361922);
+        int i = R.id.add_member;
+        TextView textView = (TextView) view.findViewById(R.id.add_member);
         if (textView != null) {
-            i = 2131361925;
-            TextView textView2 = (TextView) view.findViewById(2131361925);
+            i = R.id.add_role;
+            TextView textView2 = (TextView) view.findViewById(R.id.add_role);
             if (textView2 != null) {
-                i = 2131364067;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364067);
+                i = R.id.members_container;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.members_container);
                 if (linearLayout != null) {
-                    i = 2131364069;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364069);
+                    i = R.id.members_recycler;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.members_recycler);
                     if (recyclerView != null) {
-                        i = 2131364729;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364729);
+                        i = R.id.roles_container;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.roles_container);
                         if (linearLayout2 != null) {
-                            i = 2131364732;
-                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364732);
+                            i = R.id.roles_recycler;
+                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.roles_recycler);
                             if (recyclerView2 != null) {
                                 return new WidgetChannelSettingsPermissionsAdvancedBinding((CoordinatorLayout) view, textView, textView2, linearLayout, recyclerView, linearLayout2, recyclerView2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
index a2c999559f..9ab1466280 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
@@ -7,7 +7,9 @@ import android.widget.LinearLayout;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppFragment;
@@ -113,7 +115,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
             this.guildRoles = map;
             this.memberItems = list;
             boolean z2 = false;
-            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(268435456, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel());
+            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel());
             List<SimpleRolesAdapter.RoleItem> buildRoleItems = buildRoleItems();
             this.roleItems = buildRoleItems;
             this.canAddRole = map.size() > buildRoleItems.size() ? true : z2;
@@ -268,7 +270,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
     }
 
     public WidgetChannelSettingsPermissionsAdvanced() {
-        super(2131558914);
+        super(R.layout.widget_channel_settings_permissions_advanced);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelSettingsPermissionsAdvanced widgetChannelSettingsPermissionsAdvanced, Model model) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java
index e096158645..63ce1604e3 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.permissions;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.FragmentContainerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetChannelSettingsPermissionsOverviewBinding;
 import com.discord.views.segmentedcontrol.SegmentedControlContainer;
@@ -19,17 +20,17 @@ public final /* synthetic */ class WidgetChannelSettingsPermissionsOverview$view
 
     public final WidgetChannelSettingsPermissionsOverviewBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361932;
-        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131361932);
+        int i = R.id.advanced_permissions_fragment;
+        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.advanced_permissions_fragment);
         if (fragmentContainerView != null) {
-            i = 2131363301;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363301);
+            i = R.id.flipper;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.flipper);
             if (appViewFlipper != null) {
-                i = 2131364796;
-                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131364796);
+                i = R.id.segmented_control;
+                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(R.id.segmented_control);
                 if (segmentedControlContainer != null) {
-                    i = 2131365261;
-                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365261);
+                    i = R.id.stage_moderator_permissions_fragment;
+                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(R.id.stage_moderator_permissions_fragment);
                     if (fragmentContainerView2 != null) {
                         return new WidgetChannelSettingsPermissionsOverviewBinding((CoordinatorLayout) view, fragmentContainerView, appViewFlipper, segmentedControlContainer, fragmentContainerView2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
index 22ce770518..00510a5e31 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
@@ -11,7 +11,9 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -105,7 +107,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
             this.channel = channel;
             this.myPermissions = j;
             this.guildRoles = map;
-            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(268435456, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel());
+            this.canManage = guild.getOwnerId() == meUser.getId() || PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel()) || PermissionUtils.canAndIsElevated(8, Long.valueOf(j), meUser.getMfaEnabled(), guild.getMfaLevel());
         }
 
         /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.widgets.channels.permissions.WidgetChannelSettingsPermissionsOverview$Model */
@@ -242,7 +244,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
     }
 
     public WidgetChannelSettingsPermissionsOverview() {
-        super(2131558915);
+        super(R.layout.widget_channel_settings_permissions_overview);
         WidgetChannelSettingsPermissionsOverview$viewModel$2 widgetChannelSettingsPermissionsOverview$viewModel$2 = new WidgetChannelSettingsPermissionsOverview$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelSettingsPermissionsOverviewViewModel.class), new WidgetChannelSettingsPermissionsOverview$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelSettingsPermissionsOverview$viewModel$2));
@@ -301,7 +303,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
     }
 
     private final void configureToolbar(Channel channel) {
-        setActionBarTitle(AnimatableValueParser.f1(channel) ? 2131887223 : 2131887342);
+        setActionBarTitle(AnimatableValueParser.f1(channel) ? R.string.category_settings : R.string.channel_settings);
         setActionBarSubtitle(AnimatableValueParser.z0(channel, requireContext(), true));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java
index 2c473fd136..e34bdb4f0e 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.permissions;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.fragment.app.FragmentContainerView;
+import com.discord.R;
 import com.discord.databinding.WidgetCreateChannelAddMemberBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetCreateChannelAddMember$binding$2 extend
 
     public final WidgetCreateChannelAddMemberBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362796);
+        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.content);
         if (fragmentContainerView != null) {
             return new WidgetCreateChannelAddMemberBinding((LinearLayout) view, fragmentContainerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362796)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.content)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java
index 7e7296952d..2b74d3d706 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.permissions;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.app.AppFragment;
 import d0.z.d.m;
@@ -27,7 +28,7 @@ public final class WidgetCreateChannelAddMember$onViewBound$2 extends o implemen
 
         public final void call(MenuItem menuItem, Context context) {
             m.checkNotNullExpressionValue(menuItem, "menuItem");
-            if (menuItem.getItemId() == 2131364092) {
+            if (menuItem.getItemId() == R.id.menu_continue) {
                 WidgetCreateChannelAddMember widgetCreateChannelAddMember = this.this$0.this$0;
                 Map map = this.$selected;
                 m.checkNotNullExpressionValue(map, "selected");
@@ -51,6 +52,6 @@ public final class WidgetCreateChannelAddMember$onViewBound$2 extends o implemen
     }
 
     public final void invoke(Map<Long, ? extends PermissionOverwrite.Type> map) {
-        AppFragment.setActionBarOptionsMenu$default(this.this$0, 2131623936, new AnonymousClass1(this, map), null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this.this$0, R.menu.menu_add_member_continue, new AnonymousClass1(this, map), null, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java
index f4e2247663..24255955ab 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentContainerView;
 import androidx.fragment.app.FragmentTransaction;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.app.AppFragment;
@@ -53,7 +54,7 @@ public final class WidgetCreateChannelAddMember extends AppFragment {
     }
 
     public WidgetCreateChannelAddMember() {
-        super(2131559010);
+        super(R.layout.widget_create_channel_add_member);
     }
 
     public static final /* synthetic */ void access$addPermissionOverwrites(WidgetCreateChannelAddMember widgetCreateChannelAddMember, Map map) {
@@ -115,7 +116,7 @@ public final class WidgetCreateChannelAddMember extends AppFragment {
         }
         beginTransaction.replace(id2, widgetChannelSettingsAddMemberFragment, widgetChannelSettingsAddMemberFragment2.getClass().getSimpleName()).commit();
         setActionBarDisplayHomeAsUpEnabled(true);
-        setActionBarTitle(2131887311);
+        setActionBarTitle(R.string.channel_permissions_add_moderator_title);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getChannels().observeChannel(getChannelId()), this, null, 2, null), WidgetCreateChannelAddMember.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCreateChannelAddMember$onViewBound$1(this), 62, (Object) null);
         WidgetChannelSettingsAddMemberFragment widgetChannelSettingsAddMemberFragment3 = this.fragment;
         if (widgetChannelSettingsAddMemberFragment3 == null) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java
index c974b1e825..b0bf63580a 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.permissions;
 import android.view.View;
 import android.widget.Toast;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.widgets.channels.permissions.WidgetChannelSettingsAddMemberSheet;
 import com.discord.widgets.channels.permissions.WidgetStageChannelModeratorPermissionsViewModel;
 import d0.z.d.m;
@@ -25,7 +26,7 @@ public final class WidgetStageChannelModeratorPermissions$configureUI$1 implemen
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             companion.show(parentFragmentManager, WidgetStageChannelModeratorPermissions.access$getChannelId$p(this.this$0));
         } else if (!canEditModerators) {
-            Toast.makeText(this.this$0.getContext(), 2131887316, 0).show();
+            Toast.makeText(this.this$0.getContext(), (int) R.string.channel_permissions_cannot_edit_moderators, 0).show();
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java
index 946d0026e1..9b0ee2104b 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.permissions;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageChannelModeratorPermissionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -16,14 +17,14 @@ public final /* synthetic */ class WidgetStageChannelModeratorPermissions$viewBi
 
     public final WidgetStageChannelModeratorPermissionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361924;
-        AddPermissionOwnerView addPermissionOwnerView = (AddPermissionOwnerView) view.findViewById(2131361924);
+        int i = R.id.add_permission_owner_button;
+        AddPermissionOwnerView addPermissionOwnerView = (AddPermissionOwnerView) view.findViewById(R.id.add_permission_owner_button);
         if (addPermissionOwnerView != null) {
-            i = 2131364068;
-            PermissionOwnerListView permissionOwnerListView = (PermissionOwnerListView) view.findViewById(2131364068);
+            i = R.id.members_permission_owners_list;
+            PermissionOwnerListView permissionOwnerListView = (PermissionOwnerListView) view.findViewById(R.id.members_permission_owners_list);
             if (permissionOwnerListView != null) {
-                i = 2131364731;
-                PermissionOwnerListView permissionOwnerListView2 = (PermissionOwnerListView) view.findViewById(2131364731);
+                i = R.id.roles_permission_owners_list;
+                PermissionOwnerListView permissionOwnerListView2 = (PermissionOwnerListView) view.findViewById(R.id.roles_permission_owners_list);
                 if (permissionOwnerListView2 != null) {
                     return new WidgetStageChannelModeratorPermissionsBinding((CoordinatorLayout) view, addPermissionOwnerView, permissionOwnerListView, permissionOwnerListView2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
index 1cec1bd74b..8d43856346 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetStageChannelModeratorPermissionsBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -31,7 +32,7 @@ public final class WidgetStageChannelModeratorPermissions extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetStageChannelModeratorPermissions() {
-        super(2131559286);
+        super(R.layout.widget_stage_channel_moderator_permissions);
         WidgetStageChannelModeratorPermissions$viewModel$2 widgetStageChannelModeratorPermissions$viewModel$2 = new WidgetStageChannelModeratorPermissions$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetStageChannelModeratorPermissionsViewModel.class), new WidgetStageChannelModeratorPermissions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetStageChannelModeratorPermissions$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$binding$2.java
index f7ef151146..c9c3f2f850 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelGroupDmSettingsBinding;
 import com.discord.widgets.servers.NotificationMuteSettingsView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -22,26 +23,26 @@ public final /* synthetic */ class WidgetChannelGroupDMSettings$binding$2 extend
 
     public final WidgetChannelGroupDmSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362369;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362369);
+        int i = R.id.channel_settings_edit_name;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.channel_settings_edit_name);
         if (textInputLayout != null) {
-            i = 2131362385;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362385);
+            i = R.id.channel_settings_save;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.channel_settings_save);
             if (floatingActionButton != null) {
-                i = 2131363423;
-                NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131363423);
+                i = R.id.group_dm_notifications_mute_settings_view;
+                NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(R.id.group_dm_notifications_mute_settings_view);
                 if (notificationMuteSettingsView != null) {
-                    i = 2131363424;
-                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363424);
+                    i = R.id.group_dm_settings_scroll_view;
+                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.group_dm_settings_scroll_view);
                     if (nestedScrollView != null) {
-                        i = 2131365084;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365084);
+                        i = R.id.settings_group_icon;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.settings_group_icon);
                         if (simpleDraweeView != null) {
-                            i = 2131365085;
-                            TextView textView = (TextView) view.findViewById(2131365085);
+                            i = R.id.settings_group_icon_label;
+                            TextView textView = (TextView) view.findViewById(R.id.settings_group_icon_label);
                             if (textView != null) {
-                                i = 2131365086;
-                                TextView textView2 = (TextView) view.findViewById(2131365086);
+                                i = R.id.settings_group_icon_remove;
+                                TextView textView2 = (TextView) view.findViewById(R.id.settings_group_icon_remove);
                                 if (textView2 != null) {
                                     return new WidgetChannelGroupDmSettingsBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton, notificationMuteSettingsView, nestedScrollView, simpleDraweeView, textView, textView2);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$configureUi$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$configureUi$1.java
index 800a27a7be..ea70a04768 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$configureUi$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$configureUi$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -37,7 +38,7 @@ public final class WidgetChannelGroupDMSettings$configureUi$1<T1, T2> implements
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364102) {
+        if (menuItem.getItemId() == R.id.menu_leave_group) {
             WidgetChannelGroupDMSettings widgetChannelGroupDMSettings = this.this$0;
             WidgetChannelGroupDMSettings.access$confirmLeave(widgetChannelGroupDMSettings, widgetChannelGroupDMSettings.requireContext(), new AnonymousClass1(this), this.$displayName);
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$onViewBoundOrOnResume$2.java
index 9c3f1488b2..8dbad95d5c 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.settings;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.channels.settings.ChannelGroupDMSettingsViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetChannelGroupDMSettings$onViewBoundOrOnResume$2 extends
     }
 
     public final void invoke(ChannelGroupDMSettingsViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         this.this$0.handleEvent(event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings.java
index d09c4fbd3a..c1b65ac9a4 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelGroupDMSettings.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.view.View;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
@@ -15,6 +16,7 @@ import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -63,19 +65,19 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
 
         public final void create(long j, Context context) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("INTENT_EXTRA_CHANNEL_ID", j);
+            Intent putExtra = new Intent().putExtra(WidgetChannelGroupDMSettings.INTENT_EXTRA_CHANNEL_ID, j);
             m.checkNotNullExpressionValue(putExtra, "Intent().putExtra(INTENT…RA_CHANNEL_ID, channelId)");
             l.d(context, WidgetChannelGroupDMSettings.class, putExtra);
         }
     }
 
     public WidgetChannelGroupDMSettings() {
-        super(2131558890);
+        super(R.layout.widget_channel_group_dm_settings);
         WidgetChannelGroupDMSettings$viewModel$2 widgetChannelGroupDMSettings$viewModel$2 = new WidgetChannelGroupDMSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChannelGroupDMSettingsViewModel.class), new WidgetChannelGroupDMSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelGroupDMSettings$viewModel$2));
         this.iconEditedResult = WidgetChannelGroupDMSettings$iconEditedResult$1.INSTANCE;
-        this.state = new StatefulViews(2131362369, 2131365084);
+        this.state = new StatefulViews(R.id.channel_settings_edit_name, R.id.settings_group_icon);
     }
 
     public static final /* synthetic */ void access$configureUi(WidgetChannelGroupDMSettings widgetChannelGroupDMSettings, ChannelGroupDMSettingsViewModel.ViewState viewState) {
@@ -124,7 +126,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
         this.iconEditedResult = new WidgetChannelGroupDMSettings$configureIcon$2(this);
         SimpleDraweeView simpleDraweeView3 = getBinding().f;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.settingsGroupIcon");
-        IconUtils.setIcon$default(simpleDraweeView3, currentIconUrl, 2131165299, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView3, currentIconUrl, (int) R.dimen.avatar_size_xxlarge, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.settingsGroupIconLabel");
         int i = 0;
@@ -150,10 +152,10 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
             ChannelSettings channelSettings = valid.getChannelSettings();
             Channel channel = channelSettings.getChannel();
             String z0 = AnimatableValueParser.z0(channel, requireContext(), true);
-            setActionBarTitle(2131887342);
+            setActionBarTitle(R.string.channel_settings);
             setActionBarSubtitle(z0);
             AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-            AppFragment.setActionBarOptionsMenu$default(this, 2131623955, new WidgetChannelGroupDMSettings$configureUi$1(this, z0), null, 4, null);
+            AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_main_group_settings, new WidgetChannelGroupDMSettings$configureUi$1(this, z0), null, 4, null);
             TextInputLayout textInputLayout = getBinding().b;
             m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
             StatefulViews statefulViews = this.state;
@@ -167,12 +169,12 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
             this.state.configureSaveActionView(getBinding().f1702c);
             getBinding().f1702c.setOnClickListener(new WidgetChannelGroupDMSettings$configureUi$2(this, channel, z0));
             long h = channel.h();
-            getBinding().d.updateView(new NotificationMuteSettingsView.ViewState(channelSettings.isMuted(), channelSettings.getMuteEndTime(), b.k(this, 2131891622, new Object[0], null, 4), b.k(this, 2131894508, new Object[0], null, 4), b.k(this, 2131888710, new Object[0], null, 4), 2131888711, null), new WidgetChannelGroupDMSettings$configureUi$3(this, h), new WidgetChannelGroupDMSettings$configureUi$4(this));
+            getBinding().d.updateView(new NotificationMuteSettingsView.ViewState(channelSettings.isMuted(), channelSettings.getMuteEndTime(), b.k(this, R.string.mute_conversation, new Object[0], null, 4), b.k(this, R.string.unmute_conversation, new Object[0], null, 4), b.k(this, R.string.form_label_mobile_dm_muted, new Object[0], null, 4), R.string.form_label_mobile_dm_muted_until, null), new WidgetChannelGroupDMSettings$configureUi$3(this, h), new WidgetChannelGroupDMSettings$configureUi$4(this));
         }
     }
 
     private final void confirmLeave(Context context, Function0<Unit> function0, CharSequence charSequence) {
-        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(b.k(this, 2131891098, new Object[]{charSequence}, null, 4)).setMessage(b.k(this, 2131891095, new Object[]{charSequence}, null, 4)).setDialogAttrTheme(2130969796).setPositiveButton(2131891094, new WidgetChannelGroupDMSettings$confirmLeave$1(function0)), 2131887193, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(b.k(this, R.string.leave_group_dm_title, new Object[]{charSequence}, null, 4)).setMessage(b.k(this, R.string.leave_group_dm_body, new Object[]{charSequence}, null, 4)).setDialogAttrTheme(R.attr.notice_theme_positive_red).setPositiveButton(R.string.leave_group_dm, new WidgetChannelGroupDMSettings$confirmLeave$1(function0)), (int) R.string.cancel, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         negativeButton$default.show(parentFragmentManager);
@@ -187,14 +189,14 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
     }
 
     private final void handleSettingsSaved() {
-        o.i(this, 2131893359, 0, 4);
+        o.i(this, R.string.saved_settings, 0, 4);
         StatefulViews.clear$default(this.state, false, 1, null);
         AppFragment.hideKeyboard$default(this, null, 1, null);
         getBinding().e.fullScroll(33);
     }
 
     public final void handleEvent(ChannelGroupDMSettingsViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (m.areEqual(event, ChannelGroupDMSettingsViewModel.Event.LeaveGroupSuccess.INSTANCE)) {
             AppActivity appActivity = getAppActivity();
             if (appActivity != null) {
@@ -209,7 +211,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
     /* JADX WARNING: Unknown variable types count: 1 */
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -225,7 +227,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
     /* JADX WARNING: Unknown variable types count: 1 */
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         Context context = getContext();
@@ -242,7 +244,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.settingsGroupIconLabel");
-        textView.setText(b.k(this, 2131891523, new Object[]{"128", "128"}, null, 4));
+        textView.setText(b.k(this, R.string.minimum_size, new Object[]{"128", "128"}, null, 4));
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().f1702c;
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$binding$2.java
index a3919c289e..0df9477595 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelNotificationSettingsBinding;
 import com.discord.views.CheckedSetting;
 import com.discord.widgets.servers.NotificationMuteSettingsView;
@@ -20,29 +21,29 @@ public final /* synthetic */ class WidgetChannelNotificationSettings$binding$2 e
 
     public final WidgetChannelNotificationSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362313;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362313);
+        int i = R.id.channel_notification_settings_system;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.channel_notification_settings_system);
         if (linearLayout != null) {
-            i = 2131362372;
-            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362372);
+            i = R.id.channel_settings_notifications_frequency_wrap;
+            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.channel_settings_notifications_frequency_wrap);
             if (linearLayout2 != null) {
-                i = 2131363316;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363316);
+                i = R.id.frequency_radio_all;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.frequency_radio_all);
                 if (checkedSetting != null) {
-                    i = 2131363317;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131363317);
+                    i = R.id.frequency_radio_mentions;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.frequency_radio_mentions);
                     if (checkedSetting2 != null) {
-                        i = 2131363318;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131363318);
+                        i = R.id.frequency_radio_nothing;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.frequency_radio_nothing);
                         if (checkedSetting3 != null) {
-                            i = 2131363319;
-                            View findViewById = view.findViewById(2131363319);
+                            i = R.id.frequency_top_divider;
+                            View findViewById = view.findViewById(R.id.frequency_top_divider);
                             if (findViewById != null) {
-                                i = 2131364203;
-                                NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131364203);
+                                i = R.id.mute_settings;
+                                NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(R.id.mute_settings);
                                 if (notificationMuteSettingsView != null) {
-                                    i = 2131364758;
-                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364758);
+                                    i = R.id.scroll_view;
+                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.scroll_view);
                                     if (nestedScrollView != null) {
                                         return new WidgetChannelNotificationSettingsBinding((CoordinatorLayout) view, linearLayout, linearLayout2, checkedSetting, checkedSetting2, checkedSetting3, findViewById, notificationMuteSettingsView, nestedScrollView);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$configureNotificationRadios$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$configureNotificationRadios$1.java
index d8aebde245..7b210500b7 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$configureNotificationRadios$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings$configureNotificationRadios$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.settings;
 import android.view.View;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.stores.StoreStream;
 import com.discord.views.CheckedSetting;
@@ -53,7 +54,7 @@ public final class WidgetChannelNotificationSettings$configureNotificationRadios
         m.checkNotNullParameter(model, "$this$configureNotificationRadio");
         m.checkNotNullParameter(checkedSetting, "radio");
         if (model.isGuildMuted() || model.getChannelIsMuted()) {
-            checkedSetting.b(2131887303);
+            checkedSetting.b(R.string.channel_or_guild_muted);
         } else {
             checkedSetting.e(new AnonymousClass1(model, i));
         }
@@ -62,7 +63,7 @@ public final class WidgetChannelNotificationSettings$configureNotificationRadios
             int i2 = CheckedSetting.i;
             checkedSetting.h(null, false);
         } else {
-            CharSequence k = b.k(this.this$0, 2131891083, new Object[0], null, 4);
+            CharSequence k = b.k(this.this$0, R.string.large_guild_notify_all_messages_description, new Object[0], null, 4);
             int i3 = CheckedSetting.i;
             checkedSetting.h(k, false);
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java
index da98a27fef..c854060839 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetChannelNotificationSettings.java
@@ -9,6 +9,7 @@ import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChannelNotificationSettingsBinding;
@@ -54,7 +55,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
 
         public final void launch(Context context, long j, boolean z2) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j).putExtra("SHOW_SYSTEM_SETTING", z2);
+            Intent putExtra = new Intent().putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j).putExtra(WidgetChannelNotificationSettings.INTENT_SHOW_SYSTEM_SETTINGS, z2);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…TINGS, showSystemSetting)");
             l.d(context, WidgetChannelNotificationSettings.class, putExtra);
         }
@@ -259,7 +260,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
     }
 
     public WidgetChannelNotificationSettings() {
-        super(2131558897);
+        super(R.layout.widget_channel_notification_settings);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelNotificationSettings widgetChannelNotificationSettings, Model model) {
@@ -289,7 +290,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
         m.checkNotNullExpressionValue(checkedSetting, "binding.frequencyRadioAll");
         checkedSetting.setVisibility(AnimatableValueParser.z1(model.getChannel()) ? 0 : 8);
         CheckedSetting checkedSetting2 = getBinding().d;
-        String string = requireContext().getString(AnimatableValueParser.w1(model.getChannel()) ? 2131888694 : 2131888743);
+        String string = requireContext().getString(AnimatableValueParser.w1(model.getChannel()) ? R.string.form_label_live_stages_only : R.string.form_label_only_mentions);
         m.checkNotNullExpressionValue(string, "requireContext().getStri…s\n            }\n        )");
         checkedSetting2.setText(b.l(string, new Object[0], null, 2));
         CheckedSetting checkedSetting3 = getBinding().f1704c;
@@ -306,7 +307,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
     private final void configureUI(Model model) {
         int i = 0;
         setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2));
-        NotificationMuteSettingsView.ViewState viewState = new NotificationMuteSettingsView.ViewState(model.getChannelIsMuted(), model.getChannelMuteEndTime(), AnimatableValueParser.z1(model.getChannel()) ? b.h(requireContext(), 2131891620, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.h(requireContext(), 2131891619, new Object[0], null, 4), AnimatableValueParser.z1(model.getChannel()) ? b.h(requireContext(), 2131894506, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.h(requireContext(), 2131894505, new Object[0], null, 4), b.h(requireContext(), 2131888705, new Object[0], null, 4), AnimatableValueParser.z1(model.getChannel()) ? 2131888706 : 2131888703, AnimatableValueParser.z1(model.getChannel()) ? b.h(requireContext(), 2131888709, new Object[0], null, 4) : b.h(requireContext(), 2131888704, new Object[0], null, 4));
+        NotificationMuteSettingsView.ViewState viewState = new NotificationMuteSettingsView.ViewState(model.getChannelIsMuted(), model.getChannelMuteEndTime(), AnimatableValueParser.z1(model.getChannel()) ? b.h(requireContext(), R.string.mute_channel, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.h(requireContext(), R.string.mute_category, new Object[0], null, 4), AnimatableValueParser.z1(model.getChannel()) ? b.h(requireContext(), R.string.unmute_channel, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.h(requireContext(), R.string.unmute_category, new Object[0], null, 4), b.h(requireContext(), R.string.form_label_mobile_channel_muted, new Object[0], null, 4), AnimatableValueParser.z1(model.getChannel()) ? R.string.form_label_mobile_channel_muted_until : R.string.form_label_mobile_category_muted_until, AnimatableValueParser.z1(model.getChannel()) ? b.h(requireContext(), R.string.form_label_mobile_channel_override_mute, new Object[0], null, 4) : b.h(requireContext(), R.string.form_label_mobile_category_override_mute, new Object[0], null, 4));
         WidgetChannelNotificationSettings$configureUI$onMute$1 widgetChannelNotificationSettings$configureUI$onMute$1 = new WidgetChannelNotificationSettings$configureUI$onMute$1(this, model);
         WidgetChannelNotificationSettings$configureUI$onUnmute$1 widgetChannelNotificationSettings$configureUI$onUnmute$1 = new WidgetChannelNotificationSettings$configureUI$onUnmute$1(this, model);
         boolean z1 = AnimatableValueParser.z1(model.getChannel());
@@ -333,11 +334,11 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
         setRetainInstance(true);
         int i = 0;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891872);
+        setActionBarTitle(R.string.notification_settings);
         this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().f1704c, getBinding().d, getBinding().e}));
         LinearLayout linearLayout = getBinding().b;
         m.checkNotNullExpressionValue(linearLayout, "binding.channelNotificationSettingsSystem");
-        if (!getMostRecentIntent().getBooleanExtra("SHOW_SYSTEM_SETTING", false)) {
+        if (!getMostRecentIntent().getBooleanExtra(INTENT_SHOW_SYSTEM_SETTINGS, false)) {
             i = 8;
         }
         linearLayout.setVisibility(i);
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$Model$Companion$get$1.java
index 2c124ea724..319337ec3f 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$Model$Companion$get$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.settings;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
+import com.discord.api.permission.Permission;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreStream;
@@ -35,7 +36,7 @@ public final class WidgetTextChannelSettings$Model$Companion$get$1<T, R> impleme
                 return null;
             }
             boolean canAndIsElevated = PermissionUtils.canAndIsElevated(16, l, meUser.getMfaEnabled(), guild.getMfaLevel());
-            boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(268435456, l, meUser.getMfaEnabled(), guild.getMfaLevel());
+            boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, l, meUser.getMfaEnabled(), guild.getMfaLevel());
             boolean z2 = !this.$channel.o() || StoreStream.Companion.getGuildsNsfw().isGuildNsfwGateAgreed(this.$channel.f());
             boolean contains = guild.getFeatures().contains(GuildFeature.COMMUNITY);
             return new WidgetTextChannelSettings.Model(guild, this.$channel, canAndIsElevated, canAndIsElevated2, z2, contains && (rulesChannelId = guild.getRulesChannelId()) != null && rulesChannelId.longValue() == this.this$0.$channelId, contains && (publicUpdatesChannelId = guild.getPublicUpdatesChannelId()) != null && publicUpdatesChannelId.longValue() == this.this$0.$channelId, contains);
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$binding$2.java
index 9226fb27be..b0ec794c3f 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetTextChannelSettingsBinding;
 import com.discord.databinding.WidgetThreadArchiveActionsSheetBinding;
 import com.discord.views.CheckedSetting;
@@ -24,63 +25,63 @@ public final /* synthetic */ class WidgetTextChannelSettings$binding$2 extends k
 
     public final WidgetTextChannelSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362361;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362361);
+        int i = R.id.channel_settings_announcement;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.channel_settings_announcement);
         if (checkedSetting != null) {
-            i = 2131362369;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362369);
+            i = R.id.channel_settings_edit_name;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.channel_settings_edit_name);
             if (textInputLayout != null) {
-                i = 2131362370;
-                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362370);
+                i = R.id.channel_settings_edit_topic;
+                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.channel_settings_edit_topic);
                 if (textInputLayout2 != null) {
-                    i = 2131362371;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362371);
+                    i = R.id.channel_settings_edit_wrap;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.channel_settings_edit_wrap);
                     if (linearLayout != null) {
-                        i = 2131362373;
-                        CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362373);
+                        i = R.id.channel_settings_nsfw;
+                        CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.channel_settings_nsfw);
                         if (checkedSetting2 != null) {
-                            i = 2131362374;
-                            TextView textView = (TextView) view.findViewById(2131362374);
+                            i = R.id.channel_settings_permissions;
+                            TextView textView = (TextView) view.findViewById(R.id.channel_settings_permissions);
                             if (textView != null) {
-                                i = 2131362379;
-                                TextView textView2 = (TextView) view.findViewById(2131362379);
+                                i = R.id.channel_settings_pinned_messages;
+                                TextView textView2 = (TextView) view.findViewById(R.id.channel_settings_pinned_messages);
                                 if (textView2 != null) {
-                                    i = 2131362380;
-                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362380);
+                                    i = R.id.channel_settings_pinned_messages_container;
+                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.channel_settings_pinned_messages_container);
                                     if (linearLayout2 != null) {
-                                        i = 2131362381;
-                                        View findViewById = view.findViewById(2131362381);
+                                        i = R.id.channel_settings_pinned_messages_disabled_overlay;
+                                        View findViewById = view.findViewById(R.id.channel_settings_pinned_messages_disabled_overlay);
                                         if (findViewById != null) {
-                                            i = 2131362385;
-                                            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362385);
+                                            i = R.id.channel_settings_save;
+                                            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.channel_settings_save);
                                             if (floatingActionButton != null) {
-                                                i = 2131362386;
-                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362386);
+                                                i = R.id.channel_settings_section_default_auto_archive_duration;
+                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.channel_settings_section_default_auto_archive_duration);
                                                 if (linearLayout3 != null) {
-                                                    i = 2131362387;
-                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362387);
+                                                    i = R.id.channel_settings_section_privacy_safety;
+                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.channel_settings_section_privacy_safety);
                                                     if (linearLayout4 != null) {
-                                                        i = 2131362388;
-                                                        LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131362388);
+                                                        i = R.id.channel_settings_section_slow_mode;
+                                                        LinearLayout linearLayout5 = (LinearLayout) view.findViewById(R.id.channel_settings_section_slow_mode);
                                                         if (linearLayout5 != null) {
-                                                            i = 2131362389;
-                                                            LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131362389);
+                                                            i = R.id.channel_settings_section_user_management;
+                                                            LinearLayout linearLayout6 = (LinearLayout) view.findViewById(R.id.channel_settings_section_user_management);
                                                             if (linearLayout6 != null) {
-                                                                i = 2131362390;
-                                                                TextView textView3 = (TextView) view.findViewById(2131362390);
+                                                                i = R.id.channel_settings_slow_mode_cooldown_label;
+                                                                TextView textView3 = (TextView) view.findViewById(R.id.channel_settings_slow_mode_cooldown_label);
                                                                 if (textView3 != null) {
-                                                                    i = 2131362391;
-                                                                    SeekBar seekBar = (SeekBar) view.findViewById(2131362391);
+                                                                    i = R.id.channel_settings_slow_mode_cooldown_slider;
+                                                                    SeekBar seekBar = (SeekBar) view.findViewById(R.id.channel_settings_slow_mode_cooldown_slider);
                                                                     if (seekBar != null) {
-                                                                        i = 2131362392;
-                                                                        TextView textView4 = (TextView) view.findViewById(2131362392);
+                                                                        i = R.id.channel_settings_slowmode_label;
+                                                                        TextView textView4 = (TextView) view.findViewById(R.id.channel_settings_slowmode_label);
                                                                         if (textView4 != null) {
-                                                                            i = 2131363042;
-                                                                            View findViewById2 = view.findViewById(2131363042);
+                                                                            i = R.id.duration_selector;
+                                                                            View findViewById2 = view.findViewById(R.id.duration_selector);
                                                                             if (findViewById2 != null) {
                                                                                 WidgetThreadArchiveActionsSheetBinding a = WidgetThreadArchiveActionsSheetBinding.a(findViewById2);
-                                                                                i = 2131364758;
-                                                                                NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364758);
+                                                                                i = R.id.scroll_view;
+                                                                                NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.scroll_view);
                                                                                 if (nestedScrollView != null) {
                                                                                     return new WidgetTextChannelSettingsBinding((CoordinatorLayout) view, checkedSetting, textInputLayout, textInputLayout2, linearLayout, checkedSetting2, textView, textView2, linearLayout2, findViewById, floatingActionButton, linearLayout3, linearLayout4, linearLayout5, linearLayout6, textView3, seekBar, textView4, a, nestedScrollView);
                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java
index e28d8d2c78..5888d65ce0 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserGuildSettings;
 import com.discord.widgets.channels.settings.WidgetTextChannelSettings;
@@ -20,7 +21,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364079:
+            case R.id.menu_channel_settings_delete /* 2131364079 */:
                 if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) {
                     WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel());
                     return;
@@ -28,7 +29,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
                     WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel());
                     return;
                 }
-            case 2131364080:
+            case R.id.menu_channel_settings_reset /* 2131364080 */:
                 StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings();
                 m.checkNotNullExpressionValue(context, "context");
                 userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel());
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$10.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$10.java
index f706de0930..09c83c05bf 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$10.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$10.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.channels.settings;
 
 import android.view.View;
+import com.discord.R;
 import java.util.Map;
 /* compiled from: WidgetTextChannelSettings.kt */
 public final class WidgetTextChannelSettings$configureUI$10 implements View.OnClickListener {
@@ -14,7 +15,7 @@ public final class WidgetTextChannelSettings$configureUI$10 implements View.OnCl
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131363042, 60);
+        WidgetTextChannelSettings.access$getState$p(this.this$0).put(R.id.duration_selector, 60);
         WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).k);
         WidgetTextChannelSettings.access$updateRadioState(this.this$0, this.$durationsMap, 60);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$11.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$11.java
index 8f2e0e8022..afe88ca8d1 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$11.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$11.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.channels.settings;
 
 import android.view.View;
+import com.discord.R;
 import java.util.Map;
 /* compiled from: WidgetTextChannelSettings.kt */
 public final class WidgetTextChannelSettings$configureUI$11 implements View.OnClickListener {
@@ -14,7 +15,7 @@ public final class WidgetTextChannelSettings$configureUI$11 implements View.OnCl
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131363042, 1440);
+        WidgetTextChannelSettings.access$getState$p(this.this$0).put(R.id.duration_selector, 1440);
         WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).k);
         WidgetTextChannelSettings.access$updateRadioState(this.this$0, this.$durationsMap, 1440);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$2.java
index 8541bc1a90..a2476cd58b 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.channels.settings.WidgetTextChannelSettings;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -14,7 +15,7 @@ public final class WidgetTextChannelSettings$configureUI$2<T> implements Action1
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364079);
+        MenuItem findItem = menu.findItem(R.id.menu_channel_settings_delete);
         m.checkNotNullExpressionValue(findItem, "it.findItem(R.id.menu_channel_settings_delete)");
         findItem.setVisible(this.$this_configureUI.getCanManageChannel());
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java
index 81aeac473a..4a293d1de8 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$3.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.view.View;
 import android.widget.SeekBar;
+import com.discord.R;
 import com.discord.utilities.stateful.StatefulViews;
 import com.discord.widgets.channels.settings.WidgetTextChannelSettings;
 import com.google.android.material.textfield.TextInputLayout;
@@ -31,6 +32,6 @@ public final class WidgetTextChannelSettings$configureUI$3 implements View.OnCli
         StatefulViews access$getState$p3 = WidgetTextChannelSettings.access$getState$p(this.this$0);
         SeekBar seekBar = WidgetTextChannelSettings.access$getBinding$p(this.this$0).q;
         m.checkNotNullExpressionValue(seekBar, "binding.channelSettingsSlowModeCooldownSlider");
-        WidgetTextChannelSettings.saveChannel$default(widgetTextChannelSettings, h, str, null, str2, null, (Integer) access$getState$p3.getIfChanged(seekBar.getId()), (Integer) WidgetTextChannelSettings.access$getState$p(this.this$0).getIfChanged(2131363042), 20, null);
+        WidgetTextChannelSettings.saveChannel$default(widgetTextChannelSettings, h, str, null, str2, null, (Integer) access$getState$p3.getIfChanged(seekBar.getId()), (Integer) WidgetTextChannelSettings.access$getState$p(this.this$0).getIfChanged(R.id.duration_selector), 20, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$6.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$6.java
index 2cacb83d64..a0eb27a7ee 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$6.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.view.View;
 import c.a.e.o;
+import com.discord.R;
 import d0.z.d.m;
 /* compiled from: WidgetTextChannelSettings.kt */
 public final class WidgetTextChannelSettings$configureUI$6 implements View.OnClickListener {
@@ -10,6 +11,6 @@ public final class WidgetTextChannelSettings$configureUI$6 implements View.OnCli
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         m.checkNotNullExpressionValue(view, "it");
-        o.g(view.getContext(), 2131892242, 0, null, 12);
+        o.g(view.getContext(), R.string.pins_disabled_nsfw, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1.java
index 8129264a55..10acd8760b 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1.java
@@ -1,6 +1,8 @@
 package com.discord.widgets.channels.settings;
 
 import android.view.View;
+import com.discord.R;
+import com.discord.utilities.threads.ThreadUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Map;
@@ -28,8 +30,8 @@ public final class WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131363042, 10080);
+        WidgetTextChannelSettings.access$getState$p(this.this$0).put(R.id.duration_selector, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES));
         WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).k);
-        WidgetTextChannelSettings.access$updateRadioState(this.this$0, this.$durationsMap, 10080);
+        WidgetTextChannelSettings.access$updateRadioState(this.this$0, this.$durationsMap, ThreadUtils.ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1.java
index 629d00238d..8f3644fffd 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1.java
@@ -1,6 +1,8 @@
 package com.discord.widgets.channels.settings;
 
 import android.view.View;
+import com.discord.R;
+import com.discord.utilities.threads.ThreadUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Map;
@@ -28,8 +30,8 @@ public final class WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131363042, 4320);
+        WidgetTextChannelSettings.access$getState$p(this.this$0).put(R.id.duration_selector, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.THREE_DAYS_IN_MINUTES));
         WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).k);
-        WidgetTextChannelSettings.access$updateRadioState(this.this$0, this.$durationsMap, 4320);
+        WidgetTextChannelSettings.access$updateRadioState(this.this$0, this.$durationsMap, ThreadUtils.ThreadArchiveDurations.THREE_DAYS_IN_MINUTES);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$onViewBound$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$onViewBound$1.java
index e8b7f1a2d9..97f4e01066 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$onViewBound$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.settings;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import c.a.z.i;
+import com.discord.R;
 import d0.z.d.m;
 /* compiled from: WidgetTextChannelSettings.kt */
 public final class WidgetTextChannelSettings$onViewBound$1 extends i {
@@ -19,7 +20,7 @@ public final class WidgetTextChannelSettings$onViewBound$1 extends i {
         if (z2) {
             int intValue = WidgetTextChannelSettings.Companion.getSLOWMODE_COOLDOWN_VALUES().get(i).intValue();
             WidgetTextChannelSettings.access$setSlowmodeLabel(this.this$0, intValue);
-            WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131362391, Integer.valueOf(intValue));
+            WidgetTextChannelSettings.access$getState$p(this.this$0).put(R.id.channel_settings_slow_mode_cooldown_slider, Integer.valueOf(intValue));
             WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).k);
             TextView textView = WidgetTextChannelSettings.access$getBinding$p(this.this$0).p;
             m.checkNotNullExpressionValue(textView, "binding.channelSettingsSlowModeCooldownLabel");
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$saveChannel$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$saveChannel$1.java
index a6708726ca..642b447c24 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$saveChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$saveChannel$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.content.Context;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -28,6 +29,6 @@ public final class WidgetTextChannelSettings$saveChannel$1 extends o implements
     public final void invoke(Channel channel) {
         Context context = this.this$0.getContext();
         m.checkNotNullExpressionValue(channel, "it");
-        c.a.e.o.g(context, AnimatableValueParser.f1(channel) ? 2131887224 : 2131887343, 0, null, 12);
+        c.a.e.o.g(context, AnimatableValueParser.f1(channel) ? R.string.category_settings_have_been_updated : R.string.channel_settings_have_been_updated, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java
index c305936e47..3e52651f62 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings.java
@@ -22,10 +22,12 @@ import c.a.j.j4;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetTextChannelSettingsBinding;
+import com.discord.models.domain.ModelInvite;
 import com.discord.models.guild.Guild;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -64,10 +66,10 @@ public final class WidgetTextChannelSettings extends AppFragment {
     public static final int ONE_DAY = 86400;
     public static final int ONE_HOUR = 3600;
     public static final int ONE_MINUTE = 60;
-    private static final List<Integer> SLOWMODE_COOLDOWN_VALUES = n.listOf((Object[]) new Integer[]{0, 5, 10, 15, 30, 60, 120, 300, 600, 900, 1800, 3600, 7200, 21600});
+    private static final List<Integer> SLOWMODE_COOLDOWN_VALUES = n.listOf((Object[]) new Integer[]{0, 5, 10, 15, 30, 60, 120, 300, 600, 900, Integer.valueOf((int) ModelInvite.Settings.HALF_HOUR), 3600, 7200, Integer.valueOf((int) ModelInvite.Settings.SIX_HOURS)});
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetTextChannelSettings$binding$2.INSTANCE, null, 2, null);
     private boolean hasFiredAnalytics;
-    private final StatefulViews state = new StatefulViews(2131362369, 2131362370, 2131362391, 2131363042, 2131362361);
+    private final StatefulViews state = new StatefulViews(R.id.channel_settings_edit_name, R.id.channel_settings_edit_topic, R.id.channel_settings_slow_mode_cooldown_slider, R.id.duration_selector, R.id.channel_settings_announcement);
 
     /* compiled from: WidgetTextChannelSettings.kt */
     public static final class Companion {
@@ -80,7 +82,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
 
         public static /* synthetic */ void setDurationSecondsLabel$default(Companion companion, TextView textView, int i, Context context, int i2, int i3, Object obj) {
             if ((i3 & 8) != 0) {
-                i2 = 2131888780;
+                i2 = R.string.form_label_slowmode_off;
             }
             companion.setDurationSecondsLabel(textView, i, context, i2);
         }
@@ -102,13 +104,13 @@ public final class WidgetTextChannelSettings extends AppFragment {
             if (i == 0) {
                 textView.setText(context.getString(i2));
             } else if (1 <= i && 60 > i) {
-                ViewExtensions.setPluralText(textView, 2131755070, i, new Object[0]);
+                ViewExtensions.setPluralText(textView, R.plurals.duration_seconds_seconds, i, new Object[0]);
             } else if (60 <= i && 3600 > i) {
-                ViewExtensions.setPluralText(textView, 2131755067, i / 60, new Object[0]);
+                ViewExtensions.setPluralText(textView, R.plurals.duration_mins_mins, i / 60, new Object[0]);
             } else if (3600 <= i && 86400 > i) {
-                ViewExtensions.setPluralText(textView, 2131755065, i / 3600, new Object[0]);
+                ViewExtensions.setPluralText(textView, R.plurals.duration_hours_hours, i / 3600, new Object[0]);
             } else {
-                ViewExtensions.setPluralText(textView, 2131755063, i / 86400, new Object[0]);
+                ViewExtensions.setPluralText(textView, R.plurals.duration_days_days, i / 86400, new Object[0]);
             }
         }
     }
@@ -319,7 +321,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
     }
 
     public WidgetTextChannelSettings() {
-        super(2131559304);
+        super(R.layout.widget_text_channel_settings);
     }
 
     public static final /* synthetic */ void access$cannotDeleteWarn(WidgetTextChannelSettings widgetTextChannelSettings, boolean z2) {
@@ -355,22 +357,22 @@ public final class WidgetTextChannelSettings extends AppFragment {
     }
 
     private final void cannotDeleteWarn(boolean z2) {
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558909, (ViewGroup) null, false);
-        int i = 2131362362;
-        TextView textView = (TextView) inflate.findViewById(2131362362);
+        View inflate = LayoutInflater.from(getContext()).inflate(R.layout.widget_channel_settings_cannot_delete, (ViewGroup) null, false);
+        int i = R.id.channel_settings_cannot_delete_body;
+        TextView textView = (TextView) inflate.findViewById(R.id.channel_settings_cannot_delete_body);
         if (textView != null) {
-            i = 2131362363;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362363);
+            i = R.id.channel_settings_cannot_delete_confirm;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.channel_settings_cannot_delete_confirm);
             if (materialButton != null) {
-                i = 2131362364;
-                TextView textView2 = (TextView) inflate.findViewById(2131362364);
+                i = R.id.channel_settings_cannot_delete_title;
+                TextView textView2 = (TextView) inflate.findViewById(R.id.channel_settings_cannot_delete_title);
                 if (textView2 != null) {
                     LinearLayout linearLayout = (LinearLayout) inflate;
                     m.checkNotNullExpressionValue(new i4(linearLayout, textView, materialButton, textView2), "WidgetChannelSettingsCan…om(context), null, false)");
                     m.checkNotNullExpressionValue(linearLayout, "binding.root");
                     AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(linearLayout).create();
                     m.checkNotNullExpressionValue(create, "AlertDialog.Builder(bind…ew(binding.root).create()");
-                    textView.setText(z2 ? 2131888097 : 2131888106);
+                    textView.setText(z2 ? R.string.delete_rules_channel_body : R.string.delete_updates_channel_body);
                     materialButton.setOnClickListener(new WidgetTextChannelSettings$cannotDeleteWarn$1(create));
                     create.show();
                     return;
@@ -394,11 +396,11 @@ public final class WidgetTextChannelSettings extends AppFragment {
         }
         CharSequence charSequence = null;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(AnimatableValueParser.z1(model.getChannel()) ? 2131887342 : 2131887223);
+        setActionBarTitle(AnimatableValueParser.z1(model.getChannel()) ? R.string.channel_settings : R.string.category_settings);
         setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2));
-        setActionBarOptionsMenu(AnimatableValueParser.z1(model.getChannel()) ? 2131623965 : 2131623940, new WidgetTextChannelSettings$configureUI$1(this, model), new WidgetTextChannelSettings$configureUI$2(model));
+        setActionBarOptionsMenu(AnimatableValueParser.z1(model.getChannel()) ? R.menu.menu_text_channel_settings : R.menu.menu_category_settings, new WidgetTextChannelSettings$configureUI$1(this, model), new WidgetTextChannelSettings$configureUI$2(model));
         if (!this.hasFiredAnalytics && (threadTypeForGuild = AnalyticsTracker.PremiumGuildUpsellType.Companion.getThreadTypeForGuild(model.getGuild())) != null) {
-            AnalyticsTracker.INSTANCE.premiumGuildUpsellViewed(threadTypeForGuild, model.getGuild().getId(), Long.valueOf(model.getChannel().h()), new Traits.Location("Channel Settings", null, null, null, null, 30, null));
+            AnalyticsTracker.INSTANCE.premiumGuildUpsellViewed(threadTypeForGuild, model.getGuild().getId(), Long.valueOf(model.getChannel().h()), new Traits.Location(Traits.Location.Page.CHANNEL_SETTINGS, null, null, null, null, 30, null));
             this.hasFiredAnalytics = true;
         }
         TextInputLayout textInputLayout = getBinding().f2005c;
@@ -407,7 +409,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         TextInputLayout textInputLayout2 = getBinding().f2005c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), AnimatableValueParser.y0(model.getChannel())));
-        getBinding().f2005c.setHint(AnimatableValueParser.z1(model.getChannel()) ? 2131888661 : 2131887219);
+        getBinding().f2005c.setHint(AnimatableValueParser.z1(model.getChannel()) ? R.string.form_label_channel_name : R.string.category_name);
         TextInputLayout textInputLayout3 = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic");
         StatefulViews statefulViews2 = this.state;
@@ -452,7 +454,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         CheckedSetting checkedSetting2 = getBinding().b;
         Context context = getContext();
         if (context != null) {
-            charSequence = b.h(context, 2131888619, new Object[]{f.a.a(360032008192L, null)}, null, 4);
+            charSequence = b.h(context, R.string.form_help_news_android, new Object[]{f.a.a(360032008192L, null)}, null, 4);
         }
         checkedSetting2.h(charSequence, true);
         getBinding().b.e(new WidgetTextChannelSettings$configureUI$8(this, model));
@@ -470,7 +472,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         LinearLayout linearLayout5 = getBinding().n;
         m.checkNotNullExpressionValue(linearLayout5, "binding.channelSettingsSectionSlowMode");
         linearLayout5.setVisibility(model.getCanManageChannel() && AnimatableValueParser.z1(model.getChannel()) && !AnimatableValueParser.d1(model.getChannel()) ? 0 : 8);
-        int intValue = ((Number) this.state.get(2131362391, Integer.valueOf(model.getChannel().u()))).intValue();
+        int intValue = ((Number) this.state.get(R.id.channel_settings_slow_mode_cooldown_slider, Integer.valueOf(model.getChannel().u()))).intValue();
         setSlowmodeLabel(intValue);
         Iterator<Integer> it = SLOWMODE_COOLDOWN_VALUES.iterator();
         int i2 = 0;
@@ -499,10 +501,10 @@ public final class WidgetTextChannelSettings extends AppFragment {
             i = 0;
         }
         linearLayout6.setVisibility(i);
-        Integer num = (Integer) this.state.get(2131363042, model.getChannel().d());
+        Integer num = (Integer) this.state.get(R.id.duration_selector, model.getChannel().d());
         int intValue2 = num != null ? num.intValue() : 1440;
         this.state.configureSaveActionView(getBinding().k);
-        Map<MaterialRadioButton, Integer> mapOf = h0.mapOf(o.to(getBinding().r.e, 60), o.to(getBinding().r.q, 1440), o.to(getBinding().r.o, 4320), o.to(getBinding().r.j, 10080));
+        Map<MaterialRadioButton, Integer> mapOf = h0.mapOf(o.to(getBinding().r.e, 60), o.to(getBinding().r.q, 1440), o.to(getBinding().r.o, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.THREE_DAYS_IN_MINUTES)), o.to(getBinding().r.j, Integer.valueOf((int) ThreadUtils.ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES)));
         getBinding().r.d.setOnClickListener(new WidgetTextChannelSettings$configureUI$10(this, mapOf));
         getBinding().r.p.setOnClickListener(new WidgetTextChannelSettings$configureUI$11(this, mapOf));
         PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
@@ -512,7 +514,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         Context requireContext = requireContext();
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature = premiumUtils.getBoostFeatureBadgeDataForGuildFeature(guild, valueOf, guildFeature, requireContext, parentFragmentManager, new WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1(this, mapOf), new Traits.Location("Channel Settings", null, "List Item", null, null, 26, null));
+        PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature = premiumUtils.getBoostFeatureBadgeDataForGuildFeature(guild, valueOf, guildFeature, requireContext, parentFragmentManager, new WidgetTextChannelSettings$configureUI$threeDayArchiveOption$1(this, mapOf), new Traits.Location(Traits.Location.Page.CHANNEL_SETTINGS, null, Traits.Location.Obj.LIST_ITEM, null, null, 26, null));
         ConstraintLayout constraintLayout = getBinding().r.k;
         Function1<View, Unit> onClickListener = boostFeatureBadgeDataForGuildFeature.getOnClickListener();
         if (onClickListener != null) {
@@ -532,7 +534,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         Context requireContext2 = requireContext();
         FragmentManager parentFragmentManager2 = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
-        PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature2 = premiumUtils.getBoostFeatureBadgeDataForGuildFeature(guild2, valueOf2, guildFeature2, requireContext2, parentFragmentManager2, new WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1(this, mapOf), new Traits.Location("Channel Settings", null, "List Item", null, null, 26, null));
+        PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature2 = premiumUtils.getBoostFeatureBadgeDataForGuildFeature(guild2, valueOf2, guildFeature2, requireContext2, parentFragmentManager2, new WidgetTextChannelSettings$configureUI$sevenDayArchiveOption$1(this, mapOf), new Traits.Location(Traits.Location.Page.CHANNEL_SETTINGS, null, Traits.Location.Obj.LIST_ITEM, null, null, 26, null));
         ConstraintLayout constraintLayout2 = getBinding().r.f;
         Function1<View, Unit> onClickListener2 = boostFeatureBadgeDataForGuildFeature2.getOnClickListener();
         if (onClickListener2 != null) {
@@ -556,12 +558,12 @@ public final class WidgetTextChannelSettings extends AppFragment {
         m.checkNotNullExpressionValue(linearLayout, "binding.root");
         AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(a.a).create();
         m.checkNotNullExpressionValue(create, "AlertDialog.Builder(bind…ew(binding.root).create()");
-        a.e.setText(AnimatableValueParser.z1(channel) ? 2131888084 : 2131888083);
+        a.e.setText(AnimatableValueParser.z1(channel) ? R.string.delete_channel : R.string.delete_category);
         a.f115c.setOnClickListener(new WidgetTextChannelSettings$confirmDelete$1(create));
         a.d.setOnClickListener(new WidgetTextChannelSettings$confirmDelete$2(this, channel));
         TextView textView = a.b;
         m.checkNotNullExpressionValue(textView, "binding.channelSettingsDeleteBody");
-        b.n(textView, 2131888085, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4);
+        b.n(textView, R.string.delete_channel_body, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4);
         create.show();
     }
 
@@ -585,7 +587,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         Companion companion = Companion;
         TextView textView = getBinding().p;
         m.checkNotNullExpressionValue(textView, "binding.channelSettingsSlowModeCooldownLabel");
-        companion.setDurationSecondsLabel(textView, i, requireContext(), 2131888780);
+        companion.setDurationSecondsLabel(textView, i, requireContext(), R.string.form_label_slowmode_off);
     }
 
     private final void updateRadioState(Map<MaterialRadioButton, Integer> map, int i) {
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$binding$2.java
index cec04efa37..4db6d8b3d3 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadNotificationSettingsBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetThreadNotificationSettings$binding$2 ex
 
     public final WidgetThreadNotificationSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364758;
-        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364758);
+        int i = R.id.scroll_view;
+        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.scroll_view);
         if (nestedScrollView != null) {
-            i = 2131365524;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365524);
+            i = R.id.thread_notification_settings_system;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.thread_notification_settings_system);
             if (linearLayout != null) {
-                i = 2131365539;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365539);
+                i = R.id.thread_settings_notifications_frequency_0;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.thread_settings_notifications_frequency_0);
                 if (checkedSetting != null) {
-                    i = 2131365540;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365540);
+                    i = R.id.thread_settings_notifications_frequency_1;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.thread_settings_notifications_frequency_1);
                     if (checkedSetting2 != null) {
-                        i = 2131365541;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365541);
+                        i = R.id.thread_settings_notifications_frequency_2;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.thread_settings_notifications_frequency_2);
                         if (checkedSetting3 != null) {
                             return new WidgetThreadNotificationSettingsBinding((CoordinatorLayout) view, nestedScrollView, linearLayout, checkedSetting, checkedSetting2, checkedSetting3);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$configureNotificationRadio$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$configureNotificationRadio$1.java
index 807fe4df9b..28f0cc1b1a 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$configureNotificationRadio$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings$configureNotificationRadio$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.content.Context;
 import android.view.View;
+import com.discord.R;
 import com.discord.api.thread.ThreadMember;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreStream;
@@ -42,7 +43,7 @@ public final class WidgetThreadNotificationSettings$configureNotificationRadio$1
 
         public final void invoke(ThreadMember threadMember) {
             m.checkNotNullParameter(threadMember, "threadMember");
-            c.a.e.o.g(this.$context, 2131887343, 0, null, 12);
+            c.a.e.o.g(this.$context, R.string.channel_settings_have_been_updated, 0, null, 12);
             StoreStream.Companion.getAnalytics().onThreadNotificationSettingsUpdated(this.this$0.$model.getChannel().h(), this.this$0.$model.getChannel().r(), this.this$0.$model.getNotificationSetting(), threadMember.a());
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings.java
index b94dcf80f6..fe104a1b3f 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadNotificationSettings.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetThreadNotificationSettingsBinding;
@@ -50,7 +51,7 @@ public final class WidgetThreadNotificationSettings extends AppFragment {
 
         public final void launch(Context context, long j, boolean z2) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j).putExtra("SHOW_SYSTEM_SETTING", z2);
+            Intent putExtra = new Intent().putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j).putExtra(WidgetThreadNotificationSettings.INTENT_SHOW_SYSTEM_SETTINGS, z2);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…TINGS, showSystemSetting)");
             l.d(context, WidgetThreadNotificationSettings.class, putExtra);
         }
@@ -142,7 +143,7 @@ public final class WidgetThreadNotificationSettings extends AppFragment {
     }
 
     public WidgetThreadNotificationSettings() {
-        super(2131559310);
+        super(R.layout.widget_thread_notification_settings);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetThreadNotificationSettings widgetThreadNotificationSettings, Model model) {
@@ -184,11 +185,11 @@ public final class WidgetThreadNotificationSettings extends AppFragment {
         setRetainInstance(true);
         int i = 0;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891872);
+        setActionBarTitle(R.string.notification_settings);
         this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().f2011c, getBinding().d, getBinding().e}));
         LinearLayout linearLayout = getBinding().b;
         m.checkNotNullExpressionValue(linearLayout, "binding.threadNotificationSettingsSystem");
-        if (!getMostRecentIntent().getBooleanExtra("SHOW_SYSTEM_SETTING", false)) {
+        if (!getMostRecentIntent().getBooleanExtra(INTENT_SHOW_SYSTEM_SETTINGS, false)) {
             i = 8;
         }
         linearLayout.setVisibility(i);
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$binding$2.java
index c8666870cd..8c1e741875 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadSettingsBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -22,29 +23,29 @@ public final /* synthetic */ class WidgetThreadSettings$binding$2 extends k impl
 
     public final WidgetThreadSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364758;
-        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364758);
+        int i = R.id.scroll_view;
+        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.scroll_view);
         if (nestedScrollView != null) {
-            i = 2131365537;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365537);
+            i = R.id.thread_settings_edit_name;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.thread_settings_edit_name);
             if (textInputLayout != null) {
-                i = 2131365538;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365538);
+                i = R.id.thread_settings_edit_wrap;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.thread_settings_edit_wrap);
                 if (linearLayout != null) {
-                    i = 2131365542;
-                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365542);
+                    i = R.id.thread_settings_save;
+                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.thread_settings_save);
                     if (floatingActionButton != null) {
-                        i = 2131365543;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365543);
+                        i = R.id.thread_settings_section_slow_mode;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.thread_settings_section_slow_mode);
                         if (linearLayout2 != null) {
-                            i = 2131365544;
-                            TextView textView = (TextView) view.findViewById(2131365544);
+                            i = R.id.thread_settings_slow_mode_cooldown_label;
+                            TextView textView = (TextView) view.findViewById(R.id.thread_settings_slow_mode_cooldown_label);
                             if (textView != null) {
-                                i = 2131365545;
-                                SeekBar seekBar = (SeekBar) view.findViewById(2131365545);
+                                i = R.id.thread_settings_slow_mode_cooldown_slider;
+                                SeekBar seekBar = (SeekBar) view.findViewById(R.id.thread_settings_slow_mode_cooldown_slider);
                                 if (seekBar != null) {
-                                    i = 2131365546;
-                                    TextView textView2 = (TextView) view.findViewById(2131365546);
+                                    i = R.id.thread_settings_slowmode_label;
+                                    TextView textView2 = (TextView) view.findViewById(R.id.thread_settings_slowmode_label);
                                     if (textView2 != null) {
                                         return new WidgetThreadSettingsBinding((CoordinatorLayout) view, nestedScrollView, textInputLayout, linearLayout, floatingActionButton, linearLayout2, textView, seekBar, textView2);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$1.java
index c21e28721d..d5c4627f04 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.channels.settings.WidgetThreadSettingsViewModel;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -17,7 +18,7 @@ public final class WidgetThreadSettings$configureUI$1<T1, T2> implements Action2
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364079) {
+        if (menuItem.getItemId() == R.id.menu_channel_settings_delete) {
             WidgetThreadSettings.access$confirmDelete(this.this$0, ((WidgetThreadSettingsViewModel.ViewState.Valid) this.$viewState).getChannel());
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$2.java
index c6a8247590..d8e72bd5df 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings$configureUI$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.settings;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.channels.settings.WidgetThreadSettingsViewModel;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -14,11 +15,11 @@ public final class WidgetThreadSettings$configureUI$2<T> implements Action1<Menu
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364079);
+        MenuItem findItem = menu.findItem(R.id.menu_channel_settings_delete);
         m.checkNotNullExpressionValue(findItem, "it.findItem(R.id.menu_channel_settings_delete)");
         findItem.setVisible(((WidgetThreadSettingsViewModel.ViewState.Valid) this.$viewState).getShowDeleteOption());
-        menu.findItem(2131364079).setTitle(2131888105);
-        MenuItem findItem2 = menu.findItem(2131364080);
+        menu.findItem(R.id.menu_channel_settings_delete).setTitle(R.string.delete_thread);
+        MenuItem findItem2 = menu.findItem(R.id.menu_channel_settings_reset);
         m.checkNotNullExpressionValue(findItem2, "it.findItem(R.id.menu_channel_settings_reset)");
         findItem2.setVisible(false);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java
index ca7b67c748..66a670c2f9 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettings.java
@@ -18,6 +18,7 @@ import c.a.j.j4;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetThreadSettingsBinding;
@@ -64,7 +65,7 @@ public final class WidgetThreadSettings extends AppFragment {
     }
 
     public WidgetThreadSettings() {
-        super(2131559312);
+        super(R.layout.widget_thread_settings);
         WidgetThreadSettings$viewModel$2 widgetThreadSettings$viewModel$2 = new WidgetThreadSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadSettingsViewModel.class), new WidgetThreadSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadSettings$viewModel$2));
@@ -101,10 +102,10 @@ public final class WidgetThreadSettings extends AppFragment {
         }
         int i = 0;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131894321);
+        setActionBarTitle(R.string.thread_settings);
         WidgetThreadSettingsViewModel.ViewState.Valid valid = (WidgetThreadSettingsViewModel.ViewState.Valid) viewState;
         setActionBarSubtitle(AnimatableValueParser.A0(valid.getChannel(), requireContext(), false, 2));
-        setActionBarOptionsMenu(2131623965, new WidgetThreadSettings$configureUI$1(this, viewState), new WidgetThreadSettings$configureUI$2(viewState));
+        setActionBarOptionsMenu(R.menu.menu_text_channel_settings, new WidgetThreadSettings$configureUI$1(this, viewState), new WidgetThreadSettings$configureUI$2(viewState));
         String channelNameDraft = valid.getChannelNameDraft();
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.threadSettingsEditName");
@@ -150,12 +151,12 @@ public final class WidgetThreadSettings extends AppFragment {
         LinearLayout linearLayout = a.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.root");
         AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(a.a).create();
-        a.e.setText(2131888105);
+        a.e.setText(R.string.delete_thread);
         a.f115c.setOnClickListener(new WidgetThreadSettings$confirmDelete$1(create));
         a.d.setOnClickListener(new WidgetThreadSettings$confirmDelete$2(this, channel));
         TextView textView = a.b;
         m.checkNotNullExpressionValue(textView, "binding.channelSettingsDeleteBody");
-        b.n(textView, 2131888085, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4);
+        b.n(textView, R.string.delete_channel_body, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4);
         create.show();
     }
 
@@ -177,7 +178,7 @@ public final class WidgetThreadSettings extends AppFragment {
         WidgetTextChannelSettings.Companion companion = WidgetTextChannelSettings.Companion;
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.threadSettingsSlowModeCooldownLabel");
-        companion.setDurationSecondsLabel(textView, i, requireContext(), 2131888780);
+        companion.setDurationSecondsLabel(textView, i, requireContext(), R.string.form_label_slowmode_off);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$onThreadDeleted$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$onThreadDeleted$2.java
index 903caa0de7..7d73d0cc26 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$onThreadDeleted$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$onThreadDeleted$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.settings;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.widgets.channels.settings.WidgetThreadSettingsViewModel;
 import d0.z.d.m;
@@ -28,6 +29,6 @@ public final class WidgetThreadSettingsViewModel$onThreadDeleted$2 extends o imp
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
         PublishSubject access$getEventSubject$p = WidgetThreadSettingsViewModel.access$getEventSubject$p(this.this$0);
-        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131888073));
+        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(R.string.default_failure_to_perform_action_message));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$1.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$1.java
index b8c90fd3d4..db340cd89f 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.settings;
 
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.widgets.channels.settings.WidgetThreadSettingsViewModel;
 import d0.z.d.m;
@@ -28,6 +29,6 @@ public final class WidgetThreadSettingsViewModel$saveThread$1 extends o implemen
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "it");
         PublishSubject access$getEventSubject$p = WidgetThreadSettingsViewModel.access$getEventSubject$p(this.this$0);
-        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131894322));
+        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(R.string.thread_settings_updated));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$2.java b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$2.java
index 32ee9a3ec0..a44047b8ee 100644
--- a/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/settings/WidgetThreadSettingsViewModel$saveThread$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.channels.settings;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.widgets.channels.settings.WidgetThreadSettingsViewModel;
 import d0.z.d.m;
@@ -28,6 +29,6 @@ public final class WidgetThreadSettingsViewModel$saveThread$2 extends o implemen
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
         PublishSubject access$getEventSubject$p = WidgetThreadSettingsViewModel.access$getEventSubject$p(this.this$0);
-        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131888073));
+        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(R.string.default_failure_to_perform_action_message));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$sevenDayArchiveOption$1.java b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$sevenDayArchiveOption$1.java
index bc0e1e3236..5ed6a3c4bc 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$sevenDayArchiveOption$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$sevenDayArchiveOption$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.threads;
 
 import android.view.View;
 import com.discord.stores.StoreThreadDraft;
+import com.discord.utilities.threads.ThreadUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -28,6 +29,6 @@ public final class WidgetThreadDraftArchiveSheet$configureUI$sevenDayArchiveOpti
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        WidgetThreadDraftArchiveSheet.access$setAutoArchiveDuration(this.this$0, this.$draftState, 10080);
+        WidgetThreadDraftArchiveSheet.access$setAutoArchiveDuration(this.this$0, this.$draftState, ThreadUtils.ThreadArchiveDurations.SEVEN_DAYS_IN_MINUTES);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$threeDayArchiveOption$1.java b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$threeDayArchiveOption$1.java
index f91bd1ca18..361c898915 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$threeDayArchiveOption$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$configureUI$threeDayArchiveOption$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.threads;
 
 import android.view.View;
 import com.discord.stores.StoreThreadDraft;
+import com.discord.utilities.threads.ThreadUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -28,6 +29,6 @@ public final class WidgetThreadDraftArchiveSheet$configureUI$threeDayArchiveOpti
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        WidgetThreadDraftArchiveSheet.access$setAutoArchiveDuration(this.this$0, this.$draftState, 4320);
+        WidgetThreadDraftArchiveSheet.access$setAutoArchiveDuration(this.this$0, this.$draftState, ThreadUtils.ThreadArchiveDurations.THREE_DAYS_IN_MINUTES);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java
index 7d6395b9d7..cb9a4fecaf 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java
@@ -9,6 +9,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppBottomSheet;
@@ -192,7 +193,7 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
         Long valueOf = channel != null ? Long.valueOf(channel.h()) : null;
         Integer autoArchiveDuration = draftState.getAutoArchiveDuration();
         int intValue = autoArchiveDuration != null ? autoArchiveDuration.intValue() : 1440;
-        Traits.Location location = new Traits.Location("Guild Channel", "Thread Archival Duration Sheet", "List Item", null, null, 24, null);
+        Traits.Location location = new Traits.Location(Traits.Location.Page.GUILD_CHANNEL, Traits.Location.Section.THREAD_ARCHIVAL_DURATION_SHEET, Traits.Location.Obj.LIST_ITEM, null, null, 24, null);
         if (!this.hasFiredAnalytics) {
             AnalyticsTracker.PremiumGuildUpsellType threadTypeForGuild = AnalyticsTracker.PremiumGuildUpsellType.Companion.getThreadTypeForGuild(guild);
             if (!(guild == null || threadTypeForGuild == null)) {
@@ -202,7 +203,7 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
                 if (channel2 != null) {
                     l = Long.valueOf(channel2.h());
                 }
-                analyticsTracker.premiumGuildUpsellViewed(threadTypeForGuild, id2, l, new Traits.Location(null, "Thread Archival Duration Sheet", null, null, null, 29, null));
+                analyticsTracker.premiumGuildUpsellViewed(threadTypeForGuild, id2, l, new Traits.Location(null, Traits.Location.Section.THREAD_ARCHIVAL_DURATION_SHEET, null, null, null, 29, null));
                 this.hasFiredAnalytics = true;
             }
         }
@@ -283,7 +284,7 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559305;
+        return R.layout.widget_thread_archive_actions_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java
index 5deb43f4d4..e9d2f778c3 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java
@@ -15,6 +15,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
 import com.discord.api.thread.ThreadMetadata;
@@ -24,6 +25,7 @@ import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.models.user.User;
 import com.discord.simpleast.core.parser.Parser;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.icon.IconUtils;
@@ -36,6 +38,7 @@ import com.discord.utilities.textprocessing.MessageRenderContext;
 import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.time.TimeUtils;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
+import com.discord.widgets.chat.list.adapter.WidgetChatListAdapterItemGuildWelcomeKt;
 import com.facebook.drawee.span.DraweeSpanStringBuilder;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.g0.t;
@@ -380,27 +383,27 @@ public final class ThreadBrowserThreadView extends FrameLayout {
     public ThreadBrowserThreadView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558712, this);
-        int i2 = 2131365490;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365490);
+        LayoutInflater.from(context).inflate(R.layout.thread_browser_thread_view, this);
+        int i2 = R.id.thread_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.thread_avatar);
         if (simpleDraweeView != null) {
-            i2 = 2131365519;
-            ImageView imageView = (ImageView) findViewById(2131365519);
+            i2 = R.id.thread_icon;
+            ImageView imageView = (ImageView) findViewById(R.id.thread_icon);
             if (imageView != null) {
-                i2 = 2131365520;
-                FrameLayout frameLayout = (FrameLayout) findViewById(2131365520);
+                i2 = R.id.thread_image;
+                FrameLayout frameLayout = (FrameLayout) findViewById(R.id.thread_image);
                 if (frameLayout != null) {
-                    i2 = 2131365521;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365521);
+                    i2 = R.id.thread_message;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(R.id.thread_message);
                     if (simpleDraweeSpanTextView != null) {
-                        i2 = 2131365522;
-                        TextView textView = (TextView) findViewById(2131365522);
+                        i2 = R.id.thread_name;
+                        TextView textView = (TextView) findViewById(R.id.thread_name);
                         if (textView != null) {
-                            i2 = 2131365553;
-                            TextView textView2 = (TextView) findViewById(2131365553);
+                            i2 = R.id.thread_timestamp;
+                            TextView textView2 = (TextView) findViewById(R.id.thread_timestamp);
                             if (textView2 != null) {
-                                i2 = 2131365554;
-                                TextView textView3 = (TextView) findViewById(2131365554);
+                                i2 = R.id.thread_timestamp_separator;
+                                TextView textView3 = (TextView) findViewById(R.id.thread_timestamp_separator);
                                 if (textView3 != null) {
                                     ThreadBrowserThreadViewBinding threadBrowserThreadViewBinding = new ThreadBrowserThreadViewBinding(this, simpleDraweeView, imageView, frameLayout, simpleDraweeSpanTextView, textView, textView2, textView3);
                                     m.checkNotNullExpressionValue(threadBrowserThreadViewBinding, "ThreadBrowserThreadViewB…ater.from(context), this)");
@@ -442,7 +445,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
             if (activeThread.getOwner() == null) {
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.threadMessage");
-                simpleDraweeSpanTextView.setText(getContext().getString(2131894289));
+                simpleDraweeSpanTextView.setText(getContext().getString(R.string.thread_browser_no_recent_messages));
                 configureAvatar$default(this, null, null, 2, null);
                 return;
             }
@@ -450,11 +453,11 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         }
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        MessageRenderContext messageRenderContext = new MessageRenderContext(context, activeThread.getMyUserId(), true, MessageUtils.getNickOrUsernames$default(message, activeThread.getChannel(), activeThread.getGuildMembers(), null, 8, null), activeThread.getChannelNames(), activeThread.getGuildRoles(), 0, null, null, ColorCompat.getThemedColor(getContext(), 2130970192), 0, null, null, null, 15808, null);
+        MessageRenderContext messageRenderContext = new MessageRenderContext(context, activeThread.getMyUserId(), true, MessageUtils.getNickOrUsernames$default(message, activeThread.getChannel(), activeThread.getGuildMembers(), null, 8, null), activeThread.getChannelNames(), activeThread.getGuildRoles(), 0, null, null, ColorCompat.getThemedColor(getContext(), (int) R.attr.theme_chat_spoiler_inapp_bg), 0, null, null, null, 15808, null);
         com.discord.api.user.User author = activeThread.getMessage().getAuthor();
         m.checkNotNull(author);
         CoreUser coreUser = new CoreUser(author);
-        String string = message.hasStickers() ? getContext().getString(2131892974) : (message.hasAttachments() || message.hasEmbeds()) ? getContext().getString(2131892972) : null;
+        String string = message.hasStickers() ? getContext().getString(R.string.reply_quote_sticker_mobile) : (message.hasAttachments() || message.hasEmbeds()) ? getContext().getString(R.string.reply_quote_no_text_content_mobile) : null;
         if (string != null) {
             draweeSpanStringBuilder2 = new DraweeSpanStringBuilder();
             draweeSpanStringBuilder2.append((CharSequence) (string + (char) 160));
@@ -480,7 +483,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
             configureAvatar(coreUser, activeThread.getGuildMembers().get(Long.valueOf(coreUser.getId())));
             TextView textView5 = this.binding.f;
             m.checkNotNullExpressionValue(textView5, str);
-            textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + 1420070400000L));
+            textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH));
         }
         str = "binding.threadTimestamp";
         draweeSpanStringBuilder = draweeSpanStringBuilder2;
@@ -495,7 +498,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         configureAvatar(coreUser, activeThread.getGuildMembers().get(Long.valueOf(coreUser.getId())));
         TextView textView5 = this.binding.f;
         m.checkNotNullExpressionValue(textView5, str);
-        textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + 1420070400000L));
+        textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH));
     }
 
     private final void configureArchivedThreadUI(ThreadData.ArchivedThread archivedThread) {
@@ -507,15 +510,15 @@ public final class ThreadBrowserThreadView extends FrameLayout {
             if (ordinal == 0) {
                 j = TimeUtils.parseUTCDate(y2.a());
             } else if (ordinal == 1) {
-                j = (archivedThread.getChannel().h() >>> 22) + 1420070400000L;
+                j = (archivedThread.getChannel().h() >>> 22) + SnowflakeUtils.DISCORD_EPOCH;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
             int ordinal2 = archivedThread.getTimestampMode().ordinal();
             if (ordinal2 == 0) {
-                i = 2131894278;
+                i = R.string.thread_browser_archive_time;
             } else if (ordinal2 == 1) {
-                i = 2131894280;
+                i = R.string.thread_browser_creation_time;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -553,7 +556,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         simpleDraweeView2.setVisibility(0);
         SimpleDraweeView simpleDraweeView3 = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.threadAvatar");
-        IconUtils.setIcon$default(simpleDraweeView3, user, 2131165296, null, null, guildMember, 24, null);
+        IconUtils.setIcon$default(simpleDraweeView3, user, R.dimen.avatar_size_small, null, null, guildMember, 24, null);
     }
 
     public static /* synthetic */ void configureAvatar$default(ThreadBrowserThreadView threadBrowserThreadView, User user, GuildMember guildMember, int i, Object obj) {
@@ -568,21 +571,21 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         if (currentTimeMillis < 60000) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            return c.a.l.b.h(context, 2131894298, new Object[]{1}, null, 4);
+            return c.a.l.b.h(context, R.string.thread_browser_timestamp_minutes, new Object[]{1}, null, 4);
         } else if (currentTimeMillis < 3600000) {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return c.a.l.b.h(context2, 2131894298, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
+            return c.a.l.b.h(context2, R.string.thread_browser_timestamp_minutes, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
         } else if (currentTimeMillis < 86400000) {
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
-            return c.a.l.b.h(context3, 2131894297, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
-        } else if (currentTimeMillis < 2592000000L) {
+            return c.a.l.b.h(context3, R.string.thread_browser_timestamp_hours, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
+        } else if (currentTimeMillis < WidgetChatListAdapterItemGuildWelcomeKt.OLD_GUILD_AGE_THRESHOLD) {
             Context context4 = getContext();
             m.checkNotNullExpressionValue(context4, "context");
-            return c.a.l.b.h(context4, 2131894296, new Object[]{Long.valueOf(currentTimeMillis / 86400000)}, null, 4);
+            return c.a.l.b.h(context4, R.string.thread_browser_timestamp_days, new Object[]{Long.valueOf(currentTimeMillis / 86400000)}, null, 4);
         } else {
-            String string = getContext().getString(2131894299);
+            String string = getContext().getString(R.string.thread_browser_timestamp_more_than_month);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…imestamp_more_than_month)");
             return string;
         }
@@ -593,15 +596,15 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         if (currentTimeMillis < 60000) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            return c.a.l.b.h(context, 2131894298, new Object[]{1}, null, 4);
+            return c.a.l.b.h(context, R.string.thread_browser_timestamp_minutes, new Object[]{1}, null, 4);
         } else if (currentTimeMillis < 3600000) {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return c.a.l.b.h(context2, 2131894298, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
+            return c.a.l.b.h(context2, R.string.thread_browser_timestamp_minutes, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
         } else if (currentTimeMillis < 86400000) {
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
-            return c.a.l.b.h(context3, 2131894297, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
+            return c.a.l.b.h(context3, R.string.thread_browser_timestamp_hours, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
         } else {
             String formatDateTime = DateUtils.formatDateTime(getContext(), j, 131076);
             m.checkNotNullExpressionValue(formatDateTime, "DateUtils.formatDateTime…teUtils.FORMAT_SHOW_YEAR)");
@@ -614,12 +617,12 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         FontUtils fontUtils = FontUtils.INSTANCE;
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        Typeface themedFont = fontUtils.getThemedFont(context, 2130969328);
+        Typeface themedFont = fontUtils.getThemedFont(context, R.attr.font_primary_semibold);
         if (themedFont != null) {
             arrayList.add(new TypefaceSpanCompat(themedFont));
         }
         if (guildMember != null) {
-            arrayList.add(new ForegroundColorSpan(GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(getContext(), 2130968932))));
+            arrayList.add(new ForegroundColorSpan(GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary))));
         }
         return arrayList;
     }
@@ -640,7 +643,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         String nickOrUsername$default = GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, owner, guildMember, threadData.getChannel(), null, 8, null);
         SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.threadMessage");
-        c.a.l.b.m(simpleDraweeSpanTextView, 2131894295, new Object[0], new ThreadBrowserThreadView$setThreadData$1(this, nickOrUsername$default, guildMember));
+        c.a.l.b.m(simpleDraweeSpanTextView, R.string.thread_browser_started_by, new Object[0], new ThreadBrowserThreadView$setThreadData$1(this, nickOrUsername$default, guildMember));
         if (threadData instanceof ThreadData.ActiveThread) {
             configureActiveThreadUI((ThreadData.ActiveThread) threadData);
         } else if (threadData instanceof ThreadData.ArchivedThread) {
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java
index d633eb51f2..3aa0c69c5f 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.threads.browser;
 
 import android.view.View;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadBrowserBinding;
 import com.discord.utilities.simple_pager.SimplePager;
 import com.google.android.material.appbar.AppBarLayout;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetThreadBrowser$binding$2 extends k imple
 
     public final WidgetThreadBrowserBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361869;
-        TabLayout tabLayout = (TabLayout) view.findViewById(2131361869);
+        int i = R.id.action_bar_tabs;
+        TabLayout tabLayout = (TabLayout) view.findViewById(R.id.action_bar_tabs);
         if (tabLayout != null) {
-            i = 2131365502;
-            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365502);
+            i = R.id.thread_browser_toolbar;
+            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.thread_browser_toolbar);
             if (appBarLayout != null) {
-                i = 2131365504;
-                SimplePager simplePager = (SimplePager) view.findViewById(2131365504);
+                i = R.id.thread_browser_view_pager;
+                SimplePager simplePager = (SimplePager) view.findViewById(R.id.thread_browser_view_pager);
                 if (simplePager != null) {
                     return new WidgetThreadBrowserBinding((ConstraintLayout) view, tabLayout, appBarLayout, simplePager);
                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
index 3c5150335f..dc7ff10ad8 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.threads.browser;
 import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.utilities.channel.ChannelSelector;
 import com.discord.widgets.channels.threads.browser.WidgetThreadBrowserFilterSheet;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final class WidgetThreadBrowser$updateMenu$1<T1, T2> implements Action2<M
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364124:
+            case R.id.menu_thread_browser_create_thread /* 2131364124 */:
                 ChannelSelector.openCreateThread$default(ChannelSelector.Companion.getInstance(), WidgetThreadBrowser.access$getGuildId$p(this.this$0), WidgetThreadBrowser.access$getChannelId$p(this.this$0), null, 4, null);
                 this.this$0.requireAppActivity().finish();
                 return;
-            case 2131364125:
+            case R.id.menu_thread_browser_filters /* 2131364125 */:
                 WidgetThreadBrowserFilterSheet.Companion companion = WidgetThreadBrowserFilterSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java
index a047a1c210..5181c41018 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.threads.browser;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action1;
 /* compiled from: WidgetThreadBrowser.kt */
@@ -17,12 +18,12 @@ public final class WidgetThreadBrowser$updateMenu$2<T> implements Action1<Menu>
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364125);
+        MenuItem findItem = menu.findItem(R.id.menu_thread_browser_filters);
         boolean z2 = true;
         if (findItem != null) {
             findItem.setVisible(this.$selectedPage == WidgetThreadBrowser.access$getARCHIVED_PAGE$p(this.this$0));
         }
-        MenuItem findItem2 = menu.findItem(2131364124);
+        MenuItem findItem2 = menu.findItem(R.id.menu_thread_browser_create_thread);
         if (findItem2 != null) {
             if (this.$selectedPage != WidgetThreadBrowser.access$getACTIVE_PAGE$p(this.this$0) || !m.areEqual(this.$canCreateThread, Boolean.TRUE)) {
                 z2 = false;
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
index b3ad8474a9..bc6180df73 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetThreadBrowserBinding;
 import com.discord.stores.SelectedChannelAnalyticsLocation;
@@ -67,7 +68,7 @@ public final class WidgetThreadBrowser extends AppFragment {
     }
 
     public WidgetThreadBrowser() {
-        super(2131559306);
+        super(R.layout.widget_thread_browser);
     }
 
     public static final /* synthetic */ int access$getACTIVE_PAGE$p(WidgetThreadBrowser widgetThreadBrowser) {
@@ -135,11 +136,11 @@ public final class WidgetThreadBrowser extends AppFragment {
         m.checkNotNullExpressionValue(simplePager, "binding.threadBrowserViewPager");
         if (simplePager.getAdapter() == null) {
             ArrayList arrayList = new ArrayList();
-            String string = getString(2131894277);
+            String string = getString(R.string.thread_browser_active);
             m.checkNotNullExpressionValue(string, "getString(R.string.thread_browser_active)");
             arrayList.add(new SimplePager.Adapter.Item(string, new WidgetThreadBrowser$initializeAdapter$1(this)));
             if (browser.getCanViewArchivedThreads()) {
-                String string2 = getString(2131894279);
+                String string2 = getString(R.string.thread_browser_archived);
                 m.checkNotNullExpressionValue(string2, "getString(R.string.thread_browser_archived)");
                 arrayList.add(new SimplePager.Adapter.Item(string2, new WidgetThreadBrowser$initializeAdapter$2(this)));
             }
@@ -167,7 +168,7 @@ public final class WidgetThreadBrowser extends AppFragment {
     }
 
     private final void updateMenu(int i, Boolean bool) {
-        setActionBarOptionsMenu(2131623966, new WidgetThreadBrowser$updateMenu$1(this), new WidgetThreadBrowser$updateMenu$2(this, i, bool));
+        setActionBarOptionsMenu(R.menu.menu_thread_browser, new WidgetThreadBrowser$updateMenu$1(this), new WidgetThreadBrowser$updateMenu$2(this, i, bool));
     }
 
     private final void updateView(WidgetThreadBrowserViewModel.ViewState viewState) {
@@ -200,6 +201,6 @@ public final class WidgetThreadBrowser extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131894300);
+        setActionBarTitle(R.string.thread_browser_title);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java
index 66148c1171..01a5e8f253 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.m1;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadBrowserActiveBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,15 +19,15 @@ public final /* synthetic */ class WidgetThreadBrowserActive$binding$2 extends k
 
     public final WidgetThreadBrowserActiveBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363132;
-        View findViewById = view.findViewById(2131363132);
+        int i = R.id.empty_view;
+        View findViewById = view.findViewById(R.id.empty_view);
         if (findViewById != null) {
             m1 a = m1.a(findViewById);
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
             if (recyclerView != null) {
                 return new WidgetThreadBrowserActiveBinding((ConstraintLayout) view, a, recyclerView);
             }
-            i = 2131364624;
+            i = R.id.recycler_view;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
index 342f9926d2..d7f25dfc51 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
@@ -12,6 +12,7 @@ import c.a.e.g0;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetThreadBrowserActiveBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
@@ -59,7 +60,7 @@ public final class WidgetThreadBrowserActive extends AppFragment {
     }
 
     public WidgetThreadBrowserActive() {
-        super(2131559307);
+        super(R.layout.widget_thread_browser_active);
         WidgetThreadBrowserActive$viewModel$2 widgetThreadBrowserActive$viewModel$2 = new WidgetThreadBrowserActive$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadBrowserActiveViewModel.class), new WidgetThreadBrowserActive$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadBrowserActive$viewModel$2));
@@ -106,7 +107,7 @@ public final class WidgetThreadBrowserActive extends AppFragment {
         widgetThreadBrowserAdapter.setData(viewState.getListItems());
         TextView textView = getBinding().b.d;
         m.checkNotNullExpressionValue(textView, "binding.emptyView.threadBrowserEmptyHeading");
-        textView.setText(requireContext().getString(2131894281));
+        textView.setText(requireContext().getString(R.string.thread_browser_empty_state_active_header));
         ConstraintLayout constraintLayout = getBinding().b.b;
         m.checkNotNullExpressionValue(constraintLayout, "binding.emptyView.threadBrowserEmpty");
         int i = 0;
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
index da29acaa27..1c9724516f 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.threads.browser;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppViewModel;
@@ -436,7 +437,7 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
         ArrayList arrayList = new ArrayList();
         LinkedHashSet linkedHashSet = new LinkedHashSet();
         boolean z2 = true;
-        Iterator it3 = n.listOf((Object[]) new Triple[]{new Triple("joined", 2131894287, storeState.getActiveJoinedThreads()), new Triple("other", 2131894290, storeState.getActiveThreads())}).iterator();
+        Iterator it3 = n.listOf((Object[]) new Triple[]{new Triple("joined", Integer.valueOf((int) R.string.thread_browser_joined_header), storeState.getActiveJoinedThreads()), new Triple("other", Integer.valueOf((int) R.string.thread_browser_other_header), storeState.getActiveThreads())}).iterator();
         while (it3.hasNext()) {
             Triple triple = (Triple) it3.next();
             String str = (String) triple.component1();
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java
index 725e590f7f..8cd751c882 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java
@@ -7,6 +7,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.databinding.ThreadBrowserItemHeaderBinding;
 import com.discord.databinding.ThreadBrowserItemThreadBinding;
@@ -31,17 +32,17 @@ public final class WidgetThreadBrowserAdapter extends MGRecyclerAdapterSimple<It
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderItem(WidgetThreadBrowserAdapter widgetThreadBrowserAdapter) {
-            super(2131558709, widgetThreadBrowserAdapter);
+            super((int) R.layout.thread_browser_item_header, widgetThreadBrowserAdapter);
             m.checkNotNullParameter(widgetThreadBrowserAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363712);
+            TextView textView = (TextView) view.findViewById(R.id.header_name);
             if (textView != null) {
                 ThreadBrowserItemHeaderBinding threadBrowserItemHeaderBinding = new ThreadBrowserItemHeaderBinding((ConstraintLayout) view, textView);
                 m.checkNotNullExpressionValue(threadBrowserItemHeaderBinding, "ThreadBrowserItemHeaderBinding.bind(itemView)");
                 this.binding = threadBrowserItemHeaderBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363712)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.header_name)));
         }
 
         public void onConfigure(int i, Item item) {
@@ -325,7 +326,7 @@ public final class WidgetThreadBrowserAdapter extends MGRecyclerAdapterSimple<It
     public static final class LoadingItem extends MGRecyclerViewHolder<WidgetThreadBrowserAdapter, Item> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public LoadingItem(WidgetThreadBrowserAdapter widgetThreadBrowserAdapter) {
-            super(2131558710, widgetThreadBrowserAdapter);
+            super((int) R.layout.thread_browser_item_loading, widgetThreadBrowserAdapter);
             m.checkNotNullParameter(widgetThreadBrowserAdapter, "adapter");
         }
     }
@@ -336,7 +337,7 @@ public final class WidgetThreadBrowserAdapter extends MGRecyclerAdapterSimple<It
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ThreadItem(WidgetThreadBrowserAdapter widgetThreadBrowserAdapter) {
-            super(2131558711, widgetThreadBrowserAdapter);
+            super((int) R.layout.thread_browser_item_thread, widgetThreadBrowserAdapter);
             m.checkNotNullParameter(widgetThreadBrowserAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java
index 3d280691af..2901903d6c 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.m1;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadBrowserArchivedBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -20,21 +21,21 @@ public final /* synthetic */ class WidgetThreadBrowserArchived$binding$2 extends
 
     public final WidgetThreadBrowserArchivedBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363132;
-        View findViewById = view.findViewById(2131363132);
+        int i = R.id.empty_view;
+        View findViewById = view.findViewById(R.id.empty_view);
         if (findViewById != null) {
             m1 a = m1.a(findViewById);
-            i = 2131364624;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+            i = R.id.recycler_view;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
             if (recyclerView != null) {
-                i = 2131365496;
-                TextView textView = (TextView) view.findViewById(2131365496);
+                i = R.id.thread_browser_error_msg;
+                TextView textView = (TextView) view.findViewById(R.id.thread_browser_error_msg);
                 if (textView != null) {
-                    i = 2131365497;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365497);
+                    i = R.id.thread_browser_error_overlay;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.thread_browser_error_overlay);
                     if (constraintLayout != null) {
-                        i = 2131365503;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365503);
+                        i = R.id.thread_browser_try_again;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.thread_browser_try_again);
                         if (materialButton != null) {
                             return new WidgetThreadBrowserArchivedBinding((ConstraintLayout) view, a, recyclerView, textView, constraintLayout, materialButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
index cd5feb8e23..42eb8bc27b 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetThreadBrowserArchivedBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
@@ -58,7 +59,7 @@ public final class WidgetThreadBrowserArchived extends AppFragment {
     }
 
     public WidgetThreadBrowserArchived() {
-        super(2131559308);
+        super(R.layout.widget_thread_browser_archived);
     }
 
     public static final /* synthetic */ long access$getChannelId$p(WidgetThreadBrowserArchived widgetThreadBrowserArchived) {
@@ -110,7 +111,7 @@ public final class WidgetThreadBrowserArchived extends AppFragment {
         widgetThreadBrowserAdapter.setData(viewState.getListItems());
         TextView textView = getBinding().b.d;
         m.checkNotNullExpressionValue(textView, "binding.emptyView.threadBrowserEmptyHeading");
-        textView.setText(requireContext().getString(2131894282));
+        textView.setText(requireContext().getString(R.string.thread_browser_empty_state_archived_header));
         ConstraintLayout constraintLayout2 = getBinding().b.b;
         m.checkNotNullExpressionValue(constraintLayout2, "binding.emptyView.threadBrowserEmpty");
         constraintLayout2.setVisibility(viewState.getListItems().isEmpty() ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
index 4dae6d0551..fcb8f9015a 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.channels.threads.browser;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppViewModel;
 import com.discord.models.guild.Guild;
@@ -606,9 +607,9 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
             if (!listing.getThreads().isEmpty()) {
                 int ordinal = viewMode.getVisibility().ordinal();
                 if (ordinal == 0) {
-                    i = 2131894294;
+                    i = R.string.thread_browser_public_header;
                 } else if (ordinal == 1) {
-                    i = 2131894292;
+                    i = R.string.thread_browser_private_header;
                 } else {
                     throw new NoWhenBranchMatchedException();
                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java
index c507b49c8f..1a2839e952 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadBrowserFilterSheetBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetThreadBrowserFilterSheet$binding$2 exte
 
     public final WidgetThreadBrowserFilterSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363515;
-        TextView textView = (TextView) view.findViewById(2131363515);
+        int i = R.id.guild_profile_sheet_emojis_count;
+        TextView textView = (TextView) view.findViewById(R.id.guild_profile_sheet_emojis_count);
         if (textView != null) {
-            i = 2131365499;
-            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365499);
+            i = R.id.thread_browser_moderator_view;
+            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.thread_browser_moderator_view);
             if (checkedSetting != null) {
-                i = 2131365500;
-                CardView cardView = (CardView) view.findViewById(2131365500);
+                i = R.id.thread_browser_moderator_view_card;
+                CardView cardView = (CardView) view.findViewById(R.id.thread_browser_moderator_view_card);
                 if (cardView != null) {
-                    i = 2131365505;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365505);
+                    i = R.id.thread_browser_visibility_private;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.thread_browser_visibility_private);
                     if (checkedSetting2 != null) {
-                        i = 2131365506;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365506);
+                        i = R.id.thread_browser_visibility_public;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.thread_browser_visibility_public);
                         if (checkedSetting3 != null) {
                             return new WidgetThreadBrowserFilterSheetBinding((NestedScrollView) view, textView, checkedSetting, cardView, checkedSetting2, checkedSetting3);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
index c057f26c12..3d38850b03 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetThreadBrowserFilterSheetBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -123,7 +124,7 @@ public final class WidgetThreadBrowserFilterSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559309;
+        return R.layout.widget_thread_browser_filter_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.java b/app/src/main/java/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.java
index ced39aef6c..358cf2325f 100644
--- a/app/src/main/java/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat;
 
+import com.discord.R;
 import com.discord.utilities.messagesend.MessageResult;
 import com.discord.utilities.rest.SendUtils;
 import com.discord.widgets.chat.MessageManager;
@@ -31,7 +32,7 @@ public final class MessageManager$defaultMessageResultHandler$1 extends o implem
         if (messageResult instanceof MessageResult.UnknownFailure) {
             SendUtils.handleSendError$default(SendUtils.INSTANCE, ((MessageResult.UnknownFailure) messageResult).getError(), MessageManager.access$getContext$p(this.this$0), null, null, 12, null);
         } else if (messageResult instanceof MessageResult.Slowmode) {
-            c.a.e.o.g(MessageManager.access$getContext$p(this.this$0), 2131887349, 0, null, 12);
+            c.a.e.o.g(MessageManager.access$getContext$p(this.this$0), R.string.channel_slowmode_desc_short, 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager.java b/app/src/main/java/com/discord/widgets/chat/MessageManager.java
index 0f612a0f6d..be5fe3099b 100644
--- a/app/src/main/java/com/discord/widgets/chat/MessageManager.java
+++ b/app/src/main/java/com/discord/widgets/chat/MessageManager.java
@@ -23,6 +23,7 @@ import com.discord.stores.StoreSlowMode;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
 import com.discord.utilities.messagesend.MessageResult;
+import com.discord.utilities.rest.SendUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.user.UserUtils;
 import com.lytefast.flexinput.model.Attachment;
@@ -427,7 +428,7 @@ public final class MessageManager {
         boolean z3 = true;
         boolean z4 = z2 && num != null && num.intValue() > 2000;
         if (UserUtils.INSTANCE.isPremiumTier2(meUser) || z4) {
-            i = 4000;
+            i = SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM;
         }
         if (str.length() == 0) {
             if (list != null && !list.isEmpty()) {
diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java
index 6719e0cbb8..1ba2d13e84 100644
--- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetUrlActionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,17 +18,17 @@ public final /* synthetic */ class WidgetUrlActions$binding$2 extends k implemen
 
     public final WidgetUrlActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362951;
-        TextView textView = (TextView) view.findViewById(2131362951);
+        int i = R.id.dialog_url_actions_copy;
+        TextView textView = (TextView) view.findViewById(R.id.dialog_url_actions_copy);
         if (textView != null) {
-            i = 2131362952;
-            TextView textView2 = (TextView) view.findViewById(2131362952);
+            i = R.id.dialog_url_actions_open;
+            TextView textView2 = (TextView) view.findViewById(R.id.dialog_url_actions_open);
             if (textView2 != null) {
-                i = 2131362953;
-                TextView textView3 = (TextView) view.findViewById(2131362953);
+                i = R.id.dialog_url_actions_share;
+                TextView textView3 = (TextView) view.findViewById(R.id.dialog_url_actions_share);
                 if (textView3 != null) {
-                    i = 2131362954;
-                    TextView textView4 = (TextView) view.findViewById(2131362954);
+                    i = R.id.dialog_url_actions_url;
+                    TextView textView4 = (TextView) view.findViewById(R.id.dialog_url_actions_url);
                     if (textView4 != null) {
                         return new WidgetUrlActionsBinding((LinearLayout) view, textView, textView2, textView3, textView4);
                     }
diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java
index 568c4f240e..5947c78621 100644
--- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat;
 
 import android.content.Context;
 import android.view.View;
+import com.discord.R;
 import com.discord.utilities.intent.IntentUtils;
 import d0.z.d.m;
 /* compiled from: WidgetUrlActions.kt */
@@ -17,7 +18,7 @@ public final class WidgetUrlActions$onViewCreated$3 implements View.OnClickListe
         Context requireContext = this.this$0.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
         String access$getUrl$p = WidgetUrlActions.access$getUrl$p(this.this$0);
-        String string = this.this$0.getString(2131888768);
+        String string = this.this$0.getString(R.string.form_label_send_to);
         m.checkNotNullExpressionValue(string, "getString(R.string.form_label_send_to)");
         IntentUtils.performChooserSendIntent(requireContext, access$getUrl$p, string);
         this.this$0.dismiss();
diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
index 6bacd66aca..1dd50816ab 100644
--- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
+++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
@@ -6,10 +6,12 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetUrlActionsBinding;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -45,14 +47,14 @@ public final class WidgetUrlActions extends AppBottomSheet {
             m.checkNotNullParameter(str, "url");
             WidgetUrlActions widgetUrlActions = new WidgetUrlActions();
             Bundle bundle = new Bundle();
-            bundle.putString("INTENT_URL", str);
+            bundle.putString(WidgetUrlActions.INTENT_URL, str);
             widgetUrlActions.setArguments(bundle);
             widgetUrlActions.show(fragmentManager, WidgetUrlActions.class.getName());
         }
 
         public final void requestNotice(String str) {
             m.checkNotNullParameter(str, "url");
-            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 0, false, n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetHome.class), a0.getOrCreateKotlinClass(WidgetSearchResults.class)}), 0, false, 0, new WidgetUrlActions$Companion$requestNotice$notice$1(str), 150, null));
+            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 0, false, n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetHome.class), a0.getOrCreateKotlinClass(WidgetSearchResults.class)}), 0, false, 0, new WidgetUrlActions$Companion$requestNotice$notice$1(str), FontUtils.MAX_FONT_SCALING, null));
         }
     }
 
@@ -86,7 +88,7 @@ public final class WidgetUrlActions extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559319;
+        return R.layout.widget_url_actions;
     }
 
     @Override // androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java
index 8f55839b5e..e70e281f2c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreNotices;
@@ -25,10 +26,10 @@ public final class AppFlexInputViewModel$onGiftButtonClicked$1 extends o impleme
     }
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         StoreStream.Companion companion = StoreStream.Companion;
         Channel findChannelByIdInternal$app_productionCanaryRelease = companion.getChannels().findChannelByIdInternal$app_productionCanaryRelease(companion.getChannelsSelected().getId());
-        WidgetSettingsGifting.Companion.launch(fragmentActivity, new Traits.Location((findChannelByIdInternal$app_productionCanaryRelease == null || findChannelByIdInternal$app_productionCanaryRelease.f() != 0) ? "Guild Channel" : "DM Channel", "Channel Text Area", "Button Icon", "gift", null, 16, null));
+        WidgetSettingsGifting.Companion.launch(fragmentActivity, new Traits.Location((findChannelByIdInternal$app_productionCanaryRelease == null || findChannelByIdInternal$app_productionCanaryRelease.f() != 0) ? Traits.Location.Page.GUILD_CHANNEL : "DM Channel", Traits.Location.Section.CHANNEL_TEXT_AREA, "Button Icon", "gift", null, 16, null));
         StoreNotices.markSeen$default(companion.getNotices(), "CHAT_GIFTING_NOTICE", 0, 2, null);
         return true;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
index e076f3369b..70772b3fc6 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
@@ -3,10 +3,13 @@ package com.discord.widgets.chat.input;
 import android.content.Context;
 import android.view.View;
 import androidx.annotation.MainThread;
+import androidx.core.app.FrameMetricsAggregator;
 import c.b.a.h.a;
 import c.i.a.f.e.o.c;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppPermissionsRequests;
 import com.discord.app.AppViewModel;
@@ -20,6 +23,8 @@ import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStickers;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
+import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.home.WidgetHome;
@@ -273,7 +278,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions, StoreUser storeUser, StoreGuildStickers storeGuildStickers, StoreGuilds storeGuilds, StoreGuildSelected storeGuildSelected, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(appPermissionsRequests, (i & 2) != 0 ? new FlexInputState(null, false, null, null, false, false, false, false, false, 511) : flexInputState, (i & 4) != 0 ? Companion.access$observeStores(Companion) : observable, (i & 8) != 0 ? StoreStream.Companion.getStickers() : storeStickers, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? StoreStream.Companion.getExpressionSuggestions() : storeExpressionSuggestions, (i & 64) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 128) != 0 ? StoreStream.Companion.getGuildStickers() : storeGuildStickers, (i & 256) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 512) != 0 ? StoreStream.Companion.getGuildSelected() : storeGuildSelected);
+        this(appPermissionsRequests, (i & 2) != 0 ? new FlexInputState(null, false, null, null, false, false, false, false, false, FrameMetricsAggregator.EVERY_DURATION) : flexInputState, (i & 4) != 0 ? Companion.access$observeStores(Companion) : observable, (i & 8) != 0 ? StoreStream.Companion.getStickers() : storeStickers, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? StoreStream.Companion.getExpressionSuggestions() : storeExpressionSuggestions, (i & 64) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 128) != 0 ? StoreStream.Companion.getGuildStickers() : storeGuildStickers, (i & 256) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 512) != 0 ? StoreStream.Companion.getGuildSelected() : storeGuildSelected);
     }
 
     public static final /* synthetic */ void access$handleStoreState(AppFlexInputViewModel appFlexInputViewModel, StoreState storeState) {
@@ -297,7 +302,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         boolean z3 = (m.areEqual(leftPanelState, aVar) ^ true) || (m.areEqual(storeState.getRightPanelState(), aVar) ^ true);
         boolean z4 = storeState.getNotice() != null && !storeState.getNotice().isInAppNotification() && !storeState.getNotice().isPopup();
         boolean hasAccessWrite = selectedChannel != null ? PermissionUtils.INSTANCE.hasAccessWrite(selectedChannel, channelPermission) : false;
-        boolean z5 = selectedChannel != null && (AnimatableValueParser.t1(selectedChannel) || PermissionUtils.can(32768, channelPermission));
+        boolean z5 = selectedChannel != null && (AnimatableValueParser.t1(selectedChannel) || PermissionUtils.can(Permission.ATTACH_FILES, channelPermission));
         boolean z6 = requireViewState.g;
         if (z4 || z3) {
             hideKeyboard();
@@ -387,11 +392,11 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
     public void onContentDialogPageChanged(int i) {
         updateViewState(FlexInputState.a(requireViewState(), null, false, null, Integer.valueOf(i), false, false, false, false, false, 503));
         if (i == 0) {
-            this.storeAnalytics.trackChatInputComponentViewed("media picker");
+            this.storeAnalytics.trackChatInputComponentViewed(ChatInputComponentTypes.MEDIA_PICKER);
         } else if (i == 1) {
-            this.storeAnalytics.trackChatInputComponentViewed("files");
+            this.storeAnalytics.trackChatInputComponentViewed(ChatInputComponentTypes.FILES);
         } else if (i == 2) {
-            this.storeAnalytics.trackChatInputComponentViewed("camera");
+            this.storeAnalytics.trackChatInputComponentViewed(ChatInputComponentTypes.CAMERA);
         }
     }
 
@@ -425,7 +430,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         FlexInputState requireViewState = requireViewState();
         if (!requireViewState.f) {
             PublishSubject<a> publishSubject = this.eventSubject;
-            publishSubject.j.onNext(new a.e(2131887195));
+            publishSubject.j.onNext(new a.e(R.string.cannot_attach_files));
             return;
         }
         hideKeyboard();
@@ -436,7 +441,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
     @MainThread
     public void onGiftButtonClicked() {
         hideKeyboard();
-        StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("CHAT_GIFTING_NOTICE", null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, AppFlexInputViewModel$onGiftButtonClicked$1.INSTANCE, 150, null));
+        StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(CHAT_GIFTING_NOTICE, null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, AppFlexInputViewModel$onGiftButtonClicked$1.INSTANCE, FontUtils.MAX_FONT_SCALING, null));
     }
 
     @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ApplicationCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/ApplicationCategoryViewHolder.java
index ea70b19bf7..4aa61b1f8c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ApplicationCategoryViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ApplicationCategoryViewHolder.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.CommandCategoryItemBinding;
 import com.discord.models.commands.Application;
 import com.discord.utilities.color.ColorCompat;
@@ -49,11 +50,11 @@ public final class ApplicationCategoryViewHolder extends RecyclerView.ViewHolder
         if (z2) {
             SimpleDraweeView simpleDraweeView3 = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.commandCategoryItemIcon");
-            i = ColorCompat.getThemedColor(simpleDraweeView3, 2130968946);
+            i = ColorCompat.getThemedColor(simpleDraweeView3, (int) R.attr.colorInteractiveActive);
         } else {
             SimpleDraweeView simpleDraweeView4 = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView4, "binding.commandCategoryItemIcon");
-            i = ColorCompat.getThemedColor(simpleDraweeView4, 2130968949);
+            i = ColorCompat.getThemedColor(simpleDraweeView4, (int) R.attr.colorInteractiveNormal);
         }
         SimpleDraweeView simpleDraweeView5 = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView5, "binding.commandCategoryItemIcon");
@@ -64,6 +65,6 @@ public final class ApplicationCategoryViewHolder extends RecyclerView.ViewHolder
         this.itemView.setOnClickListener(new ApplicationCategoryViewHolder$bind$1(this, application));
         View view2 = this.itemView;
         m.checkNotNullExpressionValue(view2, "itemView");
-        view2.setContentDescription(b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131887442, new Object[]{application.getName()}, null, 4));
+        view2.setContentDescription(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.command_accessibility_desc_app_item, new Object[]{application.getName()}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputApplicationsAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputApplicationsAdapter.java
index c4bfc408be..b08139256a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputApplicationsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputApplicationsAdapter.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.CommandCategoryItemBinding;
 import com.discord.models.commands.Application;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -49,12 +50,12 @@ public final class ChatInputApplicationsAdapter extends RecyclerView.Adapter<App
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public ApplicationCategoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558445, viewGroup, false);
-        int i2 = 2131362688;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362688);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.command_category_item, viewGroup, false);
+        int i2 = R.id.command_category_item_icon;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.command_category_item_icon);
         if (simpleDraweeView != null) {
-            i2 = 2131364350;
-            View findViewById = inflate.findViewById(2131364350);
+            i2 = R.id.overline;
+            View findViewById = inflate.findViewById(R.id.overline);
             if (findViewById != null) {
                 CommandCategoryItemBinding commandCategoryItemBinding = new CommandCategoryItemBinding((FrameLayout) inflate, simpleDraweeView, new c.a.j.n(findViewById, findViewById));
                 m.checkNotNullExpressionValue(commandCategoryItemBinding, "CommandCategoryItemBindi…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
index 5901e1ba7a..7ff3a81c89 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input;
 
 import android.content.Context;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreSlowMode;
 import com.discord.stores.StoreStream;
@@ -112,7 +113,7 @@ public final class ChatInputViewModel$sendMessage$1 extends o implements Functio
                 m.checkNotNullExpressionValue(retryAfterMs, "error.response.retryAfterMs ?: 0");
                 StoreStream.Companion.getSlowMode().onCooldown(this.this$0.$loadedViewState.getChannelId(), retryAfterMs.longValue(), StoreSlowMode.Type.ThreadCreate.INSTANCE);
             }
-            c.a.e.o.g(this.this$0.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891644, 0, null, 12);
+            c.a.e.o.g(this.this$0.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : R.string.network_error_bad_request, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
index 4b5a92ae80..e4d4f270cc 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
@@ -6,8 +6,10 @@ import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildVerificationLevel;
 import com.discord.api.guildjoinrequest.ApplicationStatus;
@@ -186,7 +188,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public AppendChatText(String str) {
                 super(null);
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 this.text = str;
             }
 
@@ -202,7 +204,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final AppendChatText copy(String str) {
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 return new AppendChatText(str);
             }
 
@@ -515,7 +517,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public SetChatText(String str) {
                 super(null);
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 this.text = str;
             }
 
@@ -531,7 +533,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final SetChatText copy(String str) {
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 return new SetChatText(str);
             }
 
@@ -1871,7 +1873,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             return false;
         }
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.ShowPremiumUpsell(1, 2131886797, 2131886796, false, false, 24, null));
+        publishSubject.j.onNext(new Event.ShowPremiumUpsell(1, R.string.autocomplete_emoji_upsell_modal_header, R.string.autocomplete_emoji_upsell_modal_blurb_mobile, false, false, 24, null));
         this.storeAnalytics.emojiAutocompleteUpsellModalViewed();
         return true;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/MentionUtilsKt.java b/app/src/main/java/com/discord/widgets/chat/input/MentionUtilsKt.java
index 17db32ca2d..8445949b8c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/MentionUtilsKt.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/MentionUtilsKt.java
@@ -8,7 +8,7 @@ import kotlin.Pair;
 /* compiled from: MentionUtils.kt */
 public final class MentionUtilsKt {
     public static final char CHANNELS_CHAR = '#';
-    private static final Set<Character> DEFAULT_LEADING_IDENTIFIERS = n0.hashSetOf('@', ':', '#', '/');
+    private static final Set<Character> DEFAULT_LEADING_IDENTIFIERS = n0.hashSetOf(Character.valueOf(MENTIONS_CHAR), Character.valueOf(EMOJIS_AND_STICKERS_CHAR), Character.valueOf(CHANNELS_CHAR), Character.valueOf(SLASH_CHAR));
     public static final char EMOJIS_AND_STICKERS_CHAR = ':';
     public static final char MENTIONS_CHAR = '@';
     public static final char SLASH_CHAR = '/';
diff --git a/app/src/main/java/com/discord/widgets/chat/input/SourcedAttachment.java b/app/src/main/java/com/discord/widgets/chat/input/SourcedAttachment.java
index 60a22b0ec8..582306728d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/SourcedAttachment.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/SourcedAttachment.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.net.Uri;
 import android.os.Parcel;
 import androidx.annotation.CallSuper;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.lytefast.flexinput.model.Attachment;
 import d0.z.d.m;
@@ -14,7 +15,7 @@ public final class SourcedAttachment<T> extends Attachment<T> {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public SourcedAttachment(long j, Uri uri, String str, T t, String str2) {
         super(j, uri, str, t);
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "displayName");
         m.checkNotNullParameter(str2, "source");
         this.source = str2;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java
index 1486330ded..67e5d5a558 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input;
 
 import android.view.View;
 import android.widget.FrameLayout;
+import com.discord.R;
 import com.discord.databinding.StickerAutocompleteItemBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import com.discord.views.sticker.StickerView;
@@ -12,17 +13,17 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetChatInpu
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StickerViewHolder(WidgetChatInputAutocompleteStickerAdapter widgetChatInputAutocompleteStickerAdapter) {
-        super(2131558680, widgetChatInputAutocompleteStickerAdapter);
+        super((int) R.layout.sticker_autocomplete_item, widgetChatInputAutocompleteStickerAdapter);
         m.checkNotNullParameter(widgetChatInputAutocompleteStickerAdapter, "adapter");
         View view = this.itemView;
-        StickerView stickerView = (StickerView) view.findViewById(2131365321);
+        StickerView stickerView = (StickerView) view.findViewById(R.id.sticker_autocomplete_sticker);
         if (stickerView != null) {
             StickerAutocompleteItemBinding stickerAutocompleteItemBinding = new StickerAutocompleteItemBinding((FrameLayout) view, stickerView);
             m.checkNotNullExpressionValue(stickerAutocompleteItemBinding, "StickerAutocompleteItemBinding.bind(itemView)");
             this.binding = stickerAutocompleteItemBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365321)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.sticker_autocomplete_sticker)));
     }
 
     public static final /* synthetic */ WidgetChatInputAutocompleteStickerAdapter access$getAdapter$p(StickerViewHolder stickerViewHolder) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java
index 11f83f24d0..4241f44ded 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java
@@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.k4;
 import c.a.j.l4;
+import com.discord.R;
 import com.discord.databinding.WidgetChatInputApplicationCommandsBinding;
 import com.discord.databinding.WidgetChatInputBinding;
 import com.google.android.material.button.MaterialButton;
@@ -28,91 +29,91 @@ public final /* synthetic */ class WidgetChatInput$binding$2 extends k implement
 
     public final WidgetChatInputBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361983;
-        View findViewById = view.findViewById(2131361983);
+        int i = R.id.application_commands_root;
+        View findViewById = view.findViewById(R.id.application_commands_root);
         if (findViewById != null) {
-            int i2 = 2131362480;
-            TextView textView = (TextView) findViewById.findViewById(2131362480);
+            int i2 = R.id.chat_input_application_commands_option_description;
+            TextView textView = (TextView) findViewById.findViewById(R.id.chat_input_application_commands_option_description);
             if (textView != null) {
-                i2 = 2131362481;
-                RecyclerView recyclerView = (RecyclerView) findViewById.findViewById(2131362481);
+                i2 = R.id.chat_input_application_commands_recycler;
+                RecyclerView recyclerView = (RecyclerView) findViewById.findViewById(R.id.chat_input_application_commands_recycler);
                 if (recyclerView != null) {
-                    i2 = 2131363024;
-                    View findViewById2 = findViewById.findViewById(2131363024);
+                    i2 = R.id.divider;
+                    View findViewById2 = findViewById.findViewById(R.id.divider);
                     if (findViewById2 != null) {
                         WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding = new WidgetChatInputApplicationCommandsBinding((ConstraintLayout) findViewById, textView, recyclerView, findViewById2);
-                        i = 2131362483;
-                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362483);
+                        i = R.id.chat_input_categories_recycler;
+                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.chat_input_categories_recycler);
                         if (recyclerView2 != null) {
                             LinearLayout linearLayout = (LinearLayout) view;
-                            i = 2131362485;
-                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362485);
+                            i = R.id.chat_input_context_bar;
+                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.chat_input_context_bar);
                             if (relativeLayout != null) {
-                                i = 2131362486;
-                                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(2131362486);
+                                i = R.id.chat_input_context_cancel;
+                                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(R.id.chat_input_context_cancel);
                                 if (appCompatImageButton != null) {
-                                    i = 2131362487;
-                                    TextView textView2 = (TextView) view.findViewById(2131362487);
+                                    i = R.id.chat_input_context_description;
+                                    TextView textView2 = (TextView) view.findViewById(R.id.chat_input_context_description);
                                     if (textView2 != null) {
-                                        i = 2131362488;
-                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362488);
+                                        i = R.id.chat_input_context_reply_mention_button;
+                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.chat_input_context_reply_mention_button);
                                         if (linearLayout2 != null) {
-                                            i = 2131362489;
-                                            ImageView imageView = (ImageView) view.findViewById(2131362489);
+                                            i = R.id.chat_input_context_reply_mention_button_image;
+                                            ImageView imageView = (ImageView) view.findViewById(R.id.chat_input_context_reply_mention_button_image);
                                             if (imageView != null) {
-                                                i = 2131362490;
-                                                TextView textView3 = (TextView) view.findViewById(2131362490);
+                                                i = R.id.chat_input_context_reply_mention_button_text;
+                                                TextView textView3 = (TextView) view.findViewById(R.id.chat_input_context_reply_mention_button_text);
                                                 if (textView3 != null) {
-                                                    i = 2131362491;
-                                                    TextView textView4 = (TextView) view.findViewById(2131362491);
+                                                    i = R.id.chat_input_emoji_matching_header;
+                                                    TextView textView4 = (TextView) view.findViewById(R.id.chat_input_emoji_matching_header);
                                                     if (textView4 != null) {
-                                                        i = 2131362509;
-                                                        RecyclerView recyclerView3 = (RecyclerView) view.findViewById(2131362509);
+                                                        i = R.id.chat_input_mentions_recycler;
+                                                        RecyclerView recyclerView3 = (RecyclerView) view.findViewById(R.id.chat_input_mentions_recycler);
                                                         if (recyclerView3 != null) {
-                                                            i = 2131362525;
-                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362525);
+                                                            i = R.id.chat_input_stickers_container;
+                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.chat_input_stickers_container);
                                                             if (linearLayout3 != null) {
-                                                                i = 2131362526;
-                                                                TextView textView5 = (TextView) view.findViewById(2131362526);
+                                                                i = R.id.chat_input_stickers_matching_header;
+                                                                TextView textView5 = (TextView) view.findViewById(R.id.chat_input_stickers_matching_header);
                                                                 if (textView5 != null) {
-                                                                    i = 2131362527;
-                                                                    RecyclerView recyclerView4 = (RecyclerView) view.findViewById(2131362527);
+                                                                    i = R.id.chat_input_stickers_recycler;
+                                                                    RecyclerView recyclerView4 = (RecyclerView) view.findViewById(R.id.chat_input_stickers_recycler);
                                                                     if (recyclerView4 != null) {
-                                                                        i = 2131362534;
-                                                                        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362534);
+                                                                        i = R.id.chat_input_widget;
+                                                                        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.chat_input_widget);
                                                                         if (fragmentContainerView != null) {
-                                                                            i = 2131362535;
-                                                                            LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362535);
+                                                                            i = R.id.chat_input_wrap;
+                                                                            LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.chat_input_wrap);
                                                                             if (linearLayout4 != null) {
-                                                                                i = 2131363433;
-                                                                                View findViewById3 = view.findViewById(2131363433);
+                                                                                i = R.id.guard;
+                                                                                View findViewById3 = view.findViewById(R.id.guard);
                                                                                 if (findViewById3 != null) {
-                                                                                    int i3 = 2131362496;
-                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131362496);
+                                                                                    int i3 = R.id.chat_input_guard_action;
+                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(R.id.chat_input_guard_action);
                                                                                     if (materialButton != null) {
-                                                                                        i3 = 2131362497;
-                                                                                        MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(2131362497);
+                                                                                        i3 = R.id.chat_input_guard_action_secondary;
+                                                                                        MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(R.id.chat_input_guard_action_secondary);
                                                                                         if (materialButton2 != null) {
-                                                                                            i3 = 2131362498;
-                                                                                            TextView textView6 = (TextView) findViewById3.findViewById(2131362498);
+                                                                                            i3 = R.id.chat_input_guard_subtext;
+                                                                                            TextView textView6 = (TextView) findViewById3.findViewById(R.id.chat_input_guard_subtext);
                                                                                             if (textView6 != null) {
-                                                                                                i3 = 2131362499;
-                                                                                                TextView textView7 = (TextView) findViewById3.findViewById(2131362499);
+                                                                                                i3 = R.id.chat_input_guard_text;
+                                                                                                TextView textView7 = (TextView) findViewById3.findViewById(R.id.chat_input_guard_text);
                                                                                                 if (textView7 != null) {
                                                                                                     k4 k4Var = new k4((LinearLayout) findViewById3, materialButton, materialButton2, textView6, textView7);
-                                                                                                    View findViewById4 = view.findViewById(2131363434);
+                                                                                                    View findViewById4 = view.findViewById(R.id.guard_member_verification);
                                                                                                     if (findViewById4 != null) {
-                                                                                                        int i4 = 2131362622;
-                                                                                                        CardView cardView = (CardView) findViewById4.findViewById(2131362622);
+                                                                                                        int i4 = R.id.chat_member_verification_input_guard_action;
+                                                                                                        CardView cardView = (CardView) findViewById4.findViewById(R.id.chat_member_verification_input_guard_action);
                                                                                                         if (cardView != null) {
-                                                                                                            i4 = 2131362623;
-                                                                                                            ImageView imageView2 = (ImageView) findViewById4.findViewById(2131362623);
+                                                                                                            i4 = R.id.chat_member_verification_input_guard_chevron;
+                                                                                                            ImageView imageView2 = (ImageView) findViewById4.findViewById(R.id.chat_member_verification_input_guard_chevron);
                                                                                                             if (imageView2 != null) {
-                                                                                                                i4 = 2131362624;
-                                                                                                                ImageView imageView3 = (ImageView) findViewById4.findViewById(2131362624);
+                                                                                                                i4 = R.id.chat_member_verification_input_guard_icon;
+                                                                                                                ImageView imageView3 = (ImageView) findViewById4.findViewById(R.id.chat_member_verification_input_guard_icon);
                                                                                                                 if (imageView3 != null) {
-                                                                                                                    i4 = 2131362625;
-                                                                                                                    TextView textView8 = (TextView) findViewById4.findViewById(2131362625);
+                                                                                                                    i4 = R.id.chat_member_verification_input_guard_text;
+                                                                                                                    TextView textView8 = (TextView) findViewById4.findViewById(R.id.chat_member_verification_input_guard_text);
                                                                                                                     if (textView8 != null) {
                                                                                                                         return new WidgetChatInputBinding(linearLayout, widgetChatInputApplicationCommandsBinding, recyclerView2, linearLayout, relativeLayout, appCompatImageButton, textView2, linearLayout2, imageView, textView3, textView4, recyclerView3, linearLayout3, textView5, recyclerView4, fragmentContainerView, linearLayout4, k4Var, new l4((RelativeLayout) findViewById4, cardView, imageView2, imageView3, textView8));
                                                                                                                     }
@@ -121,7 +122,7 @@ public final /* synthetic */ class WidgetChatInput$binding$2 extends k implement
                                                                                                         }
                                                                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById4.getResources().getResourceName(i4)));
                                                                                                     }
-                                                                                                    i = 2131363434;
+                                                                                                    i = R.id.guard_member_verification;
                                                                                                 }
                                                                                             }
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java
index b9e79c1c3b..62f71f8713 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input;
 import android.content.Context;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.guilds.MemberVerificationUtils;
 import com.discord.widgets.chat.input.ChatInputViewModel;
 import d0.z.d.m;
@@ -40,6 +41,6 @@ public final class WidgetChatInput$configureChatGuard$1 implements View.OnClickL
         Context requireContext = this.this$0.requireContext();
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, this.$viewState.getChannel().f(), "Guild Channel", null, AnonymousClass1.INSTANCE, 16, null);
+        MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, this.$viewState.getChannel().f(), Traits.Location.Page.GUILD_CHANNEL, null, AnonymousClass1.INSTANCE, 16, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureContextBarReplying$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureContextBarReplying$1.java
index 7171205380..1a164d1af7 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureContextBarReplying$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureContextBarReplying$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.models.member.GuildMember;
 import com.discord.utilities.color.ColorCompat;
@@ -31,6 +32,6 @@ public final class WidgetChatInput$configureContextBarReplying$1 extends o imple
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(GuildMember.Companion.getColor(this.$model.getRepliedAuthorGuildMember(), ColorCompat.getThemedColor(this.$context, 2130968932)));
+        renderContext.d = Integer.valueOf(GuildMember.Companion.getColor(this.$model.getRepliedAuthorGuildMember(), ColorCompat.getThemedColor(this.$context, (int) R.attr.colorHeaderPrimary)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java
index 3f5d1544cc..8840f0ad3a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input;
 
+import com.discord.R;
 import com.discord.widgets.chat.input.ChatInputViewModel;
 import com.lytefast.flexinput.FlexInputListener;
 import com.lytefast.flexinput.model.Attachment;
@@ -56,13 +57,13 @@ public final class WidgetChatInput$configureSendListeners$6 implements FlexInput
         m.checkNotNullParameter(list, "list");
         m.checkNotNullParameter(function1, "onSendResult");
         if (this.$viewState.isOnCooldown() && !this.$viewState.isEditing() && this.$viewState.getSelectedThreadDraft() == null) {
-            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(2131887349)));
+            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(R.string.channel_slowmode_desc_short)));
         } else if (this.$viewState.isEditing() && (!list.isEmpty())) {
-            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(2131888247)));
+            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(R.string.editing_with_attachment_error)));
         } else if (this.$viewState.getAbleToSendMessage()) {
             this.$trySend$3.invoke(list, (Function1<? super Boolean, Unit>) new AnonymousClass1(this, function1));
         } else {
-            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(2131891757)));
+            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(R.string.no_send_messages_permission_placeholder)));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java
index 6322a9798e..b8fc126849 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input;
 
 import androidx.fragment.app.Fragment;
+import com.discord.R;
 import com.lytefast.flexinput.fragment.FlexInputFragment;
 import d0.z.d.o;
 import java.util.Objects;
@@ -18,7 +19,7 @@ public final class WidgetChatInput$flexInputFragment$2 extends o implements Func
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final FlexInputFragment mo1invoke() {
-        Fragment findFragmentById = this.this$0.getChildFragmentManager().findFragmentById(2131362534);
+        Fragment findFragmentById = this.this$0.getChildFragmentManager().findFragmentById(R.id.chat_input_widget);
         Objects.requireNonNull(findFragmentById, "null cannot be cast to non-null type com.lytefast.flexinput.fragment.FlexInputFragment");
         return (FlexInputFragment) findFragmentById;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
index f884372ddb..a8b1edd8e1 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
@@ -25,6 +25,7 @@ import c.a.p.b;
 import c.d.b.a.a;
 import c.i.a.f.e.o.c;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildVerificationLevel;
 import com.discord.api.guildjoinrequest.ApplicationStatus;
@@ -75,7 +76,7 @@ public final class WidgetChatInput extends AppFragment {
     private WidgetChatInputTruncatedHint chatInputTruncatedHint;
     private final Lazy flexInputFragment$delegate = g.lazy(new WidgetChatInput$flexInputFragment$2(this));
     private final Lazy flexInputViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(AppFlexInputViewModel.class), new WidgetChatInput$appActivityViewModels$$inlined$activityViewModels$3(this), new g0(new WidgetChatInput$flexInputViewModel$2(this)));
-    private final ViewVisibilityObserver inlineVoiceVisibilityObserver = ViewVisibilityObserverProvider.INSTANCE.get("INLINE_VOICE_FEATURE");
+    private final ViewVisibilityObserver inlineVoiceVisibilityObserver = ViewVisibilityObserverProvider.INSTANCE.get(ViewVisibilityObserverProvider.INLINE_VOICE_FEATURE);
     private final MessageDraftsRepo messageDraftsRepo = MessageDraftsRepo.Provider.INSTANCE.get();
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChatInputViewModel.class), new WidgetChatInput$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetChatInput$viewModel$2.INSTANCE));
 
@@ -108,7 +109,7 @@ public final class WidgetChatInput extends AppFragment {
     }
 
     public WidgetChatInput() {
-        super(2131558938);
+        super(R.layout.widget_chat_input);
     }
 
     public static final /* synthetic */ void access$configureSendListeners(WidgetChatInput widgetChatInput, ChatInputViewModel.ViewState.Loaded loaded) {
@@ -220,10 +221,10 @@ public final class WidgetChatInput extends AppFragment {
         m.checkNotNullExpressionValue(l4Var2, "binding.guardMemberVerification");
         l4Var2.a.setOnClickListener(new WidgetChatInput$configureChatGuard$1(this, loaded));
         if (loaded.isSystemDM()) {
-            getBinding().r.e.setText(2131894146);
+            getBinding().r.e.setText(R.string.system_dm_channel_description);
             TextView textView = getBinding().r.d;
             m.checkNotNullExpressionValue(textView, "binding.guard.chatInputGuardSubtext");
-            ViewExtensions.setTextAndVisibilityBy(textView, getString(2131894147));
+            ViewExtensions.setTextAndVisibilityBy(textView, getString(R.string.system_dm_channel_description_subtext));
             MaterialButton materialButton = getBinding().r.b;
             m.checkNotNullExpressionValue(materialButton, "binding.guard.chatInputGuardAction");
             materialButton.setVisibility(8);
@@ -232,30 +233,30 @@ public final class WidgetChatInput extends AppFragment {
             materialButton2.setVisibility(8);
         } else if (loaded.isLurking()) {
             if (loaded.getShouldShowFollow()) {
-                getBinding().r.e.setText(2131888568);
+                getBinding().r.e.setText(R.string.follow_news_chat_input_message);
                 MaterialButton materialButton3 = getBinding().r.b;
                 m.checkNotNullExpressionValue(materialButton3, "binding.guard.chatInputGuardAction");
-                ViewExtensions.setTextAndVisibilityBy(materialButton3, getString(2131888999));
+                ViewExtensions.setTextAndVisibilityBy(materialButton3, getString(R.string.game_popout_follow));
                 getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$2(this, loaded));
                 MaterialButton materialButton4 = getBinding().r.f120c;
                 m.checkNotNullExpressionValue(materialButton4, "binding.guard.chatInputGuardActionSecondary");
-                ViewExtensions.setTextAndVisibilityBy(materialButton4, getString(2131891206));
+                ViewExtensions.setTextAndVisibilityBy(materialButton4, getString(R.string.lurker_mode_chat_input_button));
                 getBinding().r.f120c.setOnClickListener(new WidgetChatInput$configureChatGuard$3(this));
             } else {
-                getBinding().r.e.setText(2131891207);
+                getBinding().r.e.setText(R.string.lurker_mode_chat_input_message);
                 MaterialButton materialButton5 = getBinding().r.b;
                 m.checkNotNullExpressionValue(materialButton5, "binding.guard.chatInputGuardAction");
-                ViewExtensions.setTextAndVisibilityBy(materialButton5, getString(2131891206));
+                ViewExtensions.setTextAndVisibilityBy(materialButton5, getString(R.string.lurker_mode_chat_input_button));
                 getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$4(this));
                 MaterialButton materialButton6 = getBinding().r.f120c;
                 m.checkNotNullExpressionValue(materialButton6, "binding.guard.chatInputGuardActionSecondary");
                 materialButton6.setVisibility(8);
             }
         } else if (loaded.getShouldShowFollow()) {
-            getBinding().r.e.setText(2131888568);
+            getBinding().r.e.setText(R.string.follow_news_chat_input_message);
             MaterialButton materialButton7 = getBinding().r.b;
             m.checkNotNullExpressionValue(materialButton7, "binding.guard.chatInputGuardAction");
-            ViewExtensions.setTextAndVisibilityBy(materialButton7, getString(2131888999));
+            ViewExtensions.setTextAndVisibilityBy(materialButton7, getString(R.string.game_popout_follow));
             getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$5(this, loaded));
             MaterialButton materialButton8 = getBinding().r.f120c;
             m.checkNotNullExpressionValue(materialButton8, "binding.guard.chatInputGuardActionSecondary");
@@ -285,17 +286,17 @@ public final class WidgetChatInput extends AppFragment {
             if (joinRequestStatus != null) {
                 int ordinal = joinRequestStatus.ordinal();
                 if (ordinal == 1) {
-                    getBinding().f1736s.f127c.setText(2131891334);
-                    getBinding().f1736s.b.setImageResource(2131232236);
+                    getBinding().f1736s.f127c.setText(R.string.member_verification_application_confirmation_title);
+                    getBinding().f1736s.b.setImageResource(R.drawable.img_member_verification_pending);
                     return;
                 } else if (ordinal == 2) {
-                    getBinding().f1736s.f127c.setText(2131891339);
-                    getBinding().f1736s.b.setImageResource(2131232235);
+                    getBinding().f1736s.f127c.setText(R.string.member_verification_application_rejected_title);
+                    getBinding().f1736s.b.setImageResource(R.drawable.img_member_verification_denied);
                     return;
                 }
             }
-            getBinding().f1736s.f127c.setText(2131891348);
-            getBinding().f1736s.b.setImageResource(2131232237);
+            getBinding().f1736s.f127c.setText(R.string.member_verification_chat_blocker_text);
+            getBinding().f1736s.b.setImageResource(R.drawable.img_member_verification_started);
         }
     }
 
@@ -318,7 +319,7 @@ public final class WidgetChatInput extends AppFragment {
         RelativeLayout relativeLayout2 = getBinding().e;
         m.checkNotNullExpressionValue(relativeLayout2, "binding.chatInputContextBar");
         relativeLayout2.setClickable(false);
-        getBinding().g.setText(2131888246);
+        getBinding().g.setText(R.string.editing_message);
         getBinding().f.setOnClickListener(new WidgetChatInput$configureContextBarEditing$1(this));
         LinearLayout linearLayout = getBinding().h;
         m.checkNotNullExpressionValue(linearLayout, "binding.chatInputContextReplyMentionButton");
@@ -338,7 +339,7 @@ public final class WidgetChatInput extends AppFragment {
         }
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.chatInputContextDescription");
-        b.m(textView, 2131891546, new Object[]{str}, new WidgetChatInput$configureContextBarReplying$1(requireContext, replying));
+        b.m(textView, R.string.mobile_replying_to, new Object[]{str}, new WidgetChatInput$configureContextBarReplying$1(requireContext, replying));
         getBinding().e.setOnClickListener(new WidgetChatInput$configureContextBarReplying$2(this, replying));
         getBinding().f.setOnClickListener(new WidgetChatInput$configureContextBarReplying$3(this));
         LinearLayout linearLayout = getBinding().h;
@@ -348,12 +349,12 @@ public final class WidgetChatInput extends AppFragment {
         }
         linearLayout.setVisibility(i);
         getBinding().h.setOnClickListener(new WidgetChatInput$configureContextBarReplying$4(this));
-        int themedColor = replying.getShouldMention() ? ColorCompat.getThemedColor(requireContext, 2130968915) : ColorCompat.getThemedColor(requireContext, 2130968989);
+        int themedColor = replying.getShouldMention() ? ColorCompat.getThemedColor(requireContext, (int) R.attr.colorControlBrandForeground) : ColorCompat.getThemedColor(requireContext, (int) R.attr.colorTextMuted);
         ImageView imageView = getBinding().i;
         m.checkNotNullExpressionValue(imageView, "binding.chatInputContextReplyMentionButtonImage");
         ColorCompatKt.tintWithColor(imageView, themedColor);
         getBinding().j.setTextColor(themedColor);
-        getBinding().j.setText(replying.getShouldMention() ? 2131892965 : 2131892963);
+        getBinding().j.setText(replying.getShouldMention() ? R.string.reply_mention_on : R.string.reply_mention_off);
     }
 
     private final void configureInitialText(ChatInputViewModel.ViewState.Loaded loaded) {
@@ -443,13 +444,13 @@ public final class WidgetChatInput extends AppFragment {
 
     private final CharSequence getHint(Context context, Channel channel, boolean z2, boolean z3) {
         if (z2) {
-            String string = context.getString(2131888206);
+            String string = context.getString(R.string.dm_verification_text_blocked);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…erification_text_blocked)");
             return string;
         } else if (z3) {
-            return b.h(context, 2131894259, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
+            return b.h(context, R.string.textarea_placeholder, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
         } else {
-            String string2 = context.getString(2131891757);
+            String string2 = context.getString(R.string.no_send_messages_permission_placeholder);
             m.checkNotNullExpressionValue(string2, "context.getString(R.stri…s_permission_placeholder)");
             return string2;
         }
@@ -458,29 +459,29 @@ public final class WidgetChatInput extends AppFragment {
     private final String getVerificationActionText(Context context, GuildVerificationLevel guildVerificationLevel) {
         int ordinal = guildVerificationLevel.ordinal();
         if (ordinal == 1) {
-            return context.getString(2131894924);
+            return context.getString(R.string.verify_account);
         }
         if (ordinal != 4) {
             return null;
         }
-        return context.getString(2131894936);
+        return context.getString(R.string.verify_phone);
     }
 
     private final CharSequence getVerificationText(Context context, GuildVerificationLevel guildVerificationLevel) {
         int ordinal = guildVerificationLevel.ordinal();
         if (ordinal == 1) {
-            return context.getString(2131890361);
+            return context.getString(R.string.guild_verification_text_not_claimed);
         }
         if (ordinal == 2) {
-            return b.h(context, 2131890359, new Object[]{"5"}, null, 4);
+            return b.h(context, R.string.guild_verification_text_account_age, new Object[]{"5"}, null, 4);
         }
         if (ordinal == 3) {
-            return b.h(context, 2131890360, new Object[]{"10"}, null, 4);
+            return b.h(context, R.string.guild_verification_text_member_age, new Object[]{"10"}, null, 4);
         }
         if (ordinal != 4) {
             return null;
         }
-        return context.getString(2131890362);
+        return context.getString(R.string.guild_verification_text_not_phone_verified);
     }
 
     private final ChatInputViewModel getViewModel() {
@@ -508,21 +509,21 @@ public final class WidgetChatInput extends AppFragment {
             FragmentManager parentFragmentManager2 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
             ChatInputViewModel.Event.MessageTooLong messageTooLong = (ChatInputViewModel.Event.MessageTooLong) event;
-            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager2, getString(2131891496), b.k(this, 2131891495, new Object[]{numberInstance.format(Integer.valueOf(messageTooLong.getCurrentCharacterCount())), numberInstance.format(Integer.valueOf(messageTooLong.getMaxCharacterCount()))}, null, 4), getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager2, getString(R.string.message_too_long_header), b.k(this, R.string.message_too_long_body_text, new Object[]{numberInstance.format(Integer.valueOf(messageTooLong.getCurrentCharacterCount())), numberInstance.format(Integer.valueOf(messageTooLong.getMaxCharacterCount()))}, null, 4), getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
             unit = Unit.a;
         } else if (event instanceof ChatInputViewModel.Event.EmptyThreadName) {
             getFlexInputViewModel().hideKeyboard();
             WidgetNoticeDialog.Companion companion2 = WidgetNoticeDialog.Companion;
             FragmentManager parentFragmentManager3 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager3, "parentFragmentManager");
-            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager3, null, b.k(this, 2131888814, new Object[0], null, 4), getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16370, null);
+            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager3, null, b.k(this, R.string.form_thread_name_required_error, new Object[0], null, 4), getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16370, null);
             unit = Unit.a;
         } else if (event instanceof ChatInputViewModel.Event.FailedDeliveryToRecipient) {
             getFlexInputViewModel().hideKeyboard();
             WidgetNoticeDialog.Companion companion3 = WidgetNoticeDialog.Companion;
             FragmentManager parentFragmentManager4 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager4, "parentFragmentManager");
-            WidgetNoticeDialog.Companion.show$default(companion3, parentFragmentManager4, getString(2131888408), b.k(this, 2131887049, new Object[]{f.a.a(360060145013L, null)}, null, 4), getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+            WidgetNoticeDialog.Companion.show$default(companion3, parentFragmentManager4, getString(R.string.error), b.k(this, R.string.bot_dm_send_failed_with_help_link_mobile, new Object[]{f.a.a(360060145013L, null)}, null, 4), getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
             unit = Unit.a;
         } else if (event instanceof ChatInputViewModel.Event.AppendChatText) {
             getFlexInputViewModel().onInputTextAppended(((ChatInputViewModel.Event.AppendChatText) event).getText());
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java
index 92bdd9a252..01458f4a97 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java
@@ -6,9 +6,9 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.b.a.d.d;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.utilities.drawable.DrawableCompat;
-import com.lytefast.flexinput.R;
 import com.lytefast.flexinput.adapters.AttachmentPreviewAdapter;
 import com.lytefast.flexinput.fragment.FlexInputFragment;
 import com.lytefast.flexinput.managers.FileManager;
@@ -39,7 +39,7 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$1 exten
         m.checkNotNullExpressionValue(requireContext2, "requireContext()");
         Context requireContext3 = access$getFlexInputFragment$p.requireContext();
         m.checkNotNullExpressionValue(requireContext3, "requireContext()");
-        d.a[] aVarArr = {new WidgetChatInputAttachments$configureFlexInputFragment$1$1$1(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext, 2130969413, 0, 2, (Object) null), 2131886733), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$2(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext2, 2130969412, 0, 2, (Object) null), 2131886732), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$3(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext3, 2130969410, 0, 2, (Object) null), 2131887143)};
+        d.a[] aVarArr = {new WidgetChatInputAttachments$configureFlexInputFragment$1$1$1(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext, (int) R.attr.ic_flex_input_image, 0, 2, (Object) null), R.string.attachment_media), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$2(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext2, (int) R.attr.ic_flex_input_file, 0, 2, (Object) null), R.string.attachment_files), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$3(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext3, (int) R.attr.ic_flex_input_add_a_photo, 0, 2, (Object) null), R.string.camera)};
         m.checkNotNullParameter(aVarArr, "pageSuppliers");
         access$getFlexInputFragment$p.q = aVarArr;
         FileManager fileManager = this.$fragment.getFileManager();
@@ -63,7 +63,7 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$1 exten
         m.checkNotNullExpressionValue(childFragmentManager, "fragment.childFragmentManager");
         Fragment access$createAndConfigureExpressionFragment = WidgetChatInputAttachments.access$createAndConfigureExpressionFragment(widgetChatInputAttachments, childFragmentManager, WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).k());
         if (access$createAndConfigureExpressionFragment != null) {
-            access$getFlexInputFragment$p.getChildFragmentManager().beginTransaction().replace(R.e.expression_tray_container, access$createAndConfigureExpressionFragment, access$createAndConfigureExpressionFragment.getClass().getSimpleName()).commit();
+            access$getFlexInputFragment$p.getChildFragmentManager().beginTransaction().replace(com.lytefast.flexinput.R.e.expression_tray_container, access$createAndConfigureExpressionFragment, access$createAndConfigureExpressionFragment.getClass().getSimpleName()).commit();
             AppCompatImageButton appCompatImageButton = access$getFlexInputFragment$p.j().i;
             m.checkNotNullExpressionValue(appCompatImageButton, "binding.expressionBtn");
             appCompatImageButton.setVisibility(0);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
index ad30417491..d2b222f586 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
@@ -34,7 +34,7 @@ public final class WidgetChatInputAttachments$createPreviewAdapter$1 extends o i
         }
 
         private final void track(T t) {
-            String source = t instanceof SourcedAttachment ? t.getSource() : "media_picker";
+            String source = t instanceof SourcedAttachment ? t.getSource() : AnalyticsTracker.ATTACHMENT_SOURCE_PICKER;
             try {
                 int size = WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0.this$0).b().getSize();
                 Context context = this.this$0.$context;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
index edd7db18b8..94a258d9ac 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
@@ -13,7 +13,9 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.m4;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.app.AppFragment;
+import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.widgets.chat.input.expression.WidgetExpressionTray;
 import com.google.android.material.button.MaterialButton;
 import com.lytefast.flexinput.FlexInputListener;
@@ -35,7 +37,7 @@ public final class WidgetChatInputAttachments {
         @Override // com.lytefast.flexinput.fragment.FilesFragment
         public EmptyListAdapter newPermissionsRequestAdapter(View.OnClickListener onClickListener) {
             m.checkNotNullParameter(onClickListener, "onClickListener");
-            return new PermissionsEmptyListAdapter(2131558946, 2131361874, onClickListener);
+            return new PermissionsEmptyListAdapter(R.layout.widget_chat_input_perm_req_files, R.id.action_btn, onClickListener);
         }
     }
 
@@ -44,7 +46,7 @@ public final class WidgetChatInputAttachments {
         @Override // com.lytefast.flexinput.fragment.MediaFragment
         public EmptyListAdapter newPermissionsRequestAdapter(View.OnClickListener onClickListener) {
             m.checkNotNullParameter(onClickListener, "onClickListener");
-            return new PermissionsEmptyListAdapter(2131558946, 2131361874, onClickListener);
+            return new PermissionsEmptyListAdapter(R.layout.widget_chat_input_perm_req_files, R.id.action_btn, onClickListener);
         }
     }
 
@@ -61,15 +63,15 @@ public final class WidgetChatInputAttachments {
             m.checkNotNullParameter(viewGroup, "parent");
             EmptyListAdapter.ViewHolder onCreateViewHolder = super.onCreateViewHolder(viewGroup, i);
             View view = onCreateViewHolder.itemView;
-            int i2 = 2131361874;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131361874);
+            int i2 = R.id.action_btn;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.action_btn);
             if (materialButton != null) {
-                i2 = 2131364427;
-                TextView textView = (TextView) view.findViewById(2131364427);
+                i2 = R.id.perm_req_text;
+                TextView textView = (TextView) view.findViewById(R.id.perm_req_text);
                 if (textView != null) {
                     m.checkNotNullExpressionValue(new m4((LinearLayout) view, materialButton, textView), "WidgetChatInputPermReqFi…ing.bind(holder.itemView)");
                     m.checkNotNullExpressionValue(textView, "binding.permReqText");
-                    b.n(textView, 2131894225, new Object[0], null, 4);
+                    b.n(textView, R.string.system_permission_request_files, new Object[0], null, 4);
                     return onCreateViewHolder;
                 }
             }
@@ -102,7 +104,7 @@ public final class WidgetChatInputAttachments {
         WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1(this);
         WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1(this);
         WidgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1(textView);
-        Fragment findFragmentById = fragmentManager.findFragmentById(2131363221);
+        Fragment findFragmentById = fragmentManager.findFragmentById(R.id.expression_tray_container);
         if (!(findFragmentById instanceof WidgetExpressionTray)) {
             findFragmentById = null;
         }
@@ -124,7 +126,7 @@ public final class WidgetChatInputAttachments {
     private final void setAttachmentFromPicker(Context context, InputContentInfoCompat inputContentInfoCompat) {
         ContentResolver contentResolver = context.getContentResolver();
         if (contentResolver != null) {
-            this.flexInputFragment.f(new SourcedAttachment(Attachment.Companion.b(inputContentInfoCompat, contentResolver, true, b.h(context, 2131886731, new Object[0], null, 4).toString()), "keyboard"));
+            this.flexInputFragment.f(new SourcedAttachment(Attachment.Companion.b(inputContentInfoCompat, contentResolver, true, b.h(context, R.string.attachment_filename_unknown, new Object[0], null, 4).toString()), AnalyticsTracker.ATTACHMENT_SOURCE_KEYBOARD));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setHardwareKeyboardSendBehavior$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setHardwareKeyboardSendBehavior$1.java
index 2386068b42..dd1faccc51 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setHardwareKeyboardSendBehavior$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setHardwareKeyboardSendBehavior$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input;
 
 import android.view.KeyEvent;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
 import kotlin.Unit;
@@ -17,7 +18,7 @@ public final class WidgetChatInputEditText$setHardwareKeyboardSendBehavior$1 imp
     @Override // android.view.View.OnKeyListener
     public final boolean onKey(View view, int i, KeyEvent keyEvent) {
         Function0<Unit> onSendListener;
-        m.checkNotNullParameter(keyEvent, "event");
+        m.checkNotNullParameter(keyEvent, NotificationCompat.CATEGORY_EVENT);
         boolean z2 = (keyEvent.getFlags() & 2) == 2;
         if ((i == 66) && !z2) {
             boolean hasModifiers = keyEvent.hasModifiers(1);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.java
index 28e8832cef..91879b94e3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText$setOnTextChangedListener$1.java
@@ -28,7 +28,7 @@ public final class WidgetChatInputEditText$setOnTextChangedListener$1 extends Te
             this.empty = isEmpty;
             WidgetChatInputEditText.access$getEmptyTextSubject$p(this.this$0).onNext(Boolean.valueOf(isEmpty));
         }
-        boolean startsWith$default = w.startsWith$default((CharSequence) editable.toString(), '/', false, 2, (Object) null);
+        boolean startsWith$default = w.startsWith$default((CharSequence) editable.toString(), (char) MentionUtilsKt.SLASH_CHAR, false, 2, (Object) null);
         if (WidgetChatInputEditText.access$getLastTypingEmissionMillis$p(this.this$0) - ClockFactory.get().currentTimeMillis() < ((long) -10000) && !isEmpty && !startsWith$default) {
             WidgetChatInputEditText.access$setLastTypingEmissionMillis$p(this.this$0, ClockFactory.get().currentTimeMillis());
             StoreStream.Companion.getUsersTyping().setUserTyping(this.this$0.getChannelId());
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputMentionsTags.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputMentionsTags.java
index 5ff123ddd2..ebb208ccde 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputMentionsTags.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputMentionsTags.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: WidgetChatInputMentionsTags.kt */
@@ -12,7 +13,7 @@ public final class WidgetChatInputMentionsTags<T> {
     /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List<? extends T> */
     /* JADX WARN: Multi-variable type inference failed */
     public WidgetChatInputMentionsTags(List<? extends T> list, char c2, String str) {
-        m.checkNotNullParameter(list, "tags");
+        m.checkNotNullParameter(list, ModelAuditLogEntry.CHANGE_KEY_TAGS);
         m.checkNotNullParameter(str, "token");
         this.tags = list;
         this.tokenIdentifier = c2;
@@ -47,7 +48,7 @@ public final class WidgetChatInputMentionsTags<T> {
     }
 
     public final WidgetChatInputMentionsTags<T> copy(List<? extends T> list, char c2, String str) {
-        m.checkNotNullParameter(list, "tags");
+        m.checkNotNullParameter(list, ModelAuditLogEntry.CHANGE_KEY_TAGS);
         m.checkNotNullParameter(str, "token");
         return new WidgetChatInputMentionsTags<>(list, c2, str);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java
index 606e705de6..fcaf99d18e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input.applicationcommands;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.ViewAppcommandsOptionparamListitemBinding;
 import com.discord.models.commands.ApplicationCommandOption;
 import com.discord.utilities.color.ColorCompat;
@@ -14,17 +15,17 @@ public final class SelectedAppCommandOptionAdapterItem extends MGRecyclerViewHol
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public SelectedAppCommandOptionAdapterItem(SelectedApplicationCommandAdapter selectedApplicationCommandAdapter) {
-        super(2131558736, selectedApplicationCommandAdapter);
+        super((int) R.layout.view_appcommands_optionparam_listitem, selectedApplicationCommandAdapter);
         m.checkNotNullParameter(selectedApplicationCommandAdapter, "adapter");
         View view = this.itemView;
-        TextView textView = (TextView) view.findViewById(2131361981);
+        TextView textView = (TextView) view.findViewById(R.id.appcommands_optiontitle_title);
         if (textView != null) {
             ViewAppcommandsOptionparamListitemBinding viewAppcommandsOptionparamListitemBinding = new ViewAppcommandsOptionparamListitemBinding((FrameLayout) view, textView);
             m.checkNotNullExpressionValue(viewAppcommandsOptionparamListitemBinding, "ViewAppcommandsOptionpar…temBinding.bind(itemView)");
             this.binding = viewAppcommandsOptionparamListitemBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131361981)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.appcommands_optiontitle_title)));
     }
 
     public static final /* synthetic */ SelectedApplicationCommandAdapter access$getAdapter$p(SelectedAppCommandOptionAdapterItem selectedAppCommandOptionAdapterItem) {
@@ -40,19 +41,19 @@ public final class SelectedAppCommandOptionAdapterItem extends MGRecyclerViewHol
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.appcommandsOptiontitleTitle");
             textView.setText(option.getName());
-            int i3 = selectedApplicationCommandItem.getHighlighted() ? 2131231029 : 2131231030;
+            int i3 = selectedApplicationCommandItem.getHighlighted() ? R.drawable.drawable_bg_command_param_highlight : R.drawable.drawable_bg_command_param_normal;
             if (selectedApplicationCommandItem.getHighlighted()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.appcommandsOptiontitleTitle");
-                i2 = ColorCompat.getThemedColor(textView2, 2130968932);
+                i2 = ColorCompat.getThemedColor(textView2, (int) R.attr.colorHeaderPrimary);
             } else if (selectedApplicationCommandItem.getError()) {
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.appcommandsOptiontitleTitle");
-                i2 = ColorCompat.getColor(textView3, 2131100329);
+                i2 = ColorCompat.getColor(textView3, (int) R.color.status_red_500);
             } else {
                 TextView textView4 = this.binding.b;
                 m.checkNotNullExpressionValue(textView4, "binding.appcommandsOptiontitleTitle");
-                i2 = ColorCompat.getThemedColor(textView4, 2130968932);
+                i2 = ColorCompat.getThemedColor(textView4, (int) R.attr.colorHeaderPrimary);
             }
             if (!selectedApplicationCommandItem.getCompleted() || selectedApplicationCommandItem.getHighlighted()) {
                 TextView textView5 = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java
index 0f12bdfd1d..dffd92db64 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input.applicationcommands;
 import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.ViewAppcommandsOptionheadingListitemBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import d0.z.d.m;
@@ -12,14 +13,14 @@ public final class SelectedAppCommandSectionHeadingAdapterItem extends MGRecycle
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public SelectedAppCommandSectionHeadingAdapterItem(SelectedApplicationCommandAdapter selectedApplicationCommandAdapter) {
-        super(2131558735, selectedApplicationCommandAdapter);
+        super((int) R.layout.view_appcommands_optionheading_listitem, selectedApplicationCommandAdapter);
         m.checkNotNullParameter(selectedApplicationCommandAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131361978;
-        TextView textView = (TextView) view.findViewById(2131361978);
+        int i = R.id.appcommands_optionheading_title;
+        TextView textView = (TextView) view.findViewById(R.id.appcommands_optionheading_title);
         if (textView != null) {
-            i = 2131363024;
-            View findViewById = view.findViewById(2131363024);
+            i = R.id.divider;
+            View findViewById = view.findViewById(R.id.divider);
             if (findViewById != null) {
                 ViewAppcommandsOptionheadingListitemBinding viewAppcommandsOptionheadingListitemBinding = new ViewAppcommandsOptionheadingListitemBinding((ConstraintLayout) view, textView, findViewById);
                 m.checkNotNullExpressionValue(viewAppcommandsOptionheadingListitemBinding, "ViewAppcommandsOptionhea…temBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java
index 94bc0eb7d6..39e26199e0 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java
@@ -4,10 +4,12 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ViewAppcommandsOptiontitleListitemBinding;
 import com.discord.models.commands.Application;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: SelectedApplicationCommandAdapter.kt */
@@ -16,14 +18,14 @@ public final class SelectedAppCommandTitleAdapterItem extends MGRecyclerViewHold
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public SelectedAppCommandTitleAdapterItem(SelectedApplicationCommandAdapter selectedApplicationCommandAdapter) {
-        super(2131558737, selectedApplicationCommandAdapter);
+        super((int) R.layout.view_appcommands_optiontitle_listitem, selectedApplicationCommandAdapter);
         m.checkNotNullParameter(selectedApplicationCommandAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131361979;
-        TextView textView = (TextView) view.findViewById(2131361979);
+        int i = R.id.appcommands_optiontitle;
+        TextView textView = (TextView) view.findViewById(R.id.appcommands_optiontitle);
         if (textView != null) {
-            i = 2131361980;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131361980);
+            i = R.id.appcommands_optiontitle_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.appcommands_optiontitle_avatar);
             if (simpleDraweeView != null) {
                 ViewAppcommandsOptiontitleListitemBinding viewAppcommandsOptiontitleListitemBinding = new ViewAppcommandsOptiontitleListitemBinding((ConstraintLayout) view, textView, simpleDraweeView);
                 m.checkNotNullExpressionValue(viewAppcommandsOptiontitleListitemBinding, "ViewAppcommandsOptiontit…temBinding.bind(itemView)");
@@ -37,7 +39,7 @@ public final class SelectedAppCommandTitleAdapterItem extends MGRecyclerViewHold
     public void onConfigure(int i, SelectedApplicationCommandItem selectedApplicationCommandItem) {
         m.checkNotNullParameter(selectedApplicationCommandItem, "data");
         super.onConfigure(i, (int) selectedApplicationCommandItem);
-        StringBuilder H = a.H('/');
+        StringBuilder H = a.H(MentionUtilsKt.SLASH_CHAR);
         H.append(selectedApplicationCommandItem.getTitle());
         String sb = H.toString();
         TextView textView = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java
index b166b97db2..32183d9c53 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input.applicationcommands;
 
 import android.view.ViewGroup;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.commands.ApplicationCommandOption;
@@ -142,7 +143,7 @@ public final class SelectedApplicationCommandAdapter extends MGRecyclerAdapterSi
                 }
             }
             if (i != 0) {
-                arrayList.add(new SelectedApplicationCommandItem(null, null, false, false, false, null, getRecycler().getResources().getString(2131887486), 63, null));
+                arrayList.add(new SelectedApplicationCommandItem(null, null, false, false, false, null, getRecycler().getResources().getString(R.string.commands_optional_header), 63, null));
             }
             List<ApplicationCommandOption> options3 = applicationCommand.getOptions();
             ArrayList<ApplicationCommandOption> arrayList3 = new ArrayList();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/Autocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/Autocompletable.java
index 58142407fa..7def02c065 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/Autocompletable.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/Autocompletable.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.autocomplete;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.utilities.collections.MultiListIterator;
 import d0.z.d.m;
 import java.util.Iterator;
@@ -51,7 +52,7 @@ public abstract class Autocompletable {
     }
 
     public final boolean matchesText(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         if (getInputTextMatchers().contains(str)) {
             return true;
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java
index beff722613..d6de596211 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteViewModel.java
@@ -32,8 +32,10 @@ import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
 import com.discord.utilities.textprocessing.FontColorSpan;
 import com.discord.utilities.textprocessing.SimpleRoundedBackgroundSpan;
+import com.discord.widgets.chat.AutocompleteSelectionTypes;
 import com.discord.widgets.chat.MessageContent;
 import com.discord.widgets.chat.input.AutocompleteStickerItem;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.input.WidgetChatInputDiscoveryCommandsModel;
 import com.discord.widgets.chat.input.autocomplete.AutocompleteViewState;
 import com.discord.widgets.chat.input.autocomplete.Event;
@@ -821,7 +823,7 @@ public final class AutocompleteViewModel extends AppViewModel<ViewState> {
         WidgetChatInputDiscoveryCommandsModel browserCommands;
         WidgetChatInputDiscoveryCommandsModel browserCommands2;
         MentionToken autocompleteToken = autocompleteInputSelectionModel.getAutocompleteToken();
-        if (m.areEqual(autocompleteInputSelectionModel.getInputSelectionModel().getInputModel().getInput().toString(), "/")) {
+        if (m.areEqual(autocompleteInputSelectionModel.getInputSelectionModel().getInputModel().getInput().toString(), COMMAND_DISCOVER_TOKEN)) {
             StoreState storeState2 = this.storeState;
             Long jumpedApplicationId = (storeState2 == null || (browserCommands2 = storeState2.getBrowserCommands()) == null) ? null : browserCommands2.getJumpedApplicationId();
             if (jumpedApplicationId != null && ((storeState = this.storeState) == null || (browserCommands = storeState.getBrowserCommands()) == null || browserCommands.getJumpedSequenceId() != this.lastJumpedSequenceId)) {
@@ -990,7 +992,7 @@ public final class AutocompleteViewModel extends AppViewModel<ViewState> {
             Objects.requireNonNull(obj, "null cannot be cast to non-null type java.lang.String");
             String substring = obj.substring(first, last);
             m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
-            if (!w.contains$default((CharSequence) substring, ':', false, 2, (Object) null)) {
+            if (!w.contains$default((CharSequence) substring, (char) MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, false, 2, (Object) null)) {
                 return new InputEditTextAction.RemoveText(obj, new IntRange(intRange.getFirst(), intRange.getLast()), intRange.getFirst());
             }
         }
@@ -1223,7 +1225,7 @@ public final class AutocompleteViewModel extends AppViewModel<ViewState> {
                 return appendTextForCommandForInput;
             }
         }
-        InputEditTextAction clearSpans = inputState.getCurrentInput().length() == 0 ? new InputEditTextAction.ClearSpans(inputState.getCurrentInput()) : m.areEqual(inputState.getCurrentInput().toString(), "/") ? new InputEditTextAction.ClearSpans(inputState.getCurrentInput()) : generateSpanUpdates(mentionInputModel);
+        InputEditTextAction clearSpans = inputState.getCurrentInput().length() == 0 ? new InputEditTextAction.ClearSpans(inputState.getCurrentInput()) : m.areEqual(inputState.getCurrentInput().toString(), COMMAND_DISCOVER_TOKEN) ? new InputEditTextAction.ClearSpans(inputState.getCurrentInput()) : generateSpanUpdates(mentionInputModel);
         this.inputMentionModelSubject.onNext(mentionInputModel);
         this.inputState = InputState.copy$default(inputState, null, inputCommandContext.getSelectedCommand(), null, null, mapInputToMentions.getMentions(), 13, null);
         return clearSpans;
@@ -1409,18 +1411,18 @@ public final class AutocompleteViewModel extends AppViewModel<ViewState> {
         this.inputState.getCurrentInput();
         String obj = this.inputState.getCurrentInput().toString();
         if (obj.length() <= 1 || y.last(obj) != ':') {
-            str = w.replaceAfterLast$default(obj, ':', "", null, 4, null);
+            str = w.replaceAfterLast$default(obj, MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, "", null, 4, null);
         } else {
             String substring = obj.substring(0, w.getLastIndex(obj));
             m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
-            str = w.replaceAfterLast$default(substring, ':', "", null, 4, null);
+            str = w.replaceAfterLast$default(substring, MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, "", null, 4, null);
         }
         String substring2 = str.substring(0, str.length() - 1);
         m.checkNotNullExpressionValue(substring2, "(this as java.lang.Strin…ing(startIndex, endIndex)");
         this.editTextAction.onNext(new InputEditTextAction.ReplaceText(obj, substring2, substring2.length()));
         AutocompleteInputSelectionModel autocompleteInputSelectionModel = this.lastAutocompleteInputSelectionModel;
         if (autocompleteInputSelectionModel != null) {
-            companion.getAnalytics().trackAutocompleteSelect(companion.getChannelsSelected().getId(), autocompleteInputSelectionModel.getAutocompleteType(), autocompleteInputSelectionModel.getEmojiNumCount(), autocompleteInputSelectionModel.getStickerNumCount(), "STICKER", "sticker", Long.valueOf(sticker.getId()));
+            companion.getAnalytics().trackAutocompleteSelect(companion.getChannelsSelected().getId(), autocompleteInputSelectionModel.getAutocompleteType(), autocompleteInputSelectionModel.getEmojiNumCount(), autocompleteInputSelectionModel.getStickerNumCount(), AutocompleteSelectionTypes.STICKER, "sticker", Long.valueOf(sticker.getId()));
         }
         companion.getStickers().onStickerUsed(sticker);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiAutocompletable.java
index b214a5ee30..aa124ebd3b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiAutocompletable.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiAutocompletable.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input.autocomplete;
 
 import c.d.b.a.a;
 import com.discord.models.domain.emoji.Emoji;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.t.o;
 import d0.z.d.m;
 import java.util.ArrayList;
@@ -25,7 +26,7 @@ public final class EmojiAutocompletable extends Autocompletable {
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(names, 10));
         Iterator<T> it = names.iterator();
         while (it.hasNext()) {
-            arrayList.add(':' + ((String) it.next()) + ':');
+            arrayList.add(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + ((String) it.next()) + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         }
         this.textMatchers = arrayList;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$everyone$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$everyone$2.java
index 4ee5c67b97..57095256e7 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$everyone$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$everyone$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.autocomplete;
 
+import com.discord.models.domain.ModelGuildMemberListUpdate;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: Autocompletable.kt */
@@ -13,6 +14,6 @@ public final class GlobalRoleAutocompletable$Companion$everyone$2 extends o impl
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final GlobalRoleAutocompletable mo1invoke() {
-        return new GlobalRoleAutocompletable("everyone");
+        return new GlobalRoleAutocompletable(ModelGuildMemberListUpdate.EVERYONE_ID);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable.java
index 6d518b2d26..fd3e0c0121 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.autocomplete;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import d0.g;
 import d0.z.d.m;
@@ -39,7 +40,7 @@ public final class GlobalRoleAutocompletable extends Autocompletable {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public GlobalRoleAutocompletable(String str) {
         super(null);
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         this.text = str;
         this.textMatchers = d0.t.m.listOf(leadingIdentifier().getIdentifier() + str);
     }
@@ -64,7 +65,7 @@ public final class GlobalRoleAutocompletable extends Autocompletable {
     }
 
     public final GlobalRoleAutocompletable copy(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         return new GlobalRoleAutocompletable(str);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete$viewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete$viewModel$2.java
index b3e16c4775..ea8e9ff018 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete$viewModel$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.autocomplete;
 
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.o;
@@ -17,6 +18,6 @@ public final class InputAutocomplete$viewModel$2 extends o implements Function0<
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<ViewState> mo1invoke() {
-        return new AutocompleteViewModel(InputAutocomplete.access$getChannel$p(this.this$0), null, ColorCompat.getThemedColor(InputAutocomplete.access$getEditText$p(this.this$0), 2130970186), ColorCompat.getThemedColor(InputAutocomplete.access$getEditText$p(this.this$0), 2130968894), ColorCompat.getColor(InputAutocomplete.access$getEditText$p(this.this$0), 2131100329), null, 34, null);
+        return new AutocompleteViewModel(InputAutocomplete.access$getChannel$p(this.this$0), null, ColorCompat.getThemedColor(InputAutocomplete.access$getEditText$p(this.this$0), (int) R.attr.theme_chat_mention_foreground), ColorCompat.getThemedColor(InputAutocomplete.access$getEditText$p(this.this$0), (int) R.attr.colorBackgroundFloating), ColorCompat.getColor(InputAutocomplete.access$getEditText$p(this.this$0), (int) R.color.status_red_500), null, 34, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java
index 0d8c7ffa14..bbf8c346d6 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/InputAutocomplete.java
@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChatInputApplicationCommandsBinding;
@@ -292,7 +293,7 @@ public final class InputAutocomplete {
         chatInputAutocompleteAdapter.setOnItemSelected(new AnonymousClass4(this));
         recyclerView.setAdapter(chatInputAutocompleteAdapter);
         recyclerView.setItemAnimator(null);
-        recyclerView.setBackgroundColor(ColorCompat.getThemedColor(flexEditText, 2130968905));
+        recyclerView.setBackgroundColor(ColorCompat.getThemedColor(flexEditText, (int) R.attr.colorBackgroundSecondary));
         WidgetChatInputAutocompleteStickerAdapter widgetChatInputAutocompleteStickerAdapter = (WidgetChatInputAutocompleteStickerAdapter) MGRecyclerAdapter.Companion.configure(new WidgetChatInputAutocompleteStickerAdapter(recyclerView3, new AnonymousClass5(this)));
         this.stickersAdapter = widgetChatInputAutocompleteStickerAdapter;
         recyclerView3.setLayoutManager(new SelfHealingLinearLayoutManager(recyclerView3, widgetChatInputAutocompleteStickerAdapter, 0, false, 8, null));
@@ -421,7 +422,7 @@ public final class InputAutocomplete {
         } else {
             this.autocompleteHeader.setVisibility(0);
             TextView textView = this.autocompleteHeader;
-            textView.setText(b.j(textView, 2131888320, new Object[]{autocomplete.getToken()}, null, 4));
+            textView.setText(b.j(textView, R.string.emoji_matching, new Object[]{autocomplete.getToken()}, null, 4));
         }
         this.autocompleteAdapter.setVisiblePositionListener(new InputAutocomplete$configureAutocompleteBrowser$1(this));
         getViewModel().onAutocompleteItemsUpdated();
@@ -434,7 +435,7 @@ public final class InputAutocomplete {
         view.setVisibility(i);
         if (z2) {
             TextView textView2 = this.stickerHeader;
-            textView2.setText(b.j(textView2, 2131894003, new Object[]{t.replace$default(autocomplete.getToken(), String.valueOf(leadingIdentifier.getIdentifier()), "", false, 4, (Object) null)}, null, 4));
+            textView2.setText(b.j(textView2, R.string.stickers_matching, new Object[]{t.replace$default(autocomplete.getToken(), String.valueOf(leadingIdentifier.getIdentifier()), "", false, 4, (Object) null)}, null, 4));
             this.stickersAdapter.setData(autocomplete.getStickers());
         }
     }
@@ -520,14 +521,14 @@ public final class InputAutocomplete {
                 TextView textView2 = widgetChatInputApplicationCommandsBinding.b;
                 ConstraintLayout constraintLayout2 = widgetChatInputApplicationCommandsBinding.a;
                 m.checkNotNullExpressionValue(constraintLayout2, "selectedApplicationCommandUiBinding.root");
-                textView2.setTextColor(ColorCompat.getColor(constraintLayout2.getContext(), 2131100329));
+                textView2.setTextColor(ColorCompat.getColor(constraintLayout2.getContext(), (int) R.color.status_red_500));
             } else {
                 TextView textView3 = this.selectedApplicationCommandUiBinding.b;
                 m.checkNotNullExpressionValue(textView3, "selectedApplicationComma…CommandsOptionDescription");
                 Resources resources2 = this.editText.getResources();
                 m.checkNotNullExpressionValue(resources2, "editText.resources");
                 textView3.setText(StoreApplicationCommandsKt.getDescriptionText(selectedCommandOption, resources2));
-                this.selectedApplicationCommandUiBinding.b.setTextColor(ColorCompat.getThemedColor(this.editText.getContext(), 2130968990));
+                this.selectedApplicationCommandUiBinding.b.setTextColor(ColorCompat.getThemedColor(this.editText.getContext(), (int) R.attr.colorTextNormal));
             }
             this.selectedApplicationCommandAdapter.highlightOption(selectedCommandOption);
         } else {
@@ -537,7 +538,7 @@ public final class InputAutocomplete {
             Resources resources3 = this.editText.getResources();
             m.checkNotNullExpressionValue(resources3, "editText.resources");
             textView4.setText(StoreApplicationCommandsKt.getDescriptionText(selectedCommand2, resources3));
-            this.selectedApplicationCommandUiBinding.b.setTextColor(ColorCompat.getThemedColor(this.editText.getContext(), 2130968990));
+            this.selectedApplicationCommandUiBinding.b.setTextColor(ColorCompat.getThemedColor(this.editText.getContext(), (int) R.attr.colorTextNormal));
             this.selectedApplicationCommandAdapter.clearParamOptionHighlight();
         }
         this.selectedApplicationCommandAdapter.setVerified(selectedCommand.getValidSelectedCommandOptions(), selectedCommand.getSelectedCommandOptionErrors());
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/LeadingIdentifier.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/LeadingIdentifier.java
index cd715184c2..7949f02122 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/LeadingIdentifier.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/LeadingIdentifier.java
@@ -1,12 +1,13 @@
 package com.discord.widgets.chat.input.autocomplete;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: Autocompletable.kt */
 public enum LeadingIdentifier {
-    APP_COMMAND('/'),
-    EMOJI_AND_STICKERS(':'),
-    CHANNELS('#'),
-    MENTION('@'),
+    APP_COMMAND(Character.valueOf(MentionUtilsKt.SLASH_CHAR)),
+    EMOJI_AND_STICKERS(Character.valueOf(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR)),
+    CHANNELS(Character.valueOf(MentionUtilsKt.CHANNELS_CHAR)),
+    MENTION(Character.valueOf(MentionUtilsKt.MENTIONS_CHAR)),
     NONE(null);
     
     public static final Companion Companion = new Companion(null);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
index 355721722b..aa491c9231 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
 import com.discord.api.user.User;
@@ -30,6 +31,7 @@ import com.discord.utilities.textprocessing.node.EmojiNode;
 import com.discord.utilities.user.UserUtils;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
 import com.discord.views.StatusView;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.input.autocomplete.ApplicationCommandAutocompletable;
 import com.discord.widgets.chat.input.autocomplete.ApplicationCommandChoiceAutocompletable;
 import com.discord.widgets.chat.input.autocomplete.Autocompletable;
@@ -108,10 +110,10 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
         textView.setText(channel.m());
-        int i = AnimatableValueParser.C1(channel) ? 2131231528 : AnimatableValueParser.A1(channel) ? 2131232047 : AnimatableValueParser.l1(channel) ? 2131231519 : 2131231710;
+        int i = AnimatableValueParser.C1(channel) ? R.drawable.ic_channel_voice : AnimatableValueParser.A1(channel) ? R.drawable.ic_thread : AnimatableValueParser.l1(channel) ? R.drawable.ic_channel_text : R.drawable.ic_guild_folder;
         SimpleDraweeView simpleDraweeView = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatInputItemAvatar");
-        int color = ColorCompat.getColor(simpleDraweeView, 2131100133);
+        int color = ColorCompat.getColor(simpleDraweeView, (int) R.color.primary_500);
         SimpleDraweeView simpleDraweeView2 = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
         simpleDraweeView2.setVisibility(0);
@@ -196,7 +198,7 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(constraintLayout4, "binding.root");
             TextView textView6 = this.binding.f1734c;
             m.checkNotNullExpressionValue(textView6, "binding.chatInputItemDescription");
-            CharSequence j = b.j(constraintLayout4, 2131887444, new Object[]{command.getName(), textView6.getText(), application.getName()}, null, 4);
+            CharSequence j = b.j(constraintLayout4, R.string.command_accessibility_desc_command_item, new Object[]{command.getName(), textView6.getText(), application.getName()}, null, 4);
             ConstraintLayout constraintLayout5 = this.binding.a;
             m.checkNotNullExpressionValue(constraintLayout5, "binding.root");
             constraintLayout5.setContentDescription(j);
@@ -213,11 +215,11 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
             }
             ConstraintLayout constraintLayout6 = this.binding.a;
             m.checkNotNullExpressionValue(constraintLayout6, "binding.root");
-            int themedColor = ColorCompat.getThemedColor(constraintLayout6, 2130968989);
+            int themedColor = ColorCompat.getThemedColor(constraintLayout6, (int) R.attr.colorTextMuted);
             MGImages mGImages = MGImages.INSTANCE;
             SimpleDraweeView simpleDraweeView3 = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.chatInputItemAvatar");
-            MGImages.setImage$default(mGImages, simpleDraweeView3, 2131231985, (MGImages.ChangeDetector) null, 4, (Object) null);
+            MGImages.setImage$default(mGImages, simpleDraweeView3, (int) R.drawable.ic_slash_command_24dp, (MGImages.ChangeDetector) null, 4, (Object) null);
             this.binding.b.setColorFilter(themedColor, PorterDuff.Mode.SRC_ATOP);
         }
     }
@@ -247,9 +249,9 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         Set singleton = Collections.singleton(emojiNode);
         m.checkNotNullExpressionValue(singleton, "Collections.singleton(emojiNode)");
         DraweeSpanStringBuilder render = AstRenderer.render(singleton, emojiAutocompleteRenderContext);
-        StringBuilder H = a.H(':');
+        StringBuilder H = a.H(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         H.append(emoji.getFirstName());
-        H.append(':');
+        H.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         String sb = H.toString();
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
@@ -277,11 +279,11 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         m.checkNotNullExpressionValue(constraintLayout2, "binding.root");
         Context context2 = constraintLayout2.getContext();
         m.checkNotNullExpressionValue(context2, "binding.root.context");
-        Drawable drawable = ResourcesCompat.getDrawable(resources, 2131231782, context2.getTheme());
+        Drawable drawable = ResourcesCompat.getDrawable(resources, R.drawable.ic_mentions_white_24dp, context2.getTheme());
         if (drawable != null) {
             TextView textView2 = this.binding.e;
             m.checkNotNullExpressionValue(textView2, "binding.chatInputItemName");
-            this.binding.b.setColorFilter(ColorCompat.getColor(textView2, 2131100277), PorterDuff.Mode.SRC_ATOP);
+            this.binding.b.setColorFilter(ColorCompat.getColor(textView2, (int) R.color.status_grey_500), PorterDuff.Mode.SRC_ATOP);
             MGImages mGImages = MGImages.INSTANCE;
             SimpleDraweeView simpleDraweeView2 = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
@@ -295,7 +297,7 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         GuildRole role = roleAutocompletable.getRole();
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
-        int opaqueColor = RoleUtils.getOpaqueColor(role, ColorCompat.getColor(textView, 2131100277));
+        int opaqueColor = RoleUtils.getOpaqueColor(role, ColorCompat.getColor(textView, (int) R.color.status_grey_500));
         TextView textView2 = this.binding.e;
         m.checkNotNullExpressionValue(textView2, "binding.chatInputItemName");
         textView2.setText(roleAutocompletable.getRole().f());
@@ -312,7 +314,7 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         m.checkNotNullExpressionValue(constraintLayout2, "binding.root");
         Context context2 = constraintLayout2.getContext();
         m.checkNotNullExpressionValue(context2, "binding.root.context");
-        Drawable drawable = ResourcesCompat.getDrawable(resources, 2131231782, context2.getTheme());
+        Drawable drawable = ResourcesCompat.getDrawable(resources, R.drawable.ic_mentions_white_24dp, context2.getTheme());
         if (drawable != null) {
             this.binding.b.setColorFilter(opaqueColor, PorterDuff.Mode.SRC_ATOP);
             MGImages mGImages = MGImages.INSTANCE;
@@ -345,7 +347,7 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
         simpleDraweeView.setVisibility(0);
         SimpleDraweeView simpleDraweeView2 = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
-        IconUtils.setIcon$default(simpleDraweeView2, user, 2131165297, null, null, userAutocompletable.getGuildMember(), 24, null);
+        IconUtils.setIcon$default(simpleDraweeView2, user, R.dimen.avatar_size_standard, null, null, userAutocompletable.getGuildMember(), 24, null);
         Presence presence = userAutocompletable.getPresence();
         if (presence != null) {
             StatusView statusView = this.binding.g;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter.java
index 191e969534..b6712a5399 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter.java
@@ -12,6 +12,7 @@ import androidx.constraintlayout.widget.Guideline;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.databinding.WidgetChatInputAutocompleteItemBinding;
 import com.discord.databinding.WidgetChatInputCommandApplicationHeaderItemBinding;
@@ -137,7 +138,7 @@ public final class ChatInputAutocompleteAdapter extends RecyclerView.Adapter<Rec
 
     private final void resizeRecyclerToData(List<? extends Autocompletable> list, boolean z2) {
         ViewGroup.LayoutParams layoutParams;
-        int dpToPixels = DimenUtils.dpToPixels(getDataHeightOrMax(list, z2 ? 132 : 176));
+        int dpToPixels = DimenUtils.dpToPixels(getDataHeightOrMax(list, z2 ? MENTION_CONTAINER_MAX_SIZE_WITH_STICKERS : MENTION_CONTAINER_MAX_SIZE));
         RecyclerView recyclerView = this.recyclerView;
         if (!(recyclerView == null || (layoutParams = recyclerView.getLayoutParams()) == null)) {
             layoutParams.height = dpToPixels;
@@ -338,30 +339,30 @@ public final class ChatInputAutocompleteAdapter extends RecyclerView.Adapter<Rec
         m.checkNotNullParameter(viewGroup, "parent");
         LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
         if (i == 0) {
-            View inflate = from.inflate(2131558940, viewGroup, false);
-            int i2 = 2131362500;
-            Barrier barrier = (Barrier) inflate.findViewById(2131362500);
+            View inflate = from.inflate(R.layout.widget_chat_input_autocomplete_item, viewGroup, false);
+            int i2 = R.id.chat_input_icon_barrier;
+            Barrier barrier = (Barrier) inflate.findViewById(R.id.chat_input_icon_barrier);
             if (barrier != null) {
-                i2 = 2131362501;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362501);
+                i2 = R.id.chat_input_item_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.chat_input_item_avatar);
                 if (simpleDraweeView != null) {
-                    i2 = 2131362502;
-                    TextView textView = (TextView) inflate.findViewById(2131362502);
+                    i2 = R.id.chat_input_item_description;
+                    TextView textView = (TextView) inflate.findViewById(R.id.chat_input_item_description);
                     if (textView != null) {
-                        i2 = 2131362503;
-                        View findViewById = inflate.findViewById(2131362503);
+                        i2 = R.id.chat_input_item_divider;
+                        View findViewById = inflate.findViewById(R.id.chat_input_item_divider);
                         if (findViewById != null) {
-                            i2 = 2131362504;
-                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131362504);
+                            i2 = R.id.chat_input_item_emoji;
+                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(R.id.chat_input_item_emoji);
                             if (simpleDraweeSpanTextView != null) {
-                                i2 = 2131362506;
-                                TextView textView2 = (TextView) inflate.findViewById(2131362506);
+                                i2 = R.id.chat_input_item_name;
+                                TextView textView2 = (TextView) inflate.findViewById(R.id.chat_input_item_name);
                                 if (textView2 != null) {
-                                    i2 = 2131362507;
-                                    TextView textView3 = (TextView) inflate.findViewById(2131362507);
+                                    i2 = R.id.chat_input_item_name_right;
+                                    TextView textView3 = (TextView) inflate.findViewById(R.id.chat_input_item_name_right);
                                     if (textView3 != null) {
-                                        i2 = 2131362508;
-                                        StatusView statusView = (StatusView) inflate.findViewById(2131362508);
+                                        i2 = R.id.chat_input_item_status;
+                                        StatusView statusView = (StatusView) inflate.findViewById(R.id.chat_input_item_status);
                                         if (statusView != null) {
                                             WidgetChatInputAutocompleteItemBinding widgetChatInputAutocompleteItemBinding = new WidgetChatInputAutocompleteItemBinding((ConstraintLayout) inflate, barrier, simpleDraweeView, textView, findViewById, simpleDraweeSpanTextView, textView2, textView3, statusView);
                                             m.checkNotNullExpressionValue(widgetChatInputAutocompleteItemBinding, "WidgetChatInputAutocompl…tInflater, parent, false)");
@@ -380,24 +381,24 @@ public final class ChatInputAutocompleteAdapter extends RecyclerView.Adapter<Rec
             m.checkNotNullExpressionValue(a, "WidgetChatInputCommandAp…tInflater, parent, false)");
             return new CommandHeaderViewHolder(a);
         } else if (i == 2) {
-            View inflate2 = from.inflate(2131558947, viewGroup, false);
-            int i3 = 2131361984;
-            View findViewById2 = inflate2.findViewById(2131361984);
+            View inflate2 = from.inflate(R.layout.widget_chat_input_slash_loading_item, viewGroup, false);
+            int i3 = R.id.application_name_placeholder;
+            View findViewById2 = inflate2.findViewById(R.id.application_name_placeholder);
             if (findViewById2 != null) {
-                i3 = 2131361985;
-                Guideline guideline = (Guideline) inflate2.findViewById(2131361985);
+                i3 = R.id.application_name_start_guideline;
+                Guideline guideline = (Guideline) inflate2.findViewById(R.id.application_name_start_guideline);
                 if (guideline != null) {
-                    i3 = 2131362906;
-                    View findViewById3 = inflate2.findViewById(2131362906);
+                    i3 = R.id.description_placeholder;
+                    View findViewById3 = inflate2.findViewById(R.id.description_placeholder);
                     if (findViewById3 != null) {
-                        i3 = 2131362907;
-                        Guideline guideline2 = (Guideline) inflate2.findViewById(2131362907);
+                        i3 = R.id.description_placeholder_end_guideline;
+                        Guideline guideline2 = (Guideline) inflate2.findViewById(R.id.description_placeholder_end_guideline);
                         if (guideline2 != null) {
-                            i3 = 2131364211;
-                            View findViewById4 = inflate2.findViewById(2131364211);
+                            i3 = R.id.name_placeholder;
+                            View findViewById4 = inflate2.findViewById(R.id.name_placeholder);
                             if (findViewById4 != null) {
-                                i3 = 2131364212;
-                                Guideline guideline3 = (Guideline) inflate2.findViewById(2131364212);
+                                i3 = R.id.name_placeholder_end_guideline;
+                                Guideline guideline3 = (Guideline) inflate2.findViewById(R.id.name_placeholder_end_guideline);
                                 if (guideline3 != null) {
                                     WidgetChatInputSlashLoadingItemBinding widgetChatInputSlashLoadingItemBinding = new WidgetChatInputSlashLoadingItemBinding((ConstraintLayout) inflate2, findViewById2, guideline, findViewById3, guideline2, findViewById4, guideline3);
                                     m.checkNotNullExpressionValue(widgetChatInputSlashLoadingItemBinding, "WidgetChatInputSlashLoad…tInflater, parent, false)");
@@ -410,12 +411,12 @@ public final class ChatInputAutocompleteAdapter extends RecyclerView.Adapter<Rec
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i3)));
         } else if (i == 3) {
-            View inflate3 = from.inflate(2131558942, viewGroup, false);
-            int i4 = 2131362494;
-            PileView pileView = (PileView) inflate3.findViewById(2131362494);
+            View inflate3 = from.inflate(R.layout.widget_chat_input_emoji_autocomplete_upsell_item, viewGroup, false);
+            int i4 = R.id.chat_input_emoji_upsell_pile;
+            PileView pileView = (PileView) inflate3.findViewById(R.id.chat_input_emoji_upsell_pile);
             if (pileView != null) {
-                i4 = 2131362495;
-                TextView textView4 = (TextView) inflate3.findViewById(2131362495);
+                i4 = R.id.chat_input_emoji_upsell_text;
+                TextView textView4 = (TextView) inflate3.findViewById(R.id.chat_input_emoji_upsell_text);
                 if (textView4 != null) {
                     WidgetChatInputEmojiAutocompleteUpsellItemBinding widgetChatInputEmojiAutocompleteUpsellItemBinding = new WidgetChatInputEmojiAutocompleteUpsellItemBinding((LinearLayout) inflate3, pileView, textView4);
                     m.checkNotNullExpressionValue(widgetChatInputEmojiAutocompleteUpsellItemBinding, "WidgetChatInputEmojiAuto…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$2.java
index 5383ff4570..b18299faf2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input.autocomplete.adapter;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
+import com.discord.R;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
@@ -35,7 +36,7 @@ public final class CommandHeaderViewHolder$bind$2 extends o implements Function1
         m.checkNotNullExpressionValue(imageView, "binding.chatInputApplicationAvatar");
         Context context = imageView.getContext();
         m.checkNotNullExpressionValue(context, "binding.chatInputApplicationAvatar.context");
-        Drawable drawable$default = DrawableCompat.getDrawable$default(context, 2131231985, this.$tint, false, 4, null);
+        Drawable drawable$default = DrawableCompat.getDrawable$default(context, R.drawable.ic_slash_command_24dp, this.$tint, false, 4, null);
         if (drawable$default != null) {
             CommandHeaderViewHolder.access$getBinding$p(this.this$0).b.setImageDrawable(drawable$default);
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
index 64cf7ce518..7dc20f41f5 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.databinding.WidgetChatInputCommandApplicationHeaderItemBinding;
 import com.discord.utilities.color.ColorCompat;
@@ -54,7 +55,7 @@ public final class CommandHeaderViewHolder extends RecyclerView.ViewHolder imple
             textView.setText(str);
             ImageView imageView = this.binding.b;
             m.checkNotNullExpressionValue(imageView, "binding.chatInputApplicationAvatar");
-            int themedColor = ColorCompat.getThemedColor(imageView, 2130968989);
+            int themedColor = ColorCompat.getThemedColor(imageView, (int) R.attr.colorTextMuted);
             if (applicationPlaceholder.getApplication().getIconRes() != null) {
                 ImageView imageView2 = this.binding.b;
                 m.checkNotNullExpressionValue(imageView2, "binding.chatInputApplicationAvatar");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
index c34b4b220e..da5a3fe9f1 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetChatInputEmojiAutocompleteUpsellItemBinding;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.widgets.chat.input.autocomplete.Autocompletable;
@@ -45,9 +46,9 @@ public final class EmojiAutocompleteUpsellViewHolder extends RecyclerView.ViewHo
         LinearLayout linearLayout = this.binding.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.root");
         Resources resources = linearLayout.getResources();
-        String string = resources.getString(2131886794);
+        String string = resources.getString(R.string.autocomplete_emoji_upsell);
         m.checkNotNullExpressionValue(string, "resources.getString(R.st…utocomplete_emoji_upsell)");
-        String quantityString = resources.getQuantityString(2131755031, lockedTotal);
+        String quantityString = resources.getQuantityString(R.plurals.autocomplete_emoji_upsell_count, lockedTotal);
         m.checkNotNullExpressionValue(quantityString, "resources.getQuantityStr…moji_upsell_count, count)");
         TextView textView = this.binding.f1738c;
         m.checkNotNullExpressionValue(textView, "binding.chatInputEmojiUpsellText");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java
index 5ec9743e25..4525c94f43 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input.autocomplete.commands;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.discord.api.commands.ApplicationCommandType;
 import com.discord.api.commands.CommandChoice;
@@ -10,6 +11,7 @@ import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.commands.ApplicationCommandKt;
 import com.discord.models.commands.ApplicationCommandOption;
 import com.discord.stores.StoreApplicationCommandsKt;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import com.discord.widgets.chat.input.autocomplete.AutocompleteModelUtils;
@@ -180,7 +182,7 @@ public final class AutocompleteCommandUtils {
         String str = "";
         StringBuilder K = a.K((w.endsWith$default(charSequence, ' ', false, 2, null) || num != null) ? str : " ");
         K.append(applicationCommandOption.getName());
-        K.append(':');
+        K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         String sb = K.toString();
         int ordinal = applicationCommandOption.getType().ordinal();
         if (ordinal != 5) {
@@ -204,7 +206,7 @@ public final class AutocompleteCommandUtils {
         m.checkNotNullParameter(verifiedCommandInputModel, "model");
         ApplicationCommand selectedCommand = verifiedCommandInputModel.getInputCommandContext().getSelectedCommand();
         if (selectedCommand != null && selectedCommand.getOptions().size() == 1) {
-            StringBuilder H = a.H('/');
+            StringBuilder H = a.H(MentionUtilsKt.SLASH_CHAR);
             H.append(selectedCommand.getName());
             H.append(' ');
             String sb = H.toString();
@@ -237,7 +239,7 @@ public final class AutocompleteCommandUtils {
         IntRange range;
         m.checkNotNullParameter(charSequence, "$this$findStartOfParam");
         m.checkNotNullParameter(str, "paramName");
-        MatchResult find$default = Regex.find$default(new Regex("[\\s|\\n]" + str + ':'), charSequence, 0, 2, null);
+        MatchResult find$default = Regex.find$default(new Regex("[\\s|\\n]" + str + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR), charSequence, 0, 2, null);
         int first = (find$default == null || (range = find$default.getRange()) == null) ? -1 : range.getFirst();
         if (first == -1) {
             return null;
@@ -553,7 +555,7 @@ public final class AutocompleteCommandUtils {
             ApplicationCommand applicationCommand = (ApplicationCommand) next;
             StringBuilder sb = new StringBuilder();
             String name = applicationCommand.getName();
-            sb.append(String.valueOf('/') + name);
+            sb.append(String.valueOf((char) MentionUtilsKt.SLASH_CHAR) + name);
             sb.append(' ');
             if (!t.startsWith$default(str2, sb.toString(), false, 2, null) || !ApplicationCommandKt.hasPermission(applicationCommand, j, list2)) {
                 z2 = false;
@@ -724,9 +726,9 @@ public final class AutocompleteCommandUtils {
     }
 
     public final Long toSnowflake(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         Long longOrNull = s.toLongOrNull(str);
-        if (longOrNull == null || longOrNull.longValue() <= 1420070400000L) {
+        if (longOrNull == null || longOrNull.longValue() <= SnowflakeUtils.DISCORD_EPOCH) {
             return null;
         }
         return longOrNull;
@@ -736,13 +738,13 @@ public final class AutocompleteCommandUtils {
         if (str == null) {
             return null;
         }
-        if (w.endsWith$default((CharSequence) w.trim(str).toString(), ':', false, 2, (Object) null)) {
+        if (w.endsWith$default((CharSequence) w.trim(str).toString(), (char) MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, false, 2, (Object) null)) {
             return w.trim(str).toString();
         }
-        if (!w.contains$default((CharSequence) str, ':', false, 2, (Object) null)) {
+        if (!w.contains$default((CharSequence) str, (char) MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, false, 2, (Object) null)) {
             return str;
         }
-        List split$default = w.split$default((CharSequence) str, new char[]{':'}, false, 0, 6, (Object) null);
+        List split$default = w.split$default((CharSequence) str, new char[]{MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR}, false, 0, 6, (Object) null);
         StringBuilder sb = new StringBuilder();
         String str2 = (String) split$default.get(0);
         Objects.requireNonNull(str2, "null cannot be cast to non-null type kotlin.CharSequence");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource$observeChannelAutocompletables$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource$observeChannelAutocompletables$1.java
index ed8ce4e62a..aa0b700714 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource$observeChannelAutocompletables$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource$observeChannelAutocompletables$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input.autocomplete.sources;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import com.discord.widgets.chat.input.autocomplete.AutocompletableComparator;
@@ -31,7 +32,7 @@ public final class ChannelAutocompletableSource$observeChannelAutocompletables$1
         m.checkNotNullExpressionValue(map, "guildChannels");
         for (Channel channel : h0.plus(map2, map).values()) {
             if (AnimatableValueParser.l1(channel) || AnimatableValueParser.C1(channel) || AnimatableValueParser.f1(channel)) {
-                m.checkNotNullExpressionValue(map3, "permissions");
+                m.checkNotNullExpressionValue(map3, ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS);
                 if (PermissionUtils.hasAccess(channel, map3)) {
                     treeSet.add(new ChannelAutocompletable(channel));
                 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$createAutocompletablesForUsers$mentions$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$createAutocompletablesForUsers$mentions$1.java
index 6670d44314..0bb1a15916 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$createAutocompletablesForUsers$mentions$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$createAutocompletablesForUsers$mentions$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.autocomplete.sources;
 
+import c.a.r.n0.c.e;
 import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import com.discord.widgets.chat.input.autocomplete.UserAutocompletable;
 import d0.z.d.m;
@@ -16,7 +17,7 @@ public final class UserAutocompletableSource$createAutocompletablesForUsers$ment
     }
 
     public final int invoke(Autocompletable autocompletable) {
-        m.checkNotNullParameter(autocompletable, "e");
+        m.checkNotNullParameter(autocompletable, e.a);
         if (autocompletable instanceof UserAutocompletable) {
             return (int) ((((UserAutocompletable) autocompletable).getUser().getId() >> 22) % ((long) this.$numPartitions));
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
index 0f8adf55a8..40747e7888 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
@@ -4,6 +4,7 @@ import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelRecipientNick;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.member.GuildMember;
 import com.discord.models.presence.Presence;
@@ -113,11 +114,11 @@ public final class UserAutocompletableSource {
         } else {
             collection = new ArrayList(map2.size());
         }
-        boolean canEveryone = PermissionUtils.canEveryone(1024, channel, channel2, map);
+        boolean canEveryone = PermissionUtils.canEveryone(Permission.VIEW_CHANNEL, channel, channel2, map);
         for (Map.Entry<Long, GuildMember> entry : map2.entrySet()) {
             long longValue = entry.getKey().longValue();
             GuildMember value = entry.getValue();
-            if (canEveryone || (can = PermissionUtils.can(1024, Long.valueOf(PermissionUtils.computePermissions(longValue, channel, channel2, j2, value, map, null, true))))) {
+            if (canEveryone || (can = PermissionUtils.can(Permission.VIEW_CHANNEL, Long.valueOf(PermissionUtils.computePermissions(longValue, channel, channel2, j2, value, map, null, true))))) {
                 User user = (User) map3.get(Long.valueOf(longValue));
                 if (user != null) {
                     collection.add(new UserAutocompletable(user, value, value.getNick(), map4.get(Long.valueOf(longValue)), false, 16, null));
@@ -130,7 +131,7 @@ public final class UserAutocompletableSource {
             }
         }
         if (map2.get(Long.valueOf(j)) != null) {
-            z2 = PermissionUtils.can(131072, l);
+            z2 = PermissionUtils.can(Permission.MENTION_EVERYONE, l);
             if (z2) {
                 GlobalRoleAutocompletable.Companion companion = GlobalRoleAutocompletable.Companion;
                 collection.add(companion.getHere());
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java
index a1591a88ce..cc517cb712 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java
@@ -7,6 +7,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.databinding.EmojiCategoryItemGuildBinding;
 import com.discord.databinding.EmojiCategoryItemStandardBinding;
@@ -102,33 +103,33 @@ public final class EmojiCategoryAdapter extends RecyclerView.Adapter<EmojiCatego
     public EmojiCategoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
-        int i2 = 2131364350;
+        int i2 = R.id.overline;
         if (i == 0) {
-            View inflate = from.inflate(2131558485, viewGroup, false);
-            ImageView imageView = (ImageView) inflate.findViewById(2131363094);
+            View inflate = from.inflate(R.layout.emoji_category_item_standard, viewGroup, false);
+            ImageView imageView = (ImageView) inflate.findViewById(R.id.emoji_category_item_standard_icon);
             if (imageView != null) {
-                View findViewById = inflate.findViewById(2131364350);
+                View findViewById = inflate.findViewById(R.id.overline);
                 if (findViewById != null) {
                     EmojiCategoryItemStandardBinding emojiCategoryItemStandardBinding = new EmojiCategoryItemStandardBinding((FrameLayout) inflate, imageView, new c.a.j.n(findViewById, findViewById));
                     m.checkNotNullExpressionValue(emojiCategoryItemStandardBinding, "EmojiCategoryItemStandar…(inflater, parent, false)");
                     return new EmojiCategoryViewHolder.Standard(emojiCategoryItemStandardBinding);
                 }
             } else {
-                i2 = 2131363094;
+                i2 = R.id.emoji_category_item_standard_icon;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
         } else if (i == 1) {
-            View inflate2 = from.inflate(2131558484, viewGroup, false);
-            GuildIcon guildIcon = (GuildIcon) inflate2.findViewById(2131363093);
+            View inflate2 = from.inflate(R.layout.emoji_category_item_guild, viewGroup, false);
+            GuildIcon guildIcon = (GuildIcon) inflate2.findViewById(R.id.emoji_category_item_guild_icon);
             if (guildIcon != null) {
-                View findViewById2 = inflate2.findViewById(2131364350);
+                View findViewById2 = inflate2.findViewById(R.id.overline);
                 if (findViewById2 != null) {
                     EmojiCategoryItemGuildBinding emojiCategoryItemGuildBinding = new EmojiCategoryItemGuildBinding((FrameLayout) inflate2, guildIcon, new c.a.j.n(findViewById2, findViewById2));
                     m.checkNotNullExpressionValue(emojiCategoryItemGuildBinding, "EmojiCategoryItemGuildBi…(inflater, parent, false)");
                     return new EmojiCategoryViewHolder.Guild(emojiCategoryItemGuildBinding);
                 }
             } else {
-                i2 = 2131363093;
+                i2 = R.id.emoji_category_item_guild_icon;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i2)));
         } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java
index b93a59c3f0..83f98de2f3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import androidx.annotation.DrawableRes;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.EmojiCategoryItemGuildBinding;
 import com.discord.databinding.EmojiCategoryItemStandardBinding;
 import com.discord.models.domain.emoji.EmojiCategory;
@@ -56,28 +57,28 @@ public abstract class EmojiCategoryViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullParameter(emojiCategory, "emojiCategory");
             switch (emojiCategory.ordinal()) {
                 case 0:
-                    return 2131231618;
+                    return R.drawable.ic_emoji_picker_category_favorites_star;
                 case 1:
-                    return 2131231624;
+                    return R.drawable.ic_emoji_picker_category_recent;
                 case 2:
                 default:
-                    return 2131231617;
+                    return R.drawable.ic_emoji_picker_category_custom;
                 case 3:
-                    return 2131231623;
+                    return R.drawable.ic_emoji_picker_category_people;
                 case 4:
-                    return 2131231621;
+                    return R.drawable.ic_emoji_picker_category_nature;
                 case 5:
-                    return 2131231620;
+                    return R.drawable.ic_emoji_picker_category_food;
                 case 6:
-                    return 2131231616;
+                    return R.drawable.ic_emoji_picker_category_activity;
                 case 7:
-                    return 2131231626;
+                    return R.drawable.ic_emoji_picker_category_travel;
                 case 8:
-                    return 2131231622;
+                    return R.drawable.ic_emoji_picker_category_objects;
                 case 9:
-                    return 2131231625;
+                    return R.drawable.ic_emoji_picker_category_symbols;
                 case 10:
-                    return 2131231619;
+                    return R.drawable.ic_emoji_picker_category_flags;
             }
         }
     }
@@ -142,11 +143,11 @@ public abstract class EmojiCategoryViewHolder extends RecyclerView.ViewHolder {
             if (isSelected) {
                 ImageView imageView3 = this.binding.b;
                 m.checkNotNullExpressionValue(imageView3, "binding.emojiCategoryItemStandardIcon");
-                i = ColorCompat.getThemedColor(imageView3, 2130968946);
+                i = ColorCompat.getThemedColor(imageView3, (int) R.attr.colorInteractiveActive);
             } else {
                 ImageView imageView4 = this.binding.b;
                 m.checkNotNullExpressionValue(imageView4, "binding.emojiCategoryItemStandardIcon");
-                i = ColorCompat.getThemedColor(imageView4, 2130968949);
+                i = ColorCompat.getThemedColor(imageView4, (int) R.attr.colorInteractiveNormal);
             }
             ImageView imageView5 = this.binding.b;
             m.checkNotNullExpressionValue(imageView5, "binding.emojiCategoryItemStandardIcon");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$buildEmojiListItems$items$2.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$buildEmojiListItems$items$2.java
index 6e213ceccd..9f64aa05b3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$buildEmojiListItems$items$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$buildEmojiListItems$items$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.emoji;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.models.domain.emoji.ModelEmojiCustom;
 import com.discord.models.guild.Guild;
@@ -41,7 +42,7 @@ public final class EmojiPickerViewModel$Companion$buildEmojiListItems$items$2 ex
             }
             obj = it.next();
             String str2 = (String) obj;
-            m.checkNotNullExpressionValue(str2, "name");
+            m.checkNotNullExpressionValue(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
             Locale locale = Locale.getDefault();
             m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
             Objects.requireNonNull(str2, "null cannot be cast to non-null type java.lang.String");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
index d20886fb89..ab7ff48a32 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.models.domain.emoji.EmojiCategory;
@@ -1151,7 +1152,7 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
                 linkedHashMap = linkedHashMap2;
             }
             if (z2 && (!linkedHashSet2.isEmpty())) {
-                linkedHashSet.add(new WidgetEmojiAdapter.HeaderItem.StringHeaderItem(2131888302));
+                linkedHashSet.add(new WidgetEmojiAdapter.HeaderItem.StringHeaderItem(R.string.emoji_available_with_premium));
                 linkedHashSet.addAll(linkedHashSet2);
                 linkedHashSet.add(WidgetEmojiAdapter.UpsellItem.INSTANCE);
             }
@@ -1240,7 +1241,7 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
             if ((emoji instanceof ModelEmojiCustom) && ((ModelEmojiCustom) emoji).isAnimated()) {
                 z2 = true;
             }
-            this.eventSubject.j.onNext(new Event.ShowPremiumUpsellDialog(z2 ? 2 : 1, z2 ? 2131892703 : 2131892711, z2 ? 2131892704 : 2131892712, "Emoji Picker Popout", false, false));
+            this.eventSubject.j.onNext(new Event.ShowPremiumUpsellDialog(z2 ? 2 : 1, z2 ? R.string.premium_upsell_animated_emojis_active_mobile : R.string.premium_upsell_emoji_active_mobile, z2 ? R.string.premium_upsell_animated_emojis_description_mobile : R.string.premium_upsell_emoji_description_mobile, Traits.Location.Section.EMOJI_PICKER_POPOUT, false, false));
             this.storeAnalytics.emojiPickerUpsellLockedItemClicked(this.emojiPickerContextType, z2);
         } else if (emoji.isAvailable()) {
             function1.invoke(emoji);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java
index 068c849b09..d432568ded 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java
@@ -6,11 +6,13 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.EmojiPickerEmojiItemBinding;
 import com.discord.databinding.EmojiPickerPremiumUpsellBinding;
 import com.discord.databinding.ExpressionPickerHeaderItemBinding;
@@ -219,7 +221,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public EmojiViewHolder(WidgetEmojiAdapter widgetEmojiAdapter) {
-            super(2131558486, widgetEmojiAdapter);
+            super((int) R.layout.emoji_picker_emoji_item, widgetEmojiAdapter);
             m.checkNotNullParameter(widgetEmojiAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -289,7 +291,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public GuildHeaderItem(String str, String str2) {
                 super(null);
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 m.checkNotNullParameter(str2, "key");
                 this.text = str;
                 this.key = str2;
@@ -314,7 +316,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
             }
 
             public final GuildHeaderItem copy(String str, String str2) {
-                m.checkNotNullParameter(str, "text");
+                m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 m.checkNotNullParameter(str2, "key");
                 return new GuildHeaderItem(str, str2);
             }
@@ -527,27 +529,27 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
                 m.checkNotNullParameter(emojiCategory, "emojiCategory");
                 switch (emojiCategory.ordinal()) {
                     case 0:
-                        return 2131888305;
+                        return R.string.emoji_category_favorites;
                     case 1:
-                        return 2131888312;
+                        return R.string.emoji_category_recent;
                     case 2:
-                        return 2131888304;
+                        return R.string.emoji_category_custom;
                     case 3:
-                        return 2131888310;
+                        return R.string.emoji_category_people;
                     case 4:
-                        return 2131888308;
+                        return R.string.emoji_category_nature;
                     case 5:
-                        return 2131888307;
+                        return R.string.emoji_category_food;
                     case 6:
-                        return 2131888303;
+                        return R.string.emoji_category_activity;
                     case 7:
-                        return 2131888314;
+                        return R.string.emoji_category_travel;
                     case 8:
-                        return 2131888309;
+                        return R.string.emoji_category_objects;
                     case 9:
-                        return 2131888313;
+                        return R.string.emoji_category_symbols;
                     case 10:
-                        return 2131888306;
+                        return R.string.emoji_category_flags;
                     default:
                         throw new NoWhenBranchMatchedException();
                 }
@@ -556,7 +558,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(WidgetEmojiAdapter widgetEmojiAdapter) {
-            super(2131558504, widgetEmojiAdapter);
+            super((int) R.layout.expression_picker_header_item, widgetEmojiAdapter);
             m.checkNotNullParameter(widgetEmojiAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -646,10 +648,10 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PremiumEmojiUpsellViewHolder(WidgetEmojiAdapter widgetEmojiAdapter) {
-            super(2131558487, widgetEmojiAdapter);
+            super((int) R.layout.emoji_picker_premium_upsell, widgetEmojiAdapter);
             m.checkNotNullParameter(widgetEmojiAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363091);
+            TextView textView = (TextView) view.findViewById(R.id.emojiPickerPremiumCta);
             if (textView != null) {
                 EmojiPickerPremiumUpsellBinding emojiPickerPremiumUpsellBinding = new EmojiPickerPremiumUpsellBinding((LinearLayout) view, textView);
                 m.checkNotNullExpressionValue(emojiPickerPremiumUpsellBinding, "EmojiPickerPremiumUpsellBinding.bind(itemView)");
@@ -657,7 +659,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
                 textView.setOnClickListener(new AnonymousClass1(widgetEmojiAdapter));
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363091)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.emojiPickerPremiumCta)));
         }
     }
 
@@ -701,10 +703,10 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
         this.hideKeyboard = function02;
         Context context = recyclerView.getContext();
         m.checkNotNullExpressionValue(context, "recycler.context");
-        this.emojiSizePx = context.getResources().getDimensionPixelSize(2131165316);
+        this.emojiSizePx = context.getResources().getDimensionPixelSize(R.dimen.chat_input_emoji_size);
         Context context2 = recyclerView.getContext();
         m.checkNotNullExpressionValue(context2, "recycler.context");
-        this.numColumns = WidgetExpressionPickerAdapter.Companion.calculateNumOfColumns(recyclerView, context2.getResources().getDimension(2131165316), 8);
+        this.numColumns = WidgetExpressionPickerAdapter.Companion.calculateNumOfColumns(recyclerView, context2.getResources().getDimension(R.dimen.chat_input_emoji_size), 8);
         this.layoutManager = new GridLayoutManager(recyclerView.getContext(), getNumColumns());
         getLayoutManager().setSpanSizeLookup(new AnonymousClass1(this));
         recyclerView.setLayoutManager(getLayoutManager());
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java
index e6e72ee1fb..6b282e2e10 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java
@@ -9,6 +9,7 @@ import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetEmojiPickerBinding;
 import com.google.android.material.appbar.AppBarLayout;
@@ -26,48 +27,48 @@ public final /* synthetic */ class WidgetEmojiPicker$binding$2 extends k impleme
 
     public final WidgetEmojiPickerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362492;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362492);
+        int i = R.id.chat_input_emoji_picker_recycler;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.chat_input_emoji_picker_recycler);
         if (recyclerView != null) {
-            i = 2131362493;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362493);
+            i = R.id.chat_input_emoji_picker_view_flipper;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.chat_input_emoji_picker_view_flipper);
             if (appViewFlipper != null) {
-                i = 2131363092;
-                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363092);
+                i = R.id.emoji_app_bar;
+                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.emoji_app_bar);
                 if (appBarLayout != null) {
-                    i = 2131363096;
-                    TextView textView = (TextView) view.findViewById(2131363096);
+                    i = R.id.emoji_inline_search_button;
+                    TextView textView = (TextView) view.findViewById(R.id.emoji_inline_search_button);
                     if (textView != null) {
-                        i = 2131363099;
-                        ImageView imageView = (ImageView) view.findViewById(2131363099);
+                        i = R.id.emoji_picker_backspace_icon;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.emoji_picker_backspace_icon);
                         if (imageView != null) {
-                            i = 2131363100;
-                            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363100);
+                            i = R.id.emoji_picker_bottom_bar;
+                            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.emoji_picker_bottom_bar);
                             if (constraintLayout != null) {
-                                i = 2131363101;
-                                View findViewById = view.findViewById(2131363101);
+                                i = R.id.emoji_picker_bottom_bar_divider;
+                                View findViewById = view.findViewById(R.id.emoji_picker_bottom_bar_divider);
                                 if (findViewById != null) {
-                                    i = 2131363102;
-                                    Barrier barrier = (Barrier) view.findViewById(2131363102);
+                                    i = R.id.emoji_picker_category_barrier;
+                                    Barrier barrier = (Barrier) view.findViewById(R.id.emoji_picker_category_barrier);
                                     if (barrier != null) {
-                                        i = 2131363103;
-                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363103);
+                                        i = R.id.emoji_picker_category_recycler;
+                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.emoji_picker_category_recycler);
                                         if (recyclerView2 != null) {
                                             CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
-                                            i = 2131363105;
-                                            ImageView imageView2 = (ImageView) view.findViewById(2131363105);
+                                            i = R.id.emoji_picker_unicode_emoji_shortcut_button;
+                                            ImageView imageView2 = (ImageView) view.findViewById(R.id.emoji_picker_unicode_emoji_shortcut_button);
                                             if (imageView2 != null) {
-                                                i = 2131363106;
-                                                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363106);
+                                                i = R.id.emoji_search_bar;
+                                                FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.emoji_search_bar);
                                                 if (frameLayout != null) {
-                                                    i = 2131363107;
-                                                    ImageView imageView3 = (ImageView) view.findViewById(2131363107);
+                                                    i = R.id.emoji_search_clear;
+                                                    ImageView imageView3 = (ImageView) view.findViewById(R.id.emoji_search_clear);
                                                     if (imageView3 != null) {
-                                                        i = 2131363108;
-                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363108);
+                                                        i = R.id.emoji_search_input;
+                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.emoji_search_input);
                                                         if (textInputEditText != null) {
-                                                            i = 2131363112;
-                                                            Toolbar toolbar = (Toolbar) view.findViewById(2131363112);
+                                                            i = R.id.emoji_toolbar;
+                                                            Toolbar toolbar = (Toolbar) view.findViewById(R.id.emoji_toolbar);
                                                             if (toolbar != null) {
                                                                 return new WidgetEmojiPickerBinding(coordinatorLayout, recyclerView, appViewFlipper, appBarLayout, textView, imageView, constraintLayout, findViewById, barrier, recyclerView2, coordinatorLayout, imageView2, frameLayout, imageView3, textInputEditText, toolbar);
                                                             }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.java
index 161bbb880a..0a621df370 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.emoji;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.chat.input.emoji.EmojiPickerViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetEmojiPicker$onViewBoundOrOnResume$2 extends o implement
     }
 
     public final void invoke(EmojiPickerViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetEmojiPicker.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
index 4d60ea7bd8..30b4daa2b5 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
@@ -22,6 +22,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.a.e.b;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetEmojiPickerBinding;
@@ -95,7 +96,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
     }
 
     public WidgetEmojiPicker() {
-        super(2131559032);
+        super(R.layout.widget_emoji_picker);
     }
 
     public static final /* synthetic */ void access$checkUpsellHeaderVisibility(WidgetEmojiPicker widgetEmojiPicker, RecyclerView recyclerView) {
@@ -226,7 +227,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
                         stringHeaderItem = boundItem;
                     }
                     WidgetEmojiAdapter.HeaderItem.StringHeaderItem stringHeaderItem2 = stringHeaderItem;
-                    if (stringHeaderItem2 != null && stringHeaderItem2.getStringRes() == 2131888302) {
+                    if (stringHeaderItem2 != null && stringHeaderItem2.getStringRes() == R.string.emoji_available_with_premium) {
                         getViewModel().onUpsellHeaderVisible();
                     }
                 }
@@ -350,7 +351,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
 
     private final EmojiPickerContextType getEmojiPickerContextType() {
         Bundle arguments = getArguments();
-        Serializable serializable = arguments != null ? arguments.getSerializable("EMOJI_PICKER_CONTEXT_TYPE") : null;
+        Serializable serializable = arguments != null ? arguments.getSerializable(EmojiPickerNavigator.ARG_EMOJI_PICKER_CONTEXT_TYPE) : null;
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.widgets.chat.input.emoji.EmojiPickerContextType");
         return (EmojiPickerContextType) serializable;
     }
@@ -403,14 +404,14 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
     private final void handleInputChanged(String str) {
         getViewModel().setSearchText(str);
         boolean z2 = str.length() == 0;
-        getBinding().l.setImageResource(z2 ? 2131231955 : 2131231558);
+        getBinding().l.setImageResource(z2 ? R.drawable.ic_search_16dp : R.drawable.ic_clear_white_24dp);
         ImageView imageView = getBinding().l;
         m.checkNotNullExpressionValue(imageView, "binding.emojiSearchClear");
-        imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968989)) : ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968990)));
+        imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorTextMuted)) : ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorTextNormal)));
         if (z2) {
             ImageView imageView2 = getBinding().l;
             m.checkNotNullExpressionValue(imageView2, "binding.emojiSearchClear");
-            imageView2.setContentDescription(c.a.l.b.k(this, 2131893459, new Object[0], null, 4));
+            imageView2.setContentDescription(c.a.l.b.k(this, R.string.search_emojis, new Object[0], null, 4));
             ImageView imageView3 = getBinding().l;
             m.checkNotNullExpressionValue(imageView3, "binding.emojiSearchClear");
             imageView3.setImportantForAccessibility(2);
@@ -418,7 +419,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
         }
         ImageView imageView4 = getBinding().l;
         m.checkNotNullExpressionValue(imageView4, "binding.emojiSearchClear");
-        imageView4.setContentDescription(c.a.l.b.k(this, 2131893022, new Object[0], null, 4));
+        imageView4.setContentDescription(c.a.l.b.k(this, R.string.reset, new Object[0], null, 4));
         ImageView imageView5 = getBinding().l;
         m.checkNotNullExpressionValue(imageView5, "binding.emojiSearchClear");
         imageView5.setImportantForAccessibility(1);
@@ -555,7 +556,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
         Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams");
         ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) layoutParams;
         if (z2) {
-            i2 = getResources().getDimensionPixelSize(2131165434);
+            i2 = getResources().getDimensionPixelSize(R.dimen.expression_picker_category_bar_height);
         }
         marginLayoutParams.setMargins(marginLayoutParams.leftMargin, marginLayoutParams.topMargin, marginLayoutParams.rightMargin, i2);
         recyclerView.setLayoutParams(marginLayoutParams);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java
index a415fe652f..f19ad2380d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import com.discord.R;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.widgets.chat.input.expression.WidgetExpressionPickerSheet;
 import d0.z.d.m;
@@ -44,7 +45,7 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im
             m.checkNotNullParameter(emojiPickerContextType, "emojiPickerContextType");
             WidgetEmojiPickerSheet widgetEmojiPickerSheet = new WidgetEmojiPickerSheet();
             Bundle bundle = new Bundle();
-            bundle.putSerializable("EMOJI_PICKER_CONTEXT_TYPE", emojiPickerContextType);
+            bundle.putSerializable(EmojiPickerNavigator.ARG_EMOJI_PICKER_CONTEXT_TYPE, emojiPickerContextType);
             widgetEmojiPickerSheet.setArguments(bundle);
             widgetEmojiPickerSheet.setEmojiPickerListener(emojiPickerListener);
             widgetEmojiPickerSheet.setOnCancel(function0);
@@ -74,7 +75,7 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559033;
+        return R.layout.widget_emoji_picker_sheet;
     }
 
     @Override // com.discord.widgets.chat.input.expression.WidgetExpressionPickerSheet, androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener
@@ -108,9 +109,9 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im
         Bundle bundle2 = new Bundle();
         bundle2.putSerializable("MODE", EmojiPickerMode.BOTTOM_SHEET);
         Bundle arguments = getArguments();
-        Serializable serializable = arguments != null ? arguments.getSerializable("EMOJI_PICKER_CONTEXT_TYPE") : null;
+        Serializable serializable = arguments != null ? arguments.getSerializable(EmojiPickerNavigator.ARG_EMOJI_PICKER_CONTEXT_TYPE) : null;
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.widgets.chat.input.emoji.EmojiPickerContextType");
-        bundle2.putSerializable("EMOJI_PICKER_CONTEXT_TYPE", (EmojiPickerContextType) serializable);
+        bundle2.putSerializable(EmojiPickerNavigator.ARG_EMOJI_PICKER_CONTEXT_TYPE, (EmojiPickerContextType) serializable);
         widgetEmojiPicker.setArguments(bundle2);
         WidgetEmojiPicker widgetEmojiPicker2 = this.emojiPickerFragment;
         if (widgetEmojiPicker2 == null) {
@@ -126,7 +127,7 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im
         if (widgetEmojiPicker4 == null) {
             m.throwUninitializedPropertyAccessException("emojiPickerFragment");
         }
-        beginTransaction.replace(2131363109, widgetEmojiPicker3, widgetEmojiPicker4.getClass().getSimpleName()).runOnCommit(new WidgetEmojiPickerSheet$onViewCreated$2(this)).commit();
+        beginTransaction.replace(R.id.emoji_sheet_emoji_picker_content, widgetEmojiPicker3, widgetEmojiPicker4.getClass().getSimpleName()).runOnCommit(new WidgetEmojiPickerSheet$onViewCreated$2(this)).commit();
     }
 
     public final void setEmojiPickerListener(EmojiPickerListener emojiPickerListener) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java
index 03d00ff81a..3c0f3c632d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.fragment.app.FragmentContainerView;
+import com.discord.R;
 import com.discord.databinding.WidgetExpressionTrayBinding;
 import com.discord.utilities.view.rounded.RoundedRelativeLayout;
 import com.discord.utilities.views.ContentResizingCoordinatorLayout;
@@ -26,50 +27,50 @@ public final /* synthetic */ class WidgetExpressionTray$binding$2 extends k impl
     public final WidgetExpressionTrayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         FrameLayout frameLayout = (FrameLayout) view;
-        int i = 2131363222;
-        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363222);
+        int i = R.id.expression_tray_content_container;
+        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.expression_tray_content_container);
         if (frameLayout2 != null) {
-            i = 2131363223;
-            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131363223);
+            i = R.id.expression_tray_detail_page;
+            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.expression_tray_detail_page);
             if (fragmentContainerView != null) {
-                i = 2131363224;
-                CardSegment cardSegment = (CardSegment) view.findViewById(2131363224);
+                i = R.id.expression_tray_emoji_card;
+                CardSegment cardSegment = (CardSegment) view.findViewById(R.id.expression_tray_emoji_card);
                 if (cardSegment != null) {
-                    i = 2131363225;
-                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131363225);
+                    i = R.id.expression_tray_emoji_picker_content;
+                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(R.id.expression_tray_emoji_picker_content);
                     if (fragmentContainerView2 != null) {
-                        i = 2131363226;
-                        CardSegment cardSegment2 = (CardSegment) view.findViewById(2131363226);
+                        i = R.id.expression_tray_gif_card;
+                        CardSegment cardSegment2 = (CardSegment) view.findViewById(R.id.expression_tray_gif_card);
                         if (cardSegment2 != null) {
-                            i = 2131363227;
-                            FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131363227);
+                            i = R.id.expression_tray_gif_picker_content;
+                            FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(R.id.expression_tray_gif_picker_content);
                             if (fragmentContainerView3 != null) {
-                                i = 2131363228;
-                                ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view.findViewById(2131363228);
+                                i = R.id.expression_tray_landing_page;
+                                ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view.findViewById(R.id.expression_tray_landing_page);
                                 if (contentResizingCoordinatorLayout != null) {
-                                    i = 2131363229;
-                                    RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view.findViewById(2131363229);
+                                    i = R.id.expression_tray_search_bar;
+                                    RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view.findViewById(R.id.expression_tray_search_bar);
                                     if (roundedRelativeLayout != null) {
-                                        i = 2131363230;
-                                        TextView textView = (TextView) view.findViewById(2131363230);
+                                        i = R.id.expression_tray_search_button;
+                                        TextView textView = (TextView) view.findViewById(R.id.expression_tray_search_button);
                                         if (textView != null) {
-                                            i = 2131363231;
-                                            ImageView imageView = (ImageView) view.findViewById(2131363231);
+                                            i = R.id.expression_tray_search_icon;
+                                            ImageView imageView = (ImageView) view.findViewById(R.id.expression_tray_search_icon);
                                             if (imageView != null) {
-                                                i = 2131363232;
-                                                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131363232);
+                                                i = R.id.expression_tray_segmented_control;
+                                                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(R.id.expression_tray_segmented_control);
                                                 if (segmentedControlContainer != null) {
-                                                    i = 2131363233;
-                                                    CardSegment cardSegment3 = (CardSegment) view.findViewById(2131363233);
+                                                    i = R.id.expression_tray_sticker_card;
+                                                    CardSegment cardSegment3 = (CardSegment) view.findViewById(R.id.expression_tray_sticker_card);
                                                     if (cardSegment3 != null) {
-                                                        i = 2131363234;
-                                                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131363234);
+                                                        i = R.id.expression_tray_sticker_picker_content;
+                                                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(R.id.expression_tray_sticker_picker_content);
                                                         if (fragmentContainerView4 != null) {
-                                                            i = 2131363235;
-                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131363235);
+                                                            i = R.id.expression_tray_toolbar;
+                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(R.id.expression_tray_toolbar);
                                                             if (collapsingToolbarLayout != null) {
-                                                                i = 2131363236;
-                                                                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363236);
+                                                                i = R.id.expression_tray_toolbar_layout;
+                                                                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.expression_tray_toolbar_layout);
                                                                 if (appBarLayout != null) {
                                                                     return new WidgetExpressionTrayBinding((FrameLayout) view, frameLayout, frameLayout2, fragmentContainerView, cardSegment, fragmentContainerView2, cardSegment2, fragmentContainerView3, contentResizingCoordinatorLayout, roundedRelativeLayout, textView, imageView, segmentedControlContainer, cardSegment3, fragmentContainerView4, collapsingToolbarLayout, appBarLayout);
                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.java
index bd1ac8934c..e5d2f482d5 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.expression;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.chat.input.expression.ExpressionTrayViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetExpressionTray$onViewBoundOrOnResume$2 extends o implem
     }
 
     public final void invoke(ExpressionTrayViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetExpressionTray.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerOpened$1.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerOpened$1.java
index ff6ad0e98e..9245b152ad 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerOpened$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerOpened$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input.expression;
 
 import com.discord.utilities.analytics.AnalyticsTracker;
+import com.discord.utilities.icon.IconUtils;
 import com.discord.widgets.chat.input.expression.ExpressionTrayViewModel;
 import d0.z.d.o;
 import kotlin.NoWhenBranchMatchedException;
@@ -28,7 +29,7 @@ public final class WidgetExpressionTray$trackExpressionPickerOpened$1 extends o
         if (ordinal == 0) {
             str = "emoji";
         } else if (ordinal == 1) {
-            str = "gif";
+            str = IconUtils.ANIMATED_IMAGE_EXTENSION;
         } else if (ordinal == 2) {
             str = "sticker";
         } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerTabClicked$1.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerTabClicked$1.java
index c8b22a57e1..4a48c068d2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerTabClicked$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$trackExpressionPickerTabClicked$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input.expression;
 
 import com.discord.utilities.analytics.AnalyticsTracker;
+import com.discord.utilities.icon.IconUtils;
 import com.discord.widgets.chat.input.expression.ExpressionTrayViewModel;
 import d0.z.d.o;
 import kotlin.NoWhenBranchMatchedException;
@@ -30,7 +31,7 @@ public final class WidgetExpressionTray$trackExpressionPickerTabClicked$1 extend
         if (ordinal == 0) {
             str = "emoji";
         } else if (ordinal == 1) {
-            str = "gif";
+            str = IconUtils.ANIMATED_IMAGE_EXTENSION;
         } else if (ordinal == 2) {
             str = "sticker";
         } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
index 9da5d9be68..2fa55cc8a4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
@@ -13,10 +13,12 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.b.a.c;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetExpressionTrayBinding;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.view.rounded.RoundedRelativeLayout;
@@ -139,7 +141,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
     }
 
     public WidgetExpressionTray() {
-        super(2131559040);
+        super(R.layout.widget_expression_tray);
     }
 
     public static final /* synthetic */ WidgetExpressionTrayBinding access$getBinding$p(WidgetExpressionTray widgetExpressionTray) {
@@ -212,11 +214,11 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         if (expressionDetailPage instanceof ExpressionDetailPage.GifCategoryPage) {
             WidgetGifCategory widgetGifCategory = new WidgetGifCategory();
             Bundle bundle = new Bundle();
-            bundle.putSerializable("GIF_CATEGORY_ITEM", ((ExpressionDetailPage.GifCategoryPage) expressionDetailPage).getGifCategoryItem());
+            bundle.putSerializable(WidgetGifCategory.ARG_GIF_CATEGORY_ITEM, ((ExpressionDetailPage.GifCategoryPage) expressionDetailPage).getGifCategoryItem());
             widgetGifCategory.setArguments(bundle);
             widgetGifCategory.setOnGifSelected(new WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2(this));
-            getChildFragmentManager().beginTransaction().replace(2131363223, widgetGifCategory, WidgetGifCategory.class.getSimpleName()).commit();
-        } else if (expressionDetailPage == null && (findFragmentById = getChildFragmentManager().findFragmentById(2131363223)) != null) {
+            getChildFragmentManager().beginTransaction().replace(R.id.expression_tray_detail_page, widgetGifCategory, WidgetGifCategory.class.getSimpleName()).commit();
+        } else if (expressionDetailPage == null && (findFragmentById = getChildFragmentManager().findFragmentById(R.id.expression_tray_detail_page)) != null) {
             getChildFragmentManager().beginTransaction().remove(findFragmentById).commit();
         }
     }
@@ -248,11 +250,11 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         }
         int ordinal2 = selectedExpressionTab.ordinal();
         if (ordinal2 == 0) {
-            i = 2131893472;
+            i = R.string.search_for_emoji;
         } else if (ordinal2 == 1) {
-            i = 2131893515;
+            i = R.string.search_tenor;
         } else if (ordinal2 == 2) {
-            i = 2131893474;
+            i = R.string.search_for_stickers;
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -298,12 +300,12 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             if (function0 != null) {
                 function0.mo1invoke();
             }
-            AnalyticsTracker.INSTANCE.chatInputComponentViewed("emoji search");
+            AnalyticsTracker.INSTANCE.chatInputComponentViewed(ChatInputComponentTypes.EMOJI_SEARCH);
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             EmojiPickerNavigator.launchBottomSheet$default(parentFragmentManager, this.emojiPickerListener, EmojiPickerContextType.CHAT, null, 8, null);
         } else if (m.areEqual(event, ExpressionTrayViewModel.Event.ShowGifPickerSheet.INSTANCE)) {
-            AnalyticsTracker.INSTANCE.chatInputComponentViewed("gif search");
+            AnalyticsTracker.INSTANCE.chatInputComponentViewed(ChatInputComponentTypes.GIF_SEARCH);
             WidgetGifPickerSheet.Companion companion = WidgetGifPickerSheet.Companion;
             FragmentManager parentFragmentManager2 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
@@ -311,7 +313,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         } else if (event instanceof ExpressionTrayViewModel.Event.ShowStickerPicker) {
             ExpressionTrayViewModel.Event.ShowStickerPicker showStickerPicker = (ExpressionTrayViewModel.Event.ShowStickerPicker) event;
             if (!showStickerPicker.getInline()) {
-                AnalyticsTracker.INSTANCE.chatInputComponentViewed("sticker search");
+                AnalyticsTracker.INSTANCE.chatInputComponentViewed(ChatInputComponentTypes.STICKER_SEARCH);
                 WidgetStickerPickerSheet.Companion companion2 = WidgetStickerPickerSheet.Companion;
                 FragmentManager parentFragmentManager3 = getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager3, "parentFragmentManager");
@@ -404,9 +406,9 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             widgetEmojiPicker.setOnBackspacePressedListener(this.onBackspacePressedListener);
             Bundle bundle = new Bundle();
             bundle.putSerializable("MODE", EmojiPickerMode.INLINE);
-            bundle.putSerializable("EMOJI_PICKER_CONTEXT_TYPE", EmojiPickerContextType.CHAT);
+            bundle.putSerializable(EmojiPickerNavigator.ARG_EMOJI_PICKER_CONTEXT_TYPE, EmojiPickerContextType.CHAT);
             widgetEmojiPicker.setArguments(bundle);
-            getChildFragmentManager().beginTransaction().replace(2131363225, widgetEmojiPicker, WidgetEmojiPicker.class.getSimpleName()).commit();
+            getChildFragmentManager().beginTransaction().replace(R.id.expression_tray_emoji_picker_content, widgetEmojiPicker, WidgetEmojiPicker.class.getSimpleName()).commit();
             this.emojiPickerFragment = widgetEmojiPicker;
         }
     }
@@ -416,7 +418,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             this.gifPickerInitialized = true;
             WidgetGifPicker widgetGifPicker = new WidgetGifPicker();
             widgetGifPicker.setOnSelectGifCategory(new WidgetExpressionTray$setUpGifPicker$1(getExpressionTrayViewModel()));
-            getChildFragmentManager().beginTransaction().replace(2131363227, widgetGifPicker, WidgetGifPicker.class.getSimpleName()).commit();
+            getChildFragmentManager().beginTransaction().replace(R.id.expression_tray_gif_picker_content, widgetGifPicker, WidgetGifPicker.class.getSimpleName()).commit();
             this.gifPickerFragment = widgetGifPicker;
         }
     }
@@ -432,7 +434,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             Bundle bundle = new Bundle();
             bundle.putSerializable("MODE", StickerPickerMode.INLINE);
             widgetStickerPicker.setArguments(bundle);
-            getChildFragmentManager().beginTransaction().replace(2131363234, widgetStickerPicker, WidgetStickerPicker.class.getSimpleName()).commit();
+            getChildFragmentManager().beginTransaction().replace(R.id.expression_tray_sticker_picker_content, widgetStickerPicker, WidgetStickerPicker.class.getSimpleName()).commit();
             this.stickerPickerFragment = widgetStickerPicker;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java
index 8acd9ea487..2f106d41b0 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.databinding.GifItemViewBinding;
 import com.discord.databinding.GifSuggestedTermViewBinding;
@@ -49,7 +50,7 @@ public final class GifAdapter extends RecyclerView.Adapter<GifViewHolder> {
             m.checkNotNullParameter(recyclerView, "recyclerView");
             Resources resources = recyclerView.getResources();
             m.checkNotNullExpressionValue(resources, "recyclerView.resources");
-            return Math.max(2, Math.max(resources.getDisplayMetrics().widthPixels, 1) / DimenUtils.dpToPixels(164));
+            return Math.max(2, Math.max(resources.getDisplayMetrics().widthPixels, 1) / DimenUtils.dpToPixels((int) GifAdapter.MIN_COLUMN_WIDTH_DP));
         }
 
         public final int calculateColumnWidth(RecyclerView recyclerView, int i, int i2) {
@@ -140,23 +141,23 @@ public final class GifAdapter extends RecyclerView.Adapter<GifViewHolder> {
         LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
         int ordinal = GifAdapterItem.ViewType.Companion.fromInt(i).ordinal();
         if (ordinal == 0) {
-            View inflate = from.inflate(2131558510, viewGroup, false);
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363369);
+            View inflate = from.inflate(R.layout.gif_item_view, viewGroup, false);
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.gif_item_image);
             if (simpleDraweeView != null) {
                 GifItemViewBinding gifItemViewBinding = new GifItemViewBinding((CardView) inflate, simpleDraweeView);
                 m.checkNotNullExpressionValue(gifItemViewBinding, "GifItemViewBinding.infla…(inflater, parent, false)");
                 gifViewHolder = new GifViewHolder.Gif(gifItemViewBinding);
             } else {
-                throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363369)));
+                throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.gif_item_image)));
             }
         } else if (ordinal == 1 || ordinal == 2) {
-            View inflate2 = from.inflate(2131558512, viewGroup, false);
+            View inflate2 = from.inflate(R.layout.gif_suggested_term_view, viewGroup, false);
             LinearLayout linearLayout = (LinearLayout) inflate2;
-            int i2 = 2131363378;
-            FlexboxLayout flexboxLayout = (FlexboxLayout) inflate2.findViewById(2131363378);
+            int i2 = R.id.gif_search_suggested_terms_flex_box;
+            FlexboxLayout flexboxLayout = (FlexboxLayout) inflate2.findViewById(R.id.gif_search_suggested_terms_flex_box);
             if (flexboxLayout != null) {
-                i2 = 2131363379;
-                TextView textView = (TextView) inflate2.findViewById(2131363379);
+                i2 = R.id.gif_search_suggested_terms_icon_text;
+                TextView textView = (TextView) inflate2.findViewById(R.id.gif_search_suggested_terms_icon_text);
                 if (textView != null) {
                     GifSuggestedTermViewBinding gifSuggestedTermViewBinding = new GifSuggestedTermViewBinding((LinearLayout) inflate2, linearLayout, flexboxLayout, textView);
                     m.checkNotNullExpressionValue(gifSuggestedTermViewBinding, "GifSuggestedTermViewBind…(inflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapterItem.java
index a7aa32620e..2af3e19012 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapterItem.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input.gifpicker;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
 import com.discord.models.gifpicker.dto.ModelGif;
+import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.recycler.DiffKeyProvider;
 import d0.t.u;
 import d0.z.d.m;
@@ -21,7 +22,7 @@ public abstract class GifAdapterItem implements DiffKeyProvider {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GifItem(ModelGif modelGif, String str) {
             super(ViewType.VIEW_TYPE_GIF_ITEM, null);
-            m.checkNotNullParameter(modelGif, "gif");
+            m.checkNotNullParameter(modelGif, IconUtils.ANIMATED_IMAGE_EXTENSION);
             this.gif = modelGif;
             this.query = str;
             this.key = String.valueOf(hashCode());
@@ -51,7 +52,7 @@ public abstract class GifAdapterItem implements DiffKeyProvider {
         }
 
         public final GifItem copy(ModelGif modelGif, String str) {
-            m.checkNotNullParameter(modelGif, "gif");
+            m.checkNotNullParameter(modelGif, IconUtils.ANIMATED_IMAGE_EXTENSION);
             return new GifItem(modelGif, str);
         }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java
index 957c4bc0e1..189a2ea342 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.databinding.GifCategoryItemViewBinding;
 import com.discord.utilities.recycler.DiffCreator;
@@ -59,15 +60,15 @@ public final class GifCategoryAdapter extends RecyclerView.Adapter<GifCategoryVi
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public GifCategoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558509, viewGroup, false);
-        int i2 = 2131363364;
-        ImageView imageView = (ImageView) inflate.findViewById(2131363364);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.gif_category_item_view, viewGroup, false);
+        int i2 = R.id.gif_category_item_icon;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.gif_category_item_icon);
         if (imageView != null) {
-            i2 = 2131363365;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363365);
+            i2 = R.id.gif_category_item_preview;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.gif_category_item_preview);
             if (simpleDraweeView != null) {
-                i2 = 2131363366;
-                TextView textView = (TextView) inflate.findViewById(2131363366);
+                i2 = R.id.gif_category_item_title;
+                TextView textView = (TextView) inflate.findViewById(R.id.gif_category_item_title);
                 if (textView != null) {
                     GifCategoryItemViewBinding gifCategoryItemViewBinding = new GifCategoryItemViewBinding((CardView) inflate, imageView, simpleDraweeView, textView);
                     m.checkNotNullExpressionValue(gifCategoryItemViewBinding, "GifCategoryItemViewBindi….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java
index cd63168eb4..459b55668a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.GifCategoryItemViewBinding;
 import com.discord.models.gifpicker.domain.ModelGifCategory;
 import com.discord.utilities.images.MGImages;
@@ -54,14 +55,14 @@ public final class GifCategoryViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(textView2, "binding.gifCategoryItemTitle");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            textView2.setText(view.getResources().getString(2131889020));
+            textView2.setText(view.getResources().getString(R.string.gif_picker_result_type_trending_gifs));
             ImageView imageView2 = this.binding.b;
             m.checkNotNullExpressionValue(imageView2, "binding.gifCategoryItemIcon");
             imageView2.setVisibility(0);
             ImageView imageView3 = this.binding.b;
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            imageView3.setImageDrawable(ResourcesCompat.getDrawable(view2.getResources(), 2131231411, null));
+            imageView3.setImageDrawable(ResourcesCompat.getDrawable(view2.getResources(), R.drawable.ic_analytics_16dp, null));
         }
         this.itemView.setOnClickListener(new GifCategoryViewHolder$configure$1(function1, gifCategoryItem));
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
index f642917cda..661b2d6f40 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
@@ -239,7 +239,7 @@ public final class GifCategoryViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(gifItem, "gifItem");
         ViewState viewState = getViewState();
         if (viewState != null) {
-            StoreAnalytics.trackSearchResultSelected$default(this.storeAnalytics, SearchType.GIF, viewState.getGifCount(), null, new Traits.Source(null, null, "GIF Picker", null, null, 27, null), 4, null);
+            StoreAnalytics.trackSearchResultSelected$default(this.storeAnalytics, SearchType.GIF, viewState.getGifCount(), null, new Traits.Source(null, null, Traits.Source.Obj.GIF_PICKER, null, null, 27, null), 4, null);
         }
         MessageManager.sendMessage$default(this.messageManager, gifItem.getGif().getTenorGifUrl(), null, null, null, null, false, null, null, null, 510, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifLoadingView.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifLoadingView.java
index 643293e648..984140364c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifLoadingView.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifLoadingView.java
@@ -42,7 +42,7 @@ public final class GifLoadingView extends RecyclerView {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public LoadingGifViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558554, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.loading_gif_item_view, viewGroup, false);
             Objects.requireNonNull(inflate, "rootView");
             LoadingGifItemViewBinding loadingGifItemViewBinding = new LoadingGifItemViewBinding((CardView) inflate);
             m.checkNotNullExpressionValue(loadingGifItemViewBinding, "LoadingGifItemViewBindin….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
index b5ecd3e606..d1dcbbac84 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input.gifpicker;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.gifpicker.dto.ModelGif;
 import com.discord.stores.StoreAnalytics;
@@ -410,9 +411,9 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
             if (n0.length() <= 0) {
                 z3 = false;
             }
-            arrayList.add(z4 ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults(suggested, 2131889019) : (!z3 || z5) ? (!z3 || !z5) ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131889017) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891728) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891729));
+            arrayList.add(z4 ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults(suggested, R.string.gif_picker_related_search) : (!z3 || z5) ? (!z3 || !z5) ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, R.string.gif_picker_enter_search) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, R.string.no_gif_search_results_with_related_search) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, R.string.no_gif_search_results_without_related_search));
         } else if (storeState instanceof StoreState.TrendingSearchTermsResults) {
-            arrayList.add(new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(trendingSearchTerms, 2131889017));
+            arrayList.add(new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(trendingSearchTerms, R.string.gif_picker_enter_search));
         }
         ViewState.Loaded loaded = new ViewState.Loaded(arrayList);
         if (z2) {
@@ -429,7 +430,7 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null) {
-            StoreAnalytics.trackSearchResultSelected$default(this.storeAnalytics, SearchType.GIF, loaded.getGifCount(), null, new Traits.Source(null, null, "GIF Picker", null, null, 27, null), 4, null);
+            StoreAnalytics.trackSearchResultSelected$default(this.storeAnalytics, SearchType.GIF, loaded.getGifCount(), null, new Traits.Source(null, null, Traits.Source.Obj.GIF_PICKER, null, null, 27, null), 4, null);
         }
         MessageManager.sendMessage$default(this.messageManager, gifItem.getGif().getTenorGifUrl(), null, null, null, null, false, null, null, null, 510, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java
index 3526dd9fd3..9fab667bba 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import c.a.j.o;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.GifItemViewBinding;
 import com.discord.databinding.GifSuggestedTermViewBinding;
 import com.discord.models.gifpicker.dto.ModelGif;
@@ -99,7 +100,7 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder {
                     if (i2 >= childCount) {
                         LinearLayout linearLayout = this.binding.a;
                         m.checkNotNullExpressionValue(linearLayout, "binding.root");
-                        View inflate = LayoutInflater.from(linearLayout.getContext()).inflate(2131558511, (ViewGroup) this.binding.b, false);
+                        View inflate = LayoutInflater.from(linearLayout.getContext()).inflate(R.layout.gif_search_empty_state_text_box_view, (ViewGroup) this.binding.b, false);
                         Objects.requireNonNull(inflate, "rootView");
                         TextView textView2 = (TextView) inflate;
                         m.checkNotNullExpressionValue(new o(textView2), "GifSearchEmptyStateTextB…      false\n            )");
@@ -146,7 +147,7 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(textView, "binding.gifSearchSuggestedTermsIconText");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, DrawableCompat.getThemedDrawableRes$default(view, 2130970195, 0, 2, (Object) null), 0, 0, 13, (Object) null);
+            DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, DrawableCompat.getThemedDrawableRes$default(view, (int) R.attr.theme_expression_tray_search_icon_empty, 0, 2, (Object) null), 0, 0, 13, (Object) null);
             configureSearchTerms(suggestedTermsEmptyResults, function1, -1);
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.java
index 23f45cbe3b..5a649471e2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/ViewScalingOnTouchListener.java
@@ -4,6 +4,8 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.constraintlayout.motion.widget.Key;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 /* compiled from: ViewScalingOnTouchListener.kt */
 public final class ViewScalingOnTouchListener implements View.OnTouchListener {
@@ -16,11 +18,11 @@ public final class ViewScalingOnTouchListener implements View.OnTouchListener {
     @Override // android.view.View.OnTouchListener
     public boolean onTouch(View view, MotionEvent motionEvent) {
         m.checkNotNullParameter(view, "view");
-        m.checkNotNullParameter(motionEvent, "event");
+        m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
         int action = motionEvent.getAction();
         if (action == 0) {
-            ObjectAnimator ofFloat = ObjectAnimator.ofFloat(view, "scaleX", this.scaledownFactor);
-            ObjectAnimator ofFloat2 = ObjectAnimator.ofFloat(view, "scaleY", this.scaledownFactor);
+            ObjectAnimator ofFloat = ObjectAnimator.ofFloat(view, Key.SCALE_X, this.scaledownFactor);
+            ObjectAnimator ofFloat2 = ObjectAnimator.ofFloat(view, Key.SCALE_Y, this.scaledownFactor);
             m.checkNotNullExpressionValue(ofFloat, "scaleDownX");
             ofFloat.setDuration(200L);
             m.checkNotNullExpressionValue(ofFloat2, "scaleDownY");
@@ -29,8 +31,8 @@ public final class ViewScalingOnTouchListener implements View.OnTouchListener {
             animatorSet.play(ofFloat).with(ofFloat2);
             animatorSet.start();
         } else if (action == 1 || action == 3) {
-            ObjectAnimator ofFloat3 = ObjectAnimator.ofFloat(view, "scaleX", 1.0f);
-            ObjectAnimator ofFloat4 = ObjectAnimator.ofFloat(view, "scaleY", 1.0f);
+            ObjectAnimator ofFloat3 = ObjectAnimator.ofFloat(view, Key.SCALE_X, 1.0f);
+            ObjectAnimator ofFloat4 = ObjectAnimator.ofFloat(view, Key.SCALE_Y, 1.0f);
             m.checkNotNullExpressionValue(ofFloat3, "scaleUpX");
             ofFloat3.setDuration(200L);
             m.checkNotNullExpressionValue(ofFloat4, "scaleUpY");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java
index 4860bbccce..511c8f7fd8 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input.gifpicker;
 import android.view.View;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGifCategoryBinding;
 import com.discord.utilities.views.ContentResizingCoordinatorLayout;
 import d0.z.d.k;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetGifCategory$binding$2 extends k impleme
     public final WidgetGifCategoryBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view;
-        int i = 2131363363;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363363);
+        int i = R.id.gif_category_gif_recycler;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.gif_category_gif_recycler);
         if (recyclerView != null) {
-            i = 2131363367;
-            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363367);
+            i = R.id.gif_category_loading_view;
+            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(R.id.gif_category_loading_view);
             if (gifLoadingView != null) {
-                i = 2131363368;
-                TextView textView = (TextView) view.findViewById(2131363368);
+                i = R.id.gif_category_title;
+                TextView textView = (TextView) view.findViewById(R.id.gif_category_title);
                 if (textView != null) {
                     return new WidgetGifCategoryBinding((ContentResizingCoordinatorLayout) view, contentResizingCoordinatorLayout, recyclerView, gifLoadingView, textView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
index ce22e8baea..27667e735a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
@@ -12,6 +12,7 @@ import c.a.e.g0;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGifCategoryBinding;
 import com.discord.utilities.dimen.DimenUtils;
@@ -56,7 +57,7 @@ public final class WidgetGifCategory extends AppFragment {
     }
 
     public WidgetGifCategory() {
-        super(2131559055);
+        super(R.layout.widget_gif_category);
         WidgetGifCategory$gifCategoryViewModel$2 widgetGifCategory$gifCategoryViewModel$2 = new WidgetGifCategory$gifCategoryViewModel$2(this);
         h0 h0Var = new h0(this);
         this.gifCategoryViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifCategoryViewModel.class), new WidgetGifCategory$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifCategory$gifCategoryViewModel$2));
@@ -91,7 +92,7 @@ public final class WidgetGifCategory extends AppFragment {
     }
 
     private final GifCategoryItem getGifCategory() {
-        Serializable serializable = requireArguments().getSerializable("GIF_CATEGORY_ITEM");
+        Serializable serializable = requireArguments().getSerializable(ARG_GIF_CATEGORY_ITEM);
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.widgets.chat.input.gifpicker.GifCategoryItem");
         return (GifCategoryItem) serializable;
     }
@@ -162,7 +163,7 @@ public final class WidgetGifCategory extends AppFragment {
         if (gifCategory instanceof GifCategoryItem.Standard) {
             str = ((GifCategoryItem.Standard) gifCategory).getGifCategory().getCategoryName();
         } else if (gifCategory instanceof GifCategoryItem.Trending) {
-            str = getResources().getString(2131889020);
+            str = getResources().getString(R.string.gif_picker_result_type_trending_gifs);
         } else {
             throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java
index c52643d3d2..14ec305eed 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input.gifpicker;
 import android.view.View;
 import android.widget.FrameLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGifPickerBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,15 +18,15 @@ public final /* synthetic */ class WidgetGifPicker$binding$2 extends k implement
 
     public final WidgetGifPickerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363370;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363370);
+        int i = R.id.gif_picker_category_recycler;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.gif_picker_category_recycler);
         if (recyclerView != null) {
             FrameLayout frameLayout = (FrameLayout) view;
-            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363372);
+            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(R.id.gif_picker_loading_view);
             if (gifLoadingView != null) {
                 return new WidgetGifPickerBinding(frameLayout, recyclerView, frameLayout, gifLoadingView);
             }
-            i = 2131363372;
+            i = R.id.gif_picker_loading_view;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
index 4f9f213f16..ba7a0e997e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGifPickerBinding;
 import com.discord.utilities.dimen.DimenUtils;
@@ -34,7 +35,7 @@ public final class WidgetGifPicker extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetGifPicker() {
-        super(2131559056);
+        super(R.layout.widget_gif_picker);
         WidgetGifPicker$viewModel$2 widgetGifPicker$viewModel$2 = WidgetGifPicker$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifPickerViewModel.class), new WidgetGifPicker$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifPicker$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java
index 8bae6ad725..00ce366986 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGifPickerSearchBinding;
 import com.discord.views.SearchInputView;
@@ -21,23 +22,23 @@ public final /* synthetic */ class WidgetGifPickerSearch$binding$2 extends k imp
 
     public final WidgetGifPickerSearchBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363373;
-        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363373);
+        int i = R.id.gif_search_app_bar;
+        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.gif_search_app_bar);
         if (appBarLayout != null) {
-            i = 2131363374;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363374);
+            i = R.id.gif_search_gif_recycler;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.gif_search_gif_recycler);
             if (recyclerView != null) {
-                i = 2131363375;
-                GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363375);
+                i = R.id.gif_search_loading_view;
+                GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(R.id.gif_search_loading_view);
                 if (gifLoadingView != null) {
-                    i = 2131363380;
-                    Toolbar toolbar = (Toolbar) view.findViewById(2131363380);
+                    i = R.id.gif_search_toolbar;
+                    Toolbar toolbar = (Toolbar) view.findViewById(R.id.gif_search_toolbar);
                     if (toolbar != null) {
-                        i = 2131363381;
-                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363381);
+                        i = R.id.gif_search_view_flipper;
+                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.gif_search_view_flipper);
                         if (appViewFlipper != null) {
-                            i = 2131364772;
-                            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364772);
+                            i = R.id.search_input;
+                            SearchInputView searchInputView = (SearchInputView) view.findViewById(R.id.search_input);
                             if (searchInputView != null) {
                                 return new WidgetGifPickerSearchBinding((CoordinatorLayout) view, appBarLayout, recyclerView, gifLoadingView, toolbar, appViewFlipper, searchInputView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
index c59ddea6e9..550577ce6c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGifPickerSearchBinding;
@@ -35,7 +36,7 @@ public final class WidgetGifPickerSearch extends AppFragment {
     private Function0<Unit> onGifSelected;
 
     public WidgetGifPickerSearch() {
-        super(2131559057);
+        super(R.layout.widget_gif_picker_search);
         WidgetGifPickerSearch$gifPickerViewModel$2 widgetGifPickerSearch$gifPickerViewModel$2 = new WidgetGifPickerSearch$gifPickerViewModel$2(this);
         h0 h0Var = new h0(this);
         this.gifPickerViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifSearchViewModel.class), new WidgetGifPickerSearch$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifPickerSearch$gifPickerViewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java
index 8001614432..cbc1c2c9e4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import d0.z.d.m;
 import kotlin.Unit;
@@ -83,7 +84,7 @@ public final class WidgetGifPickerSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559058;
+        return R.layout.widget_gif_picker_sheet;
     }
 
     @Override // androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener
@@ -122,7 +123,7 @@ public final class WidgetGifPickerSheet extends AppBottomSheet {
         if (widgetGifPickerSearch3 == null) {
             m.throwUninitializedPropertyAccessException("gifPickerFragment");
         }
-        beginTransaction.replace(2131363376, widgetGifPickerSearch2, widgetGifPickerSearch3.getClass().getSimpleName()).runOnCommit(new WidgetGifPickerSheet$onViewCreated$2(this)).commit();
+        beginTransaction.replace(R.id.gif_search_sheet_content, widgetGifPickerSearch2, widgetGifPickerSearch3.getClass().getSimpleName()).runOnCommit(new WidgetGifPickerSheet$onViewCreated$2(this)).commit();
     }
 
     public final void setOnCancel(Function0<Unit> function0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandValue.java
index 5f236b3ecd..1ff417e25a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandValue.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -12,7 +13,7 @@ public final class ApplicationCommandValue {
     private final Object value;
 
     public ApplicationCommandValue(String str, Object obj, int i, List<ApplicationCommandValue> list) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.name = str;
         this.value = obj;
         this.type = i;
@@ -59,7 +60,7 @@ public final class ApplicationCommandValue {
     }
 
     public final ApplicationCommandValue copy(String str, Object obj, int i, List<ApplicationCommandValue> list) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new ApplicationCommandValue(str, obj, i, list);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputSelectionModel.java b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputSelectionModel.java
index c07738d9a1..78382665d8 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputSelectionModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputSelectionModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input.models;
 import c.d.b.a.a;
 import com.discord.api.sticker.Sticker;
 import com.discord.models.commands.ApplicationCommandOption;
+import com.discord.widgets.chat.AutocompleteTypes;
 import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import com.discord.widgets.chat.input.autocomplete.EmojiAutocompletable;
 import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
@@ -117,16 +118,16 @@ public final class AutocompleteInputSelectionModel {
         if (leadingIdentifier != null) {
             int ordinal = leadingIdentifier.ordinal();
             if (ordinal == 0) {
-                return "COMMANDS";
+                return AutocompleteTypes.COMMANDS;
             }
             if (ordinal == 1) {
-                return "EMOJIS_AND_STICKERS";
+                return AutocompleteTypes.EMOJIS_AND_STICKERS;
             }
             if (ordinal == 2) {
-                return "CHANNELS";
+                return AutocompleteTypes.CHANNELS;
             }
             if (ordinal == 3) {
-                return "MENTIONS";
+                return AutocompleteTypes.MENTIONS;
             }
         }
         return "CHOICE";
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java
index 1e44c77f54..b78ce317fe 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.TextView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ExpressionPickerHeaderItemBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -18,7 +19,7 @@ public final class OwnedHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public OwnedHeaderViewHolder(WidgetStickerAdapter widgetStickerAdapter) {
-        super(2131558504, widgetStickerAdapter);
+        super((int) R.layout.expression_picker_header_item, widgetStickerAdapter);
         m.checkNotNullParameter(widgetStickerAdapter, "adapter");
         View view = this.itemView;
         Objects.requireNonNull(view, "rootView");
@@ -57,9 +58,9 @@ public final class OwnedHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
                 textView.setText(packItem.getPack().getName());
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.headerItemText");
-                textView2.setContentDescription(b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131893940, new Object[]{packItem.getPack().getName()}, null, 4));
+                textView2.setContentDescription(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.sticker_category_a11y_label, new Object[]{packItem.getPack().getName()}, null, 4));
             } else if (headerType instanceof HeaderType.Recent) {
-                this.binding.b.setText(2131893951);
+                this.binding.b.setText(R.string.sticker_picker_categories_recent);
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.headerItemText");
                 TextView textView4 = this.binding.b;
@@ -68,7 +69,7 @@ public final class OwnedHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
                 m.checkNotNullExpressionValue(context, "binding.headerItemText.context");
                 TextView textView5 = this.binding.b;
                 m.checkNotNullExpressionValue(textView5, "binding.headerItemText");
-                textView3.setContentDescription(b.h(context, 2131893940, new Object[]{textView5.getText()}, null, 4));
+                textView3.setContentDescription(b.h(context, R.string.sticker_category_a11y_label, new Object[]{textView5.getText()}, null, 4));
             } else if (headerType instanceof HeaderType.GuildItem) {
                 TextView textView6 = this.binding.b;
                 m.checkNotNullExpressionValue(textView6, "binding.headerItemText");
@@ -80,7 +81,7 @@ public final class OwnedHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
                 m.checkNotNullExpressionValue(textView8, "binding.headerItemText");
                 Context context2 = textView8.getContext();
                 m.checkNotNullExpressionValue(context2, "binding.headerItemText.context");
-                textView7.setContentDescription(b.h(context2, 2131893940, new Object[]{guildItem.getGuild().getName()}, null, 4));
+                textView7.setContentDescription(b.h(context2, R.string.sticker_category_a11y_label, new Object[]{guildItem.getGuild().getName()}, null, 4));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java
index 85a3a041c8..82f02cbf00 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.databinding.StickerCategoryItemGuildBinding;
 import com.discord.databinding.StickerCategoryItemPackBinding;
@@ -119,42 +120,42 @@ public final class StickerCategoryAdapter extends RecyclerView.Adapter<StickerCa
     public StickerCategoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
-        int i2 = 2131364350;
+        int i2 = R.id.overline;
         if (i == 0) {
-            View inflate = from.inflate(2131558683, viewGroup, false);
-            View findViewById = inflate.findViewById(2131364350);
+            View inflate = from.inflate(R.layout.sticker_category_item_recent, viewGroup, false);
+            View findViewById = inflate.findViewById(R.id.overline);
             if (findViewById != null) {
                 StickerCategoryItemRecentBinding stickerCategoryItemRecentBinding = new StickerCategoryItemRecentBinding((FrameLayout) inflate, new c.a.j.n(findViewById, findViewById));
                 m.checkNotNullExpressionValue(stickerCategoryItemRecentBinding, "StickerCategoryItemRecen…(inflater, parent, false)");
                 return new StickerCategoryViewHolder.Recent(stickerCategoryItemRecentBinding);
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131364350)));
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.overline)));
         } else if (i == 1) {
-            View inflate2 = from.inflate(2131558682, viewGroup, false);
-            View findViewById2 = inflate2.findViewById(2131364350);
+            View inflate2 = from.inflate(R.layout.sticker_category_item_pack, viewGroup, false);
+            View findViewById2 = inflate2.findViewById(R.id.overline);
             if (findViewById2 != null) {
                 c.a.j.n nVar = new c.a.j.n(findViewById2, findViewById2);
-                StickerView stickerView = (StickerView) inflate2.findViewById(2131365323);
+                StickerView stickerView = (StickerView) inflate2.findViewById(R.id.sticker_category_item_pack_avatar);
                 if (stickerView != null) {
                     StickerCategoryItemPackBinding stickerCategoryItemPackBinding = new StickerCategoryItemPackBinding((FrameLayout) inflate2, nVar, stickerView);
                     m.checkNotNullExpressionValue(stickerCategoryItemPackBinding, "StickerCategoryItemPackB…(inflater, parent, false)");
                     return new StickerCategoryViewHolder.Pack(stickerCategoryItemPackBinding);
                 }
-                i2 = 2131365323;
+                i2 = R.id.sticker_category_item_pack_avatar;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i2)));
         } else if (i == 2) {
-            View inflate3 = from.inflate(2131558681, viewGroup, false);
-            View findViewById3 = inflate3.findViewById(2131364350);
+            View inflate3 = from.inflate(R.layout.sticker_category_item_guild, viewGroup, false);
+            View findViewById3 = inflate3.findViewById(R.id.overline);
             if (findViewById3 != null) {
                 c.a.j.n nVar2 = new c.a.j.n(findViewById3, findViewById3);
-                GuildIcon guildIcon = (GuildIcon) inflate3.findViewById(2131365322);
+                GuildIcon guildIcon = (GuildIcon) inflate3.findViewById(R.id.sticker_category_item_guild_icon);
                 if (guildIcon != null) {
                     StickerCategoryItemGuildBinding stickerCategoryItemGuildBinding = new StickerCategoryItemGuildBinding((FrameLayout) inflate3, nVar2, guildIcon);
                     m.checkNotNullExpressionValue(stickerCategoryItemGuildBinding, "StickerCategoryItemGuild…(inflater, parent, false)");
                     return new StickerCategoryViewHolder.Guild(stickerCategoryItemGuildBinding);
                 }
-                i2 = 2131365322;
+                i2 = R.id.sticker_category_item_guild_icon;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate3.getResources().getResourceName(i2)));
         } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java
index c0ec7cb4bf..06d3a5e978 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input.sticker;
 
 import android.view.View;
 import android.widget.FrameLayout;
+import com.discord.R;
 import com.discord.databinding.StickerFullSizeDialogBinding;
 import com.discord.views.sticker.StickerView;
 import d0.z.d.k;
@@ -17,10 +18,10 @@ public final /* synthetic */ class StickerFullSizeDialog$binding$2 extends k imp
 
     public final StickerFullSizeDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        StickerView stickerView = (StickerView) view.findViewById(2131365324);
+        StickerView stickerView = (StickerView) view.findViewById(R.id.sticker_full_size_sticker);
         if (stickerView != null) {
             return new StickerFullSizeDialogBinding((FrameLayout) view, stickerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365324)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.sticker_full_size_sticker)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog.java
index 0b3c61a308..cdc2479085 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog.java
@@ -8,6 +8,7 @@ import android.view.Window;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppDialog;
 import com.discord.databinding.StickerFullSizeDialogBinding;
@@ -44,7 +45,7 @@ public final class StickerFullSizeDialog extends AppDialog {
     }
 
     public StickerFullSizeDialog() {
-        super(2131558684);
+        super(R.layout.sticker_full_size_dialog);
     }
 
     private final StickerFullSizeDialogBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
index 9e740a0b3a..845c15f248 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
@@ -6,6 +6,7 @@ import androidx.annotation.MainThread;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppViewModel;
@@ -299,7 +300,7 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
 
             public final boolean canUseExternalStickersInCurrentChannel(long j) {
                 Channel channel = this.currentChannel;
-                if ((channel != null && AnimatableValueParser.t1(channel)) || PermissionUtils.can(137438953472L, Long.valueOf(this.currentChannelPermissions))) {
+                if ((channel != null && AnimatableValueParser.t1(channel)) || PermissionUtils.can(Permission.USE_EXTERNAL_STICKERS, Long.valueOf(this.currentChannelPermissions))) {
                     return true;
                 }
                 Channel channel2 = this.currentChannel;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java
index ff5cc72b31..4bbd6251c1 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import c.q.a.k.a;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppComponent;
 import com.discord.databinding.StickerPickerStickerItemBinding;
@@ -33,21 +34,21 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetStickerA
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StickerViewHolder(int i, WidgetStickerAdapter widgetStickerAdapter, BehaviorSubject<Boolean> behaviorSubject, AppComponent appComponent) {
-        super(2131558686, widgetStickerAdapter);
+        super((int) R.layout.sticker_picker_sticker_item, widgetStickerAdapter);
         m.checkNotNullParameter(widgetStickerAdapter, "adapter");
         m.checkNotNullParameter(appComponent, "appComponent");
         this.type = i;
         this.recyclerScrollingWithinThresholdSubject = behaviorSubject;
         this.appComponent = appComponent;
         View view = this.itemView;
-        StickerView stickerView = (StickerView) view.findViewById(2131365338);
+        StickerView stickerView = (StickerView) view.findViewById(R.id.sticker_picker_sticker);
         if (stickerView != null) {
             StickerPickerStickerItemBinding stickerPickerStickerItemBinding = new StickerPickerStickerItemBinding((FrameLayout) view, stickerView);
             m.checkNotNullExpressionValue(stickerPickerStickerItemBinding, "StickerPickerStickerItemBinding.bind(itemView)");
             this.binding = stickerPickerStickerItemBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365338)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.sticker_picker_sticker)));
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java
index cfafe95370..ab2cef1994 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java
@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.StickerStoreHeaderItemBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -20,29 +21,29 @@ public final class StoreHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StoreHeaderViewHolder(WidgetStickerAdapter widgetStickerAdapter) {
-        super(2131558688, widgetStickerAdapter);
+        super((int) R.layout.sticker_store_header_item, widgetStickerAdapter);
         m.checkNotNullParameter(widgetStickerAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131365352;
-        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365352);
+        int i = R.id.sticker_store_header_item_animated;
+        FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.sticker_store_header_item_animated);
         if (frameLayout != null) {
-            i = 2131365353;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365353);
+            i = R.id.sticker_store_header_item_container;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.sticker_store_header_item_container);
             if (relativeLayout != null) {
-                i = 2131365354;
-                TextView textView = (TextView) view.findViewById(2131365354);
+                i = R.id.sticker_store_header_item_description;
+                TextView textView = (TextView) view.findViewById(R.id.sticker_store_header_item_description);
                 if (textView != null) {
-                    i = 2131365355;
-                    Chip chip = (Chip) view.findViewById(2131365355);
+                    i = R.id.sticker_store_header_item_new;
+                    Chip chip = (Chip) view.findViewById(R.id.sticker_store_header_item_new);
                     if (chip != null) {
-                        i = 2131365356;
-                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365356);
+                        i = R.id.sticker_store_header_item_premium;
+                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.sticker_store_header_item_premium);
                         if (frameLayout2 != null) {
-                            i = 2131365357;
-                            TextView textView2 = (TextView) view.findViewById(2131365357);
+                            i = R.id.sticker_store_header_item_subtitle;
+                            TextView textView2 = (TextView) view.findViewById(R.id.sticker_store_header_item_subtitle);
                             if (textView2 != null) {
-                                i = 2131365358;
-                                TextView textView3 = (TextView) view.findViewById(2131365358);
+                                i = R.id.sticker_store_header_item_title;
+                                TextView textView3 = (TextView) view.findViewById(R.id.sticker_store_header_item_title);
                                 if (textView3 != null) {
                                     StickerStoreHeaderItemBinding stickerStoreHeaderItemBinding = new StickerStoreHeaderItemBinding((LinearLayout) view, frameLayout, relativeLayout, textView, chip, frameLayout2, textView2, textView3);
                                     m.checkNotNullExpressionValue(stickerStoreHeaderItemBinding, "StickerStoreHeaderItemBinding.bind(itemView)");
@@ -84,7 +85,7 @@ public final class StoreHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
             StoreHeaderItem storeHeaderItem = (StoreHeaderItem) mGRecyclerDataPayload;
             textView.setText(storeHeaderItem.getPack().getName());
             int i2 = 0;
-            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755346, storeHeaderItem.getPack().getStickers().size(), Integer.valueOf(storeHeaderItem.getPack().getStickers().size()));
+            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.sticker_pack_sticker_count_numStickers, storeHeaderItem.getPack().getStickers().size(), Integer.valueOf(storeHeaderItem.getPack().getStickers().size()));
             TextView textView2 = this.binding.f;
             m.checkNotNullExpressionValue(textView2, "binding.stickerStoreHeaderItemSubtitle");
             textView2.setText(i18nPluralString);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerAdapter.java
index 0162cd7963..36c15fc32d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerAdapter.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.ViewGroup;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -75,7 +76,7 @@ public final class WidgetStickerAdapter extends WidgetExpressionPickerAdapter {
         this.showStickerPackDescriptions = z2;
         Context context = recyclerView.getContext();
         m.checkNotNullExpressionValue(context, "recycler.context");
-        this.numColumns = WidgetExpressionPickerAdapter.Companion.calculateNumOfColumns(recyclerView, context.getResources().getDimension(2131165317), 4);
+        this.numColumns = WidgetExpressionPickerAdapter.Companion.calculateNumOfColumns(recyclerView, context.getResources().getDimension(R.dimen.chat_input_sticker_size), 4);
         this.layoutManager = new GridLayoutManager(recyclerView.getContext(), getNumColumns());
         getLayoutManager().setSpanSizeLookup(new AnonymousClass1(this));
         recyclerView.setLayoutManager(getLayoutManager());
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java
index 2ca297bc4a..8c6680bafc 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetStickerPackStoreSheetBinding;
 import com.discord.views.LoadingButton;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -20,18 +21,18 @@ public final /* synthetic */ class WidgetStickerPackStoreSheet$binding$2 extends
 
     public final WidgetStickerPackStoreSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365330;
-        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365330);
+        int i = R.id.sticker_pack_store_sheet_buy_button_container;
+        FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.sticker_pack_store_sheet_buy_button_container);
         if (frameLayout != null) {
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            i = 2131365332;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365332);
+            i = R.id.sticker_pack_store_sheet_recycler;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.sticker_pack_store_sheet_recycler);
             if (recyclerView != null) {
-                i = 2131365333;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365333);
+                i = R.id.sticker_pack_view_all_banner;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.sticker_pack_view_all_banner);
                 if (simpleDraweeView != null) {
-                    i = 2131365351;
-                    LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365351);
+                    i = R.id.sticker_store_buy_button_premium;
+                    LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.sticker_store_buy_button_premium);
                     if (loadingButton != null) {
                         return new WidgetStickerPackStoreSheetBinding(relativeLayout, frameLayout, relativeLayout, recyclerView, simpleDraweeView, loadingButton);
                     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
index 78e00ee5b3..d106dd9f1e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerType;
@@ -68,9 +69,9 @@ public final class WidgetStickerPackStoreSheet extends AppBottomSheet {
                 WidgetStickerPackStoreSheet widgetStickerPackStoreSheet = new WidgetStickerPackStoreSheet();
                 Bundle bundle = new Bundle();
                 bundle.putSerializable("com.discord.intent.extra.EXTRA_STICKER", sticker);
-                bundle.putSerializable("widget_sticker_pack_store_sheet_view_type", stickerPackStoreSheetViewType);
-                bundle.putString("widget_sticker_pack_Store_sheet_analytics_location", str);
-                bundle.putSerializable("widget_sticker_pack_Store_sheet_analytics_location_section", stickerPurchaseLocation);
+                bundle.putSerializable(WidgetStickerPackStoreSheet.VIEW_TYPE, stickerPackStoreSheetViewType);
+                bundle.putString(WidgetStickerPackStoreSheet.ANALYTICS_LOCATION, str);
+                bundle.putSerializable(WidgetStickerPackStoreSheet.ANALYTICS_LOCATION_SECTION, stickerPurchaseLocation);
                 widgetStickerPackStoreSheet.setArguments(bundle);
                 widgetStickerPackStoreSheet.show(fragmentManager, WidgetStickerPackStoreSheet.class.getName());
             }
@@ -174,7 +175,7 @@ public final class WidgetStickerPackStoreSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559298;
+        return R.layout.widget_sticker_pack_store_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java
index 180ddc261c..27d88b7742 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java
@@ -8,6 +8,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetStickerPickerBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -28,69 +29,69 @@ public final /* synthetic */ class WidgetStickerPicker$binding$2 extends k imple
 
     public final WidgetStickerPickerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362510;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362510);
+        int i = R.id.chat_input_sticker_picker_empty_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.chat_input_sticker_picker_empty_container);
         if (linearLayout != null) {
-            i = 2131362511;
-            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362511);
+            i = R.id.chat_input_sticker_picker_empty_container_phase_1;
+            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.chat_input_sticker_picker_empty_container_phase_1);
             if (linearLayout2 != null) {
-                i = 2131362512;
-                ImageView imageView = (ImageView) view.findViewById(2131362512);
+                i = R.id.chat_input_sticker_picker_empty_image;
+                ImageView imageView = (ImageView) view.findViewById(R.id.chat_input_sticker_picker_empty_image);
                 if (imageView != null) {
-                    i = 2131362513;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362513);
+                    i = R.id.chat_input_sticker_picker_empty_link;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.chat_input_sticker_picker_empty_link);
                     if (linkifiedTextView != null) {
-                        i = 2131362514;
-                        StickerView stickerView = (StickerView) view.findViewById(2131362514);
+                        i = R.id.chat_input_sticker_picker_empty_sticker_1;
+                        StickerView stickerView = (StickerView) view.findViewById(R.id.chat_input_sticker_picker_empty_sticker_1);
                         if (stickerView != null) {
-                            i = 2131362515;
-                            StickerView stickerView2 = (StickerView) view.findViewById(2131362515);
+                            i = R.id.chat_input_sticker_picker_empty_sticker_2;
+                            StickerView stickerView2 = (StickerView) view.findViewById(R.id.chat_input_sticker_picker_empty_sticker_2);
                             if (stickerView2 != null) {
-                                i = 2131362516;
-                                StickerView stickerView3 = (StickerView) view.findViewById(2131362516);
+                                i = R.id.chat_input_sticker_picker_empty_sticker_3;
+                                StickerView stickerView3 = (StickerView) view.findViewById(R.id.chat_input_sticker_picker_empty_sticker_3);
                                 if (stickerView3 != null) {
-                                    i = 2131362517;
-                                    StickerView stickerView4 = (StickerView) view.findViewById(2131362517);
+                                    i = R.id.chat_input_sticker_picker_empty_sticker_4;
+                                    StickerView stickerView4 = (StickerView) view.findViewById(R.id.chat_input_sticker_picker_empty_sticker_4);
                                     if (stickerView4 != null) {
-                                        i = 2131362518;
-                                        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362518);
+                                        i = R.id.chat_input_sticker_picker_empty_subscribe;
+                                        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.chat_input_sticker_picker_empty_subscribe);
                                         if (loadingButton != null) {
-                                            i = 2131362519;
-                                            TextView textView = (TextView) view.findViewById(2131362519);
+                                            i = R.id.chat_input_sticker_picker_empty_subtitle;
+                                            TextView textView = (TextView) view.findViewById(R.id.chat_input_sticker_picker_empty_subtitle);
                                             if (textView != null) {
-                                                i = 2131362520;
-                                                TextView textView2 = (TextView) view.findViewById(2131362520);
+                                                i = R.id.chat_input_sticker_picker_empty_subtitle_phase_1;
+                                                TextView textView2 = (TextView) view.findViewById(R.id.chat_input_sticker_picker_empty_subtitle_phase_1);
                                                 if (textView2 != null) {
-                                                    i = 2131362521;
-                                                    TextView textView3 = (TextView) view.findViewById(2131362521);
+                                                    i = R.id.chat_input_sticker_picker_empty_title;
+                                                    TextView textView3 = (TextView) view.findViewById(R.id.chat_input_sticker_picker_empty_title);
                                                     if (textView3 != null) {
-                                                        i = 2131362522;
-                                                        TextView textView4 = (TextView) view.findViewById(2131362522);
+                                                        i = R.id.chat_input_sticker_picker_empty_title_phase_1;
+                                                        TextView textView4 = (TextView) view.findViewById(R.id.chat_input_sticker_picker_empty_title_phase_1);
                                                         if (textView4 != null) {
-                                                            i = 2131362523;
-                                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362523);
+                                                            i = R.id.chat_input_sticker_picker_recycler;
+                                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.chat_input_sticker_picker_recycler);
                                                             if (recyclerView != null) {
-                                                                i = 2131362524;
-                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362524);
+                                                                i = R.id.chat_input_sticker_picker_view_flipper;
+                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.chat_input_sticker_picker_view_flipper);
                                                                 if (appViewFlipper != null) {
-                                                                    i = 2131365320;
-                                                                    AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365320);
+                                                                    i = R.id.sticker_app_bar;
+                                                                    AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.sticker_app_bar);
                                                                     if (appBarLayout != null) {
-                                                                        i = 2131365334;
-                                                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365334);
+                                                                        i = R.id.sticker_picker_bottom_bar;
+                                                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.sticker_picker_bottom_bar);
                                                                         if (constraintLayout != null) {
-                                                                            i = 2131365335;
-                                                                            View findViewById = view.findViewById(2131365335);
+                                                                            i = R.id.sticker_picker_bottom_bar_divider;
+                                                                            View findViewById = view.findViewById(R.id.sticker_picker_bottom_bar_divider);
                                                                             if (findViewById != null) {
-                                                                                i = 2131365336;
-                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131365336);
+                                                                                i = R.id.sticker_picker_category_recycler;
+                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.sticker_picker_category_recycler);
                                                                                 if (recyclerView2 != null) {
                                                                                     CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
-                                                                                    i = 2131365342;
-                                                                                    SearchInputView searchInputView = (SearchInputView) view.findViewById(2131365342);
+                                                                                    i = R.id.sticker_search_input;
+                                                                                    SearchInputView searchInputView = (SearchInputView) view.findViewById(R.id.sticker_search_input);
                                                                                     if (searchInputView != null) {
-                                                                                        i = 2131365359;
-                                                                                        Toolbar toolbar = (Toolbar) view.findViewById(2131365359);
+                                                                                        i = R.id.sticker_toolbar;
+                                                                                        Toolbar toolbar = (Toolbar) view.findViewById(R.id.sticker_toolbar);
                                                                                         if (toolbar != null) {
                                                                                             return new WidgetStickerPickerBinding(coordinatorLayout, linearLayout, linearLayout2, imageView, linkifiedTextView, stickerView, stickerView2, stickerView3, stickerView4, loadingButton, textView, textView2, textView3, textView4, recyclerView, appViewFlipper, appBarLayout, constraintLayout, findViewById, recyclerView2, coordinatorLayout, searchInputView, toolbar);
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBound$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBound$2.java
index 0f6321bb61..218890bebe 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBound$2.java
@@ -18,6 +18,6 @@ public final class WidgetStickerPicker$onViewBound$2 implements View.OnClickList
         StickerPremiumUpsellDialog.Companion companion = StickerPremiumUpsellDialog.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.show(parentFragmentManager, new Traits.Location(null, "Expression Picker", null, null, null, 29, null));
+        companion.show(parentFragmentManager, new Traits.Location(null, Traits.Location.Section.EXPRESSION_PICKER, null, null, null, 29, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBoundOrOnResume$2.java
index 22d2a2ee6a..8aaf3a17b4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.sticker;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.chat.input.sticker.StickerPickerViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetStickerPicker$onViewBoundOrOnResume$2 extends o impleme
     }
 
     public final void invoke(StickerPickerViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetStickerPicker.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
index 5fc8414d67..646d940c92 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
@@ -20,6 +20,7 @@ import c.a.e.g0;
 import c.a.e.o;
 import c.b.a.c;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -103,7 +104,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
     }
 
     public WidgetStickerPicker() {
-        super(2131559299);
+        super(R.layout.widget_sticker_picker);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetStickerPicker widgetStickerPicker, StickerPickerViewModel.ViewState viewState) {
@@ -200,7 +201,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
             int i = 0;
             if (viewState instanceof StickerPickerViewModel.ViewState.EmptyNonPremium) {
                 if (this.wasActive && ((StickerPickerViewModel.ViewState.EmptyNonPremium) viewState).isStickersSelectedTab()) {
-                    AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, AnalyticsTracker.PremiumUpsellType.EmptyStickerPickerUpsell, new Traits.Location(null, "Empty Sticker Picker Upsell", null, null, null, 29, null), null, null, 12, null);
+                    AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, AnalyticsTracker.PremiumUpsellType.EmptyStickerPickerUpsell, new Traits.Location(null, Traits.Location.Section.EMPTY_STICKER_PICKER_UPSELL, null, null, null, 29, null), null, null, 12, null);
                 }
                 AppViewFlipper appViewFlipper = getBinding().l;
                 m.checkNotNullExpressionValue(appViewFlipper, "binding.chatInputStickerPickerViewFlipper");
@@ -225,13 +226,13 @@ public final class WidgetStickerPicker extends AppFragment implements c {
                     function12.invoke(Boolean.TRUE);
                 }
                 this.scrollExpressionPickerToTop.mo1invoke();
-                getBinding().b.setImageResource(2131232292);
+                getBinding().b.setImageResource(R.drawable.img_stickers_search_empty_90dp);
                 TextView textView = getBinding().j;
                 m.checkNotNullExpressionValue(textView, "binding.chatInputStickerPickerEmptyTitle");
                 textView.setVisibility(8);
                 TextView textView2 = getBinding().i;
                 m.checkNotNullExpressionValue(textView2, "binding.chatInputStickerPickerEmptySubtitle");
-                textView2.setText(getString(2131891758));
+                textView2.setText(getString(R.string.no_sticker_search_results));
                 LinkifiedTextView linkifiedTextView = getBinding().f2001c;
                 m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatInputStickerPickerEmptyLink");
                 linkifiedTextView.setVisibility(8);
@@ -344,7 +345,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             companion.show(parentFragmentManager);
         } else if (event instanceof StickerPickerViewModel.Event.SlowMode) {
-            o.i(getParentFragment(), 2131887349, 0, 4);
+            o.i(getParentFragment(), R.string.channel_slowmode_desc_short, 0, 4);
         }
     }
 
@@ -618,7 +619,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         WidgetExpressionPickerAdapter.Companion companion = WidgetExpressionPickerAdapter.Companion;
         RecyclerView recyclerView = getBinding().k;
         m.checkNotNullExpressionValue(recyclerView, "binding.chatInputStickerPickerRecycler");
-        viewModel.setStickerCountToDisplayForStore(companion.calculateNumOfColumns(recyclerView, getResources().getDimension(2131165317), 4));
+        viewModel.setStickerCountToDisplayForStore(companion.calculateNumOfColumns(recyclerView, getResources().getDimension(R.dimen.chat_input_sticker_size), 4));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetStickerPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStickerPicker$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetStickerPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStickerPicker$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java
index addb4a293e..e4e2444a07 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.widgets.chat.input.expression.WidgetExpressionPickerSheet;
 import d0.z.d.m;
@@ -64,7 +65,7 @@ public final class WidgetStickerPickerSheet extends WidgetExpressionPickerSheet
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559300;
+        return R.layout.widget_sticker_picker_sheet;
     }
 
     @Override // com.discord.widgets.chat.input.expression.WidgetExpressionPickerSheet, androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener
@@ -120,7 +121,7 @@ public final class WidgetStickerPickerSheet extends WidgetExpressionPickerSheet
         }
         Bundle bundle2 = new Bundle();
         bundle2.putSerializable("MODE", StickerPickerMode.BOTTOM_SHEET);
-        bundle2.putSerializable("VIEW_TYPE", StickerPackStoreSheetViewType.STICKER_SEARCH_VIEW_ALL);
+        bundle2.putSerializable(WidgetStickerPicker.VIEW_TYPE, StickerPackStoreSheetViewType.STICKER_SEARCH_VIEW_ALL);
         bundle2.putString("com.discord.intent.extra.EXTRA_TEXT", str);
         if (valueOf != null) {
             bundle2.putLong("com.discord.intent.EXTRA_STICKER_PACK_ID", valueOf.longValue());
@@ -143,7 +144,7 @@ public final class WidgetStickerPickerSheet extends WidgetExpressionPickerSheet
         if (widgetStickerPicker4 == null) {
             m.throwUninitializedPropertyAccessException("stickerPickerFragment");
         }
-        beginTransaction.replace(2131365346, widgetStickerPicker3, widgetStickerPicker4.getClass().getSimpleName()).runOnCommit(new WidgetStickerPickerSheet$onViewCreated$2(this)).commit();
+        beginTransaction.replace(R.id.sticker_sheet_sticker_picker_content, widgetStickerPicker3, widgetStickerPicker4.getClass().getSimpleName()).runOnCommit(new WidgetStickerPickerSheet$onViewCreated$2(this)).commit();
     }
 
     public final void scrollToPack(Long l) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java b/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java
index fabebdca69..59977370ca 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java
@@ -7,6 +7,7 @@ import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import d0.t.u;
 import d0.z.d.m;
 import java.util.ArrayList;
@@ -33,7 +34,7 @@ public final class ChatListItemMessageAccessibilityDelegate extends Accessibilit
             SpoilerSpan[] spoilerSpanArr = (SpoilerSpan[]) spannableStringBuilder.getSpans(0, spannableStringBuilder.length(), SpoilerSpan.class);
             for (SpoilerSpan spoilerSpan : spoilerSpanArr) {
                 if (!spoilerSpan.k) {
-                    spannableStringBuilder.replace(spannableStringBuilder.getSpanStart(spoilerSpan), spannableStringBuilder.getSpanEnd(spoilerSpan), b.j(view, 2131893693, new Object[0], null, 4));
+                    spannableStringBuilder.replace(spannableStringBuilder.getSpanStart(spoilerSpan), spannableStringBuilder.getSpanEnd(spoilerSpan), b.j(view, R.string.spoiler_hidden_a11y_label, new Object[0], null, 4));
                 }
             }
             ArrayList arrayList = new ArrayList();
diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$1.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$1.java
index cd5f3103b7..82504dc7b5 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.list;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class InlineMediaView$updateUI$1 extends o implements Function1<Sub
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         InlineMediaView.access$getCompositeSubscription$p(this.this$0).a(subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java
index 15b5cd1644..00c2d8f77e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.core.content.ContextCompat;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.player.AppMediaPlayer;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -48,9 +49,9 @@ public final class InlineMediaView$updateUI$2 extends o implements Function1<Flo
 
     public final void invoke(float f) {
         boolean z2 = f > ((float) 0);
-        InlineMediaView.access$getBinding$p(this.this$0).g.setImageDrawable(ContextCompat.getDrawable(this.this$0.getContext(), z2 ? 2131232114 : 2131232112));
+        InlineMediaView.access$getBinding$p(this.this$0).g.setImageDrawable(ContextCompat.getDrawable(this.this$0.getContext(), z2 ? R.drawable.ic_volume_up_white_24dp : R.drawable.ic_volume_off_24dp));
         InlineMediaView.access$getBinding$p(this.this$0).g.setOnClickListener(new AnonymousClass1(this, z2));
-        int i = z2 ? 2131894952 : 2131894953;
+        int i = z2 ? R.string.video_playback_mute_accessibility_label : R.string.video_playback_unmute_accessibility_label;
         ImageView imageView = InlineMediaView.access$getBinding$p(this.this$0).g;
         m.checkNotNullExpressionValue(imageView, "binding.inlineMediaVolumeToggle");
         imageView.setContentDescription(b.j(this.this$0, i, new Object[0], null, 4));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$3.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$3.java
index 97a4847ee5..7fb94107b5 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$3.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.list;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class InlineMediaView$updateUI$3 extends o implements Function1<Sub
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         InlineMediaView.access$getCompositeSubscription$p(this.this$0).a(subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$4.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$4.java
index b58cb13f77..07944052c6 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$4.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$4.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.list;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.player.AppMediaPlayer;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class InlineMediaView$updateUI$4 extends o implements Function1<App
     }
 
     public final void invoke(AppMediaPlayer.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         InlineMediaView.access$handlePlayerEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java
index abe54fee06..3dc3c7e9be 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.PublishMessageDialogBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,23 +19,23 @@ public final /* synthetic */ class PublishActionDialog$binding$2 extends k imple
 
     public final PublishMessageDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364245;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364245);
+        int i = R.id.notice_body_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.notice_body_container);
         if (linearLayout != null) {
-            i = 2131364246;
-            TextView textView = (TextView) view.findViewById(2131364246);
+            i = R.id.notice_body_text;
+            TextView textView = (TextView) view.findViewById(R.id.notice_body_text);
             if (textView != null) {
-                i = 2131364247;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364247);
+                i = R.id.notice_cancel;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.notice_cancel);
                 if (materialButton != null) {
-                    i = 2131364249;
-                    TextView textView2 = (TextView) view.findViewById(2131364249);
+                    i = R.id.notice_header;
+                    TextView textView2 = (TextView) view.findViewById(R.id.notice_header);
                     if (textView2 != null) {
-                        i = 2131364250;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364250);
+                        i = R.id.notice_header_container;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.notice_header_container);
                         if (linearLayout2 != null) {
-                            i = 2131364252;
-                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364252);
+                            i = R.id.notice_ok;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.notice_ok);
                             if (materialButton2 != null) {
                                 return new PublishMessageDialogBinding((LinearLayout) view, linearLayout, textView, materialButton, textView2, linearLayout2, materialButton2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java
index beedff0e65..d2079fe8d6 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java
@@ -16,6 +16,7 @@ import c.a.e.j0;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.PublishMessageDialogBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -65,7 +66,7 @@ public final class PublishActionDialog extends AppDialog {
             bundle.putLong("com.discord.intent.extra.EXTRA_MESSAGE_ID", j);
             bundle.putLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", j2);
             if (num != null) {
-                bundle.putInt("theme_id", num.intValue());
+                bundle.putInt(PublishActionDialog.ARG_THEME_ID, num.intValue());
             }
             publishActionDialog.setArguments(bundle);
             publishActionDialog.show(fragmentManager, PublishActionDialog.class.getName());
@@ -73,7 +74,7 @@ public final class PublishActionDialog extends AppDialog {
     }
 
     public PublishActionDialog() {
-        super(2131558657);
+        super(R.layout.publish_message_dialog);
         PublishActionDialog$viewModel$2 publishActionDialog$viewModel$2 = new PublishActionDialog$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PublishActionDialogViewModel.class), new PublishActionDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(publishActionDialog$viewModel$2));
@@ -113,9 +114,9 @@ public final class PublishActionDialog extends AppDialog {
 
     private final void handleEvent(PublishActionDialogViewModel.Event event) {
         if (event instanceof PublishActionDialogViewModel.Event.Success) {
-            o.i(this, 2131891486, 0, 4);
+            o.i(this, R.string.message_published, 0, 4);
         } else if (event instanceof PublishActionDialogViewModel.Event.Failure) {
-            o.i(this, 2131892843, 0, 4);
+            o.i(this, R.string.publish_followed_news_generic_body, 0, 4);
         }
         dismiss();
     }
@@ -123,19 +124,19 @@ public final class PublishActionDialog extends AppDialog {
     private final void renderHasFollowers(PublishActionDialogViewModel.ViewState.LoadedHasFollowers loadedHasFollowers) {
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.noticeBodyText");
-        b.n(textView, 2131892839, new Object[]{String.valueOf(loadedHasFollowers.getFollowerStats().getGuildsFollowing())}, null, 4);
+        b.n(textView, R.string.publish_followed_news_body_reach, new Object[]{String.valueOf(loadedHasFollowers.getFollowerStats().getGuildsFollowing())}, null, 4);
     }
 
     private final void renderLoading() {
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.noticeBodyText");
-        b.n(textView, 2131891128, new Object[0], null, 4);
+        b.n(textView, R.string.loading, new Object[0], null, 4);
     }
 
     private final void renderNoFollowers() {
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.noticeBodyText");
-        b.n(textView, 2131892838, new Object[0], null, 4);
+        b.n(textView, R.string.publish_followed_news_body, new Object[0], null, 4);
     }
 
     public static final void show(FragmentManager fragmentManager, long j, long j2, Function0<Unit> function0, Integer num) {
@@ -160,7 +161,7 @@ public final class PublishActionDialog extends AppDialog {
             TypedValue typedValue = new TypedValue();
             Context context = getContext();
             if (!(context == null || (theme = context.getTheme()) == null)) {
-                theme.resolveAttribute(arguments.getInt("theme_id", 2130969173), typedValue, true);
+                theme.resolveAttribute(arguments.getInt(ARG_THEME_ID, R.attr.dialogTheme), typedValue, true);
             }
             setStyle(1, typedValue.resourceId);
         }
@@ -173,7 +174,7 @@ public final class PublishActionDialog extends AppDialog {
         super.onViewBound(view);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.noticeHeader");
-        b.n(textView, 2131891683, new Object[0], null, 4);
+        b.n(textView, R.string.news_channel_publish_bump, new Object[0], null, 4);
         LinearLayout linearLayout = getBinding().e;
         m.checkNotNullExpressionValue(linearLayout, "binding.noticeHeaderContainer");
         linearLayout.setVisibility(0);
@@ -185,11 +186,11 @@ public final class PublishActionDialog extends AppDialog {
         textView3.setMovementMethod(new WidgetNoticeDialog.ActionLinkMovementMethod(new PublishActionDialog$onViewBound$1(this)));
         MaterialButton materialButton = getBinding().f;
         m.checkNotNullExpressionValue(materialButton, "binding.noticeOk");
-        ViewExtensions.setTextAndVisibilityBy(materialButton, b.k(this, 2131891682, new Object[0], null, 4));
+        ViewExtensions.setTextAndVisibilityBy(materialButton, b.k(this, R.string.news_channel_publish, new Object[0], null, 4));
         getBinding().f.setOnClickListener(new PublishActionDialog$onViewBound$2(this));
         MaterialButton materialButton2 = getBinding().f1626c;
         m.checkNotNullExpressionValue(materialButton2, "binding.noticeCancel");
-        ViewExtensions.setTextAndVisibilityBy(materialButton2, b.k(this, 2131887193, new Object[0], null, 4));
+        ViewExtensions.setTextAndVisibilityBy(materialButton2, b.k(this, R.string.cancel, new Object[0], null, 4));
         getBinding().f1626c.setOnClickListener(new PublishActionDialog$onViewBound$3(this));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
index f2387c14bd..c2cc5bef82 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list;
 
 import android.content.Context;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelChannelFollowerStats;
 import com.discord.stores.StoreChannelFollowerStats;
@@ -299,12 +300,12 @@ public final class PublishActionDialogViewModel extends AppViewModel<ViewState>
 
     private final void emitFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.Failure(2131888073));
+        publishSubject.j.onNext(new Event.Failure(R.string.default_failure_to_perform_action_message));
     }
 
     private final void emitSuccessActionEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.Success(2131891486));
+        publishSubject.j.onNext(new Event.Success(R.string.message_published));
     }
 
     private final void handleStoreState(StoreState storeState) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java b/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java
index a8261176ff..d3bbb9be56 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java
@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import d0.z.d.m;
 /* compiled from: ThreadSpineItemDecoration.kt */
@@ -21,8 +22,8 @@ public final class ThreadSpineItemDecoration extends RecyclerView.ItemDecoration
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         this.context = context;
         this.adapter = widgetChatListAdapter;
-        this.drawable = ContextCompat.getDrawable(context, 2131232382);
-        this.startPositionPx = context.getResources().getDimensionPixelSize(2131165318);
+        this.drawable = ContextCompat.getDrawable(context, R.drawable.thread_embed_spine_drawable);
+        this.startPositionPx = context.getResources().getDimensionPixelSize(R.dimen.chat_list_spine_margin);
     }
 
     private final void drawSpinePiece(Canvas canvas, RecyclerView recyclerView, View view) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
index edc37b3514..753dc6ec49 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
@@ -10,6 +10,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityAssets;
 import com.discord.api.activity.ActivityParty;
@@ -18,10 +19,12 @@ import com.discord.api.message.activity.MessageActivity;
 import com.discord.api.message.activity.MessageActivityType;
 import com.discord.app.AppLog;
 import com.discord.databinding.ViewChatEmbedGameInviteBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.logging.Logger;
@@ -102,7 +105,7 @@ public final class ViewEmbedGameInvite extends LinearLayout {
             }
 
             private final Model create(GameInviteEntry gameInviteEntry, MeUser meUser, Application application, Activity activity, Map<Long, ? extends User> map) {
-                return new Model(meUser, gameInviteEntry.getAuthorId(), 1420070400000L + (gameInviteEntry.getMessageId() >>> 22), application != null ? application : gameInviteEntry.getApplication(), gameInviteEntry.getActivity(), activity, createPartyUsers(map, activity));
+                return new Model(meUser, gameInviteEntry.getAuthorId(), SnowflakeUtils.DISCORD_EPOCH + (gameInviteEntry.getMessageId() >>> 22), application != null ? application : gameInviteEntry.getApplication(), gameInviteEntry.getActivity(), activity, createPartyUsers(map, activity));
             }
 
             private final Model createForShare(MeUser meUser, long j, MessageActivity messageActivity, Activity activity, Map<Long, ? extends User> map, Application application) {
@@ -140,7 +143,7 @@ public final class ViewEmbedGameInvite extends LinearLayout {
             public final Observable<Model> getForShare(Clock clock, Uri uri, Activity activity) {
                 m.checkNotNullParameter(clock, "clock");
                 if (uri != null) {
-                    String queryParameter = uri.getQueryParameter("application_id");
+                    String queryParameter = uri.getQueryParameter(ModelAuditLogEntry.CHANGE_KEY_APPLICATION_ID);
                     Long longOrNull = queryParameter != null ? s.toLongOrNull(queryParameter) : null;
                     String queryParameter2 = uri.getQueryParameter("party_id");
                     String queryParameter3 = uri.getQueryParameter("type");
@@ -329,7 +332,7 @@ public final class ViewEmbedGameInvite extends LinearLayout {
         }
 
         public final boolean isExpiredInvite(long j) {
-            return j > this.creationTime + 7200000;
+            return j > this.creationTime + ViewEmbedGameInvite.EMBED_LIFETIME_MILLIS;
         }
 
         public final boolean isInParty() {
@@ -481,9 +484,9 @@ public final class ViewEmbedGameInvite extends LinearLayout {
         m.checkNotNullExpressionValue(textView, "binding.itemGameInviteApplicationNameTv");
         textView.setText(model.getApplication().g());
         TextView textView2 = this.binding.g;
-        int i2 = 2131890819;
+        int i2 = R.string.invite_embed_game_has_ended;
         if (!isDeadInvite && model.getMessageActivity().b() != MessageActivityType.SPECTATE) {
-            i2 = 2131890823;
+            i2 = R.string.invite_embed_invite_to_join_group;
         }
         textView2.setText(i2);
         int i3 = 0;
@@ -521,12 +524,12 @@ public final class ViewEmbedGameInvite extends LinearLayout {
         m.checkNotNullExpressionValue(materialButton, "binding.itemGameInviteActionBtn");
         boolean z4 = false;
         materialButton.setVisibility(0);
-        int i = 2131890951;
+        int i = R.string.join;
         if (z2 || !model.getCanJoin()) {
             MaterialButton materialButton2 = this.binding.b;
             m.checkNotNullExpressionValue(materialButton2, "binding.itemGameInviteActionBtn");
             materialButton2.setEnabled(false);
-            this.binding.b.setText(2131890951);
+            this.binding.b.setText(R.string.join);
             return;
         }
         MaterialButton materialButton3 = this.binding.b;
@@ -537,9 +540,9 @@ public final class ViewEmbedGameInvite extends LinearLayout {
         materialButton3.setEnabled(z4);
         MaterialButton materialButton4 = this.binding.b;
         if (z3) {
-            i = 2131890818;
+            i = R.string.invite_embed_full_group;
         } else if (model.isInParty()) {
-            i = 2131890830;
+            i = R.string.invite_embed_joined;
         }
         materialButton4.setText(i);
         this.binding.b.setOnClickListener(new ViewEmbedGameInvite$onConfigureActionButton$1(this, model));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ViewReplySpline.java b/app/src/main/java/com/discord/widgets/chat/list/ViewReplySpline.java
index b410c2a8dd..ad5f2da8b7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ViewReplySpline.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ViewReplySpline.java
@@ -67,7 +67,7 @@ public final class ViewReplySpline extends View {
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeCap(Paint.Cap.ROUND);
         paint.setStrokeWidth(f);
-        paint.setColor(ColorCompat.getThemedColor(this, 2130968892));
+        paint.setColor(ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundAccent));
         if (attributeSet != null) {
             TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.ViewReplySpline, 0, 0);
             m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…* defStyleRes */0\n      )");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java
index 2a107321fa..9b184277f4 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChatListBinding;
 import com.discord.stores.StoreStream;
@@ -37,7 +38,7 @@ public final class WidgetChatList extends AppFragment {
     private final Lazy flexInputViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(AppFlexInputViewModel.class), new WidgetChatList$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(new WidgetChatList$flexInputViewModel$2(this)));
 
     public WidgetChatList() {
-        super(2131558949);
+        super(R.layout.widget_chat_list);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChatList widgetChatList, WidgetChatListModel widgetChatListModel) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/EmojiViewHolder.java b/app/src/main/java/com/discord/widgets/chat/list/actions/EmojiViewHolder.java
index d5a1488bd5..d2d55fda1a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/EmojiViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/EmojiViewHolder.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.list.actions;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.databinding.ViewChatListActionsEmojiItemBinding;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.utilities.dimen.DimenUtils;
@@ -17,7 +18,7 @@ public final class EmojiViewHolder extends MGRecyclerViewHolder<WidgetChatListAc
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public EmojiViewHolder(WidgetChatListActionsEmojisAdapter widgetChatListActionsEmojisAdapter) {
-        super(2131558744, widgetChatListActionsEmojisAdapter);
+        super((int) R.layout.view_chat_list_actions_emoji_item, widgetChatListActionsEmojisAdapter);
         m.checkNotNullParameter(widgetChatListActionsEmojisAdapter, "adapter");
         View view = this.itemView;
         Objects.requireNonNull(view, "rootView");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java
index db6ff79509..43116ef3a8 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.actions;
 
 import android.content.Context;
 import android.view.View;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.models.message.Message;
 import com.discord.utilities.rest.RestAPI;
@@ -40,7 +41,7 @@ public final class MessageActionDialogs$showPinMessageConfirmation$1 extends o i
 
         public final void invoke(Void r5) {
             MessageActionDialogs$showPinMessageConfirmation$1 messageActionDialogs$showPinMessageConfirmation$1 = this.this$0;
-            c.a.e.o.g(messageActionDialogs$showPinMessageConfirmation$1.$context, messageActionDialogs$showPinMessageConfirmation$1.$isPinned ? 2131891500 : 2131891484, 0, null, 12);
+            c.a.e.o.g(messageActionDialogs$showPinMessageConfirmation$1.$context, messageActionDialogs$showPinMessageConfirmation$1.$isPinned ? R.string.message_unpinned : R.string.message_pinned, 0, null, 12);
             this.this$0.$onSuccess.mo1invoke();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java
index bfd13eb7b2..6ae71222e5 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.actions;
 
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.PublishActionDialog;
@@ -24,10 +25,10 @@ public final class MessageActionDialogs {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(function0, "onSuccess");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = context.getString(2131888087);
-        String string2 = context.getString(2131888088);
+        String string = context.getString(R.string.delete_message);
+        String string2 = context.getString(R.string.delete_message_body);
         m.checkNotNullExpressionValue(string2, "context.getString(R.string.delete_message_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(2131888076), context.getString(2131887193), g0.mapOf(o.to(2131364252, new MessageActionDialogs$showDeleteMessageConfirmation$1(message, function0))), null, null, null, 2130969796, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(R.string.delete), context.getString(R.string.cancel), g0.mapOf(o.to(Integer.valueOf((int) R.id.notice_ok), new MessageActionDialogs$showDeleteMessageConfirmation$1(message, function0))), null, null, null, Integer.valueOf((int) R.attr.notice_theme_positive_red), null, null, 0, null, 15808, null);
     }
 
     public final void showPinMessageConfirmation(FragmentManager fragmentManager, Context context, Message message, AppComponent appComponent, Function0<Unit> function0) {
@@ -38,10 +39,10 @@ public final class MessageActionDialogs {
         m.checkNotNullParameter(function0, "onSuccess");
         boolean areEqual = m.areEqual(message.getPinned(), Boolean.TRUE);
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = context.getString(areEqual ? 2131894518 : 2131892232);
-        String string2 = context.getString(areEqual ? 2131894514 : 2131892230);
+        String string = context.getString(areEqual ? R.string.unpin_message_title : R.string.pin_message_title);
+        String string2 = context.getString(areEqual ? R.string.unpin_message_body : R.string.pin_message_body_mobile);
         m.checkNotNullExpressionValue(string2, "context.getString(\n     …age_body_mobile\n        )");
-        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(areEqual ? 2131894511 : 2131892226), context.getString(2131887193), g0.mapOf(o.to(2131364252, new MessageActionDialogs$showPinMessageConfirmation$1(message, areEqual, appComponent, context, function0))), null, null, null, null, null, null, 0, null, 16320, null);
+        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(areEqual ? R.string.unpin : R.string.pin), context.getString(R.string.cancel), g0.mapOf(o.to(Integer.valueOf((int) R.id.notice_ok), new MessageActionDialogs$showPinMessageConfirmation$1(message, areEqual, appComponent, context, function0))), null, null, null, null, null, null, 0, null, 16320, null);
     }
 
     public final void showPublishMessageConfirmation(FragmentManager fragmentManager, Message message, Function0<Unit> function0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.java
index d3ee4f6f6b..24fcf8f535 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MoreEmojisViewHolder.java
@@ -1,12 +1,13 @@
 package com.discord.widgets.chat.list.actions;
 
+import com.discord.R;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import d0.z.d.m;
 /* compiled from: WidgetChatListActionsEmojisAdapter.kt */
 public final class MoreEmojisViewHolder extends MGRecyclerViewHolder<WidgetChatListActionsEmojisAdapter, EmojiItem> {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public MoreEmojisViewHolder(WidgetChatListActionsEmojisAdapter widgetChatListActionsEmojisAdapter) {
-        super(2131558745, widgetChatListActionsEmojisAdapter);
+        super((int) R.layout.view_chat_list_actions_emoji_item_more, widgetChatListActionsEmojisAdapter);
         m.checkNotNullParameter(widgetChatListActionsEmojisAdapter, "adapter");
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java
index 2eaee11863..735e250041 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListActionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -19,56 +20,56 @@ public final /* synthetic */ class WidgetChatListActions$binding$2 extends k imp
 
     public final WidgetChatListActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362927;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362927);
+        int i = R.id.dialog_chat_actions_add_reaction_emojis_list;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.dialog_chat_actions_add_reaction_emojis_list);
         if (recyclerView != null) {
-            i = 2131362928;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362928);
+            i = R.id.dialog_chat_actions_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.dialog_chat_actions_container);
             if (linearLayout != null) {
-                i = 2131362929;
-                TextView textView = (TextView) view.findViewById(2131362929);
+                i = R.id.dialog_chat_actions_copy;
+                TextView textView = (TextView) view.findViewById(R.id.dialog_chat_actions_copy);
                 if (textView != null) {
-                    i = 2131362930;
-                    TextView textView2 = (TextView) view.findViewById(2131362930);
+                    i = R.id.dialog_chat_actions_copy_id;
+                    TextView textView2 = (TextView) view.findViewById(R.id.dialog_chat_actions_copy_id);
                     if (textView2 != null) {
-                        i = 2131362931;
-                        TextView textView3 = (TextView) view.findViewById(2131362931);
+                        i = R.id.dialog_chat_actions_delete;
+                        TextView textView3 = (TextView) view.findViewById(R.id.dialog_chat_actions_delete);
                         if (textView3 != null) {
-                            i = 2131362932;
-                            TextView textView4 = (TextView) view.findViewById(2131362932);
+                            i = R.id.dialog_chat_actions_edit;
+                            TextView textView4 = (TextView) view.findViewById(R.id.dialog_chat_actions_edit);
                             if (textView4 != null) {
-                                i = 2131362933;
-                                TextView textView5 = (TextView) view.findViewById(2131362933);
+                                i = R.id.dialog_chat_actions_manage_reactions;
+                                TextView textView5 = (TextView) view.findViewById(R.id.dialog_chat_actions_manage_reactions);
                                 if (textView5 != null) {
-                                    i = 2131362934;
-                                    TextView textView6 = (TextView) view.findViewById(2131362934);
+                                    i = R.id.dialog_chat_actions_mark_unread;
+                                    TextView textView6 = (TextView) view.findViewById(R.id.dialog_chat_actions_mark_unread);
                                     if (textView6 != null) {
-                                        i = 2131362935;
-                                        TextView textView7 = (TextView) view.findViewById(2131362935);
+                                        i = R.id.dialog_chat_actions_pin;
+                                        TextView textView7 = (TextView) view.findViewById(R.id.dialog_chat_actions_pin);
                                         if (textView7 != null) {
-                                            i = 2131362936;
-                                            TextView textView8 = (TextView) view.findViewById(2131362936);
+                                            i = R.id.dialog_chat_actions_profile;
+                                            TextView textView8 = (TextView) view.findViewById(R.id.dialog_chat_actions_profile);
                                             if (textView8 != null) {
-                                                i = 2131362937;
-                                                TextView textView9 = (TextView) view.findViewById(2131362937);
+                                                i = R.id.dialog_chat_actions_publish;
+                                                TextView textView9 = (TextView) view.findViewById(R.id.dialog_chat_actions_publish);
                                                 if (textView9 != null) {
-                                                    i = 2131362938;
-                                                    TextView textView10 = (TextView) view.findViewById(2131362938);
+                                                    i = R.id.dialog_chat_actions_remove_all_reactions;
+                                                    TextView textView10 = (TextView) view.findViewById(R.id.dialog_chat_actions_remove_all_reactions);
                                                     if (textView10 != null) {
-                                                        i = 2131362939;
-                                                        TextView textView11 = (TextView) view.findViewById(2131362939);
+                                                        i = R.id.dialog_chat_actions_reply;
+                                                        TextView textView11 = (TextView) view.findViewById(R.id.dialog_chat_actions_reply);
                                                         if (textView11 != null) {
-                                                            i = 2131362940;
-                                                            TextView textView12 = (TextView) view.findViewById(2131362940);
+                                                            i = R.id.dialog_chat_actions_report;
+                                                            TextView textView12 = (TextView) view.findViewById(R.id.dialog_chat_actions_report);
                                                             if (textView12 != null) {
-                                                                i = 2131362941;
-                                                                TextView textView13 = (TextView) view.findViewById(2131362941);
+                                                                i = R.id.dialog_chat_actions_resend;
+                                                                TextView textView13 = (TextView) view.findViewById(R.id.dialog_chat_actions_resend);
                                                                 if (textView13 != null) {
-                                                                    i = 2131362942;
-                                                                    TextView textView14 = (TextView) view.findViewById(2131362942);
+                                                                    i = R.id.dialog_chat_actions_share;
+                                                                    TextView textView14 = (TextView) view.findViewById(R.id.dialog_chat_actions_share);
                                                                     if (textView14 != null) {
-                                                                        i = 2131362943;
-                                                                        TextView textView15 = (TextView) view.findViewById(2131362943);
+                                                                        i = R.id.dialog_chat_actions_start_thread;
+                                                                        TextView textView15 = (TextView) view.findViewById(R.id.dialog_chat_actions_start_thread);
                                                                         if (textView15 != null) {
                                                                             return new WidgetChatListActionsBinding((NestedScrollView) view, recyclerView, linearLayout, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, textView13, textView14, textView15);
                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java
index 3f57bf4e75..ced976b139 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.actions;
 
 import android.content.Intent;
 import android.view.View;
+import com.discord.R;
 import com.discord.utilities.intent.IntentUtils;
 import com.discord.widgets.chat.list.actions.WidgetChatListActions;
 /* compiled from: WidgetChatListActions.kt */
@@ -18,7 +19,7 @@ public final class WidgetChatListActions$configureUI$10 implements View.OnClickL
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        this.this$0.requireContext().startActivity(Intent.createChooser(IntentUtils.INSTANCE.toExternalizedSend(IntentUtils.RouteBuilders.selectChannel(this.$data.getMessage().getChannelId(), this.$guildId, Long.valueOf(this.$data.getMessage().getId()))), this.this$0.getString(2131893629)));
+        this.this$0.requireContext().startActivity(Intent.createChooser(IntentUtils.INSTANCE.toExternalizedSend(IntentUtils.RouteBuilders.selectChannel(this.$data.getMessage().getChannelId(), this.$guildId, Long.valueOf(this.$data.getMessage().getId()))), this.this$0.getString(R.string.share_to)));
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
index a343c2bde1..da8b4faf2a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.api.user.User;
@@ -73,10 +74,10 @@ public final class WidgetChatListActions extends AppBottomSheet {
             m.checkNotNullParameter(charSequence, "messageContent");
             WidgetChatListActions widgetChatListActions = new WidgetChatListActions();
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_EXTRA_MESSAGE_CHANNEL_ID", j);
-            bundle.putLong("INTENT_EXTRA_MESSAGE_ID", j2);
-            bundle.putCharSequence("INTENT_EXTRA_MESSAGE_CONTENT", charSequence);
-            bundle.putInt("INTENT_EXTRA_TYPE", 0);
+            bundle.putLong(WidgetChatListActions.INTENT_EXTRA_MESSAGE_CHANNEL_ID, j);
+            bundle.putLong(WidgetChatListActions.INTENT_EXTRA_MESSAGE_ID, j2);
+            bundle.putCharSequence(WidgetChatListActions.INTENT_EXTRA_MESSAGE_CONTENT, charSequence);
+            bundle.putInt(WidgetChatListActions.INTENT_EXTRA_TYPE, 0);
             widgetChatListActions.setArguments(bundle);
             widgetChatListActions.show(fragmentManager, WidgetChatListActions.class.getName());
         }
@@ -85,10 +86,10 @@ public final class WidgetChatListActions extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(charSequence, "messageContent");
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_EXTRA_MESSAGE_CHANNEL_ID", j);
-            bundle.putLong("INTENT_EXTRA_MESSAGE_ID", j2);
-            bundle.putCharSequence("INTENT_EXTRA_MESSAGE_CONTENT", charSequence);
-            bundle.putInt("INTENT_EXTRA_TYPE", 1);
+            bundle.putLong(WidgetChatListActions.INTENT_EXTRA_MESSAGE_CHANNEL_ID, j);
+            bundle.putLong(WidgetChatListActions.INTENT_EXTRA_MESSAGE_ID, j2);
+            bundle.putCharSequence(WidgetChatListActions.INTENT_EXTRA_MESSAGE_CONTENT, charSequence);
+            bundle.putInt(WidgetChatListActions.INTENT_EXTRA_TYPE, 1);
             WidgetChatListActions widgetChatListActions = new WidgetChatListActions();
             widgetChatListActions.setArguments(bundle);
             widgetChatListActions.show(fragmentManager, WidgetChatListActions.class.getName());
@@ -431,7 +432,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
         RecyclerView recyclerView5 = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView5, "binding.dialogChatActionsAddReactionEmojisList");
         int paddingEnd = recyclerView5.getPaddingEnd() + paddingStart;
-        int dimensionPixelSize = getResources().getDimensionPixelSize(2131165316);
+        int dimensionPixelSize = getResources().getDimensionPixelSize(R.dimen.chat_input_emoji_size);
         int dpToPixels = DimenUtils.dpToPixels(8);
         int i = width - paddingEnd;
         int min = Math.min(list.size() + 1, (i + dpToPixels) / (dimensionPixelSize + dpToPixels));
@@ -534,7 +535,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 TextView textView12 = getBinding().i;
                 m.checkNotNullExpressionValue(textView12, "binding.dialogChatActionsPin");
                 textView12.setVisibility(!model.getManageMessageContext().getCanTogglePinned() ? 0 : 8);
-                getBinding().i.setText(!m.areEqual(model.getMessage().getPinned(), Boolean.TRUE) ? 2131894511 : 2131892226);
+                getBinding().i.setText(!m.areEqual(model.getMessage().getPinned(), Boolean.TRUE) ? R.string.unpin : R.string.pin);
                 getBinding().i.setOnClickListener(new WidgetChatListActions$configureUI$11(this, model));
                 TextView textView13 = getBinding().e;
                 m.checkNotNullExpressionValue(textView13, "binding.dialogChatActionsDelete");
@@ -577,7 +578,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
         TextView textView12 = getBinding().i;
         m.checkNotNullExpressionValue(textView12, "binding.dialogChatActionsPin");
         textView12.setVisibility(!model.getManageMessageContext().getCanTogglePinned() ? 0 : 8);
-        getBinding().i.setText(!m.areEqual(model.getMessage().getPinned(), Boolean.TRUE) ? 2131894511 : 2131892226);
+        getBinding().i.setText(!m.areEqual(model.getMessage().getPinned(), Boolean.TRUE) ? R.string.unpin : R.string.pin);
         getBinding().i.setOnClickListener(new WidgetChatListActions$configureUI$11(this, model));
         TextView textView13 = getBinding().e;
         m.checkNotNullExpressionValue(textView13, "binding.dialogChatActionsDelete");
@@ -632,10 +633,10 @@ public final class WidgetChatListActions extends AppBottomSheet {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        String string = getString(2131892942);
-        String string2 = getString(2131892941);
+        String string = getString(R.string.remove_all_reactions_confirm_title);
+        String string2 = getString(R.string.remove_all_reactions_confirm_body);
         m.checkNotNullExpressionValue(string2, "getString(R.string.remov…l_reactions_confirm_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, getString(2131895113), getString(2131891762), g0.mapOf(o.to(2131364252, new WidgetChatListActions$removeAllReactions$1(this, model))), null, null, null, null, null, null, 0, null, 16320, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, getString(R.string.yes_text), getString(R.string.no_text), g0.mapOf(o.to(Integer.valueOf((int) R.id.notice_ok), new WidgetChatListActions$removeAllReactions$1(this, model))), null, null, null, null, null, null, 0, null, 16320, null);
     }
 
     private final void replyMessage(Message message, Channel channel) {
@@ -673,14 +674,14 @@ public final class WidgetChatListActions extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558950;
+        return R.layout.widget_chat_list_actions;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
     public void onResume() {
         super.onResume();
         AppBottomSheet.hideKeyboard$default(this, null, 1, null);
-        Observable r = ObservableExtensionsKt.computationLatest(Model.Companion.get(this.channelId, this.messageId, getArgumentsOrDefault().getCharSequence("INTENT_EXTRA_MESSAGE_CONTENT"), getArgumentsOrDefault().getInt("INTENT_EXTRA_TYPE"))).r();
+        Observable r = ObservableExtensionsKt.computationLatest(Model.Companion.get(this.channelId, this.messageId, getArgumentsOrDefault().getCharSequence(INTENT_EXTRA_MESSAGE_CONTENT), getArgumentsOrDefault().getInt(INTENT_EXTRA_TYPE))).r();
         m.checkNotNullExpressionValue(r, "Model.get(channelId, mes…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetChatListActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListActions$onResume$1(this), 62, (Object) null);
     }
@@ -689,8 +690,8 @@ public final class WidgetChatListActions extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        this.channelId = getArgumentsOrDefault().getLong("INTENT_EXTRA_MESSAGE_CHANNEL_ID");
-        this.messageId = getArgumentsOrDefault().getLong("INTENT_EXTRA_MESSAGE_ID");
+        this.channelId = getArgumentsOrDefault().getLong(INTENT_EXTRA_MESSAGE_CHANNEL_ID);
+        this.messageId = getArgumentsOrDefault().getLong(INTENT_EXTRA_MESSAGE_ID);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.dialogChatActionsAddReactionEmojisList");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java
index 9db7266522..1eeae01026 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java
@@ -8,10 +8,13 @@ import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.q.a.k.a;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
@@ -245,7 +248,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             }
 
             public static boolean onQuickDownloadClicked(EventHandler eventHandler, Uri uri, String str) {
-                m.checkNotNullParameter(uri, "uri");
+                m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
                 m.checkNotNullParameter(str, "fileName");
                 return false;
             }
@@ -281,7 +284,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
 
             public static void onUserActivityAction(EventHandler eventHandler, long j, long j2, long j3, MessageActivityType messageActivityType, Activity activity, Application application) {
                 m.checkNotNullParameter(messageActivityType, "messageActivityType");
-                m.checkNotNullParameter(activity, "activity");
+                m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
                 m.checkNotNullParameter(application, "application");
             }
 
@@ -427,7 +430,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
         }
 
         private final void animateHighlight(View view) {
-            view.setBackgroundResource(2131231032);
+            view.setBackgroundResource(R.drawable.drawable_bg_highlight);
             Drawable background = view.getBackground();
             Objects.requireNonNull(background, "null cannot be cast to non-null type android.graphics.drawable.TransitionDrawable");
             TransitionDrawable transitionDrawable = (TransitionDrawable) background;
@@ -700,11 +703,11 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
         switch (i) {
             case 0:
             case 32:
-                return new WidgetChatListAdapterItemMessage(2131558987, this);
+                return new WidgetChatListAdapterItemMessage(R.layout.widget_chat_list_adapter_item_text, this);
             case 1:
-                return new WidgetChatListAdapterItemMessage(2131558971, this);
+                return new WidgetChatListAdapterItemMessage(R.layout.widget_chat_list_adapter_item_minimal, this);
             case 2:
-                return new WidgetChatListItem(2131558968, this);
+                return new WidgetChatListItem(R.layout.widget_chat_list_adapter_item_loading, this);
             case 3:
                 return new WidgetChatListAdapterItemStart(this);
             case 4:
@@ -714,7 +717,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 6:
                 return new WidgetChatListAdapterItemUploadProgress(this);
             case 7:
-                return new WidgetChatListItem(2131558979, this);
+                return new WidgetChatListItem(R.layout.widget_chat_list_adapter_item_spacer, this);
             case 8:
                 return new WidgetChatListAdapterItemNewMessages(this);
             case 9:
@@ -724,13 +727,13 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 11:
                 return new WidgetChatListAdapterItemSearchResultCount(this);
             case 12:
-                return new MGRecyclerViewHolder<>(2131558977, this);
+                return new MGRecyclerViewHolder<>((int) R.layout.widget_chat_list_adapter_item_search_indexing, this);
             case 13:
-                return new MGRecyclerViewHolder<>(2131558975, this);
+                return new MGRecyclerViewHolder<>((int) R.layout.widget_chat_list_adapter_item_search_empty, this);
             case 14:
-                return new MGRecyclerViewHolder<>(2131558976, this);
+                return new MGRecyclerViewHolder<>((int) R.layout.widget_chat_list_adapter_item_search_error, this);
             case 15:
-                return new MGRecyclerViewHolder<>(2131558956, this);
+                return new MGRecyclerViewHolder<>((int) R.layout.widget_chat_list_adapter_item_divider, this);
             case 16:
                 return new WidgetChatListAdapterItemEmptyPins(this);
             case 17:
@@ -740,7 +743,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 19:
                 return new WidgetChatListAdapterItemCallMessage(this);
             case 20:
-                return new WidgetChatListAdapterItemMessage(2131558961, this);
+                return new WidgetChatListAdapterItemMessage(R.layout.widget_chat_list_adapter_item_failed, this);
             case 21:
                 return new WidgetChatListAdapterItemEmbed(this);
             case 22:
@@ -779,7 +782,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 39:
                 return new WidgetChatListAdapterItemStageInvite(this);
             case 40:
-                return new MGRecyclerViewHolder<>(2131558991, this);
+                return new MGRecyclerViewHolder<>((int) R.layout.widget_chat_list_adapter_item_thread_starter_divider, this);
             case 41:
                 return new WidgetChatListAdapterItemStickerGreet(this);
             case 42:
@@ -839,7 +842,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
 
     public final void onUserActivityAction(long j, long j2, MessageActivityType messageActivityType, Activity activity, Application application) {
         m.checkNotNullParameter(messageActivityType, "messageActivityType");
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(application, "application");
         this.eventHandler.onUserActivityAction(j, this.data.getChannelId(), j2, messageActivityType, activity, application);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java
index df681e7cff..f26068530a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.net.Uri;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.app.AppLog;
 import com.discord.utilities.io.NetworkUtils;
 import d0.z.d.m;
@@ -40,7 +41,7 @@ public final class WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1 e
         public final void invoke(String str) {
             Context context = (Context) this.this$0.$weakContext.get();
             if (context != null) {
-                c.a.e.o.h(context, b.h(context, 2131888216, new Object[]{str}, null, 4), 0, null, 12);
+                c.a.e.o.h(context, b.h(context, R.string.download_file_complete, new Object[]{str}, null, 4), 0, null, 12);
             }
         }
     }
@@ -69,7 +70,7 @@ public final class WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1 e
             AppLog.i("Could not download attachment due to:  \n" + th);
             Context context = (Context) this.this$0.$weakContext.get();
             if (context != null) {
-                c.a.e.o.h((Context) this.this$0.$weakContext.get(), context.getString(2131888215), 0, null, 12);
+                c.a.e.o.h((Context) this.this$0.$weakContext.get(), context.getString(R.string.download_failed), 0, null, 12);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java
index 15cfa9eba7..a363c6984d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.ActivityActionConfirmation;
 import com.discord.api.application.Application;
 import com.discord.utilities.intent.IntentUtils;
@@ -40,7 +41,7 @@ public final class WidgetChatListAdapterEventsHandler$onUserActivityAction$1 ext
             join.addFlags(268435456);
             WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0).startActivity(join);
         } catch (ActivityNotFoundException unused) {
-            c.a.e.o.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), b.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), 2131894645, new Object[]{this.$application.g()}, null, 4), 0, null, 12);
+            c.a.e.o.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), b.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), R.string.user_activity_not_detected, new Object[]{this.$application.g()}, null, 4), 0, null, 12);
             String str = (String) u.firstOrNull((List<? extends Object>) this.$application.d());
             if (str != null) {
                 UriHandler.directToPlayStore$default(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), str, null, 4, null);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
index 194a7e84a3..abddafc718 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
@@ -3,10 +3,13 @@ package com.discord.widgets.chat.list.adapter;
 import a0.a.a.b;
 import android.content.Context;
 import android.net.Uri;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.o;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
@@ -19,6 +22,7 @@ import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerType;
 import com.discord.api.user.User;
 import com.discord.app.AppFragment;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
@@ -32,6 +36,7 @@ import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.AnalyticsUtils;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.channel.ChannelSelector;
 import com.discord.utilities.guilds.MemberVerificationUtils;
 import com.discord.utilities.guilds.PublicGuildUtils;
@@ -42,6 +47,7 @@ import com.discord.widgets.channels.list.WidgetChannelsListItemThreadActions;
 import com.discord.widgets.chat.MessageManager;
 import com.discord.widgets.chat.WidgetUrlActions;
 import com.discord.widgets.chat.input.AppFlexInputViewModel;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.list.actions.WidgetChatListActions;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapterItemCallMessage;
@@ -222,7 +228,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
             this.requestStream = k0;
             TimeUnit timeUnit = TimeUnit.MILLISECONDS;
             Objects.requireNonNull(k0);
-            Observable h02 = Observable.h0(new r(k0.i, new l2(250, timeUnit, j0.p.a.a())));
+            Observable h02 = Observable.h0(new r(k0.i, new l2(REQUEST_RATE_LIMIT_MILLIS, timeUnit, j0.p.a.a())));
             m.checkNotNullExpressionValue(h02, "requestStream\n          …S, TimeUnit.MILLISECONDS)");
             ObservableExtensionsKt.appSubscribe$default(h02, appFragment.getClass(), appFragment.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
         }
@@ -247,7 +253,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
             MessageReaction component4 = updateRequest.component4();
             MessageReactionUpdate messageReactionUpdate = new MessageReactionUpdate(component1, component2, component3, component4.b());
             if (component4.b().e()) {
-                str = component4.b().d() + ':' + component4.b().b();
+                str = component4.b().d() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + component4.b().b();
             } else {
                 str = component4.b().d();
                 if (str == null) {
@@ -419,7 +425,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
             }
             return;
         }
-        o.g(getContext(), 2131894686, 0, null, 8);
+        o.g(getContext(), R.string.user_profile_failure_to_open_message, 0, null, 8);
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
@@ -481,12 +487,12 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onQuickAddReactionClicked(long j, long j2, long j3, long j4) {
-        MemberVerificationUtils.INSTANCE.maybeShowVerificationGate(getContext(), getFragmentManager(), j, "Emoji Picker Popout", null, new WidgetChatListAdapterEventsHandler$onQuickAddReactionClicked$1(this, j3, j4));
+        MemberVerificationUtils.INSTANCE.maybeShowVerificationGate(getContext(), getFragmentManager(), j, Traits.Location.Section.EMOJI_PICKER_POPOUT, null, new WidgetChatListAdapterEventsHandler$onQuickAddReactionClicked$1(this, j3, j4));
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public boolean onQuickDownloadClicked(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "fileName");
         this.host.requestMediaDownload(new WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1(this, uri, str, new WeakReference(getContext())));
         return true;
@@ -496,22 +502,22 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
     public void onReactionClicked(long j, long j2, long j3, long j4, MessageReaction messageReaction, boolean z2) {
         m.checkNotNullParameter(messageReaction, "reaction");
         if (z2) {
-            MemberVerificationUtils.INSTANCE.maybeShowVerificationGate(getContext(), getFragmentManager(), j, "Emoji Picker Popout", null, new WidgetChatListAdapterEventsHandler$onReactionClicked$1(this, j2, j3, j4, messageReaction));
+            MemberVerificationUtils.INSTANCE.maybeShowVerificationGate(getContext(), getFragmentManager(), j, Traits.Location.Section.EMOJI_PICKER_POPOUT, null, new WidgetChatListAdapterEventsHandler$onReactionClicked$1(this, j2, j3, j4, messageReaction));
         } else {
-            o.g(getContext(), 2131886725, 0, null, 8);
+            o.g(getContext(), R.string.archived_thread_reactions_disabled_toast, 0, null, 8);
         }
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onReactionLongClicked(long j, long j2, long j3, MessageReaction messageReaction) {
         m.checkNotNullParameter(messageReaction, "reaction");
-        MemberVerificationUtils.INSTANCE.maybeShowVerificationGate(getContext(), getFragmentManager(), j, "Emoji Picker Popout", null, new WidgetChatListAdapterEventsHandler$onReactionLongClicked$1(this, j2, j3, messageReaction));
+        MemberVerificationUtils.INSTANCE.maybeShowVerificationGate(getContext(), getFragmentManager(), j, Traits.Location.Section.EMOJI_PICKER_POPOUT, null, new WidgetChatListAdapterEventsHandler$onReactionLongClicked$1(this, j2, j3, messageReaction));
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onSendGreetMessageClicked(long j, int i, Sticker sticker) {
         m.checkNotNullParameter(sticker, "sticker");
-        AnalyticsTracker.INSTANCE.getTracker().track("dm_empty_action", h0.mutableMapOf(d0.o.to("channel_id", Long.valueOf(j)), d0.o.to("channel_type", Integer.valueOf(i)), d0.o.to("source", "Wave"), d0.o.to("type", "Send wave")));
+        AnalyticsTracker.INSTANCE.getTracker().track("dm_empty_action", h0.mutableMapOf(d0.o.to(ModelAuditLogEntry.CHANGE_KEY_CHANNEL_ID, Long.valueOf(j)), d0.o.to("channel_type", Integer.valueOf(i)), d0.o.to("source", "Wave"), d0.o.to("type", "Send wave")));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().sendGreetMessage(j, new RestAPIParams.GreetMessage(d0.t.m.listOf(Long.valueOf(sticker.getId())))), false, 1, null), this.host, null, 2, null), this.host.getClass(), this.host.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, WidgetChatListAdapterEventsHandler$onSendGreetMessageClicked$1.INSTANCE, 60, (Object) null);
     }
 
@@ -549,7 +555,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onUserActivityAction(long j, long j2, long j3, MessageActivityType messageActivityType, Activity activity, Application application) {
         m.checkNotNullParameter(messageActivityType, "actionType");
-        m.checkNotNullParameter(activity, "activity");
+        m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(application, "application");
         Long a = activity.a();
         String k = activity.k();
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$1.java
index a25934cb29..49992724f7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -25,7 +26,7 @@ public final class WidgetChatListAdapterItemApplicationCommand$onConfigure$1 ext
             Context context = this.$this_copyTextOnLongPress.getContext();
             m.checkNotNullExpressionValue(context, "context");
             CharSequence text = this.$this_copyTextOnLongPress.getText();
-            m.checkNotNullExpressionValue(text, "text");
+            m.checkNotNullExpressionValue(text, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             c.a.e.o.c(context, text, 0, 4);
             return false;
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
index b91f47da18..7cea6c9b87 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
@@ -11,6 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.WidgetChatListAdapterItemApplicationCommandBinding;
@@ -18,6 +19,7 @@ import com.discord.models.member.GuildMember;
 import com.discord.models.message.Message;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.time.TimeUtils;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import com.discord.widgets.chat.list.entries.MessageEntry;
 import d0.g0.t;
@@ -31,32 +33,32 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemApplicationCommand(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558951, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_application_command, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362562;
-        ImageView imageView = (ImageView) view.findViewById(2131362562);
+        int i = R.id.chat_list_adapter_item_text_avatar;
+        ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_adapter_item_text_avatar);
         if (imageView != null) {
-            i = 2131362563;
-            TextView textView = (TextView) view.findViewById(2131362563);
+            i = R.id.chat_list_adapter_item_text_command;
+            TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_command);
             if (textView != null) {
-                i = 2131362564;
-                CardView cardView = (CardView) view.findViewById(2131362564);
+                i = R.id.chat_list_adapter_item_text_decorator;
+                CardView cardView = (CardView) view.findViewById(R.id.chat_list_adapter_item_text_decorator);
                 if (cardView != null) {
-                    i = 2131362567;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362567);
+                    i = R.id.chat_list_adapter_item_text_decorator_reply_link_icon;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.chat_list_adapter_item_text_decorator_reply_link_icon);
                     if (frameLayout != null) {
-                        i = 2131362571;
-                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362571);
+                        i = R.id.chat_list_adapter_item_text_header;
+                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.chat_list_adapter_item_text_header);
                         if (constraintLayout != null) {
-                            i = 2131362573;
-                            TextView textView2 = (TextView) view.findViewById(2131362573);
+                            i = R.id.chat_list_adapter_item_text_name;
+                            TextView textView2 = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_name);
                             if (textView2 != null) {
-                                i = 2131362576;
-                                TextView textView3 = (TextView) view.findViewById(2131362576);
+                                i = R.id.chat_list_adapter_item_text_timestamp;
+                                TextView textView3 = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_timestamp);
                                 if (textView3 != null) {
-                                    i = 2131365605;
-                                    Guideline guideline = (Guideline) view.findViewById(2131365605);
+                                    i = R.id.uikit_chat_guideline;
+                                    Guideline guideline = (Guideline) view.findViewById(R.id.uikit_chat_guideline);
                                     if (guideline != null) {
                                         WidgetChatListAdapterItemApplicationCommandBinding widgetChatListAdapterItemApplicationCommandBinding = new WidgetChatListAdapterItemApplicationCommandBinding((ConstraintLayout) view, imageView, textView, cardView, frameLayout, constraintLayout, textView2, textView3, guideline);
                                         m.checkNotNullExpressionValue(widgetChatListAdapterItemApplicationCommandBinding, "WidgetChatListAdapterIte…andBinding.bind(itemView)");
@@ -84,7 +86,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
     private final int getAuthorTextColor(GuildMember guildMember) {
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
-        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), 2130968932));
+        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), (int) R.attr.colorHeaderPrimary));
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:9:0x0048, code lost:
@@ -116,7 +118,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
             }
             str2 = matcher.group(3);
         } else {
-            str = "/";
+            str = AutocompleteViewModel.COMMAND_DISCOVER_TOKEN;
         }
         str2 = str3;
         User author2 = message.getAuthor();
@@ -126,10 +128,10 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
         }
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
-        int themedColor = ColorCompat.getThemedColor(view, 2130969008);
+        int themedColor = ColorCompat.getThemedColor(view, (int) R.attr.color_brand_500);
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextName");
-        CharSequence d = b.d(textView, 2131894157, new Object[]{str3, str}, new WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(this, authorTextColor, message, themedColor));
+        CharSequence d = b.d(textView, R.string.system_message_application_command_used_short_mobile, new Object[]{str3, str}, new WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(this, authorTextColor, message, themedColor));
         TextView textView2 = this.binding.e;
         m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemTextName");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -153,7 +155,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
         frameLayout.setVisibility(i2);
         TextView textView5 = this.binding.b;
         m.checkNotNullExpressionValue(textView5, "binding.chatListAdapterItemTextCommand");
-        textView5.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131887447, new Object[]{str, str2}, null, 4));
+        textView5.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.command_display_string, new Object[]{str, str2}, null, 4));
         TextView textView6 = this.binding.b;
         m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemTextCommand");
         widgetChatListAdapterItemApplicationCommand$onConfigure$1.invoke(textView6);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
index dfce12f0d0..66320d42d3 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
@@ -12,6 +12,7 @@ import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.attachment.MessageAttachmentType;
 import com.discord.api.role.GuildRole;
@@ -237,7 +238,7 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemAttachment(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558952, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_attachment, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE;
         View view = this.itemView;
@@ -246,38 +247,38 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte
         m.checkNotNullExpressionValue(context, "itemView.context");
         this.maxAttachmentImageWidth = embedResourceUtils.computeMaximumImageWidthPx(context);
         View view2 = this.itemView;
-        int i = 2131362549;
-        View findViewById = view2.findViewById(2131362549);
+        int i = R.id.chat_list_adapter_item_gutter_bg;
+        View findViewById = view2.findViewById(R.id.chat_list_adapter_item_gutter_bg);
         if (findViewById != null) {
-            i = 2131362551;
-            View findViewById2 = view2.findViewById(2131362551);
+            i = R.id.chat_list_adapter_item_highlighted_bg;
+            View findViewById2 = view2.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
             if (findViewById2 != null) {
-                i = 2131362583;
-                Barrier barrier = (Barrier) view2.findViewById(2131362583);
+                i = R.id.chat_list_item_attachment_barrier;
+                Barrier barrier = (Barrier) view2.findViewById(R.id.chat_list_item_attachment_barrier);
                 if (barrier != null) {
-                    i = 2131362584;
-                    MaterialCardView materialCardView = (MaterialCardView) view2.findViewById(2131362584);
+                    i = R.id.chat_list_item_attachment_card;
+                    MaterialCardView materialCardView = (MaterialCardView) view2.findViewById(R.id.chat_list_item_attachment_card);
                     if (materialCardView != null) {
-                        i = 2131362585;
-                        TextView textView = (TextView) view2.findViewById(2131362585);
+                        i = R.id.chat_list_item_attachment_description;
+                        TextView textView = (TextView) view2.findViewById(R.id.chat_list_item_attachment_description);
                         if (textView != null) {
-                            i = 2131362586;
-                            ImageView imageView = (ImageView) view2.findViewById(2131362586);
+                            i = R.id.chat_list_item_attachment_download;
+                            ImageView imageView = (ImageView) view2.findViewById(R.id.chat_list_item_attachment_download);
                             if (imageView != null) {
-                                i = 2131362587;
-                                ImageView imageView2 = (ImageView) view2.findViewById(2131362587);
+                                i = R.id.chat_list_item_attachment_icon;
+                                ImageView imageView2 = (ImageView) view2.findViewById(R.id.chat_list_item_attachment_icon);
                                 if (imageView2 != null) {
-                                    i = 2131362588;
-                                    InlineMediaView inlineMediaView = (InlineMediaView) view2.findViewById(2131362588);
+                                    i = R.id.chat_list_item_attachment_inline_media;
+                                    InlineMediaView inlineMediaView = (InlineMediaView) view2.findViewById(R.id.chat_list_item_attachment_inline_media);
                                     if (inlineMediaView != null) {
-                                        i = 2131362589;
-                                        TextView textView2 = (TextView) view2.findViewById(2131362589);
+                                        i = R.id.chat_list_item_attachment_name;
+                                        TextView textView2 = (TextView) view2.findViewById(R.id.chat_list_item_attachment_name);
                                         if (textView2 != null) {
-                                            i = 2131362590;
-                                            FrameLayout frameLayout = (FrameLayout) view2.findViewById(2131362590);
+                                            i = R.id.chat_list_item_attachment_spoiler;
+                                            FrameLayout frameLayout = (FrameLayout) view2.findViewById(R.id.chat_list_item_attachment_spoiler);
                                             if (frameLayout != null) {
-                                                i = 2131365605;
-                                                Guideline guideline = (Guideline) view2.findViewById(2131365605);
+                                                i = R.id.uikit_chat_guideline;
+                                                Guideline guideline = (Guideline) view2.findViewById(R.id.uikit_chat_guideline);
                                                 if (guideline != null) {
                                                     WidgetChatListAdapterItemAttachmentBinding widgetChatListAdapterItemAttachmentBinding = new WidgetChatListAdapterItemAttachmentBinding((ConstraintLayout) view2, findViewById, findViewById2, barrier, materialCardView, textView, imageView, imageView2, inlineMediaView, textView2, frameLayout, guideline);
                                                     m.checkNotNullExpressionValue(widgetChatListAdapterItemAttachmentBinding, "WidgetChatListAdapterIte…entBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java
index f52fad35bf..a5ae05352e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java
@@ -7,6 +7,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemBlockedBinding;
 import com.discord.models.message.Message;
 import com.discord.utilities.resources.StringResourceUtilsKt;
@@ -19,17 +20,17 @@ public final class WidgetChatListAdapterItemBlocked extends WidgetChatListItem {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemBlocked(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558953, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_blocked, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        TextView textView = (TextView) view.findViewById(2131362538);
+        TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_blocked);
         if (textView != null) {
             WidgetChatListAdapterItemBlockedBinding widgetChatListAdapterItemBlockedBinding = new WidgetChatListAdapterItemBlockedBinding((RelativeLayout) view, textView);
             m.checkNotNullExpressionValue(widgetChatListAdapterItemBlockedBinding, "WidgetChatListAdapterIte…kedBinding.bind(itemView)");
             this.binding = widgetChatListAdapterItemBlockedBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362538)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.chat_list_adapter_item_blocked)));
     }
 
     public static final /* synthetic */ WidgetChatListAdapter access$getAdapter$p(WidgetChatListAdapterItemBlocked widgetChatListAdapterItemBlocked) {
@@ -37,7 +38,7 @@ public final class WidgetChatListAdapterItemBlocked extends WidgetChatListItem {
     }
 
     private final CharSequence getBlockedText(Resources resources, Context context, int i) {
-        return b.i(resources, 2131887040, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755042, i, Integer.valueOf(i))}, null, 4);
+        return b.i(resources, R.string.blocked_messages, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.blocked_messages_count, i, Integer.valueOf(i))}, null, 4);
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
index 1e91a92807..96eb6ed508 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.api.botuikit.SelectItem;
 import com.discord.databinding.WidgetChatListAdapterItemBotComponentRowBinding;
 import com.discord.models.botuikit.MessageComponent;
@@ -28,17 +29,17 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemBotComponentRow(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558954, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_bot_component_row, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362545;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362545);
+        int i = R.id.chat_list_adapter_item_component_root;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.chat_list_adapter_item_component_root);
         if (linearLayout != null) {
-            i = 2131362549;
-            View findViewById = view.findViewById(2131362549);
+            i = R.id.chat_list_adapter_item_gutter_bg;
+            View findViewById = view.findViewById(R.id.chat_list_adapter_item_gutter_bg);
             if (findViewById != null) {
-                i = 2131362551;
-                View findViewById2 = view.findViewById(2131362551);
+                i = R.id.chat_list_adapter_item_highlighted_bg;
+                View findViewById2 = view.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
                 if (findViewById2 != null) {
                     WidgetChatListAdapterItemBotComponentRowBinding widgetChatListAdapterItemBotComponentRowBinding = new WidgetChatListAdapterItemBotComponentRowBinding((ConstraintLayout) view, linearLayout, findViewById, findViewById2);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemBotComponentRowBinding, "WidgetChatListAdapterIte…RowBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configure$1.java
index 274b7cf991..85ebb72f04 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configure$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configure$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.list.adapter;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetChatListAdapterItemCallMessage$configure$1 extends o im
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetChatListAdapterItemCallMessage.access$setStateSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.java
index ed09867d08..6d0547facd 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$configureSubtitle$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.list.adapter;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetChatListAdapterItemCallMessage$configureSubtitle$2 exte
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetChatListAdapterItemCallMessage.access$setOngoingCallDurationSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
index 213549a35a..629c908bf3 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
@@ -12,6 +12,7 @@ import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.message.call.MessageCall;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.WidgetChatListAdapterItemCallBinding;
@@ -203,26 +204,26 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemCallMessage(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558955, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_call, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362539;
-        ImageView imageView = (ImageView) view.findViewById(2131362539);
+        int i = R.id.chat_list_adapter_item_call_icon;
+        ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_adapter_item_call_icon);
         if (imageView != null) {
-            i = 2131362540;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362540);
+            i = R.id.chat_list_adapter_item_call_participants;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.chat_list_adapter_item_call_participants);
             if (recyclerView != null) {
-                i = 2131362541;
-                TextView textView = (TextView) view.findViewById(2131362541);
+                i = R.id.chat_list_adapter_item_call_subtitle;
+                TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_call_subtitle);
                 if (textView != null) {
-                    i = 2131362542;
-                    TextView textView2 = (TextView) view.findViewById(2131362542);
+                    i = R.id.chat_list_adapter_item_call_title;
+                    TextView textView2 = (TextView) view.findViewById(R.id.chat_list_adapter_item_call_title);
                     if (textView2 != null) {
-                        i = 2131362543;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362543);
+                        i = R.id.chat_list_adapter_item_call_unjoined_ongoing_subtitle;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.chat_list_adapter_item_call_unjoined_ongoing_subtitle);
                         if (linearLayout != null) {
-                            i = 2131362578;
-                            TextView textView3 = (TextView) view.findViewById(2131362578);
+                            i = R.id.chat_list_adapter_item_unjoined_call_duration;
+                            TextView textView3 = (TextView) view.findViewById(R.id.chat_list_adapter_item_unjoined_call_duration);
                             if (textView3 != null) {
                                 WidgetChatListAdapterItemCallBinding widgetChatListAdapterItemCallBinding = new WidgetChatListAdapterItemCallBinding((CardView) view, imageView, recyclerView, textView, textView2, linearLayout, textView3);
                                 m.checkNotNullExpressionValue(widgetChatListAdapterItemCallBinding, "WidgetChatListAdapterIte…allBinding.bind(itemView)");
@@ -337,11 +338,11 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
         } else if (ordinal == 2) {
             TextView textView2 = this.binding.d;
             m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemCallSubtitle");
-            b.n(textView2, 2131887121, new Object[]{humanizeDuration, obj}, null, 4);
+            b.n(textView2, R.string.call_ended_description, new Object[]{humanizeDuration, obj}, null, 4);
         } else if (ordinal == 3) {
             TextView textView3 = this.binding.d;
             m.checkNotNullExpressionValue(textView3, "binding.chatListAdapterItemCallSubtitle");
-            b.n(textView3, 2131887121, new Object[]{humanizeDuration, obj}, null, 4);
+            b.n(textView3, R.string.call_ended_description, new Object[]{humanizeDuration, obj}, null, 4);
         }
     }
 
@@ -382,23 +383,23 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
         Drawable drawable;
         int ordinal = callStatus.ordinal();
         if (ordinal == 0 || ordinal == 1) {
-            drawable = AppCompatResources.getDrawable(context, 2131231484);
+            drawable = AppCompatResources.getDrawable(context, R.drawable.ic_call_24dp);
             if (drawable == null) {
                 return null;
             }
-            ColorCompatKt.setTint(drawable, ColorCompat.getColor(context, 2131100254), false);
+            ColorCompatKt.setTint(drawable, ColorCompat.getColor(context, (int) R.color.status_green_600), false);
         } else if (ordinal == 2) {
-            drawable = AppCompatResources.getDrawable(context, 2131231485);
+            drawable = AppCompatResources.getDrawable(context, R.drawable.ic_call_disconnect_24dp);
             if (drawable == null) {
                 return null;
             }
-            ColorCompatKt.setTint(drawable, ColorCompat.getColor(context, 2131100316), false);
+            ColorCompatKt.setTint(drawable, ColorCompat.getColor(context, (int) R.color.status_red), false);
         } else if (ordinal == 3) {
-            drawable = AppCompatResources.getDrawable(context, 2131231484);
+            drawable = AppCompatResources.getDrawable(context, R.drawable.ic_call_24dp);
             if (drawable == null) {
                 return null;
             }
-            ColorCompatKt.setTint(drawable, ColorCompat.getThemedColor(context, 2130968949), false);
+            ColorCompatKt.setTint(drawable, ColorCompat.getThemedColor(context, (int) R.attr.colorInteractiveNormal), false);
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -453,13 +454,13 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
     private final CharSequence getTitleString(CallStatus callStatus, Resources resources) {
         int ordinal = callStatus.ordinal();
         if (ordinal == 0 || ordinal == 1) {
-            return b.i(resources, 2131892008, new Object[0], null, 4);
+            return b.i(resources, R.string.ongoing_call, new Object[0], null, 4);
         }
         if (ordinal == 2) {
-            return b.i(resources, 2131891525, new Object[0], null, 4);
+            return b.i(resources, R.string.missed_call, new Object[0], null, 4);
         }
         if (ordinal == 3) {
-            return b.i(resources, 2131887120, new Object[0], null, 4);
+            return b.i(resources, R.string.call_ended, new Object[0], null, 4);
         }
         throw new NoWhenBranchMatchedException();
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.java
index 85777a2616..d361612274 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedFields$1.java
@@ -7,6 +7,7 @@ import com.discord.utilities.textprocessing.AstRenderer;
 import com.discord.utilities.textprocessing.MessagePreprocessor;
 import com.discord.utilities.textprocessing.MessageRenderContext;
 import com.discord.utilities.textprocessing.node.SpoilerNode;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapterItemEmbed;
 import com.facebook.drawee.span.DraweeSpanStringBuilder;
 import d0.z.d.m;
@@ -51,7 +52,7 @@ public final class WidgetChatListAdapterItemEmbed$configureEmbedFields$1 extends
             WidgetChatListAdapterItemEmbed$configureEmbedFields$1 widgetChatListAdapterItemEmbed$configureEmbedFields$1 = this.this$0;
             long j = widgetChatListAdapterItemEmbed$configureEmbedFields$1.$messageId;
             int i = widgetChatListAdapterItemEmbed$configureEmbedFields$1.$embedIndex;
-            messageState.revealSpoilerEmbedData(j, i, this.$prefixKey + ':' + spoilerNode.getId());
+            messageState.revealSpoilerEmbedData(j, i, this.$prefixKey + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + spoilerNode.getId());
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
index 132f568752..3a03d6023c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
@@ -13,10 +13,12 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.app.NotificationCompat;
 import androidx.core.graphics.ColorUtils;
 import c.a.j.o4;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.message.embed.EmbedAuthor;
 import com.discord.api.message.embed.EmbedField;
 import com.discord.api.message.embed.EmbedFooter;
@@ -117,7 +119,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
                 Context context = this.$this_copyTextOnLongPress.getContext();
                 m.checkNotNullExpressionValue(context, "context");
                 CharSequence text = this.$this_copyTextOnLongPress.getText();
-                m.checkNotNullExpressionValue(text, "text");
+                m.checkNotNullExpressionValue(text, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
                 c.a.e.o.c(context, text, 0, 4);
                 return false;
             }
@@ -543,71 +545,71 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemEmbed(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558957, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_embed, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362549;
-        View findViewById = view.findViewById(2131362549);
+        int i = R.id.chat_list_adapter_item_gutter_bg;
+        View findViewById = view.findViewById(R.id.chat_list_adapter_item_gutter_bg);
         if (findViewById != null) {
-            i = 2131362551;
-            View findViewById2 = view.findViewById(2131362551);
+            i = R.id.chat_list_adapter_item_highlighted_bg;
+            View findViewById2 = view.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
             if (findViewById2 != null) {
-                i = 2131362591;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362591);
+                i = R.id.chat_list_item_embed_author_icon;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.chat_list_item_embed_author_icon);
                 if (simpleDraweeView != null) {
-                    i = 2131362592;
-                    TextView textView = (TextView) view.findViewById(2131362592);
+                    i = R.id.chat_list_item_embed_author_text;
+                    TextView textView = (TextView) view.findViewById(R.id.chat_list_item_embed_author_text);
                     if (textView != null) {
-                        i = 2131362593;
-                        Barrier barrier = (Barrier) view.findViewById(2131362593);
+                        i = R.id.chat_list_item_embed_barrier_data;
+                        Barrier barrier = (Barrier) view.findViewById(R.id.chat_list_item_embed_barrier_data);
                         if (barrier != null) {
-                            i = 2131362594;
-                            Barrier barrier2 = (Barrier) view.findViewById(2131362594);
+                            i = R.id.chat_list_item_embed_barrier_header;
+                            Barrier barrier2 = (Barrier) view.findViewById(R.id.chat_list_item_embed_barrier_header);
                             if (barrier2 != null) {
-                                i = 2131362595;
-                                MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362595);
+                                i = R.id.chat_list_item_embed_container_card;
+                                MaterialCardView materialCardView = (MaterialCardView) view.findViewById(R.id.chat_list_item_embed_container_card);
                                 if (materialCardView != null) {
-                                    i = 2131362596;
-                                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362596);
+                                    i = R.id.chat_list_item_embed_content;
+                                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.chat_list_item_embed_content);
                                     if (constraintLayout != null) {
-                                        i = 2131362597;
-                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362597);
+                                        i = R.id.chat_list_item_embed_description;
+                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.chat_list_item_embed_description);
                                         if (linkifiedTextView != null) {
-                                            i = 2131362598;
-                                            View findViewById3 = view.findViewById(2131362598);
+                                            i = R.id.chat_list_item_embed_divider;
+                                            View findViewById3 = view.findViewById(R.id.chat_list_item_embed_divider);
                                             if (findViewById3 != null) {
-                                                i = 2131362601;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362601);
+                                                i = R.id.chat_list_item_embed_fields;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.chat_list_item_embed_fields);
                                                 if (linearLayout != null) {
-                                                    i = 2131362602;
-                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362602);
+                                                    i = R.id.chat_list_item_embed_footer_icon;
+                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.chat_list_item_embed_footer_icon);
                                                     if (simpleDraweeView2 != null) {
-                                                        i = 2131362603;
-                                                        TextView textView2 = (TextView) view.findViewById(2131362603);
+                                                        i = R.id.chat_list_item_embed_footer_text;
+                                                        TextView textView2 = (TextView) view.findViewById(R.id.chat_list_item_embed_footer_text);
                                                         if (textView2 != null) {
-                                                            i = 2131362604;
-                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) view.findViewById(2131362604);
+                                                            i = R.id.chat_list_item_embed_image;
+                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) view.findViewById(R.id.chat_list_item_embed_image);
                                                             if (simpleDraweeView3 != null) {
-                                                                i = 2131362605;
-                                                                ImageView imageView = (ImageView) view.findViewById(2131362605);
+                                                                i = R.id.chat_list_item_embed_image_icons;
+                                                                ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_item_embed_image_icons);
                                                                 if (imageView != null) {
-                                                                    i = 2131362606;
-                                                                    SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) view.findViewById(2131362606);
+                                                                    i = R.id.chat_list_item_embed_image_thumbnail;
+                                                                    SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) view.findViewById(R.id.chat_list_item_embed_image_thumbnail);
                                                                     if (simpleDraweeView4 != null) {
-                                                                        i = 2131362607;
-                                                                        TextView textView3 = (TextView) view.findViewById(2131362607);
+                                                                        i = R.id.chat_list_item_embed_provider;
+                                                                        TextView textView3 = (TextView) view.findViewById(R.id.chat_list_item_embed_provider);
                                                                         if (textView3 != null) {
-                                                                            i = 2131362608;
-                                                                            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362608);
+                                                                            i = R.id.chat_list_item_embed_spoiler;
+                                                                            FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.chat_list_item_embed_spoiler);
                                                                             if (frameLayout != null) {
-                                                                                i = 2131362609;
-                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131362609);
+                                                                                i = R.id.chat_list_item_embed_title;
+                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.chat_list_item_embed_title);
                                                                                 if (linkifiedTextView2 != null) {
-                                                                                    i = 2131363088;
-                                                                                    CardView cardView = (CardView) view.findViewById(2131363088);
+                                                                                    i = R.id.embed_image_container;
+                                                                                    CardView cardView = (CardView) view.findViewById(R.id.embed_image_container);
                                                                                     if (cardView != null) {
-                                                                                        i = 2131363089;
-                                                                                        InlineMediaView inlineMediaView = (InlineMediaView) view.findViewById(2131363089);
+                                                                                        i = R.id.embed_inline_media;
+                                                                                        InlineMediaView inlineMediaView = (InlineMediaView) view.findViewById(R.id.embed_inline_media);
                                                                                         if (inlineMediaView != null) {
                                                                                             WidgetChatListAdapterItemEmbedBinding widgetChatListAdapterItemEmbedBinding = new WidgetChatListAdapterItemEmbedBinding((ConstraintLayout) view, findViewById, findViewById2, simpleDraweeView, textView, barrier, barrier2, materialCardView, constraintLayout, linkifiedTextView, findViewById3, linearLayout, simpleDraweeView2, textView2, simpleDraweeView3, imageView, simpleDraweeView4, textView3, frameLayout, linkifiedTextView2, cardView, inlineMediaView);
                                                                                             m.checkNotNullExpressionValue(widgetChatListAdapterItemEmbedBinding, "WidgetChatListAdapterIte…bedBinding.bind(itemView)");
@@ -626,10 +628,10 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
                                                                                             this.userSettings = StoreStream.Companion.getUserSettings();
                                                                                             View view2 = this.itemView;
                                                                                             m.checkNotNullExpressionValue(view2, "itemView");
-                                                                                            this.embedTinyIconSize = (int) view2.getResources().getDimension(2131165397);
+                                                                                            this.embedTinyIconSize = (int) view2.getResources().getDimension(R.dimen.embed_tiny_icon_size);
                                                                                             View view3 = this.itemView;
                                                                                             m.checkNotNullExpressionValue(view3, "itemView");
-                                                                                            this.embedThumbnailMaxSize = (int) view3.getResources().getDimension(2131165396);
+                                                                                            this.embedThumbnailMaxSize = (int) view3.getResources().getDimension(R.dimen.embed_thumbnail_max_size);
                                                                                             EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE;
                                                                                             View view4 = this.itemView;
                                                                                             m.checkNotNullExpressionValue(view4, "itemView");
@@ -732,7 +734,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             int embedIndex = model.getEmbedEntry().getEmbedIndex();
             long myId = model.getMyId();
             StoreMessageState.State messageState = model.getEmbedEntry().getMessageState();
-            new MessagePreprocessor(myId, (messageState == null || (visibleSpoilerEmbedMap = messageState.getVisibleSpoilerEmbedMap()) == null) ? null : Companion.access$getEmbedFieldVisibleIndices(Companion, visibleSpoilerEmbedMap, embedIndex, "desc"), null, false, null, 28, null).process(model.getParsedDescription());
+            new MessagePreprocessor(myId, (messageState == null || (visibleSpoilerEmbedMap = messageState.getVisibleSpoilerEmbedMap()) == null) ? null : Companion.access$getEmbedFieldVisibleIndices(Companion, visibleSpoilerEmbedMap, embedIndex, EMBED_TYPE_DESC), null, false, null, 28, null).process(model.getParsedDescription());
             this.binding.h.setDraweeSpanStringBuilder(AstRenderer.render(model.getParsedDescription(), MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedDescription$1(id2, embedIndex), null, null, 14335, null)));
             LinkifiedTextView linkifiedTextView = this.binding.h;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatListItemEmbedDescription");
@@ -751,7 +753,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             i = ColorUtils.setAlphaComponent(num.intValue(), 255);
         } else {
             m.checkNotNullExpressionValue(view, "binding.chatListItemEmbedDivider");
-            i = ColorCompat.getThemedColor(view.getContext(), 2130968900);
+            i = ColorCompat.getThemedColor(view.getContext(), (int) R.attr.colorBackgroundModifierAccent);
         }
         view.setBackgroundColor(i);
     }
@@ -783,25 +785,26 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         for (int i = 0; i < size; i++) {
             LinearLayout linearLayout4 = this.binding.j;
             m.checkNotNullExpressionValue(linearLayout4, "binding.chatListItemEmbedFields");
-            int i2 = 2131362600;
-            if (i < linearLayout4.getChildCount()) {
+            int childCount = linearLayout4.getChildCount();
+            int i2 = R.id.chat_list_item_embed_field_value;
+            if (i < childCount) {
                 r5 = this.binding.j.getChildAt(i);
             } else {
-                View inflate = LayoutInflater.from(context).inflate(2131558958, (ViewGroup) this.binding.j, false);
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(2131362599);
+                View inflate = LayoutInflater.from(context).inflate(R.layout.widget_chat_list_adapter_item_embed_field, (ViewGroup) this.binding.j, false);
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(R.id.chat_list_item_embed_field_name);
                 if (linkifiedTextView != null) {
-                    LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) inflate.findViewById(2131362600);
+                    LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) inflate.findViewById(R.id.chat_list_item_embed_field_value);
                     if (linkifiedTextView2 != null) {
                         r5 = (LinearLayout) inflate;
                         m.checkNotNullExpressionValue(new o4(r5, linkifiedTextView, linkifiedTextView2), "WidgetChatListAdapterIte…edFields, false\n        )");
                     }
                 } else {
-                    i2 = 2131362599;
+                    i2 = R.id.chat_list_item_embed_field_name;
                 }
                 throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
             }
-            ((SimpleDraweeSpanTextView) r5.findViewById(2131362599)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedName(), a.j("f_name:", i)));
-            ((SimpleDraweeSpanTextView) r5.findViewById(2131362600)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedValue(), "f_value:" + i));
+            ((SimpleDraweeSpanTextView) r5.findViewById(R.id.chat_list_item_embed_field_name)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedName(), a.j("f_name:", i)));
+            ((SimpleDraweeSpanTextView) r5.findViewById(R.id.chat_list_item_embed_field_value)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedValue(), "f_value:" + i));
             this.binding.j.addView(r5);
         }
     }
@@ -937,17 +940,17 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             List parse$default = Parser.parse$default(UI_THREAD_TITLES_PARSER, j, MessageParseState.Companion.getInitialState(), null, 4, null);
             long myId = model.getMyId();
             StoreMessageState.State messageState = model.getEmbedEntry().getMessageState();
-            new MessagePreprocessor(myId, (messageState == null || (visibleSpoilerEmbedMap = messageState.getVisibleSpoilerEmbedMap()) == null) ? null : Companion.access$getEmbedFieldVisibleIndices(Companion, visibleSpoilerEmbedMap, embedIndex, "title"), null, false, null, 28, null).process(parse$default);
+            new MessagePreprocessor(myId, (messageState == null || (visibleSpoilerEmbedMap = messageState.getVisibleSpoilerEmbedMap()) == null) ? null : Companion.access$getEmbedFieldVisibleIndices(Companion, visibleSpoilerEmbedMap, embedIndex, EMBED_TYPE_TITLE), null, false, null, 28, null).process(parse$default);
             this.binding.r.setDraweeSpanStringBuilder(AstRenderer.render(parse$default, MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedTitle$1(model, embedIndex), null, null, 14335, null)));
             LinkifiedTextView linkifiedTextView = this.binding.r;
             if (embed.l() != null) {
                 LinkifiedTextView linkifiedTextView2 = this.binding.r;
                 m.checkNotNullExpressionValue(linkifiedTextView2, "binding.chatListItemEmbedTitle");
-                i = ColorCompat.getThemedColor(linkifiedTextView2, 2130968987);
+                i = ColorCompat.getThemedColor(linkifiedTextView2, (int) R.attr.colorTextLink);
             } else {
                 LinkifiedTextView linkifiedTextView3 = this.binding.r;
                 m.checkNotNullExpressionValue(linkifiedTextView3, "binding.chatListItemEmbedTitle");
-                i = ColorCompat.getThemedColor(linkifiedTextView3, 2130969878);
+                i = ColorCompat.getThemedColor(linkifiedTextView3, (int) R.attr.primary_100);
             }
             linkifiedTextView.setTextColor(i);
             Companion companion = Companion;
@@ -1004,7 +1007,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         }
         textView2.setText(str2);
         CharSequence text = textView2.getText();
-        m.checkNotNullExpressionValue(text, "text");
+        m.checkNotNullExpressionValue(text, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         if (text.length() <= 0) {
             z2 = false;
         }
@@ -1108,7 +1111,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
                 MaterialCardView materialCardView = this.binding.f;
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                materialCardView.setCardBackgroundColor(ColorCompat.getColor(view2, 2131100384));
+                materialCardView.setCardBackgroundColor(ColorCompat.getColor(view2, (int) R.color.transparent));
                 MaterialCardView materialCardView2 = this.binding.f;
                 m.checkNotNullExpressionValue(materialCardView2, "binding.chatListItemEmbedContainerCard");
                 materialCardView2.setStrokeWidth(0);
@@ -1134,12 +1137,12 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
                 MaterialCardView materialCardView3 = this.binding.f;
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                materialCardView3.setCardBackgroundColor(ColorCompat.getThemedColor(view4, 2130968905));
+                materialCardView3.setCardBackgroundColor(ColorCompat.getThemedColor(view4, (int) R.attr.colorBackgroundSecondary));
                 MaterialCardView materialCardView4 = this.binding.f;
                 m.checkNotNullExpressionValue(materialCardView4, "binding.chatListItemEmbedContainerCard");
                 MaterialCardView materialCardView5 = this.binding.f;
                 m.checkNotNullExpressionValue(materialCardView5, "binding.chatListItemEmbedContainerCard");
-                materialCardView4.setStrokeWidth(materialCardView5.getResources().getDimensionPixelSize(2131165313));
+                materialCardView4.setStrokeWidth(materialCardView5.getResources().getDimensionPixelSize(R.dimen.chat_embed_card_stroke_width));
             }
             View view5 = this.itemView;
             m.checkNotNullExpressionValue(view5, "itemView");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java
index ff832f195c..da011f7b48 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemEmptyPinsBinding;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import com.discord.widgets.chat.list.entries.EmptyPinsEntry;
@@ -14,14 +15,14 @@ public final class WidgetChatListAdapterItemEmptyPins extends WidgetChatListItem
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemEmptyPins(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558959, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_empty_pins, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362581;
-        ImageView imageView = (ImageView) view.findViewById(2131362581);
+        int i = R.id.chat_list_empty_image;
+        ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_empty_image);
         if (imageView != null) {
-            i = 2131362582;
-            TextView textView = (TextView) view.findViewById(2131362582);
+            i = R.id.chat_list_empty_pins_text;
+            TextView textView = (TextView) view.findViewById(R.id.chat_list_empty_pins_text);
             if (textView != null) {
                 WidgetChatListAdapterItemEmptyPinsBinding widgetChatListAdapterItemEmptyPinsBinding = new WidgetChatListAdapterItemEmptyPinsBinding((RelativeLayout) view, imageView, textView);
                 m.checkNotNullExpressionValue(widgetChatListAdapterItemEmptyPinsBinding, "WidgetChatListAdapterIte…insBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
index 39823ec1e1..b21aca82be 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.models.message.Message;
@@ -65,7 +66,7 @@ public final class WidgetChatListAdapterItemEphemeralMessage$onConfigure$2 exten
             m.checkNotNullParameter(hook, "$receiver");
             View view = this.this$0.this$0.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            Integer valueOf = Integer.valueOf(ColorCompat.getColor(view, 2131099723));
+            Integer valueOf = Integer.valueOf(ColorCompat.getColor(view, (int) R.color.brand));
             AnonymousClass1 r1 = new AnonymousClass1(this);
             Objects.requireNonNull(hook);
             m.checkNotNullParameter(r1, "onClick");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
index ff39997c5d..3572f2f1d6 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemEphemeralMessageBinding;
 import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
@@ -18,26 +19,26 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemEphemeralMessage(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558960, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_ephemeral_message, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362549;
-        View findViewById = view.findViewById(2131362549);
+        int i = R.id.chat_list_adapter_item_gutter_bg;
+        View findViewById = view.findViewById(R.id.chat_list_adapter_item_gutter_bg);
         if (findViewById != null) {
-            i = 2131362551;
-            View findViewById2 = view.findViewById(2131362551);
+            i = R.id.chat_list_adapter_item_highlighted_bg;
+            View findViewById2 = view.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
             if (findViewById2 != null) {
-                i = 2131362552;
-                ImageView imageView = (ImageView) view.findViewById(2131362552);
+                i = R.id.chat_list_adapter_item_icon_help;
+                ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_adapter_item_icon_help);
                 if (imageView != null) {
-                    i = 2131362569;
-                    TextView textView = (TextView) view.findViewById(2131362569);
+                    i = R.id.chat_list_adapter_item_text_dismiss;
+                    TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_text_dismiss);
                     if (textView != null) {
-                        i = 2131362579;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131362579);
+                        i = R.id.chat_list_adapter_item_visibility_icon;
+                        ImageView imageView2 = (ImageView) view.findViewById(R.id.chat_list_adapter_item_visibility_icon);
                         if (imageView2 != null) {
-                            i = 2131365605;
-                            Guideline guideline = (Guideline) view.findViewById(2131365605);
+                            i = R.id.uikit_chat_guideline;
+                            Guideline guideline = (Guideline) view.findViewById(R.id.uikit_chat_guideline);
                             if (guideline != null) {
                                 WidgetChatListAdapterItemEphemeralMessageBinding widgetChatListAdapterItemEphemeralMessageBinding = new WidgetChatListAdapterItemEphemeralMessageBinding((ConstraintLayout) view, findViewById, findViewById2, imageView, textView, imageView2, guideline);
                                 m.checkNotNullExpressionValue(widgetChatListAdapterItemEphemeralMessageBinding, "WidgetChatListAdapterIte…ageBinding.bind(itemView)");
@@ -73,11 +74,11 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL
         this.binding.d.setOnClickListener(new WidgetChatListAdapterItemEphemeralMessage$onConfigure$1(this));
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextDismiss");
-        String quantityString = textView.getResources().getQuantityString(2131755242, 1);
+        String quantityString = textView.getResources().getQuantityString(R.plurals.only_you_can_see_and_delete_these_count, 1);
         m.checkNotNullExpressionValue(quantityString, "itemDismiss.resources.ge…nd_delete_these_count, 1)");
-        String quantityString2 = textView.getResources().getQuantityString(2131755243, 1);
+        String quantityString2 = textView.getResources().getQuantityString(R.plurals.only_you_can_see_and_delete_these_countMessages, 1);
         m.checkNotNullExpressionValue(quantityString2, "itemDismiss.resources.ge…e_these_countMessages, 1)");
         textView.setMovementMethod(LinkMovementMethod.getInstance());
-        textView.setText(b.d(textView, 2131892013, new Object[]{quantityString, quantityString2}, new WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(this, message)));
+        textView.setText(b.d(textView, R.string.only_you_can_see_and_delete_these, new Object[]{quantityString, quantityString2}, new WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(this, message)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java
index 3ae0d96315..32602c19a7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.view.View;
 import androidx.cardview.widget.CardView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemGameInviteBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.chat.list.ViewEmbedGameInvite;
@@ -20,17 +21,17 @@ public final class WidgetChatListAdapterItemGameInvite extends WidgetChatListIte
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGameInvite(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558962, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_game_invite, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363857);
+        ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(R.id.item_game_invite);
         if (viewEmbedGameInvite != null) {
             WidgetChatListAdapterItemGameInviteBinding widgetChatListAdapterItemGameInviteBinding = new WidgetChatListAdapterItemGameInviteBinding((CardView) view, viewEmbedGameInvite);
             m.checkNotNullExpressionValue(widgetChatListAdapterItemGameInviteBinding, "WidgetChatListAdapterIte…iteBinding.bind(itemView)");
             this.binding = widgetChatListAdapterItemGameInviteBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363857)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.item_game_invite)));
     }
 
     public static final /* synthetic */ WidgetChatListAdapter access$getAdapter$p(WidgetChatListAdapterItemGameInvite widgetChatListAdapterItemGameInvite) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
index 7ab7d4b32a..ac2a7371a1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.application.Application;
 import com.discord.api.user.User;
 import com.discord.databinding.WidgetChatListAdapterItemGiftBinding;
@@ -319,44 +320,44 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGift(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558963, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_gift, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362114;
-        Barrier barrier = (Barrier) view.findViewById(2131362114);
+        int i = R.id.barrier;
+        Barrier barrier = (Barrier) view.findViewById(R.id.barrier);
         if (barrier != null) {
-            i = 2131363867;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363867);
+            i = R.id.item_gift_accept_button;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.item_gift_accept_button);
             if (materialButton != null) {
-                i = 2131363868;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363868);
+                i = R.id.item_gift_cannot_claim_button;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.item_gift_cannot_claim_button);
                 if (materialButton2 != null) {
-                    i = 2131363869;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363869);
+                    i = R.id.item_gift_details;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.item_gift_details);
                     if (linearLayout != null) {
-                        i = 2131363870;
-                        TextView textView = (TextView) view.findViewById(2131363870);
+                        i = R.id.item_gift_expires;
+                        TextView textView = (TextView) view.findViewById(R.id.item_gift_expires);
                         if (textView != null) {
-                            i = 2131363871;
-                            TextView textView2 = (TextView) view.findViewById(2131363871);
+                            i = R.id.item_gift_header;
+                            TextView textView2 = (TextView) view.findViewById(R.id.item_gift_header);
                             if (textView2 != null) {
-                                i = 2131363872;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363872);
+                                i = R.id.item_gift_image;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.item_gift_image);
                                 if (simpleDraweeView != null) {
-                                    i = 2131363873;
-                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363873);
+                                    i = R.id.item_gift_image_background;
+                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.item_gift_image_background);
                                     if (simpleDraweeView2 != null) {
-                                        i = 2131363874;
-                                        View findViewById = view.findViewById(2131363874);
+                                        i = R.id.item_gift_loading_button_placeholder;
+                                        View findViewById = view.findViewById(R.id.item_gift_loading_button_placeholder);
                                         if (findViewById != null) {
-                                            i = 2131363875;
-                                            TextView textView3 = (TextView) view.findViewById(2131363875);
+                                            i = R.id.item_gift_name;
+                                            TextView textView3 = (TextView) view.findViewById(R.id.item_gift_name);
                                             if (textView3 != null) {
-                                                i = 2131363876;
-                                                TextView textView4 = (TextView) view.findViewById(2131363876);
+                                                i = R.id.item_gift_subtext;
+                                                TextView textView4 = (TextView) view.findViewById(R.id.item_gift_subtext);
                                                 if (textView4 != null) {
-                                                    i = 2131363877;
-                                                    MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363877);
+                                                    i = R.id.item_gift_verify_button;
+                                                    MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.item_gift_verify_button);
                                                     if (materialButton3 != null) {
                                                         ConstraintLayout constraintLayout = (ConstraintLayout) view;
                                                         WidgetChatListAdapterItemGiftBinding widgetChatListAdapterItemGiftBinding = new WidgetChatListAdapterItemGiftBinding(constraintLayout, barrier, materialButton, materialButton2, linearLayout, textView, textView2, simpleDraweeView, simpleDraweeView2, findViewById, textView3, textView4, materialButton3, constraintLayout);
@@ -425,12 +426,12 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         simpleDraweeView.setVisibility(4);
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.itemGiftHeader");
-        textView.setText(areEqual ? context.getString(2131889120) : context.getString(2131889119));
-        this.binding.i.setText(2131889116);
-        this.binding.i.setTextColor(ColorCompat.getColor(context, 2131100329));
+        textView.setText(areEqual ? context.getString(R.string.gift_embed_invalid_title_self) : context.getString(R.string.gift_embed_invalid_title_other));
+        this.binding.i.setText(R.string.gift_embed_invalid);
+        this.binding.i.setTextColor(ColorCompat.getColor(context, (int) R.color.status_red_500));
         this.binding.i.setBackgroundResource(0);
         m.checkNotNullExpressionValue(context, "context");
-        this.binding.f.setImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969524, 2131232260));
+        this.binding.f.setImageResource(DrawableCompat.getThemedDrawableRes(context, (int) R.attr.img_poop, (int) R.drawable.img_poop_dark));
         TextView textView2 = this.binding.j;
         m.checkNotNullExpressionValue(textView2, "binding.itemGiftSubtext");
         textView2.setVisibility(8);
@@ -453,13 +454,13 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
         Context context = view.getContext();
-        this.binding.e.setText(2131889121);
+        this.binding.e.setText(R.string.gift_embed_resolving);
         TextView textView = this.binding.i;
         m.checkNotNullExpressionValue(textView, "binding.itemGiftName");
         textView.setText((CharSequence) null);
-        this.binding.i.setTextColor(ColorCompat.getThemedColor(context, 2130969878));
-        this.binding.i.setBackgroundResource(2131231131);
-        this.binding.f.setActualImageResource(2131231131);
+        this.binding.i.setTextColor(ColorCompat.getThemedColor(context, (int) R.attr.primary_100));
+        this.binding.i.setBackgroundResource(R.drawable.drawable_empty_text_placeholder_dark);
+        this.binding.f.setActualImageResource(R.drawable.drawable_empty_text_placeholder_dark);
         SimpleDraweeView simpleDraweeView = this.binding.g;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemGiftImageBackground");
         simpleDraweeView.setVisibility(4);
@@ -511,7 +512,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         String giftSplashUrl = iconUtils.getGiftSplashUrl(applicationId, h, Integer.valueOf(view2.getWidth()));
         if (resolved.getGift().isAnyNitroGift()) {
             m.checkNotNullExpressionValue(context, "context");
-            this.binding.g.setActualImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969338, 2131232244));
+            this.binding.g.setActualImageResource(DrawableCompat.getThemedDrawableRes(context, (int) R.attr.gift_nitro_splash, (int) R.drawable.img_nitro_splash_dark));
             SimpleDraweeView simpleDraweeView = this.binding.g;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemGiftImageBackground");
             simpleDraweeView.setVisibility(0);
@@ -529,12 +530,12 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         }
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.itemGiftHeader");
-        textView.setText(z2 ? context.getString(2131889124) : context.getString(2131889123));
+        textView.setText(z2 ? context.getString(R.string.gift_embed_title_self) : context.getString(R.string.gift_embed_title));
         TextView textView2 = this.binding.i;
         m.checkNotNullExpressionValue(textView2, "binding.itemGiftName");
         ModelStoreListing storeListing3 = resolved.getGift().getStoreListing();
         textView2.setText((storeListing3 == null || (sku3 = storeListing3.getSku()) == null) ? null : sku3.getName());
-        this.binding.i.setTextColor(ColorCompat.getThemedColor(context, 2130969878));
+        this.binding.i.setTextColor(ColorCompat.getThemedColor(context, (int) R.attr.primary_100));
         this.binding.i.setBackgroundResource(0);
         TextView textView3 = this.binding.d;
         m.checkNotNullExpressionValue(textView3, "binding.itemGiftExpires");
@@ -543,7 +544,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
             TextView textView4 = this.binding.d;
             m.checkNotNullExpressionValue(textView4, "binding.itemGiftExpires");
             m.checkNotNullExpressionValue(context, "context");
-            textView4.setText(c.a.l.b.h(context, 2131889111, new Object[]{GiftingUtils.INSTANCE.getTimeString(resolved.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context)}, null, 4));
+            textView4.setText(c.a.l.b.h(context, R.string.gift_embed_expiration, new Object[]{GiftingUtils.INSTANCE.getTimeString(resolved.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context)}, null, 4));
         }
         if (resolved.getGift().isAnyNitroGift()) {
             MGImages mGImages = MGImages.INSTANCE;
@@ -561,16 +562,16 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
             this.binding.f.setImageURI(str);
         }
         if (!resolved.getMeUser().isVerified()) {
-            String string = context.getString(2131889035);
+            String string = context.getString(R.string.gift_code_auth_help_text_verification_required);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…xt_verification_required)");
             str2 = t.replace$default(t.replace$default(t.replace$default(string, "(onClick)", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null);
         } else if (isClaimedByMe) {
-            str2 = context.getString(2131889085);
+            str2 = context.getString(R.string.gift_embed_body_claimed_self_mobile);
         } else if (resolved.getInLibrary()) {
             m.checkNotNullExpressionValue(context, "context");
-            str2 = t.replace$default(t.replace$default(t.replace$default(c.a.l.b.h(context, 2131889034, new Object[]{""}, null, 4).toString(), "()", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null);
+            str2 = t.replace$default(t.replace$default(t.replace$default(c.a.l.b.h(context, R.string.gift_code_auth_help_text_owned, new Object[]{""}, null, 4).toString(), "()", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null);
         } else if (z3) {
-            str2 = context.getString(2131889033);
+            str2 = context.getString(R.string.gift_code_auth_help_text_claimed);
         }
         TextView textView5 = this.binding.j;
         m.checkNotNullExpressionValue(textView5, "binding.itemGiftSubtext");
@@ -583,11 +584,12 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
             materialButton = this.binding.k;
         } else {
             MaterialButton materialButton2 = this.binding.f1747c;
-            int i = 2131889107;
-            if (resolved.getRedeeming()) {
-                i = 2131889108;
+            boolean redeeming = resolved.getRedeeming();
+            int i = R.string.gift_embed_button_claimed;
+            if (redeeming) {
+                i = R.string.gift_embed_button_claiming;
             } else if (!isClaimedByMe && resolved.getInLibrary()) {
-                i = 2131889109;
+                i = R.string.gift_embed_button_owned;
             }
             materialButton2.setText(i);
             materialButton = this.binding.f1747c;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java
index 6c9296ea36..3be526e329 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
@@ -35,7 +36,7 @@ public final class WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2 ex
         Message message = ((MessageEntry) this.$data).getMessage();
         View view2 = this.this$0.itemView;
         m.checkNotNullExpressionValue(view2, "itemView");
-        String string = view2.getContext().getString(2131894202);
+        String string = view2.getContext().getString(R.string.system_message_invite_users_owner);
         m.checkNotNullExpressionValue(string, "itemView.context.getStri…ssage_invite_users_owner)");
         eventHandler.onMessageLongClicked(message, string, false);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
index cf86a8b097..5b93498db7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemGuildInviteReminderBinding;
 import com.discord.models.guild.Guild;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -17,20 +18,20 @@ public final class WidgetChatListAdapterItemGuildInviteReminder extends WidgetCh
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGuildInviteReminder(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558964, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_guild_invite_reminder, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362475;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362475);
+        int i = R.id.chat_action_item_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.chat_action_item_button);
         if (materialButton != null) {
-            i = 2131362476;
-            ImageView imageView = (ImageView) view.findViewById(2131362476);
+            i = R.id.chat_action_item_image;
+            ImageView imageView = (ImageView) view.findViewById(R.id.chat_action_item_image);
             if (imageView != null) {
-                i = 2131362477;
-                TextView textView = (TextView) view.findViewById(2131362477);
+                i = R.id.chat_action_item_subtext;
+                TextView textView = (TextView) view.findViewById(R.id.chat_action_item_subtext);
                 if (textView != null) {
-                    i = 2131362478;
-                    TextView textView2 = (TextView) view.findViewById(2131362478);
+                    i = R.id.chat_action_item_text;
+                    TextView textView2 = (TextView) view.findViewById(R.id.chat_action_item_text);
                     if (textView2 != null) {
                         WidgetChatListAdapterItemGuildInviteReminderBinding widgetChatListAdapterItemGuildInviteReminderBinding = new WidgetChatListAdapterItemGuildInviteReminderBinding((ConstraintLayout) view, materialButton, imageView, textView, textView2);
                         m.checkNotNullExpressionValue(widgetChatListAdapterItemGuildInviteReminderBinding, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
@@ -54,8 +55,8 @@ public final class WidgetChatListAdapterItemGuildInviteReminder extends WidgetCh
         if (chatListEntry instanceof MessageEntry) {
             Guild guild = ((WidgetChatListAdapter) this.adapter).getData().getGuild();
             boolean isOwner = guild != null ? guild.isOwner(((WidgetChatListAdapter) this.adapter).getData().getUserId()) : false;
-            int i2 = isOwner ? 2131894202 : 2131894197;
-            int i3 = isOwner ? 2131894201 : 2131894200;
+            int i2 = isOwner ? R.string.system_message_invite_users_owner : R.string.system_message_invite_users;
+            int i3 = isOwner ? R.string.system_message_invite_users_description_owner : R.string.system_message_invite_users_description;
             this.binding.d.setText(i2);
             this.binding.f1748c.setText(i3);
             this.binding.b.setOnClickListener(new WidgetChatListAdapterItemGuildInviteReminder$onConfigure$1(this));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
index e1ac7591ae..dc6d36b9ab 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemGuildTemplateBinding;
 import com.discord.models.domain.ModelGuildTemplate;
 import com.discord.stores.StoreStream;
@@ -128,23 +129,23 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGuildTemplate(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558965, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_guild_template, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131363879;
-        TextView textView = (TextView) view.findViewById(2131363879);
+        int i = R.id.item_guild_template_header;
+        TextView textView = (TextView) view.findViewById(R.id.item_guild_template_header);
         if (textView != null) {
-            i = 2131363880;
-            ImageView imageView = (ImageView) view.findViewById(2131363880);
+            i = R.id.item_guild_template_image;
+            ImageView imageView = (ImageView) view.findViewById(R.id.item_guild_template_image);
             if (imageView != null) {
-                i = 2131363881;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363881);
+                i = R.id.item_guild_template_join_button;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.item_guild_template_join_button);
                 if (materialButton != null) {
-                    i = 2131363882;
-                    TextView textView2 = (TextView) view.findViewById(2131363882);
+                    i = R.id.item_guild_template_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.item_guild_template_name);
                     if (textView2 != null) {
-                        i = 2131363883;
-                        TextView textView3 = (TextView) view.findViewById(2131363883);
+                        i = R.id.item_guild_template_subtext;
+                        TextView textView3 = (TextView) view.findViewById(R.id.item_guild_template_subtext);
                         if (textView3 != null) {
                             ConstraintLayout constraintLayout = (ConstraintLayout) view;
                             WidgetChatListAdapterItemGuildTemplateBinding widgetChatListAdapterItemGuildTemplateBinding = new WidgetChatListAdapterItemGuildTemplateBinding(constraintLayout, textView, imageView, materialButton, textView2, textView3, constraintLayout);
@@ -180,8 +181,8 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
     }
 
     private final void configureInvalidUI() {
-        this.binding.f1749c.setText(2131890225);
-        this.binding.d.setText(2131890224);
+        this.binding.f1749c.setText(R.string.guild_template_invalid_title);
+        this.binding.d.setText(R.string.guild_template_invalid_subtitle);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext");
         textView.setVisibility(0);
@@ -191,7 +192,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
     }
 
     private final void configureLoadingUI() {
-        this.binding.f1749c.setText(2131890308);
+        this.binding.f1749c.setText(R.string.guild_template_resolving_title);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext");
         textView.setVisibility(8);
@@ -211,7 +212,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
         m.checkNotNullExpressionValue(textView3, "binding.itemGuildTemplateSubtext");
         Context context = textView3.getContext();
         m.checkNotNullExpressionValue(context, "binding.itemGuildTemplateSubtext.context");
-        ViewExtensions.setTextAndVisibilityBy(textView2, StringResourceUtilsKt.getI18nPluralString(context, 2131755192, component1.getUsageCount(), Integer.valueOf(component1.getUsageCount())));
+        ViewExtensions.setTextAndVisibilityBy(textView2, StringResourceUtilsKt.getI18nPluralString(context, R.plurals.guild_template_usages_usageCount, component1.getUsageCount(), Integer.valueOf(component1.getUsageCount())));
         MaterialButton materialButton = this.binding.b;
         m.checkNotNullExpressionValue(materialButton, "binding.itemGuildTemplateJoinButton");
         materialButton.setVisibility(0);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
index 1762f5578c..71bc69d07c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
@@ -6,7 +6,9 @@ import android.widget.TextView;
 import c.a.e.f;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemGuildWelcomeBinding;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -22,25 +24,25 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGuildWelcome(WidgetChatListAdapter widgetChatListAdapter, Clock clock) {
-        super(2131558966, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_guild_welcome, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         m.checkNotNullParameter(clock, "clock");
         this.clock = clock;
         View view = this.itemView;
-        int i = 2131363884;
-        TextView textView = (TextView) view.findViewById(2131363884);
+        int i = R.id.item_guild_welcome_header;
+        TextView textView = (TextView) view.findViewById(R.id.item_guild_welcome_header);
         if (textView != null) {
-            i = 2131363885;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363885);
+            i = R.id.item_guild_welcome_subheader;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.item_guild_welcome_subheader);
             if (linkifiedTextView != null) {
-                i = 2131363886;
-                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131363886);
+                i = R.id.item_guild_welcome_subheader_intro;
+                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.item_guild_welcome_subheader_intro);
                 if (linkifiedTextView2 != null) {
-                    i = 2131365859;
-                    ChatActionItem chatActionItem = (ChatActionItem) view.findViewById(2131365859);
+                    i = R.id.welcome_card_invite_friends;
+                    ChatActionItem chatActionItem = (ChatActionItem) view.findViewById(R.id.welcome_card_invite_friends);
                     if (chatActionItem != null) {
-                        i = 2131365860;
-                        ChatActionItem chatActionItem2 = (ChatActionItem) view.findViewById(2131365860);
+                        i = R.id.welcome_card_upload_icon;
+                        ChatActionItem chatActionItem2 = (ChatActionItem) view.findViewById(R.id.welcome_card_upload_icon);
                         if (chatActionItem2 != null) {
                             WidgetChatListAdapterItemGuildWelcomeBinding widgetChatListAdapterItemGuildWelcomeBinding = new WidgetChatListAdapterItemGuildWelcomeBinding((LinearLayout) view, textView, linkifiedTextView, linkifiedTextView2, chatActionItem, chatActionItem2);
                             m.checkNotNullExpressionValue(widgetChatListAdapterItemGuildWelcomeBinding, "WidgetChatListAdapterIte…omeBinding.bind(itemView)");
@@ -72,8 +74,8 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
             m.checkNotNullExpressionValue(textView, "binding.itemGuildWelcomeHeader");
             boolean z2 = true;
             GuildWelcomeEntry guildWelcomeEntry = (GuildWelcomeEntry) chatListEntry;
-            b.n(textView, 2131895073, new Object[]{guildWelcomeEntry.getGuildName()}, null, 4);
-            boolean z3 = (guildWelcomeEntry.getGuildId() >>> 22) + 1420070400000L < this.clock.currentTimeMillis() - 2592000000L;
+            b.n(textView, R.string.welcome_cta_title_mobile, new Object[]{guildWelcomeEntry.getGuildName()}, null, 4);
+            boolean z3 = (guildWelcomeEntry.getGuildId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH < this.clock.currentTimeMillis() - WidgetChatListAdapterItemGuildWelcomeKt.OLD_GUILD_AGE_THRESHOLD;
             ChatActionItem chatActionItem = this.binding.f;
             m.checkNotNullExpressionValue(chatActionItem, "binding.welcomeCardUploadIcon");
             int i2 = 8;
@@ -86,7 +88,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
             String C = a.C(new StringBuilder(), f.a.a(360045138571L, null), "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-new-user&utm_content=--t%3Apm");
             LinkifiedTextView linkifiedTextView = this.binding.d;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.itemGuildWelcomeSubheaderIntro");
-            b.n(linkifiedTextView, 2131895068, new Object[]{C}, null, 4);
+            b.n(linkifiedTextView, R.string.welcome_cta_subtitle_action_with_guide, new Object[]{C}, null, 4);
             LinkifiedTextView linkifiedTextView2 = this.binding.d;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.itemGuildWelcomeSubheaderIntro");
             ChatActionItem chatActionItem3 = this.binding.f;
@@ -104,7 +106,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
             linkifiedTextView2.setVisibility(i2);
             LinkifiedTextView linkifiedTextView3 = this.binding.f1750c;
             m.checkNotNullExpressionValue(linkifiedTextView3, "binding.itemGuildWelcomeSubheader");
-            b.n(linkifiedTextView3, z3 ? 2131895069 : guildWelcomeEntry.isOwner() ? 2131895071 : 2131895070, new Object[0], null, 4);
+            b.n(linkifiedTextView3, z3 ? R.string.welcome_cta_subtitle_existing_server : guildWelcomeEntry.isOwner() ? R.string.welcome_cta_subtitle_owner : R.string.welcome_cta_subtitle_member, new Object[0], null, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureResolvedUI$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureResolvedUI$2.java
index 08448c987b..73306f63a5 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureResolvedUI$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureResolvedUI$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.view.View;
 import c.a.e.q;
+import com.discord.R;
 import com.discord.api.guild.Guild;
 import com.discord.models.domain.ModelInvite;
 import com.discord.utilities.features.GrowthTeamFeatures;
@@ -75,7 +76,7 @@ public final class WidgetChatListAdapterItemInvite$configureResolvedUI$2 impleme
         } else if (!this.$isHub || GrowthTeamFeatures.INSTANCE.isDiscordHubEmailConnectionEnabled()) {
             ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postInviteCode(this.$invite, "Invite Button Embed"), false, 1, null)).k(q.a.g(this.$context, new AnonymousClass1(this), null));
         } else {
-            c.a.e.o.g(this.$context, 2131888185, 0, null, 12);
+            c.a.e.o.g(this.$context, R.string.discord_u_coming_soon_to_mobile, 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
index 0dee923e63..9b4521fe27 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
@@ -14,6 +14,7 @@ import c.a.e.l;
 import c.a.j.b3;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.guild.GuildFeature;
@@ -359,54 +360,54 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemInvite(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558967, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_invite, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362115;
-        Barrier barrier = (Barrier) view.findViewById(2131362115);
+        int i = R.id.barrier_button;
+        Barrier barrier = (Barrier) view.findViewById(R.id.barrier_button);
         if (barrier != null) {
-            i = 2131362116;
-            Barrier barrier2 = (Barrier) view.findViewById(2131362116);
+            i = R.id.barrier_header;
+            Barrier barrier2 = (Barrier) view.findViewById(R.id.barrier_header);
             if (barrier2 != null) {
-                i = 2131363892;
-                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363892);
+                i = R.id.item_invite_button_layout;
+                FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.item_invite_button_layout);
                 if (frameLayout != null) {
-                    i = 2131363893;
-                    TextView textView = (TextView) view.findViewById(2131363893);
+                    i = R.id.item_invite_channel_name;
+                    TextView textView = (TextView) view.findViewById(R.id.item_invite_channel_name);
                     if (textView != null) {
-                        i = 2131363896;
-                        TextView textView2 = (TextView) view.findViewById(2131363896);
+                        i = R.id.item_invite_header;
+                        TextView textView2 = (TextView) view.findViewById(R.id.item_invite_header);
                         if (textView2 != null) {
-                            i = 2131363897;
-                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363897);
+                            i = R.id.item_invite_hub_layout;
+                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.item_invite_hub_layout);
                             if (frameLayout2 != null) {
-                                i = 2131363898;
-                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363898);
+                                i = R.id.item_invite_hub_link;
+                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.item_invite_hub_link);
                                 if (linkifiedTextView != null) {
-                                    i = 2131363899;
-                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363899);
+                                    i = R.id.item_invite_image;
+                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.item_invite_image);
                                     if (simpleDraweeView != null) {
-                                        i = 2131363900;
-                                        TextView textView3 = (TextView) view.findViewById(2131363900);
+                                        i = R.id.item_invite_image_text;
+                                        TextView textView3 = (TextView) view.findViewById(R.id.item_invite_image_text);
                                         if (textView3 != null) {
-                                            i = 2131363901;
-                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363901);
+                                            i = R.id.item_invite_join_button;
+                                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.item_invite_join_button);
                                             if (materialButton != null) {
-                                                i = 2131363902;
-                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363902);
+                                                i = R.id.item_invite_joined_button;
+                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.item_invite_joined_button);
                                                 if (materialButton2 != null) {
-                                                    i = 2131363903;
-                                                    View findViewById = view.findViewById(2131363903);
+                                                    i = R.id.item_invite_loading_button;
+                                                    View findViewById = view.findViewById(R.id.item_invite_loading_button);
                                                     if (findViewById != null) {
-                                                        i = 2131363904;
-                                                        View findViewById2 = view.findViewById(2131363904);
+                                                        i = R.id.item_invite_member_container;
+                                                        View findViewById2 = view.findViewById(R.id.item_invite_member_container);
                                                         if (findViewById2 != null) {
                                                             b3 a = b3.a(findViewById2);
-                                                            i = 2131363905;
-                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363905);
+                                                            i = R.id.item_invite_mention_button;
+                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.item_invite_mention_button);
                                                             if (materialButton3 != null) {
-                                                                i = 2131363906;
-                                                                TextView textView4 = (TextView) view.findViewById(2131363906);
+                                                                i = R.id.item_invite_name;
+                                                                TextView textView4 = (TextView) view.findViewById(R.id.item_invite_name);
                                                                 if (textView4 != null) {
                                                                     ConstraintLayout constraintLayout = (ConstraintLayout) view;
                                                                     WidgetChatListAdapterItemInviteBinding widgetChatListAdapterItemInviteBinding = new WidgetChatListAdapterItemInviteBinding(constraintLayout, barrier, barrier2, frameLayout, textView, textView2, frameLayout2, linkifiedTextView, simpleDraweeView, textView3, materialButton, materialButton2, findViewById, a, materialButton3, textView4, constraintLayout);
@@ -479,7 +480,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         imageView.setVisibility(z2 ^ true ? 0 : 8);
         TextView textView = this.binding.k.f72c;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteMember…iner.itemInviteOnlineText");
-        c.a.l.b.n(textView, 2131890667, new Object[]{StringUtilsKt.format(modelInvite.getApproximatePresenceCount(), context)}, null, 4);
+        c.a.l.b.n(textView, R.string.instant_invite_guild_members_online, new Object[]{StringUtilsKt.format(modelInvite.getApproximatePresenceCount(), context)}, null, 4);
         TextView textView2 = this.binding.k.f72c;
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteMember…iner.itemInviteOnlineText");
         if (!z2) {
@@ -495,7 +496,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         m.checkNotNullExpressionValue(textView4, "binding.itemInviteMember…itemInviteTotalMemberText");
         Resources resources = textView4.getResources();
         m.checkNotNullExpressionValue(resources, "binding.itemInviteMember…TotalMemberText.resources");
-        ViewExtensions.setTextAndVisibilityBy(textView3, StringResourceUtilsKt.getQuantityString(resources, context, 2131755201, modelInvite.getApproximateMemberCount(), Integer.valueOf(modelInvite.getApproximateMemberCount())));
+        ViewExtensions.setTextAndVisibilityBy(textView3, StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.instant_invite_guild_members_total_count, modelInvite.getApproximateMemberCount(), Integer.valueOf(modelInvite.getApproximateMemberCount())));
     }
 
     private final void configureForVocalChannel(Channel channel, Context context) {
@@ -508,11 +509,11 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         TextView textView = this.binding.b;
         int A = channel.A();
         if (A != 2) {
-            i = A != 13 ? 0 : 2131231514;
+            i = A != 13 ? 0 : R.drawable.ic_channel_stage_24dp;
         } else {
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            i = DrawableCompat.getThemedDrawableRes$default(view, 2130969482, 0, 2, (Object) null);
+            i = DrawableCompat.getThemedDrawableRes$default(view, (int) R.attr.ic_volume_up, 0, 2, (Object) null);
         }
         DrawableCompat.setCompoundDrawablesCompat$default(textView, i, 0, 0, 0, 14, (Object) null);
         ViewExtensions.setTextAndVisibilityBy(textView, AnimatableValueParser.z0(channel, context, false));
@@ -551,13 +552,13 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         TextView textView = this.binding.f1751c;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader");
         int i = 0;
-        c.a.l.b.n(textView, areEqual ? 2131890809 : 2131890801, new Object[0], null, 4);
+        c.a.l.b.n(textView, areEqual ? R.string.invite_button_title_inviter_invalid : R.string.invite_button_title_invited_invalid, new Object[0], null, 4);
         TextView textView2 = this.binding.m;
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteName");
-        c.a.l.b.n(textView2, 2131890788, new Object[0], null, 4);
-        this.binding.m.setTextColor(ColorCompat.getColor(context, 2131100329));
+        c.a.l.b.n(textView2, R.string.invite_button_invalid, new Object[0], null, 4);
+        this.binding.m.setTextColor(ColorCompat.getColor(context, (int) R.color.status_red_500));
         this.binding.m.setBackgroundResource(0);
-        this.binding.f.setActualImageResource(2131232302);
+        this.binding.f.setActualImageResource(R.drawable.img_wump_trash_dark);
         TextView textView3 = this.binding.g;
         m.checkNotNullExpressionValue(textView3, "binding.itemInviteImageText");
         textView3.setVisibility(8);
@@ -565,7 +566,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         if (!areEqual) {
             if ((invalid != null ? invalid.getAuthorUser() : null) != null) {
                 m.checkNotNullExpressionValue(context, "context");
-                charSequence = c.a.l.b.h(context, 2131890654, new Object[]{invalid.getAuthorUser().getUsername()}, null, 4);
+                charSequence = c.a.l.b.h(context, R.string.instant_invite_ask_user_for_new_invite, new Object[]{invalid.getAuthorUser().getUsername()}, null, 4);
                 b3 b3Var = this.binding.k;
                 m.checkNotNullExpressionValue(b3Var, "binding.itemInviteMemberContainer");
                 LinearLayout linearLayout = b3Var.a;
@@ -588,7 +589,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
                 imageView2.setVisibility(8);
                 MaterialButton materialButton = this.binding.l;
                 m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton");
-                c.a.l.b.n(materialButton, areEqual ? 2131887936 : 2131891459, new Object[0], null, 4);
+                c.a.l.b.n(materialButton, areEqual ? R.string.create_instant_invite : R.string.mention, new Object[0], null, 4);
                 MaterialButton materialButton2 = this.binding.l;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton");
                 if (areEqual) {
@@ -618,7 +619,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         if (!areEqual) {
             if ((invalid != null ? invalid.getAuthorUser() : null) == null) {
                 m.checkNotNullExpressionValue(context, "context");
-                charSequence = c.a.l.b.h(context, 2131890653, new Object[0], null, 4);
+                charSequence = c.a.l.b.h(context, R.string.instant_invite_ask_for_new_invite, new Object[0], null, 4);
                 b3 b3Var = this.binding.k;
                 m.checkNotNullExpressionValue(b3Var, "binding.itemInviteMemberContainer");
                 LinearLayout linearLayout = b3Var.a;
@@ -641,7 +642,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
                 imageView2.setVisibility(8);
                 MaterialButton materialButton = this.binding.l;
                 m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton");
-                c.a.l.b.n(materialButton, areEqual ? 2131887936 : 2131891459, new Object[0], null, 4);
+                c.a.l.b.n(materialButton, areEqual ? R.string.create_instant_invite : R.string.mention, new Object[0], null, 4);
                 MaterialButton materialButton2 = this.binding.l;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton");
                 if (areEqual) {
@@ -663,7 +664,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         }
         if (areEqual) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.h(context, 2131890789, new Object[0], null, 4);
+            charSequence = c.a.l.b.h(context, R.string.invite_button_invalid_owner, new Object[0], null, 4);
         } else {
             charSequence = null;
         }
@@ -689,7 +690,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         imageView2.setVisibility(8);
         MaterialButton materialButton = this.binding.l;
         m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton");
-        c.a.l.b.n(materialButton, areEqual ? 2131887936 : 2131891459, new Object[0], null, 4);
+        c.a.l.b.n(materialButton, areEqual ? R.string.create_instant_invite : R.string.mention, new Object[0], null, 4);
         MaterialButton materialButton2 = this.binding.l;
         m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton");
         if (areEqual) {
@@ -713,13 +714,13 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
         Context context = view.getContext();
-        this.binding.f1751c.setText(2131890676);
+        this.binding.f1751c.setText(R.string.instant_invite_resolving);
         TextView textView = this.binding.m;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteName");
         textView.setText((CharSequence) null);
-        this.binding.m.setTextColor(ColorCompat.getThemedColor(context, 2130969878));
-        this.binding.m.setBackgroundResource(2131231131);
-        this.binding.f.setImageResource(2131231131);
+        this.binding.m.setTextColor(ColorCompat.getThemedColor(context, (int) R.attr.primary_100));
+        this.binding.m.setBackgroundResource(R.drawable.drawable_empty_text_placeholder_dark);
+        this.binding.f.setImageResource(R.drawable.drawable_empty_text_placeholder_dark);
         TextView textView2 = this.binding.g;
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteImageText");
         textView2.setVisibility(8);
@@ -804,30 +805,30 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         String str2 = null;
         if (r1 && z4) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.h(context, 2131890807, new Object[0], null, 4);
+            charSequence = c.a.l.b.h(context, R.string.invite_button_title_inviter_group_dm, new Object[0], null, 4);
         } else if (z4) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.h(context, 2131890805, new Object[0], null, 4);
+            charSequence = c.a.l.b.h(context, R.string.invite_button_title_inviter, new Object[0], null, 4);
         } else if (r1 && !z4) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.h(context, 2131890799, new Object[0], null, 4);
+            charSequence = c.a.l.b.h(context, R.string.invite_button_title_invited_group_dm, new Object[0], null, 4);
         } else if (z6) {
-            charSequence = context.getString(2131890800);
+            charSequence = context.getString(R.string.invite_button_title_invited_hub);
         } else if (z7) {
             m.checkNotNullExpressionValue(context, "context");
             Object[] objArr = new Object[1];
             com.discord.api.user.User inviter = component1.getInviter();
             objArr[0] = inviter != null ? inviter.r() : null;
-            charSequence = c.a.l.b.h(context, 2131890679, objArr, null, 4);
+            charSequence = c.a.l.b.h(context, R.string.instant_invite_you_have_been_invited_to_chat, objArr, null, 4);
         } else if (!z5 || component1.getInviter() == null) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.h(context, 2131890797, new Object[0], null, 4);
+            charSequence = c.a.l.b.h(context, R.string.invite_button_title_invited, new Object[0], null, 4);
         } else {
             m.checkNotNullExpressionValue(context, "context");
             Object[] objArr2 = new Object[1];
             com.discord.api.user.User inviter2 = component1.getInviter();
             objArr2[0] = inviter2 != null ? inviter2.r() : null;
-            charSequence = c.a.l.b.h(context, 2131890682, objArr2, null, 4);
+            charSequence = c.a.l.b.h(context, R.string.instant_invite_you_have_been_invited_to_join_by_user, objArr2, null, 4);
         }
         textView.setText(charSequence);
         TextView textView2 = this.binding.m;
@@ -842,7 +843,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
                 m.checkNotNullExpressionValue(context, "context");
                 str = AnimatableValueParser.A0(channel2, context, false, 2);
                 textView2.setText(str);
-                this.binding.m.setTextColor(ColorCompat.getThemedColor(context, 2130969878));
+                this.binding.m.setTextColor(ColorCompat.getThemedColor(context, (int) R.attr.primary_100));
                 this.binding.m.setBackgroundResource(0);
                 int i = 8;
                 if (z7) {
@@ -858,7 +859,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
                     Guild guild4 = component1.getGuild();
                     Long valueOf = guild4 != null ? Long.valueOf(guild4.o()) : null;
                     Guild guild5 = component1.getGuild();
-                    updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild5 != null ? guild5.n() : null, "asset://asset/images/default_icon_selected.jpg", resolved.getShouldAnimateGuildIcon(), null, 16, null));
+                    updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild5 != null ? guild5.n() : null, IconUtils.DEFAULT_ICON_BLURPLE, resolved.getShouldAnimateGuildIcon(), null, 16, null));
                     Guild guild6 = component1.getGuild();
                     if (!(guild6 == null || (n = guild6.n()) == null)) {
                         if (n.length() > 0) {
@@ -911,7 +912,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
                 if (z2) {
                     LinkifiedTextView linkifiedTextView = this.binding.e;
                     m.checkNotNullExpressionValue(linkifiedTextView, "binding.itemInviteHubLink");
-                    linkifiedTextView.setText(c.a.l.b.b(context, 2131890465, new Object[0], new WidgetChatListAdapterItemInvite$configureResolvedUI$4(this)));
+                    linkifiedTextView.setText(c.a.l.b.b(context, R.string.hub_invite_another_school_link, new Object[0], new WidgetChatListAdapterItemInvite$configureResolvedUI$4(this)));
                     return;
                 }
                 return;
@@ -921,7 +922,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
             if (guild7 != null) {
                 str = guild7.u();
                 textView2.setText(str);
-                this.binding.m.setTextColor(ColorCompat.getThemedColor(context, 2130969878));
+                this.binding.m.setTextColor(ColorCompat.getThemedColor(context, (int) R.attr.primary_100));
                 this.binding.m.setBackgroundResource(0);
                 int i = 8;
                 if (z7) {
@@ -959,7 +960,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         }
         str = null;
         textView2.setText(str);
-        this.binding.m.setTextColor(ColorCompat.getThemedColor(context, 2130969878));
+        this.binding.m.setTextColor(ColorCompat.getThemedColor(context, (int) R.attr.primary_100));
         this.binding.m.setBackgroundResource(0);
         int i = 8;
         if (z7) {
@@ -1019,7 +1020,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         if (!m.areEqual(this.iconUrl, str)) {
             SimpleDraweeView simpleDraweeView = this.binding.f;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemInviteImage");
-            IconUtils.setIcon$default(simpleDraweeView, str, 2131165290, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView, str, (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
             this.iconUrl = str;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java
index 0629228d1f..8165f283af 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java
@@ -5,6 +5,7 @@ import androidx.annotation.LayoutRes;
 import c.a.e.o;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.guild.GuildFeature;
@@ -73,7 +74,7 @@ public abstract class WidgetChatListAdapterItemInviteBase extends WidgetChatList
                     z4 = false;
                 }
                 if (!z4 && !GrowthTeamFeatures.INSTANCE.isDiscordHubEnabled()) {
-                    o.g(context, 2131888185, 0, null, 12);
+                    o.g(context, R.string.discord_u_coming_soon_to_mobile, 0, null, 12);
                     return;
                 } else if (!z3) {
                     ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), modelInvite.getChannel(), null, null, 6, null);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
index b9c1d3e7f4..23207d3509 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemMentionFooterBinding;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import d0.z.d.m;
@@ -17,20 +18,20 @@ public final class WidgetChatListAdapterItemMentionFooter extends WidgetChatList
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemMentionFooter(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558969, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_mention_footer, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362610;
-        View findViewById = view.findViewById(2131362610);
+        int i = R.id.chat_list_item_mention_footer_divider;
+        View findViewById = view.findViewById(R.id.chat_list_item_mention_footer_divider);
         if (findViewById != null) {
-            i = 2131362611;
-            ImageView imageView = (ImageView) view.findViewById(2131362611);
+            i = R.id.chat_list_item_mention_footer_hand;
+            ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_item_mention_footer_hand);
             if (imageView != null) {
-                i = 2131362612;
-                TextView textView = (TextView) view.findViewById(2131362612);
+                i = R.id.chat_list_item_message_header_channel;
+                TextView textView = (TextView) view.findViewById(R.id.chat_list_item_message_header_channel);
                 if (textView != null) {
-                    i = 2131365559;
-                    View findViewById2 = view.findViewById(2131365559);
+                    i = R.id.tile;
+                    View findViewById2 = view.findViewById(R.id.tile);
                     if (findViewById2 != null) {
                         WidgetChatListAdapterItemMentionFooterBinding widgetChatListAdapterItemMentionFooterBinding = new WidgetChatListAdapterItemMentionFooterBinding((LinearLayout) view, findViewById, imageView, textView, findViewById2);
                         m.checkNotNullExpressionValue(widgetChatListAdapterItemMentionFooterBinding, "WidgetChatListAdapterIte…terBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java
index 6db753286b..889a641fa7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.adapter;
 
 import android.text.style.StyleSpan;
 import android.view.View;
+import com.discord.R;
 import com.discord.api.interaction.Interaction;
 import com.discord.api.user.User;
 import com.discord.i18n.Hook;
@@ -83,7 +84,7 @@ public final class WidgetChatListAdapterItemMessage$configureReplyInteraction$co
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
             hook.a.add(new StyleSpan(1));
-            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(WidgetChatListAdapterItemMessage.access$getReplyText$p(this.this$0.this$0), 2130968987)), false, null, new AnonymousClass1(this), 4, null));
+            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(WidgetChatListAdapterItemMessage.access$getReplyText$p(this.this$0.this$0), (int) R.attr.colorTextLink)), false, null, new AnonymousClass1(this), 4, null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java
index e5bb45f9ea..0631285c00 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java
@@ -17,6 +17,7 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewKt;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.interaction.Interaction;
 import com.discord.api.message.LocalAttachment;
 import com.discord.api.user.User;
@@ -59,27 +60,27 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     public static final Companion Companion = new Companion(null);
     private static final int MAX_REPLY_AST_NODES = 50;
-    private final View backgroundHighlight = this.itemView.findViewById(2131362551);
-    private final FailedUploadList failedUploadList = ((FailedUploadList) this.itemView.findViewById(2131362548));
-    private final View gutterHighlight = this.itemView.findViewById(2131362549);
-    private final TextView itemAlertText = ((TextView) this.itemView.findViewById(2131362537));
-    private final ImageView itemAvatar = ((ImageView) this.itemView.findViewById(2131362562));
-    private final TextView itemLoadingText = ((TextView) this.itemView.findViewById(2131362572));
-    private final TextView itemName = ((TextView) this.itemView.findViewById(2131362573));
-    private final TextView itemTag = ((TextView) this.itemView.findViewById(2131362575));
+    private final View backgroundHighlight = this.itemView.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
+    private final FailedUploadList failedUploadList = ((FailedUploadList) this.itemView.findViewById(R.id.chat_list_adapter_item_failed_upload_list));
+    private final View gutterHighlight = this.itemView.findViewById(R.id.chat_list_adapter_item_gutter_bg);
+    private final TextView itemAlertText = ((TextView) this.itemView.findViewById(R.id.chat_list_adapter_item_alert_text));
+    private final ImageView itemAvatar = ((ImageView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_avatar));
+    private final TextView itemLoadingText = ((TextView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_loading));
+    private final TextView itemName = ((TextView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_name));
+    private final TextView itemTag = ((TextView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_tag));
     private final SimpleDraweeSpanTextView itemText;
-    private final TextView itemTimestamp = ((TextView) this.itemView.findViewById(2131362576));
-    private final TypingDots loadingDots = ((TypingDots) this.itemView.findViewById(2131362628));
-    private final ImageView replyAvatar = ((ImageView) this.itemView.findViewById(2131362565));
-    private final View replyHolder = this.itemView.findViewById(2131362564);
-    private final ImageView replyIcon = ((ImageView) this.itemView.findViewById(2131362566));
-    private final View replyLeadingViewsHolder = this.itemView.findViewById(2131362554);
-    private final View replyLinkItem = this.itemView.findViewById(2131362567);
-    private final TextView replyName = ((TextView) this.itemView.findViewById(2131362568));
-    private final SimpleDraweeSpanTextView replyText = ((SimpleDraweeSpanTextView) this.itemView.findViewById(2131362574));
-    private final ImageView sendError = ((ImageView) this.itemView.findViewById(2131362570));
-    private final ImageView threadEmbedSpine = ((ImageView) this.itemView.findViewById(2131362577));
-    private final View threadStarterMessageHeader = this.itemView.findViewById(2131365547);
+    private final TextView itemTimestamp = ((TextView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_timestamp));
+    private final TypingDots loadingDots = ((TypingDots) this.itemView.findViewById(R.id.chat_overlay_typing_dots));
+    private final ImageView replyAvatar = ((ImageView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_decorator_avatar));
+    private final View replyHolder = this.itemView.findViewById(R.id.chat_list_adapter_item_text_decorator);
+    private final ImageView replyIcon = ((ImageView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_decorator_reply_icon));
+    private final View replyLeadingViewsHolder = this.itemView.findViewById(R.id.chat_list_adapter_item_reply_leading_views);
+    private final View replyLinkItem = this.itemView.findViewById(R.id.chat_list_adapter_item_text_decorator_reply_link_icon);
+    private final TextView replyName = ((TextView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_decorator_reply_name));
+    private final SimpleDraweeSpanTextView replyText = ((SimpleDraweeSpanTextView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_reply_content));
+    private final ImageView sendError = ((ImageView) this.itemView.findViewById(R.id.chat_list_adapter_item_text_error));
+    private final ImageView threadEmbedSpine = ((ImageView) this.itemView.findViewById(R.id.chat_list_adapter_item_thread_embed_spine));
+    private final View threadStarterMessageHeader = this.itemView.findViewById(R.id.thread_starter_message_header);
 
     /* compiled from: WidgetChatListAdapterItemMessage.kt */
     public static final class Companion {
@@ -95,7 +96,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     public WidgetChatListAdapterItemMessage(@LayoutRes int i, WidgetChatListAdapter widgetChatListAdapter) {
         super(i, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
-        View findViewById = this.itemView.findViewById(2131362561);
+        View findViewById = this.itemView.findViewById(R.id.chat_list_adapter_item_text);
         m.checkNotNullExpressionValue(findViewById, "itemView.findViewById(R.…t_list_adapter_item_text)");
         this.itemText = (SimpleDraweeSpanTextView) findViewById;
     }
@@ -156,11 +157,11 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         if (message.isFailed()) {
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            i = ColorCompat.getThemedColor(view, 2130968930);
+            i = ColorCompat.getThemedColor(view, (int) R.attr.colorError);
         } else {
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            i = ColorCompat.getThemedColor(view2, 2130968989);
+            i = ColorCompat.getThemedColor(view2, (int) R.attr.colorTextMuted);
         }
         TextView textView3 = this.itemLoadingText;
         if (textView3 != null) {
@@ -175,7 +176,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                 Map<Long, String> nickOrUsernames = messageEntry.getNickOrUsernames();
                 User author = message.getAuthor();
                 objArr[0] = nickOrUsernames.get(author != null ? Long.valueOf(author.i()) : null);
-                textView4.setText(b.h(context, 2131886392, objArr, null, 4));
+                textView4.setText(b.h(context, R.string.application_command_waiting, objArr, null, 4));
             }
             ImageView imageView2 = this.sendError;
             if (imageView2 != null) {
@@ -184,7 +185,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         } else if (message.isLocalApplicationCommand() && message.isFailed()) {
             TextView textView5 = this.itemLoadingText;
             if (textView5 != null) {
-                textView5.setText(2131886382);
+                textView5.setText(R.string.application_command_failed);
             }
             ImageView imageView3 = this.sendError;
             if (imageView3 != null) {
@@ -201,7 +202,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         } else if (message.isLocalApplicationCommand()) {
             TextView textView6 = this.itemLoadingText;
             if (textView6 != null) {
-                textView6.setText(2131886383);
+                textView6.setText(R.string.application_command_sending);
             }
             ImageView imageView4 = this.sendError;
             if (imageView4 != null) {
@@ -226,8 +227,8 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                 z2 = false;
             }
             textView.setVisibility(z2 ? 0 : 8);
-            this.itemTag.setText((coreUser.isSystemUser() || isPublicGuildSystemMessage) ? 2131894149 : z3 ? 2131887058 : 2131887057);
-            this.itemTag.setCompoundDrawablesWithIntrinsicBounds(UserUtils.INSTANCE.isVerifiedBot(coreUser) ? 2131232094 : 0, 0, 0, 0);
+            this.itemTag.setText((coreUser.isSystemUser() || isPublicGuildSystemMessage) ? R.string.system_dm_tag_system : z3 ? R.string.bot_tag_server : R.string.bot_tag_bot);
+            this.itemTag.setCompoundDrawablesWithIntrinsicBounds(UserUtils.INSTANCE.isVerifiedBot(coreUser) ? R.drawable.ic_verified_10dp : 0, 0, 0, 0);
         }
     }
 
@@ -259,7 +260,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
             }
             imageView.setVisibility(8);
             this.replyAvatar.setVisibility(0);
-            IconUtils.setIcon$default(this.replyAvatar, user, 2131165295, null, null, guildMember, 24, null);
+            IconUtils.setIcon$default(this.replyAvatar, user, R.dimen.avatar_size_reply, null, null, guildMember, 24, null);
         }
     }
 
@@ -296,7 +297,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                 }
             }
             SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.replyText;
-            CharSequence d = simpleDraweeSpanTextView2 != null ? b.d(simpleDraweeSpanTextView2, 2131894153, new Object[]{interaction.b()}, new WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(this, interaction, message, c2)) : null;
+            CharSequence d = simpleDraweeSpanTextView2 != null ? b.d(simpleDraweeSpanTextView2, R.string.system_message_application_command_reply, new Object[]{interaction.b()}, new WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(this, interaction, message, c2)) : null;
             if (d != null) {
                 SpannableString valueOf = SpannableString.valueOf(d);
                 m.checkExpressionValueIsNotNull(valueOf, "SpannableString.valueOf(this)");
@@ -343,11 +344,11 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                     MessageEntry messageEntry2 = replyData.getMessageEntry();
                     StoreMessageReplies.MessageState messageState = replyData.getMessageState();
                     if (replyData.isRepliedUserBlocked()) {
-                        configureReplySystemMessage(2131892968);
+                        configureReplySystemMessage(R.string.reply_quote_message_blocked);
                     } else if (messageState instanceof StoreMessageReplies.MessageState.Unloaded) {
-                        configureReplySystemMessage(2131892970);
+                        configureReplySystemMessage(R.string.reply_quote_message_not_loaded);
                     } else if (messageState instanceof StoreMessageReplies.MessageState.Deleted) {
-                        configureReplySystemMessage(2131892969);
+                        configureReplySystemMessage(R.string.reply_quote_message_deleted);
                     } else if ((messageState instanceof StoreMessageReplies.MessageState.Loaded) && messageEntry2 != null) {
                         Message message2 = messageEntry2.getMessage();
                         this.replyHolder.setOnClickListener(new WidgetChatListAdapterItemMessage$configureReplyPreview$1(message2));
@@ -373,9 +374,9 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                                 this.replyText.setDraweeSpanStringBuilder(parse);
                                 configureReplyLayoutDirection();
                             } else if (message2.hasStickers()) {
-                                configureReplyContentWithResourceId(2131892974);
+                                configureReplyContentWithResourceId(R.string.reply_quote_sticker_mobile);
                             } else if (message2.hasAttachments() || message2.hasEmbeds()) {
-                                configureReplyContentWithResourceId(2131892972);
+                                configureReplyContentWithResourceId(R.string.reply_quote_no_text_content_mobile);
                             }
                         }
                     }
@@ -398,7 +399,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         if (imageView != null && this.replyAvatar != null && this.replyText != null) {
             imageView.setVisibility(8);
             this.replyAvatar.setVisibility(0);
-            this.replyAvatar.setImageResource(2131231701);
+            this.replyAvatar.setImageResource(R.drawable.ic_group_join);
             configureReplyName("", 0, false);
             Context context = this.replyText.getContext();
             m.checkNotNullExpressionValue(context, "context");
@@ -435,7 +436,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     private final int getAuthorTextColor(GuildMember guildMember) {
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
-        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), 2130968932));
+        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), (int) R.attr.colorHeaderPrimary));
     }
 
     private final LeadingMarginSpan getLeadingEdgeSpan() {
@@ -456,7 +457,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     }
 
     private final MessageRenderContext getMessageRenderContext(Context context, MessageEntry messageEntry, Function1<? super SpoilerNode<?>, Unit> function1) {
-        return new MessageRenderContext(context, ((WidgetChatListAdapter) this.adapter).getData().getUserId(), messageEntry.getAnimateEmojis(), messageEntry.getNickOrUsernames(), ((WidgetChatListAdapter) this.adapter).getData().getChannelNames(), messageEntry.getRoles(), 2130968987, WidgetChatListAdapterItemMessage$getMessageRenderContext$1.INSTANCE, new WidgetChatListAdapterItemMessage$getMessageRenderContext$2(this), ColorCompat.getThemedColor(context, 2130970190), ColorCompat.getThemedColor(context, 2130970191), function1, new WidgetChatListAdapterItemMessage$getMessageRenderContext$3(this), new WidgetChatListAdapterItemMessage$getMessageRenderContext$4(context));
+        return new MessageRenderContext(context, ((WidgetChatListAdapter) this.adapter).getData().getUserId(), messageEntry.getAnimateEmojis(), messageEntry.getNickOrUsernames(), ((WidgetChatListAdapter) this.adapter).getData().getChannelNames(), messageEntry.getRoles(), R.attr.colorTextLink, WidgetChatListAdapterItemMessage$getMessageRenderContext$1.INSTANCE, new WidgetChatListAdapterItemMessage$getMessageRenderContext$2(this), ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_spoiler_bg), ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_spoiler_bg_visible), function1, new WidgetChatListAdapterItemMessage$getMessageRenderContext$3(this), new WidgetChatListAdapterItemMessage$getMessageRenderContext$4(context));
     }
 
     private final Function1<SpoilerNode<?>, Unit> getSpoilerClickHandler(Message message) {
@@ -477,7 +478,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         boolean z3 = (editedTimestamp != null ? editedTimestamp.g() : 0) > 0;
         if (message.isSourceDeleted()) {
             m.checkNotNullExpressionValue(context, "context");
-            str = context.getResources().getString(2131893684);
+            str = context.getResources().getString(R.string.source_message_deleted);
         } else {
             str = message.getContent();
             if (str == null) {
@@ -592,7 +593,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                 ImageView imageView2 = this.itemAvatar;
                 User author4 = message.getAuthor();
                 m.checkNotNull(author4);
-                IconUtils.setIcon$default(imageView2, new CoreUser(author4), 2131165285, null, null, messageEntry.getAuthor(), 24, null);
+                IconUtils.setIcon$default(imageView2, new CoreUser(author4), R.dimen.avatar_size_chat, null, null, messageEntry.getAuthor(), 24, null);
             }
             if (this.failedUploadList != null) {
                 List<LocalAttachment> localAttachments = message.getLocalAttachments();
@@ -610,7 +611,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                     if (type == null || type.intValue() != -3) {
                         z2 = false;
                     }
-                    this.itemAlertText.setText(z2 ? 2131890767 : 2131893548);
+                    this.itemAlertText.setText(z2 ? R.string.invalid_attachments_failure : R.string.send_message_failure);
                 } else {
                     this.itemAlertText.setVisibility(8);
                 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
index 8c8f382082..7b04c89e45 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.Space;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemMessageHeaderBinding;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import com.discord.widgets.chat.list.entries.MessageHeaderEntry;
@@ -14,20 +15,20 @@ public final class WidgetChatListAdapterItemMessageHeader extends WidgetChatList
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemMessageHeader(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558970, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_message_header, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362612;
-        TextView textView = (TextView) view.findViewById(2131362612);
+        int i = R.id.chat_list_item_message_header_channel;
+        TextView textView = (TextView) view.findViewById(R.id.chat_list_item_message_header_channel);
         if (textView != null) {
-            i = 2131362613;
-            View findViewById = view.findViewById(2131362613);
+            i = R.id.chat_list_item_message_header_divider;
+            View findViewById = view.findViewById(R.id.chat_list_item_message_header_divider);
             if (findViewById != null) {
-                i = 2131362614;
-                TextView textView2 = (TextView) view.findViewById(2131362614);
+                i = R.id.chat_list_item_message_header_guild;
+                TextView textView2 = (TextView) view.findViewById(R.id.chat_list_item_message_header_guild);
                 if (textView2 != null) {
-                    i = 2131362615;
-                    Space space = (Space) view.findViewById(2131362615);
+                    i = R.id.chat_list_item_message_header_spacer;
+                    Space space = (Space) view.findViewById(R.id.chat_list_item_message_header_spacer);
                     if (space != null) {
                         WidgetChatListAdapterItemMessageHeaderBinding widgetChatListAdapterItemMessageHeaderBinding = new WidgetChatListAdapterItemMessageHeaderBinding((RelativeLayout) view, textView, findViewById, textView2, space);
                         m.checkNotNullExpressionValue(widgetChatListAdapterItemMessageHeaderBinding, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
index 63e3bb5e43..6641b27ef1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemTextDividerBinding;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.locale.LocaleManager;
@@ -15,7 +16,7 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemNewMessages(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558988, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_text_divider, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         WidgetChatListAdapterItemTextDividerBinding a = WidgetChatListAdapterItemTextDividerBinding.a(this.itemView);
         m.checkNotNullExpressionValue(a, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
@@ -25,20 +26,20 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt
         View view = a.b;
         View view2 = this.itemView;
         m.checkNotNullExpressionValue(view2, "itemView");
-        view.setBackgroundColor(ColorCompat.getColor(view2.getContext(), 2131100329));
+        view.setBackgroundColor(ColorCompat.getColor(view2.getContext(), (int) R.color.status_red_500));
         View view3 = a.f1763c;
         View view4 = this.itemView;
         m.checkNotNullExpressionValue(view4, "itemView");
-        view3.setBackgroundColor(ColorCompat.getColor(view4.getContext(), 2131100329));
+        view3.setBackgroundColor(ColorCompat.getColor(view4.getContext(), (int) R.color.status_red_500));
         TextView textView = a.d;
         View view5 = this.itemView;
         m.checkNotNullExpressionValue(view5, "itemView");
-        textView.setTextColor(ColorCompat.getColor(view5.getContext(), 2131100329));
+        textView.setTextColor(ColorCompat.getColor(view5.getContext(), (int) R.color.status_red_500));
         TextView textView2 = a.d;
         m.checkNotNullExpressionValue(textView2, "binding.dividerText");
         View view6 = this.itemView;
         m.checkNotNullExpressionValue(view6, "itemView");
-        String string = view6.getContext().getString(2131891667);
+        String string = view6.getContext().getString(R.string.new_messages_divider);
         m.checkNotNullExpressionValue(string, "itemView.context.getStri…ing.new_messages_divider)");
         TextView textView3 = a.d;
         m.checkNotNullExpressionValue(textView3, "binding.dividerText");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
index 7980b9ce9d..b18405b6d9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.StringRes;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemPrivateChannelStartBinding;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -20,17 +21,17 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemPrivateChannelStart(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558972, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_private_channel_start, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362553;
-        TextView textView = (TextView) view.findViewById(2131362553);
+        int i = R.id.chat_list_adapter_item_private_channel_start_header;
+        TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_private_channel_start_header);
         if (textView != null) {
-            i = 2131364565;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364565);
+            i = R.id.private_channel_start_image;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.private_channel_start_image);
             if (simpleDraweeView != null) {
-                i = 2131364566;
-                TextView textView2 = (TextView) view.findViewById(2131364566);
+                i = R.id.private_channel_start_text;
+                TextView textView2 = (TextView) view.findViewById(R.id.private_channel_start_text);
                 if (textView2 != null) {
                     WidgetChatListAdapterItemPrivateChannelStartBinding widgetChatListAdapterItemPrivateChannelStartBinding = new WidgetChatListAdapterItemPrivateChannelStartBinding((LinearLayout) view, textView, simpleDraweeView, textView2);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemPrivateChannelStartBinding, "WidgetChatListAdapterIte…artBinding.bind(itemView)");
@@ -44,7 +45,7 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
 
     @StringRes
     private final int getStartResId(int i) {
-        return (i == 1 || i != 3) ? 2131886842 : 2131886843;
+        return (i == 1 || i != 3) ? R.string.beginning_dm : R.string.beginning_group_dm;
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem
@@ -59,7 +60,7 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
         if (!(!t.isBlank(component2))) {
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.chatListAdapterI…PrivateChannelStartHeader");
-            component2 = textView.getContext().getString(2131894510);
+            component2 = textView.getContext().getString(R.string.unnamed);
             m.checkNotNullExpressionValue(component2, "binding.chatListAdapterI…tString(R.string.unnamed)");
         }
         TextView textView2 = this.binding.b;
@@ -68,14 +69,14 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
         if (component4 != null) {
             SimpleDraweeView simpleDraweeView = this.binding.f1754c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.privateChannelStartImage");
-            IconUtils.setIcon$default(simpleDraweeView, component4, 2131165299, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView, component4, (int) R.dimen.avatar_size_xxlarge, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         } else {
             SimpleDraweeView simpleDraweeView2 = this.binding.f1754c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.privateChannelStartImage");
-            IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon.jpg", 2131165299, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView2, IconUtils.DEFAULT_ICON, (int) R.dimen.avatar_size_xxlarge, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
         if (component5) {
-            this.binding.d.setText(2131894148);
+            this.binding.d.setText(R.string.system_dm_empty_message);
             return;
         }
         TextView textView3 = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
index 7a2876e210..12b8c92af8 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.c1;
 import c.a.z.z;
+import com.discord.R;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.databinding.WidgetChatListAdapterItemReactionsBinding;
 import com.discord.models.message.Message;
@@ -37,24 +38,24 @@ public final class WidgetChatListAdapterItemReactions extends WidgetChatListItem
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemReactions(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558973, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_reactions, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362549;
-        View findViewById = view.findViewById(2131362549);
+        int i = R.id.chat_list_adapter_item_gutter_bg;
+        View findViewById = view.findViewById(R.id.chat_list_adapter_item_gutter_bg);
         if (findViewById != null) {
-            i = 2131362551;
-            View findViewById2 = view.findViewById(2131362551);
+            i = R.id.chat_list_adapter_item_highlighted_bg;
+            View findViewById2 = view.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
             if (findViewById2 != null) {
-                i = 2131362616;
-                FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131362616);
+                i = R.id.chat_list_item_reactions;
+                FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(R.id.chat_list_item_reactions);
                 if (flexboxLayout != null) {
                     ConstraintLayout constraintLayout = (ConstraintLayout) view;
                     WidgetChatListAdapterItemReactionsBinding widgetChatListAdapterItemReactionsBinding = new WidgetChatListAdapterItemReactionsBinding(constraintLayout, findViewById, findViewById2, flexboxLayout);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemReactionsBinding, "WidgetChatListAdapterIte…onsBinding.bind(itemView)");
                     this.binding = widgetChatListAdapterItemReactionsBinding;
                     m.checkNotNullExpressionValue(constraintLayout, "binding.root");
-                    View inflate = LayoutInflater.from(constraintLayout.getContext()).inflate(2131558658, (ViewGroup) null, false);
+                    View inflate = LayoutInflater.from(constraintLayout.getContext()).inflate(R.layout.reaction_quick_add, (ViewGroup) null, false);
                     Objects.requireNonNull(inflate, "rootView");
                     ImageView imageView = (ImageView) inflate;
                     m.checkNotNullExpressionValue(new c1(imageView, imageView), "ReactionQuickAddBinding.…ot.context), null, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java
index 6010156aa7..88b4ef0b7e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.view.View;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemResultCountBinding;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
@@ -16,7 +17,7 @@ public final class WidgetChatListAdapterItemSearchResultCount extends WidgetChat
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSearchResultCount(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558974, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_result_count, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
         Objects.requireNonNull(view, "rootView");
@@ -41,6 +42,6 @@ public final class WidgetChatListAdapterItemSearchResultCount extends WidgetChat
         m.checkNotNullExpressionValue(textView3, "binding.resultCount");
         Context context = textView3.getContext();
         m.checkNotNullExpressionValue(context, "binding.resultCount.context");
-        textView.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755352, totalResults, Integer.valueOf(totalResults)));
+        textView.setText(StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.total_results_count, totalResults, Integer.valueOf(totalResults)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
index 1a29fda5ea..fc65405cd3 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
@@ -8,6 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityAssets;
 import com.discord.api.activity.ActivityParty;
@@ -229,33 +230,33 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSpotifyListenTogether(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558980, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_spotify_listen_together, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362114;
-        Barrier barrier = (Barrier) view.findViewById(2131362114);
+        int i = R.id.barrier;
+        Barrier barrier = (Barrier) view.findViewById(R.id.barrier);
         if (barrier != null) {
-            i = 2131363911;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363911);
+            i = R.id.item_listen_together_album_image;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.item_listen_together_album_image);
             if (simpleDraweeView != null) {
-                i = 2131363912;
-                TextView textView = (TextView) view.findViewById(2131363912);
+                i = R.id.item_listen_together_artist;
+                TextView textView = (TextView) view.findViewById(R.id.item_listen_together_artist);
                 if (textView != null) {
                     ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                    i = 2131363914;
-                    TextView textView2 = (TextView) view.findViewById(2131363914);
+                    i = R.id.item_listen_together_header;
+                    TextView textView2 = (TextView) view.findViewById(R.id.item_listen_together_header);
                     if (textView2 != null) {
-                        i = 2131363915;
-                        TextView textView3 = (TextView) view.findViewById(2131363915);
+                        i = R.id.item_listen_together_join;
+                        TextView textView3 = (TextView) view.findViewById(R.id.item_listen_together_join);
                         if (textView3 != null) {
-                            i = 2131363916;
-                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363916);
+                            i = R.id.item_listen_together_recycler;
+                            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.item_listen_together_recycler);
                             if (recyclerView != null) {
-                                i = 2131363917;
-                                TextView textView4 = (TextView) view.findViewById(2131363917);
+                                i = R.id.item_listen_together_session_ended;
+                                TextView textView4 = (TextView) view.findViewById(R.id.item_listen_together_session_ended);
                                 if (textView4 != null) {
-                                    i = 2131363918;
-                                    TextView textView5 = (TextView) view.findViewById(2131363918);
+                                    i = R.id.item_listen_together_track;
+                                    TextView textView5 = (TextView) view.findViewById(R.id.item_listen_together_track);
                                     if (textView5 != null) {
                                         WidgetChatListAdapterItemSpotifyListenTogetherBinding widgetChatListAdapterItemSpotifyListenTogetherBinding = new WidgetChatListAdapterItemSpotifyListenTogetherBinding(constraintLayout, barrier, simpleDraweeView, textView, constraintLayout, textView2, textView3, recyclerView, textView4, textView5);
                                         m.checkNotNullExpressionValue(widgetChatListAdapterItemSpotifyListenTogetherBinding, "WidgetChatListAdapterIte…herBinding.bind(itemView)");
@@ -303,7 +304,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
         Context context2 = textView3.getContext();
         m.checkNotNullExpressionValue(context2, "binding.itemListenTogetherHeader.context");
         String str = null;
-        textView.setText(b.h(context, 2131890824, new Object[]{getActivityName(context2, model.getItem())}, null, 4));
+        textView.setText(b.h(context, R.string.invite_embed_invite_to_listen, new Object[]{getActivityName(context2, model.getItem())}, null, 4));
         boolean isDeadInvite = isDeadInvite(model.getPresence(), model.getItem());
         Presence presence = model.getPresence();
         Activity spotifyListeningActivity = presence != null ? PresenceUtils.INSTANCE.getSpotifyListeningActivity(presence) : null;
@@ -338,7 +339,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
             m.checkNotNullExpressionValue(textView8, "binding.itemListenTogetherArtist");
             Object[] objArr = new Object[1];
             objArr[0] = spotifyListeningActivity != null ? spotifyListeningActivity.l() : null;
-            b.n(textView8, 2131894643, objArr, null, 4);
+            b.n(textView8, R.string.user_activity_listening_artists, objArr, null, 4);
             ActivityAssets b = spotifyListeningActivity != null ? spotifyListeningActivity.b() : null;
             if (!(b == null || (a = b.a()) == null)) {
                 SimpleDraweeView simpleDraweeView2 = this.binding.b;
@@ -362,7 +363,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
         if (w.contains((CharSequence) a, (CharSequence) platform.getPlatformId(), true)) {
             return platform.getProperName();
         }
-        String string = context.getString(2131888673);
+        String string = context.getString(R.string.form_label_desktop_only);
         m.checkNotNullExpressionValue(string, "context.getString(R.stri….form_label_desktop_only)");
         return string;
     }
@@ -375,7 +376,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
         ActivityParty i;
         String a;
         Activity spotifyListeningActivity = presence != null ? PresenceUtils.INSTANCE.getSpotifyListeningActivity(presence) : null;
-        return !((spotifyListeningActivity == null || (i = spotifyListeningActivity.i()) == null || (a = i.a()) == null) ? false : a.equals(spotifyListenTogetherEntry.getActivity().a())) || TimeUtils.parseSnowflake(Long.valueOf(spotifyListenTogetherEntry.getMessageId())) + 7200000 < ClockFactory.get().currentTimeMillis();
+        return !((spotifyListeningActivity == null || (i = spotifyListeningActivity.i()) == null || (a = i.a()) == null) ? false : a.equals(spotifyListenTogetherEntry.getActivity().a())) || TimeUtils.parseSnowflake(Long.valueOf(spotifyListenTogetherEntry.getMessageId())) + EMBED_LIFETIME_MILLIS < ClockFactory.get().currentTimeMillis();
     }
 
     @Override // com.discord.utilities.mg_recycler.MGRecyclerViewHolder
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
index 8f1f8e0410..902f53ce3a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
@@ -6,6 +6,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.guildmember.GuildMember;
@@ -305,33 +306,33 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStageInvite(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558981, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_stage_invite, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131363894;
-        TextView textView = (TextView) view.findViewById(2131363894);
+        int i = R.id.item_invite_channel_topic;
+        TextView textView = (TextView) view.findViewById(R.id.item_invite_channel_topic);
         if (textView != null) {
-            i = 2131363895;
-            TextView textView2 = (TextView) view.findViewById(2131363895);
+            i = R.id.item_invite_guild_name;
+            TextView textView2 = (TextView) view.findViewById(R.id.item_invite_guild_name);
             if (textView2 != null) {
-                i = 2131363896;
-                TextView textView3 = (TextView) view.findViewById(2131363896);
+                i = R.id.item_invite_header;
+                TextView textView3 = (TextView) view.findViewById(R.id.item_invite_header);
                 if (textView3 != null) {
-                    i = 2131363899;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363899);
+                    i = R.id.item_invite_image;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.item_invite_image);
                     if (simpleDraweeView != null) {
-                        i = 2131363900;
-                        TextView textView4 = (TextView) view.findViewById(2131363900);
+                        i = R.id.item_invite_image_text;
+                        TextView textView4 = (TextView) view.findViewById(R.id.item_invite_image_text);
                         if (textView4 != null) {
-                            i = 2131363901;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363901);
+                            i = R.id.item_invite_join_button;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.item_invite_join_button);
                             if (materialButton != null) {
                                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                                i = 2131363919;
-                                TextView textView5 = (TextView) view.findViewById(2131363919);
+                                i = R.id.item_listeners_count;
+                                TextView textView5 = (TextView) view.findViewById(R.id.item_listeners_count);
                                 if (textView5 != null) {
-                                    i = 2131365255;
-                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) view.findViewById(2131365255);
+                                    i = R.id.stage_discovery_speakers_view;
+                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) view.findViewById(R.id.stage_discovery_speakers_view);
                                     if (discoveryStageCardSpeakersView != null) {
                                         WidgetChatListAdapterItemStageInviteBinding widgetChatListAdapterItemStageInviteBinding = new WidgetChatListAdapterItemStageInviteBinding(constraintLayout, textView, textView2, textView3, simpleDraweeView, textView4, materialButton, constraintLayout, textView5, discoveryStageCardSpeakersView);
                                         m.checkNotNullExpressionValue(widgetChatListAdapterItemStageInviteBinding, "WidgetChatListAdapterIte…iteBinding.bind(itemView)");
@@ -387,7 +388,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
         String str3 = null;
         Long valueOf = guild2 != null ? Long.valueOf(guild2.o()) : null;
         Guild guild3 = model.getInvite().getGuild();
-        updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild3 != null ? guild3.n() : null, "asset://asset/images/default_icon_selected.jpg", model.getShouldAnimateGuildIcon(), null, 16, null));
+        updateIconUrlIfChanged(IconUtils.getForGuild$default(valueOf, guild3 != null ? guild3.n() : null, IconUtils.DEFAULT_ICON_BLURPLE, model.getShouldAnimateGuildIcon(), null, 16, null));
         Guild guild4 = model.getInvite().getGuild();
         boolean z2 = true;
         if (!(guild4 == null || (r1 = guild4.n()) == null)) {
@@ -428,7 +429,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
         if (!m.areEqual(this.iconUrl, str)) {
             SimpleDraweeView simpleDraweeView = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemInviteImage");
-            IconUtils.setIcon$default(simpleDraweeView, str, 2131165290, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView, str, (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
             this.iconUrl = str;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$1.java
index e1dfb1afd7..8ca7d9944c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.text.style.ForegroundColorSpan;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.models.member.GuildMember;
@@ -46,7 +47,7 @@ public final class WidgetChatListAdapterItemStart$configureThread$1 extends o im
             FontUtils fontUtils = FontUtils.INSTANCE;
             Context context = widgetChatListAdapterItemStart$configureThread$1.$context;
             m.checkNotNullExpressionValue(context, "context");
-            Typeface themedFont = fontUtils.getThemedFont(context, 2130969328);
+            Typeface themedFont = fontUtils.getThemedFont(context, R.attr.font_primary_semibold);
             if (themedFont != null) {
                 hook.a.add(new TypefaceSpanCompat(themedFont));
             }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$2.java
index d1177eac73..83d8bbf961 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.text.style.ForegroundColorSpan;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
@@ -43,11 +44,11 @@ public final class WidgetChatListAdapterItemStart$configureThread$2 extends o im
             FontUtils fontUtils = FontUtils.INSTANCE;
             Context context = widgetChatListAdapterItemStart$configureThread$2.$context;
             m.checkNotNullExpressionValue(context, "context");
-            Typeface themedFont = fontUtils.getThemedFont(context, 2130969327);
+            Typeface themedFont = fontUtils.getThemedFont(context, R.attr.font_primary_normal);
             if (themedFont != null) {
                 hook.a.add(new TypefaceSpanCompat(themedFont));
             }
-            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.$context, 2130968932)));
+            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.$context, (int) R.attr.colorHeaderPrimary)));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
index 96789d56f7..2278793d17 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemStartBinding;
 import com.discord.models.member.GuildMember;
 import com.discord.utilities.color.ColorCompat;
@@ -19,23 +20,23 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStart(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558982, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_start, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362546;
-        TextView textView = (TextView) view.findViewById(2131362546);
+        int i = R.id.chat_list_adapter_item_edit_channel;
+        TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_edit_channel);
         if (textView != null) {
-            i = 2131362550;
-            TextView textView2 = (TextView) view.findViewById(2131362550);
+            i = R.id.chat_list_adapter_item_header;
+            TextView textView2 = (TextView) view.findViewById(R.id.chat_list_adapter_item_header);
             if (textView2 != null) {
-                i = 2131362559;
-                TextView textView3 = (TextView) view.findViewById(2131362559);
+                i = R.id.chat_list_adapter_item_subheader1;
+                TextView textView3 = (TextView) view.findViewById(R.id.chat_list_adapter_item_subheader1);
                 if (textView3 != null) {
-                    i = 2131362560;
-                    TextView textView4 = (TextView) view.findViewById(2131362560);
+                    i = R.id.chat_list_adapter_item_subheader2;
+                    TextView textView4 = (TextView) view.findViewById(R.id.chat_list_adapter_item_subheader2);
                     if (textView4 != null) {
-                        i = 2131362580;
-                        ImageView imageView = (ImageView) view.findViewById(2131362580);
+                        i = R.id.chat_list_adapter_thread_header_icon;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.chat_list_adapter_thread_header_icon);
                         if (imageView != null) {
                             WidgetChatListAdapterItemStartBinding widgetChatListAdapterItemStartBinding = new WidgetChatListAdapterItemStartBinding((LinearLayout) view, textView, textView2, textView3, textView4, imageView);
                             m.checkNotNullExpressionValue(widgetChatListAdapterItemStartBinding, "WidgetChatListAdapterIte…artBinding.bind(itemView)");
@@ -61,7 +62,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
         TextView textView = this.binding.f1758c;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemHeader");
         int i = 0;
-        b.n(textView, 2131886354, new Object[]{str}, null, 4);
+        b.n(textView, R.string.android_welcome_message_title_channel, new Object[]{str}, null, 4);
         TextView textView2 = this.binding.d;
         m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemSubheader1");
         textView2.setVisibility(8);
@@ -71,16 +72,16 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
         if (z2) {
             TextView textView3 = this.binding.e;
             m.checkNotNullExpressionValue(textView3, "binding.chatListAdapterItemSubheader2");
-            b.n(textView3, 2131886353, new Object[]{str}, null, 4);
+            b.n(textView3, R.string.android_welcome_message_subtitle_channel, new Object[]{str}, null, 4);
         } else {
             TextView textView4 = this.binding.e;
             m.checkNotNullExpressionValue(textView4, "binding.chatListAdapterItemSubheader2");
-            b.n(textView4, 2131886838, new Object[]{str}, null, 4);
+            b.n(textView4, R.string.beginning_channel_no_history, new Object[]{str}, null, 4);
         }
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemStart$configureChannel$1(this, j));
         TextView textView5 = this.binding.b;
         m.checkNotNullExpressionValue(textView5, "binding.chatListAdapterItemEditChannel");
-        b.n(textView5, 2131888232, new Object[0], null, 4);
+        b.n(textView5, R.string.edit_channel, new Object[0], null, 4);
         TextView textView6 = this.binding.b;
         m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemEditChannel");
         if (!z3) {
@@ -105,23 +106,23 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
         imageView.setVisibility(0);
         TextView textView4 = this.binding.d;
         m.checkNotNullExpressionValue(textView4, "binding.chatListAdapterItemSubheader1");
-        b.m(textView4, 2131894323, new Object[]{str2}, new WidgetChatListAdapterItemStart$configureThread$1(this, str2, context, guildMember));
+        b.m(textView4, R.string.thread_started_by, new Object[]{str2}, new WidgetChatListAdapterItemStart$configureThread$1(this, str2, context, guildMember));
         if (z2) {
             ThreadUtils threadUtils = ThreadUtils.INSTANCE;
             m.checkNotNullExpressionValue(context, "context");
             String autoArchiveDurationName = threadUtils.autoArchiveDurationName(context, num != null ? num.intValue() : 0);
             TextView textView5 = this.binding.e;
             m.checkNotNullExpressionValue(textView5, "binding.chatListAdapterItemSubheader2");
-            b.m(textView5, 2131886846, new Object[]{autoArchiveDurationName}, new WidgetChatListAdapterItemStart$configureThread$2(autoArchiveDurationName, context));
+            b.m(textView5, R.string.beginning_thread_archive_description, new Object[]{autoArchiveDurationName}, new WidgetChatListAdapterItemStart$configureThread$2(autoArchiveDurationName, context));
         } else {
             TextView textView6 = this.binding.e;
             m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemSubheader2");
-            b.n(textView6, 2131886838, new Object[]{str}, null, 4);
+            b.n(textView6, R.string.beginning_channel_no_history, new Object[]{str}, null, 4);
         }
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemStart$configureThread$3(this, j));
         TextView textView7 = this.binding.b;
         m.checkNotNullExpressionValue(textView7, "binding.chatListAdapterItemEditChannel");
-        b.n(textView7, 2131888244, new Object[0], null, 4);
+        b.n(textView7, R.string.edit_thread, new Object[0], null, 4);
         TextView textView8 = this.binding.b;
         m.checkNotNullExpressionValue(textView8, "binding.chatListAdapterItemEditChannel");
         if (!z3) {
@@ -133,7 +134,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
     private final int getAuthorTextColor(GuildMember guildMember) {
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
-        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), 2130968932));
+        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), (int) R.attr.colorHeaderPrimary));
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
index 5f74144954..a5e967ef84 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.view.View;
 import android.widget.FrameLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemStickerBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.stickers.StickerUtils;
@@ -20,17 +21,17 @@ public final class WidgetChatListAdapterItemSticker extends WidgetChatListItem {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSticker(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558983, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_sticker, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        StickerView stickerView = (StickerView) view.findViewById(2131362556);
+        StickerView stickerView = (StickerView) view.findViewById(R.id.chat_list_adapter_item_sticker);
         if (stickerView != null) {
             WidgetChatListAdapterItemStickerBinding widgetChatListAdapterItemStickerBinding = new WidgetChatListAdapterItemStickerBinding((FrameLayout) view, stickerView);
             m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerBinding, "WidgetChatListAdapterIte…kerBinding.bind(itemView)");
             this.binding = widgetChatListAdapterItemStickerBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362556)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.chat_list_adapter_item_sticker)));
     }
 
     public static final /* synthetic */ WidgetChatListAdapter access$getAdapter$p(WidgetChatListAdapterItemSticker widgetChatListAdapterItemSticker) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
index 3660231e6b..a47cb30379 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.view.View;
 import android.widget.LinearLayout;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.databinding.WidgetChatListAdapterItemStickerGreetBinding;
 import com.discord.views.sticker.StickerView;
@@ -17,14 +18,14 @@ public final class WidgetChatListAdapterItemStickerGreet extends WidgetChatListI
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStickerGreet(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558984, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_sticker_greet, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362557;
-        StickerView stickerView = (StickerView) view.findViewById(2131362557);
+        int i = R.id.chat_list_adapter_item_sticker_greet;
+        StickerView stickerView = (StickerView) view.findViewById(R.id.chat_list_adapter_item_sticker_greet);
         if (stickerView != null) {
-            i = 2131364815;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364815);
+            i = R.id.send_sticker_greet_button;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.send_sticker_greet_button);
             if (materialButton != null) {
                 WidgetChatListAdapterItemStickerGreetBinding widgetChatListAdapterItemStickerGreetBinding = new WidgetChatListAdapterItemStickerGreetBinding((LinearLayout) view, stickerView, materialButton);
                 m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerGreetBinding, "WidgetChatListAdapterIte…eetBinding.bind(itemView)");
@@ -57,6 +58,6 @@ public final class WidgetChatListAdapterItemStickerGreet extends WidgetChatListI
         this.binding.f1759c.setOnClickListener(new WidgetChatListAdapterItemStickerGreet$onConfigure$1(this, component2, component4, component1));
         MaterialButton materialButton = this.binding.f1759c;
         m.checkNotNullExpressionValue(materialButton, "binding.sendStickerGreetButton");
-        b.n(materialButton, 2131895030, new Object[]{component3}, null, 4);
+        b.n(materialButton, R.string.wave_to, new Object[]{component3}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
index 239b7a500c..5ddcc3a8d7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.databinding.WidgetChatListAdapterItemStickerGreetCompactBinding;
 import com.discord.views.sticker.StickerView;
@@ -18,17 +19,17 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStickerGreetCompact(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558985, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_sticker_greet_compact, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362557;
-        StickerView stickerView = (StickerView) view.findViewById(2131362557);
+        int i = R.id.chat_list_adapter_item_sticker_greet;
+        StickerView stickerView = (StickerView) view.findViewById(R.id.chat_list_adapter_item_sticker_greet);
         if (stickerView != null) {
-            i = 2131362558;
-            TextView textView = (TextView) view.findViewById(2131362558);
+            i = R.id.chat_list_adapter_item_sticker_greet_text;
+            TextView textView = (TextView) view.findViewById(R.id.chat_list_adapter_item_sticker_greet_text);
             if (textView != null) {
-                i = 2131364815;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364815);
+                i = R.id.send_sticker_greet_button;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.send_sticker_greet_button);
                 if (linearLayout != null) {
                     WidgetChatListAdapterItemStickerGreetCompactBinding widgetChatListAdapterItemStickerGreetCompactBinding = new WidgetChatListAdapterItemStickerGreetCompactBinding((ConstraintLayout) view, stickerView, textView, linearLayout);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerGreetCompactBinding, "WidgetChatListAdapterIte…actBinding.bind(itemView)");
@@ -62,6 +63,6 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh
         this.binding.d.setOnClickListener(new WidgetChatListAdapterItemStickerGreetCompact$onConfigure$1(this, component2, component4, component1));
         TextView textView = this.binding.f1760c;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemStickerGreetText");
-        b.n(textView, 2131895030, new Object[]{component3}, null, 4);
+        b.n(textView, R.string.wave_to, new Object[]{component3}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java
index d91a1a84ab..76fed5142d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.adapter;
 
 import android.content.Context;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.models.message.Message;
 import com.discord.utilities.message.MessageUtils;
@@ -36,7 +37,7 @@ public final class WidgetChatListAdapterItemSystemMessage$getSystemMessage$1 ext
         m.checkNotNullParameter(context, "$this$getString");
         Integer type = this.$this_getSystemMessage.getType();
         if (type != null && type.intValue() == 1) {
-            return b.b(context, 2131894212, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
+            return b.b(context, R.string.system_message_recipient_add, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
         }
         Long l = null;
         if (type != null && type.intValue() == 2) {
@@ -45,25 +46,25 @@ public final class WidgetChatListAdapterItemSystemMessage$getSystemMessage$1 ext
             if (author != null) {
                 l = Long.valueOf(author.i());
             }
-            return m.areEqual(l2, l) ? b.b(context, 2131894214, new Object[]{this.$authorName}, this.$usernameRenderContext) : b.b(context, 2131894213, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
+            return m.areEqual(l2, l) ? b.b(context, R.string.system_message_recipient_remove_self, new Object[]{this.$authorName}, this.$usernameRenderContext) : b.b(context, R.string.system_message_recipient_remove, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
         } else if (type != null && type.intValue() == 4) {
-            return b.b(context, 2131894165, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext);
+            return b.b(context, R.string.system_message_channel_name_change, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext);
         } else {
             if (type != null && type.intValue() == 5) {
-                return b.b(context, 2131894164, new Object[]{this.$authorName}, this.$usernameRenderContext);
+                return b.b(context, R.string.system_message_channel_icon_change, new Object[]{this.$authorName}, this.$usernameRenderContext);
             }
             if (type != null && type.intValue() == 6) {
-                return b.b(context, 2131894208, new Object[]{this.$authorName}, this.$usernameRenderContext);
+                return b.b(context, R.string.system_message_pinned_message_no_cta, new Object[]{this.$authorName}, this.$usernameRenderContext);
             }
             if (type != null && type.intValue() == 7) {
                 return b.b(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(this.$context, this.$this_getSystemMessage.getId()), new Object[]{this.$authorName}, this.$usernameRenderContext);
             }
             if (type == null || type.intValue() != 8) {
-                return (type != null && type.intValue() == 9) ? b.b(context, 2131894187, new Object[]{this.$authorName, this.$guildName, b.h(context, 2131892508, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 10) ? b.b(context, 2131894187, new Object[]{this.$authorName, this.$guildName, b.h(context, 2131892510, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 11) ? b.b(context, 2131894187, new Object[]{this.$authorName, this.$guildName, b.h(context, 2131892512, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 12) ? b.b(context, 2131894162, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext) : (type != null && type.intValue() == 14) ? b.h(context, 2131894169, new Object[0], null, 4) : (type != null && type.intValue() == 15) ? b.h(context, 2131894172, new Object[0], null, 4) : (type != null && type.intValue() == 16) ? b.h(context, 2131894171, new Object[0], null, 4) : (type != null && type.intValue() == 17) ? b.h(context, 2131894170, new Object[0], null, 4) : (type != null && type.intValue() == 18) ? b.b(context, 2131894215, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$actorRenderContext) : (type != null && type.intValue() == 23) ? b.h(context, 2131894324, new Object[0], null, 4) : b.h(context, 2131892970, new Object[0], null, 4);
+                return (type != null && type.intValue() == 9) ? b.b(context, R.string.system_message_guild_member_subscribed_achieved_tier, new Object[]{this.$authorName, this.$guildName, b.h(context, R.string.premium_guild_tier_1, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 10) ? b.b(context, R.string.system_message_guild_member_subscribed_achieved_tier, new Object[]{this.$authorName, this.$guildName, b.h(context, R.string.premium_guild_tier_2, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 11) ? b.b(context, R.string.system_message_guild_member_subscribed_achieved_tier, new Object[]{this.$authorName, this.$guildName, b.h(context, R.string.premium_guild_tier_3, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 12) ? b.b(context, R.string.system_message_channel_follow_add, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext) : (type != null && type.intValue() == 14) ? b.h(context, R.string.system_message_guild_discovery_disqualified_mobile, new Object[0], null, 4) : (type != null && type.intValue() == 15) ? b.h(context, R.string.system_message_guild_discovery_requalified, new Object[0], null, 4) : (type != null && type.intValue() == 16) ? b.h(context, R.string.system_message_guild_discovery_grace_period_initial_warning, new Object[0], null, 4) : (type != null && type.intValue() == 17) ? b.h(context, R.string.system_message_guild_discovery_grace_period_final_warning, new Object[0], null, 4) : (type != null && type.intValue() == 18) ? b.b(context, R.string.system_message_thread_created, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$actorRenderContext) : (type != null && type.intValue() == 23) ? b.h(context, R.string.thread_starter_message_not_loaded, new Object[0], null, 4) : b.h(context, R.string.reply_quote_message_not_loaded, new Object[0], null, 4);
             }
             String content = this.$this_getSystemMessage.getContent();
             int parseInt = content == null || content.length() == 0 ? 1 : Integer.parseInt(this.$this_getSystemMessage.getContent());
-            return parseInt > 1 ? b.b(context, 2131894188, new Object[]{this.$authorName, String.valueOf(parseInt)}, this.$usernameRenderContext) : b.b(context, 2131894186, new Object[]{this.$authorName}, this.$usernameRenderContext);
+            return parseInt > 1 ? b.b(context, R.string.system_message_guild_member_subscribed_many, new Object[]{this.$authorName, String.valueOf(parseInt)}, this.$usernameRenderContext) : b.b(context, R.string.system_message_guild_member_subscribed, new Object[]{this.$authorName}, this.$usernameRenderContext);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
index ffeb557f62..8a05d9c036 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
@@ -9,6 +9,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.WidgetChatListAdapterItemSystemBinding;
@@ -32,29 +33,29 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSystemMessage(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558986, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_system, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362577;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362577);
+        int i = R.id.chat_list_adapter_item_thread_embed_spine;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.chat_list_adapter_item_thread_embed_spine);
         if (appCompatImageView != null) {
-            i = 2131365419;
-            ImageView imageView = (ImageView) view.findViewById(2131365419);
+            i = R.id.system_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.system_icon);
             if (imageView != null) {
-                i = 2131365420;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365420);
+                i = R.id.system_text;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.system_text);
                 if (linkifiedTextView != null) {
-                    i = 2131365421;
-                    TextView textView = (TextView) view.findViewById(2131365421);
+                    i = R.id.system_timestamp;
+                    TextView textView = (TextView) view.findViewById(R.id.system_timestamp);
                     if (textView != null) {
-                        i = 2131365422;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365422);
+                        i = R.id.system_welcome_cta_button;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.system_welcome_cta_button);
                         if (linearLayout != null) {
-                            i = 2131365423;
-                            StickerView stickerView = (StickerView) view.findViewById(2131365423);
+                            i = R.id.system_welecome_cta_button_sticker;
+                            StickerView stickerView = (StickerView) view.findViewById(R.id.system_welecome_cta_button_sticker);
                             if (stickerView != null) {
-                                i = 2131365605;
-                                Guideline guideline = (Guideline) view.findViewById(2131365605);
+                                i = R.id.uikit_chat_guideline;
+                                Guideline guideline = (Guideline) view.findViewById(R.id.uikit_chat_guideline);
                                 if (guideline != null) {
                                     WidgetChatListAdapterItemSystemBinding widgetChatListAdapterItemSystemBinding = new WidgetChatListAdapterItemSystemBinding((ConstraintLayout) view, appCompatImageView, imageView, linkifiedTextView, textView, linearLayout, stickerView, guideline);
                                     m.checkNotNullExpressionValue(widgetChatListAdapterItemSystemBinding, "WidgetChatListAdapterIte…temBinding.bind(itemView)");
@@ -82,41 +83,41 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
         Integer type = message.getType();
         if (type == null || type.intValue() != 1) {
             if (type != null && type.intValue() == 2) {
-                return 2131231702;
+                return R.drawable.ic_group_leave;
             }
             if ((type != null && type.intValue() == 4) || (type != null && type.intValue() == 5)) {
-                return 2131231700;
+                return R.drawable.ic_group_edit;
             }
             if (type != null && type.intValue() == 6) {
-                return 2131231512;
+                return R.drawable.ic_channel_pinned_message;
             }
             if (type == null || type.intValue() != 7) {
                 if ((type != null && type.intValue() == 8) || ((type != null && type.intValue() == 9) || ((type != null && type.intValue() == 10) || (type != null && type.intValue() == 11)))) {
-                    return 2131232085;
+                    return R.drawable.ic_user_premium_guild_subscription;
                 }
                 if (type == null || type.intValue() != 12) {
                     if (type == null || type.intValue() != 14) {
                         if (type != null && type.intValue() == 15) {
-                            return 2131231543;
+                            return R.drawable.ic_check_green_24dp;
                         }
                         if (type != null && type.intValue() == 16) {
-                            return 2131232117;
+                            return R.drawable.ic_warning_circle_24dp;
                         }
                         if (type != null && type.intValue() == 17) {
-                            return 2131232117;
+                            return R.drawable.ic_warning_circle_24dp;
                         }
                         if (type != null && type.intValue() == 18) {
-                            return 2131232047;
+                            return R.drawable.ic_thread;
                         }
                         if (type != null) {
                             type.intValue();
                         }
                     }
-                    return 2131232118;
+                    return R.drawable.ic_x_red_24dp;
                 }
             }
         }
-        return 2131231701;
+        return R.drawable.ic_group_join;
     }
 
     private final CharSequence getSystemMessage(Message message, Context context, String str, int i, Long l, String str2, int i2, String str3) {
@@ -142,7 +143,7 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
         String str2 = valueOf != null ? component6.get(Long.valueOf(valueOf.longValue())) : null;
         LinkifiedTextView linkifiedTextView = this.binding.d;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.systemText");
-        int themedColor = ColorCompat.getThemedColor(linkifiedTextView.getContext(), 2130968932);
+        int themedColor = ColorCompat.getThemedColor(linkifiedTextView.getContext(), (int) R.attr.colorHeaderPrimary);
         GuildMember.Companion companion = GuildMember.Companion;
         int color = companion.getColor(component3, themedColor);
         int color2 = companion.getColor(component4, themedColor);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java
index df65a0651e..09fb949793 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java
@@ -18,6 +18,6 @@ public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$2 implem
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        a.j.a(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0).getFragmentManager(), this.$draftData.getGuildId(), Long.valueOf(this.$draftData.getParentChannelId()), PremiumUtils.INSTANCE.getMinimumPremiumGuildTierForGuildFeature(GuildFeature.PRIVATE_THREADS), new Traits.Location("Guild Channel", null, null, null, null, 30, null));
+        a.j.a(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0).getFragmentManager(), this.$draftData.getGuildId(), Long.valueOf(this.$draftData.getParentChannelId()), PremiumUtils.INSTANCE.getMinimumPremiumGuildTierForGuildFeature(GuildFeature.PRIVATE_THREADS), new Traits.Location(Traits.Location.Page.GUILD_CHANNEL, null, null, null, null, 30, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$5.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$5.java
index 737c4ab661..047080a64a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$5.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$5.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.text.style.StyleSpan;
 import android.view.View;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.stores.StoreThreadDraft;
@@ -84,7 +85,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$5 extend
             String lowerCase = autoArchiveDurationName.toLowerCase(locale);
             m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
             hook.b = lowerCase;
-            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0.this$0).getContext(), 2130968932)), true, null, new AnonymousClass1(this), 4, null));
+            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getThemedColor(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0.this$0).getContext(), (int) R.attr.colorHeaderPrimary)), true, null, new AnonymousClass1(this), 4, null));
             hook.a.add(new StyleSpan(1));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
index 36824530da..7cbef73818 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.databinding.WidgetChatListAdapterItemThreadDraftFormBinding;
 import com.discord.stores.StoreStream;
@@ -30,33 +31,33 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemThreadDraftForm(WidgetChatListAdapter widgetChatListAdapter, AppFlexInputViewModel appFlexInputViewModel) {
-        super(2131558989, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_thread_draft_form, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         this.flexInputViewModel = appFlexInputViewModel;
         View view = this.itemView;
-        int i = 2131362080;
-        TextView textView = (TextView) view.findViewById(2131362080);
+        int i = R.id.auto_archive_duration;
+        TextView textView = (TextView) view.findViewById(R.id.auto_archive_duration);
         if (textView != null) {
-            i = 2131363025;
-            View findViewById = view.findViewById(2131363025);
+            i = R.id.divider_stroke;
+            View findViewById = view.findViewById(R.id.divider_stroke);
             if (findViewById != null) {
-                i = 2131364567;
-                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131364567);
+                i = R.id.private_thread_toggle;
+                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.private_thread_toggle);
                 if (constraintLayout != null) {
-                    i = 2131364568;
-                    TextView textView2 = (TextView) view.findViewById(2131364568);
+                    i = R.id.private_thread_toggle_badge;
+                    TextView textView2 = (TextView) view.findViewById(R.id.private_thread_toggle_badge);
                     if (textView2 != null) {
-                        i = 2131364569;
-                        SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131364569);
+                        i = R.id.private_thread_toggle_switch;
+                        SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(R.id.private_thread_toggle_switch);
                         if (switchMaterial != null) {
-                            i = 2131364570;
-                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364570);
+                            i = R.id.private_thread_toggle_text;
+                            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.private_thread_toggle_text);
                             if (linearLayout != null) {
-                                i = 2131365519;
-                                ImageView imageView = (ImageView) view.findViewById(2131365519);
+                                i = R.id.thread_icon;
+                                ImageView imageView = (ImageView) view.findViewById(R.id.thread_icon);
                                 if (imageView != null) {
-                                    i = 2131365523;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365523);
+                                    i = R.id.thread_name_input;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.thread_name_input);
                                     if (textInputLayout != null) {
                                         WidgetChatListAdapterItemThreadDraftFormBinding widgetChatListAdapterItemThreadDraftFormBinding = new WidgetChatListAdapterItemThreadDraftFormBinding((LinearLayout) view, textView, findViewById, constraintLayout, textView2, switchMaterial, linearLayout, imageView, textInputLayout);
                                         m.checkNotNullExpressionValue(widgetChatListAdapterItemThreadDraftFormBinding, "WidgetChatListAdapterIte…ormBinding.bind(itemView)");
@@ -88,7 +89,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
         StoreThreadDraft threadDraft = StoreStream.Companion.getThreadDraft();
         ThreadDraftFormEntry threadDraftFormEntry = (ThreadDraftFormEntry) chatListEntry;
         StoreThreadDraft.ThreadDraftState threadDraftState = threadDraftFormEntry.getThreadDraftState();
-        this.binding.f.setImageResource(threadDraftState.isPrivate() ? 2131232049 : 2131232047);
+        this.binding.f.setImageResource(threadDraftState.isPrivate() ? R.drawable.ic_thread_locked : R.drawable.ic_thread);
         TextInputLayout textInputLayout = this.binding.g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.threadNameInput");
         EditText editText = textInputLayout.getEditText();
@@ -113,12 +114,12 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
         SwitchMaterial switchMaterial = this.binding.e;
         m.checkNotNullExpressionValue(switchMaterial, "binding.privateThreadToggleSwitch");
         switchMaterial.setChecked(threadDraftState.isPrivate());
-        PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature$default = PremiumUtils.getBoostFeatureBadgeDataForGuildFeature$default(PremiumUtils.INSTANCE, threadDraftFormEntry.getGuild(), Long.valueOf(threadDraftFormEntry.getParentChannelId()), GuildFeature.PRIVATE_THREADS, ((WidgetChatListAdapter) this.adapter).getContext(), ((WidgetChatListAdapter) this.adapter).getFragmentManager(), null, new Traits.Location(null, "Thread Creation Options", "Private Thread Checkbox", null, null, 25, null), 32, null);
+        PremiumUtils.BoostFeatureBadgeData boostFeatureBadgeDataForGuildFeature$default = PremiumUtils.getBoostFeatureBadgeDataForGuildFeature$default(PremiumUtils.INSTANCE, threadDraftFormEntry.getGuild(), Long.valueOf(threadDraftFormEntry.getParentChannelId()), GuildFeature.PRIVATE_THREADS, ((WidgetChatListAdapter) this.adapter).getContext(), ((WidgetChatListAdapter) this.adapter).getFragmentManager(), null, new Traits.Location(null, Traits.Location.Section.THREAD_CREATION_OPTIONS, Traits.Location.Obj.PRIVATE_THREAD_CHECKBOX, null, null, 25, null), 32, null);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.privateThreadToggleBadge");
         textView.setText(boostFeatureBadgeDataForGuildFeature$default.getText());
         TextView textView2 = this.binding.d;
-        Drawable drawable = ContextCompat.getDrawable(((WidgetChatListAdapter) this.adapter).getContext(), 2131231477);
+        Drawable drawable = ContextCompat.getDrawable(((WidgetChatListAdapter) this.adapter).getContext(), R.drawable.ic_boosted_badge_12dp);
         if (drawable != null) {
             drawable.setTint(boostFeatureBadgeDataForGuildFeature$default.getIconColor());
         } else {
@@ -127,7 +128,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
         textView2.setCompoundDrawablesWithIntrinsicBounds(drawable, (Drawable) null, (Drawable) null, (Drawable) null);
         TextView textView3 = this.binding.b;
         m.checkNotNullExpressionValue(textView3, "binding.autoArchiveDuration");
-        b.m(textView3, 2131887989, new Object[0], new WidgetChatListAdapterItemThreadDraftForm$onConfigure$5(this, threadDraftState, chatListEntry, threadDraftFormEntry));
+        b.m(textView3, R.string.create_thread_header_2, new Object[0], new WidgetChatListAdapterItemThreadDraftForm$onConfigure$5(this, threadDraftState, chatListEntry, threadDraftFormEntry));
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$6(this, threadDraftFormEntry));
         this.binding.g.requestFocus();
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
index ec384a8729..691e3730bd 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
@@ -12,6 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.core.content.ContextCompat;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.databinding.WidgetChatListAdapterItemThreadEmbedBinding;
@@ -51,51 +52,51 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemThreadEmbed(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558990, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_thread_embed, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362549;
-        View findViewById = view.findViewById(2131362549);
+        int i = R.id.chat_list_adapter_item_gutter_bg;
+        View findViewById = view.findViewById(R.id.chat_list_adapter_item_gutter_bg);
         if (findViewById != null) {
-            i = 2131362551;
-            View findViewById2 = view.findViewById(2131362551);
+            i = R.id.chat_list_adapter_item_highlighted_bg;
+            View findViewById2 = view.findViewById(R.id.chat_list_adapter_item_highlighted_bg);
             if (findViewById2 != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131365508;
-                ImageView imageView = (ImageView) view.findViewById(2131365508);
+                i = R.id.thread_embed_icon;
+                ImageView imageView = (ImageView) view.findViewById(R.id.thread_embed_icon);
                 if (imageView != null) {
-                    i = 2131365509;
-                    View findViewById3 = view.findViewById(2131365509);
+                    i = R.id.thread_embed_message_center_guideline;
+                    View findViewById3 = view.findViewById(R.id.thread_embed_message_center_guideline);
                     if (findViewById3 != null) {
-                        i = 2131365510;
-                        TextView textView = (TextView) view.findViewById(2131365510);
+                        i = R.id.thread_embed_messages_count;
+                        TextView textView = (TextView) view.findViewById(R.id.thread_embed_messages_count);
                         if (textView != null) {
-                            i = 2131365511;
-                            ImageView imageView2 = (ImageView) view.findViewById(2131365511);
+                            i = R.id.thread_embed_messages_count_chevron;
+                            ImageView imageView2 = (ImageView) view.findViewById(R.id.thread_embed_messages_count_chevron);
                             if (imageView2 != null) {
-                                i = 2131365512;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365512);
+                                i = R.id.thread_embed_most_recent_message_avatar;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.thread_embed_most_recent_message_avatar);
                                 if (simpleDraweeView != null) {
-                                    i = 2131365513;
-                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365513);
+                                    i = R.id.thread_embed_most_recent_message_content;
+                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.thread_embed_most_recent_message_content);
                                     if (simpleDraweeSpanTextView != null) {
-                                        i = 2131365514;
-                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131365514);
+                                        i = R.id.thread_embed_most_recent_message_header;
+                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(R.id.thread_embed_most_recent_message_header);
                                         if (constraintLayout2 != null) {
-                                            i = 2131365515;
-                                            TextView textView2 = (TextView) view.findViewById(2131365515);
+                                            i = R.id.thread_embed_most_recent_message_name;
+                                            TextView textView2 = (TextView) view.findViewById(R.id.thread_embed_most_recent_message_name);
                                             if (textView2 != null) {
-                                                i = 2131365516;
-                                                TextView textView3 = (TextView) view.findViewById(2131365516);
+                                                i = R.id.thread_embed_name;
+                                                TextView textView3 = (TextView) view.findViewById(R.id.thread_embed_name);
                                                 if (textView3 != null) {
-                                                    i = 2131365517;
-                                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131365517);
+                                                    i = R.id.thread_embed_selectable_background;
+                                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(R.id.thread_embed_selectable_background);
                                                     if (constraintLayout3 != null) {
-                                                        i = 2131365518;
-                                                        ViewReplySpline viewReplySpline = (ViewReplySpline) view.findViewById(2131365518);
+                                                        i = R.id.thread_embed_spine;
+                                                        ViewReplySpline viewReplySpline = (ViewReplySpline) view.findViewById(R.id.thread_embed_spine);
                                                         if (viewReplySpline != null) {
-                                                            i = 2131365605;
-                                                            Guideline guideline = (Guideline) view.findViewById(2131365605);
+                                                            i = R.id.uikit_chat_guideline;
+                                                            Guideline guideline = (Guideline) view.findViewById(R.id.uikit_chat_guideline);
                                                             if (guideline != null) {
                                                                 WidgetChatListAdapterItemThreadEmbedBinding widgetChatListAdapterItemThreadEmbedBinding = new WidgetChatListAdapterItemThreadEmbedBinding(constraintLayout, findViewById, findViewById2, constraintLayout, imageView, findViewById3, textView, imageView2, simpleDraweeView, simpleDraweeSpanTextView, constraintLayout2, textView2, textView3, constraintLayout3, viewReplySpline, guideline);
                                                                 m.checkNotNullExpressionValue(widgetChatListAdapterItemThreadEmbedBinding, "WidgetChatListAdapterIte…bedBinding.bind(itemView)");
@@ -131,7 +132,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
             textView.setText(i >= 50 ? "50+" : String.valueOf(i));
         }
         ImageView imageView = this.binding.g;
-        imageView.setImageTintList(i == 0 ? ColorStateList.valueOf(ColorCompat.getThemedColor(imageView.getContext(), 2130968949)) : ColorStateList.valueOf(ColorCompat.getThemedColor(imageView.getContext(), 2130968987)));
+        imageView.setImageTintList(i == 0 ? ColorStateList.valueOf(ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorInteractiveNormal)) : ColorStateList.valueOf(ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorTextLink)));
     }
 
     private final void configureMostRecentMessageText(ThreadEmbedEntry threadEmbedEntry) {
@@ -145,37 +146,37 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
         ThreadMetadata y2 = threadEmbedEntry.getThread().y();
         if (y2 != null && y2.b()) {
             m.checkNotNullExpressionValue(context, "context");
-            Drawable drawable = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, 2130969467, 0));
+            Drawable drawable = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, (int) R.attr.ic_thread_archived_clock, 0));
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            String string = view.getResources().getString(2131894276);
+            String string = view.getResources().getString(R.string.thread_archived);
             m.checkNotNullExpressionValue(string, "itemView.resources.getSt…R.string.thread_archived)");
             setNoMostRecentMessage$default(this, string, null, threadEmbedEntry.getNickOrUsernames(), null, drawable, 10, null);
         } else if (threadEmbedEntry.getThreadMessageCount() == 0) {
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            String string2 = view2.getResources().getString(2131891764);
+            String string2 = view2.getResources().getString(R.string.no_thread_messages);
             m.checkNotNullExpressionValue(string2, "itemView.resources.getSt…tring.no_thread_messages)");
             setNoMostRecentMessage$default(this, string2, null, threadEmbedEntry.getNickOrUsernames(), null, null, 26, null);
         } else {
             if ((mostRecentMessage != null ? mostRecentMessage.getContent() : null) == null || mostRecentMessage.getAuthor() == null || threadEmbedEntry.getMostRecentMessageGuildMember() == null) {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                String string3 = view3.getResources().getString(2131891753);
+                String string3 = view3.getResources().getString(R.string.no_recent_thread_messages);
                 m.checkNotNullExpressionValue(string3, "itemView.resources.getSt…o_recent_thread_messages)");
                 setNoMostRecentMessage$default(this, string3, null, threadEmbedEntry.getNickOrUsernames(), null, null, 26, null);
             } else if (mostRecentMessage.hasStickers()) {
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                String string4 = view4.getResources().getString(2131892974);
+                String string4 = view4.getResources().getString(R.string.reply_quote_sticker_mobile);
                 m.checkNotNullExpressionValue(string4, "itemView.resources.getSt…ply_quote_sticker_mobile)");
                 setNoMostRecentMessage$default(this, string4, mostRecentMessage, threadEmbedEntry.getNickOrUsernames(), threadEmbedEntry.getMostRecentMessageGuildMember(), null, 16, null);
             } else if (mostRecentMessage.hasAttachments() || mostRecentMessage.hasEmbeds()) {
                 m.checkNotNullExpressionValue(context, "context");
-                Drawable drawable2 = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, 2130969413, 0));
+                Drawable drawable2 = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, (int) R.attr.ic_flex_input_image, 0));
                 View view5 = this.itemView;
                 m.checkNotNullExpressionValue(view5, "itemView");
-                String string5 = view5.getResources().getString(2131892972);
+                String string5 = view5.getResources().getString(R.string.reply_quote_no_text_content_mobile);
                 m.checkNotNullExpressionValue(string5, "itemView.resources.getSt…e_no_text_content_mobile)");
                 setNoMostRecentMessage(string5, mostRecentMessage, threadEmbedEntry.getNickOrUsernames(), threadEmbedEntry.getMostRecentMessageGuildMember(), drawable2);
             } else {
@@ -187,7 +188,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
     private final int getAuthorTextColor(GuildMember guildMember) {
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
-        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), 2130968932));
+        return GuildMember.Companion.getColor(guildMember, ColorCompat.getThemedColor(view.getContext(), (int) R.attr.colorHeaderPrimary));
     }
 
     private final LeadingMarginSpan getLeadingMarginSpan(boolean z2) {
@@ -222,7 +223,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
             CoreUser coreUser = new CoreUser(message.getAuthor());
             SimpleDraweeView simpleDraweeView = this.binding.h;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.threadEmbedMostRecentMessageAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, coreUser, 2131165296, null, null, guildMember, 24, null);
+            IconUtils.setIcon$default(simpleDraweeView, coreUser, R.dimen.avatar_size_small, null, null, guildMember, 24, null);
         }
     }
 
@@ -253,7 +254,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
         FontUtils fontUtils = FontUtils.INSTANCE;
         Context context = simpleDraweeSpanTextView.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        simpleDraweeSpanTextView.setTypeface(fontUtils.getThemedFont(context, 2130969327), 0);
+        simpleDraweeSpanTextView.setTypeface(fontUtils.getThemedFont(context, R.attr.font_primary_normal), 0);
         setIcon$default(this, null, 1, null);
     }
 
@@ -268,7 +269,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
         FontUtils fontUtils = FontUtils.INSTANCE;
         Context context = simpleDraweeSpanTextView2.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        simpleDraweeSpanTextView2.setTypeface(fontUtils.getThemedFont(context, 2130969327), 2);
+        simpleDraweeSpanTextView2.setTypeface(fontUtils.getThemedFont(context, R.attr.font_primary_normal), 2);
         setIcon(drawable);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
index bd773031e1..16d4b653e8 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.list.adapter;
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemTextDividerBinding;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.time.TimeUtils;
@@ -15,20 +16,20 @@ public final class WidgetChatListAdapterItemTimestamp extends WidgetChatListItem
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemTimestamp(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558988, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_text_divider, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         WidgetChatListAdapterItemTextDividerBinding a = WidgetChatListAdapterItemTextDividerBinding.a(this.itemView);
         m.checkNotNullExpressionValue(a, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
         this.binding = a;
         View view = a.b;
         m.checkNotNullExpressionValue(view, "binding.dividerStrokeLeft");
-        view.setBackgroundColor(ColorCompat.getThemedColor(view, 2130968989));
+        view.setBackgroundColor(ColorCompat.getThemedColor(view, (int) R.attr.colorTextMuted));
         View view2 = a.f1763c;
         m.checkNotNullExpressionValue(view2, "binding.dividerStrokeRight");
-        view2.setBackgroundColor(ColorCompat.getThemedColor(view2, 2130968989));
+        view2.setBackgroundColor(ColorCompat.getThemedColor(view2, (int) R.attr.colorTextMuted));
         TextView textView = a.d;
         m.checkNotNullExpressionValue(textView, "binding.dividerText");
-        textView.setTextColor(ColorCompat.getThemedColor(textView, 2130968989));
+        textView.setTextColor(ColorCompat.getThemedColor(textView, (int) R.attr.colorTextMuted));
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
index 64415b11ab..58d9774672 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
@@ -7,8 +7,10 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetChatListAdapterItemUploadProgressBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreMessageUploads;
 import com.discord.stores.StoreStream;
 import com.discord.stores.updates.ObservationDeck;
@@ -307,7 +309,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Single(String str, String str2, long j, int i) {
                 super(null);
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(str2, "mimeType");
                 this.name = str;
                 this.mimeType = str2;
@@ -348,7 +350,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             }
 
             public final Single copy(String str, String str2, long j, int i) {
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(str2, "mimeType");
                 return new Single(str, str2, j, i);
             }
@@ -500,23 +502,23 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemUploadProgress(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558992, widgetChatListAdapter);
+        super(R.layout.widget_chat_list_adapter_item_upload_progress, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131364580;
-        ImageView imageView = (ImageView) view.findViewById(2131364580);
+        int i = R.id.progress_cancel_centered;
+        ImageView imageView = (ImageView) view.findViewById(R.id.progress_cancel_centered);
         if (imageView != null) {
-            i = 2131364581;
-            ImageView imageView2 = (ImageView) view.findViewById(2131364581);
+            i = R.id.progress_cancel_top;
+            ImageView imageView2 = (ImageView) view.findViewById(R.id.progress_cancel_top);
             if (imageView2 != null) {
-                i = 2131365632;
-                UploadProgressView uploadProgressView = (UploadProgressView) view.findViewById(2131365632);
+                i = R.id.upload_progress_1;
+                UploadProgressView uploadProgressView = (UploadProgressView) view.findViewById(R.id.upload_progress_1);
                 if (uploadProgressView != null) {
-                    i = 2131365633;
-                    UploadProgressView uploadProgressView2 = (UploadProgressView) view.findViewById(2131365633);
+                    i = R.id.upload_progress_2;
+                    UploadProgressView uploadProgressView2 = (UploadProgressView) view.findViewById(R.id.upload_progress_2);
                     if (uploadProgressView2 != null) {
-                        i = 2131365634;
-                        UploadProgressView uploadProgressView3 = (UploadProgressView) view.findViewById(2131365634);
+                        i = R.id.upload_progress_3;
+                        UploadProgressView uploadProgressView3 = (UploadProgressView) view.findViewById(R.id.upload_progress_3);
                         if (uploadProgressView3 != null) {
                             WidgetChatListAdapterItemUploadProgressBinding widgetChatListAdapterItemUploadProgressBinding = new WidgetChatListAdapterItemUploadProgressBinding((LinearLayout) view, imageView, imageView2, uploadProgressView, uploadProgressView2, uploadProgressView3);
                             m.checkNotNullExpressionValue(widgetChatListAdapterItemUploadProgressBinding, "WidgetChatListAdapterIte…essBinding.bind(itemView)");
@@ -641,12 +643,12 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
 
     private final void setUploadState(UploadProgressView uploadProgressView, Model model) {
         if (m.areEqual(model, Model.None.INSTANCE)) {
-            CharSequence j = c.a.l.b.j(uploadProgressView, 2131894581, new Object[0], null, 4);
+            CharSequence j = c.a.l.b.j(uploadProgressView, R.string.upload_queued, new Object[0], null, 4);
             int i = UploadProgressView.i;
             uploadProgressView.a(j, 0, null);
             Context context = uploadProgressView.getContext();
             m.checkNotNullExpressionValue(context, "context");
-            uploadProgressView.setIcon(DrawableCompat.getThemedDrawableRes$default(context, 2130969470, 0, 2, (Object) null));
+            uploadProgressView.setIcon(DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.ic_uploads_generic, 0, 2, (Object) null));
             return;
         }
         int i2 = -1;
@@ -658,7 +660,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
                 m.checkNotNullExpressionValue(resources, "resources");
                 Context context2 = uploadProgressView.getContext();
                 m.checkNotNullExpressionValue(context2, "context");
-                displayName = StringResourceUtilsKt.getQuantityString(resources, context2, 2131755353, preprocessing.getNumFiles(), Integer.valueOf(preprocessing.getNumFiles()));
+                displayName = StringResourceUtilsKt.getQuantityString(resources, context2, (int) R.plurals.uploading_files_count, preprocessing.getNumFiles(), Integer.valueOf(preprocessing.getNumFiles()));
             }
             int i3 = UploadProgressView.i;
             uploadProgressView.a(displayName, -1, null);
@@ -670,7 +672,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             }
             Context context4 = uploadProgressView.getContext();
             m.checkNotNullExpressionValue(context4, "context");
-            uploadProgressView.setIcon(DrawableCompat.getThemedDrawableRes$default(context4, 2130969470, 0, 2, (Object) null));
+            uploadProgressView.setIcon(DrawableCompat.getThemedDrawableRes$default(context4, (int) R.attr.ic_uploads_generic, 0, 2, (Object) null));
         } else if (model instanceof Model.Single) {
             Model.Single single = (Model.Single) model;
             String name = single.getName();
@@ -687,14 +689,14 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             Context context6 = uploadProgressView.getContext();
             m.checkNotNullExpressionValue(context6, "context");
             Model.Many many = (Model.Many) model;
-            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, context6, 2131755353, many.getNumFiles(), Integer.valueOf(many.getNumFiles()));
+            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, context6, (int) R.plurals.uploading_files_count, many.getNumFiles(), Integer.valueOf(many.getNumFiles()));
             if (many.getProgress() != -1) {
                 i2 = many.getProgress();
             }
             uploadProgressView.a(quantityString, i2, FileUtilsKt.getSizeSubtitle(many.getSizeBytes()));
             Context context7 = uploadProgressView.getContext();
             m.checkNotNullExpressionValue(context7, "context");
-            uploadProgressView.setIcon(DrawableCompat.getThemedDrawableRes$default(context7, 2130969470, 0, 2, (Object) null));
+            uploadProgressView.setIcon(DrawableCompat.getThemedDrawableRes$default(context7, (int) R.attr.ic_uploads_generic, 0, 2, (Object) null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java
index 61c7fe4c37..c6c30de8d1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java
@@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
+import com.discord.R;
 import com.discord.models.message.Message;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -45,7 +46,7 @@ public class WidgetChatListItem extends MGRecyclerViewHolder<WidgetChatListAdapt
         this.defaultBackground = view.getBackground();
         View view2 = this.itemView;
         m.checkNotNullExpressionValue(view2, "itemView");
-        this.backgroundBlockedExpanded = new ColorDrawable(ColorCompat.getThemedColor(view2, 2130970172));
+        this.backgroundBlockedExpanded = new ColorDrawable(ColorCompat.getThemedColor(view2, (int) R.attr.theme_chat_blocked_bg));
         this.itemView.setOnTouchListener(new AnonymousClass1(this, widgetChatListAdapter));
     }
 
@@ -58,11 +59,11 @@ public class WidgetChatListItem extends MGRecyclerViewHolder<WidgetChatListAdapt
         boolean z2 = true;
         int i3 = 0;
         if (message.isEphemeralMessage() || message.isFailed()) {
-            i = ColorCompat.getThemedColor(view.getContext(), 2130968902);
-            i2 = ColorCompat.getThemedColor(view2, 2130968995);
+            i = ColorCompat.getThemedColor(view.getContext(), (int) R.attr.colorBackgroundModifierHover);
+            i2 = ColorCompat.getThemedColor(view2, (int) R.attr.color_brand);
         } else if (WidgetChatListItemKt.isUserMentioned((WidgetChatListAdapter) this.adapter, message)) {
-            i = ColorCompat.getThemedColor(view.getContext(), 2130970187);
-            i2 = ColorCompat.getColor(view2, 2131100356);
+            i = ColorCompat.getThemedColor(view.getContext(), (int) R.attr.theme_chat_mentioned_me);
+            i2 = ColorCompat.getColor(view2, (int) R.color.status_yellow_500);
         } else {
             i = 0;
             i2 = 0;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/EmptyPinsEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/EmptyPinsEntry.java
index e200f28a2d..94fcb63b6e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/EmptyPinsEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/EmptyPinsEntry.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.list.entries;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import d0.z.d.m;
 /* compiled from: EmptyPinsEntry.kt */
@@ -9,7 +10,7 @@ public final class EmptyPinsEntry extends ChatListEntry {
     private final int type = 16;
 
     public EmptyPinsEntry(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         this.text = str;
     }
 
@@ -25,7 +26,7 @@ public final class EmptyPinsEntry extends ChatListEntry {
     }
 
     public final EmptyPinsEntry copy(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         return new EmptyPinsEntry(str);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/GameInviteEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/GameInviteEntry.java
index f5fa6f4595..0ed4a98fd6 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/GameInviteEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/GameInviteEntry.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.list.entries;
 
 import a0.a.a.b;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.d.b.a.a;
 import com.discord.api.application.Application;
 import com.discord.api.message.activity.MessageActivity;
@@ -15,7 +16,7 @@ public final class GameInviteEntry extends ChatListEntry {
     private final int type = 22;
 
     public GameInviteEntry(long j, long j2, MessageActivity messageActivity, Application application) {
-        m.checkNotNullParameter(messageActivity, "activity");
+        m.checkNotNullParameter(messageActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(application, "application");
         this.authorId = j;
         this.messageId = j2;
@@ -57,7 +58,7 @@ public final class GameInviteEntry extends ChatListEntry {
     }
 
     public final GameInviteEntry copy(long j, long j2, MessageActivity messageActivity, Application application) {
-        m.checkNotNullParameter(messageActivity, "activity");
+        m.checkNotNullParameter(messageActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(application, "application");
         return new GameInviteEntry(j, j2, messageActivity, application);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/SpotifyListenTogetherEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/SpotifyListenTogetherEntry.java
index 75f07e6fa5..2513c552b1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/SpotifyListenTogetherEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/SpotifyListenTogetherEntry.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.list.entries;
 
 import a0.a.a.b;
+import androidx.appcompat.widget.ActivityChooserModel;
 import c.d.b.a.a;
 import com.discord.api.message.activity.MessageActivity;
 import d0.z.d.m;
@@ -13,7 +14,7 @@ public final class SpotifyListenTogetherEntry extends ChatListEntry {
     private final long userId;
 
     public SpotifyListenTogetherEntry(long j, long j2, MessageActivity messageActivity) {
-        m.checkNotNullParameter(messageActivity, "activity");
+        m.checkNotNullParameter(messageActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         this.userId = j;
         this.messageId = j2;
         this.activity = messageActivity;
@@ -46,7 +47,7 @@ public final class SpotifyListenTogetherEntry extends ChatListEntry {
     }
 
     public final SpotifyListenTogetherEntry copy(long j, long j2, MessageActivity messageActivity) {
-        m.checkNotNullParameter(messageActivity, "activity");
+        m.checkNotNullParameter(messageActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         return new SpotifyListenTogetherEntry(j, j2, messageActivity);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
index bbb39df494..ad2349989c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
@@ -105,10 +105,12 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
 
         private final ChatListEntry getGreetMessageItem(WidgetChatListModelMessages widgetChatListModelMessages, Channel channel) {
             StoreStickers stickers = StoreStream.Companion.getStickers();
-            if (stickers.getStickers().get(749054660769218631L) == null) {
-                stickers.fetchStickerPack(749043879713701898L);
+            Map<Long, Sticker> stickers2 = stickers.getStickers();
+            Long valueOf = Long.valueOf((long) WidgetChatListModel.WUMPUS_WAVE_STICKER_ID);
+            if (stickers2.get(valueOf) == null) {
+                stickers.fetchStickerPack(WidgetChatListModel.WUMPUS_PACK_ID);
             }
-            Sticker sticker = stickers.getStickers().get(749054660769218631L);
+            Sticker sticker = stickers.getStickers().get(valueOf);
             if (sticker != null) {
                 if (widgetChatListModelMessages.getItems().isEmpty()) {
                     return new StickerGreetEntry(sticker, channel.h(), AnimatableValueParser.y0(channel), channel.A());
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
index ceeaa8b37e..72289ec8d9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
@@ -6,6 +6,7 @@ import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.interaction.Interaction;
 import com.discord.api.message.MessageReference;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.api.user.User;
@@ -171,7 +172,7 @@ public final class WidgetChatListModelMessages {
             if (guildMember != null) {
                 z2 = guildMember.getPending();
             }
-            if (!PermissionUtils.can(2048, l) || z2) {
+            if (!PermissionUtils.can(Permission.SEND_MESSAGES, l) || z2) {
                 return null;
             }
             return new MessageEntry.WelcomeCtaData(MessageUtils.INSTANCE.getWelcomeSticker(j, message.getId()), channel);
@@ -207,7 +208,7 @@ public final class WidgetChatListModelMessages {
             if (timestamp2 != null) {
                 j = timestamp2.g();
             }
-            if (g - j >= 420000 || message2.hasAttachments() || message2.hasEmbeds()) {
+            if (g - j >= WidgetChatListModelMessages.MESSAGE_CONCAT_TIMESTAMP_DELTA_THRESHOLD || message2.hasAttachments() || message2.hasEmbeds()) {
                 return false;
             }
             List<User> mentions = message2.getMentions();
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java
index 771e61710f..2bb914b752 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.model;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
@@ -28,7 +29,7 @@ public final class WidgetChatListModelTop$Companion$getWelcomeEntry$2<T1, T2, T3
         ChatListEntry startOfChatEntry;
         boolean z2 = l2 != null && this.$channel.h() == l2.longValue();
         boolean z3 = guild != null && guild.hasIcon();
-        boolean can = PermissionUtils.can(65536, l);
+        boolean can = PermissionUtils.can(Permission.READ_MESSAGE_HISTORY, l);
         boolean can2 = PermissionUtils.can(1, l);
         boolean can3 = PermissionUtils.can(16, l);
         ThreadUtils threadUtils = ThreadUtils.INSTANCE;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java
index 0f0b6de057..fc3912f04d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetApplicationCommandBottomSheetBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -21,29 +22,29 @@ public final /* synthetic */ class WidgetApplicationCommandBottomSheet$binding$2
 
     public final WidgetApplicationCommandBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362179;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362179);
+        int i = R.id.bottom;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.bottom);
         if (linearLayout != null) {
-            i = 2131362681;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362681);
+            i = R.id.command_bottom_sheet_command_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.command_bottom_sheet_command_avatar);
             if (simpleDraweeView != null) {
-                i = 2131362682;
-                TextView textView = (TextView) view.findViewById(2131362682);
+                i = R.id.command_bottom_sheet_command_content;
+                TextView textView = (TextView) view.findViewById(R.id.command_bottom_sheet_command_content);
                 if (textView != null) {
-                    i = 2131362683;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362683);
+                    i = R.id.command_bottom_sheet_command_copy_button;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.command_bottom_sheet_command_copy_button);
                     if (materialButton != null) {
-                        i = 2131362684;
-                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131362684);
+                        i = R.id.command_bottom_sheet_command_loader;
+                        ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.command_bottom_sheet_command_loader);
                         if (progressBar != null) {
-                            i = 2131362685;
-                            TextView textView2 = (TextView) view.findViewById(2131362685);
+                            i = R.id.command_bottom_sheet_command_slash_heading;
+                            TextView textView2 = (TextView) view.findViewById(R.id.command_bottom_sheet_command_slash_heading);
                             if (textView2 != null) {
-                                i = 2131362686;
-                                TextView textView3 = (TextView) view.findViewById(2131362686);
+                                i = R.id.command_bottom_sheet_command_title;
+                                TextView textView3 = (TextView) view.findViewById(R.id.command_bottom_sheet_command_title);
                                 if (textView3 != null) {
-                                    i = 2131362687;
-                                    TextView textView4 = (TextView) view.findViewById(2131362687);
+                                    i = R.id.command_bottom_sheet_command_title_application_name;
+                                    TextView textView4 = (TextView) view.findViewById(R.id.command_bottom_sheet_command_title_application_name);
                                     if (textView4 != null) {
                                         return new WidgetApplicationCommandBottomSheetBinding((ConstraintLayout) view, linearLayout, simpleDraweeView, textView, materialButton, progressBar, textView2, textView3, textView4);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$viewModel$2.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$viewModel$2.java
index 0a5b2dcfd4..68d27da544 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$viewModel$2.java
@@ -19,6 +19,6 @@ public final class WidgetApplicationCommandBottomSheet$viewModel$2 extends o imp
     /* renamed from: invoke */
     public final AppViewModel<WidgetApplicationCommandBottomSheetViewModel.ViewState> mo1invoke() {
         Bundle arguments;
-        return new WidgetApplicationCommandBottomSheetViewModel(WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_INTERACTION_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_MESSAGE_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_CHANNEL_ID"), (!WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).containsKey("com.discord.intent.extra.EXTRA_GUILD_ID") || (arguments = this.this$0.getArguments()) == null) ? null : Long.valueOf(arguments.getLong("com.discord.intent.extra.EXTRA_GUILD_ID")), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_USER_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_APPLICATION_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString("arg_message_nonce"), null, 128, null);
+        return new WidgetApplicationCommandBottomSheetViewModel(WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_INTERACTION_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_MESSAGE_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_CHANNEL_ID"), (!WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).containsKey("com.discord.intent.extra.EXTRA_GUILD_ID") || (arguments = this.this$0.getArguments()) == null) ? null : Long.valueOf(arguments.getLong("com.discord.intent.extra.EXTRA_GUILD_ID")), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_USER_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_APPLICATION_ID"), WidgetApplicationCommandBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getString(WidgetApplicationCommandBottomSheet.ARG_MESSAGE_NONCE), null, 128, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java
index 61b9b76992..0c712e16bb 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java
@@ -15,6 +15,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.commands.ApplicationCommandData;
 import com.discord.api.commands.ApplicationCommandValue;
 import com.discord.api.user.User;
@@ -29,6 +30,7 @@ import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.list.sheet.WidgetApplicationCommandBottomSheetViewModel;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -75,7 +77,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
                 }
                 bundle.putLong("com.discord.intent.extra.EXTRA_USER_ID", j4);
                 bundle.putLong("com.discord.intent.extra.EXTRA_APPLICATION_ID", j5);
-                bundle.putString("arg_message_nonce", str);
+                bundle.putString(WidgetApplicationCommandBottomSheet.ARG_MESSAGE_NONCE, str);
                 widgetApplicationCommandBottomSheet.setArguments(bundle);
                 widgetApplicationCommandBottomSheet.show(fragmentManager, WidgetApplicationCommandBottomSheet.class.getName());
             }
@@ -102,7 +104,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
         String str;
         String nick;
         User bot;
-        StringBuilder H = a.H('/');
+        StringBuilder H = a.H(MentionUtilsKt.SLASH_CHAR);
         H.append(loaded.getApplicationCommandData().a());
         String sb = H.toString();
         Application application = loaded.getApplication();
@@ -111,7 +113,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
             Application application2 = loaded.getApplication();
             str = application2 != null ? application2.getName() : null;
         }
-        int themedColor = ColorCompat.getThemedColor(requireContext(), 2130968990);
+        int themedColor = ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorTextNormal);
         Application application3 = loaded.getApplication();
         if (application3 != null) {
             SimpleDraweeView simpleDraweeView = getBinding().b;
@@ -134,7 +136,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
         objArr[0] = str2;
         boolean z2 = true;
         objArr[1] = sb;
-        CharSequence d = b.d(textView, 2131894155, objArr, new WidgetApplicationCommandBottomSheet$configureCommandTitle$content$1(this, loaded, themedColor));
+        CharSequence d = b.d(textView, R.string.system_message_application_command_used_as_title, objArr, new WidgetApplicationCommandBottomSheet$configureCommandTitle$content$1(this, loaded, themedColor));
         TextView textView2 = getBinding().f;
         m.checkNotNullExpressionValue(textView2, "binding.commandBottomSheetCommandTitle");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -175,7 +177,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
         ApplicationCommandData applicationCommandData = loaded.getApplicationCommandData();
         List<ApplicationCommandValue> b = loaded.getApplicationCommandData().b();
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder();
-        StringBuilder H = a.H('/');
+        StringBuilder H = a.H(MentionUtilsKt.SLASH_CHAR);
         H.append(applicationCommandData.a());
         H.append(' ');
         spannableStringBuilder.append((CharSequence) H.toString());
@@ -191,7 +193,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
 
     private final Spannable configureSlashCommandStringOptions(WidgetApplicationCommandBottomSheetViewModel.ViewState.Loaded loaded, ApplicationCommandValue applicationCommandValue) {
         Integer valueColor;
-        int themedColor = ColorCompat.getThemedColor(this, 2130968932);
+        int themedColor = ColorCompat.getThemedColor(this, (int) R.attr.colorHeaderPrimary);
         WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam slashCommandParam = loaded.getCommandValues().get(applicationCommandValue.a());
         String str = null;
         if ((slashCommandParam != null ? slashCommandParam.getValueColor() : null) != null && ((valueColor = slashCommandParam.getValueColor()) == null || valueColor.intValue() != 0)) {
@@ -245,7 +247,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558865;
+        return R.layout.widget_application_command_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetKt.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetKt.java
index 2b36dcb933..18d1c4b4f3 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetKt.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetKt.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.sheet;
 
 import com.discord.api.commands.ApplicationCommandData;
 import com.discord.api.commands.ApplicationCommandValue;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.list.sheet.WidgetApplicationCommandBottomSheetViewModel;
 import d0.t.u;
 import d0.z.d.m;
@@ -14,7 +15,7 @@ public final class WidgetApplicationCommandBottomSheetKt {
         m.checkNotNullParameter(applicationCommandData, "$this$toSlashCommandCopyString");
         m.checkNotNullParameter(map, "commandValues");
         StringBuilder sb = new StringBuilder();
-        sb.append('/');
+        sb.append(MentionUtilsKt.SLASH_CHAR);
         sb.append(applicationCommandData.a());
         sb.append(' ');
         List<ApplicationCommandValue> b = applicationCommandData.b();
@@ -42,7 +43,7 @@ public final class WidgetApplicationCommandBottomSheetKt {
         }
         StringBuilder sb2 = new StringBuilder();
         sb2.append(applicationCommandValue.a());
-        sb2.append(':');
+        sb2.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam slashCommandParam = map.get(applicationCommandValue.a());
         if (slashCommandParam != null) {
             str = slashCommandParam.getCopyText();
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java
index 4616781f13..ad24f65e5d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java
@@ -14,6 +14,7 @@ import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreUser;
 import com.discord.utilities.guilds.RoleUtils;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.chat.list.sheet.WidgetApplicationCommandBottomSheetViewModel;
 import d0.g0.s;
 import d0.t.n0;
@@ -82,10 +83,10 @@ public final class WidgetApplicationCommandBottomSheetViewModel$Companion$observ
                         String a2 = applicationCommandValue.a();
                         String valueOf = String.valueOf(user != null ? user.getUsername() : null);
                         Integer valueOf2 = guildMember != null ? Integer.valueOf(guildMember.getColor()) : null;
-                        StringBuilder H = a.H('@');
+                        StringBuilder H = a.H(MentionUtilsKt.MENTIONS_CHAR);
                         it = it2;
                         H.append(user != null ? user.getUsername() : null);
-                        H.append('#');
+                        H.append(MentionUtilsKt.CHANNELS_CHAR);
                         H.append(user != null ? Integer.valueOf(user.getDiscriminator()) : null);
                         linkedHashMap3.put(a, new WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam(a2, valueOf, valueOf2, H.toString()));
                     } else {
@@ -102,7 +103,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel$Companion$observ
                             String a4 = applicationCommandValue.a();
                             String valueOf3 = String.valueOf(guildRole != null ? guildRole.f() : null);
                             Integer valueOf4 = Integer.valueOf(RoleUtils.getOpaqueColor(guildRole));
-                            StringBuilder H2 = a.H('@');
+                            StringBuilder H2 = a.H(MentionUtilsKt.MENTIONS_CHAR);
                             H2.append(guildRole != null ? guildRole.f() : null);
                             linkedHashMap3.put(a3, new WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam(a4, valueOf3, valueOf4, H2.toString()));
                         }
@@ -116,7 +117,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel$Companion$observ
                                 String a6 = applicationCommandValue.a();
                                 String valueOf5 = String.valueOf(guildRole2.f());
                                 Integer valueOf6 = Integer.valueOf(RoleUtils.getOpaqueColor(guildRole2));
-                                StringBuilder H3 = a.H('@');
+                                StringBuilder H3 = a.H(MentionUtilsKt.MENTIONS_CHAR);
                                 H3.append(guildRole2.f());
                                 linkedHashMap3.put(a5, new WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam(a6, valueOf5, valueOf6, H3.toString()));
                             } else {
@@ -127,9 +128,9 @@ public final class WidgetApplicationCommandBottomSheetViewModel$Companion$observ
                                 String a8 = applicationCommandValue.a();
                                 String valueOf7 = String.valueOf(user2 != null ? user2.getUsername() : null);
                                 Integer valueOf8 = guildMember2 != null ? Integer.valueOf(guildMember2.getColor()) : null;
-                                StringBuilder H4 = a.H('@');
+                                StringBuilder H4 = a.H(MentionUtilsKt.MENTIONS_CHAR);
                                 H4.append(user2 != null ? user2.getUsername() : null);
-                                H4.append('#');
+                                H4.append(MentionUtilsKt.CHANNELS_CHAR);
                                 H4.append(user2 != null ? Integer.valueOf(user2.getDiscriminator()) : null);
                                 linkedHashMap3.put(a7, new WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam(a8, valueOf7, valueOf8, H4.toString()));
                             }
@@ -141,7 +142,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel$Companion$observ
                             String a9 = applicationCommandValue.a();
                             String a10 = applicationCommandValue.a();
                             String valueOf9 = String.valueOf(channel != null ? channel.m() : null);
-                            StringBuilder H5 = a.H('#');
+                            StringBuilder H5 = a.H(MentionUtilsKt.CHANNELS_CHAR);
                             H5.append(channel != null ? channel.m() : null);
                             linkedHashMap3.put(a9, new WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam(a10, valueOf9, null, H5.toString()));
                         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
index 174e1dd112..d70c614257 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
@@ -7,6 +7,7 @@ import com.discord.api.commands.ApplicationCommandData;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppViewModel;
 import com.discord.models.commands.Application;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
 import com.discord.stores.StoreApplicationCommands;
@@ -129,7 +130,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
         private final Integer valueColor;
 
         public SlashCommandParam(String str, String str2, Integer num, String str3) {
-            a.h0(str, "name", str2, "value", str3, "copyText");
+            a.h0(str, ModelAuditLogEntry.CHANGE_KEY_NAME, str2, "value", str3, "copyText");
             this.name = str;
             this.value = str2;
             this.valueColor = num;
@@ -169,7 +170,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
         }
 
         public final SlashCommandParam copy(String str, String str2, Integer num, String str3) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(str2, "value");
             m.checkNotNullParameter(str3, "copyText");
             return new SlashCommandParam(str, str2, num, str3);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java b/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java
index eb335a7944..c05c95e32b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.utils;
 
 import android.content.Context;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.api.user.User;
 import com.discord.models.message.Message;
@@ -195,7 +196,7 @@ public final class EmbeddedMessageParser {
     }
 
     private final MessageRenderContext getMessageRenderContext(ParserData parserData) {
-        return new MessageRenderContext(parserData.getContext(), parserData.getAdapter().getData().getUserId(), parserData.getAnimateEmojis(), parserData.getNickOrUsernames(), parserData.getAdapter().getData().getChannelNames(), parserData.getRoleMentions(), 2130968987, EmbeddedMessageParser$getMessageRenderContext$1.INSTANCE, new EmbeddedMessageParser$getMessageRenderContext$2(parserData), ColorCompat.getThemedColor(parserData.getContext(), 2130970190), ColorCompat.getThemedColor(parserData.getContext(), 2130970191), null, new EmbeddedMessageParser$getMessageRenderContext$3(parserData), new EmbeddedMessageParser$getMessageRenderContext$4(parserData));
+        return new MessageRenderContext(parserData.getContext(), parserData.getAdapter().getData().getUserId(), parserData.getAnimateEmojis(), parserData.getNickOrUsernames(), parserData.getAdapter().getData().getChannelNames(), parserData.getRoleMentions(), R.attr.colorTextLink, EmbeddedMessageParser$getMessageRenderContext$1.INSTANCE, new EmbeddedMessageParser$getMessageRenderContext$2(parserData), ColorCompat.getThemedColor(parserData.getContext(), (int) R.attr.theme_chat_spoiler_bg), ColorCompat.getThemedColor(parserData.getContext(), (int) R.attr.theme_chat_spoiler_bg_visible), null, new EmbeddedMessageParser$getMessageRenderContext$3(parserData), new EmbeddedMessageParser$getMessageRenderContext$4(parserData));
     }
 
     public final DraweeSpanStringBuilder parse(ParserData parserData) {
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java
index 46e9267b7a..a9416da667 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java
@@ -7,6 +7,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.databinding.WidgetManageReactionsEmojiBinding;
 import com.discord.utilities.dimen.DimenUtils;
@@ -140,20 +141,20 @@ public final class ManageReactionsEmojisAdapter extends MGRecyclerAdapterSimple<
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ReactionEmojiViewHolder(ManageReactionsEmojisAdapter manageReactionsEmojisAdapter) {
-            super(2131559129, manageReactionsEmojisAdapter);
+            super((int) R.layout.widget_manage_reactions_emoji, manageReactionsEmojisAdapter);
             m.checkNotNullParameter(manageReactionsEmojisAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363987;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363987);
+            int i = R.id.manage_reactions_emoji_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.manage_reactions_emoji_container);
             if (linearLayout != null) {
-                i = 2131363988;
-                TextView textView = (TextView) view.findViewById(2131363988);
+                i = R.id.manage_reactions_emoji_counter;
+                TextView textView = (TextView) view.findViewById(R.id.manage_reactions_emoji_counter);
                 if (textView != null) {
-                    i = 2131363989;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363989);
+                    i = R.id.manage_reactions_emoji_emoji_textview;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.manage_reactions_emoji_emoji_textview);
                     if (simpleDraweeSpanTextView != null) {
-                        i = 2131363990;
-                        View findViewById = view.findViewById(2131363990);
+                        i = R.id.manage_reactions_emoji_selected_indicator;
+                        View findViewById = view.findViewById(R.id.manage_reactions_emoji_selected_indicator);
                         if (findViewById != null) {
                             WidgetManageReactionsEmojiBinding widgetManageReactionsEmojiBinding = new WidgetManageReactionsEmojiBinding((RelativeLayout) view, linearLayout, textView, simpleDraweeSpanTextView, findViewById);
                             m.checkNotNullExpressionValue(widgetManageReactionsEmojiBinding, "WidgetManageReactionsEmojiBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.java
index 772459182a..0b861044d7 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.managereactions;
 
+import com.discord.api.permission.Permission;
 import com.discord.models.guild.Guild;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.permissions.PermissionUtils;
@@ -22,7 +23,7 @@ public final class ManageReactionsModelProvider$get$1 extends o implements Funct
         }
 
         public final Boolean call(Long l, Guild guild) {
-            return Boolean.valueOf(guild != null && PermissionUtils.canAndIsElevated(8192, l, this.$isMeMfaEnabled, guild.getMfaLevel()));
+            return Boolean.valueOf(guild != null && PermissionUtils.canAndIsElevated(Permission.MANAGE_MESSAGES, l, this.$isMeMfaEnabled, guild.getMfaLevel()));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java
index 1998f6b85a..512d385044 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java
@@ -8,6 +8,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.message.reaction.MessageReactionEmoji;
 import com.discord.databinding.WidgetManageReactionsResultErrorBinding;
 import com.discord.databinding.WidgetManageReactionsResultUserBinding;
@@ -81,14 +82,14 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ErrorViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) {
-            super(2131559130, manageReactionsResultsAdapter);
+            super((int) R.layout.widget_manage_reactions_result_error, manageReactionsResultsAdapter);
             m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363992;
-            ImageView imageView = (ImageView) view.findViewById(2131363992);
+            int i = R.id.manage_reactions_result_error_img;
+            ImageView imageView = (ImageView) view.findViewById(R.id.manage_reactions_result_error_img);
             if (imageView != null) {
-                i = 2131363993;
-                TextView textView = (TextView) view.findViewById(2131363993);
+                i = R.id.manage_reactions_result_error_text;
+                TextView textView = (TextView) view.findViewById(R.id.manage_reactions_result_error_text);
                 if (textView != null) {
                     WidgetManageReactionsResultErrorBinding widgetManageReactionsResultErrorBinding = new WidgetManageReactionsResultErrorBinding((RelativeLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(widgetManageReactionsResultErrorBinding, "WidgetManageReactionsRes…rorBinding.bind(itemView)");
@@ -126,7 +127,7 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
     public static final class LoadingViewHolder extends MGRecyclerViewHolder<ManageReactionsResultsAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public LoadingViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) {
-            super(2131559131, manageReactionsResultsAdapter);
+            super((int) R.layout.widget_manage_reactions_result_loading, manageReactionsResultsAdapter);
             m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter");
         }
     }
@@ -278,17 +279,17 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ReactionUserViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) {
-            super(2131559132, manageReactionsResultsAdapter);
+            super((int) R.layout.widget_manage_reactions_result_user, manageReactionsResultsAdapter);
             m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363994;
-            ImageView imageView = (ImageView) view.findViewById(2131363994);
+            int i = R.id.manage_reactions_result_remove_reaction;
+            ImageView imageView = (ImageView) view.findViewById(R.id.manage_reactions_result_remove_reaction);
             if (imageView != null) {
-                i = 2131363995;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363995);
+                i = R.id.manage_reactions_result_user_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.manage_reactions_result_user_avatar);
                 if (simpleDraweeView != null) {
-                    i = 2131363996;
-                    TextView textView = (TextView) view.findViewById(2131363996);
+                    i = R.id.manage_reactions_result_user_name;
+                    TextView textView = (TextView) view.findViewById(R.id.manage_reactions_result_user_name);
                     if (textView != null) {
                         WidgetManageReactionsResultUserBinding widgetManageReactionsResultUserBinding = new WidgetManageReactionsResultUserBinding((RelativeLayout) view, imageView, simpleDraweeView, textView);
                         m.checkNotNullExpressionValue(widgetManageReactionsResultUserBinding, "WidgetManageReactionsRes…serBinding.bind(itemView)");
@@ -315,7 +316,7 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
                 textView.setText(str);
                 SimpleDraweeView simpleDraweeView = this.binding.f1860c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.manageReactionsResultUserAvatar");
-                IconUtils.setIcon$default(simpleDraweeView, reactionUserItem.getUser(), 2131165297, null, null, reactionUserItem.getGuildMember(), 24, null);
+                IconUtils.setIcon$default(simpleDraweeView, reactionUserItem.getUser(), R.dimen.avatar_size_standard, null, null, reactionUserItem.getGuildMember(), 24, null);
                 ImageView imageView = this.binding.b;
                 m.checkNotNullExpressionValue(imageView, "binding.manageReactionsResultRemoveReaction");
                 imageView.setVisibility(reactionUserItem.getCanDelete() ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java
index 53ad1f5d36..c78e79f514 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.managereactions;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetManageReactionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,11 +18,11 @@ public final /* synthetic */ class WidgetManageReactions$binding$2 extends k imp
 
     public final WidgetManageReactionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363991;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363991);
+        int i = R.id.manage_reactions_emojis_recycler;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.manage_reactions_emojis_recycler);
         if (recyclerView != null) {
-            i = 2131363997;
-            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363997);
+            i = R.id.manage_reactions_results_recycler;
+            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.manage_reactions_results_recycler);
             if (recyclerView2 != null) {
                 return new WidgetManageReactionsBinding((CoordinatorLayout) view, recyclerView, recyclerView2);
             }
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java
index 54659b883b..9d174d8d2a 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.api.message.reaction.MessageReactionEmoji;
 import com.discord.app.AppFragment;
@@ -50,14 +51,14 @@ public final class WidgetManageReactions extends AppFragment {
         public final void create(long j, long j2, Context context, MessageReaction messageReaction) {
             MessageReactionEmoji b;
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j).putExtra("com.discord.intent.extra.EXTRA_MESSAGE_ID", j2).putExtra("com.discord.intent.extra.EXTRA_EMOJI_KEY", (messageReaction == null || (b = messageReaction.b()) == null) ? null : b.c());
+            Intent putExtra = new Intent().putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j).putExtra("com.discord.intent.extra.EXTRA_MESSAGE_ID", j2).putExtra(WidgetManageReactions.EXTRA_EMOJI_KEY, (messageReaction == null || (b = messageReaction.b()) == null) ? null : b.c());
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…eaction?.emoji?.getKey())");
             l.d(context, WidgetManageReactions.class, putExtra);
         }
     }
 
     public WidgetManageReactions() {
-        super(2131559128);
+        super(R.layout.widget_manage_reactions);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetManageReactions widgetManageReactions, ManageReactionsModel manageReactionsModel) {
@@ -110,9 +111,9 @@ public final class WidgetManageReactions extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131892905);
+        setActionBarTitle(R.string.reactions);
         if (this.modelProvider == null) {
-            this.modelProvider = new ManageReactionsModelProvider(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0), getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_MESSAGE_ID", 0), getMostRecentIntent().getStringExtra("com.discord.intent.extra.EXTRA_EMOJI_KEY"), null, null, null, 56, null);
+            this.modelProvider = new ManageReactionsModelProvider(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0), getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_MESSAGE_ID", 0), getMostRecentIntent().getStringExtra(EXTRA_EMOJI_KEY), null, null, null, 56, null);
         }
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java
index efc3bc3ec2..26ad1e1215 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java
@@ -7,6 +7,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.n4;
+import com.discord.R;
 import com.discord.databinding.WidgetChatOverlayBinding;
 import com.discord.views.sticker.StickerView;
 import com.discord.views.typing.TypingDots;
@@ -24,41 +25,41 @@ public final /* synthetic */ class WidgetChatOverlay$binding$2 extends k impleme
 
     public final WidgetChatOverlayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362626;
-        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362626);
+        int i = R.id.chat_overlay_old_messages_fab;
+        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.chat_overlay_old_messages_fab);
         if (floatingActionButton != null) {
-            i = 2131362627;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362627);
+            i = R.id.chat_overlay_typing;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.chat_overlay_typing);
             if (relativeLayout != null) {
-                i = 2131362628;
-                TypingDots typingDots = (TypingDots) view.findViewById(2131362628);
+                i = R.id.chat_overlay_typing_dots;
+                TypingDots typingDots = (TypingDots) view.findViewById(R.id.chat_overlay_typing_dots);
                 if (typingDots != null) {
-                    i = 2131362632;
-                    TextView textView = (TextView) view.findViewById(2131362632);
+                    i = R.id.chat_typing_users_slowmode;
+                    TextView textView = (TextView) view.findViewById(R.id.chat_typing_users_slowmode);
                     if (textView != null) {
-                        i = 2131362633;
-                        ImageView imageView = (ImageView) view.findViewById(2131362633);
+                        i = R.id.chat_typing_users_slowmode_icon;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.chat_typing_users_slowmode_icon);
                         if (imageView != null) {
-                            i = 2131362634;
-                            TextView textView2 = (TextView) view.findViewById(2131362634);
+                            i = R.id.chat_typing_users_typing;
+                            TextView textView2 = (TextView) view.findViewById(R.id.chat_typing_users_typing);
                             if (textView2 != null) {
-                                i = 2131365370;
-                                View findViewById = view.findViewById(2131365370);
+                                i = R.id.stickers_suggestions;
+                                View findViewById = view.findViewById(R.id.stickers_suggestions);
                                 if (findViewById != null) {
-                                    int i2 = 2131362528;
-                                    StickerView stickerView = (StickerView) findViewById.findViewById(2131362528);
+                                    int i2 = R.id.chat_input_suggested_sticker_1;
+                                    StickerView stickerView = (StickerView) findViewById.findViewById(R.id.chat_input_suggested_sticker_1);
                                     if (stickerView != null) {
-                                        i2 = 2131362529;
-                                        StickerView stickerView2 = (StickerView) findViewById.findViewById(2131362529);
+                                        i2 = R.id.chat_input_suggested_sticker_2;
+                                        StickerView stickerView2 = (StickerView) findViewById.findViewById(R.id.chat_input_suggested_sticker_2);
                                         if (stickerView2 != null) {
-                                            i2 = 2131362530;
-                                            StickerView stickerView3 = (StickerView) findViewById.findViewById(2131362530);
+                                            i2 = R.id.chat_input_suggested_sticker_3;
+                                            StickerView stickerView3 = (StickerView) findViewById.findViewById(R.id.chat_input_suggested_sticker_3);
                                             if (stickerView3 != null) {
-                                                i2 = 2131362531;
-                                                StickerView stickerView4 = (StickerView) findViewById.findViewById(2131362531);
+                                                i2 = R.id.chat_input_suggested_sticker_4;
+                                                StickerView stickerView4 = (StickerView) findViewById.findViewById(R.id.chat_input_suggested_sticker_4);
                                                 if (stickerView4 != null) {
-                                                    i2 = 2131362532;
-                                                    ImageView imageView2 = (ImageView) findViewById.findViewById(2131362532);
+                                                    i2 = R.id.chat_input_suggested_sticker_cancel;
+                                                    ImageView imageView2 = (ImageView) findViewById.findViewById(R.id.chat_input_suggested_sticker_cancel);
                                                     if (imageView2 != null) {
                                                         return new WidgetChatOverlayBinding((ConstraintLayout) view, floatingActionButton, relativeLayout, typingDots, textView, imageView, textView2, new n4((LinearLayout) findViewById, stickerView, stickerView2, stickerView3, stickerView4, imageView2));
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
index fb064bd76e..706add02e1 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
@@ -14,6 +14,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.a.j.n4;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChatOverlayBinding;
@@ -203,14 +204,14 @@ public final class WidgetChatOverlay extends AppFragment {
             }
             ConstraintLayout constraintLayout = this.binding.a;
             m.checkNotNullExpressionValue(constraintLayout, "binding.root");
-            String string = constraintLayout.getResources().getString(2131887349);
+            String string = constraintLayout.getResources().getString(R.string.channel_slowmode_desc_short);
             m.checkNotNullExpressionValue(string, "binding.root.resources.g…nnel_slowmode_desc_short)");
             return string;
         }
 
         private final CharSequence getTypingString(Resources resources, List<? extends CharSequence> list) {
             int size = list.size();
-            return size != 0 ? size != 1 ? size != 2 ? size != 3 ? c.a.l.b.i(resources, 2131893623, new Object[0], null, 4) : c.a.l.b.i(resources, 2131894332, new Object[]{list.get(0), list.get(1), list.get(2)}, null, 4) : c.a.l.b.i(resources, 2131894469, new Object[]{list.get(0), list.get(1)}, null, 4) : c.a.l.b.i(resources, 2131892007, new Object[]{list.get(0)}, null, 4) : "";
+            return size != 0 ? size != 1 ? size != 2 ? size != 3 ? c.a.l.b.i(resources, R.string.several_users_typing, new Object[0], null, 4) : c.a.l.b.i(resources, R.string.three_users_typing, new Object[]{list.get(0), list.get(1), list.get(2)}, null, 4) : c.a.l.b.i(resources, R.string.two_users_typing, new Object[]{list.get(0), list.get(1)}, null, 4) : c.a.l.b.i(resources, R.string.one_user_typing, new Object[]{list.get(0)}, null, 4) : "";
         }
 
         public final void configureUI(ChatTypingModel chatTypingModel) {
@@ -226,7 +227,7 @@ public final class WidgetChatOverlay extends AppFragment {
     }
 
     public WidgetChatOverlay() {
-        super(2131558997);
+        super(R.layout.widget_chat_overlay);
     }
 
     public static final /* synthetic */ void access$configureStickerSuggestions(WidgetChatOverlay widgetChatOverlay, Pair pair) {
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java
index 38b6449712..b1d1ce58a0 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.pins;
 
 import android.content.Context;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
@@ -55,7 +56,7 @@ public final class WidgetChannelPinnedMessages$Model$Companion$get$1<T, R> imple
                 listOf = m.listOf(new LoadingEntry());
             } else if (list.isEmpty()) {
                 WidgetChannelPinnedMessages$Model$Companion$get$1 widgetChannelPinnedMessages$Model$Companion$get$1 = this.this$0;
-                String string = widgetChannelPinnedMessages$Model$Companion$get$1.$context.getString(AnimatableValueParser.t1(widgetChannelPinnedMessages$Model$Companion$get$1.$channel) ? 2131891747 : 2131891746);
+                String string = widgetChannelPinnedMessages$Model$Companion$get$1.$context.getString(AnimatableValueParser.t1(widgetChannelPinnedMessages$Model$Companion$get$1.$channel) ? R.string.no_pins_in_dm : R.string.no_pins_in_channel);
                 d0.z.d.m.checkNotNullExpressionValue(string, "context.getString(\n     …                        )");
                 listOf = m.listOf(new EmptyPinsEntry(string));
             } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java
index f6cb194e4c..e6b7568a66 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.pins;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelPinnedMessagesBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetChannelPinnedMessages$binding$2 extends
 
     public final WidgetChannelPinnedMessagesBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362358);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.channel_pinned_messages_recycler);
         if (recyclerView != null) {
             return new WidgetChannelPinnedMessagesBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362358)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.channel_pinned_messages_recycler)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
index 153e4eebe1..1a555a678f 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
@@ -5,12 +5,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.view.View;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
@@ -160,7 +163,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
 
         @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
         public boolean onQuickDownloadClicked(Uri uri, String str) {
-            m.checkNotNullParameter(uri, "uri");
+            m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             m.checkNotNullParameter(str, "fileName");
             return WidgetChatListAdapter.EventHandler.DefaultImpls.onQuickDownloadClicked(this, uri, str);
         }
@@ -212,7 +215,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
         @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
         public void onUserActivityAction(long j, long j2, long j3, MessageActivityType messageActivityType, Activity activity, Application application) {
             m.checkNotNullParameter(messageActivityType, "messageActivityType");
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(application, "application");
             WidgetChatListAdapter.EventHandler.DefaultImpls.onUserActivityAction(this, j, j2, j3, messageActivityType, activity, application);
         }
@@ -243,7 +246,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
         public final void show(Context context, long j) {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_EXTRA_CHANNEL_ID", j);
+            intent.putExtra(WidgetChannelPinnedMessages.INTENT_EXTRA_CHANNEL_ID, j);
             l.d(context, WidgetChannelPinnedMessages.class, intent);
         }
     }
@@ -487,7 +490,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
     }
 
     public WidgetChannelPinnedMessages() {
-        super(2131558900);
+        super(R.layout.widget_channel_pinned_messages);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelPinnedMessages widgetChannelPinnedMessages, Model model) {
@@ -537,7 +540,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131892236);
+        setActionBarTitle(R.string.pinned_messages);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.channelPinnedMessagesRecycler");
@@ -554,7 +557,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<Model> r = Model.Companion.get(requireContext(), getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", 0)).r();
+        Observable<Model> r = Model.Companion.get(requireContext(), getMostRecentIntent().getLongExtra(INTENT_EXTRA_CHANNEL_ID, 0)).r();
         m.checkNotNullExpressionValue(r, "Model\n        .get(requi…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetChannelPinnedMessages.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelPinnedMessages$onViewBoundOrOnResume$1(this), 62, (Object) null);
         WidgetChatListAdapter widgetChatListAdapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java
index f09e22145e..8a21fee202 100644
--- a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.client;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetClientOutdatedBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetClientOutdated$binding$2 extends k impl
 
     public final WidgetClientOutdatedBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362669;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362669);
+        int i = R.id.client_outdated_anchor_wrap;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.client_outdated_anchor_wrap);
         if (linearLayout != null) {
-            i = 2131362670;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362670);
+            i = R.id.client_outdated_update;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.client_outdated_update);
             if (materialButton != null) {
                 return new WidgetClientOutdatedBinding((RelativeLayout) view, linearLayout, materialButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java
index 6456e44232..ea5a3924dd 100644
--- a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java
+++ b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java
@@ -6,6 +6,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetClientOutdatedBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -35,7 +36,7 @@ public final class WidgetClientOutdated extends AppFragment {
     }
 
     public WidgetClientOutdated() {
-        super(2131559004);
+        super(R.layout.widget_client_outdated);
     }
 
     private final WidgetClientOutdatedBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java b/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java
index f47750d75e..a284d693fc 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.ViewDialogConfirmationBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -41,7 +42,7 @@ public final class AddFriendsFailed extends AppDialog {
     }
 
     public AddFriendsFailed() {
-        super(2131558757);
+        super(R.layout.view_dialog_confirmation);
     }
 
     private final ViewDialogConfirmationBinding getBinding() {
@@ -58,13 +59,13 @@ public final class AddFriendsFailed extends AppDialog {
         super.onViewBound(view);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader");
-        textView.setText(b.k(this, 2131888845, new Object[0], null, 4));
+        textView.setText(b.k(this, R.string.friend_request_failed_header, new Object[0], null, 4));
         TextView textView2 = getBinding().e;
         m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText");
-        textView2.setText(b.k(this, 2131888843, new Object[0], null, 4));
+        textView2.setText(b.k(this, R.string.friend_request_failed_body, new Object[0], null, 4));
         MaterialButton materialButton = getBinding().f1655c;
         m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm");
-        materialButton.setText(b.k(this, 2131892004, new Object[0], null, 4));
+        materialButton.setText(b.k(this, R.string.okay, new Object[0], null, 4));
         getBinding().f1655c.setOnClickListener(new AddFriendsFailed$onViewBound$1(this));
         MaterialButton materialButton2 = getBinding().b;
         m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationCancel");
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncAnalytics.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncAnalytics.java
index bf99255a13..7bf54e1155 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncAnalytics.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncAnalytics.java
@@ -42,9 +42,9 @@ public final class ContactSyncAnalytics {
             Map<String, ? extends Object> mutableMap = h0.toMutableMap(map != null ? map : h0.emptyMap());
             mutableMap.put("has_phone_number", Boolean.valueOf(StoreStream.Companion.getUsers().getMe().getPhoneNumber() != null));
             AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-            analyticsTracker.relationshipSyncFlow("Contact Sync", "Flow Initialized", "Landing", 0, false, false, mutableMap);
+            analyticsTracker.relationshipSyncFlow(ContactSyncAnalytics.CONTACT_SYNC_FLOW_KEY, "Flow Initialized", "Landing", 0, false, false, mutableMap);
             if (z2) {
-                AnalyticsTracker.newUserOnboarding$default(analyticsTracker, "Contact Sync", "Flow Initialized", "Landing", null, false, 24, null);
+                AnalyticsTracker.newUserOnboarding$default(analyticsTracker, ContactSyncAnalytics.CONTACT_SYNC_FLOW_KEY, "Flow Initialized", "Landing", null, false, 24, null);
             }
         }
     }
@@ -95,9 +95,9 @@ public final class ContactSyncAnalytics {
     public final void trackEnd(boolean z2, Map<String, ? extends Object> map) {
         long currentTimeMillis = this.clock.currentTimeMillis();
         AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-        analyticsTracker.relationshipSyncFlow("Contact Sync", this.lastStep, "Complete", (int) ((currentTimeMillis - this.lastStepTimestamp) / ((long) 1000)), z2, false, map);
+        analyticsTracker.relationshipSyncFlow(CONTACT_SYNC_FLOW_KEY, this.lastStep, "Complete", (int) ((currentTimeMillis - this.lastStepTimestamp) / ((long) 1000)), z2, false, map);
         if (this.isOnboarding) {
-            analyticsTracker.newUserOnboarding("Contact Sync", this.lastStep, "Complete", Long.valueOf(this.lastStepTimestamp), z2);
+            analyticsTracker.newUserOnboarding(CONTACT_SYNC_FLOW_KEY, this.lastStep, "Complete", Long.valueOf(this.lastStepTimestamp), z2);
         }
     }
 
@@ -105,9 +105,9 @@ public final class ContactSyncAnalytics {
         m.checkNotNullParameter(str, "toStep");
         long currentTimeMillis = this.clock.currentTimeMillis();
         AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-        analyticsTracker.relationshipSyncFlow("Contact Sync", this.lastStep, str, (int) ((currentTimeMillis - this.lastStepTimestamp) / ((long) 1000)), z2, z3, map);
+        analyticsTracker.relationshipSyncFlow(CONTACT_SYNC_FLOW_KEY, this.lastStep, str, (int) ((currentTimeMillis - this.lastStepTimestamp) / ((long) 1000)), z2, z3, map);
         if (this.isOnboarding) {
-            analyticsTracker.newUserOnboarding("Contact Sync", this.lastStep, str, Long.valueOf(this.lastStepTimestamp), z2);
+            analyticsTracker.newUserOnboarding(CONTACT_SYNC_FLOW_KEY, this.lastStep, str, Long.valueOf(this.lastStepTimestamp), z2);
         }
         this.lastStepTimestamp = currentTimeMillis;
         this.lastStep = str;
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java
index 9b50b50589..e924a757c5 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java
@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.api.friendsuggestions.FriendSuggestion;
 import com.discord.api.friendsuggestions.FriendSuggestionReason;
 import com.discord.api.user.User;
@@ -16,6 +17,7 @@ import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.contact_sync.WidgetContactSyncViewModel;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.checkbox.MaterialCheckBox;
@@ -37,24 +39,24 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemFriendSuggestion(ContactSyncFriendSuggestionListAdapter contactSyncFriendSuggestionListAdapter) {
-            super(2131558816, contactSyncFriendSuggestionListAdapter);
+            super((int) R.layout.view_selectable_friend_suggestion, contactSyncFriendSuggestionListAdapter);
             m.checkNotNullParameter(contactSyncFriendSuggestionListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363322;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363322);
+            int i = R.id.friend_suggestion_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.friend_suggestion_avatar);
             if (simpleDraweeView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131363324;
-                TextView textView = (TextView) view.findViewById(2131363324);
+                i = R.id.friend_suggestion_discriminator;
+                TextView textView = (TextView) view.findViewById(R.id.friend_suggestion_discriminator);
                 if (textView != null) {
-                    i = 2131363325;
-                    TextView textView2 = (TextView) view.findViewById(2131363325);
+                    i = R.id.friend_suggestion_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.friend_suggestion_name);
                     if (textView2 != null) {
-                        i = 2131363326;
-                        TextView textView3 = (TextView) view.findViewById(2131363326);
+                        i = R.id.friend_suggestion_nickname;
+                        TextView textView3 = (TextView) view.findViewById(R.id.friend_suggestion_nickname);
                         if (textView3 != null) {
-                            i = 2131363327;
-                            MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131363327);
+                            i = R.id.friend_suggestion_selected;
+                            MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(R.id.friend_suggestion_selected);
                             if (materialCheckBox != null) {
                                 ViewSelectableFriendSuggestionBinding viewSelectableFriendSuggestionBinding = new ViewSelectableFriendSuggestionBinding(constraintLayout, simpleDraweeView, constraintLayout, textView, textView2, textView3, materialCheckBox);
                                 m.checkNotNullExpressionValue(viewSelectableFriendSuggestionBinding, "ViewSelectableFriendSugg…ionBinding.bind(itemView)");
@@ -93,7 +95,7 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap
             textView.setText(b.r());
             TextView textView2 = this.binding.d;
             m.checkNotNullExpressionValue(textView2, "binding.friendSuggestionDiscriminator");
-            textView2.setText('#' + b.f());
+            textView2.setText(MentionUtilsKt.CHANNELS_CHAR + b.f());
             Iterator<T> it = suggestion.a().iterator();
             while (true) {
                 str = null;
@@ -133,7 +135,7 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap
             if (a2 != null) {
                 str = a2.a();
             }
-            IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(valueOf, str, s.toIntOrNull(b.f()), false, null, 16, null), 2131165297, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(valueOf, str, s.toIntOrNull(b.f()), false, null, 16, null), (int) R.dimen.avatar_size_standard, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
             this.binding.g.setOnCheckedChangeListener(new ContactSyncFriendSuggestionListAdapter$ItemFriendSuggestion$onConfigure$1(this, suggestion.b().i()));
         }
     }
@@ -144,7 +146,7 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap
         m.checkNotNullParameter(recyclerView, "recycler");
         Context context = recyclerView.getContext();
         m.checkNotNullExpressionValue(context, "recycler.context");
-        this.spacing = context.getResources().getDimensionPixelSize(2131165729);
+        this.spacing = context.getResources().getDimensionPixelSize(R.dimen.suggestion_spacing);
     }
 
     public static final /* synthetic */ int access$getSpacing$p(ContactSyncFriendSuggestionListAdapter contactSyncFriendSuggestionListAdapter) {
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java
index 5249e4f746..636b6b1412 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.contact_sync;
 import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.ContactSyncPermissionsSheetBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
@@ -19,26 +20,26 @@ public final /* synthetic */ class ContactSyncPermissionsSheet$binding$2 extends
 
     public final ContactSyncPermissionsSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362764;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362764);
+        int i = R.id.contact_sync_permissions_discoverable_toggle;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.contact_sync_permissions_discoverable_toggle);
         if (checkedSetting != null) {
-            i = 2131362765;
-            TextView textView = (TextView) view.findViewById(2131362765);
+            i = R.id.contact_sync_permissions_discovery_info_1;
+            TextView textView = (TextView) view.findViewById(R.id.contact_sync_permissions_discovery_info_1);
             if (textView != null) {
-                i = 2131362766;
-                TextView textView2 = (TextView) view.findViewById(2131362766);
+                i = R.id.contact_sync_permissions_discovery_info_2;
+                TextView textView2 = (TextView) view.findViewById(R.id.contact_sync_permissions_discovery_info_2);
                 if (textView2 != null) {
-                    i = 2131362767;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362767);
+                    i = R.id.contact_sync_permissions_email_toggle;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.contact_sync_permissions_email_toggle);
                     if (checkedSetting2 != null) {
-                        i = 2131362768;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362768);
+                        i = R.id.contact_sync_permissions_learn_more;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.contact_sync_permissions_learn_more);
                         if (linkifiedTextView != null) {
-                            i = 2131362769;
-                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362769);
+                            i = R.id.contact_sync_permissions_phone_toggle;
+                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.contact_sync_permissions_phone_toggle);
                             if (checkedSetting3 != null) {
-                                i = 2131362770;
-                                TextView textView3 = (TextView) view.findViewById(2131362770);
+                                i = R.id.contact_sync_permissions_subtitle;
+                                TextView textView3 = (TextView) view.findViewById(R.id.contact_sync_permissions_subtitle);
                                 if (textView3 != null) {
                                     return new ContactSyncPermissionsSheetBinding((ConstraintLayout) view, checkedSetting, textView, textView2, checkedSetting2, linkifiedTextView, checkedSetting3, textView3);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$configureUI$1.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$configureUI$1.java
index 83c9091096..4a72a434ca 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$configureUI$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.contact_sync;
 import android.content.Context;
 import android.view.View;
 import c.a.e.f;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
@@ -63,7 +64,7 @@ public final class ContactSyncPermissionsSheet$configureUI$1 extends o implement
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), 2131099928)), false, null, AnonymousClass1.INSTANCE, 4, null));
+            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), (int) R.color.link)), false, null, AnonymousClass1.INSTANCE, 4, null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java
index 3d24b8cd76..6dea721324 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.ContactSyncPermissionsSheetBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -71,7 +72,7 @@ public final class ContactSyncPermissionsSheet extends AppBottomSheet {
         checkedSetting3.setChecked(viewState.getAllowEmail());
         LinkifiedTextView linkifiedTextView = getBinding().d;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncPermissionsLearnMore");
-        b.m(linkifiedTextView, 2131887600, new Object[0], new ContactSyncPermissionsSheet$configureUI$1(this));
+        b.m(linkifiedTextView, R.string.contact_sync_learn_more, new Object[0], new ContactSyncPermissionsSheet$configureUI$1(this));
         getBinding().b.e(new ContactSyncPermissionsSheet$configureUI$2(this, z2));
         getBinding().e.e(new ContactSyncPermissionsSheet$configureUI$3(this, viewState));
         getBinding().f1600c.e(new ContactSyncPermissionsSheet$configureUI$4(this, viewState));
@@ -87,7 +88,7 @@ public final class ContactSyncPermissionsSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558448;
+        return R.layout.contact_sync_permissions_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java
index 052257833b..c93d90d186 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.j.g0;
+import com.discord.R;
 import com.discord.databinding.ContactSyncUpsellSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -20,23 +21,23 @@ public final /* synthetic */ class ContactSyncUpsellSheet$binding$2 extends k im
 
     public final ContactSyncUpsellSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362784;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362784);
+        int i = R.id.contact_sync_upsell_cta;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.contact_sync_upsell_cta);
         if (linearLayout != null) {
-            i = 2131362785;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362785);
+            i = R.id.contact_sync_upsell_next_button;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.contact_sync_upsell_next_button);
             if (materialButton != null) {
-                i = 2131362786;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362786);
+                i = R.id.contact_sync_upsell_skip_button;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.contact_sync_upsell_skip_button);
                 if (materialButton2 != null) {
-                    i = 2131362787;
-                    TextView textView = (TextView) view.findViewById(2131362787);
+                    i = R.id.contact_sync_upsell_subtitle;
+                    TextView textView = (TextView) view.findViewById(R.id.contact_sync_upsell_subtitle);
                     if (textView != null) {
-                        i = 2131362788;
-                        TextView textView2 = (TextView) view.findViewById(2131362788);
+                        i = R.id.contact_sync_upsell_title;
+                        TextView textView2 = (TextView) view.findViewById(R.id.contact_sync_upsell_title);
                         if (textView2 != null) {
-                            i = 2131362789;
-                            View findViewById = view.findViewById(2131362789);
+                            i = R.id.contact_sync_upsell_toggle_info;
+                            View findViewById = view.findViewById(R.id.contact_sync_upsell_toggle_info);
                             if (findViewById != null) {
                                 return new ContactSyncUpsellSheetBinding((ConstraintLayout) view, linearLayout, materialButton, materialButton2, textView, textView2, g0.a(findViewById));
                             }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$configureUI$2.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$configureUI$2.java
index 8ddc77450e..03759b0104 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$configureUI$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.contact_sync;
 
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -67,7 +68,7 @@ public final class ContactSyncUpsellSheet$configureUI$2 extends o implements Fun
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), 2131099928)), false, null, new AnonymousClass1(this), 4, null));
+            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), (int) R.color.link)), false, null, new AnonymousClass1(this), 4, null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java
index a0bcda62d0..e0a72f4b96 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.ContactSyncUpsellSheetBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -69,7 +70,7 @@ public final class ContactSyncUpsellSheet extends AppBottomSheet {
         getBinding().d.f99c.e(new ContactSyncUpsellSheet$configureUI$1(this, z2));
         LinkifiedTextView linkifiedTextView = getBinding().d.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncUpsel…contactSyncDiscoveryInfo2");
-        b.m(linkifiedTextView, 2131887600, new Object[0], new ContactSyncUpsellSheet$configureUI$2(this));
+        b.m(linkifiedTextView, R.string.contact_sync_learn_more, new Object[0], new ContactSyncUpsellSheet$configureUI$2(this));
         getBinding().f1601c.setOnClickListener(new ContactSyncUpsellSheet$configureUI$3(this));
         getBinding().b.setOnClickListener(new ContactSyncUpsellSheet$configureUI$4(this, viewState));
     }
@@ -84,7 +85,7 @@ public final class ContactSyncUpsellSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558449;
+        return R.layout.contact_sync_upsell_sheet;
     }
 
     @Override // androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnDismissListener
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java
index ba8b0ca74e..222eb4c0a9 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java
@@ -13,6 +13,7 @@ import c.a.j.e0;
 import c.a.j.f0;
 import c.a.j.g0;
 import c.a.j.h0;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetContactSyncBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -35,123 +36,123 @@ public final /* synthetic */ class WidgetContactSync$binding$2 extends k impleme
 
     public final WidgetContactSyncBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362739;
-        View findViewById = view.findViewById(2131362739);
+        int i = R.id.contact_sync_add_phone;
+        View findViewById = view.findViewById(R.id.contact_sync_add_phone);
         if (findViewById != null) {
-            int i2 = 2131362740;
-            PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) findViewById.findViewById(2131362740);
+            int i2 = R.id.contact_sync_add_phone_input;
+            PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) findViewById.findViewById(R.id.contact_sync_add_phone_input);
             if (phoneOrEmailInputView != null) {
-                i2 = 2131362741;
-                MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131362741);
+                i2 = R.id.contact_sync_add_phone_next;
+                MaterialButton materialButton = (MaterialButton) findViewById.findViewById(R.id.contact_sync_add_phone_next);
                 if (materialButton != null) {
-                    i2 = 2131362742;
-                    TextView textView = (TextView) findViewById.findViewById(2131362742);
+                    i2 = R.id.contact_sync_add_phone_subtitle;
+                    TextView textView = (TextView) findViewById.findViewById(R.id.contact_sync_add_phone_subtitle);
                     if (textView != null) {
-                        i2 = 2131362743;
-                        TextView textView2 = (TextView) findViewById.findViewById(2131362743);
+                        i2 = R.id.contact_sync_add_phone_title;
+                        TextView textView2 = (TextView) findViewById.findViewById(R.id.contact_sync_add_phone_title);
                         if (textView2 != null) {
                             b0 b0Var = new b0((ConstraintLayout) findViewById, phoneOrEmailInputView, materialButton, textView, textView2);
-                            i = 2131362747;
-                            View findViewById2 = view.findViewById(2131362747);
+                            i = R.id.contact_sync_friend_suggestions;
+                            View findViewById2 = view.findViewById(R.id.contact_sync_friend_suggestions);
                             if (findViewById2 != null) {
-                                int i3 = 2131362779;
-                                RecyclerView recyclerView = (RecyclerView) findViewById2.findViewById(2131362779);
+                                int i3 = R.id.contact_sync_suggestions_list_recycler;
+                                RecyclerView recyclerView = (RecyclerView) findViewById2.findViewById(R.id.contact_sync_suggestions_list_recycler);
                                 if (recyclerView != null) {
-                                    i3 = 2131362781;
-                                    LoadingButton loadingButton = (LoadingButton) findViewById2.findViewById(2131362781);
+                                    i3 = R.id.contact_sync_suggestions_submit_button;
+                                    LoadingButton loadingButton = (LoadingButton) findViewById2.findViewById(R.id.contact_sync_suggestions_submit_button);
                                     if (loadingButton != null) {
-                                        i3 = 2131362782;
-                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById2.findViewById(2131362782);
+                                        i3 = R.id.contact_sync_suggestions_subtitle;
+                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById2.findViewById(R.id.contact_sync_suggestions_subtitle);
                                         if (linkifiedTextView != null) {
-                                            i3 = 2131362783;
-                                            TextView textView3 = (TextView) findViewById2.findViewById(2131362783);
+                                            i3 = R.id.contact_sync_suggestions_title;
+                                            TextView textView3 = (TextView) findViewById2.findViewById(R.id.contact_sync_suggestions_title);
                                             if (textView3 != null) {
                                                 e0 e0Var = new e0((ConstraintLayout) findViewById2, recyclerView, loadingButton, linkifiedTextView, textView3);
-                                                i = 2131362748;
-                                                View findViewById3 = view.findViewById(2131362748);
+                                                i = R.id.contact_sync_friend_suggestions_empty;
+                                                View findViewById3 = view.findViewById(R.id.contact_sync_friend_suggestions_empty);
                                                 if (findViewById3 != null) {
-                                                    int i4 = 2131362776;
-                                                    TextView textView4 = (TextView) findViewById3.findViewById(2131362776);
+                                                    int i4 = R.id.contact_sync_suggestions_empty_subtitle;
+                                                    TextView textView4 = (TextView) findViewById3.findViewById(R.id.contact_sync_suggestions_empty_subtitle);
                                                     if (textView4 != null) {
-                                                        i4 = 2131362777;
-                                                        TextView textView5 = (TextView) findViewById3.findViewById(2131362777);
+                                                        i4 = R.id.contact_sync_suggestions_empty_title;
+                                                        TextView textView5 = (TextView) findViewById3.findViewById(R.id.contact_sync_suggestions_empty_title);
                                                         if (textView5 != null) {
-                                                            i4 = 2131362778;
-                                                            MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(2131362778);
+                                                            i4 = R.id.contact_sync_suggestions_invite_button;
+                                                            MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(R.id.contact_sync_suggestions_invite_button);
                                                             if (materialButton2 != null) {
-                                                                i4 = 2131362780;
-                                                                MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131362780);
+                                                                i4 = R.id.contact_sync_suggestions_skip_button;
+                                                                MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(R.id.contact_sync_suggestions_skip_button);
                                                                 if (materialButton3 != null) {
                                                                     f0 f0Var = new f0((ConstraintLayout) findViewById3, textView4, textView5, materialButton2, materialButton3);
-                                                                    i = 2131362749;
-                                                                    View findViewById4 = view.findViewById(2131362749);
+                                                                    i = R.id.contact_sync_landing;
+                                                                    View findViewById4 = view.findViewById(R.id.contact_sync_landing);
                                                                     if (findViewById4 != null) {
-                                                                        int i5 = 2131362750;
-                                                                        LinearLayout linearLayout = (LinearLayout) findViewById4.findViewById(2131362750);
+                                                                        int i5 = R.id.contact_sync_landing_cta;
+                                                                        LinearLayout linearLayout = (LinearLayout) findViewById4.findViewById(R.id.contact_sync_landing_cta);
                                                                         if (linearLayout != null) {
-                                                                            i5 = 2131362751;
-                                                                            TextView textView6 = (TextView) findViewById4.findViewById(2131362751);
+                                                                            i5 = R.id.contact_sync_landing_needs_permissions;
+                                                                            TextView textView6 = (TextView) findViewById4.findViewById(R.id.contact_sync_landing_needs_permissions);
                                                                             if (textView6 != null) {
-                                                                                i5 = 2131362752;
-                                                                                LoadingButton loadingButton2 = (LoadingButton) findViewById4.findViewById(2131362752);
+                                                                                i5 = R.id.contact_sync_landing_next_button;
+                                                                                LoadingButton loadingButton2 = (LoadingButton) findViewById4.findViewById(R.id.contact_sync_landing_next_button);
                                                                                 if (loadingButton2 != null) {
-                                                                                    i5 = 2131362753;
-                                                                                    View findViewById5 = findViewById4.findViewById(2131362753);
+                                                                                    i5 = R.id.contact_sync_landing_permissions_divider;
+                                                                                    View findViewById5 = findViewById4.findViewById(R.id.contact_sync_landing_permissions_divider);
                                                                                     if (findViewById5 != null) {
-                                                                                        i5 = 2131362754;
-                                                                                        TextView textView7 = (TextView) findViewById4.findViewById(2131362754);
+                                                                                        i5 = R.id.contact_sync_landing_subtitle;
+                                                                                        TextView textView7 = (TextView) findViewById4.findViewById(R.id.contact_sync_landing_subtitle);
                                                                                         if (textView7 != null) {
-                                                                                            i5 = 2131362755;
-                                                                                            TextView textView8 = (TextView) findViewById4.findViewById(2131362755);
+                                                                                            i5 = R.id.contact_sync_landing_title;
+                                                                                            TextView textView8 = (TextView) findViewById4.findViewById(R.id.contact_sync_landing_title);
                                                                                             if (textView8 != null) {
-                                                                                                i5 = 2131362756;
-                                                                                                View findViewById6 = findViewById4.findViewById(2131362756);
+                                                                                                i5 = R.id.contact_sync_landing_toggle_info;
+                                                                                                View findViewById6 = findViewById4.findViewById(R.id.contact_sync_landing_toggle_info);
                                                                                                 if (findViewById6 != null) {
                                                                                                     c0 c0Var = new c0((ConstraintLayout) findViewById4, linearLayout, textView6, loadingButton2, findViewById5, textView7, textView8, g0.a(findViewById6));
-                                                                                                    View findViewById7 = view.findViewById(2131362757);
+                                                                                                    View findViewById7 = view.findViewById(R.id.contact_sync_name);
                                                                                                     if (findViewById7 != null) {
-                                                                                                        int i6 = 2131362758;
-                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) findViewById7.findViewById(2131362758);
+                                                                                                        int i6 = R.id.contact_sync_name_input;
+                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) findViewById7.findViewById(R.id.contact_sync_name_input);
                                                                                                         if (textInputEditText != null) {
-                                                                                                            i6 = 2131362759;
-                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) findViewById7.findViewById(2131362759);
+                                                                                                            i6 = R.id.contact_sync_name_input_wrap;
+                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) findViewById7.findViewById(R.id.contact_sync_name_input_wrap);
                                                                                                             if (textInputLayout != null) {
-                                                                                                                i6 = 2131362760;
-                                                                                                                LoadingButton loadingButton3 = (LoadingButton) findViewById7.findViewById(2131362760);
+                                                                                                                i6 = R.id.contact_sync_name_next_button;
+                                                                                                                LoadingButton loadingButton3 = (LoadingButton) findViewById7.findViewById(R.id.contact_sync_name_next_button);
                                                                                                                 if (loadingButton3 != null) {
-                                                                                                                    i6 = 2131362761;
-                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(2131362761);
+                                                                                                                    i6 = R.id.contact_sync_name_prefill_hint;
+                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(R.id.contact_sync_name_prefill_hint);
                                                                                                                     if (textView9 != null) {
-                                                                                                                        i6 = 2131362762;
-                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(2131362762);
+                                                                                                                        i6 = R.id.contact_sync_name_subtitle;
+                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(R.id.contact_sync_name_subtitle);
                                                                                                                         if (textView10 != null) {
-                                                                                                                            i6 = 2131362763;
-                                                                                                                            TextView textView11 = (TextView) findViewById7.findViewById(2131362763);
+                                                                                                                            i6 = R.id.contact_sync_name_title;
+                                                                                                                            TextView textView11 = (TextView) findViewById7.findViewById(R.id.contact_sync_name_title);
                                                                                                                             if (textView11 != null) {
                                                                                                                                 d0 d0Var = new d0((ConstraintLayout) findViewById7, textInputEditText, textInputLayout, loadingButton3, textView9, textView10, textView11);
-                                                                                                                                View findViewById8 = view.findViewById(2131362790);
+                                                                                                                                View findViewById8 = view.findViewById(R.id.contact_sync_verify_phone);
                                                                                                                                 if (findViewById8 != null) {
-                                                                                                                                    int i7 = 2131362791;
-                                                                                                                                    CodeVerificationView codeVerificationView = (CodeVerificationView) findViewById8.findViewById(2131362791);
+                                                                                                                                    int i7 = R.id.contact_sync_verify_phone_code;
+                                                                                                                                    CodeVerificationView codeVerificationView = (CodeVerificationView) findViewById8.findViewById(R.id.contact_sync_verify_phone_code);
                                                                                                                                     if (codeVerificationView != null) {
-                                                                                                                                        i7 = 2131362792;
-                                                                                                                                        TextView textView12 = (TextView) findViewById8.findViewById(2131362792);
+                                                                                                                                        i7 = R.id.contact_sync_verify_phone_subtitle;
+                                                                                                                                        TextView textView12 = (TextView) findViewById8.findViewById(R.id.contact_sync_verify_phone_subtitle);
                                                                                                                                         if (textView12 != null) {
-                                                                                                                                            i7 = 2131362793;
-                                                                                                                                            TextView textView13 = (TextView) findViewById8.findViewById(2131362793);
+                                                                                                                                            i7 = R.id.contact_sync_verify_phone_title;
+                                                                                                                                            TextView textView13 = (TextView) findViewById8.findViewById(R.id.contact_sync_verify_phone_title);
                                                                                                                                             if (textView13 != null) {
                                                                                                                                                 h0 h0Var = new h0((ConstraintLayout) findViewById8, codeVerificationView, textView12, textView13);
-                                                                                                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362794);
+                                                                                                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.contact_sync_view_flipper);
                                                                                                                                                 if (appViewFlipper != null) {
                                                                                                                                                     return new WidgetContactSyncBinding((CoordinatorLayout) view, b0Var, e0Var, f0Var, c0Var, d0Var, h0Var, appViewFlipper);
                                                                                                                                                 }
-                                                                                                                                                i = 2131362794;
+                                                                                                                                                i = R.id.contact_sync_view_flipper;
                                                                                                                                             }
                                                                                                                                         }
                                                                                                                                     }
                                                                                                                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById8.getResources().getResourceName(i7)));
                                                                                                                                 }
-                                                                                                                                i = 2131362790;
+                                                                                                                                i = R.id.contact_sync_verify_phone;
                                                                                                                             }
                                                                                                                         }
                                                                                                                     }
@@ -160,7 +161,7 @@ public final /* synthetic */ class WidgetContactSync$binding$2 extends k impleme
                                                                                                         }
                                                                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i6)));
                                                                                                     }
-                                                                                                    i = 2131362757;
+                                                                                                    i = R.id.contact_sync_name;
                                                                                                 }
                                                                                             }
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java
index 22a192a77b..bdc9259a74 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.contact_sync;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action2;
 /* compiled from: WidgetContactSync.kt */
@@ -14,7 +15,7 @@ public final class WidgetContactSync$configureToolbar$1<T1, T2> implements Actio
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364090) {
+        if (menuItem.getItemId() == R.id.menu_contact_sync_skip) {
             WidgetContactSync.access$getViewModel$p(this.this$0).skip();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java
index 5cdf6059dd..28853bf8bf 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.contact_sync;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.contact_sync.WidgetContactSyncViewModel;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -14,7 +15,7 @@ public final class WidgetContactSync$configureToolbar$2<T> implements Action1<Me
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364090);
+        MenuItem findItem = menu.findItem(R.id.menu_contact_sync_skip);
         m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_contact_sync_skip)");
         findItem.setVisible(this.$toolbarConfig.getShowSkip());
     }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java
index c28671ff80..5a5ae58a91 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java
@@ -3,6 +3,8 @@ package com.discord.widgets.contact_sync;
 import android.content.Context;
 import android.view.View;
 import c.a.l.b;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.intent.IntentUtils;
 import com.discord.widgets.contact_sync.WidgetContactSyncViewModel;
@@ -23,6 +25,6 @@ public final class WidgetContactSync$configureUI$10 implements View.OnClickListe
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        IntentUtils.performChooserSendIntent(context, b.k(this.this$0, 2131888895, new Object[]{"https://discord.com", this.$viewState.getUsername()}, null, 4).toString(), b.k(this.this$0, 2131894343, new Object[0], null, 4));
+        IntentUtils.performChooserSendIntent(context, b.k(this.this$0, R.string.friends_share_tabbar_title, new Object[]{BuildConfig.HOST, this.$viewState.getUsername()}, null, 4).toString(), b.k(this.this$0, R.string.tip_instant_invite_title3, new Object[0], null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$4.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$4.java
index fed9284f05..0a1712262d 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$4.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$4.java
@@ -2,6 +2,7 @@ package com.discord.widgets.contact_sync;
 
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -67,7 +68,7 @@ public final class WidgetContactSync$configureUI$4 extends o implements Function
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), 2131099928)), false, null, new AnonymousClass1(this), 4, null));
+            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), (int) R.color.link)), false, null, new AnonymousClass1(this), 4, null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$9.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$9.java
index ea55579e33..f3734e11fb 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$9.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$9.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.contact_sync;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -23,7 +24,7 @@ public final class WidgetContactSync$configureUI$9 extends o implements Function
     }
 
     public final void invoke(String str) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         WidgetContactSync.access$getViewModel$p(this.this$0).onVerifyPhone(str);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
index a64699ac86..49bd0f54f9 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
@@ -14,6 +14,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -30,6 +31,7 @@ import com.discord.views.CheckedSetting;
 import com.discord.views.LoadingButton;
 import com.discord.widgets.contact_sync.AddFriendsFailed;
 import com.discord.widgets.contact_sync.WidgetContactSyncViewModel;
+import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.button.MaterialButton;
 import d0.g0.t;
 import d0.z.d.a0;
@@ -74,29 +76,29 @@ public final class WidgetContactSync extends AppFragment {
 
         public final ContactSyncMode getContactSyncModeFromIntent(AppActivity appActivity) {
             m.checkNotNullParameter(appActivity, "appActivity");
-            Serializable serializableExtra = appActivity.c().getSerializableExtra("INTENT_EXTRA_CONTACT_SYNC_MODE");
+            Serializable serializableExtra = appActivity.c().getSerializableExtra(WidgetContactSync.INTENT_EXTRA_CONTACT_SYNC_MODE);
             Objects.requireNonNull(serializableExtra, "null cannot be cast to non-null type com.discord.widgets.contact_sync.ContactSyncMode");
             return (ContactSyncMode) serializableExtra;
         }
 
         public final boolean getEmailDiscoverableFromIntent(AppActivity appActivity) {
             m.checkNotNullParameter(appActivity, "appActivity");
-            return appActivity.c().getBooleanExtra("INTENT_EXTRA_CONTACT_SYNC_ALLOW_EMAIL", true);
+            return appActivity.c().getBooleanExtra(WidgetContactSync.INTENT_EXTRA_CONTACT_SYNC_ALLOW_EMAIL, true);
         }
 
         public final boolean getPhoneDiscoverableFromIntent(AppActivity appActivity) {
             m.checkNotNullParameter(appActivity, "appActivity");
-            return appActivity.c().getBooleanExtra("INTENT_EXTRA_CONTACT_SYNC_ALLOW_PHONE", true);
+            return appActivity.c().getBooleanExtra(WidgetContactSync.INTENT_EXTRA_CONTACT_SYNC_ALLOW_PHONE, true);
         }
 
         public final void launch(Context context, ContactSyncMode contactSyncMode, boolean z2, boolean z3, boolean z4) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(contactSyncMode, "mode");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_EXTRA_CONTACT_SYNC_MODE", contactSyncMode);
-            intent.putExtra("INTENT_EXTRA_CONTACT_SYNC_IMMEDIATELY_PROCEED", z2);
-            intent.putExtra("INTENT_EXTRA_CONTACT_SYNC_ALLOW_PHONE", z3);
-            intent.putExtra("INTENT_EXTRA_CONTACT_SYNC_ALLOW_EMAIL", z4);
+            intent.putExtra(WidgetContactSync.INTENT_EXTRA_CONTACT_SYNC_MODE, contactSyncMode);
+            intent.putExtra(WidgetContactSync.INTENT_EXTRA_CONTACT_SYNC_IMMEDIATELY_PROCEED, z2);
+            intent.putExtra(WidgetContactSync.INTENT_EXTRA_CONTACT_SYNC_ALLOW_PHONE, z3);
+            intent.putExtra(WidgetContactSync.INTENT_EXTRA_CONTACT_SYNC_ALLOW_EMAIL, z4);
             l.d(context, WidgetContactSync.class, intent);
         }
     }
@@ -118,7 +120,7 @@ public final class WidgetContactSync extends AppFragment {
     }
 
     public WidgetContactSync() {
-        super(2131559008);
+        super(R.layout.widget_contact_sync);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetContactSync widgetContactSync, WidgetContactSyncViewModel.ViewState viewState) {
@@ -151,7 +153,7 @@ public final class WidgetContactSync extends AppFragment {
 
     private final void configureToolbar(WidgetContactSyncViewModel.ToolbarConfig toolbarConfig) {
         setActionBarDisplayHomeAsUpEnabled(toolbarConfig.getShowBackButton());
-        setActionBarOptionsMenu(2131623946, new WidgetContactSync$configureToolbar$1(this), new WidgetContactSync$configureToolbar$2(toolbarConfig));
+        setActionBarOptionsMenu(R.menu.menu_contact_sync, new WidgetContactSync$configureToolbar$1(this), new WidgetContactSync$configureToolbar$2(toolbarConfig));
         AppFragment.setOnBackPressed$default(this, new WidgetContactSync$configureToolbar$3(this, toolbarConfig), 0, 2, null);
     }
 
@@ -172,7 +174,7 @@ public final class WidgetContactSync extends AppFragment {
             View view = getBinding().e.d;
             m.checkNotNullExpressionValue(view, "binding.contactSyncLandi…LandingPermissionsDivider");
             view.setVisibility(0);
-            getBinding().e.f76c.setText(b.k(this, 2131892116, new Object[0], null, 4));
+            getBinding().e.f76c.setText(b.k(this, R.string.password_manager_open_settings, new Object[0], null, 4));
             getBinding().e.f76c.setOnClickListener(WidgetContactSync$configureUI$1.INSTANCE);
         } else {
             TextView textView2 = getBinding().e.b;
@@ -181,7 +183,7 @@ public final class WidgetContactSync extends AppFragment {
             View view2 = getBinding().e.d;
             m.checkNotNullExpressionValue(view2, "binding.contactSyncLandi…LandingPermissionsDivider");
             view2.setVisibility(8);
-            getBinding().e.f76c.setText(b.k(this, 2131889012, new Object[0], null, 4));
+            getBinding().e.f76c.setText(b.k(this, R.string.get_started, new Object[0], null, 4));
             getBinding().e.f76c.setOnClickListener(new WidgetContactSync$configureUI$2(this));
         }
         CheckedSetting checkedSetting = getBinding().e.e.f99c;
@@ -190,13 +192,13 @@ public final class WidgetContactSync extends AppFragment {
         getBinding().e.e.f99c.e(new WidgetContactSync$configureUI$3(this));
         LinkifiedTextView linkifiedTextView = getBinding().e.e.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncLandi…contactSyncDiscoveryInfo2");
-        b.m(linkifiedTextView, 2131887614, new Object[0], new WidgetContactSync$configureUI$4(this));
+        b.m(linkifiedTextView, R.string.contact_sync_permissions_description_android, new Object[0], new WidgetContactSync$configureUI$4(this));
         getBinding().f.d.setOnClickListener(new WidgetContactSync$configureUI$5(this));
         ContactSyncFriendSuggestionListAdapter contactSyncFriendSuggestionListAdapter = this.friendSuggestionsAdapter;
         if (contactSyncFriendSuggestionListAdapter != null) {
             contactSyncFriendSuggestionListAdapter.setData(viewState.getFriendSuggestions());
         }
-        getBinding().f1776c.f88c.setText(b.k(this, 2131891686, new Object[0], null, 4));
+        getBinding().f1776c.f88c.setText(b.k(this, R.string.next, new Object[0], null, 4));
         getBinding().f1776c.f88c.setOnClickListener(new WidgetContactSync$configureUI$6(this));
         getBinding().b.b.b(this);
         getBinding().b.b.setCountryCode(viewState.getCountryCode());
@@ -234,26 +236,26 @@ public final class WidgetContactSync extends AppFragment {
         if (AccessibilityUtils.INSTANCE.isReducedMotionEnabled()) {
             AppViewFlipper appViewFlipper = getBinding().h;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.contactSyncViewFlipper");
-            appViewFlipper.setInAnimation(AnimationUtils.loadAnimation(getContext(), 2130772016));
+            appViewFlipper.setInAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.anim_fade_in_fast));
             AppViewFlipper appViewFlipper2 = getBinding().h;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.contactSyncViewFlipper");
-            appViewFlipper2.setOutAnimation(AnimationUtils.loadAnimation(getContext(), 2130772018));
+            appViewFlipper2.setOutAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.anim_fade_out_fast));
         } else {
             int i3 = this.displayedChildIndex;
             if (i2 > i3 || z2) {
                 AppViewFlipper appViewFlipper3 = getBinding().h;
                 m.checkNotNullExpressionValue(appViewFlipper3, "binding.contactSyncViewFlipper");
-                appViewFlipper3.setInAnimation(AnimationUtils.loadAnimation(getContext(), 2130771990));
+                appViewFlipper3.setInAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_open_in));
                 AppViewFlipper appViewFlipper4 = getBinding().h;
                 m.checkNotNullExpressionValue(appViewFlipper4, "binding.contactSyncViewFlipper");
-                appViewFlipper4.setOutAnimation(AnimationUtils.loadAnimation(getContext(), 2130771991));
+                appViewFlipper4.setOutAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_open_out));
             } else if (i2 < i3) {
                 AppViewFlipper appViewFlipper5 = getBinding().h;
                 m.checkNotNullExpressionValue(appViewFlipper5, "binding.contactSyncViewFlipper");
-                appViewFlipper5.setInAnimation(AnimationUtils.loadAnimation(getContext(), 2130771988));
+                appViewFlipper5.setInAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_close_in));
                 AppViewFlipper appViewFlipper6 = getBinding().h;
                 m.checkNotNullExpressionValue(appViewFlipper6, "binding.contactSyncViewFlipper");
-                appViewFlipper6.setOutAnimation(AnimationUtils.loadAnimation(getContext(), 2130771989));
+                appViewFlipper6.setOutAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.activity_slide_horizontal_close_out));
             }
         }
         AppViewFlipper appViewFlipper7 = getBinding().h;
@@ -272,7 +274,7 @@ public final class WidgetContactSync extends AppFragment {
 
     private final void handleEvent(WidgetContactSyncViewModel.Event event) {
         if (m.areEqual(event, WidgetContactSyncViewModel.Event.MaybeProceedFromLanding.INSTANCE)) {
-            if (getMostRecentIntent().getBooleanExtra("INTENT_EXTRA_CONTACT_SYNC_IMMEDIATELY_PROCEED", false)) {
+            if (getMostRecentIntent().getBooleanExtra(INTENT_EXTRA_CONTACT_SYNC_IMMEDIATELY_PROCEED, false)) {
                 getViewModel().onLandingNext();
             }
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.PermissionsNeeded.INSTANCE)) {
@@ -280,11 +282,11 @@ public final class WidgetContactSync extends AppFragment {
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.ContactsEnabled.INSTANCE)) {
             getViewModel().onContactsFetched(ContactsProviderUtils.INSTANCE.getAllContactPhoneNumbers(requireContext()));
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.RateLimited.INSTANCE)) {
-            o.f(this, b.k(this, 2131887580, new Object[0], null, 4), 1);
+            o.f(this, b.k(this, R.string.contact_sync_failed_alert_title, new Object[0], null, 4), 1);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.UploadFailed.INSTANCE)) {
-            o.f(this, b.k(this, 2131887579, new Object[0], null, 4), 1);
+            o.f(this, b.k(this, R.string.contact_sync_failed_alert_message, new Object[0], null, 4), 1);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.ContactsEnableFailed.INSTANCE)) {
-            o.f(this, b.k(this, 2131887580, new Object[0], null, 4), 1);
+            o.f(this, b.k(this, R.string.contact_sync_failed_alert_title, new Object[0], null, 4), 1);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.AddFriendsFailed.INSTANCE)) {
             AddFriendsFailed.Companion companion = AddFriendsFailed.Companion;
             FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -296,11 +298,11 @@ public final class WidgetContactSync extends AppFragment {
             m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
             companion2.show(parentFragmentManager2).setOnClose(new WidgetContactSync$handleEvent$$inlined$apply$lambda$2(this));
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.PhoneInvalid.INSTANCE)) {
-            o.j(this, b.k(this, 2131892212, new Object[0], null, 4), 0, 4);
+            o.j(this, b.k(this, R.string.phone_invalid, new Object[0], null, 4), 0, 4);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.VerificationCodeInvalid.INSTANCE)) {
-            o.j(this, b.k(this, 2131886408, new Object[0], null, 4), 0, 4);
+            o.j(this, b.k(this, R.string.application_entitlement_code_redemption_invalid, new Object[0], null, 4), 0, 4);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.VerificationFailed.INSTANCE)) {
-            o.j(this, b.k(this, 2131892211, new Object[0], null, 4), 0, 4);
+            o.j(this, b.k(this, R.string.phone_failed_to_add, new Object[0], null, 4), 0, 4);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.Completed.INSTANCE)) {
             requireAppActivity().finish();
         }
@@ -311,7 +313,7 @@ public final class WidgetContactSync extends AppFragment {
         MaterialButton materialButton = getBinding().b.f69c;
         m.checkNotNullExpressionValue(materialButton, "binding.contactSyncAddPh…e.contactSyncAddPhoneNext");
         boolean z2 = true;
-        if (!(textOrEmpty.length() > 0) || !t.startsWith$default(textOrEmpty, "+", false, 2, null)) {
+        if (!(textOrEmpty.length() > 0) || !t.startsWith$default(textOrEmpty, BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX, false, 2, null)) {
             z2 = false;
         }
         materialButton.setEnabled(z2);
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
index 125d8bd9e6..3dbc4627fd 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
@@ -9,6 +9,7 @@ import com.discord.api.friendsuggestions.BulkFriendSuggestions;
 import com.discord.api.friendsuggestions.FriendSuggestion;
 import com.discord.api.friendsuggestions.FriendSuggestionReason;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelConnectedAccount;
 import com.discord.models.phone.PhoneCountryCode;
 import com.discord.restapi.RestAPIParams;
@@ -1262,7 +1263,7 @@ public final class WidgetContactSyncViewModel extends AppViewModel<ViewState> {
     @MainThread
     public final void onNameSubmitted(String str) {
         MGRecyclerAdapterSimple mGRecyclerAdapterSimple;
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         AnalyticsTracker.INSTANCE.nameSubmitted(w.split$default((CharSequence) str, new String[]{" "}, false, 0, 6, (Object) null).size(), str.length());
         String obj = t.isBlank(str) ? null : w.trim(str).toString();
         ViewState viewState = getViewState();
@@ -1346,7 +1347,7 @@ public final class WidgetContactSyncViewModel extends AppViewModel<ViewState> {
 
     @MainThread
     public final void onVerifyPhone(String str) {
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.userAddPhoneNoPassword(new RestAPIParams.VerificationCodeOnly(str)), false, 1, null), this, null, 2, null), WidgetContactSyncViewModel.class, (Context) null, (Function1) null, new WidgetContactSyncViewModel$onVerifyPhone$2(this), (Function0) null, (Function0) null, new WidgetContactSyncViewModel$onVerifyPhone$1(this), 54, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java
index a10cb6c4a1..0ec1cb2cdf 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.debugging;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetDebuggingBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetDebugging$binding$2 extends k implement
 
     public final WidgetDebuggingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362893);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.debugging_logs);
         if (recyclerView != null) {
             return new WidgetDebuggingBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362893)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.debugging_logs)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java
index 43ebafdb7e..78cad0f8c2 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.debugging;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action2;
 /* compiled from: WidgetDebugging.kt */
@@ -14,7 +15,7 @@ public final class WidgetDebugging$configureUI$1<T1, T2> implements Action2<Menu
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364095) {
+        if (menuItem.getItemId() == R.id.menu_debugging_filter) {
             boolean z2 = !menuItem.isChecked();
             menuItem.setChecked(z2);
             WidgetDebugging.access$getFilterSubject$p(this.this$0).onNext(Boolean.valueOf(z2));
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java
index d4e0a98204..dde13188cb 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.debugging;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.debugging.WidgetDebugging;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -14,7 +15,7 @@ public final class WidgetDebugging$configureUI$2<T> implements Action1<Menu> {
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364095);
+        MenuItem findItem = menu.findItem(R.id.menu_debugging_filter);
         m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_debugging_filter)");
         findItem.setChecked(this.$model.isFiltered());
     }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
index 5956346f46..017f53ede2 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetDebuggingAdapterItemBinding;
@@ -90,14 +91,14 @@ public final class WidgetDebugging extends AppFragment {
                 super(i, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                TextView textView = (TextView) view.findViewById(2131363982);
+                TextView textView = (TextView) view.findViewById(R.id.log_message);
                 if (textView != null) {
                     WidgetDebuggingAdapterItemBinding widgetDebuggingAdapterItemBinding = new WidgetDebuggingAdapterItemBinding((LinearLayout) view, textView);
                     m.checkNotNullExpressionValue(widgetDebuggingAdapterItemBinding, "WidgetDebuggingAdapterItemBinding.bind(itemView)");
                     this.binding = widgetDebuggingAdapterItemBinding;
                     return;
                 }
-                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363982)));
+                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.log_message)));
             }
 
             public static final /* synthetic */ WidgetDebuggingAdapterItemBinding access$getBinding$p(Item item) {
@@ -106,7 +107,7 @@ public final class WidgetDebugging extends AppFragment {
 
             @ColorInt
             private final int getColor(Context context, int i) {
-                return i != 2 ? i != 3 ? i != 5 ? i != 6 ? ColorCompat.getThemedColor(context, 2130969878) : ColorCompat.getColor(context, 2131100329) : ColorCompat.getColor(context, 2131100356) : ColorCompat.getColor(context, 2131100254) : ColorCompat.getThemedColor(context, 2130969885);
+                return i != 2 ? i != 3 ? i != 5 ? i != 6 ? ColorCompat.getThemedColor(context, (int) R.attr.primary_100) : ColorCompat.getColor(context, (int) R.color.status_red_500) : ColorCompat.getColor(context, (int) R.color.status_yellow_500) : ColorCompat.getColor(context, (int) R.color.status_green_600) : ColorCompat.getThemedColor(context, (int) R.attr.primary_300);
             }
 
             /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [('\n' char), (r6v1 java.lang.Throwable)] */
@@ -163,7 +164,7 @@ public final class WidgetDebugging extends AppFragment {
         public MGRecyclerViewHolder<?, AppLog.LoggedItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
             if (i == 0) {
-                return new Item(2131559014, this);
+                return new Item(R.layout.widget_debugging_adapter_item, this);
             }
             throw invalidViewTypeException(i);
         }
@@ -261,7 +262,7 @@ public final class WidgetDebugging extends AppFragment {
     }
 
     public WidgetDebugging() {
-        super(2131559013);
+        super(R.layout.widget_debugging);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetDebugging widgetDebugging, Model model) {
@@ -277,7 +278,7 @@ public final class WidgetDebugging extends AppFragment {
         if (adapter != null) {
             adapter.setData(model.getLogs());
         }
-        setActionBarOptionsMenu(2131623948, new WidgetDebugging$configureUI$1(this), new WidgetDebugging$configureUI$2(model));
+        setActionBarOptionsMenu(R.menu.menu_debugging, new WidgetDebugging$configureUI$1(this), new WidgetDebugging$configureUI$2(model));
     }
 
     private final WidgetDebuggingBinding getBinding() {
@@ -300,7 +301,7 @@ public final class WidgetDebugging extends AppFragment {
         linearLayoutManager.setReverseLayout(true);
         linearLayoutManager.setSmoothScrollbarEnabled(true);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131888070);
+        setActionBarTitle(R.string.debug);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java
index aa317d32c5..b310f91478 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetFatalCrashBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import d0.z.d.k;
@@ -19,26 +20,26 @@ public final /* synthetic */ class WidgetFatalCrash$binding$2 extends k implemen
 
     public final WidgetFatalCrashBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363252;
-        TextView textView = (TextView) view.findViewById(2131363252);
+        int i = R.id.fatal_crash_app_version;
+        TextView textView = (TextView) view.findViewById(R.id.fatal_crash_app_version);
         if (textView != null) {
-            i = 2131363253;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363253);
+            i = R.id.fatal_crash_details;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.fatal_crash_details);
             if (linearLayout != null) {
-                i = 2131363254;
-                TextView textView2 = (TextView) view.findViewById(2131363254);
+                i = R.id.fatal_crash_device;
+                TextView textView2 = (TextView) view.findViewById(R.id.fatal_crash_device);
                 if (textView2 != null) {
-                    i = 2131363255;
-                    TextView textView3 = (TextView) view.findViewById(2131363255);
+                    i = R.id.fatal_crash_os_version;
+                    TextView textView3 = (TextView) view.findViewById(R.id.fatal_crash_os_version);
                     if (textView3 != null) {
-                        i = 2131363256;
-                        TextView textView4 = (TextView) view.findViewById(2131363256);
+                        i = R.id.fatal_crash_source;
+                        TextView textView4 = (TextView) view.findViewById(R.id.fatal_crash_source);
                         if (textView4 != null) {
-                            i = 2131363257;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363257);
+                            i = R.id.fatal_crash_testers_invite;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.fatal_crash_testers_invite);
                             if (linkifiedTextView != null) {
-                                i = 2131363258;
-                                TextView textView5 = (TextView) view.findViewById(2131363258);
+                                i = R.id.fatal_crash_time;
+                                TextView textView5 = (TextView) view.findViewById(R.id.fatal_crash_time);
                                 if (textView5 != null) {
                                     return new WidgetFatalCrashBinding((ScrollView) view, textView, linearLayout, textView2, textView3, textView4, linkifiedTextView, textView5);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
index 4234e08d70..8ecfc34193 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
@@ -11,6 +11,8 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetFatalCrashBinding;
@@ -44,11 +46,11 @@ public final class WidgetFatalCrash extends AppFragment {
         @SuppressLint({"SimpleDateFormat"})
         private final Intent createIntent(String str) {
             Bundle bundle = new Bundle();
-            bundle.putString("INTENT_EXTRA_CRASH_SOURCE", str);
+            bundle.putString(WidgetFatalCrash.INTENT_EXTRA_CRASH_SOURCE, str);
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
             simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
             String format = simpleDateFormat.format(new Date());
-            bundle.putString("INTENT_EXTRA_CRASH_TIME", format + " GMT");
+            bundle.putString(WidgetFatalCrash.INTENT_EXTRA_CRASH_TIME, format + " GMT");
             Intent putExtras = new Intent().putExtras(bundle);
             m.checkNotNullExpressionValue(putExtras, "Intent().putExtras(extras)");
             return putExtras;
@@ -67,7 +69,7 @@ public final class WidgetFatalCrash extends AppFragment {
     }
 
     public WidgetFatalCrash() {
-        super(2131559041);
+        super(R.layout.widget_fatal_crash);
     }
 
     private final WidgetFatalCrashBinding getBinding() {
@@ -86,26 +88,26 @@ public final class WidgetFatalCrash extends AppFragment {
         super.onViewBound(view);
         LinkifiedTextView linkifiedTextView = getBinding().f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.fatalCrashTestersInvite");
-        linkifiedTextView.setText(b.k(this, 2131887915, new Object[]{"https://discord.gg/discord-testers"}, null, 4));
+        linkifiedTextView.setText(b.k(this, R.string.crash_testers_invite, new Object[]{"https://discord.gg/discord-testers"}, null, 4));
         Bundle extras = getMostRecentIntent().getExtras();
         TextView textView = getBinding().e;
         m.checkNotNullExpressionValue(textView, "binding.fatalCrashSource");
         Object[] objArr = new Object[1];
-        objArr[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_SOURCE", getString(2131893934)) : null;
-        textView.setText(b.k(this, 2131887914, objArr, null, 4));
+        objArr[0] = extras != null ? extras.getString(INTENT_EXTRA_CRASH_SOURCE, getString(R.string.status_unknown)) : null;
+        textView.setText(b.k(this, R.string.crash_source, objArr, null, 4));
         TextView textView2 = getBinding().g;
         m.checkNotNullExpressionValue(textView2, "binding.fatalCrashTime");
         Object[] objArr2 = new Object[1];
-        objArr2[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_TIME") : null;
-        textView2.setText(b.k(this, 2131887916, objArr2, null, 4));
+        objArr2[0] = extras != null ? extras.getString(INTENT_EXTRA_CRASH_TIME) : null;
+        textView2.setText(b.k(this, R.string.crash_timestamp, objArr2, null, 4));
         TextView textView3 = getBinding().b;
         m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion");
-        textView3.setText(b.k(this, 2131887909, new Object[]{"87.3 - Alpha"}, null, 4));
+        textView3.setText(b.k(this, R.string.crash_app_version, new Object[]{BuildConfig.VERSION_NAME}, null, 4));
         TextView textView4 = getBinding().d;
         m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion");
-        textView4.setText(b.k(this, 2131887912, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
+        textView4.setText(b.k(this, R.string.crash_device_version, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
         TextView textView5 = getBinding().f1799c;
         m.checkNotNullExpressionValue(textView5, "binding.fatalCrashDevice");
-        textView5.setText(b.k(this, 2131887911, new Object[]{Build.MODEL + ' ' + Build.PRODUCT}, null, 4));
+        textView5.setText(b.k(this, R.string.crash_device, new Object[]{Build.MODEL + ' ' + Build.PRODUCT}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$binding$2.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$binding$2.java
index 2d26909671..d3fd0d88ce 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetDirectoriesSearchBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.google.android.material.appbar.AppBarLayout;
@@ -25,32 +26,32 @@ public final /* synthetic */ class WidgetDirectoriesSearch$binding$2 extends k i
 
     public final WidgetDirectoriesSearchBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361872;
-        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131361872);
+        int i = R.id.action_bar_toolbar_layout;
+        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.action_bar_toolbar_layout);
         if (appBarLayout != null) {
-            i = 2131362114;
-            Barrier barrier = (Barrier) view.findViewById(2131362114);
+            i = R.id.barrier;
+            Barrier barrier = (Barrier) view.findViewById(R.id.barrier);
             if (barrier != null) {
-                i = 2131363114;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363114);
+                i = R.id.empty_description;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.empty_description);
                 if (linkifiedTextView != null) {
-                    i = 2131363122;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363122);
+                    i = R.id.empty_state;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.empty_state);
                     if (linearLayout != null) {
-                        i = 2131363131;
-                        TextView textView = (TextView) view.findViewById(2131363131);
+                        i = R.id.empty_title;
+                        TextView textView = (TextView) view.findViewById(R.id.empty_title);
                         if (textView != null) {
-                            i = 2131364624;
-                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+                            i = R.id.recycler_view;
+                            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
                             if (recyclerView != null) {
-                                i = 2131364760;
-                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364760);
+                                i = R.id.search;
+                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.search);
                                 if (floatingActionButton != null) {
-                                    i = 2131364762;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364762);
+                                    i = R.id.search_bar;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.search_bar);
                                     if (textInputLayout != null) {
-                                        i = 2131364763;
-                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131364763);
+                                        i = R.id.search_bar_text;
+                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.search_bar_text);
                                         if (textInputEditText != null) {
                                             return new WidgetDirectoriesSearchBinding((ConstraintLayout) view, appBarLayout, barrier, linkifiedTextView, linearLayout, textView, recyclerView, floatingActionButton, textInputLayout, textInputEditText);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$configureUI$2.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$configureUI$2.java
index 22bf75288a..ec32513f56 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch$configureUI$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.directories;
 
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -26,6 +27,6 @@ public final class WidgetDirectoriesSearch$configureUI$2 extends o implements Fu
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968989));
+        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.colorTextMuted));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java
index e6bfcd2c63..905f888dd0 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesSearch.java
@@ -15,6 +15,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetDirectoriesSearchBinding;
 import com.discord.stores.utilities.Loading;
@@ -50,7 +51,7 @@ public final class WidgetDirectoriesSearch extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetDirectoriesSearch() {
-        super(2131559015);
+        super(R.layout.widget_directories_search);
         WidgetDirectoriesSearch$viewModel$2 widgetDirectoriesSearch$viewModel$2 = WidgetDirectoriesSearch$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetDirectoriesSearchViewModel.class), new WidgetDirectoriesSearch$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetDirectoriesSearch$viewModel$2));
@@ -93,7 +94,7 @@ public final class WidgetDirectoriesSearch extends AppFragment {
             TextInputEditText textInputEditText2 = getBinding().h;
             m.checkNotNullExpressionValue(textInputEditText2, "binding.searchBarText");
             Editable text = textInputEditText2.getText();
-            linkifiedTextView.setText(text == null || t.isBlank(text) ? b.e(this, 2131889283, new Object[0], new WidgetDirectoriesSearch$configureUI$2(this)) : b.e(this, 2131888149, new Object[0], new WidgetDirectoriesSearch$configureUI$3(this)));
+            linkifiedTextView.setText(text == null || t.isBlank(text) ? b.e(this, R.string.guild_discovery_search_protip, new Object[0], new WidgetDirectoriesSearch$configureUI$2(this)) : b.e(this, R.string.directory_search_no_results_subtitle, new Object[0], new WidgetDirectoriesSearch$configureUI$3(this)));
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.emptyTitle");
             TextInputEditText textInputEditText3 = getBinding().h;
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel$binding$2.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel$binding$2.java
index 0168c1b607..135e672959 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.t4;
+import com.discord.R;
 import com.discord.databinding.WidgetDirectoryChannelBinding;
 import com.discord.utilities.view.rounded.RoundedRelativeLayout;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -23,26 +24,26 @@ public final /* synthetic */ class WidgetDirectoryChannel$binding$2 extends k im
 
     public final WidgetDirectoryChannelBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363710;
-        ServerDiscoveryHeader serverDiscoveryHeader = (ServerDiscoveryHeader) view.findViewById(2131363710);
+        int i = R.id.header;
+        ServerDiscoveryHeader serverDiscoveryHeader = (ServerDiscoveryHeader) view.findViewById(R.id.header);
         if (serverDiscoveryHeader != null) {
-            i = 2131364624;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+            i = R.id.recycler_view;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
             if (recyclerView != null) {
-                i = 2131365894;
-                View findViewById = view.findViewById(2131365894);
+                i = R.id.widget_directory_channel_empty;
+                View findViewById = view.findViewById(R.id.widget_directory_channel_empty);
                 if (findViewById != null) {
-                    int i2 = 2131363855;
-                    TextView textView = (TextView) findViewById.findViewById(2131363855);
+                    int i2 = R.id.item_directory_empty_header;
+                    TextView textView = (TextView) findViewById.findViewById(R.id.item_directory_empty_header);
                     if (textView != null) {
-                        i2 = 2131363856;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131363856);
+                        i2 = R.id.item_directory_empty_subheader;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(R.id.item_directory_empty_subheader);
                         if (linkifiedTextView != null) {
-                            i2 = 2131365858;
-                            ChatActionItem chatActionItem = (ChatActionItem) findViewById.findViewById(2131365858);
+                            i2 = R.id.welcome_card_add_server;
+                            ChatActionItem chatActionItem = (ChatActionItem) findViewById.findViewById(R.id.welcome_card_add_server);
                             if (chatActionItem != null) {
-                                i2 = 2131365859;
-                                ChatActionItem chatActionItem2 = (ChatActionItem) findViewById.findViewById(2131365859);
+                                i2 = R.id.welcome_card_invite_friends;
+                                ChatActionItem chatActionItem2 = (ChatActionItem) findViewById.findViewById(R.id.welcome_card_invite_friends);
                                 if (chatActionItem2 != null) {
                                     return new WidgetDirectoryChannelBinding((RoundedRelativeLayout) view, serverDiscoveryHeader, recyclerView, new t4((LinearLayout) findViewById, textView, linkifiedTextView, chatActionItem, chatActionItem2));
                                 }
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 db7fb15089..069446d2ff 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannel.java
@@ -15,6 +15,7 @@ import c.a.e.j0;
 import c.a.j.t4;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.directory.DirectoryEntry;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetDirectoryChannelBinding;
@@ -50,7 +51,7 @@ public final class WidgetDirectoryChannel extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetDirectoryChannel() {
-        super(2131559016);
+        super(R.layout.widget_directory_channel);
         WidgetDirectoryChannel$viewModel$2 widgetDirectoryChannel$viewModel$2 = WidgetDirectoryChannel$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetDirectoriesViewModel.class), new WidgetDirectoryChannel$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetDirectoryChannel$viewModel$2));
@@ -73,7 +74,7 @@ public final class WidgetDirectoryChannel extends AppFragment {
             getBinding().d.d.setOnClickListener(new WidgetDirectoryChannel$configureUi$$inlined$let$lambda$1(guild, this));
             TextView textView = getBinding().d.b;
             m.checkNotNullExpressionValue(textView, "binding.widgetDirectoryC….itemDirectoryEmptyHeader");
-            textView.setText(b.k(this, 2131890434, new Object[]{guild.getName()}, null, 4));
+            textView.setText(b.k(this, R.string.hub_directory_channel_empty_title, new Object[]{guild.getName()}, null, 4));
         }
         ServerDiscoveryHeader serverDiscoveryHeader = getBinding().b;
         serverDiscoveryHeader.setButtonOnClickListener(new WidgetDirectoryChannel$configureUi$$inlined$apply$lambda$1(serverDiscoveryHeader, viewState));
@@ -123,8 +124,8 @@ public final class WidgetDirectoryChannel extends AppFragment {
         recyclerView.setAdapter(this.adapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext()));
         ServerDiscoveryHeader serverDiscoveryHeader = getBinding().b;
-        serverDiscoveryHeader.setTitle(getString(2131890437));
-        serverDiscoveryHeader.setDescription(getString(2131890436));
+        serverDiscoveryHeader.setTitle(getString(R.string.hub_directory_search_title));
+        serverDiscoveryHeader.setDescription(getString(R.string.hub_directory_search_subtitle));
         Observable<Long> r = StoreStream.Companion.getGuildSelected().observeSelectedGuildId().r();
         m.checkNotNullExpressionValue(r, "StoreStream\n        .get…  .distinctUntilChanged()");
         Observable<R> F = r.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannelAdapter.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannelAdapter.java
index 8a91723ea6..34492d1cb5 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannelAdapter.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryChannelAdapter.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.DirectoryAddServerListItemBinding;
 import com.discord.databinding.DirectoryEntryListItemBinding;
 import com.discord.views.directories.ServerDiscoveryItem;
@@ -60,14 +61,14 @@ public final class WidgetDirectoryChannelAdapter extends RecyclerView.Adapter<Re
         m.checkNotNullParameter(viewGroup, "parent");
         DirectoryChannelItem.Companion companion = DirectoryChannelItem.Companion;
         if (i == companion.getVIEW_TYPE_ITEM()) {
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558482, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.directory_entry_list_item, viewGroup, false);
             Objects.requireNonNull(inflate, "rootView");
             ServerDiscoveryItem serverDiscoveryItem = (ServerDiscoveryItem) inflate;
             DirectoryEntryListItemBinding directoryEntryListItemBinding = new DirectoryEntryListItemBinding(serverDiscoveryItem, serverDiscoveryItem);
             m.checkNotNullExpressionValue(directoryEntryListItemBinding, "DirectoryEntryListItemBi…          false\n        )");
             return new DirectoryEntryViewHolder(directoryEntryListItemBinding);
         } else if (i == companion.getVIEW_TYPE_ADD_SERVER()) {
-            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131558481, viewGroup, false);
+            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.directory_add_server_list_item, viewGroup, false);
             Objects.requireNonNull(inflate2, "rootView");
             TextView textView = (TextView) inflate2;
             DirectoryAddServerListItemBinding directoryAddServerListItemBinding = new DirectoryAddServerListItemBinding(textView, textView);
diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java
index a4a482ce12..f8e8e1d8bb 100644
--- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetEmojiSheetBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -21,57 +22,57 @@ public final /* synthetic */ class WidgetEmojiSheet$binding$2 extends k implemen
 
     public final WidgetEmojiSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362180;
-        TextView textView = (TextView) view.findViewById(2131362180);
+        int i = R.id.bottom_header_tv;
+        TextView textView = (TextView) view.findViewById(R.id.bottom_header_tv);
         if (textView != null) {
-            i = 2131362215;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362215);
+            i = R.id.button_container;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.button_container);
             if (frameLayout != null) {
-                i = 2131363024;
-                View findViewById = view.findViewById(2131363024);
+                i = R.id.divider;
+                View findViewById = view.findViewById(R.id.divider);
                 if (findViewById != null) {
-                    i = 2131363095;
-                    TextView textView2 = (TextView) view.findViewById(2131363095);
+                    i = R.id.emoji_info_tv;
+                    TextView textView2 = (TextView) view.findViewById(R.id.emoji_info_tv);
                     if (textView2 != null) {
-                        i = 2131363098;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363098);
+                        i = R.id.emoji_iv;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.emoji_iv);
                         if (simpleDraweeView != null) {
                             AppViewFlipper appViewFlipper = (AppViewFlipper) view;
-                            i = 2131363259;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363259);
+                            i = R.id.favorite_add_button;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.favorite_add_button);
                             if (materialButton != null) {
-                                i = 2131363260;
-                                FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363260);
+                                i = R.id.favorite_container;
+                                FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.favorite_container);
                                 if (frameLayout2 != null) {
-                                    i = 2131363261;
-                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363261);
+                                    i = R.id.favorite_remove_button;
+                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.favorite_remove_button);
                                     if (materialButton2 != null) {
-                                        i = 2131363436;
-                                        TextView textView3 = (TextView) view.findViewById(2131363436);
+                                        i = R.id.guildAvatarText;
+                                        TextView textView3 = (TextView) view.findViewById(R.id.guildAvatarText);
                                         if (textView3 != null) {
-                                            i = 2131363437;
-                                            FrameLayout frameLayout3 = (FrameLayout) view.findViewById(2131363437);
+                                            i = R.id.guildAvatarWrap;
+                                            FrameLayout frameLayout3 = (FrameLayout) view.findViewById(R.id.guildAvatarWrap);
                                             if (frameLayout3 != null) {
-                                                i = 2131363441;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363441);
+                                                i = R.id.guild_container;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_container);
                                                 if (linearLayout != null) {
-                                                    i = 2131363460;
-                                                    TextView textView4 = (TextView) view.findViewById(2131363460);
+                                                    i = R.id.guild_info_tv;
+                                                    TextView textView4 = (TextView) view.findViewById(R.id.guild_info_tv);
                                                     if (textView4 != null) {
-                                                        i = 2131363485;
-                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363485);
+                                                        i = R.id.guild_iv;
+                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.guild_iv);
                                                         if (simpleDraweeView2 != null) {
-                                                            i = 2131363492;
-                                                            TextView textView5 = (TextView) view.findViewById(2131363492);
+                                                            i = R.id.guild_name_tv;
+                                                            TextView textView5 = (TextView) view.findViewById(R.id.guild_name_tv);
                                                             if (textView5 != null) {
-                                                                i = 2131363931;
-                                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363931);
+                                                                i = R.id.join_btn;
+                                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.join_btn);
                                                                 if (materialButton3 != null) {
-                                                                    i = 2131364213;
-                                                                    TextView textView6 = (TextView) view.findViewById(2131364213);
+                                                                    i = R.id.name_tv;
+                                                                    TextView textView6 = (TextView) view.findViewById(R.id.name_tv);
                                                                     if (textView6 != null) {
-                                                                        i = 2131364473;
-                                                                        MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364473);
+                                                                        i = R.id.premium_btn;
+                                                                        MaterialButton materialButton4 = (MaterialButton) view.findViewById(R.id.premium_btn);
                                                                         if (materialButton4 != null) {
                                                                             return new WidgetEmojiSheetBinding(appViewFlipper, textView, frameLayout, findViewById, textView2, simpleDraweeView, appViewFlipper, materialButton, frameLayout2, materialButton2, textView3, frameLayout3, linearLayout, textView4, simpleDraweeView2, textView5, materialButton3, textView6, materialButton4);
                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$configureButtons$$inlined$with$lambda$1.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$configureButtons$$inlined$with$lambda$1.java
index 6870935fc1..0ec35f28d8 100644
--- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$configureButtons$$inlined$with$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$configureButtons$$inlined$with$lambda$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.emoji;
 import android.content.Context;
 import android.view.View;
 import com.discord.models.guild.Guild;
+import com.discord.utilities.analytics.Traits;
 import com.discord.widgets.settings.premium.WidgetSettingsPremium;
 import d0.z.d.m;
 /* compiled from: WidgetEmojiSheet.kt */
@@ -25,6 +26,6 @@ public final class WidgetEmojiSheet$configureButtons$$inlined$with$lambda$1 impl
         WidgetSettingsPremium.Companion companion = WidgetSettingsPremium.Companion;
         Context requireContext = this.this$0.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        WidgetSettingsPremium.Companion.launch$default(companion, requireContext, null, "Emoji Upsell Popout", 2, null);
+        WidgetSettingsPremium.Companion.launch$default(companion, requireContext, null, Traits.Location.Section.EMOJI_SHEET_UPSELL, 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
index 42280f64ef..7d48503908 100644
--- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
+++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
@@ -18,6 +18,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppViewFlipper;
@@ -37,6 +38,7 @@ import com.discord.utilities.textprocessing.node.EmojiNode;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.emoji.EmojiSheetViewModel;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -89,7 +91,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
             m.checkNotNullParameter(emojiIdAndType, "emojiIdAndType");
             WidgetEmojiSheet widgetEmojiSheet = new WidgetEmojiSheet();
             Bundle bundle = new Bundle();
-            bundle.putSerializable("EXTRA_EMOJI_ID_AND_TYPE", emojiIdAndType);
+            bundle.putSerializable(WidgetEmojiSheet.EXTRA_EMOJI_ID_AND_TYPE, emojiIdAndType);
             widgetEmojiSheet.setArguments(bundle);
             widgetEmojiSheet.show(fragmentManager, WidgetEmojiSheet.class.getName());
         }
@@ -194,7 +196,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
         MGImages.setImage$default(simpleDraweeView, ModelEmojiCustom.getImageUri(emojiCustom2.getId(), emojiCustom2.isAnimated(), this.emojiSizePx), 0, 0, false, null, this.imageChangeDetector, 60, null);
         TextView textView = binding2.p;
         m.checkNotNullExpressionValue(textView, "nameTv");
-        textView.setText(':' + emojiCustom2.getName() + ':');
+        textView.setText(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + emojiCustom2.getName() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         TextView textView2 = binding2.f1794c;
         m.checkNotNullExpressionValue(textView2, "emojiInfoTv");
         textView2.setText(getString(getCustomEmojiInfoText(isCurrentGuild, isUserInGuild, isPublic, isUserPremium)));
@@ -238,8 +240,8 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(simpleDraweeView, "guildIv");
             IconUtils.setIcon$default((ImageView) simpleDraweeView, guild, 0, (MGImages.ChangeDetector) this.imageChangeDetector, true, 4, (Object) null);
         } else {
-            binding.j.setBackgroundResource(2131231092);
-            int themedColor = ColorCompat.getThemedColor(requireContext(), 2130968905);
+            binding.j.setBackgroundResource(R.drawable.drawable_circle_black);
+            int themedColor = ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundSecondary);
             FrameLayout frameLayout = binding.j;
             m.checkNotNullExpressionValue(frameLayout, "guildAvatarWrap");
             frameLayout.setBackgroundTintList(ColorStateList.valueOf(themedColor));
@@ -247,19 +249,19 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(textView, "guildAvatarText");
             textView.setText(guild.getShortName());
         }
-        int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231858 : guild.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232096 : 0;
+        int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? R.drawable.ic_partnered_badge_banner : guild.getFeatures().contains(GuildFeature.VERIFIED) ? R.drawable.ic_verified_badge_banner : 0;
         TextView textView2 = binding.n;
         m.checkNotNullExpressionValue(textView2, "guildNameTv");
         DrawableCompat.setCompoundDrawablesCompat(textView2, i, 0, 0, 0);
         TextView textView3 = binding.n;
         m.checkNotNullExpressionValue(textView3, "guildNameTv");
         textView3.setText(guild.getName());
-        int i2 = z3 ? 2131888339 : 2131888338;
+        int i2 = z3 ? R.string.emoji_popout_public_server : R.string.emoji_popout_private_server;
         String str = null;
         CharSequence k = b.k(this, i2, new Object[0], null, 4);
         if (num != null) {
             String format = NumberFormat.getNumberInstance(new LocaleManager().getPrimaryLocale(requireContext())).format(Integer.valueOf(num.intValue()));
-            str = b.k(this, 2131890667, new Object[]{format}, null, 4).toString() + " • ";
+            str = b.k(this, R.string.instant_invite_guild_members_online, new Object[]{format}, null, 4).toString() + " • ";
         }
         if (str == null) {
             str = "";
@@ -276,10 +278,10 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
         MGImages.setImage$default(simpleDraweeView, emojiUnicode.getEmojiUnicode().getImageUri(true, this.emojiSizePx, requireContext()), 0, 0, false, null, this.imageChangeDetector, 60, null);
         TextView textView = binding.p;
         m.checkNotNullExpressionValue(textView, "nameTv");
-        textView.setText(':' + emojiUnicode.getEmojiUnicode().getFirstName() + ':');
+        textView.setText(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + emojiUnicode.getEmojiUnicode().getFirstName() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         TextView textView2 = binding.f1794c;
         m.checkNotNullExpressionValue(textView2, "emojiInfoTv");
-        textView2.setText(getString(2131888342));
+        textView2.setText(getString(R.string.emoji_popout_standard_emoji_description));
         FrameLayout frameLayout = binding.b;
         m.checkNotNullExpressionValue(frameLayout, "buttonContainer");
         frameLayout.setVisibility(8);
@@ -297,22 +299,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
     }
 
     private final int getCustomEmojiInfoText(boolean z2, boolean z3, boolean z4, boolean z5) {
-        if (z2 && !z5) {
-            return 2131888330;
-        }
-        if (z2 && z5) {
-            return 2131888334;
-        }
-        if (z3 && !z5) {
-            return 2131888331;
-        }
-        if (z3 && z5) {
-            return 2131888335;
-        }
-        if (!z4 || z5) {
-            return (!z4 || !z5) ? 2131888337 : 2131888336;
-        }
-        return 2131888343;
+        return (!z2 || z5) ? (!z2 || !z5) ? (!z3 || z5) ? (!z3 || !z5) ? (!z4 || z5) ? (!z4 || !z5) ? R.string.emoji_popout_premium_unjoined_private_guild_description : R.string.emoji_popout_premium_unjoined_discoverable_guild_description : R.string.emoji_popout_unjoined_discoverable_guild_description : R.string.emoji_popout_premium_joined_guild_description : R.string.emoji_popout_joined_guild_description : R.string.emoji_popout_premium_current_guild_description : R.string.emoji_popout_current_guild_description;
     }
 
     private final EmojiNode.EmojiIdAndType getEmojiIdAndType() {
@@ -341,6 +328,6 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559034;
+        return R.layout.widget_emoji_sheet;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java
index 87caf4ddef..15f4f9efec 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetFeedbackSheetBinding;
 import com.discord.widgets.voice.feedback.FeedbackView;
 import d0.z.d.k;
@@ -19,15 +20,15 @@ public final /* synthetic */ class WidgetFeedbackSheet$binding$2 extends k imple
 
     public final WidgetFeedbackSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363270;
-        ImageView imageView = (ImageView) view.findViewById(2131363270);
+        int i = R.id.feedback_sheet_close_button;
+        ImageView imageView = (ImageView) view.findViewById(R.id.feedback_sheet_close_button);
         if (imageView != null) {
             NestedScrollView nestedScrollView = (NestedScrollView) view;
-            i = 2131363272;
-            FeedbackView feedbackView = (FeedbackView) view.findViewById(2131363272);
+            i = R.id.feedback_sheet_feedback_view;
+            FeedbackView feedbackView = (FeedbackView) view.findViewById(R.id.feedback_sheet_feedback_view);
             if (feedbackView != null) {
-                i = 2131363273;
-                TextView textView = (TextView) view.findViewById(2131363273);
+                i = R.id.feedback_sheet_title;
+                TextView textView = (TextView) view.findViewById(R.id.feedback_sheet_title);
                 if (textView != null) {
                     return new WidgetFeedbackSheetBinding(nestedScrollView, imageView, nestedScrollView, feedbackView, textView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java
index e2701a1c39..ae430c0460 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.feedback;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,7 +23,7 @@ public final class WidgetFeedbackSheet$handleEvent$1 extends o implements Functi
     }
 
     public final void invoke(Long l) {
-        c.a.e.o.i(this.this$0, 2131887122, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.call_feedback_confirmation, 0, 4);
         this.this$0.requireDialog().cancel();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelCallFeedbackSheet$2.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelCallFeedbackSheet$2.java
index 3ce5905b3e..d287051699 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelCallFeedbackSheet$2.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelCallFeedbackSheet$2.java
@@ -19,7 +19,7 @@ public final class WidgetFeedbackSheet$viewModelCallFeedbackSheet$2 extends o im
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<FeedbackSheetViewModel.ViewState> mo1invoke() {
-        CallFeedbackSheetViewModel.Config config = (CallFeedbackSheetViewModel.Config) WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getParcelable("ARG_CONFIG");
+        CallFeedbackSheetViewModel.Config config = (CallFeedbackSheetViewModel.Config) WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getParcelable(WidgetFeedbackSheet.ARG_CALL_FEEDBACK_CONFIG);
         m.checkNotNull(config);
         return new CallFeedbackSheetViewModel(config, null, null, null, 14, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelGuildDeleteFeedbackSheet$2.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelGuildDeleteFeedbackSheet$2.java
index 9425362554..a91e5cc5fe 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelGuildDeleteFeedbackSheet$2.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelGuildDeleteFeedbackSheet$2.java
@@ -18,6 +18,6 @@ public final class WidgetFeedbackSheet$viewModelGuildDeleteFeedbackSheet$2 exten
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<FeedbackSheetViewModel.ViewState> mo1invoke() {
-        return new GuildDeleteFeedbackSheetViewModel(WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("ARG_GUILD_DELETE_FEEDBACK_GUILD_ID"));
+        return new GuildDeleteFeedbackSheetViewModel(WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getLong(WidgetFeedbackSheet.ARG_GUILD_DELETE_FEEDBACK_GUILD_ID));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelStreamFeedbackSheet$2.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelStreamFeedbackSheet$2.java
index 3eae5d4083..ad94adc688 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelStreamFeedbackSheet$2.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$viewModelStreamFeedbackSheet$2.java
@@ -19,11 +19,11 @@ public final class WidgetFeedbackSheet$viewModelStreamFeedbackSheet$2 extends o
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<FeedbackSheetViewModel.ViewState> mo1invoke() {
-        String string = WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getString("ARG_STREAM_FEEDBACK_STREAM_KEY ");
+        String string = WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getString(WidgetFeedbackSheet.ARG_STREAM_FEEDBACK_STREAM_KEY);
         if (string == null) {
             string = "";
         }
         m.checkNotNullExpressionValue(string, "argumentsOrDefault.getSt…EEDBACK_STREAM_KEY) ?: \"\"");
-        return new StreamFeedbackSheetViewModel(string, WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getString("ARG_STREAM_FEEDBACK_MEDIA_SESSION_ID"), null, null, null, 28, null);
+        return new StreamFeedbackSheetViewModel(string, WidgetFeedbackSheet.access$getArgumentsOrDefault$p(this.this$0).getString(WidgetFeedbackSheet.ARG_STREAM_FEEDBACK_MEDIA_SESSION_ID), null, null, null, 28, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
index c1e00155b6..6ff2258e11 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetFeedbackSheetBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -66,7 +67,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
             m.checkNotNullParameter(feedbackType, "feedbackType");
             WidgetFeedbackSheet widgetFeedbackSheet = new WidgetFeedbackSheet();
             Bundle bundle = new Bundle();
-            bundle.putSerializable("ARG_FEEDBACK_TYPE", feedbackType);
+            bundle.putSerializable(WidgetFeedbackSheet.ARG_FEEDBACK_TYPE, feedbackType);
             widgetFeedbackSheet.setArguments(bundle);
             return widgetFeedbackSheet;
         }
@@ -134,7 +135,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
     }
 
     private final FeedbackSheetViewModel getViewModel() {
-        Serializable serializable = requireArguments().getSerializable("ARG_FEEDBACK_TYPE");
+        Serializable serializable = requireArguments().getSerializable(ARG_FEEDBACK_TYPE);
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.widgets.feedback.WidgetFeedbackSheet.FeedbackType");
         int ordinal = ((FeedbackType) serializable).ordinal();
         if (ordinal == 0) {
@@ -167,7 +168,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
                 requireDialog().cancel();
                 return;
             }
-            Observable<Long> d02 = Observable.d0(600, TimeUnit.MILLISECONDS);
+            Observable<Long> d02 = Observable.d0(SHEET_DISMISS_DELAY_MS, TimeUnit.MILLISECONDS);
             m.checkNotNullExpressionValue(d02, "Observable\n             …S, TimeUnit.MILLISECONDS)");
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$handleEvent$1(this), 62, (Object) null);
         } else if (event instanceof FeedbackSheetViewModel.Event.NavigateToIssueDetails) {
@@ -221,7 +222,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559042;
+        return R.layout.widget_feedback_sheet;
     }
 
     public final Function0<Unit> getOnDismissed() {
diff --git a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java
index 2efd1b5da9..2710238540 100644
--- a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java
+++ b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.EmptyFriendsStateContactSyncViewBinding;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -55,7 +56,7 @@ public final class EmptyFriendsStateContactSyncView extends ConstraintLayout {
             this.binding.d.setTextSize(2, 18.0f);
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.csSubtitle");
-            b.n(textView, 2131887583, new Object[0], null, 4);
+            b.n(textView, R.string.contact_sync_find_friends_subtitle, new Object[0], null, 4);
         }
         this.binding.f1605c.setOnClickListener(EmptyFriendsStateContactSyncView$updateView$1.INSTANCE);
     }
diff --git a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java
index 6731117966..7aafaba7f5 100644
--- a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java
+++ b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java
@@ -55,7 +55,7 @@ public final class EmptyFriendsStateView extends ConstraintLayout {
     public final void initialize(AttributeSet attributeSet) {
         TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(attributeSet, R.a.EmptyFriendsStateView);
         m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…le.EmptyFriendsStateView)");
-        int resourceId = obtainStyledAttributes.getResourceId(0, 2131165782);
+        int resourceId = obtainStyledAttributes.getResourceId(0, R.dimen.uikit_textsize_xlarge);
         obtainStyledAttributes.recycle();
         this.binding.f1606c.setTextSize(0, getResources().getDimension(resourceId));
     }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.java
index 9ac780d47f..e5f04ced5f 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.friends;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class FriendsListViewModel$acceptFriendRequest$1 extends o implemen
     }
 
     public final void invoke(Void r2) {
-        FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131886115);
+        FriendsListViewModel.access$emitShowToastEvent(this.this$0, R.string.accept_request_button_after);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java
index d12d6f2cda..5eb868fa2b 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.friends;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPIAbortMessages;
 import d0.z.d.m;
@@ -50,7 +51,7 @@ public final class FriendsListViewModel$acceptFriendRequest$2 extends o implemen
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final Boolean mo1invoke() {
-            FriendsListViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888073);
+            FriendsListViewModel.access$emitShowToastEvent(this.this$0.this$0, R.string.default_failure_to_perform_action_message);
             return null;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java
index c62009bb0d..8637d9bc99 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.friends;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class FriendsListViewModel$launchVoiceCall$2 extends o implements F
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        FriendsListViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java
index 3bb0a6d682..5b41a635fd 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.friends;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class FriendsListViewModel$removeFriendRequest$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        FriendsListViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
index 0288fff428..593d2da4a7 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.presence.ClientStatus;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelApplicationStream;
@@ -1579,7 +1580,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
             }
         }
         List list = u.toList(u.sortedWith(arrayList2, FriendsListViewModel$getItems$sortedPendingItems$1.INSTANCE));
-        Item.PendingHeader pendingHeader = !list.isEmpty() ? new Item.PendingHeader(2131888878, list.size(), false, list.size() > 2) : null;
+        Item.PendingHeader pendingHeader = !list.isEmpty() ? new Item.PendingHeader(R.string.friends_pending_request_header, list.size(), false, list.size() > 2) : null;
         ArrayList arrayList4 = new ArrayList();
         ArrayList arrayList5 = new ArrayList();
         for (Object obj : arrayList3) {
@@ -1589,7 +1590,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
         }
         List list2 = u.toList(u.sortedWith(arrayList5, FriendsListViewModel$getItems$onlineFriendItems$2.INSTANCE));
         if (!list2.isEmpty()) {
-            arrayList4.add(new Item.Header(2131888874, list2.size()));
+            arrayList4.add(new Item.Header(R.string.friends_online_header, list2.size()));
             arrayList4.addAll(list2);
         }
         ArrayList arrayList6 = new ArrayList();
@@ -1600,7 +1601,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
         }
         List list3 = u.toList(u.sortedWith(arrayList6, FriendsListViewModel$getItems$offlineFriendItems$2.INSTANCE));
         if (true ^ list3.isEmpty()) {
-            arrayList4.add(new Item.Header(2131888873, list3.size()));
+            arrayList4.add(new Item.Header(R.string.friends_offline_header, list3.size()));
             arrayList4.addAll(list3);
         }
         return new ListSections(suggestedFriendsHeader, arrayList, pendingHeader, list, arrayList4, z2 ? new Item.ContactSyncUpsell(false) : null);
@@ -1659,7 +1660,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
 
     public final void acceptFriendRequest(long j, String str) {
         m.checkNotNullParameter(str, "username");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(this.restAPI, "Friends List", j, null, null, 12, null), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$acceptFriendRequest$2(this, str), (Function0) null, (Function0) null, new FriendsListViewModel$acceptFriendRequest$1(this), 54, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(this.restAPI, LOCATION, j, null, null, 12, null), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$acceptFriendRequest$2(this, str), (Function0) null, (Function0) null, new FriendsListViewModel$acceptFriendRequest$1(this), 54, (Object) null);
     }
 
     public final void acceptFriendSuggestion(String str, int i) {
@@ -1720,6 +1721,6 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
     }
 
     public final void removeFriendRequest(long j, int i) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship("Friends List", j), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$removeFriendRequest$2(this), (Function0) null, (Function0) null, new FriendsListViewModel$removeFriendRequest$1(this, i == 3 ? 2131888847 : 2131888842), 54, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship(LOCATION, j), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$removeFriendRequest$2(this), (Function0) null, (Function0) null, new FriendsListViewModel$removeFriendRequest$1(this, i == 3 ? R.string.friend_request_ignored : R.string.friend_request_cancelled), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java b/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java
index 7e725c1c35..7063518f3c 100644
--- a/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java
+++ b/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.SuggestedFriendViewBinding;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -31,21 +32,21 @@ public final class SuggestedFriendView extends ConstraintLayout {
     public SuggestedFriendView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558691, this);
-        int i2 = 2131365388;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365388);
+        LayoutInflater.from(context).inflate(R.layout.suggested_friend_view, this);
+        int i2 = R.id.suggested_friend_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.suggested_friend_avatar);
         if (simpleDraweeView != null) {
-            i2 = 2131365389;
-            AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById(2131365389);
+            i2 = R.id.suggested_friend_decline;
+            AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById(R.id.suggested_friend_decline);
             if (appCompatImageView != null) {
-                i2 = 2131365390;
-                TextView textView = (TextView) findViewById(2131365390);
+                i2 = R.id.suggested_friend_public_name;
+                TextView textView = (TextView) findViewById(R.id.suggested_friend_public_name);
                 if (textView != null) {
-                    i2 = 2131365391;
-                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) findViewById(2131365391);
+                    i2 = R.id.suggested_friend_send_request;
+                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) findViewById(R.id.suggested_friend_send_request);
                     if (appCompatImageView2 != null) {
-                        i2 = 2131365392;
-                        TextView textView2 = (TextView) findViewById(2131365392);
+                        i2 = R.id.suggested_friend_username;
+                        TextView textView2 = (TextView) findViewById(R.id.suggested_friend_username);
                         if (textView2 != null) {
                             SuggestedFriendViewBinding suggestedFriendViewBinding = new SuggestedFriendViewBinding(this, simpleDraweeView, appCompatImageView, textView, appCompatImageView2, textView2);
                             m.checkNotNullExpressionValue(suggestedFriendViewBinding, "SuggestedFriendViewBindi…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd$binding$2.java
index 6349c873e9..91abbad0f9 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.friends;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetFriendsAddBinding;
 import com.discord.utilities.simple_pager.SimplePager;
 import com.google.android.material.appbar.AppBarLayout;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetFriendsAdd$binding$2 extends k implemen
 
     public final WidgetFriendsAddBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361869;
-        TabLayout tabLayout = (TabLayout) view.findViewById(2131361869);
+        int i = R.id.action_bar_tabs;
+        TabLayout tabLayout = (TabLayout) view.findViewById(R.id.action_bar_tabs);
         if (tabLayout != null) {
-            i = 2131361872;
-            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131361872);
+            i = R.id.action_bar_toolbar_layout;
+            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.action_bar_toolbar_layout);
             if (appBarLayout != null) {
-                i = 2131361920;
-                SimplePager simplePager = (SimplePager) view.findViewById(2131361920);
+                i = R.id.add_friend_view_pager;
+                SimplePager simplePager = (SimplePager) view.findViewById(R.id.add_friend_view_pager);
                 if (simplePager != null) {
                     return new WidgetFriendsAddBinding((CoordinatorLayout) view, tabLayout, appBarLayout, simplePager);
                 }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java
index 98ab4382bc..43468992b1 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetFriendsAddBinding;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -53,7 +54,7 @@ public final class WidgetFriendsAdd extends AppFragment {
     }
 
     public WidgetFriendsAdd() {
-        super(2131559044);
+        super(R.layout.widget_friends_add);
     }
 
     private final WidgetFriendsAddBinding getBinding() {
@@ -73,14 +74,14 @@ public final class WidgetFriendsAdd extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131888888);
+        setActionBarTitle(R.string.friends_section_add_friend);
         SimplePager simplePager = getBinding().b;
         m.checkNotNullExpressionValue(simplePager, "binding.addFriendViewPager");
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        String string = getString(2131894875);
+        String string = getString(R.string.username);
         m.checkNotNullExpressionValue(string, "getString(R.string.username)");
-        String string2 = getString(2131891640);
+        String string2 = getString(R.string.nearby_scan);
         m.checkNotNullExpressionValue(string2, "getString(R.string.nearby_scan)");
         simplePager.setAdapter(new SimplePager.Adapter(parentFragmentManager, new SimplePager.Adapter.Item(string, WidgetFriendsAdd$onViewBound$1.INSTANCE), new SimplePager.Adapter.Item(string2, WidgetFriendsAdd$onViewBound$2.INSTANCE)));
     }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java
index 10454eb0aa..39b9b183a3 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetFriendsAddByIdBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -20,17 +21,17 @@ public final /* synthetic */ class WidgetFriendsAddById$binding$2 extends k impl
 
     public final WidgetFriendsAddByIdBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363320;
-        TextView textView = (TextView) view.findViewById(2131363320);
+        int i = R.id.friend_add_username_indicator;
+        TextView textView = (TextView) view.findViewById(R.id.friend_add_username_indicator);
         if (textView != null) {
-            i = 2131363328;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363328);
+            i = R.id.friends_add_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.friends_add_container);
             if (linearLayout != null) {
-                i = 2131363329;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363329);
+                i = R.id.friends_add_send;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.friends_add_send);
                 if (materialButton != null) {
-                    i = 2131363330;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363330);
+                    i = R.id.friends_add_text_edit_wrap;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.friends_add_text_edit_wrap);
                     if (textInputLayout != null) {
                         return new WidgetFriendsAddByIdBinding((NestedScrollView) view, textView, linearLayout, materialButton, textInputLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.java
index cf9a61dc42..f2efa084fe 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.friends;
 import android.content.Context;
 import c.a.e.o;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.google.android.material.textfield.TextInputLayout;
@@ -21,7 +22,7 @@ public final class WidgetFriendsAddById$sendFriendRequest$1<T> implements Action
     public final void call(Void r8) {
         Context context = this.this$0.getContext();
         Context context2 = this.this$0.getContext();
-        o.h(context, context2 != null ? b.h(context2, 2131886256, new Object[]{this.$username}, null, 4) : null, 0, null, 12);
+        o.h(context, context2 != null ? b.h(context2, R.string.add_friend_confirmation, new Object[]{this.$username}, null, 4) : null, 0, null, 12);
         TextInputLayout textInputLayout = WidgetFriendsAddById.access$getBinding$p(this.this$0).e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.friendsAddTextEditWrap");
         ViewExtensions.clear(textInputLayout);
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java
index f40fbd9e30..b501c8ea75 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$sendFriendRequest$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.friends;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPIAbortMessages;
 import com.discord.utilities.user.UserUtils;
@@ -31,7 +32,7 @@ public final class WidgetFriendsAddById$sendFriendRequest$2<T> implements Action
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            WidgetFriendsAddById.access$getBinding$p(this.this$0.this$0).e.setErrorTextAppearance(2131952223);
+            WidgetFriendsAddById.access$getBinding$p(this.this$0.this$0).e.setErrorTextAppearance(R.style.TextAppearance_Error);
             RestAPIAbortMessages.ResponseResolver responseResolver = RestAPIAbortMessages.ResponseResolver.INSTANCE;
             Context context = this.this$0.this$0.getContext();
             Error error = this.$error;
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
index adf15e0ce0..eabe6023e6 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.q;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetFriendsAddByIdBinding;
 import com.discord.models.user.MeUser;
@@ -134,7 +135,7 @@ public final class WidgetFriendsAddById extends AppFragment {
     }
 
     public WidgetFriendsAddById() {
-        super(2131559045);
+        super(R.layout.widget_friends_add_by_id);
     }
 
     public static final /* synthetic */ void access$extractTargetAndSendFriendRequest(WidgetFriendsAddById widgetFriendsAddById) {
@@ -165,7 +166,7 @@ public final class WidgetFriendsAddById extends AppFragment {
         Context context = getContext();
         CharSequence charSequence = null;
         if (context != null) {
-            charSequence = b.h(context, 2131886264, new Object[]{access$extractUsernameAndDiscriminator.getUsername()}, null, 4);
+            charSequence = b.h(context, R.string.add_friend_error_username_only, new Object[]{access$extractUsernameAndDiscriminator.getUsername()}, null, 4);
         }
         setInputEditError(charSequence);
         AnalyticsTracker.INSTANCE.friendRequestFailed(textOrEmpty, access$extractUsernameAndDiscriminator.getUsername(), access$extractUsernameAndDiscriminator.getDiscriminator(), "Invalid Username");
@@ -179,10 +180,10 @@ public final class WidgetFriendsAddById extends AppFragment {
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
         UserUtils userUtils = UserUtils.INSTANCE;
-        CharSequence i = b.i(resources, 2131893535, new Object[]{UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null)}, null, 4);
+        CharSequence i = b.i(resources, R.string.self_username_indicator, new Object[]{UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null)}, null, 4);
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(i);
         SpannableStringBuilder spannableStringBuilder2 = (SpannableStringBuilder) i;
-        spannableStringBuilder.setSpan(new ForegroundColorSpan(ColorCompat.getThemedColor(requireContext(), 2130968932)), spannableStringBuilder2.length() - UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null).length(), spannableStringBuilder2.length(), 33);
+        spannableStringBuilder.setSpan(new ForegroundColorSpan(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorHeaderPrimary)), spannableStringBuilder2.length() - UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null).length(), spannableStringBuilder2.length(), 33);
         return spannableStringBuilder;
     }
 
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java
index b98084ae0b..b566a46dfa 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java
@@ -8,6 +8,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetAddFriendUserListItemBinding;
 import com.discord.models.presence.Presence;
 import com.discord.models.user.User;
@@ -208,38 +209,38 @@ public final class WidgetFriendsAddUserAdapter extends MGRecyclerAdapterSimple<I
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public UserViewHolder(WidgetFriendsAddUserAdapter widgetFriendsAddUserAdapter) {
-            super(2131558862, widgetFriendsAddUserAdapter);
+            super((int) R.layout.widget_add_friend_user_list_item, widgetFriendsAddUserAdapter);
             m.checkNotNullParameter(widgetFriendsAddUserAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131361910;
-            AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131361910);
+            int i = R.id.add_friend_user_accept_button;
+            AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.add_friend_user_accept_button);
             if (appCompatImageView != null) {
-                i = 2131361911;
-                AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131361911);
+                i = R.id.add_friend_user_check_image;
+                AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(R.id.add_friend_user_check_image);
                 if (appCompatImageView2 != null) {
-                    i = 2131361912;
-                    AppCompatImageView appCompatImageView3 = (AppCompatImageView) view.findViewById(2131361912);
+                    i = R.id.add_friend_user_decline_button;
+                    AppCompatImageView appCompatImageView3 = (AppCompatImageView) view.findViewById(R.id.add_friend_user_decline_button);
                     if (appCompatImageView3 != null) {
-                        i = 2131361913;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131361913);
+                        i = R.id.add_friend_user_item_avatar;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.add_friend_user_item_avatar);
                         if (simpleDraweeView != null) {
-                            i = 2131361914;
-                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131361914);
+                            i = R.id.add_friend_user_item_buttons;
+                            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.add_friend_user_item_buttons);
                             if (linearLayout != null) {
-                                i = 2131361915;
-                                TextView textView = (TextView) view.findViewById(2131361915);
+                                i = R.id.add_friend_user_item_name;
+                                TextView textView = (TextView) view.findViewById(R.id.add_friend_user_item_name);
                                 if (textView != null) {
-                                    i = 2131361916;
-                                    TextView textView2 = (TextView) view.findViewById(2131361916);
+                                    i = R.id.add_friend_user_item_name_secondary;
+                                    TextView textView2 = (TextView) view.findViewById(R.id.add_friend_user_item_name_secondary);
                                     if (textView2 != null) {
-                                        i = 2131361917;
-                                        StatusView statusView = (StatusView) view.findViewById(2131361917);
+                                        i = R.id.add_friend_user_item_status;
+                                        StatusView statusView = (StatusView) view.findViewById(R.id.add_friend_user_item_status);
                                         if (statusView != null) {
-                                            i = 2131361918;
-                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131361918);
+                                            i = R.id.add_friend_user_item_text;
+                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.add_friend_user_item_text);
                                             if (linearLayout2 != null) {
-                                                i = 2131361919;
-                                                AppCompatImageView appCompatImageView4 = (AppCompatImageView) view.findViewById(2131361919);
+                                                i = R.id.add_friend_user_send_button;
+                                                AppCompatImageView appCompatImageView4 = (AppCompatImageView) view.findViewById(R.id.add_friend_user_send_button);
                                                 if (appCompatImageView4 != null) {
                                                     WidgetAddFriendUserListItemBinding widgetAddFriendUserListItemBinding = new WidgetAddFriendUserListItemBinding((ConstraintLayout) view, appCompatImageView, appCompatImageView2, appCompatImageView3, simpleDraweeView, linearLayout, textView, textView2, statusView, linearLayout2, appCompatImageView4);
                                                     m.checkNotNullExpressionValue(widgetAddFriendUserListItemBinding, "WidgetAddFriendUserListItemBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.java
index 71873fffbf..bcaabd94db 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$acceptFriendRequest$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.friends;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class WidgetFriendsFindNearby$acceptFriendRequest$1 extends o imple
     }
 
     public final void invoke(Void r5) {
-        c.a.e.o.g(this.this$0.getContext(), 2131886115, 0, null, 12);
+        c.a.e.o.g(this.this$0.getContext(), R.string.accept_request_button_after, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java
index 9fb30f3fc2..9aa80d4b68 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetFriendsNearbyBinding;
 import com.discord.rlottie.RLottieImageView;
 import com.google.android.material.button.MaterialButton;
@@ -20,23 +21,23 @@ public final /* synthetic */ class WidgetFriendsFindNearby$binding$2 extends k i
 
     public final WidgetFriendsNearbyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364219;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364219);
+        int i = R.id.nearby_friends_enable;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.nearby_friends_enable);
         if (materialButton != null) {
-            i = 2131364220;
-            TextView textView = (TextView) view.findViewById(2131364220);
+            i = R.id.nearby_friends_learn_more;
+            TextView textView = (TextView) view.findViewById(R.id.nearby_friends_learn_more);
             if (textView != null) {
-                i = 2131364221;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364221);
+                i = R.id.nearby_friends_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.nearby_friends_recycler);
                 if (recyclerView != null) {
-                    i = 2131364222;
-                    TextView textView2 = (TextView) view.findViewById(2131364222);
+                    i = R.id.nearby_friends_searching_body;
+                    TextView textView2 = (TextView) view.findViewById(R.id.nearby_friends_searching_body);
                     if (textView2 != null) {
-                        i = 2131364223;
-                        RLottieImageView rLottieImageView = (RLottieImageView) view.findViewById(2131364223);
+                        i = R.id.nearby_friends_searching_lottie;
+                        RLottieImageView rLottieImageView = (RLottieImageView) view.findViewById(R.id.nearby_friends_searching_lottie);
                         if (rLottieImageView != null) {
-                            i = 2131364224;
-                            TextView textView3 = (TextView) view.findViewById(2131364224);
+                            i = R.id.nearby_friends_searching_title;
+                            TextView textView3 = (TextView) view.findViewById(R.id.nearby_friends_searching_title);
                             if (textView3 != null) {
                                 return new WidgetFriendsNearbyBinding((NestedScrollView) view, materialButton, textView, recyclerView, textView2, rLottieImageView, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java
index 2d7a771fc3..5ae698b177 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.friends;
 
 import android.content.Context;
 import c.a.l.b;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -28,6 +29,6 @@ public final class WidgetFriendsFindNearby$sendFriendRequest$1 extends o impleme
     public final void invoke(Void r7) {
         Context context = this.this$0.getContext();
         Context context2 = this.this$0.getContext();
-        c.a.e.o.h(context, context2 != null ? b.h(context2, 2131886256, new Object[]{this.$username}, null, 4) : null, 0, null, 12);
+        c.a.e.o.h(context, context2 != null ? b.h(context2, R.string.add_friend_confirmation, new Object[]{this.$username}, null, 4) : null, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java
index 124e172db5..59bf549038 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$sendFriendRequest$2.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPIAbortMessages;
 import com.discord.utilities.user.UserUtils;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -38,7 +39,7 @@ public final class WidgetFriendsFindNearby$sendFriendRequest$2<T> implements Act
             Error.Response response = error.getResponse();
             m.checkNotNullExpressionValue(response, "it.response");
             int code = response.getCode();
-            c.a.e.o.h(this.this$0.this$0.getContext(), responseResolver.getRelationshipResponse(context, code, this.this$0.$username + '#' + UserUtils.INSTANCE.padDiscriminator(this.this$0.$discriminator)), 0, null, 12);
+            c.a.e.o.h(this.this$0.this$0.getContext(), responseResolver.getRelationshipResponse(context, code, this.this$0.$username + MentionUtilsKt.CHANNELS_CHAR + UserUtils.INSTANCE.padDiscriminator(this.this$0.$discriminator)), 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
index dcc83190d9..a291675af8 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetFriendsNearbyBinding;
 import com.discord.rlottie.RLottieDrawable;
@@ -201,7 +202,7 @@ public final class WidgetFriendsFindNearby extends AppFragment {
     }
 
     public WidgetFriendsFindNearby() {
-        super(2131559054);
+        super(R.layout.widget_friends_nearby);
     }
 
     private final void acceptFriendRequest(long j) {
@@ -244,14 +245,14 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         if (model instanceof Model.Uninitialized) {
             TextView textView = getBinding().g;
             m.checkNotNullExpressionValue(textView, "binding.nearbyFriendsSearchingTitle");
-            textView.setText(getString(2131886281));
+            textView.setText(getString(R.string.add_friend_nearby_title));
             TextView textView2 = getBinding().e;
             m.checkNotNullExpressionValue(textView2, "binding.nearbyFriendsSearchingBody");
-            textView2.setText(getString(2131886268));
+            textView2.setText(getString(R.string.add_friend_nearby_body));
             TextView textView3 = getBinding().e;
             TextView textView4 = getBinding().e;
             m.checkNotNullExpressionValue(textView4, "binding.nearbyFriendsSearchingBody");
-            textView3.setTextColor(ColorCompat.getThemedColor(textView4, 2130968933));
+            textView3.setTextColor(ColorCompat.getThemedColor(textView4, (int) R.attr.colorHeaderSecondary));
             MaterialButton materialButton = getBinding().b;
             m.checkNotNullExpressionValue(materialButton, "binding.nearbyFriendsEnable");
             materialButton.setVisibility(0);
@@ -269,14 +270,14 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         } else if (model instanceof Model.Error) {
             TextView textView5 = getBinding().g;
             m.checkNotNullExpressionValue(textView5, "binding.nearbyFriendsSearchingTitle");
-            textView5.setText(getString(2131886281));
+            textView5.setText(getString(R.string.add_friend_nearby_title));
             TextView textView6 = getBinding().e;
             m.checkNotNullExpressionValue(textView6, "binding.nearbyFriendsSearchingBody");
             textView6.setText(getErrorMessage(((Model.Error) model).getErrorCode()));
             TextView textView7 = getBinding().e;
             TextView textView8 = getBinding().e;
             m.checkNotNullExpressionValue(textView8, "binding.nearbyFriendsSearchingBody");
-            textView7.setTextColor(ColorCompat.getColor(textView8, 2131100329));
+            textView7.setTextColor(ColorCompat.getColor(textView8, (int) R.color.status_red_500));
             MaterialButton materialButton2 = getBinding().b;
             m.checkNotNullExpressionValue(materialButton2, "binding.nearbyFriendsEnable");
             materialButton2.setVisibility(0);
@@ -294,14 +295,14 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         } else if (model instanceof Model.Empty) {
             TextView textView9 = getBinding().g;
             m.checkNotNullExpressionValue(textView9, "binding.nearbyFriendsSearchingTitle");
-            textView9.setText(getString(2131886281));
+            textView9.setText(getString(R.string.add_friend_nearby_title));
             TextView textView10 = getBinding().e;
             m.checkNotNullExpressionValue(textView10, "binding.nearbyFriendsSearchingBody");
-            textView10.setText(getString(2131886268));
+            textView10.setText(getString(R.string.add_friend_nearby_body));
             TextView textView11 = getBinding().e;
             TextView textView12 = getBinding().e;
             m.checkNotNullExpressionValue(textView12, "binding.nearbyFriendsSearchingBody");
-            textView11.setTextColor(ColorCompat.getThemedColor(textView12, 2130968933));
+            textView11.setTextColor(ColorCompat.getThemedColor(textView12, (int) R.attr.colorHeaderSecondary));
             MaterialButton materialButton3 = getBinding().b;
             m.checkNotNullExpressionValue(materialButton3, "binding.nearbyFriendsEnable");
             materialButton3.setVisibility(8);
@@ -314,14 +315,14 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         } else if (model instanceof Model.NearbyUsers) {
             TextView textView13 = getBinding().g;
             m.checkNotNullExpressionValue(textView13, "binding.nearbyFriendsSearchingTitle");
-            textView13.setText(getString(2131886275));
+            textView13.setText(getString(R.string.add_friend_nearby_found_title));
             TextView textView14 = getBinding().e;
             m.checkNotNullExpressionValue(textView14, "binding.nearbyFriendsSearchingBody");
-            textView14.setText(getString(2131886274));
+            textView14.setText(getString(R.string.add_friend_nearby_found_body));
             TextView textView15 = getBinding().e;
             TextView textView16 = getBinding().e;
             m.checkNotNullExpressionValue(textView16, "binding.nearbyFriendsSearchingBody");
-            textView15.setTextColor(ColorCompat.getThemedColor(textView16, 2130968933));
+            textView15.setTextColor(ColorCompat.getThemedColor(textView16, (int) R.attr.colorHeaderSecondary));
             MaterialButton materialButton4 = getBinding().b;
             m.checkNotNullExpressionValue(materialButton4, "binding.nearbyFriendsEnable");
             materialButton4.setVisibility(8);
@@ -337,7 +338,7 @@ public final class WidgetFriendsFindNearby extends AppFragment {
     }
 
     private final void declineFriendRequest(long j, boolean z2) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeRelationship("Nearby - Remove Friend Request", j), false, 1, null), this, null, 2, null), WidgetFriendsFindNearby.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFriendsFindNearby$declineFriendRequest$1(this, z2 ? 2131888847 : 2131888842), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeRelationship("Nearby - Remove Friend Request", j), false, 1, null), this, null, 2, null), WidgetFriendsFindNearby.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFriendsFindNearby$declineFriendRequest$1(this, z2 ? R.string.friend_request_ignored : R.string.friend_request_cancelled), 62, (Object) null);
     }
 
     private final void enableScanning() {
@@ -360,19 +361,19 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         if (num != null && num.intValue() == 99) {
             Context context = getContext();
             if (context != null) {
-                return context.getString(2131886269);
+                return context.getString(R.string.add_friend_nearby_connection_error);
             }
             return null;
         } else if (num != null && num.intValue() == 98) {
             Context context2 = getContext();
             if (context2 != null) {
-                return context2.getString(2131886280);
+                return context2.getString(R.string.add_friend_nearby_stopped);
             }
             return null;
         } else {
             Context context3 = getContext();
             if (context3 != null) {
-                return context3.getString(2131886276);
+                return context3.getString(R.string.add_friend_nearby_generic_error);
             }
             return null;
         }
@@ -440,10 +441,10 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         m.checkNotNullParameter(playbackMode, "playbackMode");
         Context context = rLottieImageView.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        String valueOf = String.valueOf(2131820544);
+        String valueOf = String.valueOf((int) R.raw.anim_friends_add_nearby_looking);
         Context context2 = rLottieImageView.getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        RLottieDrawable rLottieDrawable = new RLottieDrawable(context, 2131820544, valueOf, dpToPixels, dpToPixels2, DisplayUtils.getScreenRefreshRate(context2), false, (int[]) null);
+        RLottieDrawable rLottieDrawable = new RLottieDrawable(context, (int) R.raw.anim_friends_add_nearby_looking, valueOf, dpToPixels, dpToPixels2, DisplayUtils.getScreenRefreshRate(context2), false, (int[]) null);
         rLottieImageView.i = rLottieDrawable;
         rLottieDrawable.f(playbackMode);
         RLottieDrawable rLottieDrawable2 = rLottieImageView.i;
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java
index 0f39c8332e..3e67fa2c5c 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.friends;
 import android.view.View;
 import android.widget.RelativeLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetFriendsListBinding;
 import d0.z.d.k;
@@ -18,20 +19,20 @@ public final /* synthetic */ class WidgetFriendsList$binding$2 extends k impleme
 
     public final WidgetFriendsListBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363336;
-        EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131363336);
+        int i = R.id.friends_list_empty_friends_state_cs_view;
+        EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(R.id.friends_list_empty_friends_state_cs_view);
         if (emptyFriendsStateContactSyncView != null) {
-            i = 2131363337;
-            EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131363337);
+            i = R.id.friends_list_empty_friends_state_view;
+            EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(R.id.friends_list_empty_friends_state_view);
             if (emptyFriendsStateView != null) {
-                i = 2131363339;
-                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363339);
+                i = R.id.friends_list_flipper;
+                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.friends_list_flipper);
                 if (appViewFlipper != null) {
-                    i = 2131363354;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363354);
+                    i = R.id.friends_list_loading;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.friends_list_loading);
                     if (recyclerView != null) {
-                        i = 2131363356;
-                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363356);
+                        i = R.id.friends_list_recycler;
+                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.friends_list_recycler);
                         if (recyclerView2 != null) {
                             return new WidgetFriendsListBinding((RelativeLayout) view, emptyFriendsStateContactSyncView, emptyFriendsStateView, appViewFlipper, recyclerView, recyclerView2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
index 3b39aa85a8..fd2bbce964 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.friends;
 import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.Traits;
 import com.discord.widgets.channels.WidgetGroupInviteFriends;
@@ -26,19 +27,19 @@ public final class WidgetFriendsList$configureToolbar$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364099:
+            case R.id.menu_friends_add_friend /* 2131364099 */:
                 WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null);
                 return;
-            case 2131364100:
+            case R.id.menu_friends_contact_sync /* 2131364100 */:
                 ContactSyncAnalytics.Companion.trackStart$default(ContactSyncAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null);
                 AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null));
                 WidgetContactSync.Companion companion2 = WidgetContactSync.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null);
                 return;
-            case 2131364101:
+            case R.id.menu_friends_start_group /* 2131364101 */:
                 if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) {
                     GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion;
                     FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java
index 085f11b871..e263668597 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.friends;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import rx.functions.Action1;
 /* compiled from: WidgetFriendsList.kt */
 public final class WidgetFriendsList$configureToolbar$2<T> implements Action1<Menu> {
@@ -12,7 +13,7 @@ public final class WidgetFriendsList$configureToolbar$2<T> implements Action1<Me
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364100);
+        MenuItem findItem = menu.findItem(R.id.menu_friends_contact_sync);
         if (findItem != null) {
             findItem.setVisible(WidgetFriendsList.access$getShowContactSyncIcon$p(this.this$0));
         }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java
index 8bc38b1f18..43a0c62753 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java
@@ -4,6 +4,7 @@ import android.view.ContextThemeWrapper;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.PopupMenu;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -44,9 +45,9 @@ public final class WidgetFriendsList$onViewBound$8 extends o implements Function
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "upsellView");
-        PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(view.getContext(), 2131951661), view);
-        popupMenu.getMenuInflater().inflate(2131623947, popupMenu.getMenu());
-        popupMenu.getMenu().findItem(2131364091).setOnMenuItemClickListener(new AnonymousClass1(this));
+        PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(view.getContext(), (int) R.style.AppTheme_PopupMenu), view);
+        popupMenu.getMenuInflater().inflate(R.menu.menu_contact_sync_upsell, popupMenu.getMenu());
+        popupMenu.getMenu().findItem(R.id.menu_contact_sync_upsell_dismiss).setOnMenuItemClickListener(new AnonymousClass1(this));
         popupMenu.show();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
index 94199f5961..42a2d8e48f 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetFriendsListBinding;
@@ -60,7 +61,7 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte
     }
 
     public WidgetFriendsList() {
-        super(2131559046);
+        super(R.layout.widget_friends_list);
         WidgetFriendsList$viewModel$2 widgetFriendsList$viewModel$2 = WidgetFriendsList$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(FriendsListViewModel.class), new WidgetFriendsList$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetFriendsList$viewModel$2));
@@ -88,9 +89,9 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte
 
     private final void configureToolbar() {
         AppFragment.bindToolbar$default(this, null, 1, null);
-        setActionBarTitle(2131888856);
+        setActionBarTitle(R.string.friends);
         setActionBarTitleLayoutMinimumTappableArea();
-        setActionBarOptionsMenu(2131623954, new WidgetFriendsList$configureToolbar$1(this), new WidgetFriendsList$configureToolbar$2(this));
+        setActionBarOptionsMenu(R.menu.menu_friends, new WidgetFriendsList$configureToolbar$1(this), new WidgetFriendsList$configureToolbar$2(this));
     }
 
     private final void configureUI(FriendsListViewModel.ViewState viewState) {
@@ -207,7 +208,7 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte
         if (widgetTabsHost != null) {
             widgetTabsHost.registerTabSelectionListener(NavigationTab.FRIENDS, this);
         }
-        getBinding().f1805c.updateView("Friends");
+        getBinding().f1805c.updateView(ANALYTICS_SOURCE);
         getBinding().b.updateView(false);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().f;
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
index 7e36a90f41..826b522171 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
@@ -14,6 +14,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetFriendsListAdapterItemFriendBinding;
 import com.discord.databinding.WidgetFriendsListAdapterItemHeaderBinding;
 import com.discord.databinding.WidgetFriendsListAdapterItemPendingBinding;
@@ -75,21 +76,21 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemContactSyncUpsell(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559052, widgetFriendsListAdapter);
+            super((int) R.layout.widget_friends_list_contact_sync_upsell, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363331;
-            ImageView imageView = (ImageView) view.findViewById(2131363331);
+            int i = R.id.friends_list_contact_sync_upsell_arrow;
+            ImageView imageView = (ImageView) view.findViewById(R.id.friends_list_contact_sync_upsell_arrow);
             if (imageView != null) {
                 MaterialCardView materialCardView = (MaterialCardView) view;
-                i = 2131363333;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363333);
+                i = R.id.friends_list_contact_sync_upsell_icon;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.friends_list_contact_sync_upsell_icon);
                 if (imageView2 != null) {
-                    i = 2131363334;
-                    TextView textView = (TextView) view.findViewById(2131363334);
+                    i = R.id.friends_list_contact_sync_upsell_subtitle;
+                    TextView textView = (TextView) view.findViewById(R.id.friends_list_contact_sync_upsell_subtitle);
                     if (textView != null) {
-                        i = 2131363335;
-                        TextView textView2 = (TextView) view.findViewById(2131363335);
+                        i = R.id.friends_list_contact_sync_upsell_title;
+                        TextView textView2 = (TextView) view.findViewById(R.id.friends_list_contact_sync_upsell_title);
                         if (textView2 != null) {
                             WidgetFriendsListContactSyncUpsellBinding widgetFriendsListContactSyncUpsellBinding = new WidgetFriendsListContactSyncUpsellBinding(materialCardView, imageView, materialCardView, imageView2, textView, textView2);
                             m.checkNotNullExpressionValue(widgetFriendsListContactSyncUpsellBinding, "WidgetFriendsListContact…ellBinding.bind(itemView)");
@@ -120,17 +121,17 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemHeader(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559048, widgetFriendsListAdapter);
+            super((int) R.layout.widget_friends_list_adapter_item_header, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363350);
+            TextView textView = (TextView) view.findViewById(R.id.friends_list_item_header_text);
             if (textView != null) {
                 WidgetFriendsListAdapterItemHeaderBinding widgetFriendsListAdapterItemHeaderBinding = new WidgetFriendsListAdapterItemHeaderBinding((FrameLayout) view, textView);
                 m.checkNotNullExpressionValue(widgetFriendsListAdapterItemHeaderBinding, "WidgetFriendsListAdapter…derBinding.bind(itemView)");
                 this.binding = widgetFriendsListAdapterItemHeaderBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363350)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.friends_list_item_header_text)));
         }
 
         public void onConfigure(int i, FriendsListViewModel.Item item) {
@@ -149,7 +150,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemPendingHeader(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559053, widgetFriendsListAdapter);
+            super((int) R.layout.widget_friends_list_expandable_header, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             WidgetFriendsListExpandableHeaderBinding a = WidgetFriendsListExpandableHeaderBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetFriendsListExpanda…derBinding.bind(itemView)");
@@ -171,11 +172,11 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.friendsListExpandableHeaderButton");
                 textView2.setVisibility(0);
-                int i2 = pendingHeader.isPendingSectionExpanded() ? 2131888877 : 2131888876;
+                int i2 = pendingHeader.isPendingSectionExpanded() ? R.string.friends_pending_request_expand_collapse : R.string.friends_pending_request_expand;
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.friendsListExpandableHeaderButton");
                 b.n(textView3, i2, new Object[0], null, 4);
-                int i3 = pendingHeader.isPendingSectionExpanded() ? 2131231429 : 2131231427;
+                int i3 = pendingHeader.isPendingSectionExpanded() ? R.drawable.ic_arrow_up_24dp : R.drawable.ic_arrow_right_24dp;
                 TextView textView4 = this.binding.b;
                 m.checkNotNullExpressionValue(textView4, "binding.friendsListExpandableHeaderButton");
                 Drawable drawable = ContextCompat.getDrawable(textView4.getContext(), i3);
@@ -197,32 +198,32 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemPendingUser(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559050, widgetFriendsListAdapter);
+            super((int) R.layout.widget_friends_list_adapter_item_pending, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363340;
-            AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363340);
+            int i = R.id.friends_list_item_accept_button;
+            AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.friends_list_item_accept_button);
             if (appCompatImageView != null) {
-                i = 2131363341;
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363341);
+                i = R.id.friends_list_item_activity;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.friends_list_item_activity);
                 if (simpleDraweeSpanTextView != null) {
-                    i = 2131363342;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363342);
+                    i = R.id.friends_list_item_avatar;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.friends_list_item_avatar);
                     if (simpleDraweeView != null) {
-                        i = 2131363344;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363344);
+                        i = R.id.friends_list_item_buttons_wrap;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.friends_list_item_buttons_wrap);
                         if (linearLayout != null) {
-                            i = 2131363347;
-                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131363347);
+                            i = R.id.friends_list_item_decline_button;
+                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(R.id.friends_list_item_decline_button);
                             if (appCompatImageView2 != null) {
-                                i = 2131363351;
-                                TextView textView = (TextView) view.findViewById(2131363351);
+                                i = R.id.friends_list_item_name;
+                                TextView textView = (TextView) view.findViewById(R.id.friends_list_item_name);
                                 if (textView != null) {
-                                    i = 2131363352;
-                                    StatusView statusView = (StatusView) view.findViewById(2131363352);
+                                    i = R.id.friends_list_item_status;
+                                    StatusView statusView = (StatusView) view.findViewById(R.id.friends_list_item_status);
                                     if (statusView != null) {
-                                        i = 2131363353;
-                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363353);
+                                        i = R.id.friends_list_item_text;
+                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.friends_list_item_text);
                                         if (linearLayout2 != null) {
                                             WidgetFriendsListAdapterItemPendingBinding widgetFriendsListAdapterItemPendingBinding = new WidgetFriendsListAdapterItemPendingBinding((RelativeLayout) view, appCompatImageView, simpleDraweeSpanTextView, simpleDraweeView, linearLayout, appCompatImageView2, textView, statusView, linearLayout2);
                                             m.checkNotNullExpressionValue(widgetFriendsListAdapterItemPendingBinding, "WidgetFriendsListAdapter…ingBinding.bind(itemView)");
@@ -258,7 +259,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemActivity");
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.f1804c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.friendsListItemActivity");
-                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.j(simpleDraweeSpanTextView2, 2131890631, new Object[0], null, 4));
+                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.j(simpleDraweeSpanTextView2, R.string.incoming_friend_request, new Object[0], null, 4));
                 AppCompatImageView appCompatImageView = this.binding.b;
                 m.checkNotNullExpressionValue(appCompatImageView, "binding.friendsListItemAcceptButton");
                 appCompatImageView.setVisibility(0);
@@ -267,14 +268,14 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.friendsListItemActivity");
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.binding.f1804c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView4, "binding.friendsListItemActivity");
-                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView3, b.j(simpleDraweeSpanTextView4, 2131892048, new Object[0], null, 4));
+                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView3, b.j(simpleDraweeSpanTextView4, R.string.outgoing_friend_request, new Object[0], null, 4));
                 AppCompatImageView appCompatImageView2 = this.binding.b;
                 m.checkNotNullExpressionValue(appCompatImageView2, "binding.friendsListItemAcceptButton");
                 appCompatImageView2.setVisibility(8);
             }
             SimpleDraweeView simpleDraweeView = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, pendingFriendRequest.getUser(), 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, pendingFriendRequest.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
             this.binding.b.setOnClickListener(new WidgetFriendsListAdapter$ItemPendingUser$onConfigure$2(this, pendingFriendRequest));
             this.binding.e.setOnClickListener(new WidgetFriendsListAdapter$ItemPendingUser$onConfigure$3(this, pendingFriendRequest));
         }
@@ -316,7 +317,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemSuggestedFriendHeader(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559053, widgetFriendsListAdapter);
+            super((int) R.layout.widget_friends_list_expandable_header, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             WidgetFriendsListExpandableHeaderBinding a = WidgetFriendsListExpandableHeaderBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetFriendsListExpanda…derBinding.bind(itemView)");
@@ -333,7 +334,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             FriendsListViewModel.Item.SuggestedFriendsHeader suggestedFriendsHeader = (FriendsListViewModel.Item.SuggestedFriendsHeader) item;
             TextView textView = this.binding.f1806c;
             m.checkNotNullExpressionValue(textView, "binding.friendsListPendingItemHeaderText");
-            b.m(textView, 2131888872, new Object[0], new WidgetFriendsListAdapter$ItemSuggestedFriendHeader$onConfigure$1(item));
+            b.m(textView, R.string.friends_friend_suggestions_header, new Object[0], new WidgetFriendsListAdapter$ItemSuggestedFriendHeader$onConfigure$1(item));
             if (suggestedFriendsHeader.getShowExpandButton()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.friendsListExpandableHeaderButton");
@@ -343,14 +344,14 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
                 if (suggestedFriendsHeader.isExpanded()) {
                     TextView textView4 = this.binding.b;
                     m.checkNotNullExpressionValue(textView4, "binding.friendsListExpandableHeaderButton");
-                    charSequence = b.j(textView4, 2131888877, new Object[0], null, 4);
+                    charSequence = b.j(textView4, R.string.friends_pending_request_expand_collapse, new Object[0], null, 4);
                 } else {
                     TextView textView5 = this.binding.b;
                     m.checkNotNullExpressionValue(textView5, "binding.friendsListExpandableHeaderButton");
-                    charSequence = b.j(textView5, 2131888876, new Object[0], null, 4);
+                    charSequence = b.j(textView5, R.string.friends_pending_request_expand, new Object[0], null, 4);
                 }
                 textView3.setText(charSequence);
-                int i2 = suggestedFriendsHeader.isExpanded() ? 2131231429 : 2131231427;
+                int i2 = suggestedFriendsHeader.isExpanded() ? R.drawable.ic_arrow_up_24dp : R.drawable.ic_arrow_right_24dp;
                 TextView textView6 = this.binding.b;
                 m.checkNotNullExpressionValue(textView6, "binding.friendsListExpandableHeaderButton");
                 Drawable drawable = ContextCompat.getDrawable(textView6.getContext(), i2);
@@ -372,32 +373,32 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemUser(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559047, widgetFriendsListAdapter);
+            super((int) R.layout.widget_friends_list_adapter_item_friend, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363341;
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363341);
+            int i = R.id.friends_list_item_activity;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.friends_list_item_activity);
             if (simpleDraweeSpanTextView != null) {
-                i = 2131363342;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363342);
+                i = R.id.friends_list_item_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.friends_list_item_avatar);
                 if (simpleDraweeView != null) {
-                    i = 2131363344;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363344);
+                    i = R.id.friends_list_item_buttons_wrap;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.friends_list_item_buttons_wrap);
                     if (linearLayout != null) {
-                        i = 2131363345;
-                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363345);
+                        i = R.id.friends_list_item_call_button;
+                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.friends_list_item_call_button);
                         if (appCompatImageView != null) {
-                            i = 2131363346;
-                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131363346);
+                            i = R.id.friends_list_item_chat_button;
+                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(R.id.friends_list_item_chat_button);
                             if (appCompatImageView2 != null) {
-                                i = 2131363351;
-                                TextView textView = (TextView) view.findViewById(2131363351);
+                                i = R.id.friends_list_item_name;
+                                TextView textView = (TextView) view.findViewById(R.id.friends_list_item_name);
                                 if (textView != null) {
-                                    i = 2131363352;
-                                    StatusView statusView = (StatusView) view.findViewById(2131363352);
+                                    i = R.id.friends_list_item_status;
+                                    StatusView statusView = (StatusView) view.findViewById(R.id.friends_list_item_status);
                                     if (statusView != null) {
-                                        i = 2131363353;
-                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363353);
+                                        i = R.id.friends_list_item_text;
+                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.friends_list_item_text);
                                         if (linearLayout2 != null) {
                                             WidgetFriendsListAdapterItemFriendBinding widgetFriendsListAdapterItemFriendBinding = new WidgetFriendsListAdapterItemFriendBinding((RelativeLayout) view, simpleDraweeSpanTextView, simpleDraweeView, linearLayout, appCompatImageView, appCompatImageView2, textView, statusView, linearLayout2);
                                             m.checkNotNullExpressionValue(widgetFriendsListAdapterItemFriendBinding, "WidgetFriendsListAdapter…endBinding.bind(itemView)");
@@ -434,7 +435,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, true, false, 16, null);
             SimpleDraweeView simpleDraweeView = this.binding.f1803c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, friend.getUser(), 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, friend.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
             this.binding.d.setOnClickListener(new WidgetFriendsListAdapter$ItemUser$onConfigure$2(this, friend));
             this.binding.e.setOnClickListener(new WidgetFriendsListAdapter$ItemUser$onConfigure$3(this, friend));
         }
@@ -513,7 +514,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             case 4:
                 return new ItemSuggestedFriendHeader(this);
             case 5:
-                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559051, viewGroup, false);
+                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.widget_friends_list_adapter_suggested_friend, viewGroup, false);
                 Objects.requireNonNull(inflate, "rootView");
                 SuggestedFriendView suggestedFriendView = (SuggestedFriendView) inflate;
                 WidgetFriendsListAdapterSuggestedFriendBinding widgetFriendsListAdapterSuggestedFriendBinding = new WidgetFriendsListAdapterSuggestedFriendBinding(suggestedFriendView, suggestedFriendView);
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java
index 7abfcfa01d..7eed2d59d5 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetFriendsListAdapterItemLoadingBinding;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -36,12 +37,12 @@ public final class WidgetFriendsListLoadingAdapter extends RecyclerView.Adapter<
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559049, viewGroup, false);
-        int i2 = 2131362130;
-        View findViewById = inflate.findViewById(2131362130);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.widget_friends_list_adapter_item_loading, viewGroup, false);
+        int i2 = R.id.blank_item_avatar_placeholder;
+        View findViewById = inflate.findViewById(R.id.blank_item_avatar_placeholder);
         if (findViewById != null) {
-            i2 = 2131362131;
-            View findViewById2 = inflate.findViewById(2131362131);
+            i2 = R.id.blank_item_username_placeholder;
+            View findViewById2 = inflate.findViewById(R.id.blank_item_username_placeholder);
             if (findViewById2 != null) {
                 WidgetFriendsListAdapterItemLoadingBinding widgetFriendsListAdapterItemLoadingBinding = new WidgetFriendsListAdapterItemLoadingBinding((ConstraintLayout) inflate, findViewById, findViewById2);
                 m.checkNotNullExpressionValue(widgetFriendsListAdapterItemLoadingBinding, "WidgetFriendsListAdapter….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetNavigator.java b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetNavigator.java
index 6cfebeb23e..95713e60af 100644
--- a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetNavigator.java
+++ b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetNavigator.java
@@ -29,7 +29,7 @@ public final class GuildDeleteFeedbackSheetNavigator {
         WidgetFeedbackSheet newInstance = WidgetFeedbackSheet.Companion.newInstance(WidgetFeedbackSheet.FeedbackType.GUILD_DELETE);
         Bundle arguments = newInstance.getArguments();
         m.checkNotNull(arguments);
-        arguments.putLong("ARG_GUILD_DELETE_FEEDBACK_GUILD_ID", j);
+        arguments.putLong(WidgetFeedbackSheet.ARG_GUILD_DELETE_FEEDBACK_GUILD_ID, j);
         newInstance.show(fragmentManager, WidgetFeedbackSheet.class.getName());
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
index 02030b4963..cdeeb4d46f 100644
--- a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guild_delete_feedback;
 
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.widgets.feedback.FeedbackSheetViewModel;
 import com.discord.widgets.voice.feedback.FeedbackIssue;
@@ -32,7 +33,7 @@ public final class GuildDeleteFeedbackSheetViewModel extends AppViewModel<Feedba
     }
 
     public GuildDeleteFeedbackSheetViewModel(long j) {
-        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, u.plus((Collection<? extends FeedbackIssue>) m.shuffled(REASONS), FeedbackIssue.GUILD_DELETE_OTHER), 2131889241, null, 2131889240, 8, null));
+        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, u.plus((Collection<? extends FeedbackIssue>) m.shuffled(REASONS), FeedbackIssue.GUILD_DELETE_OTHER), R.string.guild_delete_feedback_header, null, R.string.guild_delete_feedback_body, 8, null));
         this.pendingFeedback = new PendingFeedback.GuildDeleteFeedback(j, null, null, 6, null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionPlanDetailsView.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionPlanDetailsView.java
index 471742d4a5..e919a9b30d 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionPlanDetailsView.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionPlanDetailsView.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
+import com.discord.R;
 import com.discord.databinding.ViewGuildRoleSubscriptionPlanDetailsBinding;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -103,7 +104,7 @@ public final class GuildRoleSubscriptionPlanDetailsView extends ConstraintLayout
         TextInputLayout textInputLayout = this.binding.d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildRoleSubscriptionPlanDescriptionLayout");
         ViewExtensions.setTextIfDifferent(textInputLayout, str);
-        int dimensionPixelSize = getResources().getDimensionPixelSize(2131165289);
+        int dimensionPixelSize = getResources().getDimensionPixelSize(R.dimen.avatar_size_huge);
         SimpleDraweeView simpleDraweeView = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildRoleSubscriptionPlanCoverImage");
         IconUtils.setIcon$default(simpleDraweeView, str2, dimensionPixelSize, dimensionPixelSize, false, null, null, 112, null);
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildSubscriptionRoleImageUploadView.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildSubscriptionRoleImageUploadView.java
index cd0e6dac62..5cd83d577f 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildSubscriptionRoleImageUploadView.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildSubscriptionRoleImageUploadView.java
@@ -50,7 +50,7 @@ public final class GuildSubscriptionRoleImageUploadView extends ConstraintLayout
         ViewGuildRoleSubscriptionImageUploadBinding a = ViewGuildRoleSubscriptionImageUploadBinding.a(LayoutInflater.from(getContext()), this);
         m.checkNotNullExpressionValue(a, "ViewGuildRoleSubscriptio…ater.from(context), this)");
         this.binding = a;
-        this.avatarSize = getResources().getDimensionPixelSize(2131165289);
+        this.avatarSize = getResources().getDimensionPixelSize(R.dimen.avatar_size_huge);
         initialize$default(this, null, 1, null);
     }
 
@@ -61,7 +61,7 @@ public final class GuildSubscriptionRoleImageUploadView extends ConstraintLayout
         ViewGuildRoleSubscriptionImageUploadBinding a = ViewGuildRoleSubscriptionImageUploadBinding.a(LayoutInflater.from(getContext()), this);
         m.checkNotNullExpressionValue(a, "ViewGuildRoleSubscriptio…ater.from(context), this)");
         this.binding = a;
-        this.avatarSize = getResources().getDimensionPixelSize(2131165289);
+        this.avatarSize = getResources().getDimensionPixelSize(R.dimen.avatar_size_huge);
         initialize(attributeSet);
     }
 
@@ -72,7 +72,7 @@ public final class GuildSubscriptionRoleImageUploadView extends ConstraintLayout
         ViewGuildRoleSubscriptionImageUploadBinding a = ViewGuildRoleSubscriptionImageUploadBinding.a(LayoutInflater.from(getContext()), this);
         m.checkNotNullExpressionValue(a, "ViewGuildRoleSubscriptio…ater.from(context), this)");
         this.binding = a;
-        this.avatarSize = getResources().getDimensionPixelSize(2131165289);
+        this.avatarSize = getResources().getDimensionPixelSize(R.dimen.avatar_size_huge);
         initialize(attributeSet);
     }
 
@@ -116,10 +116,10 @@ public final class GuildSubscriptionRoleImageUploadView extends ConstraintLayout
         hierarchy.n(scalingUtils$ScaleType);
         int i = obtainStyledAttributes.getInt(2, 0);
         if (i == 0) {
-            this.binding.f1663c.setBackgroundResource(DrawableCompat.getThemedDrawableRes(this, 2130969907, 0));
+            this.binding.f1663c.setBackgroundResource(DrawableCompat.getThemedDrawableRes(this, (int) R.attr.primary_700_circle, 0));
         } else if (i == 1) {
             SimpleDraweeView simpleDraweeView2 = this.binding.f1663c;
-            simpleDraweeView2.setBackgroundResource(2131231221);
+            simpleDraweeView2.setBackgroundResource(R.drawable.drawable_rect_rounded_bg_tertiary);
             GenericDraweeHierarchy hierarchy2 = simpleDraweeView2.getHierarchy();
             m.checkNotNullExpressionValue(hierarchy2, "hierarchy");
             c cVar = new c();
@@ -129,15 +129,15 @@ public final class GuildSubscriptionRoleImageUploadView extends ConstraintLayout
         }
         String string = obtainStyledAttributes.getString(0);
         if (string == null) {
-            string = getContext().getString(2131889503);
+            string = getContext().getString(R.string.guild_role_subscription_tier_detail_custom_image_description);
         }
         m.checkNotNullExpressionValue(string, "it.getString(R.styleable…image_description\n      )");
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.guildSubscriptionUploadImageLabel");
         textView.setText(string);
-        this.avatarSize = obtainStyledAttributes.getDimensionPixelSize(1, getResources().getDimensionPixelSize(2131165289));
+        this.avatarSize = obtainStyledAttributes.getDimensionPixelSize(1, getResources().getDimensionPixelSize(R.dimen.avatar_size_huge));
         obtainStyledAttributes.recycle();
-        setBackgroundColor(ColorCompat.getThemedColor(this, 2130968905));
+        setBackgroundColor(ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundSecondary));
         this.binding.d.setOnClickListener(new GuildSubscriptionRoleImageUploadView$initialize$2(this));
         this.binding.f1663c.setOnClickListener(new GuildSubscriptionRoleImageUploadView$initialize$3(this));
         this.binding.b.setOnClickListener(new GuildSubscriptionRoleImageUploadView$initialize$4(this));
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails$binding$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails$binding$2.java
index 75d0d10532..6735d01d08 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.guild_role_subscriptions.setup;
 
 import android.view.View;
 import android.widget.ScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildRoleSubscriptionPlanDetailsBinding;
 import com.discord.widgets.guild_role_subscriptions.GuildRoleSubscriptionPlanDetailsView;
 import d0.z.d.k;
@@ -18,10 +19,10 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionPlanDetails$bindin
     public final WidgetGuildRoleSubscriptionPlanDetailsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ScrollView scrollView = (ScrollView) view;
-        GuildRoleSubscriptionPlanDetailsView guildRoleSubscriptionPlanDetailsView = (GuildRoleSubscriptionPlanDetailsView) view.findViewById(2131363650);
+        GuildRoleSubscriptionPlanDetailsView guildRoleSubscriptionPlanDetailsView = (GuildRoleSubscriptionPlanDetailsView) view.findViewById(R.id.guild_subscription_role_plan_details_view);
         if (guildRoleSubscriptionPlanDetailsView != null) {
             return new WidgetGuildRoleSubscriptionPlanDetailsBinding((ScrollView) view, scrollView, guildRoleSubscriptionPlanDetailsView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363650)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.guild_subscription_role_plan_details_view)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java
index 71f2f0563f..4d1afab153 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanDetails.java
@@ -3,11 +3,13 @@ package com.discord.widgets.guild_role_subscriptions.setup;
 import android.content.Context;
 import android.net.Uri;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildRoleSubscriptionPlanDetailsBinding;
 import com.discord.dialogs.ImageUploadDialog;
@@ -31,7 +33,7 @@ public final class WidgetGuildRoleSubscriptionPlanDetails extends AppFragment {
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionPlanDetailsViewModel.class), new WidgetGuildRoleSubscriptionPlanDetails$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetGuildRoleSubscriptionPlanDetails$viewModel$2.INSTANCE));
 
     public WidgetGuildRoleSubscriptionPlanDetails() {
-        super(2131559088);
+        super(R.layout.widget_guild_role_subscription_plan_details);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGuildRoleSubscriptionPlanDetails widgetGuildRoleSubscriptionPlanDetails, GuildRoleSubscriptionPlanDetailsViewModel.ViewState viewState) {
@@ -56,7 +58,7 @@ public final class WidgetGuildRoleSubscriptionPlanDetails extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -66,7 +68,7 @@ public final class WidgetGuildRoleSubscriptionPlanDetails extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         MGImages.requestDataUrl(getContext(), uri, str, this.coverImageSelectedResult);
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$guildId$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$guildId$2.java
index 777e462632..9edce38f01 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$guildId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guild_role_subscriptions.setup;
 
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetGuildRoleSubscriptionPlanSetup.kt */
@@ -17,6 +18,6 @@ public final class WidgetGuildRoleSubscriptionPlanSetup$guildId$2 extends o impl
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", 0);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, 0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java
index fdc67ed068..22251c32bb 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java
@@ -12,6 +12,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildSubscriptionPlanSetupBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -66,7 +67,7 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment {
     }
 
     public WidgetGuildRoleSubscriptionPlanSetup() {
-        super(2131559099);
+        super(R.layout.widget_guild_subscription_plan_setup);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGuildRoleSubscriptionPlanSetup widgetGuildRoleSubscriptionPlanSetup, GuildRoleSubscriptionPlanSetupViewModel.ViewState viewState) {
@@ -91,7 +92,7 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment {
         stepsView.setIsDoneButtonEnabled(!viewState.isSubmitting());
         stepsView.setIsLoading(viewState.isSubmitting());
         stepsView.b(viewState.getCurrentStep());
-        stepsView.setTitle(b.j(stepsView, 2131889446, new Object[]{Integer.valueOf(viewState.getCurrentVisibleStep()), 3}, null, 4).toString());
+        stepsView.setTitle(b.j(stepsView, R.string.guild_role_subscription_create_tier_step_header, new Object[]{Integer.valueOf(viewState.getCurrentVisibleStep()), 3}, null, 4).toString());
     }
 
     private final WidgetGuildSubscriptionPlanSetupBinding getBinding() {
@@ -121,7 +122,7 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment {
                 activity.finish();
             }
         } else if (event instanceof GuildRoleSubscriptionPlanSetupViewModel.Event.SubmitFailure) {
-            o.i(this, 2131888073, 0, 4);
+            o.i(this, R.string.default_failure_to_perform_action_message, 0, 4);
         }
     }
 
@@ -133,7 +134,7 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionPlanDetails.class, 2131889441, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, 2131889441, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$2(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, 2131889441, 0, 0, BundleKt.bundleOf(d0.o.to("INTENT_EXTRA_BENEFITS_GUILD_ID", Long.valueOf(getGuildId()))), new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, 2131889441, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$4(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, 2131889481, null, null, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5(this), false, false, false, 374)});
+        List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionPlanDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$2(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(d0.o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, Long.valueOf(getGuildId()))), new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$4(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, null, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5(this), false, false, false, 374)});
         StepsView stepsView = getBinding().b;
         StepsView.d dVar = new StepsView.d(this, listOf);
         WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1 widgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1 = new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1(this, listOf);
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapter.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapter.java
index 89398c8c84..2d533239d6 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapter.java
@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.databinding.ViewGuildRoleSubscriptionBenefitItemBinding;
 import com.discord.databinding.ViewGuildRoleSubscriptionSectionHeaderItemBinding;
@@ -95,21 +96,21 @@ public final class GuildRoleSubscriptionTierAdapter extends RecyclerView.Adapter
     public GuildRoleSubscriptionTierViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558777, viewGroup, false);
-            int i2 = 2131363585;
-            TextView textView = (TextView) inflate.findViewById(2131363585);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.view_guild_role_subscription_tier_header, viewGroup, false);
+            int i2 = R.id.guild_role_subscription_tier_header_description;
+            TextView textView = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_header_description);
             if (textView != null) {
-                i2 = 2131363586;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363586);
+                i2 = R.id.guild_role_subscription_tier_header_image;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.guild_role_subscription_tier_header_image);
                 if (simpleDraweeView != null) {
-                    i2 = 2131363587;
-                    TextView textView2 = (TextView) inflate.findViewById(2131363587);
+                    i2 = R.id.guild_role_subscription_tier_header_name;
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_header_name);
                     if (textView2 != null) {
-                        i2 = 2131363588;
-                        TextView textView3 = (TextView) inflate.findViewById(2131363588);
+                        i2 = R.id.guild_role_subscription_tier_header_price;
+                        TextView textView3 = (TextView) inflate.findViewById(R.id.guild_role_subscription_tier_header_price);
                         if (textView3 != null) {
-                            i2 = 2131363589;
-                            Button button = (Button) inflate.findViewById(2131363589);
+                            i2 = R.id.guild_role_subscription_tier_header_subscribe;
+                            Button button = (Button) inflate.findViewById(R.id.guild_role_subscription_tier_header_subscribe);
                             if (button != null) {
                                 ViewGuildRoleSubscriptionTierHeaderBinding viewGuildRoleSubscriptionTierHeaderBinding = new ViewGuildRoleSubscriptionTierHeaderBinding((LinearLayout) inflate, textView, simpleDraweeView, textView2, textView3, button);
                                 m.checkNotNullExpressionValue(viewGuildRoleSubscriptionTierHeaderBinding, "ViewGuildRoleSubscriptio…rent, false\n            )");
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapterItem.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapterItem.java
index ec62437c54..a11ff8eae2 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierAdapterItem.java
@@ -4,6 +4,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.PluralsRes;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.utilities.recycler.DiffKeyProvider;
 import d0.z.d.m;
@@ -161,7 +162,7 @@ public abstract class GuildRoleSubscriptionTierAdapterItem implements DiffKeyPro
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public Header(String str, double d, Long l, String str2, String str3) {
             super(null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.name = str;
             this.price = d;
             this.skuId = l;
@@ -215,7 +216,7 @@ public abstract class GuildRoleSubscriptionTierAdapterItem implements DiffKeyPro
         }
 
         public final Header copy(String str, double d, Long l, String str2, String str3) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return new Header(str, d, l, str2, str3);
         }
 
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierListItemGeneratorKt.java
index b76b9db550..51fd538229 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierListItemGeneratorKt.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierListItemGeneratorKt.java
@@ -1,5 +1,7 @@
 package com.discord.widgets.guild_role_subscriptions.tier;
 
+import com.discord.R;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.widgets.guild_role_subscriptions.tier.GuildRoleSubscriptionTierAdapterItem;
 import com.discord.widgets.guild_role_subscriptions.tier.model.Benefit;
 import d0.t.n;
@@ -9,7 +11,7 @@ import java.util.List;
 /* compiled from: GuildRoleSubscriptionTierListItemGenerator.kt */
 public final class GuildRoleSubscriptionTierListItemGeneratorKt {
     public static final List<GuildRoleSubscriptionTierAdapterItem> generateGuildRoleSubscriptionTierListItems(String str, double d, List<Benefit.ChannelBenefit> list, List<Benefit.IntangibleBenefit> list2, int i, String str2, String str3) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "channelBenefits");
         m.checkNotNullParameter(list2, "intangibleBenefits");
         ArrayList arrayList = new ArrayList();
@@ -17,7 +19,7 @@ public final class GuildRoleSubscriptionTierListItemGeneratorKt {
         arrayList.add(new GuildRoleSubscriptionTierAdapterItem.MemberPreview(i, null, 2, null));
         int i2 = 0;
         if (!list.isEmpty()) {
-            arrayList.add(new GuildRoleSubscriptionTierAdapterItem.SectionHeader(2131755142, list.size()));
+            arrayList.add(new GuildRoleSubscriptionTierAdapterItem.SectionHeader(R.plurals.guild_role_subscription_tier_review_exclusive_channel_header_count, list.size()));
             int i3 = 0;
             for (Object obj : list) {
                 int i4 = i3 + 1;
@@ -30,7 +32,7 @@ public final class GuildRoleSubscriptionTierListItemGeneratorKt {
             }
         }
         if (!list2.isEmpty()) {
-            arrayList.add(new GuildRoleSubscriptionTierAdapterItem.SectionHeader(2131755143, list2.size()));
+            arrayList.add(new GuildRoleSubscriptionTierAdapterItem.SectionHeader(R.plurals.guild_role_subscription_tier_review_intangible_benefits_header_count, list2.size()));
             for (Object obj2 : list2) {
                 int i5 = i2 + 1;
                 if (i2 < 0) {
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierViewHolder.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierViewHolder.java
index a9a8ad1892..3bf2966d79 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierViewHolder.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ViewGuildRoleSubscriptionBenefitItemBinding;
 import com.discord.databinding.ViewGuildRoleSubscriptionSectionHeaderItemBinding;
 import com.discord.databinding.ViewGuildRoleSubscriptionTierHeaderBinding;
@@ -45,7 +46,7 @@ public abstract class GuildRoleSubscriptionTierViewHolder extends RecyclerView.V
             m.checkNotNullExpressionValue(view, "itemView");
             Context context = view.getContext();
             m.checkNotNullExpressionValue(context, "itemView.context");
-            this.emojiSizePx = context.getResources().getDimensionPixelSize(2131165450);
+            this.emojiSizePx = context.getResources().getDimensionPixelSize(R.dimen.guild_role_subscription_benefit_emoji_size);
             View view2 = this.itemView;
             view2.setPadding(0, 0, 0, 0);
             view2.setBackground(null);
@@ -138,7 +139,7 @@ public abstract class GuildRoleSubscriptionTierViewHolder extends RecyclerView.V
             m.checkNotNullParameter(guildRoleSubscriptionMemberPreview, "memberPreview");
             this.memberPreview = guildRoleSubscriptionMemberPreview;
             guildRoleSubscriptionMemberPreview.setLayoutParams(new ViewGroup.LayoutParams(-1, -2));
-            guildRoleSubscriptionMemberPreview.setBackgroundColor(ColorCompat.getThemedColor(guildRoleSubscriptionMemberPreview, 2130968905));
+            guildRoleSubscriptionMemberPreview.setBackgroundColor(ColorCompat.getThemedColor(guildRoleSubscriptionMemberPreview, (int) R.attr.colorBackgroundSecondary));
         }
 
         private final GuildRoleSubscriptionMemberPreview component1() {
@@ -288,7 +289,7 @@ public abstract class GuildRoleSubscriptionTierViewHolder extends RecyclerView.V
             textView2.setText(header.getDescription());
             SimpleDraweeView simpleDraweeView = this.binding.f1665c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildRoleSubscriptionTierHeaderImage");
-            IconUtils.setIcon$default(simpleDraweeView, header.getImage(), 2131165299, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView, header.getImage(), (int) R.dimen.avatar_size_xxlarge, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
 
         public final TierHeaderViewHolder copy(ViewGuildRoleSubscriptionTierHeaderBinding viewGuildRoleSubscriptionTierHeaderBinding) {
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java
index 0bc3a7f1bd..3259ec6888 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionMemberPreview.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import androidx.annotation.ColorInt;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemTextBinding;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -22,17 +23,17 @@ public final class GuildRoleSubscriptionMemberPreview extends FrameLayout {
         m.checkNotNullExpressionValue(b, "WidgetChatListAdapterIte…rom(context), this, true)");
         this.binding = b;
         if (isInEditMode()) {
-            b.f1762c.setImageResource(2131232217);
+            b.f1762c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         } else {
-            b.f1762c.setActualImageResource(2131232217);
+            b.f1762c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         }
         TextView textView = b.e;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextTag");
         textView.setVisibility(8);
-        b.d.setText(2131895104);
-        b.f.setText(2131893342);
-        b.b.setText(2131889500);
-        setBackgroundColor(ColorCompat.getThemedColor(this, 2130968904));
+        b.d.setText(R.string.wumpus);
+        b.f.setText(R.string.sample_time_pm);
+        b.b.setText(R.string.guild_role_subscription_tier_design_member_preview_placeholder_message);
+        setBackgroundColor(ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundPrimary));
         b.g.setPadding(0, 0, 0, 0);
     }
 
@@ -44,17 +45,17 @@ public final class GuildRoleSubscriptionMemberPreview extends FrameLayout {
         m.checkNotNullExpressionValue(b, "WidgetChatListAdapterIte…rom(context), this, true)");
         this.binding = b;
         if (isInEditMode()) {
-            b.f1762c.setImageResource(2131232217);
+            b.f1762c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         } else {
-            b.f1762c.setActualImageResource(2131232217);
+            b.f1762c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         }
         TextView textView = b.e;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextTag");
         textView.setVisibility(8);
-        b.d.setText(2131895104);
-        b.f.setText(2131893342);
-        b.b.setText(2131889500);
-        setBackgroundColor(ColorCompat.getThemedColor(this, 2130968904));
+        b.d.setText(R.string.wumpus);
+        b.f.setText(R.string.sample_time_pm);
+        b.b.setText(R.string.guild_role_subscription_tier_design_member_preview_placeholder_message);
+        setBackgroundColor(ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundPrimary));
         b.g.setPadding(0, 0, 0, 0);
     }
 
@@ -66,17 +67,17 @@ public final class GuildRoleSubscriptionMemberPreview extends FrameLayout {
         m.checkNotNullExpressionValue(b, "WidgetChatListAdapterIte…rom(context), this, true)");
         this.binding = b;
         if (isInEditMode()) {
-            b.f1762c.setImageResource(2131232217);
+            b.f1762c.setImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         } else {
-            b.f1762c.setActualImageResource(2131232217);
+            b.f1762c.setActualImageResource(R.drawable.img_guild_role_subscription_default_avatar_40dp);
         }
         TextView textView = b.e;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextTag");
         textView.setVisibility(8);
-        b.d.setText(2131895104);
-        b.f.setText(2131893342);
-        b.b.setText(2131889500);
-        setBackgroundColor(ColorCompat.getThemedColor(this, 2130968904));
+        b.d.setText(R.string.wumpus);
+        b.f.setText(R.string.sample_time_pm);
+        b.b.setText(R.string.guild_role_subscription_tier_design_member_preview_placeholder_message);
+        setBackgroundColor(ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundPrimary));
         b.g.setPadding(0, 0, 0, 0);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierReviewViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierReviewViewModel.java
index 1b50064ed4..86e5a1f446 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierReviewViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierReviewViewModel.java
@@ -2,6 +2,7 @@ package com.discord.widgets.guild_role_subscriptions.tier.create;
 
 import c.d.b.a.a;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.widgets.guild_role_subscriptions.tier.GuildRoleSubscriptionTierAdapterItem;
 import com.discord.widgets.guild_role_subscriptions.tier.GuildRoleSubscriptionTierListItemGeneratorKt;
 import com.discord.widgets.guild_role_subscriptions.tier.model.Benefit;
@@ -72,7 +73,7 @@ public final class GuildRoleSubscriptionTierReviewViewModel extends AppViewModel
     }
 
     public final void updateList(String str, double d, int i, List<Benefit.ChannelBenefit> list, List<Benefit.IntangibleBenefit> list2, String str2, String str3) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "channelBenefits");
         m.checkNotNullParameter(list2, "intangibleBenefits");
         updateViewState(new ViewState(GuildRoleSubscriptionTierListItemGeneratorKt.generateGuildRoleSubscriptionTierListItems(str, d, list, list2, i, str2, str3)));
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierViewModel.java
index 888aece85b..69f8406825 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/GuildRoleSubscriptionTierViewModel.java
@@ -2,7 +2,9 @@ package com.discord.widgets.guild_role_subscriptions.tier.create;
 
 import a0.a.a.a;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.widgets.guild_role_subscriptions.tier.model.Benefit;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import d0.t.u;
 import d0.z.d.e0;
 import d0.z.d.m;
@@ -26,7 +28,7 @@ public final class GuildRoleSubscriptionTierViewModel extends AppViewModel<ViewS
         private final double priceTier;
 
         public ViewState() {
-            this(null, null, 0.0d, null, null, null, null, null, 255, null);
+            this(null, null, ShadowDrawableWrapper.COS_45, null, null, null, null, null, 255, null);
         }
 
         public ViewState(String str, String str2, double d, String str3, Integer num, String str4, List<Benefit.ChannelBenefit> list, List<Benefit.IntangibleBenefit> list2) {
@@ -44,7 +46,7 @@ public final class GuildRoleSubscriptionTierViewModel extends AppViewModel<ViewS
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
         public /* synthetic */ ViewState(String str, String str2, double d, String str3, Integer num, String str4, List list, List list2, int i, DefaultConstructorMarker defaultConstructorMarker) {
-            this((i & 1) != 0 ? null : str, (i & 2) != 0 ? null : str2, (i & 4) != 0 ? 0.0d : d, (i & 8) != 0 ? null : str3, (i & 16) != 0 ? null : num, (i & 32) == 0 ? str4 : null, (i & 64) != 0 ? new ArrayList() : list, (i & 128) != 0 ? new ArrayList() : list2);
+            this((i & 1) != 0 ? null : str, (i & 2) != 0 ? null : str2, (i & 4) != 0 ? ShadowDrawableWrapper.COS_45 : d, (i & 8) != 0 ? null : str3, (i & 16) != 0 ? null : num, (i & 32) == 0 ? str4 : null, (i & 64) != 0 ? new ArrayList() : list, (i & 128) != 0 ? new ArrayList() : list2);
         }
 
         public static /* synthetic */ ViewState copy$default(ViewState viewState, String str, String str2, double d, String str3, Integer num, String str4, List list, List list2, int i, Object obj) {
@@ -174,23 +176,23 @@ public final class GuildRoleSubscriptionTierViewModel extends AppViewModel<ViewS
     }
 
     public GuildRoleSubscriptionTierViewModel() {
-        super(new ViewState(null, null, 0.0d, null, null, null, null, null, 255, null));
+        super(new ViewState(null, null, ShadowDrawableWrapper.COS_45, null, null, null, null, null, 255, null));
     }
 
     private final void addChannelBenefit(Benefit.ChannelBenefit channelBenefit) {
-        updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, null, null, u.plus((Collection<? extends Benefit.ChannelBenefit>) requireViewState().getChannelBenefits(), channelBenefit), null, 191, null));
+        updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, null, null, u.plus((Collection<? extends Benefit.ChannelBenefit>) requireViewState().getChannelBenefits(), channelBenefit), null, 191, null));
     }
 
     private final void addIntangibleBenefit(Benefit.IntangibleBenefit intangibleBenefit) {
-        updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, null, null, null, u.plus((Collection<? extends Benefit.IntangibleBenefit>) requireViewState().getIntangibleBenefits(), intangibleBenefit), 127, null));
+        updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, null, null, null, u.plus((Collection<? extends Benefit.IntangibleBenefit>) requireViewState().getIntangibleBenefits(), intangibleBenefit), 127, null));
     }
 
     private final void removeChannelBenefit(Benefit.ChannelBenefit channelBenefit) {
-        updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, null, null, u.minus(requireViewState().getChannelBenefits(), channelBenefit), null, 191, null));
+        updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, null, null, u.minus(requireViewState().getChannelBenefits(), channelBenefit), null, 191, null));
     }
 
     private final void removeIntangibleBenefit(Benefit.IntangibleBenefit intangibleBenefit) {
-        updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, null, null, null, u.minus(requireViewState().getIntangibleBenefits(), intangibleBenefit), 127, null));
+        updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, null, null, null, u.minus(requireViewState().getIntangibleBenefits(), intangibleBenefit), 127, null));
     }
 
     private final void replaceChannelBenefit(Benefit.ChannelBenefit channelBenefit, Benefit.ChannelBenefit channelBenefit2) {
@@ -200,7 +202,7 @@ public final class GuildRoleSubscriptionTierViewModel extends AppViewModel<ViewS
         int indexOf = requireViewState().getChannelBenefits().indexOf(channelBenefit);
         if (indexOf != -1) {
             asMutableList.set(indexOf, channelBenefit2);
-            updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, null, null, asMutableList, null, 191, null));
+            updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, null, null, asMutableList, null, 191, null));
         }
     }
 
@@ -211,7 +213,7 @@ public final class GuildRoleSubscriptionTierViewModel extends AppViewModel<ViewS
         int indexOf = asMutableList.indexOf(intangibleBenefit);
         if (indexOf != -1) {
             asMutableList.set(indexOf, intangibleBenefit2);
-            updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, null, null, null, asMutableList, 127, null));
+            updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, null, null, null, asMutableList, 127, null));
         }
     }
 
@@ -240,12 +242,12 @@ public final class GuildRoleSubscriptionTierViewModel extends AppViewModel<ViewS
     }
 
     public final void updateDescription(String str) {
-        m.checkNotNullParameter(str, "description");
-        updateViewState(ViewState.copy$default(requireViewState(), null, str, 0.0d, null, null, null, null, null, 253, null));
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
+        updateViewState(ViewState.copy$default(requireViewState(), null, str, ShadowDrawableWrapper.COS_45, null, null, null, null, null, 253, null));
     }
 
     public final void updateImage(String str) {
-        updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, str, null, null, null, null, 247, null));
+        updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, str, null, null, null, null, 247, null));
     }
 
     public final void updateIntangibleBenefit(Benefit.IntangibleBenefit intangibleBenefit, Benefit.IntangibleBenefit intangibleBenefit2) {
@@ -259,15 +261,15 @@ public final class GuildRoleSubscriptionTierViewModel extends AppViewModel<ViewS
     }
 
     public final void updateMemberBadge(String str) {
-        updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, null, str, null, null, 223, null));
+        updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, null, str, null, null, 223, null));
     }
 
     public final void updateMemberColor(Integer num) {
-        updateViewState(ViewState.copy$default(requireViewState(), null, null, 0.0d, null, num, null, null, null, 239, null));
+        updateViewState(ViewState.copy$default(requireViewState(), null, null, ShadowDrawableWrapper.COS_45, null, num, null, null, null, 239, null));
     }
 
     public final void updateTierName(String str) {
         m.checkNotNullParameter(str, "tierName");
-        updateViewState(ViewState.copy$default(requireViewState(), str, null, 0.0d, null, null, null, null, null, 254, null));
+        updateViewState(ViewState.copy$default(requireViewState(), str, null, ShadowDrawableWrapper.COS_45, null, null, null, null, null, 254, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier$guildId$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier$guildId$2.java
index 2d56df06f9..87796ae08f 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier$guildId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guild_role_subscriptions.tier.create;
 
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetCreateGuildRoleSubscriptionTier.kt */
@@ -17,6 +18,6 @@ public final class WidgetCreateGuildRoleSubscriptionTier$guildId$2 extends o imp
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", 0);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, 0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java
index f92f20b194..539be1e699 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java
@@ -12,6 +12,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetCreateGuildRoleSubscriptionTierBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -58,13 +59,13 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
             intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-            intent.putExtra("INTENT_EXTRA_GROUP_LISTING_ID", j2);
+            intent.putExtra(WidgetCreateGuildRoleSubscriptionTier.INTENT_EXTRA_GROUP_LISTING_ID, j2);
             l.d(context, WidgetCreateGuildRoleSubscriptionTier.class, intent);
         }
     }
 
     public WidgetCreateGuildRoleSubscriptionTier() {
-        super(2131559011);
+        super(R.layout.widget_create_guild_role_subscription_tier);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetCreateGuildRoleSubscriptionTier widgetCreateGuildRoleSubscriptionTier, CreateGuildRoleSubscriptionTierViewModel.ViewState viewState) {
@@ -98,7 +99,7 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment {
             return;
         }
         getBinding().b.b(currentStep);
-        getBinding().b.setTitle(b.k(this, 2131889446, new Object[]{Integer.valueOf(viewState.getCurrentStep() + 1), 4}, null, 4).toString());
+        getBinding().b.setTitle(b.k(this, R.string.guild_role_subscription_create_tier_step_header, new Object[]{Integer.valueOf(viewState.getCurrentStep() + 1), 4}, null, 4).toString());
         getBinding().b.setIsNextButtonEnabled(viewState.getCanProceed());
         getBinding().b.setIsDoneButtonEnabled(!viewState.isSubmitting());
         getBinding().b.setIsLoading(viewState.isSubmitting());
@@ -131,7 +132,7 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment {
                 activity.finish();
             }
         } else if (event instanceof CreateGuildRoleSubscriptionTierViewModel.Event.SubmitFailure) {
-            o.i(this, 2131888073, 0, 4);
+            o.i(this, R.string.default_failure_to_perform_action_message, 0, 4);
         }
     }
 
@@ -147,7 +148,7 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, 2131889441, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, 2131889441, 0, 0, BundleKt.bundleOf(d0.o.to("INTENT_EXTRA_BENEFITS_GUILD_ID", Long.valueOf(getGuildId()))), new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$2(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, 2131889441, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$3(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, 2131889481, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$4(this), null, null, false, false, false, 470)});
+        List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(d0.o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, Long.valueOf(getGuildId()))), new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$2(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$3(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$4(this), null, null, false, false, false, 470)});
         StepsView stepsView = getBinding().b;
         StepsView.d dVar = new StepsView.d(this, listOf);
         WidgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1 widgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1 = new WidgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1(this, listOf);
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$binding$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$binding$2.java
index 633bc9bd69..1ca1d50c85 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guild_role_subscriptions.tier.create;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierDesignBinding;
 import com.discord.widgets.guild_role_subscriptions.GuildSubscriptionRoleImageUploadView;
 import d0.z.d.k;
@@ -18,29 +19,29 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionTierDesign$binding
 
     public final WidgetGuildRoleSubscriptionTierDesignBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363580;
-        View findViewById = view.findViewById(2131363580);
+        int i = R.id.guild_role_subscription_tier_appearance_color;
+        View findViewById = view.findViewById(R.id.guild_role_subscription_tier_appearance_color);
         if (findViewById != null) {
-            i = 2131363581;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363581);
+            i = R.id.guild_role_subscription_tier_appearance_color_layout;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_role_subscription_tier_appearance_color_layout);
             if (linearLayout != null) {
-                i = 2131363582;
-                TextView textView = (TextView) view.findViewById(2131363582);
+                i = R.id.guild_role_subscription_tier_appearance_color_text;
+                TextView textView = (TextView) view.findViewById(R.id.guild_role_subscription_tier_appearance_color_text);
                 if (textView != null) {
-                    i = 2131363583;
-                    TextView textView2 = (TextView) view.findViewById(2131363583);
+                    i = R.id.guild_role_subscription_tier_appearance_subtitle;
+                    TextView textView2 = (TextView) view.findViewById(R.id.guild_role_subscription_tier_appearance_subtitle);
                     if (textView2 != null) {
-                        i = 2131363584;
-                        TextView textView3 = (TextView) view.findViewById(2131363584);
+                        i = R.id.guild_role_subscription_tier_appearance_title;
+                        TextView textView3 = (TextView) view.findViewById(R.id.guild_role_subscription_tier_appearance_title);
                         if (textView3 != null) {
-                            i = 2131363590;
-                            GuildSubscriptionRoleImageUploadView guildSubscriptionRoleImageUploadView = (GuildSubscriptionRoleImageUploadView) view.findViewById(2131363590);
+                            i = R.id.guild_role_subscription_tier_member_badge;
+                            GuildSubscriptionRoleImageUploadView guildSubscriptionRoleImageUploadView = (GuildSubscriptionRoleImageUploadView) view.findViewById(R.id.guild_role_subscription_tier_member_badge);
                             if (guildSubscriptionRoleImageUploadView != null) {
-                                i = 2131363591;
-                                GuildRoleSubscriptionMemberPreview guildRoleSubscriptionMemberPreview = (GuildRoleSubscriptionMemberPreview) view.findViewById(2131363591);
+                                i = R.id.guild_role_subscription_tier_member_preview_dark;
+                                GuildRoleSubscriptionMemberPreview guildRoleSubscriptionMemberPreview = (GuildRoleSubscriptionMemberPreview) view.findViewById(R.id.guild_role_subscription_tier_member_preview_dark);
                                 if (guildRoleSubscriptionMemberPreview != null) {
-                                    i = 2131363592;
-                                    GuildRoleSubscriptionMemberPreview guildRoleSubscriptionMemberPreview2 = (GuildRoleSubscriptionMemberPreview) view.findViewById(2131363592);
+                                    i = R.id.guild_role_subscription_tier_member_preview_light;
+                                    GuildRoleSubscriptionMemberPreview guildRoleSubscriptionMemberPreview2 = (GuildRoleSubscriptionMemberPreview) view.findViewById(R.id.guild_role_subscription_tier_member_preview_light);
                                     if (guildRoleSubscriptionMemberPreview2 != null) {
                                         return new WidgetGuildRoleSubscriptionTierDesignBinding((LinearLayout) view, findViewById, linearLayout, textView, textView2, textView3, guildSubscriptionRoleImageUploadView, guildRoleSubscriptionMemberPreview, guildRoleSubscriptionMemberPreview2);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$defaultColor$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$defaultColor$2.java
index 273f56e264..52a4ab88d9 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$defaultColor$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign$defaultColor$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guild_role_subscriptions.tier.create;
 
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
@@ -18,6 +19,6 @@ public final class WidgetGuildRoleSubscriptionTierDesign$defaultColor$2 extends
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Integer mo1invoke() {
-        return ColorCompat.getColor(this.this$0, 2131100126);
+        return ColorCompat.getColor(this.this$0, (int) R.color.primary_300);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java
index 6385da90f0..23c3f70823 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java
@@ -8,12 +8,14 @@ import android.net.Uri;
 import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.ColorInt;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierDesignBinding;
 import com.discord.dialogs.ImageUploadDialog;
@@ -22,6 +24,7 @@ import com.discord.utilities.images.MGImages;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionTierViewModel;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import d0.g;
@@ -56,7 +59,7 @@ public final class WidgetGuildRoleSubscriptionTierDesign extends AppFragment {
     }
 
     public WidgetGuildRoleSubscriptionTierDesign() {
-        super(2131559091);
+        super(R.layout.widget_guild_role_subscription_tier_design);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGuildRoleSubscriptionTierDesign widgetGuildRoleSubscriptionTierDesign, GuildRoleSubscriptionTierViewModel.ViewState viewState) {
@@ -90,15 +93,15 @@ public final class WidgetGuildRoleSubscriptionTierDesign extends AppFragment {
     }
 
     private final void launchColorPicker(@ColorInt int i) {
-        ColorPickerDialog buildColorPickerDialog = ColorPickerUtils.INSTANCE.buildColorPickerDialog(requireContext(), 2131889499, i);
+        ColorPickerDialog buildColorPickerDialog = ColorPickerUtils.INSTANCE.buildColorPickerDialog(requireContext(), R.string.guild_role_subscription_tier_design_member_color_label, i);
         buildColorPickerDialog.j = new WidgetGuildRoleSubscriptionTierDesign$launchColorPicker$$inlined$apply$lambda$1(this);
-        buildColorPickerDialog.show(getParentFragmentManager(), "DIALOG_TAG_COLOR_PICKER");
+        buildColorPickerDialog.show(getParentFragmentManager(), DIALOG_TAG_COLOR_PICKER);
     }
 
     private final void setupMemberColor(@ColorInt int i) {
         View view = getBinding().b;
         m.checkNotNullExpressionValue(view, "binding.guildRoleSubscriptionTierAppearanceColor");
-        Drawable drawable = ContextCompat.getDrawable(requireContext(), 2131232360);
+        Drawable drawable = ContextCompat.getDrawable(requireContext(), R.drawable.rounded_rectangle_4dp_radius);
         if (drawable != null) {
             drawable.mutate();
             drawable.setColorFilter(new PorterDuffColorFilter(i, PorterDuff.Mode.SRC_ATOP));
@@ -113,7 +116,7 @@ public final class WidgetGuildRoleSubscriptionTierDesign extends AppFragment {
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscri…onTierAppearanceColorText");
             StringBuilder sb = new StringBuilder();
-            sb.append('#');
+            sb.append(MentionUtilsKt.CHANNELS_CHAR);
             String x2 = c.x(i);
             Objects.requireNonNull(x2, "null cannot be cast to non-null type java.lang.String");
             String substring = x2.substring(2);
@@ -127,7 +130,7 @@ public final class WidgetGuildRoleSubscriptionTierDesign extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -137,7 +140,7 @@ public final class WidgetGuildRoleSubscriptionTierDesign extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         MGImages.requestDataUrl(getContext(), uri, str, this.memberBadgeImageSelectedResult);
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails$binding$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails$binding$2.java
index da8fdf279c..158c06449f 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildRoleSubscriptionDetailsBinding;
 import com.discord.widgets.guild_role_subscriptions.GuildSubscriptionRoleImageUploadView;
 import com.google.android.material.textfield.TextInputEditText;
@@ -21,30 +22,30 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionTierDetails$bindin
 
     public final WidgetGuildRoleSubscriptionDetailsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362859;
-        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131362859);
+        int i = R.id.create_subscription_tier_description;
+        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.create_subscription_tier_description);
         if (textInputEditText != null) {
-            i = 2131362860;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362860);
+            i = R.id.create_subscription_tier_description_layout;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.create_subscription_tier_description_layout);
             if (textInputLayout != null) {
                 ScrollView scrollView = (ScrollView) view;
-                i = 2131362862;
-                GuildSubscriptionRoleImageUploadView guildSubscriptionRoleImageUploadView = (GuildSubscriptionRoleImageUploadView) view.findViewById(2131362862);
+                i = R.id.create_subscription_tier_image_upload_view;
+                GuildSubscriptionRoleImageUploadView guildSubscriptionRoleImageUploadView = (GuildSubscriptionRoleImageUploadView) view.findViewById(R.id.create_subscription_tier_image_upload_view);
                 if (guildSubscriptionRoleImageUploadView != null) {
-                    i = 2131362863;
-                    TextInputEditText textInputEditText2 = (TextInputEditText) view.findViewById(2131362863);
+                    i = R.id.create_subscription_tier_name;
+                    TextInputEditText textInputEditText2 = (TextInputEditText) view.findViewById(R.id.create_subscription_tier_name);
                     if (textInputEditText2 != null) {
-                        i = 2131362864;
-                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362864);
+                        i = R.id.create_subscription_tier_name_layout;
+                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.create_subscription_tier_name_layout);
                         if (textInputLayout2 != null) {
-                            i = 2131362865;
-                            Spinner spinner = (Spinner) view.findViewById(2131362865);
+                            i = R.id.create_subscription_tier_price;
+                            Spinner spinner = (Spinner) view.findViewById(R.id.create_subscription_tier_price);
                             if (spinner != null) {
-                                i = 2131362866;
-                                TextView textView = (TextView) view.findViewById(2131362866);
+                                i = R.id.create_subscription_tier_subtitle;
+                                TextView textView = (TextView) view.findViewById(R.id.create_subscription_tier_subtitle);
                                 if (textView != null) {
-                                    i = 2131362867;
-                                    TextView textView2 = (TextView) view.findViewById(2131362867);
+                                    i = R.id.create_subscription_tier_title;
+                                    TextView textView2 = (TextView) view.findViewById(R.id.create_subscription_tier_title);
                                     if (textView2 != null) {
                                         return new WidgetGuildRoleSubscriptionDetailsBinding(scrollView, textInputEditText, textInputLayout, scrollView, guildSubscriptionRoleImageUploadView, textInputEditText2, textInputLayout2, spinner, textView, textView2);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java
index 535c2b5516..106a72ab47 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java
@@ -3,11 +3,13 @@ package com.discord.widgets.guild_role_subscriptions.tier.create;
 import android.content.Context;
 import android.net.Uri;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildRoleSubscriptionDetailsBinding;
 import com.discord.dialogs.ImageUploadDialog;
@@ -36,7 +38,7 @@ public final class WidgetGuildRoleSubscriptionTierDetails extends AppFragment {
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionTierViewModel.class), new WidgetGuildRoleSubscriptionTierDetails$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetGuildRoleSubscriptionTierDetails$viewModel$2.INSTANCE));
 
     public WidgetGuildRoleSubscriptionTierDetails() {
-        super(2131559087);
+        super(R.layout.widget_guild_role_subscription_details);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGuildRoleSubscriptionTierDetails widgetGuildRoleSubscriptionTierDetails, GuildRoleSubscriptionTierViewModel.ViewState viewState) {
@@ -67,7 +69,7 @@ public final class WidgetGuildRoleSubscriptionTierDetails extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -77,7 +79,7 @@ public final class WidgetGuildRoleSubscriptionTierDetails extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         MGImages.requestDataUrl(getContext(), uri, str, this.tierImageSelectedResult);
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview$binding$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview$binding$2.java
index 0f0b2442e2..5e7cc02bb2 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guild_role_subscriptions.tier.create;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierReviewBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionTierReview$binding
 
     public final WidgetGuildRoleSubscriptionTierReviewBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365385);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.subscription_tier_review_recycler);
         if (recyclerView != null) {
             return new WidgetGuildRoleSubscriptionTierReviewBinding((LinearLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365385)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.subscription_tier_review_recycler)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview.java
index bd5b3656db..2fa3631c78 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierReview.java
@@ -9,6 +9,7 @@ import c.a.e.g0;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierReviewBinding;
 import com.discord.utilities.dimen.DimenUtils;
@@ -36,7 +37,7 @@ public final class WidgetGuildRoleSubscriptionTierReview extends AppFragment {
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionTierViewModel.class), new WidgetGuildRoleSubscriptionTierReview$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetGuildRoleSubscriptionTierReview$viewModel$2.INSTANCE));
 
     public WidgetGuildRoleSubscriptionTierReview() {
-        super(2131559093);
+        super(R.layout.widget_guild_role_subscription_tier_review);
         WidgetGuildRoleSubscriptionTierReview$reviewViewModel$2 widgetGuildRoleSubscriptionTierReview$reviewViewModel$2 = WidgetGuildRoleSubscriptionTierReview$reviewViewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.reviewViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionTierReviewViewModel.class), new WidgetGuildRoleSubscriptionTierReview$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildRoleSubscriptionTierReview$reviewViewModel$2));
@@ -72,7 +73,7 @@ public final class WidgetGuildRoleSubscriptionTierReview extends AppFragment {
 
     private final void setupRecyclerView() {
         this.adapter = new GuildRoleSubscriptionTierAdapter(this, null, 2, null);
-        GuildRoleSubscriptionTierItemDecoration guildRoleSubscriptionTierItemDecoration = new GuildRoleSubscriptionTierItemDecoration(DimenUtils.dpToPixels(8), getResources().getDimensionPixelSize(2131165452));
+        GuildRoleSubscriptionTierItemDecoration guildRoleSubscriptionTierItemDecoration = new GuildRoleSubscriptionTierItemDecoration(DimenUtils.dpToPixels(8), getResources().getDimensionPixelSize(R.dimen.guild_role_subscription_setup_default_padding));
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "this");
         GuildRoleSubscriptionTierAdapter guildRoleSubscriptionTierAdapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitAdapter.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitAdapter.java
index 44a6f143d2..70c2a6357e 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitAdapter.java
@@ -9,6 +9,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.app.AppLog;
 import com.discord.databinding.ViewGuildRoleSubscriptionAddBenefitItemBinding;
@@ -218,12 +219,12 @@ public final class GuildRoleSubscriptionBenefitAdapter extends RecyclerView.Adap
             m.checkNotNullExpressionValue(a2, "ViewGuildRoleSubscriptio…(inflater, parent, false)");
             return new GuildRoleSubscriptionBenefitViewHolder.HeaderViewHolder(a2);
         } else if (i == 3) {
-            View inflate = from.inflate(2131558771, viewGroup, false);
-            int i2 = 2131363545;
-            View findViewById = inflate.findViewById(2131363545);
+            View inflate = from.inflate(R.layout.view_guild_role_subscription_add_benefit_item, viewGroup, false);
+            int i2 = R.id.guild_role_subscription_add_benefit_image_circle;
+            View findViewById = inflate.findViewById(R.id.guild_role_subscription_add_benefit_image_circle);
             if (findViewById != null) {
-                i2 = 2131363546;
-                TextView textView = (TextView) inflate.findViewById(2131363546);
+                i2 = R.id.guild_role_subscription_add_benefit_text;
+                TextView textView = (TextView) inflate.findViewById(R.id.guild_role_subscription_add_benefit_text);
                 if (textView != null) {
                     ViewGuildRoleSubscriptionAddBenefitItemBinding viewGuildRoleSubscriptionAddBenefitItemBinding = new ViewGuildRoleSubscriptionAddBenefitItemBinding((ConstraintLayout) inflate, findViewById, textView);
                     m.checkNotNullExpressionValue(viewGuildRoleSubscriptionAddBenefitItemBinding, "ViewGuildRoleSubscriptio…(inflater, parent, false)");
@@ -234,7 +235,7 @@ public final class GuildRoleSubscriptionBenefitAdapter extends RecyclerView.Adap
         } else {
             Context context = viewGroup.getContext();
             m.checkNotNullExpressionValue(context, "parent.context");
-            throw new IllegalArgumentException(b.h(context, 2131886352, new Object[]{Integer.valueOf(i)}, null, 4).toString());
+            throw new IllegalArgumentException(b.h(context, R.string.android_unknown_view_holder, new Object[]{Integer.valueOf(i)}, null, 4).toString());
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitViewHolder.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitViewHolder.java
index 85abd4b7e3..b5980fe061 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/GuildRoleSubscriptionBenefitViewHolder.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.ViewGuildRoleSubscriptionAddBenefitItemBinding;
 import com.discord.databinding.ViewGuildRoleSubscriptionBenefitItemBinding;
 import com.discord.databinding.ViewGuildRoleSubscriptionSectionHeaderItemBinding;
@@ -50,11 +51,11 @@ public abstract class GuildRoleSubscriptionBenefitViewHolder extends RecyclerVie
             if (addBenefitItem.getType() == GuildRoleSubscriptionBenefitAdapterItem.Type.Channel) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                str = view.getContext().getString(2131889491);
+                str = view.getContext().getString(R.string.guild_role_subscription_tier_benefits_add_channel_label);
             } else {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                str = view2.getContext().getString(2131889490);
+                str = view2.getContext().getString(R.string.guild_role_subscription_tier_benefits_add_benefit_label);
             }
             m.checkNotNullExpressionValue(str, "if (data.type == GuildRo…dd_benefit_label)\n      }");
             TextView textView = this.binding.b;
@@ -82,7 +83,7 @@ public abstract class GuildRoleSubscriptionBenefitViewHolder extends RecyclerVie
         @Override // com.discord.widgets.guild_role_subscriptions.tier.create.benefits.GuildRoleSubscriptionBenefitViewHolder
         public void configure(GuildRoleSubscriptionBenefitAdapterItem guildRoleSubscriptionBenefitAdapterItem) {
             m.checkNotNullParameter(guildRoleSubscriptionBenefitAdapterItem, "benefitAdapterItem");
-            this.binding.a.setText(((GuildRoleSubscriptionBenefitAdapterItem.Header) guildRoleSubscriptionBenefitAdapterItem).getType() == GuildRoleSubscriptionBenefitAdapterItem.Type.Channel ? 2131889512 : 2131889489);
+            this.binding.a.setText(((GuildRoleSubscriptionBenefitAdapterItem.Header) guildRoleSubscriptionBenefitAdapterItem).getType() == GuildRoleSubscriptionBenefitAdapterItem.Type.Channel ? R.string.guild_role_subscription_tier_exclusive_channels_section_title : R.string.guild_role_subscription_tier_additional_benefits_section_title);
         }
     }
 
@@ -117,7 +118,7 @@ public abstract class GuildRoleSubscriptionBenefitViewHolder extends RecyclerVie
             m.checkNotNullExpressionValue(view, "itemView");
             Context context = view.getContext();
             m.checkNotNullExpressionValue(context, "itemView.context");
-            this.emojiSizePx = context.getResources().getDimensionPixelSize(2131165450);
+            this.emojiSizePx = context.getResources().getDimensionPixelSize(R.dimen.guild_role_subscription_benefit_emoji_size);
         }
 
         public static final /* synthetic */ GuildRoleSubscriptionBenefitAdapter.ItemClickListener access$getItemClickListener$p(ItemViewHolder itemViewHolder) {
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$binding$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$binding$2.java
index 86837b8c3f..6d19095763 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guild_role_subscriptions.tier.create.benefits;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierBenefitsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionTierBenefits$bindi
 
     public final WidgetGuildRoleSubscriptionTierBenefitsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365384);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.subscription_tier_benefits_recycler);
         if (recyclerView != null) {
             return new WidgetGuildRoleSubscriptionTierBenefitsBinding((LinearLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365384)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.subscription_tier_benefits_recycler)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java
index 9a83adfdf1..7d24768618 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java
@@ -17,6 +17,6 @@ public final class WidgetGuildRoleSubscriptionTierBenefits$guildId$2 extends o i
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_BENEFITS_GUILD_ID", 0);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, 0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java
index 835b330101..104ac9834e 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java
@@ -11,6 +11,7 @@ import c.a.e.g0;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierBenefitsBinding;
 import com.discord.utilities.dimen.DimenUtils;
@@ -70,7 +71,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefits extends AppFragment {
     }
 
     public WidgetGuildRoleSubscriptionTierBenefits() {
-        super(2131559089);
+        super(R.layout.widget_guild_role_subscription_tier_benefits);
         WidgetGuildRoleSubscriptionTierBenefits$benefitsViewModel$2 widgetGuildRoleSubscriptionTierBenefits$benefitsViewModel$2 = new WidgetGuildRoleSubscriptionTierBenefits$benefitsViewModel$2(this);
         h0 h0Var = new h0(this);
         this.benefitsViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionTierBenefitsViewModel.class), new WidgetGuildRoleSubscriptionTierBenefits$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildRoleSubscriptionTierBenefits$benefitsViewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/GuildRoleSubscriptionTierChannelBenefitViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/GuildRoleSubscriptionTierChannelBenefitViewModel.java
index a55afbfbef..acac1c9069 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/GuildRoleSubscriptionTierChannelBenefitViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/GuildRoleSubscriptionTierChannelBenefitViewModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guild_role_subscriptions.tier.create.benefits.channe
 import androidx.annotation.DrawableRes;
 import c.d.b.a.a;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.widgets.guild_role_subscriptions.tier.model.Benefit;
 import d0.g0.t;
@@ -296,7 +297,7 @@ public final class GuildRoleSubscriptionTierChannelBenefitViewModel extends AppV
     }
 
     public final void updateDescription(String str) {
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         updateViewState(ViewState.copy$default(requireViewState(), false, null, null, null, null, str, 31, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$binding$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$binding$2.java
index 5b648df2e7..1a4325b150 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierChannelBenefitBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -21,35 +22,35 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionTierChannelBenefit
 
     public final WidgetGuildRoleSubscriptionTierChannelBenefitBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363547;
-        TextView textView = (TextView) view.findViewById(2131363547);
+        int i = R.id.guild_role_subscription_benefit_channel;
+        TextView textView = (TextView) view.findViewById(R.id.guild_role_subscription_benefit_channel);
         if (textView != null) {
-            i = 2131363551;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363551);
+            i = R.id.guild_role_subscription_channel_benefit_cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_role_subscription_channel_benefit_cancel);
             if (materialButton != null) {
-                i = 2131363552;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363552);
+                i = R.id.guild_role_subscription_channel_benefit_description;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_role_subscription_channel_benefit_description);
                 if (textInputLayout != null) {
-                    i = 2131363553;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363553);
+                    i = R.id.guild_role_subscription_channel_benefit_emoji;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guild_role_subscription_channel_benefit_emoji);
                     if (simpleDraweeView != null) {
-                        i = 2131363554;
-                        TextView textView2 = (TextView) view.findViewById(2131363554);
+                        i = R.id.guild_role_subscription_channel_benefit_emoji_name;
+                        TextView textView2 = (TextView) view.findViewById(R.id.guild_role_subscription_channel_benefit_emoji_name);
                         if (textView2 != null) {
-                            i = 2131363555;
-                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363555);
+                            i = R.id.guild_role_subscription_channel_benefit_remove;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.guild_role_subscription_channel_benefit_remove);
                             if (materialButton2 != null) {
-                                i = 2131363556;
-                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363556);
+                                i = R.id.guild_role_subscription_channel_benefit_save;
+                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.guild_role_subscription_channel_benefit_save);
                                 if (materialButton3 != null) {
-                                    i = 2131363557;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363557);
+                                    i = R.id.guild_role_subscription_channel_benefit_select_emoji;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_role_subscription_channel_benefit_select_emoji);
                                     if (linearLayout != null) {
-                                        i = 2131363558;
-                                        TextView textView3 = (TextView) view.findViewById(2131363558);
+                                        i = R.id.guild_role_subscription_channel_benefit_subtitle;
+                                        TextView textView3 = (TextView) view.findViewById(R.id.guild_role_subscription_channel_benefit_subtitle);
                                         if (textView3 != null) {
-                                            i = 2131363559;
-                                            TextView textView4 = (TextView) view.findViewById(2131363559);
+                                            i = R.id.guild_role_subscription_channel_benefit_title;
+                                            TextView textView4 = (TextView) view.findViewById(R.id.guild_role_subscription_channel_benefit_title);
                                             if (textView4 != null) {
                                                 return new WidgetGuildRoleSubscriptionTierChannelBenefitBinding((CoordinatorLayout) view, textView, materialButton, textInputLayout, simpleDraweeView, textView2, materialButton2, materialButton3, linearLayout, textView3, textView4);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$guildId$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$guildId$2.java
index f630cbe56e..9081c0f9e1 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit$guildId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guild_role_subscriptions.tier.create.benefits.channel;
 
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetGuildRoleSubscriptionTierChannelBenefit.kt */
@@ -17,6 +18,6 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit$guildId$2 exten
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java
index cac62915a6..67015e1d02 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java
@@ -13,6 +13,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierChannelBenefitBinding;
 import com.discord.models.domain.emoji.Emoji;
@@ -79,7 +80,7 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit extends AppFrag
             l lVar = l.g;
             Intent intent = new Intent();
             intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-            intent.putExtra("INTENT_EXTRA_EXISTING_CHANNEL_BENEFIT", channelBenefit);
+            intent.putExtra(WidgetGuildRoleSubscriptionTierChannelBenefit.INTENT_EXTRA_EXISTING_CHANNEL_BENEFIT, channelBenefit);
             lVar.f(context, activityResultLauncher, WidgetGuildRoleSubscriptionTierChannelBenefit.class, intent);
         }
 
@@ -93,7 +94,7 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit extends AppFrag
     }
 
     public WidgetGuildRoleSubscriptionTierChannelBenefit() {
-        super(2131559090);
+        super(R.layout.widget_guild_role_subscription_tier_channel_benefit);
         WidgetGuildRoleSubscriptionTierChannelBenefit$viewModel$2 widgetGuildRoleSubscriptionTierChannelBenefit$viewModel$2 = new WidgetGuildRoleSubscriptionTierChannelBenefit$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionTierChannelBenefitViewModel.class), new WidgetGuildRoleSubscriptionTierChannelBenefit$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildRoleSubscriptionTierChannelBenefit$viewModel$2));
@@ -127,12 +128,12 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit extends AppFrag
     private final void configureUI(GuildRoleSubscriptionTierChannelBenefitViewModel.ViewState viewState) {
         String str;
         Emoji emoji = viewState.getEmoji();
-        String imageUri = emoji != null ? emoji.getImageUri(false, f.coerceAtMost(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165451)), 64), requireContext()) : null;
+        String imageUri = emoji != null ? emoji.getImageUri(false, f.coerceAtMost(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.guild_role_subscription_create_benefit_emoji_size)), 64), requireContext()) : null;
         SimpleDraweeView simpleDraweeView = getBinding().e;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildRoleSubscriptionChannelBenefitEmoji");
         MGImages.setImage$default(simpleDraweeView, imageUri, 0, 0, true, null, null, 108, null);
         if (emoji == null || (str = emoji.getFirstName()) == null) {
-            str = getString(2131889494);
+            str = getString(R.string.guild_role_subscription_tier_benefits_emoji_placeholder);
             m.checkNotNullExpressionValue(str, "getString(R.string.guild…nefits_emoji_placeholder)");
         }
         TextView textView = getBinding().f;
@@ -150,7 +151,7 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit extends AppFrag
         TextView textView3 = getBinding().b;
         m.checkNotNullExpressionValue(textView3, "binding.guildRoleSubscriptionBenefitChannel");
         Integer channelIconResId = viewState.getChannelIconResId();
-        ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, channelIconResId != null ? channelIconResId.intValue() : 0, 0, 2131232121, 0, 10, null);
+        ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, channelIconResId != null ? channelIconResId.intValue() : 0, 0, R.drawable.icon_carrot, 0, 10, null);
         getBinding().b.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$configureUI$1(this, viewState));
         MaterialButton materialButton = getBinding().h;
         m.checkNotNullExpressionValue(materialButton, "binding.guildRoleSubscriptionChannelBenefitSave");
@@ -177,8 +178,8 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit extends AppFrag
         if (event instanceof GuildRoleSubscriptionTierChannelBenefitViewModel.Event.SendResult) {
             FragmentActivity requireActivity = requireActivity();
             Intent intent = new Intent();
-            intent.putExtra("RESULT_EXTRA_EXISTING_CHANNEL_BENEFIT", getExistingChannelBenefit());
-            intent.putExtra("RESULT_EXTRA_CHANNEL_BENEFIT", ((GuildRoleSubscriptionTierChannelBenefitViewModel.Event.SendResult) event).getChannelBenefit());
+            intent.putExtra(RESULT_EXTRA_EXISTING_CHANNEL_BENEFIT, getExistingChannelBenefit());
+            intent.putExtra(RESULT_EXTRA_CHANNEL_BENEFIT, ((GuildRoleSubscriptionTierChannelBenefitViewModel.Event.SendResult) event).getChannelBenefit());
             requireActivity.setResult(-1, intent);
             AppFragment.hideKeyboard$default(this, null, 1, null);
             requireActivity.finish();
@@ -189,7 +190,7 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit extends AppFrag
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        WidgetChannelPickerBottomSheet.Companion.registerForResult(this, "REQUEST_KEY_CHANNEL_PICKER", new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$1(this), new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$2(this));
+        WidgetChannelPickerBottomSheet.Companion.registerForResult(this, REQUEST_KEY_CHANNEL_PICKER, new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$1(this), new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$2(this));
         getBinding().h.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$3(this));
         getBinding().f1836c.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$4(this));
         getBinding().i.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$5(this));
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/GuildRoleSubscriptionTierIntangibleBenefitViewModel.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/GuildRoleSubscriptionTierIntangibleBenefitViewModel.java
index f8e8795e87..e86ffda61d 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/GuildRoleSubscriptionTierIntangibleBenefitViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/GuildRoleSubscriptionTierIntangibleBenefitViewModel.java
@@ -2,6 +2,7 @@ package com.discord.widgets.guild_role_subscriptions.tier.create.benefits.intang
 
 import c.d.b.a.a;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.widgets.guild_role_subscriptions.tier.model.Benefit;
 import d0.g0.t;
@@ -251,12 +252,12 @@ public final class GuildRoleSubscriptionTierIntangibleBenefitViewModel extends A
     }
 
     public final void updateDescription(String str) {
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         updateViewStateWithCanSubmitResult(ViewState.copy$default(requireViewState(), null, null, str, false, 11, null));
     }
 
     public final void updateName(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         updateViewStateWithCanSubmitResult(ViewState.copy$default(requireViewState(), str, null, null, false, 14, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit$binding$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit$binding$2.java
index 650e2be74b..7f7cd9dcbc 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -22,41 +23,41 @@ public final /* synthetic */ class WidgetGuildRoleSubscriptionTierIntangibleBene
 
     public final WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363560;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363560);
+        int i = R.id.guild_role_subscription_intangible_benefit_cancel;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_role_subscription_intangible_benefit_cancel);
         if (materialButton != null) {
-            i = 2131363561;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363561);
+            i = R.id.guild_role_subscription_intangible_benefit_description;
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.guild_role_subscription_intangible_benefit_description);
             if (textInputEditText != null) {
-                i = 2131363562;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363562);
+                i = R.id.guild_role_subscription_intangible_benefit_description_layout;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_role_subscription_intangible_benefit_description_layout);
                 if (textInputLayout != null) {
-                    i = 2131363563;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363563);
+                    i = R.id.guild_role_subscription_intangible_benefit_emoji;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guild_role_subscription_intangible_benefit_emoji);
                     if (simpleDraweeView != null) {
-                        i = 2131363564;
-                        TextView textView = (TextView) view.findViewById(2131363564);
+                        i = R.id.guild_role_subscription_intangible_benefit_emoji_name;
+                        TextView textView = (TextView) view.findViewById(R.id.guild_role_subscription_intangible_benefit_emoji_name);
                         if (textView != null) {
-                            i = 2131363565;
-                            TextInputEditText textInputEditText2 = (TextInputEditText) view.findViewById(2131363565);
+                            i = R.id.guild_role_subscription_intangible_benefit_name;
+                            TextInputEditText textInputEditText2 = (TextInputEditText) view.findViewById(R.id.guild_role_subscription_intangible_benefit_name);
                             if (textInputEditText2 != null) {
-                                i = 2131363566;
-                                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363566);
+                                i = R.id.guild_role_subscription_intangible_benefit_name_layout;
+                                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.guild_role_subscription_intangible_benefit_name_layout);
                                 if (textInputLayout2 != null) {
-                                    i = 2131363567;
-                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363567);
+                                    i = R.id.guild_role_subscription_intangible_benefit_remove;
+                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.guild_role_subscription_intangible_benefit_remove);
                                     if (materialButton2 != null) {
-                                        i = 2131363568;
-                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363568);
+                                        i = R.id.guild_role_subscription_intangible_benefit_save;
+                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.guild_role_subscription_intangible_benefit_save);
                                         if (materialButton3 != null) {
-                                            i = 2131363569;
-                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363569);
+                                            i = R.id.guild_role_subscription_intangible_benefit_select_emoji;
+                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_role_subscription_intangible_benefit_select_emoji);
                                             if (linearLayout != null) {
-                                                i = 2131363570;
-                                                TextView textView2 = (TextView) view.findViewById(2131363570);
+                                                i = R.id.guild_role_subscription_intangible_benefit_subtitle;
+                                                TextView textView2 = (TextView) view.findViewById(R.id.guild_role_subscription_intangible_benefit_subtitle);
                                                 if (textView2 != null) {
-                                                    i = 2131363571;
-                                                    TextView textView3 = (TextView) view.findViewById(2131363571);
+                                                    i = R.id.guild_role_subscription_intangible_benefit_title;
+                                                    TextView textView3 = (TextView) view.findViewById(R.id.guild_role_subscription_intangible_benefit_title);
                                                     if (textView3 != null) {
                                                         return new WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding((CoordinatorLayout) view, materialButton, textInputEditText, textInputLayout, simpleDraweeView, textView, textInputEditText2, textInputLayout2, materialButton2, materialButton3, linearLayout, textView2, textView3);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java
index 5775585edd..a2a8c00388 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java
@@ -13,6 +13,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding;
 import com.discord.models.domain.emoji.Emoji;
@@ -73,7 +74,7 @@ public final class WidgetGuildRoleSubscriptionTierIntangibleBenefit extends AppF
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             l lVar = l.g;
             Intent intent = new Intent();
-            intent.putExtra("extra_intangible_benefit", intangibleBenefit);
+            intent.putExtra(WidgetGuildRoleSubscriptionTierIntangibleBenefit.INTENT_EXTRA_EXISTING_INTANGIBLE_BENEFIT, intangibleBenefit);
             lVar.f(context, activityResultLauncher, WidgetGuildRoleSubscriptionTierIntangibleBenefit.class, intent);
         }
 
@@ -87,7 +88,7 @@ public final class WidgetGuildRoleSubscriptionTierIntangibleBenefit extends AppF
     }
 
     public WidgetGuildRoleSubscriptionTierIntangibleBenefit() {
-        super(2131559092);
+        super(R.layout.widget_guild_role_subscription_tier_intangible_benefit);
         WidgetGuildRoleSubscriptionTierIntangibleBenefit$viewModel$2 widgetGuildRoleSubscriptionTierIntangibleBenefit$viewModel$2 = new WidgetGuildRoleSubscriptionTierIntangibleBenefit$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildRoleSubscriptionTierIntangibleBenefitViewModel.class), new WidgetGuildRoleSubscriptionTierIntangibleBenefit$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildRoleSubscriptionTierIntangibleBenefit$viewModel$2));
@@ -112,12 +113,12 @@ public final class WidgetGuildRoleSubscriptionTierIntangibleBenefit extends AppF
     private final void configureUI(GuildRoleSubscriptionTierIntangibleBenefitViewModel.ViewState viewState) {
         String str;
         Emoji emoji = viewState.getEmoji();
-        String imageUri = emoji != null ? emoji.getImageUri(false, f.coerceAtMost(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165451)), 64), requireContext()) : null;
+        String imageUri = emoji != null ? emoji.getImageUri(false, f.coerceAtMost(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.guild_role_subscription_create_benefit_emoji_size)), 64), requireContext()) : null;
         SimpleDraweeView simpleDraweeView = getBinding().e;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildRoleSubscri…ionIntangibleBenefitEmoji");
         MGImages.setImage$default(simpleDraweeView, imageUri, 0, 0, true, null, null, 108, null);
         if (emoji == null || (str = emoji.getFirstName()) == null) {
-            str = getString(2131889494);
+            str = getString(R.string.guild_role_subscription_tier_benefits_emoji_placeholder);
             m.checkNotNullExpressionValue(str, "getString(R.string.guild…nefits_emoji_placeholder)");
         }
         TextView textView = getBinding().f;
@@ -150,8 +151,8 @@ public final class WidgetGuildRoleSubscriptionTierIntangibleBenefit extends AppF
         if (event instanceof GuildRoleSubscriptionTierIntangibleBenefitViewModel.Event.SendResult) {
             FragmentActivity requireActivity = requireActivity();
             Intent intent = new Intent();
-            intent.putExtra("RESULT_EXTRA_EXISTING_INTANGIBLE_BENEFIT", getExistingIntangibleBenefit());
-            intent.putExtra("RESULT_EXTRA_INTANGIBLE_BENEFIT", ((GuildRoleSubscriptionTierIntangibleBenefitViewModel.Event.SendResult) event).getIntangibleBenefit());
+            intent.putExtra(RESULT_EXTRA_EXISTING_INTANGIBLE_BENEFIT, getExistingIntangibleBenefit());
+            intent.putExtra(RESULT_EXTRA_INTANGIBLE_BENEFIT, ((GuildRoleSubscriptionTierIntangibleBenefitViewModel.Event.SendResult) event).getIntangibleBenefit());
             requireActivity.setResult(-1, intent);
             AppFragment.hideKeyboard$default(this, null, 1, null);
             requireActivity.finish();
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java
index 9b6aa9df1e..ee301cbb82 100644
--- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java
@@ -7,6 +7,7 @@ import androidx.annotation.DrawableRes;
 import c.d.b.a.a;
 import com.discord.api.guildrolesubscription.GuildRoleSubscriptionBenefit;
 import com.discord.api.guildrolesubscription.GuildRoleSubscriptionBenefitType;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.Emoji;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -213,7 +214,7 @@ public abstract class Benefit implements Parcelable {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public IntangibleBenefit(String str, Emoji emoji, String str2) {
             super(null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(emoji, "emoji");
             this.name = str;
             this.emoji = emoji;
@@ -251,7 +252,7 @@ public abstract class Benefit implements Parcelable {
         }
 
         public final IntangibleBenefit copy(String str, Emoji emoji, String str2) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(emoji, "emoji");
             return new IntangibleBenefit(str, emoji, str2);
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java
index 65ee968088..801dfd12ac 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildFolderSettingsBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -20,20 +21,20 @@ public final /* synthetic */ class WidgetGuildFolderSettings$binding$2 extends k
 
     public final WidgetGuildFolderSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363052;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363052);
+        int i = R.id.edit_guild_folder_name;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.edit_guild_folder_name);
         if (textInputLayout != null) {
-            i = 2131363456;
-            TextView textView = (TextView) view.findViewById(2131363456);
+            i = R.id.guild_folder_color_name;
+            TextView textView = (TextView) view.findViewById(R.id.guild_folder_color_name);
             if (textView != null) {
-                i = 2131363457;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363457);
+                i = R.id.guild_folder_settings_color;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.guild_folder_settings_color);
                 if (relativeLayout != null) {
-                    i = 2131363458;
-                    View findViewById = view.findViewById(2131363458);
+                    i = R.id.guild_folder_settings_color_display;
+                    View findViewById = view.findViewById(R.id.guild_folder_settings_color_display);
                     if (findViewById != null) {
-                        i = 2131363459;
-                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363459);
+                        i = R.id.guild_folder_settings_save;
+                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.guild_folder_settings_save);
                         if (floatingActionButton != null) {
                             return new WidgetGuildFolderSettingsBinding((CoordinatorLayout) view, textInputLayout, textView, relativeLayout, findViewById, floatingActionButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$launchColorPicker$1.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$launchColorPicker$1.java
index 81f6a12634..208bdc52c3 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$launchColorPicker$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$launchColorPicker$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.guilds;
 
 import c.k.a.a.f;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 /* compiled from: WidgetGuildFolderSettings.kt */
 public final class WidgetGuildFolderSettings$launchColorPicker$1 implements f {
@@ -12,7 +13,7 @@ public final class WidgetGuildFolderSettings$launchColorPicker$1 implements f {
 
     @Override // c.k.a.a.f
     public void onColorReset(int i) {
-        WidgetGuildFolderSettings.access$getViewModel$p(this.this$0).setColor(Integer.valueOf(WidgetGuildFolderSettings.access$argbColorToRGB(this.this$0, ColorCompat.getThemedColor(this.this$0.getContext(), 2130968995))));
+        WidgetGuildFolderSettings.access$getViewModel$p(this.this$0).setColor(Integer.valueOf(WidgetGuildFolderSettings.access$argbColorToRGB(this.this$0, ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.color_brand))));
     }
 
     @Override // c.k.a.a.f
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
index dfc5bc4121..30d2bc57cf 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
@@ -22,6 +22,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildFolderSettingsBinding;
 import com.discord.utilities.color.ColorCompat;
@@ -30,6 +31,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.guilds.WidgetGuildFolderSettingsViewModel;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -70,7 +72,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
     }
 
     public WidgetGuildFolderSettings() {
-        super(2131559071);
+        super(R.layout.widget_guild_folder_settings);
         WidgetGuildFolderSettings$viewModel$2 widgetGuildFolderSettings$viewModel$2 = new WidgetGuildFolderSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildFolderSettingsViewModel.class), new WidgetGuildFolderSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildFolderSettings$viewModel$2));
@@ -105,7 +107,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
         if (viewState instanceof WidgetGuildFolderSettingsViewModel.ViewState.Loaded) {
             View view = getBinding().e;
             m.checkNotNullExpressionValue(view, "binding.guildFolderSettingsColorDisplay");
-            Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231112);
+            Drawable drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.drawable_circle_white_1);
             WidgetGuildFolderSettingsViewModel.ViewState.Loaded loaded = (WidgetGuildFolderSettingsViewModel.ViewState.Loaded) viewState;
             Integer rgbColorToARGB = rgbColorToARGB(loaded.getFormState().getColor());
             if (rgbColorToARGB != null) {
@@ -113,7 +115,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
             } else {
                 View view2 = getBinding().e;
                 m.checkNotNullExpressionValue(view2, "binding.guildFolderSettingsColorDisplay");
-                i = ColorCompat.getThemedColor(view2, 2130968995);
+                i = ColorCompat.getThemedColor(view2, (int) R.attr.color_brand);
             }
             if (drawable != null) {
                 drawable.setColorFilter(new PorterDuffColorFilter(i, PorterDuff.Mode.SRC_ATOP));
@@ -149,7 +151,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
             TextView textView = getBinding().f1819c;
             m.checkNotNullExpressionValue(textView, "binding.guildFolderColorName");
             StringBuilder sb = new StringBuilder();
-            sb.append('#');
+            sb.append(MentionUtilsKt.CHANNELS_CHAR);
             String x2 = c.x(i);
             Objects.requireNonNull(x2, "null cannot be cast to non-null type java.lang.String");
             String substring = x2.substring(2);
@@ -178,7 +180,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
 
     @ColorInt
     private final int[] getColorsToDisplay(@ColorInt int i) {
-        int[] intArray = getResources().getIntArray(2130903044);
+        int[] intArray = getResources().getIntArray(R.array.color_picker_palette);
         m.checkNotNullExpressionValue(intArray, "resources.getIntArray(R.…ray.color_picker_palette)");
         ArrayList arrayList = new ArrayList();
         boolean z2 = false;
@@ -218,34 +220,34 @@ public final class WidgetGuildFolderSettings extends AppFragment {
 
     private final void launchColorPicker(WidgetGuildFolderSettingsViewModel.ViewState.Loaded loaded) {
         Integer rgbColorToARGB = rgbColorToARGB(loaded.getFormState().getColor());
-        int intValue = rgbColorToARGB != null ? rgbColorToARGB.intValue() : ColorCompat.getThemedColor(getContext(), 2130968995);
+        int intValue = rgbColorToARGB != null ? rgbColorToARGB.intValue() : ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand);
         ColorPickerDialog.k kVar = new ColorPickerDialog.k();
         kVar.h = intValue;
-        kVar.f2413s = ColorCompat.getThemedColor(getContext(), 2130968904);
+        kVar.f2413s = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundPrimary);
         kVar.i = false;
         kVar.g = getColorsToDisplay(intValue);
-        kVar.a = 2131889319;
-        kVar.r = ColorCompat.getThemedColor(getContext(), 2130968932);
+        kVar.a = R.string.guild_folder_color;
+        kVar.r = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f2414x = fontUtils.getThemedFontResId(getContext(), 2130969322);
-        kVar.o = ColorCompat.getThemedColor(getContext(), 2130968892);
-        kVar.f2412c = 2131887434;
-        kVar.v = ColorCompat.getColor(getContext(), 2131100433);
-        kVar.b = 2131887435;
-        kVar.p = ColorCompat.getThemedColor(getContext(), 2130968995);
-        kVar.d = 2131893521;
+        kVar.f2414x = fontUtils.getThemedFontResId(getContext(), R.attr.font_display_bold);
+        kVar.o = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundAccent);
+        kVar.f2412c = R.string.color_picker_custom;
+        kVar.v = ColorCompat.getColor(getContext(), (int) R.color.white);
+        kVar.b = R.string.color_picker_presets;
+        kVar.p = ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand);
+        kVar.d = R.string.select;
         kVar.l = true;
-        kVar.e = 2131893022;
-        kVar.w = ColorCompat.getColor(getContext(), 2131100433);
-        kVar.f2415y = fontUtils.getThemedFontResId(getContext(), 2130969328);
-        kVar.q = ColorCompat.getThemedColor(getContext(), 2130968900);
-        kVar.t = ColorCompat.getThemedColor(getContext(), 2130968989);
-        kVar.u = 2131231123;
-        kVar.f2416z = fontUtils.getThemedFontResId(getContext(), 2130969327);
+        kVar.e = R.string.reset;
+        kVar.w = ColorCompat.getColor(getContext(), (int) R.color.white);
+        kVar.f2415y = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_semibold);
+        kVar.q = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundModifierAccent);
+        kVar.t = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorTextMuted);
+        kVar.u = R.drawable.drawable_cpv_edit_text_background;
+        kVar.f2416z = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_normal);
         ColorPickerDialog a = kVar.a();
         a.j = new WidgetGuildFolderSettings$launchColorPicker$1(this);
         AppFragment.hideKeyboard$default(this, null, 1, null);
-        a.show(getParentFragmentManager(), "DIALOG_TAG_COLOR_PICKER");
+        a.show(getParentFragmentManager(), DIALOG_TAG_COLOR_PICKER);
     }
 
     private final Integer rgbColorToARGB(Integer num) {
@@ -260,7 +262,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131893563);
+        setActionBarTitle(R.string.server_folder_settings);
     }
 
     @Override // com.discord.app.AppFragment
@@ -272,7 +274,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetGuildFolderSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildFolderSettings$onViewBoundOrOnResume$2(this), 62, (Object) null);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        Fragment findFragmentByTag = parentFragmentManager.findFragmentByTag("DIALOG_TAG_COLOR_PICKER");
+        Fragment findFragmentByTag = parentFragmentManager.findFragmentByTag(DIALOG_TAG_COLOR_PICKER);
         if (findFragmentByTag != null) {
             parentFragmentManager.beginTransaction().remove(findFragmentByTag).commit();
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
index 99a8ff8390..271e00e63b 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
@@ -2,7 +2,9 @@ package com.discord.widgets.guilds;
 
 import android.content.Context;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelGuildFolder;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreGuildsSorted;
@@ -469,12 +471,12 @@ public final class WidgetGuildFolderSettingsViewModel extends AppViewModel<ViewS
 
     private final void emitUpdateFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.UpdateFolderSettingsFailure(2131888073));
+        publishSubject.j.onNext(new Event.UpdateFolderSettingsFailure(R.string.default_failure_to_perform_action_message));
     }
 
     private final void emitUpdateSuccessEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.UpdateFolderSettingsSuccess(2131889324));
+        publishSubject.j.onNext(new Event.UpdateFolderSettingsSuccess(R.string.guild_folder_updated_success));
     }
 
     private final void handleStoreState(StoreState storeState) {
@@ -565,7 +567,7 @@ public final class WidgetGuildFolderSettingsViewModel extends AppViewModel<ViewS
     }
 
     public final void setName(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Loaded)) {
             viewState = null;
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$Companion$registerForResult$1.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$Companion$registerForResult$1.java
index 51dbb6e87d..96cf3c388a 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$Companion$registerForResult$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$Companion$registerForResult$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.guilds;
 
 import android.os.Bundle;
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -32,7 +33,7 @@ public final class WidgetGuildSelector$Companion$registerForResult$1 extends o i
         m.checkNotNullParameter(bundle, "bundle");
         if (m.areEqual(this.$requestKey, str)) {
             String string = bundle.getString("INTENT_EXTRA_GUILD_NAME", "");
-            long j = bundle.getLong("INTENT_EXTRA_GUILD_ID", -1);
+            long j = bundle.getLong(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
             if (j > 0 || this.$allowNullGuild) {
                 Function2 function2 = this.$onGuildSelected;
                 Long valueOf = Long.valueOf(j);
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java
index ae0f5266f6..4ff33bc494 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildSelectorBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetGuildSelector$binding$2 extends k imple
 
     public final WidgetGuildSelectorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363438;
-        TextView textView = (TextView) view.findViewById(2131363438);
+        int i = R.id.guild_actions_overview_header_tv;
+        TextView textView = (TextView) view.findViewById(R.id.guild_actions_overview_header_tv);
         if (textView != null) {
-            i = 2131363629;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363629);
+            i = R.id.guild_selector_list;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_selector_list);
             if (recyclerView != null) {
                 return new WidgetGuildSelectorBinding((NestedScrollView) view, textView, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java
index f93f703b00..c527fb6b5f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java
@@ -14,6 +14,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetGuildSelectorBinding;
 import com.discord.databinding.WidgetGuildSelectorItemBinding;
@@ -74,17 +75,17 @@ public final class WidgetGuildSelector extends AppBottomSheet {
                 m.checkNotNullParameter(adapter, "adapter");
                 this.noGuildStringId = i2;
                 View view = this.itemView;
-                int i3 = 2131363851;
-                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363851);
+                int i3 = R.id.item_avatar_wrap;
+                FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.item_avatar_wrap);
                 if (frameLayout != null) {
-                    i3 = 2131363889;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363889);
+                    i3 = R.id.item_icon;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.item_icon);
                     if (simpleDraweeView != null) {
-                        i3 = 2131363921;
-                        TextView textView = (TextView) view.findViewById(2131363921);
+                        i3 = R.id.item_name;
+                        TextView textView = (TextView) view.findViewById(R.id.item_name);
                         if (textView != null) {
-                            i3 = 2131363924;
-                            TextView textView2 = (TextView) view.findViewById(2131363924);
+                            i3 = R.id.item_text;
+                            TextView textView2 = (TextView) view.findViewById(R.id.item_text);
                             if (textView2 != null) {
                                 WidgetGuildSelectorItemBinding widgetGuildSelectorItemBinding = new WidgetGuildSelectorItemBinding((LinearLayout) view, frameLayout, simpleDraweeView, textView, textView2);
                                 m.checkNotNullExpressionValue(widgetGuildSelectorItemBinding, "WidgetGuildSelectorItemBinding.bind(itemView)");
@@ -134,10 +135,10 @@ public final class WidgetGuildSelector extends AppBottomSheet {
                 Guild guild4 = item.getGuild();
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                Integer valueOf = Integer.valueOf(ColorCompat.getThemedColor(view, 2130968904));
+                Integer valueOf = Integer.valueOf(ColorCompat.getThemedColor(view, (int) R.attr.colorBackgroundPrimary));
                 SimpleDraweeView simpleDraweeView2 = this.binding.f1841c;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.itemIcon");
-                SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, false, guild4, (float) simpleDraweeView2.getResources().getDimensionPixelSize(2131165446), null, valueOf, null, null, true, null, 360, null);
+                SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, false, guild4, (float) simpleDraweeView2.getResources().getDimensionPixelSize(R.dimen.guild_icon_radius), null, valueOf, null, null, true, null, 360, null);
                 FrameLayout frameLayout = this.binding.b;
                 m.checkNotNullExpressionValue(frameLayout, "binding.itemAvatarWrap");
                 frameLayout.setClipToOutline(true);
@@ -166,7 +167,7 @@ public final class WidgetGuildSelector extends AppBottomSheet {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public ItemGuild onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ItemGuild(2131559097, this, this.noGuildStringId);
+            return new ItemGuild(R.layout.widget_guild_selector_item, this, this.noGuildStringId);
         }
     }
 
@@ -190,10 +191,10 @@ public final class WidgetGuildSelector extends AppBottomSheet {
 
         public static /* synthetic */ void launch$default(Companion companion, Fragment fragment, String str, boolean z2, int i, FilterFunction filterFunction, int i2, Object obj) {
             if ((i2 & 2) != 0) {
-                str = "GUILD_SELECTOR_DEFAULT_REQUEST_KEY";
+                str = WidgetGuildSelector.REQUEST_KEY_DEFAULT;
             }
             boolean z3 = (i2 & 4) != 0 ? false : z2;
-            int i3 = (i2 & 8) != 0 ? 2131891780 : i;
+            int i3 = (i2 & 8) != 0 ? R.string.none : i;
             if ((i2 & 16) != 0) {
                 filterFunction = null;
             }
@@ -202,7 +203,7 @@ public final class WidgetGuildSelector extends AppBottomSheet {
 
         public static /* synthetic */ void registerForResult$default(Companion companion, Fragment fragment, String str, boolean z2, Function2 function2, int i, Object obj) {
             if ((i & 2) != 0) {
-                str = "GUILD_SELECTOR_DEFAULT_REQUEST_KEY";
+                str = WidgetGuildSelector.REQUEST_KEY_DEFAULT;
             }
             if ((i & 4) != 0) {
                 z2 = false;
@@ -215,10 +216,10 @@ public final class WidgetGuildSelector extends AppBottomSheet {
             m.checkNotNullParameter(str, "requestKey");
             WidgetGuildSelector widgetGuildSelector = new WidgetGuildSelector();
             Bundle bundle = new Bundle();
-            bundle.putString("INTENT_EXTRA_REQUEST_CODE", str);
-            bundle.putBoolean("INTENT_EXTRA_INCLUDE_NO_GUILD", z2);
-            bundle.putInt("INTENT_EXTRA_NO_GUILD_STRING_ID", i);
-            bundle.putSerializable("INTENT_EXTRA_FILTER_FUNCTION", filterFunction);
+            bundle.putString(WidgetGuildSelector.ARG_REQUEST_KEY, str);
+            bundle.putBoolean(WidgetGuildSelector.ARG_INCLUDE_NO_GUILD, z2);
+            bundle.putInt(WidgetGuildSelector.ARG_NO_GUILD_STRING_ID, i);
+            bundle.putSerializable(WidgetGuildSelector.ARG_FILTER_FUNCTION, filterFunction);
             widgetGuildSelector.setArguments(bundle);
             FragmentManager parentFragmentManager = fragment.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "fragment.parentFragmentManager");
@@ -415,7 +416,7 @@ public final class WidgetGuildSelector extends AppBottomSheet {
         m.checkNotNullExpressionValue(requestKey, "requestKey");
         Bundle bundle = new Bundle();
         bundle.putLong("INTENT_EXTRA_GUILD_ID", guild != null ? guild.getId() : -1);
-        bundle.putString("INTENT_EXTRA_GUILD_NAME", guild != null ? guild.getName() : null);
+        bundle.putString(RESULT_EXTRA_GUILD_NAME, guild != null ? guild.getName() : null);
         FragmentKt.setFragmentResult(this, requestKey, bundle);
         dismiss();
     }
@@ -424,8 +425,8 @@ public final class WidgetGuildSelector extends AppBottomSheet {
     public void bindSubscriptions(CompositeSubscription compositeSubscription) {
         m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
         super.bindSubscriptions(compositeSubscription);
-        boolean z2 = getArgumentsOrDefault().getBoolean("INTENT_EXTRA_INCLUDE_NO_GUILD", false);
-        Serializable serializable = getArgumentsOrDefault().getSerializable("INTENT_EXTRA_FILTER_FUNCTION");
+        boolean z2 = getArgumentsOrDefault().getBoolean(ARG_INCLUDE_NO_GUILD, false);
+        Serializable serializable = getArgumentsOrDefault().getSerializable(ARG_FILTER_FUNCTION);
         if (!(serializable instanceof FilterFunction)) {
             serializable = null;
         }
@@ -443,7 +444,7 @@ public final class WidgetGuildSelector extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559096;
+        return R.layout.widget_guild_selector;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -453,6 +454,6 @@ public final class WidgetGuildSelector extends AppBottomSheet {
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.guildSelectorList");
-        this.adapter = (Adapter) companion.configure(new Adapter(recyclerView, this, getArgumentsOrDefault().getInt("INTENT_EXTRA_NO_GUILD_STRING_ID")));
+        this.adapter = (Adapter) companion.configure(new Adapter(recyclerView, this, getArgumentsOrDefault().getInt(ARG_NO_GUILD_STRING_ID)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu$doCircularRemove$1.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu$doCircularRemove$1.java
index 431bc0e4b7..31d701d47c 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu$doCircularRemove$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu$doCircularRemove$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.guilds.contextmenu;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import com.discord.widgets.guilds.contextmenu.WidgetFolderContextMenu;
 import d0.z.d.m;
@@ -19,7 +20,7 @@ public final class WidgetFolderContextMenu$doCircularRemove$1 extends AnimatorLi
         FragmentActivity activity = this.this$0.getActivity();
         if (activity != null) {
             WidgetFolderContextMenu.Companion companion = WidgetFolderContextMenu.Companion;
-            m.checkNotNullExpressionValue(activity, "activity");
+            m.checkNotNullExpressionValue(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             companion.hide(activity, false);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
index 068f7659d9..ac403eb5ba 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -19,6 +20,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetFolderContextMenuBinding;
 import com.discord.utilities.dimen.DimenUtils;
@@ -64,7 +66,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
         }
 
         private final int computeMaxContextMenuHeight(Context context) {
-            WidgetFolderContextMenuBinding a = WidgetFolderContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559043, (ViewGroup) null, false));
+            WidgetFolderContextMenuBinding a = WidgetFolderContextMenuBinding.a(LayoutInflater.from(context).inflate(R.layout.widget_folder_context_menu, (ViewGroup) null, false));
             m.checkNotNullExpressionValue(a, "WidgetFolderContextMenuB…om(context), null, false)");
             CardView cardView = a.a;
             m.checkNotNullExpressionValue(cardView, "WidgetFolderContextMenuB…ntext), null, false).root");
@@ -81,8 +83,8 @@ public final class WidgetFolderContextMenu extends AppFragment {
         }
 
         public final void hide(FragmentActivity fragmentActivity, boolean z2) {
-            m.checkNotNullParameter(fragmentActivity, "activity");
-            Fragment findFragmentByTag = fragmentActivity.getSupportFragmentManager().findFragmentByTag("WidgetFolderContextMenu");
+            m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
+            Fragment findFragmentByTag = fragmentActivity.getSupportFragmentManager().findFragmentByTag(WidgetFolderContextMenu.FRAGMENT_TAG);
             if (!(findFragmentByTag instanceof WidgetFolderContextMenu)) {
                 findFragmentByTag = null;
             }
@@ -106,7 +108,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
             m.checkNotNullExpressionValue(window2, "activity.window");
             View decorView2 = window2.getDecorView();
             m.checkNotNullExpressionValue(decorView2, "activity.window.decorView");
-            FrameLayout frameLayout = (FrameLayout) decorView2.getRootView().findViewWithTag("WidgetFolderContextMenuViewContainer");
+            FrameLayout frameLayout = (FrameLayout) decorView2.getRootView().findViewWithTag(WidgetFolderContextMenu.VIEW_CONTAINER_TAG);
             if (frameLayout != null) {
                 viewGroup.removeView(frameLayout);
             }
@@ -114,7 +116,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
         }
 
         public final void show(FragmentActivity fragmentActivity, PointF pointF, long j) {
-            m.checkNotNullParameter(fragmentActivity, "activity");
+            m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(pointF, "absolutePosition");
             if (!WidgetFolderContextMenu.access$isShowingContextMenu$cp()) {
                 WidgetFolderContextMenu.access$setShowingContextMenu$cp(true);
@@ -122,7 +124,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
                 hide(fragmentActivity, false);
                 FrameLayout frameLayout = new FrameLayout(fragmentActivity);
                 frameLayout.setLayoutParams(new ViewGroup.LayoutParams(-1, -1));
-                frameLayout.setTag("WidgetFolderContextMenuViewContainer");
+                frameLayout.setTag(WidgetFolderContextMenu.VIEW_CONTAINER_TAG);
                 Window window = fragmentActivity.getWindow();
                 m.checkNotNullExpressionValue(window, "activity.window");
                 View decorView = window.getDecorView();
@@ -138,13 +140,13 @@ public final class WidgetFolderContextMenu extends AppFragment {
                 frameLayout.addView(frameLayout2);
                 frameLayout2.setX(pointF.x);
                 frameLayout2.setY(f.coerceAtMost(pointF.y, (float) ((viewGroup.getHeight() - computeMaxContextMenuHeight(fragmentActivity)) - WidgetFolderContextMenu.access$getSCREEN_BOTTOM_BUFFER$cp())));
-                fragmentActivity.getSupportFragmentManager().beginTransaction().add(frameLayout2.getId(), newInstance(j), "WidgetFolderContextMenu").commit();
+                fragmentActivity.getSupportFragmentManager().beginTransaction().add(frameLayout2.getId(), newInstance(j), WidgetFolderContextMenu.FRAGMENT_TAG).commit();
             }
         }
     }
 
     public WidgetFolderContextMenu() {
-        super(2131559043);
+        super(R.layout.widget_folder_context_menu);
         WidgetFolderContextMenu$viewModel$2 widgetFolderContextMenu$viewModel$2 = new WidgetFolderContextMenu$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(FolderContextMenuViewModel.class), new WidgetFolderContextMenu$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetFolderContextMenu$viewModel$2));
@@ -207,7 +209,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
         CharSequence name = valid.getFolder().getName();
         boolean z2 = false;
         if (name == null) {
-            name = b.k(this, 2131889323, new Object[0], null, 4);
+            name = b.k(this, R.string.guild_folder_unnamed, new Object[0], null, 4);
         }
         textView.setText(name);
         getBinding().d.setOnClickListener(new WidgetFolderContextMenu$configureValidUI$1(this));
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.java
index 6038cead9c..1a05a576b3 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu$doCircularRemove$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.guilds.contextmenu;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import com.discord.widgets.guilds.contextmenu.WidgetGuildContextMenu;
 import d0.z.d.m;
@@ -19,7 +20,7 @@ public final class WidgetGuildContextMenu$doCircularRemove$1 extends AnimatorLis
         FragmentActivity activity = this.this$0.getActivity();
         if (activity != null) {
             WidgetGuildContextMenu.Companion companion = WidgetGuildContextMenu.Companion;
-            m.checkNotNullExpressionValue(activity, "activity");
+            m.checkNotNullExpressionValue(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             companion.hide(activity, false);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
index 2357561503..f83e37c371 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -18,6 +19,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildContextMenuBinding;
 import com.discord.utilities.dimen.DimenUtils;
@@ -63,7 +65,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
         }
 
         private final int computeMaxContextMenuHeight(Context context) {
-            WidgetGuildContextMenuBinding a = WidgetGuildContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559069, (ViewGroup) null, false));
+            WidgetGuildContextMenuBinding a = WidgetGuildContextMenuBinding.a(LayoutInflater.from(context).inflate(R.layout.widget_guild_context_menu, (ViewGroup) null, false));
             m.checkNotNullExpressionValue(a, "WidgetGuildContextMenuBi…om(context), null, false)");
             CardView cardView = a.a;
             m.checkNotNullExpressionValue(cardView, "WidgetGuildContextMenuBi…ntext), null, false).root");
@@ -80,8 +82,8 @@ public final class WidgetGuildContextMenu extends AppFragment {
         }
 
         public final void hide(FragmentActivity fragmentActivity, boolean z2) {
-            m.checkNotNullParameter(fragmentActivity, "activity");
-            Fragment findFragmentByTag = fragmentActivity.getSupportFragmentManager().findFragmentByTag("WidgetGuildContextMenu");
+            m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
+            Fragment findFragmentByTag = fragmentActivity.getSupportFragmentManager().findFragmentByTag(WidgetGuildContextMenu.FRAGMENT_TAG);
             if (!(findFragmentByTag instanceof WidgetGuildContextMenu)) {
                 findFragmentByTag = null;
             }
@@ -105,7 +107,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
             m.checkNotNullExpressionValue(window2, "activity.window");
             View decorView2 = window2.getDecorView();
             m.checkNotNullExpressionValue(decorView2, "activity.window.decorView");
-            FrameLayout frameLayout = (FrameLayout) decorView2.getRootView().findViewWithTag("WidgetGuildContextMenuViewContainer");
+            FrameLayout frameLayout = (FrameLayout) decorView2.getRootView().findViewWithTag(WidgetGuildContextMenu.VIEW_CONTAINER_TAG);
             if (frameLayout != null) {
                 viewGroup.removeView(frameLayout);
             }
@@ -113,7 +115,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
         }
 
         public final void show(FragmentActivity fragmentActivity, PointF pointF, long j) {
-            m.checkNotNullParameter(fragmentActivity, "activity");
+            m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(pointF, "absolutePosition");
             if (!WidgetGuildContextMenu.access$isShowingContextMenu$cp()) {
                 WidgetGuildContextMenu.access$setShowingContextMenu$cp(true);
@@ -121,7 +123,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
                 hide(fragmentActivity, false);
                 FrameLayout frameLayout = new FrameLayout(fragmentActivity);
                 frameLayout.setLayoutParams(new ViewGroup.LayoutParams(-1, -1));
-                frameLayout.setTag("WidgetGuildContextMenuViewContainer");
+                frameLayout.setTag(WidgetGuildContextMenu.VIEW_CONTAINER_TAG);
                 Window window = fragmentActivity.getWindow();
                 m.checkNotNullExpressionValue(window, "activity.window");
                 View decorView = window.getDecorView();
@@ -137,13 +139,13 @@ public final class WidgetGuildContextMenu extends AppFragment {
                 frameLayout.addView(frameLayout2);
                 frameLayout2.setX(pointF.x);
                 frameLayout2.setY(f.coerceAtMost(pointF.y, (float) ((viewGroup.getHeight() - computeMaxContextMenuHeight(fragmentActivity)) - WidgetGuildContextMenu.access$getSCREEN_BOTTOM_BUFFER$cp())));
-                fragmentActivity.getSupportFragmentManager().beginTransaction().add(frameLayout2.getId(), newInstance(j), "WidgetGuildContextMenu").commit();
+                fragmentActivity.getSupportFragmentManager().beginTransaction().add(frameLayout2.getId(), newInstance(j), WidgetGuildContextMenu.FRAGMENT_TAG).commit();
             }
         }
     }
 
     public WidgetGuildContextMenu() {
-        super(2131559069);
+        super(R.layout.widget_guild_context_menu);
         WidgetGuildContextMenu$viewModel$2 widgetGuildContextMenu$viewModel$2 = new WidgetGuildContextMenu$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildContextMenuViewModel.class), new WidgetGuildContextMenu$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildContextMenu$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java b/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
index 91203148e1..06dec32727 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guilds.create;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: StockGuildTemplate.kt */
@@ -14,7 +15,7 @@ public abstract class ChannelTemplate {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public NormalChannel(String str) {
             super(null, str, null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         }
     }
 
@@ -23,7 +24,7 @@ public abstract class ChannelTemplate {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public SystemChannel(String str) {
             super(11L, str, null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java b/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java
index b034b8bbf2..bbeb317c9a 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java
@@ -14,6 +14,7 @@ import androidx.annotation.LayoutRes;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.databinding.GuildTemplateChannelsItemViewBinding;
 import com.discord.databinding.GuildTemplateChannelsViewBinding;
@@ -104,11 +105,11 @@ public final class GuildTemplateChannelsView extends LinearLayout {
             super(i, channelsAdapter);
             m.checkNotNullParameter(channelsAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131363653;
-            ImageView imageView = (ImageView) view.findViewById(2131363653);
+            int i2 = R.id.guild_template_channels_item_image;
+            ImageView imageView = (ImageView) view.findViewById(R.id.guild_template_channels_item_image);
             if (imageView != null) {
-                i2 = 2131363654;
-                TextView textView = (TextView) view.findViewById(2131363654);
+                i2 = R.id.guild_template_channels_item_name;
+                TextView textView = (TextView) view.findViewById(R.id.guild_template_channels_item_name);
                 if (textView != null) {
                     GuildTemplateChannelsItemViewBinding guildTemplateChannelsItemViewBinding = new GuildTemplateChannelsItemViewBinding((LinearLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(guildTemplateChannelsItemViewBinding, "GuildTemplateChannelsIte…iewBinding.bind(itemView)");
@@ -126,11 +127,11 @@ public final class GuildTemplateChannelsView extends LinearLayout {
             m.checkNotNullExpressionValue(textView, "binding.guildTemplateChannelsItemName");
             textView.setText(AnimatableValueParser.y0(channelDataPayload.getChannel()));
             if (AnimatableValueParser.f1(channelDataPayload.getChannel())) {
-                this.binding.b.setImageResource(2131231549);
+                this.binding.b.setImageResource(R.drawable.ic_chevron_down_grey_12dp);
             } else if (AnimatableValueParser.C1(channelDataPayload.getChannel())) {
-                this.binding.b.setImageResource(2131231529);
+                this.binding.b.setImageResource(R.drawable.ic_channel_voice_16dp);
             } else {
-                this.binding.b.setImageResource(2131231520);
+                this.binding.b.setImageResource(R.drawable.ic_channel_text_16dp);
             }
             if (channelDataPayload.getChannel().r() > 0) {
                 ImageView imageView = this.binding.b;
@@ -155,7 +156,7 @@ public final class GuildTemplateChannelsView extends LinearLayout {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<ChannelsAdapter, ChannelDataPayload> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ChannelViewHolder(2131558522, this);
+            return new ChannelViewHolder(R.layout.guild_template_channels_item_view, this);
         }
     }
 
@@ -164,21 +165,21 @@ public final class GuildTemplateChannelsView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558523, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.guild_template_channels_view, (ViewGroup) this, false);
         addView(inflate);
-        RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363655);
+        RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.guild_template_channels_recycler_view);
         if (recyclerView != null) {
             GuildTemplateChannelsViewBinding guildTemplateChannelsViewBinding = new GuildTemplateChannelsViewBinding((LinearLayout) inflate, recyclerView);
             m.checkNotNullExpressionValue(guildTemplateChannelsViewBinding, "GuildTemplateChannelsVie…rom(context), this, true)");
             this.binding = guildTemplateChannelsViewBinding;
-            LinearLayout.inflate(context, 2131558523, this);
+            LinearLayout.inflate(context, R.layout.guild_template_channels_view, this);
             MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
             m.checkNotNullExpressionValue(recyclerView, "binding.guildTemplateChannelsRecyclerView");
             this.channelsAdapter = (ChannelsAdapter) companion.configure(new ChannelsAdapter(recyclerView));
             recyclerView.setHasFixedSize(false);
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363655)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.guild_template_channels_recycler_view)));
     }
 
     public final void updateView(List<Channel> list) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java b/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java
index 6fa4a917c1..4c15fdd42c 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java
@@ -1,7 +1,9 @@
 package com.discord.widgets.guilds.create;
 
 import android.content.res.Resources;
+import androidx.exifinterface.media.ExifInterface;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.restapi.RestAPIParams;
 import com.discord.widgets.guilds.create.ChannelTemplate;
 import d0.t.n;
@@ -53,274 +55,274 @@ public enum StockGuildTemplate {
         m.checkNotNullParameter(resources, "resources");
         switch (ordinal()) {
             case 0:
-                String string = resources.getString(2131890261);
+                String string = resources.getString(R.string.guild_template_name_category_text);
                 m.checkNotNullExpressionValue(string, "resources.getString(R.st…plate_name_category_text)");
-                String string2 = resources.getString(2131890269);
+                String string2 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string2, "resources.getString(R.st…ld_template_name_general)");
-                String string3 = resources.getString(2131890266);
+                String string3 = resources.getString(R.string.guild_template_name_game);
                 m.checkNotNullExpressionValue(string3, "resources.getString(R.st…guild_template_name_game)");
-                String string4 = resources.getString(2131890279);
+                String string4 = resources.getString(R.string.guild_template_name_music);
                 m.checkNotNullExpressionValue(string4, "resources.getString(R.st…uild_template_name_music)");
                 List access$createCategorySection = StockGuildTemplateKt.access$createCategorySection(string, 100, 0, new ChannelTemplate.SystemChannel(string2), new ChannelTemplate.NormalChannel(string3), new ChannelTemplate.NormalChannel(string4));
-                String string5 = resources.getString(2131890262);
+                String string5 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string5, "resources.getString(R.st…late_name_category_voice)");
-                String string6 = resources.getString(2131890293);
+                String string6 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string6, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string7 = resources.getString(2131890298);
+                String string7 = resources.getString(R.string.guild_template_name_voice_stream_room);
                 m.checkNotNullExpressionValue(string7, "resources.getString(R.st…e_name_voice_stream_room)");
                 return u.plus((Collection) access$createCategorySection, (Iterable) StockGuildTemplateKt.access$createCategorySection(string5, 200, 2, new ChannelTemplate.NormalChannel(string6), new ChannelTemplate.NormalChannel(string7)));
             case 1:
-                String string8 = resources.getString(2131890260);
+                String string8 = resources.getString(R.string.guild_template_name_category_information);
                 m.checkNotNullExpressionValue(string8, "resources.getString(R.st…ame_category_information)");
-                String string9 = resources.getString(2131890302);
+                String string9 = resources.getString(R.string.guild_template_name_welcome_and_rules);
                 m.checkNotNullExpressionValue(string9, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string10 = resources.getString(2131890281);
+                String string10 = resources.getString(R.string.guild_template_name_notes_resources);
                 m.checkNotNullExpressionValue(string10, "resources.getString(R.st…ate_name_notes_resources)");
                 List access$createCategorySection2 = StockGuildTemplateKt.access$createCategorySection(string8, 100, 0, new ChannelTemplate.NormalChannel(string9), new ChannelTemplate.NormalChannel(string10));
-                String string11 = resources.getString(2131890261);
+                String string11 = resources.getString(R.string.guild_template_name_category_text);
                 m.checkNotNullExpressionValue(string11, "resources.getString(R.st…plate_name_category_text)");
-                String string12 = resources.getString(2131890269);
+                String string12 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string12, "resources.getString(R.st…ld_template_name_general)");
-                String string13 = resources.getString(2131890273);
+                String string13 = resources.getString(R.string.guild_template_name_homework_help);
                 m.checkNotNullExpressionValue(string13, "resources.getString(R.st…plate_name_homework_help)");
-                String string14 = resources.getString(2131890285);
+                String string14 = resources.getString(R.string.guild_template_name_session_planning);
                 m.checkNotNullExpressionValue(string14, "resources.getString(R.st…te_name_session_planning)");
-                String string15 = resources.getString(2131890282);
+                String string15 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string15, "resources.getString(R.st…_template_name_off_topic)");
                 List plus = u.plus((Collection) access$createCategorySection2, (Iterable) StockGuildTemplateKt.access$createCategorySection(string11, 200, 0, new ChannelTemplate.SystemChannel(string12), new ChannelTemplate.NormalChannel(string13), new ChannelTemplate.NormalChannel(string14), new ChannelTemplate.NormalChannel(string15)));
-                String string16 = resources.getString(2131890262);
+                String string16 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string16, "resources.getString(R.st…late_name_category_voice)");
-                String string17 = resources.getString(2131890293);
+                String string17 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string17, "resources.getString(R.st…mplate_name_voice_lounge)");
-                return u.plus((Collection) plus, (Iterable) StockGuildTemplateKt.access$createCategorySection(string16, 300, 2, new ChannelTemplate.NormalChannel(string17), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{"1"}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{"2"}, null, 4).toString())));
+                return u.plus((Collection) plus, (Iterable) StockGuildTemplateKt.access$createCategorySection(string16, 300, 2, new ChannelTemplate.NormalChannel(string17), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{"1"}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{ExifInterface.GPS_MEASUREMENT_2D}, null, 4).toString())));
             case 2:
-                String string18 = resources.getString(2131890261);
+                String string18 = resources.getString(R.string.guild_template_name_category_text);
                 m.checkNotNullExpressionValue(string18, "resources.getString(R.st…plate_name_category_text)");
-                String string19 = resources.getString(2131890269);
+                String string19 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string19, "resources.getString(R.st…ld_template_name_general)");
-                String string20 = resources.getString(2131890263);
+                String string20 = resources.getString(R.string.guild_template_name_clips_and_highlights);
                 m.checkNotNullExpressionValue(string20, "resources.getString(R.st…ame_clips_and_highlights)");
                 List access$createCategorySection3 = StockGuildTemplateKt.access$createCategorySection(string18, 100, 0, new ChannelTemplate.SystemChannel(string19), new ChannelTemplate.NormalChannel(string20));
-                String string21 = resources.getString(2131890262);
+                String string21 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string21, "resources.getString(R.st…late_name_category_voice)");
-                String string22 = resources.getString(2131890292);
+                String string22 = resources.getString(R.string.guild_template_name_voice_lobby);
                 m.checkNotNullExpressionValue(string22, "resources.getString(R.st…emplate_name_voice_lobby)");
-                String string23 = resources.getString(2131890290);
+                String string23 = resources.getString(R.string.guild_template_name_voice_gaming);
                 m.checkNotNullExpressionValue(string23, "resources.getString(R.st…mplate_name_voice_gaming)");
                 return u.plus((Collection) access$createCategorySection3, (Iterable) StockGuildTemplateKt.access$createCategorySection(string21, 200, 2, new ChannelTemplate.NormalChannel(string22), new ChannelTemplate.NormalChannel(string23)));
             case 3:
-                String string24 = resources.getString(2131890260);
+                String string24 = resources.getString(R.string.guild_template_name_category_information);
                 m.checkNotNullExpressionValue(string24, "resources.getString(R.st…ame_category_information)");
-                String string25 = resources.getString(2131890302);
+                String string25 = resources.getString(R.string.guild_template_name_welcome_and_rules);
                 m.checkNotNullExpressionValue(string25, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string26 = resources.getString(2131890256);
+                String string26 = resources.getString(R.string.guild_template_name_announcements);
                 m.checkNotNullExpressionValue(string26, "resources.getString(R.st…plate_name_announcements)");
                 List access$createCategorySection4 = StockGuildTemplateKt.access$createCategorySection(string24, 100, 0, new ChannelTemplate.NormalChannel(string25), new ChannelTemplate.NormalChannel(string26));
-                String string27 = resources.getString(2131890261);
+                String string27 = resources.getString(R.string.guild_template_name_category_text);
                 m.checkNotNullExpressionValue(string27, "resources.getString(R.st…plate_name_category_text)");
-                String string28 = resources.getString(2131890269);
+                String string28 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string28, "resources.getString(R.st…ld_template_name_general)");
-                String string29 = resources.getString(2131890265);
+                String string29 = resources.getString(R.string.guild_template_name_events);
                 m.checkNotNullExpressionValue(string29, "resources.getString(R.st…ild_template_name_events)");
-                String string30 = resources.getString(2131890274);
+                String string30 = resources.getString(R.string.guild_template_name_ideas_and_feedback);
                 m.checkNotNullExpressionValue(string30, "resources.getString(R.st…_name_ideas_and_feedback)");
                 List plus2 = u.plus((Collection) access$createCategorySection4, (Iterable) StockGuildTemplateKt.access$createCategorySection(string27, 200, 0, new ChannelTemplate.SystemChannel(string28), new ChannelTemplate.NormalChannel(string29), new ChannelTemplate.NormalChannel(string30)));
-                String string31 = resources.getString(2131890262);
+                String string31 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string31, "resources.getString(R.st…late_name_category_voice)");
-                String string32 = resources.getString(2131890293);
+                String string32 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string32, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string33 = resources.getString(2131890288);
+                String string33 = resources.getString(R.string.guild_template_name_voice_community_hangout);
                 m.checkNotNullExpressionValue(string33, "resources.getString(R.st…_voice_community_hangout)");
-                String string34 = resources.getString(2131890298);
+                String string34 = resources.getString(R.string.guild_template_name_voice_stream_room);
                 m.checkNotNullExpressionValue(string34, "resources.getString(R.st…e_name_voice_stream_room)");
                 return u.plus((Collection) plus2, (Iterable) StockGuildTemplateKt.access$createCategorySection(string31, 300, 2, new ChannelTemplate.NormalChannel(string32), new ChannelTemplate.NormalChannel(string33), new ChannelTemplate.NormalChannel(string34)));
             case 4:
-                String string35 = resources.getString(2131890260);
+                String string35 = resources.getString(R.string.guild_template_name_category_information);
                 m.checkNotNullExpressionValue(string35, "resources.getString(R.st…ame_category_information)");
-                String string36 = resources.getString(2131890302);
+                String string36 = resources.getString(R.string.guild_template_name_welcome_and_rules);
                 m.checkNotNullExpressionValue(string36, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string37 = resources.getString(2131890256);
+                String string37 = resources.getString(R.string.guild_template_name_announcements);
                 m.checkNotNullExpressionValue(string37, "resources.getString(R.st…plate_name_announcements)");
                 List access$createCategorySection5 = StockGuildTemplateKt.access$createCategorySection(string35, 100, 0, new ChannelTemplate.NormalChannel(string36), new ChannelTemplate.NormalChannel(string37));
-                String string38 = resources.getString(2131890261);
+                String string38 = resources.getString(R.string.guild_template_name_category_text);
                 m.checkNotNullExpressionValue(string38, "resources.getString(R.st…plate_name_category_text)");
-                String string39 = resources.getString(2131890269);
+                String string39 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string39, "resources.getString(R.st…ld_template_name_general)");
-                String string40 = resources.getString(2131890276);
+                String string40 = resources.getString(R.string.guild_template_name_meeting_plans);
                 m.checkNotNullExpressionValue(string40, "resources.getString(R.st…plate_name_meeting_plans)");
                 List plus3 = u.plus((Collection) access$createCategorySection5, (Iterable) StockGuildTemplateKt.access$createCategorySection(string38, 200, 0, new ChannelTemplate.SystemChannel(string39), new ChannelTemplate.NormalChannel(string40)));
-                String string41 = resources.getString(2131890262);
+                String string41 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string41, "resources.getString(R.st…late_name_category_voice)");
-                String string42 = resources.getString(2131890293);
+                String string42 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string42, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string43 = resources.getString(2131890294);
+                String string43 = resources.getString(R.string.guild_template_name_voice_meeting_room);
                 m.checkNotNullExpressionValue(string43, "resources.getString(R.st…_name_voice_meeting_room)");
                 return u.plus((Collection) plus3, (Iterable) StockGuildTemplateKt.access$createCategorySection(string41, 300, 2, new ChannelTemplate.NormalChannel(string42), new ChannelTemplate.NormalChannel(string43)));
             case 5:
-                String string44 = resources.getString(2131890260);
+                String string44 = resources.getString(R.string.guild_template_name_category_information);
                 m.checkNotNullExpressionValue(string44, "resources.getString(R.st…ame_category_information)");
-                String string45 = resources.getString(2131890302);
+                String string45 = resources.getString(R.string.guild_template_name_welcome_and_rules);
                 m.checkNotNullExpressionValue(string45, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string46 = resources.getString(2131890256);
+                String string46 = resources.getString(R.string.guild_template_name_announcements);
                 m.checkNotNullExpressionValue(string46, "resources.getString(R.st…plate_name_announcements)");
-                String string47 = resources.getString(2131890284);
+                String string47 = resources.getString(R.string.guild_template_name_resources);
                 m.checkNotNullExpressionValue(string47, "resources.getString(R.st…_template_name_resources)");
                 List access$createCategorySection6 = StockGuildTemplateKt.access$createCategorySection(string44, 100, 0, new ChannelTemplate.NormalChannel(string45), new ChannelTemplate.NormalChannel(string46), new ChannelTemplate.NormalChannel(string47));
-                String string48 = resources.getString(2131890261);
+                String string48 = resources.getString(R.string.guild_template_name_category_text);
                 m.checkNotNullExpressionValue(string48, "resources.getString(R.st…plate_name_category_text)");
-                String string49 = resources.getString(2131890269);
+                String string49 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string49, "resources.getString(R.st…ld_template_name_general)");
-                String string50 = resources.getString(2131890276);
+                String string50 = resources.getString(R.string.guild_template_name_meeting_plans);
                 m.checkNotNullExpressionValue(string50, "resources.getString(R.st…plate_name_meeting_plans)");
-                String string51 = resources.getString(2131890282);
+                String string51 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string51, "resources.getString(R.st…_template_name_off_topic)");
                 List plus4 = u.plus((Collection) access$createCategorySection6, (Iterable) StockGuildTemplateKt.access$createCategorySection(string48, 200, 0, new ChannelTemplate.SystemChannel(string49), new ChannelTemplate.NormalChannel(string50), new ChannelTemplate.NormalChannel(string51)));
-                String string52 = resources.getString(2131890262);
+                String string52 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string52, "resources.getString(R.st…late_name_category_voice)");
-                String string53 = resources.getString(2131890293);
+                String string53 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string53, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string54 = resources.getString(2131890294);
+                String string54 = resources.getString(R.string.guild_template_name_voice_meeting_room);
                 m.checkNotNullExpressionValue(string54, "resources.getString(R.st…_name_voice_meeting_room)");
                 return u.plus((Collection) plus4, (Iterable) StockGuildTemplateKt.access$createCategorySection(string52, 300, 2, new ChannelTemplate.NormalChannel(string53), new ChannelTemplate.NormalChannel(string54)));
             case 6:
-                String string55 = resources.getString(2131890260);
+                String string55 = resources.getString(R.string.guild_template_name_category_information);
                 m.checkNotNullExpressionValue(string55, "resources.getString(R.st…ame_category_information)");
-                String string56 = resources.getString(2131890302);
+                String string56 = resources.getString(R.string.guild_template_name_welcome_and_rules);
                 m.checkNotNullExpressionValue(string56, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string57 = resources.getString(2131890256);
+                String string57 = resources.getString(R.string.guild_template_name_announcements);
                 m.checkNotNullExpressionValue(string57, "resources.getString(R.st…plate_name_announcements)");
-                String string58 = resources.getString(2131890284);
+                String string58 = resources.getString(R.string.guild_template_name_resources);
                 m.checkNotNullExpressionValue(string58, "resources.getString(R.st…_template_name_resources)");
                 List access$createCategorySection7 = StockGuildTemplateKt.access$createCategorySection(string55, 100, 0, new ChannelTemplate.NormalChannel(string56), new ChannelTemplate.NormalChannel(string57), new ChannelTemplate.NormalChannel(string58));
-                String string59 = resources.getString(2131890261);
+                String string59 = resources.getString(R.string.guild_template_name_category_text);
                 m.checkNotNullExpressionValue(string59, "resources.getString(R.st…plate_name_category_text)");
-                String string60 = resources.getString(2131890269);
+                String string60 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string60, "resources.getString(R.st…ld_template_name_general)");
-                String string61 = resources.getString(2131890275);
+                String string61 = resources.getString(R.string.guild_template_name_introductions);
                 m.checkNotNullExpressionValue(string61, "resources.getString(R.st…plate_name_introductions)");
-                String string62 = resources.getString(2131890282);
+                String string62 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string62, "resources.getString(R.st…_template_name_off_topic)");
                 List plus5 = u.plus((Collection) access$createCategorySection7, (Iterable) StockGuildTemplateKt.access$createCategorySection(string59, 200, 0, new ChannelTemplate.SystemChannel(string60), new ChannelTemplate.NormalChannel(string61), new ChannelTemplate.NormalChannel(string62)));
-                String string63 = resources.getString(2131890262);
+                String string63 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string63, "resources.getString(R.st…late_name_category_voice)");
-                String string64 = resources.getString(2131890293);
+                String string64 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string64, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string65 = resources.getString(2131890295);
+                String string65 = resources.getString(R.string.guild_template_name_voice_meeting_room_1);
                 m.checkNotNullExpressionValue(string65, "resources.getString(R.st…ame_voice_meeting_room_1)");
-                String string66 = resources.getString(2131890296);
+                String string66 = resources.getString(R.string.guild_template_name_voice_meeting_room_2);
                 m.checkNotNullExpressionValue(string66, "resources.getString(R.st…ame_voice_meeting_room_2)");
                 return u.plus((Collection) plus5, (Iterable) StockGuildTemplateKt.access$createCategorySection(string63, 300, 2, new ChannelTemplate.NormalChannel(string64), new ChannelTemplate.NormalChannel(string65), new ChannelTemplate.NormalChannel(string66)));
             case 7:
-                String string67 = resources.getString(2131890259);
+                String string67 = resources.getString(R.string.guild_template_name_category_info);
                 m.checkNotNullExpressionValue(string67, "resources.getString(R.st…plate_name_category_info)");
-                String string68 = resources.getString(2131890281);
+                String string68 = resources.getString(R.string.guild_template_name_notes_resources);
                 m.checkNotNullExpressionValue(string68, "resources.getString(R.st…ate_name_notes_resources)");
-                String string69 = resources.getString(2131890271);
+                String string69 = resources.getString(R.string.guild_template_name_help_questions);
                 m.checkNotNullExpressionValue(string69, "resources.getString(R.st…late_name_help_questions)");
                 List access$createCategorySection8 = StockGuildTemplateKt.access$createCategorySection(string67, 100, 0, new ChannelTemplate.NormalChannel(string68), new ChannelTemplate.NormalChannel(string69));
-                String string70 = resources.getString(2131890258);
+                String string70 = resources.getString(R.string.guild_template_name_category_chat);
                 m.checkNotNullExpressionValue(string70, "resources.getString(R.st…plate_name_category_chat)");
-                String string71 = resources.getString(2131890275);
+                String string71 = resources.getString(R.string.guild_template_name_introductions);
                 m.checkNotNullExpressionValue(string71, "resources.getString(R.st…plate_name_introductions)");
-                String string72 = resources.getString(2131890269);
+                String string72 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string72, "resources.getString(R.st…ld_template_name_general)");
-                String string73 = resources.getString(2131890282);
+                String string73 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string73, "resources.getString(R.st…_template_name_off_topic)");
                 List plus6 = u.plus((Collection) access$createCategorySection8, (Iterable) StockGuildTemplateKt.access$createCategorySection(string70, 200, 0, new ChannelTemplate.NormalChannel(string71), new ChannelTemplate.SystemChannel(string72), new ChannelTemplate.NormalChannel(string73)));
-                String string74 = resources.getString(2131890262);
+                String string74 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string74, "resources.getString(R.st…late_name_category_voice)");
-                String string75 = resources.getString(2131890293);
+                String string75 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string75, "resources.getString(R.st…mplate_name_voice_lounge)");
-                return u.plus((Collection) plus6, (Iterable) StockGuildTemplateKt.access$createCategorySection(string74, 300, 2, new ChannelTemplate.NormalChannel(string75), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{1}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{2}, null, 4).toString())));
+                return u.plus((Collection) plus6, (Iterable) StockGuildTemplateKt.access$createCategorySection(string74, 300, 2, new ChannelTemplate.NormalChannel(string75), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{1}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{2}, null, 4).toString())));
             case 8:
-                String string76 = resources.getString(2131890259);
+                String string76 = resources.getString(R.string.guild_template_name_category_info);
                 m.checkNotNullExpressionValue(string76, "resources.getString(R.st…plate_name_category_info)");
-                String string77 = resources.getString(2131890257);
+                String string77 = resources.getString(R.string.guild_template_name_assignments);
                 m.checkNotNullExpressionValue(string77, "resources.getString(R.st…emplate_name_assignments)");
-                String string78 = resources.getString(2131890271);
+                String string78 = resources.getString(R.string.guild_template_name_help_questions);
                 m.checkNotNullExpressionValue(string78, "resources.getString(R.st…late_name_help_questions)");
-                String string79 = resources.getString(2131890284);
+                String string79 = resources.getString(R.string.guild_template_name_resources);
                 m.checkNotNullExpressionValue(string79, "resources.getString(R.st…_template_name_resources)");
                 List access$createCategorySection9 = StockGuildTemplateKt.access$createCategorySection(string76, 100, 0, new ChannelTemplate.NormalChannel(string77), new ChannelTemplate.NormalChannel(string78), new ChannelTemplate.NormalChannel(string79));
-                String string80 = resources.getString(2131890258);
+                String string80 = resources.getString(R.string.guild_template_name_category_chat);
                 m.checkNotNullExpressionValue(string80, "resources.getString(R.st…plate_name_category_chat)");
-                String string81 = resources.getString(2131890275);
+                String string81 = resources.getString(R.string.guild_template_name_introductions);
                 m.checkNotNullExpressionValue(string81, "resources.getString(R.st…plate_name_introductions)");
-                String string82 = resources.getString(2131890269);
+                String string82 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string82, "resources.getString(R.st…ld_template_name_general)");
-                String string83 = resources.getString(2131890282);
+                String string83 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string83, "resources.getString(R.st…_template_name_off_topic)");
                 List plus7 = u.plus((Collection) access$createCategorySection9, (Iterable) StockGuildTemplateKt.access$createCategorySection(string80, 200, 0, new ChannelTemplate.NormalChannel(string81), new ChannelTemplate.SystemChannel(string82), new ChannelTemplate.NormalChannel(string83)));
-                String string84 = resources.getString(2131890262);
+                String string84 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string84, "resources.getString(R.st…late_name_category_voice)");
-                String string85 = resources.getString(2131890293);
+                String string85 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string85, "resources.getString(R.st…mplate_name_voice_lounge)");
-                return u.plus((Collection) plus7, (Iterable) StockGuildTemplateKt.access$createCategorySection(string84, 300, 2, new ChannelTemplate.NormalChannel(string85), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{1}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{2}, null, 4).toString())));
+                return u.plus((Collection) plus7, (Iterable) StockGuildTemplateKt.access$createCategorySection(string84, 300, 2, new ChannelTemplate.NormalChannel(string85), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{1}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{2}, null, 4).toString())));
             case 9:
-                String string86 = resources.getString(2131890258);
+                String string86 = resources.getString(R.string.guild_template_name_category_chat);
                 m.checkNotNullExpressionValue(string86, "resources.getString(R.st…plate_name_category_chat)");
-                String string87 = resources.getString(2131890275);
+                String string87 = resources.getString(R.string.guild_template_name_introductions);
                 m.checkNotNullExpressionValue(string87, "resources.getString(R.st…plate_name_introductions)");
-                String string88 = resources.getString(2131890269);
+                String string88 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string88, "resources.getString(R.st…ld_template_name_general)");
-                String string89 = resources.getString(2131890282);
+                String string89 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string89, "resources.getString(R.st…_template_name_off_topic)");
-                String string90 = resources.getString(2131890277);
+                String string90 = resources.getString(R.string.guild_template_name_meetups);
                 m.checkNotNullExpressionValue(string90, "resources.getString(R.st…ld_template_name_meetups)");
                 List access$createCategorySection10 = StockGuildTemplateKt.access$createCategorySection(string86, 200, 0, new ChannelTemplate.NormalChannel(string87), new ChannelTemplate.SystemChannel(string88), new ChannelTemplate.NormalChannel(string89), new ChannelTemplate.NormalChannel(string90));
-                String string91 = resources.getString(2131890262);
+                String string91 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string91, "resources.getString(R.st…late_name_category_voice)");
-                String string92 = resources.getString(2131890289);
+                String string92 = resources.getString(R.string.guild_template_name_voice_couches);
                 m.checkNotNullExpressionValue(string92, "resources.getString(R.st…plate_name_voice_couches)");
-                String string93 = resources.getString(2131890297);
+                String string93 = resources.getString(R.string.guild_template_name_voice_movie_room);
                 m.checkNotNullExpressionValue(string93, "resources.getString(R.st…te_name_voice_movie_room)");
-                String string94 = resources.getString(2131890300);
+                String string94 = resources.getString(R.string.guild_template_name_voice_unnumbered_study_room);
                 m.checkNotNullExpressionValue(string94, "resources.getString(R.st…ce_unnumbered_study_room)");
                 return u.plus((Collection) access$createCategorySection10, (Iterable) StockGuildTemplateKt.access$createCategorySection(string91, 300, 2, new ChannelTemplate.NormalChannel(string92), new ChannelTemplate.NormalChannel(string93), new ChannelTemplate.NormalChannel(string94)));
             case 10:
-                String string95 = resources.getString(2131890259);
+                String string95 = resources.getString(R.string.guild_template_name_category_info);
                 m.checkNotNullExpressionValue(string95, "resources.getString(R.st…plate_name_category_info)");
-                String string96 = resources.getString(2131890284);
+                String string96 = resources.getString(R.string.guild_template_name_resources);
                 m.checkNotNullExpressionValue(string96, "resources.getString(R.st…_template_name_resources)");
-                String string97 = resources.getString(2131890271);
+                String string97 = resources.getString(R.string.guild_template_name_help_questions);
                 m.checkNotNullExpressionValue(string97, "resources.getString(R.st…late_name_help_questions)");
                 List access$createCategorySection11 = StockGuildTemplateKt.access$createCategorySection(string95, 100, 0, new ChannelTemplate.NormalChannel(string96), new ChannelTemplate.NormalChannel(string97));
-                String string98 = resources.getString(2131890258);
+                String string98 = resources.getString(R.string.guild_template_name_category_chat);
                 m.checkNotNullExpressionValue(string98, "resources.getString(R.st…plate_name_category_chat)");
-                String string99 = resources.getString(2131890275);
+                String string99 = resources.getString(R.string.guild_template_name_introductions);
                 m.checkNotNullExpressionValue(string99, "resources.getString(R.st…plate_name_introductions)");
-                String string100 = resources.getString(2131890269);
+                String string100 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string100, "resources.getString(R.st…ld_template_name_general)");
-                String string101 = resources.getString(2131890282);
+                String string101 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string101, "resources.getString(R.st…_template_name_off_topic)");
                 List plus8 = u.plus((Collection) access$createCategorySection11, (Iterable) StockGuildTemplateKt.access$createCategorySection(string98, 200, 0, new ChannelTemplate.NormalChannel(string99), new ChannelTemplate.SystemChannel(string100), new ChannelTemplate.NormalChannel(string101)));
-                String string102 = resources.getString(2131890262);
+                String string102 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string102, "resources.getString(R.st…late_name_category_voice)");
-                String string103 = resources.getString(2131890293);
+                String string103 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string103, "resources.getString(R.st…mplate_name_voice_lounge)");
-                return u.plus((Collection) plus8, (Iterable) StockGuildTemplateKt.access$createCategorySection(string102, 300, 2, new ChannelTemplate.NormalChannel(string103), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{1}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, 2131890299, new Object[]{2}, null, 4).toString())));
+                return u.plus((Collection) plus8, (Iterable) StockGuildTemplateKt.access$createCategorySection(string102, 300, 2, new ChannelTemplate.NormalChannel(string103), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{1}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.i(resources, R.string.guild_template_name_voice_study_room, new Object[]{2}, null, 4).toString())));
             case 11:
-                String string104 = resources.getString(2131890259);
+                String string104 = resources.getString(R.string.guild_template_name_category_info);
                 m.checkNotNullExpressionValue(string104, "resources.getString(R.st…plate_name_category_info)");
-                String string105 = resources.getString(2131890264);
+                String string105 = resources.getString(R.string.guild_template_name_dorm_news);
                 m.checkNotNullExpressionValue(string105, "resources.getString(R.st…_template_name_dorm_news)");
                 List access$createCategorySection12 = StockGuildTemplateKt.access$createCategorySection(string104, 100, 0, new ChannelTemplate.NormalChannel(string105));
-                String string106 = resources.getString(2131890258);
+                String string106 = resources.getString(R.string.guild_template_name_category_chat);
                 m.checkNotNullExpressionValue(string106, "resources.getString(R.st…plate_name_category_chat)");
-                String string107 = resources.getString(2131890275);
+                String string107 = resources.getString(R.string.guild_template_name_introductions);
                 m.checkNotNullExpressionValue(string107, "resources.getString(R.st…plate_name_introductions)");
-                String string108 = resources.getString(2131890269);
+                String string108 = resources.getString(R.string.guild_template_name_general);
                 m.checkNotNullExpressionValue(string108, "resources.getString(R.st…ld_template_name_general)");
-                String string109 = resources.getString(2131890282);
+                String string109 = resources.getString(R.string.guild_template_name_off_topic);
                 m.checkNotNullExpressionValue(string109, "resources.getString(R.st…_template_name_off_topic)");
                 List plus9 = u.plus((Collection) access$createCategorySection12, (Iterable) StockGuildTemplateKt.access$createCategorySection(string106, 200, 0, new ChannelTemplate.NormalChannel(string107), new ChannelTemplate.SystemChannel(string108), new ChannelTemplate.NormalChannel(string109)));
-                String string110 = resources.getString(2131890262);
+                String string110 = resources.getString(R.string.guild_template_name_category_voice);
                 m.checkNotNullExpressionValue(string110, "resources.getString(R.st…late_name_category_voice)");
-                String string111 = resources.getString(2131890293);
+                String string111 = resources.getString(R.string.guild_template_name_voice_lounge);
                 m.checkNotNullExpressionValue(string111, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string112 = resources.getString(2131890297);
+                String string112 = resources.getString(R.string.guild_template_name_voice_movie_room);
                 m.checkNotNullExpressionValue(string112, "resources.getString(R.st…te_name_voice_movie_room)");
-                String string113 = resources.getString(2131890289);
+                String string113 = resources.getString(R.string.guild_template_name_voice_couches);
                 m.checkNotNullExpressionValue(string113, "resources.getString(R.st…plate_name_voice_couches)");
                 return u.plus((Collection) plus9, (Iterable) StockGuildTemplateKt.access$createCategorySection(string110, 300, 2, new ChannelTemplate.NormalChannel(string111), new ChannelTemplate.NormalChannel(string112), new ChannelTemplate.NormalChannel(string113)));
             case 12:
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java
index ab0fcc86ab..ceebdec026 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guilds.create;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetCreationIntentBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.google.android.material.card.MaterialCardView;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetCreationIntent$binding$2 extends k impl
 
     public final WidgetCreationIntentBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362868;
-        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362868);
+        int i = R.id.creation_intent_first_option;
+        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(R.id.creation_intent_first_option);
         if (materialCardView != null) {
-            i = 2131362869;
-            TextView textView = (TextView) view.findViewById(2131362869);
+            i = R.id.creation_intent_first_option_text;
+            TextView textView = (TextView) view.findViewById(R.id.creation_intent_first_option_text);
             if (textView != null) {
-                i = 2131362870;
-                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131362870);
+                i = R.id.creation_intent_second_option;
+                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(R.id.creation_intent_second_option);
                 if (materialCardView2 != null) {
-                    i = 2131362871;
-                    TextView textView2 = (TextView) view.findViewById(2131362871);
+                    i = R.id.creation_intent_second_option_text;
+                    TextView textView2 = (TextView) view.findViewById(R.id.creation_intent_second_option_text);
                     if (textView2 != null) {
-                        i = 2131362872;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362872);
+                        i = R.id.creation_intent_skip_text;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.creation_intent_skip_text);
                         if (linkifiedTextView != null) {
                             return new WidgetCreationIntentBinding((CoordinatorLayout) view, materialCardView, textView, materialCardView2, textView2, linkifiedTextView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
index 61227dc0f5..999106985f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetCreationIntentBinding;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -68,7 +69,7 @@ public final class WidgetCreationIntent extends AppFragment {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetCreationIntent(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i2 & 1) != 0 ? 2131559012 : i);
+        this((i2 & 1) != 0 ? R.layout.widget_creation_intent : i);
     }
 
     public static final /* synthetic */ void access$onSelectionPressed(WidgetCreationIntent widgetCreationIntent, Boolean bool) {
@@ -76,14 +77,14 @@ public final class WidgetCreationIntent extends AppFragment {
     }
 
     private final void configureCommunityButton(View view, TextView textView) {
-        textView.setText(getString(2131887994));
-        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231155), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232121), (Drawable) null);
+        textView.setText(getString(R.string.creation_intent_option_community));
+        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), R.drawable.drawable_guild_template_creator), (Drawable) null, ContextCompat.getDrawable(requireContext(), R.drawable.icon_carrot), (Drawable) null);
         view.setOnClickListener(new WidgetCreationIntent$configureCommunityButton$1(this));
     }
 
     private final void configureFriendsButton(View view, TextView textView) {
-        textView.setText(getString(2131887995));
-        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231153), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232121), (Drawable) null);
+        textView.setText(getString(R.string.creation_intent_option_friends));
+        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), R.drawable.drawable_guild_template_community), (Drawable) null, ContextCompat.getDrawable(requireContext(), R.drawable.icon_carrot), (Drawable) null);
         view.setOnClickListener(new WidgetCreationIntent$configureFriendsButton$1(this));
     }
 
@@ -94,7 +95,7 @@ public final class WidgetCreationIntent extends AppFragment {
     private final void onSelectionPressed(Boolean bool) {
         AnalyticsTracker.INSTANCE.guildCreationIntentSelected(bool);
         if (getArgs().getTrigger() == CreateGuildTrigger.NUF) {
-            GuildTemplateAnalytics.INSTANCE.postRegistrationTransition$app_productionCanaryRelease("Server Intent Discovery", "Guild Create");
+            GuildTemplateAnalytics.INSTANCE.postRegistrationTransition$app_productionCanaryRelease(GuildTemplateAnalytics.STEP_CREATION_INTENT, GuildTemplateAnalytics.STEP_GUILD_CREATE);
         } else {
             AnalyticsTracker.openModal$default("Create Guild Step 2", getArgs().getCreateGuildOptions().getAnalyticsLocation(), null, 4, null);
         }
@@ -134,6 +135,6 @@ public final class WidgetCreationIntent extends AppFragment {
         }
         LinkifiedTextView linkifiedTextView = getBinding().f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.creationIntentSkipText");
-        b.m(linkifiedTextView, 2131887996, new Object[0], new WidgetCreationIntent$onViewBound$1(this));
+        b.m(linkifiedTextView, R.string.creation_intent_skip, new Object[0], new WidgetCreationIntent$onViewBound$1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java
index 2ce8007160..3e5944a0c8 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import c.a.j.i0;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGuildCloneBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -25,39 +26,39 @@ public final /* synthetic */ class WidgetGuildClone$binding$2 extends k implemen
 
     public final WidgetGuildCloneBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363449;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363449);
+        int i = R.id.guild_create_button;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.guild_create_button);
         if (loadingButton != null) {
-            i = 2131363450;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363450);
+            i = R.id.guild_create_flipper;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.guild_create_flipper);
             if (appViewFlipper != null) {
-                i = 2131363451;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363451);
+                i = R.id.guild_create_guidelines;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.guild_create_guidelines);
                 if (linkifiedTextView != null) {
-                    i = 2131363452;
-                    View findViewById = view.findViewById(2131363452);
+                    i = R.id.guild_create_icon_uploader;
+                    View findViewById = view.findViewById(R.id.guild_create_icon_uploader);
                     if (findViewById != null) {
                         i0 a = i0.a(findViewById);
-                        i = 2131363453;
-                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363453);
+                        i = R.id.guild_create_name;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_create_name);
                         if (textInputLayout != null) {
-                            i = 2131363454;
-                            TextView textView = (TextView) view.findViewById(2131363454);
+                            i = R.id.guild_create_protip;
+                            TextView textView = (TextView) view.findViewById(R.id.guild_create_protip);
                             if (textView != null) {
-                                i = 2131363656;
-                                TextView textView2 = (TextView) view.findViewById(2131363656);
+                                i = R.id.guild_template_name;
+                                TextView textView2 = (TextView) view.findViewById(R.id.guild_template_name);
                                 if (textView2 != null) {
-                                    i = 2131363657;
-                                    GuildTemplateChannelsView guildTemplateChannelsView = (GuildTemplateChannelsView) view.findViewById(2131363657);
+                                    i = R.id.guild_template_preview_channels;
+                                    GuildTemplateChannelsView guildTemplateChannelsView = (GuildTemplateChannelsView) view.findViewById(R.id.guild_template_preview_channels);
                                     if (guildTemplateChannelsView != null) {
-                                        i = 2131363658;
-                                        RolesListView rolesListView = (RolesListView) view.findViewById(2131363658);
+                                        i = R.id.guild_template_preview_roles;
+                                        RolesListView rolesListView = (RolesListView) view.findViewById(R.id.guild_template_preview_roles);
                                         if (rolesListView != null) {
-                                            i = 2131363659;
-                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363659);
+                                            i = R.id.guild_template_preview_roles_layout;
+                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_template_preview_roles_layout);
                                             if (linearLayout != null) {
-                                                i = 2131363979;
-                                                ProgressBar progressBar = (ProgressBar) view.findViewById(2131363979);
+                                                i = R.id.loading_button_progress;
+                                                ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.loading_button_progress);
                                                 if (progressBar != null) {
                                                     return new WidgetGuildCloneBinding((CoordinatorLayout) view, loadingButton, appViewFlipper, linkifiedTextView, a, textInputLayout, textView, textView2, guildTemplateChannelsView, rolesListView, linearLayout, progressBar);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
index acb1a29b38..58c7e2ccc4 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.role.GuildRole;
@@ -60,7 +61,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
             m.checkNotNullParameter(str2, "location");
             Intent intent = new Intent();
             if (str != null) {
-                intent.putExtra("guild_template_code", str);
+                intent.putExtra(WidgetGuildClone.INTENT_GUILD_TEMPLATE_CODE, str);
             }
             intent.putExtra("com.discord.intent.extra.EXTRA_SOURCE", str2);
             l.d(context, WidgetGuildClone.class, intent);
@@ -68,7 +69,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
     }
 
     public WidgetGuildClone() {
-        super(2131559068);
+        super(R.layout.widget_guild_clone);
     }
 
     private final WidgetGuildCloneBinding getBinding() {
@@ -111,7 +112,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
                 appViewFlipper5.setDisplayedChild(2);
                 TextView textView = getBinding().g;
                 m.checkNotNullExpressionValue(textView, "binding.guildTemplateName");
-                int themedColor = ColorCompat.getThemedColor(textView, 2130968933);
+                int themedColor = ColorCompat.getThemedColor(textView, (int) R.attr.colorHeaderSecondary);
                 TextView textView2 = getBinding().g;
                 m.checkNotNullExpressionValue(textView2, "binding.guildTemplateName");
                 ColorCompatKt.setDrawableColor(textView2, themedColor);
@@ -144,19 +145,19 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
                 RolesListView rolesListView = getBinding().i;
                 RolesListView rolesListView2 = getBinding().i;
                 m.checkNotNullExpressionValue(rolesListView2, "binding.guildTemplatePreviewRoles");
-                rolesListView.updateView(arrayList, ColorCompat.getThemedColor(rolesListView2.getContext(), 2130969885));
+                rolesListView.updateView(arrayList, ColorCompat.getThemedColor(rolesListView2.getContext(), (int) R.attr.primary_300));
             }
         }
     }
 
     @Override // com.discord.widgets.guilds.create.WidgetGuildCreate
     public WidgetGuildCreateViewModel createViewModelFactory() {
-        String stringExtra = getMostRecentIntent().getStringExtra("guild_template_code");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_GUILD_TEMPLATE_CODE);
         String stringExtra2 = getMostRecentIntent().getStringExtra("com.discord.intent.extra.EXTRA_SOURCE");
         if (stringExtra2 == null) {
             stringExtra2 = "";
         }
-        return new WidgetGuildCreateViewModel(2131887948, null, stringExtra, false, stringExtra2, null, false, null, null, null, 962, null);
+        return new WidgetGuildCreateViewModel(R.string.create_server_default_server_name_format, null, stringExtra, false, stringExtra2, null, false, null, null, null, 962, null);
     }
 
     @Override // com.discord.widgets.guilds.create.WidgetGuildCreate
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java
index c77b7bc84c..b284d62342 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guilds.create;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import c.a.j.i0;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildCreateBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.LoadingButton;
@@ -21,21 +22,21 @@ public final /* synthetic */ class WidgetGuildCreate$binding$2 extends k impleme
 
     public final WidgetGuildCreateBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363449;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363449);
+        int i = R.id.guild_create_button;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.guild_create_button);
         if (loadingButton != null) {
-            i = 2131363451;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363451);
+            i = R.id.guild_create_guidelines;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.guild_create_guidelines);
             if (linkifiedTextView != null) {
-                i = 2131363452;
-                View findViewById = view.findViewById(2131363452);
+                i = R.id.guild_create_icon_uploader;
+                View findViewById = view.findViewById(R.id.guild_create_icon_uploader);
                 if (findViewById != null) {
                     i0 a = i0.a(findViewById);
-                    i = 2131363453;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363453);
+                    i = R.id.guild_create_name;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_create_name);
                     if (textInputLayout != null) {
-                        i = 2131363455;
-                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363455);
+                        i = R.id.guild_create_screen_title;
+                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.guild_create_screen_title);
                         if (screenTitleView != null) {
                             return new WidgetGuildCreateBinding((CoordinatorLayout) view, loadingButton, linkifiedTextView, a, textInputLayout, screenTitleView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java
index f04ba85d2a..76b79b6daa 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java
@@ -10,6 +10,7 @@ import android.os.Parcelable;
 import android.widget.EditText;
 import androidx.annotation.LayoutRes;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -20,6 +21,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildCreateBinding;
 import com.discord.dialogs.ImageUploadDialog;
@@ -70,7 +72,7 @@ public class WidgetGuildCreate extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(options, "options");
             Intent intent = new Intent();
-            intent.putExtra("com.discord.intent.extra.EXTRA_OPTIONS", options);
+            intent.putExtra(WidgetGuildCreate.EXTRA_OPTIONS, options);
             l.d(context, WidgetGuildCreate.class, intent);
         }
 
@@ -78,7 +80,7 @@ public class WidgetGuildCreate extends AppFragment {
             m.checkNotNullParameter(appFragment, "fragment");
             m.checkNotNullParameter(options, "options");
             Bundle bundle = new Bundle();
-            bundle.putParcelable("com.discord.intent.extra.EXTRA_OPTIONS", options);
+            bundle.putParcelable(WidgetGuildCreate.EXTRA_OPTIONS, options);
             l.g(l.g, appFragment.getParentFragmentManager(), appFragment.requireContext(), WidgetGuildCreate.class, 0, true, null, bundle, 40);
         }
     }
@@ -332,7 +334,7 @@ public class WidgetGuildCreate extends AppFragment {
 
     public WidgetGuildCreate(@LayoutRes int i) {
         super(i);
-        this.args$delegate = g.lazy(new WidgetGuildCreate$$special$$inlined$args$1(this, "com.discord.intent.extra.EXTRA_OPTIONS"));
+        this.args$delegate = g.lazy(new WidgetGuildCreate$$special$$inlined$args$1(this, EXTRA_OPTIONS));
         WidgetGuildCreate$viewModel$2 widgetGuildCreate$viewModel$2 = new WidgetGuildCreate$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildCreateViewModel.class), new WidgetGuildCreate$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildCreate$viewModel$2));
@@ -341,7 +343,7 @@ public class WidgetGuildCreate extends AppFragment {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetGuildCreate(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i2 & 1) != 0 ? 2131559070 : i);
+        this((i2 & 1) != 0 ? R.layout.widget_guild_create : i);
     }
 
     public static final /* synthetic */ WidgetGuildCreateViewModel access$getViewModel$p(WidgetGuildCreate widgetGuildCreate) {
@@ -407,7 +409,7 @@ public class WidgetGuildCreate extends AppFragment {
                     i = 8;
                 }
                 iconUploaderPlaceholderGroup.setVisibility(i);
-                IconUtils.setIcon$default(getViews().getIconUploaderImage(), initialized.getGuildIconUri(), 2131165299, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+                IconUtils.setIcon$default(getViews().getIconUploaderImage(), initialized.getGuildIconUri(), (int) R.dimen.avatar_size_xxlarge, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
                 this.currentImageUri = initialized.getGuildIconUri();
             }
             if (!(initialized.getCustomTitle() == null || (screenTitleView = getViews().getScreenTitleView()) == null)) {
@@ -418,7 +420,7 @@ public class WidgetGuildCreate extends AppFragment {
     }
 
     public WidgetGuildCreateViewModel createViewModelFactory() {
-        return new WidgetGuildCreateViewModel(2131887948, getArgs().getTemplate(), null, getArgs().getShowChannelPrompt(), getArgs().getAnalyticsLocation(), getArgs().getCustomTitle(), getArgs().getCloseWithResult(), null, null, null, 896, null);
+        return new WidgetGuildCreateViewModel(R.string.create_server_default_server_name_format, getArgs().getTemplate(), null, getArgs().getShowChannelPrompt(), getArgs().getAnalyticsLocation(), getArgs().getCustomTitle(), getArgs().getCloseWithResult(), null, null, null, 896, null);
     }
 
     public final Options getArgs() {
@@ -434,7 +436,7 @@ public class WidgetGuildCreate extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -444,7 +446,7 @@ public class WidgetGuildCreate extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         MGImages.requestDataUrl(requireContext(), uri, str, new WidgetGuildCreate$onImageCropped$1(this));
@@ -456,7 +458,7 @@ public class WidgetGuildCreate extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildCreate$onResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildCreate$onResume$2(this), 62, (Object) null);
         getViews().getGuildCreateIconUploader().setOnClickListener(new WidgetGuildCreate$onResume$3(this));
-        c.a.l.b.n(getViews().getGuidelinesTextView(), 2131887952, new Object[]{"https://discord.com/guidelines"}, null, 4);
+        c.a.l.b.n(getViews().getGuidelinesTextView(), R.string.create_server_guidelines, new Object[]{GUIDELINES_URL}, null, 4);
         EditText editText = getViews().getGuildCreateName().getEditText();
         if (editText != null) {
             TextWatcherKt.addLifecycleAwareTextWatcher(editText, this, new WidgetGuildCreate$onResume$4(this));
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
index c334bd80ca..ca34ed0480 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
@@ -6,6 +6,7 @@ import android.content.res.Resources;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.User;
@@ -634,7 +635,7 @@ public final class WidgetGuildCreateViewModel extends AppViewModel<ViewState> {
             String guildIconUri = initialized.getGuildIconUri();
             if (!initialized.isBusy()) {
                 if (t.isBlank(guildName)) {
-                    emitEvent(new Event.ShowToast(2131893570));
+                    emitEvent(new Event.ShowToast(R.string.server_name_required));
                     return;
                 }
                 if (initialized.getGuildTemplate() instanceof StoreGuildTemplates.GuildTemplateState.Resolved) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
index 8b849c200f..db7842e84f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.BuildConfig;
 import com.discord.api.channel.Channel;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.app.AppLog;
@@ -596,7 +597,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
         boolean z2;
         Collections.sort(new ArrayList(valid.getInvitableChannels().values()), AnimatableValueParser.K0(Channel.Companion));
         if (guildInvite == null || (str2 = guildInvite.toLink()) == null) {
-            str2 = "https://discord.gg";
+            str2 = BuildConfig.HOST_INVITE;
         }
         Object obj2 = map.get(str2);
         if (obj2 == null) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java
index 6b82789794..3e6a2ccb6f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java
@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.content.res.Resources;
 import c.a.e.o;
 import c.a.l.b;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.models.domain.ModelInvite;
 import com.discord.models.experiments.domain.Experiment;
@@ -16,7 +18,7 @@ import d0.z.d.m;
 /* compiled from: GuildInviteUiHelper.kt */
 public final class GuildInviteUiHelperKt {
     private static final void copyLink(Context context, String str) {
-        o.a(context, str, 2131890858);
+        o.a(context, str, R.string.invite_link_copied);
     }
 
     public static final void copyLinkClick(Context context, ModelInvite modelInvite, Intent intent) {
@@ -48,39 +50,39 @@ public final class GuildInviteUiHelperKt {
 
     private static final String getInviteLink(ModelInvite modelInvite, Resources resources) {
         if (modelInvite == null) {
-            return "https://discord.gg";
+            return BuildConfig.HOST_INVITE;
         }
-        String link = modelInvite.toLink(resources, "https://discord.gg");
+        String link = modelInvite.toLink(resources, BuildConfig.HOST_INVITE);
         m.checkNotNullExpressionValue(link, "inviteModel.toLink(resou… BuildConfig.HOST_INVITE)");
         return link;
     }
 
     public static final CharSequence getInviteLinkText(Context context, Experiment experiment) {
         m.checkNotNullParameter(context, "context");
-        return b.h(context, 2131890864, new Object[]{(experiment == null || experiment.getBucket() != 1) ? StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 1, 1) : StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 7, 7)}, null, 4);
+        return b.h(context, R.string.invite_links_expire_after_default, new Object[]{(experiment == null || experiment.getBucket() != 1) ? StringResourceUtilsKt.getI18nPluralString(context, R.plurals.duration_days_days, 1, 1) : StringResourceUtilsKt.getI18nPluralString(context, R.plurals.duration_days_days, 7, 7)}, null, 4);
     }
 
     public static final CharSequence getInviteSettingsText(Context context, long j) {
         m.checkNotNullParameter(context, "context");
-        return j <= 0 ? b.h(context, 2131891317, new Object[0], null, 4) : b.h(context, 2131890839, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j)}, null, 4);
+        return j <= 0 ? b.h(context, R.string.max_age_never_description_mobile, new Object[0], null, 4) : b.h(context, R.string.invite_expired_subtext_mobile, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j)}, null, 4);
     }
 
     public static final CharSequence getInviteSettingsText(Context context, long j, int i) {
         Object obj;
         m.checkNotNullParameter(context, "context");
         if (i == 0) {
-            obj = context.getString(2131891322);
+            obj = context.getString(R.string.max_uses_description_unlimited_uses);
             m.checkNotNullExpressionValue(obj, "context.getString(R.stri…scription_unlimited_uses)");
         } else {
             Resources resources = context.getResources();
             m.checkNotNullExpressionValue(resources, "context.resources");
-            obj = StringResourceUtilsKt.getQuantityString(resources, context, 2131755224, i, Integer.valueOf(i));
+            obj = StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.max_uses_description_mobile_maxUses, i, Integer.valueOf(i));
         }
-        return j <= 0 ? b.h(context, 2131890891, new Object[]{context.getString(2131891317), obj}, null, 4) : b.h(context, 2131890892, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j), obj}, null, 4);
+        return j <= 0 ? b.h(context, R.string.invite_settings_description_no_expiration, new Object[]{context.getString(R.string.max_age_never_description_mobile), obj}, null, 4) : b.h(context, R.string.invite_settings_expired_description, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j), obj}, null, 4);
     }
 
     private static final void shareLink(Context context, String str) {
-        String string = context.getResources().getString(2131894343);
+        String string = context.getResources().getString(R.string.tip_instant_invite_title3);
         m.checkNotNullExpressionValue(string, "context.resources.getStr…ip_instant_invite_title3)");
         IntentUtils.performChooserSendIntent(context, str, string);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java
index 7b5d45e251..bb15450afd 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java
@@ -4,6 +4,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.databinding.WidgetGuildInviteShareItemBinding;
 import com.discord.models.user.User;
@@ -25,7 +26,7 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple<Invi
     public static final class EmptySearchResultsViewHolder extends MGRecyclerViewHolder<InviteSuggestionsAdapter, InviteSuggestionItemV2> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public EmptySearchResultsViewHolder(InviteSuggestionsAdapter inviteSuggestionsAdapter) {
-            super(2131558517, inviteSuggestionsAdapter);
+            super((int) R.layout.guild_invite_empty_search_results_item, inviteSuggestionsAdapter);
             m.checkNotNullParameter(inviteSuggestionsAdapter, "adapter");
         }
     }
@@ -36,7 +37,7 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple<Invi
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public InviteSuggestionViewHolder(InviteSuggestionsAdapter inviteSuggestionsAdapter) {
-            super(2131559079, inviteSuggestionsAdapter);
+            super((int) R.layout.widget_guild_invite_share_item, inviteSuggestionsAdapter);
             m.checkNotNullParameter(inviteSuggestionsAdapter, "adapter");
             WidgetGuildInviteShareItemBinding a = WidgetGuildInviteShareItemBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetGuildInviteShareItemBinding.bind(itemView)");
@@ -62,7 +63,7 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple<Invi
             IconUtils.setIcon$default(simpleDraweeView, user, 0, null, null, null, 60, null);
             TextView textView = this.binding.d;
             m.checkNotNullExpressionValue(textView, "binding.itemNameTv");
-            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, null, ((InviteSuggestionsAdapter) this.adapter).getContext(), 2130968932, 2130969328, 2131427362, 2130968989, 2130969327, 2131427362));
+            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, null, ((InviteSuggestionsAdapter) this.adapter).getContext(), R.attr.colorHeaderPrimary, R.attr.font_primary_semibold, R.integer.uikit_textsize_large_sp, R.attr.colorTextMuted, R.attr.font_primary_normal, R.integer.uikit_textsize_large_sp));
         }
 
         public void onConfigure(int i, InviteSuggestionItemV2 inviteSuggestionItemV2) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java b/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
index 79e7954221..55fd2adb07 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
@@ -4,6 +4,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildInviteShareItemBinding;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
@@ -24,7 +25,7 @@ public final class PrivateChannelAdapter extends MGRecyclerAdapterSimple<InviteS
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public Item(PrivateChannelAdapter privateChannelAdapter) {
-            super(2131559079, privateChannelAdapter);
+            super((int) R.layout.widget_guild_invite_share_item, privateChannelAdapter);
             m.checkNotNullParameter(privateChannelAdapter, "adapter");
             WidgetGuildInviteShareItemBinding a = WidgetGuildInviteShareItemBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetGuildInviteShareItemBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java
index c88deb8b89..264390ce74 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.guilds.invite;
 
 import androidx.annotation.IdRes;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: ViewInviteSettingsSheet.kt */
@@ -18,6 +19,6 @@ public final class ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1 e
     @IdRes
     /* renamed from: invoke */
     public final Integer mo1invoke() {
-        return this.$dropDownMode ? 2131362397 : 2131362398;
+        return this.$dropDownMode ? R.id.channel_spinner_dropdown_item_textview : R.id.channel_spinner_item_textview;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java
index 9c9ab9ffcf..5f526cb26b 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java
@@ -17,6 +17,7 @@ import androidx.core.widget.NestedScrollView;
 import c.a.j.w2;
 import c.a.l.b;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.databinding.ViewGuildInviteBottomSheetBinding;
 import com.discord.models.domain.ModelInvite;
@@ -126,7 +127,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         @Override // android.widget.ArrayAdapter, android.widget.SpinnerAdapter, android.widget.BaseAdapter
         public View getDropDownView(int i, View view, ViewGroup viewGroup) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return getItemView(i, 2131558782, view, true);
+            return getItemView(i, R.layout.view_invite_settngs_channel_spinner_item_open, view, true);
         }
 
         @Override // android.widget.ArrayAdapter, android.widget.Adapter
@@ -137,7 +138,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         @Override // android.widget.ArrayAdapter, android.widget.Adapter
         public View getView(int i, View view, ViewGroup viewGroup) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return getItemView(i, 2131558781, view, false);
+            return getItemView(i, R.layout.view_invite_settings_channel_spinner_item, view, false);
         }
 
         public final void setData(Channel[] channelArr) {
@@ -156,10 +157,10 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         this.binding = a;
         Context context2 = getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, 2131558781, null, 4, null);
+        ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, R.layout.view_invite_settings_channel_spinner_item, null, 4, null);
         this.channelsSpinnerAdapter = channelsSpinnerAdapter;
         setFocusable(true);
-        setContentDescription(b.j(this, 2131890893, new Object[0], null, 4));
+        setContentDescription(b.j(this, R.string.invite_settings_title, new Object[0], null, 4));
         Spinner spinner = a.b;
         m.checkNotNullExpressionValue(spinner, "binding.guildInviteChannelSpinner");
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
@@ -186,10 +187,10 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         this.binding = a;
         Context context2 = getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, 2131558781, null, 4, null);
+        ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, R.layout.view_invite_settings_channel_spinner_item, null, 4, null);
         this.channelsSpinnerAdapter = channelsSpinnerAdapter;
         setFocusable(true);
-        setContentDescription(b.j(this, 2131890893, new Object[0], null, 4));
+        setContentDescription(b.j(this, R.string.invite_settings_title, new Object[0], null, 4));
         Spinner spinner = a.b;
         m.checkNotNullExpressionValue(spinner, "binding.guildInviteChannelSpinner");
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
@@ -216,10 +217,10 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         this.binding = a;
         Context context2 = getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, 2131558781, null, 4, null);
+        ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, R.layout.view_invite_settings_channel_spinner_item, null, 4, null);
         this.channelsSpinnerAdapter = channelsSpinnerAdapter;
         setFocusable(true);
-        setContentDescription(b.j(this, 2131890893, new Object[0], null, 4));
+        setContentDescription(b.j(this, R.string.invite_settings_title, new Object[0], null, 4));
         Spinner spinner = a.b;
         m.checkNotNullExpressionValue(spinner, "binding.guildInviteChannelSpinner");
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
@@ -265,7 +266,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         if (radioGroup.getChildCount() <= 0) {
             boolean z2 = false;
             for (int i : iArr) {
-                View inflate = LayoutInflater.from(getContext()).inflate(2131558812, (ViewGroup) radioGroup, false);
+                View inflate = LayoutInflater.from(getContext()).inflate(R.layout.view_radio_button, (ViewGroup) radioGroup, false);
                 Objects.requireNonNull(inflate, "rootView");
                 RadioButton radioButton = (RadioButton) inflate;
                 m.checkNotNullExpressionValue(new w2(radioButton), "ViewRadioButtonBinding.i…text), radioGroup, false)");
@@ -290,38 +291,38 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
 
     private final CharSequence getExpireAfterString(int i) {
         if (i == 0) {
-            return b.j(this, 2131891765, new Object[0], null, 4);
+            return b.j(this, R.string.no_user_limit, new Object[0], null, 4);
         }
         if (i == 1800) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            return StringResourceUtilsKt.getQuantityString(resources, context, 2131755067, 30, 30);
+            return StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.duration_mins_mins, 30, 30);
         } else if (i == 3600) {
             Resources resources2 = getResources();
             m.checkNotNullExpressionValue(resources2, "resources");
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return StringResourceUtilsKt.getQuantityString(resources2, context2, 2131755065, 1, 1);
+            return StringResourceUtilsKt.getQuantityString(resources2, context2, (int) R.plurals.duration_hours_hours, 1, 1);
         } else if (i == 21600) {
             Resources resources3 = getResources();
             m.checkNotNullExpressionValue(resources3, "resources");
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
-            return StringResourceUtilsKt.getQuantityString(resources3, context3, 2131755065, 6, 6);
+            return StringResourceUtilsKt.getQuantityString(resources3, context3, (int) R.plurals.duration_hours_hours, 6, 6);
         } else if (i == 43200) {
             Resources resources4 = getResources();
             m.checkNotNullExpressionValue(resources4, "resources");
             Context context4 = getContext();
             m.checkNotNullExpressionValue(context4, "context");
-            return StringResourceUtilsKt.getQuantityString(resources4, context4, 2131755065, 12, 12);
+            return StringResourceUtilsKt.getQuantityString(resources4, context4, (int) R.plurals.duration_hours_hours, 12, 12);
         } else if (i == 86400) {
             Resources resources5 = getResources();
             m.checkNotNullExpressionValue(resources5, "resources");
             Context context5 = getContext();
             m.checkNotNullExpressionValue(context5, "context");
-            return StringResourceUtilsKt.getQuantityString(resources5, context5, 2131755063, 1, 1);
+            return StringResourceUtilsKt.getQuantityString(resources5, context5, (int) R.plurals.duration_days_days, 1, 1);
         } else if (i != 604800) {
             return "";
         } else {
@@ -329,7 +330,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
             m.checkNotNullExpressionValue(resources6, "resources");
             Context context6 = getContext();
             m.checkNotNullExpressionValue(context6, "context");
-            return StringResourceUtilsKt.getQuantityString(resources6, context6, 2131755063, 7, 7);
+            return StringResourceUtilsKt.getQuantityString(resources6, context6, (int) R.plurals.duration_days_days, 7, 7);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java
index 1d0a0eefa6..461e71f43d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.guilds.invite;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildInviteBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -18,20 +19,20 @@ public final /* synthetic */ class WidgetGuildInvite$binding$2 extends k impleme
 
     public final WidgetGuildInviteBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363461;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363461);
+        int i = R.id.guild_invite_accept;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_invite_accept);
         if (materialButton != null) {
-            i = 2131363462;
-            View findViewById = view.findViewById(2131363462);
+            i = R.id.guild_invite_actions;
+            View findViewById = view.findViewById(R.id.guild_invite_actions);
             if (findViewById != null) {
-                i = 2131363463;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363463);
+                i = R.id.guild_invite_cancel;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.guild_invite_cancel);
                 if (materialButton2 != null) {
-                    i = 2131363472;
-                    WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(2131363472);
+                    i = R.id.guild_invite_info;
+                    WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(R.id.guild_invite_info);
                     if (widgetInviteInfo != null) {
-                        i = 2131363480;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363480);
+                        i = R.id.guild_invite_splash;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guild_invite_splash);
                         if (simpleDraweeView != null) {
                             return new WidgetGuildInviteBinding((CoordinatorLayout) view, materialButton, findViewById, materialButton2, widgetInviteInfo, simpleDraweeView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.java
index 868944880c..b647a2ef02 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.View;
 import c.a.e.l;
 import c.a.e.q;
+import com.discord.R;
 import com.discord.api.guild.Guild;
 import com.discord.models.domain.ModelInvite;
 import com.discord.stores.StoreInstantInvites;
@@ -78,7 +79,7 @@ public final class WidgetGuildInvite$configureUI$1 implements View.OnClickListen
     public final void onClick(View view) {
         String str = null;
         if (this.$isHub && !GrowthTeamFeatures.INSTANCE.isDiscordHubEmailConnectionEnabled()) {
-            c.a.e.o.g(this.$context, 2131888185, 0, null, 12);
+            c.a.e.o.g(this.$context, R.string.discord_u_coming_soon_to_mobile, 0, null, 12);
         } else if (!this.$isHub || !GrowthTeamFeatures.INSTANCE.isDiscordHubEmailConnectionEnabled()) {
             ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postInviteCode(this.$invite, "Accept Invite Page"), false, 1, null), this.this$0, null, 2, null).k(q.a.g(this.$context, new AnonymousClass1(this), new AnonymousClass2(this)));
         } else {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
index 465f674e4d..dcb27b737f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
@@ -11,11 +11,13 @@ import c.a.e.l;
 import c.a.e.q;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildInviteBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelInvite;
 import com.discord.stores.StoreInstantInvites;
 import com.discord.stores.StoreStream;
@@ -61,17 +63,17 @@ public final class WidgetGuildInvite extends AppFragment {
 
         public final void launch(Context context, String str, String str2) {
             m.checkNotNullParameter(context, "context");
-            m.checkNotNullParameter(str, "code");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
             m.checkNotNullParameter(str2, "location");
             Intent intent = new Intent();
-            intent.putExtra("EXTRA_CODE", str);
-            intent.putExtra("EXTRA_LOCATION", str2);
+            intent.putExtra(WidgetGuildInvite.EXTRA_CODE, str);
+            intent.putExtra(WidgetGuildInvite.EXTRA_LOCATION, str2);
             l.d(context, WidgetGuildInvite.class, intent);
         }
     }
 
     public WidgetGuildInvite() {
-        super(2131559073);
+        super(R.layout.widget_guild_invite);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGuildInvite widgetGuildInvite, StoreInstantInvites.InviteState.Resolved resolved) {
@@ -226,7 +228,7 @@ public final class WidgetGuildInvite extends AppFragment {
         super.onViewBound(view);
         setRetainInstance(true);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        String stringExtra = getMostRecentIntent().getStringExtra("EXTRA_CODE");
+        String stringExtra = getMostRecentIntent().getStringExtra(EXTRA_CODE);
         this.inviteCode = stringExtra;
         AnalyticsTracker.INSTANCE.impressionInviteAccept(stringExtra);
         getBinding().f1821c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this));
@@ -235,8 +237,8 @@ public final class WidgetGuildInvite extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        this.inviteCode = getMostRecentIntent().getStringExtra("EXTRA_CODE");
-        this.inviteLocation = getMostRecentIntent().getStringExtra("EXTRA_LOCATION");
+        this.inviteCode = getMostRecentIntent().getStringExtra(EXTRA_CODE);
+        this.inviteLocation = getMostRecentIntent().getStringExtra(EXTRA_LOCATION);
         Observable<? extends StoreInstantInvites.InviteState> resolvedInviteOrDefault = getResolvedInviteOrDefault(this.inviteCode);
         m.checkNotNullExpressionValue(resolvedInviteOrDefault, "getResolvedInviteOrDefault(inviteCode)");
         ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(resolvedInviteOrDefault, false, 1, null), this, null, 2, null).k(q.a.g(getContext(), new WidgetGuildInvite$onViewBoundOrOnResume$1(this), new WidgetGuildInvite$onViewBoundOrOnResume$2(this)));
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java
index 7d01750126..9bd494199e 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.guilds.invite;
 
 import androidx.annotation.IdRes;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetGuildInviteSettings.kt */
@@ -18,6 +19,6 @@ public final class WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1
     @IdRes
     /* renamed from: invoke */
     public final Integer mo1invoke() {
-        return this.$dropDownMode ? 2131362397 : 2131362398;
+        return this.$dropDownMode ? R.id.channel_spinner_dropdown_item_textview : R.id.channel_spinner_item_textview;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java
index 20402cd592..5f30502700 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RadioGroup;
 import android.widget.Spinner;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildInviteSettingsBinding;
 import com.discord.views.CheckedSetting;
 import com.google.android.material.button.MaterialButton;
@@ -20,20 +21,20 @@ public final /* synthetic */ class WidgetGuildInviteSettings$binding$2 extends k
 
     public final WidgetGuildInviteSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363464;
-        Spinner spinner = (Spinner) view.findViewById(2131363464);
+        int i = R.id.guild_invite_channel_spinner;
+        Spinner spinner = (Spinner) view.findViewById(R.id.guild_invite_channel_spinner);
         if (spinner != null) {
-            i = 2131363470;
-            RadioGroup radioGroup = (RadioGroup) view.findViewById(2131363470);
+            i = R.id.guild_invite_expires_after_radiogroup;
+            RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.guild_invite_expires_after_radiogroup);
             if (radioGroup != null) {
-                i = 2131363471;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363471);
+                i = R.id.guild_invite_generate_link;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_invite_generate_link);
                 if (materialButton != null) {
-                    i = 2131363474;
-                    RadioGroup radioGroup2 = (RadioGroup) view.findViewById(2131363474);
+                    i = R.id.guild_invite_max_uses_radiogroup;
+                    RadioGroup radioGroup2 = (RadioGroup) view.findViewById(R.id.guild_invite_max_uses_radiogroup);
                     if (radioGroup2 != null) {
-                        i = 2131363483;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363483);
+                        i = R.id.guild_invite_temporary_membership;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.guild_invite_temporary_membership);
                         if (checkedSetting != null) {
                             return new WidgetGuildInviteSettingsBinding((LinearLayout) view, spinner, radioGroup, materialButton, radioGroup2, checkedSetting);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$onViewBoundOrOnResume$2.java
index 0a99a79cd2..e39e6d33e4 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guilds.invite;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.guilds.invite.GuildInviteSettingsViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetGuildInviteSettings$onViewBoundOrOnResume$2 extends o i
     }
 
     public final void invoke(GuildInviteSettingsViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         this.this$0.handleEvent(event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
index b30b7067a0..34bb5c29b9 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
@@ -16,6 +16,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.MainThread;
 import androidx.appcompat.widget.AppCompatRadioButton;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
@@ -26,6 +27,7 @@ import c.a.j.w;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildInviteSettingsBinding;
@@ -107,7 +109,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
         @Override // android.widget.ArrayAdapter, android.widget.SpinnerAdapter, android.widget.BaseAdapter
         public View getDropDownView(int i, View view, ViewGroup viewGroup) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return getItemView(i, 2131558782, view, true);
+            return getItemView(i, R.layout.view_invite_settngs_channel_spinner_item_open, view, true);
         }
 
         @Override // android.widget.ArrayAdapter, android.widget.Adapter
@@ -118,7 +120,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
         @Override // android.widget.ArrayAdapter, android.widget.Adapter
         public View getView(int i, View view, ViewGroup viewGroup) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return getItemView(i, 2131558781, view, false);
+            return getItemView(i, R.layout.view_invite_settings_channel_spinner_item, view, false);
         }
 
         public final void setData(Channel[] channelArr) {
@@ -160,7 +162,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
     }
 
     public WidgetGuildInviteSettings() {
-        super(2131559075);
+        super(R.layout.widget_guild_invite_settings);
         WidgetGuildInviteSettings$viewModel$2 widgetGuildInviteSettings$viewModel$2 = new WidgetGuildInviteSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildInviteSettingsViewModel.class), new WidgetGuildInviteSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteSettings$viewModel$2));
@@ -199,7 +201,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
         if (radioGroup.getChildCount() <= 0) {
             boolean z2 = false;
             for (int i : iArr) {
-                View inflate = LayoutInflater.from(getContext()).inflate(2131558534, (ViewGroup) radioGroup, false);
+                View inflate = LayoutInflater.from(getContext()).inflate(R.layout.invite_settings_radio_button, (ViewGroup) radioGroup, false);
                 Objects.requireNonNull(inflate, "rootView");
                 AppCompatRadioButton appCompatRadioButton = (AppCompatRadioButton) inflate;
                 m.checkNotNullExpressionValue(new w(appCompatRadioButton), "InviteSettingsRadioButto…text), radioGroup, false)");
@@ -228,34 +230,34 @@ public final class WidgetGuildInviteSettings extends AppFragment {
 
     private final CharSequence getExpireAfterString(int i, Context context) {
         if (i == 0) {
-            return b.k(this, 2131891765, new Object[0], null, 4);
+            return b.k(this, R.string.no_user_limit, new Object[0], null, 4);
         }
         if (i == 1800) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            return StringResourceUtilsKt.getQuantityString(resources, context, 2131755067, 30, 30);
+            return StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.duration_mins_mins, 30, 30);
         } else if (i == 3600) {
             Resources resources2 = getResources();
             m.checkNotNullExpressionValue(resources2, "resources");
-            return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755065, 1, 1);
+            return StringResourceUtilsKt.getQuantityString(resources2, context, (int) R.plurals.duration_hours_hours, 1, 1);
         } else if (i == 21600) {
             Resources resources3 = getResources();
             m.checkNotNullExpressionValue(resources3, "resources");
-            return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755065, 6, 6);
+            return StringResourceUtilsKt.getQuantityString(resources3, context, (int) R.plurals.duration_hours_hours, 6, 6);
         } else if (i == 43200) {
             Resources resources4 = getResources();
             m.checkNotNullExpressionValue(resources4, "resources");
-            return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755065, 12, 12);
+            return StringResourceUtilsKt.getQuantityString(resources4, context, (int) R.plurals.duration_hours_hours, 12, 12);
         } else if (i == 86400) {
             Resources resources5 = getResources();
             m.checkNotNullExpressionValue(resources5, "resources");
-            return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755063, 1, 1);
+            return StringResourceUtilsKt.getQuantityString(resources5, context, (int) R.plurals.duration_days_days, 1, 1);
         } else if (i != 604800) {
             return "";
         } else {
             Resources resources6 = getResources();
             m.checkNotNullExpressionValue(resources6, "resources");
-            return StringResourceUtilsKt.getQuantityString(resources6, context, 2131755063, 7, 7);
+            return StringResourceUtilsKt.getQuantityString(resources6, context, (int) R.plurals.duration_days_days, 7, 7);
         }
     }
 
@@ -378,14 +380,14 @@ public final class WidgetGuildInviteSettings extends AppFragment {
     }
 
     public final void handleEvent(GuildInviteSettingsViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (event instanceof GuildInviteSettingsViewModel.Event.InviteCreationSuccess) {
             Intent intent = new Intent();
-            intent.putExtra("EXTRA_CREATED_INVITE", ((GuildInviteSettingsViewModel.Event.InviteCreationSuccess) event).getInvite());
+            intent.putExtra(EXTRA_CREATED_INVITE, ((GuildInviteSettingsViewModel.Event.InviteCreationSuccess) event).getInvite());
             requireActivity().setResult(-1, intent);
             requireActivity().finish();
         } else if (m.areEqual(event, GuildInviteSettingsViewModel.Event.InviteCreationFailure.INSTANCE)) {
-            c.a.e.o.g(requireContext(), 2131888073, 0, null, 12);
+            c.a.e.o.g(requireContext(), R.string.default_failure_to_perform_action_message, 0, null, 12);
         }
     }
 
@@ -393,7 +395,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        this.channelsSpinnerAdapter = new ChannelsSpinnerAdapter(requireContext(), 2131558781, null, 4, null);
+        this.channelsSpinnerAdapter = new ChannelsSpinnerAdapter(requireContext(), R.layout.view_invite_settings_channel_spinner_item, null, 4, null);
         Spinner spinner = getBinding().b;
         m.checkNotNullExpressionValue(spinner, "binding.guildInviteChannelSpinner");
         ChannelsSpinnerAdapter channelsSpinnerAdapter = this.channelsSpinnerAdapter;
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java
index e1647a9411..78134deacd 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGuildInviteShareBinding;
 import com.discord.views.CheckedSetting;
@@ -23,35 +24,35 @@ public final /* synthetic */ class WidgetGuildInviteShare$binding$2 extends k im
 
     public final WidgetGuildInviteShareBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362182;
-        View findViewById = view.findViewById(2131362182);
+        int i = R.id.bottom_sheet_tint;
+        View findViewById = view.findViewById(R.id.bottom_sheet_tint);
         if (findViewById != null) {
-            i = 2131363465;
-            TextView textView = (TextView) view.findViewById(2131363465);
+            i = R.id.guild_invite_empty_results;
+            TextView textView = (TextView) view.findViewById(R.id.guild_invite_empty_results);
             if (textView != null) {
-                i = 2131363473;
-                TextView textView2 = (TextView) view.findViewById(2131363473);
+                i = R.id.guild_invite_link;
+                TextView textView2 = (TextView) view.findViewById(R.id.guild_invite_link);
                 if (textView2 != null) {
-                    i = 2131363475;
-                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363475);
+                    i = R.id.guild_invite_never_expire;
+                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.guild_invite_never_expire);
                     if (checkedSetting != null) {
-                        i = 2131363476;
-                        ImageView imageView = (ImageView) view.findViewById(2131363476);
+                        i = R.id.guild_invite_settings_edit;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.guild_invite_settings_edit);
                         if (imageView != null) {
-                            i = 2131363477;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363477);
+                            i = R.id.guild_invite_share_btn;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_invite_share_btn);
                             if (materialButton != null) {
-                                i = 2131363479;
-                                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363479);
+                                i = R.id.guild_invite_share_search;
+                                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_invite_share_search);
                                 if (textInputLayout != null) {
-                                    i = 2131363481;
-                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363481);
+                                    i = R.id.guild_invite_suggestion_list;
+                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_invite_suggestion_list);
                                     if (recyclerView != null) {
-                                        i = 2131363482;
-                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363482);
+                                        i = R.id.guild_invite_suggestions_flipper;
+                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.guild_invite_suggestions_flipper);
                                         if (appViewFlipper != null) {
-                                            i = 2131363838;
-                                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363838);
+                                            i = R.id.invite_settings_bottom_sheet;
+                                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(R.id.invite_settings_bottom_sheet);
                                             if (viewInviteSettingsSheet != null) {
                                                 return new WidgetGuildInviteShareBinding((CoordinatorLayout) view, findViewById, textView, textView2, checkedSetting, imageView, materialButton, textInputLayout, recyclerView, appViewFlipper, viewInviteSettingsSheet);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java
index 0751fb2fb0..a889fe206d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.guilds.invite;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.models.domain.ModelInvite;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import com.discord.widgets.guilds.invite.WidgetGuildInviteShareViewModel;
@@ -35,7 +36,7 @@ public final class WidgetGuildInviteShare$configureUI$3 extends o implements Fun
         WidgetGuildInviteShare.access$sendInvite(this.this$0, inviteSuggestionItem, this.$viewState, this.$invite);
         AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
         Context context = WidgetGuildInviteShare.access$getAdapter$p(this.this$0).getContext();
-        String string = this.this$0.getString(2131890890);
+        String string = this.this$0.getString(R.string.invite_sent);
         m.checkNotNullExpressionValue(string, "getString(R.string.invite_sent)");
         accessibilityUtils.sendAnnouncement(context, string);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java
index bed95104fa..184b7575f0 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java
@@ -31,7 +31,7 @@ public final class WidgetGuildInviteShare$configureUI$5 implements View.OnClickL
                 i = 0;
             } else {
                 Experiment experiment = this.$inviteExperiment;
-                i = (experiment == null || experiment.getBucket() != 1) ? 86400 : 604800;
+                i = (experiment == null || experiment.getBucket() != 1) ? 86400 : ModelInvite.Settings.SEVEN_DAYS;
             }
             ModelInvite.Settings mergeMaxAge = settings.mergeMaxAge(i);
             m.checkNotNullExpressionValue(mergeMaxAge, "settings.mergeMaxAge(\n  …          }\n            )");
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java
index 51fdd1fd4d..6933072f43 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java
@@ -13,6 +13,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.api.guild.Guild;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -79,7 +81,7 @@ public final class WidgetGuildInviteShare extends AppFragment {
                 return;
             }
             Intent intent = new Intent();
-            intent.putExtra("INTENT_IS_NUX_FLOW", z2);
+            intent.putExtra(WidgetGuildInviteShare.INTENT_IS_NUX_FLOW, z2);
             intent.putExtra("com.discord.intent.extra.EXTRA_GUILD_ID", j);
             intent.putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", l != null ? l.longValue() : 0);
             intent.putExtra("com.discord.intent.ORIGIN_SOURCE", str);
@@ -90,7 +92,7 @@ public final class WidgetGuildInviteShare extends AppFragment {
     }
 
     public WidgetGuildInviteShare() {
-        super(2131559076);
+        super(R.layout.widget_guild_invite_share);
         WidgetGuildInviteShare$viewModel$2 widgetGuildInviteShare$viewModel$2 = new WidgetGuildInviteShare$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShare$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShare$viewModel$2));
@@ -227,7 +229,7 @@ public final class WidgetGuildInviteShare extends AppFragment {
     }
 
     private final String getInviteLink(ModelInvite modelInvite) {
-        return modelInvite == null ? "https://discord.gg" : modelInvite.toLink(getResources(), "https://discord.gg");
+        return modelInvite == null ? BuildConfig.HOST_INVITE : modelInvite.toLink(getResources(), BuildConfig.HOST_INVITE);
     }
 
     private final WidgetGuildInviteShareViewModel getViewModel() {
@@ -266,13 +268,13 @@ public final class WidgetGuildInviteShare extends AppFragment {
         RecyclerView recyclerView = getBinding().i;
         m.checkNotNullExpressionValue(recyclerView, "binding.guildInviteSuggestionList");
         this.adapter = (PrivateChannelAdapter) companion.configure(new PrivateChannelAdapter(recyclerView));
-        boolean booleanExtra = getMostRecentIntent().getBooleanExtra("INTENT_IS_NUX_FLOW", false);
+        boolean booleanExtra = getMostRecentIntent().getBooleanExtra(INTENT_IS_NUX_FLOW, false);
         long longExtra = getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0);
         if (longExtra != 0) {
             getViewModel().selectChannel(longExtra);
         }
-        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969398, 0, 2, (Object) null)) : null, booleanExtra ? 2131887410 : null, null, 8, null);
-        setActionBarTitle(2131890879);
+        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_close_24dp, 0, 2, (Object) null)) : null, booleanExtra ? Integer.valueOf((int) R.string.close) : null, null, 8, null);
+        setActionBarTitle(R.string.invite_people);
         AppActivity appActivity = getAppActivity();
         if (!(appActivity == null || (window = appActivity.getWindow()) == null)) {
             window.setSoftInputMode(32);
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java
index d1322f700a..5458d859d5 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGuildInviteShareCompactBinding;
 import com.google.android.material.button.MaterialButton;
@@ -22,32 +23,32 @@ public final /* synthetic */ class WidgetGuildInviteShareCompact$binding$2 exten
 
     public final WidgetGuildInviteShareCompactBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362182;
-        View findViewById = view.findViewById(2131362182);
+        int i = R.id.bottom_sheet_tint;
+        View findViewById = view.findViewById(R.id.bottom_sheet_tint);
         if (findViewById != null) {
-            i = 2131363465;
-            TextView textView = (TextView) view.findViewById(2131363465);
+            i = R.id.guild_invite_empty_results;
+            TextView textView = (TextView) view.findViewById(R.id.guild_invite_empty_results);
             if (textView != null) {
-                i = 2131363475;
-                TextView textView2 = (TextView) view.findViewById(2131363475);
+                i = R.id.guild_invite_never_expire;
+                TextView textView2 = (TextView) view.findViewById(R.id.guild_invite_never_expire);
                 if (textView2 != null) {
-                    i = 2131363476;
-                    ImageView imageView = (ImageView) view.findViewById(2131363476);
+                    i = R.id.guild_invite_settings_edit;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.guild_invite_settings_edit);
                     if (imageView != null) {
-                        i = 2131363477;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363477);
+                        i = R.id.guild_invite_share_btn;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_invite_share_btn);
                         if (materialButton != null) {
-                            i = 2131363478;
-                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363478);
+                            i = R.id.guild_invite_share_compact_search;
+                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_invite_share_compact_search);
                             if (textInputLayout != null) {
-                                i = 2131363481;
-                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363481);
+                                i = R.id.guild_invite_suggestion_list;
+                                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_invite_suggestion_list);
                                 if (recyclerView != null) {
-                                    i = 2131363482;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363482);
+                                    i = R.id.guild_invite_suggestions_flipper;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.guild_invite_suggestions_flipper);
                                     if (appViewFlipper != null) {
-                                        i = 2131363838;
-                                        ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363838);
+                                        i = R.id.invite_settings_bottom_sheet;
+                                        ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(R.id.invite_settings_bottom_sheet);
                                         if (viewInviteSettingsSheet != null) {
                                             return new WidgetGuildInviteShareCompactBinding((CoordinatorLayout) view, findViewById, textView, textView2, imageView, materialButton, textInputLayout, recyclerView, appViewFlipper, viewInviteSettingsSheet);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java
index 3589ec1e74..fa6d259518 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java
@@ -12,6 +12,8 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.api.guild.Guild;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -66,7 +68,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Item(PrivateChannelAdapter privateChannelAdapter) {
-                super(2131559079, privateChannelAdapter);
+                super((int) R.layout.widget_guild_invite_share_item, privateChannelAdapter);
                 m.checkNotNullParameter(privateChannelAdapter, "adapter");
                 WidgetGuildInviteShareItemBinding a = WidgetGuildInviteShareItemBinding.a(this.itemView);
                 m.checkNotNullExpressionValue(a, "WidgetGuildInviteShareItemBinding.bind(itemView)");
@@ -144,7 +146,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
     }
 
     public WidgetGuildInviteShareCompact() {
-        super(2131559077);
+        super(R.layout.widget_guild_invite_share_compact);
         WidgetGuildInviteShareCompact$viewModel$2 widgetGuildInviteShareCompact$viewModel$2 = new WidgetGuildInviteShareCompact$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShareCompact$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShareCompact$viewModel$2));
@@ -260,7 +262,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
     }
 
     private final String getInviteLink(ModelInvite modelInvite) {
-        return modelInvite == null ? "https://discord.gg" : modelInvite.toLink(getResources(), "https://discord.gg");
+        return modelInvite == null ? BuildConfig.HOST_INVITE : modelInvite.toLink(getResources(), BuildConfig.HOST_INVITE);
     }
 
     private final WidgetGuildInviteShareViewModel getViewModel() {
@@ -293,13 +295,13 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
         RecyclerView recyclerView = getBinding().h;
         m.checkNotNullExpressionValue(recyclerView, "binding.guildInviteSuggestionList");
         this.adapter = (PrivateChannelAdapter) companion.configure(new PrivateChannelAdapter(recyclerView));
-        boolean booleanExtra = getMostRecentIntent().getBooleanExtra("INTENT_IS_NUX_FLOW", false);
+        boolean booleanExtra = getMostRecentIntent().getBooleanExtra(WidgetGuildInviteShare.INTENT_IS_NUX_FLOW, false);
         long longExtra = getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0);
         if (longExtra != 0) {
             getViewModel().selectChannel(longExtra);
         }
-        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969398, 0, 2, (Object) null)) : null, booleanExtra ? 2131887410 : null, null, 8, null);
-        setActionBarTitle(2131890879);
+        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_close_24dp, 0, 2, (Object) null)) : null, booleanExtra ? Integer.valueOf((int) R.string.close) : null, null, 8, null);
+        setActionBarTitle(R.string.invite_people);
         AppFragment.setOnBackPressed$default(this, new WidgetGuildInviteShareCompact$onViewBound$1(this, booleanExtra), 0, 2, null);
         TextInputLayout textInputLayout = getBinding().g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildInviteShareCompactSearch");
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java
index 40beb594b8..424644231c 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildInviteShareEmptySuggestionsBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -19,23 +20,23 @@ public final /* synthetic */ class WidgetGuildInviteShareEmptySuggestions$bindin
 
     public final WidgetGuildInviteShareEmptySuggestionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362182;
-        View findViewById = view.findViewById(2131362182);
+        int i = R.id.bottom_sheet_tint;
+        View findViewById = view.findViewById(R.id.bottom_sheet_tint);
         if (findViewById != null) {
-            i = 2131363466;
-            TextView textView = (TextView) view.findViewById(2131363466);
+            i = R.id.guild_invite_empty_suggestions_invite_link;
+            TextView textView = (TextView) view.findViewById(R.id.guild_invite_empty_suggestions_invite_link);
             if (textView != null) {
-                i = 2131363467;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363467);
+                i = R.id.guild_invite_empty_suggestions_invite_share_btn;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_invite_empty_suggestions_invite_share_btn);
                 if (materialButton != null) {
-                    i = 2131363468;
-                    ImageButton imageButton = (ImageButton) view.findViewById(2131363468);
+                    i = R.id.guild_invite_empty_suggestions_settings_edit;
+                    ImageButton imageButton = (ImageButton) view.findViewById(R.id.guild_invite_empty_suggestions_settings_edit);
                     if (imageButton != null) {
-                        i = 2131363469;
-                        TextView textView2 = (TextView) view.findViewById(2131363469);
+                        i = R.id.guild_invite_empty_suggestions_settings_invite_link_subtext;
+                        TextView textView2 = (TextView) view.findViewById(R.id.guild_invite_empty_suggestions_settings_invite_link_subtext);
                         if (textView2 != null) {
-                            i = 2131363838;
-                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363838);
+                            i = R.id.invite_settings_bottom_sheet;
+                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(R.id.invite_settings_bottom_sheet);
                             if (viewInviteSettingsSheet != null) {
                                 return new WidgetGuildInviteShareEmptySuggestionsBinding((CoordinatorLayout) view, findViewById, textView, materialButton, imageButton, textView2, viewInviteSettingsSheet);
                             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java
index a5a1836014..76f8f2baa9 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java
@@ -10,6 +10,8 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildInviteShareEmptySuggestionsBinding;
 import com.discord.models.domain.ModelInvite;
@@ -37,7 +39,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetGuildInviteShareEmptySuggestions() {
-        super(2131559078);
+        super(R.layout.widget_guild_invite_share_empty_suggestions);
         WidgetGuildInviteShareEmptySuggestions$viewModel$2 widgetGuildInviteShareEmptySuggestions$viewModel$2 = new WidgetGuildInviteShareEmptySuggestions$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShareEmptySuggestions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShareEmptySuggestions$viewModel$2));
@@ -75,14 +77,14 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
     private final CharSequence getHoursExpirationString(int i, CharSequence charSequence) {
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755065, i, Integer.valueOf(i));
+        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), (int) R.plurals.duration_hours_hours, i, Integer.valueOf(i));
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        return b.i(resources2, 2131890892, new Object[]{quantityString, charSequence}, null, 4);
+        return b.i(resources2, R.string.invite_settings_expired_description, new Object[]{quantityString, charSequence}, null, 4);
     }
 
     private final String getInviteLink(ModelInvite modelInvite) {
-        return modelInvite == null ? "https://discord.gg" : modelInvite.toLink(getResources(), "https://discord.gg");
+        return modelInvite == null ? BuildConfig.HOST_INVITE : modelInvite.toLink(getResources(), BuildConfig.HOST_INVITE);
     }
 
     private final WidgetGuildInviteShareViewModel getViewModel() {
@@ -113,16 +115,16 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
         ModelInvite.Settings settings = widgetInviteModel.getSettings();
         if (settings != null) {
             if (settings.getMaxUses() == 0) {
-                charSequence = getResources().getString(2131891322);
+                charSequence = getResources().getString(R.string.max_uses_description_unlimited_uses);
                 m.checkNotNullExpressionValue(charSequence, "resources.getString(R.st…scription_unlimited_uses)");
             } else {
                 Resources resources = getResources();
                 m.checkNotNullExpressionValue(resources, "resources");
-                charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755224, settings.getMaxUses(), Integer.valueOf(settings.getMaxUses()));
+                charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), (int) R.plurals.max_uses_description_mobile_maxUses, settings.getMaxUses(), Integer.valueOf(settings.getMaxUses()));
             }
             int maxAge = widgetInviteModel.getSettings().getMaxAge();
             if (maxAge == 0) {
-                String str = getResources().getString(2131891317) + ", " + charSequence;
+                String str = getResources().getString(R.string.max_age_never_description_mobile) + ", " + charSequence;
                 m.checkNotNullExpressionValue(str, "StringBuilder()\n        …              .toString()");
                 TextView textView2 = getBinding().f;
                 m.checkNotNullExpressionValue(textView2, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
@@ -130,12 +132,12 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
             } else if (maxAge == 1800) {
                 Resources resources2 = getResources();
                 m.checkNotNullExpressionValue(resources2, "resources");
-                CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755068, 30, 30);
+                CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.duration_minutes_minutes, 30, 30);
                 TextView textView3 = getBinding().f;
                 m.checkNotNullExpressionValue(textView3, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
                 Resources resources3 = getResources();
                 m.checkNotNullExpressionValue(resources3, "resources");
-                textView3.setText(b.i(resources3, 2131890892, new Object[]{quantityString, charSequence}, null, 4));
+                textView3.setText(b.i(resources3, R.string.invite_settings_expired_description, new Object[]{quantityString, charSequence}, null, 4));
             } else if (maxAge == 3600) {
                 TextView textView4 = getBinding().f;
                 m.checkNotNullExpressionValue(textView4, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
@@ -151,21 +153,21 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
             } else if (maxAge == 86400) {
                 Resources resources4 = getResources();
                 m.checkNotNullExpressionValue(resources4, "resources");
-                CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources4, requireContext(), 2131755063, 1, 1);
+                CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources4, requireContext(), (int) R.plurals.duration_days_days, 1, 1);
                 TextView textView7 = getBinding().f;
                 m.checkNotNullExpressionValue(textView7, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
                 Resources resources5 = getResources();
                 m.checkNotNullExpressionValue(resources5, "resources");
-                textView7.setText(b.i(resources5, 2131890892, new Object[]{quantityString2, charSequence}, null, 4));
+                textView7.setText(b.i(resources5, R.string.invite_settings_expired_description, new Object[]{quantityString2, charSequence}, null, 4));
             } else if (maxAge == 604800) {
                 Resources resources6 = getResources();
                 m.checkNotNullExpressionValue(resources6, "resources");
-                CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources6, requireContext(), 2131755063, 7, 7);
+                CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources6, requireContext(), (int) R.plurals.duration_days_days, 7, 7);
                 TextView textView8 = getBinding().f;
                 m.checkNotNullExpressionValue(textView8, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
                 Resources resources7 = getResources();
                 m.checkNotNullExpressionValue(resources7, "resources");
-                textView8.setText(b.i(resources7, 2131890892, new Object[]{quantityString3, charSequence}, null, 4));
+                textView8.setText(b.i(resources7, R.string.invite_settings_expired_description, new Object[]{quantityString3, charSequence}, null, 4));
             }
         }
     }
@@ -186,8 +188,8 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
         if (longExtra != 0) {
             getViewModel().selectChannel(longExtra);
         }
-        boolean booleanExtra = getMostRecentIntent().getBooleanExtra("INTENT_IS_NUX_FLOW", false);
-        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969398, 0, 2, (Object) null)) : null, booleanExtra ? 2131887410 : null, null, 8, null);
+        boolean booleanExtra = getMostRecentIntent().getBooleanExtra(WidgetGuildInviteShare.INTENT_IS_NUX_FLOW, false);
+        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_close_24dp, 0, 2, (Object) null)) : null, booleanExtra ? Integer.valueOf((int) R.string.close) : null, null, 8, null);
         AppFragment.setOnBackPressed$default(this, new WidgetGuildInviteShareEmptySuggestions$onViewBound$1(this, booleanExtra), 0, 2, null);
         BottomSheetBehavior<ViewInviteSettingsSheet> from = BottomSheetBehavior.from(getBinding().g);
         m.checkNotNullExpressionValue(from, "BottomSheetBehavior.from…nviteSettingsBottomSheet)");
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java
index 1b76485a33..8be7b202a8 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java
@@ -10,6 +10,7 @@ import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGuildInviteShareSheetBinding;
 import com.discord.views.SearchInputView;
@@ -27,69 +28,69 @@ public final /* synthetic */ class WidgetGuildInviteShareSheet$binding$2 extends
 
     public final WidgetGuildInviteShareSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362808;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362808);
+        int i = R.id.copy_link_group;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.copy_link_group);
         if (constraintLayout != null) {
-            i = 2131362809;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362809);
+            i = R.id.copy_link_icon;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.copy_link_icon);
             if (frameLayout != null) {
-                i = 2131362810;
-                Barrier barrier = (Barrier) view.findViewById(2131362810);
+                i = R.id.copy_link_icon_barrier;
+                Barrier barrier = (Barrier) view.findViewById(R.id.copy_link_icon_barrier);
                 if (barrier != null) {
-                    i = 2131362811;
-                    TextView textView = (TextView) view.findViewById(2131362811);
+                    i = R.id.copy_link_subtitle;
+                    TextView textView = (TextView) view.findViewById(R.id.copy_link_subtitle);
                     if (textView != null) {
-                        i = 2131362812;
-                        TextView textView2 = (TextView) view.findViewById(2131362812);
+                        i = R.id.copy_link_title;
+                        TextView textView2 = (TextView) view.findViewById(R.id.copy_link_title);
                         if (textView2 != null) {
-                            i = 2131363123;
-                            TextView textView3 = (TextView) view.findViewById(2131363123);
+                            i = R.id.empty_state_body;
+                            TextView textView3 = (TextView) view.findViewById(R.id.empty_state_body);
                             if (textView3 != null) {
-                                i = 2131363124;
-                                ImageView imageView = (ImageView) view.findViewById(2131363124);
+                                i = R.id.empty_state_img;
+                                ImageView imageView = (ImageView) view.findViewById(R.id.empty_state_img);
                                 if (imageView != null) {
-                                    i = 2131363125;
-                                    TextView textView4 = (TextView) view.findViewById(2131363125);
+                                    i = R.id.empty_state_invite_link;
+                                    TextView textView4 = (TextView) view.findViewById(R.id.empty_state_invite_link);
                                     if (textView4 != null) {
-                                        i = 2131363126;
-                                        ImageButton imageButton = (ImageButton) view.findViewById(2131363126);
+                                        i = R.id.empty_state_link_options;
+                                        ImageButton imageButton = (ImageButton) view.findViewById(R.id.empty_state_link_options);
                                         if (imageButton != null) {
-                                            i = 2131363127;
-                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363127);
+                                            i = R.id.empty_state_scroller;
+                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.empty_state_scroller);
                                             if (nestedScrollView != null) {
-                                                i = 2131363128;
-                                                TextView textView5 = (TextView) view.findViewById(2131363128);
+                                                i = R.id.empty_state_settings_subtext;
+                                                TextView textView5 = (TextView) view.findViewById(R.id.empty_state_settings_subtext);
                                                 if (textView5 != null) {
-                                                    i = 2131363129;
-                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131363129);
+                                                    i = R.id.empty_state_share_btn;
+                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.empty_state_share_btn);
                                                     if (materialButton != null) {
-                                                        i = 2131363130;
-                                                        TextView textView6 = (TextView) view.findViewById(2131363130);
+                                                        i = R.id.empty_state_title;
+                                                        TextView textView6 = (TextView) view.findViewById(R.id.empty_state_title);
                                                         if (textView6 != null) {
-                                                            i = 2131363839;
-                                                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363839);
+                                                            i = R.id.invite_settings_button;
+                                                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.invite_settings_button);
                                                             if (frameLayout2 != null) {
-                                                                i = 2131363841;
-                                                                TextView textView7 = (TextView) view.findViewById(2131363841);
+                                                                i = R.id.invite_suggestions_header;
+                                                                TextView textView7 = (TextView) view.findViewById(R.id.invite_suggestions_header);
                                                                 if (textView7 != null) {
-                                                                    i = 2131363968;
-                                                                    Barrier barrier2 = (Barrier) view.findViewById(2131363968);
+                                                                    i = R.id.link_settings_barrier;
+                                                                    Barrier barrier2 = (Barrier) view.findViewById(R.id.link_settings_barrier);
                                                                     if (barrier2 != null) {
                                                                         FrameLayout frameLayout3 = (FrameLayout) view;
-                                                                        i = 2131364764;
-                                                                        Barrier barrier3 = (Barrier) view.findViewById(2131364764);
+                                                                        i = R.id.search_barrier;
+                                                                        Barrier barrier3 = (Barrier) view.findViewById(R.id.search_barrier);
                                                                         if (barrier3 != null) {
-                                                                            i = 2131364772;
-                                                                            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364772);
+                                                                            i = R.id.search_input;
+                                                                            SearchInputView searchInputView = (SearchInputView) view.findViewById(R.id.search_input);
                                                                             if (searchInputView != null) {
-                                                                                i = 2131365177;
-                                                                                CardView cardView = (CardView) view.findViewById(2131365177);
+                                                                                i = R.id.share_button;
+                                                                                CardView cardView = (CardView) view.findViewById(R.id.share_button);
                                                                                 if (cardView != null) {
-                                                                                    i = 2131365402;
-                                                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365402);
+                                                                                    i = R.id.suggestion_list;
+                                                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.suggestion_list);
                                                                                     if (recyclerView != null) {
-                                                                                        i = 2131365403;
-                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365403);
+                                                                                        i = R.id.suggestions_flipper;
+                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.suggestions_flipper);
                                                                                         if (appViewFlipper != null) {
                                                                                             return new WidgetGuildInviteShareSheetBinding(frameLayout3, constraintLayout, frameLayout, barrier, textView, textView2, textView3, imageView, textView4, imageButton, nestedScrollView, textView5, materialButton, textView6, frameLayout2, textView7, barrier2, frameLayout3, barrier3, searchInputView, cardView, recyclerView, appViewFlipper);
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java
index 1939e00070..b77075c705 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java
@@ -22,6 +22,7 @@ import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppViewFlipper;
@@ -102,10 +103,10 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
             WidgetGuildInviteShareSheet widgetGuildInviteShareSheet = new WidgetGuildInviteShareSheet();
             Bundle bundle = new Bundle();
             if (l != null) {
-                bundle.putLong("ARG_CHANNEL_ID", l.longValue());
+                bundle.putLong(WidgetGuildInviteShareSheet.ARG_CHANNEL_ID, l.longValue());
             }
-            bundle.putLong("ARG_GUILD_ID", j);
-            bundle.putString("ARG_ANALYTICS_SOURCE", str);
+            bundle.putLong(WidgetGuildInviteShareSheet.ARG_GUILD_ID, j);
+            bundle.putString(WidgetGuildInviteShareSheet.ARG_ANALYTICS_SOURCE, str);
             widgetGuildInviteShareSheet.setArguments(bundle);
             widgetGuildInviteShareSheet.show(fragmentManager, WidgetGuildInviteShareSheet.class.getName());
         }
@@ -186,7 +187,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
         } else {
             TextView textView3 = binding.d;
             m.checkNotNullExpressionValue(textView3, "emptyStateInviteLink");
-            textView3.setText(getString(2131891128));
+            textView3.setText(getString(R.string.loading));
             TextView textView4 = binding.g;
             m.checkNotNullExpressionValue(textView4, "emptyStateSettingsSubtext");
             textView4.setText((CharSequence) null);
@@ -239,10 +240,10 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
             Channel channel = viewState.getChannel();
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            searchInputView.setHint(b.k(this, 2131890911, new Object[]{AnimatableValueParser.A0(channel, requireContext, false, 2)}, null, 4));
+            searchInputView.setHint(b.k(this, R.string.invite_your_friends_channel_mobile, new Object[]{AnimatableValueParser.A0(channel, requireContext, false, 2)}, null, 4));
         } else {
             SearchInputView searchInputView2 = binding.k;
-            String string = getString(2131890910);
+            String string = getString(R.string.invite_your_friends);
             m.checkNotNullExpressionValue(string, "getString(R.string.invite_your_friends)");
             searchInputView2.setHint(string);
         }
@@ -250,7 +251,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
         if (invite != null) {
             CardView cardView = binding.l;
             m.checkNotNullExpressionValue(cardView, "shareButton");
-            cardView.setContentDescription(b.k(this, 2131893626, new Object[]{invite}, null, 4));
+            cardView.setContentDescription(b.k(this, R.string.share_invite_mobile, new Object[]{invite}, null, 4));
             long expirationTimeMs = invite.getExpirationTimeMs() - ClockFactory.get().currentTimeMillis();
             String link = invite.toLink();
             Context requireContext2 = requireContext();
@@ -310,7 +311,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559080;
+        return R.layout.widget_guild_invite_share_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -324,7 +325,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         setBottomSheetCollapsedStateDisabled();
-        String string = getArgumentsOrDefault().getString("ARG_ANALYTICS_SOURCE");
+        String string = getArgumentsOrDefault().getString(ARG_ANALYTICS_SOURCE);
         if (string == null) {
             string = "";
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
index fba64608cb..b9f27ae0ba 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guilds.invite;
 import android.content.Context;
 import android.content.res.Resources;
 import c.d.b.a.a;
+import com.discord.BuildConfig;
 import com.discord.app.AppComponent;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelInvite;
@@ -318,7 +319,7 @@ public final class WidgetGuildInviteShareViewModel extends AppViewModel<ViewStat
     }
 
     private final String getInviteLink(ModelInvite modelInvite) {
-        return modelInvite == null ? "https://discord.gg" : modelInvite.toLink(this.resources, "https://discord.gg");
+        return modelInvite == null ? BuildConfig.HOST_INVITE : modelInvite.toLink(this.resources, BuildConfig.HOST_INVITE);
     }
 
     private final Observable<WidgetInviteModel> observeWidgetInviteViewModel(long j) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java
index dfd00d79c2..76a3657f82 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java
@@ -49,45 +49,45 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
     public WidgetInviteInfo(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "ctx");
-        LayoutInflater.from(getContext()).inflate(2131559074, this);
-        int i2 = 2131363815;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363815);
+        LayoutInflater.from(getContext()).inflate(R.layout.widget_guild_invite_info, this);
+        int i2 = R.id.invite_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.invite_avatar);
         if (simpleDraweeView != null) {
-            i2 = 2131363816;
-            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById(2131363816);
+            i2 = R.id.invite_avatar_small;
+            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById(R.id.invite_avatar_small);
             if (simpleDraweeView2 != null) {
-                i2 = 2131363817;
-                CardView cardView = (CardView) findViewById(2131363817);
+                i2 = R.id.invite_avatar_small_card;
+                CardView cardView = (CardView) findViewById(R.id.invite_avatar_small_card);
                 if (cardView != null) {
-                    i2 = 2131363818;
-                    RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131363818);
+                    i2 = R.id.invite_avatar_small_wrap;
+                    RelativeLayout relativeLayout = (RelativeLayout) findViewById(R.id.invite_avatar_small_wrap);
                     if (relativeLayout != null) {
-                        i2 = 2131363819;
-                        RelativeLayout relativeLayout2 = (RelativeLayout) findViewById(2131363819);
+                        i2 = R.id.invite_avatar_wrap;
+                        RelativeLayout relativeLayout2 = (RelativeLayout) findViewById(R.id.invite_avatar_wrap);
                         if (relativeLayout2 != null) {
-                            i2 = 2131363827;
-                            ImageView imageView = (ImageView) findViewById(2131363827);
+                            i2 = R.id.invite_expired_image;
+                            ImageView imageView = (ImageView) findViewById(R.id.invite_expired_image);
                             if (imageView != null) {
-                                i2 = 2131363830;
-                                TextView textView = (TextView) findViewById(2131363830);
+                                i2 = R.id.invite_members_online;
+                                TextView textView = (TextView) findViewById(R.id.invite_members_online);
                                 if (textView != null) {
-                                    i2 = 2131363831;
-                                    CardView cardView2 = (CardView) findViewById(2131363831);
+                                    i2 = R.id.invite_members_online_wrap;
+                                    CardView cardView2 = (CardView) findViewById(R.id.invite_members_online_wrap);
                                     if (cardView2 != null) {
-                                        i2 = 2131363832;
-                                        TextView textView2 = (TextView) findViewById(2131363832);
+                                        i2 = R.id.invite_members_total;
+                                        TextView textView2 = (TextView) findViewById(R.id.invite_members_total);
                                         if (textView2 != null) {
-                                            i2 = 2131363833;
-                                            CardView cardView3 = (CardView) findViewById(2131363833);
+                                            i2 = R.id.invite_members_total_wrap;
+                                            CardView cardView3 = (CardView) findViewById(R.id.invite_members_total_wrap);
                                             if (cardView3 != null) {
-                                                i2 = 2131363834;
-                                                LinearLayout linearLayout = (LinearLayout) findViewById(2131363834);
+                                                i2 = R.id.invite_members_wrap;
+                                                LinearLayout linearLayout = (LinearLayout) findViewById(R.id.invite_members_wrap);
                                                 if (linearLayout != null) {
-                                                    i2 = 2131363835;
-                                                    TextView textView3 = (TextView) findViewById(2131363835);
+                                                    i2 = R.id.invite_message;
+                                                    TextView textView3 = (TextView) findViewById(R.id.invite_message);
                                                     if (textView3 != null) {
-                                                        i2 = 2131363842;
-                                                        TextView textView4 = (TextView) findViewById(2131363842);
+                                                        i2 = R.id.invite_title;
+                                                        TextView textView4 = (TextView) findViewById(R.id.invite_title);
                                                         if (textView4 != null) {
                                                             WidgetGuildInviteInfoBinding widgetGuildInviteInfoBinding = new WidgetGuildInviteInfoBinding(this, simpleDraweeView, simpleDraweeView2, cardView, relativeLayout, relativeLayout2, imageView, textView, cardView2, textView2, cardView3, linearLayout, textView3, textView4);
                                                             m.checkNotNullExpressionValue(widgetGuildInviteInfoBinding, "WidgetGuildInviteInfoBin…ater.from(context), this)");
@@ -126,7 +126,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatar");
         User inviter = modelInvite.getInviter();
         String str = null;
-        IconUtils.setIcon$default(simpleDraweeView, inviter != null ? new CoreUser(inviter) : null, 2131165288, null, null, null, 56, null);
+        IconUtils.setIcon$default(simpleDraweeView, inviter != null ? new CoreUser(inviter) : null, R.dimen.avatar_size_hero, null, null, null, 56, null);
         User inviter2 = modelInvite.getInviter();
         String r = inviter2 != null ? inviter2.r() : null;
         String str2 = "";
@@ -183,7 +183,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatar");
         User inviter = modelInvite.getInviter();
         String str = null;
-        IconUtils.setIcon$default(simpleDraweeView, inviter != null ? new CoreUser(inviter) : null, 2131165288, null, null, null, 56, null);
+        IconUtils.setIcon$default(simpleDraweeView, inviter != null ? new CoreUser(inviter) : null, R.dimen.avatar_size_hero, null, null, null, 56, null);
         Channel channel = modelInvite.getChannel();
         User inviter2 = modelInvite.getInviter();
         if (inviter2 != null) {
@@ -202,7 +202,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
         if (z2) {
             SimpleDraweeView simpleDraweeView2 = this.binding.f1822c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
-            IconUtils.setIcon$default(simpleDraweeView2, channel, 2131165291, null, 8, null);
+            IconUtils.setIcon$default(simpleDraweeView2, channel, R.dimen.avatar_size_medium, null, 8, null);
         }
         RelativeLayout relativeLayout = this.binding.e;
         m.checkNotNullExpressionValue(relativeLayout, "binding.inviteAvatarSmallWrap");
@@ -231,20 +231,20 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatar");
             User inviter = modelInvite.getInviter();
-            IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(inviter != null ? new CoreUser(inviter) : null, true, null, 4, null), 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(inviter != null ? new CoreUser(inviter) : null, true, null, 4, null), (int) R.dimen.avatar_size_hero, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
             SimpleDraweeView simpleDraweeView2 = this.binding.f1822c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
             Guild guild = modelInvite.getGuild();
             Long valueOf = guild != null ? Long.valueOf(guild.o()) : null;
             Guild guild2 = modelInvite.getGuild();
-            IconUtils.setIcon$default(simpleDraweeView2, IconUtils.getForGuild$default(valueOf, guild2 != null ? guild2.n() : null, "asset://asset/images/default_icon_selected.jpg", true, null, 16, null), 2131165291, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView2, IconUtils.getForGuild$default(valueOf, guild2 != null ? guild2.n() : null, IconUtils.DEFAULT_ICON_BLURPLE, true, null, 16, null), (int) R.dimen.avatar_size_medium, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         } else {
             SimpleDraweeView simpleDraweeView3 = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.inviteAvatar");
             Guild guild3 = modelInvite.getGuild();
             Long valueOf2 = guild3 != null ? Long.valueOf(guild3.o()) : null;
             Guild guild4 = modelInvite.getGuild();
-            IconUtils.setIcon$default(simpleDraweeView3, IconUtils.getForGuild$default(valueOf2, guild4 != null ? guild4.n() : null, "asset://asset/images/default_icon_selected.jpg", true, null, 16, null), 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView3, IconUtils.getForGuild$default(valueOf2, guild4 != null ? guild4.n() : null, IconUtils.DEFAULT_ICON_BLURPLE, true, null, 16, null), (int) R.dimen.avatar_size_hero, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
         CardView cardView = this.binding.i;
         m.checkNotNullExpressionValue(cardView, "binding.inviteMembersOnlineWrap");
@@ -275,12 +275,12 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
             if (!(guild7 == null || (l = guild7.l()) == null || !l.contains(GuildFeature.PARTNERED))) {
                 TextView textView2 = this.binding.m;
                 m.checkNotNullExpressionValue(textView2, "binding.inviteMessage");
-                ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, 2131231857, 0, 0, 0, 14, null);
+                ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, R.drawable.ic_partnered_badge, 0, 0, 0, 14, null);
             }
         } else {
             TextView textView3 = this.binding.m;
             m.checkNotNullExpressionValue(textView3, "binding.inviteMessage");
-            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, 2131232095, 0, 0, 0, 14, null);
+            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, R.drawable.ic_verified_badge, 0, 0, 0, 14, null);
         }
         TextView textView4 = this.binding.n;
         m.checkNotNullExpressionValue(textView4, "binding.inviteTitle");
@@ -296,19 +296,19 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
     }
 
     private final CharSequence getIntroText(String str) {
-        return str == null ? b.j(this, 2131890681, new Object[0], null, 4) : b.j(this, 2131886769, new Object[]{str}, null, 4);
+        return str == null ? b.j(this, R.string.instant_invite_you_have_been_invited_to_join, new Object[0], null, 4) : b.j(this, R.string.auth_message_invited_by, new Object[]{str}, null, 4);
     }
 
     private final CharSequence getIntroTextForGroup(String str, String str2) {
-        return str2.length() > 0 ? b.j(this, 2131886769, new Object[]{str}, null, 4) : b.j(this, 2131890683, new Object[0], null, 4);
+        return str2.length() > 0 ? b.j(this, R.string.auth_message_invited_by, new Object[]{str}, null, 4) : b.j(this, R.string.instant_invite_you_have_been_invited_to_join_group_dm, new Object[0], null, 4);
     }
 
     private final CharSequence getInviteSubtitleForDirectFriend(String str) {
-        return b.j(this, 2131890657, new Object[]{str}, null, 4);
+        return b.j(this, R.string.instant_invite_direct_friend_description, new Object[]{str}, null, 4);
     }
 
     private final CharSequence getInviteTitleForDirectFriend(String str) {
-        return b.j(this, 2131890679, new Object[]{str}, null, 4);
+        return b.j(this, R.string.instant_invite_you_have_been_invited_to_chat, new Object[]{str}, null, 4);
     }
 
     private final CharSequence getMembersCount(int i) {
@@ -316,13 +316,13 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
         m.checkNotNullExpressionValue(resources, "resources");
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        return b.j(this, 2131890668, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755201, i, Integer.valueOf(i))}, null, 4);
+        return b.j(this, R.string.instant_invite_guild_members_total, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.instant_invite_guild_members_total_count, i, Integer.valueOf(i))}, null, 4);
     }
 
     private final CharSequence getMembersOnlineCount(int i) {
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        return b.j(this, 2131890667, new Object[]{StringUtilsKt.format(i, context)}, null, 4);
+        return b.j(this, R.string.instant_invite_guild_members_online, new Object[]{StringUtilsKt.format(i, context)}, null, 4);
     }
 
     private final void parseAttributeSet(Context context, AttributeSet attributeSet, int i) {
@@ -361,15 +361,15 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
     }
 
     public final void configureUIFailure(Error error) {
-        this.binding.n.setText(2131890659);
-        this.binding.m.setText(2131890787);
+        this.binding.n.setText(R.string.instant_invite_expired);
+        this.binding.m.setText(R.string.invite_button_expired);
         if (error != null) {
             Error.Response response = error.getResponse();
             m.checkNotNullExpressionValue(response, "e.response");
             if (response.getCode() == 30001) {
-                this.binding.n.setText(2131894393);
-                this.binding.m.setText(2131894392);
-                this.binding.m.setTextSize(0, getResources().getDimension(2131165780));
+                this.binding.n.setText(R.string.too_many_user_guilds_title);
+                this.binding.m.setText(R.string.too_many_user_guilds_description);
+                this.binding.m.setTextSize(0, getResources().getDimension(R.dimen.uikit_textsize_medium));
             }
         }
         TextView textView = this.binding.m;
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java
index 06c7a32214..e72b103f50 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.guilds.join;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildJoinBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetGuildJoin$binding$2 extends k implement
 
     public final WidgetGuildJoinBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363486;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363486);
+        int i = R.id.guild_join_action_btn;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_join_action_btn);
         if (materialButton != null) {
-            i = 2131363488;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363488);
+            i = R.id.guild_join_invite;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_join_invite);
             if (textInputLayout != null) {
                 return new WidgetGuildJoinBinding((CoordinatorLayout) view, materialButton, textInputLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java
index 3635fa7de9..d2b723203a 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java
@@ -9,9 +9,11 @@ import androidx.annotation.LayoutRes;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildJoinBinding;
+import com.discord.stores.StoreInviteSettings;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.intent.IntentUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -74,7 +76,7 @@ public class WidgetGuildJoin extends AppFragment {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetGuildJoin(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i2 & 1) != 0 ? 2131559081 : i);
+        this((i2 & 1) != 0 ? R.layout.widget_guild_join : i);
     }
 
     public final WidgetGuildJoinBinding getBinding() {
@@ -86,7 +88,7 @@ public class WidgetGuildJoin extends AppFragment {
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
         if (textOrEmpty.length() > 0) {
-            Intent selectInvite = IntentUtils.RouteBuilders.INSTANCE.selectInvite(textOrEmpty, "Join Guild Modal");
+            Intent selectInvite = IntentUtils.RouteBuilders.INSTANCE.selectInvite(textOrEmpty, StoreInviteSettings.LOCATION_JOIN);
             IntentUtils intentUtils = IntentUtils.INSTANCE;
             TextInputLayout textInputLayout2 = getBinding().f1829c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.guildJoinInvite");
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java
index c403005605..f5dbefb26f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGuildWelcomeSheetBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -21,26 +22,26 @@ public final /* synthetic */ class WidgetGuildWelcomeSheet$binding$2 extends k i
 
     public final WidgetGuildWelcomeSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363681;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363681);
+        int i = R.id.guild_welcome_sheet_channels;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_welcome_sheet_channels);
         if (recyclerView != null) {
-            i = 2131363682;
-            TextView textView = (TextView) view.findViewById(2131363682);
+            i = R.id.guild_welcome_sheet_description;
+            TextView textView = (TextView) view.findViewById(R.id.guild_welcome_sheet_description);
             if (textView != null) {
-                i = 2131363683;
-                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363683);
+                i = R.id.guild_welcome_sheet_flipper;
+                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.guild_welcome_sheet_flipper);
                 if (appViewFlipper != null) {
-                    i = 2131363684;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363684);
+                    i = R.id.guild_welcome_sheet_icon;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guild_welcome_sheet_icon);
                     if (simpleDraweeView != null) {
-                        i = 2131363685;
-                        CardView cardView = (CardView) view.findViewById(2131363685);
+                        i = R.id.guild_welcome_sheet_icon_card;
+                        CardView cardView = (CardView) view.findViewById(R.id.guild_welcome_sheet_icon_card);
                         if (cardView != null) {
-                            i = 2131363686;
-                            TextView textView2 = (TextView) view.findViewById(2131363686);
+                            i = R.id.guild_welcome_sheet_icon_name;
+                            TextView textView2 = (TextView) view.findViewById(R.id.guild_welcome_sheet_icon_name);
                             if (textView2 != null) {
-                                i = 2131363687;
-                                TextView textView3 = (TextView) view.findViewById(2131363687);
+                                i = R.id.guild_welcome_sheet_name;
+                                TextView textView3 = (TextView) view.findViewById(R.id.guild_welcome_sheet_name);
                                 if (textView3 != null) {
                                     return new WidgetGuildWelcomeSheetBinding((NestedScrollView) view, recyclerView, textView, appViewFlipper, simpleDraweeView, cardView, textView2, textView3);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java
index bb242c628b..bd04332819 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java
@@ -12,6 +12,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.welcome.GuildWelcomeChannel;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppViewFlipper;
@@ -88,7 +89,7 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet {
     private final void configureGuildDetails(String str, String str2) {
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.guildWelcomeSheetName");
-        b.n(textView, 2131895095, new Object[]{str}, null, 4);
+        b.n(textView, R.string.welcome_screen_title, new Object[]{str}, null, 4);
         if (str2 != null) {
             TextView textView2 = getBinding().f1845c;
             m.checkNotNullExpressionValue(textView2, "binding.guildWelcomeSheetDescription");
@@ -101,7 +102,7 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet {
     }
 
     private final void configureGuildIcon(long j, String str, String str2) {
-        String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(j), str, null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165299))), 4, null);
+        String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(j), str, null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.avatar_size_xxlarge))), 4, null);
         if (forGuild$default != null) {
             TextView textView = getBinding().f;
             m.checkNotNullExpressionValue(textView, "binding.guildWelcomeSheetIconName");
@@ -113,7 +114,7 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet {
         }
         SimpleDraweeView simpleDraweeView2 = getBinding().e;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.guildWelcomeSheetIcon");
-        IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon_selected.jpg", 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView2, IconUtils.DEFAULT_ICON_BLURPLE, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
         TextView textView2 = getBinding().f;
         m.checkNotNullExpressionValue(textView2, "binding.guildWelcomeSheetIconName");
         textView2.setVisibility(0);
@@ -191,7 +192,7 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559102;
+        return R.layout.widget_guild_welcome_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java
index 37c805fc62..6c7cc98533 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java
@@ -9,6 +9,7 @@ import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildWelcomeChannelBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.t.n;
@@ -37,31 +38,31 @@ public final class WidgetGuildWelcomeSheetChannelAdapter extends RecyclerView.Ad
     public BaseChannelViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559101, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.widget_guild_welcome_channel, viewGroup, false);
             CardView cardView = (CardView) inflate;
-            int i2 = 2131363673;
-            TextView textView = (TextView) inflate.findViewById(2131363673);
+            int i2 = R.id.guild_welcome_channel_description;
+            TextView textView = (TextView) inflate.findViewById(R.id.guild_welcome_channel_description);
             if (textView != null) {
-                i2 = 2131363674;
-                ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363674);
+                i2 = R.id.guild_welcome_channel_details;
+                ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(R.id.guild_welcome_channel_details);
                 if (constraintLayout != null) {
-                    i2 = 2131363675;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363675);
+                    i2 = R.id.guild_welcome_channel_emoji;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.guild_welcome_channel_emoji);
                     if (simpleDraweeView != null) {
-                        i2 = 2131363676;
-                        ImageView imageView = (ImageView) inflate.findViewById(2131363676);
+                        i2 = R.id.guild_welcome_channel_hash;
+                        ImageView imageView = (ImageView) inflate.findViewById(R.id.guild_welcome_channel_hash);
                         if (imageView != null) {
-                            i2 = 2131363677;
-                            ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131363677);
+                            i2 = R.id.guild_welcome_channel_icon;
+                            ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(R.id.guild_welcome_channel_icon);
                             if (constraintLayout2 != null) {
-                                i2 = 2131363678;
-                                TextView textView2 = (TextView) inflate.findViewById(2131363678);
+                                i2 = R.id.guild_welcome_channel_name;
+                                TextView textView2 = (TextView) inflate.findViewById(R.id.guild_welcome_channel_name);
                                 if (textView2 != null) {
-                                    i2 = 2131363679;
-                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) inflate.findViewById(2131363679);
+                                    i2 = R.id.guild_welcome_channel_text;
+                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) inflate.findViewById(R.id.guild_welcome_channel_text);
                                     if (constraintLayout3 != null) {
-                                        i2 = 2131363680;
-                                        TextView textView3 = (TextView) inflate.findViewById(2131363680);
+                                        i2 = R.id.guild_welcome_channel_unicode_emoji;
+                                        TextView textView3 = (TextView) inflate.findViewById(R.id.guild_welcome_channel_unicode_emoji);
                                         if (textView3 != null) {
                                             WidgetGuildWelcomeChannelBinding widgetGuildWelcomeChannelBinding = new WidgetGuildWelcomeChannelBinding((CardView) inflate, cardView, textView, constraintLayout, simpleDraweeView, imageView, constraintLayout2, textView2, constraintLayout3, textView3);
                                             m.checkNotNullExpressionValue(widgetGuildWelcomeChannelBinding, "WidgetGuildWelcomeChanne….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java
index f00d032a2f..5b1e04191c 100644
--- a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guilds.leave;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.LeaveGuildDialogBinding;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetLeaveGuildDialog$binding$2 extends k im
 
     public final LeaveGuildDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363956;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363956);
+        int i = R.id.leave_guild_cancel_btn;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.leave_guild_cancel_btn);
         if (materialButton != null) {
-            i = 2131363957;
-            LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363957);
+            i = R.id.leave_guild_confirm_btn;
+            LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.leave_guild_confirm_btn);
             if (loadingButton != null) {
-                i = 2131363958;
-                TextView textView = (TextView) view.findViewById(2131363958);
+                i = R.id.leave_guild_dialog_body;
+                TextView textView = (TextView) view.findViewById(R.id.leave_guild_dialog_body);
                 if (textView != null) {
-                    i = 2131363959;
-                    TextView textView2 = (TextView) view.findViewById(2131363959);
+                    i = R.id.leave_guild_dialog_header;
+                    TextView textView2 = (TextView) view.findViewById(R.id.leave_guild_dialog_header);
                     if (textView2 != null) {
-                        i = 2131364250;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364250);
+                        i = R.id.notice_header_container;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.notice_header_container);
                         if (linearLayout != null) {
                             return new LeaveGuildDialogBinding((LinearLayout) view, materialButton, loadingButton, textView, textView2, linearLayout);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.java b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.java
index acffa4e735..d8994c26ee 100644
--- a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.java
+++ b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$onResume$4.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guilds.leave;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.guilds.leave.LeaveGuildDialogViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetLeaveGuildDialog$onResume$4 extends o implements Functi
     }
 
     public final void invoke(LeaveGuildDialogViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetLeaveGuildDialog.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java
index 3879a54ce0..550b58cebe 100644
--- a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java
+++ b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java
@@ -10,6 +10,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.LeaveGuildDialogBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -50,7 +51,7 @@ public final class WidgetLeaveGuildDialog extends AppDialog {
     }
 
     public WidgetLeaveGuildDialog() {
-        super(2131558553);
+        super(R.layout.leave_guild_dialog);
         WidgetLeaveGuildDialog$viewModel$2 widgetLeaveGuildDialog$viewModel$2 = new WidgetLeaveGuildDialog$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(LeaveGuildDialogViewModel.class), new WidgetLeaveGuildDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetLeaveGuildDialog$viewModel$2));
@@ -77,11 +78,11 @@ public final class WidgetLeaveGuildDialog extends AppDialog {
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.leaveGuildDialogHeader");
             LeaveGuildDialogViewModel.ViewState.Valid valid = (LeaveGuildDialogViewModel.ViewState.Valid) viewState;
-            b.n(textView, 2131891104, new Object[]{valid.getGuild().getName()}, null, 4);
+            b.n(textView, R.string.leave_server_title, new Object[]{valid.getGuild().getName()}, null, 4);
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.leaveGuildDialogBody");
-            b.n(textView2, valid.getGuild().isHub() ? 2131891100 : 2131891103, new Object[]{valid.getGuild().getName()}, null, 4);
-            getBinding().f1617c.setText(getString(valid.getGuild().isHub() ? 2131891099 : 2131891101));
+            b.n(textView2, valid.getGuild().isHub() ? R.string.leave_hub_body : R.string.leave_server_body_mobile, new Object[]{valid.getGuild().getName()}, null, 4);
+            getBinding().f1617c.setText(getString(valid.getGuild().isHub() ? R.string.leave_hub : R.string.leave_server));
             getBinding().f1617c.setIsLoading(valid.isLoading());
         } else if (m.areEqual(viewState, LeaveGuildDialogViewModel.ViewState.Invalid.INSTANCE)) {
             dismiss();
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java b/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java
index f8a66f96f1..d7169a992b 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java
@@ -56,7 +56,7 @@ public abstract class GuildListItem {
         public static final DividerItem INSTANCE = new DividerItem();
 
         private DividerItem() {
-            super(-4, null);
+            super(GuildListItem.ID_DIVIDER, null);
         }
     }
 
@@ -644,7 +644,7 @@ public abstract class GuildListItem {
         public static final HelpItem INSTANCE = new HelpItem();
 
         private HelpItem() {
-            super(-5, null);
+            super(GuildListItem.ID_HELP, null);
         }
     }
 
@@ -653,7 +653,7 @@ public abstract class GuildListItem {
         private final boolean showSparkle;
 
         public HubItem(boolean z2) {
-            super(-8, null);
+            super(GuildListItem.ID_HUB, null);
             this.showSparkle = z2;
         }
 
@@ -778,7 +778,7 @@ public abstract class GuildListItem {
         public static final SpaceItem INSTANCE = new SpaceItem();
 
         private SpaceItem() {
-            super(-6, null);
+            super(GuildListItem.ID_BOTTOM_NAV_SPACE, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java
index 5b5e474adc..71bc65e8f6 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java
@@ -17,6 +17,7 @@ import c.a.l.b;
 import c.d.b.a.a;
 import c.f.g.e.f;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.guildjoinrequest.ApplicationStatus;
 import com.discord.databinding.WidgetGuildsListItemDmBinding;
@@ -57,14 +58,14 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
         public DiscordHubViewHolder(View view) {
             super(view, null);
             m.checkNotNullParameter(view, "view");
-            SparkleView sparkleView = (SparkleView) view.findViewById(2131363484);
+            SparkleView sparkleView = (SparkleView) view.findViewById(R.id.guild_item_sparkle);
             if (sparkleView != null) {
                 WidgetGuildsListItemHubVerificationBinding widgetGuildsListItemHubVerificationBinding = new WidgetGuildsListItemHubVerificationBinding((FrameLayout) view, sparkleView);
                 m.checkNotNullExpressionValue(widgetGuildsListItemHubVerificationBinding, "WidgetGuildsListItemHubV…icationBinding.bind(view)");
                 this.binding = widgetGuildsListItemHubVerificationBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363484)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.guild_item_sparkle)));
         }
 
         public final void configure(GuildListItem.HubItem hubItem) {
@@ -103,26 +104,26 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullParameter(function12, "onLongPressed");
             this.onClicked = function1;
             this.onLongPressed = function12;
-            int i = 2131363695;
-            ServerFolderView serverFolderView = (ServerFolderView) view.findViewById(2131363695);
+            int i = R.id.guilds_item_folder;
+            ServerFolderView serverFolderView = (ServerFolderView) view.findViewById(R.id.guilds_item_folder);
             if (serverFolderView != null) {
-                i = 2131363696;
-                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363696);
+                i = R.id.guilds_item_folder_container;
+                FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.guilds_item_folder_container);
                 if (frameLayout != null) {
-                    i = 2131363697;
-                    View findViewById = view.findViewById(2131363697);
+                    i = R.id.guilds_item_highlight;
+                    View findViewById = view.findViewById(R.id.guilds_item_highlight);
                     if (findViewById != null) {
-                        i = 2131363698;
-                        TextView textView = (TextView) view.findViewById(2131363698);
+                        i = R.id.guilds_item_mentions;
+                        TextView textView = (TextView) view.findViewById(R.id.guilds_item_mentions);
                         if (textView != null) {
-                            i = 2131363702;
-                            View findViewById2 = view.findViewById(2131363702);
+                            i = R.id.guilds_item_selected;
+                            View findViewById2 = view.findViewById(R.id.guilds_item_selected);
                             if (findViewById2 != null) {
-                                i = 2131363703;
-                                ImageView imageView = (ImageView) view.findViewById(2131363703);
+                                i = R.id.guilds_item_unread;
+                                ImageView imageView = (ImageView) view.findViewById(R.id.guilds_item_unread);
                                 if (imageView != null) {
-                                    i = 2131363704;
-                                    ImageView imageView2 = (ImageView) view.findViewById(2131363704);
+                                    i = R.id.guilds_item_voice;
+                                    ImageView imageView2 = (ImageView) view.findViewById(R.id.guilds_item_voice);
                                     if (imageView2 != null) {
                                         WidgetGuildsListItemFolderBinding widgetGuildsListItemFolderBinding = new WidgetGuildsListItemFolderBinding((RelativeLayout) view, serverFolderView, frameLayout, findViewById, textView, findViewById2, imageView, imageView2);
                                         m.checkNotNullExpressionValue(widgetGuildsListItemFolderBinding, "WidgetGuildsListItemFolderBinding.bind(view)");
@@ -177,7 +178,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                 GridLayout gridLayout = serverFolderView.j.g;
                 m.checkNotNullExpressionValue(gridLayout, "binding.guildViews");
                 gridLayout.setVisibility(isOpen ? 0 : 8);
-                serverFolderView.j.b.setImageDrawable(ContextCompat.getDrawable(serverFolderView.getContext(), 2131231713));
+                serverFolderView.j.b.setImageDrawable(ContextCompat.getDrawable(serverFolderView.getContext(), R.drawable.ic_guild_list_pending_folder));
             } else {
                 Long l = serverFolderView.k;
                 boolean z2 = (l == null || l.longValue() != folderId || serverFolderView.l == isOpen) ? false : true;
@@ -185,15 +186,15 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                 if (isOpen) {
                     serverFolderView.l = true;
                     if (z2) {
-                        serverFolderView.b(2130772019);
+                        serverFolderView.b(R.anim.anim_folder_slide_in_down);
                     } else {
                         serverFolderView.a();
                     }
-                    ImageViewCompat.setImageTintList(serverFolderView.j.b, ColorStateList.valueOf((int) (((long) (color2 != null ? color2.intValue() : ColorCompat.getThemedColor(serverFolderView.getContext(), 2130969008))) + 4278190080L)));
+                    ImageViewCompat.setImageTintList(serverFolderView.j.b, ColorStateList.valueOf((int) (((long) (color2 != null ? color2.intValue() : ColorCompat.getThemedColor(serverFolderView.getContext(), (int) R.attr.color_brand_500))) + 4278190080L)));
                 } else {
                     serverFolderView.l = false;
                     if (z2) {
-                        serverFolderView.b(2130772020);
+                        serverFolderView.b(R.anim.anim_folder_slide_out_up);
                     } else {
                         serverFolderView.a();
                     }
@@ -207,7 +208,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                         GuildView guildView = (GuildView) obj;
                         if (n.getLastIndex(guilds) >= i2) {
                             Guild guild = guilds.get(i2);
-                            String forGuild$default = guild.hasIcon() ? IconUtils.getForGuild$default(guild, "asset://asset/images/default_icon.jpg", false, null, 12, null) : null;
+                            String forGuild$default = guild.hasIcon() ? IconUtils.getForGuild$default(guild, IconUtils.DEFAULT_ICON, false, null, 12, null) : null;
                             m.checkNotNullExpressionValue(guildView, "guildView");
                             guildView.setVisibility(0);
                             guildView.a(guild.getShortName(), forGuild$default);
@@ -229,7 +230,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             ImageView imageView2 = this.binding.h;
             imageView2.setActivated(folderItem.isAnyGuildConnectedToVoice());
             imageView2.setVisibility(!folderItem.isOpen() && folderItem.isAnyGuildConnectedToVoice() ? 0 : 8);
-            imageView2.setImageResource(folderItem.isAnyGuildConnectedToStageChannel() ? 2131231516 : 2131232114);
+            imageView2.setImageResource(folderItem.isAnyGuildConnectedToStageChannel() ? R.drawable.ic_channel_stage_24dp_white : R.drawable.ic_volume_up_white_24dp);
             View view2 = this.binding.d;
             m.checkNotNullExpressionValue(view2, "binding.guildsItemHighlight");
             if (folderItem.isTargetedForFolderAddition()) {
@@ -237,15 +238,15 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             }
             view2.setVisibility(i4);
             int mentionCount = folderItem.getMentionCount();
-            String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755137, mentionCount, Integer.valueOf(mentionCount)) : "";
+            String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.guild_folder_tooltip_a11y_label_mentions, mentionCount, Integer.valueOf(mentionCount)) : "";
             View view3 = this.itemView;
             m.checkNotNullExpressionValue(view3, "itemView");
-            CharSequence j = b.j(view3, folderItem.isOpen() ? 2131888493 : 2131887433, new Object[0], null, 4);
+            CharSequence j = b.j(view3, folderItem.isOpen() ? R.string.expanded : R.string.collapsed, new Object[0], null, 4);
             View view4 = this.itemView;
             m.checkNotNullExpressionValue(view4, "itemView");
             View view5 = this.itemView;
             m.checkNotNullExpressionValue(view5, "itemView");
-            view4.setContentDescription(b.j(view5, 2131889322, new Object[]{folderItem.getName(), i18nPluralString, j}, null, 4));
+            view4.setContentDescription(b.j(view5, R.string.guild_folder_tooltip_a11y_label_with_expanded_state, new Object[]{folderItem.getName(), i18nPluralString, j}, null, 4));
             View view6 = this.itemView;
             m.checkNotNullExpressionValue(view6, "itemView");
             ViewExtensions.setOnLongClickListenerConsumeClick(view6, new GuildListViewHolder$FolderViewHolder$configure$4(this, folderItem));
@@ -280,7 +281,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(serverFolderView, "binding.guildsItemFolder");
             ServerFolderView serverFolderView2 = this.binding.b;
             m.checkNotNullExpressionValue(serverFolderView2, "binding.guildsItemFolder");
-            serverFolderView.setBackground(ContextCompat.getDrawable(serverFolderView2.getContext(), 2131231229));
+            serverFolderView.setBackground(ContextCompat.getDrawable(serverFolderView2.getContext(), R.drawable.drawable_squircle_primary_600));
         }
 
         public final void setColor(Integer num) {
@@ -305,14 +306,14 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullParameter(view, "view");
             m.checkNotNullParameter(function1, "onClicked");
             this.onClicked = function1;
-            int i = 2131363699;
-            ImageView imageView = (ImageView) view.findViewById(2131363699);
+            int i = R.id.guilds_item_profile_avatar;
+            ImageView imageView = (ImageView) view.findViewById(R.id.guilds_item_profile_avatar);
             if (imageView != null) {
-                i = 2131363700;
-                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363700);
+                i = R.id.guilds_item_profile_avatar_wrap;
+                FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.guilds_item_profile_avatar_wrap);
                 if (frameLayout != null) {
-                    i = 2131363701;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131363701);
+                    i = R.id.guilds_item_profile_selected;
+                    ImageView imageView2 = (ImageView) view.findViewById(R.id.guilds_item_profile_selected);
                     if (imageView2 != null) {
                         WidgetGuildsListItemProfileBinding widgetGuildsListItemProfileBinding = new WidgetGuildsListItemProfileBinding((RelativeLayout) view, imageView, frameLayout, imageView2);
                         m.checkNotNullExpressionValue(widgetGuildsListItemProfileBinding, "WidgetGuildsListItemProfileBinding.bind(view)");
@@ -335,15 +336,15 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             imageView.setVisibility(friendsItem.isSelected() ? 0 : 8);
             this.binding.a.setOnClickListener(new GuildListViewHolder$FriendsViewHolder$configure$1(this, friendsItem));
             if (friendsItem.isSelected()) {
-                this.binding.f1851c.setBackgroundResource(2131231228);
+                this.binding.f1851c.setBackgroundResource(R.drawable.drawable_squircle_brand_500);
                 FrameLayout frameLayout = this.binding.f1851c;
                 m.checkNotNullExpressionValue(frameLayout, "binding.guildsItemProfileAvatarWrap");
                 frameLayout.setBackgroundTintList(null);
             } else {
-                this.binding.f1851c.setBackgroundResource(2131231092);
+                this.binding.f1851c.setBackgroundResource(R.drawable.drawable_circle_black);
                 FrameLayout frameLayout2 = this.binding.f1851c;
                 m.checkNotNullExpressionValue(frameLayout2, "binding.guildsItemProfileAvatarWrap");
-                int themedColor = ColorCompat.getThemedColor(frameLayout2, 2130968905);
+                int themedColor = ColorCompat.getThemedColor(frameLayout2, (int) R.attr.colorBackgroundSecondary);
                 FrameLayout frameLayout3 = this.binding.f1851c;
                 m.checkNotNullExpressionValue(frameLayout3, "binding.guildsItemProfileAvatarWrap");
                 frameLayout3.setBackgroundTintList(ColorStateList.valueOf(themedColor));
@@ -353,14 +354,14 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                 m.checkNotNullExpressionValue(imageView2, "binding.guildsItemProfileAvatar");
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                imageView2.setImageTintList(ColorStateList.valueOf(ColorCompat.getColor(view, 2131100433)));
+                imageView2.setImageTintList(ColorStateList.valueOf(ColorCompat.getColor(view, (int) R.color.white)));
                 return;
             }
             ImageView imageView3 = this.binding.b;
             m.checkNotNullExpressionValue(imageView3, "binding.guildsItemProfileAvatar");
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            imageView3.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(view2, 2130969885)));
+            imageView3.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(view2, (int) R.attr.primary_300)));
         }
     }
 
@@ -419,11 +420,11 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             this.overlayColorInFolder = i2;
             this.onClicked = function1;
             this.onLongPressed = function12;
-            int i3 = 2131363702;
-            ImageView imageView = (ImageView) view.findViewById(2131363702);
+            int i3 = R.id.guilds_item_selected;
+            ImageView imageView = (ImageView) view.findViewById(R.id.guilds_item_selected);
             if (imageView != null) {
-                i3 = 2131363703;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363703);
+                i3 = R.id.guilds_item_unread;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.guilds_item_unread);
                 if (imageView2 != null) {
                     WidgetGuildsListItemGuildVerticalBinding widgetGuildsListItemGuildVerticalBinding = new WidgetGuildsListItemGuildVerticalBinding((RelativeLayout) view, imageView, imageView2);
                     m.checkNotNullExpressionValue(widgetGuildsListItemGuildVerticalBinding, "WidgetGuildsListItemGuil…calBinding.bind(itemView)");
@@ -431,9 +432,9 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                     WidgetGuildsListItemGuildBinding a = WidgetGuildsListItemGuildBinding.a(view);
                     m.checkNotNullExpressionValue(a, "WidgetGuildsListItemGuildBinding.bind(itemView)");
                     this.bindingGuild = a;
-                    this.defaultAvatarSize = view.getResources().getDimensionPixelSize(2131165290);
-                    this.targetedAvatarSize = view.getResources().getDimensionPixelSize(2131165444);
-                    this.targetedAvatarMargin = view.getResources().getDimensionPixelSize(2131165443);
+                    this.defaultAvatarSize = view.getResources().getDimensionPixelSize(R.dimen.avatar_size_large);
+                    this.targetedAvatarSize = view.getResources().getDimensionPixelSize(R.dimen.folder_guild_size);
+                    this.targetedAvatarMargin = view.getResources().getDimensionPixelSize(R.dimen.folder_guild_outer_margin);
                     FrameLayout frameLayout = a.f;
                     m.checkNotNullExpressionValue(frameLayout, "bindingGuild.guildsItemAvatarWrap");
                     frameLayout.setClipToOutline(true);
@@ -461,7 +462,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                 imageView.setVisibility(8);
                 return;
             }
-            int i = z2 ? 2130968905 : 2130968907;
+            int i = z2 ? R.attr.colorBackgroundSecondary : R.attr.colorBackgroundTertiary;
             ImageView imageView2 = this.bindingGuild.b;
             m.checkNotNullExpressionValue(imageView2, "bindingGuild.guildsItemApplicationStatus");
             int themedColor = ColorCompat.getThemedColor(imageView2, i);
@@ -473,17 +474,17 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             imageView4.setVisibility(0);
             int ordinal = applicationStatus.ordinal();
             if (ordinal == 0) {
-                this.bindingGuild.b.setImageResource(2131231415);
+                this.bindingGuild.b.setImageResource(R.drawable.ic_application_status_started);
             } else if (ordinal == 1) {
-                this.bindingGuild.b.setImageResource(2131231413);
+                this.bindingGuild.b.setImageResource(R.drawable.ic_application_status_pending);
             } else if (ordinal == 2) {
-                this.bindingGuild.b.setImageResource(2131231414);
+                this.bindingGuild.b.setImageResource(R.drawable.ic_application_status_rejected);
             } else if (ordinal != 3) {
                 ImageView imageView5 = this.bindingGuild.b;
                 m.checkNotNullExpressionValue(imageView5, "bindingGuild.guildsItemApplicationStatus");
                 imageView5.setVisibility(8);
             } else {
-                this.bindingGuild.b.setImageResource(2131231412);
+                this.bindingGuild.b.setImageResource(R.drawable.ic_application_status_approved);
             }
         }
 
@@ -502,27 +503,27 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
         private final void configureGuildIconBackground(boolean z2, boolean z3, boolean z4) {
             SimpleDraweeView simpleDraweeView = this.bindingGuild.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "bindingGuild.guildsItemAvatar");
-            float dimensionPixelSize = (float) simpleDraweeView.getResources().getDimensionPixelSize(2131165446);
+            float dimensionPixelSize = (float) simpleDraweeView.getResources().getDimensionPixelSize(R.dimen.guild_icon_radius);
             SimpleDraweeView simpleDraweeView2 = this.bindingGuild.d;
             m.checkNotNullExpressionValue(simpleDraweeView2, "bindingGuild.guildsItemAvatar");
             MGImages.setRoundingParams$default(simpleDraweeView2, dimensionPixelSize, !z2, Integer.valueOf(z3 ? this.overlayColorInFolder : this.overlayColor), null, null, 48, null);
             if (z4) {
                 if (z2) {
-                    this.bindingGuild.f.setBackgroundResource(2131231231);
+                    this.bindingGuild.f.setBackgroundResource(R.drawable.drawable_squircle_transparent);
                 } else {
-                    this.bindingGuild.f.setBackgroundResource(2131231110);
+                    this.bindingGuild.f.setBackgroundResource(R.drawable.drawable_circle_transparent);
                 }
                 FrameLayout frameLayout = this.bindingGuild.f;
                 m.checkNotNullExpressionValue(frameLayout, "bindingGuild.guildsItemAvatarWrap");
                 frameLayout.setBackgroundTintList(null);
             } else if (z2) {
-                this.bindingGuild.f.setBackgroundResource(2131231228);
+                this.bindingGuild.f.setBackgroundResource(R.drawable.drawable_squircle_brand_500);
                 FrameLayout frameLayout2 = this.bindingGuild.f;
                 m.checkNotNullExpressionValue(frameLayout2, "bindingGuild.guildsItemAvatarWrap");
                 frameLayout2.setBackgroundTintList(null);
             } else {
-                this.bindingGuild.f.setBackgroundResource(2131231092);
-                int i = z3 ? 2130968905 : 2130968904;
+                this.bindingGuild.f.setBackgroundResource(R.drawable.drawable_circle_black);
+                int i = z3 ? R.attr.colorBackgroundSecondary : R.attr.colorBackgroundPrimary;
                 FrameLayout frameLayout3 = this.bindingGuild.f;
                 m.checkNotNullExpressionValue(frameLayout3, "bindingGuild.guildsItemAvatarWrap");
                 int themedColor = ColorCompat.getThemedColor(frameLayout3, i);
@@ -537,7 +538,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             if (!guild.getFeatures().contains(GuildFeature.ANIMATED_ICON) || (icon = guild.getIcon()) == null || !t.startsWith$default(icon, "a", false, 2, null)) {
                 SimpleDraweeView simpleDraweeView = this.bindingGuild.d;
                 m.checkNotNullExpressionValue(simpleDraweeView, "bindingGuild.guildsItemAvatar");
-                simpleDraweeView.getHierarchy().p(2131230900);
+                simpleDraweeView.getHierarchy().p(R.drawable.asset_default_avatar_64dp);
                 SimpleDraweeView simpleDraweeView2 = this.bindingGuild.d;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "bindingGuild.guildsItemAvatar");
                 GenericDraweeHierarchy hierarchy = simpleDraweeView2.getHierarchy();
@@ -604,14 +605,14 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                 layoutParams2.width = i3;
             }
             if (z2) {
-                this.bindingGuild.e.setTextSize(1, 8.0f);
+                this.bindingGuild.e.setTextSize(1, TARGETED_AVATAR_TEXT_SIZE_DP);
                 int i4 = this.targetedAvatarMargin;
                 layoutParams4.setMargins(i4, i4, 0, 0);
                 int i5 = this.targetedAvatarSize;
                 layoutParams4.height = i5;
                 layoutParams4.width = i5;
             } else {
-                this.bindingGuild.e.setTextSize(2, 14.0f);
+                this.bindingGuild.e.setTextSize(2, DEFAULT_AVATAR_TEXT_SIZE_SP);
                 layoutParams4.setMargins(0, 0, 0, 0);
                 layoutParams4.height = -1;
                 layoutParams4.width = -1;
@@ -671,11 +672,11 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                 if (guildItem.isSelected()) {
                     TextView textView2 = this.bindingGuild.e;
                     m.checkNotNullExpressionValue(textView2, "bindingGuild.guildsItemAvatarText");
-                    i = ColorCompat.getColor(textView2.getContext(), 2131100433);
+                    i = ColorCompat.getColor(textView2.getContext(), (int) R.color.white);
                 } else {
                     TextView textView3 = this.bindingGuild.e;
                     m.checkNotNullExpressionValue(textView3, "bindingGuild.guildsItemAvatarText");
-                    i = ColorCompat.getThemedColor(textView3.getContext(), 2130968932);
+                    i = ColorCompat.getThemedColor(textView3.getContext(), (int) R.attr.colorHeaderPrimary);
                 }
                 this.bindingGuild.e.setTextColor(i);
             }
@@ -683,17 +684,17 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(textView4, "bindingGuild.guildsItemMentions");
             configureMentionsCount(textView4, guildItem.getMentionCount());
             int mentionCount = guildItem.getMentionCount();
-            String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755193, mentionCount, Integer.valueOf(mentionCount)) : "";
+            String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.guild_tooltip_a11y_label_mentions, mentionCount, Integer.valueOf(mentionCount)) : "";
             View view4 = this.itemView;
             m.checkNotNullExpressionValue(view4, "itemView");
             View view5 = this.itemView;
             m.checkNotNullExpressionValue(view5, "itemView");
-            view4.setContentDescription(b.j(view5, 2131890355, new Object[]{i18nPluralString, guildItem.getGuild().getName()}, null, 4));
+            view4.setContentDescription(b.j(view5, R.string.guild_tooltip_a11y_label, new Object[]{i18nPluralString, guildItem.getGuild().getName()}, null, 4));
             ImageView imageView = this.bindingGuild.h;
             int i2 = 8;
             imageView.setVisibility(guildItem.isConnectedToVoice() || guildItem.getHasActiveStageChannel() ? 0 : 8);
             imageView.setActivated(guildItem.isConnectedToVoice());
-            imageView.setImageResource((!guildItem.isConnectedToVoice() || guildItem.isConnectedToStageChannel()) ? 2131231516 : 2131232114);
+            imageView.setImageResource((!guildItem.isConnectedToVoice() || guildItem.isConnectedToStageChannel()) ? R.drawable.ic_channel_stage_24dp_white : R.drawable.ic_volume_up_white_24dp);
             ImageView imageView2 = this.bindingGuild.f1849c;
             m.checkNotNullExpressionValue(imageView2, "bindingGuild.guildsItemApplicationStream");
             imageView2.setVisibility(!guildItem.isConnectedToVoice() && guildItem.getHasOngoingApplicationStream() ? 0 : 8);
@@ -789,15 +790,15 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             TextView textView = this.binding.f1847c;
             m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount");
             configureMentionsCount(textView, mentionCount);
-            String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755062, mentionCount, Integer.valueOf(mentionCount)) : "";
+            String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.dm_tooltip_a11y_label_mentions, mentionCount, Integer.valueOf(mentionCount)) : "";
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            view.setContentDescription(b.j(view2, 2131888205, new Object[]{AnimatableValueParser.y0(privateChannelItem.getChannel()), i18nPluralString}, null, 4));
+            view.setContentDescription(b.j(view2, R.string.dm_tooltip_a11y_label, new Object[]{AnimatableValueParser.y0(privateChannelItem.getChannel()), i18nPluralString}, null, 4));
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildsItemDmAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, privateChannelItem.getChannel(), 2131165290, null, 8, null);
+            IconUtils.setIcon$default(simpleDraweeView, privateChannelItem.getChannel(), R.dimen.avatar_size_large, null, 8, null);
             this.itemView.setOnClickListener(new GuildListViewHolder$PrivateChannelViewHolder$configure$1(this, privateChannelItem));
             View view3 = this.itemView;
             m.checkNotNullExpressionValue(view3, "itemView");
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java
index 1c8b878915..7d2a851b14 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java
@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.widgets.guilds.list.GuildListItem;
 import com.discord.widgets.guilds.list.GuildListViewHolder;
@@ -393,45 +394,45 @@ public final class WidgetGuildListAdapter extends RecyclerView.Adapter<GuildList
         WidgetGuildListAdapter$onCreateViewHolder$1 widgetGuildListAdapter$onCreateViewHolder$1 = new WidgetGuildListAdapter$onCreateViewHolder$1(viewGroup);
         switch (i) {
             case 0:
-                View invoke = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559114);
+                View invoke = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_profile);
                 m.checkNotNullExpressionValue(invoke, "itemView");
                 return new GuildListViewHolder.FriendsViewHolder(invoke, new WidgetGuildListAdapter$onCreateViewHolder$8(this, invoke));
             case 1:
-                View invoke2 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559104);
+                View invoke2 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_divider);
                 m.checkNotNullExpressionValue(invoke2, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke2);
             case 2:
-                View invoke3 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559106);
+                View invoke3 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_dm_vertical);
                 m.checkNotNullExpressionValue(invoke3, "itemView");
                 return new GuildListViewHolder.PrivateChannelViewHolder(invoke3, new WidgetGuildListAdapter$onCreateViewHolder$6(this, invoke3), new WidgetGuildListAdapter$onCreateViewHolder$7(this, invoke3));
             case 3:
-                View invoke4 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559112);
-                int themedColor = ColorCompat.getThemedColor(viewGroup.getContext(), 2130968907);
-                int themedColor2 = ColorCompat.getThemedColor(viewGroup.getContext(), 2130969896);
+                View invoke4 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_guild_vertical);
+                int themedColor = ColorCompat.getThemedColor(viewGroup.getContext(), (int) R.attr.colorBackgroundTertiary);
+                int themedColor2 = ColorCompat.getThemedColor(viewGroup.getContext(), (int) R.attr.primary_600);
                 m.checkNotNullExpressionValue(invoke4, "itemView");
                 return new GuildListViewHolder.GuildViewHolder(invoke4, themedColor, themedColor2, new WidgetGuildListAdapter$onCreateViewHolder$2(this, invoke4), new WidgetGuildListAdapter$onCreateViewHolder$3(this, invoke4));
             case 4:
-                View invoke5 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559111);
+                View invoke5 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_guild_unavailable);
                 m.checkNotNullExpressionValue(invoke5, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke5);
             case 5:
-                View invoke6 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559109);
+                View invoke6 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_guild_new);
                 m.checkNotNullExpressionValue(invoke6, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke6);
             case 6:
-                View invoke7 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559107);
+                View invoke7 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_folder);
                 m.checkNotNullExpressionValue(invoke7, "itemView");
                 return new GuildListViewHolder.FolderViewHolder(invoke7, new WidgetGuildListAdapter$onCreateViewHolder$4(this, invoke7), new WidgetGuildListAdapter$onCreateViewHolder$5(this, invoke7));
             case 7:
-                View invoke8 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559110);
+                View invoke8 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_guild_nux);
                 m.checkNotNullExpressionValue(invoke8, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke8);
             case 8:
-                View invoke9 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131558660);
+                View invoke9 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.recycler_item_bottom_nav_space);
                 m.checkNotNullExpressionValue(invoke9, "itemView");
                 return new GuildListViewHolder.SpaceViewHolder(invoke9);
             case 9:
-                View invoke10 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559113);
+                View invoke10 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(R.layout.widget_guilds_list_item_hub_verification);
                 m.checkNotNullExpressionValue(invoke10, "itemView");
                 return new GuildListViewHolder.DiscordHubViewHolder(invoke10);
             default:
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java
index a7034c700d..6e6636b49e 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.view.ViewStub;
 import android.widget.RelativeLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildsListBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetGuildsList$binding$2 extends k implemen
 
     public final WidgetGuildsListBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363489;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363489);
+        int i = R.id.guild_list;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_list);
         if (recyclerView != null) {
-            i = 2131363491;
-            ViewStub viewStub = (ViewStub) view.findViewById(2131363491);
+            i = R.id.guild_list_unreads_stub;
+            ViewStub viewStub = (ViewStub) view.findViewById(R.id.guild_list_unreads_stub);
             if (viewStub != null) {
                 return new WidgetGuildsListBinding((RelativeLayout) view, recyclerView, viewStub);
             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java
index b3e0529a17..1ca3dc05f7 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java
@@ -20,6 +20,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildsListBinding;
 import com.discord.stores.StoreConnectionOpen;
@@ -174,7 +175,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
     }
 
     public WidgetGuildsList() {
-        super(2131559103);
+        super(R.layout.widget_guilds_list);
         WidgetGuildsList$viewModel$2 widgetGuildsList$viewModel$2 = WidgetGuildsList$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildsListViewModel.class), new WidgetGuildsList$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildsList$viewModel$2));
@@ -233,7 +234,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
      */
     private final void announceFolderToggle(GuildListItem.FolderItem folderItem) {
         Object[] objArr = new Object[2];
-        objArr[0] = b.k(this, folderItem.isOpen() ? 2131887433 : 2131888493, new Object[0], null, 4);
+        objArr[0] = b.k(this, folderItem.isOpen() ? R.string.collapsed : R.string.expanded, new Object[0], null, 4);
         String name = folderItem.getName();
         if (name == null) {
             name = "";
@@ -361,16 +362,16 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
         }
         new ItemTouchHelper(new GuildsDragAndDropCallback(widgetGuildListAdapter3)).attachToRecyclerView(getBinding().b);
         RecyclerView recyclerView5 = getBinding().b;
-        Drawable drawable = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130968709, 0, 2, (Object) null));
+        Drawable drawable = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.bg_folder_no_children, 0, 2, (Object) null));
         m.checkNotNull(drawable);
         m.checkNotNullExpressionValue(drawable, "ContextCompat.getDrawabl…children)\n            )!!");
-        Drawable drawable2 = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130968710, 0, 2, (Object) null));
+        Drawable drawable2 = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.bg_folder_tintable_no_children, 0, 2, (Object) null));
         m.checkNotNull(drawable2);
         m.checkNotNullExpressionValue(drawable2, "ContextCompat.getDrawabl…children)\n            )!!");
-        Drawable drawable3 = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130968711, 0, 2, (Object) null));
+        Drawable drawable3 = ContextCompat.getDrawable(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.bg_folder_with_children, 0, 2, (Object) null));
         m.checkNotNull(drawable3);
         m.checkNotNullExpressionValue(drawable3, "ContextCompat.getDrawabl…children)\n            )!!");
-        recyclerView5.addItemDecoration(new FolderItemDecoration(drawable, drawable2, drawable3, requireContext().getResources().getDimensionPixelSize(2131165290)));
+        recyclerView5.addItemDecoration(new FolderItemDecoration(drawable, drawable2, drawable3, requireContext().getResources().getDimensionPixelSize(R.dimen.avatar_size_large)));
     }
 
     private final void showChannelActions(long j) {
@@ -400,7 +401,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
     private final void showUnavailableGuildsToast(int i) {
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        o.h(getContext(), b.l(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755245, i, Integer.valueOf(i)), new Object[0], null, 2), 0, null, 12);
+        o.h(getContext(), b.l(StringResourceUtilsKt.getQuantityString(resources, requireContext(), (int) R.plurals.partial_outage_count, i, Integer.valueOf(i)), new Object[0], null, 2), 0, null, 12);
     }
 
     @Override // com.discord.widgets.guilds.list.WidgetGuildListAdapter.InteractionListener
@@ -494,7 +495,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
         WidgetChannelListUnreads widgetChannelListUnreads = new WidgetChannelListUnreads(viewStub, recyclerView, null, new WidgetGuildsList$onViewBound$1(this), 0, 0, false, 116, null);
         this.guildListUnreads = widgetChannelListUnreads;
         if (widgetChannelListUnreads != null) {
-            widgetChannelListUnreads.setMentionResId(2131886082);
+            widgetChannelListUnreads.setMentionResId(R.string._new);
         }
         WidgetChannelListUnreads widgetChannelListUnreads2 = this.guildListUnreads;
         if (widgetChannelListUnreads2 != null) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
index 0c386c416a..7cc8b09b41 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
@@ -3,11 +3,14 @@ package com.discord.widgets.guilds.list;
 import a0.a.a.b;
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
+import androidx.media.AudioAttributesCompat;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guildjoinrequest.ApplicationStatus;
 import com.discord.api.guildjoinrequest.GuildJoinRequest;
+import com.discord.api.permission.Permission;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.models.guild.Guild;
@@ -1657,7 +1660,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
         if (!(values instanceof Collection) || !values.isEmpty()) {
             for (StreamContext streamContext : values) {
                 Guild guild = streamContext.getGuild();
-                if (guild == null || guild.getId() != j || !PermissionUtils.can(1024, map2.get(Long.valueOf(streamContext.getStream().getChannelId())))) {
+                if (guild == null || guild.getId() != j || !PermissionUtils.can(Permission.VIEW_CHANNEL, map2.get(Long.valueOf(streamContext.getStream().getChannelId())))) {
                     z2 = false;
                     continue;
                 } else {
@@ -1696,7 +1699,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             if (guildListItem3 instanceof GuildListItem.GuildItem) {
                 guildListItem = GuildListItem.GuildItem.copy$default((GuildListItem.GuildItem) guildListItem3, null, 0, false, false, false, null, false, false, false, null, null, false, false, false, 16127, null);
             } else if (guildListItem3 instanceof GuildListItem.FolderItem) {
-                guildListItem = GuildListItem.FolderItem.copy$default((GuildListItem.FolderItem) guildListItem3, 0, null, null, false, null, false, false, false, 0, false, false, 1023, null);
+                guildListItem = GuildListItem.FolderItem.copy$default((GuildListItem.FolderItem) guildListItem3, 0, null, null, false, null, false, false, false, 0, false, false, AudioAttributesCompat.FLAG_ALL, null);
             }
             arrayList.set(component2, guildListItem);
         }
@@ -1802,7 +1805,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             } else if (!guildItem.getGuild().isHub() || !z2) {
                 StoreStream.Companion.getGuildSelected().set(guildItem.getGuild().getId());
             } else {
-                c.a.e.o.g(context, 2131888185, 0, null, 12);
+                c.a.e.o.g(context, R.string.discord_u_coming_soon_to_mobile, 0, null, 12);
             }
         } else if (guildListItem instanceof GuildListItem.PrivateChannelItem) {
             ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, ((GuildListItem.PrivateChannelItem) guildListItem).getChannel().h(), null, null, 12, null);
@@ -1854,7 +1857,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             if (guildListItem2 instanceof GuildListItem.GuildItem) {
                 guildListItem = GuildListItem.GuildItem.copy$default((GuildListItem.GuildItem) guildListItem2, null, 0, false, false, false, null, false, false, true, null, null, false, false, false, 16127, null);
             } else if (guildListItem2 instanceof GuildListItem.FolderItem) {
-                guildListItem = GuildListItem.FolderItem.copy$default((GuildListItem.FolderItem) guildListItem2, 0, null, null, false, null, false, false, false, 0, false, true, 1023, null);
+                guildListItem = GuildListItem.FolderItem.copy$default((GuildListItem.FolderItem) guildListItem2, 0, null, null, false, null, false, false, false, 0, false, true, AudioAttributesCompat.FLAG_ALL, null);
             } else {
                 throw new IllegalStateException("invalid target item: " + guildListItem2);
             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java
index 17d39266b3..61756b4a68 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java
@@ -4,6 +4,7 @@ import android.content.res.Resources;
 import android.view.View;
 import android.widget.TextView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildProfileEmojiExtraBinding;
 import com.discord.widgets.guilds.profile.EmojiItem;
 import d0.z.d.m;
@@ -30,6 +31,6 @@ public final class MoreEmojiViewHolder extends BaseEmojiViewHolder {
         m.checkNotNullExpressionValue(view, "itemView");
         Resources resources = view.getResources();
         m.checkNotNullExpressionValue(resources, "itemView.resources");
-        textView.setText(b.i(resources, 2131888524, new Object[]{String.valueOf(((EmojiItem.MoreEmoji) emojiItem).getExtraEmojiCount())}, null, 4));
+        textView.setText(b.i(resources, R.string.extra_emoji_count, new Object[]{String.valueOf(((EmojiItem.MoreEmoji) emojiItem).getExtraEmojiCount())}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java
index acaa5bffbb..7e86dfb4fa 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java
@@ -9,6 +9,7 @@ import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGuildProfileSheetBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -26,74 +27,74 @@ public final /* synthetic */ class WidgetGuildProfileSheet$binding$2 extends k i
 
     public final WidgetGuildProfileSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363497;
-        Barrier barrier = (Barrier) view.findViewById(2131363497);
+        int i = R.id.guild_profile_sheet_actions_top_barrier;
+        Barrier barrier = (Barrier) view.findViewById(R.id.guild_profile_sheet_actions_top_barrier);
         if (barrier != null) {
-            i = 2131363499;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363499);
+            i = R.id.guild_profile_sheet_banner;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guild_profile_sheet_banner);
             if (simpleDraweeView != null) {
-                i = 2131363500;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363500);
+                i = R.id.guild_profile_sheet_boosts;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_profile_sheet_boosts);
                 if (materialButton != null) {
-                    i = 2131363504;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363504);
+                    i = R.id.guild_profile_sheet_constraint_layout;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.guild_profile_sheet_constraint_layout);
                     if (constraintLayout != null) {
-                        i = 2131363505;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363505);
+                        i = R.id.guild_profile_sheet_content_container;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_profile_sheet_content_container);
                         if (linearLayout != null) {
-                            i = 2131363506;
-                            View findViewById = view.findViewById(2131363506);
+                            i = R.id.guild_profile_sheet_content_container_bottom_divider;
+                            View findViewById = view.findViewById(R.id.guild_profile_sheet_content_container_bottom_divider);
                             if (findViewById != null) {
-                                i = 2131363510;
-                                TextView textView = (TextView) view.findViewById(2131363510);
+                                i = R.id.guild_profile_sheet_description;
+                                TextView textView = (TextView) view.findViewById(R.id.guild_profile_sheet_description);
                                 if (textView != null) {
-                                    i = 2131363516;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363516);
+                                    i = R.id.guild_profile_sheet_flipper;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.guild_profile_sheet_flipper);
                                     if (appViewFlipper != null) {
-                                        i = 2131363517;
-                                        ImageView imageView = (ImageView) view.findViewById(2131363517);
+                                        i = R.id.guild_profile_sheet_guild_verified_premium_icon;
+                                        ImageView imageView = (ImageView) view.findViewById(R.id.guild_profile_sheet_guild_verified_premium_icon);
                                         if (imageView != null) {
-                                            i = 2131363519;
-                                            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363519);
+                                            i = R.id.guild_profile_sheet_icon;
+                                            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.guild_profile_sheet_icon);
                                             if (simpleDraweeView2 != null) {
-                                                i = 2131363520;
-                                                CardView cardView = (CardView) view.findViewById(2131363520);
+                                                i = R.id.guild_profile_sheet_icon_card;
+                                                CardView cardView = (CardView) view.findViewById(R.id.guild_profile_sheet_icon_card);
                                                 if (cardView != null) {
-                                                    i = 2131363521;
-                                                    TextView textView2 = (TextView) view.findViewById(2131363521);
+                                                    i = R.id.guild_profile_sheet_icon_name;
+                                                    TextView textView2 = (TextView) view.findViewById(R.id.guild_profile_sheet_icon_name);
                                                     if (textView2 != null) {
-                                                        i = 2131363522;
-                                                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363522);
+                                                        i = R.id.guild_profile_sheet_invite;
+                                                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.guild_profile_sheet_invite);
                                                         if (materialButton2 != null) {
-                                                            i = 2131363528;
-                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363528);
+                                                            i = R.id.guild_profile_sheet_member_count;
+                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.guild_profile_sheet_member_count);
                                                             if (linearLayout2 != null) {
-                                                                i = 2131363529;
-                                                                TextView textView3 = (TextView) view.findViewById(2131363529);
+                                                                i = R.id.guild_profile_sheet_member_count_text;
+                                                                TextView textView3 = (TextView) view.findViewById(R.id.guild_profile_sheet_member_count_text);
                                                                 if (textView3 != null) {
-                                                                    i = 2131363530;
-                                                                    TextView textView4 = (TextView) view.findViewById(2131363530);
+                                                                    i = R.id.guild_profile_sheet_name;
+                                                                    TextView textView4 = (TextView) view.findViewById(R.id.guild_profile_sheet_name);
                                                                     if (textView4 != null) {
-                                                                        i = 2131363532;
-                                                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363532);
+                                                                        i = R.id.guild_profile_sheet_notifications;
+                                                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.guild_profile_sheet_notifications);
                                                                         if (materialButton3 != null) {
-                                                                            i = 2131363533;
-                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363533);
+                                                                            i = R.id.guild_profile_sheet_online_count;
+                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.guild_profile_sheet_online_count);
                                                                             if (linearLayout3 != null) {
-                                                                                i = 2131363534;
-                                                                                TextView textView5 = (TextView) view.findViewById(2131363534);
+                                                                                i = R.id.guild_profile_sheet_online_count_text;
+                                                                                TextView textView5 = (TextView) view.findViewById(R.id.guild_profile_sheet_online_count_text);
                                                                                 if (textView5 != null) {
-                                                                                    i = 2131363539;
-                                                                                    MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131363539);
+                                                                                    i = R.id.guild_profile_sheet_settings;
+                                                                                    MaterialButton materialButton4 = (MaterialButton) view.findViewById(R.id.guild_profile_sheet_settings);
                                                                                     if (materialButton4 != null) {
-                                                                                        i = 2131363540;
-                                                                                        LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131363540);
+                                                                                        i = R.id.guild_profile_sheet_tab_items;
+                                                                                        LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.guild_profile_sheet_tab_items);
                                                                                         if (linearLayout4 != null) {
-                                                                                            i = 2131365897;
-                                                                                            ViewStub viewStub = (ViewStub) view.findViewById(2131365897);
+                                                                                            i = R.id.widget_guild_hub_profile_actions;
+                                                                                            ViewStub viewStub = (ViewStub) view.findViewById(R.id.widget_guild_hub_profile_actions);
                                                                                             if (viewStub != null) {
-                                                                                                i = 2131365898;
-                                                                                                ViewStub viewStub2 = (ViewStub) view.findViewById(2131365898);
+                                                                                                i = R.id.widget_guild_profile_actions;
+                                                                                                ViewStub viewStub2 = (ViewStub) view.findViewById(R.id.widget_guild_profile_actions);
                                                                                                 if (viewStub2 != null) {
                                                                                                     return new WidgetGuildProfileSheetBinding((NestedScrollView) view, barrier, simpleDraweeView, materialButton, constraintLayout, linearLayout, findViewById, textView, appViewFlipper, imageView, simpleDraweeView2, cardView, textView2, materialButton2, linearLayout2, textView3, textView4, materialButton3, linearLayout3, textView5, materialButton4, linearLayout4, viewStub, viewStub2);
                                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java
index a8fd42add2..e1f5ca51b7 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java
@@ -22,6 +22,7 @@ import c.a.e.j0;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetChannelsListActionsChangeNicknameBinding;
@@ -239,7 +240,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView, "guildActionBinding.guildProfileSheetEmojisCount");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        textView.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755076, 2131891721, size, Integer.valueOf(size)));
+        textView.setText(StringResourceUtilsKt.getQuantityString(resources, (int) R.plurals.emojis_title_count, (int) R.string.no_emoji_title, size, Integer.valueOf(size)));
         WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding2 = this.guildActionBinding;
         if (widgetGuildProfileActionsBinding2 == null) {
             m.throwUninitializedPropertyAccessException("guildActionBinding");
@@ -393,9 +394,9 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         if (banner.getHash() != null) {
             int ordinal = banner.getType().ordinal();
             if (ordinal == 0) {
-                str = IconUtils.INSTANCE.getBannerForGuild(Long.valueOf(banner.getGuildId()), banner.getHash(), Integer.valueOf(getResources().getDimensionPixelSize(2131165685)));
+                str = IconUtils.INSTANCE.getBannerForGuild(Long.valueOf(banner.getGuildId()), banner.getHash(), Integer.valueOf(getResources().getDimensionPixelSize(R.dimen.nav_panel_width)));
             } else if (ordinal == 1) {
-                str = IconUtils.INSTANCE.getGuildSplashUrl(banner.getGuildId(), banner.getHash(), Integer.valueOf(getResources().getDimensionPixelSize(2131165685)));
+                str = IconUtils.INSTANCE.getGuildSplashUrl(banner.getGuildId(), banner.getHash(), Integer.valueOf(getResources().getDimensionPixelSize(R.dimen.nav_panel_width)));
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -485,7 +486,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
     }
 
     private final void configureGuildIcon(long j, String str, String str2) {
-        String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(j), str, null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165299))), 4, null);
+        String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(j), str, null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.avatar_size_xxlarge))), 4, null);
         if (forGuild$default != null) {
             TextView textView = getBinding().k;
             m.checkNotNullExpressionValue(textView, "binding.guildProfileSheetIconName");
@@ -497,7 +498,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         }
         SimpleDraweeView simpleDraweeView2 = getBinding().i;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.guildProfileSheetIcon");
-        IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon_selected.jpg", 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView2, IconUtils.DEFAULT_ICON_BLURPLE, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
         TextView textView2 = getBinding().k;
         m.checkNotNullExpressionValue(textView2, "binding.guildProfileSheetIconName");
         textView2.setVisibility(0);
@@ -518,7 +519,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(linearLayout2, "binding.guildProfileSheetOnlineCount");
             Context context = linearLayout2.getContext();
             m.checkNotNullExpressionValue(context, "binding.guildProfileSheetOnlineCount.context");
-            b.n(textView, 2131890667, new Object[]{StringUtilsKt.format(intValue, context)}, null, 4);
+            b.n(textView, R.string.instant_invite_guild_members_online, new Object[]{StringUtilsKt.format(intValue, context)}, null, 4);
         } else {
             LinearLayout linearLayout3 = getBinding().q;
             m.checkNotNullExpressionValue(linearLayout3, "binding.guildProfileSheetOnlineCount");
@@ -532,10 +533,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(resources, "resources");
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext, 2131755201, num2.intValue(), num2);
+            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext, (int) R.plurals.instant_invite_guild_members_total_count, num2.intValue(), num2);
             TextView textView2 = getBinding().n;
             m.checkNotNullExpressionValue(textView2, "binding.guildProfileSheetMemberCountText");
-            b.n(textView2, 2131890668, new Object[]{quantityString}, null, 4);
+            b.n(textView2, R.string.instant_invite_guild_members_total, new Object[]{quantityString}, null, 4);
             return;
         }
         LinearLayout linearLayout5 = getBinding().m;
@@ -563,11 +564,11 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         View view2 = getBinding().e;
         m.checkNotNullExpressionValue(view2, "binding.guildProfileShee…entContainerBottomDivider");
         view2.setVisibility(0);
-        int themedColor = ColorCompat.getThemedColor(this, 2130968949);
+        int themedColor = ColorCompat.getThemedColor(this, (int) R.attr.colorInteractiveNormal);
         MaterialButton materialButton = getBinding().f1833c;
         Resources resources = materialButton.getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        materialButton.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755254, 2131892414, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
+        materialButton.setText(StringResourceUtilsKt.getQuantityString(resources, (int) R.plurals.premium_guild_perks_modal_header_subscription_count_subscriptions, (int) R.string.premium_guild_subscription, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
         materialButton.setTextColor(themedColor);
         setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1(this, premiumSubscriptionCount, themedColor, j));
         MaterialButton materialButton2 = getBinding().p;
@@ -615,64 +616,64 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             actions = component11;
             if (!component14 && this.guildActionBinding == null) {
                 View inflate = getBinding().v.inflate();
-                LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363496);
+                LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.guild_profile_sheet_actions);
                 if (linearLayout != null) {
-                    CheckedSetting checkedSetting = (CheckedSetting) inflate.findViewById(2131363498);
+                    CheckedSetting checkedSetting = (CheckedSetting) inflate.findViewById(R.id.guild_profile_sheet_allow_dm);
                     if (checkedSetting != null) {
-                        LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131363501);
+                        LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(R.id.guild_profile_sheet_bottom_actions);
                         if (linearLayout2 != null) {
                             LinearLayout linearLayout3 = (LinearLayout) inflate;
-                            LinearLayout linearLayout4 = (LinearLayout) inflate.findViewById(2131363503);
+                            LinearLayout linearLayout4 = (LinearLayout) inflate.findViewById(R.id.guild_profile_sheet_change_nickname);
                             if (linearLayout4 != null) {
-                                TextView textView = (TextView) inflate.findViewById(2131363507);
+                                TextView textView = (TextView) inflate.findViewById(R.id.guild_profile_sheet_copy_id);
                                 if (textView != null) {
-                                    TextView textView2 = (TextView) inflate.findViewById(2131363508);
+                                    TextView textView2 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_create_category);
                                     if (textView2 != null) {
-                                        TextView textView3 = (TextView) inflate.findViewById(2131363509);
+                                        TextView textView3 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_create_channel);
                                         if (textView3 != null) {
-                                            CardView cardView = (CardView) inflate.findViewById(2131363511);
+                                            CardView cardView = (CardView) inflate.findViewById(R.id.guild_profile_sheet_developer_actions);
                                             if (cardView != null) {
-                                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363513);
+                                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.guild_profile_sheet_emojis);
                                                 if (recyclerView != null) {
                                                     tabItems = component10;
-                                                    i = 2131363514;
-                                                    CardView cardView2 = (CardView) inflate.findViewById(2131363514);
+                                                    i = R.id.guild_profile_sheet_emojis_card;
+                                                    CardView cardView2 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_emojis_card);
                                                     if (cardView2 != null) {
-                                                        i = 2131363515;
-                                                        TextView textView4 = (TextView) inflate.findViewById(2131363515);
+                                                        i = R.id.guild_profile_sheet_emojis_count;
+                                                        TextView textView4 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_emojis_count);
                                                         if (textView4 != null) {
-                                                            i = 2131363518;
-                                                            CheckedSetting checkedSetting2 = (CheckedSetting) inflate.findViewById(2131363518);
+                                                            i = R.id.guild_profile_sheet_hide_muted_channels;
+                                                            CheckedSetting checkedSetting2 = (CheckedSetting) inflate.findViewById(R.id.guild_profile_sheet_hide_muted_channels);
                                                             if (checkedSetting2 != null) {
-                                                                MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131363524);
+                                                                MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_join_server);
                                                                 if (materialButton != null) {
-                                                                    i = 2131363525;
-                                                                    TextView textView5 = (TextView) inflate.findViewById(2131363525);
+                                                                    i = R.id.guild_profile_sheet_leave_server;
+                                                                    TextView textView5 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_leave_server);
                                                                     if (textView5 != null) {
-                                                                        i = 2131363526;
-                                                                        TextView textView6 = (TextView) inflate.findViewById(2131363526);
+                                                                        i = R.id.guild_profile_sheet_mark_as_read;
+                                                                        TextView textView6 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_mark_as_read);
                                                                         if (textView6 != null) {
-                                                                            CardView cardView3 = (CardView) inflate.findViewById(2131363527);
+                                                                            CardView cardView3 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_mark_as_read_action);
                                                                             if (cardView3 != null) {
-                                                                                i = 2131363531;
-                                                                                TextView textView7 = (TextView) inflate.findViewById(2131363531);
+                                                                                i = R.id.guild_profile_sheet_nickname;
+                                                                                TextView textView7 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_nickname);
                                                                                 if (textView7 != null) {
-                                                                                    i = 2131363535;
-                                                                                    ImageView imageView = (ImageView) inflate.findViewById(2131363535);
+                                                                                    i = R.id.guild_profile_sheet_premium_upsell_dot_separator;
+                                                                                    ImageView imageView = (ImageView) inflate.findViewById(R.id.guild_profile_sheet_premium_upsell_dot_separator);
                                                                                     if (imageView != null) {
-                                                                                        i = 2131363536;
-                                                                                        TextView textView8 = (TextView) inflate.findViewById(2131363536);
+                                                                                        i = R.id.guild_profile_sheet_premium_upsell_text;
+                                                                                        TextView textView8 = (TextView) inflate.findViewById(R.id.guild_profile_sheet_premium_upsell_text);
                                                                                         if (textView8 != null) {
-                                                                                            CardView cardView4 = (CardView) inflate.findViewById(2131363537);
+                                                                                            CardView cardView4 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_primary_actions);
                                                                                             if (cardView4 != null) {
-                                                                                                i = 2131363538;
-                                                                                                CardView cardView5 = (CardView) inflate.findViewById(2131363538);
+                                                                                                i = R.id.guild_profile_sheet_secondary_actions;
+                                                                                                CardView cardView5 = (CardView) inflate.findViewById(R.id.guild_profile_sheet_secondary_actions);
                                                                                                 if (cardView5 != null) {
-                                                                                                    i = 2131363541;
-                                                                                                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131363541);
+                                                                                                    i = R.id.guild_profile_sheet_upload_emoji;
+                                                                                                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_upload_emoji);
                                                                                                     if (materialButton2 != null) {
-                                                                                                        i = 2131363542;
-                                                                                                        MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131363542);
+                                                                                                        i = R.id.guild_profile_sheet_view_server;
+                                                                                                        MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(R.id.guild_profile_sheet_view_server);
                                                                                                         if (materialButton3 != null) {
                                                                                                             WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding = new WidgetGuildProfileActionsBinding(linearLayout3, linearLayout, checkedSetting, linearLayout2, linearLayout3, linearLayout4, textView, textView2, textView3, cardView, recyclerView, cardView2, textView4, checkedSetting2, materialButton, textView5, textView6, cardView3, textView7, imageView, textView8, cardView4, cardView5, materialButton2, materialButton3);
                                                                                                             m.checkNotNullExpressionValue(widgetGuildProfileActionsBinding, "WidgetGuildProfileActionsBinding.bind(view)");
@@ -699,91 +700,91 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
                                                                                                     }
                                                                                                 }
                                                                                             } else {
-                                                                                                i = 2131363537;
+                                                                                                i = R.id.guild_profile_sheet_primary_actions;
                                                                                             }
                                                                                         }
                                                                                     }
                                                                                 }
                                                                             } else {
-                                                                                i = 2131363527;
+                                                                                i = R.id.guild_profile_sheet_mark_as_read_action;
                                                                             }
                                                                         }
                                                                     }
                                                                 } else {
-                                                                    i = 2131363524;
+                                                                    i = R.id.guild_profile_sheet_join_server;
                                                                 }
                                                             }
                                                         }
                                                     }
                                                 } else {
-                                                    i = 2131363513;
+                                                    i = R.id.guild_profile_sheet_emojis;
                                                 }
                                             } else {
-                                                i = 2131363511;
+                                                i = R.id.guild_profile_sheet_developer_actions;
                                             }
                                         } else {
-                                            i = 2131363509;
+                                            i = R.id.guild_profile_sheet_create_channel;
                                         }
                                     } else {
-                                        i = 2131363508;
+                                        i = R.id.guild_profile_sheet_create_category;
                                     }
                                 } else {
-                                    i = 2131363507;
+                                    i = R.id.guild_profile_sheet_copy_id;
                                 }
                             } else {
-                                i = 2131363503;
+                                i = R.id.guild_profile_sheet_change_nickname;
                             }
                         } else {
-                            i = 2131363501;
+                            i = R.id.guild_profile_sheet_bottom_actions;
                         }
                     } else {
-                        i = 2131363498;
+                        i = R.id.guild_profile_sheet_allow_dm;
                     }
                 } else {
-                    i = 2131363496;
+                    i = R.id.guild_profile_sheet_actions;
                 }
                 throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
             }
         } else {
             View inflate2 = getBinding().u.inflate();
             actions = component11;
-            LinearLayout linearLayout5 = (LinearLayout) inflate2.findViewById(2131363496);
+            LinearLayout linearLayout5 = (LinearLayout) inflate2.findViewById(R.id.guild_profile_sheet_actions);
             if (linearLayout5 != null) {
                 LinearLayout linearLayout6 = (LinearLayout) inflate2;
-                LinearLayout linearLayout7 = (LinearLayout) inflate2.findViewById(2131363503);
+                LinearLayout linearLayout7 = (LinearLayout) inflate2.findViewById(R.id.guild_profile_sheet_change_nickname);
                 if (linearLayout7 != null) {
-                    i2 = 2131363522;
-                    TextView textView9 = (TextView) inflate2.findViewById(2131363522);
+                    i2 = R.id.guild_profile_sheet_invite;
+                    TextView textView9 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_invite);
                     if (textView9 != null) {
-                        CardView cardView6 = (CardView) inflate2.findViewById(2131363523);
+                        CardView cardView6 = (CardView) inflate2.findViewById(R.id.guild_profile_sheet_invite_action);
                         if (cardView6 != null) {
-                            TextView textView10 = (TextView) inflate2.findViewById(2131363525);
+                            TextView textView10 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_leave_server);
                             if (textView10 != null) {
-                                TextView textView11 = (TextView) inflate2.findViewById(2131363531);
+                                TextView textView11 = (TextView) inflate2.findViewById(R.id.guild_profile_sheet_nickname);
                                 if (textView11 != null) {
-                                    CardView cardView7 = (CardView) inflate2.findViewById(2131363538);
+                                    CardView cardView7 = (CardView) inflate2.findViewById(R.id.guild_profile_sheet_secondary_actions);
                                     if (cardView7 != null) {
                                         WidgetGuildHubProfileActionsBinding widgetGuildHubProfileActionsBinding = new WidgetGuildHubProfileActionsBinding(linearLayout6, linearLayout5, linearLayout6, linearLayout7, textView9, cardView6, textView10, textView11, cardView7);
                                         m.checkNotNullExpressionValue(widgetGuildHubProfileActionsBinding, "WidgetGuildHubProfileActionsBinding.bind(view)");
                                         this.guildHubActionBinding = widgetGuildHubProfileActionsBinding;
                                     } else {
-                                        i2 = 2131363538;
+                                        i2 = R.id.guild_profile_sheet_secondary_actions;
                                     }
                                 } else {
-                                    i2 = 2131363531;
+                                    i2 = R.id.guild_profile_sheet_nickname;
                                 }
                             } else {
-                                i2 = 2131363525;
+                                i2 = R.id.guild_profile_sheet_leave_server;
                             }
                         } else {
-                            i2 = 2131363523;
+                            i2 = R.id.guild_profile_sheet_invite_action;
                         }
                     }
                 } else {
-                    i2 = 2131363503;
+                    i2 = R.id.guild_profile_sheet_change_nickname;
                 }
             } else {
-                i2 = 2131363496;
+                i2 = R.id.guild_profile_sheet_actions;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i2)));
         }
@@ -933,7 +934,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         }
         LinearLayout linearLayout2 = widgetGuildProfileActionsBinding4.e;
         m.checkNotNullExpressionValue(linearLayout2, "guildActionBinding.guild…ofileSheetBottomContainer");
-        return ((i - contentPaddingRight) - (linearLayout2.getPaddingEnd() + paddingStart)) / getResources().getDimensionPixelSize(2131165398);
+        return ((i - contentPaddingRight) - (linearLayout2.getPaddingEnd() + paddingStart)) / getResources().getDimensionPixelSize(R.dimen.emoji_size);
     }
 
     public static final void show(FragmentManager fragmentManager, boolean z2, long j, long j2) {
@@ -942,28 +943,28 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
 
     private final void showChangeNicknameDialog(long j, String str, boolean z2) {
         int i = 0;
-        View inflate = getLayoutInflater().inflate(2131558919, (ViewGroup) null, false);
-        int i2 = 2131362427;
-        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362427);
+        View inflate = getLayoutInflater().inflate(R.layout.widget_channels_list_actions_change_nickname, (ViewGroup) null, false);
+        int i2 = R.id.channels_list_actions_change_nickname_cancel;
+        MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.channels_list_actions_change_nickname_cancel);
         if (materialButton != null) {
-            i2 = 2131362428;
-            TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131362428);
+            i2 = R.id.channels_list_actions_change_nickname_edit_text;
+            TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(R.id.channels_list_actions_change_nickname_edit_text);
             if (textInputLayout != null) {
-                i2 = 2131362429;
-                TextView textView = (TextView) inflate.findViewById(2131362429);
+                i2 = R.id.channels_list_actions_change_nickname_reset;
+                TextView textView = (TextView) inflate.findViewById(R.id.channels_list_actions_change_nickname_reset);
                 if (textView != null) {
-                    i2 = 2131362430;
-                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131362430);
+                    i2 = R.id.channels_list_actions_change_nickname_save;
+                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.channels_list_actions_change_nickname_save);
                     if (materialButton2 != null) {
-                        i2 = 2131362431;
-                        TextView textView2 = (TextView) inflate.findViewById(2131362431);
+                        i2 = R.id.channels_list_actions_change_nickname_title;
+                        TextView textView2 = (TextView) inflate.findViewById(R.id.channels_list_actions_change_nickname_title);
                         if (textView2 != null) {
                             LinearLayout linearLayout = (LinearLayout) inflate;
                             WidgetChannelsListActionsChangeNicknameBinding widgetChannelsListActionsChangeNicknameBinding = new WidgetChannelsListActionsChangeNicknameBinding(linearLayout, materialButton, textInputLayout, textView, materialButton2, textView2);
                             m.checkNotNullExpressionValue(widgetChannelsListActionsChangeNicknameBinding, "WidgetChannelsListAction…outInflater, null, false)");
                             materialButton.setOnClickListener(new WidgetGuildProfileSheet$showChangeNicknameDialog$1(this));
-                            textView2.setText(z2 ? 2131887242 : 2131887261);
-                            textInputLayout.setHint(z2 ? 2131890469 : 2131891687);
+                            textView2.setText(z2 ? R.string.change_identity : R.string.change_nickname);
+                            textInputLayout.setHint(z2 ? R.string.hub_real_name_modal_form_placeholder : R.string.nickname);
                             m.checkNotNullExpressionValue(textInputLayout, "binding.channelsListActionsChangeNicknameEditText");
                             ViewExtensions.setText(textInputLayout, str);
                             m.checkNotNullExpressionValue(textInputLayout, "binding.channelsListActionsChangeNicknameEditText");
@@ -974,7 +975,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
                             }
                             textView.setVisibility(i);
                             textView.setOnClickListener(new WidgetGuildProfileSheet$showChangeNicknameDialog$$inlined$apply$lambda$1(this, str, j, z2));
-                            textView.setText(z2 ? 2131893029 : 2131893024);
+                            textView.setText(z2 ? R.string.reset_to_default : R.string.reset_nickname);
                             m.checkNotNullExpressionValue(linearLayout, "binding.root");
                             AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(linearLayout).create();
                             create.show();
@@ -1011,7 +1012,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559086;
+        return R.layout.widget_guild_profile_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java
index 9d6df0ce4a..7032eb433f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildProfileEmojiExtraBinding;
 import com.discord.databinding.WidgetGuildProfileEmojiItemBinding;
 import com.discord.models.domain.emoji.Emoji;
@@ -65,14 +66,14 @@ public final class WidgetGuildProfileSheetEmojisAdapter extends RecyclerView.Ada
     public BaseEmojiViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559085, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.widget_guild_profile_emoji_item, viewGroup, false);
             Objects.requireNonNull(inflate, "rootView");
             SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate;
             WidgetGuildProfileEmojiItemBinding widgetGuildProfileEmojiItemBinding = new WidgetGuildProfileEmojiItemBinding(simpleDraweeView, simpleDraweeView);
             m.checkNotNullExpressionValue(widgetGuildProfileEmojiItemBinding, "WidgetGuildProfileEmojiI….context), parent, false)");
             return new EmojiViewHolder(widgetGuildProfileEmojiItemBinding);
         } else if (i == 1) {
-            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131559084, viewGroup, false);
+            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.widget_guild_profile_emoji_extra, viewGroup, false);
             Objects.requireNonNull(inflate2, "rootView");
             WidgetGuildProfileEmojiExtraBinding widgetGuildProfileEmojiExtraBinding = new WidgetGuildProfileEmojiExtraBinding((TextView) inflate2);
             m.checkNotNullExpressionValue(widgetGuildProfileEmojiExtraBinding, "WidgetGuildProfileEmojiE….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java
index 092c657838..c52bf3d78a 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guilds.profile;
 
+import com.discord.R;
 import com.discord.widgets.guilds.profile.WidgetGuildProfileSheetViewModel;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -19,6 +20,6 @@ public final class WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1 extends
     /* renamed from: invoke */
     public final void mo1invoke() {
         PublishSubject access$getEventSubject$p = WidgetGuildProfileSheetViewModel.access$getEventSubject$p(this.this$0);
-        access$getEventSubject$p.j.onNext(new WidgetGuildProfileSheetViewModel.Event.DismissAndShowToast(2131891252));
+        access$getEventSubject$p.j.onNext(new WidgetGuildProfileSheetViewModel.Event.DismissAndShowToast(R.string.marked_as_read));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
index 373f39c51d..d3f0e1f542 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
@@ -4,11 +4,13 @@ import a0.a.a.b;
 import android.content.Context;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.emoji.GuildEmoji;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.guild.preview.GuildPreview;
 import com.discord.app.AppActivity;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.models.domain.emoji.ModelEmojiCustom;
 import com.discord.models.guild.Guild;
@@ -1252,12 +1254,12 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         Integer num;
         List<? extends Emoji> list3;
         List<GuildEmoji> d;
-        int i;
+        Integer valueOf;
         Integer num2 = null;
         if (guild.getFeatures().contains(GuildFeature.VERIFIED)) {
-            i = 2131232095;
+            valueOf = Integer.valueOf((int) R.drawable.ic_verified_badge);
         } else if (guild.getFeatures().contains(GuildFeature.PARTNERED)) {
-            i = 2131231857;
+            valueOf = Integer.valueOf((int) R.drawable.ic_partnered_badge);
         } else {
             num = null;
             Banner banner = new Banner(guild.getId(), guild.getBanner(), Banner.Type.BANNER);
@@ -1291,7 +1293,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             }
             updateViewState(new ViewState.Loaded(id2, name, shortName, icon, description, num, banner, b, num2, tabItems, actions, new EmojisData(isPremium, z5, list3), bottomActions, guild.isHub()));
         }
-        num = i;
+        num = valueOf;
         Banner banner = new Banner(guild.getId(), guild.getBanner(), Banner.Type.BANNER);
         ManageGuildContext manageGuildContext = guildChannelsInfo.getManageGuildContext();
         if (z3) {
@@ -1318,7 +1320,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
     }
 
     private final void handleLoadedGuildPreview(GuildPreview guildPreview, boolean z2) {
-        int i = guildPreview.e().contains(GuildFeature.VERIFIED) ? 2131232095 : guildPreview.e().contains(GuildFeature.PARTNERED) ? 2131231857 : null;
+        Integer valueOf = guildPreview.e().contains(GuildFeature.VERIFIED) ? Integer.valueOf((int) R.drawable.ic_verified_badge) : guildPreview.e().contains(GuildFeature.PARTNERED) ? Integer.valueOf((int) R.drawable.ic_partnered_badge) : null;
         Banner banner = new Banner(guildPreview.g(), guildPreview.i(), Banner.Type.SPLASH);
         BottomActions bottomActions = new BottomActions(false, true, !this.viewingGuild);
         long g = guildPreview.g();
@@ -1337,7 +1339,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             it = it;
             bottomActions = bottomActions;
         }
-        updateViewState(new ViewState.Loaded(g, h, computeShortName, f, c2, i, banner, b, a, null, null, new EmojisData(z2, z3, arrayList), bottomActions, guildPreview.e().contains(GuildFeature.HUB)));
+        updateViewState(new ViewState.Loaded(g, h, computeShortName, f, c2, valueOf, banner, b, a, null, null, new EmojisData(z2, z3, arrayList), bottomActions, guildPreview.e().contains(GuildFeature.HUB)));
     }
 
     private final void handleStoreState(StoreState storeState) {
@@ -1415,7 +1417,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
     }
 
     public final void onClickSaveNickname(long j, String str, Function0<Unit> function0) {
-        m.checkNotNullParameter(str, "nick");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NICK);
         m.checkNotNullParameter(function0, "onSuccess");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.changeGuildNickname(j, new RestAPIParams.Nick(str)), false, 1, null), this, null, 2, null), WidgetGuildProfileSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildProfileSheetViewModel$onClickSaveNickname$1(function0), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$binding$2.java
index 2effeaefd6..f19e960d8e 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetAnnouncementGuildProfileSheetBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.k;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetPublicAnnouncementProfileSheet$binding$
 
     public final WidgetAnnouncementGuildProfileSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361970;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131361970);
+        int i = R.id.announcement_guild_avatar;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.announcement_guild_avatar);
         if (simpleDraweeView != null) {
-            i = 2131361971;
-            TextView textView = (TextView) view.findViewById(2131361971);
+            i = R.id.announcement_guild_description;
+            TextView textView = (TextView) view.findViewById(R.id.announcement_guild_description);
             if (textView != null) {
-                i = 2131361972;
-                TextView textView2 = (TextView) view.findViewById(2131361972);
+                i = R.id.announcement_guild_here_to_help;
+                TextView textView2 = (TextView) view.findViewById(R.id.announcement_guild_here_to_help);
                 if (textView2 != null) {
-                    i = 2131361973;
-                    TextView textView3 = (TextView) view.findViewById(2131361973);
+                    i = R.id.announcement_guild_name;
+                    TextView textView3 = (TextView) view.findViewById(R.id.announcement_guild_name);
                     if (textView3 != null) {
-                        i = 2131361974;
-                        ImageView imageView = (ImageView) view.findViewById(2131361974);
+                        i = R.id.announcement_guild_staff_icon;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.announcement_guild_staff_icon);
                         if (imageView != null) {
                             return new WidgetAnnouncementGuildProfileSheetBinding((NestedScrollView) view, simpleDraweeView, textView, textView2, textView3, imageView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java
index 341e1f62b0..3679eb3464 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetAnnouncementGuildProfileSheetBinding;
 import com.discord.utilities.icon.IconUtils;
@@ -51,7 +52,7 @@ public final class WidgetPublicAnnouncementProfileSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558864;
+        return R.layout.widget_announcement_guild_profile_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -60,6 +61,6 @@ public final class WidgetPublicAnnouncementProfileSheet extends AppBottomSheet {
         super.onViewCreated(view, bundle);
         SimpleDraweeView simpleDraweeView = getBinding().b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.announcementGuildAvatar");
-        IconUtils.setIcon$default(simpleDraweeView, "asset://asset/images/system_user_avatar.png", 2131165299, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView, "asset://asset/images/system_user_avatar.png", (int) R.dimen.avatar_size_xxlarge, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java
index 4a20279e41..5619943911 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
 import com.discord.databinding.GuildScheduledEventItemViewBinding;
@@ -63,34 +64,34 @@ public final class GuildScheduledEventItemView extends ConstraintLayout {
     public GuildScheduledEventItemView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558520, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.guild_scheduled_event_item_view, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131363594;
-        ImageView imageView = (ImageView) inflate.findViewById(2131363594);
+        int i2 = R.id.guild_scheduled_event_list_item_bottom_button;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.guild_scheduled_event_list_item_bottom_button);
         if (imageView != null) {
-            i2 = 2131363595;
-            TextView textView = (TextView) inflate.findViewById(2131363595);
+            i2 = R.id.guild_scheduled_event_list_item_bottom_button_text;
+            TextView textView = (TextView) inflate.findViewById(R.id.guild_scheduled_event_list_item_bottom_button_text);
             if (textView != null) {
-                i2 = 2131363596;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131363596);
+                i2 = R.id.guild_scheduled_event_list_item_channel_icon;
+                ImageView imageView2 = (ImageView) inflate.findViewById(R.id.guild_scheduled_event_list_item_channel_icon);
                 if (imageView2 != null) {
-                    i2 = 2131363597;
-                    TextView textView2 = (TextView) inflate.findViewById(2131363597);
+                    i2 = R.id.guild_scheduled_event_list_item_channel_name;
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.guild_scheduled_event_list_item_channel_name);
                     if (textView2 != null) {
-                        i2 = 2131363598;
-                        TextView textView3 = (TextView) inflate.findViewById(2131363598);
+                        i2 = R.id.guild_scheduled_event_list_item_date_text;
+                        TextView textView3 = (TextView) inflate.findViewById(R.id.guild_scheduled_event_list_item_date_text);
                         if (textView3 != null) {
-                            i2 = 2131363599;
-                            TextView textView4 = (TextView) inflate.findViewById(2131363599);
+                            i2 = R.id.guild_scheduled_event_list_item_desc_text;
+                            TextView textView4 = (TextView) inflate.findViewById(R.id.guild_scheduled_event_list_item_desc_text);
                             if (textView4 != null) {
-                                i2 = 2131363600;
-                                TextView textView5 = (TextView) inflate.findViewById(2131363600);
+                                i2 = R.id.guild_scheduled_event_list_item_rsvp_text;
+                                TextView textView5 = (TextView) inflate.findViewById(R.id.guild_scheduled_event_list_item_rsvp_text);
                                 if (textView5 != null) {
-                                    i2 = 2131363601;
-                                    ImageView imageView3 = (ImageView) inflate.findViewById(2131363601);
+                                    i2 = R.id.guild_scheduled_event_list_item_status_icon;
+                                    ImageView imageView3 = (ImageView) inflate.findViewById(R.id.guild_scheduled_event_list_item_status_icon);
                                     if (imageView3 != null) {
-                                        i2 = 2131363602;
-                                        TextView textView6 = (TextView) inflate.findViewById(2131363602);
+                                        i2 = R.id.guild_scheduled_event_list_item_title_text;
+                                        TextView textView6 = (TextView) inflate.findViewById(R.id.guild_scheduled_event_list_item_title_text);
                                         if (textView6 != null) {
                                             GuildScheduledEventItemViewBinding guildScheduledEventItemViewBinding = new GuildScheduledEventItemViewBinding((ConstraintLayout) inflate, imageView, textView, imageView2, textView2, textView3, textView4, textView5, imageView3, textView6);
                                             m.checkNotNullExpressionValue(guildScheduledEventItemViewBinding, "GuildScheduledEventItemV…rom(context), this, true)");
@@ -117,18 +118,18 @@ public final class GuildScheduledEventItemView extends ConstraintLayout {
         ImageView imageView = this.binding.i;
         int ordinal = guildScheduledEventTiming.ordinal();
         if (ordinal == 3 || ordinal == 4) {
-            imageView.setImageResource(2131231559);
-            ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), 2130968916));
+            imageView.setImageResource(R.drawable.ic_clock_20dp);
+            ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorControlBrandForegroundNew));
         } else if (ordinal != 5) {
-            imageView.setImageResource(2131231629);
-            ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), 2130968916));
+            imageView.setImageResource(R.drawable.ic_event_20dp);
+            ColorCompatKt.tintWithColor(imageView, ColorCompat.getThemedColor(imageView.getContext(), (int) R.attr.colorControlBrandForegroundNew));
         } else {
-            imageView.setImageResource(2131231514);
-            ColorCompatKt.tintWithColor(imageView, ColorCompat.getColor(imageView.getContext(), 2131100254));
+            imageView.setImageResource(R.drawable.ic_channel_stage_24dp);
+            ColorCompatKt.tintWithColor(imageView, ColorCompat.getColor(imageView.getContext(), (int) R.color.status_green_600));
         }
         TextView textView = this.binding.f;
         int ordinal2 = guildScheduledEventTiming.ordinal();
-        textView.setTextColor((ordinal2 == 3 || ordinal2 == 4) ? ColorCompat.getThemedColor(getContext(), 2130968916) : ordinal2 != 5 ? ColorCompat.getThemedColor(getContext(), 2130968932) : ColorCompat.getColor(getContext(), 2131100254));
+        textView.setTextColor((ordinal2 == 3 || ordinal2 == 4) ? ColorCompat.getThemedColor(getContext(), (int) R.attr.colorControlBrandForegroundNew) : ordinal2 != 5 ? ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary) : ColorCompat.getColor(getContext(), (int) R.color.status_green_600));
     }
 
     public final void configure(GuildScheduledEventListItem.Event event, boolean z2, Function0<Unit> function0) {
@@ -140,12 +141,12 @@ public final class GuildScheduledEventItemView extends ConstraintLayout {
         int i = 0;
         boolean z4 = eventTiming == guildScheduledEventTiming;
         ImageView imageView = this.binding.b;
-        imageView.setImageResource(z4 ? 2131230936 : z2 ? 2131230938 : 2131230937);
+        imageView.setImageResource(z4 ? R.drawable.bg_guild_scheduled_event_list_item_interested_button_active : z2 ? R.drawable.bg_guild_scheduled_event_list_item_interested_button_interested : R.drawable.bg_guild_scheduled_event_list_item_interested_button_default);
         imageView.setOnClickListener(new GuildScheduledEventItemView$configure$$inlined$apply$lambda$1(z4, z2, function0));
         TextView textView = this.binding.f1612c;
-        int color = (!z2 || eventTiming == guildScheduledEventTiming) ? ColorCompat.getColor(textView.getContext(), 2131100433) : ColorCompat.getThemedColor(textView.getContext(), 2130968916);
-        int i2 = z4 ? 0 : z2 ? 2131231539 : 2131231472;
-        int i3 = z4 ? 2131893738 : 2131893811;
+        int color = (!z2 || eventTiming == guildScheduledEventTiming) ? ColorCompat.getColor(textView.getContext(), (int) R.color.white) : ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorControlBrandForegroundNew);
+        int i2 = z4 ? 0 : z2 ? R.drawable.ic_check_brand_16dp : R.drawable.ic_bell_16dp;
+        int i3 = z4 ? R.string.stage_channel_join_button : R.string.stage_instance_interested_label;
         DrawableCompat.setCompoundDrawablesCompat$default(textView, i2, 0, 0, 0, 14, (Object) null);
         textView.setTextColor(color);
         Context context = textView.getContext();
@@ -193,7 +194,7 @@ public final class GuildScheduledEventItemView extends ConstraintLayout {
         GuildScheduledEventTiming eventTiming = GuildScheduledEventUtilitiesKt.getEventTiming(millis);
         ConstraintLayout constraintLayout = this.binding.a;
         m.checkNotNullExpressionValue(constraintLayout, "binding.root");
-        constraintLayout.setBackground(ContextCompat.getDrawable(getContext(), 2131230939));
+        constraintLayout.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_list_item_preview));
         ImageView imageView = this.binding.b;
         m.checkNotNullExpressionValue(imageView, "binding.guildScheduledEventListItemBottomButton");
         int i = 8;
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java
index f542dda650..c10aeb30de 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guildscheduledevent;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.GuildScheduledEventListItemBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -20,7 +21,7 @@ public final class GuildScheduledEventListAdapter extends MGRecyclerAdapterSimpl
         private final GuildScheduledEventListItemBinding binding;
 
         public EventViewHolder() {
-            super(2131558521, GuildScheduledEventListAdapter.this);
+            super((int) R.layout.guild_scheduled_event_list_item, GuildScheduledEventListAdapter.this);
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
             GuildScheduledEventItemView guildScheduledEventItemView = (GuildScheduledEventItemView) view;
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListItem.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListItem.java
index 4cb25c0977..9fdb88b75e 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListItem.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListItem.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.guildscheduledevent;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
@@ -32,7 +33,7 @@ public abstract class GuildScheduledEventListItem implements MGRecyclerDataPaylo
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public Event(GuildScheduledEvent guildScheduledEvent, Channel channel, boolean z2) {
             super(null);
-            m.checkNotNullParameter(guildScheduledEvent, "event");
+            m.checkNotNullParameter(guildScheduledEvent, NotificationCompat.CATEGORY_EVENT);
             m.checkNotNullParameter(channel, "channel");
             this.event = guildScheduledEvent;
             this.channel = channel;
@@ -66,7 +67,7 @@ public abstract class GuildScheduledEventListItem implements MGRecyclerDataPaylo
         }
 
         public final Event copy(GuildScheduledEvent guildScheduledEvent, Channel channel, boolean z2) {
-            m.checkNotNullParameter(guildScheduledEvent, "event");
+            m.checkNotNullParameter(guildScheduledEvent, NotificationCompat.CATEGORY_EVENT);
             m.checkNotNullParameter(channel, "channel");
             return new Event(guildScheduledEvent, channel, z2);
         }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java
index bd6a1d774e..b64727f0b2 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java
@@ -4,6 +4,7 @@ import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreChannels;
 import com.discord.stores.StorePermissions;
 import com.discord.stores.StoreStream;
@@ -205,7 +206,7 @@ public final class GuildScheduledEventSettingsViewModel extends AppViewModel<Vie
 
     public final Unit setDescription(String str) {
         GuildScheduledEventModel eventModel;
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Initialized)) {
             viewState = null;
@@ -268,7 +269,7 @@ public final class GuildScheduledEventSettingsViewModel extends AppViewModel<Vie
 
     public final Unit setTopic(String str) {
         GuildScheduledEventModel eventModel;
-        m.checkNotNullParameter(str, "topic");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Initialized)) {
             viewState = null;
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet$binding$2.java
index 9bd484058d..fd2ab5da2f 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildScheduledEventListBottomSheetBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,14 +19,14 @@ public final /* synthetic */ class WidgetGuildScheduledEventListBottomSheet$bind
 
     public final WidgetGuildScheduledEventListBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363603;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363603);
+        int i = R.id.guild_scheduled_event_list_recycler_view;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_scheduled_event_list_recycler_view);
         if (recyclerView != null) {
-            i = 2131363604;
-            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363604);
+            i = R.id.guild_scheduled_event_list_toolbar_container;
+            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.guild_scheduled_event_list_toolbar_container);
             if (constraintLayout != null) {
-                i = 2131363605;
-                TextView textView = (TextView) view.findViewById(2131363605);
+                i = R.id.guild_scheduled_event_list_toolbar_title;
+                TextView textView = (TextView) view.findViewById(R.id.guild_scheduled_event_list_toolbar_title);
                 if (textView != null) {
                     return new WidgetGuildScheduledEventListBottomSheetBinding((ConstraintLayout) view, recyclerView, constraintLayout, textView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java
index b7439cd97d..c4b35ca889 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java
@@ -13,6 +13,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guildscheduledevent.GuildScheduledEventStatus;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetGuildScheduledEventListBottomSheetBinding;
@@ -87,7 +88,7 @@ public final class WidgetGuildScheduledEventListBottomSheet extends AppBottomShe
             m.checkNotNullExpressionValue(textView, "binding.guildScheduledEventListToolbarTitle");
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            textView.setText(StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755136, loaded.getGuildScheduledEvents().size(), Integer.valueOf(loaded.getGuildScheduledEvents().size())));
+            textView.setText(StringResourceUtilsKt.getI18nPluralString(requireContext, R.plurals.guild_events_plural_number, loaded.getGuildScheduledEvents().size(), Integer.valueOf(loaded.getGuildScheduledEvents().size())));
             GuildScheduledEventListAdapter guildScheduledEventListAdapter = this.adapter;
             if (guildScheduledEventListAdapter == null) {
                 m.throwUninitializedPropertyAccessException("adapter");
@@ -115,14 +116,14 @@ public final class WidgetGuildScheduledEventListBottomSheet extends AppBottomShe
             return;
         }
         if (!event.isRsvped()) {
-            o.g(getContext(), 2131889301, 0, null, 12);
+            o.g(getContext(), R.string.guild_event_interested_notification, 0, null, 12);
         }
         getViewModel().toggleRsvp(event.getEvent());
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559094;
+        return R.layout.widget_guild_scheduled_event_list_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$binding$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$binding$2.java
index 6ba2edf875..b9b710f9cd 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildScheduledEventSettingsBinding;
 import com.discord.views.CheckedSetting;
 import com.discord.views.ScreenTitleView;
@@ -24,77 +25,77 @@ public final /* synthetic */ class WidgetGuildScheduledEventSettings$binding$2 e
 
     public final WidgetGuildScheduledEventSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363606;
-        TextView textView = (TextView) view.findViewById(2131363606);
+        int i = R.id.guild_scheduled_event_settings_description_header;
+        TextView textView = (TextView) view.findViewById(R.id.guild_scheduled_event_settings_description_header);
         if (textView != null) {
-            i = 2131363607;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363607);
+            i = R.id.guild_scheduled_event_settings_description_input;
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.guild_scheduled_event_settings_description_input);
             if (textInputEditText != null) {
-                i = 2131363608;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363608);
+                i = R.id.guild_scheduled_event_settings_description_input_layout;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_scheduled_event_settings_description_input_layout);
                 if (textInputLayout != null) {
-                    i = 2131363609;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131363609);
+                    i = R.id.guild_scheduled_event_settings_next_button;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_scheduled_event_settings_next_button);
                     if (materialButton != null) {
-                        i = 2131363610;
-                        TextView textView2 = (TextView) view.findViewById(2131363610);
+                        i = R.id.guild_scheduled_event_settings_place_header;
+                        TextView textView2 = (TextView) view.findViewById(R.id.guild_scheduled_event_settings_place_header);
                         if (textView2 != null) {
-                            i = 2131363611;
-                            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363611);
+                            i = R.id.guild_scheduled_event_settings_place_option_elsewhere;
+                            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.guild_scheduled_event_settings_place_option_elsewhere);
                             if (checkedSetting != null) {
-                                i = 2131363612;
-                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131363612);
+                                i = R.id.guild_scheduled_event_settings_place_option_on_discord;
+                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.guild_scheduled_event_settings_place_option_on_discord);
                                 if (checkedSetting2 != null) {
-                                    i = 2131363613;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363613);
+                                    i = R.id.guild_scheduled_event_settings_place_options;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_scheduled_event_settings_place_options);
                                     if (linearLayout != null) {
-                                        i = 2131363614;
-                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363614);
+                                        i = R.id.guild_scheduled_event_settings_scroll_view;
+                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.guild_scheduled_event_settings_scroll_view);
                                         if (nestedScrollView != null) {
-                                            i = 2131363615;
-                                            TextInputEditText textInputEditText2 = (TextInputEditText) view.findViewById(2131363615);
+                                            i = R.id.guild_scheduled_event_settings_select_channel_input;
+                                            TextInputEditText textInputEditText2 = (TextInputEditText) view.findViewById(R.id.guild_scheduled_event_settings_select_channel_input);
                                             if (textInputEditText2 != null) {
-                                                i = 2131363616;
-                                                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363616);
+                                                i = R.id.guild_scheduled_event_settings_select_channel_input_layout;
+                                                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.guild_scheduled_event_settings_select_channel_input_layout);
                                                 if (textInputLayout2 != null) {
-                                                    i = 2131363617;
-                                                    TextView textView3 = (TextView) view.findViewById(2131363617);
+                                                    i = R.id.guild_scheduled_event_settings_start_date_header;
+                                                    TextView textView3 = (TextView) view.findViewById(R.id.guild_scheduled_event_settings_start_date_header);
                                                     if (textView3 != null) {
-                                                        i = 2131363618;
-                                                        TextInputEditText textInputEditText3 = (TextInputEditText) view.findViewById(2131363618);
+                                                        i = R.id.guild_scheduled_event_settings_start_date_input;
+                                                        TextInputEditText textInputEditText3 = (TextInputEditText) view.findViewById(R.id.guild_scheduled_event_settings_start_date_input);
                                                         if (textInputEditText3 != null) {
-                                                            i = 2131363619;
-                                                            TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131363619);
+                                                            i = R.id.guild_scheduled_event_settings_start_date_input_layout;
+                                                            TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(R.id.guild_scheduled_event_settings_start_date_input_layout);
                                                             if (textInputLayout3 != null) {
-                                                                i = 2131363620;
-                                                                TextView textView4 = (TextView) view.findViewById(2131363620);
+                                                                i = R.id.guild_scheduled_event_settings_start_time_header;
+                                                                TextView textView4 = (TextView) view.findViewById(R.id.guild_scheduled_event_settings_start_time_header);
                                                                 if (textView4 != null) {
-                                                                    i = 2131363621;
-                                                                    TextInputEditText textInputEditText4 = (TextInputEditText) view.findViewById(2131363621);
+                                                                    i = R.id.guild_scheduled_event_settings_start_time_input;
+                                                                    TextInputEditText textInputEditText4 = (TextInputEditText) view.findViewById(R.id.guild_scheduled_event_settings_start_time_input);
                                                                     if (textInputEditText4 != null) {
-                                                                        i = 2131363622;
-                                                                        TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(2131363622);
+                                                                        i = R.id.guild_scheduled_event_settings_start_time_input_layout;
+                                                                        TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(R.id.guild_scheduled_event_settings_start_time_input_layout);
                                                                         if (textInputLayout4 != null) {
-                                                                            i = 2131363623;
-                                                                            TextView textView5 = (TextView) view.findViewById(2131363623);
+                                                                            i = R.id.guild_scheduled_event_settings_step_text;
+                                                                            TextView textView5 = (TextView) view.findViewById(R.id.guild_scheduled_event_settings_step_text);
                                                                             if (textView5 != null) {
-                                                                                i = 2131363624;
-                                                                                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363624);
+                                                                                i = R.id.guild_scheduled_event_settings_stv;
+                                                                                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.guild_scheduled_event_settings_stv);
                                                                                 if (screenTitleView != null) {
-                                                                                    i = 2131363625;
-                                                                                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363625);
+                                                                                    i = R.id.guild_scheduled_event_settings_toolbar;
+                                                                                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.guild_scheduled_event_settings_toolbar);
                                                                                     if (constraintLayout != null) {
-                                                                                        i = 2131363626;
-                                                                                        TextView textView6 = (TextView) view.findViewById(2131363626);
+                                                                                        i = R.id.guild_scheduled_event_settings_topic_header;
+                                                                                        TextView textView6 = (TextView) view.findViewById(R.id.guild_scheduled_event_settings_topic_header);
                                                                                         if (textView6 != null) {
-                                                                                            i = 2131363627;
-                                                                                            TextInputEditText textInputEditText5 = (TextInputEditText) view.findViewById(2131363627);
+                                                                                            i = R.id.guild_scheduled_event_settings_topic_input;
+                                                                                            TextInputEditText textInputEditText5 = (TextInputEditText) view.findViewById(R.id.guild_scheduled_event_settings_topic_input);
                                                                                             if (textInputEditText5 != null) {
-                                                                                                i = 2131363628;
-                                                                                                TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(2131363628);
+                                                                                                i = R.id.guild_scheduled_event_settings_topic_layout;
+                                                                                                TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(R.id.guild_scheduled_event_settings_topic_layout);
                                                                                                 if (textInputLayout5 != null) {
-                                                                                                    i = 2131365273;
-                                                                                                    View findViewById = view.findViewById(2131365273);
+                                                                                                    i = R.id.stage_start_divider;
+                                                                                                    View findViewById = view.findViewById(R.id.stage_start_divider);
                                                                                                     if (findViewById != null) {
                                                                                                         return new WidgetGuildScheduledEventSettingsBinding((ConstraintLayout) view, textView, textInputEditText, textInputLayout, materialButton, textView2, checkedSetting, checkedSetting2, linearLayout, nestedScrollView, textInputEditText2, textInputLayout2, textView3, textInputEditText3, textInputLayout3, textView4, textInputEditText4, textInputLayout4, textView5, screenTitleView, constraintLayout, textView6, textInputEditText5, textInputLayout5, findViewById);
                                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java
index dc4adb0341..93b1fb51f7 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java
@@ -15,6 +15,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGuildScheduledEventSettingsBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -67,7 +68,7 @@ public final class WidgetGuildScheduledEventSettings extends AppFragment {
     }
 
     public WidgetGuildScheduledEventSettings() {
-        super(2131559095);
+        super(R.layout.widget_guild_scheduled_event_settings);
         WidgetGuildScheduledEventSettings$viewModel$2 widgetGuildScheduledEventSettings$viewModel$2 = new WidgetGuildScheduledEventSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildScheduledEventSettingsViewModel.class), new WidgetGuildScheduledEventSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildScheduledEventSettings$viewModel$2));
@@ -153,7 +154,7 @@ public final class WidgetGuildScheduledEventSettings extends AppFragment {
     }
 
     private final void showDateErrorToast() {
-        o.g(requireContext(), 2131889306, 0, null, 12);
+        o.g(requireContext(), R.string.guild_event_past_start_date, 0, null, 12);
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
@@ -168,7 +169,7 @@ public final class WidgetGuildScheduledEventSettings extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().i;
         m.checkNotNullExpressionValue(textView, "binding.guildScheduledEventSettingsStepText");
-        b.n(textView, 2131889313, new Object[]{1, 2}, null, 4);
+        b.n(textView, R.string.guild_event_step_label, new Object[]{1, 2}, null, 4);
         TextInputEditText textInputEditText = getBinding().j;
         m.checkNotNullExpressionValue(textInputEditText, "binding.guildScheduledEventSettingsTopicInput");
         textInputEditText.addTextChangedListener(new WidgetGuildScheduledEventSettings$onViewBound$$inlined$addTextChangedListener$1(this));
@@ -181,6 +182,6 @@ public final class WidgetGuildScheduledEventSettings extends AppFragment {
         getBinding().g.setOnClickListener(new WidgetGuildScheduledEventSettings$onViewBound$6(this));
         getBinding().f1840c.setOnClickListener(new WidgetGuildScheduledEventSettings$onViewBound$7(this));
         getBinding().f.setOnClickListener(new WidgetGuildScheduledEventSettings$onViewBound$8(this));
-        WidgetChannelSelector.Companion.registerForResult(this, "GUILD_SCHEDULED_EVENT_SETTINGS_REQUEST_KEY", false, new WidgetGuildScheduledEventSettings$onViewBound$9(this));
+        WidgetChannelSelector.Companion.registerForResult(this, GUILD_SCHEDULED_EVENT_SETTINGS_REQUEST_KEY, false, new WidgetGuildScheduledEventSettings$onViewBound$9(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$binding$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$binding$2.java
index 2aa2e678ad..160a14ad5a 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.guildscheduledevent;
 import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetPreviewGuildScheduledEventBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,20 +19,20 @@ public final /* synthetic */ class WidgetPreviewGuildScheduledEvent$binding$2 ex
 
     public final WidgetPreviewGuildScheduledEventBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362722;
-        GuildScheduledEventItemView guildScheduledEventItemView = (GuildScheduledEventItemView) view.findViewById(2131362722);
+        int i = R.id.confirm_guild_scheduled_event_preview;
+        GuildScheduledEventItemView guildScheduledEventItemView = (GuildScheduledEventItemView) view.findViewById(R.id.confirm_guild_scheduled_event_preview);
         if (guildScheduledEventItemView != null) {
-            i = 2131362723;
-            TextView textView = (TextView) view.findViewById(2131362723);
+            i = R.id.confirm_guild_scheduled_event_step_text;
+            TextView textView = (TextView) view.findViewById(R.id.confirm_guild_scheduled_event_step_text);
             if (textView != null) {
-                i = 2131362724;
-                TextView textView2 = (TextView) view.findViewById(2131362724);
+                i = R.id.confirm_guild_scheduled_event_title;
+                TextView textView2 = (TextView) view.findViewById(R.id.confirm_guild_scheduled_event_title);
                 if (textView2 != null) {
-                    i = 2131362725;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362725);
+                    i = R.id.confirm_guild_scheduled_event_toolbar;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.confirm_guild_scheduled_event_toolbar);
                     if (constraintLayout != null) {
-                        i = 2131363609;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363609);
+                        i = R.id.guild_scheduled_event_settings_next_button;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_scheduled_event_settings_next_button);
                         if (materialButton != null) {
                             return new WidgetPreviewGuildScheduledEventBinding((ConstraintLayout) view, guildScheduledEventItemView, textView, textView2, constraintLayout, materialButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java
index b0cdc1ab2a..247c29daca 100644
--- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java
+++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java
@@ -14,6 +14,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetPreviewGuildScheduledEventBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -61,7 +62,7 @@ public final class WidgetPreviewGuildScheduledEvent extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(guildScheduledEventModel, "eventModel");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_EXTRA_EVENT_MODEL", guildScheduledEventModel);
+            intent.putExtra(WidgetPreviewGuildScheduledEvent.EXTRA_EVENT_MODEL, guildScheduledEventModel);
             if (activityResultLauncher != null) {
                 l.g.f(context, activityResultLauncher, WidgetPreviewGuildScheduledEvent.class, intent);
             } else {
@@ -79,7 +80,7 @@ public final class WidgetPreviewGuildScheduledEvent extends AppFragment {
     }
 
     public WidgetPreviewGuildScheduledEvent() {
-        super(2131559168);
+        super(R.layout.widget_preview_guild_scheduled_event);
         WidgetPreviewGuildScheduledEvent$viewModel$2 widgetPreviewGuildScheduledEvent$viewModel$2 = new WidgetPreviewGuildScheduledEvent$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PreviewGuildScheduledEventViewModel.class), new WidgetPreviewGuildScheduledEvent$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPreviewGuildScheduledEvent$viewModel$2));
@@ -136,7 +137,7 @@ public final class WidgetPreviewGuildScheduledEvent extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().f1882c;
         m.checkNotNullExpressionValue(textView, "binding.confirmGuildScheduledEventStepText");
-        b.n(textView, 2131889313, new Object[]{2, 2}, null, 4);
+        b.n(textView, R.string.guild_event_step_label, new Object[]{2, 2}, null, 4);
         getBinding().d.setOnClickListener(new WidgetPreviewGuildScheduledEvent$onViewBound$1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java
index 602fa8c0dc..1d9c4501a7 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java
@@ -13,6 +13,7 @@ import c.a.j.c5;
 import c.a.j.d5;
 import c.a.j.e5;
 import c.a.j.f5;
+import com.discord.R;
 import com.discord.databinding.WidgetHomeBinding;
 import com.discord.utilities.view.rounded.RoundedRelativeLayout;
 import d0.z.d.k;
@@ -28,101 +29,101 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun
 
     public final WidgetHomeBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363976;
-        View findViewById = view.findViewById(2131363976);
+        int i = R.id.loading;
+        View findViewById = view.findViewById(R.id.loading);
         if (findViewById != null) {
-            ImageView imageView = (ImageView) findViewById.findViewById(2131363983);
+            ImageView imageView = (ImageView) findViewById.findViewById(R.id.logo);
             if (imageView != null) {
                 e5 e5Var = new e5((FrameLayout) findViewById, imageView);
-                i = 2131364336;
-                HomePanelsLayout homePanelsLayout = (HomePanelsLayout) view.findViewById(2131364336);
+                i = R.id.overlapping_panels;
+                HomePanelsLayout homePanelsLayout = (HomePanelsLayout) view.findViewById(R.id.overlapping_panels);
                 if (homePanelsLayout != null) {
-                    i = 2131364357;
-                    View findViewById2 = view.findViewById(2131364357);
+                    i = R.id.panel_center;
+                    View findViewById2 = view.findViewById(R.id.panel_center);
                     if (findViewById2 != null) {
-                        int i2 = 2131365901;
-                        View findViewById3 = findViewById2.findViewById(2131365901);
+                        int i2 = R.id.widget_home_panel_center_chat;
+                        View findViewById3 = findViewById2.findViewById(R.id.widget_home_panel_center_chat);
                         if (findViewById3 != null) {
-                            int i3 = 2131363717;
-                            ViewStub viewStub = (ViewStub) findViewById3.findViewById(2131363717);
+                            int i3 = R.id.home_panel_center_channel_less;
+                            ViewStub viewStub = (ViewStub) findViewById3.findViewById(R.id.home_panel_center_channel_less);
                             if (viewStub != null) {
-                                i3 = 2131363720;
-                                ViewStub viewStub2 = (ViewStub) findViewById3.findViewById(2131363720);
+                                i3 = R.id.home_panel_center_nsfw;
+                                ViewStub viewStub2 = (ViewStub) findViewById3.findViewById(R.id.home_panel_center_nsfw);
                                 if (viewStub2 != null) {
-                                    i3 = 2131365621;
-                                    View findViewById4 = findViewById3.findViewById(2131365621);
+                                    i3 = R.id.unread;
+                                    View findViewById4 = findViewById3.findViewById(R.id.unread);
                                     if (findViewById4 != null) {
                                         TextView textView = (TextView) findViewById4;
                                         c5 c5Var = new c5(textView, textView);
-                                        i3 = 2131365880;
-                                        View findViewById5 = findViewById3.findViewById(2131365880);
+                                        i3 = R.id.widget_chat_bottom_space;
+                                        View findViewById5 = findViewById3.findViewById(R.id.widget_chat_bottom_space);
                                         if (findViewById5 != null) {
-                                            i3 = 2131365881;
-                                            FragmentContainerView fragmentContainerView = (FragmentContainerView) findViewById3.findViewById(2131365881);
+                                            i3 = R.id.widget_chat_input;
+                                            FragmentContainerView fragmentContainerView = (FragmentContainerView) findViewById3.findViewById(R.id.widget_chat_input);
                                             if (fragmentContainerView != null) {
-                                                i3 = 2131365882;
-                                                FragmentContainerView fragmentContainerView2 = (FragmentContainerView) findViewById3.findViewById(2131365882);
+                                                i3 = R.id.widget_chat_list;
+                                                FragmentContainerView fragmentContainerView2 = (FragmentContainerView) findViewById3.findViewById(R.id.widget_chat_list);
                                                 if (fragmentContainerView2 != null) {
-                                                    i3 = 2131365884;
-                                                    FragmentContainerView fragmentContainerView3 = (FragmentContainerView) findViewById3.findViewById(2131365884);
+                                                    i3 = R.id.widget_chat_overlay_actions;
+                                                    FragmentContainerView fragmentContainerView3 = (FragmentContainerView) findViewById3.findViewById(R.id.widget_chat_overlay_actions);
                                                     if (fragmentContainerView3 != null) {
-                                                        i3 = 2131365885;
-                                                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) findViewById3.findViewById(2131365885);
+                                                        i3 = R.id.widget_chat_voice_inline;
+                                                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) findViewById3.findViewById(R.id.widget_chat_voice_inline);
                                                         if (fragmentContainerView4 != null) {
-                                                            i3 = 2131365930;
-                                                            FragmentContainerView fragmentContainerView5 = (FragmentContainerView) findViewById3.findViewById(2131365930);
+                                                            i3 = R.id.widget_status;
+                                                            FragmentContainerView fragmentContainerView5 = (FragmentContainerView) findViewById3.findViewById(R.id.widget_status);
                                                             if (fragmentContainerView5 != null) {
-                                                                i3 = 2131365941;
-                                                                FragmentContainerView fragmentContainerView6 = (FragmentContainerView) findViewById3.findViewById(2131365941);
+                                                                i3 = R.id.widget_thread_status;
+                                                                FragmentContainerView fragmentContainerView6 = (FragmentContainerView) findViewById3.findViewById(R.id.widget_thread_status);
                                                                 if (fragmentContainerView6 != null) {
                                                                     b5 b5Var = new b5((RoundedRelativeLayout) findViewById3, viewStub, viewStub2, c5Var, findViewById5, fragmentContainerView, fragmentContainerView2, fragmentContainerView3, fragmentContainerView4, fragmentContainerView5, fragmentContainerView6);
-                                                                    FragmentContainerView fragmentContainerView7 = (FragmentContainerView) findViewById2.findViewById(2131365902);
+                                                                    FragmentContainerView fragmentContainerView7 = (FragmentContainerView) findViewById2.findViewById(R.id.widget_home_panel_directory);
                                                                     if (fragmentContainerView7 != null) {
                                                                         a5 a5Var = new a5((FrameLayout) findViewById2, b5Var, fragmentContainerView7);
-                                                                        i = 2131364358;
-                                                                        View findViewById6 = view.findViewById(2131364358);
+                                                                        i = R.id.panel_left;
+                                                                        View findViewById6 = view.findViewById(R.id.panel_left);
                                                                         if (findViewById6 != null) {
-                                                                            int i4 = 2131363490;
-                                                                            TextView textView2 = (TextView) findViewById6.findViewById(2131363490);
+                                                                            int i4 = R.id.guild_list_add_hint;
+                                                                            TextView textView2 = (TextView) findViewById6.findViewById(R.id.guild_list_add_hint);
                                                                             if (textView2 != null) {
-                                                                                i4 = 2131365876;
-                                                                                FragmentContainerView fragmentContainerView8 = (FragmentContainerView) findViewById6.findViewById(2131365876);
+                                                                                i4 = R.id.widget_channels;
+                                                                                FragmentContainerView fragmentContainerView8 = (FragmentContainerView) findViewById6.findViewById(R.id.widget_channels);
                                                                                 if (fragmentContainerView8 != null) {
-                                                                                    i4 = 2131365899;
-                                                                                    FragmentContainerView fragmentContainerView9 = (FragmentContainerView) findViewById6.findViewById(2131365899);
+                                                                                    i4 = R.id.widget_guilds;
+                                                                                    FragmentContainerView fragmentContainerView9 = (FragmentContainerView) findViewById6.findViewById(R.id.widget_guilds);
                                                                                     if (fragmentContainerView9 != null) {
-                                                                                        i4 = 2131365903;
-                                                                                        FrameLayout frameLayout = (FrameLayout) findViewById6.findViewById(2131365903);
+                                                                                        i4 = R.id.widget_profile_strip;
+                                                                                        FrameLayout frameLayout = (FrameLayout) findViewById6.findViewById(R.id.widget_profile_strip);
                                                                                         if (frameLayout != null) {
                                                                                             d5 d5Var = new d5((RelativeLayout) findViewById6, textView2, fragmentContainerView8, fragmentContainerView9, frameLayout);
-                                                                                            View findViewById7 = view.findViewById(2131364359);
+                                                                                            View findViewById7 = view.findViewById(R.id.panel_right);
                                                                                             if (findViewById7 != null) {
-                                                                                                int i5 = 2131363986;
-                                                                                                RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) findViewById7.findViewById(2131363986);
+                                                                                                int i5 = R.id.main_panel_right_rounded_container;
+                                                                                                RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) findViewById7.findViewById(R.id.main_panel_right_rounded_container);
                                                                                                 if (roundedRelativeLayout != null) {
-                                                                                                    i5 = 2131365870;
-                                                                                                    FragmentContainerView fragmentContainerView10 = (FragmentContainerView) findViewById7.findViewById(2131365870);
+                                                                                                    i5 = R.id.widget_channel_action_bar;
+                                                                                                    FragmentContainerView fragmentContainerView10 = (FragmentContainerView) findViewById7.findViewById(R.id.widget_channel_action_bar);
                                                                                                     if (fragmentContainerView10 != null) {
-                                                                                                        i5 = 2131365875;
-                                                                                                        FragmentContainerView fragmentContainerView11 = (FragmentContainerView) findViewById7.findViewById(2131365875);
+                                                                                                        i5 = R.id.widget_channel_topic;
+                                                                                                        FragmentContainerView fragmentContainerView11 = (FragmentContainerView) findViewById7.findViewById(R.id.widget_channel_topic);
                                                                                                         if (fragmentContainerView11 != null) {
-                                                                                                            i5 = 2131365888;
-                                                                                                            FragmentContainerView fragmentContainerView12 = (FragmentContainerView) findViewById7.findViewById(2131365888);
+                                                                                                            i5 = R.id.widget_connected_list;
+                                                                                                            FragmentContainerView fragmentContainerView12 = (FragmentContainerView) findViewById7.findViewById(R.id.widget_connected_list);
                                                                                                             if (fragmentContainerView12 != null) {
                                                                                                                 f5 f5Var = new f5((FrameLayout) findViewById7, roundedRelativeLayout, fragmentContainerView10, fragmentContainerView11, fragmentContainerView12);
-                                                                                                                ImageView imageView2 = (ImageView) view.findViewById(2131364414);
+                                                                                                                ImageView imageView2 = (ImageView) view.findViewById(R.id.peek_transition_bitmap);
                                                                                                                 if (imageView2 != null) {
                                                                                                                     FrameLayout frameLayout2 = (FrameLayout) view;
                                                                                                                     return new WidgetHomeBinding(frameLayout2, e5Var, homePanelsLayout, a5Var, d5Var, f5Var, imageView2, frameLayout2);
                                                                                                                 }
-                                                                                                                i = 2131364414;
+                                                                                                                i = R.id.peek_transition_bitmap;
                                                                                                             }
                                                                                                         }
                                                                                                     }
                                                                                                 }
                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i5)));
                                                                                             }
-                                                                                            i = 2131364359;
+                                                                                            i = R.id.panel_right;
                                                                                         }
                                                                                     }
                                                                                 }
@@ -130,7 +131,7 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun
                                                                             throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i4)));
                                                                         }
                                                                     } else {
-                                                                        i2 = 2131365902;
+                                                                        i2 = R.id.widget_home_panel_directory;
                                                                     }
                                                                 }
                                                             }
@@ -148,7 +149,7 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun
                     }
                 }
             } else {
-                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131363983)));
+                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(R.id.logo)));
             }
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$maybeShowHubEmailUpsell$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$maybeShowHubEmailUpsell$1.java
index 1eab342ce7..3dc8ef6701 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$maybeShowHubEmailUpsell$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$maybeShowHubEmailUpsell$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.home;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import c.a.e.l;
 import com.discord.widgets.hubs.HubEmailArgs;
@@ -23,7 +24,7 @@ public final class WidgetHome$maybeShowHubEmailUpsell$1 extends o implements Fun
     }
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         l.d(fragmentActivity, WidgetDiscordHubEmailFlow.class, new HubEmailArgs(false, null, 0, 7, null));
         return true;
     }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.java
index de76cdddcc..e8bc4002e0 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.home;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.home.WidgetHomeViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetHome$onViewBoundOrOnResume$2 extends o implements Funct
     }
 
     public final void invoke(WidgetHomeViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetHome.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$showSurvey$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$showSurvey$1.java
index 94aa303be9..b63070a4e1 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$showSurvey$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$showSurvey$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.home;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import com.discord.stores.StoreNotices;
@@ -27,7 +28,7 @@ public final class WidgetHome$showSurvey$1 extends o implements Function1<Fragme
     }
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         WidgetMainSurveyDialog.Companion companion = WidgetMainSurveyDialog.Companion;
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
         m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.java
index 0143ac7278..ff76e697bd 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$showUrgentMessageDialog$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.home;
 
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.s;
@@ -23,7 +24,7 @@ public final class WidgetHome$showUrgentMessageDialog$1 extends o implements Fun
     }
 
     public final boolean invoke(FragmentActivity fragmentActivity) {
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         s.a aVar = s.j;
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
         m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java
index 7341d217cc..d2055dbb38 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$viewModel$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.home;
 
+import androidx.media.AudioAttributesCompat;
 import com.discord.app.AppViewModel;
 import com.discord.widgets.home.WidgetHomeViewModel;
 import d0.z.d.o;
@@ -15,6 +16,6 @@ public final class WidgetHome$viewModel$2 extends o implements Function0<AppView
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetHomeViewModel.ViewState> mo1invoke() {
-        return new WidgetHomeViewModel(null, null, null, null, null, null, null, null, null, null, 1023, null);
+        return new WidgetHomeViewModel(null, null, null, null, null, null, null, null, null, null, AudioAttributesCompat.FLAG_ALL, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome.java b/app/src/main/java/com/discord/widgets/home/WidgetHome.java
index ddc872e311..a13f412126 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome.java
@@ -18,6 +18,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentContainerView;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
+import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.a.j.a5;
@@ -28,6 +29,7 @@ import c.a.j.f5;
 import c.a.p.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -127,11 +129,11 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     public WidgetHome() {
-        super(2131559115);
+        super(R.layout.widget_home);
         WidgetHome$viewModel$2 widgetHome$viewModel$2 = WidgetHome$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetHomeViewModel.class), new WidgetHome$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetHome$viewModel$2));
-        this.fixedPositionViewIds = m0.setOf(2131365621);
+        this.fixedPositionViewIds = m0.setOf(Integer.valueOf((int) R.id.unread));
         this.leftPanelManager = new LeftPanelManager(null, null, 3, null);
         this.localeManager = new LocaleManager();
         this.onGuildListAddHintCreate = WidgetHome$onGuildListAddHintCreate$1.INSTANCE;
@@ -206,7 +208,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         float f2;
         View view2;
         if (!AccessibilityUtils.INSTANCE.isReducedMotionEnabled()) {
-            Fragment findFragmentById = getChildFragmentManager().findFragmentById(2131365882);
+            Fragment findFragmentById = getChildFragmentManager().findFragmentById(R.id.widget_chat_list);
             if (!(findFragmentById instanceof WidgetChatList)) {
                 findFragmentById = null;
             }
@@ -379,7 +381,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         StoreNotices notices = StoreStream.Companion.getNotices();
         String name = WidgetDiscordHubEmailFlow.class.getName();
         m.checkNotNullExpressionValue(name, "WidgetDiscordHubEmailFlow::class.java.name");
-        notices.requestToShow(new StoreNotices.Notice(name, null, 0, 0, true, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, true, Long.MAX_VALUE, WidgetHome$maybeShowHubEmailUpsell$1.INSTANCE, 6, null));
+        notices.requestToShow(new StoreNotices.Notice(name, null, 0, 0, true, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, true, RecyclerView.FOREVER_NS, WidgetHome$maybeShowHubEmailUpsell$1.INSTANCE, 6, null));
     }
 
     private final void roundPanelCorners() {
@@ -416,7 +418,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final void setUpToolbar() {
-        setActionBarDisplayHomeAsUpEnabled(true, 2131231783, 2131894376, Integer.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968946)));
+        setActionBarDisplayHomeAsUpEnabled(true, Integer.valueOf((int) R.drawable.ic_menu_24dp), Integer.valueOf((int) R.string.toggle_drawer), Integer.valueOf(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorInteractiveActive)));
         Toolbar toolbar = getToolbar();
         if (toolbar != null) {
             toolbar.setNavigationOnClickListener(new WidgetHome$setUpToolbar$1(this));
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java
index a7230141c1..27019764d2 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.home;
 import android.view.Menu;
 import android.view.MenuItem;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -20,54 +21,54 @@ public final class WidgetHomeHeaderManager$getOnConfigureAction$1<T> implements
         Channel channel = this.$this_getOnConfigureAction.getChannel();
         Integer valueOf = channel != null ? Integer.valueOf(channel.A()) : null;
         if ((valueOf != null && valueOf.intValue() == 3) || (valueOf != null && valueOf.intValue() == 1)) {
-            MenuItem findItem = menu.findItem(2131364082);
+            MenuItem findItem = menu.findItem(R.id.menu_chat_search);
             m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_chat_search)");
             findItem.setVisible(false);
-            MenuItem findItem2 = menu.findItem(2131364083);
+            MenuItem findItem2 = menu.findItem(R.id.menu_chat_side_panel);
             m.checkNotNullExpressionValue(findItem2, "menu.findItem(R.id.menu_chat_side_panel)");
             findItem2.setVisible(true);
-            MenuItem findItem3 = menu.findItem(2131364088);
+            MenuItem findItem3 = menu.findItem(R.id.menu_chat_thread_browser);
             m.checkNotNullExpressionValue(findItem3, "menu.findItem(R.id.menu_chat_thread_browser)");
             findItem3.setVisible(false);
         } else if ((valueOf != null && valueOf.intValue() == 5) || (valueOf != null && valueOf.intValue() == 0)) {
-            MenuItem findItem4 = menu.findItem(2131364083);
+            MenuItem findItem4 = menu.findItem(R.id.menu_chat_side_panel);
             m.checkNotNullExpressionValue(findItem4, "menu.findItem(R.id.menu_chat_side_panel)");
             findItem4.setVisible(true);
-            MenuItem findItem5 = menu.findItem(2131364082);
+            MenuItem findItem5 = menu.findItem(R.id.menu_chat_search);
             m.checkNotNullExpressionValue(findItem5, "menu.findItem(R.id.menu_chat_search)");
             findItem5.setVisible(!this.$this_getOnConfigureAction.getThreadExperimentEnabled());
-            MenuItem findItem6 = menu.findItem(2131364088);
+            MenuItem findItem6 = menu.findItem(R.id.menu_chat_thread_browser);
             m.checkNotNullExpressionValue(findItem6, "menu.findItem(R.id.menu_chat_thread_browser)");
             findItem6.setVisible(this.$this_getOnConfigureAction.getThreadExperimentEnabled());
         } else if ((valueOf != null && valueOf.intValue() == 10) || ((valueOf != null && valueOf.intValue() == 12) || (valueOf != null && valueOf.intValue() == 11))) {
-            MenuItem findItem7 = menu.findItem(2131364083);
+            MenuItem findItem7 = menu.findItem(R.id.menu_chat_side_panel);
             m.checkNotNullExpressionValue(findItem7, "menu.findItem(R.id.menu_chat_side_panel)");
             findItem7.setVisible(!AnimatableValueParser.e1(this.$this_getOnConfigureAction.getChannel()));
-            MenuItem findItem8 = menu.findItem(2131364082);
+            MenuItem findItem8 = menu.findItem(R.id.menu_chat_search);
             m.checkNotNullExpressionValue(findItem8, "menu.findItem(R.id.menu_chat_search)");
             findItem8.setVisible(false);
-            MenuItem findItem9 = menu.findItem(2131364088);
+            MenuItem findItem9 = menu.findItem(R.id.menu_chat_thread_browser);
             m.checkNotNullExpressionValue(findItem9, "menu.findItem(R.id.menu_chat_thread_browser)");
             findItem9.setVisible(true);
         } else if (valueOf != null && valueOf.intValue() == 14) {
-            MenuItem findItem10 = menu.findItem(2131364082);
+            MenuItem findItem10 = menu.findItem(R.id.menu_chat_search);
             m.checkNotNullExpressionValue(findItem10, "menu.findItem(R.id.menu_chat_search)");
             findItem10.setVisible(false);
-            MenuItem findItem11 = menu.findItem(2131364083);
+            MenuItem findItem11 = menu.findItem(R.id.menu_chat_side_panel);
             m.checkNotNullExpressionValue(findItem11, "menu.findItem(R.id.menu_chat_side_panel)");
             findItem11.setVisible(true);
-            MenuItem findItem12 = menu.findItem(2131364088);
+            MenuItem findItem12 = menu.findItem(R.id.menu_chat_thread_browser);
             m.checkNotNullExpressionValue(findItem12, "menu.findItem(R.id.menu_chat_thread_browser)");
             findItem12.setVisible(false);
         }
         boolean z4 = this.$this_getOnConfigureAction.getChannel() != null && AnimatableValueParser.t1(this.$this_getOnConfigureAction.getChannel());
-        MenuItem findItem13 = menu.findItem(2131364084);
+        MenuItem findItem13 = menu.findItem(R.id.menu_chat_start_call);
         m.checkNotNullExpressionValue(findItem13, "menu.findItem(R.id.menu_chat_start_call)");
         findItem13.setVisible(!this.$this_getOnConfigureAction.isCallConnected() && z4 && !z3);
-        MenuItem findItem14 = menu.findItem(2131364086);
+        MenuItem findItem14 = menu.findItem(R.id.menu_chat_start_video_call);
         m.checkNotNullExpressionValue(findItem14, "menu.findItem(R.id.menu_chat_start_video_call)");
         findItem14.setVisible(!this.$this_getOnConfigureAction.isCallConnected() && z4 && !z3);
-        MenuItem findItem15 = menu.findItem(2131364087);
+        MenuItem findItem15 = menu.findItem(R.id.menu_chat_stop_call);
         m.checkNotNullExpressionValue(findItem15, "menu.findItem(R.id.menu_chat_stop_call)");
         if (this.$this_getOnConfigureAction.isCallConnected() && !z3) {
             z2 = true;
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
index caa43180b4..9e671deb44 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.stores.StoreStream;
@@ -46,25 +47,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti
         m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager");
         PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager);
         switch (menuItem.getItemId()) {
-            case 2131364081:
+            case R.id.menu_chat_add_friend /* 2131364081 */:
                 WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null);
                 break;
-            case 2131364082:
+            case R.id.menu_chat_search /* 2131364082 */:
                 launchForSearch(context);
                 break;
-            case 2131364083:
+            case R.id.menu_chat_side_panel /* 2131364083 */:
                 this.$panelLayout.openEndPanel();
                 break;
-            case 2131364084:
+            case R.id.menu_chat_start_call /* 2131364084 */:
                 privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case 2131364085:
+            case R.id.menu_chat_start_group /* 2131364085 */:
                 ChannelInviteLaunchUtils.INSTANCE.inviteToChannel(this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar");
                 break;
-            case 2131364086:
+            case R.id.menu_chat_start_video_call /* 2131364086 */:
                 privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case 2131364087:
+            case R.id.menu_chat_stop_call /* 2131364087 */:
                 StoreStream.Companion.getVoiceChannelSelected().clear();
                 break;
         }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java
index 682458ce96..7c0b734c0c 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java
@@ -12,6 +12,7 @@ import androidx.core.view.ViewKt;
 import c.a.j.b5;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetHomeBinding;
@@ -156,8 +157,8 @@ public final class WidgetHomeHeaderManager {
         if (channel != null) {
             int threadCount = widgetHomeModel.getThreadCount();
             View view = null;
-            MenuItem findItem = (toolbar == null || (menu = toolbar.getMenu()) == null) ? null : menu.findItem(2131364088);
-            TextView textView = (findItem == null || (actionView2 = findItem.getActionView()) == null) ? null : (TextView) actionView2.findViewById(2131365491);
+            MenuItem findItem = (toolbar == null || (menu = toolbar.getMenu()) == null) ? null : menu.findItem(R.id.menu_chat_thread_browser);
+            TextView textView = (findItem == null || (actionView2 = findItem.getActionView()) == null) ? null : (TextView) actionView2.findViewById(R.id.thread_browser_count);
             if (textView != null) {
                 textView.setText(String.valueOf(Math.min(99, threadCount)));
             }
@@ -165,7 +166,7 @@ public final class WidgetHomeHeaderManager {
                 ViewKt.setVisible(textView, threadCount != 0);
             }
             if (!(findItem == null || (actionView = findItem.getActionView()) == null)) {
-                view = actionView.findViewById(2131365501);
+                view = actionView.findViewById(R.id.thread_browser_root);
             }
             if (view != null) {
                 view.setOnClickListener(new WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1(context, channel));
@@ -182,14 +183,14 @@ public final class WidgetHomeHeaderManager {
             Channel channel = widgetHomeModel.getChannel();
             Integer valueOf = channel != null ? Integer.valueOf(channel.A()) : null;
             if (valueOf == null) {
-                return new HeaderData(context.getString(2131887373), null, null, false, 10, null);
+                return new HeaderData(context.getString(R.string.channels_unavailable_title), null, null, false, 10, null);
             }
             if (valueOf.intValue() == 3) {
-                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231703, false, 10, null);
+                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, Integer.valueOf((int) R.drawable.ic_group_message_header), false, 10, null);
             } else if (valueOf.intValue() == 1) {
-                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231599, false, 10, null);
+                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, Integer.valueOf((int) R.drawable.ic_direct_message_header), false, 10, null);
             } else if (valueOf.intValue() == 14) {
-                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231747, false, 10, null);
+                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, Integer.valueOf((int) R.drawable.ic_hub_24dp), false, 10, null);
             } else if (widgetHomeModel.getChannel().h() <= 0) {
                 return new HeaderData(null, null, null, false, 10, null);
             } else {
@@ -207,7 +208,7 @@ public final class WidgetHomeHeaderManager {
         } else if (!(selectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft)) {
             return new HeaderData(null, null, null, false, 14, null);
         } else {
-            headerData = new HeaderData(context.getString(2131887987), AnimatableValueParser.z0(((StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) widgetHomeModel.getSelectedChannel()).getParentChannel(), context, false), null, true);
+            headerData = new HeaderData(context.getString(R.string.create_thread), AnimatableValueParser.z0(((StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) widgetHomeModel.getSelectedChannel()).getParentChannel(), context, false), null, true);
         }
         return headerData;
     }
@@ -253,12 +254,12 @@ public final class WidgetHomeHeaderManager {
             widgetHome.setActionBarSubtitle(component2);
             Toolbar toolbar = widgetHome.getToolbar();
             if (toolbar != null) {
-                toolbar.setNavigationIcon(ContextCompat.getDrawable(context, component4 ? DrawableCompat.getThemedDrawableRes$default(context, 2130969371, 0, 2, (Object) null) : 2131231783));
+                toolbar.setNavigationIcon(ContextCompat.getDrawable(context, component4 ? DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.ic_action_bar_back, 0, 2, (Object) null) : R.drawable.ic_menu_24dp));
             }
         }
         widgetHome.setActionBarTitleClick(new WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1(widgetHomeModel, widgetHome, widgetHomeModel, widgetHomeBinding));
         WidgetHomeHeaderManager widgetHomeHeaderManager2 = INSTANCE;
-        Toolbar actionBarOptionsMenu = widgetHome.setActionBarOptionsMenu(2131623943, widgetHomeHeaderManager2.getOnSelectedAction(widgetHomeModel, widgetHome, widgetHome.getPanelLayout()), widgetHomeHeaderManager2.getOnConfigureAction(widgetHomeModel));
+        Toolbar actionBarOptionsMenu = widgetHome.setActionBarOptionsMenu(R.menu.menu_chat_toolbar, widgetHomeHeaderManager2.getOnSelectedAction(widgetHomeModel, widgetHome, widgetHome.getPanelLayout()), widgetHomeHeaderManager2.getOnConfigureAction(widgetHomeModel));
         Channel channel2 = widgetHomeModel.getChannel();
         boolean z3 = channel2 != null && AnimatableValueParser.h1(channel2) && !AnimatableValueParser.y1(channel2);
         ToolbarTitleLayout actionBarTitleLayout = widgetHome.getActionBarTitleLayout();
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$2.java
index b0a3c3d2d5..4b32b48b9f 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.home;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetHomePanelNsfw$toggleContainerVisibility$2 extends o imp
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetHomePanelNsfw.access$setHidePanelSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
index 245a612b4f..fa1c9a1cea 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import c.a.e.f;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.user.NsfwAllowance;
 import com.discord.app.AppComponent;
 import com.discord.databinding.WidgetHomeBinding;
@@ -83,7 +84,7 @@ public final class WidgetHomePanelNsfw {
         FragmentManager fragmentManager = this.fragmentManager.get();
         if (fragmentManager != null) {
             m.checkNotNullExpressionValue(fragmentManager, "fragmentManager.get() ?: return");
-            Fragment findFragmentById = fragmentManager.findFragmentById(2131365882);
+            Fragment findFragmentById = fragmentManager.findFragmentById(R.id.widget_chat_list);
             if (findFragmentById != null) {
                 m.checkNotNullExpressionValue(findFragmentById, "fragmentManager.findFrag…dget_chat_list) ?: return");
                 FragmentTransaction beginTransaction = fragmentManager.beginTransaction();
@@ -132,7 +133,7 @@ public final class WidgetHomePanelNsfw {
         View inflate;
         boolean z4 = nsfwAllowance == NsfwAllowance.DISALLOWED;
         if (!z2 || (!z3 && !z4)) {
-            Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+            Observable<Long> d02 = Observable.d0(HIDE_DELAY_MILLIS, TimeUnit.MILLISECONDS);
             m.checkNotNullExpressionValue(d02, "Observable.timer(HIDE_DE…S, TimeUnit.MILLISECONDS)");
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this.appComponent, null, 2, null), WidgetHomePanelNsfw.class, (Context) null, new WidgetHomePanelNsfw$toggleContainerVisibility$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetHomePanelNsfw$toggleContainerVisibility$3(this), 58, (Object) null);
             return;
@@ -140,23 +141,23 @@ public final class WidgetHomePanelNsfw {
         ViewStub viewStub = this.stub;
         if (!(viewStub == null || (inflate = viewStub.inflate()) == null)) {
             this.stub = null;
-            int i = 2131363721;
-            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363721);
+            int i = R.id.home_panel_center_nsfw_anchor_wrap;
+            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.home_panel_center_nsfw_anchor_wrap);
             if (linearLayout != null) {
-                i = 2131363722;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131363722);
+                i = R.id.home_panel_center_nsfw_art;
+                ImageView imageView2 = (ImageView) inflate.findViewById(R.id.home_panel_center_nsfw_art);
                 if (imageView2 != null) {
-                    i = 2131363723;
-                    MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131363723);
+                    i = R.id.home_panel_center_nsfw_confirm;
+                    MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(R.id.home_panel_center_nsfw_confirm);
                     if (materialButton3 != null) {
-                        i = 2131363724;
-                        MaterialButton materialButton4 = (MaterialButton) inflate.findViewById(2131363724);
+                        i = R.id.home_panel_center_nsfw_deny;
+                        MaterialButton materialButton4 = (MaterialButton) inflate.findViewById(R.id.home_panel_center_nsfw_deny);
                         if (materialButton4 != null) {
-                            i = 2131363725;
-                            LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363725);
+                            i = R.id.home_panel_center_nsfw_description;
+                            LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(R.id.home_panel_center_nsfw_description);
                             if (linkifiedTextView3 != null) {
-                                i = 2131363726;
-                                TextView textView2 = (TextView) inflate.findViewById(2131363726);
+                                i = R.id.home_panel_center_nsfw_title;
+                                TextView textView2 = (TextView) inflate.findViewById(R.id.home_panel_center_nsfw_title);
                                 if (textView2 != null) {
                                     this.binding = new WidgetHomePanelCenterNsfwBinding((LinearLayout) inflate, linearLayout, imageView2, materialButton3, materialButton4, linkifiedTextView3, textView2);
                                     ViewCompat.setOnApplyWindowInsetsListener(inflate, WidgetHomePanelNsfw$toggleContainerVisibility$1$1.INSTANCE);
@@ -176,24 +177,24 @@ public final class WidgetHomePanelNsfw {
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding2 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding2 == null || (imageView = widgetHomePanelCenterNsfwBinding2.b) == null)) {
-                imageView.setImageResource(2131232164);
+                imageView.setImageResource(R.drawable.img_age_gate_failure);
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding3 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding3 == null || (materialButton = widgetHomePanelCenterNsfwBinding3.d) == null)) {
-                b.n(materialButton, 2131886813, new Object[0], null, 4);
+                b.n(materialButton, R.string.back, new Object[0], null, 4);
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding4 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding4 == null || (textView = widgetHomePanelCenterNsfwBinding4.f) == null)) {
-                b.n(textView, 2131886328, new Object[0], null, 4);
+                b.n(textView, R.string.age_gate_nsfw_underage_header, new Object[0], null, 4);
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding5 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding5 == null || (linkifiedTextView2 = widgetHomePanelCenterNsfwBinding5.e) == null)) {
-                b.n(linkifiedTextView2, 2131886327, new Object[]{f.a.a(115000084051L, "h_5206f3f2-0ee4-4380-b50a-25319e45bc7c")}, null, 4);
+                b.n(linkifiedTextView2, R.string.age_gate_nsfw_underage_body, new Object[]{f.a.a(115000084051L, "h_5206f3f2-0ee4-4380-b50a-25319e45bc7c")}, null, 4);
             }
         } else {
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding6 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding6 == null || (linkifiedTextView = widgetHomePanelCenterNsfwBinding6.e) == null)) {
-                b.n(linkifiedTextView, 2131886326, new Object[0], null, 4);
+                b.n(linkifiedTextView, R.string.age_gate_nsfw_description, new Object[0], null, 4);
             }
         }
         setContainerViewHidden(false);
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
index 6b6d93f700..f864b10537 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
@@ -4,6 +4,7 @@ import a0.a.a.b;
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.MainThread;
+import androidx.media.AudioAttributesCompat;
 import c.a.k.a;
 import c.d.b.a.a;
 import com.discord.api.utcdatetime.UtcDateTime;
@@ -28,6 +29,7 @@ import com.discord.widgets.channels.ChannelOnboardingManager;
 import com.discord.widgets.channels.ThreadOnboardingManager;
 import com.discord.widgets.settings.CustomProfilesEditingFeatureFlag;
 import com.discord.widgets.settings.profile.ProfileMarketingTooltip;
+import com.discord.widgets.settings.profile.WidgetSettingsUserProfile;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.lang.ref.WeakReference;
@@ -570,7 +572,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
     }
 
     public WidgetHomeViewModel() {
-        this(null, null, null, null, null, null, null, null, null, null, 1023, null);
+        this(null, null, null, null, null, null, null, null, null, null, AudioAttributesCompat.FLAG_ALL, null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -763,7 +765,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
                 String bannerColor = meUser.getBannerColor();
                 if (bannerColor == null || bannerColor.length() == 0) {
                     z2 = true;
-                    return !(!(panelState instanceof PanelState.d) && (panelState2 instanceof PanelState.c)) && this.tooltipManager.b(ProfileMarketingTooltip.INSTANCE, false) && since && this.customProfilesEditingFeatureFlag.isEnabled() && !this.sharedPreferences.getBoolean("USER_PROFILE_SETTINGS_VIEWED_CACHE_KEY", false) && z2;
+                    return !(!(panelState instanceof PanelState.d) && (panelState2 instanceof PanelState.c)) && this.tooltipManager.b(ProfileMarketingTooltip.INSTANCE, false) && since && this.customProfilesEditingFeatureFlag.isEnabled() && !this.sharedPreferences.getBoolean(WidgetSettingsUserProfile.USER_PROFILE_SETTINGS_VIEWED_CACHE_KEY, false) && z2;
                 }
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java b/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java
index 5f3eae866e..5c43170cbe 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.ViewDialogConfirmationBinding;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -42,17 +43,17 @@ public final class WidgetMainSurveyDialog extends AppDialog {
             m.checkNotNullParameter(str4, "surveyTitle");
             WidgetMainSurveyDialog widgetMainSurveyDialog = new WidgetMainSurveyDialog();
             Bundle bundle = new Bundle();
-            bundle.putString("extra_survey_id", str);
-            bundle.putString("extra_survey_url", str2);
-            bundle.putString("extra_survey_body", str3);
-            bundle.putString("extra_survey_title", str4);
+            bundle.putString(WidgetMainSurveyDialog.EXTRA_SURVEY_ID, str);
+            bundle.putString(WidgetMainSurveyDialog.EXTRA_SURVEY_URL, str2);
+            bundle.putString(WidgetMainSurveyDialog.EXTRA_SURVEY_BODY, str3);
+            bundle.putString(WidgetMainSurveyDialog.EXTRA_SURVEY_TITLE, str4);
             widgetMainSurveyDialog.setArguments(bundle);
             widgetMainSurveyDialog.show(fragmentManager, "WidgetMainSurveyDialog");
         }
     }
 
     public WidgetMainSurveyDialog() {
-        super(2131558757);
+        super(R.layout.view_dialog_confirmation);
     }
 
     private final ViewDialogConfirmationBinding getBinding() {
@@ -65,14 +66,14 @@ public final class WidgetMainSurveyDialog extends AppDialog {
         super.onViewBound(view);
         Bundle arguments = getArguments();
         String str = null;
-        String string = arguments != null ? arguments.getString("extra_survey_url") : null;
+        String string = arguments != null ? arguments.getString(EXTRA_SURVEY_URL) : null;
         Bundle arguments2 = getArguments();
-        String string2 = arguments2 != null ? arguments2.getString("extra_survey_body") : null;
+        String string2 = arguments2 != null ? arguments2.getString(EXTRA_SURVEY_BODY) : null;
         Bundle arguments3 = getArguments();
-        String string3 = arguments3 != null ? arguments3.getString("extra_survey_id") : null;
+        String string3 = arguments3 != null ? arguments3.getString(EXTRA_SURVEY_ID) : null;
         Bundle arguments4 = getArguments();
         if (arguments4 != null) {
-            str = arguments4.getString("extra_survey_title");
+            str = arguments4.getString(EXTRA_SURVEY_TITLE);
         }
         boolean z2 = false;
         if (!(string == null || string.length() == 0)) {
@@ -88,11 +89,11 @@ public final class WidgetMainSurveyDialog extends AppDialog {
                 textView2.setText(string2);
                 MaterialButton materialButton = getBinding().b;
                 m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationCancel");
-                materialButton.setText(getString(2131891763));
+                materialButton.setText(getString(R.string.no_thanks));
                 getBinding().b.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$1(this));
                 MaterialButton materialButton2 = getBinding().f1655c;
                 m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationConfirm");
-                materialButton2.setText(getString(2131892004));
+                materialButton2.setText(getString(R.string.okay));
                 getBinding().f1655c.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$2(this, string));
                 AnalyticsTracker.INSTANCE.surveyViewed(string3);
                 return;
diff --git a/app/src/main/java/com/discord/widgets/hubs/DiscordHubEmailViewModel.java b/app/src/main/java/com/discord/widgets/hubs/DiscordHubEmailViewModel.java
index d43e8aa564..495935d917 100644
--- a/app/src/main/java/com/discord/widgets/hubs/DiscordHubEmailViewModel.java
+++ b/app/src/main/java/com/discord/widgets/hubs/DiscordHubEmailViewModel.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.hubs;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.app.AppViewModel;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.utilities.Default;
@@ -47,7 +48,7 @@ public final class DiscordHubEmailViewModel extends AppViewModel<DiscordHubEmail
     }
 
     public final void submitEmail(String str) {
-        m.checkNotNullParameter(str, "email");
+        m.checkNotNullParameter(str, NotificationCompat.CATEGORY_EMAIL);
         RestCallStateKt.executeRequest(ObservableExtensionsKt.ui$default(this.restAPI.verifyEmail(new RestAPIParams.VerifyEmail(str)), this, null, 2, null), new DiscordHubEmailViewModel$submitEmail$1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$adapter$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$adapter$1.java
index 3cf7a0907d..04843b1655 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$adapter$1.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$adapter$1.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.DiscordHubAddServerListItemBinding;
 import com.discord.views.GuildView;
 import com.google.android.material.card.MaterialCardView;
@@ -47,15 +48,15 @@ public final class WidgetDiscordHubAddServer$adapter$1 extends o implements Func
     public final DiscordHubAddServerViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) {
         m.checkNotNullParameter(layoutInflater, "layoutInflater");
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = layoutInflater.inflate(2131558483, viewGroup, false);
-        int i = 2131362993;
-        GuildView guildView = (GuildView) inflate.findViewById(2131362993);
+        View inflate = layoutInflater.inflate(R.layout.discord_hub_add_server_list_item, viewGroup, false);
+        int i = R.id.discord_u_add_server_list_item_image;
+        GuildView guildView = (GuildView) inflate.findViewById(R.id.discord_u_add_server_list_item_image);
         if (guildView != null) {
-            i = 2131362994;
-            MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(2131362994);
+            i = R.id.discord_u_add_server_list_item_layout;
+            MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(R.id.discord_u_add_server_list_item_layout);
             if (materialCardView != null) {
-                i = 2131362995;
-                TextView textView = (TextView) inflate.findViewById(2131362995);
+                i = R.id.discord_u_add_server_list_item_text;
+                TextView textView = (TextView) inflate.findViewById(R.id.discord_u_add_server_list_item_text);
                 if (textView != null) {
                     DiscordHubAddServerListItemBinding discordHubAddServerListItemBinding = new DiscordHubAddServerListItemBinding((FrameLayout) inflate, guildView, materialCardView, textView);
                     m.checkNotNullExpressionValue(discordHubAddServerListItemBinding, "DiscordHubAddServerListI…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$binding$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$binding$2.java
index 9189e8a617..61ce0176ae 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.hubs;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetDiscordHubAddServerBinding;
 import com.discord.views.ScreenTitleView;
 import com.google.android.material.button.MaterialButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetDiscordHubAddServer$binding$2 extends k
 
     public final WidgetDiscordHubAddServerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362992;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362992);
+        int i = R.id.discord_u_add_server_create_server;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.discord_u_add_server_create_server);
         if (materialButton != null) {
-            i = 2131363710;
-            ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363710);
+            i = R.id.header;
+            ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.header);
             if (screenTitleView != null) {
-                i = 2131364624;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+                i = R.id.recycler_view;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
                 if (recyclerView != null) {
                     return new WidgetDiscordHubAddServerBinding((LinearLayout) view, materialButton, screenTitleView, recyclerView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$configureUI$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$configureUI$1.java
index 3fd2cd3eff..6de9c8b7cc 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer$configureUI$1.java
@@ -6,8 +6,10 @@ import android.view.View;
 import androidx.activity.result.ActivityResultLauncher;
 import c.a.e.l;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.widgets.guilds.create.CreateGuildTrigger;
 import com.discord.widgets.nux.GuildCreateArgs;
+import com.discord.widgets.nux.GuildTemplateAnalytics;
 import com.discord.widgets.nux.GuildTemplateArgs;
 import com.discord.widgets.nux.GuildTemplateTypes;
 import com.discord.widgets.nux.WidgetGuildTemplates;
@@ -30,10 +32,10 @@ public final class WidgetDiscordHubAddServer$configureUI$1 implements View.OnCli
             l lVar = l.g;
             ActivityResultLauncher<Intent> access$getLauncher$p = WidgetDiscordHubAddServer.access$getLauncher$p(this.this$0);
             CreateGuildTrigger createGuildTrigger = CreateGuildTrigger.DIRECTORY_CHANNEL;
-            String obj = b.h(context, 2131890421, new Object[]{this.$state.getGuildName()}, null, 4).toString();
-            String string = context.getString(2131890420);
+            String obj = b.h(context, R.string.hub_create_or_add_guild_title, new Object[]{this.$state.getGuildName()}, null, 4).toString();
+            String string = context.getString(R.string.hub_create_or_add_guild_subtitle);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…te_or_add_guild_subtitle)");
-            lVar.f(context, access$getLauncher$p, WidgetGuildTemplates.class, new GuildCreateArgs(false, "Create or Join Guild Modal", createGuildTrigger, new GuildTemplateArgs(obj, string, GuildTemplateTypes.INSTANCE.getHUB(), false, true), true));
+            lVar.f(context, access$getLauncher$p, WidgetGuildTemplates.class, new GuildCreateArgs(false, GuildTemplateAnalytics.IN_APP_LOCATION_TEMPLATE, createGuildTrigger, new GuildTemplateArgs(obj, string, GuildTemplateTypes.INSTANCE.getHUB(), false, true), true));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer.java
index 85888888d8..322ec8d8a2 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubAddServer.java
@@ -13,6 +13,7 @@ import c.a.e.g0;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetDiscordHubAddServerBinding;
 import com.discord.models.guild.Guild;
@@ -53,7 +54,7 @@ public final class WidgetDiscordHubAddServer extends AppFragment {
     }
 
     public WidgetDiscordHubAddServer() {
-        super(2131559019);
+        super(R.layout.widget_discord_hub_add_server);
         ActivityResultLauncher<Intent> registerForActivityResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new WidgetDiscordHubAddServer$launcher$1(this));
         m.checkNotNullExpressionValue(registerForActivityResult, "registerForActivityResul…istener(it.guildId) }\n  }");
         this.launcher = registerForActivityResult;
@@ -73,7 +74,7 @@ public final class WidgetDiscordHubAddServer extends AppFragment {
 
     private final void configureUI(DiscordHubAddServerState discordHubAddServerState) {
         this.adapter.setData(discordHubAddServerState.getGuilds());
-        getBinding().f1782c.setTitle(b.k(this, 2131890416, new Object[]{discordHubAddServerState.getGuildName()}, null, 4));
+        getBinding().f1782c.setTitle(b.k(this, R.string.hub_choose_guild_title, new Object[]{discordHubAddServerState.getGuildName()}, null, 4));
         getBinding().b.setOnClickListener(new WidgetDiscordHubAddServer$configureUI$1(this, discordHubAddServerState));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$binding$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$binding$2.java
index c463930036..4163bfcd02 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.hubs;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetDiscordHubDescriptionBinding;
 import com.discord.views.LoadingButton;
 import com.discord.views.ScreenTitleView;
@@ -20,17 +21,17 @@ public final /* synthetic */ class WidgetDiscordHubDescription$binding$2 extends
 
     public final WidgetDiscordHubDescriptionBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361926;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131361926);
+        int i = R.id.add_server;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.add_server);
         if (loadingButton != null) {
-            i = 2131362904;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131362904);
+            i = R.id.description;
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.description);
             if (textInputEditText != null) {
-                i = 2131362905;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362905);
+                i = R.id.description_layout;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.description_layout);
                 if (textInputLayout != null) {
-                    i = 2131363710;
-                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363710);
+                    i = R.id.header;
+                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.header);
                     if (screenTitleView != null) {
                         return new WidgetDiscordHubDescriptionBinding((LinearLayout) view, loadingButton, textInputEditText, textInputLayout, screenTitleView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$validationManager$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$validationManager$2.java
index 0421e28ceb..1ffe9a15ed 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription$validationManager$2.java
@@ -1,5 +1,7 @@
 package com.discord.widgets.hubs;
 
+import com.discord.R;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
 import com.discord.utilities.view.validators.ValidationManager;
@@ -22,6 +24,6 @@ public final class WidgetDiscordHubDescription$validationManager$2 extends o imp
     public final ValidationManager mo1invoke() {
         TextInputLayout textInputLayout = this.this$0.getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.descriptionLayout");
-        return new ValidationManager(new Input.TextInputLayoutInput("description", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131891386)));
+        return new ValidationManager(new Input.TextInputLayoutInput(ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION, textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.member_verification_form_required_item)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription.java
index 22cf5cd38b..7367e7d243 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubDescription.java
@@ -8,6 +8,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetDiscordHubDescriptionBinding;
 import com.discord.stores.utilities.Loading;
@@ -34,7 +35,7 @@ public final class WidgetDiscordHubDescription extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetDiscordHubDescription() {
-        super(2131559020);
+        super(R.layout.widget_discord_hub_description);
         WidgetDiscordHubDescription$viewModel$2 widgetDiscordHubDescription$viewModel$2 = new WidgetDiscordHubDescription$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetDiscordHubsDescriptionViewModel.class), new WidgetDiscordHubDescription$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetDiscordHubDescription$viewModel$2));
@@ -53,11 +54,11 @@ public final class WidgetDiscordHubDescription extends AppFragment {
         Context context = getContext();
         if (context != null) {
             m.checkNotNullExpressionValue(context, "context ?: return");
-            getBinding().e.setTitle(b.k(this, getArgs().isEditing() ? 2131890463 : 2131890426, new Object[]{hubDescriptionState.getGuildName()}, null, 4));
+            getBinding().e.setTitle(b.k(this, getArgs().isEditing() ? R.string.hub_entry_update_description_title : R.string.hub_customize_existing_guild_title, new Object[]{hubDescriptionState.getGuildName()}, null, 4));
             LoadingButton loadingButton = getBinding().b;
             loadingButton.setOnClickListener(new WidgetDiscordHubDescription$configureUI$$inlined$apply$lambda$1(this, hubDescriptionState));
             loadingButton.setIsLoading(hubDescriptionState.getAddServerAsync() instanceof Loading);
-            loadingButton.setText(getString(getArgs().isEditing() ? 2131893352 : 2131890410));
+            loadingButton.setText(getString(getArgs().isEditing() ? R.string.save : R.string.hub_add_server_cta));
             RestCallStateKt.handleResponse$default(hubDescriptionState.getAddServerAsync(), context, null, null, new WidgetDiscordHubDescription$configureUI$2(this), 6, null);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java
index 8f9f04df5e..032a02d33e 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$binding$2.java
@@ -8,6 +8,7 @@ import androidx.core.widget.NestedScrollView;
 import c.a.j.u4;
 import c.a.j.v4;
 import c.a.j.w4;
+import com.discord.R;
 import com.discord.databinding.WidgetDiscordHubEmailFlowBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.LoadingButton;
@@ -27,57 +28,57 @@ public final /* synthetic */ class WidgetDiscordHubEmailFlow$binding$2 extends k
 
     public final WidgetDiscordHubEmailFlowBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362977;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362977);
+        int i = R.id.discord_hub_email_button_layout;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.discord_hub_email_button_layout);
         if (linearLayout != null) {
-            i = 2131362978;
-            View findViewById = view.findViewById(2131362978);
+            i = R.id.discord_hub_email_confirmation;
+            View findViewById = view.findViewById(R.id.discord_hub_email_confirmation);
             if (findViewById != null) {
-                int i2 = 2131362979;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131362979);
+                int i2 = R.id.discord_hub_email_confirmation_different;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(R.id.discord_hub_email_confirmation_different);
                 if (linkifiedTextView != null) {
-                    i2 = 2131362980;
-                    TextView textView = (TextView) findViewById.findViewById(2131362980);
+                    i2 = R.id.discord_hub_email_confirmation_header_title;
+                    TextView textView = (TextView) findViewById.findViewById(R.id.discord_hub_email_confirmation_header_title);
                     if (textView != null) {
-                        i2 = 2131362981;
-                        LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById.findViewById(2131362981);
+                        i2 = R.id.discord_hub_email_confirmation_resend;
+                        LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById.findViewById(R.id.discord_hub_email_confirmation_resend);
                         if (linkifiedTextView2 != null) {
                             u4 u4Var = new u4((NestedScrollView) findViewById, linkifiedTextView, textView, linkifiedTextView2);
-                            View findViewById2 = view.findViewById(2131362987);
+                            View findViewById2 = view.findViewById(R.id.discord_hub_email_input);
                             if (findViewById2 != null) {
-                                int i3 = 2131362982;
-                                LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById2.findViewById(2131362982);
+                                int i3 = R.id.discord_hub_email_header_description;
+                                LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById2.findViewById(R.id.discord_hub_email_header_description);
                                 if (linkifiedTextView3 != null) {
-                                    i3 = 2131362983;
-                                    TextInputEditText textInputEditText = (TextInputEditText) findViewById2.findViewById(2131362983);
+                                    i3 = R.id.discord_hub_email_header_description_email_input;
+                                    TextInputEditText textInputEditText = (TextInputEditText) findViewById2.findViewById(R.id.discord_hub_email_header_description_email_input);
                                     if (textInputEditText != null) {
-                                        i3 = 2131362984;
-                                        TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(2131362984);
+                                        i3 = R.id.discord_hub_email_header_description_email_input_layout;
+                                        TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(R.id.discord_hub_email_header_description_email_input_layout);
                                         if (textInputLayout != null) {
-                                            i3 = 2131362985;
-                                            ImageView imageView = (ImageView) findViewById2.findViewById(2131362985);
+                                            i3 = R.id.discord_hub_email_header_image;
+                                            ImageView imageView = (ImageView) findViewById2.findViewById(R.id.discord_hub_email_header_image);
                                             if (imageView != null) {
-                                                i3 = 2131362986;
-                                                TextView textView2 = (TextView) findViewById2.findViewById(2131362986);
+                                                i3 = R.id.discord_hub_email_header_title;
+                                                TextView textView2 = (TextView) findViewById2.findViewById(R.id.discord_hub_email_header_title);
                                                 if (textView2 != null) {
-                                                    i3 = 2131362988;
-                                                    TextView textView3 = (TextView) findViewById2.findViewById(2131362988);
+                                                    i3 = R.id.discord_hub_email_label;
+                                                    TextView textView3 = (TextView) findViewById2.findViewById(R.id.discord_hub_email_label);
                                                     if (textView3 != null) {
                                                         v4 v4Var = new v4((NestedScrollView) findViewById2, linkifiedTextView3, textInputEditText, textInputLayout, imageView, textView2, textView3);
-                                                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362989);
+                                                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.discord_hub_email_no);
                                                         if (materialButton != null) {
-                                                            LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362990);
+                                                            LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.discord_hub_email_yes);
                                                             if (loadingButton != null) {
-                                                                View findViewById3 = view.findViewById(2131362991);
+                                                                View findViewById3 = view.findViewById(R.id.discord_hub_waitlist);
                                                                 if (findViewById3 != null) {
                                                                     return new WidgetDiscordHubEmailFlowBinding((LinearLayout) view, linearLayout, u4Var, v4Var, materialButton, loadingButton, new w4((NestedScrollView) findViewById3));
                                                                 }
-                                                                i = 2131362991;
+                                                                i = R.id.discord_hub_waitlist;
                                                             } else {
-                                                                i = 2131362990;
+                                                                i = R.id.discord_hub_email_yes;
                                                             }
                                                         } else {
-                                                            i = 2131362989;
+                                                            i = R.id.discord_hub_email_no;
                                                         }
                                                     }
                                                 }
@@ -87,7 +88,7 @@ public final /* synthetic */ class WidgetDiscordHubEmailFlow$binding$2 extends k
                                 }
                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i3)));
                             }
-                            i = 2131362987;
+                            i = R.id.discord_hub_email_input;
                         }
                     }
                 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$onViewCreated$learnMore$1.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$onViewCreated$learnMore$1.java
index aec97291d6..aa1fa18c0f 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$onViewCreated$learnMore$1.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow$onViewCreated$learnMore$1.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.z.a0;
 import c.a.z.b0;
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -37,9 +38,9 @@ public final class WidgetDiscordHubEmailFlow$onViewCreated$learnMore$1 extends o
             a0.a aVar = a0.j;
             FragmentManager childFragmentManager = this.this$0.this$0.getChildFragmentManager();
             m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
-            String string = this.this$0.this$0.getString(2131890458);
+            String string = this.this$0.this$0.getString(R.string.hub_email_connection_sidebar_learn_more_header);
             m.checkNotNullExpressionValue(string, "getString(R.string.hub_e…idebar_learn_more_header)");
-            a0.a.b(aVar, childFragmentManager, string, d0.t.m.listOf(new b0(null, this.this$0.this$0.getString(2131890456), null, null, null, null, null, 125)), false, null, 16);
+            a0.a.b(aVar, childFragmentManager, string, d0.t.m.listOf(new b0(null, this.this$0.this$0.getString(R.string.hub_email_connection_sidebar_description), null, null, null, null, null, 125)), false, null, 16);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java
index 6620c98c13..3d44437ee5 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubEmailFlow.java
@@ -15,6 +15,7 @@ import c.a.j.v4;
 import c.a.j.w4;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.hubs.EmailVerification;
 import com.discord.app.AppFragment;
 import com.discord.app.LoggingConfig;
@@ -48,7 +49,7 @@ public final class WidgetDiscordHubEmailFlow extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetDiscordHubEmailFlow() {
-        super(2131559022);
+        super(R.layout.widget_discord_hub_email_flow);
         WidgetDiscordHubEmailFlow$viewModel$2 widgetDiscordHubEmailFlow$viewModel$2 = WidgetDiscordHubEmailFlow$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(DiscordHubEmailViewModel.class), new WidgetDiscordHubEmailFlow$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetDiscordHubEmailFlow$viewModel$2));
@@ -116,7 +117,7 @@ public final class WidgetDiscordHubEmailFlow extends AppFragment {
             nestedScrollView2.setVisibility(z2 ? 0 : 8);
             TextView textView = getBinding().b.f173c;
             m.checkNotNullExpressionValue(textView, "binding.discordHubEmailC…ilConfirmationHeaderTitle");
-            textView.setText(b.k(this, 2131891363, new Object[]{valueOf}, null, 4));
+            textView.setText(b.k(this, R.string.member_verification_email_confirmation_title, new Object[]{valueOf}, null, 4));
             w4 w4Var = getBinding().f;
             m.checkNotNullExpressionValue(w4Var, "binding.discordHubWaitlist");
             NestedScrollView nestedScrollView3 = w4Var.a;
@@ -130,7 +131,7 @@ public final class WidgetDiscordHubEmailFlow extends AppFragment {
             }
             loadingButton.setVisibility(i);
             getBinding().e.setIsLoading(discordHubEmailState.getVerifyEmailAsync() instanceof Loading);
-            getBinding().e.setText(z4 ? getString(2131890408) : getString(2131890447));
+            getBinding().e.setText(z4 ? getString(R.string.hub_add_server_confirmation_button) : getString(R.string.hub_email_connection_content_button));
             RestCallStateKt.handleResponse$default(discordHubEmailState.getVerifyEmailAsync(), context, null, null, WidgetDiscordHubEmailFlow$updateView$3.INSTANCE, 6, null);
         }
     }
@@ -172,14 +173,14 @@ public final class WidgetDiscordHubEmailFlow extends AppFragment {
         if (getArgs().getHasInvitee()) {
             Context context = view.getContext();
             m.checkNotNullExpressionValue(context, "view.context");
-            charSequence = b.k(this, 2131890454, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755196, getArgs().getGuildMemberCount(), Integer.valueOf(getArgs().getGuildMemberCount())), getArgs().getGuildName()}, null, 4);
+            charSequence = b.k(this, R.string.hub_email_connection_invite_header, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, R.plurals.hub_email_connection_invite_header_count, getArgs().getGuildMemberCount(), Integer.valueOf(getArgs().getGuildMemberCount())), getArgs().getGuildName()}, null, 4);
         } else {
-            charSequence = getString(2131890481);
+            charSequence = getString(R.string.hub_waitlist_modal_join_header);
         }
         textView.setText(charSequence);
-        String string = getString(getArgs().getHasInvitee() ? 2131890449 : 2131890482);
+        String string = getString(getArgs().getHasInvitee() ? R.string.hub_email_connection_content_description : R.string.hub_waitlist_modal_join_subheader);
         m.checkNotNullExpressionValue(string, "getString(\n        if (a…subheader\n        }\n    )");
-        CharSequence e = b.e(this, 2131891092, new Object[0], new WidgetDiscordHubEmailFlow$onViewCreated$learnMore$1(this));
+        CharSequence e = b.e(this, R.string.learn_more_link, new Object[0], new WidgetDiscordHubEmailFlow$onViewCreated$learnMore$1(this));
         LinkifiedTextView linkifiedTextView = getBinding().f1784c.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.discordHubEmailI…HubEmailHeaderDescription");
         linkifiedTextView.setText(new SpannableStringBuilder(string).append((CharSequence) " ").append(e));
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubsDescriptionViewModel.java b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubsDescriptionViewModel.java
index 19b7f095af..eb948f0c4d 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubsDescriptionViewModel.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetDiscordHubsDescriptionViewModel.java
@@ -2,6 +2,7 @@ package com.discord.widgets.hubs;
 
 import android.content.Context;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreStream;
@@ -82,7 +83,7 @@ public final class WidgetDiscordHubsDescriptionViewModel extends AppViewModel<Hu
     }
 
     public final void addServer(long j, long j2, String str) {
-        m.checkNotNullParameter(str, "description");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_DESCRIPTION);
         HubDescriptionState viewState = getViewState();
         if (viewState != null) {
             RestCallStateKt.executeRequest(this.isEditing ? this.restAPI.modifyServerInHub(j, j2, new RestAPIParams.AddServerBody(str)) : this.restAPI.addServerToHub(j, j2, new RestAPIParams.AddServerBody(str)), new WidgetDiscordHubsDescriptionViewModel$addServer$1(this, viewState));
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$binding$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$binding$2.java
index 28a929bfed..4c94852843 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.hubs;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetHubAddNameBinding;
 import com.discord.views.GuildView;
 import com.discord.views.LoadingButton;
@@ -21,20 +22,20 @@ public final /* synthetic */ class WidgetHubAddName$binding$2 extends k implemen
 
     public final WidgetHubAddNameBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362972;
-        GuildView guildView = (GuildView) view.findViewById(2131362972);
+        int i = R.id.discord_hub_add_name_image;
+        GuildView guildView = (GuildView) view.findViewById(R.id.discord_hub_add_name_image);
         if (guildView != null) {
-            i = 2131362973;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131362973);
+            i = R.id.discord_hub_add_name_input;
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.discord_hub_add_name_input);
             if (textInputEditText != null) {
-                i = 2131362974;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362974);
+                i = R.id.discord_hub_add_name_input_layout;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.discord_hub_add_name_input_layout);
                 if (textInputLayout != null) {
-                    i = 2131362975;
-                    TextView textView = (TextView) view.findViewById(2131362975);
+                    i = R.id.discord_hub_add_name_title;
+                    TextView textView = (TextView) view.findViewById(R.id.discord_hub_add_name_title);
                     if (textView != null) {
-                        i = 2131362976;
-                        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362976);
+                        i = R.id.discord_hub_add_name_title_button;
+                        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.discord_hub_add_name_title_button);
                         if (loadingButton != null) {
                             return new WidgetHubAddNameBinding((LinearLayout) view, guildView, textInputEditText, textInputLayout, textView, loadingButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$validationManager$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$validationManager$2.java
index 92b1de1552..da716b2cff 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName$validationManager$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.hubs;
 
+import com.discord.R;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
 import com.discord.utilities.view.validators.ValidationManager;
@@ -22,6 +23,6 @@ public final class WidgetHubAddName$validationManager$2 extends o implements Fun
     public final ValidationManager mo1invoke() {
         TextInputLayout textInputLayout = this.this$0.getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.discordHubAddNameInputLayout");
-        return new ValidationManager(new Input.TextInputLayoutInput("binding.discordHubAddNameInputLayout", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131891386)));
+        return new ValidationManager(new Input.TextInputLayoutInput("binding.discordHubAddNameInputLayout", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.member_verification_form_required_item)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java
index 0a0fac1743..8a301d7cb6 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java
@@ -9,6 +9,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetHubAddNameBinding;
 import com.discord.models.guild.Guild;
@@ -36,7 +37,7 @@ public final class WidgetHubAddName extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetHubAddName() {
-        super(2131559124);
+        super(R.layout.widget_hub_add_name);
         WidgetHubAddName$viewModel$2 widgetHubAddName$viewModel$2 = new WidgetHubAddName$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetHubAddNameViewModel.class), new WidgetHubAddName$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetHubAddName$viewModel$2));
@@ -64,7 +65,7 @@ public final class WidgetHubAddName extends AppFragment {
             Object[] objArr = new Object[1];
             Guild guild = addNameState.getGuild();
             objArr[0] = guild != null ? guild.getName() : null;
-            textView.setText(b.k(this, 2131890471, objArr, null, 4));
+            textView.setText(b.k(this, R.string.hub_real_name_modal_header, objArr, null, 4));
             Guild guild2 = addNameState.getGuild();
             if (guild2 != null) {
                 getBinding().b.a(guild2.getShortName(), IconUtils.getForGuild$default(addNameState.getGuild(), null, false, null, 14, null));
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddNameViewModel.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddNameViewModel.java
index 7f9f9357a9..3eefc5102e 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddNameViewModel.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddNameViewModel.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.hubs;
 
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.restapi.RestAPIParams;
@@ -64,7 +65,7 @@ public final class WidgetHubAddNameViewModel extends AppViewModel<AddNameState>
     }
 
     public final void setName(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         AddNameState viewState = getViewState();
         if (viewState != null) {
             updateViewState(AddNameState.copy$default(viewState, str, null, null, 6, null));
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog$binding$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog$binding$2.java
index c0b140e746..29e93c72f8 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.hubs;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.HubAddServerConfirmationDialogBinding;
 import com.discord.views.GuildView;
 import com.google.android.material.button.MaterialButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetHubAddServerConfirmationDialog$binding$
 
     public final HubAddServerConfirmationDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361927;
-        TextView textView = (TextView) view.findViewById(2131361927);
+        int i = R.id.add_server_confirmation_dialog_description;
+        TextView textView = (TextView) view.findViewById(R.id.add_server_confirmation_dialog_description);
         if (textView != null) {
-            i = 2131361928;
-            GuildView guildView = (GuildView) view.findViewById(2131361928);
+            i = R.id.add_server_confirmation_dialog_image;
+            GuildView guildView = (GuildView) view.findViewById(R.id.add_server_confirmation_dialog_image);
             if (guildView != null) {
-                i = 2131361929;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131361929);
+                i = R.id.add_server_confirmation_dialog_positive;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.add_server_confirmation_dialog_positive);
                 if (materialButton != null) {
                     return new HubAddServerConfirmationDialogBinding((LinearLayout) view, textView, guildView, materialButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog.java
index 4cfbfb01e6..8bf2ff4de5 100644
--- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog.java
+++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServerConfirmationDialog.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.HubAddServerConfirmationDialogBinding;
 import com.discord.models.guild.Guild;
@@ -47,7 +48,7 @@ public final class WidgetHubAddServerConfirmationDialog extends AppDialog {
     }
 
     public WidgetHubAddServerConfirmationDialog() {
-        super(2131558526);
+        super(R.layout.hub_add_server_confirmation_dialog);
     }
 
     private final AddServerConfirmationArgs getArgs() {
@@ -67,7 +68,7 @@ public final class WidgetHubAddServerConfirmationDialog extends AppDialog {
         m.checkNotNullExpressionValue(textView, "binding.addServerConfirmationDialogDescription");
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        b.a(textView, b.h(requireContext, 2131890409, new Object[]{getArgs().getHubName()}, null, 4));
+        b.a(textView, b.h(requireContext, R.string.hub_add_server_confirmation_subtitle, new Object[]{getArgs().getHubName()}, null, 4));
         getBinding().f1614c.b();
         Guild guild = StoreStream.Companion.getGuilds().getGuild(getArgs().getGuildId());
         if (guild != null) {
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java
index c3d38aca34..f34d3daa6b 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.media;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
+import com.discord.R;
 import com.discord.databinding.WidgetMediaBinding;
 import com.facebook.samples.zoomable.ZoomableDraweeView;
 import com.google.android.exoplayer2.ui.PlayerControlView;
@@ -21,21 +22,21 @@ public final /* synthetic */ class WidgetMedia$binding$2 extends k implements Fu
 
     public final WidgetMediaBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361872;
-        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131361872);
+        int i = R.id.action_bar_toolbar_layout;
+        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.action_bar_toolbar_layout);
         if (appBarLayout != null) {
             FrameLayout frameLayout = (FrameLayout) view;
-            i = 2131364028;
-            ZoomableDraweeView zoomableDraweeView = (ZoomableDraweeView) view.findViewById(2131364028);
+            i = R.id.media_image;
+            ZoomableDraweeView zoomableDraweeView = (ZoomableDraweeView) view.findViewById(R.id.media_image);
             if (zoomableDraweeView != null) {
-                i = 2131364029;
-                ProgressBar progressBar = (ProgressBar) view.findViewById(2131364029);
+                i = R.id.media_loading_indicator;
+                ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.media_loading_indicator);
                 if (progressBar != null) {
-                    i = 2131364030;
-                    PlayerControlView playerControlView = (PlayerControlView) view.findViewById(2131364030);
+                    i = R.id.media_player_control_view;
+                    PlayerControlView playerControlView = (PlayerControlView) view.findViewById(R.id.media_player_control_view);
                     if (playerControlView != null) {
-                        i = 2131364031;
-                        PlayerView playerView = (PlayerView) view.findViewById(2131364031);
+                        i = R.id.media_player_view;
+                        PlayerView playerView = (PlayerView) view.findViewById(R.id.media_player_view);
                         if (playerView != null) {
                             return new WidgetMediaBinding(frameLayout, appBarLayout, frameLayout, zoomableDraweeView, progressBar, playerControlView, playerView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.java
index 06c2d503c6..4290956364 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$configureMediaImage$1.java
@@ -4,8 +4,8 @@ import android.graphics.PointF;
 import android.graphics.RectF;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
+import c.a.r.n0.c.e;
 import c.f.l.b.a;
-import c.f.l.b.e;
 import com.facebook.samples.zoomable.ZoomableDraweeView;
 import d0.z.d.m;
 import java.util.Objects;
@@ -53,10 +53,10 @@ public final class WidgetMedia$configureMediaImage$1 extends GestureDetector.Sim
 
     @Override // android.view.GestureDetector.SimpleOnGestureListener, android.view.GestureDetector.OnDoubleTapListener
     public boolean onDoubleTapEvent(MotionEvent motionEvent) {
-        m.checkNotNullParameter(motionEvent, "e");
+        m.checkNotNullParameter(motionEvent, e.a);
         ZoomableDraweeView zoomableDraweeView = WidgetMedia.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(zoomableDraweeView, "binding.mediaImage");
-        e zoomableController = zoomableDraweeView.getZoomableController();
+        c.f.l.b.e zoomableController = zoomableDraweeView.getZoomableController();
         Objects.requireNonNull(zoomableController, "null cannot be cast to non-null type com.facebook.samples.zoomable.AbstractAnimatedZoomableController");
         a aVar = (a) zoomableController;
         PointF pointF = new PointF(motionEvent.getX(), motionEvent.getY());
@@ -106,7 +106,7 @@ public final class WidgetMedia$configureMediaImage$1 extends GestureDetector.Sim
 
     @Override // android.view.GestureDetector.SimpleOnGestureListener, android.view.GestureDetector.OnDoubleTapListener
     public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
-        m.checkNotNullParameter(motionEvent, "e");
+        m.checkNotNullParameter(motionEvent, e.a);
         WidgetMedia.access$onMediaClick(this.this$0);
         return true;
     }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.java
index 6a7fe1dd3e..7b458d098d 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.media;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.player.AppMediaPlayer;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1 exten
     }
 
     public final void invoke(AppMediaPlayer.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetMedia.access$handlePlayerEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
index 9d13cfd752..6f3f495433 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.net.Uri;
 import android.view.MenuItem;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.intent.IntentUtils;
 import com.discord.utilities.io.NetworkUtils;
 import com.discord.utilities.uri.UriHandler;
@@ -53,7 +54,7 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
                     WidgetMedia widgetMedia = r0.this$0.this$0;
                     Context context = r0.$context;
                     m.checkNotNullExpressionValue(context, "context");
-                    c.a.e.o.j(widgetMedia, b.h(context, 2131888216, new Object[]{str}, null, 4), 0, 4);
+                    c.a.e.o.j(widgetMedia, b.h(context, R.string.download_file_complete, new Object[]{str}, null, 4), 0, 4);
                 }
             }
         }
@@ -81,7 +82,7 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
                 m.checkNotNullParameter(th, "it");
                 if (this.this$0.this$0.this$0.isAdded()) {
                     WidgetMedia widgetMedia = this.this$0.this$0.this$0;
-                    c.a.e.o.j(widgetMedia, widgetMedia.getString(2131888215), 0, 4);
+                    c.a.e.o.j(widgetMedia, widgetMedia.getString(R.string.download_failed), 0, 4);
                 }
             }
         }
@@ -115,16 +116,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364104:
+            case R.id.menu_media_browser /* 2131364104 */:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri, "sourceUri.toString()");
                 UriHandler.handleOrUntrusted$default(context, uri, null, 4, null);
                 return;
-            case 2131364105:
+            case R.id.menu_media_download /* 2131364105 */:
                 this.this$0.requestMediaDownload(new AnonymousClass1(this, context));
                 return;
-            case 2131364106:
+            case R.id.menu_media_share /* 2131364106 */:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri2 = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri2, "sourceUri.toString()");
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$showControls$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$showControls$1.java
index 627789bc1e..f21fa122b1 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$showControls$1.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$showControls$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.media;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetMedia$showControls$1 extends o implements Function1<Sub
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetMedia.access$setControlsVisibilitySubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
index aeb4410e3e..c3d57f2796 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
@@ -18,6 +18,7 @@ import c.a.q.i;
 import c.d.b.a.a;
 import c.f.g.e.v;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.attachment.MessageAttachmentType;
 import com.discord.api.message.embed.EmbedType;
@@ -108,11 +109,11 @@ public final class WidgetMedia extends AppFragment {
 
         private final void launch(Context context, String str, String str2, String str3, String str4, Integer num, Integer num2, MediaType mediaType) {
             MediaSource R = (str3 == null || mediaType == null) ? null : AnimatableValueParser.R(mediaType, str3, "javaClass");
-            Intent putExtra = new Intent().putExtra("INTENT_TITLE", str);
+            Intent putExtra = new Intent().putExtra(WidgetMedia.INTENT_TITLE, str);
             if (str2 == null) {
                 str2 = str4;
             }
-            Intent putExtra2 = putExtra.putExtra("INTENT_MEDIA_URL", str2).putExtra("INTENT_IMAGE_URL", str4).putExtra("INTENT_MEDIA_WIDTH", num).putExtra("INTENT_MEDIA_HEIGHT", num2).putExtra("INTENT_MEDIA_SOURCE", R);
+            Intent putExtra2 = putExtra.putExtra(WidgetMedia.INTENT_URL, str2).putExtra(WidgetMedia.INTENT_IMAGE_URL, str4).putExtra(WidgetMedia.INTENT_WIDTH, num).putExtra(WidgetMedia.INTENT_HEIGHT, num2).putExtra(WidgetMedia.INTENT_MEDIA_SOURCE, R);
             m.checkNotNullExpressionValue(putExtra2, "Intent()\n          .putE…EDIA_SOURCE, mediaSource)");
             l.d(context, WidgetMedia.class, putExtra2);
         }
@@ -193,7 +194,7 @@ public final class WidgetMedia extends AppFragment {
     }
 
     public WidgetMedia() {
-        super(2131559134);
+        super(R.layout.widget_media);
         WidgetMedia$viewModel$2 widgetMedia$viewModel$2 = WidgetMedia$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetMediaViewModel.class), new WidgetMedia$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMedia$viewModel$2));
@@ -261,7 +262,7 @@ public final class WidgetMedia extends AppFragment {
 
     private final void configureAndStartControlsAnimation(ValueAnimator valueAnimator) {
         valueAnimator.setInterpolator(new FastOutSlowInInterpolator());
-        valueAnimator.setDuration(200L);
+        valueAnimator.setDuration(VERTICAL_CONTROLS_ANIMATION_DURATION_MS);
         valueAnimator.addUpdateListener(new WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$1(this));
         valueAnimator.addListener(new WidgetMedia$configureAndStartControlsAnimation$$inlined$apply$lambda$2(this));
         valueAnimator.start();
@@ -295,7 +296,7 @@ public final class WidgetMedia extends AppFragment {
 
     private final String getFormattedUrl(Context context, Uri uri) {
         String str;
-        Rect resizeToFitScreen = DisplayUtils.resizeToFitScreen(context, new Rect(0, 0, getMostRecentIntent().getIntExtra("INTENT_MEDIA_WIDTH", 0), getMostRecentIntent().getIntExtra("INTENT_MEDIA_HEIGHT", 0)));
+        Rect resizeToFitScreen = DisplayUtils.resizeToFitScreen(context, new Rect(0, 0, getMostRecentIntent().getIntExtra(INTENT_WIDTH, 0), getMostRecentIntent().getIntExtra(INTENT_HEIGHT, 0)));
         String lastPathSegment = uri.getLastPathSegment();
         if (lastPathSegment == null || !t.endsWith$default(lastPathSegment, ".gif", false, 2, null)) {
             StringBuilder K = a.K("&format=");
@@ -399,7 +400,7 @@ public final class WidgetMedia extends AppFragment {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            Observable<Long> d02 = Observable.d0(3000, TimeUnit.MILLISECONDS);
+            Observable<Long> d02 = Observable.d0(SHOW_CONTROLS_TIMEOUT_MS, TimeUnit.MILLISECONDS);
             m.checkNotNullExpressionValue(d02, "Observable.timer(SHOW_CO…S, TimeUnit.MILLISECONDS)");
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetMedia.class, (Context) null, new WidgetMedia$showControls$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$showControls$2(this), 58, (Object) null);
         } else {
@@ -458,8 +459,8 @@ public final class WidgetMedia extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         this.appMediaPlayer = i.a(requireContext());
-        ColorCompat.getThemedColor(this, 2130969913);
-        ColorCompat.setStatusBarColor$default((Fragment) this, ColorCompat.getThemedColor(this, 2130969913), false, 4, (Object) null);
+        ColorCompat.getThemedColor(this, (int) R.attr.primary_900);
+        ColorCompat.setStatusBarColor$default((Fragment) this, ColorCompat.getThemedColor(this, (int) R.attr.primary_900), false, 4, (Object) null);
         PlayerView playerView = getBinding().g;
         m.checkNotNullExpressionValue(playerView, "binding.mediaPlayerView");
         View videoSurfaceView = playerView.getVideoSurfaceView();
@@ -492,11 +493,11 @@ public final class WidgetMedia extends AppFragment {
             i = 0;
         }
         progressBar.setVisibility(i);
-        Uri parse = Uri.parse(getMostRecentIntent().getStringExtra("INTENT_MEDIA_URL"));
-        Uri parse2 = Uri.parse(getMostRecentIntent().getStringExtra("INTENT_IMAGE_URL"));
+        Uri parse = Uri.parse(getMostRecentIntent().getStringExtra(INTENT_URL));
+        Uri parse2 = Uri.parse(getMostRecentIntent().getStringExtra(INTENT_IMAGE_URL));
         m.checkNotNullExpressionValue(parse2, "Uri.parse(mostRecentInte…gExtra(INTENT_IMAGE_URL))");
         this.imageUri = parse2;
-        Parcelable parcelableExtra = getMostRecentIntent().getParcelableExtra("INTENT_MEDIA_SOURCE");
+        Parcelable parcelableExtra = getMostRecentIntent().getParcelableExtra(INTENT_MEDIA_SOURCE);
         if (!(parcelableExtra instanceof MediaSource)) {
             parcelableExtra = null;
         }
@@ -512,7 +513,7 @@ public final class WidgetMedia extends AppFragment {
                 m.throwUninitializedPropertyAccessException("imageUri");
             }
         }
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_TITLE");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_TITLE);
         if (stringExtra == null || t.isBlank(stringExtra)) {
             String uri4 = parse.toString();
             m.checkNotNullExpressionValue(uri4, "sourceUri.toString()");
@@ -521,9 +522,9 @@ public final class WidgetMedia extends AppFragment {
             str = stringExtra;
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131894972);
+        setActionBarTitle(R.string.view_embed);
         setActionBarSubtitle(str);
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623956, new WidgetMedia$onViewBoundOrOnResume$1(this, parse, uri, stringExtra, str), null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_media, new WidgetMedia$onViewBoundOrOnResume$1(this, parse, uri, stringExtra, str), null, 4, null);
         configureMediaImage();
         showControls();
         this.playerPausedByFragmentLifecycle = false;
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java
index 4f09c294e9..04ac88ee14 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.media;
 
 import android.view.View;
 import android.widget.FrameLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetQrScannerBinding;
 import com.google.android.material.chip.Chip;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetQRScanner$binding$2 extends k implement
 
     public final WidgetQrScannerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364610;
-        ZXingScannerView zXingScannerView = (ZXingScannerView) view.findViewById(2131364610);
+        int i = R.id.qr_scanner;
+        ZXingScannerView zXingScannerView = (ZXingScannerView) view.findViewById(R.id.qr_scanner);
         if (zXingScannerView != null) {
-            i = 2131364611;
-            Chip chip = (Chip) view.findViewById(2131364611);
+            i = R.id.qr_scanner_chip;
+            Chip chip = (Chip) view.findViewById(R.id.qr_scanner_chip);
             if (chip != null) {
                 return new WidgetQrScannerBinding((FrameLayout) view, zXingScannerView, chip);
             }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
index d7cfa53fc3..b3037e0105 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
@@ -5,11 +5,13 @@ import android.content.Intent;
 import android.net.Uri;
 import android.view.View;
 import android.webkit.URLUtil;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.e.o;
 import c.a.e.o0.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetQrScannerBinding;
 import com.discord.utilities.color.ColorCompat;
@@ -54,14 +56,14 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
 
         public final void launch(Context context, boolean z2) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent("android.intent.action.VIEW").putExtra("SHOW_HELP_CHIP", z2);
+            Intent putExtra = new Intent("android.intent.action.VIEW").putExtra(WidgetQRScanner.EXTRA_SHOW_HELP_CHIP, z2);
             m.checkNotNullExpressionValue(putExtra, "Intent(Intent.ACTION_VIE…_HELP_CHIP, showHelpChip)");
             l.d(context, WidgetQRScanner.class, putExtra);
         }
     }
 
     public WidgetQRScanner() {
-        super(2131559171);
+        super(R.layout.widget_qr_scanner);
     }
 
     public static final /* synthetic */ WidgetQrScannerBinding access$getBinding$p(WidgetQRScanner widgetQRScanner) {
@@ -91,12 +93,12 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
             Uri parse = Uri.parse(str);
             if (URLUtil.isValidUrl(str)) {
                 b bVar = b.F;
-                m.checkNotNullExpressionValue(parse, "uri");
+                m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             }
             IntentUtils intentUtils = IntentUtils.INSTANCE;
-            m.checkNotNullExpressionValue(parse, "uri");
+            m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             if (!intentUtils.isDiscordAppUri(parse)) {
-                o.i(this, 2131892851, 0, 4);
+                o.i(this, R.string.qr_code_invalid, 0, 4);
                 requireActivity().finish();
             }
             String path = parse.getPath();
@@ -138,10 +140,10 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         int i = 0;
-        ColorCompat.setStatusBarColor$default((Fragment) this, ColorCompat.getColor(this, 2131099689), false, 4, (Object) null);
+        ColorCompat.setStatusBarColor$default((Fragment) this, ColorCompat.getColor(this, (int) R.color.black), false, 4, (Object) null);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891199);
-        boolean booleanExtra = getMostRecentIntent().getBooleanExtra("SHOW_HELP_CHIP", false);
+        setActionBarTitle(R.string.login_with_qr);
+        boolean booleanExtra = getMostRecentIntent().getBooleanExtra(EXTRA_SHOW_HELP_CHIP, false);
         Chip chip = getBinding().f1885c;
         m.checkNotNullExpressionValue(chip, "binding.qrScannerChip");
         if (!booleanExtra) {
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java
index cc613ef76b..0719c8177a 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.report.ReportNodeBottomButton;
 import com.discord.databinding.ViewMobileReportsBottomButtonBinding;
 import com.discord.utilities.color.ColorCompat;
@@ -33,18 +34,18 @@ public final class MobileReportsBottomButton extends LinearLayout {
     public MobileReportsBottomButton(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558786, this);
-        int i2 = 2131364642;
-        LoadingButton loadingButton = (LoadingButton) findViewById(2131364642);
+        LayoutInflater.from(context).inflate(R.layout.view_mobile_reports_bottom_button, this);
+        int i2 = R.id.report_node_bottom_button;
+        LoadingButton loadingButton = (LoadingButton) findViewById(R.id.report_node_bottom_button);
         if (loadingButton != null) {
-            i2 = 2131364643;
-            MaterialButton materialButton = (MaterialButton) findViewById(2131364643);
+            i2 = R.id.report_node_bottom_button_cancel;
+            MaterialButton materialButton = (MaterialButton) findViewById(R.id.report_node_bottom_button_cancel);
             if (materialButton != null) {
-                i2 = 2131364644;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById(2131364644);
+                i2 = R.id.report_node_bottom_button_description;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById(R.id.report_node_bottom_button_description);
                 if (linkifiedTextView != null) {
-                    i2 = 2131364645;
-                    TextView textView = (TextView) findViewById(2131364645);
+                    i2 = R.id.report_node_bottom_button_error_text;
+                    TextView textView = (TextView) findViewById(R.id.report_node_bottom_button_error_text);
                     if (textView != null) {
                         ViewMobileReportsBottomButtonBinding viewMobileReportsBottomButtonBinding = new ViewMobileReportsBottomButtonBinding(this, loadingButton, materialButton, linkifiedTextView, textView);
                         m.checkNotNullExpressionValue(viewMobileReportsBottomButtonBinding, "ViewMobileReportsBottomB…ater.from(context), this)");
@@ -95,15 +96,15 @@ public final class MobileReportsBottomButton extends LinearLayout {
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.reportNodeBottomButtonDescription");
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            linkifiedTextView2.setText(b.h(context, 2131891553, new Object[0], null, 4));
-            this.binding.b.setText(getContext().getString(2131891554));
-            this.binding.b.setBackgroundColor(ColorCompat.getColor(getContext(), 2131100316));
+            linkifiedTextView2.setText(b.h(context, R.string.mobile_reports_submit_info_text, new Object[0], null, 4));
+            this.binding.b.setText(getContext().getString(R.string.mobile_reports_submit_report));
+            this.binding.b.setBackgroundColor(ColorCompat.getColor(getContext(), (int) R.color.status_red));
             this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$1(function1, reportNodeBottomButton));
         } else if (reportNodeBottomButton instanceof ReportNodeBottomButton.Done) {
-            this.binding.b.setText(getContext().getString(2131888207));
+            this.binding.b.setText(getContext().getString(R.string.done));
             this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$2(function1, reportNodeBottomButton));
         } else if (reportNodeBottomButton instanceof ReportNodeBottomButton.Next) {
-            this.binding.b.setText(getContext().getString(2131891686));
+            this.binding.b.setText(getContext().getString(R.string.next));
             this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$3(function1, reportNodeBottomButton));
         } else if (z3) {
             this.binding.f1667c.setOnClickListener(new MobileReportsBottomButton$setup$4(function1, reportNodeBottomButton));
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java
index 05ccbaa2ce..280b01e8be 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java
@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.api.report.NodeElementResult;
 import com.discord.api.report.NodeResult;
 import com.discord.api.report.ReportNodeChild;
@@ -38,7 +39,7 @@ public final class MobileReportsBreadcrumbs extends LinearLayout {
     public MobileReportsBreadcrumbs(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558787, this);
+        LayoutInflater.from(context).inflate(R.layout.view_mobile_reports_breadcrumbs, this);
         ViewMobileReportsBreadcrumbsBinding viewMobileReportsBreadcrumbsBinding = new ViewMobileReportsBreadcrumbsBinding(this);
         m.checkNotNullExpressionValue(viewMobileReportsBreadcrumbsBinding, "ViewMobileReportsBreadcr…ater.from(context), this)");
         this.binding = viewMobileReportsBreadcrumbsBinding;
@@ -54,13 +55,13 @@ public final class MobileReportsBreadcrumbs extends LinearLayout {
         View view = this.binding.a;
         Objects.requireNonNull(view, "null cannot be cast to non-null type android.view.ViewGroup");
         ViewGroup viewGroup = (ViewGroup) view;
-        View inflate = from.inflate(2131558788, viewGroup, false);
+        View inflate = from.inflate(R.layout.view_mobile_reports_breadcrumbs_item, viewGroup, false);
         viewGroup.addView(inflate);
-        int i = 2131364653;
-        View findViewById = inflate.findViewById(2131364653);
+        int i = R.id.reports_breadcrumbs_item_dot;
+        View findViewById = inflate.findViewById(R.id.reports_breadcrumbs_item_dot);
         if (findViewById != null) {
-            i = 2131364654;
-            TextView textView = (TextView) inflate.findViewById(2131364654);
+            i = R.id.reports_breadcrumbs_item_title;
+            TextView textView = (TextView) inflate.findViewById(R.id.reports_breadcrumbs_item_title);
             if (textView != null) {
                 ViewMobileReportsBreadcrumbsItemBinding viewMobileReportsBreadcrumbsItemBinding = new ViewMobileReportsBreadcrumbsItemBinding((ConstraintLayout) inflate, findViewById, textView);
                 m.checkNotNullExpressionValue(viewMobileReportsBreadcrumbsItemBinding, "ViewMobileReportsBreadcr…ach to parent */ true\n  )");
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java
index e7e8d6f5d6..c3cc67d902 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java
@@ -1,7 +1,9 @@
 package com.discord.widgets.mobile_reports;
 
 import android.content.Context;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.report.MenuAPIResponse;
 import com.discord.api.report.NodeElementResult;
@@ -16,11 +18,13 @@ import com.discord.api.report.ReportType;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.app.AppLog;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.models.message.Message;
 import com.discord.models.user.User;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.logging.Logger;
@@ -311,7 +315,7 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
         private final HashSet<ReportNodeElementData> selections;
 
         public CheckboxElement(String str, List<ReportNodeElementData> list, HashSet<ReportNodeElementData> hashSet) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(list, "data");
             m.checkNotNullParameter(hashSet, "selections");
             this.name = str;
@@ -347,7 +351,7 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
         }
 
         public final CheckboxElement copy(String str, List<ReportNodeElementData> list, HashSet<ReportNodeElementData> hashSet) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(list, "data");
             m.checkNotNullParameter(hashSet, "selections");
             return new CheckboxElement(str, list, hashSet);
@@ -439,7 +443,7 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
         private final DraweeSpanStringBuilder text;
 
         public MessagePreview(DraweeSpanStringBuilder draweeSpanStringBuilder, String str, int i, User user, boolean z2) {
-            m.checkNotNullParameter(draweeSpanStringBuilder, "text");
+            m.checkNotNullParameter(draweeSpanStringBuilder, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(str, "authorName");
             m.checkNotNullParameter(user, "author");
             this.text = draweeSpanStringBuilder;
@@ -494,7 +498,7 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
         }
 
         public final MessagePreview copy(DraweeSpanStringBuilder draweeSpanStringBuilder, String str, int i, User user, boolean z2) {
-            m.checkNotNullParameter(draweeSpanStringBuilder, "text");
+            m.checkNotNullParameter(draweeSpanStringBuilder, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(str, "authorName");
             m.checkNotNullParameter(user, "author");
             return new MessagePreview(draweeSpanStringBuilder, str, i, user, z2);
@@ -1495,7 +1499,7 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
                 if (author4 != null) {
                     l2 = Long.valueOf(author4.i());
                 }
-                return new MessagePreview(parseChannelMessage, str, companion2.getColor((GuildMember) map2.get(l2), ColorCompat.getThemedColor(context, 2130968932)), user, message.hasEmbeds() || message.hasAttachments());
+                return new MessagePreview(parseChannelMessage, str, companion2.getColor((GuildMember) map2.get(l2), ColorCompat.getThemedColor(context, (int) R.attr.colorHeaderPrimary)), user, message.hasEmbeds() || message.hasAttachments());
             }
         }
         return null;
@@ -1581,7 +1585,7 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
                 throw new IllegalStateException("need to generate a report context id based off the report type");
             }
             ReportSubmissionBody.Companion companion = ReportSubmissionBody.Companion;
-            long currentTimeMillis = (this.clock.currentTimeMillis() - 1420070400000L) << 22;
+            long currentTimeMillis = (this.clock.currentTimeMillis() - SnowflakeUtils.DISCORD_EPOCH) << 22;
             long j2 = this.channelId;
             ReportType reportType = this.reportType;
             MenuAPIResponse menu2 = menu.getMenu();
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java b/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java
index 22766dcc44..b063ed8a21 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java
@@ -17,6 +17,7 @@ import c.a.j.i2;
 import c.a.j.j2;
 import c.a.j.p4;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.report.NodeResult;
 import com.discord.api.report.ReportNode;
 import com.discord.api.report.ReportNodeBottomButton;
@@ -154,10 +155,10 @@ public final class ReportsMenuNode extends ConstraintLayout {
             boolean isBlocked = blockUserElement.isBlocked();
             TextView textView = this.binding.e.d;
             m.checkNotNullExpressionValue(textView, "binding.mobileReportsNod…obileReportsBlockUserName");
-            textView.setText(UserUtils.INSTANCE.getUserNameWithDiscriminator(user, Integer.valueOf(ColorCompat.getThemedColor(getContext(), 2130968933)), Float.valueOf(0.8f)));
+            textView.setText(UserUtils.INSTANCE.getUserNameWithDiscriminator(user, Integer.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderSecondary)), Float.valueOf(0.8f)));
             SimpleDraweeView simpleDraweeView = this.binding.e.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.mobileReportsNod…ileReportsBlockUserAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, user, 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, user, R.dimen.avatar_size_standard, null, null, null, 56, null);
             this.binding.e.f100c.setOnClickListener(new ReportsMenuNode$setupBlockUser$1(this));
             MaterialButton materialButton = this.binding.e.f100c;
             m.checkNotNullExpressionValue(materialButton, "binding.mobileReportsNod…ileReportsBlockUserButton");
@@ -166,10 +167,10 @@ public final class ReportsMenuNode extends ConstraintLayout {
             m.checkNotNullExpressionValue(materialButton2, "binding.mobileReportsNod…ileReportsBlockUserButton");
             if (isBlocked) {
                 context = getContext();
-                i = 2131887037;
+                i = R.string.blocked;
             } else {
                 context = getContext();
-                i = 2131887036;
+                i = R.string.block;
             }
             materialButton2.setText(context.getString(i));
         }
@@ -214,7 +215,7 @@ public final class ReportsMenuNode extends ConstraintLayout {
             textView.setText(channelPreviewElement.getGuild().getName());
             SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.b.f104c;
             m.checkNotNullExpressionValue(simpleDraweeView, "mobileReportsChannelPrev…eportsChannelPreviewImage");
-            IconUtils.setIcon$default((ImageView) simpleDraweeView, channelPreviewElement.getGuild(), 2131165296, (MGImages.ChangeDetector) null, false, 24, (Object) null);
+            IconUtils.setIcon$default((ImageView) simpleDraweeView, channelPreviewElement.getGuild(), (int) R.dimen.avatar_size_small, (MGImages.ChangeDetector) null, false, 24, (Object) null);
             MaterialCardView materialCardView = viewReportsMenuNodeBinding.h;
             m.checkNotNullExpressionValue(materialCardView, "mobileReportsNodeChannelPreview");
             materialCardView.setVisibility(0);
@@ -239,7 +240,7 @@ public final class ReportsMenuNode extends ConstraintLayout {
                 for (ReportNodeElementData reportNodeElementData : data) {
                     LayoutInflater from = LayoutInflater.from(getContext());
                     LinearLayout linearLayout2 = this.binding.d;
-                    View inflate = from.inflate(2131558791, (ViewGroup) linearLayout2, false);
+                    View inflate = from.inflate(R.layout.view_mobile_reports_multicheck_item, (ViewGroup) linearLayout2, false);
                     linearLayout2.addView(inflate);
                     Objects.requireNonNull(inflate, "rootView");
                     CheckedSetting checkedSetting = (CheckedSetting) inflate;
@@ -266,13 +267,13 @@ public final class ReportsMenuNode extends ConstraintLayout {
             for (ReportNodeChild reportNodeChild : nodeState.getNode().b()) {
                 LayoutInflater from = LayoutInflater.from(getContext());
                 LinearLayout linearLayout2 = this.binding.i;
-                View inflate = from.inflate(2131558790, (ViewGroup) linearLayout2, false);
+                View inflate = from.inflate(R.layout.view_mobile_reports_child, (ViewGroup) linearLayout2, false);
                 linearLayout2.addView(inflate);
-                int i = 2131364146;
-                CardView cardView = (CardView) inflate.findViewById(2131364146);
+                int i = R.id.mobile_reports_child;
+                CardView cardView = (CardView) inflate.findViewById(R.id.mobile_reports_child);
                 if (cardView != null) {
-                    i = 2131364147;
-                    TextView textView = (TextView) inflate.findViewById(2131364147);
+                    i = R.id.mobile_reports_child_menu_title;
+                    TextView textView = (TextView) inflate.findViewById(R.id.mobile_reports_child_menu_title);
                     if (textView != null) {
                         FrameLayout frameLayout = (FrameLayout) inflate;
                         m.checkNotNullExpressionValue(new i2(frameLayout, cardView, textView), "childView");
@@ -297,7 +298,7 @@ public final class ReportsMenuNode extends ConstraintLayout {
             viewReportsMenuNodeBinding.f1669c.e.setTextColor(messagePreviewElement.getAuthorNameColor());
             SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.f1669c.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "mobileReportsMessagePrev…ListAdapterItemTextAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, messagePreviewElement.getAuthor(), 2131165296, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, messagePreviewElement.getAuthor(), R.dimen.avatar_size_small, null, null, null, 56, null);
             viewReportsMenuNodeBinding.f1669c.f146c.setDraweeSpanStringBuilder(messagePreviewElement.getText());
             ImageView imageView = viewReportsMenuNodeBinding.f1669c.b;
             m.checkNotNullExpressionValue(imageView, "mobileReportsMessagePrev…terItemChatAttachmentIcon");
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java
index 8c00248cef..f33629bb65 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetMobileReportsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetMobileReports$binding$2 extends k imple
 
     public final WidgetMobileReportsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364112;
-        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364112);
+        int i = R.id.menu_reports_node_view_holder;
+        FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.menu_reports_node_view_holder);
         if (frameLayout != null) {
-            i = 2131364161;
-            ProgressBar progressBar = (ProgressBar) view.findViewById(2131364161);
+            i = R.id.mobile_reports_progress_bar;
+            ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.mobile_reports_progress_bar);
             if (progressBar != null) {
                 return new WidgetMobileReportsBinding((CoordinatorLayout) view, frameLayout, progressBar);
             }
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java
index 94f98e295c..c13408921e 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java
@@ -10,6 +10,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.report.ReportType;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetMobileReportsBinding;
@@ -46,17 +47,17 @@ public final class WidgetMobileReports extends AppFragment {
 
         public final void launchMessageReport(Context context, long j, long j2) {
             m.checkNotNullParameter(context, "context");
-            l.d(context, WidgetMobileReports.class, new Intent().putExtra("MESSAGE_ID", j).putExtra("CHANNEL_ID", j2).putExtra("REPORT_TYPE", ReportType.Message));
+            l.d(context, WidgetMobileReports.class, new Intent().putExtra(WidgetMobileReports.MESSAGE_ID, j).putExtra(WidgetMobileReports.CHANNEL_ID, j2).putExtra(WidgetMobileReports.REPORT_TYPE, ReportType.Message));
         }
 
         public final void launchStageChannelReport(Context context, long j) {
             m.checkNotNullParameter(context, "context");
-            l.d(context, WidgetMobileReports.class, new Intent().putExtra("CHANNEL_ID", j).putExtra("REPORT_TYPE", ReportType.StageChannel));
+            l.d(context, WidgetMobileReports.class, new Intent().putExtra(WidgetMobileReports.CHANNEL_ID, j).putExtra(WidgetMobileReports.REPORT_TYPE, ReportType.StageChannel));
         }
     }
 
     public WidgetMobileReports() {
-        super(2131559145);
+        super(R.layout.widget_mobile_reports);
         WidgetMobileReports$viewModel$2 widgetMobileReports$viewModel$2 = new WidgetMobileReports$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(MobileReportsViewModel.class), new WidgetMobileReports$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMobileReports$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$1.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$1.java
index ea462b4ba4..8544195eae 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.notice;
 import android.animation.ValueAnimator;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 /* compiled from: NoticePopup.kt */
 public final class NoticePopup$enqueue$notice$1$3$1 implements View.OnTouchListener {
@@ -14,7 +15,7 @@ public final class NoticePopup$enqueue$notice$1$3$1 implements View.OnTouchListe
 
     @Override // android.view.View.OnTouchListener
     public final boolean onTouch(View view, MotionEvent motionEvent) {
-        m.checkNotNullExpressionValue(motionEvent, "event");
+        m.checkNotNullExpressionValue(motionEvent, NotificationCompat.CATEGORY_EVENT);
         if (motionEvent.getAction() != 0) {
             return false;
         }
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java
index f6015a3050..c002d833e9 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java
@@ -13,6 +13,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import androidx.appcompat.widget.ActivityChooserModel;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.FragmentActivity;
@@ -23,6 +24,7 @@ import c.p.a.h;
 import c.p.a.i;
 import c.p.a.j;
 import c.p.a.l;
+import com.discord.R;
 import com.discord.api.sticker.Sticker;
 import com.discord.databinding.WidgetNoticePopupBinding;
 import com.discord.stores.StoreNotices;
@@ -35,7 +37,6 @@ import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
 import com.discord.views.sticker.StickerView;
 import com.facebook.drawee.span.DraweeSpanStringBuilder;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.tapadoo.alerter.R;
 import d0.g0.t;
 import d0.t.u;
 import d0.z.d.m;
@@ -129,8 +130,8 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
         int childCount;
         b bVar2;
         Window window2;
-        m.checkNotNullParameter(fragmentActivity, "activity");
-        m.checkNotNullParameter(fragmentActivity, "activity");
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
+        m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         i iVar = new i(null);
         View decorView = (fragmentActivity == null || (window2 = fragmentActivity.getWindow()) == null) ? null : window2.getDecorView();
         if (!(decorView instanceof ViewGroup)) {
@@ -167,17 +168,17 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
             m.checkNotNullExpressionValue(decorView3, "it.decorView");
             Context context = decorView3.getContext();
             m.checkNotNullExpressionValue(context, "it.decorView.context");
-            bVar = new b(context, 2131559156, null, 0, 12);
+            bVar = new b(context, R.layout.widget_notice_popup, null, 0, 12);
         }
         iVar.b = bVar;
-        int themedColor = ColorCompat.getThemedColor(fragmentActivity, 2130968907);
+        int themedColor = ColorCompat.getThemedColor(fragmentActivity, (int) R.attr.colorBackgroundTertiary);
         b bVar3 = iVar.b;
         if (bVar3 != null) {
             bVar3.setAlertBackgroundColor(themedColor);
         }
         b bVar4 = iVar.b;
         if (bVar4 != null) {
-            LinearLayout linearLayout = (LinearLayout) bVar4.c(R.d.llAlertBackground);
+            LinearLayout linearLayout = (LinearLayout) bVar4.c(com.tapadoo.alerter.R.d.llAlertBackground);
             m.checkNotNullExpressionValue(linearLayout, "it");
             linearLayout.setOnTouchListener(new l(linearLayout, new a(bVar4)));
         }
@@ -191,7 +192,7 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
         }
         b bVar7 = iVar.b;
         if (bVar7 != null) {
-            Animation loadAnimation = AnimationUtils.loadAnimation(bVar7.getContext(), 2130772021);
+            Animation loadAnimation = AnimationUtils.loadAnimation(bVar7.getContext(), R.anim.anim_slide_in_down);
             m.checkNotNullExpressionValue(loadAnimation, "AnimationUtils.loadAnima…lert?.context, animation)");
             bVar7.setEnterAnimation$alerter_release(loadAnimation);
         }
@@ -211,29 +212,29 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
         View layoutContainer = bVar10 != null ? bVar10.getLayoutContainer() : null;
         if (layoutContainer != null) {
             layoutContainer.setOnTouchListener(new NoticePopup$enqueue$notice$1$3$1(NoticePopup.access$getAutoDismissAnimator(NoticePopup.INSTANCE, this.$noticeAutoDismissPeriodSecs, new NoticePopup$enqueue$notice$1$$special$$inlined$also$lambda$1(this, fragmentActivity))));
-            int i3 = 2131364456;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) layoutContainer.findViewById(2131364456);
+            int i3 = R.id.popup_attachment;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) layoutContainer.findViewById(R.id.popup_attachment);
             if (simpleDraweeView != null) {
-                i3 = 2131364457;
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) layoutContainer.findViewById(2131364457);
+                i3 = R.id.popup_body;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) layoutContainer.findViewById(R.id.popup_body);
                 if (simpleDraweeSpanTextView != null) {
-                    i3 = 2131364458;
-                    ImageView imageView = (ImageView) layoutContainer.findViewById(2131364458);
+                    i3 = R.id.popup_close_btn;
+                    ImageView imageView = (ImageView) layoutContainer.findViewById(R.id.popup_close_btn);
                     if (imageView != null) {
-                        i3 = 2131364459;
-                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) layoutContainer.findViewById(2131364459);
+                        i3 = R.id.popup_icon;
+                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) layoutContainer.findViewById(R.id.popup_icon);
                         if (simpleDraweeView2 != null) {
-                            i3 = 2131364460;
-                            StickerView stickerView = (StickerView) layoutContainer.findViewById(2131364460);
+                            i3 = R.id.popup_sticker;
+                            StickerView stickerView = (StickerView) layoutContainer.findViewById(R.id.popup_sticker);
                             if (stickerView != null) {
-                                i3 = 2131364461;
-                                TextView textView = (TextView) layoutContainer.findViewById(2131364461);
+                                i3 = R.id.popup_subtitle;
+                                TextView textView = (TextView) layoutContainer.findViewById(R.id.popup_subtitle);
                                 if (textView != null) {
-                                    i3 = 2131364462;
-                                    TextView textView2 = (TextView) layoutContainer.findViewById(2131364462);
+                                    i3 = R.id.popup_title;
+                                    TextView textView2 = (TextView) layoutContainer.findViewById(R.id.popup_title);
                                     if (textView2 != null) {
-                                        i3 = 2131364463;
-                                        RelativeLayout relativeLayout = (RelativeLayout) layoutContainer.findViewById(2131364463);
+                                        i3 = R.id.popup_title_wrap;
+                                        RelativeLayout relativeLayout = (RelativeLayout) layoutContainer.findViewById(R.id.popup_title_wrap);
                                         if (relativeLayout != null) {
                                             WidgetNoticePopupBinding widgetNoticePopupBinding = new WidgetNoticePopupBinding((RelativeLayout) layoutContainer, simpleDraweeView, simpleDraweeSpanTextView, imageView, simpleDraweeView2, stickerView, textView, textView2, relativeLayout);
                                             m.checkNotNullExpressionValue(widgetNoticePopupBinding, "WidgetNoticePopupBinding.bind(view)");
@@ -274,7 +275,7 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
                                             simpleDraweeSpanTextView.post(new NoticePopup$enqueue$notice$1$3$2(widgetNoticePopupBinding));
                                             Drawable drawable = this.$noticeIconTopRight;
                                             if (drawable == null) {
-                                                drawable = ContextCompat.getDrawable(fragmentActivity, DrawableCompat.getThemedDrawableRes$default(fragmentActivity, 2130969454, 0, 2, (Object) null));
+                                                drawable = ContextCompat.getDrawable(fragmentActivity, DrawableCompat.getThemedDrawableRes$default(fragmentActivity, (int) R.attr.ic_settings, 0, 2, (Object) null));
                                             }
                                             m.checkNotNullExpressionValue(stickerView, "binding.popupSticker");
                                             List list = this.$noticeStickers;
@@ -307,9 +308,9 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
             new Handler(Looper.getMainLooper()).post(new h(viewGroup, iVar));
         }
         b bVar11 = iVar.b;
-        View findViewById = bVar11 != null ? bVar11.findViewById(2131363974) : view;
+        View findViewById = bVar11 != null ? bVar11.findViewById(R.id.llAlertBackground) : view;
         if (findViewById != null) {
-            ViewCompat.setElevation(findViewById, fragmentActivity.getResources().getDimension(2131165279));
+            ViewCompat.setElevation(findViewById, fragmentActivity.getResources().getDimension(R.dimen.app_elevation));
         }
         return true;
     }
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup.java
index c7eb2655a6..95bea4c59c 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopup.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup.java
@@ -14,6 +14,7 @@ import com.discord.api.sticker.Sticker;
 import com.discord.app.AppComponent;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.font.FontUtils;
 import com.discord.widgets.home.WidgetHome;
 import d0.e0.c;
 import d0.z.d.a0;
@@ -106,6 +107,6 @@ public final class NoticePopup {
         m.checkNotNullParameter(list2, "validScreens");
         m.checkNotNullParameter(function1, "onClickTopRightIcon");
         m.checkNotNullParameter(function12, "onClick");
-        StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 1, false, list2, 1000, false, 0, new NoticePopup$enqueue$notice$1(function12, str, num2, str3, num, str2, drawable2, drawable, charSequence, charSequence2, charSequence3, drawable3, list, function1), 150, null));
+        StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 1, false, list2, 1000, false, 0, new NoticePopup$enqueue$notice$1(function12, str, num2, str3, num, str2, drawable2, drawable, charSequence, charSequence2, charSequence3, drawable3, list, function1), FontUtils.MAX_FONT_SCALING, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java
index 543568de22..caaea9c5ee 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java
@@ -9,6 +9,7 @@ import android.view.View;
 import androidx.core.content.ContextCompat;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.attachment.MessageAttachmentType;
@@ -33,6 +34,7 @@ import com.discord.utilities.textprocessing.AstRenderer;
 import com.discord.utilities.textprocessing.DiscordParser;
 import com.discord.utilities.textprocessing.MessageParseState;
 import com.discord.utilities.textprocessing.MessageRenderContext;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.facebook.drawee.span.DraweeSpanStringBuilder;
 import d0.g0.t;
 import d0.o;
@@ -276,7 +278,7 @@ public final class NoticePopupChannel {
         if (channel != null) {
             long h = channel.h();
             if (l == null || l.longValue() != h) {
-                MessageRenderContext messageRenderContext = new MessageRenderContext(context, user.getId(), true, MessageUtils.getNickOrUsernames$default(message, channel, map, null, 8, null), map2, map3, 0, null, NoticePopupChannel$createModel$messageRenderContext$1.INSTANCE, ColorCompat.getThemedColor(context, 2130970192), 0, null, null, null, 15552, null);
+                MessageRenderContext messageRenderContext = new MessageRenderContext(context, user.getId(), true, MessageUtils.getNickOrUsernames$default(message, channel, map, null, 8, null), map2, map3, 0, null, NoticePopupChannel$createModel$messageRenderContext$1.INSTANCE, ColorCompat.getThemedColor(context, (int) R.attr.theme_chat_spoiler_inapp_bg), 0, null, null, null, 15552, null);
                 String content = message.getContent();
                 if (content != null) {
                     z2 = false;
@@ -306,14 +308,14 @@ public final class NoticePopupChannel {
                     if (name != null) {
                         str4 = name;
                     }
-                    StringBuilder H = a.H('#');
+                    StringBuilder H = a.H(MentionUtilsKt.CHANNELS_CHAR);
                     H.append(AnimatableValueParser.y0(channel));
                     pair = o.to(str4, H.toString());
                 }
                 String str5 = (String) pair.component1();
                 String str6 = (String) pair.component2();
                 if (AnimatableValueParser.l1(channel)) {
-                    str = IconUtils.getForGuild$default(guild, "asset://asset/images/default_icon_selected.jpg", false, null, 12, null);
+                    str = IconUtils.getForGuild$default(guild, IconUtils.DEFAULT_ICON_BLURPLE, false, null, 12, null);
                     channel2 = channel;
                 } else {
                     channel2 = channel;
@@ -326,7 +328,7 @@ public final class NoticePopupChannel {
                     SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(a.s(GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, coreUser, map.get(Long.valueOf(coreUser.getId())), channel, null, 8, null), ": "));
                     context2 = context;
                     Object[] objArr = new Object[2];
-                    objArr[i] = new ForegroundColorSpan(ColorCompat.getThemedColor(context2, 2130969877));
+                    objArr[i] = new ForegroundColorSpan(ColorCompat.getThemedColor(context2, (int) R.attr.primary_000));
                     objArr[1] = new StyleSpan(1);
                     for (Object obj : n.listOf(objArr)) {
                         spannableStringBuilder.setSpan(obj, i, spannableStringBuilder.length(), 33);
@@ -342,8 +344,8 @@ public final class NoticePopupChannel {
                         str2 = messageAttachment.c();
                         str3 = r1;
                     } else if ((messageAttachment != null ? messageAttachment.e() : r1) == MessageAttachmentType.VIDEO) {
-                        Drawable drawable$default = DrawableCompat.getDrawable$default(context, 2131232360, ColorCompat.getThemedColor(context2, 2130968905), false, 4, null);
-                        drawable2 = DrawableCompat.getDrawable$default(context, 2131231895, ColorCompat.getThemedColor(context2, 2130968946), false, 4, null);
+                        Drawable drawable$default = DrawableCompat.getDrawable$default(context, R.drawable.rounded_rectangle_4dp_radius, ColorCompat.getThemedColor(context2, (int) R.attr.colorBackgroundSecondary), false, 4, null);
+                        drawable2 = DrawableCompat.getDrawable$default(context, R.drawable.ic_play_circle_outline_white_24dp, ColorCompat.getThemedColor(context2, (int) R.attr.colorInteractiveActive), false, 4, null);
                         str2 = r1;
                         drawable = drawable$default;
                     } else {
@@ -353,11 +355,11 @@ public final class NoticePopupChannel {
                     drawable = str3;
                     drawable2 = str3;
                 } else {
-                    drawable2 = ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, 2130970192, i, 2, (Object) r1));
+                    drawable2 = ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, (int) R.attr.theme_chat_spoiler_inapp_bg, i, 2, (Object) r1));
                     str2 = r1;
                     drawable = str2;
                 }
-                return new Model(str5, str6, draweeSpanStringBuilder, str, drawable, str2, drawable2, ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, AnimatableValueParser.t1(channel) ? 2130969398 : 2130969454, i, 2, (Object) r1)), new NoticePopupChannel$createModel$onClickTopRightIcon$1(channel2, context2), message.getStickers());
+                return new Model(str5, str6, draweeSpanStringBuilder, str, drawable, str2, drawable2, ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, AnimatableValueParser.t1(channel) ? R.attr.ic_close_24dp : R.attr.ic_settings, i, 2, (Object) r1)), new NoticePopupChannel$createModel$onClickTopRightIcon$1(channel2, context2), message.getStickers());
             }
         }
         return null;
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java
index 616a39bb92..844668ed6c 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.notice;
 
 import android.content.Context;
 import android.view.View;
+import com.discord.R;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.m;
@@ -32,7 +33,7 @@ public final class WidgetNoticeDialog$Companion$showInputModal$1 extends o imple
         Function2 function2 = this.$onOKClicked;
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "view.context");
-        View findViewById = view.findViewById(2131365778);
+        View findViewById = view.findViewById(R.id.view_input);
         m.checkNotNullExpressionValue(findViewById, "view.findViewById<TextIn…tLayout>(R.id.view_input)");
         function2.invoke(context, ViewExtensions.getTextOrEmpty((TextInputLayout) findViewById));
     }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java
index 0283cceefb..cda1b63b8a 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.notice;
 
 import android.view.View;
+import com.discord.R;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -26,7 +27,7 @@ public final class WidgetNoticeDialog$Companion$showInputModal$3 extends o imple
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        View findViewById = view.findViewById(2131365778);
+        View findViewById = view.findViewById(R.id.view_input);
         m.checkNotNullExpressionValue(findViewById, "view.findViewById<TextIn…tLayout>(R.id.view_input)");
         ((TextInputLayout) findViewById).setHint(this.$hintText);
     }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java
index 1abce6c205..261ec78742 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.notice;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetNoticeDialogBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.google.android.material.button.MaterialButton;
@@ -19,23 +20,23 @@ public final /* synthetic */ class WidgetNoticeDialog$binding$2 extends k implem
 
     public final WidgetNoticeDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364245;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364245);
+        int i = R.id.notice_body_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.notice_body_container);
         if (linearLayout != null) {
-            i = 2131364246;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364246);
+            i = R.id.notice_body_text;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.notice_body_text);
             if (linkifiedTextView != null) {
-                i = 2131364247;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364247);
+                i = R.id.notice_cancel;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.notice_cancel);
                 if (materialButton != null) {
-                    i = 2131364249;
-                    TextView textView = (TextView) view.findViewById(2131364249);
+                    i = R.id.notice_header;
+                    TextView textView = (TextView) view.findViewById(R.id.notice_header);
                     if (textView != null) {
-                        i = 2131364250;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364250);
+                        i = R.id.notice_header_container;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.notice_header_container);
                         if (linearLayout2 != null) {
-                            i = 2131364252;
-                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364252);
+                            i = R.id.notice_ok;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.notice_ok);
                             if (materialButton2 != null) {
                                 return new WidgetNoticeDialogBinding((LinearLayout) view, linearLayout, linkifiedTextView, materialButton, textView, linearLayout2, materialButton2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
index 0dfdee0a20..e445dcc0ef 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
@@ -16,10 +16,13 @@ import android.widget.TextView;
 import androidx.annotation.AttrRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppDialog;
 import com.discord.app.AppLog;
@@ -59,9 +62,13 @@ public final class WidgetNoticeDialog extends AppDialog {
     private static final String ARG_OK_TEXT = "ok_text";
     private static final String ARG_STACK_TRACE_CALLER_FRAME = "stack_trace_caller_frame";
     private static final String ARG_THEME_ID = "theme_id";
-    public static final int CANCEL_BUTTON = 2131364247;
+
+    /* renamed from: CANCEL_BUTTON */
+    public static final int notice_cancel = 2131364247;
     public static final Companion Companion = new Companion(null);
-    public static final int OK_BUTTON = 2131364252;
+
+    /* renamed from: OK_BUTTON */
+    public static final int notice_ok = 2131364252;
     public static final int ON_SHOW = 0;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null);
     private Map<Integer, ? extends Function1<? super View, Unit>> listenerMap;
@@ -80,7 +87,7 @@ public final class WidgetNoticeDialog extends AppDialog {
         public boolean onTouchEvent(TextView textView, Spannable spannable, MotionEvent motionEvent) {
             m.checkNotNullParameter(textView, "widget");
             m.checkNotNullParameter(spannable, "buffer");
-            m.checkNotNullParameter(motionEvent, "event");
+            m.checkNotNullParameter(motionEvent, NotificationCompat.CATEGORY_EVENT);
             boolean onTouchEvent = super.onTouchEvent(textView, spannable, motionEvent);
             if (motionEvent.getAction() == 1) {
                 this.linkAction.mo1invoke();
@@ -163,7 +170,7 @@ public final class WidgetNoticeDialog extends AppDialog {
         }
 
         public final Builder setMessage(CharSequence charSequence) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.message = charSequence;
             return this;
         }
@@ -178,7 +185,7 @@ public final class WidgetNoticeDialog extends AppDialog {
         }
 
         public final Builder setNegativeButton(String str, Function1<? super View, Unit> function1) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(function1, "onCancel");
             this.cancelText = str;
             this.onCancel = function1;
@@ -195,7 +202,7 @@ public final class WidgetNoticeDialog extends AppDialog {
         }
 
         public final Builder setPositiveButton(String str, Function1<? super View, Unit> function1) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(function1, "onConfirm");
             this.confirmText = str;
             this.onConfirm = function1;
@@ -216,14 +223,14 @@ public final class WidgetNoticeDialog extends AppDialog {
         }
 
         public final Builder setTitle(CharSequence charSequence) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.title = charSequence;
             return this;
         }
 
         public final void show(FragmentManager fragmentManager) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
-            Companion.show$default(WidgetNoticeDialog.Companion, fragmentManager, this.title, this.message, this.confirmText, this.cancelText, h0.mapOf(o.to(2131364252, this.onConfirm), o.to(2131364247, this.onCancel)), null, null, null, this.themeId, null, null, 0, null, 15808, null);
+            Companion.show$default(WidgetNoticeDialog.Companion, fragmentManager, this.title, this.message, this.confirmText, this.cancelText, h0.mapOf(o.to(Integer.valueOf((int) R.id.notice_ok), this.onConfirm), o.to(Integer.valueOf((int) R.id.notice_cancel), this.onCancel)), null, null, null, this.themeId, null, null, 0, null, 15808, null);
         }
     }
 
@@ -251,32 +258,32 @@ public final class WidgetNoticeDialog extends AppDialog {
             widgetNoticeDialog.setListenerMap(map);
             widgetNoticeDialog.setOnDismiss(function0);
             Bundle bundle = new Bundle();
-            bundle.putCharSequence("header_text", charSequence);
-            bundle.putCharSequence("body_text", charSequence2);
-            bundle.putCharSequence("ok_text", charSequence3);
-            bundle.putCharSequence("cancel_text", charSequence4);
+            bundle.putCharSequence(WidgetNoticeDialog.ARG_HEADER_TEXT, charSequence);
+            bundle.putCharSequence(WidgetNoticeDialog.ARG_BODY_TEXT, charSequence2);
+            bundle.putCharSequence(WidgetNoticeDialog.ARG_OK_TEXT, charSequence3);
+            bundle.putCharSequence(WidgetNoticeDialog.ARG_CANCEL_TEXT, charSequence4);
             if (type != null) {
-                bundle.putString("notice_type", type.name());
+                bundle.putString(WidgetNoticeDialog.ARG_NOTICE_TYPE, type.name());
             }
             if (num != null) {
-                bundle.putInt("above_layout_id", num.intValue());
+                bundle.putInt(WidgetNoticeDialog.ARG_ABOVE_LAYOUT_ID, num.intValue());
             }
             if (num2 != null) {
-                bundle.putInt("below_layout_id", num2.intValue());
+                bundle.putInt(WidgetNoticeDialog.ARG_BELOW_LAYOUT_ID, num2.intValue());
             }
             if (num3 != null) {
-                bundle.putInt("theme_id", num3.intValue());
+                bundle.putInt(WidgetNoticeDialog.ARG_THEME_ID, num3.intValue());
             }
             if (bool != null) {
-                bundle.putBoolean("cancelable", bool.booleanValue());
+                bundle.putBoolean(WidgetNoticeDialog.ARG_CANCELABLE, bool.booleanValue());
             }
-            bundle.putInt("body_text_alignment", i);
+            bundle.putInt(WidgetNoticeDialog.ARG_BODY_TEXT_ALIGNMENT, i);
             Thread currentThread = Thread.currentThread();
             m.checkNotNullExpressionValue(currentThread, "Thread.currentThread()");
             StackTraceElement[] stackTrace = currentThread.getStackTrace();
             String stackTraceElement = stackTrace.length > 4 ? stackTrace[4].toString() : "";
             m.checkNotNullExpressionValue(stackTraceElement, "if (stacktrace.size > 4)…ace[4].toString() else \"\"");
-            bundle.putString("stack_trace_caller_frame", stackTraceElement);
+            bundle.putString(WidgetNoticeDialog.ARG_STACK_TRACE_CALLER_FRAME, stackTraceElement);
             widgetNoticeDialog.setArguments(bundle);
             if (str == null) {
                 str = WidgetNoticeDialog.class.getSimpleName();
@@ -285,25 +292,25 @@ public final class WidgetNoticeDialog extends AppDialog {
         }
 
         public final void showInputModal(AppActivity appActivity, CharSequence charSequence, CharSequence charSequence2, CharSequence charSequence3, Function2<? super Context, ? super String, Unit> function2, Function0<Unit> function0, Boolean bool) {
-            m.checkNotNullParameter(appActivity, "activity");
+            m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(charSequence, "headerText");
             m.checkNotNullParameter(charSequence2, "bodyText");
             m.checkNotNullParameter(charSequence3, "hintText");
             m.checkNotNullParameter(function2, "onOKClicked");
             HashMap hashMap = new HashMap();
-            hashMap.put(2131364252, new WidgetNoticeDialog$Companion$showInputModal$1(function2));
+            hashMap.put(Integer.valueOf((int) R.id.notice_ok), new WidgetNoticeDialog$Companion$showInputModal$1(function2));
             if (function0 != null) {
-                hashMap.put(2131364247, new WidgetNoticeDialog$Companion$showInputModal$2(function0));
+                hashMap.put(Integer.valueOf((int) R.id.notice_cancel), new WidgetNoticeDialog$Companion$showInputModal$2(function0));
             }
             hashMap.put(0, new WidgetNoticeDialog$Companion$showInputModal$3(charSequence3));
             FragmentManager supportFragmentManager = appActivity.getSupportFragmentManager();
             m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
-            show$default(this, supportFragmentManager, charSequence, charSequence2, appActivity.getString(2131887513), appActivity.getString(2131887193), hashMap, null, null, 2131558779, null, bool, null, 0, null, 15040, null);
+            show$default(this, supportFragmentManager, charSequence, charSequence2, appActivity.getString(R.string.confirm), appActivity.getString(R.string.cancel), hashMap, null, null, Integer.valueOf((int) R.layout.view_input_modal), null, bool, null, 0, null, 15040, null);
         }
     }
 
     public WidgetNoticeDialog() {
-        super(2131559153);
+        super(R.layout.widget_notice_dialog);
     }
 
     private final WidgetNoticeDialogBinding getBinding() {
@@ -348,7 +355,7 @@ public final class WidgetNoticeDialog extends AppDialog {
     public final void logOnStartError(Exception exc) {
         m.checkNotNullParameter(exc, "exception");
         Bundle arguments = getArguments();
-        Serializable serializable = arguments != null ? arguments.getSerializable("stack_trace_caller_frame") : null;
+        Serializable serializable = arguments != null ? arguments.getSerializable(ARG_STACK_TRACE_CALLER_FRAME) : null;
         AppLog appLog = AppLog.g;
         Logger.e$default(appLog, "failed to start WidgetNoticeDialog from " + serializable, exc, null, 4, null);
     }
@@ -361,7 +368,7 @@ public final class WidgetNoticeDialog extends AppDialog {
             TypedValue typedValue = new TypedValue();
             Context context = getContext();
             if (!(context == null || (theme = context.getTheme()) == null)) {
-                theme.resolveAttribute(arguments.getInt("theme_id", 2130969173), typedValue, true);
+                theme.resolveAttribute(arguments.getInt(ARG_THEME_ID, R.attr.dialogTheme), typedValue, true);
             }
             setStyle(1, typedValue.resourceId);
         }
@@ -386,16 +393,16 @@ public final class WidgetNoticeDialog extends AppDialog {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         Bundle arguments = getArguments();
-        setCancelable(arguments != null ? arguments.getBoolean("cancelable", true) : true);
+        setCancelable(arguments != null ? arguments.getBoolean(ARG_CANCELABLE, true) : true);
         Bundle arguments2 = getArguments();
-        if (!(arguments2 == null || (string = arguments2.getString("notice_type")) == null)) {
+        if (!(arguments2 == null || (string = arguments2.getString(ARG_NOTICE_TYPE)) == null)) {
             StoreNotices notices = StoreStream.Companion.getNotices();
             m.checkNotNullExpressionValue(string, "it");
             notices.markDialogSeen(string);
         }
         Bundle arguments3 = getArguments();
         CharSequence charSequence = null;
-        CharSequence charSequence2 = arguments3 != null ? arguments3.getCharSequence("header_text") : null;
+        CharSequence charSequence2 = arguments3 != null ? arguments3.getCharSequence(ARG_HEADER_TEXT) : null;
         TextView textView = getBinding().e;
         m.checkNotNullExpressionValue(textView, "binding.noticeHeader");
         textView.setText(charSequence2);
@@ -405,7 +412,7 @@ public final class WidgetNoticeDialog extends AppDialog {
         LinkifiedTextView linkifiedTextView = getBinding().f1870c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.noticeBodyText");
         Bundle arguments4 = getArguments();
-        linkifiedTextView.setText(arguments4 != null ? arguments4.getCharSequence("body_text") : null);
+        linkifiedTextView.setText(arguments4 != null ? arguments4.getCharSequence(ARG_BODY_TEXT) : null);
         if (isCancelable()) {
             LinkifiedTextView linkifiedTextView2 = getBinding().f1870c;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.noticeBodyText");
@@ -414,27 +421,27 @@ public final class WidgetNoticeDialog extends AppDialog {
         LinkifiedTextView linkifiedTextView3 = getBinding().f1870c;
         m.checkNotNullExpressionValue(linkifiedTextView3, "binding.noticeBodyText");
         Bundle arguments5 = getArguments();
-        linkifiedTextView3.setTextAlignment(arguments5 != null ? arguments5.getInt("body_text_alignment") : 2);
+        linkifiedTextView3.setTextAlignment(arguments5 != null ? arguments5.getInt(ARG_BODY_TEXT_ALIGNMENT) : 2);
         MaterialButton materialButton = getBinding().g;
         m.checkNotNullExpressionValue(materialButton, "binding.noticeOk");
         Bundle arguments6 = getArguments();
-        ViewExtensions.setTextAndVisibilityBy(materialButton, arguments6 != null ? arguments6.getCharSequence("ok_text") : null);
+        ViewExtensions.setTextAndVisibilityBy(materialButton, arguments6 != null ? arguments6.getCharSequence(ARG_OK_TEXT) : null);
         Bundle arguments7 = getArguments();
         if (arguments7 != null) {
-            charSequence = arguments7.getCharSequence("cancel_text");
+            charSequence = arguments7.getCharSequence(ARG_CANCEL_TEXT);
         }
         MaterialButton materialButton2 = getBinding().d;
         m.checkNotNullExpressionValue(materialButton2, "binding.noticeCancel");
         ViewExtensions.setTextAndVisibilityBy(materialButton2, charSequence);
         Bundle arguments8 = getArguments();
         if (arguments8 != null) {
-            insertLayoutInBundle(arguments8, "above_layout_id", 0);
+            insertLayoutInBundle(arguments8, ARG_ABOVE_LAYOUT_ID, 0);
         }
         Bundle arguments9 = getArguments();
         if (arguments9 != null) {
             LinearLayout linearLayout2 = getBinding().b;
             m.checkNotNullExpressionValue(linearLayout2, "binding.noticeBodyContainer");
-            insertLayoutInBundle(arguments9, "below_layout_id", linearLayout2.getChildCount());
+            insertLayoutInBundle(arguments9, ARG_BELOW_LAYOUT_ID, linearLayout2.getChildCount());
         }
         getBinding().g.setOnClickListener(new WidgetNoticeDialog$onViewBound$4(this));
         getBinding().d.setOnClickListener(new WidgetNoticeDialog$onViewBound$5(this));
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java
index d311f57fc3..6b64037aeb 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.notice;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetNoticeNuxOverlayBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -17,11 +18,11 @@ public final /* synthetic */ class WidgetNoticeNuxOverlay$binding$2 extends k im
 
     public final WidgetNoticeNuxOverlayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362245;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362245);
+        int i = R.id.cancel_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.cancel_button);
         if (materialButton != null) {
-            i = 2131363133;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363133);
+            i = R.id.enable_button;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.enable_button);
             if (materialButton2 != null) {
                 return new WidgetNoticeNuxOverlayBinding((LinearLayout) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java
index d5686f4fc1..060d803b9d 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.notice;
 
 import android.view.View;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.widgets.settings.WidgetSettingsVoice;
 /* compiled from: WidgetNoticeNuxOverlay.kt */
 public final class WidgetNoticeNuxOverlay$onViewBound$1 implements View.OnClickListener {
@@ -13,7 +14,7 @@ public final class WidgetNoticeNuxOverlay$onViewBound$1 implements View.OnClickL
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsVoice.Companion.launch(a.x(view, "it", "it.context"), 2131365163, true);
+        WidgetSettingsVoice.Companion.launch(a.x(view, "it", "it.context"), Integer.valueOf((int) R.id.settings_voice_overlay_toggle), true);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java
index 99205abc11..d0a21bb578 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java
@@ -3,6 +3,7 @@ package com.discord.widgets.notice;
 import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetNoticeNuxOverlayBinding;
 import com.discord.stores.StoreNotices;
@@ -29,12 +30,12 @@ public final class WidgetNoticeNuxOverlay extends AppDialog {
         }
 
         public final void enqueue() {
-            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("NUX/Overlay", null, 0, 0, true, null, 0, false, 0, WidgetNoticeNuxOverlay$Companion$enqueue$notice$1.INSTANCE, 486, null));
+            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(WidgetNoticeNuxOverlay.NOTICE_NAME, null, 0, 0, true, null, 0, false, 0, WidgetNoticeNuxOverlay$Companion$enqueue$notice$1.INSTANCE, 486, null));
         }
     }
 
     public WidgetNoticeNuxOverlay() {
-        super(2131559154);
+        super(R.layout.widget_notice_nux_overlay);
     }
 
     private final WidgetNoticeNuxOverlayBinding getBinding() {
@@ -45,7 +46,7 @@ public final class WidgetNoticeNuxOverlay extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        StoreStream.Companion.getNotices().markDialogSeen("NUX/Overlay");
+        StoreStream.Companion.getNotices().markDialogSeen(NOTICE_NAME);
         getBinding().f1871c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this));
         getBinding().b.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$2(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.java
index b61b24053b..69c47cb9a7 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.notice;
 
+import com.discord.BuildConfig;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
@@ -32,8 +33,8 @@ public final class WidgetNoticeNuxSamsungLink$Companion$enqueue$2 extends o impl
     public final void invoke(Pair<Boolean, MeUser> pair) {
         MeUser component2 = pair.component2();
         if (!pair.component1().booleanValue()) {
-            m.checkNotNullParameter("canary", "flavorVendor");
-            if (!m.areEqual("canary", "samsung")) {
+            m.checkNotNullParameter(BuildConfig.FLAVOR_vendor, "flavorVendor");
+            if (!m.areEqual(BuildConfig.FLAVOR_vendor, "samsung")) {
                 StoreNotices.markSeen$default(StoreStream.Companion.getNotices(), "NUX/SamsungLink", 0, 2, null);
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java
index 6593437226..88039b8c59 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.notice;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetNoticeNuxSamsungLinkBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -17,11 +18,11 @@ public final /* synthetic */ class WidgetNoticeNuxSamsungLink$binding$2 extends
 
     public final WidgetNoticeNuxSamsungLinkBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362245;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362245);
+        int i = R.id.cancel_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.cancel_button);
         if (materialButton != null) {
-            i = 2131363133;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363133);
+            i = R.id.enable_button;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.enable_button);
             if (materialButton2 != null) {
                 return new WidgetNoticeNuxSamsungLinkBinding((LinearLayout) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.java
index 1ee23a7464..ea769612fc 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.notice;
 import android.content.Intent;
 import android.net.Uri;
 import android.view.View;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.intent.IntentUtils;
 import d0.z.d.m;
 /* compiled from: WidgetNoticeNuxSamsungLink.kt */
@@ -18,7 +19,7 @@ public final class WidgetNoticeNuxSamsungLink$onViewBound$2 implements View.OnCl
         WidgetNoticeNuxSamsungLink widgetNoticeNuxSamsungLink = this.this$0;
         Uri oauth2Authorize = IntentUtils.RouteBuilders.Uris.INSTANCE.getOauth2Authorize();
         m.checkNotNullParameter(oauth2Authorize, "oAuthUri");
-        widgetNoticeNuxSamsungLink.startActivity(new Intent("android.intent.action.VIEW", oauth2Authorize.buildUpon().appendQueryParameter("client_id", "591317049637339146").appendQueryParameter("prompt", "consent").appendQueryParameter("response_type", "code").appendQueryParameter("scope", "identify activities.read activities.write").build()));
+        widgetNoticeNuxSamsungLink.startActivity(new Intent("android.intent.action.VIEW", oauth2Authorize.buildUpon().appendQueryParameter("client_id", "591317049637339146").appendQueryParameter("prompt", "consent").appendQueryParameter("response_type", ModelAuditLogEntry.CHANGE_KEY_CODE).appendQueryParameter("scope", "identify activities.read activities.write").build()));
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java
index 3f477e04b4..77acb356b4 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java
@@ -4,7 +4,9 @@ import android.content.Context;
 import android.os.Build;
 import android.view.View;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetNoticeNuxSamsungLinkBinding;
 import com.discord.stores.StoreNotices;
@@ -43,7 +45,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog {
         }
 
         private final void internalEnqueue() {
-            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice("NUX/SamsungLink", null, 0, 0, true, null, 0, false, Long.MAX_VALUE, WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1.INSTANCE, 230, null));
+            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(WidgetNoticeNuxSamsungLink.NOTICE_NAME, null, 0, 0, true, null, 0, false, RecyclerView.FOREVER_NS, WidgetNoticeNuxSamsungLink$Companion$internalEnqueue$notice$1.INSTANCE, 230, null));
         }
 
         /* JADX WARNING: Code restructure failed: missing block: B:10:0x002e, code lost:
@@ -74,7 +76,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog {
     }
 
     public WidgetNoticeNuxSamsungLink() {
-        super(2131559155);
+        super(R.layout.widget_notice_nux_samsung_link);
     }
 
     private final WidgetNoticeNuxSamsungLinkBinding getBinding() {
@@ -85,7 +87,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        StoreStream.Companion.getNotices().markDialogSeen("NUX/SamsungLink");
+        StoreStream.Companion.getNotices().markDialogSeen(NOTICE_NAME);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getOAuthTokens(), false, 1, null)), 0, false, 1, null), this, null, 2, null), WidgetNoticeNuxSamsungLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetNoticeNuxSamsungLink$onViewBound$1(this), 62, (Object) null);
         getBinding().f1872c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this));
         getBinding().b.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$3(this));
diff --git a/app/src/main/java/com/discord/widgets/nux/GuildTemplate.java b/app/src/main/java/com/discord/widgets/nux/GuildTemplate.java
index 823d9df103..8a35c8869b 100644
--- a/app/src/main/java/com/discord/widgets/nux/GuildTemplate.java
+++ b/app/src/main/java/com/discord/widgets/nux/GuildTemplate.java
@@ -2,22 +2,23 @@ package com.discord.widgets.nux;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
+import com.discord.R;
 import com.discord.widgets.guilds.create.StockGuildTemplate;
 /* compiled from: GuildTemplates.kt */
 public enum GuildTemplate {
-    CreateMyOwn(2131890215, 2131231154, StockGuildTemplate.CREATE),
-    Gaming(2131890219, 2131231157, StockGuildTemplate.GAMING_GROUP),
-    SchoolClub(2131890221, 2131231152, StockGuildTemplate.CLUB),
-    StudyGroup(2131890223, 2131231158, StockGuildTemplate.STUDY_GROUP),
-    Friends(2131890218, 2131231156, StockGuildTemplate.FRIEND_GROUP),
-    ArtistsAndCreators(2131890216, 2131231155, StockGuildTemplate.CONTENT_CREATOR),
-    LocalCommunity(2131890214, 2131231153, StockGuildTemplate.LOCAL_COMMUNITY),
-    HubStudyGroup(2131890223, 2131231156, StockGuildTemplate.HUB_STUDY_GROUP),
-    HubSchoolClub(2131890221, 2131231153, StockGuildTemplate.HUB_SCHOOL_CLUB),
-    Class(2131890212, 2131231158, StockGuildTemplate.CLASS),
-    Social(2131890222, 2131231157, StockGuildTemplate.SOCIAL),
-    SubjectOrMajor(2131890220, 2131231152, StockGuildTemplate.MAJOR),
-    Dorm(2131890217, 2131231155, StockGuildTemplate.DORM);
+    CreateMyOwn(R.string.guild_template_header_create, R.drawable.drawable_guild_template_create, StockGuildTemplate.CREATE),
+    Gaming(R.string.guild_template_header_gaming, R.drawable.drawable_guild_template_gaming, StockGuildTemplate.GAMING_GROUP),
+    SchoolClub(R.string.guild_template_header_school_club, R.drawable.drawable_guild_template_club, StockGuildTemplate.CLUB),
+    StudyGroup(R.string.guild_template_header_study, R.drawable.drawable_guild_template_study, StockGuildTemplate.STUDY_GROUP),
+    Friends(R.string.guild_template_header_friend, R.drawable.drawable_guild_template_friend, StockGuildTemplate.FRIEND_GROUP),
+    ArtistsAndCreators(R.string.guild_template_header_creator, R.drawable.drawable_guild_template_creator, StockGuildTemplate.CONTENT_CREATOR),
+    LocalCommunity(R.string.guild_template_header_community, R.drawable.drawable_guild_template_community, StockGuildTemplate.LOCAL_COMMUNITY),
+    HubStudyGroup(R.string.guild_template_header_study, R.drawable.drawable_guild_template_friend, StockGuildTemplate.HUB_STUDY_GROUP),
+    HubSchoolClub(R.string.guild_template_header_school_club, R.drawable.drawable_guild_template_community, StockGuildTemplate.HUB_SCHOOL_CLUB),
+    Class(R.string.guild_template_header_class, R.drawable.drawable_guild_template_study, StockGuildTemplate.CLASS),
+    Social(R.string.guild_template_header_social, R.drawable.drawable_guild_template_gaming, StockGuildTemplate.SOCIAL),
+    SubjectOrMajor(R.string.guild_template_header_major, R.drawable.drawable_guild_template_club, StockGuildTemplate.MAJOR),
+    Dorm(R.string.guild_template_header_dorm, R.drawable.drawable_guild_template_creator, StockGuildTemplate.DORM);
     
     private final int drawableRes;
     private final StockGuildTemplate templateType;
diff --git a/app/src/main/java/com/discord/widgets/nux/GuildTemplateAnalytics.java b/app/src/main/java/com/discord/widgets/nux/GuildTemplateAnalytics.java
index 8c9a9fa990..b6c2bffcd9 100644
--- a/app/src/main/java/com/discord/widgets/nux/GuildTemplateAnalytics.java
+++ b/app/src/main/java/com/discord/widgets/nux/GuildTemplateAnalytics.java
@@ -19,12 +19,12 @@ public final class GuildTemplateAnalytics {
 
     public final void postRegistrationSkip$app_productionCanaryRelease(String str) {
         m.checkNotNullParameter(str, "fromStep");
-        AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, "Mobile NUX Post Reg", str, "Friends List", null, true, 8, null);
+        AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, FLOW_TYPE_POST_REG, str, STEP_FRIENDS_LIST, null, true, 8, null);
     }
 
     public final void postRegistrationTransition$app_productionCanaryRelease(String str, String str2) {
         m.checkNotNullParameter(str, "fromStep");
         m.checkNotNullParameter(str2, "toStep");
-        AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, "Mobile NUX Post Reg", str, str2, null, false, 24, null);
+        AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, FLOW_TYPE_POST_REG, str, str2, null, false, 24, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/GuildTemplateCardViewHolder.java b/app/src/main/java/com/discord/widgets/nux/GuildTemplateCardViewHolder.java
index dd5bab7d92..19b54daf06 100644
--- a/app/src/main/java/com/discord/widgets/nux/GuildTemplateCardViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/nux/GuildTemplateCardViewHolder.java
@@ -2,6 +2,7 @@ package com.discord.widgets.nux;
 
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.NuxGuildTemplateCardViewHolderBinding;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.widgets.nux.GuildTemplatesAdapter;
@@ -24,7 +25,7 @@ public final class GuildTemplateCardViewHolder extends RecyclerView.ViewHolder {
         m.checkNotNullParameter(guildTemplate, "guildTemplate");
         TextView textView = this.binding.f1621c;
         textView.setText(guildTemplate.getTitleRes());
-        DrawableCompat.setCompoundDrawablesCompat(textView, guildTemplate.getDrawableRes(), 0, 2131232121, 0);
+        DrawableCompat.setCompoundDrawablesCompat(textView, guildTemplate.getDrawableRes(), 0, (int) R.drawable.icon_carrot, 0);
         this.binding.b.setOnClickListener(new GuildTemplateCardViewHolder$bind$2(this, guildTemplate));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/nux/GuildTemplatesAdapter.java b/app/src/main/java/com/discord/widgets/nux/GuildTemplatesAdapter.java
index 21132704c3..49857b4b9b 100644
--- a/app/src/main/java/com/discord/widgets/nux/GuildTemplatesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/nux/GuildTemplatesAdapter.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.NuxGuildTemplateCardViewHolderBinding;
 import com.discord.databinding.NuxGuildTemplateTextViewHolderBinding;
 import com.discord.widgets.nux.GuildTemplateViewType;
@@ -70,21 +71,21 @@ public final class GuildTemplatesAdapter extends RecyclerView.Adapter<RecyclerVi
         m.checkNotNullParameter(viewGroup, "parent");
         GuildTemplateViewType.Companion companion = GuildTemplateViewType.Companion;
         if (i == companion.getTEXT()) {
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558620, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.nux_guild_template_text_view_holder, viewGroup, false);
             Objects.requireNonNull(inflate, "rootView");
             NuxGuildTemplateTextViewHolderBinding nuxGuildTemplateTextViewHolderBinding = new NuxGuildTemplateTextViewHolderBinding((TextView) inflate);
             m.checkNotNullExpressionValue(nuxGuildTemplateTextViewHolderBinding, "NuxGuildTemplateTextView…          false\n        )");
             return new GuildTemplateTextViewHolder(nuxGuildTemplateTextViewHolderBinding);
         } else if (i == companion.getTEMPLATE()) {
-            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131558619, viewGroup, false);
+            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.nux_guild_template_card_view_holder, viewGroup, false);
             MaterialCardView materialCardView = (MaterialCardView) inflate2;
-            TextView textView = (TextView) inflate2.findViewById(2131364279);
+            TextView textView = (TextView) inflate2.findViewById(R.id.nux_guild_template_text);
             if (textView != null) {
                 NuxGuildTemplateCardViewHolderBinding nuxGuildTemplateCardViewHolderBinding = new NuxGuildTemplateCardViewHolderBinding((MaterialCardView) inflate2, materialCardView, textView);
                 m.checkNotNullExpressionValue(nuxGuildTemplateCardViewHolderBinding, "NuxGuildTemplateCardView…          false\n        )");
                 return new GuildTemplateCardViewHolder(nuxGuildTemplateCardViewHolderBinding, this.callbacks);
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(2131364279)));
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(R.id.nux_guild_template_text)));
         } else {
             throw new IllegalStateException(a.j("Missing view type for ", i));
         }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$adapter$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$adapter$1.java
index 5c2c4abbb9..1c92ad3c34 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$adapter$1.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$adapter$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.nux;
 
+import com.discord.R;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.widgets.guilds.create.StockGuildTemplate;
 import com.discord.widgets.guilds.create.WidgetCreationIntent;
@@ -17,13 +18,13 @@ public final class WidgetGuildTemplates$adapter$1 implements GuildTemplatesAdapt
     @Override // com.discord.widgets.nux.GuildTemplatesAdapter.Callbacks
     public void onTemplateClick(GuildTemplate guildTemplate) {
         m.checkNotNullParameter(guildTemplate, "guildTemplate");
-        WidgetGuildCreate.Options options = new WidgetGuildCreate.Options(WidgetGuildTemplates.access$getArgs$p(this.this$0).getLocation(), guildTemplate.getTemplateType(), guildTemplate.getTemplateType() == StockGuildTemplate.CREATE, this.this$0.getString(2131889235), WidgetGuildTemplates.access$getArgs$p(this.this$0).getCloseWithResult());
+        WidgetGuildCreate.Options options = new WidgetGuildCreate.Options(WidgetGuildTemplates.access$getArgs$p(this.this$0).getLocation(), guildTemplate.getTemplateType(), guildTemplate.getTemplateType() == StockGuildTemplate.CREATE, this.this$0.getString(R.string.guild_create_title), WidgetGuildTemplates.access$getArgs$p(this.this$0).getCloseWithResult());
         if (WidgetGuildTemplates.access$getArgs$p(this.this$0).getGuildTemplate().getSkipCreationIntent()) {
             AnalyticsTracker.openModal$default("Create Guild Step 2", options.getAnalyticsLocation(), null, 4, null);
             WidgetGuildCreate.Companion.showFragment(this.this$0, options);
             return;
         }
-        WidgetGuildTemplates.access$trackPostRegistrationTransition(this.this$0, "Guild Template", "Server Intent Discovery");
+        WidgetGuildTemplates.access$trackPostRegistrationTransition(this.this$0, GuildTemplateAnalytics.STEP_GUILD_TEMPLATE, GuildTemplateAnalytics.STEP_CREATION_INTENT);
         WidgetCreationIntent.Companion companion = WidgetCreationIntent.Companion;
         WidgetGuildTemplates widgetGuildTemplates = this.this$0;
         companion.show(widgetGuildTemplates, WidgetGuildTemplates.access$getArgs$p(widgetGuildTemplates).getTrigger(), options);
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java
index 7024705cab..555323e41a 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetNuxGuildTemplateBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetGuildTemplates$binding$2 extends k impl
 
     public final WidgetNuxGuildTemplateBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364274;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364274);
+        int i = R.id.nux_guild_template_action_join;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.nux_guild_template_action_join);
         if (materialButton != null) {
-            i = 2131364276;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364276);
+            i = R.id.nux_guild_template_section_bottom;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.nux_guild_template_section_bottom);
             if (linearLayout != null) {
-                i = 2131364277;
-                TextView textView = (TextView) view.findViewById(2131364277);
+                i = R.id.nux_guild_template_section_custom_label;
+                TextView textView = (TextView) view.findViewById(R.id.nux_guild_template_section_custom_label);
                 if (textView != null) {
-                    i = 2131364278;
-                    TextView textView2 = (TextView) view.findViewById(2131364278);
+                    i = R.id.nux_guild_template_section_title;
+                    TextView textView2 = (TextView) view.findViewById(R.id.nux_guild_template_section_title);
                     if (textView2 != null) {
-                        i = 2131364624;
-                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+                        i = R.id.recycler_view;
+                        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
                         if (recyclerView != null) {
                             return new WidgetNuxGuildTemplateBinding((LinearLayout) view, materialButton, linearLayout, textView, textView2, recyclerView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$3.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$3.java
index cd5da4d089..cba56047ff 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$3.java
@@ -12,7 +12,7 @@ public final class WidgetGuildTemplates$onViewBound$3 implements View.OnClickLis
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetGuildTemplates.access$trackPostRegistrationTransition(this.this$0, "Guild Template", "Guild Join");
+        WidgetGuildTemplates.access$trackPostRegistrationTransition(this.this$0, GuildTemplateAnalytics.STEP_GUILD_TEMPLATE, GuildTemplateAnalytics.STEP_GUILD_JOIN);
         WidgetNuxPostRegistrationJoin.Companion.show(this.this$0.requireContext());
         FragmentActivity activity = this.this$0.getActivity();
         if (activity != null) {
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java
index 8808d3b467..152212acfc 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetNuxGuildTemplateBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -42,10 +43,10 @@ public final class WidgetGuildTemplates extends AppFragment {
         public final void launch(Context context, CreateGuildTrigger createGuildTrigger, boolean z2) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(createGuildTrigger, "trigger");
-            String str = z2 ? "Guild Template" : "Create or Join Guild Modal";
-            String string = context.getString(2131890312);
+            String str = z2 ? GuildTemplateAnalytics.STEP_GUILD_TEMPLATE : GuildTemplateAnalytics.IN_APP_LOCATION_TEMPLATE;
+            String string = context.getString(R.string.guild_template_selector_title);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…_template_selector_title)");
-            String string2 = context.getString(2131890309);
+            String string2 = context.getString(R.string.guild_template_selector_description);
             m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ate_selector_description)");
             launch(context, new GuildCreateArgs(z2, str, createGuildTrigger, new GuildTemplateArgs(string, string2, null, false, false, 28, null), false, 16, null));
         }
@@ -58,7 +59,7 @@ public final class WidgetGuildTemplates extends AppFragment {
     }
 
     public WidgetGuildTemplates() {
-        super(2131559158);
+        super(R.layout.widget_nux_guild_template);
     }
 
     public static final /* synthetic */ GuildCreateArgs access$getArgs$p(WidgetGuildTemplates widgetGuildTemplates) {
@@ -83,7 +84,7 @@ public final class WidgetGuildTemplates extends AppFragment {
 
     private final void trackPostRegistrationSkip() {
         if (getArgs().isNux()) {
-            GuildTemplateAnalytics.INSTANCE.postRegistrationSkip$app_productionCanaryRelease("Guild Template");
+            GuildTemplateAnalytics.INSTANCE.postRegistrationSkip$app_productionCanaryRelease(GuildTemplateAnalytics.STEP_GUILD_TEMPLATE);
         }
     }
 
@@ -97,7 +98,7 @@ public final class WidgetGuildTemplates extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        trackPostRegistrationTransition("Registration", "Guild Template");
+        trackPostRegistrationTransition(GuildTemplateAnalytics.STEP_REGISTRATION, GuildTemplateAnalytics.STEP_GUILD_TEMPLATE);
         int i = 0;
         AppFragment.setOnBackPressed$default(this, new WidgetGuildTemplates$onViewBound$1(this), 0, 2, null);
         RecyclerView recyclerView = getBinding().f;
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java
index 8effbb95f1..21eae24918 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.viewpager2.widget.ViewPager2;
+import com.discord.R;
 import com.discord.databinding.WidgetNavigationHelpBinding;
 import com.google.android.material.tabs.TabLayout;
 import d0.z.d.k;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetNavigationHelp$binding$2 extends k impl
 
     public final WidgetNavigationHelpBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364215;
-        ImageView imageView = (ImageView) view.findViewById(2131364215);
+        int i = R.id.navigation_help_close;
+        ImageView imageView = (ImageView) view.findViewById(R.id.navigation_help_close);
         if (imageView != null) {
-            i = 2131364216;
-            TabLayout tabLayout = (TabLayout) view.findViewById(2131364216);
+            i = R.id.navigation_help_indicators;
+            TabLayout tabLayout = (TabLayout) view.findViewById(R.id.navigation_help_indicators);
             if (tabLayout != null) {
-                i = 2131364217;
-                ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131364217);
+                i = R.id.navigation_help_nux_pager;
+                ViewPager2 viewPager2 = (ViewPager2) view.findViewById(R.id.navigation_help_nux_pager);
                 if (viewPager2 != null) {
                     return new WidgetNavigationHelpBinding((LinearLayout) view, imageView, tabLayout, viewPager2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java
index 6a88e77ce8..3c933fc9fc 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java
@@ -10,6 +10,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.MarginPageTransformer;
 import androidx.viewpager2.widget.ViewPager2;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetNavigationHelpBinding;
@@ -63,11 +64,11 @@ public final class WidgetNavigationHelp extends AppDialog {
         public Fragment createFragment(int i) {
             int i2;
             if (i == 0) {
-                i2 = 2131559152;
+                i2 = R.layout.widget_navigation_help_nux_guilds;
             } else if (i == 1) {
-                i2 = 2131559150;
+                i2 = R.layout.widget_navigation_help_nux_channels;
             } else if (i == 2) {
-                i2 = 2131559151;
+                i2 = R.layout.widget_navigation_help_nux_dms;
             } else {
                 throw new IllegalStateException(a.j("unknown nux page: ", i));
             }
@@ -81,7 +82,7 @@ public final class WidgetNavigationHelp extends AppDialog {
     }
 
     public WidgetNavigationHelp() {
-        super(2131559149);
+        super(R.layout.widget_navigation_help);
     }
 
     private final WidgetNavigationHelpBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java
index 4261502bfb..daf6dcc672 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.appcompat.widget.Toolbar;
+import com.discord.R;
 import com.discord.databinding.WidgetNuxChannelPromptBinding;
 import com.discord.views.LoadingButton;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -21,26 +22,26 @@ public final /* synthetic */ class WidgetNuxChannelPrompt$binding$2 extends k im
 
     public final WidgetNuxChannelPromptBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364267;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364267);
+        int i = R.id.nuf_channel_prompt_cta_button;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.nuf_channel_prompt_cta_button);
         if (loadingButton != null) {
-            i = 2131364268;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364268);
+            i = R.id.nuf_channel_prompt_guild_icon;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.nuf_channel_prompt_guild_icon);
             if (simpleDraweeView != null) {
-                i = 2131364269;
-                TextView textView = (TextView) view.findViewById(2131364269);
+                i = R.id.nuf_channel_prompt_guild_icon_name;
+                TextView textView = (TextView) view.findViewById(R.id.nuf_channel_prompt_guild_icon_name);
                 if (textView != null) {
-                    i = 2131364270;
-                    TextView textView2 = (TextView) view.findViewById(2131364270);
+                    i = R.id.nuf_channel_prompt_guild_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.nuf_channel_prompt_guild_name);
                     if (textView2 != null) {
-                        i = 2131364271;
-                        TextView textView3 = (TextView) view.findViewById(2131364271);
+                        i = R.id.nuf_channel_prompt_skip_button;
+                        TextView textView3 = (TextView) view.findViewById(R.id.nuf_channel_prompt_skip_button);
                         if (textView3 != null) {
-                            i = 2131364272;
-                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364272);
+                            i = R.id.nuf_channel_prompt_topic_wrap;
+                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.nuf_channel_prompt_topic_wrap);
                             if (textInputLayout != null) {
-                                i = 2131365569;
-                                Toolbar toolbar = (Toolbar) view.findViewById(2131365569);
+                                i = R.id.toolbar;
+                                Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
                                 if (toolbar != null) {
                                     return new WidgetNuxChannelPromptBinding((RelativeLayout) view, loadingButton, simpleDraweeView, textView, textView2, textView3, textInputLayout, toolbar);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java
index 12659d57c2..8b711a6342 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.nux;
 
 import c.a.e.q;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.error.Error;
@@ -83,6 +84,6 @@ public final class WidgetNuxChannelPrompt$handleSubmit$1 extends o implements Fu
         TextInputLayout textInputLayout = WidgetNuxChannelPrompt.access$getBinding$p(this.this$0).g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.nufChannelPromptTopicWrap");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
-        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.r()), null, b.k(this.this$0, 2131891902, new Object[]{textOrEmpty}, null, 4).toString())), false, 1, null), this.this$0, null, 2, null).k(q.a.g(this.this$0.requireContext(), new AnonymousClass1(this), new AnonymousClass2(this)));
+        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.r()), null, b.k(this.this$0, R.string.nuf_channel_prompt_channel_topic_template, new Object[]{textOrEmpty}, null, 4).toString())), false, 1, null), this.this$0, null, 2, null).k(q.a.g(this.this$0.requireContext(), new AnonymousClass1(this), new AnonymousClass2(this)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.java
index 1a3155be8e..d9ad1a340e 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$validationManager$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.nux;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.view.validators.Input;
 import com.discord.utilities.view.validators.InputValidator;
 import com.discord.utilities.view.validators.ValidationManager;
@@ -22,6 +23,6 @@ public final class WidgetNuxChannelPrompt$validationManager$2 extends o implemen
     public final ValidationManager mo1invoke() {
         TextInputLayout textInputLayout = WidgetNuxChannelPrompt.access$getBinding$p(this.this$0).g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.nufChannelPromptTopicWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("name", textInputLayout, new InputValidator[0]));
+        return new ValidationManager(new Input.TextInputLayoutInput(ModelAuditLogEntry.CHANGE_KEY_NAME, textInputLayout, new InputValidator[0]));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
index c9e190d394..45746dc0a4 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetNuxChannelPromptBinding;
 import com.discord.models.guild.Guild;
@@ -59,7 +60,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
     }
 
     public WidgetNuxChannelPrompt() {
-        super(2131559157);
+        super(R.layout.widget_nux_channel_prompt);
     }
 
     public static final /* synthetic */ void access$finishActivity(WidgetNuxChannelPrompt widgetNuxChannelPrompt, long j) {
@@ -80,14 +81,14 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
 
     private final void finishActivity(long j) {
         if (GuildInviteShareSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) {
-            WidgetGuildInviteShareSheet.Companion.enqueueNoticeForHomeTab$default(WidgetGuildInviteShareSheet.Companion, null, j, "Guild Create", 1, null);
+            WidgetGuildInviteShareSheet.Companion.enqueueNoticeForHomeTab$default(WidgetGuildInviteShareSheet.Companion, null, j, GuildTemplateAnalytics.STEP_GUILD_CREATE, 1, null);
             l.c(requireContext(), false, null, 6);
         } else {
             WidgetGuildInviteShare.Companion companion = WidgetGuildInviteShare.Companion;
             Context requireContext = requireContext();
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            companion.launch(requireContext, parentFragmentManager, j, null, true, "Guild Create");
+            companion.launch(requireContext, parentFragmentManager, j, null, true, GuildTemplateAnalytics.STEP_GUILD_CREATE);
         }
         requireActivity().finish();
     }
@@ -102,7 +103,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
 
     private final void handleGuild(Guild guild) {
         if (guild != null) {
-            String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(guild.getId()), guild.getIcon(), null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165290))), 4, null);
+            String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(guild.getId()), guild.getIcon(), null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.avatar_size_large))), 4, null);
             if (forGuild$default != null) {
                 TextView textView = getBinding().d;
                 m.checkNotNullExpressionValue(textView, "binding.nufChannelPromptGuildIconName");
@@ -119,7 +120,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
                 textView3.setText(guild.getShortName());
                 SimpleDraweeView simpleDraweeView2 = getBinding().f1874c;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.nufChannelPromptGuildIcon");
-                IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon.jpg", 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
+                IconUtils.setIcon$default(simpleDraweeView2, IconUtils.DEFAULT_ICON, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
             }
             TextView textView4 = getBinding().e;
             m.checkNotNullExpressionValue(textView4, "binding.nufChannelPromptGuildName");
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java
index 45f9f343f0..9c63283fda 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.nux;
 
 import android.text.Editable;
+import com.discord.R;
 import d0.g0.t;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -26,6 +27,6 @@ public final class WidgetNuxPostRegistrationJoin$onViewBound$2 extends o impleme
 
     public final void invoke(Editable editable) {
         m.checkNotNullParameter(editable, "editable");
-        this.this$0.getBinding().b.setText(t.isBlank(editable) ? 2131891961 : 2131890951);
+        this.this$0.getBinding().b.setText(t.isBlank(editable) ? R.string.nux_post_reg_join_server_skip : R.string.join);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java
index b8e6fd987a..6da46475b5 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java
@@ -3,6 +3,7 @@ package com.discord.widgets.nux;
 import android.content.Context;
 import android.view.View;
 import c.a.e.l;
+import com.discord.R;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -32,7 +33,7 @@ public final class WidgetNuxPostRegistrationJoin extends WidgetGuildJoin {
     }
 
     public WidgetNuxPostRegistrationJoin() {
-        super(2131559159);
+        super(R.layout.widget_nux_post_registration);
     }
 
     public static final /* synthetic */ void access$handleGuildJoin(WidgetNuxPostRegistrationJoin widgetNuxPostRegistrationJoin) {
@@ -44,7 +45,7 @@ public final class WidgetNuxPostRegistrationJoin extends WidgetGuildJoin {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setActionBarDisplayHomeAsUpEnabled(false);
-        AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, "Mobile NUX Post Reg", "Registration", "Ask to join", null, false, 24, null);
+        AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, NUX_FLOW_TYPE, GuildTemplateAnalytics.STEP_REGISTRATION, NUX_STEP, null, false, 24, null);
         getBinding().b.setOnClickListener(new WidgetNuxPostRegistrationJoin$onViewBound$1(this, ClockFactory.get().currentTimeMillis()));
         TextInputLayout textInputLayout = getBinding().f1829c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite");
diff --git a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java
index 0b9cd29346..6483d6a17d 100644
--- a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java
+++ b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetPhoneCountryCodeListItemBinding;
 import com.discord.models.phone.PhoneCountryCode;
 import d0.t.n;
@@ -40,18 +41,18 @@ public final class PhoneCountryCodeAdapter extends RecyclerView.Adapter<PhoneCou
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public PhoneCountryCodeAdapterItem onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559164, viewGroup, false);
-        int i2 = 2131364434;
-        TextView textView = (TextView) inflate.findViewById(2131364434);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.widget_phone_country_code_list_item, viewGroup, false);
+        int i2 = R.id.phone_country_code_code;
+        TextView textView = (TextView) inflate.findViewById(R.id.phone_country_code_code);
         if (textView != null) {
             ConstraintLayout constraintLayout = (ConstraintLayout) inflate;
-            TextView textView2 = (TextView) inflate.findViewById(2131364436);
+            TextView textView2 = (TextView) inflate.findViewById(R.id.phone_country_code_name);
             if (textView2 != null) {
                 WidgetPhoneCountryCodeListItemBinding widgetPhoneCountryCodeListItemBinding = new WidgetPhoneCountryCodeListItemBinding(constraintLayout, textView, constraintLayout, textView2);
                 m.checkNotNullExpressionValue(widgetPhoneCountryCodeListItemBinding, "WidgetPhoneCountryCodeLi….context), parent, false)");
                 return new PhoneCountryCodeAdapterItem(this, widgetPhoneCountryCodeListItemBinding);
             }
-            i2 = 2131364436;
+            i2 = R.id.phone_country_code_name;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
     }
diff --git a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java
index a54629f16b..a11aeb3210 100644
--- a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.phone;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetPhoneCountryCodeBottomSheetBinding;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetPhoneCountryCodeBottomSheet$binding$2 e
 
     public final WidgetPhoneCountryCodeBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364437;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364437);
+        int i = R.id.phone_country_code_recycler;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.phone_country_code_recycler);
         if (recyclerView != null) {
-            i = 2131364438;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364438);
+            i = R.id.phone_country_code_search;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.phone_country_code_search);
             if (textInputLayout != null) {
                 return new WidgetPhoneCountryCodeBottomSheetBinding((LinearLayout) view, recyclerView, textInputLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
index ec7460ae19..a86ee49c3c 100644
--- a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetPhoneCountryCodeBottomSheetBinding;
 import com.discord.models.phone.PhoneCountryCode;
@@ -106,7 +107,7 @@ public final class WidgetPhoneCountryCodeBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559163;
+        return R.layout.widget_phone_country_code_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java
index 6731d903b8..8ae323134f 100644
--- a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.quickmentions;
 import android.view.View;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewpager2.widget.ViewPager2;
+import com.discord.R;
 import com.discord.databinding.WidgetQuickMentionsDialogBinding;
 import com.google.android.material.tabs.TabLayout;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetQuickMentionsDialog$binding$2 extends k
 
     public final WidgetQuickMentionsDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365425;
-        ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131365425);
+        int i = R.id.tab_contents;
+        ViewPager2 viewPager2 = (ViewPager2) view.findViewById(R.id.tab_contents);
         if (viewPager2 != null) {
-            i = 2131365426;
-            TabLayout tabLayout = (TabLayout) view.findViewById(2131365426);
+            i = R.id.tabs;
+            TabLayout tabLayout = (TabLayout) view.findViewById(R.id.tabs);
             if (tabLayout != null) {
                 return new WidgetQuickMentionsDialogBinding((ConstraintLayout) view, viewPager2, tabLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
index 74e87d336e..3150363811 100644
--- a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
+++ b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
@@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetQuickMentionsDialogBinding;
 import com.discord.utilities.accessibility.AccessibilityUtils;
@@ -69,7 +70,7 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             dismiss(fragmentManager);
             WidgetQuickMentionsDialog widgetQuickMentionsDialog = new WidgetQuickMentionsDialog();
-            widgetQuickMentionsDialog.setArguments(BundleKt.bundleOf(o.to("EXTRA_SEARCH_TEXT", str)));
+            widgetQuickMentionsDialog.setArguments(BundleKt.bundleOf(o.to(WidgetGlobalSearch.EXTRA_SEARCH_TEXT, str)));
             widgetQuickMentionsDialog.show(fragmentManager, "javaClass");
             AnalyticsTracker.INSTANCE.quickSwitcherOpen();
         }
@@ -104,17 +105,17 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
 
         public final int getItemTitleResId(int i) {
             if (i == 0) {
-                return 2131893434;
+                return R.string.search;
             }
             if (i == 1) {
-                return 2131891472;
+                return R.string.mentions;
             }
             throw new UnsupportedOperationException();
         }
     }
 
     public WidgetQuickMentionsDialog() {
-        super(2131559172);
+        super(R.layout.widget_quick_mentions_dialog);
     }
 
     private final WidgetQuickMentionsDialogBinding getBinding() {
@@ -127,7 +128,7 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
 
     @Override // com.discord.app.AppDialog, androidx.fragment.app.DialogFragment
     public Dialog onCreateDialog(Bundle bundle) {
-        setStyle(0, 2131951654);
+        setStyle(0, R.style.AppTheme_GlobalSearchDialog);
         return super.onCreateDialog(bundle);
     }
 
@@ -138,7 +139,7 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
         Dialog dialog = getDialog();
         if (dialog != null && (window = dialog.getWindow()) != null) {
             if (!AccessibilityUtils.INSTANCE.isReducedMotionEnabled()) {
-                window.getAttributes().windowAnimations = 2131952482;
+                window.getAttributes().windowAnimations = R.style.UiKit_QuickSwitcher_Animation;
             }
             window.setLayout(-1, -1);
             window.setBackgroundDrawable(new ColorDrawable(0));
@@ -150,7 +151,7 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getDismissViewModel().getDismissEvents(), this, null, 2, null), WidgetQuickMentionsDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetQuickMentionsDialog$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        TabsAdapter tabsAdapter = new TabsAdapter(this, requireArguments().getString("EXTRA_SEARCH_TEXT"));
+        TabsAdapter tabsAdapter = new TabsAdapter(this, requireArguments().getString(WidgetGlobalSearch.EXTRA_SEARCH_TEXT));
         ViewPager2 viewPager2 = getBinding().b;
         m.checkNotNullExpressionValue(viewPager2, "binding.tabContents");
         viewPager2.setAdapter(tabsAdapter);
diff --git a/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java
index 8dd3fd962f..2863d72256 100644
--- a/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.View;
 import c.a.e.o;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import d0.z.d.m;
 /* compiled from: RolesListView.kt */
@@ -24,6 +25,6 @@ public final class RolesListView$updateView$$inlined$forEach$lambda$1 implements
     public final void onClick(View view) {
         Context context = this.this$0.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        o.b(context, String.valueOf(this.$role.getId()), b.j(this.this$0, 2131893108, new Object[]{this.$role.f()}, null, 4));
+        o.b(context, String.valueOf(this.$role.getId()), b.j(this.this$0, R.string.role_id_copied, new Object[]{this.$role.f()}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/roles/RolesListView.java b/app/src/main/java/com/discord/widgets/roles/RolesListView.java
index 08d045bf1e..afcf53ea55 100644
--- a/app/src/main/java/com/discord/widgets/roles/RolesListView.java
+++ b/app/src/main/java/com/discord/widgets/roles/RolesListView.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import c.a.j.r;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.color.ColorCompat;
@@ -47,7 +48,7 @@ public final class RolesListView extends ChipGroup {
             this.roles = list;
             removeAllViews();
             for (GuildRole guildRole : list) {
-                View inflate = LayoutInflater.from(getContext()).inflate(2131558518, (ViewGroup) null, false);
+                View inflate = LayoutInflater.from(getContext()).inflate(R.layout.guild_role_chip, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 Chip chip = (Chip) inflate;
                 m.checkNotNullExpressionValue(new r(chip), "GuildRoleChipBinding.inf…om(context), null, false)");
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java
index d3c331cb5a..3ccec647e8 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.search;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.FragmentContainerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSearchBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -19,17 +20,17 @@ public final /* synthetic */ class WidgetSearch$binding$2 extends k implements F
 
     public final WidgetSearchBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364777;
-        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364777);
+        int i = R.id.search_send_query_fab;
+        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.search_send_query_fab);
         if (floatingActionButton != null) {
-            i = 2131365904;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365904);
+            i = R.id.widget_search_input;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.widget_search_input);
             if (textInputLayout != null) {
-                i = 2131365905;
-                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365905);
+                i = R.id.widget_search_results;
+                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.widget_search_results);
                 if (fragmentContainerView != null) {
-                    i = 2131365906;
-                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365906);
+                    i = R.id.widget_search_suggestions;
+                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(R.id.widget_search_suggestions);
                     if (fragmentContainerView2 != null) {
                         return new WidgetSearchBinding((CoordinatorLayout) view, floatingActionButton, textInputLayout, fragmentContainerView, fragmentContainerView2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$2.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$2.java
index 847e7eb2ce..b7a7e495be 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$2.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.search;
 
 import android.text.Editable;
+import androidx.core.app.NotificationCompat;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -23,7 +24,7 @@ public final class WidgetSearch$configureSearchInput$2 extends o implements Func
     }
 
     public final void invoke(Editable editable) {
-        m.checkNotNullParameter(editable, "text");
+        m.checkNotNullParameter(editable, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         StoreStream.Companion.getSearch().getStoreSearchInput().updateInput(editable.toString());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
index 3ae7448769..fb2dd924cb 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
@@ -9,6 +9,7 @@ import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -52,7 +53,7 @@ public final class WidgetSearch extends AppFragment {
         }
 
         private final void launch(long j, int i, Context context) {
-            Intent putExtra = new Intent().putExtra("INTENT_EXTRA_TARGET_ID", j).putExtra("INTENT_EXTRA_SEARCH_TYPE", i);
+            Intent putExtra = new Intent().putExtra(WidgetSearch.INTENT_EXTRA_TARGET_ID, j).putExtra(WidgetSearch.INTENT_EXTRA_TARGET_TYPE, i);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…_TARGET_TYPE, targetType)");
             l.d(context, WidgetSearch.class, putExtra);
         }
@@ -211,7 +212,7 @@ public final class WidgetSearch extends AppFragment {
     }
 
     public WidgetSearch() {
-        super(2131559178);
+        super(R.layout.widget_search);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSearch widgetSearch, Model model) {
@@ -256,7 +257,7 @@ public final class WidgetSearch extends AppFragment {
             Object[] objArr = new Object[1];
             Guild guild = model.getGuild();
             objArr[0] = guild != null ? guild.getName() : null;
-            ViewExtensions.setSingleLineHint(textInputLayout, b.k(this, 2131893489, objArr, null, 4));
+            ViewExtensions.setSingleLineHint(textInputLayout, b.k(this, R.string.search_in, objArr, null, 4));
         } else if (i == 1) {
             Channel channel = model.getChannel();
             String z0 = channel != null ? AnimatableValueParser.z0(channel, requireContext(), false) : null;
@@ -264,7 +265,7 @@ public final class WidgetSearch extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput");
             Channel channel2 = model.getChannel();
             Integer valueOf = channel2 != null ? Integer.valueOf(channel2.A()) : null;
-            ViewExtensions.setSingleLineHint(textInputLayout2, (valueOf != null && valueOf.intValue() == 1) ? b.k(this, 2131893458, new Object[]{z0}, null, 4) : (valueOf != null && valueOf.intValue() == 3) ? b.k(this, 2131893489, new Object[]{z0}, null, 4) : b.k(this, 2131893434, new Object[0], null, 4));
+            ViewExtensions.setSingleLineHint(textInputLayout2, (valueOf != null && valueOf.intValue() == 1) ? b.k(this, R.string.search_dm_with, new Object[]{z0}, null, 4) : (valueOf != null && valueOf.intValue() == 3) ? b.k(this, R.string.search_in, new Object[]{z0}, null, 4) : b.k(this, R.string.search, new Object[0], null, 4));
         }
         StoreSearch.DisplayState displayState = model.getDisplayState();
         if (displayState != null) {
@@ -327,8 +328,8 @@ public final class WidgetSearch extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setRetainInstance(true);
-        this.targetId = getMostRecentIntent().getLongExtra("INTENT_EXTRA_TARGET_ID", 0);
-        this.targetType = getMostRecentIntent().getIntExtra("INTENT_EXTRA_SEARCH_TYPE", -1);
+        this.targetId = getMostRecentIntent().getLongExtra(INTENT_EXTRA_TARGET_ID, 0);
+        this.targetType = getMostRecentIntent().getIntExtra(INTENT_EXTRA_TARGET_TYPE, -1);
         if (!isRecreated()) {
             TextInputLayout textInputLayout = getBinding().f1889c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
diff --git a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
index 2f220eef3c..9cd871c032 100644
--- a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
+++ b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
@@ -4,11 +4,14 @@ import a0.a.a.b;
 import android.content.Context;
 import android.net.Uri;
 import android.view.View;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
@@ -278,7 +281,7 @@ public final class WidgetSearchResults extends AppFragment {
         @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
         public void onInteractionStateUpdated(StoreChat.InteractionState interactionState) {
             m.checkNotNullParameter(interactionState, "interactionState");
-            if (interactionState.isAtTop() && this.oldestMessageId != Long.MAX_VALUE) {
+            if (interactionState.isAtTop() && this.oldestMessageId != RecyclerView.FOREVER_NS) {
                 StoreStream.Companion.getSearch().loadMore(this.oldestMessageId);
             }
         }
@@ -340,7 +343,7 @@ public final class WidgetSearchResults extends AppFragment {
 
         @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
         public boolean onQuickDownloadClicked(Uri uri, String str) {
-            m.checkNotNullParameter(uri, "uri");
+            m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             m.checkNotNullParameter(str, "fileName");
             return false;
         }
@@ -389,7 +392,7 @@ public final class WidgetSearchResults extends AppFragment {
         @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
         public void onUserActivityAction(long j, long j2, long j3, MessageActivityType messageActivityType, Activity activity, Application application) {
             m.checkNotNullParameter(messageActivityType, "actionType");
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(application, "application");
         }
 
@@ -407,7 +410,7 @@ public final class WidgetSearchResults extends AppFragment {
     }
 
     public WidgetSearchResults() {
-        super(2131559179);
+        super(R.layout.widget_search_results);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSearchResults widgetSearchResults, Model model) {
diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java
index aab0a6bf28..66f1088ae2 100644
--- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java
+++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSearchSuggestionsBinding;
 import com.discord.stores.StoreStream;
@@ -191,7 +192,7 @@ public final class WidgetSearchSuggestions extends AppFragment {
     }
 
     public WidgetSearchSuggestions() {
-        super(2131559182);
+        super(R.layout.widget_search_suggestions);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSearchSuggestions widgetSearchSuggestions, Model model) {
diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
index b7b7fb065a..4f0ec2f787 100644
--- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
@@ -14,6 +14,7 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetSearchSuggestionItemHeaderBinding;
 import com.discord.databinding.WidgetSearchSuggestionItemHeaderHistoryBinding;
 import com.discord.databinding.WidgetSearchSuggestionsItemChannelBinding;
@@ -149,18 +150,18 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public FilterViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559186, widgetSearchSuggestionsAdapter);
+            super((int) R.layout.widget_search_suggestions_item_suggestion, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
-            int i = 2131365394;
-            TextView textView = (TextView) view.findViewById(2131365394);
+            int i = R.id.suggestion_example_answer;
+            TextView textView = (TextView) view.findViewById(R.id.suggestion_example_answer);
             if (textView != null) {
                 RelativeLayout relativeLayout = (RelativeLayout) view;
-                i = 2131365396;
-                TextView textView2 = (TextView) view.findViewById(2131365396);
+                i = R.id.suggestion_example_filter;
+                TextView textView2 = (TextView) view.findViewById(R.id.suggestion_example_filter);
                 if (textView2 != null) {
-                    i = 2131365397;
-                    ImageView imageView = (ImageView) view.findViewById(2131365397);
+                    i = R.id.suggestion_example_icon;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.suggestion_example_icon);
                     if (imageView != null) {
                         WidgetSearchSuggestionsItemSuggestionBinding widgetSearchSuggestionsItemSuggestionBinding = new WidgetSearchSuggestionsItemSuggestionBinding(relativeLayout, textView, relativeLayout, textView2, imageView);
                         m.checkNotNullExpressionValue(widgetSearchSuggestionsItemSuggestionBinding, "WidgetSearchSuggestionsI…ionBinding.bind(itemView)");
@@ -180,16 +181,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
         private final int getAnswerText(FilterType filterType) {
             int ordinal = filterType.ordinal();
             if (ordinal == 0) {
-                return 2131893439;
+                return R.string.search_answer_from;
             }
             if (ordinal == 1) {
-                return 2131893450;
+                return R.string.search_answer_mentions;
             }
             if (ordinal == 2) {
-                return 2131893440;
+                return R.string.search_answer_has;
             }
             if (ordinal == 3) {
-                return 2131893448;
+                return R.string.search_answer_in;
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -198,16 +199,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
         private final int getFilterText(FilterType filterType) {
             int ordinal = filterType.ordinal();
             if (ordinal == 0) {
-                return 2131893466;
+                return R.string.search_filter_from;
             }
             if (ordinal == 1) {
-                return 2131893470;
+                return R.string.search_filter_mentions;
             }
             if (ordinal == 2) {
-                return 2131893467;
+                return R.string.search_filter_has;
             }
             if (ordinal == 3) {
-                return 2131893468;
+                return R.string.search_filter_in;
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -215,16 +216,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
         private final Drawable getIconDrawable(Context context, FilterType filterType) {
             int ordinal = filterType.ordinal();
             if (ordinal == 0) {
-                return ContextCompat.getDrawable(context, 2131231780);
+                return ContextCompat.getDrawable(context, R.drawable.ic_members_24dp);
             }
             if (ordinal == 1) {
-                return ContextCompat.getDrawable(context, 2131231782);
+                return ContextCompat.getDrawable(context, R.drawable.ic_mentions_white_24dp);
             }
             if (ordinal == 2) {
-                return ContextCompat.getDrawable(context, 2131231431);
+                return ContextCompat.getDrawable(context, R.drawable.ic_attachment_white_24dp);
             }
             if (ordinal == 3) {
-                return ContextCompat.getDrawable(context, 2131232044);
+                return ContextCompat.getDrawable(context, R.drawable.ic_text_channel_white_24dp);
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -292,19 +293,19 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             private final int getIconRes(HasAnswerOption hasAnswerOption) {
                 switch (hasAnswerOption.ordinal()) {
                     case 0:
-                        return 2131231598;
+                        return R.drawable.ic_diag_link_24dp;
                     case 1:
-                        return 2131231613;
+                        return R.drawable.ic_embed_white_24dp;
                     case 2:
-                        return 2131231431;
+                        return R.drawable.ic_attachment_white_24dp;
                     case 3:
-                        return 2131231895;
+                        return R.drawable.ic_play_circle_outline_white_24dp;
                     case 4:
-                        return 2131232045;
+                        return R.drawable.ic_text_image_24dp;
                     case 5:
-                        return 2131231991;
+                        return R.drawable.ic_sound_24dp;
                     case 6:
-                        return 2131232022;
+                        return R.drawable.ic_sticker_icon_24dp;
                     default:
                         throw new NoWhenBranchMatchedException();
                 }
@@ -313,15 +314,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HasViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559184, widgetSearchSuggestionsAdapter);
+            super((int) R.layout.widget_search_suggestions_item_has, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i = 2131364785;
-            ImageView imageView = (ImageView) view.findViewById(2131364785);
+            int i = R.id.search_suggestions_item_has_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.search_suggestions_item_has_icon);
             if (imageView != null) {
-                i = 2131364786;
-                TextView textView = (TextView) view.findViewById(2131364786);
+                i = R.id.search_suggestions_item_has_text;
+                TextView textView = (TextView) view.findViewById(R.id.search_suggestions_item_has_text);
                 if (textView != null) {
                     WidgetSearchSuggestionsItemHasBinding widgetSearchSuggestionsItemHasBinding = new WidgetSearchSuggestionsItemHasBinding((RelativeLayout) view, relativeLayout, imageView, textView);
                     m.checkNotNullExpressionValue(widgetSearchSuggestionsItemHasBinding, "WidgetSearchSuggestionsI…HasBinding.bind(itemView)");
@@ -375,7 +376,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559180, widgetSearchSuggestionsAdapter);
+            super((int) R.layout.widget_search_suggestion_item_header, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -389,22 +390,22 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             if (category != null) {
                 int ordinal = category.ordinal();
                 if (ordinal == 0) {
-                    return 2131893486;
+                    return R.string.search_group_header_search_options;
                 }
                 if (ordinal == 1) {
-                    return 2131893485;
+                    return R.string.search_group_header_mentions;
                 }
                 if (ordinal == 2) {
-                    return 2131893481;
+                    return R.string.search_group_header_from;
                 }
                 if (ordinal == 3) {
-                    return 2131893482;
+                    return R.string.search_group_header_has;
                 }
                 if (ordinal == 4) {
-                    return 2131893479;
+                    return R.string.search_group_header_dates;
                 }
                 if (ordinal == 5) {
-                    return 2131893478;
+                    return R.string.search_group_header_channels;
                 }
             }
             throw new IllegalArgumentException("couldn't resolve category: " + category);
@@ -423,17 +424,17 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HistoryHeaderViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559181, widgetSearchSuggestionsAdapter);
+            super((int) R.layout.widget_search_suggestion_item_header_history, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
-            int i = 2131365399;
-            ImageView imageView = (ImageView) view.findViewById(2131365399);
+            int i = R.id.suggestion_item_header_history_clear_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.suggestion_item_header_history_clear_icon);
             if (imageView != null) {
-                i = 2131365400;
-                View findViewById = view.findViewById(2131365400);
+                i = R.id.suggestion_item_header_history_divider;
+                View findViewById = view.findViewById(R.id.suggestion_item_header_history_divider);
                 if (findViewById != null) {
-                    i = 2131365401;
-                    TextView textView = (TextView) view.findViewById(2131365401);
+                    i = R.id.suggestion_item_header_history_text;
+                    TextView textView = (TextView) view.findViewById(R.id.suggestion_item_header_history_text);
                     if (textView != null) {
                         WidgetSearchSuggestionItemHeaderHistoryBinding widgetSearchSuggestionItemHeaderHistoryBinding = new WidgetSearchSuggestionItemHeaderHistoryBinding((RelativeLayout) view, imageView, findViewById, textView);
                         m.checkNotNullExpressionValue(widgetSearchSuggestionItemHeaderHistoryBinding, "WidgetSearchSuggestionIt…oryBinding.bind(itemView)");
@@ -462,15 +463,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public InChannelViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559183, widgetSearchSuggestionsAdapter);
+            super((int) R.layout.widget_search_suggestions_item_channel, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i = 2131364783;
-            ImageView imageView = (ImageView) view.findViewById(2131364783);
+            int i = R.id.search_suggestions_item_channel_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.search_suggestions_item_channel_icon);
             if (imageView != null) {
-                i = 2131364784;
-                TextView textView = (TextView) view.findViewById(2131364784);
+                i = R.id.search_suggestions_item_channel_text;
+                TextView textView = (TextView) view.findViewById(R.id.search_suggestions_item_channel_text);
                 if (textView != null) {
                     WidgetSearchSuggestionsItemChannelBinding widgetSearchSuggestionsItemChannelBinding = new WidgetSearchSuggestionsItemChannelBinding((RelativeLayout) view, relativeLayout, imageView, textView);
                     m.checkNotNullExpressionValue(widgetSearchSuggestionsItemChannelBinding, "WidgetSearchSuggestionsI…nelBinding.bind(itemView)");
@@ -502,15 +503,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RecentQueryViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559185, widgetSearchSuggestionsAdapter);
+            super((int) R.layout.widget_search_suggestions_item_recent_query, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "widgetSearchSuggestionsAdapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i = 2131364787;
-            ImageView imageView = (ImageView) view.findViewById(2131364787);
+            int i = R.id.search_suggestions_item_recent_query_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.search_suggestions_item_recent_query_icon);
             if (imageView != null) {
-                i = 2131364788;
-                TextView textView = (TextView) view.findViewById(2131364788);
+                i = R.id.search_suggestions_item_recent_query_text;
+                TextView textView = (TextView) view.findViewById(R.id.search_suggestions_item_recent_query_text);
                 if (textView != null) {
                     WidgetSearchSuggestionsItemRecentQueryBinding widgetSearchSuggestionsItemRecentQueryBinding = new WidgetSearchSuggestionsItemRecentQueryBinding((RelativeLayout) view, relativeLayout, imageView, textView);
                     m.checkNotNullExpressionValue(widgetSearchSuggestionsItemRecentQueryBinding, "WidgetSearchSuggestionsI…eryBinding.bind(itemView)");
@@ -546,7 +547,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public UserViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559187, widgetSearchSuggestionsAdapter);
+            super((int) R.layout.widget_search_suggestions_item_user, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -589,7 +590,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             }
             SimpleDraweeView simpleDraweeView = userListItemView.j.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.userListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, user, 2131165297, null, null, guildMember, 24, null);
+            IconUtils.setIcon$default(simpleDraweeView, user, R.dimen.avatar_size_standard, null, null, guildMember, 24, null);
             userListItemView.j.e.setPresence(null);
             StatusView statusView = userListItemView.j.e;
             m.checkNotNullExpressionValue(statusView, "binding.userListItemStatus");
diff --git a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView$updateView$rawMuteStatusText$1.java b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView$updateView$rawMuteStatusText$1.java
index b733679aa4..475482e7f2 100644
--- a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView$updateView$rawMuteStatusText$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView$updateView$rawMuteStatusText$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -26,6 +27,6 @@ public final class NotificationMuteSettingsView$updateView$rawMuteStatusText$1 e
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968915));
+        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.colorControlBrandForeground));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java
index fad0b45780..505e6becaf 100644
--- a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java
+++ b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.StringRes;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.NotificationMuteSettingsViewBinding;
 import com.discord.utilities.time.TimeUtils;
 import d0.z.d.m;
@@ -195,16 +196,16 @@ public final class NotificationMuteSettingsView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558607, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.notification_mute_settings_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364257;
-        TextView textView = (TextView) inflate.findViewById(2131364257);
+        int i = R.id.notification_mute_settings_mute_item;
+        TextView textView = (TextView) inflate.findViewById(R.id.notification_mute_settings_mute_item);
         if (textView != null) {
-            i = 2131364258;
-            TextView textView2 = (TextView) inflate.findViewById(2131364258);
+            i = R.id.notification_mute_settings_mute_item_description;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.notification_mute_settings_mute_item_description);
             if (textView2 != null) {
-                i = 2131364259;
-                TextView textView3 = (TextView) inflate.findViewById(2131364259);
+                i = R.id.notification_mute_settings_mute_item_status;
+                TextView textView3 = (TextView) inflate.findViewById(R.id.notification_mute_settings_mute_item_status);
                 if (textView3 != null) {
                     NotificationMuteSettingsViewBinding notificationMuteSettingsViewBinding = new NotificationMuteSettingsViewBinding((LinearLayout) inflate, textView, textView2, textView3);
                     m.checkNotNullExpressionValue(notificationMuteSettingsViewBinding, "NotificationMuteSettings…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java b/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java
index fcb7a8c14b..eb653cf0eb 100644
--- a/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.databinding.ViewCategoryOverrideItemBinding;
 import com.discord.databinding.ViewChannelOverrideItemBinding;
@@ -116,7 +117,7 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
                 TextView textView = this.binding.b;
                 m.checkNotNullExpressionValue(textView, "binding.categoryOverrideName");
                 textView.setText(AnimatableValueParser.y0(item.getChannel()));
-                int messageNotificationToString = item.getOverrideSettings().isMuted() ? 2131888735 : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
+                int messageNotificationToString = item.getOverrideSettings().isMuted() ? R.string.form_label_muted : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
                 TextView textView2 = this.binding.f1649c;
                 m.checkNotNullExpressionValue(textView2, "binding.categoryOverrideStatus");
                 b.n(textView2, messageNotificationToString, new Object[0], null, 4);
@@ -148,7 +149,7 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
                 m.checkNotNullExpressionValue(textView2, "binding.channelOverrideCategoryName");
                 Channel parent = item.getParent();
                 ViewExtensions.setTextAndVisibilityBy(textView2, parent != null ? AnimatableValueParser.y0(parent) : null);
-                int messageNotificationToString = item.getOverrideSettings().isMuted() ? 2131888735 : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
+                int messageNotificationToString = item.getOverrideSettings().isMuted() ? R.string.form_label_muted : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
                 TextView textView3 = this.binding.d;
                 m.checkNotNullExpressionValue(textView3, "binding.channelOverrideStatus");
                 b.n(textView3, messageNotificationToString, new Object[0], null, 4);
@@ -173,12 +174,15 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
         @StringRes
         public final int messageNotificationToString(int i) {
             if (i == ModelNotificationSettings.FREQUENCY_ALL) {
-                return 2131888642;
+                return R.string.form_label_all_messages;
             }
             if (i == ModelNotificationSettings.FREQUENCY_MENTIONS) {
-                return 2131888743;
+                return R.string.form_label_only_mentions;
             }
-            return i == ModelNotificationSettings.FREQUENCY_NOTHING ? 2131888738 : 0;
+            if (i == ModelNotificationSettings.FREQUENCY_NOTHING) {
+                return R.string.form_label_nothing;
+            }
+            return 0;
         }
 
         public void onBind(Item item) {
@@ -220,62 +224,62 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        int i2 = 2131364218;
+        int i2 = R.id.navigation_indicator;
         if (i != 0) {
             if (i == 4) {
-                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558740, viewGroup, false);
-                TextView textView = (TextView) inflate.findViewById(2131362251);
+                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.view_category_override_item, viewGroup, false);
+                TextView textView = (TextView) inflate.findViewById(R.id.category_override_name);
                 if (textView != null) {
-                    TextView textView2 = (TextView) inflate.findViewById(2131362252);
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.category_override_status);
                     if (textView2 != null) {
-                        Guideline guideline = (Guideline) inflate.findViewById(2131363435);
+                        Guideline guideline = (Guideline) inflate.findViewById(R.id.guideline);
                         if (guideline != null) {
-                            ImageView imageView = (ImageView) inflate.findViewById(2131364218);
+                            ImageView imageView = (ImageView) inflate.findViewById(R.id.navigation_indicator);
                             if (imageView != null) {
                                 ViewCategoryOverrideItemBinding viewCategoryOverrideItemBinding = new ViewCategoryOverrideItemBinding((ConstraintLayout) inflate, textView, textView2, guideline, imageView);
                                 m.checkNotNullExpressionValue(viewCategoryOverrideItemBinding, "ViewCategoryOverrideItem….context), parent, false)");
                                 return new ViewHolder.CategoryOverridesViewHolder(viewCategoryOverrideItemBinding, this.onClick);
                             }
                         } else {
-                            i2 = 2131363435;
+                            i2 = R.id.guideline;
                         }
                     } else {
-                        i2 = 2131362252;
+                        i2 = R.id.category_override_status;
                     }
                 } else {
-                    i2 = 2131362251;
+                    i2 = R.id.category_override_name;
                 }
                 throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
             } else if (i != 5) {
                 throw new j(a.s("An operation is not implemented: ", a.k("Type[", i, "] not implemented")));
             }
         }
-        View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131558741, viewGroup, false);
-        TextView textView3 = (TextView) inflate2.findViewById(2131362314);
+        View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.view_channel_override_item, viewGroup, false);
+        TextView textView3 = (TextView) inflate2.findViewById(R.id.channel_override_category_name);
         if (textView3 != null) {
-            TextView textView4 = (TextView) inflate2.findViewById(2131362315);
+            TextView textView4 = (TextView) inflate2.findViewById(R.id.channel_override_name);
             if (textView4 != null) {
-                TextView textView5 = (TextView) inflate2.findViewById(2131362316);
+                TextView textView5 = (TextView) inflate2.findViewById(R.id.channel_override_status);
                 if (textView5 != null) {
-                    Guideline guideline2 = (Guideline) inflate2.findViewById(2131363435);
+                    Guideline guideline2 = (Guideline) inflate2.findViewById(R.id.guideline);
                     if (guideline2 != null) {
-                        ImageView imageView2 = (ImageView) inflate2.findViewById(2131364218);
+                        ImageView imageView2 = (ImageView) inflate2.findViewById(R.id.navigation_indicator);
                         if (imageView2 != null) {
                             ViewChannelOverrideItemBinding viewChannelOverrideItemBinding = new ViewChannelOverrideItemBinding((ConstraintLayout) inflate2, textView3, textView4, textView5, guideline2, imageView2);
                             m.checkNotNullExpressionValue(viewChannelOverrideItemBinding, "ViewChannelOverrideItemB….context), parent, false)");
                             return new ViewHolder.ChannelOverridesViewHolder(viewChannelOverrideItemBinding, this.onClick);
                         }
                     } else {
-                        i2 = 2131363435;
+                        i2 = R.id.guideline;
                     }
                 } else {
-                    i2 = 2131362316;
+                    i2 = R.id.channel_override_status;
                 }
             } else {
-                i2 = 2131362315;
+                i2 = R.id.channel_override_name;
             }
         } else {
-            i2 = 2131362314;
+            i2 = R.id.channel_override_category_name;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i2)));
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
index 4bba7a59ea..d1a99129b0 100644
--- a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.databinding.SettingsChannelListCategoryItemBinding;
 import com.discord.databinding.SettingsChannelListItemBinding;
@@ -207,14 +208,14 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public CategoryListItem(SettingsChannelListAdapter settingsChannelListAdapter) {
-            super(2131558669, settingsChannelListAdapter);
+            super((int) R.layout.settings_channel_list_category_item, settingsChannelListAdapter);
             m.checkNotNullParameter(settingsChannelListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131365065;
-            ImageView imageView = (ImageView) view.findViewById(2131365065);
+            int i = R.id.settings_channel_list_category_item_drag;
+            ImageView imageView = (ImageView) view.findViewById(R.id.settings_channel_list_category_item_drag);
             if (imageView != null) {
-                i = 2131365066;
-                TextView textView = (TextView) view.findViewById(2131365066);
+                i = R.id.settings_channel_list_category_item_text;
+                TextView textView = (TextView) view.findViewById(R.id.settings_channel_list_category_item_text);
                 if (textView != null) {
                     SettingsChannelListCategoryItemBinding settingsChannelListCategoryItemBinding = new SettingsChannelListCategoryItemBinding((RelativeLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(settingsChannelListCategoryItemBinding, "SettingsChannelListCateg…temBinding.bind(itemView)");
@@ -247,7 +248,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 if (name == null) {
                     View view = this.itemView;
                     m.checkNotNullExpressionValue(view, "itemView");
-                    name = view.getContext().getString(2131894492);
+                    name = view.getContext().getString(R.string.uncategorized);
                 }
                 textView.setText(name);
                 ImageView imageView = this.binding.b;
@@ -401,20 +402,20 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ChannelListItem(SettingsChannelListAdapter settingsChannelListAdapter) {
-            super(2131558670, settingsChannelListAdapter);
+            super((int) R.layout.settings_channel_list_item, settingsChannelListAdapter);
             m.checkNotNullParameter(settingsChannelListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131365067;
-            ImageView imageView = (ImageView) view.findViewById(2131365067);
+            int i = R.id.settings_channel_list_item_drag;
+            ImageView imageView = (ImageView) view.findViewById(R.id.settings_channel_list_item_drag);
             if (imageView != null) {
-                i = 2131365068;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365068);
+                i = R.id.settings_channel_list_item_hash;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.settings_channel_list_item_hash);
                 if (imageView2 != null) {
-                    i = 2131365069;
-                    TextView textView = (TextView) view.findViewById(2131365069);
+                    i = R.id.settings_channel_list_item_name;
+                    TextView textView = (TextView) view.findViewById(R.id.settings_channel_list_item_name);
                     if (textView != null) {
-                        i = 2131365070;
-                        View findViewById = view.findViewById(2131365070);
+                        i = R.id.settings_channel_list_item_selected_overlay;
+                        View findViewById = view.findViewById(R.id.settings_channel_list_item_selected_overlay);
                         if (findViewById != null) {
                             SettingsChannelListItemBinding settingsChannelListItemBinding = new SettingsChannelListItemBinding((RelativeLayout) view, imageView, imageView2, textView, findViewById);
                             m.checkNotNullExpressionValue(settingsChannelListItemBinding, "SettingsChannelListItemBinding.bind(itemView)");
@@ -446,7 +447,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 }
                 ImageView imageView = this.binding.f1629c;
                 int A = channelItem.getChannel().A();
-                imageView.setImageResource(A != 2 ? A != 5 ? A != 13 ? 2131231519 : 2131231514 : 2131231504 : 2131231528);
+                imageView.setImageResource(A != 2 ? A != 5 ? A != 13 ? R.drawable.ic_channel_text : R.drawable.ic_channel_stage_24dp : R.drawable.ic_channel_announcements : R.drawable.ic_channel_voice);
                 TextView textView = this.binding.d;
                 m.checkNotNullExpressionValue(textView, "binding.settingsChannelListItemName");
                 textView.setText(AnimatableValueParser.y0(channelItem.getChannel()));
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java
index d774f308a0..1d4efee246 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerDeleteDialogBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -19,23 +20,23 @@ public final /* synthetic */ class WidgetServerDeleteDialog$binding$2 extends k
 
     public final WidgetServerDeleteDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364864;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364864);
+        int i = R.id.server_settings_delete_server_cancel;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.server_settings_delete_server_cancel);
         if (materialButton != null) {
-            i = 2131364865;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364865);
+            i = R.id.server_settings_delete_server_confirm;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.server_settings_delete_server_confirm);
             if (materialButton2 != null) {
-                i = 2131364866;
-                TextView textView = (TextView) view.findViewById(2131364866);
+                i = R.id.server_settings_delete_server_header;
+                TextView textView = (TextView) view.findViewById(R.id.server_settings_delete_server_header);
                 if (textView != null) {
-                    i = 2131364867;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364867);
+                    i = R.id.server_settings_delete_server_mfa_code;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.server_settings_delete_server_mfa_code);
                     if (textInputLayout != null) {
-                        i = 2131364868;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364868);
+                        i = R.id.server_settings_delete_server_mfa_wrap;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.server_settings_delete_server_mfa_wrap);
                         if (linearLayout != null) {
-                            i = 2131364869;
-                            TextView textView2 = (TextView) view.findViewById(2131364869);
+                            i = R.id.server_settings_delete_server_text;
+                            TextView textView2 = (TextView) view.findViewById(R.id.server_settings_delete_server_text);
                             if (textView2 != null) {
                                 return new WidgetServerDeleteDialogBinding((LinearLayout) view, materialButton, materialButton2, textView, textInputLayout, linearLayout, textView2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
index 670573740f..2ee58c6cf4 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetServerDeleteDialogBinding;
 import com.discord.models.experiments.domain.Experiment;
@@ -47,7 +48,7 @@ public final class WidgetServerDeleteDialog extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetServerDeleteDialog widgetServerDeleteDialog = new WidgetServerDeleteDialog();
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_GUILD_ID", j);
+            bundle.putLong(WidgetServerDeleteDialog.INTENT_GUILD_ID, j);
             widgetServerDeleteDialog.setArguments(bundle);
             widgetServerDeleteDialog.show(fragmentManager, WidgetServerDeleteDialog.class.getSimpleName());
         }
@@ -102,7 +103,7 @@ public final class WidgetServerDeleteDialog extends AppDialog {
     }
 
     public WidgetServerDeleteDialog() {
-        super(2131559192);
+        super(R.layout.widget_server_delete_dialog);
     }
 
     public static final /* synthetic */ void access$afterDeleteGuild(WidgetServerDeleteDialog widgetServerDeleteDialog, long j) {
@@ -133,13 +134,13 @@ public final class WidgetServerDeleteDialog extends AppDialog {
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.serverSettingsDeleteServerHeader");
         Context context = getContext();
-        textView.setText(context != null ? b.h(context, 2131888102, new Object[]{model.getGuild().getName()}, null, 4) : null);
+        textView.setText(context != null ? b.h(context, R.string.delete_server_title, new Object[]{model.getGuild().getName()}, null, 4) : null);
         LinearLayout linearLayout = getBinding().f;
         m.checkNotNullExpressionValue(linearLayout, "binding.serverSettingsDeleteServerMfaWrap");
         linearLayout.setVisibility(model.getMe().getMfaEnabled() ? 0 : 8);
         TextView textView2 = getBinding().g;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsDeleteServerText");
-        b.n(textView2, 2131888099, new Object[]{model.getGuild().getName()}, null, 4);
+        b.n(textView2, R.string.delete_server_body, new Object[]{model.getGuild().getName()}, null, 4);
         getBinding().b.setOnClickListener(new WidgetServerDeleteDialog$configureUI$1(this));
         MaterialButton materialButton = getBinding().f1898c;
         m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsDeleteServerConfirm");
@@ -158,7 +159,7 @@ public final class WidgetServerDeleteDialog extends AppDialog {
     @Override // com.discord.app.AppDialog
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<Model> observable = Model.Companion.get$app_productionCanaryRelease(getArgumentsOrDefault().getLong("INTENT_GUILD_ID"));
+        Observable<Model> observable = Model.Companion.get$app_productionCanaryRelease(getArgumentsOrDefault().getLong(INTENT_GUILD_ID));
         m.checkNotNullExpressionValue(observable, "Model.get(guildId)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetServerDeleteDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerDeleteDialog$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java
index d87e0853e2..586649c0db 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java
@@ -9,6 +9,7 @@ import androidx.constraintlayout.widget.Guideline;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.t1;
+import com.discord.R;
 import com.discord.databinding.WidgetServerNotificationsBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -24,48 +25,48 @@ public final /* synthetic */ class WidgetServerNotifications$binding$2 extends k
 
     public final WidgetServerNotificationsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361923;
-        View findViewById = view.findViewById(2131361923);
+        int i = R.id.add_override;
+        View findViewById = view.findViewById(R.id.add_override);
         if (findViewById != null) {
-            int i2 = 2131362253;
-            TextView textView = (TextView) findViewById.findViewById(2131362253);
+            int i2 = R.id.category_overview_name;
+            TextView textView = (TextView) findViewById.findViewById(R.id.category_overview_name);
             if (textView != null) {
-                i2 = 2131363435;
-                Guideline guideline = (Guideline) findViewById.findViewById(2131363435);
+                i2 = R.id.guideline;
+                Guideline guideline = (Guideline) findViewById.findViewById(R.id.guideline);
                 if (guideline != null) {
-                    i2 = 2131364218;
-                    ImageView imageView = (ImageView) findViewById.findViewById(2131364218);
+                    i2 = R.id.navigation_indicator;
+                    ImageView imageView = (ImageView) findViewById.findViewById(R.id.navigation_indicator);
                     if (imageView != null) {
                         t1 t1Var = new t1((ConstraintLayout) findViewById, textView, guideline, imageView);
-                        i = 2131363495;
-                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363495);
+                        i = R.id.guild_notifications_override_list;
+                        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_notifications_override_list);
                         if (recyclerView != null) {
-                            i = 2131364828;
-                            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364828);
+                            i = R.id.server_notifications_everyone_switch;
+                            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.server_notifications_everyone_switch);
                             if (checkedSetting != null) {
-                                i = 2131364829;
-                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364829);
+                                i = R.id.server_notifications_frequency_0_radio;
+                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.server_notifications_frequency_0_radio);
                                 if (checkedSetting2 != null) {
-                                    i = 2131364830;
-                                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364830);
+                                    i = R.id.server_notifications_frequency_1_radio;
+                                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.server_notifications_frequency_1_radio);
                                     if (checkedSetting3 != null) {
-                                        i = 2131364831;
-                                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364831);
+                                        i = R.id.server_notifications_frequency_2_radio;
+                                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.server_notifications_frequency_2_radio);
                                         if (checkedSetting4 != null) {
-                                            i = 2131364832;
-                                            View findViewById2 = view.findViewById(2131364832);
+                                            i = R.id.server_notifications_frequency_divider;
+                                            View findViewById2 = view.findViewById(R.id.server_notifications_frequency_divider);
                                             if (findViewById2 != null) {
-                                                i = 2131364833;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364833);
+                                                i = R.id.server_notifications_frequency_wrap;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.server_notifications_frequency_wrap);
                                                 if (linearLayout != null) {
-                                                    i = 2131364834;
-                                                    NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131364834);
+                                                    i = R.id.server_notifications_mute_settings_view;
+                                                    NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(R.id.server_notifications_mute_settings_view);
                                                     if (notificationMuteSettingsView != null) {
-                                                        i = 2131364835;
-                                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364835);
+                                                        i = R.id.server_notifications_push_switch;
+                                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.server_notifications_push_switch);
                                                         if (checkedSetting5 != null) {
-                                                            i = 2131364836;
-                                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364836);
+                                                            i = R.id.server_notifications_roles_switch;
+                                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.server_notifications_roles_switch);
                                                             if (checkedSetting6 != null) {
                                                                 return new WidgetServerNotificationsBinding((CoordinatorLayout) view, t1Var, recyclerView, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, findViewById2, linearLayout, notificationMuteSettingsView, checkedSetting5, checkedSetting6);
                                                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
index b864661a26..1e64692933 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
@@ -13,6 +13,7 @@ import c.a.e.l;
 import c.a.j.t1;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.preview.GuildPreview;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -209,7 +210,7 @@ public final class WidgetServerNotifications extends AppFragment {
     }
 
     public WidgetServerNotifications() {
-        super(2131559194);
+        super(R.layout.widget_server_notifications);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerNotifications widgetServerNotifications, Model model) {
@@ -245,7 +246,7 @@ public final class WidgetServerNotifications extends AppFragment {
             int i2 = CheckedSetting.i;
             checkedSetting.h(null, false);
         } else {
-            CharSequence k = b.k(this, 2131891083, new Object[0], null, 4);
+            CharSequence k = b.k(this, R.string.large_guild_notify_all_messages_description, new Object[0], null, 4);
             int i3 = CheckedSetting.i;
             checkedSetting.h(k, false);
         }
@@ -262,7 +263,7 @@ public final class WidgetServerNotifications extends AppFragment {
             return;
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891872);
+        setActionBarTitle(R.string.notification_settings);
         setActionBarSubtitle(model.getGuild().getName());
         ModelNotificationSettings guildSettings = model.getGuildSettings();
         boolean isMuted = guildSettings.isMuted();
@@ -273,7 +274,7 @@ public final class WidgetServerNotifications extends AppFragment {
         LinearLayout linearLayout = getBinding().i;
         m.checkNotNullExpressionValue(linearLayout, "binding.serverNotificationsFrequencyWrap");
         linearLayout.setVisibility(isMuted ^ true ? 0 : 8);
-        getBinding().j.updateView(new NotificationMuteSettingsView.ViewState(isMuted, guildSettings.getMuteEndTime(), b.h(requireContext(), 2131888733, new Object[]{model.getGuild().getName()}, null, 4), b.h(requireContext(), 2131888795, new Object[]{model.getGuild().getName()}, null, 4), b.h(requireContext(), 2131888729, new Object[0], null, 4), 2131888730, b.h(requireContext(), 2131888734, new Object[0], null, 4)), new WidgetServerNotifications$configureUI$onMute$1(this, id2), new WidgetServerNotifications$configureUI$onUnmute$1(this, id2));
+        getBinding().j.updateView(new NotificationMuteSettingsView.ViewState(isMuted, guildSettings.getMuteEndTime(), b.h(requireContext(), R.string.form_label_mute_server, new Object[]{model.getGuild().getName()}, null, 4), b.h(requireContext(), R.string.form_label_unmute_server, new Object[]{model.getGuild().getName()}, null, 4), b.h(requireContext(), R.string.form_label_mobile_server_muted, new Object[0], null, 4), R.string.form_label_mobile_server_muted_until, b.h(requireContext(), R.string.form_label_mute_server_description, new Object[0], null, 4)), new WidgetServerNotifications$configureUI$onMute$1(this, id2), new WidgetServerNotifications$configureUI$onUnmute$1(this, id2));
         getBinding().d.setOnCheckedListener(new WidgetServerNotifications$configureUI$1(this, model));
         CheckedSetting checkedSetting = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting, "binding.serverNotificationsEveryoneSwitch");
@@ -281,7 +282,7 @@ public final class WidgetServerNotifications extends AppFragment {
         CheckedSetting checkedSetting2 = getBinding().d;
         CheckedSetting checkedSetting3 = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.serverNotificationsEveryoneSwitch");
-        checkedSetting2.setText(b.j(checkedSetting3, 2131888784, new Object[0], null, 4));
+        checkedSetting2.setText(b.j(checkedSetting3, R.string.form_label_suppress_everyone, new Object[0], null, 4));
         getBinding().l.setOnCheckedListener(new WidgetServerNotifications$configureUI$2(this, model));
         CheckedSetting checkedSetting4 = getBinding().l;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.serverNotificationsRolesSwitch");
@@ -289,7 +290,7 @@ public final class WidgetServerNotifications extends AppFragment {
         CheckedSetting checkedSetting5 = getBinding().l;
         CheckedSetting checkedSetting6 = getBinding().l;
         m.checkNotNullExpressionValue(checkedSetting6, "binding.serverNotificationsRolesSwitch");
-        checkedSetting5.setText(b.j(checkedSetting6, 2131888785, new Object[0], null, 4));
+        checkedSetting5.setText(b.j(checkedSetting6, R.string.form_label_suppress_roles, new Object[0], null, 4));
         CheckedSetting checkedSetting7 = getBinding().k;
         m.checkNotNullExpressionValue(checkedSetting7, "binding.serverNotificationsPushSwitch");
         checkedSetting7.setVisibility(model.getGuildSettings().isMuted() ^ true ? 0 : 8);
@@ -300,7 +301,7 @@ public final class WidgetServerNotifications extends AppFragment {
         CheckedSetting checkedSetting9 = getBinding().f;
         CheckedSetting checkedSetting10 = getBinding().f;
         m.checkNotNullExpressionValue(checkedSetting10, "binding.serverNotificationsFrequency1Radio");
-        checkedSetting9.setText(b.j(checkedSetting10, 2131888743, new Object[0], null, 4));
+        checkedSetting9.setText(b.j(checkedSetting10, R.string.form_label_only_mentions, new Object[0], null, 4));
         CheckedSetting checkedSetting11 = getBinding().e;
         m.checkNotNullExpressionValue(checkedSetting11, "binding.serverNotificationsFrequency0Radio");
         configureRadio(checkedSetting11, ModelNotificationSettings.FREQUENCY_ALL, model);
@@ -313,7 +314,7 @@ public final class WidgetServerNotifications extends AppFragment {
     }
 
     private final ItemTouchHelper createSwipeableItemTouchHelper() {
-        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this, 2131100329), ContextCompat.getDrawable(requireContext(), 2131231596), DimenUtils.dpToPixels(8));
+        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this, (int) R.color.status_red_500), ContextCompat.getDrawable(requireContext(), R.drawable.ic_delete_white_24dp), DimenUtils.dpToPixels(8));
         return new ItemTouchHelper(new WidgetServerNotifications$createSwipeableItemTouchHelper$1(this, swipeRevealConfiguration, swipeRevealConfiguration, swipeRevealConfiguration));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java
index 6b6549f1a8..c58e094e44 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerNotificationOverrideSelectorBinding;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetServerNotificationsOverrideSelector$bin
 
     public final WidgetServerNotificationOverrideSelectorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363493;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363493);
+        int i = R.id.guild_notifications_channel_list;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.guild_notifications_channel_list);
         if (recyclerView != null) {
-            i = 2131363494;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363494);
+            i = R.id.guild_notifications_channel_search;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_notifications_channel_search);
             if (textInputLayout != null) {
                 return new WidgetServerNotificationOverrideSelectorBinding((CoordinatorLayout) view, recyclerView, textInputLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
index 8f3dfa53a6..70df34641d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerNotificationOverrideSelectorBinding;
 import com.discord.stores.StoreChannels;
@@ -64,7 +65,7 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
     }
 
     public WidgetServerNotificationsOverrideSelector() {
-        super(2131559193);
+        super(R.layout.widget_server_notification_override_selector);
     }
 
     public static final /* synthetic */ SettingsChannelListAdapter access$getChannelsAdapter$p(WidgetServerNotificationsOverrideSelector widgetServerNotificationsOverrideSelector) {
@@ -92,8 +93,8 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891867);
-        setActionBarSubtitle(2131893526);
+        setActionBarTitle(R.string.notification_overrides);
+        setActionBarSubtitle(R.string.select_channel_or_category);
         TextInputLayout textInputLayout = getBinding().f1899c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildNotificationsChannelSearch");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetServerNotificationsOverrideSelector$onViewBound$1(this));
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java
index c7ff6c1898..eab895c341 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsOverviewRegionBinding;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import com.google.android.material.button.MaterialButton;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetServerRegionSelectDialog$binding$2 exte
 
     public final WidgetServerSettingsOverviewRegionBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362245;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362245);
+        int i = R.id.cancel_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.cancel_button);
         if (materialButton != null) {
-            i = 2131364921;
-            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131364921);
+            i = R.id.server_settings_overview_region_list;
+            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(R.id.server_settings_overview_region_list);
             if (maxHeightRecyclerView != null) {
                 return new WidgetServerSettingsOverviewRegionBinding((LinearLayout) view, materialButton, maxHeightRecyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java
index 887c305797..c598367992 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java
@@ -10,9 +10,11 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetServerSettingsOverviewRegionBinding;
 import com.discord.databinding.WidgetServerSettingsOverviewRegionItemBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelVoiceRegion;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.icon.IconUtils;
@@ -58,8 +60,8 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetServerRegionSelectDialog widgetServerRegionSelectDialog = new WidgetServerRegionSelectDialog();
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_GUILD_ID", j);
-            bundle.putString("INTENT_REGION_SELECTED", str);
+            bundle.putLong(WidgetServerRegionSelectDialog.INTENT_GUILD_ID, j);
+            bundle.putString(WidgetServerRegionSelectDialog.INTENT_REGION_SELECTED, str);
             widgetServerRegionSelectDialog.setArguments(bundle);
             widgetServerRegionSelectDialog.show(fragmentManager, WidgetServerRegionSelectDialog.class.getSimpleName());
             return widgetServerRegionSelectDialog;
@@ -138,7 +140,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
                 TextView textView = this.binding.b;
                 m.checkNotNullExpressionValue(textView, "binding.serverSettingsOverviewRegionItemName");
                 textView.setText(voiceRegion.getName());
-                int i2 = m.areEqual(this.this$0.getSelectedRegion(), voiceRegion.getId()) ? 2131231544 : 0;
+                int i2 = m.areEqual(this.this$0.getSelectedRegion(), voiceRegion.getId()) ? R.drawable.ic_check_grey_24dp : 0;
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.serverSettingsOverviewRegionItemName");
                 DrawableCompat.setCompoundDrawablesCompat$default(textView2, IconUtils.INSTANCE.getVoiceRegionIconResourceId(voiceRegion.getId()), 0, i2, 0, 10, (Object) null);
@@ -167,7 +169,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public ItemRegion onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ItemRegion(this, 2131559233, this);
+            return new ItemRegion(this, R.layout.widget_server_settings_overview_region_item, this);
         }
 
         public final void setSelectedRegion(String str) {
@@ -195,8 +197,8 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         }
 
         public VoiceRegion(String str, String str2) {
-            m.checkNotNullParameter(str, "id");
-            m.checkNotNullParameter(str2, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+            m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.f2179id = str;
             this.name = str2;
             this.key = str;
@@ -221,8 +223,8 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         }
 
         public final VoiceRegion copy(String str, String str2) {
-            m.checkNotNullParameter(str, "id");
-            m.checkNotNullParameter(str2, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+            m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return new VoiceRegion(str, str2);
         }
 
@@ -275,7 +277,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
     }
 
     public WidgetServerRegionSelectDialog() {
-        super(2131559232);
+        super(R.layout.widget_server_settings_overview_region);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerRegionSelectDialog widgetServerRegionSelectDialog, Model model) {
@@ -311,8 +313,8 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         getBinding().b.setOnClickListener(new WidgetServerRegionSelectDialog$onViewBoundOrOnResume$1(this));
-        long j = getArgumentsOrDefault().getLong("INTENT_GUILD_ID");
-        String string = getArgumentsOrDefault().getString("INTENT_REGION_SELECTED");
+        long j = getArgumentsOrDefault().getLong(INTENT_GUILD_ID);
+        String string = getArgumentsOrDefault().getString(INTENT_REGION_SELECTED);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1932c;
         m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.serverSettingsOverviewRegionList");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java
index eeec1a9364..a34f15b9c5 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.k;
@@ -19,71 +20,71 @@ public final /* synthetic */ class WidgetServerSettings$binding$2 extends k impl
 
     public final WidgetServerSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364844;
-        TextView textView = (TextView) view.findViewById(2131364844);
+        int i = R.id.server_settings_bans_option;
+        TextView textView = (TextView) view.findViewById(R.id.server_settings_bans_option);
         if (textView != null) {
-            i = 2131364854;
-            TextView textView2 = (TextView) view.findViewById(2131364854);
+            i = R.id.server_settings_community_overview_option;
+            TextView textView2 = (TextView) view.findViewById(R.id.server_settings_community_overview_option);
             if (textView2 != null) {
-                i = 2131364877;
-                TextView textView3 = (TextView) view.findViewById(2131364877);
+                i = R.id.server_settings_emojis_option;
+                TextView textView3 = (TextView) view.findViewById(R.id.server_settings_emojis_option);
                 if (textView3 != null) {
-                    i = 2131364881;
-                    TextView textView4 = (TextView) view.findViewById(2131364881);
+                    i = R.id.server_settings_enable_community_option;
+                    TextView textView4 = (TextView) view.findViewById(R.id.server_settings_enable_community_option);
                     if (textView4 != null) {
-                        i = 2131364883;
-                        TextView textView5 = (TextView) view.findViewById(2131364883);
+                        i = R.id.server_settings_instant_invites_option;
+                        TextView textView5 = (TextView) view.findViewById(R.id.server_settings_instant_invites_option);
                         if (textView5 != null) {
-                            i = 2131364888;
-                            TextView textView6 = (TextView) view.findViewById(2131364888);
+                            i = R.id.server_settings_members_option;
+                            TextView textView6 = (TextView) view.findViewById(R.id.server_settings_members_option);
                             if (textView6 != null) {
-                                i = 2131364902;
-                                TextView textView7 = (TextView) view.findViewById(2131364902);
+                                i = R.id.server_settings_option_audit_log;
+                                TextView textView7 = (TextView) view.findViewById(R.id.server_settings_option_audit_log);
                                 if (textView7 != null) {
-                                    i = 2131364903;
-                                    TextView textView8 = (TextView) view.findViewById(2131364903);
+                                    i = R.id.server_settings_option_channels;
+                                    TextView textView8 = (TextView) view.findViewById(R.id.server_settings_option_channels);
                                     if (textView8 != null) {
-                                        i = 2131364904;
-                                        TextView textView9 = (TextView) view.findViewById(2131364904);
+                                        i = R.id.server_settings_option_integrations;
+                                        TextView textView9 = (TextView) view.findViewById(R.id.server_settings_option_integrations);
                                         if (textView9 != null) {
-                                            i = 2131364905;
-                                            TextView textView10 = (TextView) view.findViewById(2131364905);
+                                            i = R.id.server_settings_option_moderation;
+                                            TextView textView10 = (TextView) view.findViewById(R.id.server_settings_option_moderation);
                                             if (textView10 != null) {
-                                                i = 2131364906;
-                                                TextView textView11 = (TextView) view.findViewById(2131364906);
+                                                i = R.id.server_settings_option_overview;
+                                                TextView textView11 = (TextView) view.findViewById(R.id.server_settings_option_overview);
                                                 if (textView11 != null) {
-                                                    i = 2131364907;
-                                                    TextView textView12 = (TextView) view.findViewById(2131364907);
+                                                    i = R.id.server_settings_option_security;
+                                                    TextView textView12 = (TextView) view.findViewById(R.id.server_settings_option_security);
                                                     if (textView12 != null) {
-                                                        i = 2131364908;
-                                                        TextView textView13 = (TextView) view.findViewById(2131364908);
+                                                        i = R.id.server_settings_option_vanity_url;
+                                                        TextView textView13 = (TextView) view.findViewById(R.id.server_settings_option_vanity_url);
                                                         if (textView13 != null) {
-                                                            i = 2131364934;
-                                                            TextView textView14 = (TextView) view.findViewById(2131364934);
+                                                            i = R.id.server_settings_roles_option;
+                                                            TextView textView14 = (TextView) view.findViewById(R.id.server_settings_roles_option);
                                                             if (textView14 != null) {
-                                                                i = 2131364936;
-                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364936);
+                                                                i = R.id.server_settings_section_community;
+                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.server_settings_section_community);
                                                                 if (linearLayout != null) {
-                                                                    i = 2131364937;
-                                                                    View findViewById = view.findViewById(2131364937);
+                                                                    i = R.id.server_settings_section_community_divider;
+                                                                    View findViewById = view.findViewById(R.id.server_settings_section_community_divider);
                                                                     if (findViewById != null) {
-                                                                        i = 2131364938;
-                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364938);
+                                                                        i = R.id.server_settings_section_general_settings;
+                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.server_settings_section_general_settings);
                                                                         if (linearLayout2 != null) {
-                                                                            i = 2131364939;
-                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364939);
+                                                                            i = R.id.server_settings_section_user_management;
+                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.server_settings_section_user_management);
                                                                             if (linearLayout3 != null) {
-                                                                                i = 2131364940;
-                                                                                View findViewById2 = view.findViewById(2131364940);
+                                                                                i = R.id.server_settings_section_user_management_divider;
+                                                                                View findViewById2 = view.findViewById(R.id.server_settings_section_user_management_divider);
                                                                                 if (findViewById2 != null) {
-                                                                                    i = 2131364946;
-                                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364946);
+                                                                                    i = R.id.server_settings_server_icon;
+                                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.server_settings_server_icon);
                                                                                     if (simpleDraweeView != null) {
-                                                                                        i = 2131364947;
-                                                                                        TextView textView15 = (TextView) view.findViewById(2131364947);
+                                                                                        i = R.id.server_settings_server_icon_text;
+                                                                                        TextView textView15 = (TextView) view.findViewById(R.id.server_settings_server_icon_text);
                                                                                         if (textView15 != null) {
-                                                                                            i = 2131364948;
-                                                                                            TextView textView16 = (TextView) view.findViewById(2131364948);
+                                                                                            i = R.id.server_settings_server_name;
+                                                                                            TextView textView16 = (TextView) view.findViewById(R.id.server_settings_server_name);
                                                                                             if (textView16 != null) {
                                                                                                 return new WidgetServerSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, textView13, textView14, linearLayout, findViewById, linearLayout2, linearLayout3, findViewById2, simpleDraweeView, textView15, textView16);
                                                                                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java
index e66f8dac09..daeb7adaac 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.models.guild.Guild;
 import com.discord.widgets.servers.WidgetServerDeleteDialog;
 import d0.z.d.m;
@@ -19,7 +20,7 @@ public final class WidgetServerSettings$configureToolbar$1<T1, T2> implements Ac
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364114) {
+        if (menuItem.getItemId() == R.id.menu_server_settings_delete) {
             WidgetServerDeleteDialog.Companion companion = WidgetServerDeleteDialog.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
index 7638a09bfa..9b941920fb 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsBinding;
@@ -153,7 +154,7 @@ public final class WidgetServerSettings extends AppFragment {
     }
 
     public WidgetServerSettings() {
-        super(2131559195);
+        super(R.layout.widget_server_settings);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettings widgetServerSettings, Model model) {
@@ -262,7 +263,7 @@ public final class WidgetServerSettings extends AppFragment {
         textView.setText(guild.getName());
         SimpleDraweeView simpleDraweeView = getBinding().t;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.serverSettingsServerIcon");
-        IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 2131165290, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView, forGuild$default, (int) R.dimen.avatar_size_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         TextView textView2 = getBinding().u;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsServerIconText");
         int i = 0;
@@ -273,7 +274,7 @@ public final class WidgetServerSettings extends AppFragment {
         TextView textView3 = getBinding().u;
         m.checkNotNullExpressionValue(textView3, "binding.serverSettingsServerIconText");
         textView3.setText(guild.getShortName());
-        AppFragment.setActionBarOptionsMenu$default(this, model.getManageGuildContext().isOwnerWithRequiredMFALevel() ? 2131623959 : 2131623951, new WidgetServerSettings$configureToolbar$1(this, guild), null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, model.getManageGuildContext().isOwnerWithRequiredMFALevel() ? R.menu.menu_server_settings : R.menu.menu_empty, new WidgetServerSettings$configureToolbar$1(this, guild), null, 4, null);
     }
 
     private final void configureUI(Model model) {
@@ -361,7 +362,7 @@ public final class WidgetServerSettings extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131893575);
+        setActionBarTitle(R.string.server_settings);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java
index d41902ae19..3267ed5c37 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsBansBinding;
 import com.google.android.material.textfield.TextInputLayout;
@@ -20,20 +21,20 @@ public final /* synthetic */ class WidgetServerSettingsBans$binding$2 extends k
 
     public final WidgetServerSettingsBansBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364233;
-        TextView textView = (TextView) view.findViewById(2131364233);
+        int i = R.id.no_bans_body;
+        TextView textView = (TextView) view.findViewById(R.id.no_bans_body);
         if (textView != null) {
-            i = 2131364239;
-            TextView textView2 = (TextView) view.findViewById(2131364239);
+            i = R.id.no_results_text;
+            TextView textView2 = (TextView) view.findViewById(R.id.no_results_text);
             if (textView2 != null) {
-                i = 2131364845;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364845);
+                i = R.id.server_settings_bans_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.server_settings_bans_recycler);
                 if (recyclerView != null) {
-                    i = 2131364846;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364846);
+                    i = R.id.server_settings_bans_search;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.server_settings_bans_search);
                     if (textInputLayout != null) {
-                        i = 2131364847;
-                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364847);
+                        i = R.id.server_settings_bans_view_flipper;
+                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.server_settings_bans_view_flipper);
                         if (appViewFlipper != null) {
                             return new WidgetServerSettingsBansBinding((CoordinatorLayout) view, textView, textView2, recyclerView, textInputLayout, appViewFlipper);
                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
index 6609d6bf7a..b4e7e4c229 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
@@ -13,6 +13,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -75,16 +76,16 @@ public final class WidgetServerSettingsBans extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public BanListItem(Adapter adapter, Adapter adapter2) {
-                super(2131559202, adapter2);
+                super((int) R.layout.widget_server_settings_ban_list_item, adapter2);
                 m.checkNotNullParameter(adapter2, "adapter");
                 this.this$0 = adapter;
                 View view = this.itemView;
                 RelativeLayout relativeLayout = (RelativeLayout) view;
-                int i = 2131362093;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362093);
+                int i = R.id.ban_list_item_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.ban_list_item_avatar);
                 if (simpleDraweeView != null) {
-                    i = 2131362094;
-                    TextView textView = (TextView) view.findViewById(2131362094);
+                    i = R.id.ban_list_item_name;
+                    TextView textView = (TextView) view.findViewById(R.id.ban_list_item_name);
                     if (textView != null) {
                         WidgetServerSettingsBanListItemBinding widgetServerSettingsBanListItemBinding = new WidgetServerSettingsBanListItemBinding((RelativeLayout) view, relativeLayout, simpleDraweeView, textView);
                         m.checkNotNullExpressionValue(widgetServerSettingsBanListItemBinding, "WidgetServerSettingsBanL…temBinding.bind(itemView)");
@@ -115,7 +116,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
                 if (!(ban2 == null || (user = ban2.getUser()) == null)) {
                     coreUser = new CoreUser(user);
                 }
-                IconUtils.setIcon$default(simpleDraweeView, coreUser, 2131165297, null, null, null, 56, null);
+                IconUtils.setIcon$default(simpleDraweeView, coreUser, R.dimen.avatar_size_standard, null, null, null, 56, null);
                 this.binding.b.setOnClickListener(new WidgetServerSettingsBans$Adapter$BanListItem$onConfigure$2(this, banItem));
             }
         }
@@ -157,7 +158,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
         public final void create(Context context, long j) {
             m.checkNotNullParameter(context, "context");
             StoreStream.Companion.getAnalytics().onGuildSettingsPaneViewed("BANS", j);
-            Intent putExtra = new Intent().putExtra("GUILD_ID", j);
+            Intent putExtra = new Intent().putExtra(WidgetServerSettingsBans.INTENT_EXTRA_GUILD_ID, j);
             m.checkNotNullExpressionValue(putExtra, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)");
             l.d(context, WidgetServerSettingsBans.class, putExtra);
         }
@@ -438,7 +439,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
     }
 
     public WidgetServerSettingsBans() {
-        super(2131559203);
+        super(R.layout.widget_server_settings_bans);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsBans widgetServerSettingsBans, Model model) {
@@ -454,7 +455,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
     }
 
     private final void configureToolbar(String str) {
-        setActionBarTitle(2131886829);
+        setActionBarTitle(R.string.bans);
         setActionBarSubtitle(str);
     }
 
@@ -506,11 +507,11 @@ public final class WidgetServerSettingsBans extends AppFragment {
     private final void showConfirmUnbanDialog(long j, ModelBan modelBan) {
         String reason = modelBan.getReason();
         if (reason == null) {
-            reason = getString(2131891711);
+            reason = getString(R.string.no_ban_reason);
         }
         m.checkNotNullExpressionValue(reason, "ban.reason ?: getString(R.string.no_ban_reason)");
         StringBuilder sb = new StringBuilder();
-        String string = getString(2131886822);
+        String string = getString(R.string.ban_reason);
         m.checkNotNullExpressionValue(string, "getString(R.string.ban_reason)");
         Locale primaryLocale = new LocaleManager().getPrimaryLocale(getContext());
         Objects.requireNonNull(string, "null cannot be cast to non-null type java.lang.String");
@@ -519,7 +520,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
         sb.append(upperCase);
         sb.append("\n");
         sb.append(reason);
-        WidgetNoticeDialog.Builder dialogAttrTheme = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(c.a.l.b.h(requireContext(), 2131894488, new Object[]{modelBan.getUser().r()}, null, 4).toString()).setMessage(sb.toString()), 2131887193, (Function1) null, 2, (Object) null).setPositiveButton(2131894486, new WidgetServerSettingsBans$showConfirmUnbanDialog$1(this, j, modelBan)).setDialogAttrTheme(2130969796);
+        WidgetNoticeDialog.Builder dialogAttrTheme = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(c.a.l.b.h(requireContext(), R.string.unban_user_title, new Object[]{modelBan.getUser().r()}, null, 4).toString()).setMessage(sb.toString()), (int) R.string.cancel, (Function1) null, 2, (Object) null).setPositiveButton(R.string.unban, new WidgetServerSettingsBans$showConfirmUnbanDialog$1(this, j, modelBan)).setDialogAttrTheme(R.attr.notice_theme_positive_red);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         dialogAttrTheme.show(parentFragmentManager);
@@ -561,6 +562,6 @@ public final class WidgetServerSettingsBans extends AppFragment {
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsBansRecycler");
         this.adapter = (Adapter) companion.configure(new Adapter(recyclerView));
-        this.guildId = getMostRecentIntent().getLongExtra("GUILD_ID", -1);
+        this.guildId = getMostRecentIntent().getLongExtra(INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java
index 37a93e4f40..1900c2381d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsChannelsBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -20,17 +21,17 @@ public final /* synthetic */ class WidgetServerSettingsChannels$binding$2 extend
 
     public final WidgetServerSettingsChannelsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131364848;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364848);
+            i = R.id.server_settings_channels_create_channel;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.server_settings_channels_create_channel);
             if (floatingActionButton != null) {
-                i = 2131364852;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364852);
+                i = R.id.server_settings_channels_text_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.server_settings_channels_text_recycler);
                 if (recyclerView != null) {
-                    i = 2131365907;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365907);
+                    i = R.id.widget_server_settings_channels_container;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.widget_server_settings_channels_container);
                     if (frameLayout != null) {
                         return new WidgetServerSettingsChannelsBinding((CoordinatorLayout) view, dimmerView, floatingActionButton, recyclerView, frameLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
index db0ef8b037..7ecb807e49 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.widgets.servers.WidgetServerSettingsChannelsSortActions;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -44,13 +45,13 @@ public final class WidgetServerSettingsChannels$configureUI$1<T1, T2> implements
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364122:
+            case R.id.menu_sort_channel /* 2131364122 */:
                 WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion;
                 FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
                 m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
                 companion.show(childFragmentManager, new AnonymousClass1(this));
                 return;
-            case 2131364123:
+            case R.id.menu_sort_done /* 2131364123 */:
                 WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1);
                 return;
             default:
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java
index 210cc3ea7a..3a3581b66e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -14,10 +15,10 @@ public final class WidgetServerSettingsChannels$configureUI$2<T> implements Acti
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364122);
+        MenuItem findItem = menu.findItem(R.id.menu_sort_channel);
         m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_sort_channel)");
         findItem.setVisible(!this.$model.isSorting());
-        MenuItem findItem2 = menu.findItem(2131364123);
+        MenuItem findItem2 = menu.findItem(R.id.menu_sort_done);
         m.checkNotNullExpressionValue(findItem2, "menu.findItem(R.id.menu_sort_done)");
         findItem2.setVisible(this.$model.isSorting());
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java
index 05d40887cb..2c89e34617 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class WidgetServerSettingsChannels$reorderChannels$1 extends o impl
     }
 
     public final void invoke(Void r4) {
-        c.a.e.o.i(this.this$0, 2131887304, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.channel_order_updated, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
index d4e02177e8..fafe7b3288 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -23,6 +24,7 @@ import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.chat.AutocompleteTypes;
 import com.discord.widgets.servers.SettingsChannelListAdapter;
 import d0.f0.q;
 import d0.t.u;
@@ -57,8 +59,8 @@ public final class WidgetServerSettingsChannels extends AppFragment {
 
         public final void show(Context context, long j) {
             m.checkNotNullParameter(context, "context");
-            StoreStream.Companion.getAnalytics().onGuildSettingsPaneViewed("CHANNELS", j);
-            Intent putExtra = new Intent().putExtra("INTENT_EXTRA_GUILD_ID", j);
+            StoreStream.Companion.getAnalytics().onGuildSettingsPaneViewed(AutocompleteTypes.CHANNELS, j);
+            Intent putExtra = new Intent().putExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, j);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…_EXTRA_GUILD_ID, guildId)");
             l.d(context, WidgetServerSettingsChannels.class, putExtra);
         }
@@ -236,7 +238,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
     }
 
     public WidgetServerSettingsChannels() {
-        super(2131559204);
+        super(R.layout.widget_server_settings_channels);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsChannels widgetServerSettingsChannels, Model model) {
@@ -271,9 +273,9 @@ public final class WidgetServerSettingsChannels extends AppFragment {
             return;
         }
         setActionBarDisplayHomeAsUpEnabled(!model.isSorting());
-        setActionBarTitle(!model.isSorting() ? 2131887370 : 2131893658);
+        setActionBarTitle(!model.isSorting() ? R.string.channels : R.string.sorting);
         setActionBarSubtitle(model.getGuild().getName());
-        setActionBarOptionsMenu(2131623942, new WidgetServerSettingsChannels$configureUI$1(this), new WidgetServerSettingsChannels$configureUI$2(model));
+        setActionBarOptionsMenu(R.menu.menu_channel_sort, new WidgetServerSettingsChannels$configureUI$1(this), new WidgetServerSettingsChannels$configureUI$2(model));
         configureFabVisibility(model);
         SettingsChannelListAdapter settingsChannelListAdapter = this.adapter;
         if (settingsChannelListAdapter != null) {
@@ -320,7 +322,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        long longExtra = getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        long longExtra = getMostRecentIntent().getLongExtra(INTENT_EXTRA_GUILD_ID, -1);
         Model.Companion companion = Model.Companion;
         BehaviorSubject<Integer> behaviorSubject = this.channelSortTypeSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "channelSortTypeSubject");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java
index efbe62e05f..612e3a5685 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.TableLayout;
 import android.widget.TableRow;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsChannelsSortFabMenuBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import d0.z.d.k;
@@ -18,20 +19,20 @@ public final /* synthetic */ class WidgetServerSettingsChannelsFabMenuFragment$b
 
     public final WidgetServerSettingsChannelsSortFabMenuBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363244;
-        TableRow tableRow = (TableRow) view.findViewById(2131363244);
+        int i = R.id.fab_menu_add_category;
+        TableRow tableRow = (TableRow) view.findViewById(R.id.fab_menu_add_category);
         if (tableRow != null) {
-            i = 2131363245;
-            TableRow tableRow2 = (TableRow) view.findViewById(2131363245);
+            i = R.id.fab_menu_add_text;
+            TableRow tableRow2 = (TableRow) view.findViewById(R.id.fab_menu_add_text);
             if (tableRow2 != null) {
-                i = 2131363246;
-                TableRow tableRow3 = (TableRow) view.findViewById(2131363246);
+                i = R.id.fab_menu_add_voice;
+                TableRow tableRow3 = (TableRow) view.findViewById(R.id.fab_menu_add_voice);
                 if (tableRow3 != null) {
-                    i = 2131363247;
-                    TableRow tableRow4 = (TableRow) view.findViewById(2131363247);
+                    i = R.id.fab_menu_main;
+                    TableRow tableRow4 = (TableRow) view.findViewById(R.id.fab_menu_main);
                     if (tableRow4 != null) {
-                        i = 2131363248;
-                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363248);
+                        i = R.id.fab_menu_main_fab;
+                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.fab_menu_main_fab);
                         if (floatingActionButton != null) {
                             TableLayout tableLayout = (TableLayout) view;
                             return new WidgetServerSettingsChannelsSortFabMenuBinding(tableLayout, tableRow, tableRow2, tableRow3, tableRow4, floatingActionButton, tableLayout);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
index a04fe5025c..71a9222dd0 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
@@ -7,6 +7,7 @@ import android.widget.TableLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsChannelsSortFabMenuBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -44,12 +45,12 @@ public final class WidgetServerSettingsChannelsFabMenuFragment extends Fragment
             bundle.putLong("INTENT_EXTRA_GUILD_ID", j);
             widgetServerSettingsChannelsFabMenuFragment.setArguments(bundle);
             WidgetServerSettingsChannelsFabMenuFragment.access$setDismissHandler$p(widgetServerSettingsChannelsFabMenuFragment, action0);
-            fragmentManager.beginTransaction().setCustomAnimations(2130772015, 2130772017).add(2131365907, widgetServerSettingsChannelsFabMenuFragment, "channels fab menu").addToBackStack("channels fab menu").commit();
+            fragmentManager.beginTransaction().setCustomAnimations(R.anim.anim_fade_in, R.anim.anim_fade_out).add(R.id.widget_server_settings_channels_container, widgetServerSettingsChannelsFabMenuFragment, WidgetServerSettingsChannelsFabMenuFragment.TAG).addToBackStack(WidgetServerSettingsChannelsFabMenuFragment.TAG).commit();
         }
     }
 
     public WidgetServerSettingsChannelsFabMenuFragment() {
-        super(2131559206);
+        super(R.layout.widget_server_settings_channels_sort_fab_menu);
     }
 
     public static final /* synthetic */ void access$dismiss(WidgetServerSettingsChannelsFabMenuFragment widgetServerSettingsChannelsFabMenuFragment) {
@@ -103,7 +104,7 @@ public final class WidgetServerSettingsChannelsFabMenuFragment extends Fragment
         }
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        FloatingButtonMenuInitializer floatingButtonMenuInitializer = new FloatingButtonMenuInitializer(requireContext, h0.mapOf(o.to(2131363244, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$2(this, j))), o.to(2131363246, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$3(this, j))), o.to(2131363245, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$4(this, j))), o.to(2131363247, createListener(WidgetServerSettingsChannelsFabMenuFragment$onResume$5.INSTANCE))));
+        FloatingButtonMenuInitializer floatingButtonMenuInitializer = new FloatingButtonMenuInitializer(requireContext, h0.mapOf(o.to(Integer.valueOf((int) R.id.fab_menu_add_category), createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$2(this, j))), o.to(Integer.valueOf((int) R.id.fab_menu_add_voice), createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$3(this, j))), o.to(Integer.valueOf((int) R.id.fab_menu_add_text), createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$4(this, j))), o.to(Integer.valueOf((int) R.id.fab_menu_main), createListener(WidgetServerSettingsChannelsFabMenuFragment$onResume$5.INSTANCE))));
         TableLayout tableLayout = getBinding().f1911c;
         m.checkNotNullExpressionValue(tableLayout, "binding.fabMenuTable");
         FloatingActionButton floatingActionButton = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java
index 2523fa6ee2..4f776ad7d6 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsChannelsSortActionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,17 +18,17 @@ public final /* synthetic */ class WidgetServerSettingsChannelsSortActions$bindi
 
     public final WidgetServerSettingsChannelsSortActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363438;
-        TextView textView = (TextView) view.findViewById(2131363438);
+        int i = R.id.guild_actions_overview_header_tv;
+        TextView textView = (TextView) view.findViewById(R.id.guild_actions_overview_header_tv);
         if (textView != null) {
-            i = 2131364849;
-            TextView textView2 = (TextView) view.findViewById(2131364849);
+            i = R.id.server_settings_channels_sort_actions_category;
+            TextView textView2 = (TextView) view.findViewById(R.id.server_settings_channels_sort_actions_category);
             if (textView2 != null) {
-                i = 2131364850;
-                TextView textView3 = (TextView) view.findViewById(2131364850);
+                i = R.id.server_settings_channels_sort_actions_text;
+                TextView textView3 = (TextView) view.findViewById(R.id.server_settings_channels_sort_actions_text);
                 if (textView3 != null) {
-                    i = 2131364851;
-                    TextView textView4 = (TextView) view.findViewById(2131364851);
+                    i = R.id.server_settings_channels_sort_actions_voice;
+                    TextView textView4 = (TextView) view.findViewById(R.id.server_settings_channels_sort_actions_voice);
                     if (textView4 != null) {
                         return new WidgetServerSettingsChannelsSortActionsBinding((NestedScrollView) view, textView, textView2, textView3, textView4);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
index a153f9e097..1446f7635c 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetServerSettingsChannelsSortActionsBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -55,7 +56,7 @@ public final class WidgetServerSettingsChannelsSortActions extends AppBottomShee
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559205;
+        return R.layout.widget_server_settings_channels_sort_actions;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1<? super java.lang.Integer, kotlin.Unit>, kotlin.jvm.functions.Function1<java.lang.Integer, kotlin.Unit> */
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java
index 20b3369c1a..e84616573a 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
 import c.a.j.v;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsEditIntegrationBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.CheckedSetting;
@@ -25,83 +26,83 @@ public final /* synthetic */ class WidgetServerSettingsEditIntegration$binding$2
 
     public final WidgetServerSettingsEditIntegrationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131363053;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363053);
+            i = R.id.edit_integration_custom_emotes_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.edit_integration_custom_emotes_container);
             if (linearLayout != null) {
-                i = 2131363054;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363054);
+                i = R.id.edit_integration_custom_emotes_toggle;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.edit_integration_custom_emotes_toggle);
                 if (checkedSetting != null) {
-                    i = 2131363055;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131363055);
+                    i = R.id.edit_integration_expire_radio_kick_user;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.edit_integration_expire_radio_kick_user);
                     if (checkedSetting2 != null) {
-                        i = 2131363056;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131363056);
+                        i = R.id.edit_integration_expire_radio_remove_role;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.edit_integration_expire_radio_remove_role);
                         if (checkedSetting3 != null) {
-                            i = 2131363057;
-                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363057);
+                            i = R.id.edit_integration_expired_sub_container;
+                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.edit_integration_expired_sub_container);
                             if (linearLayout2 != null) {
-                                i = 2131363058;
-                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363058);
+                                i = R.id.edit_integration_grace_period_container;
+                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.edit_integration_grace_period_container);
                                 if (linearLayout3 != null) {
-                                    i = 2131363059;
-                                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131363059);
+                                    i = R.id.edit_integration_grace_period_radio_14_days;
+                                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.edit_integration_grace_period_radio_14_days);
                                     if (checkedSetting4 != null) {
-                                        i = 2131363060;
-                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131363060);
+                                        i = R.id.edit_integration_grace_period_radio_1_day;
+                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.edit_integration_grace_period_radio_1_day);
                                         if (checkedSetting5 != null) {
-                                            i = 2131363061;
-                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131363061);
+                                            i = R.id.edit_integration_grace_period_radio_30_days;
+                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.edit_integration_grace_period_radio_30_days);
                                             if (checkedSetting6 != null) {
-                                                i = 2131363062;
-                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131363062);
+                                                i = R.id.edit_integration_grace_period_radio_3_days;
+                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(R.id.edit_integration_grace_period_radio_3_days);
                                                 if (checkedSetting7 != null) {
-                                                    i = 2131363063;
-                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131363063);
+                                                    i = R.id.edit_integration_grace_period_radio_7_days;
+                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(R.id.edit_integration_grace_period_radio_7_days);
                                                     if (checkedSetting8 != null) {
-                                                        i = 2131363064;
-                                                        ImageView imageView = (ImageView) view.findViewById(2131363064);
+                                                        i = R.id.edit_integration_icon;
+                                                        ImageView imageView = (ImageView) view.findViewById(R.id.edit_integration_icon);
                                                         if (imageView != null) {
-                                                            i = 2131363066;
-                                                            TextView textView = (TextView) view.findViewById(2131363066);
+                                                            i = R.id.edit_integration_name;
+                                                            TextView textView = (TextView) view.findViewById(R.id.edit_integration_name);
                                                             if (textView != null) {
-                                                                i = 2131363067;
-                                                                LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131363067);
+                                                                i = R.id.edit_integration_name_container;
+                                                                LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.edit_integration_name_container);
                                                                 if (linearLayout4 != null) {
-                                                                    i = 2131363068;
-                                                                    TextView textView2 = (TextView) view.findViewById(2131363068);
+                                                                    i = R.id.edit_integration_owner_name;
+                                                                    TextView textView2 = (TextView) view.findViewById(R.id.edit_integration_owner_name);
                                                                     if (textView2 != null) {
-                                                                        i = 2131363069;
-                                                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363069);
+                                                                        i = R.id.edit_integration_save;
+                                                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.edit_integration_save);
                                                                         if (floatingActionButton != null) {
-                                                                            i = 2131363070;
-                                                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363070);
+                                                                            i = R.id.edit_integration_settings_scroll;
+                                                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.edit_integration_settings_scroll);
                                                                             if (nestedScrollView != null) {
-                                                                                i = 2131363075;
-                                                                                LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131363075);
+                                                                                i = R.id.edit_member_administrative_container;
+                                                                                LinearLayout linearLayout5 = (LinearLayout) view.findViewById(R.id.edit_member_administrative_container);
                                                                                 if (linearLayout5 != null) {
-                                                                                    i = 2131363079;
-                                                                                    LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131363079);
+                                                                                    i = R.id.edit_member_roles_container;
+                                                                                    LinearLayout linearLayout6 = (LinearLayout) view.findViewById(R.id.edit_member_roles_container);
                                                                                     if (linearLayout6 != null) {
-                                                                                        i = 2131365413;
-                                                                                        View findViewById = view.findViewById(2131365413);
+                                                                                        i = R.id.sync_settings;
+                                                                                        View findViewById = view.findViewById(R.id.sync_settings);
                                                                                         if (findViewById != null) {
-                                                                                            int i2 = 2131363065;
-                                                                                            TextView textView3 = (TextView) findViewById.findViewById(2131363065);
+                                                                                            int i2 = R.id.edit_integration_last_sync_time;
+                                                                                            TextView textView3 = (TextView) findViewById.findViewById(R.id.edit_integration_last_sync_time);
                                                                                             if (textView3 != null) {
-                                                                                                i2 = 2131363071;
-                                                                                                TextView textView4 = (TextView) findViewById.findViewById(2131363071);
+                                                                                                i2 = R.id.edit_integration_subscriber_count;
+                                                                                                TextView textView4 = (TextView) findViewById.findViewById(R.id.edit_integration_subscriber_count);
                                                                                                 if (textView4 != null) {
-                                                                                                    i2 = 2131363072;
-                                                                                                    RelativeLayout relativeLayout = (RelativeLayout) findViewById.findViewById(2131363072);
+                                                                                                    i2 = R.id.edit_integration_sync_container;
+                                                                                                    RelativeLayout relativeLayout = (RelativeLayout) findViewById.findViewById(R.id.edit_integration_sync_container);
                                                                                                     if (relativeLayout != null) {
-                                                                                                        i2 = 2131363073;
-                                                                                                        TextView textView5 = (TextView) findViewById.findViewById(2131363073);
+                                                                                                        i2 = R.id.edit_integration_synced_role;
+                                                                                                        TextView textView5 = (TextView) findViewById.findViewById(R.id.edit_integration_synced_role);
                                                                                                         if (textView5 != null) {
-                                                                                                            i2 = 2131363074;
-                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) findViewById.findViewById(2131363074);
+                                                                                                            i2 = R.id.edit_integration_synced_role_container;
+                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) findViewById.findViewById(R.id.edit_integration_synced_role_container);
                                                                                                             if (relativeLayout2 != null) {
                                                                                                                 return new WidgetServerSettingsEditIntegrationBinding((CoordinatorLayout) view, dimmerView, linearLayout, checkedSetting, checkedSetting2, checkedSetting3, linearLayout2, linearLayout3, checkedSetting4, checkedSetting5, checkedSetting6, checkedSetting7, checkedSetting8, imageView, textView, linearLayout4, textView2, floatingActionButton, nestedScrollView, linearLayout5, linearLayout6, new v((LinearLayout) findViewById, textView3, textView4, relativeLayout, textView5, relativeLayout2));
                                                                                                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java
index a135b65c2e..9cad8accdc 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.utilities.stateful.StatefulViews;
 import com.discord.views.CheckedSetting;
 import d0.z.d.m;
@@ -18,7 +19,7 @@ public final class WidgetServerSettingsEditIntegration$onViewBound$2 implements
         StatefulViews access$getState$p = WidgetServerSettingsEditIntegration.access$getState$p(this.this$0);
         CheckedSetting checkedSetting = WidgetServerSettingsEditIntegration.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(checkedSetting, "binding.editIntegrationCustomEmotesToggle");
-        access$getState$p.put(2131363054, Boolean.valueOf(checkedSetting.isChecked()));
+        access$getState$p.put(R.id.edit_integration_custom_emotes_toggle, Boolean.valueOf(checkedSetting.isChecked()));
         WidgetServerSettingsEditIntegration.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsEditIntegration.access$getBinding$p(this.this$0).o);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
index c36e0a0f4c..0391a3499f 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
@@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -59,7 +60,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
     private final Lazy expiryBehaviorRadios$delegate = g.lazy(new WidgetServerSettingsEditIntegration$expiryBehaviorRadios$2(this));
     private RadioManager gracePeriodRadioManager;
     private final Lazy gracePeriodRadios$delegate = g.lazy(new WidgetServerSettingsEditIntegration$gracePeriodRadios$2(this));
-    private final StatefulViews state = new StatefulViews(2131363054, 2131363057, 2131363058);
+    private final StatefulViews state = new StatefulViews(R.id.edit_integration_custom_emotes_toggle, R.id.edit_integration_expired_sub_container, R.id.edit_integration_grace_period_container);
 
     /* compiled from: WidgetServerSettingsEditIntegration.kt */
     public static final class Companion {
@@ -74,7 +75,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
             intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-            intent.putExtra("INTENT_EXTRA_INTEGRATION_ID", j2);
+            intent.putExtra(WidgetServerSettingsEditIntegration.INTENT_EXTRA_INTEGRATION_ID, j2);
             l.d(context, WidgetServerSettingsEditIntegration.class, intent);
         }
     }
@@ -193,7 +194,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
     }
 
     public WidgetServerSettingsEditIntegration() {
-        super(2131559212);
+        super(R.layout.widget_server_settings_edit_integration);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEditIntegration widgetServerSettingsEditIntegration, Model model) {
@@ -245,7 +246,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
             }
             return;
         }
-        setActionBarTitle(2131890692);
+        setActionBarTitle(R.string.integration_settings);
         setActionBarSubtitle(model.getGuild().getName());
         boolean areEqual = m.areEqual(model.getIntegration().getType(), "twitch");
         TextView textView = getBinding().m;
@@ -254,7 +255,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         TextView textView2 = getBinding().n;
         m.checkNotNullExpressionValue(textView2, "binding.editIntegrationOwnerName");
         textView2.setText(model.getIntegration().getUser().r());
-        getBinding().l.setImageResource(areEqual ? 2131230895 : 2131230896);
+        getBinding().l.setImageResource(areEqual ? R.drawable.asset_account_sync_twitch : R.drawable.asset_account_sync_youtube);
         getBinding().p.d.setOnClickListener(new WidgetServerSettingsEditIntegration$configureUI$1(this, model));
         int i = 0;
         WidgetServerSettingsEditIntegration$configureUI$2 widgetServerSettingsEditIntegration$configureUI$2 = null;
@@ -278,7 +279,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         m.checkNotNullExpressionValue(coordinatorLayout2, "binding.root");
         Context context2 = coordinatorLayout2.getContext();
         m.checkNotNullExpressionValue(context2, "binding.root.context");
-        textView4.setText(b.l(StringResourceUtilsKt.getQuantityString(resources, context2, areEqual ? 2131755240 : 2131755239, model.getIntegration().getSubscriberCount(), Integer.valueOf(model.getIntegration().getSubscriberCount())), new Object[0], null, 2));
+        textView4.setText(b.l(StringResourceUtilsKt.getQuantityString(resources, context2, areEqual ? R.plurals.num_subscribers_subscribers : R.plurals.num_members_subscribers, model.getIntegration().getSubscriberCount(), Integer.valueOf(model.getIntegration().getSubscriberCount())), new Object[0], null, 2));
         RelativeLayout relativeLayout = getBinding().p.f;
         if (model.getRole() != null) {
             widgetServerSettingsEditIntegration$configureUI$2 = new WidgetServerSettingsEditIntegration$configureUI$2(model);
@@ -287,14 +288,14 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         TextView textView5 = getBinding().p.e;
         m.checkNotNullExpressionValue(textView5, "binding.syncSettings.editIntegrationSyncedRole");
         textView5.setText(model.getRole() != null ? model.getRole().f() : "None");
-        getBinding().p.e.setTextColor(RoleUtils.getOpaqueColor(model.getRole(), ColorCompat.getColor(this, 2131100126)));
-        int intValue = ((Number) this.state.get(2131363057, Integer.valueOf(model.getIntegration().getExpireBehavior()))).intValue();
+        getBinding().p.e.setTextColor(RoleUtils.getOpaqueColor(model.getRole(), ColorCompat.getColor(this, (int) R.color.primary_300)));
+        int intValue = ((Number) this.state.get(R.id.edit_integration_expired_sub_container, Integer.valueOf(model.getIntegration().getExpireBehavior()))).intValue();
         RadioManager radioManager = this.expiryBehaviorRadioManager;
         if (radioManager == null) {
             m.throwUninitializedPropertyAccessException("expiryBehaviorRadioManager");
         }
         radioManager.a(getExpiryBehaviorRadios().get(intValue));
-        int intValue2 = ((Number) this.state.get(2131363058, Integer.valueOf(getGracePeriodPosition(model.getIntegration().getExpireGracePeriod())))).intValue();
+        int intValue2 = ((Number) this.state.get(R.id.edit_integration_grace_period_container, Integer.valueOf(getGracePeriodPosition(model.getIntegration().getExpireGracePeriod())))).intValue();
         RadioManager radioManager2 = this.gracePeriodRadioManager;
         if (radioManager2 == null) {
             m.throwUninitializedPropertyAccessException("gracePeriodRadioManager");
@@ -370,8 +371,8 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setRetainInstance(true);
-        this.expiryBehaviorRadioManager = setupRadioManager(getExpiryBehaviorRadios(), 2131363057);
-        this.gracePeriodRadioManager = setupRadioManager(getGracePeriodRadios(), 2131363058);
+        this.expiryBehaviorRadioManager = setupRadioManager(getExpiryBehaviorRadios(), R.id.edit_integration_expired_sub_container);
+        this.gracePeriodRadioManager = setupRadioManager(getGracePeriodRadios(), R.id.edit_integration_grace_period_container);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         this.state.setupUnsavedChangesConfirmation(this);
         List<CheckedSetting> gracePeriodRadios = getGracePeriodRadios();
@@ -388,7 +389,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
             Context context = checkedSetting.getContext();
             m.checkNotNullExpressionValue(context, "radio.context");
             int[] iArr = gracePeriodDays;
-            checkedSetting.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755231, iArr[i], Integer.valueOf(iArr[i])));
+            checkedSetting.setText(StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.n_days_days, iArr[i], Integer.valueOf(iArr[i])));
             arrayList.add(Unit.a);
             i = i2;
         }
@@ -399,7 +400,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         long longExtra = getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
-        long longExtra2 = getMostRecentIntent().getLongExtra("INTENT_EXTRA_INTEGRATION_ID", -1);
+        long longExtra2 = getMostRecentIntent().getLongExtra(INTENT_EXTRA_INTEGRATION_ID, -1);
         StoreStream.Companion.getGuildIntegrations().onIntegrationScreenOpened(longExtra);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(longExtra, longExtra2), this, null, 2, null), WidgetServerSettingsEditIntegration.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEditIntegration$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java
index 8a6a813d3d..8f43ea72d5 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsEditMemberBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -21,29 +22,29 @@ public final /* synthetic */ class WidgetServerSettingsEditMember$binding$2 exte
 
     public final WidgetServerSettingsEditMemberBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363075;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363075);
+        int i = R.id.edit_member_administrative_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.edit_member_administrative_container);
         if (linearLayout != null) {
-            i = 2131363076;
-            TextView textView = (TextView) view.findViewById(2131363076);
+            i = R.id.edit_member_ban_button;
+            TextView textView = (TextView) view.findViewById(R.id.edit_member_ban_button);
             if (textView != null) {
-                i = 2131363077;
-                TextView textView2 = (TextView) view.findViewById(2131363077);
+                i = R.id.edit_member_kick_button;
+                TextView textView2 = (TextView) view.findViewById(R.id.edit_member_kick_button);
                 if (textView2 != null) {
-                    i = 2131363078;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363078);
+                    i = R.id.edit_member_nickname;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.edit_member_nickname);
                     if (textInputLayout != null) {
-                        i = 2131363079;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363079);
+                        i = R.id.edit_member_roles_container;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.edit_member_roles_container);
                         if (linearLayout2 != null) {
-                            i = 2131363080;
-                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363080);
+                            i = R.id.edit_member_roles_recycler;
+                            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.edit_member_roles_recycler);
                             if (recyclerView != null) {
-                                i = 2131363081;
-                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363081);
+                                i = R.id.edit_member_save;
+                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.edit_member_save);
                                 if (floatingActionButton != null) {
-                                    i = 2131363082;
-                                    TextView textView3 = (TextView) view.findViewById(2131363082);
+                                    i = R.id.edit_member_transfer_ownership_button;
+                                    TextView textView3 = (TextView) view.findViewById(R.id.edit_member_transfer_ownership_button);
                                     if (textView3 != null) {
                                         return new WidgetServerSettingsEditMemberBinding((CoordinatorLayout) view, linearLayout, textView, textView2, textInputLayout, linearLayout2, recyclerView, floatingActionButton, textView3);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java
index d3a2fdd728..db5fb5e3bc 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.widgets.servers.WidgetServerSettingsEditMember;
 import com.discord.widgets.servers.WidgetServerSettingsTransferOwnership;
@@ -20,7 +21,7 @@ public final class WidgetServerSettingsEditMember$configureUI$4 implements View.
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         if (this.$data.getGuild().getFeatures().contains(GuildFeature.VERIFIED) || this.$data.getGuild().getFeatures().contains(GuildFeature.PARTNERED)) {
-            o.i(this.this$0, 2131894402, 0, 4);
+            o.i(this.this$0, R.string.transfer_ownership_protected_guild, 0, 4);
             return;
         }
         WidgetServerSettingsTransferOwnership.Companion companion = WidgetServerSettingsTransferOwnership.Companion;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
index 0c9c5ab726..67f1286969 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsEditMemberBinding;
@@ -46,7 +47,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
     private static final String INTENT_EXTRA_USER_ID = "INTENT_EXTRA_USER_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditMember$binding$2.INSTANCE, null, 2, null);
     private WidgetServerSettingsEditMemberRolesAdapter rolesAdapter;
-    private final StatefulViews state = new StatefulViews(2131363078);
+    private final StatefulViews state = new StatefulViews(R.id.edit_member_nickname);
 
     /* compiled from: WidgetServerSettingsEditMember.kt */
     public static final class Companion {
@@ -61,7 +62,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
             intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-            intent.putExtra("INTENT_EXTRA_USER_ID", j2);
+            intent.putExtra(WidgetServerSettingsEditMember.INTENT_EXTRA_USER_ID, j2);
             l.d(context, WidgetServerSettingsEditMember.class, intent);
         }
     }
@@ -312,7 +313,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
     }
 
     public WidgetServerSettingsEditMember() {
-        super(2131559213);
+        super(R.layout.widget_server_settings_edit_member);
     }
 
     public static final /* synthetic */ void access$changeNickname(WidgetServerSettingsEditMember widgetServerSettingsEditMember, Model model, String str) {
@@ -352,7 +353,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
         boolean z2 = true;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         Context context = getContext();
-        setActionBarTitle(context != null ? c.a.l.b.h(context, 2131889342, new Object[]{model.getGuild().getName()}, null, 4) : null);
+        setActionBarTitle(context != null ? c.a.l.b.h(context, R.string.guild_members_header, new Object[]{model.getGuild().getName()}, null, 4) : null);
         GuildMember.Companion companion = GuildMember.Companion;
         setActionBarSubtitle(companion.getNickOrUsername(model.getUserComputed(), model.getUser()));
         setupNickname(model);
@@ -363,7 +364,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
         if (model.getCanKick()) {
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.editMemberKickButton");
-            c.a.l.b.n(textView, 2131891074, new Object[]{nickOrUsername}, null, 4);
+            c.a.l.b.n(textView, R.string.kick_user_title, new Object[]{nickOrUsername}, null, 4);
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.editMemberKickButton");
             textView2.setVisibility(0);
@@ -377,7 +378,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
         if (model.getCanBan()) {
             TextView textView4 = getBinding().f1917c;
             m.checkNotNullExpressionValue(textView4, "binding.editMemberBanButton");
-            c.a.l.b.n(textView4, 2131886828, new Object[]{nickOrUsername}, null, 4);
+            c.a.l.b.n(textView4, R.string.ban_user_title, new Object[]{nickOrUsername}, null, 4);
             TextView textView5 = getBinding().f1917c;
             m.checkNotNullExpressionValue(textView5, "binding.editMemberBanButton");
             textView5.setVisibility(0);
@@ -416,7 +417,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
 
     private final void onNicknameChangeSuccessful(String str) {
         AppFragment.hideKeyboard$default(this, null, 1, null);
-        o.j(this, str.length() > 0 ? c.a.l.b.k(this, 2131891688, new Object[]{str}, null, 4) : c.a.l.b.k(this, 2131891689, new Object[0], null, 4), 0, 4);
+        o.j(this, str.length() > 0 ? c.a.l.b.k(this, R.string.nickname_changed, new Object[]{str}, null, 4) : c.a.l.b.k(this, R.string.nickname_cleared, new Object[0], null, 4), 0, 4);
     }
 
     private final void setupNickname(Model model) {
@@ -490,7 +491,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         long longExtra = getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
-        long longExtra2 = getMostRecentIntent().getLongExtra("INTENT_EXTRA_USER_ID", -1);
+        long longExtra2 = getMostRecentIntent().getLongExtra(INTENT_EXTRA_USER_ID, -1);
         StoreStream.Companion.getGuildSubscriptions().subscribeUser(longExtra, longExtra2);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(longExtra, longExtra2), this, null, 2, null), WidgetServerSettingsEditMember.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEditMember$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java
index 6a07ead037..6e23aa69c5 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.databinding.ViewCheckableRoleListItemBinding;
 import com.discord.utilities.guilds.RoleUtils;
@@ -159,7 +160,7 @@ public final class WidgetServerSettingsEditMemberRolesAdapter extends MGRecycler
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RoleListItem(WidgetServerSettingsEditMemberRolesAdapter widgetServerSettingsEditMemberRolesAdapter) {
-            super(2131558748, widgetServerSettingsEditMemberRolesAdapter);
+            super((int) R.layout.view_checkable_role_list_item, widgetServerSettingsEditMemberRolesAdapter);
             m.checkNotNullParameter(widgetServerSettingsEditMemberRolesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -190,7 +191,7 @@ public final class WidgetServerSettingsEditMemberRolesAdapter extends MGRecycler
             if (roleItem.isManageable()) {
                 this.binding.b.e(new WidgetServerSettingsEditMemberRolesAdapter$RoleListItem$onConfigure$1(this, roleItem));
             } else if (roleItem.isRoleManaged()) {
-                this.binding.b.b(2131891246);
+                this.binding.b.b(R.string.managed_role_explaination);
             } else {
                 CheckedSetting.d(this.binding.b, null, 1);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java
index 01219d9064..c34ed56500 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetEditRoleBinding;
 import com.discord.views.CheckedSetting;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -22,149 +23,149 @@ public final /* synthetic */ class WidgetServerSettingsEditRole$binding$2 extend
 
     public final WidgetEditRoleBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363084;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363084);
+        int i = R.id.edit_role_name;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.edit_role_name);
         if (textInputLayout != null) {
-            i = 2131363085;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363085);
+            i = R.id.edit_role_save;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.edit_role_save);
             if (floatingActionButton != null) {
-                i = 2131364684;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364684);
+                i = R.id.role_settings_add_reactions;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.role_settings_add_reactions);
                 if (checkedSetting != null) {
-                    i = 2131364685;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364685);
+                    i = R.id.role_settings_administrator;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.role_settings_administrator);
                     if (checkedSetting2 != null) {
-                        i = 2131364686;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364686);
+                        i = R.id.role_settings_attach_files;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.role_settings_attach_files);
                         if (checkedSetting3 != null) {
-                            i = 2131364687;
-                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364687);
+                            i = R.id.role_settings_ban_members;
+                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.role_settings_ban_members);
                             if (checkedSetting4 != null) {
-                                i = 2131364688;
-                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364688);
+                                i = R.id.role_settings_change_nickname;
+                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.role_settings_change_nickname);
                                 if (checkedSetting5 != null) {
-                                    i = 2131364689;
-                                    View findViewById = view.findViewById(2131364689);
+                                    i = R.id.role_settings_color_disabled_overlay;
+                                    View findViewById = view.findViewById(R.id.role_settings_color_disabled_overlay);
                                     if (findViewById != null) {
-                                        i = 2131364690;
-                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364690);
+                                        i = R.id.role_settings_color_selector_container;
+                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.role_settings_color_selector_container);
                                         if (relativeLayout != null) {
-                                            i = 2131364691;
-                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364691);
+                                            i = R.id.role_settings_create_instant_invite;
+                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.role_settings_create_instant_invite);
                                             if (checkedSetting6 != null) {
-                                                i = 2131364692;
-                                                View findViewById2 = view.findViewById(2131364692);
+                                                i = R.id.role_settings_current_color_display;
+                                                View findViewById2 = view.findViewById(R.id.role_settings_current_color_display);
                                                 if (findViewById2 != null) {
-                                                    i = 2131364693;
-                                                    View findViewById3 = view.findViewById(2131364693);
+                                                    i = R.id.role_settings_edit_name_disabled_overlay;
+                                                    View findViewById3 = view.findViewById(R.id.role_settings_edit_name_disabled_overlay);
                                                     if (findViewById3 != null) {
-                                                        i = 2131364694;
-                                                        CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364694);
+                                                        i = R.id.role_settings_embed_links;
+                                                        CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(R.id.role_settings_embed_links);
                                                         if (checkedSetting7 != null) {
-                                                            i = 2131364695;
-                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364695);
+                                                            i = R.id.role_settings_hoist_checkedsetting;
+                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(R.id.role_settings_hoist_checkedsetting);
                                                             if (checkedSetting8 != null) {
-                                                                i = 2131364696;
-                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364696);
+                                                                i = R.id.role_settings_kick_members;
+                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(R.id.role_settings_kick_members);
                                                                 if (checkedSetting9 != null) {
-                                                                    i = 2131364697;
-                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364697);
+                                                                    i = R.id.role_settings_manage_channels;
+                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_channels);
                                                                     if (checkedSetting10 != null) {
-                                                                        i = 2131364698;
-                                                                        CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364698);
+                                                                        i = R.id.role_settings_manage_emojis_and_stickers;
+                                                                        CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_emojis_and_stickers);
                                                                         if (checkedSetting11 != null) {
-                                                                            i = 2131364699;
-                                                                            CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364699);
+                                                                            i = R.id.role_settings_manage_messages;
+                                                                            CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_messages);
                                                                             if (checkedSetting12 != null) {
-                                                                                i = 2131364700;
-                                                                                CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364700);
+                                                                                i = R.id.role_settings_manage_nicknames;
+                                                                                CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_nicknames);
                                                                                 if (checkedSetting13 != null) {
-                                                                                    i = 2131364701;
-                                                                                    CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364701);
+                                                                                    i = R.id.role_settings_manage_roles;
+                                                                                    CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_roles);
                                                                                     if (checkedSetting14 != null) {
-                                                                                        i = 2131364702;
-                                                                                        CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364702);
+                                                                                        i = R.id.role_settings_manage_server;
+                                                                                        CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_server);
                                                                                         if (checkedSetting15 != null) {
-                                                                                            i = 2131364703;
-                                                                                            CheckedSetting checkedSetting16 = (CheckedSetting) view.findViewById(2131364703);
+                                                                                            i = R.id.role_settings_manage_threads;
+                                                                                            CheckedSetting checkedSetting16 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_threads);
                                                                                             if (checkedSetting16 != null) {
-                                                                                                i = 2131364704;
-                                                                                                CheckedSetting checkedSetting17 = (CheckedSetting) view.findViewById(2131364704);
+                                                                                                i = R.id.role_settings_manage_webhooks;
+                                                                                                CheckedSetting checkedSetting17 = (CheckedSetting) view.findViewById(R.id.role_settings_manage_webhooks);
                                                                                                 if (checkedSetting17 != null) {
-                                                                                                    i = 2131364705;
-                                                                                                    CheckedSetting checkedSetting18 = (CheckedSetting) view.findViewById(2131364705);
+                                                                                                    i = R.id.role_settings_mention_everyone;
+                                                                                                    CheckedSetting checkedSetting18 = (CheckedSetting) view.findViewById(R.id.role_settings_mention_everyone);
                                                                                                     if (checkedSetting18 != null) {
-                                                                                                        i = 2131364706;
-                                                                                                        CheckedSetting checkedSetting19 = (CheckedSetting) view.findViewById(2131364706);
+                                                                                                        i = R.id.role_settings_mentionable_checkedsetting;
+                                                                                                        CheckedSetting checkedSetting19 = (CheckedSetting) view.findViewById(R.id.role_settings_mentionable_checkedsetting);
                                                                                                         if (checkedSetting19 != null) {
-                                                                                                            i = 2131364707;
-                                                                                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364707);
+                                                                                                            i = R.id.role_settings_overview_scroll;
+                                                                                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.role_settings_overview_scroll);
                                                                                                             if (nestedScrollView != null) {
-                                                                                                                i = 2131364708;
-                                                                                                                CheckedSetting checkedSetting20 = (CheckedSetting) view.findViewById(2131364708);
+                                                                                                                i = R.id.role_settings_priority_speaker;
+                                                                                                                CheckedSetting checkedSetting20 = (CheckedSetting) view.findViewById(R.id.role_settings_priority_speaker);
                                                                                                                 if (checkedSetting20 != null) {
-                                                                                                                    i = 2131364709;
-                                                                                                                    CheckedSetting checkedSetting21 = (CheckedSetting) view.findViewById(2131364709);
+                                                                                                                    i = R.id.role_settings_read_message_history;
+                                                                                                                    CheckedSetting checkedSetting21 = (CheckedSetting) view.findViewById(R.id.role_settings_read_message_history);
                                                                                                                     if (checkedSetting21 != null) {
-                                                                                                                        i = 2131364710;
-                                                                                                                        CheckedSetting checkedSetting22 = (CheckedSetting) view.findViewById(2131364710);
+                                                                                                                        i = R.id.role_settings_read_messages;
+                                                                                                                        CheckedSetting checkedSetting22 = (CheckedSetting) view.findViewById(R.id.role_settings_read_messages);
                                                                                                                         if (checkedSetting22 != null) {
-                                                                                                                            i = 2131364711;
-                                                                                                                            CheckedSetting checkedSetting23 = (CheckedSetting) view.findViewById(2131364711);
+                                                                                                                            i = R.id.role_settings_request_to_speak;
+                                                                                                                            CheckedSetting checkedSetting23 = (CheckedSetting) view.findViewById(R.id.role_settings_request_to_speak);
                                                                                                                             if (checkedSetting23 != null) {
-                                                                                                                                i = 2131364712;
-                                                                                                                                CheckedSetting checkedSetting24 = (CheckedSetting) view.findViewById(2131364712);
+                                                                                                                                i = R.id.role_settings_send_messages;
+                                                                                                                                CheckedSetting checkedSetting24 = (CheckedSetting) view.findViewById(R.id.role_settings_send_messages);
                                                                                                                                 if (checkedSetting24 != null) {
-                                                                                                                                    i = 2131364713;
-                                                                                                                                    CheckedSetting checkedSetting25 = (CheckedSetting) view.findViewById(2131364713);
+                                                                                                                                    i = R.id.role_settings_send_tts_messages;
+                                                                                                                                    CheckedSetting checkedSetting25 = (CheckedSetting) view.findViewById(R.id.role_settings_send_tts_messages);
                                                                                                                                     if (checkedSetting25 != null) {
-                                                                                                                                        i = 2131364714;
-                                                                                                                                        CheckedSetting checkedSetting26 = (CheckedSetting) view.findViewById(2131364714);
+                                                                                                                                        i = R.id.role_settings_use_application_commands;
+                                                                                                                                        CheckedSetting checkedSetting26 = (CheckedSetting) view.findViewById(R.id.role_settings_use_application_commands);
                                                                                                                                         if (checkedSetting26 != null) {
-                                                                                                                                            i = 2131364715;
-                                                                                                                                            CheckedSetting checkedSetting27 = (CheckedSetting) view.findViewById(2131364715);
+                                                                                                                                            i = R.id.role_settings_use_external_emojis;
+                                                                                                                                            CheckedSetting checkedSetting27 = (CheckedSetting) view.findViewById(R.id.role_settings_use_external_emojis);
                                                                                                                                             if (checkedSetting27 != null) {
-                                                                                                                                                i = 2131364716;
-                                                                                                                                                CheckedSetting checkedSetting28 = (CheckedSetting) view.findViewById(2131364716);
+                                                                                                                                                i = R.id.role_settings_use_external_stickers;
+                                                                                                                                                CheckedSetting checkedSetting28 = (CheckedSetting) view.findViewById(R.id.role_settings_use_external_stickers);
                                                                                                                                                 if (checkedSetting28 != null) {
-                                                                                                                                                    i = 2131364717;
-                                                                                                                                                    CheckedSetting checkedSetting29 = (CheckedSetting) view.findViewById(2131364717);
+                                                                                                                                                    i = R.id.role_settings_use_private_threads;
+                                                                                                                                                    CheckedSetting checkedSetting29 = (CheckedSetting) view.findViewById(R.id.role_settings_use_private_threads);
                                                                                                                                                     if (checkedSetting29 != null) {
-                                                                                                                                                        i = 2131364718;
-                                                                                                                                                        CheckedSetting checkedSetting30 = (CheckedSetting) view.findViewById(2131364718);
+                                                                                                                                                        i = R.id.role_settings_use_public_threads;
+                                                                                                                                                        CheckedSetting checkedSetting30 = (CheckedSetting) view.findViewById(R.id.role_settings_use_public_threads);
                                                                                                                                                         if (checkedSetting30 != null) {
-                                                                                                                                                            i = 2131364719;
-                                                                                                                                                            CheckedSetting checkedSetting31 = (CheckedSetting) view.findViewById(2131364719);
+                                                                                                                                                            i = R.id.role_settings_view_audit_log;
+                                                                                                                                                            CheckedSetting checkedSetting31 = (CheckedSetting) view.findViewById(R.id.role_settings_view_audit_log);
                                                                                                                                                             if (checkedSetting31 != null) {
-                                                                                                                                                                i = 2131364720;
-                                                                                                                                                                CheckedSetting checkedSetting32 = (CheckedSetting) view.findViewById(2131364720);
+                                                                                                                                                                i = R.id.role_settings_view_guild_analytics;
+                                                                                                                                                                CheckedSetting checkedSetting32 = (CheckedSetting) view.findViewById(R.id.role_settings_view_guild_analytics);
                                                                                                                                                                 if (checkedSetting32 != null) {
-                                                                                                                                                                    i = 2131364721;
-                                                                                                                                                                    CheckedSetting checkedSetting33 = (CheckedSetting) view.findViewById(2131364721);
+                                                                                                                                                                    i = R.id.role_settings_voice_connect;
+                                                                                                                                                                    CheckedSetting checkedSetting33 = (CheckedSetting) view.findViewById(R.id.role_settings_voice_connect);
                                                                                                                                                                     if (checkedSetting33 != null) {
-                                                                                                                                                                        i = 2131364722;
-                                                                                                                                                                        CheckedSetting checkedSetting34 = (CheckedSetting) view.findViewById(2131364722);
+                                                                                                                                                                        i = R.id.role_settings_voice_deafen_members;
+                                                                                                                                                                        CheckedSetting checkedSetting34 = (CheckedSetting) view.findViewById(R.id.role_settings_voice_deafen_members);
                                                                                                                                                                         if (checkedSetting34 != null) {
-                                                                                                                                                                            i = 2131364723;
-                                                                                                                                                                            CheckedSetting checkedSetting35 = (CheckedSetting) view.findViewById(2131364723);
+                                                                                                                                                                            i = R.id.role_settings_voice_move_members;
+                                                                                                                                                                            CheckedSetting checkedSetting35 = (CheckedSetting) view.findViewById(R.id.role_settings_voice_move_members);
                                                                                                                                                                             if (checkedSetting35 != null) {
-                                                                                                                                                                                i = 2131364724;
-                                                                                                                                                                                CheckedSetting checkedSetting36 = (CheckedSetting) view.findViewById(2131364724);
+                                                                                                                                                                                i = R.id.role_settings_voice_mute_members;
+                                                                                                                                                                                CheckedSetting checkedSetting36 = (CheckedSetting) view.findViewById(R.id.role_settings_voice_mute_members);
                                                                                                                                                                                 if (checkedSetting36 != null) {
-                                                                                                                                                                                    i = 2131364725;
-                                                                                                                                                                                    CheckedSetting checkedSetting37 = (CheckedSetting) view.findViewById(2131364725);
+                                                                                                                                                                                    i = R.id.role_settings_voice_speak;
+                                                                                                                                                                                    CheckedSetting checkedSetting37 = (CheckedSetting) view.findViewById(R.id.role_settings_voice_speak);
                                                                                                                                                                                     if (checkedSetting37 != null) {
-                                                                                                                                                                                        i = 2131364726;
-                                                                                                                                                                                        CheckedSetting checkedSetting38 = (CheckedSetting) view.findViewById(2131364726);
+                                                                                                                                                                                        i = R.id.role_settings_voice_use_voice_activity;
+                                                                                                                                                                                        CheckedSetting checkedSetting38 = (CheckedSetting) view.findViewById(R.id.role_settings_voice_use_voice_activity);
                                                                                                                                                                                         if (checkedSetting38 != null) {
-                                                                                                                                                                                            i = 2131364727;
-                                                                                                                                                                                            CheckedSetting checkedSetting39 = (CheckedSetting) view.findViewById(2131364727);
+                                                                                                                                                                                            i = R.id.role_settings_voice_video;
+                                                                                                                                                                                            CheckedSetting checkedSetting39 = (CheckedSetting) view.findViewById(R.id.role_settings_voice_video);
                                                                                                                                                                                             if (checkedSetting39 != null) {
-                                                                                                                                                                                                i = 2131365262;
-                                                                                                                                                                                                View findViewById4 = view.findViewById(2131365262);
+                                                                                                                                                                                                i = R.id.stage_permissions_divider;
+                                                                                                                                                                                                View findViewById4 = view.findViewById(R.id.stage_permissions_divider);
                                                                                                                                                                                                 if (findViewById4 != null) {
-                                                                                                                                                                                                    i = 2131365263;
-                                                                                                                                                                                                    TextView textView = (TextView) view.findViewById(2131365263);
+                                                                                                                                                                                                    i = R.id.stage_permissions_title;
+                                                                                                                                                                                                    TextView textView = (TextView) view.findViewById(R.id.stage_permissions_title);
                                                                                                                                                                                                     if (textView != null) {
                                                                                                                                                                                                         return new WidgetEditRoleBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, findViewById, relativeLayout, checkedSetting6, findViewById2, findViewById3, checkedSetting7, checkedSetting8, checkedSetting9, checkedSetting10, checkedSetting11, checkedSetting12, checkedSetting13, checkedSetting14, checkedSetting15, checkedSetting16, checkedSetting17, checkedSetting18, checkedSetting19, nestedScrollView, checkedSetting20, checkedSetting21, checkedSetting22, checkedSetting23, checkedSetting24, checkedSetting25, checkedSetting26, checkedSetting27, checkedSetting28, checkedSetting29, checkedSetting30, checkedSetting31, checkedSetting32, checkedSetting33, checkedSetting34, checkedSetting35, checkedSetting36, checkedSetting37, checkedSetting38, checkedSetting39, findViewById4, textView);
                                                                                                                                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java
index b6b5eba0c0..971eebe29d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers;
 
 import android.view.View;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -51,6 +52,6 @@ public final class WidgetServerSettingsEditRole$configureUI$1 implements View.On
             AppFragment.hideKeyboard$default(this.this$0, null, 1, null);
             return;
         }
-        o.i(this.this$0, 2131888761, 0, 4);
+        o.i(this.this$0, R.string.form_label_role_enter_name, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupActionBar$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupActionBar$1.java
index e92e2d38b0..031d89da81 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupActionBar$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupActionBar$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 import androidx.annotation.ColorInt;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function2;
@@ -15,7 +16,7 @@ public final class WidgetServerSettingsEditRole$setupActionBar$1 extends o imple
     }
 
     public final SpannableStringBuilder invoke(String str, @ColorInt int i) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(str);
         spannableStringBuilder.setSpan(new ForegroundColorSpan(i), 0, spannableStringBuilder.length(), 0);
         return spannableStringBuilder;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java
index f6868f8453..c821c978c5 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.content.Context;
 import android.view.MenuItem;
 import c.a.e.q;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -39,7 +40,7 @@ public final class WidgetServerSettingsEditRole$setupMenu$1<T1, T2> implements A
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullParameter(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364097) {
+        if (menuItem.getItemId() == R.id.menu_edit_role_delete) {
             ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteRole(this.$data.getGuildId(), this.$data.getRole().getId()), false, 1, null), this.this$0, null, 2, null).k(q.j(new AnonymousClass1(this), this.this$0.getContext(), null, 4));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
index 41ffe505a6..6759681d13 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
@@ -15,6 +15,8 @@ import androidx.fragment.app.FragmentManager;
 import c.a.e.l;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -53,7 +55,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private static final String INTENT_EXTRA_ROLE_ID = "INTENT_EXTRA_ROLE_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditRole$binding$2.INSTANCE, null, 2, null);
-    private final StatefulViews state = new StatefulViews(2131363084);
+    private final StatefulViews state = new StatefulViews(R.id.edit_role_name);
 
     /* compiled from: WidgetServerSettingsEditRole.kt */
     public static final class Companion {
@@ -68,7 +70,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
             intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-            intent.putExtra("INTENT_EXTRA_ROLE_ID", j2);
+            intent.putExtra(WidgetServerSettingsEditRole.INTENT_EXTRA_ROLE_ID, j2);
             l.d(context, WidgetServerSettingsEditRole.class, intent);
         }
     }
@@ -102,7 +104,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             }
 
             private final ManageStatus computeManageStatus(boolean z2, boolean z3, Long l, GuildRole guildRole, GuildRole guildRole2) {
-                return (z2 || (PermissionUtils.can(8, l) && RoleUtils.rankIsHigher(guildRole, guildRole2) && z3)) ? ManageStatus.CAN_MANAGE_ADMIN : RoleUtils.rankIsHigher(guildRole2, guildRole) ? ManageStatus.LOCKED_HIGHER : RoleUtils.rankEquals(guildRole, guildRole2) ? ManageStatus.LOCKED_HIGHEST : (!PermissionUtils.can(268435456, l) || !z3) ? !z3 ? ManageStatus.USER_NOT_ELEVATED : ManageStatus.NO_MANAGE_ROLES_PERMISSION : ManageStatus.CAN_MANAGE_CONDITIONAL;
+                return (z2 || (PermissionUtils.can(8, l) && RoleUtils.rankIsHigher(guildRole, guildRole2) && z3)) ? ManageStatus.CAN_MANAGE_ADMIN : RoleUtils.rankIsHigher(guildRole2, guildRole) ? ManageStatus.LOCKED_HIGHER : RoleUtils.rankEquals(guildRole, guildRole2) ? ManageStatus.LOCKED_HIGHEST : (!PermissionUtils.can(Permission.MANAGE_ROLES, l) || !z3) ? !z3 ? ManageStatus.USER_NOT_ELEVATED : ManageStatus.NO_MANAGE_ROLES_PERMISSION : ManageStatus.CAN_MANAGE_CONDITIONAL;
             }
 
             private final long computeMyOtherPermissions(Collection<Long> collection, Map<Long, GuildRole> map, long j, long j2) {
@@ -304,7 +306,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     }
 
     public WidgetServerSettingsEditRole() {
-        super(2131559031);
+        super(R.layout.widget_edit_role);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEditRole widgetServerSettingsEditRole, Model model) {
@@ -361,13 +363,13 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             if (manageStatus != null) {
                 int ordinal = manageStatus.ordinal();
                 if (ordinal == 0) {
-                    str = getString(2131890381);
+                    str = getString(R.string.help_missing_manage_roles_permission);
                 } else if (ordinal == 1) {
-                    str = getString(2131890383);
+                    str = getString(R.string.help_role_locked);
                 } else if (ordinal == 2) {
-                    str = getString(2131890384);
+                    str = getString(R.string.help_role_locked_mine);
                 } else if (ordinal == 3) {
-                    str = getString(2131894450);
+                    str = getString(R.string.two_fa_guild_mfa_warning_ios);
                 }
                 m.checkNotNullExpressionValue(str, "when (data.manageStatus)…s)\n      else -> \"\"\n    }");
                 return str;
@@ -376,7 +378,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             m.checkNotNullExpressionValue(str, "when (data.manageStatus)…s)\n      else -> \"\"\n    }");
             return str;
         }
-        String string = getString(2131888674);
+        String string = getString(R.string.form_label_disabled_for_everyone);
         m.checkNotNullExpressionValue(string, "getString(R.string.form_…el_disabled_for_everyone)");
         return string;
     }
@@ -386,10 +388,10 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     }
 
     private final void launchColorPicker(Model model) {
-        ColorPickerDialog buildColorPickerDialog = ColorPickerUtils.INSTANCE.buildColorPickerDialog(requireContext(), 2131893049, RoleUtils.getRoleColor$default(model.getRole(), requireContext(), null, 2, null));
+        ColorPickerDialog buildColorPickerDialog = ColorPickerUtils.INSTANCE.buildColorPickerDialog(requireContext(), R.string.role_color, RoleUtils.getRoleColor$default(model.getRole(), requireContext(), null, 2, null));
         buildColorPickerDialog.j = new WidgetServerSettingsEditRole$launchColorPicker$1(this, model);
         AppFragment.hideKeyboard$default(this, null, 1, null);
-        buildColorPickerDialog.show(getParentFragmentManager(), "DIALOG_TAG_COLOR_PICKER");
+        buildColorPickerDialog.show(getParentFragmentManager(), DIALOG_TAG_COLOR_PICKER);
     }
 
     private final void patchRole(long j, RestAPIParams.Role role) {
@@ -401,9 +403,9 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         AppActivity appActivity = getAppActivity();
         Toolbar toolbar = appActivity != null ? appActivity.t : null;
         if (toolbar != null) {
-            int roleColor = RoleUtils.getRoleColor(model.getRole(), requireContext(), Integer.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968995)));
+            int roleColor = RoleUtils.getRoleColor(model.getRole(), requireContext(), Integer.valueOf(ColorCompat.getThemedColor(requireContext(), (int) R.attr.color_brand)));
             if (RoleUtils.isDefaultColor(model.getRole())) {
-                i = ColorCompat.getThemedColor(this, 2130969007);
+                i = ColorCompat.getThemedColor(this, (int) R.attr.color_brand_460);
             } else {
                 float[] fArr = new float[3];
                 Color.colorToHSV(roleColor, fArr);
@@ -411,11 +413,11 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
                 i = Color.HSVToColor(fArr);
             }
             boolean isColorDark$default = ColorCompat.isColorDark$default(roleColor, 0.0f, 2, null);
-            int color = ColorCompat.getColor(requireContext(), isColorDark$default ? 2131100117 : 2131100133);
+            int color = ColorCompat.getColor(requireContext(), isColorDark$default ? R.color.primary_100 : R.color.primary_500);
             ColorCompat.setStatusBarColor(this, i, isColorDark$default);
             WidgetServerSettingsEditRole$setupActionBar$1 widgetServerSettingsEditRole$setupActionBar$1 = WidgetServerSettingsEditRole$setupActionBar$1.INSTANCE;
             AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-            String string = getString(2131888763);
+            String string = getString(R.string.form_label_role_settings);
             m.checkNotNullExpressionValue(string, "getString(R.string.form_label_role_settings)");
             setActionBarTitle(widgetServerSettingsEditRole$setupActionBar$1.invoke(string, color));
             setActionBarSubtitle(widgetServerSettingsEditRole$setupActionBar$1.invoke(model.getRole().f(), color));
@@ -434,7 +436,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     private final void setupColorSetting(Model model) {
         View view = getBinding().l;
         m.checkNotNullExpressionValue(view, "binding.roleSettingsCurrentColorDisplay");
-        Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231112);
+        Drawable drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.drawable_circle_white_1);
         if (drawable != null) {
             drawable.setColorFilter(new PorterDuffColorFilter(RoleUtils.getRoleColor$default(model.getRole(), requireContext(), null, 2, null), PorterDuff.Mode.SRC_ATOP));
             View view2 = getBinding().l;
@@ -474,9 +476,9 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
 
     private final void setupMenu(Model model) {
         if (!model.canManage() || model.isEveryoneRole() || model.getRole().d()) {
-            AppFragment.setActionBarOptionsMenu$default(this, 2131623951, null, null, 4, null);
+            AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_empty, null, null, 4, null);
         } else {
-            AppFragment.setActionBarOptionsMenu$default(this, 2131623950, new WidgetServerSettingsEditRole$setupMenu$1(this, model), null, 4, null);
+            AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_edit_role, new WidgetServerSettingsEditRole$setupMenu$1(this, model), null, 4, null);
         }
     }
 
@@ -487,125 +489,125 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().e, getBinding().f, getBinding().g, getBinding().h, getBinding().k, getBinding().n, getBinding().p, getBinding().q, getBinding().f1789s, getBinding().w, getBinding().t, getBinding().r, getBinding().u, getBinding().v, getBinding().f1790x, getBinding().f1791y, getBinding().B, getBinding().C, getBinding().E, getBinding().K, getBinding().J, getBinding().F, getBinding().G, getBinding().H, getBinding().I, getBinding().d, getBinding().L, getBinding().N, getBinding().R, getBinding().T, getBinding().Q, getBinding().O, getBinding().P, getBinding().S, getBinding().A, getBinding().M, getBinding().D})) {
             m.checkNotNullExpressionValue(checkedSetting, "setting");
             switch (checkedSetting.getId()) {
-                case 2131364684:
+                case R.id.role_settings_add_reactions /* 2131364684 */:
                     j = 64;
                     break;
-                case 2131364685:
+                case R.id.role_settings_administrator /* 2131364685 */:
                     j = 8;
                     break;
-                case 2131364686:
-                    j = 32768;
+                case R.id.role_settings_attach_files /* 2131364686 */:
+                    j = Permission.ATTACH_FILES;
                     break;
-                case 2131364687:
+                case R.id.role_settings_ban_members /* 2131364687 */:
                     j = 4;
                     break;
-                case 2131364688:
-                    j = 67108864;
+                case R.id.role_settings_change_nickname /* 2131364688 */:
+                    j = Permission.CHANGE_NICKNAME;
                     break;
-                case 2131364689:
-                case 2131364690:
-                case 2131364692:
-                case 2131364693:
-                case 2131364695:
-                case 2131364706:
-                case 2131364707:
+                case R.id.role_settings_color_disabled_overlay /* 2131364689 */:
+                case R.id.role_settings_color_selector_container /* 2131364690 */:
+                case R.id.role_settings_current_color_display /* 2131364692 */:
+                case R.id.role_settings_edit_name_disabled_overlay /* 2131364693 */:
+                case R.id.role_settings_hoist_checkedsetting /* 2131364695 */:
+                case R.id.role_settings_mentionable_checkedsetting /* 2131364706 */:
+                case R.id.role_settings_overview_scroll /* 2131364707 */:
                 default:
                     j = 0;
                     break;
-                case 2131364691:
+                case R.id.role_settings_create_instant_invite /* 2131364691 */:
                     j = 1;
                     break;
-                case 2131364694:
-                    j = 16384;
+                case R.id.role_settings_embed_links /* 2131364694 */:
+                    j = Permission.EMBED_LINKS;
                     break;
-                case 2131364696:
+                case R.id.role_settings_kick_members /* 2131364696 */:
                     j = 2;
                     break;
-                case 2131364697:
+                case R.id.role_settings_manage_channels /* 2131364697 */:
                     j = 16;
                     break;
-                case 2131364698:
-                    j = 1073741824;
+                case R.id.role_settings_manage_emojis_and_stickers /* 2131364698 */:
+                    j = Permission.MANAGE_EMOJIS_AND_STICKERS;
                     break;
-                case 2131364699:
-                    j = 8192;
+                case R.id.role_settings_manage_messages /* 2131364699 */:
+                    j = Permission.MANAGE_MESSAGES;
                     break;
-                case 2131364700:
-                    j = 134217728;
+                case R.id.role_settings_manage_nicknames /* 2131364700 */:
+                    j = Permission.MANAGE_NICKNAMES;
                     break;
-                case 2131364701:
-                    j = 268435456;
+                case R.id.role_settings_manage_roles /* 2131364701 */:
+                    j = Permission.MANAGE_ROLES;
                     break;
-                case 2131364702:
+                case R.id.role_settings_manage_server /* 2131364702 */:
                     j = 32;
                     break;
-                case 2131364703:
-                    j = 17179869184L;
+                case R.id.role_settings_manage_threads /* 2131364703 */:
+                    j = Permission.MANAGE_THREADS;
                     break;
-                case 2131364704:
-                    j = 536870912;
+                case R.id.role_settings_manage_webhooks /* 2131364704 */:
+                    j = Permission.MANAGE_WEBHOOKS;
                     break;
-                case 2131364705:
-                    j = 131072;
+                case R.id.role_settings_mention_everyone /* 2131364705 */:
+                    j = Permission.MENTION_EVERYONE;
                     break;
-                case 2131364708:
+                case R.id.role_settings_priority_speaker /* 2131364708 */:
                     j = 256;
                     break;
-                case 2131364709:
-                    j = 65536;
+                case R.id.role_settings_read_message_history /* 2131364709 */:
+                    j = Permission.READ_MESSAGE_HISTORY;
                     break;
-                case 2131364710:
-                    j = 1024;
+                case R.id.role_settings_read_messages /* 2131364710 */:
+                    j = Permission.VIEW_CHANNEL;
                     break;
-                case 2131364711:
-                    j = 4294967296L;
+                case R.id.role_settings_request_to_speak /* 2131364711 */:
+                    j = Permission.REQUEST_TO_SPEAK;
                     break;
-                case 2131364712:
-                    j = 2048;
+                case R.id.role_settings_send_messages /* 2131364712 */:
+                    j = Permission.SEND_MESSAGES;
                     break;
-                case 2131364713:
-                    j = 4096;
+                case R.id.role_settings_send_tts_messages /* 2131364713 */:
+                    j = Permission.SEND_TTS_MESSAGES;
                     break;
-                case 2131364714:
-                    j = 2147483648L;
+                case R.id.role_settings_use_application_commands /* 2131364714 */:
+                    j = Permission.USE_APPLICATION_COMMANDS;
                     break;
-                case 2131364715:
-                    j = 262144;
+                case R.id.role_settings_use_external_emojis /* 2131364715 */:
+                    j = Permission.USE_EXTERNAL_EMOJIS;
                     break;
-                case 2131364716:
-                    j = 137438953472L;
+                case R.id.role_settings_use_external_stickers /* 2131364716 */:
+                    j = Permission.USE_EXTERNAL_STICKERS;
                     break;
-                case 2131364717:
-                    j = 68719476736L;
+                case R.id.role_settings_use_private_threads /* 2131364717 */:
+                    j = Permission.USE_PRIVATE_THREADS;
                     break;
-                case 2131364718:
-                    j = 34359738368L;
+                case R.id.role_settings_use_public_threads /* 2131364718 */:
+                    j = Permission.USE_PUBLIC_THREADS;
                     break;
-                case 2131364719:
+                case R.id.role_settings_view_audit_log /* 2131364719 */:
                     j = 128;
                     break;
-                case 2131364720:
-                    j = 524288;
+                case R.id.role_settings_view_guild_analytics /* 2131364720 */:
+                    j = Permission.VIEW_GUILD_ANALYTICS;
                     break;
-                case 2131364721:
-                    j = 1048576;
+                case R.id.role_settings_voice_connect /* 2131364721 */:
+                    j = Permission.CONNECT;
                     break;
-                case 2131364722:
-                    j = 8388608;
+                case R.id.role_settings_voice_deafen_members /* 2131364722 */:
+                    j = Permission.DEAFEN_MEMBERS;
                     break;
-                case 2131364723:
-                    j = 16777216;
+                case R.id.role_settings_voice_move_members /* 2131364723 */:
+                    j = Permission.MOVE_MEMBERS;
                     break;
-                case 2131364724:
-                    j = 4194304;
+                case R.id.role_settings_voice_mute_members /* 2131364724 */:
+                    j = Permission.MUTE_MEMBERS;
                     break;
-                case 2131364725:
-                    j = 2097152;
+                case R.id.role_settings_voice_speak /* 2131364725 */:
+                    j = Permission.SPEAK;
                     break;
-                case 2131364726:
-                    j = 33554432;
+                case R.id.role_settings_voice_use_voice_activity /* 2131364726 */:
+                    j = Permission.USE_VAD;
                     break;
-                case 2131364727:
+                case R.id.role_settings_voice_video /* 2131364727 */:
                     j = 512;
                     break;
             }
@@ -620,20 +622,20 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
                         if (model.getOwner() || j != 8 || !model.isSingular(j)) {
                             enableSetting(checkedSetting, model, j);
                         } else {
-                            checkedSetting.b(2131890386);
+                            checkedSetting.b(R.string.help_singular_permission);
                         }
                     }
                 } else if (can2 && !(model.isSingular(j) && can)) {
                     enableSetting(checkedSetting, model, j);
                 } else if (!can2) {
-                    checkedSetting.b(2131890382);
+                    checkedSetting.b(R.string.help_missing_permission);
                 } else {
-                    checkedSetting.b(2131890386);
+                    checkedSetting.b(R.string.help_singular_permission);
                 }
-                checkedSetting.setVisibility(!((j != 524288 && !model.isCommunityServer()) ^ true) ? 0 : 8);
+                checkedSetting.setVisibility(!((j != Permission.VIEW_GUILD_ANALYTICS && !model.isCommunityServer()) ^ true) ? 0 : 8);
             }
             checkedSetting.c(getLockMessage(model, false));
-            checkedSetting.setVisibility(!((j != 524288 && !model.isCommunityServer()) ^ true) ? 0 : 8);
+            checkedSetting.setVisibility(!((j != Permission.VIEW_GUILD_ANALYTICS && !model.isCommunityServer()) ^ true) ? 0 : 8);
         }
     }
 
@@ -676,10 +678,10 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Model.Companion.get(getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1), getMostRecentIntent().getLongExtra("INTENT_EXTRA_ROLE_ID", -1))), this, null, 2, null), WidgetServerSettingsEditRole.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEditRole$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Model.Companion.get(getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1), getMostRecentIntent().getLongExtra(INTENT_EXTRA_ROLE_ID, -1))), this, null, 2, null), WidgetServerSettingsEditRole.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEditRole$onViewBoundOrOnResume$1(this), 62, (Object) null);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        Fragment findFragmentByTag = parentFragmentManager.findFragmentByTag("DIALOG_TAG_COLOR_PICKER");
+        Fragment findFragmentByTag = parentFragmentManager.findFragmentByTag(DIALOG_TAG_COLOR_PICKER);
         if (findFragmentByTag != null) {
             parentFragmentManager.beginTransaction().remove(findFragmentByTag).commit();
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojisAndStickers$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojisAndStickers$1.java
index 62f1d0ced2..4170df3672 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojisAndStickers$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion$canManageEmojisAndStickers$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.api.permission.Permission;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
 import com.discord.utilities.permissions.PermissionUtils;
@@ -13,6 +14,6 @@ public final class WidgetServerSettingsEmojis$Model$Companion$canManageEmojisAnd
         if (guild == null || l == null) {
             return null;
         }
-        return new WidgetServerSettingsEmojis.Model.Permission(PermissionUtils.canAndIsElevated(1073741824, l, meUser.getMfaEnabled(), guild.getMfaLevel()), guild);
+        return new WidgetServerSettingsEmojis.Model.Permission(PermissionUtils.canAndIsElevated(Permission.MANAGE_EMOJIS_AND_STICKERS, l, meUser.getMfaEnabled(), guild.getMfaLevel()), guild);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java
index cbb68d5944..8dfbe47ed7 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsEmojisBinding;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetServerSettingsEmojis$binding$2 extends
 
     public final WidgetServerSettingsEmojisBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365908;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365908);
+        int i = R.id.widget_server_settings_emojis_recycler;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.widget_server_settings_emojis_recycler);
         if (recyclerView != null) {
-            i = 2131365912;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365912);
+            i = R.id.widget_server_settings_emojis_view_flipper;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.widget_server_settings_emojis_view_flipper);
             if (appViewFlipper != null) {
                 return new WidgetServerSettingsEmojisBinding((CoordinatorLayout) view, recyclerView, appViewFlipper);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
index 252eb52b2b..0fae395687 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
@@ -9,6 +9,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -16,6 +17,7 @@ import c.a.e.l;
 import c.a.e.q;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -84,7 +86,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
         public static final class EmojiEmptyViewHolder extends MGRecyclerViewHolder<Adapter, Item> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiEmptyViewHolder(Adapter adapter) {
-                super(2131559216, adapter);
+                super((int) R.layout.widget_server_settings_emojis_empty, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
             }
 
@@ -99,14 +101,14 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiHeaderViewHolder(Adapter adapter) {
-                super(2131559217, adapter);
+                super((int) R.layout.widget_server_settings_emojis_header, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i = 2131365910;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365910);
+                int i = R.id.widget_server_settings_emojis_upload;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.widget_server_settings_emojis_upload);
                 if (materialButton != null) {
-                    i = 2131365911;
-                    TextView textView = (TextView) view.findViewById(2131365911);
+                    i = R.id.widget_server_settings_emojis_upload_description;
+                    TextView textView = (TextView) view.findViewById(R.id.widget_server_settings_emojis_upload_description);
                     if (textView != null) {
                         WidgetServerSettingsEmojisHeaderBinding widgetServerSettingsEmojisHeaderBinding = new WidgetServerSettingsEmojisHeaderBinding((LinearLayout) view, materialButton, textView);
                         m.checkNotNullExpressionValue(widgetServerSettingsEmojisHeaderBinding, "WidgetServerSettingsEmoj…derBinding.bind(itemView)");
@@ -125,7 +127,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 m.checkNotNullParameter(item, "data");
                 TextView textView = this.binding.f1920c;
                 m.checkNotNullExpressionValue(textView, "binding.widgetServerSett…gsEmojisUploadDescription");
-                textView.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131889886, new Object[]{String.valueOf(((Item.EmojiHeader) item).getEmojiMax()), String.valueOf(256)}, null, 4));
+                textView.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.guild_settings_emoji_upload_to_server_message, new Object[]{String.valueOf(((Item.EmojiHeader) item).getEmojiMax()), String.valueOf(256)}, null, 4));
                 this.binding.b.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder$onConfigure$1(this));
             }
         }
@@ -136,24 +138,24 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiItemViewHolder(Adapter adapter) {
-                super(2131559218, adapter);
+                super((int) R.layout.widget_server_settings_emojis_item, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i = 2131364872;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364872);
+                int i = R.id.server_settings_emojis_avatar;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.server_settings_emojis_avatar);
                 if (simpleDraweeView != null) {
                     LinearLayout linearLayout = (LinearLayout) view;
-                    i = 2131364876;
-                    TextView textView = (TextView) view.findViewById(2131364876);
+                    i = R.id.server_settings_emojis_name;
+                    TextView textView = (TextView) view.findViewById(R.id.server_settings_emojis_name);
                     if (textView != null) {
-                        i = 2131364878;
-                        ImageView imageView = (ImageView) view.findViewById(2131364878);
+                        i = R.id.server_settings_emojis_overflow;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.server_settings_emojis_overflow);
                         if (imageView != null) {
-                            i = 2131364879;
-                            TextView textView2 = (TextView) view.findViewById(2131364879);
+                            i = R.id.server_settings_emojis_username;
+                            TextView textView2 = (TextView) view.findViewById(R.id.server_settings_emojis_username);
                             if (textView2 != null) {
-                                i = 2131364880;
-                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364880);
+                                i = R.id.server_settings_emojis_username_avatar;
+                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.server_settings_emojis_username_avatar);
                                 if (simpleDraweeView2 != null) {
                                     WidgetServerSettingsEmojisItemBinding widgetServerSettingsEmojisItemBinding = new WidgetServerSettingsEmojisItemBinding(linearLayout, simpleDraweeView, linearLayout, textView, imageView, textView2, simpleDraweeView2);
                                     m.checkNotNullExpressionValue(widgetServerSettingsEmojisItemBinding, "WidgetServerSettingsEmoj…temBinding.bind(itemView)");
@@ -183,11 +185,11 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 textView2.setText(emojiItem.getEmoji().getUser().r());
                 SimpleDraweeView simpleDraweeView = this.binding.f;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.serverSettingsEmojisUsernameAvatar");
-                IconUtils.setIcon$default(simpleDraweeView, new CoreUser(emojiItem.getEmoji().getUser()), 2131165297, null, null, null, 56, null);
+                IconUtils.setIcon$default(simpleDraweeView, new CoreUser(emojiItem.getEmoji().getUser()), R.dimen.avatar_size_standard, null, null, null, 56, null);
                 String imageUri = ModelEmojiCustom.getImageUri(emojiItem.getEmoji().getId(), emojiItem.getEmoji().getAnimated(), 64);
                 SimpleDraweeView simpleDraweeView2 = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.serverSettingsEmojisAvatar");
-                MGImages.setImage$default(simpleDraweeView2, imageUri, 2131165398, 2131165398, true, null, null, 96, null);
+                MGImages.setImage$default(simpleDraweeView2, imageUri, R.dimen.emoji_size, R.dimen.emoji_size, true, null, null, 96, null);
                 SimpleDraweeView simpleDraweeView3 = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView3, "binding.serverSettingsEmojisAvatar");
                 ImageViewExtensionsKt.setGrayscale(simpleDraweeView3, !emojiItem.getEmoji().getAvailable());
@@ -204,17 +206,17 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiSectionViewHolder(Adapter adapter) {
-                super(2131559219, adapter);
+                super((int) R.layout.widget_server_settings_emojis_section, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                TextView textView = (TextView) view.findViewById(2131365909);
+                TextView textView = (TextView) view.findViewById(R.id.widget_server_settings_emojis_section);
                 if (textView != null) {
                     WidgetServerSettingsEmojisSectionBinding widgetServerSettingsEmojisSectionBinding = new WidgetServerSettingsEmojisSectionBinding((LinearLayout) view, textView);
                     m.checkNotNullExpressionValue(widgetServerSettingsEmojisSectionBinding, "WidgetServerSettingsEmoj…ionBinding.bind(itemView)");
                     this.binding = widgetServerSettingsEmojisSectionBinding;
                     return;
                 }
-                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365909)));
+                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.widget_server_settings_emojis_section)));
             }
 
             public void onConfigure(int i, Item item) {
@@ -228,10 +230,10 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 m.checkNotNullExpressionValue(context, "itemView.context");
                 Resources resources = context.getResources();
                 m.checkNotNullExpressionValue(resources, "itemView.context.resources");
-                CharSequence h = b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131888348, new Object[]{StringResourceUtilsKt.getQuantityString(resources, a.x(this.itemView, "itemView", "itemView.context"), 2131755075, emojiMax, Integer.valueOf(emojiMax))}, null, 4);
+                CharSequence h = b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.emoji_slots_available, new Object[]{StringResourceUtilsKt.getQuantityString(resources, a.x(this.itemView, "itemView", "itemView.context"), (int) R.plurals.emoji_slots_available_count, emojiMax, Integer.valueOf(emojiMax))}, null, 4);
                 TextView textView = this.binding.b;
                 m.checkNotNullExpressionValue(textView, "binding.widgetServerSettingsEmojisSection");
-                textView.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131888347, new Object[]{b.h(a.x(this.itemView, "itemView", "itemView.context"), emojiSection.getTitleId(), new Object[0], null, 4), h}, null, 4));
+                textView.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.emoji_section, new Object[]{b.h(a.x(this.itemView, "itemView", "itemView.context"), emojiSection.getTitleId(), new Object[0], null, 4), h}, null, 4));
             }
         }
 
@@ -616,8 +618,8 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                     arrayList4.add(new Item.EmojiItem(modelEmojiGuild2));
                 }
                 List reversed2 = u.reversed(arrayList4);
-                Item.EmojiSection emojiSection = new Item.EmojiSection(guildEmojiMaxCount, reversed.size(), 2131888300);
-                Item.EmojiSection emojiSection2 = new Item.EmojiSection(guildEmojiMaxCount, reversed2.size(), 2131886357);
+                Item.EmojiSection emojiSection = new Item.EmojiSection(guildEmojiMaxCount, reversed.size(), R.string.emoji);
+                Item.EmojiSection emojiSection2 = new Item.EmojiSection(guildEmojiMaxCount, reversed2.size(), R.string.animated_emoji);
                 ArrayList arrayList5 = new ArrayList(d0.t.m.listOf(emojiHeader));
                 if (!reversed.isEmpty()) {
                     arrayList5.addAll(u.plus((Collection) d0.t.m.listOf(emojiSection), (Iterable) reversed));
@@ -812,7 +814,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
     }
 
     public WidgetServerSettingsEmojis() {
-        super(2131559214);
+        super(R.layout.widget_server_settings_emojis);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEmojis widgetServerSettingsEmojis, Model model) {
@@ -828,7 +830,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
     }
 
     private final void configureToolbar(String str) {
-        setActionBarTitle(2131888300);
+        setActionBarTitle(R.string.emoji);
         setActionBarSubtitle(str);
     }
 
@@ -890,7 +892,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -900,7 +902,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         MGImages.requestDataUrl(getContext(), uri, str, this.uploadEmojiAction);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java
index c2bbedefa3..8c12c9bf8c 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsEmojisEditBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetServerSettingsEmojisEdit$binding$2 exte
 
     public final WidgetServerSettingsEmojisEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364874;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364874);
+        int i = R.id.server_settings_emojis_edit_alias;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.server_settings_emojis_edit_alias);
         if (textInputLayout != null) {
-            i = 2131364875;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364875);
+            i = R.id.server_settings_emojis_edit_alias_save;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.server_settings_emojis_edit_alias_save);
             if (floatingActionButton != null) {
                 return new WidgetServerSettingsEmojisEditBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java
index 8b5d114347..800d7fca30 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action2;
 /* compiled from: WidgetServerSettingsEmojisEdit.kt */
@@ -14,7 +15,7 @@ public final class WidgetServerSettingsEmojisEdit$configureMenu$1<T1, T2> implem
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364115) {
+        if (menuItem.getItemId() == R.id.menu_server_settings_emoji_delete) {
             WidgetServerSettingsEmojisEdit.access$deleteEmoji(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
index 723539a7c6..8b976181d8 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
@@ -8,6 +8,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsEmojisEditBinding;
 import com.discord.restapi.RestAPIParams;
@@ -36,7 +37,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
     private long emojiId = -1;
     private String emojiName = "";
     private long guildId = -1;
-    private final StatefulViews state = new StatefulViews(2131364874);
+    private final StatefulViews state = new StatefulViews(R.id.server_settings_emojis_edit_alias);
 
     /* compiled from: WidgetServerSettingsEmojisEdit.kt */
     public static final class Companion {
@@ -50,14 +51,14 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
         public final void create(Context context, long j, long j2, String str) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "alias");
-            Intent putExtra = new Intent().putExtra("EXTRA_GUILD_ID", j).putExtra("EXTRA_EMOJI_ID", j2).putExtra("EXTRA_EMOJI_ALIAS", str);
+            Intent putExtra = new Intent().putExtra(WidgetServerSettingsEmojisEdit.EXTRA_GUILD_ID, j).putExtra(WidgetServerSettingsEmojisEdit.EXTRA_EMOJI_ID, j2).putExtra(WidgetServerSettingsEmojisEdit.EXTRA_EMOJI_ALIAS, str);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…EXTRA_EMOJI_ALIAS, alias)");
             l.d(context, WidgetServerSettingsEmojisEdit.class, putExtra);
         }
     }
 
     public WidgetServerSettingsEmojisEdit() {
-        super(2131559215);
+        super(R.layout.widget_server_settings_emojis_edit);
     }
 
     public static final /* synthetic */ void access$deleteEmoji(WidgetServerSettingsEmojisEdit widgetServerSettingsEmojisEdit) {
@@ -89,11 +90,11 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
     }
 
     private final void configureMenu() {
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623960, new WidgetServerSettingsEmojisEdit$configureMenu$1(this), null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_server_settings_emojis_edit, new WidgetServerSettingsEmojisEdit$configureMenu$1(this), null, 4, null);
     }
 
     private final void configureToolbar(String str) {
-        setActionBarTitle(2131888300);
+        setActionBarTitle(R.string.emoji);
         setActionBarSubtitle(str);
     }
 
@@ -132,7 +133,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
         TextInputLayout textInputLayout3 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.serverSettingsEmojisEditAlias");
         ViewExtensions.setText(textInputLayout2, (CharSequence) statefulViews2.get(textInputLayout3.getId(), str));
-        o.j(this, getString(2131893358), 0, 4);
+        o.j(this, getString(R.string.save_media_success_mobile), 0, 4);
     }
 
     private final String sanitizeEmojiName(String str) {
@@ -148,9 +149,9 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        this.guildId = getMostRecentIntent().getLongExtra("EXTRA_GUILD_ID", -1);
-        this.emojiId = getMostRecentIntent().getLongExtra("EXTRA_EMOJI_ID", -1);
-        String stringExtra = getMostRecentIntent().getStringExtra("EXTRA_EMOJI_ALIAS");
+        this.guildId = getMostRecentIntent().getLongExtra(EXTRA_GUILD_ID, -1);
+        this.emojiId = getMostRecentIntent().getLongExtra(EXTRA_EMOJI_ID, -1);
+        String stringExtra = getMostRecentIntent().getStringExtra(EXTRA_EMOJI_ALIAS);
         if (stringExtra == null) {
             stringExtra = "";
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java
index 2e2c1a8df4..9cef4f1844 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsInstantInviteActionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,17 +18,17 @@ public final /* synthetic */ class WidgetServerSettingsInstantInvitesActions$bin
 
     public final WidgetServerSettingsInstantInviteActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363811;
-        TextView textView = (TextView) view.findViewById(2131363811);
+        int i = R.id.invite_actions_copy;
+        TextView textView = (TextView) view.findViewById(R.id.invite_actions_copy);
         if (textView != null) {
-            i = 2131363812;
-            TextView textView2 = (TextView) view.findViewById(2131363812);
+            i = R.id.invite_actions_revoke;
+            TextView textView2 = (TextView) view.findViewById(R.id.invite_actions_revoke);
             if (textView2 != null) {
-                i = 2131363813;
-                TextView textView3 = (TextView) view.findViewById(2131363813);
+                i = R.id.invite_actions_share;
+                TextView textView3 = (TextView) view.findViewById(R.id.invite_actions_share);
                 if (textView3 != null) {
-                    i = 2131363814;
-                    TextView textView4 = (TextView) view.findViewById(2131363814);
+                    i = R.id.invite_actions_title;
+                    TextView textView4 = (TextView) view.findViewById(R.id.invite_actions_title);
                     if (textView4 != null) {
                         return new WidgetServerSettingsInstantInviteActionsBinding((NestedScrollView) view, textView, textView2, textView3, textView4);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java
index ab4112248c..52d3be37a6 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.View;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.utilities.intent.IntentUtils;
 /* compiled from: WidgetServerSettingsInstantInvitesActions.kt */
 public final class WidgetServerSettingsInstantInvitesActions$onResume$3 implements View.OnClickListener {
@@ -19,7 +20,7 @@ public final class WidgetServerSettingsInstantInvitesActions$onResume$3 implemen
     public final void onClick(View view) {
         Context x2 = a.x(view, "it", "it.context");
         String str = this.$inviteUrl;
-        IntentUtils.performChooserSendIntent(x2, str, b.k(this.this$0, 2131893626, new Object[]{str}, null, 4));
+        IntentUtils.performChooserSendIntent(x2, str, b.k(this.this$0, R.string.share_invite_mobile, new Object[]{str}, null, 4));
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
index 7649ba0e96..7863edc27e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
@@ -5,6 +5,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetServerSettingsInstantInviteActionsBinding;
 import com.discord.models.domain.ModelInvite;
@@ -37,7 +38,7 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh
             m.checkNotNullParameter(str, "inviteCode");
             WidgetServerSettingsInstantInvitesActions widgetServerSettingsInstantInvitesActions = new WidgetServerSettingsInstantInvitesActions();
             Bundle bundle = new Bundle();
-            bundle.putString("ARG_INVITE_CODE", str);
+            bundle.putString(WidgetServerSettingsInstantInvitesActions.ARG_INVITE_CODE, str);
             widgetServerSettingsInstantInvitesActions.setArguments(bundle);
             widgetServerSettingsInstantInvitesActions.show(fragmentManager, WidgetServerSettingsInstantInvitesActions.class.getName());
         }
@@ -66,13 +67,13 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559222;
+        return R.layout.widget_server_settings_instant_invite_actions;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
     public void onResume() {
         super.onResume();
-        String string = getArgumentsOrDefault().getString("ARG_INVITE_CODE");
+        String string = getArgumentsOrDefault().getString(ARG_INVITE_CODE);
         boolean z2 = false;
         if (string == null || t.isBlank(string)) {
             dismiss();
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java
index 851463945b..04e4579405 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsIntegrationsBinding;
 import d0.z.d.k;
@@ -19,17 +20,17 @@ public final /* synthetic */ class WidgetServerSettingsIntegrations$binding$2 ex
 
     public final WidgetServerSettingsIntegrationsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363800;
-        TextView textView = (TextView) view.findViewById(2131363800);
+        int i = R.id.integrations_empty_body;
+        TextView textView = (TextView) view.findViewById(R.id.integrations_empty_body);
         if (textView != null) {
-            i = 2131363801;
-            TextView textView2 = (TextView) view.findViewById(2131363801);
+            i = R.id.integrations_empty_header;
+            TextView textView2 = (TextView) view.findViewById(R.id.integrations_empty_header);
             if (textView2 != null) {
-                i = 2131363802;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363802);
+                i = R.id.integrations_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.integrations_recycler);
                 if (recyclerView != null) {
-                    i = 2131363804;
-                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363804);
+                    i = R.id.integrations_view_flipper;
+                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.integrations_view_flipper);
                     if (appViewFlipper != null) {
                         return new WidgetServerSettingsIntegrationsBinding((CoordinatorLayout) view, textView, textView2, recyclerView, appViewFlipper);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
index beca56a6ef..c721c6cddc 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsIntegrationsBinding;
@@ -294,7 +295,7 @@ public final class WidgetServerSettingsIntegrations extends AppFragment {
     }
 
     public WidgetServerSettingsIntegrations() {
-        super(2131559226);
+        super(R.layout.widget_server_settings_integrations);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsIntegrations widgetServerSettingsIntegrations, Model model) {
@@ -303,7 +304,7 @@ public final class WidgetServerSettingsIntegrations extends AppFragment {
 
     private final void configureUI(Model model) {
         if (model != null) {
-            setActionBarTitle(2131890693);
+            setActionBarTitle(R.string.integrations);
             setActionBarSubtitle(model.getGuildName());
             AppViewFlipper appViewFlipper = getBinding().f1926c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.integrationsViewFlipper");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
index 3378beccc8..bdb9f28876 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
@@ -12,6 +12,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import c.a.j.o5;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.databinding.WidgetServerSettingsIntegrationListItemBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -25,35 +26,35 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetServerSettingsIntegrationsListItem(WidgetServerSettingsIntegrations.Adapter adapter) {
-        super(2131559225, adapter);
+        super((int) R.layout.widget_server_settings_integration_list_item, adapter);
         m.checkNotNullParameter(adapter, "adapter");
         View view = this.itemView;
-        int i = 2131363791;
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363791);
+        int i = R.id.integration_header_container;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.integration_header_container);
         if (relativeLayout != null) {
-            i = 2131363792;
-            View findViewById = view.findViewById(2131363792);
+            i = R.id.integration_header_disabled_overlay;
+            View findViewById = view.findViewById(R.id.integration_header_disabled_overlay);
             if (findViewById != null) {
-                i = 2131363793;
-                ImageView imageView = (ImageView) view.findViewById(2131363793);
+                i = R.id.integration_icon;
+                ImageView imageView = (ImageView) view.findViewById(R.id.integration_icon);
                 if (imageView != null) {
-                    i = 2131363794;
-                    TextView textView = (TextView) view.findViewById(2131363794);
+                    i = R.id.integration_name;
+                    TextView textView = (TextView) view.findViewById(R.id.integration_name);
                     if (textView != null) {
-                        i = 2131363795;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363795);
+                        i = R.id.integration_name_container;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.integration_name_container);
                         if (linearLayout != null) {
-                            i = 2131363796;
-                            TextView textView2 = (TextView) view.findViewById(2131363796);
+                            i = R.id.integration_owner_name;
+                            TextView textView2 = (TextView) view.findViewById(R.id.integration_owner_name);
                             if (textView2 != null) {
-                                i = 2131363797;
-                                ImageView imageView2 = (ImageView) view.findViewById(2131363797);
+                                i = R.id.integration_settings_icon;
+                                ImageView imageView2 = (ImageView) view.findViewById(R.id.integration_settings_icon);
                                 if (imageView2 != null) {
-                                    i = 2131363798;
-                                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363798);
+                                    i = R.id.integration_sync_switch;
+                                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.integration_sync_switch);
                                     if (checkedSetting != null) {
-                                        i = 2131363799;
-                                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131363799);
+                                        i = R.id.integration_syncing_progress_bar;
+                                        ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.integration_syncing_progress_bar);
                                         if (progressBar != null) {
                                             WidgetServerSettingsIntegrationListItemBinding widgetServerSettingsIntegrationListItemBinding = new WidgetServerSettingsIntegrationListItemBinding((FrameLayout) view, relativeLayout, findViewById, imageView, textView, linearLayout, textView2, imageView2, checkedSetting, progressBar);
                                             m.checkNotNullExpressionValue(widgetServerSettingsIntegrationListItemBinding, "WidgetServerSettingsInte…temBinding.bind(itemView)");
@@ -88,18 +89,18 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
     }
 
     private final void showDisableSyncDialog(long j, long j2, boolean z2, Context context) {
-        View inflate = LayoutInflater.from(context).inflate(2131559211, (ViewGroup) null, false);
-        int i = 2131364860;
-        TextView textView = (TextView) inflate.findViewById(2131364860);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.widget_server_settings_confirm_disable_integration, (ViewGroup) null, false);
+        int i = R.id.server_settings_confirm_disable_integration_body;
+        TextView textView = (TextView) inflate.findViewById(R.id.server_settings_confirm_disable_integration_body);
         if (textView != null) {
-            i = 2131364861;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364861);
+            i = R.id.server_settings_confirm_disable_integration_cancel;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.server_settings_confirm_disable_integration_cancel);
             if (materialButton != null) {
-                i = 2131364862;
-                MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364862);
+                i = R.id.server_settings_confirm_disable_integration_confirm;
+                MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.server_settings_confirm_disable_integration_confirm);
                 if (materialButton2 != null) {
-                    i = 2131364863;
-                    TextView textView2 = (TextView) inflate.findViewById(2131364863);
+                    i = R.id.server_settings_confirm_disable_integration_header;
+                    TextView textView2 = (TextView) inflate.findViewById(R.id.server_settings_confirm_disable_integration_header);
                     if (textView2 != null) {
                         LinearLayout linearLayout = (LinearLayout) inflate;
                         m.checkNotNullExpressionValue(new o5(linearLayout, textView, materialButton, materialButton2, textView2), "WidgetServerSettingsConf…om(context), null, false)");
@@ -107,7 +108,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
                         m.checkNotNullExpressionValue(create, "AlertDialog.Builder(cont…ew(binding.root).create()");
                         materialButton.setOnClickListener(new WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1(create));
                         materialButton2.setOnClickListener(new WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2(j, j2, create, context));
-                        textView.setText(z2 ? 2131888159 : 2131888160);
+                        textView.setText(z2 ? R.string.disable_integration_twitch_body : R.string.disable_integration_youtube_body);
                         create.show();
                         return;
                     }
@@ -155,7 +156,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
         m.checkNotNullExpressionValue(textView2, "binding.integrationOwnerName");
         User user = integrationItem.getIntegration().getUser();
         textView2.setText(user != null ? user.r() : null);
-        this.binding.d.setImageResource(areEqual ? 2131230895 : 2131230896);
+        this.binding.d.setImageResource(areEqual ? R.drawable.asset_account_sync_twitch : R.drawable.asset_account_sync_youtube);
         View view = this.binding.f1925c;
         m.checkNotNullExpressionValue(view, "binding.integrationHeaderDisabledOverlay");
         int i2 = 0;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java
index 23cbb8b132..b910182593 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsModerationBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -18,35 +19,35 @@ public final /* synthetic */ class WidgetServerSettingsModeration$binding$2 exte
 
     public final WidgetServerSettingsModerationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364892;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364892);
+        int i = R.id.server_settings_moderation_explicit_1;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_explicit_1);
         if (checkedSetting != null) {
-            i = 2131364893;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364893);
+            i = R.id.server_settings_moderation_explicit_2;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_explicit_2);
             if (checkedSetting2 != null) {
-                i = 2131364894;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364894);
+                i = R.id.server_settings_moderation_explicit_3;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_explicit_3);
                 if (checkedSetting3 != null) {
-                    i = 2131364895;
-                    TextView textView = (TextView) view.findViewById(2131364895);
+                    i = R.id.server_settings_moderation_explicit_help;
+                    TextView textView = (TextView) view.findViewById(R.id.server_settings_moderation_explicit_help);
                     if (textView != null) {
-                        i = 2131364896;
-                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364896);
+                        i = R.id.server_settings_moderation_verification_1;
+                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_verification_1);
                         if (checkedSetting4 != null) {
-                            i = 2131364897;
-                            CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364897);
+                            i = R.id.server_settings_moderation_verification_2;
+                            CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_verification_2);
                             if (checkedSetting5 != null) {
-                                i = 2131364898;
-                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364898);
+                                i = R.id.server_settings_moderation_verification_3;
+                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_verification_3);
                                 if (checkedSetting6 != null) {
-                                    i = 2131364899;
-                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364899);
+                                    i = R.id.server_settings_moderation_verification_4;
+                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_verification_4);
                                     if (checkedSetting7 != null) {
-                                        i = 2131364900;
-                                        CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364900);
+                                        i = R.id.server_settings_moderation_verification_5;
+                                        CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(R.id.server_settings_moderation_verification_5);
                                         if (checkedSetting8 != null) {
-                                            i = 2131364901;
-                                            TextView textView2 = (TextView) view.findViewById(2131364901);
+                                            i = R.id.server_settings_moderation_verification_help;
+                                            TextView textView2 = (TextView) view.findViewById(R.id.server_settings_moderation_verification_help);
                                             if (textView2 != null) {
                                                 return new WidgetServerSettingsModerationBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, textView, checkedSetting4, checkedSetting5, checkedSetting6, checkedSetting7, checkedSetting8, textView2);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$guildId$2.java
index 805f0cd5a6..cc53d9d21d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$guildId$2.java
@@ -17,6 +17,6 @@ public final class WidgetServerSettingsModeration$guildId$2 extends o implements
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java
index fe09e99f7d..ba79ae3950 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.R;
 import com.discord.api.guild.Guild;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetServerSettingsModeration$updateGuild$1 extends o implem
 
     public final void invoke(Guild guild) {
         m.checkNotNullParameter(guild, "it");
-        c.a.e.o.i(this.this$0, 2131893576, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.server_settings_updated, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
index 88361ef9b1..27fe709d35 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.GuildExplicitContentFilter;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.guild.GuildVerificationLevel;
@@ -137,7 +138,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
     }
 
     public WidgetServerSettingsModeration() {
-        super(2131559229);
+        super(R.layout.widget_server_settings_moderation);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsModeration widgetServerSettingsModeration, Model model) {
@@ -153,7 +154,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
         if (!model.getGuild().getFeatures().contains(GuildFeature.COMMUNITY) || guildExplicitContentFilter.compareTo(GuildExplicitContentFilter.ALL) >= 0) {
             checkedSetting.e(new WidgetServerSettingsModeration$configureExplicitContentRadio$1(this, model, guildExplicitContentFilter));
         } else {
-            checkedSetting.b(2131894394);
+            checkedSetting.b(R.string.tooltip_community_feature_disabled);
         }
         if (this.radioManagerExplicit != null && model.getGuild().getExplicitContentFilter() == guildExplicitContentFilter && (radioManager = this.radioManagerExplicit) != null) {
             radioManager.a(checkedSetting);
@@ -185,7 +186,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
         if (!model.getGuild().getFeatures().contains(GuildFeature.COMMUNITY) || guildVerificationLevel != GuildVerificationLevel.NONE) {
             checkedSetting.e(new WidgetServerSettingsModeration$configureVerificationLevelRadio$1(this, model, guildVerificationLevel));
         } else {
-            checkedSetting.b(2131894394);
+            checkedSetting.b(R.string.tooltip_community_feature_disabled);
         }
         if (this.radioManagerVerification != null && model.getGuild().getVerificationLevel() == guildVerificationLevel && (radioManager = this.radioManagerVerification) != null) {
             radioManager.a(checkedSetting);
@@ -233,17 +234,17 @@ public final class WidgetServerSettingsModeration extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891562);
+        setActionBarTitle(R.string.moderation);
         TextView textView = getBinding().k;
         m.checkNotNullExpressionValue(textView, "binding.serverSettingsModerationVerificationHelp");
-        b.n(textView, 2131888635, new Object[0], null, 4);
+        b.n(textView, R.string.form_help_verification_level, new Object[0], null, 4);
         TextView textView2 = getBinding().e;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsModerationExplicitHelp");
-        b.n(textView2, 2131888613, new Object[0], null, 4);
+        b.n(textView2, R.string.form_help_explicit_content_filter, new Object[0], null, 4);
         this.radioManagerVerification = new RadioManager(getVerificationViews());
         this.radioManagerExplicit = new RadioManager(getExplicitContentViews());
-        CheckedSetting.i(getVerificationViews().get(2), b.k(this, 2131894910, new Object[]{"5"}, null, 4), false, 2);
-        CheckedSetting.i(getVerificationViews().get(3), b.k(this, 2131894906, new Object[]{"10"}, null, 4), false, 2);
+        CheckedSetting.i(getVerificationViews().get(2), b.k(this, R.string.verification_level_medium_criteria, new Object[]{VERIFICATION_LEVEL_MEDIUM_MINUTES}, null, 4), false, 2);
+        CheckedSetting.i(getVerificationViews().get(3), b.k(this, R.string.verification_level_high_criteria, new Object[]{VERIFICATION_LEVEL_HIGH_MINUTES}, null, 4), false, 2);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java
index a2e84e2b3c..59dcf6c26a 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsOverviewAfkTimeoutBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,23 +18,23 @@ public final /* synthetic */ class WidgetServerSettingsOverview$AfkBottomSheet$b
 
     public final WidgetServerSettingsOverviewAfkTimeoutBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363438;
-        TextView textView = (TextView) view.findViewById(2131363438);
+        int i = R.id.guild_actions_overview_header_tv;
+        TextView textView = (TextView) view.findViewById(R.id.guild_actions_overview_header_tv);
         if (textView != null) {
-            i = 2131364909;
-            TextView textView2 = (TextView) view.findViewById(2131364909);
+            i = R.id.server_settings_overview_afk_timeout_01;
+            TextView textView2 = (TextView) view.findViewById(R.id.server_settings_overview_afk_timeout_01);
             if (textView2 != null) {
-                i = 2131364910;
-                TextView textView3 = (TextView) view.findViewById(2131364910);
+                i = R.id.server_settings_overview_afk_timeout_05;
+                TextView textView3 = (TextView) view.findViewById(R.id.server_settings_overview_afk_timeout_05);
                 if (textView3 != null) {
-                    i = 2131364911;
-                    TextView textView4 = (TextView) view.findViewById(2131364911);
+                    i = R.id.server_settings_overview_afk_timeout_15;
+                    TextView textView4 = (TextView) view.findViewById(R.id.server_settings_overview_afk_timeout_15);
                     if (textView4 != null) {
-                        i = 2131364912;
-                        TextView textView5 = (TextView) view.findViewById(2131364912);
+                        i = R.id.server_settings_overview_afk_timeout_30;
+                        TextView textView5 = (TextView) view.findViewById(R.id.server_settings_overview_afk_timeout_30);
                         if (textView5 != null) {
-                            i = 2131364913;
-                            TextView textView6 = (TextView) view.findViewById(2131364913);
+                            i = R.id.server_settings_overview_afk_timeout_60;
+                            TextView textView6 = (TextView) view.findViewById(R.id.server_settings_overview_afk_timeout_60);
                             if (textView6 != null) {
                                 return new WidgetServerSettingsOverviewAfkTimeoutBinding((NestedScrollView) view, textView, textView2, textView3, textView4, textView5, textView6);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java
index 1b62e6da1c..b4c4776172 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java
@@ -16,6 +16,7 @@ import c.a.j.g3;
 import c.a.j.h3;
 import c.a.j.i3;
 import c.a.j.p5;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsOverviewBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
@@ -35,131 +36,131 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend
 
     public final WidgetServerSettingsOverviewBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361933;
-        View findViewById = view.findViewById(2131361933);
+        int i = R.id.afk;
+        View findViewById = view.findViewById(R.id.afk);
         if (findViewById != null) {
-            int i2 = 2131361934;
-            TextView textView = (TextView) findViewById.findViewById(2131361934);
+            int i2 = R.id.afk_channel;
+            TextView textView = (TextView) findViewById.findViewById(R.id.afk_channel);
             if (textView != null) {
-                i2 = 2131361935;
-                LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(2131361935);
+                i2 = R.id.afk_channel_wrap;
+                LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(R.id.afk_channel_wrap);
                 if (linearLayout != null) {
-                    i2 = 2131361936;
-                    TextView textView2 = (TextView) findViewById.findViewById(2131361936);
+                    i2 = R.id.afk_timeout;
+                    TextView textView2 = (TextView) findViewById.findViewById(R.id.afk_timeout);
                     if (textView2 != null) {
-                        i2 = 2131361937;
-                        LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(2131361937);
+                        i2 = R.id.afk_timeout_wrap;
+                        LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(R.id.afk_timeout_wrap);
                         if (linearLayout2 != null) {
                             p5 p5Var = new p5((LinearLayout) findViewById, textView, linearLayout, textView2, linearLayout2);
-                            i = 2131363710;
-                            View findViewById2 = view.findViewById(2131363710);
+                            i = R.id.header;
+                            View findViewById2 = view.findViewById(R.id.header);
                             if (findViewById2 != null) {
-                                int i3 = 2131363734;
-                                TextView textView3 = (TextView) findViewById2.findViewById(2131363734);
+                                int i3 = R.id.icon_label;
+                                TextView textView3 = (TextView) findViewById2.findViewById(R.id.icon_label);
                                 if (textView3 != null) {
-                                    i3 = 2131364351;
-                                    TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(2131364351);
+                                    i3 = R.id.overview_name;
+                                    TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(R.id.overview_name);
                                     if (textInputLayout != null) {
-                                        i3 = 2131364914;
-                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById2.findViewById(2131364914);
+                                        i3 = R.id.server_settings_overview_icon;
+                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById2.findViewById(R.id.server_settings_overview_icon);
                                         if (simpleDraweeView != null) {
                                             ConstraintLayout constraintLayout = (ConstraintLayout) findViewById2;
-                                            i3 = 2131364916;
-                                            TextView textView4 = (TextView) findViewById2.findViewById(2131364916);
+                                            i3 = R.id.server_settings_overview_icon_remove;
+                                            TextView textView4 = (TextView) findViewById2.findViewById(R.id.server_settings_overview_icon_remove);
                                             if (textView4 != null) {
-                                                i3 = 2131364917;
-                                                TextView textView5 = (TextView) findViewById2.findViewById(2131364917);
+                                                i3 = R.id.server_settings_overview_icon_text;
+                                                TextView textView5 = (TextView) findViewById2.findViewById(R.id.server_settings_overview_icon_text);
                                                 if (textView5 != null) {
                                                     c3 c3Var = new c3(constraintLayout, textView3, textInputLayout, simpleDraweeView, constraintLayout, textView4, textView5);
-                                                    i = 2131364264;
-                                                    View findViewById3 = view.findViewById(2131364264);
+                                                    i = R.id.notifications;
+                                                    View findViewById3 = view.findViewById(R.id.notifications);
                                                     if (findViewById3 != null) {
-                                                        int i4 = 2131364918;
-                                                        CheckedSetting checkedSetting = (CheckedSetting) findViewById3.findViewById(2131364918);
+                                                        int i4 = R.id.server_settings_overview_notification_all;
+                                                        CheckedSetting checkedSetting = (CheckedSetting) findViewById3.findViewById(R.id.server_settings_overview_notification_all);
                                                         if (checkedSetting != null) {
-                                                            i4 = 2131364919;
-                                                            CheckedSetting checkedSetting2 = (CheckedSetting) findViewById3.findViewById(2131364919);
+                                                            i4 = R.id.server_settings_overview_notification_only_mentions;
+                                                            CheckedSetting checkedSetting2 = (CheckedSetting) findViewById3.findViewById(R.id.server_settings_overview_notification_only_mentions);
                                                             if (checkedSetting2 != null) {
                                                                 d3 d3Var = new d3((LinearLayout) findViewById3, checkedSetting, checkedSetting2);
-                                                                View findViewById4 = view.findViewById(2131364625);
+                                                                View findViewById4 = view.findViewById(R.id.region);
                                                                 if (findViewById4 != null) {
-                                                                    int i5 = 2131364352;
-                                                                    TextView textView6 = (TextView) findViewById4.findViewById(2131364352);
+                                                                    int i5 = R.id.overview_region;
+                                                                    TextView textView6 = (TextView) findViewById4.findViewById(R.id.overview_region);
                                                                     if (textView6 != null) {
-                                                                        i5 = 2131364353;
-                                                                        ImageView imageView = (ImageView) findViewById4.findViewById(2131364353);
+                                                                        i5 = R.id.overview_region_flag;
+                                                                        ImageView imageView = (ImageView) findViewById4.findViewById(R.id.overview_region_flag);
                                                                         if (imageView != null) {
                                                                             LinearLayout linearLayout3 = (LinearLayout) findViewById4;
                                                                             e3 e3Var = new e3(linearLayout3, textView6, imageView, linearLayout3);
-                                                                            View findViewById5 = view.findViewById(2131364626);
+                                                                            View findViewById5 = view.findViewById(R.id.region_help);
                                                                             if (findViewById5 != null) {
-                                                                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById5.findViewById(2131363543);
+                                                                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById5.findViewById(R.id.guild_region_help);
                                                                                 if (linkifiedTextView != null) {
                                                                                     LinearLayout linearLayout4 = (LinearLayout) findViewById5;
                                                                                     f3 f3Var = new f3(linearLayout4, linkifiedTextView, linearLayout4);
-                                                                                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364739);
+                                                                                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.save);
                                                                                     if (floatingActionButton != null) {
-                                                                                        ScrollView scrollView = (ScrollView) view.findViewById(2131364922);
+                                                                                        ScrollView scrollView = (ScrollView) view.findViewById(R.id.server_settings_overview_scroll);
                                                                                         if (scrollView != null) {
-                                                                                            View findViewById6 = view.findViewById(2131365414);
+                                                                                            View findViewById6 = view.findViewById(R.id.systemChannel);
                                                                                             if (findViewById6 != null) {
-                                                                                                int i6 = 2131365415;
-                                                                                                TextView textView7 = (TextView) findViewById6.findViewById(2131365415);
+                                                                                                int i6 = R.id.system_channel;
+                                                                                                TextView textView7 = (TextView) findViewById6.findViewById(R.id.system_channel);
                                                                                                 if (textView7 != null) {
-                                                                                                    i6 = 2131365416;
-                                                                                                    CheckedSetting checkedSetting3 = (CheckedSetting) findViewById6.findViewById(2131365416);
+                                                                                                    i6 = R.id.system_channel_boost;
+                                                                                                    CheckedSetting checkedSetting3 = (CheckedSetting) findViewById6.findViewById(R.id.system_channel_boost);
                                                                                                     if (checkedSetting3 != null) {
-                                                                                                        i6 = 2131365417;
-                                                                                                        CheckedSetting checkedSetting4 = (CheckedSetting) findViewById6.findViewById(2131365417);
+                                                                                                        i6 = R.id.system_channel_join;
+                                                                                                        CheckedSetting checkedSetting4 = (CheckedSetting) findViewById6.findViewById(R.id.system_channel_join);
                                                                                                         if (checkedSetting4 != null) {
                                                                                                             LinearLayout linearLayout5 = (LinearLayout) findViewById6;
                                                                                                             g3 g3Var = new g3(linearLayout5, textView7, checkedSetting3, checkedSetting4, linearLayout5);
-                                                                                                            View findViewById7 = view.findViewById(2131365624);
+                                                                                                            View findViewById7 = view.findViewById(R.id.uploadBanner);
                                                                                                             if (findViewById7 != null) {
-                                                                                                                int i7 = 2131364923;
-                                                                                                                FrameLayout frameLayout = (FrameLayout) findViewById7.findViewById(2131364923);
+                                                                                                                int i7 = R.id.server_settings_overview_upload_banner_container;
+                                                                                                                FrameLayout frameLayout = (FrameLayout) findViewById7.findViewById(R.id.server_settings_overview_upload_banner_container);
                                                                                                                 if (frameLayout != null) {
-                                                                                                                    i7 = 2131364924;
-                                                                                                                    TextView textView8 = (TextView) findViewById7.findViewById(2131364924);
+                                                                                                                    i7 = R.id.server_settings_overview_upload_banner_remove;
+                                                                                                                    TextView textView8 = (TextView) findViewById7.findViewById(R.id.server_settings_overview_upload_banner_remove);
                                                                                                                     if (textView8 != null) {
-                                                                                                                        i7 = 2131365626;
-                                                                                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById7.findViewById(2131365626);
+                                                                                                                        i7 = R.id.upload_banner;
+                                                                                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById7.findViewById(R.id.upload_banner);
                                                                                                                         if (simpleDraweeView2 != null) {
-                                                                                                                            i7 = 2131365627;
-                                                                                                                            FloatingActionButton floatingActionButton2 = (FloatingActionButton) findViewById7.findViewById(2131365627);
+                                                                                                                            i7 = R.id.upload_banner_fab;
+                                                                                                                            FloatingActionButton floatingActionButton2 = (FloatingActionButton) findViewById7.findViewById(R.id.upload_banner_fab);
                                                                                                                             if (floatingActionButton2 != null) {
-                                                                                                                                i7 = 2131365628;
-                                                                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById7.findViewById(2131365628);
+                                                                                                                                i7 = R.id.upload_banner_learn_more;
+                                                                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById7.findViewById(R.id.upload_banner_learn_more);
                                                                                                                                 if (linkifiedTextView2 != null) {
-                                                                                                                                    i7 = 2131365629;
-                                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(2131365629);
+                                                                                                                                    i7 = R.id.upload_banner_nitro_tier;
+                                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(R.id.upload_banner_nitro_tier);
                                                                                                                                     if (textView9 != null) {
-                                                                                                                                        i7 = 2131365630;
-                                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(2131365630);
+                                                                                                                                        i7 = R.id.upload_banner_unlock;
+                                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(R.id.upload_banner_unlock);
                                                                                                                                         if (textView10 != null) {
                                                                                                                                             h3 h3Var = new h3((LinearLayout) findViewById7, frameLayout, textView8, simpleDraweeView2, floatingActionButton2, linkifiedTextView2, textView9, textView10);
-                                                                                                                                            View findViewById8 = view.findViewById(2131365625);
+                                                                                                                                            View findViewById8 = view.findViewById(R.id.uploadSplash);
                                                                                                                                             if (findViewById8 != null) {
-                                                                                                                                                int i8 = 2131364925;
-                                                                                                                                                FrameLayout frameLayout2 = (FrameLayout) findViewById8.findViewById(2131364925);
+                                                                                                                                                int i8 = R.id.server_settings_overview_upload_splash_container;
+                                                                                                                                                FrameLayout frameLayout2 = (FrameLayout) findViewById8.findViewById(R.id.server_settings_overview_upload_splash_container);
                                                                                                                                                 if (frameLayout2 != null) {
-                                                                                                                                                    i8 = 2131364926;
-                                                                                                                                                    FloatingActionButton floatingActionButton3 = (FloatingActionButton) findViewById8.findViewById(2131364926);
+                                                                                                                                                    i8 = R.id.server_settings_overview_upload_splash_fab;
+                                                                                                                                                    FloatingActionButton floatingActionButton3 = (FloatingActionButton) findViewById8.findViewById(R.id.server_settings_overview_upload_splash_fab);
                                                                                                                                                     if (floatingActionButton3 != null) {
-                                                                                                                                                        i8 = 2131364927;
-                                                                                                                                                        TextView textView11 = (TextView) findViewById8.findViewById(2131364927);
+                                                                                                                                                        i8 = R.id.server_settings_overview_upload_splash_remove;
+                                                                                                                                                        TextView textView11 = (TextView) findViewById8.findViewById(R.id.server_settings_overview_upload_splash_remove);
                                                                                                                                                         if (textView11 != null) {
-                                                                                                                                                            i8 = 2131365636;
-                                                                                                                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById8.findViewById(2131365636);
+                                                                                                                                                            i8 = R.id.upload_splash;
+                                                                                                                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById8.findViewById(R.id.upload_splash);
                                                                                                                                                             if (simpleDraweeView3 != null) {
-                                                                                                                                                                i8 = 2131365637;
-                                                                                                                                                                LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById8.findViewById(2131365637);
+                                                                                                                                                                i8 = R.id.upload_splash_learn_more;
+                                                                                                                                                                LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById8.findViewById(R.id.upload_splash_learn_more);
                                                                                                                                                                 if (linkifiedTextView3 != null) {
-                                                                                                                                                                    i8 = 2131365638;
-                                                                                                                                                                    TextView textView12 = (TextView) findViewById8.findViewById(2131365638);
+                                                                                                                                                                    i8 = R.id.upload_splash_nitro_tier;
+                                                                                                                                                                    TextView textView12 = (TextView) findViewById8.findViewById(R.id.upload_splash_nitro_tier);
                                                                                                                                                                     if (textView12 != null) {
-                                                                                                                                                                        i8 = 2131365639;
-                                                                                                                                                                        TextView textView13 = (TextView) findViewById8.findViewById(2131365639);
+                                                                                                                                                                        i8 = R.id.upload_splash_unlock;
+                                                                                                                                                                        TextView textView13 = (TextView) findViewById8.findViewById(R.id.upload_splash_unlock);
                                                                                                                                                                         if (textView13 != null) {
                                                                                                                                                                             return new WidgetServerSettingsOverviewBinding((CoordinatorLayout) view, p5Var, c3Var, d3Var, e3Var, f3Var, floatingActionButton, scrollView, g3Var, h3Var, new i3((LinearLayout) findViewById8, frameLayout2, floatingActionButton3, textView11, simpleDraweeView3, linkifiedTextView3, textView12, textView13));
                                                                                                                                                                         }
@@ -171,7 +172,7 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend
                                                                                                                                                 }
                                                                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById8.getResources().getResourceName(i8)));
                                                                                                                                             }
-                                                                                                                                            i = 2131365625;
+                                                                                                                                            i = R.id.uploadSplash;
                                                                                                                                         }
                                                                                                                                     }
                                                                                                                                 }
@@ -181,30 +182,30 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend
                                                                                                                 }
                                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i7)));
                                                                                                             }
-                                                                                                            i = 2131365624;
+                                                                                                            i = R.id.uploadBanner;
                                                                                                         }
                                                                                                     }
                                                                                                 }
                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i6)));
                                                                                             }
-                                                                                            i = 2131365414;
+                                                                                            i = R.id.systemChannel;
                                                                                         } else {
-                                                                                            i = 2131364922;
+                                                                                            i = R.id.server_settings_overview_scroll;
                                                                                         }
                                                                                     } else {
-                                                                                        i = 2131364739;
+                                                                                        i = R.id.save;
                                                                                     }
                                                                                 } else {
-                                                                                    throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(2131363543)));
+                                                                                    throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(R.id.guild_region_help)));
                                                                                 }
                                                                             } else {
-                                                                                i = 2131364626;
+                                                                                i = R.id.region_help;
                                                                             }
                                                                         }
                                                                     }
                                                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById4.getResources().getResourceName(i5)));
                                                                 }
-                                                                i = 2131364625;
+                                                                i = R.id.region;
                                                             }
                                                         }
                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i4)));
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java
index 40848d4710..bf796a1b48 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.widgets.channels.WidgetChannelSelector;
 import com.discord.widgets.servers.WidgetServerSettingsOverview;
 /* compiled from: WidgetServerSettingsOverview.kt */
@@ -15,6 +16,6 @@ public final class WidgetServerSettingsOverview$configureUI$2 implements View.On
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSelector.Companion.launchForVoice(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_AFK_CHANNEL", true, 2131891708);
+        WidgetChannelSelector.Companion.launchForVoice(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_AFK_CHANNEL", true, R.string.no_afk_channel);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java
index 56a6bc5286..36673d7b10 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.widgets.channels.WidgetChannelSelector;
 import com.discord.widgets.servers.WidgetServerSettingsOverview;
 /* compiled from: WidgetServerSettingsOverview.kt */
@@ -15,6 +16,6 @@ public final class WidgetServerSettingsOverview$configureUI$4 implements View.On
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSelector.Companion.launchForText(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_SYSTEM_CHANNEL", true, 2131891761);
+        WidgetChannelSelector.Companion.launchForText(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_SYSTEM_CHANNEL", true, R.string.no_system_channel);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$1.java
index 65b1d0b41f..be3b2cb869 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
@@ -27,7 +28,7 @@ public final class WidgetServerSettingsOverview$onViewBound$1 extends o implemen
     public final void invoke(long j, String str) {
         m.checkNotNullParameter(str, "<anonymous parameter 1>");
         Channel channel = StoreStream.Companion.getChannels().getChannel(j);
-        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131361934, channel);
+        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(R.id.afk_channel, channel);
         WidgetServerSettingsOverview.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsOverview.access$getBinding$p(this.this$0).g);
         WidgetServerSettingsOverview.access$configureAfkChannel(this.this$0, channel);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java
index 3a5787f93c..1d9d5dbd2d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
@@ -27,7 +28,7 @@ public final class WidgetServerSettingsOverview$onViewBound$2 extends o implemen
     public final void invoke(long j, String str) {
         m.checkNotNullParameter(str, "<anonymous parameter 1>");
         Channel channel = StoreStream.Companion.getChannels().getChannel(j);
-        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131365415, channel);
+        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(R.id.system_channel, channel);
         WidgetServerSettingsOverview.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsOverview.access$getBinding$p(this.this$0).g);
         WidgetServerSettingsOverview.access$configureSystemChannel(this.this$0, channel);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java
index b01f889cf2..2e1349b788 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers;
 
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.stateful.StatefulViews;
 import com.discord.widgets.servers.WidgetServerRegionSelectDialog;
@@ -30,8 +31,8 @@ public final class WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$
     public final void invoke(WidgetServerRegionSelectDialog.VoiceRegion voiceRegion) {
         m.checkNotNullParameter(voiceRegion, "voiceRegion");
         int voiceRegionIconResourceId = IconUtils.INSTANCE.getVoiceRegionIconResourceId(voiceRegion.getId());
-        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364352, voiceRegion.getName());
-        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364353, Integer.valueOf(voiceRegionIconResourceId));
+        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(R.id.overview_region, voiceRegion.getName());
+        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(R.id.overview_region_flag, Integer.valueOf(voiceRegionIconResourceId));
         StatefulViews access$getState$p = WidgetServerSettingsOverview.access$getState$p(this.this$0);
         LinearLayout linearLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).e.d;
         m.checkNotNullExpressionValue(linearLayout, "binding.region.overviewRegionWrap");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
index c589cd9a35..0b15afb6ff 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
@@ -12,6 +12,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.exifinterface.media.ExifInterface;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.f;
@@ -20,6 +22,7 @@ import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.preview.GuildPreview;
 import com.discord.app.AppActivity;
@@ -28,6 +31,7 @@ import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsOverviewAfkTimeoutBinding;
 import com.discord.databinding.WidgetServerSettingsOverviewBinding;
 import com.discord.dialogs.ImageUploadDialog;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelVoiceRegion;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.guild.Guild;
@@ -80,7 +84,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsOverview$binding$2.INSTANCE, null, 2, null);
     private boolean hasOpenedAvatarPicker;
     private Action1<String> imageSelectedResult;
-    private final StatefulViews state = new StatefulViews(2131364914, 2131364351, 2131364352, 2131364353, 2131364354, 2131361934, 2131361936, 2131361937, 2131365415, 2131365636, 2131365626, 2131365417, 2131365416, 90001);
+    private final StatefulViews state = new StatefulViews(R.id.server_settings_overview_icon, R.id.overview_name, R.id.overview_region, R.id.overview_region_flag, R.id.overview_region_wrap, R.id.afk_channel, R.id.afk_timeout, R.id.afk_timeout_wrap, R.id.system_channel, R.id.upload_splash, R.id.upload_banner, R.id.system_channel_join, R.id.system_channel_boost, STATE_ID_NOTIFICATION_DEFAULT);
 
     /* compiled from: WidgetServerSettingsOverview.kt */
     public static final class AfkBottomSheet extends AppBottomSheet {
@@ -111,7 +115,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
 
         @Override // com.discord.app.AppBottomSheet
         public int getContentViewResId() {
-            return 2131559231;
+            return R.layout.widget_server_settings_overview_afk_timeout;
         }
 
         @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -160,7 +164,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         public final void create(Context context, long j, boolean z2) {
             m.checkNotNullParameter(context, "context");
             StoreStream.Companion.getAnalytics().onGuildSettingsPaneViewed("OVERVIEW", j);
-            Intent putExtra = new Intent().putExtra("INTENT_EXTRA_GUILD_ID", j).putExtra("INTENT_EXTRA_OPEN_AVATAR_PICKER", z2);
+            Intent putExtra = new Intent().putExtra("INTENT_EXTRA_GUILD_ID", j).putExtra(WidgetServerSettingsOverview.INTENT_EXTRA_OPEN_AVATAR_PICKER, z2);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…PICKER, openAvatarPicker)");
             l.d(context, WidgetServerSettingsOverview.class, putExtra);
         }
@@ -202,25 +206,25 @@ public final class WidgetServerSettingsOverview extends AppFragment {
                 if (i == 60) {
                     Resources resources = context.getResources();
                     m.checkNotNullExpressionValue(resources, "context.resources");
-                    return StringResourceUtilsKt.getQuantityString(resources, context, 2131755068, 1, 1);
+                    return StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.duration_minutes_minutes, 1, 1);
                 } else if (i == 300) {
                     Resources resources2 = context.getResources();
                     m.checkNotNullExpressionValue(resources2, "context.resources");
-                    return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755068, 5, 5);
+                    return StringResourceUtilsKt.getQuantityString(resources2, context, (int) R.plurals.duration_minutes_minutes, 5, 5);
                 } else if (i == 900) {
                     Resources resources3 = context.getResources();
                     m.checkNotNullExpressionValue(resources3, "context.resources");
-                    return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755068, 15, 15);
+                    return StringResourceUtilsKt.getQuantityString(resources3, context, (int) R.plurals.duration_minutes_minutes, 15, 15);
                 } else if (i == 1800) {
                     Resources resources4 = context.getResources();
                     m.checkNotNullExpressionValue(resources4, "context.resources");
-                    return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755068, 30, 30);
+                    return StringResourceUtilsKt.getQuantityString(resources4, context, (int) R.plurals.duration_minutes_minutes, 30, 30);
                 } else if (i != 3600) {
                     return "";
                 } else {
                     Resources resources5 = context.getResources();
                     m.checkNotNullExpressionValue(resources5, "context.resources");
-                    return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755065, 1, 1);
+                    return StringResourceUtilsKt.getQuantityString(resources5, context, (int) R.plurals.duration_hours_hours, 1, 1);
                 }
             }
         }
@@ -235,8 +239,8 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             private final int type;
 
             public VoiceRegion(String str, String str2) {
-                m.checkNotNullParameter(str, "id");
-                m.checkNotNullParameter(str2, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+                m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 this.f2180id = str;
                 this.name = str2;
                 this.key = str;
@@ -261,8 +265,8 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             }
 
             public final VoiceRegion copy(String str, String str2) {
-                m.checkNotNullParameter(str, "id");
-                m.checkNotNullParameter(str2, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
+                m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 return new VoiceRegion(str, str2);
             }
 
@@ -405,7 +409,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     }
 
     public WidgetServerSettingsOverview() {
-        super(2131559230);
+        super(R.layout.widget_server_settings_overview);
     }
 
     public static final /* synthetic */ void access$configureAfkChannel(WidgetServerSettingsOverview widgetServerSettingsOverview, Channel channel) {
@@ -467,7 +471,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     private final void configureAfkChannel(Channel channel) {
         TextView textView = getBinding().b.b;
         m.checkNotNullExpressionValue(textView, "binding.afk.afkChannel");
-        configureChannel(textView, channel, 2131891708, 2131231529);
+        configureChannel(textView, channel, R.string.no_afk_channel, R.drawable.ic_channel_voice_16dp);
     }
 
     private final void configureBannerImage(String str, String str2, boolean z2) {
@@ -500,18 +504,18 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     private final void configureBannerSection(Guild guild) {
         boolean z2 = true;
         if (guild.canHaveBanner()) {
-            getBinding().k.e.setBackgroundResource(2131231038);
+            getBinding().k.e.setBackgroundResource(R.drawable.drawable_bg_nitro_gradient);
             TextView textView = getBinding().j.g;
             m.checkNotNullExpressionValue(textView, "binding.uploadBanner.uploadBannerNitroTier");
             int i = 8;
             textView.setVisibility(8);
             TextView textView2 = getBinding().j.h;
             m.checkNotNullExpressionValue(textView2, "binding.uploadBanner.uploadBannerUnlock");
-            b.n(textView2, 2131890007, new Object[]{"2"}, null, 4);
+            b.n(textView2, R.string.guild_settings_overview_boost_unlocked, new Object[]{ExifInterface.GPS_MEASUREMENT_2D}, null, 4);
             TextView textView3 = getBinding().j.h;
             m.checkNotNullExpressionValue(textView3, "binding.uploadBanner.uploadBannerUnlock");
-            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231861, 0, 0, 13, (Object) null);
-            getBinding().j.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100433));
+            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, (int) R.drawable.ic_perk_tier_1_boosted, 0, 0, 13, (Object) null);
+            getBinding().j.h.setTextColor(ColorCompat.getColor(requireContext(), (int) R.color.white));
             TextView textView4 = getBinding().j.h;
             m.checkNotNullExpressionValue(textView4, "binding.uploadBanner.uploadBannerUnlock");
             String banner = guild.getBanner();
@@ -531,7 +535,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         TextView textView5 = getBinding().j.g;
         m.checkNotNullExpressionValue(textView5, "binding.uploadBanner.uploadBannerNitroTier");
-        b.m(textView5, 2131890008, new Object[]{"2", "tierStatus"}, new WidgetServerSettingsOverview$configureBannerSection$1(guild));
+        b.m(textView5, R.string.guild_settings_overview_tier_info, new Object[]{ExifInterface.GPS_MEASUREMENT_2D, "tierStatus"}, new WidgetServerSettingsOverview$configureBannerSection$1(guild));
         TextView textView6 = getBinding().j.g;
         m.checkNotNullExpressionValue(textView6, "binding.uploadBanner.uploadBannerNitroTier");
         textView6.setVisibility(0);
@@ -541,15 +545,15 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         int premiumSubscriptionCount = 15 - guild.getPremiumSubscriptionCount();
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755167, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount));
+        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.guild_settings_overview_boost_unlock_boosts, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount));
         TextView textView7 = getBinding().j.h;
         m.checkNotNullExpressionValue(textView7, "binding.uploadBanner.uploadBannerUnlock");
-        ViewExtensions.setTextAndVisibilityBy(textView7, b.k(this, 2131890006, new Object[]{quantityString}, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(textView7, b.k(this, R.string.guild_settings_overview_boost_unlock, new Object[]{quantityString}, null, 4));
         TextView textView8 = getBinding().j.h;
         m.checkNotNullExpressionValue(textView8, "binding.uploadBanner.uploadBannerUnlock");
-        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231860, 0, 0, 13, (Object) null);
-        getBinding().j.h.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130969885));
-        getBinding().j.d.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130969898));
+        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, (int) R.drawable.ic_perk_lock, 0, 0, 13, (Object) null);
+        getBinding().j.h.setTextColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.primary_300));
+        getBinding().j.d.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.primary_630));
         getBinding().j.g.setOnClickListener(new WidgetServerSettingsOverview$configureBannerSection$2(guild));
     }
 
@@ -569,7 +573,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     private final void configureIcon(String str, String str2, String str3, boolean z2) {
         boolean z3 = true;
         int i = 0;
-        if (!this.hasOpenedAvatarPicker && getMostRecentIntent().getBooleanExtra("INTENT_EXTRA_OPEN_AVATAR_PICKER", false)) {
+        if (!this.hasOpenedAvatarPicker && getMostRecentIntent().getBooleanExtra(INTENT_EXTRA_OPEN_AVATAR_PICKER, false)) {
             openAvatarPicker(str, str2);
         }
         if (z2) {
@@ -586,7 +590,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         getBinding().f1931c.d.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$1(this, str, str2));
         SimpleDraweeView simpleDraweeView3 = getBinding().f1931c.d;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.header.serverSettingsOverviewIcon");
-        IconUtils.setIcon$default(simpleDraweeView3, str3, 2131165286, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView3, str3, (int) R.dimen.avatar_size_extra_large, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         if (str3 != null && !t.isBlank(str3)) {
             z3 = false;
         }
@@ -622,10 +626,10 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             CheckedSetting checkedSetting = (CheckedSetting) obj;
             m.checkNotNullExpressionValue(checkedSetting, "checkedSetting");
             checkedSetting.setChecked(i3 == i2);
-            if (!z2 || checkedSetting.getId() != 2131364918) {
+            if (!z2 || checkedSetting.getId() != R.id.server_settings_overview_notification_all) {
                 checkedSetting.h(null, false);
             } else {
-                checkedSetting.h(b.k(this, 2131889810, new Object[0], null, 4), false);
+                checkedSetting.h(b.k(this, R.string.guild_settings_default_notifications_large_guild_notify_all, new Object[0], null, 4), false);
             }
             checkedSetting.setOnCheckedListener(new WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1(i3, this, i2, z2, i));
             i3 = i4;
@@ -667,14 +671,14 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             m.checkNotNullExpressionValue(textView, "binding.uploadSplash.uploadSplashNitroTier");
             int i = 8;
             textView.setVisibility(8);
-            getBinding().k.e.setBackgroundResource(2131231038);
+            getBinding().k.e.setBackgroundResource(R.drawable.drawable_bg_nitro_gradient);
             TextView textView2 = getBinding().k.h;
             m.checkNotNullExpressionValue(textView2, "binding.uploadSplash.uploadSplashUnlock");
-            b.n(textView2, 2131890007, new Object[]{"1"}, null, 4);
+            b.n(textView2, R.string.guild_settings_overview_boost_unlocked, new Object[]{"1"}, null, 4);
             TextView textView3 = getBinding().k.h;
             m.checkNotNullExpressionValue(textView3, "binding.uploadSplash.uploadSplashUnlock");
-            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231861, 0, 0, 13, (Object) null);
-            getBinding().k.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100433));
+            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, (int) R.drawable.ic_perk_tier_1_boosted, 0, 0, 13, (Object) null);
+            getBinding().k.h.setTextColor(ColorCompat.getColor(requireContext(), (int) R.color.white));
             TextView textView4 = getBinding().k.h;
             m.checkNotNullExpressionValue(textView4, "binding.uploadSplash.uploadSplashUnlock");
             String splash = guild.getSplash();
@@ -694,7 +698,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         TextView textView5 = getBinding().k.g;
         m.checkNotNullExpressionValue(textView5, "binding.uploadSplash.uploadSplashNitroTier");
-        b.m(textView5, 2131890008, new Object[]{"1", "tierInfo"}, new WidgetServerSettingsOverview$configureSplashSection$1(guild));
+        b.m(textView5, R.string.guild_settings_overview_tier_info, new Object[]{"1", "tierInfo"}, new WidgetServerSettingsOverview$configureSplashSection$1(guild));
         TextView textView6 = getBinding().k.g;
         m.checkNotNullExpressionValue(textView6, "binding.uploadSplash.uploadSplashNitroTier");
         textView6.setVisibility(0);
@@ -704,22 +708,22 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         int premiumSubscriptionCount = 2 - guild.getPremiumSubscriptionCount();
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755167, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount));
+        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.guild_settings_overview_boost_unlock_boosts, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount));
         TextView textView7 = getBinding().k.h;
         m.checkNotNullExpressionValue(textView7, "binding.uploadSplash.uploadSplashUnlock");
-        ViewExtensions.setTextAndVisibilityBy(textView7, b.k(this, 2131890006, new Object[]{quantityString}, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(textView7, b.k(this, R.string.guild_settings_overview_boost_unlock, new Object[]{quantityString}, null, 4));
         TextView textView8 = getBinding().k.h;
         m.checkNotNullExpressionValue(textView8, "binding.uploadSplash.uploadSplashUnlock");
-        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231860, 0, 0, 13, (Object) null);
-        getBinding().k.h.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130969885));
-        getBinding().k.e.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130969898));
+        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, (int) R.drawable.ic_perk_lock, 0, 0, 13, (Object) null);
+        getBinding().k.h.setTextColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.primary_300));
+        getBinding().k.e.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.primary_630));
         getBinding().k.g.setOnClickListener(new WidgetServerSettingsOverview$configureSplashSection$2(guild));
     }
 
     private final void configureSystemChannel(Channel channel) {
         TextView textView = getBinding().i.b;
         m.checkNotNullExpressionValue(textView, "binding.systemChannel.systemChannel");
-        configureChannel(textView, channel, 2131891761, 2131231520);
+        configureChannel(textView, channel, R.string.no_system_channel, R.drawable.ic_channel_text_16dp);
     }
 
     private final void configureUI(Model model) {
@@ -757,7 +761,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         m.checkNotNullExpressionValue(textView2, "binding.region.overviewRegion");
         CharSequence charSequence = (String) statefulViews3.get(textView2.getId(), model.getVoiceRegion());
         if (charSequence == null) {
-            charSequence = b.k(this, 2131893574, new Object[0], null, 4);
+            charSequence = b.k(this, R.string.server_region_unavailable, new Object[0], null, 4);
         }
         textView.setText(charSequence);
         LinearLayout linearLayout4 = getBinding().f.f95c;
@@ -768,7 +772,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         linearLayout4.setVisibility(i);
         LinkifiedTextView linkifiedTextView = getBinding().f.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.regionHelp.guildRegionHelp");
-        b.n(linkifiedTextView, 2131889429, new Object[]{f.a.a(360060570993L, null)}, null, 4);
+        b.n(linkifiedTextView, R.string.guild_region_deprecated_blurb, new Object[]{f.a.a(360060570993L, null)}, null, 4);
         int voiceRegionIconResourceId = IconUtils.INSTANCE.getVoiceRegionIconResourceId(model.getGuild().getRegion());
         StatefulViews statefulViews4 = this.state;
         ImageView imageView = getBinding().e.f90c;
@@ -806,7 +810,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         LinearLayout linearLayout7 = getBinding().i.e;
         m.checkNotNullExpressionValue(linearLayout7, "binding.systemChannel.systemChannelWrap");
         linearLayout6.setTag(statefulViews8.get(linearLayout7.getId(), model.getGuild().getSystemChannelId()));
-        configureRadios(90001, ((Number) this.state.get(90001, Integer.valueOf(model.getGuild().getDefaultMessageNotifications()))).intValue(), model.isAboveNotifyAllSize(), false);
+        configureRadios(STATE_ID_NOTIFICATION_DEFAULT, ((Number) this.state.get(STATE_ID_NOTIFICATION_DEFAULT, Integer.valueOf(model.getGuild().getDefaultMessageNotifications()))).intValue(), model.isAboveNotifyAllSize(), false);
         configureSplashSection(model.getGuild());
         configureBannerSection(model.getGuild());
         boolean z3 = (model.getGuild().getSystemChannelFlags() & 1) == 0;
@@ -844,7 +848,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         AppFragment.hideKeyboard$default(this, null, 1, null);
         getBinding().h.fullScroll(33);
         configureUI(model);
-        o.i(this, 2131893576, 0, 4);
+        o.i(this, R.string.server_settings_updated, 0, 4);
     }
 
     public static final void create(Context context, long j, boolean z2) {
@@ -873,7 +877,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -883,7 +887,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         MGImages.requestDataUrl(getContext(), uri, str, this.imageSelectedResult);
@@ -913,24 +917,24 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         statefulViews2.addOptionalFields(textView3, textView4);
         TextView textView5 = getBinding().f1931c.b;
         m.checkNotNullExpressionValue(textView5, "binding.header.iconLabel");
-        b.n(textView5, 2131891523, new Object[]{"128", "128"}, null, 4);
+        b.n(textView5, R.string.minimum_size, new Object[]{"128", "128"}, null, 4);
         LinkifiedTextView linkifiedTextView = getBinding().k.f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.uploadSplash.uploadSplashLearnMore");
         f fVar = f.a;
-        b.n(linkifiedTextView, 2131890109, new Object[]{fVar.a(360028716472L, null)}, null, 4);
+        b.n(linkifiedTextView, R.string.guild_settings_splash_recommend, new Object[]{fVar.a(360028716472L, null)}, null, 4);
         LinkifiedTextView linkifiedTextView2 = getBinding().j.f;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.uploadBanner.uploadBannerLearnMore");
-        b.n(linkifiedTextView2, 2131889771, new Object[]{fVar.a(360028716472L, null)}, null, 4);
+        b.n(linkifiedTextView2, R.string.guild_settings_banner_recommend, new Object[]{fVar.a(360028716472L, null)}, null, 4);
         getBinding().g.hide();
         WidgetChannelSelector.Companion companion = WidgetChannelSelector.Companion;
-        companion.registerForResult(this, "REQUEST_KEY_AFK_CHANNEL", true, new WidgetServerSettingsOverview$onViewBound$1(this));
-        companion.registerForResult(this, "REQUEST_KEY_SYSTEM_CHANNEL", true, new WidgetServerSettingsOverview$onViewBound$2(this));
+        companion.registerForResult(this, REQUEST_KEY_AFK_CHANNEL, true, new WidgetServerSettingsOverview$onViewBound$1(this));
+        companion.registerForResult(this, REQUEST_KEY_SYSTEM_CHANNEL, true, new WidgetServerSettingsOverview$onViewBound$2(this));
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        setActionBarTitle(2131892098);
+        setActionBarTitle(R.string.overview);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1)), this, null, 2, null), WidgetServerSettingsOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsOverview$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java
index 20e485cdab..5ae670a0d3 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
@@ -56,7 +57,7 @@ public final class WidgetServerSettingsRolesList$Model$Companion$get$1<T, R> imp
             if (guild == null || guildMember == null || l == null || map == null) {
                 return null;
             }
-            boolean can = PermissionUtils.can(268435456, l);
+            boolean can = PermissionUtils.can(Permission.MANAGE_ROLES, l);
             boolean isElevated = PermissionUtils.isElevated(this.$meUser.getMfaEnabled(), guild.getMfaLevel());
             GuildRole highestRole = RoleUtils.getHighestRole(map, guildMember);
             ArrayList<GuildRole> arrayList = new ArrayList(map.values());
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java
index 807c95ccf6..68e193558e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsRolesListBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetServerSettingsRolesList$binding$2 exten
 
     public final WidgetServerSettingsRolesListBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131364730;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364730);
+            i = R.id.roles_list_add_role_fab;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.roles_list_add_role_fab);
             if (floatingActionButton != null) {
-                i = 2131364935;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364935);
+                i = R.id.server_settings_roles_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.server_settings_roles_recycler);
                 if (recyclerView != null) {
                     return new WidgetServerSettingsRolesListBinding((CoordinatorLayout) view, dimmerView, floatingActionButton, recyclerView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$guildId$2.java
index 8e7a5a5299..b0a80627fd 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$guildId$2.java
@@ -17,6 +17,6 @@ public final class WidgetServerSettingsRolesList$guildId$2 extends o implements
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java
index c76cef1683..18dc576bba 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class WidgetServerSettingsRolesList$processRoleDrop$1 extends o imp
     }
 
     public final void invoke(Void r4) {
-        c.a.e.o.i(this.this$0, 2131893116, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.role_order_updated, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java
index 04e0c509e3..fdf6691f03 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsRolesListBinding;
@@ -217,7 +218,7 @@ public final class WidgetServerSettingsRolesList extends AppFragment {
     }
 
     public WidgetServerSettingsRolesList() {
-        super(2131559236);
+        super(R.layout.widget_server_settings_roles_list);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsRolesList widgetServerSettingsRolesList, Model model) {
@@ -241,7 +242,7 @@ public final class WidgetServerSettingsRolesList extends AppFragment {
             }
             return;
         }
-        setActionBarTitle(2131893294);
+        setActionBarTitle(R.string.roles);
         setActionBarSubtitle(model.getGuildName());
         WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter = this.adapter;
         if (widgetServerSettingsRolesListAdapter != null) {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java
index a999d6e9a3..5f203df565 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers;
 
 import android.view.View;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -23,6 +24,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        c.a.e.o.g(view.getContext(), 2131888674, 0, null, 12);
+        c.a.e.o.g(view.getContext(), R.string.form_label_disabled_for_everyone, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java
index fda691345f..912a7f1a86 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers;
 
 import android.view.View;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -23,6 +24,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        c.a.e.o.g(view.getContext(), 2131890381, 0, null, 12);
+        c.a.e.o.g(view.getContext(), R.string.help_missing_manage_roles_permission, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java
index eaa5dab563..efc942b157 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers;
 
 import android.view.View;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -23,6 +24,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        c.a.e.o.g(view.getContext(), 2131894450, 0, null, 12);
+        c.a.e.o.g(view.getContext(), R.string.two_fa_guild_mfa_warning_ios, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java
index 86798f3805..a12e806c9e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java
@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.databinding.WidgetServerSettingsHelpItemBinding;
 import com.discord.databinding.WidgetServerSettingsRoleItemBinding;
@@ -281,7 +282,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RoleListHelpItem(WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter) {
-            super(2131559221, widgetServerSettingsRolesListAdapter);
+            super((int) R.layout.widget_server_settings_help_item, widgetServerSettingsRolesListAdapter);
             m.checkNotNullParameter(widgetServerSettingsRolesListAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -301,7 +302,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt
             super.onConfigure(i, (int) payload);
             LinkifiedTextView linkifiedTextView = this.binding.b;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.serverSettingsHelpItem");
-            c.a.l.b.m(linkifiedTextView, 2131890385, new Object[0], new WidgetServerSettingsRolesListAdapter$RoleListHelpItem$onConfigure$1(payload));
+            c.a.l.b.m(linkifiedTextView, R.string.help_roles_description, new Object[0], new WidgetServerSettingsRolesListAdapter$RoleListHelpItem$onConfigure$1(payload));
         }
 
         @Override // com.discord.utilities.mg_recycler.DragAndDropHelper.DraggableViewHolder
@@ -316,23 +317,23 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RoleListItem(WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter) {
-            super(2131559235, widgetServerSettingsRolesListAdapter);
+            super((int) R.layout.widget_server_settings_role_item, widgetServerSettingsRolesListAdapter);
             m.checkNotNullParameter(widgetServerSettingsRolesListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364929;
-            View findViewById = view.findViewById(2131364929);
+            int i = R.id.server_settings_role_item_bottom_divider;
+            View findViewById = view.findViewById(R.id.server_settings_role_item_bottom_divider);
             if (findViewById != null) {
-                i = 2131364930;
-                View findViewById2 = view.findViewById(2131364930);
+                i = R.id.server_settings_role_item_divider_targeted;
+                View findViewById2 = view.findViewById(R.id.server_settings_role_item_divider_targeted);
                 if (findViewById2 != null) {
-                    i = 2131364931;
-                    View findViewById3 = view.findViewById(2131364931);
+                    i = R.id.server_settings_role_item_drag_overlay;
+                    View findViewById3 = view.findViewById(R.id.server_settings_role_item_drag_overlay);
                     if (findViewById3 != null) {
-                        i = 2131364932;
-                        ImageView imageView = (ImageView) view.findViewById(2131364932);
+                        i = R.id.server_settings_role_item_lock_indicator;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.server_settings_role_item_lock_indicator);
                         if (imageView != null) {
-                            i = 2131364933;
-                            TextView textView = (TextView) view.findViewById(2131364933);
+                            i = R.id.server_settings_role_item_name;
+                            TextView textView = (TextView) view.findViewById(R.id.server_settings_role_item_name);
                             if (textView != null) {
                                 WidgetServerSettingsRoleItemBinding widgetServerSettingsRoleItemBinding = new WidgetServerSettingsRoleItemBinding((RelativeLayout) view, findViewById, findViewById2, findViewById3, imageView, textView);
                                 m.checkNotNullExpressionValue(widgetServerSettingsRoleItemBinding, "WidgetServerSettingsRoleItemBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java
index 53e1a8b9f2..c8418eb9fe 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsSecurityDialogBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -19,17 +20,17 @@ public final /* synthetic */ class WidgetServerSettingsSecurity$ToggleMfaDialog$
 
     public final WidgetServerSettingsSecurityDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364249;
-        TextView textView = (TextView) view.findViewById(2131364249);
+        int i = R.id.notice_header;
+        TextView textView = (TextView) view.findViewById(R.id.notice_header);
         if (textView != null) {
-            i = 2131364941;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364941);
+            i = R.id.server_settings_security_dialog_cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.server_settings_security_dialog_cancel);
             if (materialButton != null) {
-                i = 2131364942;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364942);
+                i = R.id.server_settings_security_dialog_confirm;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.server_settings_security_dialog_confirm);
                 if (materialButton2 != null) {
-                    i = 2131364944;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364944);
+                    i = R.id.server_settings_security_server_mfa_code;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.server_settings_security_server_mfa_code);
                     if (textInputLayout != null) {
                         return new WidgetServerSettingsSecurityDialogBinding((LinearLayout) view, textView, materialButton, materialButton2, textInputLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java
index 69a98dd033..c87139f477 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsSecurityBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,14 +19,14 @@ public final /* synthetic */ class WidgetServerSettingsSecurity$binding$2 extend
 
     public final WidgetServerSettingsSecurityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364128;
-        TextView textView = (TextView) view.findViewById(2131364128);
+        int i = R.id.mfa_description_text;
+        TextView textView = (TextView) view.findViewById(R.id.mfa_description_text);
         if (textView != null) {
-            i = 2131364943;
-            TextView textView2 = (TextView) view.findViewById(2131364943);
+            i = R.id.server_settings_security_label;
+            TextView textView2 = (TextView) view.findViewById(R.id.server_settings_security_label);
             if (textView2 != null) {
-                i = 2131364945;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364945);
+                i = R.id.server_settings_security_toggle_mfa_button;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.server_settings_security_toggle_mfa_button);
                 if (materialButton != null) {
                     return new WidgetServerSettingsSecurityBinding((CoordinatorLayout) view, textView, textView2, materialButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$guildId$2.java
index d9de580e2e..08521ee02a 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$guildId$2.java
@@ -17,6 +17,6 @@ public final class WidgetServerSettingsSecurity$guildId$2 extends o implements F
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
index 0783c59aa5..6a41b4a17a 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
@@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppDialog;
 import com.discord.app.AppFragment;
@@ -191,15 +192,15 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
                 m.checkNotNullParameter(fragmentManager, "fragmentManager");
                 ToggleMfaDialog toggleMfaDialog = new ToggleMfaDialog();
                 Bundle bundle = new Bundle();
-                bundle.putLong("ARG_GUILD_ID", j);
-                bundle.putBoolean("ARG_MFA_ENABLED", z2);
+                bundle.putLong(ToggleMfaDialog.ARG_GUILD_ID, j);
+                bundle.putBoolean(ToggleMfaDialog.ARG_MFA_ENABLED, z2);
                 toggleMfaDialog.setArguments(bundle);
-                toggleMfaDialog.show(fragmentManager, "TAG_TOGGLE_MFA_DIALOG");
+                toggleMfaDialog.show(fragmentManager, WidgetServerSettingsSecurity.TAG_TOGGLE_MFA_DIALOG);
             }
         }
 
         public ToggleMfaDialog() {
-            super(2131559238);
+            super(R.layout.widget_server_settings_security_dialog);
         }
 
         public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(ToggleMfaDialog toggleMfaDialog) {
@@ -226,14 +227,14 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
             if (j <= 0) {
                 dismiss();
             }
-            getBinding().f1936c.setText(z2 ? 2131888154 : 2131888356);
+            getBinding().f1936c.setText(z2 ? R.string.disable : R.string.enable);
             MaterialButton materialButton = getBinding().f1936c;
             m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityDialogConfirm");
             WidgetServerSettingsSecurityDialogBinding binding = getBinding();
             m.checkNotNullExpressionValue(binding, "binding");
             LinearLayout linearLayout = binding.a;
             m.checkNotNullExpressionValue(linearLayout, "binding.root");
-            materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(linearLayout.getContext(), z2 ? 2131100329 : 2131100254)));
+            materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(linearLayout.getContext(), z2 ? R.color.status_red_500 : R.color.status_green_600)));
             getBinding().f1936c.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$1(this, z2, j));
             getBinding().b.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$2(this));
         }
@@ -253,7 +254,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
     }
 
     public WidgetServerSettingsSecurity() {
-        super(2131559237);
+        super(R.layout.widget_server_settings_security);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsSecurity widgetServerSettingsSecurity, Model model) {
@@ -269,20 +270,20 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
             }
             return;
         }
-        setActionBarTitle(2131893518);
+        setActionBarTitle(R.string.security);
         setActionBarSubtitle(model.getGuildName());
         if (model.isMfaEnabled()) {
-            getBinding().f1935c.setText(2131889533);
+            getBinding().f1935c.setText(R.string.guild_security_req_mfa_turn_off);
             MaterialButton materialButton = getBinding().f1935c;
             m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityToggleMfaButton");
-            materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100329)));
+            materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), (int) R.color.status_red_500)));
         } else {
-            getBinding().f1935c.setText(2131889534);
+            getBinding().f1935c.setText(R.string.guild_security_req_mfa_turn_on);
             MaterialButton materialButton2 = getBinding().f1935c;
             m.checkNotNullExpressionValue(materialButton2, "binding.serverSettingsSecurityToggleMfaButton");
-            materialButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100254)));
+            materialButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), (int) R.color.status_green_600)));
         }
-        Fragment findFragmentByTag = getParentFragmentManager().findFragmentByTag("TAG_TOGGLE_MFA_DIALOG");
+        Fragment findFragmentByTag = getParentFragmentManager().findFragmentByTag(TAG_TOGGLE_MFA_DIALOG);
         if (findFragmentByTag != null) {
             ((ToggleMfaDialog) findFragmentByTag).configure(model.getGuildId(), model.isMfaEnabled());
         }
@@ -302,13 +303,13 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        Fragment findFragmentByTag = getParentFragmentManager().findFragmentByTag("TAG_TOGGLE_MFA_DIALOG");
+        Fragment findFragmentByTag = getParentFragmentManager().findFragmentByTag(TAG_TOGGLE_MFA_DIALOG);
         if (findFragmentByTag != null) {
             getParentFragmentManager().beginTransaction().remove(findFragmentByTag).commitAllowingStateLoss();
         }
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.mfaDescriptionText");
-        c.a.l.b.n(textView, 2131889528, new Object[0], null, 4);
+        c.a.l.b.n(textView, R.string.guild_security_req_mfa_body, new Object[0], null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java
index 2d4b8a24cd..80c16c8846 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildTransferOwnershipBinding;
 import com.discord.views.CheckedSetting;
 import com.google.android.material.button.MaterialButton;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetServerSettingsTransferOwnership$binding
 
     public final WidgetGuildTransferOwnershipBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363661;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363661);
+        int i = R.id.guild_transfer_ownership_acknowledge_check;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.guild_transfer_ownership_acknowledge_check);
         if (checkedSetting != null) {
-            i = 2131363662;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363662);
+            i = R.id.guild_transfer_ownership_cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_transfer_ownership_cancel);
             if (materialButton != null) {
-                i = 2131363663;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363663);
+                i = R.id.guild_transfer_ownership_confirm;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.guild_transfer_ownership_confirm);
                 if (materialButton2 != null) {
-                    i = 2131363664;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363664);
+                    i = R.id.guild_transfer_ownership_mfa_code;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.guild_transfer_ownership_mfa_code);
                     if (textInputLayout != null) {
-                        i = 2131363665;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363665);
+                        i = R.id.guild_transfer_ownership_mfa_wrap;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_transfer_ownership_mfa_wrap);
                         if (linearLayout != null) {
                             return new WidgetGuildTransferOwnershipBinding((LinearLayout) view, checkedSetting, materialButton, materialButton2, textInputLayout, linearLayout);
                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java
index e56e9e98a0..7696a85430 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetGuildTransferOwnershipBinding;
 import com.discord.models.guild.Guild;
@@ -48,8 +49,8 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetServerSettingsTransferOwnership widgetServerSettingsTransferOwnership = new WidgetServerSettingsTransferOwnership();
             Bundle bundle = new Bundle();
-            bundle.putLong("ARG_GUILD_ID", j);
-            bundle.putLong("ARG_USER_ID", j2);
+            bundle.putLong(WidgetServerSettingsTransferOwnership.ARG_GUILD_ID, j);
+            bundle.putLong(WidgetServerSettingsTransferOwnership.ARG_USER_ID, j2);
             widgetServerSettingsTransferOwnership.setArguments(bundle);
             widgetServerSettingsTransferOwnership.show(fragmentManager, WidgetServerSettingsTransferOwnership.access$getTAG$cp());
         }
@@ -192,7 +193,7 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog {
     }
 
     public WidgetServerSettingsTransferOwnership() {
-        super(2131559100);
+        super(R.layout.widget_guild_transfer_ownership);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsTransferOwnership widgetServerSettingsTransferOwnership, Model model) {
@@ -225,7 +226,7 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog {
         CheckedSetting checkedSetting = getBinding().b;
         m.checkNotNullExpressionValue(checkedSetting, "binding.guildTransferOwnershipAcknowledgeCheck");
         materialButton.setEnabled(checkedSetting.isChecked());
-        getBinding().b.setText(b.k(this, 2131894401, new Object[]{model.getUser().getUsername()}, null, 4));
+        getBinding().b.setText(b.k(this, R.string.transfer_ownership_acknowledge, new Object[]{model.getUser().getUsername()}, null, 4));
         getBinding().b.e(new WidgetServerSettingsTransferOwnership$configureUI$2(this));
         getBinding().d.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$3(this, model));
     }
@@ -256,6 +257,6 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog {
     @Override // com.discord.app.AppDialog
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong("ARG_GUILD_ID", -1), getArgumentsOrDefault().getLong("ARG_USER_ID", -1)), this, null, 2, null), WidgetServerSettingsTransferOwnership.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsTransferOwnership$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong(ARG_GUILD_ID, -1), getArgumentsOrDefault().getLong(ARG_USER_ID, -1)), this, null, 2, null), WidgetServerSettingsTransferOwnership.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsTransferOwnership$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java
index 56cf8f46d6..09014bb2f3 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsVanityUrlBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -21,32 +22,32 @@ public final /* synthetic */ class WidgetServerSettingsVanityUrl$binding$2 exten
 
     public final WidgetServerSettingsVanityUrlBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364949;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364949);
+        int i = R.id.server_settings_vanity_input;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.server_settings_vanity_input);
         if (textInputLayout != null) {
-            i = 2131364950;
-            TextView textView = (TextView) view.findViewById(2131364950);
+            i = R.id.server_settings_vanity_url_current_url;
+            TextView textView = (TextView) view.findViewById(R.id.server_settings_vanity_url_current_url);
             if (textView != null) {
-                i = 2131364951;
-                TextView textView2 = (TextView) view.findViewById(2131364951);
+                i = R.id.server_settings_vanity_url_error_text;
+                TextView textView2 = (TextView) view.findViewById(R.id.server_settings_vanity_url_error_text);
                 if (textView2 != null) {
-                    i = 2131364952;
-                    TextView textView3 = (TextView) view.findViewById(2131364952);
+                    i = R.id.server_settings_vanity_url_header;
+                    TextView textView3 = (TextView) view.findViewById(R.id.server_settings_vanity_url_header);
                     if (textView3 != null) {
-                        i = 2131364953;
-                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364953);
+                        i = R.id.server_settings_vanity_url_input_container;
+                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.server_settings_vanity_url_input_container);
                         if (relativeLayout != null) {
-                            i = 2131364954;
-                            ProgressBar progressBar = (ProgressBar) view.findViewById(2131364954);
+                            i = R.id.server_settings_vanity_url_loading_indicator;
+                            ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.server_settings_vanity_url_loading_indicator);
                             if (progressBar != null) {
-                                i = 2131364955;
-                                TextView textView4 = (TextView) view.findViewById(2131364955);
+                                i = R.id.server_settings_vanity_url_prefix;
+                                TextView textView4 = (TextView) view.findViewById(R.id.server_settings_vanity_url_prefix);
                                 if (textView4 != null) {
-                                    i = 2131364956;
-                                    TextView textView5 = (TextView) view.findViewById(2131364956);
+                                    i = R.id.server_settings_vanity_url_remove;
+                                    TextView textView5 = (TextView) view.findViewById(R.id.server_settings_vanity_url_remove);
                                     if (textView5 != null) {
-                                        i = 2131364957;
-                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364957);
+                                        i = R.id.server_settings_vanity_url_save;
+                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.server_settings_vanity_url_save);
                                         if (floatingActionButton != null) {
                                             return new WidgetServerSettingsVanityUrlBinding((CoordinatorLayout) view, textInputLayout, textView, textView2, textView3, relativeLayout, progressBar, textView4, textView5, floatingActionButton);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$guildId$2.java
index 54ea7d93ff..b7d7444e03 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$guildId$2.java
@@ -17,6 +17,6 @@ public final class WidgetServerSettingsVanityUrl$guildId$2 extends o implements
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
index c927adb703..99c5e0361c 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsVanityUrlBinding;
@@ -41,7 +42,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsVanityUrl$binding$2.INSTANCE, null, 2, null);
     private final Lazy guildId$delegate = g.lazy(new WidgetServerSettingsVanityUrl$guildId$2(this));
-    private final StatefulViews state = new StatefulViews(2131364949);
+    private final StatefulViews state = new StatefulViews(R.id.server_settings_vanity_input);
 
     /* compiled from: WidgetServerSettingsVanityUrl.kt */
     public static final class Companion {
@@ -61,11 +62,11 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
         }
 
         private final void translateLeft(View view, int i) {
-            view.animate().translationXBy(-((float) i)).setDuration(250).setInterpolator(new AccelerateDecelerateInterpolator()).start();
+            view.animate().translationXBy(-((float) i)).setDuration(WidgetServerSettingsVanityUrl.ANIMATION_DURATION).setInterpolator(new AccelerateDecelerateInterpolator()).start();
         }
 
         private final void translateToOriginX(View view) {
-            view.animate().translationX(0.0f).setDuration(250).setInterpolator(new AccelerateDecelerateInterpolator()).start();
+            view.animate().translationX(0.0f).setDuration(WidgetServerSettingsVanityUrl.ANIMATION_DURATION).setInterpolator(new AccelerateDecelerateInterpolator()).start();
         }
 
         public final void create(Context context, long j) {
@@ -197,7 +198,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
     }
 
     public WidgetServerSettingsVanityUrl() {
-        super(2131559239);
+        super(R.layout.widget_server_settings_vanity_url);
     }
 
     public static final /* synthetic */ void access$configureInviteCode(WidgetServerSettingsVanityUrl widgetServerSettingsVanityUrl, String str, int i) {
@@ -245,7 +246,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
                 String s2 = a.s("https://discord.gg/", str);
                 TextView textView = getBinding().f1937c;
                 m.checkNotNullExpressionValue(textView, "binding.serverSettingsVanityUrlCurrentUrl");
-                c.a.l.b.n(textView, 2131894891, new Object[]{s2}, null, 4);
+                c.a.l.b.n(textView, R.string.vanity_url_help_extended, new Object[]{s2}, null, 4);
             }
         }
         TextView textView2 = getBinding().f1937c;
@@ -265,13 +266,13 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
                         }
                         textView3.setVisibility(i2);
                         if (str != null) {
-                            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755367, i, Integer.valueOf(i));
+                            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.vanity_url_header_uses_uses, i, Integer.valueOf(i));
                             TextView textView4 = getBinding().e;
                             m.checkNotNullExpressionValue(textView4, "binding.serverSettingsVanityUrlHeader");
-                            c.a.l.b.n(textView4, 2131894888, new Object[]{i18nPluralString}, null, 4);
+                            c.a.l.b.n(textView4, R.string.vanity_url_header_uses, new Object[]{i18nPluralString}, null, 4);
                             return;
                         }
-                        getBinding().e.setText(2131894887);
+                        getBinding().e.setText(R.string.vanity_url);
                         return;
                     }
                 }
@@ -308,7 +309,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
             return;
         }
         showLoadingUI(false);
-        setActionBarTitle(2131894887);
+        setActionBarTitle(R.string.vanity_url);
         setActionBarSubtitle(model.getGuildName());
         configureInviteCode(model.getVanityUrl(), model.getVanityUrlUses());
         this.state.configureSaveActionView(getBinding().j);
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java
index ae8bf84932..82434ee801 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.auditlog;
 import android.content.Context;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
 import com.discord.api.role.GuildRole;
@@ -208,7 +209,7 @@ public final class WidgetServerSettingsAuditLog$Model$Companion$get$1<T1, T2, T3
                 }
                 User user4 = (User) map2.get(Long.valueOf(auditLogState.getFilter().getUserFilter()));
                 if (user4 == null || (charSequence = UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user4, null, null, 3, null)) == null) {
-                    charSequence = this.$context.getString(2131889892);
+                    charSequence = this.$context.getString(R.string.guild_settings_filter_all_users);
                     m.checkNotNullExpressionValue(charSequence, "context.getString(R.stri…ettings_filter_all_users)");
                 }
                 String string = this.$context.getString(AuditLogUtils.INSTANCE.getActionName(auditLogState.getFilter().getActionFilter()));
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java
index 2bda8e677e..9d915c0bd8 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsAuditLogBinding;
 import d0.z.d.k;
@@ -20,32 +21,32 @@ public final /* synthetic */ class WidgetServerSettingsAuditLog$binding$2 extend
 
     public final WidgetServerSettingsAuditLogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364237;
-        TextView textView = (TextView) view.findViewById(2131364237);
+        int i = R.id.no_logs_body;
+        TextView textView = (TextView) view.findViewById(R.id.no_logs_body);
         if (textView != null) {
-            i = 2131364238;
-            TextView textView2 = (TextView) view.findViewById(2131364238);
+            i = R.id.no_logs_title;
+            TextView textView2 = (TextView) view.findViewById(R.id.no_logs_title);
             if (textView2 != null) {
-                i = 2131364837;
-                TextView textView3 = (TextView) view.findViewById(2131364837);
+                i = R.id.server_settings_audit_logs_action_filter;
+                TextView textView3 = (TextView) view.findViewById(R.id.server_settings_audit_logs_action_filter);
                 if (textView3 != null) {
-                    i = 2131364838;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364838);
+                    i = R.id.server_settings_audit_logs_action_filter_container;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.server_settings_audit_logs_action_filter_container);
                     if (linearLayout != null) {
-                        i = 2131364839;
-                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364839);
+                        i = R.id.server_settings_audit_logs_recycler;
+                        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.server_settings_audit_logs_recycler);
                         if (recyclerView != null) {
-                            i = 2131364840;
-                            TextView textView4 = (TextView) view.findViewById(2131364840);
+                            i = R.id.server_settings_audit_logs_user_filter;
+                            TextView textView4 = (TextView) view.findViewById(R.id.server_settings_audit_logs_user_filter);
                             if (textView4 != null) {
-                                i = 2131364841;
-                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364841);
+                                i = R.id.server_settings_audit_logs_user_filter_container;
+                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.server_settings_audit_logs_user_filter_container);
                                 if (linearLayout2 != null) {
-                                    i = 2131364842;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364842);
+                                    i = R.id.server_settings_audit_logs_view_flipper;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.server_settings_audit_logs_view_flipper);
                                     if (appViewFlipper != null) {
-                                        i = 2131364843;
-                                        AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364843);
+                                        i = R.id.server_settings_audit_logs_view_results_flipper;
+                                        AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(R.id.server_settings_audit_logs_view_results_flipper);
                                         if (appViewFlipper2 != null) {
                                             return new WidgetServerSettingsAuditLogBinding((CoordinatorLayout) view, textView, textView2, textView3, linearLayout, recyclerView, textView4, linearLayout2, appViewFlipper, appViewFlipper2);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
index 24dd0c9c16..8f8d7d6736 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
@@ -6,6 +6,7 @@ import android.view.MenuItem;
 import android.view.View;
 import androidx.appcompat.widget.PopupMenu;
 import c.d.b.a.a;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action1;
 /* compiled from: WidgetServerSettingsAuditLog.kt */
@@ -32,10 +33,10 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1<T> implements Acti
             public final boolean onMenuItemClick(MenuItem menuItem) {
                 m.checkNotNullExpressionValue(menuItem, "it");
                 switch (menuItem.getItemId()) {
-                    case 2131364071:
+                    case R.id.menu_audit_log_sort_actions /* 2131364071 */:
                         WidgetServerSettingsAuditLogFilterSheet.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1);
                         break;
-                    case 2131364072:
+                    case R.id.menu_audit_log_sort_users /* 2131364072 */:
                         WidgetServerSettingsAuditLogFilterSheet.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0);
                         break;
                 }
@@ -49,8 +50,8 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1<T> implements Acti
 
         @Override // android.view.View.OnClickListener
         public final void onClick(View view) {
-            PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(this.this$0.this$0.getContext(), 2131951661), view);
-            popupMenu.getMenuInflater().inflate(2131623937, popupMenu.getMenu());
+            PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(this.this$0.this$0.getContext(), (int) R.style.AppTheme_PopupMenu), view);
+            popupMenu.getMenuInflater().inflate(R.menu.menu_audit_log_sort, popupMenu.getMenu());
             popupMenu.setOnMenuItemClickListener(new AnonymousClass1(this, view));
             popupMenu.show();
         }
@@ -62,7 +63,7 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1<T> implements Acti
 
     public final void call(Menu menu) {
         View actionView;
-        MenuItem findItem = menu.findItem(2131364098);
+        MenuItem findItem = menu.findItem(R.id.menu_filter);
         if (findItem != null && (actionView = findItem.getActionView()) != null) {
             actionView.setOnClickListener(new AnonymousClass1(this));
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
index b967e461b1..e0e94085dd 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
@@ -11,6 +11,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -24,6 +25,7 @@ import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.util.Iterator;
 import java.util.List;
@@ -64,7 +66,7 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "guildName");
             StoreStream.Companion.getAnalytics().onGuildSettingsPaneViewed("AUDIT_LOG", j);
-            Intent putExtra = new Intent().putExtra("GUILD_ID", j).putExtra("GUILD_NAME", str);
+            Intent putExtra = new Intent().putExtra(WidgetServerSettingsAuditLog.INTENT_EXTRA_GUILD_ID, j).putExtra(WidgetServerSettingsAuditLog.INTENT_EXTRA_GUILD_NAME, str);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…RA_GUILD_NAME, guildName)");
             l.d(context, WidgetServerSettingsAuditLog.class, putExtra);
         }
@@ -130,7 +132,7 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
                 if (channel != null) {
                     boolean l1 = AnimatableValueParser.l1(channel);
                     if (l1) {
-                        StringBuilder H = a.H('#');
+                        StringBuilder H = a.H(MentionUtilsKt.CHANNELS_CHAR);
                         H.append(AnimatableValueParser.y0(channel));
                         return H.toString();
                     } else if (!l1) {
@@ -151,7 +153,7 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
                                 obj4 = it.next();
                                 ModelAuditLogEntry.Change change = (ModelAuditLogEntry.Change) obj4;
                                 m.checkNotNullExpressionValue(change, "it");
-                                if (m.areEqual(change.getKey(), "name")) {
+                                if (m.areEqual(change.getKey(), ModelAuditLogEntry.CHANGE_KEY_NAME)) {
                                     break;
                                 }
                             }
@@ -187,7 +189,7 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
                                         if (!(str == null || l == null)) {
                                             g1 = AnimatableValueParser.g1((int) l.longValue());
                                             if (g1) {
-                                                return '#' + str;
+                                                return MentionUtilsKt.CHANNELS_CHAR + str;
                                             } else if (!g1) {
                                                 return str;
                                             } else {
@@ -283,7 +285,7 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
     }
 
     public WidgetServerSettingsAuditLog() {
-        super(2131559196);
+        super(R.layout.widget_server_settings_audit_log);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsAuditLog widgetServerSettingsAuditLog, Model model) {
@@ -353,18 +355,18 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        long longExtra = getMostRecentIntent().getLongExtra("GUILD_ID", -1);
+        long longExtra = getMostRecentIntent().getLongExtra(INTENT_EXTRA_GUILD_ID, -1);
         this.guildId = longExtra;
         if (longExtra == -1) {
-            o.g(getContext(), 2131887917, 0, null, 12);
+            o.g(getContext(), R.string.crash_unexpected, 0, null, 12);
             AppActivity appActivity = getAppActivity();
             if (appActivity != null) {
                 appActivity.finish();
             }
         }
-        setActionBarTitle(2131889951);
-        setActionBarSubtitle(getMostRecentIntent().getStringExtra("GUILD_NAME"));
-        setActionBarOptionsMenu(2131623953, null, new WidgetServerSettingsAuditLog$onViewBound$1(this));
+        setActionBarTitle(R.string.guild_settings_label_audit_log);
+        setActionBarSubtitle(getMostRecentIntent().getStringExtra(INTENT_EXTRA_GUILD_NAME));
+        setActionBarOptionsMenu(R.menu.menu_filter, null, new WidgetServerSettingsAuditLog$onViewBound$1(this));
         getBinding().f1901c.addOnScrollListener(new WidgetServerSettingsAuditLog$onViewBound$2());
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().f1901c;
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
index 80b5a7260e..1c0daa115e 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsAuditLogListitemBinding;
 import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.user.User;
@@ -99,35 +100,35 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogEntryViewHolder(WidgetServerSettingsAuditLogAdapter widgetServerSettingsAuditLogAdapter) {
-            super(2131559199, widgetServerSettingsAuditLogAdapter);
+            super((int) R.layout.widget_server_settings_audit_log_listitem, widgetServerSettingsAuditLogAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362013;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362013);
+            int i = R.id.audit_log_listitem_action_container;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.audit_log_listitem_action_container);
             if (frameLayout != null) {
-                i = 2131362014;
-                ImageView imageView = (ImageView) view.findViewById(2131362014);
+                i = R.id.audit_log_listitem_actiontype_image;
+                ImageView imageView = (ImageView) view.findViewById(R.id.audit_log_listitem_actiontype_image);
                 if (imageView != null) {
-                    i = 2131362015;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131362015);
+                    i = R.id.audit_log_listitem_arrow;
+                    ImageView imageView2 = (ImageView) view.findViewById(R.id.audit_log_listitem_arrow);
                     if (imageView2 != null) {
-                        i = 2131362016;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362016);
+                        i = R.id.audit_log_listitem_avatar;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.audit_log_listitem_avatar);
                         if (simpleDraweeView != null) {
-                            i = 2131362017;
-                            TextView textView = (TextView) view.findViewById(2131362017);
+                            i = R.id.audit_log_listitem_change_text;
+                            TextView textView = (TextView) view.findViewById(R.id.audit_log_listitem_change_text);
                             if (textView != null) {
-                                i = 2131362018;
-                                TextView textView2 = (TextView) view.findViewById(2131362018);
+                                i = R.id.audit_log_listitem_date_text;
+                                TextView textView2 = (TextView) view.findViewById(R.id.audit_log_listitem_date_text);
                                 if (textView2 != null) {
-                                    i = 2131362019;
-                                    TextView textView3 = (TextView) view.findViewById(2131362019);
+                                    i = R.id.audit_log_listitem_header_text;
+                                    TextView textView3 = (TextView) view.findViewById(R.id.audit_log_listitem_header_text);
                                     if (textView3 != null) {
-                                        i = 2131362020;
-                                        ImageView imageView3 = (ImageView) view.findViewById(2131362020);
+                                        i = R.id.audit_log_listitem_targettype_image;
+                                        ImageView imageView3 = (ImageView) view.findViewById(R.id.audit_log_listitem_targettype_image);
                                         if (imageView3 != null) {
-                                            i = 2131362021;
-                                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362021);
+                                            i = R.id.audit_log_listitem_top_container;
+                                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.audit_log_listitem_top_container);
                                             if (relativeLayout != null) {
                                                 WidgetServerSettingsAuditLogListitemBinding widgetServerSettingsAuditLogListitemBinding = new WidgetServerSettingsAuditLogListitemBinding((CardView) view, frameLayout, imageView, imageView2, simpleDraweeView, textView, textView2, textView3, imageView3, relativeLayout);
                                                 m.checkNotNullExpressionValue(widgetServerSettingsAuditLogListitemBinding, "WidgetServerSettingsAudi…temBinding.bind(itemView)");
@@ -183,20 +184,20 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
             m.checkNotNullExpressionValue(imageView3, "binding.auditLogListitemArrow");
             imageView3.setVisibility(auditLogEntryItem.getHasChangesToRender() ? 0 : 4);
             if (!auditLogEntryItem.isSelected() || !auditLogEntryItem.getHasChangesToRender()) {
-                this.binding.f1904c.setImageResource(2131231553);
+                this.binding.f1904c.setImageResource(R.drawable.ic_chevron_right_grey_12dp);
                 RelativeLayout relativeLayout = this.binding.i;
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                relativeLayout.setBackgroundColor(ColorCompat.getThemedColor(view2, 2130969898));
+                relativeLayout.setBackgroundColor(ColorCompat.getThemedColor(view2, (int) R.attr.primary_630));
             } else {
                 TextView textView4 = this.binding.e;
                 m.checkNotNullExpressionValue(textView4, "binding.auditLogListitemChangeText");
                 textView4.setText(auditLogEntryItem.getChangeText());
-                this.binding.f1904c.setImageResource(2131231549);
+                this.binding.f1904c.setImageResource(R.drawable.ic_chevron_down_grey_12dp);
                 RelativeLayout relativeLayout2 = this.binding.i;
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                relativeLayout2.setBackgroundColor(ColorCompat.getThemedColor(view3, 2130969905));
+                relativeLayout2.setBackgroundColor(ColorCompat.getThemedColor(view3, (int) R.attr.primary_700_alpha_60));
                 if (WidgetServerSettingsAuditLogAdapter.access$getEnsureExpandedIsVisible$p((WidgetServerSettingsAuditLogAdapter) this.adapter)) {
                     WidgetServerSettingsAuditLogAdapter.access$setEnsureExpandedIsVisible$p((WidgetServerSettingsAuditLogAdapter) this.adapter, false);
                     ((WidgetServerSettingsAuditLogAdapter) this.adapter).getRecycler().post(new WidgetServerSettingsAuditLogAdapter$AuditLogEntryViewHolder$onConfigure$1(this));
@@ -226,7 +227,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
     public static final class AuditLogLoadingViewHolder extends MGRecyclerViewHolder<WidgetServerSettingsAuditLogAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogLoadingViewHolder(WidgetServerSettingsAuditLogAdapter widgetServerSettingsAuditLogAdapter) {
-            super(2131559200, widgetServerSettingsAuditLogAdapter);
+            super((int) R.layout.widget_server_settings_audit_log_loading_listitem, widgetServerSettingsAuditLogAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogAdapter, "adapter");
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
index c448e5b7a3..40df8ec59d 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
@@ -6,8 +6,10 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsAuditLogFilterActionListitemBinding;
 import com.discord.databinding.WidgetServerSettingsAuditLogFilterUserListitemBinding;
 import com.discord.utilities.auditlogs.AuditLogUtils;
@@ -41,7 +43,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         private final int type = 1;
 
         public AuditLogActionFilterItem(int i, String str, boolean z2) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.actionId = i;
             this.text = str;
             this.isChecked = z2;
@@ -77,20 +79,20 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogFilterActionViewHolder(WidgetServerSettingsAuditLogFilterAdapter widgetServerSettingsAuditLogFilterAdapter) {
-            super(2131559197, widgetServerSettingsAuditLogFilterAdapter);
+            super((int) R.layout.widget_server_settings_audit_log_filter_action_listitem, widgetServerSettingsAuditLogFilterAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogFilterAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362006;
-            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362006);
+            int i = R.id.audit_log_filter_cs;
+            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.audit_log_filter_cs);
             if (checkedSetting != null) {
-                i = 2131362008;
-                ImageView imageView = (ImageView) view.findViewById(2131362008);
+                i = R.id.audit_log_filter_image_action;
+                ImageView imageView = (ImageView) view.findViewById(R.id.audit_log_filter_image_action);
                 if (imageView != null) {
-                    i = 2131362009;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362009);
+                    i = R.id.audit_log_filter_image_container;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.audit_log_filter_image_container);
                     if (frameLayout != null) {
-                        i = 2131362010;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131362010);
+                        i = R.id.audit_log_filter_image_target;
+                        ImageView imageView2 = (ImageView) view.findViewById(R.id.audit_log_filter_image_target);
                         if (imageView2 != null) {
                             WidgetServerSettingsAuditLogFilterActionListitemBinding widgetServerSettingsAuditLogFilterActionListitemBinding = new WidgetServerSettingsAuditLogFilterActionListitemBinding((LinearLayout) view, checkedSetting, imageView, frameLayout, imageView2);
                             m.checkNotNullExpressionValue(widgetServerSettingsAuditLogFilterActionListitemBinding, "WidgetServerSettingsAudi…temBinding.bind(itemView)");
@@ -131,20 +133,20 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogFilterUserViewHolder(WidgetServerSettingsAuditLogFilterAdapter widgetServerSettingsAuditLogFilterAdapter) {
-            super(2131559198, widgetServerSettingsAuditLogFilterAdapter);
+            super((int) R.layout.widget_server_settings_audit_log_filter_user_listitem, widgetServerSettingsAuditLogFilterAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogFilterAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362005;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362005);
+            int i = R.id.audit_log_filter_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.audit_log_filter_avatar);
             if (simpleDraweeView != null) {
-                i = 2131362006;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362006);
+                i = R.id.audit_log_filter_cs;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.audit_log_filter_cs);
                 if (checkedSetting != null) {
-                    i = 2131362007;
-                    ImageView imageView = (ImageView) view.findViewById(2131362007);
+                    i = R.id.audit_log_filter_image;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.audit_log_filter_image);
                     if (imageView != null) {
-                        i = 2131362009;
-                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362009);
+                        i = R.id.audit_log_filter_image_container;
+                        FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.audit_log_filter_image_container);
                         if (frameLayout != null) {
                             WidgetServerSettingsAuditLogFilterUserListitemBinding widgetServerSettingsAuditLogFilterUserListitemBinding = new WidgetServerSettingsAuditLogFilterUserListitemBinding((LinearLayout) view, simpleDraweeView, checkedSetting, imageView, frameLayout);
                             m.checkNotNullExpressionValue(widgetServerSettingsAuditLogFilterUserListitemBinding, "WidgetServerSettingsAudi…temBinding.bind(itemView)");
@@ -187,11 +189,11 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
                 ImageView imageView2 = this.binding.d;
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231780);
+                Drawable drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.ic_members_24dp);
                 if (drawable != null) {
                     ImageView imageView3 = this.binding.d;
                     m.checkNotNullExpressionValue(imageView3, "binding.auditLogFilterImage");
-                    drawable.setTint(ColorCompat.getThemedColor(imageView3.getContext(), 2130968949));
+                    drawable.setTint(ColorCompat.getThemedColor(imageView3.getContext(), (int) R.attr.colorInteractiveNormal));
                 } else {
                     drawable = null;
                 }
@@ -218,7 +220,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         private final int type;
 
         public AuditLogUserFilterItem(String str, long j, CharSequence charSequence, Integer num, boolean z2) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.avatarUrl = str;
             this.f2181id = j;
             this.text = charSequence;
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java
index bc898d5168..8e0714da32 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.auditlog;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.models.user.User;
 import com.discord.stores.StoreAuditLog;
 import com.discord.utilities.auditlogs.AuditLogUtils;
@@ -97,7 +98,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2
         if (this.$filterType == 0) {
             m.checkNotNullExpressionValue(str, "filterText");
             if (t.isBlank(str)) {
-                String string = this.$context.getString(2131889892);
+                String string = this.$context.getString(R.string.guild_settings_filter_all_users);
                 m.checkNotNullExpressionValue(string, "context.getString(R.stri…ettings_filter_all_users)");
                 sequence = u.asSequence(d0.t.m.listOf(new WidgetServerSettingsAuditLogFilterAdapter.AuditLogUserFilterItem("", 0, string, null, auditLogState.getFilter().getUserFilter() == 0)));
             } else {
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$getPermissionUserIds$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$getPermissionUserIds$1.java
index 5440c565d9..08f50eff6d 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$getPermissionUserIds$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$getPermissionUserIds$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers.auditlog;
 
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
@@ -56,7 +57,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet$Model$Companion$getPe
                         break;
                     }
                     GuildRole guildRole = (GuildRole) this.$roles.get(Long.valueOf(((Number) it.next()).longValue()));
-                    if (((guildRole != null ? guildRole.g() : 0) & 10615783486L) > 0) {
+                    if (((guildRole != null ? guildRole.g() : 0) & Permission.MANAGEMENT_PERMISSIONS) > 0) {
                         z3 = true;
                         continue;
                     } else {
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$binding$2.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$binding$2.java
index 658a3edf95..255f6472c9 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.auditlog;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetAuditLogFilterSheetBinding;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetServerSettingsAuditLogFilterSheet$bindi
 
     public final WidgetAuditLogFilterSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362011;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362011);
+        int i = R.id.audit_log_filter_input;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.audit_log_filter_input);
         if (textInputLayout != null) {
-            i = 2131362012;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362012);
+            i = R.id.audit_log_filter_recycler;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.audit_log_filter_recycler);
             if (recyclerView != null) {
                 return new WidgetAuditLogFilterSheetBinding((LinearLayout) view, textInputLayout, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java
index da91ca512e..918df4dcff 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetAuditLogFilterSheetBinding;
 import com.discord.stores.StoreGuilds;
@@ -58,7 +59,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
 
         public final void show(Context context, long j, int i) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("ARG_GUILD_ID", j).putExtra("ARG_FILTER_TYPE", i);
+            Intent putExtra = new Intent().putExtra(WidgetServerSettingsAuditLogFilterSheet.ARG_GUILD_ID, j).putExtra(WidgetServerSettingsAuditLogFilterSheet.ARG_FILTER_TYPE, i);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…_FILTER_TYPE, filterType)");
             l.d(context, WidgetServerSettingsAuditLogFilterSheet.class, putExtra);
         }
@@ -108,7 +109,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
     }
 
     public WidgetServerSettingsAuditLogFilterSheet() {
-        super(2131558866);
+        super(R.layout.widget_audit_log_filter_sheet);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsAuditLogFilterSheet widgetServerSettingsAuditLogFilterSheet, Model model) {
@@ -147,9 +148,9 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        this.filterType = Integer.valueOf(getMostRecentIntent().getIntExtra("ARG_FILTER_TYPE", -1));
+        this.filterType = Integer.valueOf(getMostRecentIntent().getIntExtra(ARG_FILTER_TYPE, -1));
         long j = 0;
-        this.guildId = Long.valueOf(getMostRecentIntent().getLongExtra("ARG_GUILD_ID", 0));
+        this.guildId = Long.valueOf(getMostRecentIntent().getLongExtra(ARG_GUILD_ID, 0));
         Model.Companion companion = Model.Companion;
         Context requireContext = requireContext();
         Long l = this.guildId;
@@ -174,13 +175,13 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
         RecyclerView recyclerView = getBinding().f1682c;
         m.checkNotNullExpressionValue(recyclerView, "binding.auditLogFilterRecycler");
         this.adapter = (WidgetServerSettingsAuditLogFilterAdapter) companion.configure(new WidgetServerSettingsAuditLogFilterAdapter(recyclerView));
-        setActionBarTitle(2131889951);
+        setActionBarTitle(R.string.guild_settings_label_audit_log);
         Integer num = this.filterType;
-        setActionBarSubtitle((num != null && num.intValue() == 0) ? 2131889893 : 2131889889);
+        setActionBarSubtitle((num != null && num.intValue() == 0) ? R.string.guild_settings_filter_user : R.string.guild_settings_filter_action);
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.auditLogFilterInput");
         Integer num2 = this.filterType;
-        ViewExtensions.setSingleLineHint(textInputLayout, (num2 != null && num2.intValue() == 0) ? 2131893491 : 2131893435);
+        ViewExtensions.setSingleLineHint(textInputLayout, (num2 != null && num2.intValue() == 0) ? R.string.search_members : R.string.search_actions);
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.auditLogFilterInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1(this));
diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java
index f2fe4eeb28..0e1aade303 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java
@@ -28,12 +28,12 @@ public final class CommunityGetStartedHeaderIconView extends CardView {
     public CommunityGetStartedHeaderIconView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558754, this);
-        int i2 = 2131362691;
-        ImageView imageView = (ImageView) findViewById(2131362691);
+        LayoutInflater.from(context).inflate(R.layout.view_community_get_started_header, this);
+        int i2 = R.id.community_get_started_header_icon;
+        ImageView imageView = (ImageView) findViewById(R.id.community_get_started_header_icon);
         if (imageView != null) {
-            i2 = 2131362692;
-            TextView textView = (TextView) findViewById(2131362692);
+            i2 = R.id.community_get_started_header_icon_text;
+            TextView textView = (TextView) findViewById(R.id.community_get_started_header_icon_text);
             if (textView != null) {
                 ViewCommunityGetStartedHeaderBinding viewCommunityGetStartedHeaderBinding = new ViewCommunityGetStartedHeaderBinding(this, imageView, textView);
                 m.checkNotNullExpressionValue(viewCommunityGetStartedHeaderBinding, "ViewCommunityGetStartedH…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView$initAttrs$1.java b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView$initAttrs$1.java
index e8bd0c6591..4e18fcdcfa 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView$initAttrs$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView$initAttrs$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers.community;
 
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -26,6 +27,6 @@ public final class CommunityGetStartedInformationView$initAttrs$1 extends o impl
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968932));
+        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.colorHeaderPrimary));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java
index dc030d9d9e..edcaa1e308 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java
@@ -32,24 +32,24 @@ public final class CommunityGetStartedInformationView extends CardView {
     public CommunityGetStartedInformationView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558755, this);
-        int i2 = 2131362695;
-        Guideline guideline = (Guideline) findViewById(2131362695);
+        LayoutInflater.from(context).inflate(R.layout.view_community_get_started_information, this);
+        int i2 = R.id.community_guideline;
+        Guideline guideline = (Guideline) findViewById(R.id.community_guideline);
         if (guideline != null) {
-            i2 = 2131362698;
-            TextView textView = (TextView) findViewById(2131362698);
+            i2 = R.id.community_list_adapter_item_description;
+            TextView textView = (TextView) findViewById(R.id.community_list_adapter_item_description);
             if (textView != null) {
-                i2 = 2131362699;
-                ImageView imageView = (ImageView) findViewById(2131362699);
+                i2 = R.id.community_list_adapter_item_icon;
+                ImageView imageView = (ImageView) findViewById(R.id.community_list_adapter_item_icon);
                 if (imageView != null) {
-                    i2 = 2131362700;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131362700);
+                    i2 = R.id.community_list_adapter_item_text_header;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(R.id.community_list_adapter_item_text_header);
                     if (constraintLayout != null) {
-                        i2 = 2131362701;
-                        RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131362701);
+                        i2 = R.id.community_list_adapter_item_text_icon;
+                        RelativeLayout relativeLayout = (RelativeLayout) findViewById(R.id.community_list_adapter_item_text_icon);
                         if (relativeLayout != null) {
-                            i2 = 2131362702;
-                            TextView textView2 = (TextView) findViewById(2131362702);
+                            i2 = R.id.community_list_adapter_item_text_name;
+                            TextView textView2 = (TextView) findViewById(R.id.community_list_adapter_item_text_name);
                             if (textView2 != null) {
                                 ViewCommunityGetStartedInformationBinding viewCommunityGetStartedInformationBinding = new ViewCommunityGetStartedInformationBinding(this, guideline, textView, imageView, constraintLayout, relativeLayout, textView2);
                                 m.checkNotNullExpressionValue(viewCommunityGetStartedInformationBinding, "ViewCommunityGetStartedI…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java
index c5089cd986..dfdcea5afa 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java
@@ -27,18 +27,18 @@ public final class CommunitySelectorView extends LinearLayout {
     public CommunitySelectorView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558821, this);
-        int i2 = 2131364856;
-        TextView textView = (TextView) findViewById(2131364856);
+        LayoutInflater.from(context).inflate(R.layout.view_server_settings_community_setting_selector, this);
+        int i2 = R.id.server_settings_community_setting_selector_description;
+        TextView textView = (TextView) findViewById(R.id.server_settings_community_setting_selector_description);
         if (textView != null) {
-            i2 = 2131364857;
-            ImageView imageView = (ImageView) findViewById(2131364857);
+            i2 = R.id.server_settings_community_setting_selector_dropdown_icon;
+            ImageView imageView = (ImageView) findViewById(R.id.server_settings_community_setting_selector_dropdown_icon);
             if (imageView != null) {
-                i2 = 2131364858;
-                TextView textView2 = (TextView) findViewById(2131364858);
+                i2 = R.id.server_settings_community_setting_selector_subtitle;
+                TextView textView2 = (TextView) findViewById(R.id.server_settings_community_setting_selector_subtitle);
                 if (textView2 != null) {
-                    i2 = 2131364859;
-                    TextView textView3 = (TextView) findViewById(2131364859);
+                    i2 = R.id.server_settings_community_setting_selector_title;
+                    TextView textView3 = (TextView) findViewById(R.id.server_settings_community_setting_selector_title);
                     if (textView3 != null) {
                         ViewServerSettingsCommunitySettingSelectorBinding viewServerSettingsCommunitySettingSelectorBinding = new ViewServerSettingsCommunitySettingSelectorBinding(this, textView, imageView, textView2, textView3);
                         m.checkNotNullExpressionValue(viewServerSettingsCommunitySettingSelectorBinding, "ViewServerSettingsCommun…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java
index 00b00b5b84..8454779212 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.community;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetConfirmRemoveCommunityDialogBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,20 +19,20 @@ public final /* synthetic */ class WidgetConfirmRemoveCommunityDialog$binding$2
 
     public final WidgetConfirmRemoveCommunityDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362717;
-        TextView textView = (TextView) view.findViewById(2131362717);
+        int i = R.id.confirm_deleting_community_body_text;
+        TextView textView = (TextView) view.findViewById(R.id.confirm_deleting_community_body_text);
         if (textView != null) {
-            i = 2131362718;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362718);
+            i = R.id.confirm_deleting_community_cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.confirm_deleting_community_cancel);
             if (materialButton != null) {
-                i = 2131362719;
-                TextView textView2 = (TextView) view.findViewById(2131362719);
+                i = R.id.confirm_deleting_community_header;
+                TextView textView2 = (TextView) view.findViewById(R.id.confirm_deleting_community_header);
                 if (textView2 != null) {
-                    i = 2131362720;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362720);
+                    i = R.id.confirm_deleting_community_header_container;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.confirm_deleting_community_header_container);
                     if (linearLayout != null) {
-                        i = 2131362721;
-                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362721);
+                        i = R.id.confirm_deleting_community_ok;
+                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.confirm_deleting_community_ok);
                         if (materialButton2 != null) {
                             return new WidgetConfirmRemoveCommunityDialogBinding((LinearLayout) view, textView, materialButton, textView2, linearLayout, materialButton2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$viewModel$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$viewModel$2.java
index 17664c49b4..9948ebed8a 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$viewModel$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.community;
 
 import com.discord.app.AppViewModel;
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import com.discord.widgets.servers.community.WidgetServerSettingsCommunityOverviewViewModel;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
@@ -17,6 +18,6 @@ public final class WidgetConfirmRemoveCommunityDialog$viewModel$2 extends o impl
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetServerSettingsCommunityOverviewViewModel.ViewState> mo1invoke() {
-        return new WidgetServerSettingsCommunityOverviewViewModel(WidgetConfirmRemoveCommunityDialog.access$getArgumentsOrDefault$p(this.this$0).getLong("INTENT_EXTRA_GUILD_ID", -1), null, 2, null);
+        return new WidgetServerSettingsCommunityOverviewViewModel(WidgetConfirmRemoveCommunityDialog.access$getArgumentsOrDefault$p(this.this$0).getLong(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1), null, 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
index 111135e9ad..a64c3fb531 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetConfirmRemoveCommunityDialogBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -44,7 +45,7 @@ public final class WidgetConfirmRemoveCommunityDialog extends AppDialog {
     }
 
     public WidgetConfirmRemoveCommunityDialog() {
-        super(2131559006);
+        super(R.layout.widget_confirm_remove_community_dialog);
     }
 
     public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(WidgetConfirmRemoveCommunityDialog widgetConfirmRemoveCommunityDialog) {
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java
index 455650e612..d4ff1b21ed 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.community;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsCommunitySetupFirstStepBinding;
 import com.discord.views.CheckedSetting;
 import com.discord.views.ScreenTitleView;
@@ -20,17 +21,17 @@ public final /* synthetic */ class WidgetServerSettingsCommunityFirstStep$bindin
     public final WidgetServerSettingsCommunitySetupFirstStepBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ScrollView scrollView = (ScrollView) view;
-        int i = 2131362693;
-        ImageView imageView = (ImageView) view.findViewById(2131362693);
+        int i = R.id.community_get_started_header_image;
+        ImageView imageView = (ImageView) view.findViewById(R.id.community_get_started_header_image);
         if (imageView != null) {
-            i = 2131362709;
-            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362709);
+            i = R.id.community_settings_scan_messages_switch;
+            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.community_settings_scan_messages_switch);
             if (checkedSetting != null) {
-                i = 2131362710;
-                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362710);
+                i = R.id.community_settings_verified_emailed_switch;
+                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.community_settings_verified_emailed_switch);
                 if (checkedSetting2 != null) {
-                    i = 2131362711;
-                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362711);
+                    i = R.id.community_step_header;
+                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.community_step_header);
                     if (screenTitleView != null) {
                         return new WidgetServerSettingsCommunitySetupFirstStepBinding((ScrollView) view, scrollView, imageView, checkedSetting, checkedSetting2, screenTitleView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
index 89e4317397..be33d583fd 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.community;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.views.CheckedSetting;
 import com.discord.widgets.servers.community.WidgetServerSettingsEnableCommunityViewModel;
 import d0.z.d.m;
@@ -42,7 +43,7 @@ public final class WidgetServerSettingsCommunityFirstStep$configureUI$1 implemen
         if (!this.$viewState.getCommunityGuildConfig().getVerificationLevel() || !this.$guildVerificationLevel) {
             WidgetServerSettingsCommunityFirstStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this));
         } else {
-            c.a.e.o.d(this.this$0.getContext(), 2131888366, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0));
+            c.a.e.o.d(this.this$0.getContext(), R.string.enable_community_modal_requirement_satisfied_tooltip, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java
index 2a0e7dd659..aaa57edcc7 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.community;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.views.CheckedSetting;
 import com.discord.widgets.servers.community.WidgetServerSettingsEnableCommunityViewModel;
 import d0.z.d.m;
@@ -42,7 +43,7 @@ public final class WidgetServerSettingsCommunityFirstStep$configureUI$2 implemen
         if (!this.$viewState.getCommunityGuildConfig().getExplicitContentFilter() || !this.$guildExplicitContentFilter) {
             WidgetServerSettingsCommunityFirstStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this));
         } else {
-            c.a.e.o.d(this.this$0.getContext(), 2131888366, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0));
+            c.a.e.o.d(this.this$0.getContext(), R.string.enable_community_modal_requirement_satisfied_tooltip, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
index 6b5255cb5c..b98c8fa58c 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.GuildExplicitContentFilter;
 import com.discord.api.guild.GuildVerificationLevel;
 import com.discord.app.AppFragment;
@@ -50,7 +51,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
     }
 
     public WidgetServerSettingsCommunityFirstStep() {
-        super(2131559208);
+        super(R.layout.widget_server_settings_community_setup_first_step);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityFirstStep widgetServerSettingsCommunityFirstStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java
index 3d41864695..50bd715e98 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.community;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsCommunityOverviewBinding;
 import com.discord.views.LoadingButton;
 import d0.z.d.k;
@@ -18,23 +19,23 @@ public final /* synthetic */ class WidgetServerSettingsCommunityOverview$binding
 
     public final WidgetServerSettingsCommunityOverviewBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362703;
-        CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(2131362703);
+        int i = R.id.community_rules_channel;
+        CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(R.id.community_rules_channel);
         if (communitySelectorView != null) {
-            i = 2131362712;
-            CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(2131362712);
+            i = R.id.community_updates_channel;
+            CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(R.id.community_updates_channel);
             if (communitySelectorView2 != null) {
-                i = 2131364853;
-                CommunitySelectorView communitySelectorView3 = (CommunitySelectorView) view.findViewById(2131364853);
+                i = R.id.server_settings_community_locale;
+                CommunitySelectorView communitySelectorView3 = (CommunitySelectorView) view.findViewById(R.id.server_settings_community_locale);
                 if (communitySelectorView3 != null) {
-                    i = 2131364855;
-                    ScrollView scrollView = (ScrollView) view.findViewById(2131364855);
+                    i = R.id.server_settings_community_overview_scroll;
+                    ScrollView scrollView = (ScrollView) view.findViewById(R.id.server_settings_community_overview_scroll);
                     if (scrollView != null) {
-                        i = 2131364870;
-                        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364870);
+                        i = R.id.server_settings_disable_community_button;
+                        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.server_settings_disable_community_button);
                         if (loadingButton != null) {
-                            i = 2131364871;
-                            CommunitySelectorView communitySelectorView4 = (CommunitySelectorView) view.findViewById(2131364871);
+                            i = R.id.server_settings_disable_community_message;
+                            CommunitySelectorView communitySelectorView4 = (CommunitySelectorView) view.findViewById(R.id.server_settings_disable_community_message);
                             if (communitySelectorView4 != null) {
                                 return new WidgetServerSettingsCommunityOverviewBinding((LinearLayout) view, communitySelectorView, communitySelectorView2, communitySelectorView3, scrollView, loadingButton, communitySelectorView4);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$guildId$2.java
index 6543110d18..5dd8661876 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$guildId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers.community;
 
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetServerSettingsCommunityOverview.kt */
@@ -17,6 +18,6 @@ public final class WidgetServerSettingsCommunityOverview$guildId$2 extends o imp
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java
index eb504937df..7cb03f507c 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java
@@ -1,6 +1,8 @@
 package com.discord.widgets.servers.community;
 
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentActivity;
+import com.discord.R;
 import com.discord.widgets.servers.community.WidgetServerSettingsCommunityOverviewViewModel;
 import com.discord.widgets.servers.community.WidgetServerSettingsEnableCommunitySteps;
 import d0.z.d.m;
@@ -26,7 +28,7 @@ public final class WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2
     }
 
     public final void invoke(WidgetServerSettingsCommunityOverviewViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (m.areEqual(event, WidgetServerSettingsCommunityOverviewViewModel.Event.DisableCommunitySuccess.INSTANCE)) {
             this.this$0.requireActivity().finish();
             WidgetServerSettingsEnableCommunitySteps.Companion companion = WidgetServerSettingsEnableCommunitySteps.Companion;
@@ -34,9 +36,9 @@ public final class WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2
             m.checkNotNullExpressionValue(requireActivity, "requireActivity()");
             companion.create(requireActivity, this.this$0.getGuildId());
         } else if (m.areEqual(event, WidgetServerSettingsCommunityOverviewViewModel.Event.SaveSuccess.INSTANCE)) {
-            c.a.e.o.i(this.this$0, 2131893576, 0, 4);
+            c.a.e.o.i(this.this$0, R.string.server_settings_updated, 0, 4);
         } else if (m.areEqual(event, WidgetServerSettingsCommunityOverviewViewModel.Event.Error.INSTANCE)) {
-            c.a.e.o.i(this.this$0, 2131890068, 0, 4);
+            c.a.e.o.i(this.this$0, R.string.guild_settings_public_update_failed, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$viewModel$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$viewModel$2.java
index ad42f18df3..6d3cd5903f 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$viewModel$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.community;
 
 import com.discord.app.AppViewModel;
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import com.discord.widgets.servers.community.WidgetServerSettingsCommunityOverviewViewModel;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
@@ -17,6 +18,6 @@ public final class WidgetServerSettingsCommunityOverview$viewModel$2 extends o i
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetServerSettingsCommunityOverviewViewModel.ViewState> mo1invoke() {
-        return new WidgetServerSettingsCommunityOverviewViewModel(this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1), null, 2, null);
+        return new WidgetServerSettingsCommunityOverviewViewModel(this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1), null, 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
index 3f60ea9cf4..9b9cafee4a 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
@@ -10,6 +10,7 @@ import c.a.e.g0;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsCommunityOverviewBinding;
@@ -60,7 +61,7 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
     }
 
     public WidgetServerSettingsCommunityOverview() {
-        super(2131559207);
+        super(R.layout.widget_server_settings_community_overview);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityOverview widgetServerSettingsCommunityOverview, WidgetServerSettingsCommunityOverviewViewModel.ViewState viewState) {
@@ -84,10 +85,10 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
     private final void configureValidUI(WidgetServerSettingsCommunityOverviewViewModel.ViewState.Loaded loaded) {
         String str;
         getBinding().e.setIsLoading(false);
-        String string = loaded.getRulesChannel() == null ? requireContext().getString(2131890067) : AnimatableValueParser.A0(loaded.getRulesChannel(), requireContext(), false, 2);
+        String string = loaded.getRulesChannel() == null ? requireContext().getString(R.string.guild_settings_public_no_option_selected) : AnimatableValueParser.A0(loaded.getRulesChannel(), requireContext(), false, 2);
         m.checkNotNullExpressionValue(string, "when (viewState.rulesCha…t(requireContext())\n    }");
         if (loaded.getUpdatesChannel() == null) {
-            str = requireContext().getString(2131890067);
+            str = requireContext().getString(R.string.guild_settings_public_no_option_selected);
         } else {
             Channel updatesChannel = loaded.getUpdatesChannel();
             FragmentActivity requireActivity = requireActivity();
@@ -126,15 +127,15 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
         super.onViewBound(view);
         WidgetSettingsLanguageSelect.Companion.registerForResult(this, new WidgetServerSettingsCommunityOverview$onViewBound$1(this));
         WidgetChannelSelector.Companion companion = WidgetChannelSelector.Companion;
-        WidgetChannelSelector.Companion.registerForResult$default(companion, this, "REQUEST_KEY_RULES_CHANNEL", false, new WidgetServerSettingsCommunityOverview$onViewBound$2(this), 4, null);
-        WidgetChannelSelector.Companion.registerForResult$default(companion, this, "REQUEST_KEY_UPDATES_CHANNEL", false, new WidgetServerSettingsCommunityOverview$onViewBound$3(this), 4, null);
+        WidgetChannelSelector.Companion.registerForResult$default(companion, this, REQUEST_KEY_RULES_CHANNEL, false, new WidgetServerSettingsCommunityOverview$onViewBound$2(this), 4, null);
+        WidgetChannelSelector.Companion.registerForResult$default(companion, this, REQUEST_KEY_UPDATES_CHANNEL, false, new WidgetServerSettingsCommunityOverview$onViewBound$3(this), 4, null);
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131889772);
+        setActionBarTitle(R.string.guild_settings_community);
         Observable<WidgetServerSettingsCommunityOverviewViewModel.ViewState> r = getViewModel().observeViewState().r();
         m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetServerSettingsCommunityOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$1(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java
index c6aee75ca7..ba5fd0c17a 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.community;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsCommunitySetupSecondStepBinding;
 import com.discord.views.ScreenTitleView;
 import d0.z.d.k;
@@ -19,17 +20,17 @@ public final /* synthetic */ class WidgetServerSettingsCommunitySecondStep$bindi
     public final WidgetServerSettingsCommunitySetupSecondStepBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ScrollView scrollView = (ScrollView) view;
-        int i = 2131362693;
-        ImageView imageView = (ImageView) view.findViewById(2131362693);
+        int i = R.id.community_get_started_header_image;
+        ImageView imageView = (ImageView) view.findViewById(R.id.community_get_started_header_image);
         if (imageView != null) {
-            i = 2131362696;
-            CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(2131362696);
+            i = R.id.community_guidelines_channel;
+            CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(R.id.community_guidelines_channel);
             if (communitySelectorView != null) {
-                i = 2131362711;
-                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362711);
+                i = R.id.community_step_header;
+                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.community_step_header);
                 if (screenTitleView != null) {
-                    i = 2131362712;
-                    CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(2131362712);
+                    i = R.id.community_updates_channel;
+                    CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(R.id.community_updates_channel);
                     if (communitySelectorView2 != null) {
                         return new WidgetServerSettingsCommunitySetupSecondStepBinding((ScrollView) view, scrollView, imageView, communitySelectorView, screenTitleView, communitySelectorView2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
index 23e4ac397c..afcfd8f776 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
@@ -9,6 +9,7 @@ import c.a.e.g0;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsCommunitySetupSecondStepBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -49,7 +50,7 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
     }
 
     public WidgetServerSettingsCommunitySecondStep() {
-        super(2131559209);
+        super(R.layout.widget_server_settings_community_setup_second_step);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunitySecondStep widgetServerSettingsCommunitySecondStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
@@ -61,9 +62,9 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
     }
 
     private final void configureUI(WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
-        String string = loaded.getCommunityGuildConfig().getRulesChannel() == null ? requireContext().getString(2131888388) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getRulesChannel(), requireContext(), false, 2);
+        String string = loaded.getCommunityGuildConfig().getRulesChannel() == null ? requireContext().getString(R.string.enable_public_modal_create_channel) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getRulesChannel(), requireContext(), false, 2);
         m.checkNotNullExpressionValue(string, "when (viewState.communit…t(requireContext())\n    }");
-        String string2 = loaded.getCommunityGuildConfig().getUpdatesChannel() == null ? requireContext().getString(2131888388) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getUpdatesChannel(), requireContext(), false, 2);
+        String string2 = loaded.getCommunityGuildConfig().getUpdatesChannel() == null ? requireContext().getString(R.string.enable_public_modal_create_channel) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getUpdatesChannel(), requireContext(), false, 2);
         m.checkNotNullExpressionValue(string2, "when (viewState.communit…t(requireContext())\n    }");
         getBinding().b.setSubtitle(string);
         getBinding().f1914c.setSubtitle(string2);
@@ -88,8 +89,8 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         WidgetChannelSelector.Companion companion = WidgetChannelSelector.Companion;
-        WidgetChannelSelector.Companion.registerForResult$default(companion, this, "REQUEST_KEY_RULES_CHANNEL", false, new WidgetServerSettingsCommunitySecondStep$onViewBound$1(this), 4, null);
-        WidgetChannelSelector.Companion.registerForResult$default(companion, this, "REQUEST_KEY_UPDATES_CHANNEL", false, new WidgetServerSettingsCommunitySecondStep$onViewBound$2(this), 4, null);
+        WidgetChannelSelector.Companion.registerForResult$default(companion, this, REQUEST_KEY_RULES_CHANNEL, false, new WidgetServerSettingsCommunitySecondStep$onViewBound$1(this), 4, null);
+        WidgetChannelSelector.Companion.registerForResult$default(companion, this, REQUEST_KEY_UPDATES_CHANNEL, false, new WidgetServerSettingsCommunitySecondStep$onViewBound$2(this), 4, null);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java
index 5598a42d7e..ff0d55c1c5 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.community;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsCommunitySetupThirdStepBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
@@ -21,23 +22,23 @@ public final /* synthetic */ class WidgetServerSettingsCommunityThirdStep$bindin
     public final WidgetServerSettingsCommunitySetupThirdStepBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ScrollView scrollView = (ScrollView) view;
-        int i = 2131362693;
-        ImageView imageView = (ImageView) view.findViewById(2131362693);
+        int i = R.id.community_get_started_header_image;
+        ImageView imageView = (ImageView) view.findViewById(R.id.community_get_started_header_image);
         if (imageView != null) {
-            i = 2131362704;
-            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362704);
+            i = R.id.community_setting_community_guidelines_switch;
+            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.community_setting_community_guidelines_switch);
             if (checkedSetting != null) {
-                i = 2131362706;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362706);
+                i = R.id.community_setting_guidelines;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.community_setting_guidelines);
                 if (linkifiedTextView != null) {
-                    i = 2131362707;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362707);
+                    i = R.id.community_setting_manage_permissions_switch;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.community_setting_manage_permissions_switch);
                     if (checkedSetting2 != null) {
-                        i = 2131362708;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362708);
+                        i = R.id.community_setting_notifications_to_mentions_switch;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.community_setting_notifications_to_mentions_switch);
                         if (checkedSetting3 != null) {
-                            i = 2131362711;
-                            ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362711);
+                            i = R.id.community_step_header;
+                            ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.community_step_header);
                             if (screenTitleView != null) {
                                 return new WidgetServerSettingsCommunitySetupThirdStepBinding((ScrollView) view, scrollView, imageView, checkedSetting, linkifiedTextView, checkedSetting2, checkedSetting3, screenTitleView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java
index 26c143c2f3..3007cc4b6f 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.community;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.views.CheckedSetting;
 import com.discord.widgets.servers.community.WidgetServerSettingsEnableCommunityViewModel;
 import d0.z.d.m;
@@ -42,7 +43,7 @@ public final class WidgetServerSettingsCommunityThirdStep$configureUI$1 implemen
         if (!this.$viewState.getCommunityGuildConfig().getDefaultMessageNotifications() || !this.$guildDefaultMessageNotifications) {
             WidgetServerSettingsCommunityThirdStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this));
         } else {
-            c.a.e.o.d(this.this$0.getContext(), 2131888366, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0));
+            c.a.e.o.d(this.this$0.getContext(), R.string.enable_community_modal_requirement_satisfied_tooltip, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java
index 8fe204c1e0..f1c0c29423 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.community;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.views.CheckedSetting;
 import com.discord.widgets.servers.community.WidgetServerSettingsEnableCommunityViewModel;
 import d0.z.d.m;
@@ -42,7 +43,7 @@ public final class WidgetServerSettingsCommunityThirdStep$configureUI$2 implemen
         if (!this.$viewState.getCommunityGuildConfig().getEveryonePermissions() || !this.$guildEveryonePermissions) {
             WidgetServerSettingsCommunityThirdStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this));
         } else {
-            c.a.e.o.d(this.this$0.getContext(), 2131888366, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0));
+            c.a.e.o.d(this.this$0.getContext(), R.string.enable_community_modal_requirement_satisfied_tooltip, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2.java
index b137ef0e4b..3d49dbdf9d 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers.community;
 
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -26,6 +27,6 @@ public final class WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968995));
+        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.color_brand));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3.java
index 111122a79a..3414bd3ab3 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers.community;
 
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -26,6 +27,6 @@ public final class WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968995));
+        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(this.this$0.getContext(), (int) R.attr.color_brand));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
index 5097d98ec1..12d262bc35 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
@@ -9,6 +9,7 @@ import c.a.e.g0;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsCommunitySetupThirdStepBinding;
@@ -53,7 +54,7 @@ public final class WidgetServerSettingsCommunityThirdStep extends AppFragment {
     }
 
     public WidgetServerSettingsCommunityThirdStep() {
-        super(2131559210);
+        super(R.layout.widget_server_settings_community_setup_third_step);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityThirdStep widgetServerSettingsCommunityThirdStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
@@ -152,12 +153,12 @@ public final class WidgetServerSettingsCommunityThirdStep extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsCommunityThirdStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
         CheckedSetting checkedSetting = getBinding().e;
         Context context = getContext();
-        checkedSetting.setText(context != null ? b.b(context, 2131888361, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2(this)) : null);
+        checkedSetting.setText(context != null ? b.b(context, R.string.enable_community_modal_default_notifications_label_mobile, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2(this)) : null);
         CheckedSetting checkedSetting2 = getBinding().d;
         Context context2 = getContext();
-        checkedSetting2.setText(context2 != null ? b.b(context2, 2131888364, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3(this)) : null);
+        checkedSetting2.setText(context2 != null ? b.b(context2, R.string.enable_community_modal_everyone_role_permission_label_mobile, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3(this)) : null);
         LinkifiedTextView linkifiedTextView = getBinding().f1915c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.communitySettingGuidelines");
-        b.n(linkifiedTextView, 2131887507, new Object[]{f.a.a(360035969312L, null)}, null, 4);
+        b.n(linkifiedTextView, R.string.community_policy_help, new Object[]{f.a.a(360035969312L, null)}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java
index 33c35d0361..df1fbd157e 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetServerSettingsEnableCommunityBinding;
 import com.discord.views.ScreenTitleView;
 import com.google.android.material.button.MaterialButton;
@@ -20,18 +21,18 @@ public final /* synthetic */ class WidgetServerSettingsEnableCommunity$binding$2
 
     public final WidgetServerSettingsEnableCommunityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362690;
-        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362690);
+        int i = R.id.community_get_started_header;
+        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.community_get_started_header);
         if (screenTitleView != null) {
-            i = 2131362693;
-            ImageView imageView = (ImageView) view.findViewById(2131362693);
+            i = R.id.community_get_started_header_image;
+            ImageView imageView = (ImageView) view.findViewById(R.id.community_get_started_header_image);
             if (imageView != null) {
                 ScrollView scrollView = (ScrollView) view;
-                i = 2131362697;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362697);
+                i = R.id.community_header_image;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.community_header_image);
                 if (relativeLayout != null) {
-                    i = 2131362705;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362705);
+                    i = R.id.community_setting_get_started;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.community_setting_get_started);
                     if (materialButton != null) {
                         return new WidgetServerSettingsEnableCommunityBinding(scrollView, screenTitleView, imageView, scrollView, relativeLayout, materialButton);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java
index 8b9c60b07c..3660ab6554 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java
@@ -4,6 +4,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerSettingsEnableCommunityBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -18,7 +19,7 @@ public final class WidgetServerSettingsEnableCommunity extends AppFragment {
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetServerSettingsEnableCommunityViewModel.class), new WidgetServerSettingsEnableCommunity$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetServerSettingsEnableCommunity$viewModel$2.INSTANCE));
 
     public WidgetServerSettingsEnableCommunity() {
-        super(2131559220);
+        super(R.layout.widget_server_settings_enable_community);
     }
 
     public static final /* synthetic */ WidgetServerSettingsEnableCommunityViewModel access$getViewModel$p(WidgetServerSettingsEnableCommunity widgetServerSettingsEnableCommunity) {
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$guildId$2.java
index 064626c372..037aa1ebb8 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$guildId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers.community;
 
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetServerSettingsEnableCommunitySteps.kt */
@@ -17,6 +18,6 @@ public final class WidgetServerSettingsEnableCommunitySteps$guildId$2 extends o
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java
index 2f3f4e67c1..d102ad3ac5 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java
@@ -1,6 +1,8 @@
 package com.discord.widgets.servers.community;
 
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.FragmentActivity;
+import com.discord.R;
 import com.discord.widgets.servers.community.WidgetServerSettingsCommunityOverview;
 import com.discord.widgets.servers.community.WidgetServerSettingsEnableCommunityViewModel;
 import d0.z.d.m;
@@ -26,7 +28,7 @@ public final class WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResum
     }
 
     public final void invoke(WidgetServerSettingsEnableCommunityViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (m.areEqual(event, WidgetServerSettingsEnableCommunityViewModel.Event.SaveSuccess.INSTANCE)) {
             this.this$0.requireActivity().finish();
             WidgetServerSettingsCommunityOverview.Companion companion = WidgetServerSettingsCommunityOverview.Companion;
@@ -34,7 +36,7 @@ public final class WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResum
             m.checkNotNullExpressionValue(requireActivity, "requireActivity()");
             companion.create(requireActivity, this.this$0.getGuildId());
         } else if (m.areEqual(event, WidgetServerSettingsEnableCommunityViewModel.Event.Error.INSTANCE)) {
-            c.a.e.o.i(this.this$0, 2131890068, 0, 4);
+            c.a.e.o.i(this.this$0, R.string.guild_settings_public_update_failed, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
index faad623ec3..b8676718d6 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetEnableCommunityStepsBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -52,7 +53,7 @@ public final class WidgetServerSettingsEnableCommunitySteps extends AppFragment
     }
 
     public WidgetServerSettingsEnableCommunitySteps() {
-        super(2131559035);
+        super(R.layout.widget_enable_community_steps);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEnableCommunitySteps widgetServerSettingsEnableCommunitySteps, WidgetServerSettingsEnableCommunityViewModel.ViewState viewState) {
@@ -89,7 +90,7 @@ public final class WidgetServerSettingsEnableCommunitySteps extends AppFragment
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().b.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetServerSettingsEnableCommunity.class, 0, 0, 0, null, null, null, null, false, false, false, 254), new StepsView.b.a(WidgetServerSettingsCommunityFirstStep.class, 0, 0, 0, null, null, null, null, false, false, false, 510), new StepsView.b.a(WidgetServerSettingsCommunitySecondStep.class, 0, 0, 0, null, null, null, null, false, false, false, 510), new StepsView.b.a(WidgetServerSettingsCommunityThirdStep.class, 0, 0, 2131888357, null, null, null, new WidgetServerSettingsEnableCommunitySteps$onViewBound$steps$1(this), false, false, false, 374)})), new WidgetServerSettingsEnableCommunitySteps$onViewBound$1(this), new WidgetServerSettingsEnableCommunitySteps$onViewBound$2(this));
+        getBinding().b.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetServerSettingsEnableCommunity.class, 0, 0, 0, null, null, null, null, false, false, false, 254), new StepsView.b.a(WidgetServerSettingsCommunityFirstStep.class, 0, 0, 0, null, null, null, null, false, false, false, 510), new StepsView.b.a(WidgetServerSettingsCommunitySecondStep.class, 0, 0, 0, null, null, null, null, false, false, false, 510), new StepsView.b.a(WidgetServerSettingsCommunityThirdStep.class, 0, 0, R.string.enable_community_button_text, null, null, null, new WidgetServerSettingsEnableCommunitySteps$onViewBound$steps$1(this), false, false, false, 374)})), new WidgetServerSettingsEnableCommunitySteps$onViewBound$1(this), new WidgetServerSettingsEnableCommunitySteps$onViewBound$2(this));
         AppFragment.setOnBackPressed$default(this, new WidgetServerSettingsEnableCommunitySteps$onViewBound$3(this), 0, 2, null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$Companion$enqueue$memberVerificationPendingDialogNotice$1.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$Companion$enqueue$memberVerificationPendingDialogNotice$1.java
index 35d9dc81c3..89f01f1307 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$Companion$enqueue$memberVerificationPendingDialogNotice$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$Companion$enqueue$memberVerificationPendingDialogNotice$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.member_verification;
 import android.os.Bundle;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.a0;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -28,7 +29,7 @@ public final class MemberVerificationPendingDialog$Companion$enqueue$memberVerif
         m.checkNotNullParameter(fragmentActivity, "appActivity");
         MemberVerificationPendingDialog memberVerificationPendingDialog = new MemberVerificationPendingDialog();
         Bundle bundle = new Bundle();
-        bundle.putLong("INTENT_EXTRA_GUILD_ID", this.$guildId);
+        bundle.putLong(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, this.$guildId);
         memberVerificationPendingDialog.setArguments(bundle);
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
         m.checkNotNullExpressionValue(supportFragmentManager, "appActivity.supportFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java
index 481144bf88..25be9cad92 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetMemberVerificationPendingDialogBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -19,23 +20,23 @@ public final /* synthetic */ class MemberVerificationPendingDialog$binding$2 ext
 
     public final WidgetMemberVerificationPendingDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364046;
-        ImageView imageView = (ImageView) view.findViewById(2131364046);
+        int i = R.id.member_verification_pending_img;
+        ImageView imageView = (ImageView) view.findViewById(R.id.member_verification_pending_img);
         if (imageView != null) {
-            i = 2131364047;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364047);
+            i = R.id.member_verification_primary_btn;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.member_verification_primary_btn);
             if (materialButton != null) {
-                i = 2131364058;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364058);
+                i = R.id.member_verification_secondary_btn;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.member_verification_secondary_btn);
                 if (materialButton2 != null) {
-                    i = 2131364060;
-                    TextView textView = (TextView) view.findViewById(2131364060);
+                    i = R.id.member_verification_tertiary_btn;
+                    TextView textView = (TextView) view.findViewById(R.id.member_verification_tertiary_btn);
                     if (textView != null) {
-                        i = 2131364415;
-                        TextView textView2 = (TextView) view.findViewById(2131364415);
+                        i = R.id.pending_dialog_desc;
+                        TextView textView2 = (TextView) view.findViewById(R.id.pending_dialog_desc);
                         if (textView2 != null) {
-                            i = 2131364416;
-                            TextView textView3 = (TextView) view.findViewById(2131364416);
+                            i = R.id.pending_dialog_title;
+                            TextView textView3 = (TextView) view.findViewById(R.id.pending_dialog_title);
                             if (textView3 != null) {
                                 return new WidgetMemberVerificationPendingDialogBinding((RelativeLayout) view, imageView, materialButton, materialButton2, textView, textView2, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java
index 1df7f3ff9c..29f4cdfffa 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java
@@ -1,5 +1,7 @@
 package com.discord.widgets.servers.member_verification;
 
+import androidx.core.app.NotificationCompat;
+import com.discord.R;
 import com.discord.widgets.servers.member_verification.MemberVerificationPendingViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,9 +26,9 @@ public final class MemberVerificationPendingDialog$onViewBoundOrOnResume$2 exten
     }
 
     public final void invoke(MemberVerificationPendingViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (!(event instanceof MemberVerificationPendingViewModel.Event.Success) && (event instanceof MemberVerificationPendingViewModel.Event.Error)) {
-            c.a.e.o.i(this.this$0, 2131890068, 0, 4);
+            c.a.e.o.i(this.this$0, R.string.guild_settings_public_update_failed, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$viewModel$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$viewModel$2.java
index a09b5d70bd..db6dc49757 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$viewModel$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers.member_verification;
 
 import android.os.Bundle;
 import com.discord.app.AppViewModel;
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import com.discord.widgets.servers.member_verification.MemberVerificationPendingViewModel;
 import d0.z.d.o;
 import java.util.Objects;
@@ -20,7 +21,7 @@ public final class MemberVerificationPendingDialog$viewModel$2 extends o impleme
     /* renamed from: invoke */
     public final AppViewModel<MemberVerificationPendingViewModel.ViewState> mo1invoke() {
         Bundle arguments = this.this$0.getArguments();
-        Long valueOf = arguments != null ? Long.valueOf(arguments.getLong("INTENT_EXTRA_GUILD_ID")) : null;
+        Long valueOf = arguments != null ? Long.valueOf(arguments.getLong(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID)) : null;
         Objects.requireNonNull(valueOf, "null cannot be cast to non-null type com.discord.primitives.GuildId /* = kotlin.Long */");
         return new MemberVerificationPendingViewModel(valueOf.longValue(), null, null, 6, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java
index fd0e80489c..eb973010ac 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java
@@ -11,11 +11,13 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetMemberVerificationPendingDialogBinding;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -50,7 +52,7 @@ public final class MemberVerificationPendingDialog extends AppDialog {
 
         public final void enqueue(long j, String str) {
             m.checkNotNullParameter(str, "guildName");
-            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, new MemberVerificationPendingDialog$Companion$enqueue$memberVerificationPendingDialogNotice$1(j), 150, null));
+            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, new MemberVerificationPendingDialog$Companion$enqueue$memberVerificationPendingDialogNotice$1(j), FontUtils.MAX_FONT_SCALING, null));
         }
 
         public final void show(FragmentManager fragmentManager, long j) {
@@ -84,7 +86,7 @@ public final class MemberVerificationPendingDialog extends AppDialog {
     }
 
     public MemberVerificationPendingDialog() {
-        super(2131559141);
+        super(R.layout.widget_member_verification_pending_dialog);
         MemberVerificationPendingDialog$viewModel$2 memberVerificationPendingDialog$viewModel$2 = new MemberVerificationPendingDialog$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(MemberVerificationPendingViewModel.class), new MemberVerificationPendingDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(memberVerificationPendingDialog$viewModel$2));
@@ -109,72 +111,72 @@ public final class MemberVerificationPendingDialog extends AppDialog {
             i = 8;
         }
         textView.setVisibility(i);
-        int themedColor = loaded.getDialogState().ordinal() != 3 ? ColorCompat.getThemedColor(getContext(), 2130969008) : ColorCompat.getColor(getContext(), 2131100329);
+        int themedColor = loaded.getDialogState().ordinal() != 3 ? ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand_500) : ColorCompat.getColor(getContext(), (int) R.color.status_red_500);
         MaterialButton materialButton = getBinding().f1863c;
         m.checkNotNullExpressionValue(materialButton, "binding.memberVerificationPrimaryBtn");
         materialButton.setBackgroundTintList(ColorStateList.valueOf(themedColor));
         int ordinal = loaded.getDialogState().ordinal();
         if (ordinal == 0) {
-            getBinding().b.setImageResource(2131231570);
+            getBinding().b.setImageResource(R.drawable.ic_community_update);
             TextView textView2 = getBinding().g;
             m.checkNotNullExpressionValue(textView2, "binding.pendingDialogTitle");
-            textView2.setText(getString(2131891454));
+            textView2.setText(getString(R.string.member_verification_warning_update_modal_title));
             TextView textView3 = getBinding().f;
             m.checkNotNullExpressionValue(textView3, "binding.pendingDialogDesc");
-            textView3.setText(getString(2131891453));
+            textView3.setText(getString(R.string.member_verification_warning_update_modal_desc));
             MaterialButton materialButton2 = getBinding().f1863c;
             m.checkNotNullExpressionValue(materialButton2, "binding.memberVerificationPrimaryBtn");
-            materialButton2.setText(getString(2131891452));
+            materialButton2.setText(getString(R.string.member_verification_warning_update));
             MaterialButton materialButton3 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton3, "binding.memberVerificationSecondaryBtn");
-            materialButton3.setText(getString(2131887193));
+            materialButton3.setText(getString(R.string.cancel));
             getBinding().f1863c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$9(this));
         } else if (ordinal == 1) {
-            getBinding().b.setImageResource(2131231779);
+            getBinding().b.setImageResource(R.drawable.ic_member_verification_pending);
             TextView textView4 = getBinding().g;
             m.checkNotNullExpressionValue(textView4, "binding.pendingDialogTitle");
-            textView4.setText(getString(2131891418));
+            textView4.setText(getString(R.string.member_verification_pending_application_modal_title));
             TextView textView5 = getBinding().f;
             m.checkNotNullExpressionValue(textView5, "binding.pendingDialogDesc");
-            textView5.setText(getString(2131891414));
+            textView5.setText(getString(R.string.member_verification_pending_application_modal_desc));
             MaterialButton materialButton4 = getBinding().f1863c;
             m.checkNotNullExpressionValue(materialButton4, "binding.memberVerificationPrimaryBtn");
-            materialButton4.setText(getString(2131891413));
+            materialButton4.setText(getString(R.string.member_verification_pending_application_modal_confirm));
             MaterialButton materialButton5 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton5, "binding.memberVerificationSecondaryBtn");
-            materialButton5.setText(getString(2131891412));
+            materialButton5.setText(getString(R.string.member_verification_pending_application_modal_cancel));
             getBinding().f1863c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$2(this));
             getBinding().e.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$3(this));
         } else if (ordinal == 2) {
             TextView textView6 = getBinding().g;
             m.checkNotNullExpressionValue(textView6, "binding.pendingDialogTitle");
-            textView6.setText(getString(2131891408));
+            textView6.setText(getString(R.string.member_verification_pending_application_cancel_modal_title));
             TextView textView7 = getBinding().f;
             m.checkNotNullExpressionValue(textView7, "binding.pendingDialogDesc");
-            textView7.setText(getString(2131891410));
+            textView7.setText(getString(R.string.member_verification_pending_application_leave_server_modal_desc));
             MaterialButton materialButton6 = getBinding().f1863c;
             m.checkNotNullExpressionValue(materialButton6, "binding.memberVerificationPrimaryBtn");
-            materialButton6.setText(getString(2131891412));
+            materialButton6.setText(getString(R.string.member_verification_pending_application_modal_cancel));
             MaterialButton materialButton7 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton7, "binding.memberVerificationSecondaryBtn");
-            materialButton7.setText(getString(2131891415));
+            materialButton7.setText(getString(R.string.member_verification_pending_application_modal_dismiss));
             getBinding().f1863c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$5(this));
         } else if (ordinal == 3) {
             TextView textView8 = getBinding().g;
             m.checkNotNullExpressionValue(textView8, "binding.pendingDialogTitle");
-            textView8.setText(getString(2131891411));
+            textView8.setText(getString(R.string.member_verification_pending_application_leave_server_modal_title));
             TextView textView9 = getBinding().f;
             m.checkNotNullExpressionValue(textView9, "binding.pendingDialogDesc");
-            textView9.setText(getString(2131891410));
+            textView9.setText(getString(R.string.member_verification_pending_application_leave_server_modal_desc));
             MaterialButton materialButton8 = getBinding().f1863c;
             m.checkNotNullExpressionValue(materialButton8, "binding.memberVerificationPrimaryBtn");
-            materialButton8.setText(getString(2131891416));
+            materialButton8.setText(getString(R.string.member_verification_pending_application_modal_leave));
             MaterialButton materialButton9 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton9, "binding.memberVerificationSecondaryBtn");
-            materialButton9.setText(getString(2131891415));
+            materialButton9.setText(getString(R.string.member_verification_pending_application_modal_dismiss));
             getBinding().f1863c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$7(this));
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java
index 118bdde34c..a1d193fdf8 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.h5;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetMemberVerificationApproveTermsItemBinding;
 import com.discord.databinding.WidgetMemberVerificationHeaderItemBinding;
@@ -59,7 +60,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ApproveTermsItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559136, memberVerificationRulesAdapter);
+            super((int) R.layout.widget_member_verification_approve_terms_item, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -90,7 +91,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559137, memberVerificationRulesAdapter);
+            super((int) R.layout.widget_member_verification_header_item, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -115,7 +116,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public MultipleChoiceItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559138, memberVerificationRulesAdapter);
+            super((int) R.layout.widget_member_verification_multiple_choice_item, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -134,7 +135,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
             for (String str : list) {
                 int indexOf = list.indexOf(str);
                 if (indexOf >= radioGroup.getChildCount()) {
-                    View inflate = LayoutInflater.from(context).inflate(2131559139, (ViewGroup) radioGroup, false);
+                    View inflate = LayoutInflater.from(context).inflate(R.layout.widget_member_verification_multiple_choice_radio_item, (ViewGroup) radioGroup, false);
                     Objects.requireNonNull(inflate, "rootView");
                     radioButton = (RadioButton) inflate;
                     m.checkNotNullExpressionValue(new h5(radioButton), "WidgetMemberVerification…        false\n          )");
@@ -207,10 +208,10 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ParagraphItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559140, memberVerificationRulesAdapter);
+            super((int) R.layout.widget_member_verification_paragraph_item, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131364045);
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.member_verification_paragraph_field);
             if (textInputEditText != null) {
                 WidgetMemberVerificationParagraphItemBinding widgetMemberVerificationParagraphItemBinding = new WidgetMemberVerificationParagraphItemBinding((TextInputLayout) view, textInputEditText);
                 m.checkNotNullExpressionValue(widgetMemberVerificationParagraphItemBinding, "WidgetMemberVerification…temBinding.bind(itemView)");
@@ -219,7 +220,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
                 TextWatcherKt.addBindedTextWatcher(textInputEditText, memberVerificationRulesAdapter.getFragment(), new AnonymousClass1(this, memberVerificationRulesAdapter));
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364045)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.member_verification_paragraph_field)));
         }
 
         public static final /* synthetic */ int access$getFieldIndex$p(ParagraphItemHolder paragraphItemHolder) {
@@ -248,7 +249,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public TermHeaderItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559137, memberVerificationRulesAdapter);
+            super((int) R.layout.widget_member_verification_header_item, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -265,7 +266,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullExpressionValue(textView, "binding.memberVerificationRulesHeader");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            textView.setText(view.getResources().getString(2131891387));
+            textView.setText(view.getResources().getString(R.string.member_verification_form_rules_label));
         }
     }
 
@@ -275,20 +276,20 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public TermItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559142, memberVerificationRulesAdapter);
+            super((int) R.layout.widget_member_verification_rule_item, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364048;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364048);
+            int i = R.id.member_verification_rule_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.member_verification_rule_container);
             if (linearLayout != null) {
-                i = 2131364049;
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131364049);
+                i = R.id.member_verification_rule_description;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.member_verification_rule_description);
                 if (simpleDraweeSpanTextView != null) {
-                    i = 2131364050;
-                    View findViewById = view.findViewById(2131364050);
+                    i = R.id.member_verification_rule_divider;
+                    View findViewById = view.findViewById(R.id.member_verification_rule_divider);
                     if (findViewById != null) {
-                        i = 2131364051;
-                        TextView textView = (TextView) view.findViewById(2131364051);
+                        i = R.id.member_verification_rule_index;
+                        TextView textView = (TextView) view.findViewById(R.id.member_verification_rule_index);
                         if (textView != null) {
                             RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view;
                             WidgetMemberVerificationRuleItemBinding widgetMemberVerificationRuleItemBinding = new WidgetMemberVerificationRuleItemBinding(roundedRelativeLayout, linearLayout, simpleDraweeSpanTextView, findViewById, textView, roundedRelativeLayout);
@@ -319,7 +320,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullExpressionValue(context, "itemView.context");
             String format = StringUtilsKt.format(index, context);
             int i2 = 0;
-            textView.setText(b.i(resources, 2131891429, new Object[]{format}, null, 4));
+            textView.setText(b.i(resources, R.string.member_verification_rule_index, new Object[]{format}, null, 4));
             this.binding.b.setDraweeSpanStringBuilder(AstRenderer.render(memberVerificationItemTerm.getAst(), new MessageRenderContext(a.x(this.itemView, "itemView", "itemView.context"), 0, memberVerificationItemTerm.getAllowAnimatedEmojis(), null, memberVerificationItemTerm.getChannelNames(), memberVerificationItemTerm.getRoles(), 0, null, null, 0, 0, null, null, null, 16328, null)));
             View view3 = this.binding.f1864c;
             m.checkNotNullExpressionValue(view3, "binding.memberVerificationRuleDivider");
@@ -373,10 +374,10 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public TextInputItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559144, memberVerificationRulesAdapter);
+            super((int) R.layout.widget_member_verification_text_input_item, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131364062);
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.member_verification_text_input_field);
             if (textInputEditText != null) {
                 WidgetMemberVerificationTextInputItemBinding widgetMemberVerificationTextInputItemBinding = new WidgetMemberVerificationTextInputItemBinding((TextInputLayout) view, textInputEditText);
                 m.checkNotNullExpressionValue(widgetMemberVerificationTextInputItemBinding, "WidgetMemberVerification…temBinding.bind(itemView)");
@@ -385,7 +386,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
                 TextWatcherKt.addBindedTextWatcher(textInputEditText, memberVerificationRulesAdapter.getFragment(), new AnonymousClass1(this, memberVerificationRulesAdapter));
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364062)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.member_verification_text_input_field)));
         }
 
         public static final /* synthetic */ int access$getFieldIndex$p(TextInputItemHolder textInputItemHolder) {
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java
index 40d48049eb..26a9cbb3ab 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
+import com.discord.R;
 import com.discord.databinding.WidgetMemberVerificationSuccessBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -19,14 +20,14 @@ public final /* synthetic */ class MemberVerificationSuccessDialog$binding$2 ext
 
     public final WidgetMemberVerificationSuccessBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364040;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364040);
+        int i = R.id.member_verification_confirm;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.member_verification_confirm);
         if (materialButton != null) {
-            i = 2131364043;
-            TextView textView = (TextView) view.findViewById(2131364043);
+            i = R.id.member_verification_guild_name;
+            TextView textView = (TextView) view.findViewById(R.id.member_verification_guild_name);
             if (textView != null) {
-                i = 2131364059;
-                CardView cardView = (CardView) view.findViewById(2131364059);
+                i = R.id.member_verification_success_card;
+                CardView cardView = (CardView) view.findViewById(R.id.member_verification_success_card);
                 if (cardView != null) {
                     return new WidgetMemberVerificationSuccessBinding((RelativeLayout) view, materialButton, textView, cardView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java
index a79d7298de..493e0cd4b2 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java
@@ -5,10 +5,12 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetMemberVerificationSuccessBinding;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.widgets.home.WidgetHome;
@@ -34,12 +36,12 @@ public final class MemberVerificationSuccessDialog extends AppDialog {
 
         public final void enqueue(String str) {
             m.checkNotNullParameter(str, "guildName");
-            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, new MemberVerificationSuccessDialog$Companion$enqueue$membeVerificationSuccessDialogNotice$1(str), 150, null));
+            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(str, null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, new MemberVerificationSuccessDialog$Companion$enqueue$membeVerificationSuccessDialogNotice$1(str), FontUtils.MAX_FONT_SCALING, null));
         }
     }
 
     public MemberVerificationSuccessDialog() {
-        super(2131559143);
+        super(R.layout.widget_member_verification_success);
     }
 
     private final WidgetMemberVerificationSuccessBinding getBinding() {
@@ -50,10 +52,10 @@ public final class MemberVerificationSuccessDialog extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        String string = getArgumentsOrDefault().getString("INTENT_EXTRA_GUILD_NAME");
+        String string = getArgumentsOrDefault().getString(INTENT_EXTRA_GUILD_NAME);
         TextView textView = getBinding().f1865c;
         m.checkNotNullExpressionValue(textView, "binding.memberVerificationGuildName");
-        textView.setText(b.k(this, 2131891217, new Object[]{string}, null, 4));
+        textView.setText(b.k(this, R.string.lurker_mode_popout_success_header, new Object[]{string}, null, 4));
         getBinding().b.setOnClickListener(new MemberVerificationSuccessDialog$onViewBound$1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java
index 57564be39d..042114c287 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import androidx.cardview.widget.CardView;
+import com.discord.R;
 import com.discord.databinding.ViewMemberVerificationBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
@@ -30,18 +31,18 @@ public final class MemberVerificationView extends CardView {
     public MemberVerificationView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558784, this);
-        int i2 = 2131364063;
-        TextView textView = (TextView) findViewById(2131364063);
+        LayoutInflater.from(context).inflate(R.layout.view_member_verification, this);
+        int i2 = R.id.member_verification_verified_check;
+        TextView textView = (TextView) findViewById(R.id.member_verification_verified_check);
         if (textView != null) {
-            i2 = 2131364064;
-            MaterialButton materialButton = (MaterialButton) findViewById(2131364064);
+            i2 = R.id.member_verification_verify_button;
+            MaterialButton materialButton = (MaterialButton) findViewById(R.id.member_verification_verify_button);
             if (materialButton != null) {
-                i2 = 2131364065;
-                ImageView imageView = (ImageView) findViewById(2131364065);
+                i2 = R.id.member_verification_verify_icon;
+                ImageView imageView = (ImageView) findViewById(R.id.member_verification_verify_icon);
                 if (imageView != null) {
-                    i2 = 2131364066;
-                    TextView textView2 = (TextView) findViewById(2131364066);
+                    i2 = R.id.member_verification_verify_text;
+                    TextView textView2 = (TextView) findViewById(R.id.member_verification_verify_text);
                     if (textView2 != null) {
                         ViewMemberVerificationBinding viewMemberVerificationBinding = new ViewMemberVerificationBinding(this, textView, materialButton, imageView, textView2);
                         m.checkNotNullExpressionValue(viewMemberVerificationBinding, "ViewMemberVerificationBi…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java
index 1617f6179d..6e94c6d831 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetMemberVerificationBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.CustomAppBarLayout;
@@ -24,32 +25,32 @@ public final /* synthetic */ class WidgetMemberVerification$binding$2 extends k
 
     public final WidgetMemberVerificationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361975;
-        CustomAppBarLayout customAppBarLayout = (CustomAppBarLayout) view.findViewById(2131361975);
+        int i = R.id.app_bar_layout;
+        CustomAppBarLayout customAppBarLayout = (CustomAppBarLayout) view.findViewById(R.id.app_bar_layout);
         if (customAppBarLayout != null) {
-            i = 2131362678;
-            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131362678);
+            i = R.id.collapsing_toolbar;
+            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(R.id.collapsing_toolbar);
             if (collapsingToolbarLayout != null) {
-                i = 2131362956;
-                DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                i = R.id.dimmer_view;
+                DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                 if (dimmerView != null) {
-                    i = 2131364039;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364039);
+                    i = R.id.member_verification_banner_image;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.member_verification_banner_image);
                     if (simpleDraweeView != null) {
-                        i = 2131364041;
-                        MemberVerificationView memberVerificationView = (MemberVerificationView) view.findViewById(2131364041);
+                        i = R.id.member_verification_container;
+                        MemberVerificationView memberVerificationView = (MemberVerificationView) view.findViewById(R.id.member_verification_container);
                         if (memberVerificationView != null) {
-                            i = 2131364042;
-                            MemberVerificationAvatarView memberVerificationAvatarView = (MemberVerificationAvatarView) view.findViewById(2131364042);
+                            i = R.id.member_verification_guild_icon;
+                            MemberVerificationAvatarView memberVerificationAvatarView = (MemberVerificationAvatarView) view.findViewById(R.id.member_verification_guild_icon);
                             if (memberVerificationAvatarView != null) {
-                                i = 2131364054;
-                                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364054);
+                                i = R.id.member_verification_rules_confirm;
+                                LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.member_verification_rules_confirm);
                                 if (loadingButton != null) {
-                                    i = 2131364056;
-                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364056);
+                                    i = R.id.member_verification_rules_recycler;
+                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.member_verification_rules_recycler);
                                     if (recyclerView != null) {
-                                        i = 2131364057;
-                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364057);
+                                        i = R.id.member_verification_scrollview;
+                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.member_verification_scrollview);
                                         if (nestedScrollView != null) {
                                             return new WidgetMemberVerificationBinding((CoordinatorLayout) view, customAppBarLayout, collapsingToolbarLayout, dimmerView, simpleDraweeView, memberVerificationView, memberVerificationAvatarView, loadingButton, recyclerView, nestedScrollView);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java
index 9a89aa084d..c8661f53bf 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java
@@ -1,5 +1,7 @@
 package com.discord.widgets.servers.member_verification;
 
+import androidx.core.app.NotificationCompat;
+import com.discord.R;
 import com.discord.widgets.servers.member_verification.WidgetMemberVerificationViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,7 +27,7 @@ public final class WidgetMemberVerification$onViewBoundOrOnResume$2 extends o im
 
     public final void invoke(WidgetMemberVerificationViewModel.Event event) {
         String guildName;
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (event instanceof WidgetMemberVerificationViewModel.Event.Success) {
             this.this$0.requireActivity().finish();
             WidgetMemberVerificationViewModel.Event.Success success = (WidgetMemberVerificationViewModel.Event.Success) event;
@@ -38,7 +40,7 @@ public final class WidgetMemberVerification$onViewBoundOrOnResume$2 extends o im
                 MemberVerificationPendingDialog.Companion.enqueue(success.getGuildId().longValue(), success.getGuildName());
             }
         } else if (event instanceof WidgetMemberVerificationViewModel.Event.Error) {
-            c.a.e.o.i(this.this$0, 2131890068, 0, 4);
+            c.a.e.o.i(this.this$0, R.string.guild_settings_public_update_failed, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$viewModel$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$viewModel$2.java
index 438d200309..98a07dbc53 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$viewModel$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.member_verification;
 
 import com.discord.app.AppViewModel;
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import com.discord.widgets.servers.member_verification.WidgetMemberVerificationViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -18,7 +19,7 @@ public final class WidgetMemberVerification$viewModel$2 extends o implements Fun
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetMemberVerificationViewModel.ViewState> mo1invoke() {
-        long longExtra = this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        long longExtra = this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
         String stringExtra = this.this$0.getMostRecentIntent().getStringExtra("INTENT_EXTRA_LOCATION");
         if (stringExtra == null) {
             stringExtra = "";
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java
index b1322bf93b..c39e3a76a8 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java
@@ -16,6 +16,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
 import c.i.a.f.e.o.c;
+import com.discord.R;
 import com.discord.api.guildjoinrequest.ApplicationStatus;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetMemberVerificationBinding;
@@ -73,9 +74,9 @@ public final class WidgetMemberVerification extends AppFragment {
             m.checkNotNullParameter(str, "location");
             Intent intent = new Intent();
             intent.putExtra("INTENT_EXTRA_GUILD_ID", j);
-            intent.putExtra("INTENT_EXTRA_LOCATION", str);
+            intent.putExtra(WidgetMemberVerification.INTENT_EXTRA_LOCATION, str);
             if ((modelInvite != null ? modelInvite.getGuild() : null) != null) {
-                intent.putExtra("INTENT_EXTRA_INVITE_GUILD", new Gson().m(modelInvite.getGuild()));
+                intent.putExtra(WidgetMemberVerification.INTENT_EXTRA_INVITE_GUILD, new Gson().m(modelInvite.getGuild()));
             }
             l.d(context, WidgetMemberVerification.class, intent);
         }
@@ -100,7 +101,7 @@ public final class WidgetMemberVerification extends AppFragment {
     }
 
     public WidgetMemberVerification() {
-        super(2131559135);
+        super(R.layout.widget_member_verification);
         WidgetMemberVerification$viewModel$2 widgetMemberVerification$viewModel$2 = new WidgetMemberVerification$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetMemberVerificationViewModel.class), new WidgetMemberVerification$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMemberVerification$viewModel$2));
@@ -177,7 +178,7 @@ public final class WidgetMemberVerification extends AppFragment {
 
     private final void configureUI(WidgetMemberVerificationViewModel.ViewState viewState) {
         if (viewState instanceof WidgetMemberVerificationViewModel.ViewState.Invalid) {
-            o.i(this, 2131888073, 0, 4);
+            o.i(this, R.string.default_failure_to_perform_action_message, 0, 4);
             requireActivity().finish();
         } else if (viewState instanceof WidgetMemberVerificationViewModel.ViewState.Loaded) {
             configureLoadedUI((WidgetMemberVerificationViewModel.ViewState.Loaded) viewState);
@@ -203,9 +204,9 @@ public final class WidgetMemberVerification extends AppFragment {
         if (verificationType != null) {
             int ordinal = verificationType.ordinal();
             if (ordinal == 0) {
-                getBinding().d.configure(2131231875, 2131891382, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$2(this));
+                getBinding().d.configure(R.drawable.ic_phone_verification_24dp, R.string.member_verification_form_item_phone_verification_label, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$2(this));
             } else if (ordinal == 1) {
-                getBinding().d.configure(2131231612, 2131891377, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$1(this));
+                getBinding().d.configure(R.drawable.ic_email_verification_24dp, R.string.member_verification_form_item_email_verification_label, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$1(this));
             }
         }
     }
@@ -223,7 +224,7 @@ public final class WidgetMemberVerification extends AppFragment {
     }
 
     private final Guild parseInviteGuild() {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_INVITE_GUILD");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_INVITE_GUILD);
         if (stringExtra == null) {
             return (Guild) stringExtra;
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java
index 58bd18a491..a77152bc8a 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.premiumguild;
 
 import androidx.annotation.DrawableRes;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function2;
 /* compiled from: PremiumGuildSubscriptionPerkView.kt */
@@ -12,10 +13,7 @@ public final class PremiumGuildSubscriptionPerkView$configure$1 extends o implem
     }
 
     public final int invoke(@DrawableRes int i, boolean z2) {
-        if (z2) {
-            return 2131231543;
-        }
-        return i;
+        return z2 ? R.drawable.ic_check_green_24dp : i;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.java
index 807e6d1ca7..1d94ffcb90 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$initialize$1.java
@@ -2,13 +2,14 @@ package com.discord.widgets.servers.premiumguild;
 
 import android.view.MotionEvent;
 import androidx.recyclerview.widget.RecyclerView;
+import c.a.r.n0.c.e;
 import d0.z.d.m;
 /* compiled from: PremiumGuildSubscriptionPerkView.kt */
 public final class PremiumGuildSubscriptionPerkView$initialize$1 implements RecyclerView.OnItemTouchListener {
     @Override // androidx.recyclerview.widget.RecyclerView.OnItemTouchListener
     public boolean onInterceptTouchEvent(RecyclerView recyclerView, MotionEvent motionEvent) {
         m.checkNotNullParameter(recyclerView, "rv");
-        m.checkNotNullParameter(motionEvent, "e");
+        m.checkNotNullParameter(motionEvent, e.a);
         return motionEvent.getAction() == 2;
     }
 
@@ -19,6 +20,6 @@ public final class PremiumGuildSubscriptionPerkView$initialize$1 implements Recy
     @Override // androidx.recyclerview.widget.RecyclerView.OnItemTouchListener
     public void onTouchEvent(RecyclerView recyclerView, MotionEvent motionEvent) {
         m.checkNotNullParameter(recyclerView, "rv");
-        m.checkNotNullParameter(motionEvent, "e");
+        m.checkNotNullParameter(motionEvent, e.a);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java
index c8ee771b54..53b8a002b0 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.ViewNitroBoostPerksBinding;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -89,27 +90,27 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout {
         PremiumGuildSubscriptionPerkView$configure$1 premiumGuildSubscriptionPerkView$configure$1 = PremiumGuildSubscriptionPerkView$configure$1.INSTANCE;
         boolean z2 = i2 >= i;
         if (z2) {
-            this.binding.d.setBackgroundResource(2131231043);
+            this.binding.d.setBackgroundResource(R.drawable.drawable_bg_premium_guild_gradient);
         } else {
-            this.binding.d.setBackgroundColor(ColorCompat.getThemedColor(this, 2130969904));
+            this.binding.d.setBackgroundColor(ColorCompat.getThemedColor(this, (int) R.attr.primary_700));
         }
         int i3 = i != 1 ? i != 2 ? i != 3 ? 0 : 30 : 15 : 2;
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.perksLevelHeaderText");
         PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem premiumGuildSubscriptionPerkViewListItem = null;
-        b.n(textView, i != 1 ? i != 2 ? i != 3 ? 0 : 2131889949 : 2131889948 : 2131889947, new Object[0], null, 4);
-        int i4 = i != 1 ? i != 2 ? i != 3 ? 0 : z2 ? 2131231865 : 2131231866 : z2 ? 2131231863 : 2131231864 : z2 ? 2131231861 : 2131231862;
+        b.n(textView, i != 1 ? i != 2 ? i != 3 ? 0 : R.string.guild_settings_guild_premium_perks_title_tier_3 : R.string.guild_settings_guild_premium_perks_title_tier_2 : R.string.guild_settings_guild_premium_perks_title_tier_1, new Object[0], null, 4);
+        int i4 = i != 1 ? i != 2 ? i != 3 ? 0 : z2 ? R.drawable.ic_perk_tier_3_boosted : R.drawable.ic_perk_tier_3_unboosted : z2 ? R.drawable.ic_perk_tier_2_boosted : R.drawable.ic_perk_tier_2_unboosted : z2 ? R.drawable.ic_perk_tier_1_boosted : R.drawable.ic_perk_tier_1_unboosted;
         TextView textView2 = this.binding.f;
         m.checkNotNullExpressionValue(textView2, "binding.perksLevelHeaderText");
         DrawableCompat.setCompoundDrawablesCompat$default(textView2, i4, 0, 0, 0, 14, (Object) null);
-        this.binding.f.setTextColor(z2 ? ColorCompat.getColor(getContext(), 2131100433) : ColorCompat.getThemedColor(getContext(), 2130969885));
+        this.binding.f.setTextColor(z2 ? ColorCompat.getColor(getContext(), (int) R.color.white) : ColorCompat.getThemedColor(getContext(), (int) R.attr.primary_300));
         TextView textView3 = this.binding.e;
         m.checkNotNullExpressionValue(textView3, "binding.perksLevelHeaderBoosts");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        textView3.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755172, i3, Integer.valueOf(i3)));
+        textView3.setText(StringResourceUtilsKt.getQuantityString(resources, context, (int) R.plurals.guild_settings_premium_guild_tier_requirement_required, i3, Integer.valueOf(i3)));
         TextView textView4 = this.binding.e;
         m.checkNotNullExpressionValue(textView4, "binding.perksLevelHeaderBoosts");
         textView4.setVisibility(z2 ^ true ? 0 : 8);
@@ -118,45 +119,45 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout {
         cardView.setVisibility(z2 ? 0 : 8);
         TextView textView5 = this.binding.b;
         m.checkNotNullExpressionValue(textView5, "binding.perksLevelContentsHeader");
-        b.n(textView5, i != 1 ? 2131889945 : 2131889943, new Object[0], null, 4);
+        b.n(textView5, i != 1 ? R.string.guild_settings_guild_premium_perks_previous_perks : R.string.guild_settings_guild_premium_perks_base_perks, new Object[0], null, 4);
         boolean isThreadsEnabled = ThreadUtils.INSTANCE.isThreadsEnabled(j);
         if (i == 1) {
             PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem[] premiumGuildSubscriptionPerkViewListItemArr = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem[7];
-            int invoke = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231987, z2);
+            int invoke = premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_smile_24dp, z2);
             PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
-            premiumGuildSubscriptionPerkViewListItemArr[0] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke, b.j(this, 2131889940, new Object[]{50, Integer.valueOf(premiumUtils.getGuildEmojiMaxCount(1, false))}, null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr[1] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232022, z2), b.j(this, 2131889941, new Object[]{15, Integer.valueOf(premiumUtils.getGuildStickerMaxCount(1, false))}, null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr[2] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231726, z2), b.j(this, 2131889939, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(1, false))}, null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr[3] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231829, z2), b.j(this, 2131889930, new Object[0], null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr[4] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231754, z2), b.j(this, 2131889931, new Object[0], null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr[5] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231714, z2), b.j(this, 2131889932, new Object[0], null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr[0] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke, b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_emoji, new Object[]{50, Integer.valueOf(premiumUtils.getGuildEmojiMaxCount(1, false))}, null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr[1] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_sticker_icon_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_sticker, new Object[]{15, Integer.valueOf(premiumUtils.getGuildStickerMaxCount(1, false))}, null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr[2] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_headset_blue_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_audio_quality, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(1, false))}, null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr[3] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_nitro_gifs_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon, new Object[0], null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr[4] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_image_library_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_1_splash, new Object[0], null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr[5] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_guild_nitro_perk_stream_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_1_streaming, new Object[0], null, 4));
             if (isThreadsEnabled) {
-                premiumGuildSubscriptionPerkViewListItem = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231560, z2), b.j(this, 2131889933, new Object[0], null, 4));
+                premiumGuildSubscriptionPerkViewListItem = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_clock_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_1_thread_archive, new Object[0], null, 4));
             }
             premiumGuildSubscriptionPerkViewListItemArr[6] = premiumGuildSubscriptionPerkViewListItem;
             list = u.toMutableList((Collection) u.filterNotNull(n.mutableListOf(premiumGuildSubscriptionPerkViewListItemArr)));
         } else if (i == 2) {
             PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem[] premiumGuildSubscriptionPerkViewListItemArr2 = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem[8];
-            int invoke2 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231987, z2);
+            int invoke2 = premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_smile_24dp, z2);
             PremiumUtils premiumUtils2 = PremiumUtils.INSTANCE;
-            premiumGuildSubscriptionPerkViewListItemArr2[0] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke2, b.j(this, 2131889940, new Object[]{50, Integer.valueOf(premiumUtils2.getGuildEmojiMaxCount(2, false))}, null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr2[1] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232022, z2), b.j(this, 2131889941, new Object[]{15, Integer.valueOf(premiumUtils2.getGuildStickerMaxCount(2, false))}, null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr2[2] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231726, z2), b.j(this, 2131889939, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(2, false))}, null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr2[3] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232067, z2), b.j(this, 2131889942, new Object[]{b.j(this, 2131888542, new Object[]{Integer.valueOf(premiumUtils2.getGuildMaxFileSizeMB(2))}, null, 4)}, null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr2[4] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231754, z2), b.j(this, 2131889934, new Object[0], null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr2[5] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231714, z2), b.j(this, 2131889935, new Object[0], null, 4));
-            premiumGuildSubscriptionPerkViewListItemArr2[6] = isThreadsEnabled ? new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231560, z2), b.j(this, 2131889936, new Object[0], null, 4)) : null;
+            premiumGuildSubscriptionPerkViewListItemArr2[0] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke2, b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_emoji, new Object[]{50, Integer.valueOf(premiumUtils2.getGuildEmojiMaxCount(2, false))}, null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr2[1] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_sticker_icon_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_sticker, new Object[]{15, Integer.valueOf(premiumUtils2.getGuildStickerMaxCount(2, false))}, null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr2[2] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_headset_blue_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_audio_quality, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(2, false))}, null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr2[3] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_upload_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_upload_limit, new Object[]{b.j(this, R.string.file_size_mb, new Object[]{Integer.valueOf(premiumUtils2.getGuildMaxFileSizeMB(2))}, null, 4)}, null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr2[4] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_image_library_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_2_banner, new Object[0], null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr2[5] = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_guild_nitro_perk_stream_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_2_streaming, new Object[0], null, 4));
+            premiumGuildSubscriptionPerkViewListItemArr2[6] = isThreadsEnabled ? new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_clock_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_2_thread_archive, new Object[0], null, 4)) : null;
             if (isThreadsEnabled) {
-                premiumGuildSubscriptionPerkViewListItem = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232049, z2), b.j(this, 2131889937, new Object[0], null, 4));
+                premiumGuildSubscriptionPerkViewListItem = new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_thread_locked, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_2_thread_private, new Object[0], null, 4));
             }
             premiumGuildSubscriptionPerkViewListItemArr2[7] = premiumGuildSubscriptionPerkViewListItem;
             list = u.toMutableList((Collection) u.filterNotNull(n.mutableListOf(premiumGuildSubscriptionPerkViewListItemArr2)));
         } else if (i != 3) {
             list = new ArrayList();
         } else {
-            int invoke3 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231987, z2);
+            int invoke3 = premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_smile_24dp, z2);
             PremiumUtils premiumUtils3 = PremiumUtils.INSTANCE;
-            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke3, b.j(this, 2131889940, new Object[]{100, Integer.valueOf(premiumUtils3.getGuildEmojiMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232022, z2), b.j(this, 2131889941, new Object[]{30, Integer.valueOf(premiumUtils3.getGuildStickerMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231726, z2), b.j(this, 2131889939, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232067, z2), b.j(this, 2131889942, new Object[]{b.j(this, 2131888542, new Object[]{Integer.valueOf(premiumUtils3.getGuildMaxFileSizeMB(3))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232014, z2), b.j(this, 2131889938, new Object[0], null, 4)));
+            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke3, b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_emoji, new Object[]{100, Integer.valueOf(premiumUtils3.getGuildEmojiMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_sticker_icon_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_sticker, new Object[]{30, Integer.valueOf(premiumUtils3.getGuildStickerMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_headset_blue_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_audio_quality, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_upload_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_any_upload_limit, new Object[]{b.j(this, R.string.file_size_mb, new Object[]{Integer.valueOf(premiumUtils3.getGuildMaxFileSizeMB(3))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(R.drawable.ic_star_24dp, z2), b.j(this, R.string.guild_settings_guild_premium_perk_title_tier_3_vanity_url, new Object[0], null, 4)));
         }
         PremiumGuildSubscriptionPerkViewAdapter premiumGuildSubscriptionPerkViewAdapter = this.adapter;
         if (premiumGuildSubscriptionPerkViewAdapter == null) {
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.java
index 4956885168..4bc444fe2d 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter.java
@@ -4,8 +4,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.DrawableRes;
+import androidx.core.app.NotificationCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ViewNitroBoostPerksListItemBinding;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
@@ -24,7 +26,7 @@ public final class PremiumGuildSubscriptionPerkViewAdapter extends MGRecyclerAda
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PerkViewHolder(PremiumGuildSubscriptionPerkViewAdapter premiumGuildSubscriptionPerkViewAdapter) {
-            super(2131558793, premiumGuildSubscriptionPerkViewAdapter);
+            super((int) R.layout.view_nitro_boost_perks_list_item, premiumGuildSubscriptionPerkViewAdapter);
             m.checkNotNullParameter(premiumGuildSubscriptionPerkViewAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -66,7 +68,7 @@ public final class PremiumGuildSubscriptionPerkViewAdapter extends MGRecyclerAda
         }
 
         public PremiumGuildSubscriptionPerkViewListItem(@DrawableRes int i, CharSequence charSequence) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             this.iconResId = i;
             this.text = charSequence;
             this.key = charSequence.toString();
@@ -91,7 +93,7 @@ public final class PremiumGuildSubscriptionPerkViewAdapter extends MGRecyclerAda
         }
 
         public final PremiumGuildSubscriptionPerkViewListItem copy(@DrawableRes int i, CharSequence charSequence) {
-            m.checkNotNullParameter(charSequence, "text");
+            m.checkNotNullParameter(charSequence, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             return new PremiumGuildSubscriptionPerkViewListItem(i, charSequence);
         }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
index 921a604b53..7308b3c34a 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
@@ -6,6 +6,7 @@ import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
 import com.android.billingclient.api.Purchase;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelPremiumGuildSubscription;
 import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot;
@@ -753,15 +754,15 @@ public final class PremiumGuildViewModel extends AppViewModel<ViewState> {
             ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List<? extends Object>) loaded.getSubscriptions());
             if (modelSubscription == null || modelSubscription.isGoogleSubscription()) {
                 if ((modelSubscription != null ? modelSubscription.getRenewalMutations() : null) != null) {
-                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892473, 2131892471));
+                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(R.string.premium_guild_subscription_out_of_slots_title, R.string.premium_guild_subscription_out_of_slots_pending_plan_change));
                     return;
                 }
                 if ((modelSubscription != null ? modelSubscription.getStatus() : null) == ModelSubscription.Status.CANCELED) {
-                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892473, 2131892470));
+                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(R.string.premium_guild_subscription_out_of_slots_title, R.string.premium_guild_subscription_out_of_slots_canceled_subscription));
                     return;
                 }
                 if ((modelSubscription != null ? modelSubscription.getStatus() : null) == ModelSubscription.Status.ACCOUNT_HOLD) {
-                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892469, 2131892468));
+                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(R.string.premium_guild_subscription_out_of_slots_account_hold_title, R.string.premium_guild_subscription_out_of_slots_account_hold));
                     return;
                 }
                 List<Purchase> purchases = loaded.getPurchases();
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java
index 1ac2123dba..bbf68547ec 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import c.a.j.p2;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerBoostStatusBinding;
 import com.discord.utilities.simple_pager.SimplePager;
@@ -29,74 +30,74 @@ public final /* synthetic */ class WidgetPremiumGuildSubscription$binding$2 exte
 
     public final WidgetServerBoostStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362157;
-        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362157);
+        int i = R.id.boost_status_flipper;
+        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.boost_status_flipper);
         if (appViewFlipper != null) {
-            i = 2131362158;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362158);
+            i = R.id.boost_status_learn_more;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.boost_status_learn_more);
             if (linkifiedTextView != null) {
-                i = 2131362159;
-                TextView textView = (TextView) view.findViewById(2131362159);
+                i = R.id.boost_status_num_boosts;
+                TextView textView = (TextView) view.findViewById(R.id.boost_status_num_boosts);
                 if (textView != null) {
-                    i = 2131362160;
-                    PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131362160);
+                    i = R.id.boost_status_premium_marketing;
+                    PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(R.id.boost_status_premium_marketing);
                     if (premiumSubscriptionMarketingView != null) {
-                        i = 2131362161;
-                        PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131362161);
+                        i = R.id.boost_status_premium_upsell;
+                        PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(R.id.boost_status_premium_upsell);
                         if (premiumGuildSubscriptionUpsellView != null) {
-                            i = 2131362162;
-                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131362162);
+                            i = R.id.boost_status_protip;
+                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.boost_status_protip);
                             if (linkifiedTextView2 != null) {
-                                i = 2131362163;
-                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362163);
+                                i = R.id.boost_status_retry;
+                                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.boost_status_retry);
                                 if (materialButton != null) {
-                                    i = 2131362164;
-                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362164);
+                                    i = R.id.boost_status_subscribe_button;
+                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.boost_status_subscribe_button);
                                     if (materialButton2 != null) {
-                                        i = 2131362165;
-                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362165);
+                                        i = R.id.boost_status_subscribe_button2;
+                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.boost_status_subscribe_button2);
                                         if (materialButton3 != null) {
-                                            i = 2131362166;
-                                            SimplePager simplePager = (SimplePager) view.findViewById(2131362166);
+                                            i = R.id.boost_status_viewpager;
+                                            SimplePager simplePager = (SimplePager) view.findViewById(R.id.boost_status_viewpager);
                                             if (simplePager != null) {
-                                                i = 2131364578;
-                                                View findViewById = view.findViewById(2131364578);
+                                                i = R.id.progress;
+                                                View findViewById = view.findViewById(R.id.progress);
                                                 if (findViewById != null) {
-                                                    int i2 = 2131362140;
-                                                    ProgressBar progressBar = (ProgressBar) findViewById.findViewById(2131362140);
+                                                    int i2 = R.id.boost_bar_progress_bar;
+                                                    ProgressBar progressBar = (ProgressBar) findViewById.findViewById(R.id.boost_bar_progress_bar);
                                                     if (progressBar != null) {
-                                                        i2 = 2131362141;
-                                                        FrameLayout frameLayout = (FrameLayout) findViewById.findViewById(2131362141);
+                                                        i2 = R.id.boost_bar_tier_0_container;
+                                                        FrameLayout frameLayout = (FrameLayout) findViewById.findViewById(R.id.boost_bar_tier_0_container);
                                                         if (frameLayout != null) {
-                                                            i2 = 2131362142;
-                                                            ImageView imageView = (ImageView) findViewById.findViewById(2131362142);
+                                                            i2 = R.id.boost_bar_tier_0_iv;
+                                                            ImageView imageView = (ImageView) findViewById.findViewById(R.id.boost_bar_tier_0_iv);
                                                             if (imageView != null) {
-                                                                i2 = 2131362143;
-                                                                LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(2131362143);
+                                                                i2 = R.id.boost_bar_tier_1_container;
+                                                                LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(R.id.boost_bar_tier_1_container);
                                                                 if (linearLayout != null) {
-                                                                    i2 = 2131362144;
-                                                                    ImageView imageView2 = (ImageView) findViewById.findViewById(2131362144);
+                                                                    i2 = R.id.boost_bar_tier_1_iv;
+                                                                    ImageView imageView2 = (ImageView) findViewById.findViewById(R.id.boost_bar_tier_1_iv);
                                                                     if (imageView2 != null) {
-                                                                        i2 = 2131362145;
-                                                                        TextView textView2 = (TextView) findViewById.findViewById(2131362145);
+                                                                        i2 = R.id.boost_bar_tier_1_tv;
+                                                                        TextView textView2 = (TextView) findViewById.findViewById(R.id.boost_bar_tier_1_tv);
                                                                         if (textView2 != null) {
-                                                                            i2 = 2131362146;
-                                                                            LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(2131362146);
+                                                                            i2 = R.id.boost_bar_tier_2_container;
+                                                                            LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(R.id.boost_bar_tier_2_container);
                                                                             if (linearLayout2 != null) {
-                                                                                i2 = 2131362147;
-                                                                                ImageView imageView3 = (ImageView) findViewById.findViewById(2131362147);
+                                                                                i2 = R.id.boost_bar_tier_2_iv;
+                                                                                ImageView imageView3 = (ImageView) findViewById.findViewById(R.id.boost_bar_tier_2_iv);
                                                                                 if (imageView3 != null) {
-                                                                                    i2 = 2131362148;
-                                                                                    TextView textView3 = (TextView) findViewById.findViewById(2131362148);
+                                                                                    i2 = R.id.boost_bar_tier_2_tv;
+                                                                                    TextView textView3 = (TextView) findViewById.findViewById(R.id.boost_bar_tier_2_tv);
                                                                                     if (textView3 != null) {
-                                                                                        i2 = 2131362149;
-                                                                                        LinearLayout linearLayout3 = (LinearLayout) findViewById.findViewById(2131362149);
+                                                                                        i2 = R.id.boost_bar_tier_3_container;
+                                                                                        LinearLayout linearLayout3 = (LinearLayout) findViewById.findViewById(R.id.boost_bar_tier_3_container);
                                                                                         if (linearLayout3 != null) {
-                                                                                            i2 = 2131362150;
-                                                                                            ImageView imageView4 = (ImageView) findViewById.findViewById(2131362150);
+                                                                                            i2 = R.id.boost_bar_tier_3_iv;
+                                                                                            ImageView imageView4 = (ImageView) findViewById.findViewById(R.id.boost_bar_tier_3_iv);
                                                                                             if (imageView4 != null) {
-                                                                                                i2 = 2131362151;
-                                                                                                TextView textView4 = (TextView) findViewById.findViewById(2131362151);
+                                                                                                i2 = R.id.boost_bar_tier_3_tv;
+                                                                                                TextView textView4 = (TextView) findViewById.findViewById(R.id.boost_bar_tier_3_tv);
                                                                                                 if (textView4 != null) {
                                                                                                     return new WidgetServerBoostStatusBinding((CoordinatorLayout) view, appViewFlipper, linkifiedTextView, textView, premiumSubscriptionMarketingView, premiumGuildSubscriptionUpsellView, linkifiedTextView2, materialButton, materialButton2, materialButton3, simplePager, new p2((ConstraintLayout) findViewById, progressBar, frameLayout, imageView, linearLayout, imageView2, textView2, linearLayout2, imageView3, textView3, linearLayout3, imageView4, textView4));
                                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java
index 4dac84de2e..a6670de6c0 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers.premiumguild;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.settings.premiumguild.WidgetSettingsPremiumGuildSubscription;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -11,7 +12,7 @@ public final class WidgetPremiumGuildSubscription$onViewBound$2<T1, T2> implemen
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364107) {
+        if (menuItem.getItemId() == R.id.menu_premium_guild) {
             WidgetSettingsPremiumGuildSubscription.Companion companion = WidgetSettingsPremiumGuildSubscription.Companion;
             m.checkNotNullExpressionValue(context, "context");
             companion.launch(context);
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$4.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$4.java
index 14add45fd5..5f5388593c 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$4.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$4.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.view.View;
+import androidx.core.internal.view.SupportMenu;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
@@ -62,7 +64,7 @@ public final class WidgetPremiumGuildSubscription$onViewBound$4 extends o implem
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
             hook.a.add(new StyleSpan(1));
-            hook.a.add(new ForegroundColorSpan(-65536));
+            hook.a.add(new ForegroundColorSpan((int) SupportMenu.CATEGORY_MASK));
         }
     }
 
@@ -82,7 +84,7 @@ public final class WidgetPremiumGuildSubscription$onViewBound$4 extends o implem
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getColor(this.this$0.requireContext(), 2131100254));
+        renderContext.d = Integer.valueOf(ColorCompat.getColor(this.this$0.requireContext(), (int) R.color.status_green_600));
         renderContext.b("onLearnMore", AnonymousClass1.INSTANCE);
         renderContext.a("protipHook", AnonymousClass2.INSTANCE);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$5.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$5.java
index 3246287efa..eb46c758b9 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$5.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$5.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.premiumguild;
 
 import android.view.View;
+import com.discord.utilities.analytics.Traits;
 /* compiled from: WidgetPremiumGuildSubscription.kt */
 public final class WidgetPremiumGuildSubscription$onViewBound$5 implements View.OnClickListener {
     public final /* synthetic */ WidgetPremiumGuildSubscription this$0;
@@ -11,6 +12,6 @@ public final class WidgetPremiumGuildSubscription$onViewBound$5 implements View.
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetPremiumGuildSubscription.access$getViewModel$p(this.this$0).subscribeClicked("Header");
+        WidgetPremiumGuildSubscription.access$getViewModel$p(this.this$0).subscribeClicked(Traits.Location.Section.HEADER);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$6.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$6.java
index a324671989..6e9241bf68 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$6.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$6.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.servers.premiumguild;
 
 import android.view.View;
+import com.discord.utilities.analytics.Traits;
 /* compiled from: WidgetPremiumGuildSubscription.kt */
 public final class WidgetPremiumGuildSubscription$onViewBound$6 implements View.OnClickListener {
     public final /* synthetic */ WidgetPremiumGuildSubscription this$0;
@@ -11,6 +12,6 @@ public final class WidgetPremiumGuildSubscription$onViewBound$6 implements View.
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetPremiumGuildSubscription.access$getViewModel$p(this.this$0).subscribeClicked("Footer");
+        WidgetPremiumGuildSubscription.access$getViewModel$p(this.this$0).subscribeClicked(Traits.Location.Section.FOOTER);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
index 877bb19eeb..0734328e71 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
@@ -21,6 +21,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -81,7 +82,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
 
         public final void create(Context context, long j) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("GUILD_ID", j);
+            Intent putExtra = new Intent().putExtra(WidgetPremiumGuildSubscription.INTENT_EXTRA_GUILD_ID, j);
             m.checkNotNullExpressionValue(putExtra, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)");
             l.d(context, WidgetPremiumGuildSubscription.class, putExtra);
         }
@@ -167,7 +168,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
     }
 
     public WidgetPremiumGuildSubscription() {
-        super(2131559191);
+        super(R.layout.widget_server_boost_status);
         WidgetPremiumGuildSubscription$viewModel$2 widgetPremiumGuildSubscription$viewModel$2 = new WidgetPremiumGuildSubscription$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildViewModel.class), new WidgetPremiumGuildSubscription$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscription$viewModel$2));
@@ -221,7 +222,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
             }
             TextView textView = (TextView) list2.get(i2);
             if (textView != null) {
-                textView.setTextColor(i == i2 ? ColorCompat.getThemedColor(textView, 2130969877) : ColorCompat.getThemedColor(textView, 2130969888));
+                textView.setTextColor(i == i2 ? ColorCompat.getThemedColor(textView, (int) R.attr.primary_000) : ColorCompat.getThemedColor(textView, (int) R.attr.primary_400));
             }
             i2++;
         }
@@ -234,7 +235,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
         ProgressBar progressBar2 = getBinding().l.b;
         m.checkNotNullExpressionValue(progressBar2, "binding.progress.boostBarProgressBar");
         boolean z2 = false;
-        progressBar2.setContentDescription(getString(i != 0 ? i != 1 ? i != 2 ? i != 3 ? 0 : 2131892512 : 2131892510 : 2131892508 : 2131892356));
+        progressBar2.setContentDescription(getString(i != 0 ? i != 1 ? i != 2 ? i != 3 ? 0 : R.string.premium_guild_tier_3 : R.string.premium_guild_tier_2 : R.string.premium_guild_tier_1 : R.string.premium_guild_header_badge_no_tier));
         ImageView imageView = getBinding().l.f144c;
         m.checkNotNullExpressionValue(imageView, "binding.progress.boostBarTier0Iv");
         imageView.setEnabled(i2 > 0);
@@ -253,7 +254,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
     }
 
     private final void configureToolbar(String str) {
-        setActionBarTitle(2131892374);
+        setActionBarTitle(R.string.premium_guild_perks_modal_header);
         setActionBarSubtitle(str);
     }
 
@@ -285,7 +286,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
             m.checkNotNullExpressionValue(textView, "binding.boostStatusNumBoosts");
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            textView.setText(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755254, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
+            textView.setText(StringResourceUtilsKt.getQuantityString(resources, requireContext(), (int) R.plurals.premium_guild_perks_modal_header_subscription_count_subscriptions, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
         }
     }
 
@@ -343,14 +344,14 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
             WidgetPremiumGuildSubscriptionConfirmation.Companion.create(requireContext(), launchSubscriptionConfirmation.getGuildId(), launchSubscriptionConfirmation.getSlotId());
         } else if (event instanceof PremiumGuildViewModel.Event.LaunchPurchaseSubscription) {
             PremiumGuildViewModel.Event.LaunchPurchaseSubscription launchPurchaseSubscription = (PremiumGuildViewModel.Event.LaunchPurchaseSubscription) event;
-            WidgetChoosePlan.Companion.launch$default(WidgetChoosePlan.Companion, requireContext(), this.choosePlanLauncher, WidgetChoosePlan.ViewType.BUY_PREMIUM_GUILD, launchPurchaseSubscription.getOldSkuName(), new Traits.Location("User-Facing Premium Guild Subscription Fullscreen Modal", launchPurchaseSubscription.getSection(), "Button CTA", "buy", null, 16, null), null, 32, null);
+            WidgetChoosePlan.Companion.launch$default(WidgetChoosePlan.Companion, requireContext(), this.choosePlanLauncher, WidgetChoosePlan.ViewType.BUY_PREMIUM_GUILD, launchPurchaseSubscription.getOldSkuName(), new Traits.Location("User-Facing Premium Guild Subscription Fullscreen Modal", launchPurchaseSubscription.getSection(), Traits.Location.Obj.BUTTON_CTA, "buy", null, 16, null), null, 32, null);
         } else if (event instanceof PremiumGuildViewModel.Event.ShowDesktopAlertDialog) {
             WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, getString(2131892473), b.k(this, 2131892472, new Object[]{f.a.a(360055386693L, null)}, null, 4), getString(2131892444), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, getString(R.string.premium_guild_subscription_out_of_slots_title), b.k(this, R.string.premium_guild_subscription_out_of_slots_purchase_on_desktop, new Object[]{f.a.a(360055386693L, null)}, null, 4), getString(R.string.premium_guild_subscription_header_subscribe_tooltip_close), null, null, null, null, null, null, null, null, 0, null, 16368, null);
         } else if (event instanceof PremiumGuildViewModel.Event.UnacknowledgedPurchase) {
-            o.i(this, 2131886893, 0, 4);
+            o.i(this, R.string.billing_error_purchase, 0, 4);
             GooglePlayBillingManager.INSTANCE.queryPurchases();
         } else if (event instanceof PremiumGuildViewModel.Event.ShowBlockedPlanSwitchAlertDialog) {
             WidgetNoticeDialog.Companion companion2 = WidgetNoticeDialog.Companion;
@@ -360,7 +361,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
             String string = getString(showBlockedPlanSwitchAlertDialog.getHeaderStringRes());
             String string2 = getString(showBlockedPlanSwitchAlertDialog.getBodyStringRes());
             m.checkNotNullExpressionValue(string2, "getString(event.bodyStringRes)");
-            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager2, string, string2, getString(2131886919), getString(2131887193), g0.mapOf(d0.o.to(2131364252, new WidgetPremiumGuildSubscription$handleEvent$1(this))), null, null, null, null, null, null, 0, null, 16320, null);
+            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager2, string, string2, getString(R.string.billing_manage_subscription), getString(R.string.cancel), g0.mapOf(d0.o.to(Integer.valueOf((int) R.id.notice_ok), new WidgetPremiumGuildSubscription$handleEvent$1(this))), null, null, null, null, null, null, 0, null, 16320, null);
         }
     }
 
@@ -379,14 +380,14 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
         }
         simplePager.setAdapter(perksPagerAdapter);
         getBinding().k.addOnPageChangeListener(new WidgetPremiumGuildSubscription$onViewBound$1(this));
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623957, WidgetPremiumGuildSubscription$onViewBound$2.INSTANCE, null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_premium_guild, WidgetPremiumGuildSubscription$onViewBound$2.INSTANCE, null, 4, null);
         LinkifiedTextView linkifiedTextView = getBinding().f1897c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.boostStatusLearnMore");
-        b.m(linkifiedTextView, 2131892366, new Object[]{"learnMode"}, WidgetPremiumGuildSubscription$onViewBound$3.INSTANCE);
-        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755256, 2, 2);
+        b.m(linkifiedTextView, R.string.premium_guild_perks_modal_blurb_mobile_learn_more, new Object[]{"learnMode"}, WidgetPremiumGuildSubscription$onViewBound$3.INSTANCE);
+        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_perks_modal_protip_mobile_numFreeGuildSubscriptions, 2, 2);
         LinkifiedTextView linkifiedTextView2 = getBinding().g;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.boostStatusProtip");
-        b.m(linkifiedTextView2, 2131892380, new Object[]{i18nPluralString}, new WidgetPremiumGuildSubscription$onViewBound$4(this));
+        b.m(linkifiedTextView2, R.string.premium_guild_perks_modal_protip, new Object[]{i18nPluralString}, new WidgetPremiumGuildSubscription$onViewBound$4(this));
         ImageView imageView = getBinding().l.f144c;
         m.checkNotNullExpressionValue(imageView, "binding.progress.boostBarTier0Iv");
         ImageView imageView2 = getBinding().l.d;
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java
index 3f78f8e618..63e28625ae 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetServerBoostConfirmationBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.premiumguild.PremiumGuildConfirmationView;
@@ -21,23 +22,23 @@ public final /* synthetic */ class WidgetPremiumGuildSubscriptionConfirmation$bi
 
     public final WidgetServerBoostConfirmationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362152;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362152);
+        int i = R.id.boost_confirmation_button_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.boost_confirmation_button_container);
         if (linearLayout != null) {
-            i = 2131362153;
-            PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131362153);
+            i = R.id.boost_confirmation_confirmation_view;
+            PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(R.id.boost_confirmation_confirmation_view);
             if (premiumGuildConfirmationView != null) {
-                i = 2131362154;
-                TextView textView = (TextView) view.findViewById(2131362154);
+                i = R.id.boost_confirmation_cooldown_warning;
+                TextView textView = (TextView) view.findViewById(R.id.boost_confirmation_cooldown_warning);
                 if (textView != null) {
-                    i = 2131362155;
-                    TextView textView2 = (TextView) view.findViewById(2131362155);
+                    i = R.id.boost_confirmation_error;
+                    TextView textView2 = (TextView) view.findViewById(R.id.boost_confirmation_error);
                     if (textView2 != null) {
-                        i = 2131362156;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362156);
+                        i = R.id.boost_confirmation_select;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.boost_confirmation_select);
                         if (materialButton != null) {
-                            i = 2131362956;
-                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                            i = R.id.dimmer_view;
+                            DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                             if (dimmerView != null) {
                                 return new WidgetServerBoostConfirmationBinding((CoordinatorLayout) view, linearLayout, premiumGuildConfirmationView, textView, textView2, materialButton, dimmerView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
index efd301ba4b..77641f0fba 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
@@ -13,6 +13,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetServerBoostConfirmationBinding;
@@ -55,7 +56,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
 
         public final void create(Context context, long j, long j2) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("GUILD_ID", j).putExtra("SLOT_ID", j2);
+            Intent putExtra = new Intent().putExtra(WidgetPremiumGuildSubscriptionConfirmation.INTENT_EXTRA_GUILD_ID, j).putExtra(WidgetPremiumGuildSubscriptionConfirmation.INTENT_EXTRA_SLOT_ID, j2);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…NT_EXTRA_SLOT_ID, slotId)");
             l.d(context, WidgetPremiumGuildSubscriptionConfirmation.class, putExtra);
         }
@@ -76,7 +77,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
     }
 
     public WidgetPremiumGuildSubscriptionConfirmation() {
-        super(2131559190);
+        super(R.layout.widget_server_boost_confirmation);
         WidgetPremiumGuildSubscriptionConfirmation$viewModel$2 widgetPremiumGuildSubscriptionConfirmation$viewModel$2 = new WidgetPremiumGuildSubscriptionConfirmation$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildSubscriptionInProgressViewModel.class), new WidgetPremiumGuildSubscriptionConfirmation$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscriptionConfirmation$viewModel$2));
@@ -101,7 +102,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
     }
 
     private final void configureToolbar(String str) {
-        setActionBarTitle(2131892374);
+        setActionBarTitle(R.string.premium_guild_perks_modal_header);
         setActionBarSubtitle(str);
     }
 
@@ -182,11 +183,11 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
         getBinding().e.setOnClickListener(new WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1(this));
         MaterialButton materialButton = getBinding().e;
         m.checkNotNullExpressionValue(materialButton, "binding.boostConfirmationSelect");
-        materialButton.setText(b.k(this, 2131892390, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755262, 1, 1)}, null, 4));
-        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755263, 7, 7);
-        CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755264, 1, 1);
+        materialButton.setText(b.k(this, R.string.premium_guild_subscribe_confirm_confirmation, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_confirmation_slotCount, 1, 1)}, null, 4));
+        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_cooldown_warning_days, 7, 7);
+        CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_cooldown_warning_slotCount, 1, 1);
         TextView textView = getBinding().f1896c;
         m.checkNotNullExpressionValue(textView, "binding.boostConfirmationCooldownWarning");
-        textView.setText(b.k(this, 2131892392, new Object[]{i18nPluralString2, i18nPluralString}, null, 4));
+        textView.setText(b.k(this, R.string.premium_guild_subscribe_confirm_cooldown_warning, new Object[]{i18nPluralString2, i18nPluralString}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java
index 16c2d17ef1..f1c7fd7db0 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.premiumguild;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetPremiumGuildTransferBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.premiumguild.PremiumGuildConfirmationView;
@@ -20,29 +21,29 @@ public final /* synthetic */ class WidgetPremiumGuildSubscriptionTransfer$bindin
 
     public final WidgetPremiumGuildTransferBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131364496;
-            TextView textView = (TextView) view.findViewById(2131364496);
+            i = R.id.premium_guild_transfer_confirmation_blurb;
+            TextView textView = (TextView) view.findViewById(R.id.premium_guild_transfer_confirmation_blurb);
             if (textView != null) {
-                i = 2131364497;
-                TextView textView2 = (TextView) view.findViewById(2131364497);
+                i = R.id.premium_guild_transfer_error;
+                TextView textView2 = (TextView) view.findViewById(R.id.premium_guild_transfer_error);
                 if (textView2 != null) {
-                    i = 2131364498;
-                    PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131364498);
+                    i = R.id.premium_guild_transfer_previous_guild;
+                    PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(R.id.premium_guild_transfer_previous_guild);
                     if (premiumGuildConfirmationView != null) {
-                        i = 2131364499;
-                        TextView textView3 = (TextView) view.findViewById(2131364499);
+                        i = R.id.premium_guild_transfer_previous_guild_header;
+                        TextView textView3 = (TextView) view.findViewById(R.id.premium_guild_transfer_previous_guild_header);
                         if (textView3 != null) {
-                            i = 2131364500;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364500);
+                            i = R.id.premium_guild_transfer_select;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.premium_guild_transfer_select);
                             if (materialButton != null) {
-                                i = 2131364501;
-                                PremiumGuildConfirmationView premiumGuildConfirmationView2 = (PremiumGuildConfirmationView) view.findViewById(2131364501);
+                                i = R.id.premium_guild_transfer_target_guild;
+                                PremiumGuildConfirmationView premiumGuildConfirmationView2 = (PremiumGuildConfirmationView) view.findViewById(R.id.premium_guild_transfer_target_guild);
                                 if (premiumGuildConfirmationView2 != null) {
-                                    i = 2131364502;
-                                    TextView textView4 = (TextView) view.findViewById(2131364502);
+                                    i = R.id.premium_guild_transfer_target_guild_header;
+                                    TextView textView4 = (TextView) view.findViewById(R.id.premium_guild_transfer_target_guild_header);
                                     if (textView4 != null) {
                                         return new WidgetPremiumGuildTransferBinding((CoordinatorLayout) view, dimmerView, textView, textView2, premiumGuildConfirmationView, textView3, materialButton, premiumGuildConfirmationView2, textView4);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java
index 6109491b6e..8dfad5da63 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java
@@ -14,6 +14,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetPremiumGuildTransferBinding;
 import com.discord.models.domain.ModelPremiumGuildSubscription;
@@ -64,18 +65,18 @@ public final class WidgetPremiumGuildSubscriptionTransfer extends AppFragment {
             ModelPremiumGuildSubscription premiumGuildSubscription;
             m.checkNotNullParameter(context, "context");
             Long l = null;
-            Intent putExtra = new Intent().putExtra("PREVIOUS_GUILD_ID", j).putExtra("TARGET_GUILD_ID", j2).putExtra("SLOT_ID", modelPremiumGuildSubscriptionSlot != null ? Long.valueOf(modelPremiumGuildSubscriptionSlot.getId()) : null);
+            Intent putExtra = new Intent().putExtra(WidgetPremiumGuildSubscriptionTransfer.INTENT_EXTRA_PREVIOUS_GUILD_ID, j).putExtra(WidgetPremiumGuildSubscriptionTransfer.INTENT_EXTRA_TARGET_GUILD_ID, j2).putExtra(WidgetPremiumGuildSubscriptionTransfer.INTENT_EXTRA_SLOT_ID, modelPremiumGuildSubscriptionSlot != null ? Long.valueOf(modelPremiumGuildSubscriptionSlot.getId()) : null);
             if (!(modelPremiumGuildSubscriptionSlot == null || (premiumGuildSubscription = modelPremiumGuildSubscriptionSlot.getPremiumGuildSubscription()) == null)) {
                 l = Long.valueOf(premiumGuildSubscription.getId());
             }
-            Intent putExtra2 = putExtra.putExtra("SUBSCRIPTION_ID", l);
+            Intent putExtra2 = putExtra.putExtra(WidgetPremiumGuildSubscriptionTransfer.INTENT_EXTRA_SUBSCRIPTION_ID, l);
             m.checkNotNullExpressionValue(putExtra2, "Intent()\n          .putE…iumGuildSubscription?.id)");
             l.d(context, WidgetPremiumGuildSubscriptionTransfer.class, putExtra2);
         }
     }
 
     public WidgetPremiumGuildSubscriptionTransfer() {
-        super(2131559166);
+        super(R.layout.widget_premium_guild_transfer);
         WidgetPremiumGuildSubscriptionTransfer$viewModel$2 widgetPremiumGuildSubscriptionTransfer$viewModel$2 = new WidgetPremiumGuildSubscriptionTransfer$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildTransferInProgressViewModel.class), new WidgetPremiumGuildSubscriptionTransfer$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscriptionTransfer$viewModel$2));
@@ -141,17 +142,17 @@ public final class WidgetPremiumGuildSubscriptionTransfer extends AppFragment {
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextView textView = getBinding().f1881c;
         m.checkNotNullExpressionValue(textView, "binding.premiumGuildTransferConfirmationBlurb");
-        textView.setText(b.k(this, 2131892393, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755266, 1, 1), StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755265, 1, 1)}, null, 4));
+        textView.setText(b.k(this, R.string.premium_guild_subscribe_confirm_transfer_blurb, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_transfer_blurb_slotCount, 1, 1), StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_transfer_blurb_guildCount, 1, 1)}, null, 4));
         TextView textView2 = getBinding().f;
         m.checkNotNullExpressionValue(textView2, "binding.premiumGuildTransferPreviousGuildHeader");
-        textView2.setText(b.k(this, 2131892394, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755267, 1, 1)}, null, 4));
+        textView2.setText(b.k(this, R.string.premium_guild_subscribe_confirm_transfer_from_guild, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_transfer_from_guild_guildCount, 1, 1)}, null, 4));
         TextView textView3 = getBinding().i;
         m.checkNotNullExpressionValue(textView3, "binding.premiumGuildTransferTargetGuildHeader");
-        textView3.setText(b.k(this, 2131892396, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755268, 1, 1)}, null, 4));
+        textView3.setText(b.k(this, R.string.premium_guild_subscribe_confirm_transfer_to_guild, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_transfer_to_guild_slotCount, 1, 1)}, null, 4));
         getBinding().g.setOnClickListener(new WidgetPremiumGuildSubscriptionTransfer$onViewBound$1(this));
         MaterialButton materialButton = getBinding().g;
         m.checkNotNullExpressionValue(materialButton, "binding.premiumGuildTransferSelect");
-        materialButton.setText(b.k(this, 2131892402, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755270, 1, 1)}, null, 4));
+        materialButton.setText(b.k(this, R.string.premium_guild_subscribe_transfer_confirm_confirmation, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_transfer_confirm_confirmation_slotCount, 1, 1)}, null, 4));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java
index 28505310f7..f64c8d4b85 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsInstantInvitesBinding;
 import d0.z.d.k;
@@ -19,17 +20,17 @@ public final /* synthetic */ class WidgetServerSettingsInstantInvites$binding$2
 
     public final WidgetServerSettingsInstantInvitesBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364235;
-        TextView textView = (TextView) view.findViewById(2131364235);
+        int i = R.id.no_invites_body;
+        TextView textView = (TextView) view.findViewById(R.id.no_invites_body);
         if (textView != null) {
-            i = 2131364236;
-            TextView textView2 = (TextView) view.findViewById(2131364236);
+            i = R.id.no_invites_header;
+            TextView textView2 = (TextView) view.findViewById(R.id.no_invites_header);
             if (textView2 != null) {
-                i = 2131364884;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364884);
+                i = R.id.server_settings_instant_invites_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.server_settings_instant_invites_recycler);
                 if (recyclerView != null) {
-                    i = 2131364885;
-                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364885);
+                    i = R.id.server_settings_instant_invites_view_flipper;
+                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.server_settings_instant_invites_view_flipper);
                     if (appViewFlipper != null) {
                         return new WidgetServerSettingsInstantInvitesBinding((CoordinatorLayout) view, textView, textView2, recyclerView, appViewFlipper);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$guildId$2.java
index 7d3851119b..c81887a61d 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$guildId$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$guildId$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.servers.settings.invites;
 
+import com.discord.widgets.servers.WidgetServerSettingsChannels;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetServerSettingsInstantInvites.kt */
@@ -17,6 +18,6 @@ public final class WidgetServerSettingsInstantInvites$guildId$2 extends o implem
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Long mo1invoke() {
-        return this.this$0.getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1);
+        return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
index ed3c842a18..25e58ce8be 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.user.User;
 import com.discord.app.AppActivity;
@@ -346,7 +347,7 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment {
     }
 
     public WidgetServerSettingsInstantInvites() {
-        super(2131559224);
+        super(R.layout.widget_server_settings_instant_invites);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsInstantInvites widgetServerSettingsInstantInvites, Model model) {
@@ -379,7 +380,7 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment {
                 adapter.configure(model.getInviteItems(), new WidgetServerSettingsInstantInvites$configureUI$1(this), WidgetServerSettingsInstantInvites$configureUI$2.INSTANCE);
             }
         }
-        setActionBarTitle(2131890686);
+        setActionBarTitle(R.string.instant_invites);
         setActionBarSubtitle(model.getGuild().getName());
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
index c37da9e007..3313b55d15 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.user.User;
 import com.discord.databinding.WidgetServerSettingsInstantInviteListItemBinding;
@@ -29,47 +30,47 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetServerSettingsInstantInvitesListItem(WidgetServerSettingsInstantInvites.Adapter adapter) {
-        super(2131559223, adapter);
+        super((int) R.layout.widget_server_settings_instant_invite_list_item, adapter);
         m.checkNotNullParameter(adapter, "adapter");
         View view = this.itemView;
-        int i = 2131363821;
-        TextView textView = (TextView) view.findViewById(2131363821);
+        int i = R.id.invite_channel;
+        TextView textView = (TextView) view.findViewById(R.id.invite_channel);
         if (textView != null) {
-            i = 2131363822;
-            TextView textView2 = (TextView) view.findViewById(2131363822);
+            i = R.id.invite_code;
+            TextView textView2 = (TextView) view.findViewById(R.id.invite_code);
             if (textView2 != null) {
-                i = 2131363823;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363823);
+                i = R.id.invite_container;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.invite_container);
                 if (linearLayout != null) {
-                    i = 2131363824;
-                    View findViewById = view.findViewById(2131363824);
+                    i = R.id.invite_divider;
+                    View findViewById = view.findViewById(R.id.invite_divider);
                     if (findViewById != null) {
-                        i = 2131363825;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363825);
+                        i = R.id.invite_expiration_container;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.invite_expiration_container);
                         if (linearLayout2 != null) {
-                            i = 2131363826;
-                            TextView textView3 = (TextView) view.findViewById(2131363826);
+                            i = R.id.invite_expiration_time;
+                            TextView textView3 = (TextView) view.findViewById(R.id.invite_expiration_time);
                             if (textView3 != null) {
-                                i = 2131363828;
-                                TextView textView4 = (TextView) view.findViewById(2131363828);
+                                i = R.id.invite_expires_label;
+                                TextView textView4 = (TextView) view.findViewById(R.id.invite_expires_label);
                                 if (textView4 != null) {
-                                    i = 2131363829;
-                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363829);
+                                    i = R.id.invite_list_item_avatar;
+                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.invite_list_item_avatar);
                                     if (simpleDraweeView != null) {
-                                        i = 2131363836;
-                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363836);
+                                        i = R.id.invite_name_container;
+                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.invite_name_container);
                                         if (linearLayout3 != null) {
-                                            i = 2131363840;
-                                            ImageView imageView = (ImageView) view.findViewById(2131363840);
+                                            i = R.id.invite_settings_icon;
+                                            ImageView imageView = (ImageView) view.findViewById(R.id.invite_settings_icon);
                                             if (imageView != null) {
-                                                i = 2131363843;
-                                                TextView textView5 = (TextView) view.findViewById(2131363843);
+                                                i = R.id.invite_user_name;
+                                                TextView textView5 = (TextView) view.findViewById(R.id.invite_user_name);
                                                 if (textView5 != null) {
-                                                    i = 2131363844;
-                                                    TextView textView6 = (TextView) view.findViewById(2131363844);
+                                                    i = R.id.invite_uses;
+                                                    TextView textView6 = (TextView) view.findViewById(R.id.invite_uses);
                                                     if (textView6 != null) {
-                                                        i = 2131363845;
-                                                        TextView textView7 = (TextView) view.findViewById(2131363845);
+                                                        i = R.id.invite_uses_label;
+                                                        TextView textView7 = (TextView) view.findViewById(R.id.invite_uses_label);
                                                         if (textView7 != null) {
                                                             WidgetServerSettingsInstantInviteListItemBinding widgetServerSettingsInstantInviteListItemBinding = new WidgetServerSettingsInstantInviteListItemBinding((CardView) view, textView, textView2, linearLayout, findViewById, linearLayout2, textView3, textView4, simpleDraweeView, linearLayout3, imageView, textView5, textView6, textView7);
                                                             m.checkNotNullExpressionValue(widgetServerSettingsInstantInviteListItemBinding, "WidgetServerSettingsInst…temBinding.bind(itemView)");
@@ -132,15 +133,15 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
         textView.setText(format);
         TextView textView2 = this.binding.e;
         m.checkNotNullExpressionValue(textView2, "binding.inviteExpirationTime");
-        textView2.setTextColor(ColorCompat.getColor(textView2, 2131100251));
+        textView2.setTextColor(ColorCompat.getColor(textView2, (int) R.color.status_green_500_dark));
     }
 
     private final void setupExpirationTime(ModelInvite modelInvite) {
         if (modelInvite.getMaxAge() == 0) {
-            this.binding.e.setText(2131891316);
+            this.binding.e.setText(R.string.max_age_never);
             TextView textView = this.binding.e;
             m.checkNotNullExpressionValue(textView, "binding.inviteExpirationTime");
-            textView.setTextColor(ColorCompat.getColor(textView, 2131099911));
+            textView.setTextColor(ColorCompat.getColor(textView, (int) R.color.grey_1));
             cancelTimer();
         } else if (modelInvite.getTimeToExpirationMillis() <= 0) {
             setCountdownText(0);
@@ -183,13 +184,13 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
         if (inviter == null || (str = inviter.r()) == null) {
             CardView cardView = this.binding.a;
             m.checkNotNullExpressionValue(cardView, "binding.root");
-            str = cardView.getContext().getString(2131890665);
+            str = cardView.getContext().getString(R.string.instant_invite_generated_by_widget);
         }
         textView5.setText(str);
         if (inviter != null) {
             SimpleDraweeView simpleDraweeView = this.binding.f;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, new CoreUser(inviter), 2131165296, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, new CoreUser(inviter), R.dimen.avatar_size_small, null, null, null, 56, null);
             SimpleDraweeView simpleDraweeView2 = this.binding.f;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteListItemAvatar");
             simpleDraweeView2.setVisibility(0);
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java
index 72eac3508b..0432db2672 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsMembersBinding;
 import com.google.android.material.textfield.TextInputLayout;
@@ -22,23 +23,23 @@ public final /* synthetic */ class WidgetServerSettingsMembers$binding$2 extends
 
     public final WidgetServerSettingsMembersBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364239;
-        TextView textView = (TextView) view.findViewById(2131364239);
+        int i = R.id.no_results_text;
+        TextView textView = (TextView) view.findViewById(R.id.no_results_text);
         if (textView != null) {
-            i = 2131364886;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364886);
+            i = R.id.server_settings_members_header_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.server_settings_members_header_container);
             if (linearLayout != null) {
-                i = 2131364887;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364887);
+                i = R.id.server_settings_members_name_search;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.server_settings_members_name_search);
                 if (textInputLayout != null) {
-                    i = 2131364889;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364889);
+                    i = R.id.server_settings_members_recycler;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.server_settings_members_recycler);
                     if (recyclerView != null) {
-                        i = 2131364890;
-                        Spinner spinner = (Spinner) view.findViewById(2131364890);
+                        i = R.id.server_settings_members_roles_spinner;
+                        Spinner spinner = (Spinner) view.findViewById(R.id.server_settings_members_roles_spinner);
                         if (spinner != null) {
-                            i = 2131364891;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364891);
+                            i = R.id.server_settings_members_view_flipper;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.server_settings_members_view_flipper);
                             if (appViewFlipper != null) {
                                 return new WidgetServerSettingsMembersBinding((CoordinatorLayout) view, textView, linearLayout, textInputLayout, recyclerView, spinner, appViewFlipper);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java
index 8efdde2aff..5d59cf443d 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.servers.settings.members;
 import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.widgets.user.WidgetPruneUsers;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -18,7 +19,7 @@ public final class WidgetServerSettingsMembers$configureUI$1<T1, T2> implements
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364116) {
+        if (menuItem.getItemId() == R.id.menu_server_settings_members_prune) {
             WidgetPruneUsers.Companion companion = WidgetPruneUsers.Companion;
             long id2 = this.$model.getGuild().getId();
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java
index 547e3f5c8d..1311a581d8 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.servers.settings.members;
 
 import android.content.Context;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.databinding.WidgetServerSettingsMembersBinding;
 import com.discord.utilities.guilds.RoleUtils;
@@ -47,12 +48,12 @@ public final class WidgetServerSettingsMembers$configureUI$2 extends o implement
                 m.checkNotNullExpressionValue(context, "binding.root.context");
                 companion.launch(id2, j, context);
             } else if (RoleUtils.rankEquals(this.$model.getMyHighestRole(), highestRole)) {
-                c.a.e.o.i(this.this$0, 2131887204, 0, 4);
+                c.a.e.o.i(this.this$0, R.string.cannot_manage_same_rank, 0, 4);
             } else {
-                c.a.e.o.i(this.this$0, 2131887202, 0, 4);
+                c.a.e.o.i(this.this$0, R.string.cannot_manage_higher_rank, 0, 4);
             }
         } else {
-            c.a.e.o.i(this.this$0, 2131887203, 0, 4);
+            c.a.e.o.i(this.this$0, R.string.cannot_manage_is_owner, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
index 217c66babc..9d633f7b62 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
@@ -16,6 +16,7 @@ import c.a.e.l;
 import c.a.j.f1;
 import c.a.j.g1;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -68,7 +69,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
 
         public final void create(Context context, long j) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("GUILD_ID", j);
+            Intent putExtra = new Intent().putExtra(WidgetServerSettingsMembers.INTENT_EXTRA_GUILD_ID, j);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…_EXTRA_GUILD_ID, guildId)");
             l.d(context, WidgetServerSettingsMembers.class, putExtra);
             StoreStream.Companion.getAnalytics().onGuildSettingsPaneViewed("MEMBERS", j);
@@ -81,7 +82,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RolesSpinnerAdapter(Context context, ArrayList<GuildRole> arrayList) {
-            super(context, 2131558667, arrayList);
+            super(context, (int) R.layout.server_settings_members_role_spinner_item, arrayList);
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(arrayList, "roles");
             this.roles = arrayList;
@@ -105,7 +106,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
             g1 g1Var;
             m.checkNotNullParameter(viewGroup, "parent");
             if (view == null) {
-                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558668, (ViewGroup) null, false);
+                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.server_settings_members_role_spinner_item_open, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 TextView textView = (TextView) inflate;
                 g1Var = new g1(textView, textView);
@@ -139,7 +140,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
             f1 f1Var;
             m.checkNotNullParameter(viewGroup, "parent");
             if (view == null) {
-                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558667, (ViewGroup) null, false);
+                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.server_settings_members_role_spinner_item, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 TextView textView = (TextView) inflate;
                 f1Var = new f1(textView, textView);
@@ -158,7 +159,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
     }
 
     public WidgetServerSettingsMembers() {
-        super(2131559228);
+        super(R.layout.widget_server_settings_members);
         BehaviorSubject l0 = BehaviorSubject.l0("");
         m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
         this.nameFilterPublisher = l0;
@@ -197,8 +198,8 @@ public final class WidgetServerSettingsMembers extends AppFragment {
             }
             return;
         }
-        AppFragment.setActionBarOptionsMenu$default(this, widgetServerSettingsMembersModel.getCanKick() ? 2131623961 : 2131623951, new WidgetServerSettingsMembers$configureUI$1(this, widgetServerSettingsMembersModel), null, 4, null);
-        setActionBarTitle(2131891328);
+        AppFragment.setActionBarOptionsMenu$default(this, widgetServerSettingsMembersModel.getCanKick() ? R.menu.menu_server_settings_members : R.menu.menu_empty, new WidgetServerSettingsMembers$configureUI$1(this, widgetServerSettingsMembersModel), null, 4, null);
+        setActionBarTitle(R.string.member_list);
         setActionBarSubtitle(widgetServerSettingsMembersModel.getGuild().getName());
         AppViewFlipper appViewFlipper = getBinding().e;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsMembersViewFlipper");
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
index fb094e0cc8..7f6b25db01 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
@@ -5,6 +5,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.databinding.WidgetServerSettingsMemberListItemBinding;
 import com.discord.utilities.color.ColorCompat;
@@ -30,24 +31,24 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public MemberListItem(WidgetServerSettingsMembersAdapter widgetServerSettingsMembersAdapter) {
-            super(2131559227, widgetServerSettingsMembersAdapter);
+            super((int) R.layout.widget_server_settings_member_list_item, widgetServerSettingsMembersAdapter);
             m.checkNotNullParameter(widgetServerSettingsMembersAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364032;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364032);
+            int i = R.id.member_list_item_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.member_list_item_avatar);
             if (simpleDraweeView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131364034;
-                ImageView imageView = (ImageView) view.findViewById(2131364034);
+                i = R.id.member_list_item_lock;
+                ImageView imageView = (ImageView) view.findViewById(R.id.member_list_item_lock);
                 if (imageView != null) {
-                    i = 2131364035;
-                    UsernameView usernameView = (UsernameView) view.findViewById(2131364035);
+                    i = R.id.member_list_item_name;
+                    UsernameView usernameView = (UsernameView) view.findViewById(R.id.member_list_item_name);
                     if (usernameView != null) {
-                        i = 2131364036;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131364036);
+                        i = R.id.member_list_item_overflow;
+                        ImageView imageView2 = (ImageView) view.findViewById(R.id.member_list_item_overflow);
                         if (imageView2 != null) {
-                            i = 2131364037;
-                            RolesListView rolesListView = (RolesListView) view.findViewById(2131364037);
+                            i = R.id.member_list_item_roles_list;
+                            RolesListView rolesListView = (RolesListView) view.findViewById(R.id.member_list_item_roles_list);
                             if (rolesListView != null) {
                                 WidgetServerSettingsMemberListItemBinding widgetServerSettingsMemberListItemBinding = new WidgetServerSettingsMemberListItemBinding(constraintLayout, simpleDraweeView, constraintLayout, imageView, usernameView, imageView2, rolesListView);
                                 m.checkNotNullExpressionValue(widgetServerSettingsMemberListItemBinding, "WidgetServerSettingsMemb…temBinding.bind(itemView)");
@@ -69,12 +70,12 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS
             m.checkNotNullParameter(memberItem, "data");
             super.onConfigure(i, (int) memberItem);
             UsernameView.c(this.binding.e, memberItem.getUserDisplayName(), null, false, null, null, 30);
-            this.binding.e.a(memberItem.getUser().isBot(), 2131887056, UserUtils.INSTANCE.isVerifiedBot(memberItem.getUser()));
+            this.binding.e.a(memberItem.getUser().isBot(), R.string.bot_tag, UserUtils.INSTANCE.isVerifiedBot(memberItem.getUser()));
             RolesListView rolesListView = this.binding.g;
             List<GuildRole> roles = memberItem.getRoles();
             RolesListView rolesListView2 = this.binding.g;
             m.checkNotNullExpressionValue(rolesListView2, "binding.memberListItemRolesList");
-            rolesListView.updateView(roles, ColorCompat.getColor(rolesListView2, 2131100277));
+            rolesListView.updateView(roles, ColorCompat.getColor(rolesListView2, (int) R.color.status_grey_500));
             RolesListView rolesListView3 = this.binding.g;
             m.checkNotNullExpressionValue(rolesListView3, "binding.memberListItemRolesList");
             int i2 = 0;
@@ -91,7 +92,7 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS
             this.binding.f1927c.setOnClickListener(new WidgetServerSettingsMembersAdapter$MemberListItem$onConfigure$1(this, memberItem));
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.memberListItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, memberItem.getUser(), 2131165297, null, null, memberItem.getGuildMember(), 24, null);
+            IconUtils.setIcon$default(simpleDraweeView, memberItem.getUser(), R.dimen.avatar_size_standard, null, null, memberItem.getGuildMember(), 24, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
index 7da82d9736..34d86b2348 100644
--- a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
@@ -18,6 +18,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.time.TimeUtils;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Iterator;
@@ -613,7 +614,7 @@ public final class MuteSettingsSheetViewModel extends AppViewModel<ViewState> {
             if (!(ordinal == 1 || ordinal == 2)) {
                 if (ordinal == 3) {
                     StringBuilder sb = new StringBuilder();
-                    sb.append('#');
+                    sb.append(MentionUtilsKt.CHANNELS_CHAR);
                     m.checkNotNull(channel);
                     sb.append(AnimatableValueParser.y0(channel));
                     str = sb.toString();
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java
index 3ecf0b237d..31e08283f6 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetMuteSettingsSheetBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -19,53 +20,53 @@ public final /* synthetic */ class WidgetMuteSettingsSheet$binding$2 extends k i
 
     public final WidgetMuteSettingsSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362312;
-        TextView textView = (TextView) view.findViewById(2131362312);
+        int i = R.id.channel_muted_details;
+        TextView textView = (TextView) view.findViewById(R.id.channel_muted_details);
         if (textView != null) {
-            i = 2131364204;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364204);
+            i = R.id.mute_settings_sheet_mute_options;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.mute_settings_sheet_mute_options);
             if (linearLayout != null) {
-                i = 2131364260;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364260);
+                i = R.id.notification_settings_button;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.notification_settings_button);
                 if (linearLayout2 != null) {
-                    i = 2131364261;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364261);
+                    i = R.id.notification_settings_button_container;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.notification_settings_button_container);
                     if (frameLayout != null) {
-                        i = 2131364262;
-                        TextView textView2 = (TextView) view.findViewById(2131364262);
+                        i = R.id.notification_settings_label;
+                        TextView textView2 = (TextView) view.findViewById(R.id.notification_settings_label);
                         if (textView2 != null) {
-                            i = 2131364263;
-                            TextView textView3 = (TextView) view.findViewById(2131364263);
+                            i = R.id.notification_settings_overrides_label;
+                            TextView textView3 = (TextView) view.findViewById(R.id.notification_settings_overrides_label);
                             if (textView3 != null) {
-                                i = 2131364316;
-                                TextView textView4 = (TextView) view.findViewById(2131364316);
+                                i = R.id.option_always;
+                                TextView textView4 = (TextView) view.findViewById(R.id.option_always);
                                 if (textView4 != null) {
-                                    i = 2131364317;
-                                    TextView textView5 = (TextView) view.findViewById(2131364317);
+                                    i = R.id.option_eight_hours;
+                                    TextView textView5 = (TextView) view.findViewById(R.id.option_eight_hours);
                                     if (textView5 != null) {
-                                        i = 2131364318;
-                                        TextView textView6 = (TextView) view.findViewById(2131364318);
+                                        i = R.id.option_fifteen_minutes;
+                                        TextView textView6 = (TextView) view.findViewById(R.id.option_fifteen_minutes);
                                         if (textView6 != null) {
-                                            i = 2131364319;
-                                            TextView textView7 = (TextView) view.findViewById(2131364319);
+                                            i = R.id.option_one_hour;
+                                            TextView textView7 = (TextView) view.findViewById(R.id.option_one_hour);
                                             if (textView7 != null) {
-                                                i = 2131364331;
-                                                TextView textView8 = (TextView) view.findViewById(2131364331);
+                                                i = R.id.option_twenty_four_hours;
+                                                TextView textView8 = (TextView) view.findViewById(R.id.option_twenty_four_hours);
                                                 if (textView8 != null) {
-                                                    i = 2131365386;
-                                                    TextView textView9 = (TextView) view.findViewById(2131365386);
+                                                    i = R.id.subtitle;
+                                                    TextView textView9 = (TextView) view.findViewById(R.id.subtitle);
                                                     if (textView9 != null) {
-                                                        i = 2131365561;
-                                                        TextView textView10 = (TextView) view.findViewById(2131365561);
+                                                        i = R.id.title;
+                                                        TextView textView10 = (TextView) view.findViewById(R.id.title);
                                                         if (textView10 != null) {
-                                                            i = 2131365618;
-                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365618);
+                                                            i = R.id.unmute_button;
+                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.unmute_button);
                                                             if (linearLayout3 != null) {
-                                                                i = 2131365619;
-                                                                TextView textView11 = (TextView) view.findViewById(2131365619);
+                                                                i = R.id.unmute_button_details_label;
+                                                                TextView textView11 = (TextView) view.findViewById(R.id.unmute_button_details_label);
                                                                 if (textView11 != null) {
-                                                                    i = 2131365620;
-                                                                    TextView textView12 = (TextView) view.findViewById(2131365620);
+                                                                    i = R.id.unmute_button_label;
+                                                                    TextView textView12 = (TextView) view.findViewById(R.id.unmute_button_label);
                                                                     if (textView12 != null) {
                                                                         return new WidgetMuteSettingsSheetBinding((NestedScrollView) view, textView, linearLayout, linearLayout2, frameLayout, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, linearLayout3, textView11, textView12);
                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.java
index 1ceca1eed9..1f76b7b657 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureNotificationSettings$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings;
 
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -26,6 +27,6 @@ public final class WidgetMuteSettingsSheet$configureNotificationSettings$1 exten
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.d = Integer.valueOf(ColorCompat.getColor(this.this$0.requireContext(), 2131100329));
+        renderContext.d = Integer.valueOf(ColorCompat.getColor(this.this$0.requireContext(), (int) R.color.status_red_500));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1.java
index 028a7fe107..0d95d8b6d0 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.settings;
 
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
@@ -29,6 +30,6 @@ public final class WidgetMuteSettingsSheet$configureUnmuteButton$boldRenderConte
         m.checkNotNullParameter(renderContext, "$receiver");
         TextView textView = WidgetMuteSettingsSheet.access$getBinding$p(this.this$0).q;
         m.checkNotNullExpressionValue(textView, "binding.unmuteButtonLabel");
-        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(textView, 2130968932));
+        renderContext.d = Integer.valueOf(ColorCompat.getThemedColor(textView, (int) R.attr.colorHeaderPrimary));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
index f0c31d6d4c..09a57abdc7 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
@@ -14,6 +14,7 @@ import c.a.e.j0;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetMuteSettingsSheetBinding;
 import com.discord.models.domain.ModelNotificationSettings;
@@ -55,7 +56,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetMuteSettingsSheet widgetMuteSettingsSheet = new WidgetMuteSettingsSheet();
             Bundle bundle = new Bundle();
-            bundle.putLong("ARG_CHANNEL_ID", j);
+            bundle.putLong(WidgetMuteSettingsSheet.ARG_CHANNEL_ID, j);
             widgetMuteSettingsSheet.setArguments(bundle);
             widgetMuteSettingsSheet.show(fragmentManager, WidgetMuteSettingsSheet.class.getName());
         }
@@ -64,7 +65,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetMuteSettingsSheet widgetMuteSettingsSheet = new WidgetMuteSettingsSheet();
             Bundle bundle = new Bundle();
-            bundle.putLong("ARG_GUILD_ID", j);
+            bundle.putLong(WidgetMuteSettingsSheet.ARG_GUILD_ID, j);
             widgetMuteSettingsSheet.setArguments(bundle);
             widgetMuteSettingsSheet.show(fragmentManager, WidgetMuteSettingsSheet.class.getName());
         }
@@ -134,7 +135,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.notificationSettingsOverridesLabel");
         int notificationOverride = loaded.getNotificationOverride();
-        textView.setText(notificationOverride == ModelNotificationSettings.FREQUENCY_ALL ? b.k(this, 2131888643, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_MENTIONS ? b.k(this, 2131888744, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_NOTHING ? b.k(this, 2131888738, new Object[0], null, 4) : "");
+        textView.setText(notificationOverride == ModelNotificationSettings.FREQUENCY_ALL ? b.k(this, R.string.form_label_all_messages_short, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_MENTIONS ? b.k(this, R.string.form_label_only_mentions_short, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_NOTHING ? b.k(this, R.string.form_label_nothing, new Object[0], null, 4) : "");
         int ordinal = loaded.getSettingsType().ordinal();
         if (ordinal != 0) {
             boolean z2 = true;
@@ -152,7 +153,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
                     textView3.setVisibility(0);
                     TextView textView4 = getBinding().b;
                     m.checkNotNullExpressionValue(textView4, "binding.channelMutedDetails");
-                    textView4.setText(loaded.isChannelMuted() ? b.k(this, 2131888594, new Object[0], null, 4) : b.e(this, 2131888708, new Object[0], new WidgetMuteSettingsSheet$configureNotificationSettings$1(this)));
+                    textView4.setText(loaded.isChannelMuted() ? b.k(this, R.string.form_description_mobile_notification_muted, new Object[0], null, 4) : b.e(this, R.string.form_label_mobile_channel_override_guild_muted, new Object[0], new WidgetMuteSettingsSheet$configureNotificationSettings$1(this)));
                 } else {
                     TextView textView5 = getBinding().f;
                     m.checkNotNullExpressionValue(textView5, "binding.notificationSettingsLabel");
@@ -182,16 +183,16 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
         if (loaded.isChannelMuted()) {
             TextView textView = getBinding().q;
             m.checkNotNullExpressionValue(textView, "binding.unmuteButtonLabel");
-            b.m(textView, 2131894506, new Object[]{loaded.getSubtitle()}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
+            b.m(textView, R.string.unmute_channel, new Object[]{loaded.getSubtitle()}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
             TextView textView2 = getBinding().p;
             m.checkNotNullExpressionValue(textView2, "binding.unmuteButtonDetailsLabel");
             int ordinal = loaded.getSettingsType().ordinal();
             if (ordinal == 1 || ordinal == 2) {
                 String muteEndTime = loaded.getMuteEndTime();
-                charSequence = muteEndTime == null ? b.e(this, 2131888710, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.e(this, 2131888711, new Object[]{parseMuteEndtime(muteEndTime)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
+                charSequence = muteEndTime == null ? b.e(this, R.string.form_label_mobile_dm_muted, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.e(this, R.string.form_label_mobile_dm_muted_until, new Object[]{parseMuteEndtime(muteEndTime)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
             } else {
                 String muteEndTime2 = loaded.getMuteEndTime();
-                charSequence = muteEndTime2 == null ? b.e(this, 2131888705, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.e(this, 2131888706, new Object[]{parseMuteEndtime(muteEndTime2)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
+                charSequence = muteEndTime2 == null ? b.e(this, R.string.form_label_mobile_channel_muted, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.e(this, R.string.form_label_mobile_channel_muted_until, new Object[]{parseMuteEndtime(muteEndTime2)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
             }
             textView2.setText(charSequence);
             LinearLayout linearLayout = getBinding().o;
@@ -245,11 +246,11 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
             MuteSettingsSheetViewModel.ViewState.Loaded loaded = (MuteSettingsSheetViewModel.ViewState.Loaded) viewState;
             int ordinal = loaded.getSettingsType().ordinal();
             CharSequence charSequence = null;
-            Integer num = ordinal != 0 ? (ordinal == 1 || ordinal == 2) ? 2131891634 : ordinal != 3 ? ordinal != 4 ? null : 2131891631 : 2131891632 : 2131891633;
+            Integer valueOf = ordinal != 0 ? (ordinal == 1 || ordinal == 2) ? Integer.valueOf((int) R.string.mute_settings_mute_this_conversation) : ordinal != 3 ? ordinal != 4 ? null : Integer.valueOf((int) R.string.mute_settings_mute_category) : Integer.valueOf((int) R.string.mute_settings_mute_channel) : Integer.valueOf((int) R.string.mute_settings_mute_server);
             TextView textView = getBinding().n;
             m.checkNotNullExpressionValue(textView, "binding.title");
-            if (num != null) {
-                charSequence = b.k(this, num.intValue(), new Object[0], null, 4);
+            if (valueOf != null) {
+                charSequence = b.k(this, valueOf.intValue(), new Object[0], null, 4);
             }
             textView.setText(charSequence);
             TextView textView2 = getBinding().m;
@@ -258,7 +259,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
             configureUnmuteButton(loaded);
             configureNotificationSettings(loaded);
         } else if (viewState instanceof MuteSettingsSheetViewModel.ViewState.Failure) {
-            o.i(this, 2131888073, 0, 4);
+            o.i(this, R.string.default_failure_to_perform_action_message, 0, 4);
             dismiss();
         }
     }
@@ -274,7 +275,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559148;
+        return R.layout.widget_mute_settings_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java
index c8bbf8a7bc..aac6347d22 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsBinding;
 import com.discord.views.StatusView;
 import com.discord.widgets.user.profile.UserProfileHeaderView;
@@ -20,119 +21,119 @@ public final /* synthetic */ class WidgetSettings$binding$2 extends k implements
 
     public final WidgetSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361822;
-        TextView textView = (TextView) view.findViewById(2131361822);
+        int i = R.id.accessibility;
+        TextView textView = (TextView) view.findViewById(R.id.accessibility);
         if (textView != null) {
-            i = 2131361859;
-            TextView textView2 = (TextView) view.findViewById(2131361859);
+            i = R.id.account;
+            TextView textView2 = (TextView) view.findViewById(R.id.account);
             if (textView2 != null) {
-                i = 2131361861;
-                TextView textView3 = (TextView) view.findViewById(2131361861);
+                i = R.id.acknowledgements;
+                TextView textView3 = (TextView) view.findViewById(R.id.acknowledgements);
                 if (textView3 != null) {
-                    i = 2131361903;
-                    TextView textView4 = (TextView) view.findViewById(2131361903);
+                    i = R.id.activity_status;
+                    TextView textView4 = (TextView) view.findViewById(R.id.activity_status);
                     if (textView4 != null) {
-                        i = 2131361976;
-                        TextView textView5 = (TextView) view.findViewById(2131361976);
+                        i = R.id.app_info_header;
+                        TextView textView5 = (TextView) view.findViewById(R.id.app_info_header);
                         if (textView5 != null) {
-                            i = 2131361977;
-                            TextView textView6 = (TextView) view.findViewById(2131361977);
+                            i = R.id.app_settings_header;
+                            TextView textView6 = (TextView) view.findViewById(R.id.app_settings_header);
                             if (textView6 != null) {
-                                i = 2131361982;
-                                TextView textView7 = (TextView) view.findViewById(2131361982);
+                                i = R.id.appearance;
+                                TextView textView7 = (TextView) view.findViewById(R.id.appearance);
                                 if (textView7 != null) {
-                                    i = 2131362073;
-                                    TextView textView8 = (TextView) view.findViewById(2131362073);
+                                    i = R.id.authorized_apps;
+                                    TextView textView8 = (TextView) view.findViewById(R.id.authorized_apps);
                                     if (textView8 != null) {
-                                        i = 2131362120;
-                                        TextView textView9 = (TextView) view.findViewById(2131362120);
+                                        i = R.id.behavior;
+                                        TextView textView9 = (TextView) view.findViewById(R.id.behavior);
                                         if (textView9 != null) {
-                                            i = 2131362281;
-                                            TextView textView10 = (TextView) view.findViewById(2131362281);
+                                            i = R.id.changelog;
+                                            TextView textView10 = (TextView) view.findViewById(R.id.changelog);
                                             if (textView10 != null) {
-                                                i = 2131362733;
-                                                TextView textView11 = (TextView) view.findViewById(2131362733);
+                                                i = R.id.connections;
+                                                TextView textView11 = (TextView) view.findViewById(R.id.connections);
                                                 if (textView11 != null) {
-                                                    i = 2131362914;
-                                                    TextView textView12 = (TextView) view.findViewById(2131362914);
+                                                    i = R.id.developer_options;
+                                                    TextView textView12 = (TextView) view.findViewById(R.id.developer_options);
                                                     if (textView12 != null) {
-                                                        i = 2131362915;
-                                                        View findViewById = view.findViewById(2131362915);
+                                                        i = R.id.developer_options_divider;
+                                                        View findViewById = view.findViewById(R.id.developer_options_divider);
                                                         if (findViewById != null) {
-                                                            i = 2131362916;
-                                                            TextView textView13 = (TextView) view.findViewById(2131362916);
+                                                            i = R.id.developer_options_header;
+                                                            TextView textView13 = (TextView) view.findViewById(R.id.developer_options_header);
                                                             if (textView13 != null) {
-                                                                i = 2131363944;
-                                                                TextView textView14 = (TextView) view.findViewById(2131363944);
+                                                                i = R.id.language;
+                                                                TextView textView14 = (TextView) view.findViewById(R.id.language);
                                                                 if (textView14 != null) {
-                                                                    i = 2131364228;
-                                                                    TextView textView15 = (TextView) view.findViewById(2131364228);
+                                                                    i = R.id.nitro_boosting;
+                                                                    TextView textView15 = (TextView) view.findViewById(R.id.nitro_boosting);
                                                                     if (textView15 != null) {
-                                                                        i = 2131364229;
-                                                                        TextView textView16 = (TextView) view.findViewById(2131364229);
+                                                                        i = R.id.nitro_gifting;
+                                                                        TextView textView16 = (TextView) view.findViewById(R.id.nitro_gifting);
                                                                         if (textView16 != null) {
-                                                                            i = 2131364226;
-                                                                            TextView textView17 = (TextView) view.findViewById(2131364226);
+                                                                            i = R.id.nitroGiftingBadge;
+                                                                            TextView textView17 = (TextView) view.findViewById(R.id.nitroGiftingBadge);
                                                                             if (textView17 != null) {
-                                                                                i = 2131364227;
-                                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364227);
+                                                                                i = R.id.nitroGiftingContainer;
+                                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.nitroGiftingContainer);
                                                                                 if (linearLayout != null) {
-                                                                                    i = 2131364230;
-                                                                                    TextView textView18 = (TextView) view.findViewById(2131364230);
+                                                                                    i = R.id.nitro_header;
+                                                                                    TextView textView18 = (TextView) view.findViewById(R.id.nitro_header);
                                                                                     if (textView18 != null) {
-                                                                                        i = 2131364231;
-                                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364231);
+                                                                                        i = R.id.nitro_settings_container;
+                                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.nitro_settings_container);
                                                                                         if (linearLayout2 != null) {
-                                                                                            i = 2131364264;
-                                                                                            TextView textView19 = (TextView) view.findViewById(2131364264);
+                                                                                            i = R.id.notifications;
+                                                                                            TextView textView19 = (TextView) view.findViewById(R.id.notifications);
                                                                                             if (textView19 != null) {
-                                                                                                i = 2131364551;
-                                                                                                TextView textView20 = (TextView) view.findViewById(2131364551);
+                                                                                                i = R.id.privacy;
+                                                                                                TextView textView20 = (TextView) view.findViewById(R.id.privacy);
                                                                                                 if (textView20 != null) {
-                                                                                                    i = 2131364571;
-                                                                                                    LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364571);
+                                                                                                    i = R.id.profile;
+                                                                                                    LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.profile);
                                                                                                     if (linearLayout3 != null) {
-                                                                                                        i = 2131364576;
-                                                                                                        TextView textView21 = (TextView) view.findViewById(2131364576);
+                                                                                                        i = R.id.profile_new_badge;
+                                                                                                        TextView textView21 = (TextView) view.findViewById(R.id.profile_new_badge);
                                                                                                         if (textView21 != null) {
-                                                                                                            i = 2131364577;
-                                                                                                            TextView textView22 = (TextView) view.findViewById(2131364577);
+                                                                                                            i = R.id.profile_text;
+                                                                                                            TextView textView22 = (TextView) view.findViewById(R.id.profile_text);
                                                                                                             if (textView22 != null) {
-                                                                                                                i = 2131364610;
-                                                                                                                TextView textView23 = (TextView) view.findViewById(2131364610);
+                                                                                                                i = R.id.qr_scanner;
+                                                                                                                TextView textView23 = (TextView) view.findViewById(R.id.qr_scanner);
                                                                                                                 if (textView23 != null) {
-                                                                                                                    i = 2131364968;
-                                                                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364968);
+                                                                                                                    i = R.id.set_status_container;
+                                                                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.set_status_container);
                                                                                                                     if (linearLayout4 != null) {
-                                                                                                                        i = 2131365050;
-                                                                                                                        TextView textView24 = (TextView) view.findViewById(2131365050);
+                                                                                                                        i = R.id.settings_billing;
+                                                                                                                        TextView textView24 = (TextView) view.findViewById(R.id.settings_billing);
                                                                                                                         if (textView24 != null) {
-                                                                                                                            i = 2131365097;
-                                                                                                                            TextView textView25 = (TextView) view.findViewById(2131365097);
+                                                                                                                            i = R.id.settings_nitro;
+                                                                                                                            TextView textView25 = (TextView) view.findViewById(R.id.settings_nitro);
                                                                                                                             if (textView25 != null) {
-                                                                                                                                i = 2131365106;
-                                                                                                                                TextView textView26 = (TextView) view.findViewById(2131365106);
+                                                                                                                                i = R.id.settings_presence_text;
+                                                                                                                                TextView textView26 = (TextView) view.findViewById(R.id.settings_presence_text);
                                                                                                                                 if (textView26 != null) {
-                                                                                                                                    i = 2131365129;
-                                                                                                                                    StatusView statusView = (StatusView) view.findViewById(2131365129);
+                                                                                                                                    i = R.id.settings_status_view;
+                                                                                                                                    StatusView statusView = (StatusView) view.findViewById(R.id.settings_status_view);
                                                                                                                                     if (statusView != null) {
-                                                                                                                                        i = 2131365404;
-                                                                                                                                        TextView textView27 = (TextView) view.findViewById(2131365404);
+                                                                                                                                        i = R.id.support;
+                                                                                                                                        TextView textView27 = (TextView) view.findViewById(R.id.support);
                                                                                                                                         if (textView27 != null) {
-                                                                                                                                            i = 2131365473;
-                                                                                                                                            TextView textView28 = (TextView) view.findViewById(2131365473);
+                                                                                                                                            i = R.id.text_images_settings;
+                                                                                                                                            TextView textView28 = (TextView) view.findViewById(R.id.text_images_settings);
                                                                                                                                             if (textView28 != null) {
-                                                                                                                                                i = 2131365631;
-                                                                                                                                                TextView textView29 = (TextView) view.findViewById(2131365631);
+                                                                                                                                                i = R.id.upload_debug_logs;
+                                                                                                                                                TextView textView29 = (TextView) view.findViewById(R.id.upload_debug_logs);
                                                                                                                                                 if (textView29 != null) {
-                                                                                                                                                    i = 2131365700;
-                                                                                                                                                    TextView textView30 = (TextView) view.findViewById(2131365700);
+                                                                                                                                                    i = R.id.user_settings_header;
+                                                                                                                                                    TextView textView30 = (TextView) view.findViewById(R.id.user_settings_header);
                                                                                                                                                     if (textView30 != null) {
-                                                                                                                                                        i = 2131365702;
-                                                                                                                                                        UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365702);
+                                                                                                                                                        i = R.id.user_settings_profile_header_view;
+                                                                                                                                                        UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(R.id.user_settings_profile_header_view);
                                                                                                                                                         if (userProfileHeaderView != null) {
-                                                                                                                                                            i = 2131365806;
-                                                                                                                                                            TextView textView31 = (TextView) view.findViewById(2131365806);
+                                                                                                                                                            i = R.id.voice;
+                                                                                                                                                            TextView textView31 = (TextView) view.findViewById(R.id.voice);
                                                                                                                                                             if (textView31 != null) {
                                                                                                                                                                 return new WidgetSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, findViewById, textView13, textView14, textView15, textView16, textView17, linearLayout, textView18, linearLayout2, textView19, textView20, linearLayout3, textView21, textView22, textView23, linearLayout4, textView24, textView25, textView26, statusView, textView27, textView28, textView29, textView30, userProfileHeaderView, textView31);
                                                                                                                                                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
index 45d041ed80..490d8c52c4 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.debugging.WidgetDebugging;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -16,12 +17,12 @@ public final class WidgetSettings$configureToolbar$1<T1, T2> implements Action2<
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364117:
+            case R.id.menu_settings_debugging /* 2131364117 */:
                 WidgetDebugging.Companion companion = WidgetDebugging.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launch(context);
                 return;
-            case 2131364118:
+            case R.id.menu_settings_log_out /* 2131364118 */:
                 WidgetSettings widgetSettings = this.this$0;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetSettings.access$showLogoutDialog(widgetSettings, context);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$5.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$5.java
index 8592db663c..b99be69d36 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$5.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$5.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsBinding;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPI;
@@ -54,10 +55,10 @@ public final class WidgetSettings$onViewBound$$inlined$with$lambda$5 implements
             m.checkNotNullExpressionValue(textView2, "uploadDebugLogs");
             if (z2) {
                 widgetSettings = this.this$0.this$0;
-                i = 2131894573;
+                i = R.string.upload_debug_logs;
             } else {
                 widgetSettings = this.this$0.this$0;
-                i = 2131895103;
+                i = R.string.working;
             }
             textView2.setText(widgetSettings.getString(i));
         }
@@ -85,7 +86,7 @@ public final class WidgetSettings$onViewBound$$inlined$with$lambda$5 implements
         }
 
         public final void invoke(Void r4) {
-            c.a.e.o.i(this.this$0.this$0, 2131894571, 0, 4);
+            c.a.e.o.i(this.this$0.this$0, R.string.upload_debug_log_success, 0, 4);
             AnonymousClass1.invoke$default(this.$updateUploadDebugLogsUI$1, false, 1, null);
         }
     }
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 8a6f145672..a2fa453f28 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
@@ -13,6 +13,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsBinding;
 import com.discord.models.presence.Presence;
@@ -26,6 +27,7 @@ import com.discord.utilities.user.UserUtils;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.widgets.notice.WidgetNoticeDialog;
+import com.discord.widgets.settings.profile.WidgetSettingsUserProfile;
 import com.discord.widgets.tabs.NavigationTab;
 import com.discord.widgets.tabs.OnTabSelectedListener;
 import com.discord.widgets.tabs.WidgetTabsHost;
@@ -214,7 +216,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
     }
 
     public WidgetSettings() {
-        super(2131559240);
+        super(R.layout.widget_settings);
         WidgetSettings$viewModelUserProfileHeader$2 widgetSettings$viewModelUserProfileHeader$2 = WidgetSettings$viewModelUserProfileHeader$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModelUserProfileHeader$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(UserProfileHeaderViewModel.class), new WidgetSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettings$viewModelUserProfileHeader$2));
@@ -235,9 +237,9 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
 
     private final void configureToolbar() {
         AppFragment.bindToolbar$default(this, null, 1, null);
-        setActionBarTitle(2131894701);
+        setActionBarTitle(R.string.user_settings);
         setActionBarTitleLayoutMinimumTappableArea();
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623962, new WidgetSettings$configureToolbar$1(this), null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_settings, new WidgetSettings$configureToolbar$1(this), null, 4, null);
     }
 
     private final void configureUI(Model model) {
@@ -263,10 +265,10 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         linearLayout.setVisibility(isVerified ? 0 : 8);
         TextView textView3 = binding.B;
         m.checkNotNullExpressionValue(textView3, "settingsNitro");
-        textView3.setText(getString(hasSubscription ? 2131886919 : 2131892627));
+        textView3.setText(getString(hasSubscription ? R.string.billing_manage_subscription : R.string.premium_settings_subscribe_today));
         TextView textView4 = binding.q;
         m.checkNotNullExpressionValue(textView4, "nitroBoosting");
-        textView4.setText(getString(hasSubscription ? 2131892378 : 2131892621));
+        textView4.setText(getString(hasSubscription ? R.string.premium_guild_perks_modal_manage_your_subscriptions : R.string.premium_settings_premium_guild_subscriptions));
         Presence presence = model.getPresence();
         binding.D.setPresence(presence);
         TextView textView5 = binding.C;
@@ -279,7 +281,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
             TextView textView7 = binding.r;
             m.checkNotNullExpressionValue(textView7, "nitroGiftingBadge");
             MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(new ShapeAppearanceModel.Builder().setAllCornerSizes(ShapeAppearanceModel.PILL).build());
-            materialShapeDrawable.setFillColor(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), 2131100329)));
+            materialShapeDrawable.setFillColor(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.status_red_500)));
             textView7.setBackground(materialShapeDrawable);
             TextView textView8 = binding.r;
             m.checkNotNullExpressionValue(textView8, "nitroGiftingBadge");
@@ -292,7 +294,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         LinearLayout linearLayout2 = getBinding().f1954x;
         m.checkNotNullExpressionValue(linearLayout2, "binding.profile");
         linearLayout2.setVisibility(model.isCustomProfilesEditingEnabled() ? 0 : 8);
-        boolean z3 = this.sharedPreferences.getBoolean("USER_PROFILE_SETTINGS_VIEWED_CACHE_KEY", false);
+        boolean z3 = this.sharedPreferences.getBoolean(WidgetSettingsUserProfile.USER_PROFILE_SETTINGS_VIEWED_CACHE_KEY, false);
         TextView textView10 = getBinding().f1955y;
         m.checkNotNullExpressionValue(textView10, "binding.profileNewBadge");
         if (!(!z3)) {
@@ -312,7 +314,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
     private final void showLogoutDialog(Context context) {
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131891202).setMessage(2131894755).setDialogAttrTheme(2130969796).setPositiveButton(2131891202, WidgetSettings$showLogoutDialog$1.INSTANCE), 2131887193, (Function1) null, 2, (Object) null).show(parentFragmentManager);
+        WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(R.string.logout).setMessage(R.string.user_settings_confirm_logout).setDialogAttrTheme(R.attr.notice_theme_positive_red).setPositiveButton(R.string.logout, WidgetSettings$showLogoutDialog$1.INSTANCE), (int) R.string.cancel, (Function1) null, 2, (Object) null).show(parentFragmentManager);
     }
 
     @Override // com.discord.widgets.tabs.OnTabSelectedListener
@@ -343,7 +345,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         binding.I.setOnBannerPress(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this));
         TextView textView = binding.f;
         m.checkNotNullExpressionValue(textView, "appInfoHeader");
-        String string = getString(2131886363);
+        String string = getString(R.string.app_information);
         textView.setText(string + " - 87.3 - Alpha (87203)");
         binding.f1956z.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
         binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java
index e9429d4dda..aee32c47e6 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAccessibilityBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
@@ -20,41 +21,41 @@ public final /* synthetic */ class WidgetSettingsAccessibility$binding$2 extends
 
     public final WidgetSettingsAccessibilityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364976;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364976);
+        int i = R.id.settings_accessibility_allow_animate_emoji_switch;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_accessibility_allow_animate_emoji_switch);
         if (checkedSetting != null) {
-            i = 2131364977;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364977);
+            i = R.id.settings_accessibility_allow_autoplay_gif_switch;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.settings_accessibility_allow_autoplay_gif_switch);
             if (checkedSetting2 != null) {
-                i = 2131364978;
-                TextView textView = (TextView) view.findViewById(2131364978);
+                i = R.id.settings_accessibility_images_header;
+                TextView textView = (TextView) view.findViewById(R.id.settings_accessibility_images_header);
                 if (textView != null) {
-                    i = 2131364979;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364979);
+                    i = R.id.settings_accessibility_reduced_motion_description;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.settings_accessibility_reduced_motion_description);
                     if (linkifiedTextView != null) {
-                        i = 2131364980;
-                        TextView textView2 = (TextView) view.findViewById(2131364980);
+                        i = R.id.settings_accessibility_reduced_motion_header;
+                        TextView textView2 = (TextView) view.findViewById(R.id.settings_accessibility_reduced_motion_header);
                         if (textView2 != null) {
-                            i = 2131364981;
-                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364981);
+                            i = R.id.settings_accessibility_reduced_motion_switch;
+                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.settings_accessibility_reduced_motion_switch);
                             if (checkedSetting3 != null) {
-                                i = 2131364982;
-                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364982);
+                                i = R.id.settings_accessibility_stickers_container;
+                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_accessibility_stickers_container);
                                 if (linearLayout != null) {
-                                    i = 2131364983;
-                                    TextView textView3 = (TextView) view.findViewById(2131364983);
+                                    i = R.id.settings_accessibility_stickers_header;
+                                    TextView textView3 = (TextView) view.findViewById(R.id.settings_accessibility_stickers_header);
                                     if (textView3 != null) {
-                                        i = 2131365035;
-                                        View findViewById = view.findViewById(2131365035);
+                                        i = R.id.settings_appearance_holy_light;
+                                        View findViewById = view.findViewById(R.id.settings_appearance_holy_light);
                                         if (findViewById != null) {
-                                            i = 2131365363;
-                                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131365363);
+                                            i = R.id.stickers_always_animate;
+                                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.stickers_always_animate);
                                             if (checkedSetting4 != null) {
-                                                i = 2131365364;
-                                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131365364);
+                                                i = R.id.stickers_animate_on_interaction;
+                                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.stickers_animate_on_interaction);
                                                 if (checkedSetting5 != null) {
-                                                    i = 2131365365;
-                                                    CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365365);
+                                                    i = R.id.stickers_never_animate;
+                                                    CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.stickers_never_animate);
                                                     if (checkedSetting6 != null) {
                                                         return new WidgetSettingsAccessibilityBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, textView, linkifiedTextView, textView2, checkedSetting3, linearLayout, textView3, findViewById, checkedSetting4, checkedSetting5, checkedSetting6);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
index c205851218..755b95f200 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
@@ -7,6 +7,7 @@ import c.a.e.f;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsAccessibilityBinding;
 import com.discord.stores.StoreStream;
@@ -179,7 +180,7 @@ public final class WidgetSettingsAccessibility extends AppFragment {
     }
 
     public WidgetSettingsAccessibility() {
-        super(2131559241);
+        super(R.layout.widget_settings_accessibility);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccessibility widgetSettingsAccessibility, Model model) {
@@ -203,12 +204,12 @@ public final class WidgetSettingsAccessibility extends AppFragment {
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsAccessibilityReducedMotionSwitch");
         checkedSetting.setChecked(model.getReducedMotionEnabled());
         if (model.getReducedMotionEnabled()) {
-            getBinding().b.b(2131886133);
+            getBinding().b.b(R.string.accessibility_reduced_motion_settings_override);
             CheckedSetting checkedSetting2 = getBinding().b;
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsAccessib…tyAllowAnimateEmojiSwitch");
             checkedSetting2.setChecked(false);
             for (CheckedSetting checkedSetting3 : n.listOf((Object[]) new CheckedSetting[]{getBinding().i, getBinding().j, getBinding().k})) {
-                checkedSetting3.b(2131894000);
+                checkedSetting3.b(R.string.stickers_auto_play_help_disabled);
             }
             if (model.getCurrentStickerAnimationSettings() != 2) {
                 RadioManager radioManager = this.stickersAnimationRadioManager;
@@ -228,7 +229,7 @@ public final class WidgetSettingsAccessibility extends AppFragment {
             CheckedSetting checkedSetting6 = getBinding().f1938c;
             m.checkNotNullExpressionValue(checkedSetting6, "binding.settingsAccessib…ityAllowAutoplayGifSwitch");
             checkedSetting6.setChecked(false);
-            getBinding().f1938c.b(2131886133);
+            getBinding().f1938c.b(R.string.accessibility_reduced_motion_settings_override);
             return;
         }
         CheckedSetting checkedSetting7 = getBinding().b;
@@ -261,13 +262,13 @@ public final class WidgetSettingsAccessibility extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(), this, null, 2, null), WidgetSettingsAccessibility.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAccessibility$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        setActionBarTitle(2131886116);
-        setActionBarSubtitle(2131894701);
+        setActionBarTitle(R.string.accessibility);
+        setActionBarSubtitle(R.string.user_settings);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         getBinding().g.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$2.INSTANCE);
         LinkifiedTextView linkifiedTextView = getBinding().e;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsAccessib…yReducedMotionDescription");
-        b.n(linkifiedTextView, 2131886131, new Object[]{f.a.a(360040613412L, null)}, null, 4);
+        b.n(linkifiedTextView, R.string.accessibility_prefers_reduced_motion_description, new Object[]{f.a.a(360040613412L, null)}, null, 4);
         getBinding().b.setOnCheckedListener(new WidgetSettingsAccessibility$onViewBoundOrOnResume$3(this));
         getBinding().f1938c.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$4.INSTANCE);
         this.stickersAnimationRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().i, getBinding().j, getBinding().k}));
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java
index 422870693d..49c0a96a35 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsActivityStatusBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetSettingsActivityStatus$binding$2 extend
 
     public final WidgetSettingsActivityStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365182);
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.show_current_activity);
         if (checkedSetting != null) {
             return new WidgetSettingsActivityStatusBinding((CoordinatorLayout) view, checkedSetting);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365182)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.show_current_activity)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java
index 027c2ed3f6..217a2f1f1f 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsActivityStatusBinding;
 import com.discord.stores.StoreStream;
@@ -39,7 +40,7 @@ public final class WidgetSettingsActivityStatus extends AppFragment {
     }
 
     public WidgetSettingsActivityStatus() {
-        super(2131559248);
+        super(R.layout.widget_settings_activity_status);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsActivityStatus widgetSettingsActivityStatus, boolean z2) {
@@ -61,8 +62,8 @@ public final class WidgetSettingsActivityStatus extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131886234);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.activity_status);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java
index c83ad4c893..6ed1efae09 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetChatListAdapterItemTextBinding;
 import com.discord.databinding.WidgetSettingsAppearanceBinding;
 import com.discord.views.CheckedSetting;
@@ -21,51 +22,51 @@ public final /* synthetic */ class WidgetSettingsAppearance$binding$2 extends k
 
     public final WidgetSettingsAppearanceBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362536;
-        View findViewById = view.findViewById(2131362536);
+        int i = R.id.chat_item;
+        View findViewById = view.findViewById(R.id.chat_item);
         if (findViewById != null) {
             WidgetChatListAdapterItemTextBinding a = WidgetChatListAdapterItemTextBinding.a(findViewById);
-            i = 2131365028;
-            TextView textView = (TextView) view.findViewById(2131365028);
+            i = R.id.settings_appearance_font_scale_header;
+            TextView textView = (TextView) view.findViewById(R.id.settings_appearance_font_scale_header);
             if (textView != null) {
-                i = 2131365029;
-                TextView textView2 = (TextView) view.findViewById(2131365029);
+                i = R.id.settings_appearance_font_scale_platform;
+                TextView textView2 = (TextView) view.findViewById(R.id.settings_appearance_font_scale_platform);
                 if (textView2 != null) {
-                    i = 2131365030;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365030);
+                    i = R.id.settings_appearance_font_scaling_container;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_appearance_font_scaling_container);
                     if (linearLayout != null) {
-                        i = 2131365031;
-                        TextView textView3 = (TextView) view.findViewById(2131365031);
+                        i = R.id.settings_appearance_font_scaling_reset;
+                        TextView textView3 = (TextView) view.findViewById(R.id.settings_appearance_font_scaling_reset);
                         if (textView3 != null) {
-                            i = 2131365032;
-                            SeekBar seekBar = (SeekBar) view.findViewById(2131365032);
+                            i = R.id.settings_appearance_font_scaling_seekbar;
+                            SeekBar seekBar = (SeekBar) view.findViewById(R.id.settings_appearance_font_scaling_seekbar);
                             if (seekBar != null) {
-                                i = 2131365033;
-                                TextView textView4 = (TextView) view.findViewById(2131365033);
+                                i = R.id.settings_appearance_font_scaling_seekbar_text_left;
+                                TextView textView4 = (TextView) view.findViewById(R.id.settings_appearance_font_scaling_seekbar_text_left);
                                 if (textView4 != null) {
-                                    i = 2131365034;
-                                    TextView textView5 = (TextView) view.findViewById(2131365034);
+                                    i = R.id.settings_appearance_font_scaling_seekbar_text_right;
+                                    TextView textView5 = (TextView) view.findViewById(R.id.settings_appearance_font_scaling_seekbar_text_right);
                                     if (textView5 != null) {
-                                        i = 2131365035;
-                                        View findViewById2 = view.findViewById(2131365035);
+                                        i = R.id.settings_appearance_holy_light;
+                                        View findViewById2 = view.findViewById(R.id.settings_appearance_holy_light);
                                         if (findViewById2 != null) {
-                                            i = 2131365036;
-                                            TextView textView6 = (TextView) view.findViewById(2131365036);
+                                            i = R.id.settings_appearance_sync_header;
+                                            TextView textView6 = (TextView) view.findViewById(R.id.settings_appearance_sync_header);
                                             if (textView6 != null) {
-                                                i = 2131365037;
-                                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365037);
+                                                i = R.id.settings_appearance_sync_switch;
+                                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_appearance_sync_switch);
                                                 if (checkedSetting != null) {
-                                                    i = 2131365038;
-                                                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365038);
+                                                    i = R.id.settings_appearance_theme_dark_radio;
+                                                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.settings_appearance_theme_dark_radio);
                                                     if (checkedSetting2 != null) {
-                                                        i = 2131365039;
-                                                        TextView textView7 = (TextView) view.findViewById(2131365039);
+                                                        i = R.id.settings_appearance_theme_header;
+                                                        TextView textView7 = (TextView) view.findViewById(R.id.settings_appearance_theme_header);
                                                         if (textView7 != null) {
-                                                            i = 2131365040;
-                                                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365040);
+                                                            i = R.id.settings_appearance_theme_light_radio;
+                                                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.settings_appearance_theme_light_radio);
                                                             if (checkedSetting3 != null) {
-                                                                i = 2131365041;
-                                                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131365041);
+                                                                i = R.id.settings_appearance_theme_pure_evil_switch;
+                                                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.settings_appearance_theme_pure_evil_switch);
                                                                 if (checkedSetting4 != null) {
                                                                     return new WidgetSettingsAppearanceBinding((CoordinatorLayout) view, a, textView, textView2, linearLayout, textView3, seekBar, textView4, textView5, findViewById2, textView6, checkedSetting, checkedSetting2, textView7, checkedSetting3, checkedSetting4);
                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java
index 4e902528cf..8cbb28db01 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import c.a.e.o;
 import c.a.l.b;
 import c.q.a.k.a;
+import com.discord.R;
 import com.discord.utilities.views.ViewCoroutineScopeKt;
 import com.discord.widgets.settings.WidgetSettingsAppearance;
 import d0.l;
@@ -83,9 +84,9 @@ public final class WidgetSettingsAppearance$configureUI$2 implements View.OnClic
                 }
             } else if (3 <= andIncrement && 8 > andIncrement) {
                 m.checkNotNullExpressionValue(view, "it");
-                o.h(view.getContext(), b.k(this.this$0, 2131894265, new Object[]{String.valueOf(8 - andIncrement)}, null, 4), 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0), 4);
+                o.h(view.getContext(), b.k(this.this$0, R.string.theme_pure_evil_easter_hint, new Object[]{String.valueOf(8 - andIncrement)}, null, 4), 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0), 4);
             } else if (andIncrement == 8) {
-                o.d(this.this$0.getContext(), 2131894266, 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0));
+                o.d(this.this$0.getContext(), R.string.theme_pure_evil_easter_reveal, 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0));
                 WidgetSettingsAppearance.access$getPureEvilEasterEggSubject$p(this.this$0).onNext(Boolean.TRUE);
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.java
index 58bc231f9e..aa45950681 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$3.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings;
 
+import com.discord.models.domain.ModelUserSettings;
 import com.discord.widgets.settings.WidgetSettingsAppearance;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -15,10 +16,10 @@ public final class WidgetSettingsAppearance$configureUI$3<T> implements Action1<
 
     public final void call(Boolean bool) {
         m.checkNotNullExpressionValue(bool, "isChecked");
-        if (bool.booleanValue() && m.areEqual(this.$model.getCurrentTheme(), "dark")) {
-            WidgetSettingsAppearance.access$updateTheme(this.this$0, "pureEvil");
-        } else if (!bool.booleanValue() && m.areEqual(this.$model.getCurrentTheme(), "pureEvil")) {
-            WidgetSettingsAppearance.access$updateTheme(this.this$0, "dark");
+        if (bool.booleanValue() && m.areEqual(this.$model.getCurrentTheme(), ModelUserSettings.THEME_DARK)) {
+            WidgetSettingsAppearance.access$updateTheme(this.this$0, ModelUserSettings.THEME_PURE_EVIL);
+        } else if (!bool.booleanValue() && m.areEqual(this.$model.getCurrentTheme(), ModelUserSettings.THEME_PURE_EVIL)) {
+            WidgetSettingsAppearance.access$updateTheme(this.this$0, ModelUserSettings.THEME_DARK);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
index bc0dbd77ae..66c9d490fe 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings;
 
+import com.discord.models.domain.ModelUserSettings;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -16,6 +17,6 @@ public final class WidgetSettingsAppearance$pureEvilEasterEggSubject$2 extends o
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final BehaviorSubject<Boolean> mo1invoke() {
-        return BehaviorSubject.l0(Boolean.valueOf(m.areEqual(StoreStream.Companion.getUserSettingsSystem().getTheme(), "pureEvil")));
+        return BehaviorSubject.l0(Boolean.valueOf(m.areEqual(StoreStream.Companion.getUserSettingsSystem().getTheme(), ModelUserSettings.THEME_PURE_EVIL)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java
index 1a46f9000f..2c0c082cb2 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings;
 
+import com.discord.R;
 import com.discord.models.domain.ModelUserSettings;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreUserSettings;
@@ -36,10 +37,10 @@ public final class WidgetSettingsAppearance$updateTheme$1 extends o implements F
 
         public final void invoke(ModelUserSettings modelUserSettings) {
             m.checkNotNullParameter(modelUserSettings, "it");
-            if (m.areEqual(this.this$0.$theme, "pureEvil")) {
-                c.a.e.o.g(this.this$0.this$0.getActivity(), 2131894268, 0, null, 12);
+            if (m.areEqual(this.this$0.$theme, ModelUserSettings.THEME_PURE_EVIL)) {
+                c.a.e.o.g(this.this$0.this$0.getActivity(), R.string.theme_pure_evil_updated, 0, null, 12);
             } else {
-                c.a.e.o.g(this.this$0.this$0.getActivity(), 2131894270, 0, null, 12);
+                c.a.e.o.g(this.this$0.this$0.getActivity(), R.string.theme_updated, 0, null, 12);
             }
         }
     }
@@ -54,6 +55,6 @@ public final class WidgetSettingsAppearance$updateTheme$1 extends o implements F
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithTheme(m.areEqual(this.$theme, "pureEvil") ? "dark" : this.$theme)), false, 1, null), this.this$0, null, 2, null), StoreUserSettings.class, this.this$0.getActivity(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithTheme(m.areEqual(this.$theme, ModelUserSettings.THEME_PURE_EVIL) ? ModelUserSettings.THEME_DARK : this.$theme)), false, 1, null), this.this$0, null, 2, null), StoreUserSettings.class, this.this$0.getActivity(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
index 40b0d402b8..0258dde484 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
@@ -12,13 +12,16 @@ import androidx.fragment.app.FragmentActivity;
 import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetSettingsAppearanceBinding;
+import com.discord.models.domain.ModelUserSettings;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
 import com.discord.utilities.accessibility.AccessibilityUtils;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -206,7 +209,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
     }
 
     public WidgetSettingsAppearance() {
-        super(2131559249);
+        super(R.layout.widget_settings_appearance);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAppearance widgetSettingsAppearance, Model model) {
@@ -274,21 +277,21 @@ public final class WidgetSettingsAppearance extends AppFragment {
     }
 
     private final void configureUI(Model model) {
-        boolean z2 = !m.areEqual(model.getCurrentTheme(), "light");
+        boolean z2 = !m.areEqual(model.getCurrentTheme(), ModelUserSettings.THEME_LIGHT);
         getBinding().l.g(!z2, false);
         CheckedSetting checkedSetting = getBinding().l;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsAppearanceThemeLightRadio");
-        configureThemeOption(checkedSetting, "light");
+        configureThemeOption(checkedSetting, ModelUserSettings.THEME_LIGHT);
         getBinding().l.e(new WidgetSettingsAppearance$configureUI$1(this));
         getBinding().j.g(z2, false);
         CheckedSetting checkedSetting2 = getBinding().j;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsAppearanceThemeDarkRadio");
-        configureThemeOption(checkedSetting2, "dark");
+        configureThemeOption(checkedSetting2, ModelUserSettings.THEME_DARK);
         getBinding().j.e(new WidgetSettingsAppearance$configureUI$2(this, model));
-        if (m.areEqual(model.getCurrentTheme(), "pureEvil")) {
+        if (m.areEqual(model.getCurrentTheme(), ModelUserSettings.THEME_PURE_EVIL)) {
             CheckedSetting.d(getBinding().m, null, 1);
         }
-        getBinding().m.g(m.areEqual(model.getCurrentTheme(), "pureEvil"), false);
+        getBinding().m.g(m.areEqual(model.getCurrentTheme(), ModelUserSettings.THEME_PURE_EVIL), false);
         CheckedSetting checkedSetting3 = getBinding().m;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.settingsAppearanceThemePureEvilSwitch");
         checkedSetting3.setVisibility(model.getCanSeePureEvil() ? 0 : 8);
@@ -310,9 +313,9 @@ public final class WidgetSettingsAppearance extends AppFragment {
 
     private final String getFontScaleString(int i, boolean z2) {
         if (z2) {
-            return i + "% (" + getString(2131886126) + ')';
+            return i + "% (" + getString(R.string.accessibility_font_scaling_use_os) + ')';
         }
-        return i + "% (" + getString(2131886125) + ')';
+        return i + "% (" + getString(R.string.accessibility_font_scaling_use_app) + ')';
     }
 
     public static /* synthetic */ String getFontScaleString$default(WidgetSettingsAppearance widgetSettingsAppearance, int i, boolean z2, int i2, Object obj) {
@@ -329,7 +332,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
     private final void setupMessage(Model model) {
         SimpleDraweeView simpleDraweeView = getBinding().b.f1762c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatItem.chatListAdapterItemTextAvatar");
-        IconUtils.setIcon$default(simpleDraweeView, model.getMeUser(), 2131165297, null, null, null, 56, null);
+        IconUtils.setIcon$default(simpleDraweeView, model.getMeUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
         TextView textView = getBinding().b.e;
         m.checkNotNullExpressionValue(textView, "binding.chatItem.chatListAdapterItemTextTag");
         textView.setVisibility(8);
@@ -341,11 +344,11 @@ public final class WidgetSettingsAppearance extends AppFragment {
         textView3.setText(TimeUtils.toReadableTimeString$default(requireContext(), ClockFactory.get().currentTimeMillis(), null, 4, null));
         LinkifiedTextView linkifiedTextView = getBinding().b.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatItem.chatListAdapterItemText");
-        linkifiedTextView.setText(getString(2131894732));
+        linkifiedTextView.setText(getString(R.string.user_settings_appearance_preview_message_1));
     }
 
     private final void showHolyLight() {
-        o.d(getContext(), 2131894263, 0, this.toastManager);
+        o.d(getContext(), R.string.theme_holy_light_reveal, 0, this.toastManager);
         tryEnableTorchMode(true);
         View view = getBinding().g;
         m.checkNotNullExpressionValue(view, "binding.settingsAppearanceHolyLight");
@@ -359,7 +362,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
         String str;
         if (Build.VERSION.SDK_INT >= 23) {
             Context context = getContext();
-            CameraManager cameraManager = (CameraManager) (context != null ? context.getSystemService("camera") : null);
+            CameraManager cameraManager = (CameraManager) (context != null ? context.getSystemService(ChatInputComponentTypes.CAMERA) : null);
             if (cameraManager != null) {
                 try {
                     String[] cameraIdList = cameraManager.getCameraIdList();
@@ -387,8 +390,8 @@ public final class WidgetSettingsAppearance extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarTitle(2131886373);
-        setActionBarSubtitle(2131894701);
+        setActionBarTitle(R.string.appearance);
+        setActionBarSubtitle(R.string.user_settings);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         SeekBar seekBar = getBinding().f;
         m.checkNotNullExpressionValue(seekBar, "binding.settingsAppearanceFontScalingSeekbar");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java
index 908c620647..9debd288d2 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAuthorizedAppsListItemBinding;
 import com.discord.models.domain.ModelOAuth2Token;
 import com.discord.widgets.settings.WidgetSettingsAuthorizedApps;
@@ -54,28 +55,28 @@ public final class WidgetSettingsAuthorizedApps$adapter$1 extends o implements F
     public final WidgetSettingsAuthorizedApps.AuthorizedAppViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) {
         m.checkNotNullParameter(layoutInflater, "layoutInflater");
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = layoutInflater.inflate(2131559251, viewGroup, false);
-        int i = 2131364280;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131364280);
+        View inflate = layoutInflater.inflate(R.layout.widget_settings_authorized_apps_list_item, viewGroup, false);
+        int i = R.id.oauth_application_deauthorize_btn;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(R.id.oauth_application_deauthorize_btn);
         if (appCompatImageView != null) {
-            i = 2131364281;
-            TextView textView = (TextView) inflate.findViewById(2131364281);
+            i = R.id.oauth_application_description_label_tv;
+            TextView textView = (TextView) inflate.findViewById(R.id.oauth_application_description_label_tv);
             if (textView != null) {
-                i = 2131364282;
-                TextView textView2 = (TextView) inflate.findViewById(2131364282);
+                i = R.id.oauth_application_description_tv;
+                TextView textView2 = (TextView) inflate.findViewById(R.id.oauth_application_description_tv);
                 if (textView2 != null) {
-                    i = 2131364283;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364283);
+                    i = R.id.oauth_application_icon_iv;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.oauth_application_icon_iv);
                     if (simpleDraweeView != null) {
                         MaterialCardView materialCardView = (MaterialCardView) inflate;
-                        i = 2131364285;
-                        TextView textView3 = (TextView) inflate.findViewById(2131364285);
+                        i = R.id.oauth_application_name_tv;
+                        TextView textView3 = (TextView) inflate.findViewById(R.id.oauth_application_name_tv);
                         if (textView3 != null) {
-                            i = 2131364286;
-                            TextView textView4 = (TextView) inflate.findViewById(2131364286);
+                            i = R.id.oauth_application_permissions_label_tv;
+                            TextView textView4 = (TextView) inflate.findViewById(R.id.oauth_application_permissions_label_tv);
                             if (textView4 != null) {
-                                i = 2131364287;
-                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364287);
+                                i = R.id.oauth_application_permissions_rv;
+                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.oauth_application_permissions_rv);
                                 if (recyclerView != null) {
                                     WidgetSettingsAuthorizedAppsListItemBinding widgetSettingsAuthorizedAppsListItemBinding = new WidgetSettingsAuthorizedAppsListItemBinding(materialCardView, appCompatImageView, textView, textView2, simpleDraweeView, materialCardView, textView3, textView4, recyclerView);
                                     m.checkNotNullExpressionValue(widgetSettingsAuthorizedAppsListItemBinding, "WidgetSettingsAuthorized…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java
index 9a8ec314b3..66862b31f5 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAuthorizedAppsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetSettingsAuthorizedApps$binding$2 extend
 
     public final WidgetSettingsAuthorizedAppsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362074);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.authorized_apps_list);
         if (recyclerView != null) {
             return new WidgetSettingsAuthorizedAppsBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362074)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.authorized_apps_list)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
index 951a7d5d18..51b8a612b4 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.a.z.g;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.application.Application;
 import com.discord.api.auth.OAuthScope;
 import com.discord.app.AppFragment;
@@ -123,7 +124,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
     }
 
     public WidgetSettingsAuthorizedApps() {
-        super(2131559250);
+        super(R.layout.widget_settings_authorized_apps);
     }
 
     public static final /* synthetic */ SimpleRecyclerAdapter access$getAdapter$p(WidgetSettingsAuthorizedApps widgetSettingsAuthorizedApps) {
@@ -144,7 +145,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
 
     @MainThread
     public final void deauthorizeApp(long j) {
-        WidgetNoticeDialog.Builder positiveButton = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888068).setMessage(2131888082), 2131887193, (Function1) null, 2, (Object) null).setPositiveButton(2131888067, new WidgetSettingsAuthorizedApps$deauthorizeApp$1(this, j));
+        WidgetNoticeDialog.Builder positiveButton = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(R.string.deauthorize_app).setMessage(R.string.delete_app_confirm_msg), (int) R.string.cancel, (Function1) null, 2, (Object) null).setPositiveButton(R.string.deauthorize, new WidgetSettingsAuthorizedApps$deauthorizeApp$1(this, j));
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java
index 3a6cf02866..b80748c73e 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsBehaviorBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -18,20 +19,20 @@ public final /* synthetic */ class WidgetSettingsBehavior$binding$2 extends k im
 
     public final WidgetSettingsBehaviorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365045;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365045);
+        int i = R.id.settings_behavior_browser_switch;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_behavior_browser_switch);
         if (checkedSetting != null) {
-            i = 2131365046;
-            TextView textView = (TextView) view.findViewById(2131365046);
+            i = R.id.settings_behavior_chat_header;
+            TextView textView = (TextView) view.findViewById(R.id.settings_behavior_chat_header);
             if (textView != null) {
-                i = 2131365047;
-                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365047);
+                i = R.id.settings_behavior_dev_mode_switch;
+                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.settings_behavior_dev_mode_switch);
                 if (checkedSetting2 != null) {
-                    i = 2131365048;
-                    TextView textView2 = (TextView) view.findViewById(2131365048);
+                    i = R.id.settings_behavior_keyboard_header;
+                    TextView textView2 = (TextView) view.findViewById(R.id.settings_behavior_keyboard_header);
                     if (textView2 != null) {
-                        i = 2131365049;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365049);
+                        i = R.id.settings_behavior_shift_send_toggle;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.settings_behavior_shift_send_toggle);
                         if (checkedSetting3 != null) {
                             return new WidgetSettingsBehaviorBinding((CoordinatorLayout) view, checkedSetting, textView, checkedSetting2, textView2, checkedSetting3);
                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
index 14ddc1f7a9..e60e783157 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsBehaviorBinding;
 import com.discord.stores.StoreStream;
@@ -42,7 +43,7 @@ public final class WidgetSettingsBehavior extends AppFragment {
     }
 
     public WidgetSettingsBehavior() {
-        super(2131559252);
+        super(R.layout.widget_settings_behavior);
     }
 
     private final WidgetSettingsBehaviorBinding getBinding() {
@@ -57,8 +58,8 @@ public final class WidgetSettingsBehavior extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131888712);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.form_label_mobile_notifications_behavior);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StoreUserSettings userSettings = StoreStream.Companion.getUserSettings();
         CheckedSetting checkedSetting = getBinding().f;
@@ -68,10 +69,10 @@ public final class WidgetSettingsBehavior extends AppFragment {
         checkedSetting2.setChecked(userSettings.getIsDeveloperMode());
         Context context = checkedSetting2.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        b.h(context, 2131888132, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4);
+        b.h(context, R.string.developer_mode_help_text, new Object[]{API_LINK}, null, 4);
         Context context2 = checkedSetting2.getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        checkedSetting2.h(b.h(context2, 2131888132, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4), false);
+        checkedSetting2.h(b.h(context2, R.string.developer_mode_help_text, new Object[]{API_LINK}, null, 4), false);
         checkedSetting2.setSubtextOnClickListener(new WidgetSettingsBehavior$onViewBound$2$1(checkedSetting2));
         checkedSetting2.setOnCheckedListener(new WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2(this, userSettings));
         CheckedSetting checkedSetting3 = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java
index c1acd41ddf..22096bd485 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsLanguageBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -20,23 +21,23 @@ public final /* synthetic */ class WidgetSettingsLanguage$binding$2 extends k im
 
     public final WidgetSettingsLanguageBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365088;
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365088);
+        int i = R.id.settings_language_current;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.settings_language_current);
         if (relativeLayout != null) {
-            i = 2131365089;
-            ImageView imageView = (ImageView) view.findViewById(2131365089);
+            i = R.id.settings_language_current_flag;
+            ImageView imageView = (ImageView) view.findViewById(R.id.settings_language_current_flag);
             if (imageView != null) {
-                i = 2131365090;
-                TextView textView = (TextView) view.findViewById(2131365090);
+                i = R.id.settings_language_current_text;
+                TextView textView = (TextView) view.findViewById(R.id.settings_language_current_text);
                 if (textView != null) {
-                    i = 2131365091;
-                    TextView textView2 = (TextView) view.findViewById(2131365091);
+                    i = R.id.settings_language_header;
+                    TextView textView2 = (TextView) view.findViewById(R.id.settings_language_header);
                     if (textView2 != null) {
-                        i = 2131365095;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365095);
+                        i = R.id.settings_language_sync_check;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_language_sync_check);
                         if (checkedSetting != null) {
-                            i = 2131365096;
-                            TextView textView3 = (TextView) view.findViewById(2131365096);
+                            i = R.id.settings_language_sync_header;
+                            TextView textView3 = (TextView) view.findViewById(R.id.settings_language_sync_header);
                             if (textView3 != null) {
                                 return new WidgetSettingsLanguageBinding((CoordinatorLayout) view, relativeLayout, imageView, textView, textView2, checkedSetting, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java
index 91096e5ca8..960297fbb7 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings;
 
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.models.domain.ModelUserSettings;
 import com.discord.restapi.RestAPIParams;
@@ -43,7 +44,7 @@ public final class WidgetSettingsLanguage$onViewBound$1 extends o implements Fun
 
             public final void invoke(ModelUserSettings modelUserSettings) {
                 m.checkNotNullParameter(modelUserSettings, "it");
-                c.a.e.o.g(this.this$0.this$0.this$0.requireContext(), 2131891081, 0, null, 12);
+                c.a.e.o.g(this.this$0.this$0.this$0.requireContext(), R.string.language_updated, 0, null, 12);
             }
         }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
index 4b58a4c02e..69c3826d4c 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
@@ -8,6 +8,7 @@ import androidx.annotation.StringRes;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsLanguageBinding;
 import com.discord.stores.StoreStream;
@@ -111,144 +112,144 @@ public final class WidgetSettingsLanguage extends AppFragment {
         @DrawableRes
         public final int getLocaleFlagResId(String str) {
             if (str == null) {
-                return 2131232129;
+                return R.drawable.icon_flag_en_us;
             }
             switch (str.hashCode()) {
                 case 3141:
-                    return str.equals("bg") ? 2131232123 : 2131232129;
+                    return str.equals("bg") ? R.drawable.icon_flag_bg : R.drawable.icon_flag_en_us;
                 case 3184:
-                    return str.equals("cs") ? 2131232124 : 2131232129;
+                    return str.equals("cs") ? R.drawable.icon_flag_cs : R.drawable.icon_flag_en_us;
                 case 3197:
-                    return str.equals("da") ? 2131232125 : 2131232129;
+                    return str.equals("da") ? R.drawable.icon_flag_da : R.drawable.icon_flag_en_us;
                 case 3201:
-                    return str.equals("de") ? 2131232126 : 2131232129;
+                    return str.equals("de") ? R.drawable.icon_flag_de : R.drawable.icon_flag_en_us;
                 case 3239:
-                    return str.equals("el") ? 2131232127 : 2131232129;
+                    return str.equals("el") ? R.drawable.icon_flag_el : R.drawable.icon_flag_en_us;
                 case 3267:
-                    return str.equals("fi") ? 2131232132 : 2131232129;
+                    return str.equals("fi") ? R.drawable.icon_flag_fi : R.drawable.icon_flag_en_us;
                 case 3276:
-                    return str.equals("fr") ? 2131232133 : 2131232129;
+                    return str.equals("fr") ? R.drawable.icon_flag_fr : R.drawable.icon_flag_en_us;
                 case 3329:
-                    return str.equals("hi") ? 2131232135 : 2131232129;
+                    return str.equals("hi") ? R.drawable.icon_flag_hi : R.drawable.icon_flag_en_us;
                 case 3338:
-                    return str.equals("hr") ? 2131232137 : 2131232129;
+                    return str.equals("hr") ? R.drawable.icon_flag_hr : R.drawable.icon_flag_en_us;
                 case 3341:
-                    return str.equals("hu") ? 2131232138 : 2131232129;
+                    return str.equals("hu") ? R.drawable.icon_flag_hu : R.drawable.icon_flag_en_us;
                 case 3371:
-                    return str.equals("it") ? 2131232139 : 2131232129;
+                    return str.equals("it") ? R.drawable.icon_flag_it : R.drawable.icon_flag_en_us;
                 case 3383:
-                    return str.equals("ja") ? 2131232140 : 2131232129;
+                    return str.equals("ja") ? R.drawable.icon_flag_ja : R.drawable.icon_flag_en_us;
                 case 3428:
-                    return str.equals("ko") ? 2131232141 : 2131232129;
+                    return str.equals("ko") ? R.drawable.icon_flag_ko : R.drawable.icon_flag_en_us;
                 case 3464:
-                    return str.equals("lt") ? 2131232142 : 2131232129;
+                    return str.equals("lt") ? R.drawable.icon_flag_lt : R.drawable.icon_flag_en_us;
                 case 3518:
-                    return str.equals("nl") ? 2131232143 : 2131232129;
+                    return str.equals("nl") ? R.drawable.icon_flag_nl : R.drawable.icon_flag_en_us;
                 case 3521:
-                    return str.equals("no") ? 2131232144 : 2131232129;
+                    return str.equals("no") ? R.drawable.icon_flag_no : R.drawable.icon_flag_en_us;
                 case 3580:
-                    return str.equals("pl") ? 2131232145 : 2131232129;
+                    return str.equals("pl") ? R.drawable.icon_flag_pl : R.drawable.icon_flag_en_us;
                 case 3645:
-                    return str.equals("ro") ? 2131232147 : 2131232129;
+                    return str.equals("ro") ? R.drawable.icon_flag_ro : R.drawable.icon_flag_en_us;
                 case 3651:
-                    return str.equals("ru") ? 2131232148 : 2131232129;
+                    return str.equals("ru") ? R.drawable.icon_flag_ru : R.drawable.icon_flag_en_us;
                 case 3700:
-                    return str.equals("th") ? 2131232151 : 2131232129;
+                    return str.equals("th") ? R.drawable.icon_flag_th : R.drawable.icon_flag_en_us;
                 case 3710:
-                    return str.equals("tr") ? 2131232152 : 2131232129;
+                    return str.equals("tr") ? R.drawable.icon_flag_tr : R.drawable.icon_flag_en_us;
                 case 3734:
-                    return str.equals("uk") ? 2131232153 : 2131232129;
+                    return str.equals("uk") ? R.drawable.icon_flag_uk : R.drawable.icon_flag_en_us;
                 case 3763:
-                    return str.equals("vi") ? 2131232155 : 2131232129;
+                    return str.equals("vi") ? R.drawable.icon_flag_vi : R.drawable.icon_flag_en_us;
                 case 96598143:
-                    return str.equals("en-GB") ? 2131232128 : 2131232129;
+                    return str.equals("en-GB") ? R.drawable.icon_flag_en_gb : R.drawable.icon_flag_en_us;
                 case 96598594:
                     str.equals("en-US");
-                    return 2131232129;
+                    return R.drawable.icon_flag_en_us;
                 case 96747053:
-                    return str.equals("es-ES") ? 2131232130 : 2131232129;
+                    return str.equals("es-ES") ? R.drawable.icon_flag_es_es : R.drawable.icon_flag_en_us;
                 case 106935481:
-                    return str.equals("pt-BR") ? 2131232146 : 2131232129;
+                    return str.equals("pt-BR") ? R.drawable.icon_flag_pt_br : R.drawable.icon_flag_en_us;
                 case 109766140:
-                    return str.equals("sv-SE") ? 2131232150 : 2131232129;
+                    return str.equals("sv-SE") ? R.drawable.icon_flag_sv_se : R.drawable.icon_flag_en_us;
                 case 115813226:
-                    return str.equals("zh-CN") ? 2131232156 : 2131232129;
+                    return str.equals("zh-CN") ? R.drawable.icon_flag_zh_cn : R.drawable.icon_flag_en_us;
                 case 115813762:
-                    return str.equals("zh-TW") ? 2131232157 : 2131232129;
+                    return str.equals("zh-TW") ? R.drawable.icon_flag_zh_tw : R.drawable.icon_flag_en_us;
                 default:
-                    return 2131232129;
+                    return R.drawable.icon_flag_en_us;
             }
         }
 
         @StringRes
         public final int getLocaleResId(String str) {
             if (str == null) {
-                return 2131888355;
+                return R.string.en_us;
             }
             switch (str.hashCode()) {
                 case 3141:
-                    return str.equals("bg") ? 2131886848 : 2131888355;
+                    return str.equals("bg") ? R.string.bg : R.string.en_us;
                 case 3184:
-                    return str.equals("cs") ? 2131888011 : 2131888355;
+                    return str.equals("cs") ? R.string.cs : R.string.en_us;
                 case 3197:
-                    return str.equals("da") ? 2131888033 : 2131888355;
+                    return str.equals("da") ? R.string.da : R.string.en_us;
                 case 3201:
-                    return str.equals("de") ? 2131888064 : 2131888355;
+                    return str.equals("de") ? R.string.de : R.string.en_us;
                 case 3239:
-                    return str.equals("el") ? 2131888248 : 2131888355;
+                    return str.equals("el") ? R.string.el : R.string.en_us;
                 case 3267:
-                    return str.equals("fi") ? 2131888537 : 2131888355;
+                    return str.equals("fi") ? R.string.fi : R.string.en_us;
                 case 3276:
-                    return str.equals("fr") ? 2131888822 : 2131888355;
+                    return str.equals("fr") ? R.string.fr : R.string.en_us;
                 case 3329:
-                    return str.equals("hi") ? 2131890387 : 2131888355;
+                    return str.equals("hi") ? R.string.hi : R.string.en_us;
                 case 3338:
-                    return str.equals("hr") ? 2131890401 : 2131888355;
+                    return str.equals("hr") ? R.string.hr : R.string.en_us;
                 case 3341:
-                    return str.equals("hu") ? 2131890402 : 2131888355;
+                    return str.equals("hu") ? R.string.hu : R.string.en_us;
                 case 3371:
-                    return str.equals("it") ? 2131890948 : 2131888355;
+                    return str.equals("it") ? R.string.it : R.string.en_us;
                 case 3383:
-                    return str.equals("ja") ? 2131890950 : 2131888355;
+                    return str.equals("ja") ? R.string.ja : R.string.en_us;
                 case 3428:
-                    return str.equals("ko") ? 2131891075 : 2131888355;
+                    return str.equals("ko") ? R.string.ko : R.string.en_us;
                 case 3464:
-                    return str.equals("lt") ? 2131891205 : 2131888355;
+                    return str.equals("lt") ? R.string.lt : R.string.en_us;
                 case 3518:
-                    return str.equals("nl") ? 2131891706 : 2131888355;
+                    return str.equals("nl") ? R.string.nl : R.string.en_us;
                 case 3521:
-                    return str.equals("no") ? 2131891707 : 2131888355;
+                    return str.equals("no") ? R.string.no : R.string.en_us;
                 case 3580:
-                    return str.equals("pl") ? 2131892244 : 2131888355;
+                    return str.equals("pl") ? R.string.pl : R.string.en_us;
                 case 3645:
-                    return str.equals("ro") ? 2131893042 : 2131888355;
+                    return str.equals("ro") ? R.string.ro : R.string.en_us;
                 case 3651:
-                    return str.equals("ru") ? 2131893313 : 2131888355;
+                    return str.equals("ru") ? R.string.ru : R.string.en_us;
                 case 3700:
-                    return str.equals("th") ? 2131894260 : 2131888355;
+                    return str.equals("th") ? R.string.th : R.string.en_us;
                 case 3710:
-                    return str.equals("tr") ? 2131894398 : 2131888355;
+                    return str.equals("tr") ? R.string.tr : R.string.en_us;
                 case 3734:
-                    return str.equals("uk") ? 2131894478 : 2131888355;
+                    return str.equals("uk") ? R.string.uk : R.string.en_us;
                 case 3763:
-                    return str.equals("vi") ? 2131894941 : 2131888355;
+                    return str.equals("vi") ? R.string.vi : R.string.en_us;
                 case 96598143:
-                    return str.equals("en-GB") ? 2131888354 : 2131888355;
+                    return str.equals("en-GB") ? R.string.en_gb : R.string.en_us;
                 case 96598594:
                     str.equals("en-US");
-                    return 2131888355;
+                    return R.string.en_us;
                 case 96747053:
-                    return str.equals("es-ES") ? 2131888420 : 2131888355;
+                    return str.equals("es-ES") ? R.string.es_es : R.string.en_us;
                 case 106935481:
-                    return str.equals("pt-BR") ? 2131892824 : 2131888355;
+                    return str.equals("pt-BR") ? R.string.pt_br : R.string.en_us;
                 case 109766140:
-                    return str.equals("sv-SE") ? 2131894119 : 2131888355;
+                    return str.equals("sv-SE") ? R.string.sv_se : R.string.en_us;
                 case 115813226:
-                    return str.equals("zh-CN") ? 2131895117 : 2131888355;
+                    return str.equals("zh-CN") ? R.string.zh_cn : R.string.en_us;
                 case 115813762:
-                    return str.equals("zh-TW") ? 2131895118 : 2131888355;
+                    return str.equals("zh-TW") ? R.string.zh_tw : R.string.en_us;
                 default:
-                    return 2131888355;
+                    return R.string.en_us;
             }
         }
 
@@ -259,7 +260,7 @@ public final class WidgetSettingsLanguage extends AppFragment {
     }
 
     public WidgetSettingsLanguage() {
-        super(2131559268);
+        super(R.layout.widget_settings_language);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsLanguage widgetSettingsLanguage, String str) {
@@ -282,8 +283,8 @@ public final class WidgetSettingsLanguage extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131891078);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.language);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         WidgetSettingsLanguageSelect.Companion.registerForResult(this, new WidgetSettingsLanguage$onViewBound$1(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java
index 67b213c95a..1128554ec4 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings;
 
 import android.view.View;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsLanguageSelectBinding;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import d0.z.d.k;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetSettingsLanguageSelect$binding$2 extend
 
     public final WidgetSettingsLanguageSelectBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365094);
+        MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(R.id.settings_language_select_list);
         if (maxHeightRecyclerView != null) {
             return new WidgetSettingsLanguageSelectBinding((NestedScrollView) view, maxHeightRecyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365094)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.settings_language_select_list)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
index 4c8d0b912a..cdc650a791 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
@@ -14,6 +14,7 @@ import androidx.fragment.app.FragmentKt;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetSettingsLanguageSelectBinding;
 import com.discord.databinding.WidgetSettingsLanguageSelectItemBinding;
@@ -56,17 +57,17 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
                 super(i, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i2 = 2131363296;
-                ImageView imageView = (ImageView) view.findViewById(2131363296);
+                int i2 = R.id.flag_icon;
+                ImageView imageView = (ImageView) view.findViewById(R.id.flag_icon);
                 if (imageView != null) {
-                    i2 = 2131363297;
-                    Barrier barrier = (Barrier) view.findViewById(2131363297);
+                    i2 = R.id.flag_icon_barrier;
+                    Barrier barrier = (Barrier) view.findViewById(R.id.flag_icon_barrier);
                     if (barrier != null) {
-                        i2 = 2131365092;
-                        TextView textView = (TextView) view.findViewById(2131365092);
+                        i2 = R.id.settings_language_select_item_name;
+                        TextView textView = (TextView) view.findViewById(R.id.settings_language_select_item_name);
                         if (textView != null) {
-                            i2 = 2131365093;
-                            TextView textView2 = (TextView) view.findViewById(2131365093);
+                            i2 = R.id.settings_language_select_item_name_localized;
+                            TextView textView2 = (TextView) view.findViewById(R.id.settings_language_select_item_name_localized);
                             if (textView2 != null) {
                                 WidgetSettingsLanguageSelectItemBinding widgetSettingsLanguageSelectItemBinding = new WidgetSettingsLanguageSelectItemBinding((ConstraintLayout) view, imageView, barrier, textView, textView2);
                                 m.checkNotNullExpressionValue(widgetSettingsLanguageSelectItemBinding, "WidgetSettingsLanguageSe…temBinding.bind(itemView)");
@@ -116,7 +117,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public AdapterItemLocale onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new AdapterItemLocale(2131559270, this);
+            return new AdapterItemLocale(R.layout.widget_settings_language_select_item, this);
         }
     }
 
@@ -132,7 +133,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
         public final void registerForResult(Fragment fragment, Function1<? super String, Unit> function1) {
             m.checkNotNullParameter(fragment, "fragment");
             m.checkNotNullParameter(function1, "onLocaleSelected");
-            FragmentKt.setFragmentResultListener(fragment, "REQUEST_KEY_USER_LOCALE", new WidgetSettingsLanguageSelect$Companion$registerForResult$1(function1));
+            FragmentKt.setFragmentResultListener(fragment, WidgetSettingsLanguageSelect.REQUEST_KEY_USER_LOCALE, new WidgetSettingsLanguageSelect$Companion$registerForResult$1(function1));
         }
 
         public final void show(Fragment fragment) {
@@ -225,7 +226,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
     }
 
     public WidgetSettingsLanguageSelect() {
-        super(2131559269);
+        super(R.layout.widget_settings_language_select);
     }
 
     public static final /* synthetic */ void access$onLocaleSelected(WidgetSettingsLanguageSelect widgetSettingsLanguageSelect, String str) {
@@ -238,8 +239,8 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
 
     private final void onLocaleSelected(String str) {
         Bundle bundle = new Bundle();
-        bundle.putString("INTENT_EXTRA_LOCALE", str);
-        FragmentKt.setFragmentResult(this, "REQUEST_KEY_USER_LOCALE", bundle);
+        bundle.putString(RESULT_KEY_USE_LOCALE, str);
+        FragmentKt.setFragmentResult(this, REQUEST_KEY_USER_LOCALE, bundle);
         dismiss();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java
index 098489908c..fbf5d87d28 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsMediaBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
@@ -19,41 +20,41 @@ public final /* synthetic */ class WidgetSettingsMedia$binding$2 extends k imple
 
     public final WidgetSettingsMediaBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361993;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131361993);
+        int i = R.id.attachments_toggle;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.attachments_toggle);
         if (checkedSetting != null) {
-            i = 2131362713;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362713);
+            i = R.id.compression_toggle;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.compression_toggle);
             if (checkedSetting2 != null) {
-                i = 2131362714;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362714);
+                i = R.id.compression_toggle_subtext;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.compression_toggle_subtext);
                 if (linkifiedTextView != null) {
-                    i = 2131365130;
-                    TextView textView = (TextView) view.findViewById(2131365130);
+                    i = R.id.settings_text_images_compression_header;
+                    TextView textView = (TextView) view.findViewById(R.id.settings_text_images_compression_header);
                     if (textView != null) {
-                        i = 2131365131;
-                        TextView textView2 = (TextView) view.findViewById(2131365131);
+                        i = R.id.settings_text_images_display_header;
+                        TextView textView2 = (TextView) view.findViewById(R.id.settings_text_images_display_header);
                         if (textView2 != null) {
-                            i = 2131365132;
-                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365132);
+                            i = R.id.settings_text_images_embeds_toggle;
+                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.settings_text_images_embeds_toggle);
                             if (checkedSetting3 != null) {
-                                i = 2131365133;
-                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131365133);
+                                i = R.id.settings_text_images_links_toggle;
+                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.settings_text_images_links_toggle);
                                 if (checkedSetting4 != null) {
-                                    i = 2131365134;
-                                    TextView textView3 = (TextView) view.findViewById(2131365134);
+                                    i = R.id.settings_text_images_preview_header;
+                                    TextView textView3 = (TextView) view.findViewById(R.id.settings_text_images_preview_header);
                                     if (textView3 != null) {
-                                        i = 2131365135;
-                                        TextView textView4 = (TextView) view.findViewById(2131365135);
+                                        i = R.id.settings_text_images_stickers_header;
+                                        TextView textView4 = (TextView) view.findViewById(R.id.settings_text_images_stickers_header);
                                         if (textView4 != null) {
-                                            i = 2131365136;
-                                            TextView textView5 = (TextView) view.findViewById(2131365136);
+                                            i = R.id.settings_text_images_sync_header;
+                                            TextView textView5 = (TextView) view.findViewById(R.id.settings_text_images_sync_header);
                                             if (textView5 != null) {
-                                                i = 2131365137;
-                                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131365137);
+                                                i = R.id.settings_text_images_sync_toggle;
+                                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.settings_text_images_sync_toggle);
                                                 if (checkedSetting5 != null) {
-                                                    i = 2131365370;
-                                                    CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365370);
+                                                    i = R.id.stickers_suggestions;
+                                                    CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.stickers_suggestions);
                                                     if (checkedSetting6 != null) {
                                                         return new WidgetSettingsMediaBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, linkifiedTextView, textView, textView2, checkedSetting3, checkedSetting4, textView3, textView4, textView5, checkedSetting5, checkedSetting6);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$7.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$7.java
index 9d5cf269ca..f80df04e0d 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$7.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$7.java
@@ -15,7 +15,7 @@ public final class WidgetSettingsMedia$onViewBound$7<T> implements Action1<Boole
     public final void call(Boolean bool) {
         AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
         m.checkNotNullExpressionValue(bool, "checked");
-        analyticsTracker.stickerSuggestionsEnabledToggled(bool.booleanValue(), new Traits.Location(null, "Text & Images", null, null, null, 29, null));
+        analyticsTracker.stickerSuggestionsEnabledToggled(bool.booleanValue(), new Traits.Location(null, Traits.Location.Section.SETTINGS_TEXT_AND_IMAGES, null, null, null, 29, null));
         WidgetSettingsMedia.access$getUserSettings$p(this.this$0).setIsStickerSuggestionsEnabled(bool.booleanValue());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
index da0ea6a4ec..6ced7c3d11 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsMediaBinding;
 import com.discord.stores.StoreAccessibility;
@@ -46,7 +47,7 @@ public final class WidgetSettingsMedia extends AppFragment {
     }
 
     public WidgetSettingsMedia() {
-        super(2131559271);
+        super(R.layout.widget_settings_media);
     }
 
     public static final /* synthetic */ StoreUserSettings access$getUserSettings$p(WidgetSettingsMedia widgetSettingsMedia) {
@@ -73,8 +74,8 @@ public final class WidgetSettingsMedia extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131894252);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.text_and_images);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StoreStream.Companion companion = StoreStream.Companion;
         this.userSettings = companion.getUserSettings();
@@ -86,7 +87,7 @@ public final class WidgetSettingsMedia extends AppFragment {
             m.throwUninitializedPropertyAccessException("userSettings");
         }
         checkedSetting.setChecked(storeUserSettings.getIsAttachmentMediaInline());
-        CheckedSetting.i(getBinding().b, b.k(this, 2131890639, new Object[]{"10"}, null, 4), false, 2);
+        CheckedSetting.i(getBinding().b, b.k(this, R.string.inline_attachment_media_help, new Object[]{PREVIEW_MAX_SIZE_MB}, null, 4), false, 2);
         getBinding().b.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$1(this));
         getBinding().f1969c.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$2(this));
         CheckedSetting checkedSetting2 = getBinding().f1969c;
@@ -98,7 +99,7 @@ public final class WidgetSettingsMedia extends AppFragment {
         checkedSetting2.setChecked(storeUserSettings2.getIsAutoImageCompressionEnabled());
         LinkifiedTextView linkifiedTextView = getBinding().d;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.compressionToggleSubtext");
-        b.m(linkifiedTextView, 2131890616, new Object[]{"getNitro"}, new WidgetSettingsMedia$onViewBound$3(this));
+        b.m(linkifiedTextView, R.string.image_compression_nitro_upsell, new Object[]{"getNitro"}, new WidgetSettingsMedia$onViewBound$3(this));
         CheckedSetting checkedSetting3 = getBinding().g;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.settingsTextImagesEmbedsToggle");
         StoreUserSettings storeUserSettings3 = this.userSettings;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java
index f4cf741bee..07d929cbce 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsNotificationsBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -18,23 +19,23 @@ public final /* synthetic */ class WidgetSettingsNotifications$binding$2 extends
 
     public final WidgetSettingsNotificationsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365087;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365087);
+        int i = R.id.settings_inapp_notifs_switch;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_inapp_notifs_switch);
         if (checkedSetting != null) {
-            i = 2131365101;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365101);
+            i = R.id.settings_notifications_blink;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.settings_notifications_blink);
             if (checkedSetting2 != null) {
-                i = 2131365102;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365102);
+                i = R.id.settings_notifications_enabled;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.settings_notifications_enabled);
                 if (checkedSetting3 != null) {
-                    i = 2131365103;
-                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131365103);
+                    i = R.id.settings_notifications_mute_all;
+                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.settings_notifications_mute_all);
                     if (checkedSetting4 != null) {
-                        i = 2131365104;
-                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131365104);
+                        i = R.id.settings_notifications_vibrations;
+                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.settings_notifications_vibrations);
                         if (checkedSetting5 != null) {
-                            i = 2131365105;
-                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365105);
+                            i = R.id.settings_notifications_wrap;
+                            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_notifications_wrap);
                             if (linearLayout != null) {
                                 return new WidgetSettingsNotificationsBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, linearLayout);
                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
index a0f60b37b6..9028d07f4b 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsNotificationsBinding;
 import com.discord.stores.StoreNotifications;
@@ -40,7 +41,7 @@ public final class WidgetSettingsNotifications extends AppFragment {
     }
 
     public WidgetSettingsNotifications() {
-        super(2131559273);
+        super(R.layout.widget_settings_notifications);
     }
 
     public static final /* synthetic */ WidgetSettingsNotificationsBinding access$getBinding$p(WidgetSettingsNotifications widgetSettingsNotifications) {
@@ -59,8 +60,8 @@ public final class WidgetSettingsNotifications extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131891875);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.notifications);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StoreNotifications storeNotifications = this.notificationStore;
         getBinding().d.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$1(storeNotifications));
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java
index e353badaba..af655c9794 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsNotificationOsBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -19,17 +20,17 @@ public final /* synthetic */ class WidgetSettingsNotificationsOs$binding$2 exten
 
     public final WidgetSettingsNotificationOsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365087;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365087);
+        int i = R.id.settings_inapp_notifs_switch;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_inapp_notifs_switch);
         if (checkedSetting != null) {
-            i = 2131365098;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365098);
+            i = R.id.settings_notification_os;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.settings_notification_os);
             if (relativeLayout != null) {
-                i = 2131365099;
-                TextView textView = (TextView) view.findViewById(2131365099);
+                i = R.id.settings_notification_os_label;
+                TextView textView = (TextView) view.findViewById(R.id.settings_notification_os_label);
                 if (textView != null) {
-                    i = 2131365100;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365100);
+                    i = R.id.settings_notification_switch;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.settings_notification_switch);
                     if (checkedSetting2 != null) {
                         return new WidgetSettingsNotificationOsBinding((LinearLayout) view, checkedSetting, relativeLayout, textView, checkedSetting2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
index 0a56e526a3..7471422def 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
@@ -7,6 +7,7 @@ import androidx.annotation.RequiresApi;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetSettingsNotificationOsBinding;
 import com.discord.stores.StoreStream;
@@ -58,7 +59,7 @@ public final class WidgetSettingsNotificationsOs extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559272;
+        return R.layout.widget_settings_notification_os;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java
index eb5c1891ba..072336646e 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsPrivacyBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.CheckedSetting;
@@ -21,83 +22,83 @@ public final /* synthetic */ class WidgetSettingsPrivacy$binding$2 extends k imp
 
     public final WidgetSettingsPrivacyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362771;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362771);
+        int i = R.id.contact_sync_setting_email;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.contact_sync_setting_email);
         if (checkedSetting != null) {
-            i = 2131362772;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362772);
+            i = R.id.contact_sync_setting_enabled;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.contact_sync_setting_enabled);
             if (checkedSetting2 != null) {
-                i = 2131362773;
-                TextView textView = (TextView) view.findViewById(2131362773);
+                i = R.id.contact_sync_setting_info;
+                TextView textView = (TextView) view.findViewById(R.id.contact_sync_setting_info);
                 if (textView != null) {
-                    i = 2131362774;
-                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362774);
+                    i = R.id.contact_sync_setting_phone;
+                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.contact_sync_setting_phone);
                     if (checkedSetting3 != null) {
-                        i = 2131362775;
-                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131362775);
+                        i = R.id.contact_sync_setting_staff_only;
+                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.contact_sync_setting_staff_only);
                         if (checkedSetting4 != null) {
-                            i = 2131362956;
-                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                            i = R.id.dimmer_view;
+                            DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                             if (dimmerView != null) {
-                                i = 2131364655;
-                                TextView textView2 = (TextView) view.findViewById(2131364655);
+                                i = R.id.request_data_link;
+                                TextView textView2 = (TextView) view.findViewById(R.id.request_data_link);
                                 if (textView2 != null) {
-                                    i = 2131365107;
-                                    CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131365107);
+                                    i = R.id.settings_privacy_basic_service;
+                                    CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.settings_privacy_basic_service);
                                     if (checkedSetting5 != null) {
-                                        i = 2131365108;
-                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365108);
+                                        i = R.id.settings_privacy_contact_sync;
+                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_privacy_contact_sync);
                                         if (linearLayout != null) {
-                                            i = 2131365109;
-                                            TextView textView3 = (TextView) view.findViewById(2131365109);
+                                            i = R.id.settings_privacy_contact_sync_title;
+                                            TextView textView3 = (TextView) view.findViewById(R.id.settings_privacy_contact_sync_title);
                                             if (textView3 != null) {
-                                                i = 2131365110;
-                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365110);
+                                                i = R.id.settings_privacy_controls;
+                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.settings_privacy_controls);
                                                 if (linearLayout2 != null) {
-                                                    i = 2131365111;
-                                                    TextView textView4 = (TextView) view.findViewById(2131365111);
+                                                    i = R.id.settings_privacy_data_header;
+                                                    TextView textView4 = (TextView) view.findViewById(R.id.settings_privacy_data_header);
                                                     if (textView4 != null) {
-                                                        i = 2131365112;
-                                                        CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365112);
+                                                        i = R.id.settings_privacy_default_restricted_guilds;
+                                                        CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.settings_privacy_default_restricted_guilds);
                                                         if (checkedSetting6 != null) {
-                                                            i = 2131365115;
-                                                            TextView textView5 = (TextView) view.findViewById(2131365115);
+                                                            i = R.id.settings_privacy_defaults_header;
+                                                            TextView textView5 = (TextView) view.findViewById(R.id.settings_privacy_defaults_header);
                                                             if (textView5 != null) {
-                                                                i = 2131365116;
-                                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131365116);
+                                                                i = R.id.settings_privacy_explicit_0;
+                                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(R.id.settings_privacy_explicit_0);
                                                                 if (checkedSetting7 != null) {
-                                                                    i = 2131365117;
-                                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131365117);
+                                                                    i = R.id.settings_privacy_explicit_1;
+                                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(R.id.settings_privacy_explicit_1);
                                                                     if (checkedSetting8 != null) {
-                                                                        i = 2131365118;
-                                                                        CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131365118);
+                                                                        i = R.id.settings_privacy_explicit_2;
+                                                                        CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(R.id.settings_privacy_explicit_2);
                                                                         if (checkedSetting9 != null) {
-                                                                            i = 2131365119;
-                                                                            CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131365119);
+                                                                            i = R.id.settings_privacy_friend_source_0;
+                                                                            CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(R.id.settings_privacy_friend_source_0);
                                                                             if (checkedSetting10 != null) {
-                                                                                i = 2131365120;
-                                                                                CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131365120);
+                                                                                i = R.id.settings_privacy_friend_source_1;
+                                                                                CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(R.id.settings_privacy_friend_source_1);
                                                                                 if (checkedSetting11 != null) {
-                                                                                    i = 2131365121;
-                                                                                    CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131365121);
+                                                                                    i = R.id.settings_privacy_friend_source_2;
+                                                                                    CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(R.id.settings_privacy_friend_source_2);
                                                                                     if (checkedSetting12 != null) {
-                                                                                        i = 2131365122;
-                                                                                        TextView textView6 = (TextView) view.findViewById(2131365122);
+                                                                                        i = R.id.settings_privacy_friend_source_header;
+                                                                                        TextView textView6 = (TextView) view.findViewById(R.id.settings_privacy_friend_source_header);
                                                                                         if (textView6 != null) {
-                                                                                            i = 2131365123;
-                                                                                            CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131365123);
+                                                                                            i = R.id.settings_privacy_personalization;
+                                                                                            CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(R.id.settings_privacy_personalization);
                                                                                             if (checkedSetting13 != null) {
-                                                                                                i = 2131365124;
-                                                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365124);
+                                                                                                i = R.id.settings_privacy_request_data;
+                                                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.settings_privacy_request_data);
                                                                                                 if (materialButton != null) {
-                                                                                                    i = 2131365125;
-                                                                                                    TextView textView7 = (TextView) view.findViewById(2131365125);
+                                                                                                    i = R.id.settings_privacy_safe_messaging_header;
+                                                                                                    TextView textView7 = (TextView) view.findViewById(R.id.settings_privacy_safe_messaging_header);
                                                                                                     if (textView7 != null) {
-                                                                                                        i = 2131365126;
-                                                                                                        CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131365126);
+                                                                                                        i = R.id.settings_privacy_screenreader_detection;
+                                                                                                        CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(R.id.settings_privacy_screenreader_detection);
                                                                                                         if (checkedSetting14 != null) {
-                                                                                                            i = 2131365127;
-                                                                                                            CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131365127);
+                                                                                                            i = R.id.settings_privacy_statistics;
+                                                                                                            CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(R.id.settings_privacy_statistics);
                                                                                                             if (checkedSetting15 != null) {
                                                                                                                 return new WidgetSettingsPrivacyBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, textView, checkedSetting3, checkedSetting4, dimmerView, textView2, checkedSetting5, linearLayout, textView3, linearLayout2, textView4, checkedSetting6, textView5, checkedSetting7, checkedSetting8, checkedSetting9, checkedSetting10, checkedSetting11, checkedSetting12, textView6, checkedSetting13, materialButton, textView7, checkedSetting14, checkedSetting15);
                                                                                                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$1.java
index 5a8faf6156..f898435dad 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.content.Context;
 import android.view.View;
 import c.a.e.f;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
@@ -63,7 +64,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$1 extends o
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), 2131099928)), false, null, AnonymousClass1.INSTANCE, 4, null));
+            hook.a.add(new ClickableSpan(Integer.valueOf(ColorCompat.getColor(this.this$0.this$0.getContext(), (int) R.color.link)), false, null, AnonymousClass1.INSTANCE, 4, null));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
index b1cbe81d4e..2a72facabf 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
@@ -35,8 +35,8 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$2 implement
             analyticsTracker.contactSyncToggled(z2, isChecked, checkedSetting3.isChecked());
             WidgetSettingsPrivacy.access$toggleContactSync(this.this$0, this.$model.getContactSyncConnection(), z2);
         } else if (z2) {
-            AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("User Settings", null, null, null, null, 30, null));
-            ContactSyncAnalytics.Companion.trackStart$default(ContactSyncAnalytics.Companion, false, g0.mapOf(o.to("location_page", "User Settings")), 1, null);
+            AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location(Traits.Location.Page.USER_SETTINGS, null, null, null, null, 30, null));
+            ContactSyncAnalytics.Companion.trackStart$default(ContactSyncAnalytics.Companion, false, g0.mapOf(o.to("location_page", Traits.Location.Page.USER_SETTINGS)), 1, null);
             WidgetContactSync.Companion.launch$default(WidgetContactSync.Companion, this.this$0.requireContext(), null, false, false, false, 30, null);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
index 8f9a1f81f6..151e62fdc5 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
+import com.discord.R;
+import com.discord.restapi.RestAPIParams;
 import com.discord.views.CheckedSetting;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -65,7 +67,7 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
                 boolean booleanValue = bool.booleanValue();
                 CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1978z;
                 m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
-                WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "usage_statistics", checkedSetting);
+                WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, RestAPIParams.Consents.Type.USAGE_STATS, checkedSetting);
             }
         }
 
@@ -90,11 +92,11 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
             m.checkNotNullParameter(textView2, "dialogBody");
             m.checkNotNullParameter(textView3, "dialogCancel");
             m.checkNotNullParameter(textView4, "dialogConfirm");
-            textView.setText(2131894592);
-            textView2.setText(2131894589);
-            textView3.setText(2131894590);
+            textView.setText(R.string.usage_statistics_disable_modal_title);
+            textView2.setText(R.string.usage_statistics_disable_modal_body);
+            textView3.setText(R.string.usage_statistics_disable_modal_cancel);
             textView3.setOnClickListener(new AnonymousClass1(this, alertDialog));
-            textView4.setText(2131894591);
+            textView4.setText(R.string.usage_statistics_disable_modal_confirm);
             textView4.setOnClickListener(new AnonymousClass2(this, alertDialog));
         }
     }
@@ -114,7 +116,7 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
             boolean booleanValue = bool.booleanValue();
             CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1978z;
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyStatistics");
-            WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "usage_statistics", checkedSetting2);
+            WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, RestAPIParams.Consents.Type.USAGE_STATS, checkedSetting2);
             return;
         }
         WidgetSettingsPrivacy.access$confirmConsent(this.this$0, this.$context, new AnonymousClass1(this, bool));
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java
index 10413b5202..c5b2dce626 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
+import com.discord.R;
+import com.discord.restapi.RestAPIParams;
 import com.discord.views.CheckedSetting;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -65,7 +67,7 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$2<T> implement
                 boolean booleanValue = bool.booleanValue();
                 CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).v;
                 m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyPersonalization");
-                WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "personalization", checkedSetting);
+                WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, RestAPIParams.Consents.Type.PERSONALIZATION, checkedSetting);
             }
         }
 
@@ -90,11 +92,11 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$2<T> implement
             m.checkNotNullParameter(textView2, "dialogBody");
             m.checkNotNullParameter(textView3, "dialogCancel");
             m.checkNotNullParameter(textView4, "dialogConfirm");
-            textView.setText(2131892209);
-            textView2.setText(2131892206);
-            textView3.setText(2131892207);
+            textView.setText(R.string.personalization_disable_modal_title);
+            textView2.setText(R.string.personalization_disable_modal_body);
+            textView3.setText(R.string.personalization_disable_modal_cancel);
             textView3.setOnClickListener(new AnonymousClass1(this, alertDialog));
-            textView4.setText(2131892208);
+            textView4.setText(R.string.personalization_disable_modal_confirm);
             textView4.setOnClickListener(new AnonymousClass2(this, alertDialog));
         }
     }
@@ -114,7 +116,7 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$2<T> implement
             boolean booleanValue = bool.booleanValue();
             CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).v;
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization");
-            WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "personalization", checkedSetting2);
+            WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, RestAPIParams.Consents.Type.PERSONALIZATION, checkedSetting2);
             return;
         }
         WidgetSettingsPrivacy.access$confirmConsent(this.this$0, this.$context, new AnonymousClass1(this, bool));
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java
index 90ee23abf4..a61bb63974 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.content.Context;
 import android.view.View;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.utilities.rest.RestAPI;
 import d0.z.d.m;
 /* compiled from: WidgetSettingsPrivacy.kt */
@@ -24,7 +25,7 @@ public final class WidgetSettingsPrivacy$configureRequestDataButton$1 implements
         if (context != null) {
             m.checkNotNullExpressionValue(context, "context ?: return@setOnClickListener");
             if (!this.$isMeVerified || (harvestState = this.$harvestState) == null) {
-                o.i(this.this$0, 2131888058, 0, 4);
+                o.i(this.this$0, R.string.data_privacy_controls_request_data_tooltip, 0, 4);
             } else {
                 WidgetSettingsPrivacy.access$onRequestDataClick(this.this$0, context, harvestState);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java
index 8e17e3f45c..da89dd6ee9 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.models.domain.Harvest;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.widgets.notice.WidgetNoticeDialog;
@@ -31,7 +32,7 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$1 extends o implemen
 
     public final void invoke(Harvest harvest) {
         m.checkNotNullParameter(harvest, "requestedHarvest");
-        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888057).setMessage(2131888056), 2131892004, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(R.string.data_privacy_controls_request_data_success_title).setMessage(R.string.data_privacy_controls_request_data_success_body), (int) R.string.okay, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java
index ba1a756a43..7ae49816a3 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -38,12 +39,12 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$2 extends o implemen
     /* JADX WARN: Multi-variable type inference failed */
     /* JADX WARNING: Unknown variable types count: 1 */
     public final void invoke(String str) {
-        WidgetNoticeDialog.Builder title = new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888049);
+        WidgetNoticeDialog.Builder title = new WidgetNoticeDialog.Builder(this.$context).setTitle(R.string.data_privacy_controls_request_data_failure_title);
         String str2 = str;
         if (str == null) {
-            str2 = b.h(this.$context, 2131888048, new Object[0], null, 4);
+            str2 = b.h(this.$context, R.string.data_privacy_controls_request_data_failure_body, new Object[0], null, 4);
         }
-        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(title.setMessage(str2), 2131892004, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(title.setMessage(str2), (int) R.string.okay, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java
index 71fff99f72..dbfa9f1ef7 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings;
 import android.content.Context;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -51,7 +52,7 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$4 extends o implemen
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888047).setMessage(2131888052).setPositiveButton(2131892004, new AnonymousClass1(this)), 2131887193, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(R.string.data_privacy_controls_request_data_download).setMessage(R.string.data_privacy_controls_request_data_modal_note).setPositiveButton(R.string.okay, new AnonymousClass1(this)), (int) R.string.cancel, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         negativeButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
index ff35a3257c..d1da39b20e 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
@@ -16,6 +16,7 @@ import c.a.e.q;
 import c.a.j.q5;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.ViewDialogConfirmationBinding;
 import com.discord.databinding.WidgetSettingsPrivacyBinding;
@@ -453,7 +454,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     public WidgetSettingsPrivacy() {
-        super(2131559275);
+        super(R.layout.widget_settings_privacy);
     }
 
     public static final /* synthetic */ void access$configureRequestDataButton(WidgetSettingsPrivacy widgetSettingsPrivacy, boolean z2, RestAPI.HarvestState harvestState) {
@@ -516,7 +517,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         if (model.getShowContactSync()) {
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.contactSyncSettingInfo");
-            b.m(textView, 2131887590, new Object[0], new WidgetSettingsPrivacy$configureContactSyncOptions$1(this));
+            b.m(textView, R.string.contact_sync_info_settings_2, new Object[0], new WidgetSettingsPrivacy$configureContactSyncOptions$1(this));
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.contactSyncSettingInfo");
             textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -626,7 +627,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     private final void confirmConsent(Context context, Function5<? super AlertDialog, ? super TextView, ? super TextView, ? super TextView, ? super TextView, Unit> function5) {
-        ViewDialogConfirmationBinding a = ViewDialogConfirmationBinding.a(getLayoutInflater().inflate(2131558757, (ViewGroup) null, false));
+        ViewDialogConfirmationBinding a = ViewDialogConfirmationBinding.a(getLayoutInflater().inflate(R.layout.view_dialog_confirmation, (ViewGroup) null, false));
         m.checkNotNullExpressionValue(a, "ViewDialogConfirmationBi…outInflater, null, false)");
         AlertDialog create = new AlertDialog.Builder(context).setView(a.a).setCancelable(false).create();
         m.checkNotNullExpressionValue(create, "AlertDialog.Builder(this…(false)\n        .create()");
@@ -679,12 +680,12 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     private final void showDefaultGuildsRestrictedExistingServers(boolean z2) {
-        View inflate = getLayoutInflater().inflate(2131559276, (ViewGroup) null, false);
-        int i = 2131365113;
-        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365113);
+        View inflate = getLayoutInflater().inflate(R.layout.widget_settings_privacy_defaults, (ViewGroup) null, false);
+        int i = R.id.settings_privacy_defaults_existing_no;
+        MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.settings_privacy_defaults_existing_no);
         if (materialButton != null) {
-            i = 2131365114;
-            MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131365114);
+            i = R.id.settings_privacy_defaults_existing_yes;
+            MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(R.id.settings_privacy_defaults_existing_yes);
             if (materialButton2 != null) {
                 LinearLayout linearLayout = (LinearLayout) inflate;
                 m.checkNotNullExpressionValue(new q5(linearLayout, materialButton, materialButton2), "WidgetSettingsPrivacyDef…outInflater, null, false)");
@@ -711,7 +712,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         Context context = getContext();
         if (context != null) {
             m.checkNotNullExpressionValue(context, "context ?: return");
-            WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131888061).setMessage(b.h(context, 2131888038, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, j, context, 0, 4, null)}, null, 4)), 2131892004, (Function1) null, 2, (Object) null);
+            WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(context).setTitle(R.string.data_privacy_rate_limit_title).setMessage(b.h(context, R.string.data_download_requested_status_note, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, j, context, 0, 4, null)}, null, 4)), (int) R.string.okay, (Function1) null, 2, (Object) null);
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             positiveButton$default.show(parentFragmentManager);
@@ -788,25 +789,25 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131892754);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.privacy_and_safety);
         this.radioManagerExplicit = new RadioManager(getExplicitContentRadios());
         CheckedSetting checkedSetting = getBinding().v;
         CheckedSetting checkedSetting2 = getBinding().v;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization");
         f fVar = f.a;
-        checkedSetting.h(b.j(checkedSetting2, 2131888045, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
+        checkedSetting.h(b.j(checkedSetting2, R.string.data_privacy_controls_personalization_note_learn_more, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
         CheckedSetting checkedSetting3 = getBinding().f1977y;
         CheckedSetting checkedSetting4 = getBinding().f1977y;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.settingsPrivacyScreenreaderDetection");
-        checkedSetting3.h(b.j(checkedSetting4, 2131888040, new Object[]{fVar.a(360035966492L, null)}, null, 4), true);
+        checkedSetting3.h(b.j(checkedSetting4, R.string.data_privacy_controls_allow_accessibility_detection_note, new Object[]{fVar.a(360035966492L, null)}, null, 4), true);
         CheckedSetting checkedSetting5 = getBinding().f1977y;
         checkedSetting5.setOnCheckedListener(new WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1(checkedSetting5, this));
         getBinding().i.setButtonVisibility(false);
         CheckedSetting checkedSetting6 = getBinding().i;
         CheckedSetting checkedSetting7 = getBinding().i;
         m.checkNotNullExpressionValue(checkedSetting7, "binding.settingsPrivacyBasicService");
-        checkedSetting6.h(b.d(checkedSetting7, 2131888042, new Object[0], WidgetSettingsPrivacy$onViewBound$2.INSTANCE), true);
+        checkedSetting6.h(b.d(checkedSetting7, R.string.data_privacy_controls_basic_service_note, new Object[0], WidgetSettingsPrivacy$onViewBound$2.INSTANCE), true);
         getBinding().i.e(WidgetSettingsPrivacy$onViewBound$3.INSTANCE);
         String a = fVar.a(360004027692L, null);
         TextView textView = getBinding().h;
@@ -815,7 +816,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         sb.append('[');
         TextView textView2 = getBinding().h;
         m.checkNotNullExpressionValue(textView2, "binding.requestDataLink");
-        sb.append(b.j(textView2, 2131891854, new Object[0], null, 4));
+        sb.append(b.j(textView2, R.string.notice_whats_this, new Object[0], null, 4));
         sb.append("](");
         sb.append(a);
         sb.append(')');
@@ -824,7 +825,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         CheckedSetting checkedSetting8 = getBinding().f1978z;
         CheckedSetting checkedSetting9 = getBinding().f1978z;
         m.checkNotNullExpressionValue(checkedSetting9, "binding.settingsPrivacyStatistics");
-        checkedSetting8.h(b.j(checkedSetting9, 2131888059, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
+        checkedSetting8.h(b.j(checkedSetting9, R.string.data_privacy_controls_usage_statistics_note, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
         for (TextView textView3 : n.listOf((Object[]) new TextView[]{getBinding().f1976x, getBinding().n, getBinding().u, getBinding().l})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView3, "header");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java
index 4546152dc2..b8e4212e02 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsVoiceInputModeBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,14 +19,14 @@ public final /* synthetic */ class WidgetSettingsVoice$InputModeSelector$binding
 
     public final WidgetSettingsVoiceInputModeBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363438;
-        TextView textView = (TextView) view.findViewById(2131363438);
+        int i = R.id.guild_actions_overview_header_tv;
+        TextView textView = (TextView) view.findViewById(R.id.guild_actions_overview_header_tv);
         if (textView != null) {
-            i = 2131365145;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365145);
+            i = R.id.settings_voice_input_mode_ptt;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_voice_input_mode_ptt);
             if (linearLayout != null) {
-                i = 2131365146;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365146);
+                i = R.id.settings_voice_input_mode_vad;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.settings_voice_input_mode_vad);
                 if (linearLayout2 != null) {
                     return new WidgetSettingsVoiceInputModeBinding((NestedScrollView) view, textView, linearLayout, linearLayout2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java
index 1fe83c56ff..52616d4392 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsVoiceBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
@@ -23,104 +24,104 @@ public final /* synthetic */ class WidgetSettingsVoice$binding$2 extends k imple
 
     public final WidgetSettingsVoiceBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365140;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365140);
+        int i = R.id.settings_voice_auto_vad_toggle;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_voice_auto_vad_toggle);
         if (checkedSetting != null) {
-            i = 2131365141;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365141);
+            i = R.id.settings_voice_echo_cancellation_toggle;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.settings_voice_echo_cancellation_toggle);
             if (checkedSetting2 != null) {
-                i = 2131365142;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365142);
+                i = R.id.settings_voice_enable_hardware_scaling_toggle;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.settings_voice_enable_hardware_scaling_toggle);
                 if (checkedSetting3 != null) {
-                    i = 2131365143;
-                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131365143);
+                    i = R.id.settings_voice_gain_control_toggle;
+                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.settings_voice_gain_control_toggle);
                     if (checkedSetting4 != null) {
-                        i = 2131365144;
-                        TextView textView = (TextView) view.findViewById(2131365144);
+                        i = R.id.settings_voice_input_header;
+                        TextView textView = (TextView) view.findViewById(R.id.settings_voice_input_header);
                         if (textView != null) {
-                            i = 2131365147;
-                            TextView textView2 = (TextView) view.findViewById(2131365147);
+                            i = R.id.settings_voice_krisp_info;
+                            TextView textView2 = (TextView) view.findViewById(R.id.settings_voice_krisp_info);
                             if (textView2 != null) {
-                                i = 2131365148;
-                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131365148);
+                                i = R.id.settings_voice_krisp_vad_toggle;
+                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.settings_voice_krisp_vad_toggle);
                                 if (checkedSetting5 != null) {
-                                    i = 2131365149;
-                                    RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365149);
+                                    i = R.id.settings_voice_mode;
+                                    RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.settings_voice_mode);
                                     if (relativeLayout != null) {
-                                        i = 2131365150;
-                                        TextView textView3 = (TextView) view.findViewById(2131365150);
+                                        i = R.id.settings_voice_mode_header;
+                                        TextView textView3 = (TextView) view.findViewById(R.id.settings_voice_mode_header);
                                         if (textView3 != null) {
-                                            i = 2131365151;
-                                            TextView textView4 = (TextView) view.findViewById(2131365151);
+                                            i = R.id.settings_voice_mode_value;
+                                            TextView textView4 = (TextView) view.findViewById(R.id.settings_voice_mode_value);
                                             if (textView4 != null) {
-                                                i = 2131365152;
-                                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365152);
+                                                i = R.id.settings_voice_noise_cancellation_toggle;
+                                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.settings_voice_noise_cancellation_toggle);
                                                 if (checkedSetting6 != null) {
-                                                    i = 2131365153;
-                                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131365153);
+                                                    i = R.id.settings_voice_noise_suppression_toggle;
+                                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(R.id.settings_voice_noise_suppression_toggle);
                                                     if (checkedSetting7 != null) {
-                                                        i = 2131365154;
-                                                        TextView textView5 = (TextView) view.findViewById(2131365154);
+                                                        i = R.id.settings_voice_opensl_header;
+                                                        TextView textView5 = (TextView) view.findViewById(R.id.settings_voice_opensl_header);
                                                         if (textView5 != null) {
-                                                            i = 2131365155;
-                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131365155);
+                                                            i = R.id.settings_voice_opensles_default;
+                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(R.id.settings_voice_opensles_default);
                                                             if (checkedSetting8 != null) {
-                                                                i = 2131365156;
-                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131365156);
+                                                                i = R.id.settings_voice_opensles_force_disabled;
+                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(R.id.settings_voice_opensles_force_disabled);
                                                                 if (checkedSetting9 != null) {
-                                                                    i = 2131365157;
-                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131365157);
+                                                                    i = R.id.settings_voice_opensles_force_enabled;
+                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(R.id.settings_voice_opensles_force_enabled);
                                                                     if (checkedSetting10 != null) {
-                                                                        i = 2131365158;
-                                                                        TextView textView6 = (TextView) view.findViewById(2131365158);
+                                                                        i = R.id.settings_voice_opensles_help;
+                                                                        TextView textView6 = (TextView) view.findViewById(R.id.settings_voice_opensles_help);
                                                                         if (textView6 != null) {
-                                                                            i = 2131365159;
-                                                                            TextView textView7 = (TextView) view.findViewById(2131365159);
+                                                                            i = R.id.settings_voice_output_header;
+                                                                            TextView textView7 = (TextView) view.findViewById(R.id.settings_voice_output_header);
                                                                             if (textView7 != null) {
-                                                                                i = 2131365160;
-                                                                                SeekBar seekBar = (SeekBar) view.findViewById(2131365160);
+                                                                                i = R.id.settings_voice_output_volume;
+                                                                                SeekBar seekBar = (SeekBar) view.findViewById(R.id.settings_voice_output_volume);
                                                                                 if (seekBar != null) {
-                                                                                    i = 2131365161;
-                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365161);
+                                                                                    i = R.id.settings_voice_output_volume_wrap;
+                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_voice_output_volume_wrap);
                                                                                     if (linearLayout != null) {
-                                                                                        i = 2131365162;
-                                                                                        TextView textView8 = (TextView) view.findViewById(2131365162);
+                                                                                        i = R.id.settings_voice_overlay_header;
+                                                                                        TextView textView8 = (TextView) view.findViewById(R.id.settings_voice_overlay_header);
                                                                                         if (textView8 != null) {
-                                                                                            i = 2131365163;
-                                                                                            CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131365163);
+                                                                                            i = R.id.settings_voice_overlay_toggle;
+                                                                                            CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(R.id.settings_voice_overlay_toggle);
                                                                                             if (checkedSetting11 != null) {
-                                                                                                i = 2131365164;
-                                                                                                TextView textView9 = (TextView) view.findViewById(2131365164);
+                                                                                                i = R.id.settings_voice_processing_header;
+                                                                                                TextView textView9 = (TextView) view.findViewById(R.id.settings_voice_processing_header);
                                                                                                 if (textView9 != null) {
-                                                                                                    i = 2131365165;
-                                                                                                    View findViewById = view.findViewById(2131365165);
+                                                                                                    i = R.id.settings_voice_sensitivity_automatic;
+                                                                                                    View findViewById = view.findViewById(R.id.settings_voice_sensitivity_automatic);
                                                                                                     if (findViewById != null) {
-                                                                                                        i = 2131365166;
-                                                                                                        TextView textView10 = (TextView) view.findViewById(2131365166);
+                                                                                                        i = R.id.settings_voice_sensitivity_header;
+                                                                                                        TextView textView10 = (TextView) view.findViewById(R.id.settings_voice_sensitivity_header);
                                                                                                         if (textView10 != null) {
-                                                                                                            i = 2131365167;
-                                                                                                            TextView textView11 = (TextView) view.findViewById(2131365167);
+                                                                                                            i = R.id.settings_voice_sensitivity_label;
+                                                                                                            TextView textView11 = (TextView) view.findViewById(R.id.settings_voice_sensitivity_label);
                                                                                                             if (textView11 != null) {
-                                                                                                                i = 2131365168;
-                                                                                                                SeekBar seekBar2 = (SeekBar) view.findViewById(2131365168);
+                                                                                                                i = R.id.settings_voice_sensitivity_manual;
+                                                                                                                SeekBar seekBar2 = (SeekBar) view.findViewById(R.id.settings_voice_sensitivity_manual);
                                                                                                                 if (seekBar2 != null) {
-                                                                                                                    i = 2131365169;
-                                                                                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365169);
+                                                                                                                    i = R.id.settings_voice_sensitivity_test_button;
+                                                                                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.settings_voice_sensitivity_test_button);
                                                                                                                     if (materialButton != null) {
-                                                                                                                        i = 2131365170;
-                                                                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365170);
+                                                                                                                        i = R.id.settings_voice_sensitivity_testing_container;
+                                                                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.settings_voice_sensitivity_testing_container);
                                                                                                                         if (linearLayout2 != null) {
-                                                                                                                            i = 2131365171;
-                                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131365171);
+                                                                                                                            i = R.id.settings_voice_sensitivity_wrap;
+                                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(R.id.settings_voice_sensitivity_wrap);
                                                                                                                             if (relativeLayout2 != null) {
-                                                                                                                                i = 2131365172;
-                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365172);
+                                                                                                                                i = R.id.settings_voice_video_container;
+                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.settings_voice_video_container);
                                                                                                                                 if (linearLayout3 != null) {
-                                                                                                                                    i = 2131365173;
-                                                                                                                                    TextView textView12 = (TextView) view.findViewById(2131365173);
+                                                                                                                                    i = R.id.settings_voice_video_header;
+                                                                                                                                    TextView textView12 = (TextView) view.findViewById(R.id.settings_voice_video_header);
                                                                                                                                     if (textView12 != null) {
-                                                                                                                                        i = 2131365174;
-                                                                                                                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365174);
+                                                                                                                                        i = R.id.settings_voice_video_troubleshooting_guide;
+                                                                                                                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.settings_voice_video_troubleshooting_guide);
                                                                                                                                         if (linkifiedTextView != null) {
                                                                                                                                             return new WidgetSettingsVoiceBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, textView, textView2, checkedSetting5, relativeLayout, textView3, textView4, checkedSetting6, checkedSetting7, textView5, checkedSetting8, checkedSetting9, checkedSetting10, textView6, textView7, seekBar, linearLayout, textView8, checkedSetting11, textView9, findViewById, textView10, textView11, seekBar2, materialButton, linearLayout2, relativeLayout2, linearLayout3, textView12, linkifiedTextView);
                                                                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
index 3111b9be8b..c98ccdd091 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
@@ -20,6 +20,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsVoiceBinding;
@@ -99,10 +100,10 @@ public final class WidgetSettingsVoice extends AppFragment {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
             if (num != null) {
-                intent.putExtra("ARG_TARGET_RES_ID", num.intValue());
+                intent.putExtra(WidgetSettingsVoice.ARG_TARGET_RES_ID, num.intValue());
             }
             if (z2) {
-                intent.putExtra("ARG_TARGET_AUTO_TOGGLE", z2);
+                intent.putExtra(WidgetSettingsVoice.ARG_TARGET_AUTO_TOGGLE, z2);
             }
             l.d(context, WidgetSettingsVoice.class, intent);
             StoreAnalytics.onUserSettingsPaneViewed$default(StoreStream.Companion.getAnalytics(), "Voice & Video", null, 2, null);
@@ -124,7 +125,7 @@ public final class WidgetSettingsVoice extends AppFragment {
 
         @Override // com.discord.app.AppBottomSheet
         public int getContentViewResId() {
-            return 2131559279;
+            return R.layout.widget_settings_voice_input_mode;
         }
 
         @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -224,7 +225,7 @@ public final class WidgetSettingsVoice extends AppFragment {
     }
 
     public WidgetSettingsVoice() {
-        super(2131559278);
+        super(R.layout.widget_settings_voice);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsVoice widgetSettingsVoice, Model model) {
@@ -270,12 +271,12 @@ public final class WidgetSettingsVoice extends AppFragment {
         seekBar.setProgress(d0.a0.a.roundToInt(PerceptualVolumeUtils.amplitudeToPerceptual$default(PerceptualVolumeUtils.INSTANCE, model.getVoiceConfig().getOutputVolume(), 0.0f, 2, null)));
         getBinding().i.setOnClickListener(new WidgetSettingsVoice$configureUI$1(this));
         int i = 0;
-        getBinding().j.setText(model.getModePTT() ? 2131890643 : model.getModeVAD() ? 2131890646 : 0);
+        getBinding().j.setText(model.getModePTT() ? R.string.input_mode_ptt : model.getModeVAD() ? R.string.input_mode_vad : 0);
         String C = a.C(new StringBuilder(), f.a.a(360045138471L, null), "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-voice-video&utm_content=--t%3Apm");
         LinkifiedTextView linkifiedTextView = getBinding().D;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsVoiceVideoTroubleshootingGuide");
         boolean z2 = true;
-        b.n(linkifiedTextView, 2131888637, new Object[]{C}, null, 4);
+        b.n(linkifiedTextView, R.string.form_help_voice_video_troubleshooting_guide, new Object[]{C}, null, 4);
         RadioManager radioManager = this.openSLESConfigRadioManager;
         if (radioManager == null) {
             m.throwUninitializedPropertyAccessException("openSLESConfigRadioManager");
@@ -311,7 +312,7 @@ public final class WidgetSettingsVoice extends AppFragment {
         getBinding().k.setOnCheckedListener(WidgetSettingsVoice$configureUI$4.INSTANCE);
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.settingsVoiceKrispInfo");
-        b.n(textView, 2131891092, new Object[]{f.a.a(360040843952L, null)}, null, 4);
+        b.n(textView, R.string.learn_more_link, new Object[]{f.a.a(360040843952L, null)}, null, 4);
         TextView textView2 = getBinding().g;
         m.checkNotNullExpressionValue(textView2, "binding.settingsVoiceKrispInfo");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -319,8 +320,8 @@ public final class WidgetSettingsVoice extends AppFragment {
         m.checkNotNullExpressionValue(checkedSetting5, "binding.settingsVoiceNoiseSuppressionToggle");
         checkedSetting5.setChecked(model.getVoiceConfig().getNoiseProcessing() == StoreMediaSettings.NoiseProcessing.Suppression);
         if (model.getVoiceConfig().getNoiseProcessing() == noiseProcessing2) {
-            getBinding().l.b(2131894761);
-            CheckedSetting.i(getBinding().l, b.k(this, 2131894761, new Object[0], null, 4), false, 2);
+            getBinding().l.b(R.string.user_settings_disable_noise_suppression);
+            CheckedSetting.i(getBinding().l, b.k(this, R.string.user_settings_disable_noise_suppression, new Object[0], null, 4), false, 2);
         } else {
             getBinding().l.e(WidgetSettingsVoice$configureUI$5.INSTANCE);
             CheckedSetting.i(getBinding().l, null, false, 2);
@@ -379,7 +380,7 @@ public final class WidgetSettingsVoice extends AppFragment {
             SeekBar seekBar = getBinding().f1983y;
             m.checkNotNullExpressionValue(seekBar, "binding.settingsVoiceSensitivityManual");
             seekBar.setVisibility(4);
-            int i2 = model.getLocalVoiceStatus().b ? 2131231285 : 2131231284;
+            int i2 = model.getLocalVoiceStatus().b ? R.drawable.drawable_voice_indicator_speaking : R.drawable.drawable_voice_indicator_not_speaking;
             View view2 = getBinding().w;
             m.checkNotNullExpressionValue(view2, "binding.settingsVoiceSensitivityAutomatic");
             view2.setBackground(ContextCompat.getDrawable(requireContext(), i2));
@@ -417,7 +418,7 @@ public final class WidgetSettingsVoice extends AppFragment {
         if (openSLESConfig != null) {
             StoreStream.Companion.getMediaEngine().setOpenSLESConfig(openSLESConfig);
         }
-        o.i(this, 2131894834, 0, 4);
+        o.i(this, R.string.user_settings_restart_app_mobile, 0, 4);
     }
 
     private final void onOverlayToggled(Context context) {
@@ -436,7 +437,7 @@ public final class WidgetSettingsVoice extends AppFragment {
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
     public void onActivityResult(int i, int i2, Intent intent) {
-        if (i == 2552) {
+        if (i == OVERLAY_PERMISSION_REQUEST_CODE) {
             boolean access$hasOverlayPermission = Companion.access$hasOverlayPermission(Companion, requireContext());
             StoreStream.Companion.getUserSettings().setIsMobileOverlayEnabled(access$hasOverlayPermission);
             CheckedSetting checkedSetting = getBinding().u;
@@ -458,7 +459,7 @@ public final class WidgetSettingsVoice extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().q;
         m.checkNotNullExpressionValue(textView, "binding.settingsVoiceOpenslesHelp");
-        b.n(textView, 2131888647, new Object[0], null, 4);
+        b.n(textView, R.string.form_label_android_opensl_desc, new Object[0], null, 4);
         CheckedSetting checkedSetting = getBinding().n;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsVoiceOpenslesDefault");
         CheckedSetting checkedSetting2 = getBinding().p;
@@ -481,7 +482,7 @@ public final class WidgetSettingsVoice extends AppFragment {
             m.checkNotNullExpressionValue(textView2, "header");
             accessibilityUtils.setViewIsHeading(textView2);
         }
-        Integer valueOf = Integer.valueOf(getMostRecentIntent().getIntExtra("ARG_TARGET_RES_ID", 0));
+        Integer valueOf = Integer.valueOf(getMostRecentIntent().getIntExtra(ARG_TARGET_RES_ID, 0));
         if (valueOf.intValue() != 0) {
             z2 = false;
         }
@@ -498,7 +499,7 @@ public final class WidgetSettingsVoice extends AppFragment {
             if (m.areEqual(findViewById, getBinding().u)) {
                 CheckedSetting checkedSetting5 = getBinding().u;
                 m.checkNotNullExpressionValue(checkedSetting5, "binding.settingsVoiceOverlayToggle");
-                if (!checkedSetting5.isChecked() && getMostRecentIntent().getBooleanExtra("ARG_TARGET_AUTO_TOGGLE", false)) {
+                if (!checkedSetting5.isChecked() && getMostRecentIntent().getBooleanExtra(ARG_TARGET_AUTO_TOGGLE, false)) {
                     findViewById.post(new WidgetSettingsVoice$onViewBound$$inlined$let$lambda$1(this, view));
                 }
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java
index 52b7d3b1ad..f0e02328b2 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.account;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetDisableDeleteAccountDialogBinding;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
@@ -20,26 +21,26 @@ public final /* synthetic */ class WidgetDisableDeleteAccountDialog$binding$2 ex
 
     public final WidgetDisableDeleteAccountDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362964;
-        TextView textView = (TextView) view.findViewById(2131362964);
+        int i = R.id.disable_delete_body;
+        TextView textView = (TextView) view.findViewById(R.id.disable_delete_body);
         if (textView != null) {
-            i = 2131362965;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362965);
+            i = R.id.disable_delete_cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.disable_delete_cancel);
             if (materialButton != null) {
-                i = 2131362966;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362966);
+                i = R.id.disable_delete_code_wrap;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.disable_delete_code_wrap);
                 if (textInputLayout != null) {
-                    i = 2131362967;
-                    LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362967);
+                    i = R.id.disable_delete_confirm;
+                    LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.disable_delete_confirm);
                     if (loadingButton != null) {
-                        i = 2131362968;
-                        TextView textView2 = (TextView) view.findViewById(2131362968);
+                        i = R.id.disable_delete_header;
+                        TextView textView2 = (TextView) view.findViewById(R.id.disable_delete_header);
                         if (textView2 != null) {
-                            i = 2131362969;
-                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362969);
+                            i = R.id.disable_delete_password_wrap;
+                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.disable_delete_password_wrap);
                             if (textInputLayout2 != null) {
-                                i = 2131364250;
-                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364250);
+                                i = R.id.notice_header_container;
+                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.notice_header_container);
                                 if (linearLayout != null) {
                                     return new WidgetDisableDeleteAccountDialogBinding((LinearLayout) view, textView, materialButton, textInputLayout, loadingButton, textView2, textInputLayout2, linearLayout);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
index 0b1a1eca3f..732946eaa9 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
@@ -8,6 +8,7 @@ import androidx.annotation.StringRes;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetDisableDeleteAccountDialogBinding;
@@ -50,7 +51,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
             m.checkNotNullParameter(mode, "mode");
             WidgetDisableDeleteAccountDialog widgetDisableDeleteAccountDialog = new WidgetDisableDeleteAccountDialog();
             Bundle bundle = new Bundle();
-            bundle.putInt("extra_mode", mode.ordinal());
+            bundle.putInt(WidgetDisableDeleteAccountDialog.EXTRA_MODE, mode.ordinal());
             widgetDisableDeleteAccountDialog.setArguments(bundle);
             String tag = widgetDisableDeleteAccountDialog.getTag();
             if (tag == null) {
@@ -62,8 +63,8 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
 
     /* compiled from: WidgetDisableDeleteAccountDialog.kt */
     public enum Mode {
-        DISABLE(2131888155, 2131888156, 2131888154),
-        DELETE(2131888077, 2131888078, 2131888076);
+        DISABLE(R.string.disable_account, R.string.disable_account_body, R.string.disable),
+        DELETE(R.string.delete_account, R.string.delete_account_body, R.string.delete);
         
         private final int bodyStringId;
         private final int confirmStringId;
@@ -101,7 +102,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
     }
 
     public WidgetDisableDeleteAccountDialog() {
-        super(2131559018);
+        super(R.layout.widget_disable_delete_account_dialog);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetDisableDeleteAccountDialog widgetDisableDeleteAccountDialog, MeUser meUser) {
@@ -167,7 +168,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
         setCancelable(false);
         Bundle arguments = getArguments();
         if (arguments != null) {
-            mode = Mode.values()[arguments.getInt("extra_mode")];
+            mode = Mode.values()[arguments.getInt(EXTRA_MODE)];
         } else {
             mode = null;
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java
index fe5aca755b..03012ae123 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.account;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetEnableSmsBackupDialogBinding;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
@@ -20,23 +21,23 @@ public final /* synthetic */ class WidgetEnableSMSBackupDialog$binding$2 extends
 
     public final WidgetEnableSmsBackupDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363139;
-        TextView textView = (TextView) view.findViewById(2131363139);
+        int i = R.id.enable_sms_backup_body;
+        TextView textView = (TextView) view.findViewById(R.id.enable_sms_backup_body);
         if (textView != null) {
-            i = 2131363140;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363140);
+            i = R.id.enable_sms_backup_cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.enable_sms_backup_cancel);
             if (materialButton != null) {
-                i = 2131363141;
-                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363141);
+                i = R.id.enable_sms_backup_confirm;
+                LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.enable_sms_backup_confirm);
                 if (loadingButton != null) {
-                    i = 2131363142;
-                    TextView textView2 = (TextView) view.findViewById(2131363142);
+                    i = R.id.enable_sms_backup_header;
+                    TextView textView2 = (TextView) view.findViewById(R.id.enable_sms_backup_header);
                     if (textView2 != null) {
-                        i = 2131363143;
-                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363143);
+                        i = R.id.enable_sms_backup_password_wrap;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.enable_sms_backup_password_wrap);
                         if (textInputLayout != null) {
-                            i = 2131364250;
-                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364250);
+                            i = R.id.notice_header_container;
+                            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.notice_header_container);
                             if (linearLayout != null) {
                                 return new WidgetEnableSmsBackupDialogBinding((LinearLayout) view, textView, materialButton, loadingButton, textView2, textInputLayout, linearLayout);
                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
index 82b402b245..7e566cbff9 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetEnableSmsBackupDialogBinding;
 import com.discord.restapi.RestAPIParams;
@@ -41,7 +42,7 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetEnableSMSBackupDialog widgetEnableSMSBackupDialog = new WidgetEnableSMSBackupDialog();
             Bundle bundle = new Bundle();
-            bundle.putBoolean("extra_enable", z2);
+            bundle.putBoolean(WidgetEnableSMSBackupDialog.EXTRA_ENABLE, z2);
             widgetEnableSMSBackupDialog.setArguments(bundle);
             String tag = widgetEnableSMSBackupDialog.getTag();
             if (tag == null) {
@@ -52,7 +53,7 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog {
     }
 
     public WidgetEnableSMSBackupDialog() {
-        super(2131559037);
+        super(R.layout.widget_enable_sms_backup_dialog);
         setCancelable(false);
     }
 
@@ -87,7 +88,7 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog {
     public void onResume() {
         super.onResume();
         Bundle arguments = getArguments();
-        Boolean valueOf = arguments != null ? Boolean.valueOf(arguments.getBoolean("extra_enable")) : null;
+        Boolean valueOf = arguments != null ? Boolean.valueOf(arguments.getBoolean(EXTRA_ENABLE)) : null;
         if (valueOf == null) {
             dismiss();
             return;
@@ -95,19 +96,19 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog {
         if (valueOf.booleanValue()) {
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.enableSmsBackupHeader");
-            textView.setText(getString(2131891514));
+            textView.setText(getString(R.string.mfa_sms_enable));
             TextView textView2 = getBinding().b;
             m.checkNotNullExpressionValue(textView2, "binding.enableSmsBackupBody");
-            textView2.setText(getString(2131891509));
-            getBinding().d.setText(getString(2131888356));
+            textView2.setText(getString(R.string.mfa_sms_auth_sales_pitch));
+            getBinding().d.setText(getString(R.string.enable));
         } else {
             TextView textView3 = getBinding().e;
             m.checkNotNullExpressionValue(textView3, "binding.enableSmsBackupHeader");
-            textView3.setText(getString(2131891520));
+            textView3.setText(getString(R.string.mfa_sms_remove));
             TextView textView4 = getBinding().b;
             m.checkNotNullExpressionValue(textView4, "binding.enableSmsBackupBody");
-            textView4.setText(getString(2131891511));
-            getBinding().d.setText(getString(2131888154));
+            textView4.setText(getString(R.string.mfa_sms_confirm_remove_body));
+            getBinding().d.setText(getString(R.string.disable));
         }
         getBinding().f1796c.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$1(this));
         getBinding().d.setIsLoading(false);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java
index 1b1bb8c70c..2a4c013bb9 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
 import com.airbnb.lottie.LottieAnimationView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsAccountBinding;
 import com.discord.utilities.dimmer.DimmerView;
@@ -29,146 +30,146 @@ public final /* synthetic */ class WidgetSettingsAccount$binding$2 extends k imp
 
     public final WidgetSettingsAccountBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362088;
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362088);
+        int i = R.id.avatar_edit_section;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.avatar_edit_section);
         if (relativeLayout != null) {
-            i = 2131362089;
-            View findViewById = view.findViewById(2131362089);
+            i = R.id.avatar_edit_section_bottom_divider;
+            View findViewById = view.findViewById(R.id.avatar_edit_section_bottom_divider);
             if (findViewById != null) {
-                i = 2131362956;
-                DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                i = R.id.dimmer_view;
+                DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                 if (dimmerView != null) {
-                    i = 2131364984;
-                    TextView textView = (TextView) view.findViewById(2131364984);
+                    i = R.id.settings_account_2fa_header;
+                    TextView textView = (TextView) view.findViewById(R.id.settings_account_2fa_header);
                     if (textView != null) {
-                        i = 2131364985;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364985);
+                        i = R.id.settings_account_avatar;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.settings_account_avatar);
                         if (simpleDraweeView != null) {
-                            i = 2131364986;
-                            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364986);
+                            i = R.id.settings_account_avatar_container;
+                            FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.settings_account_avatar_container);
                             if (frameLayout != null) {
-                                i = 2131364987;
-                                ImageView imageView = (ImageView) view.findViewById(2131364987);
+                                i = R.id.settings_account_avatar_edit;
+                                ImageView imageView = (ImageView) view.findViewById(R.id.settings_account_avatar_edit);
                                 if (imageView != null) {
-                                    i = 2131364988;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364988);
+                                    i = R.id.settings_account_avatar_wrap;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_account_avatar_wrap);
                                     if (linearLayout != null) {
-                                        i = 2131364989;
-                                        TextView textView2 = (TextView) view.findViewById(2131364989);
+                                        i = R.id.settings_account_change_password;
+                                        TextView textView2 = (TextView) view.findViewById(R.id.settings_account_change_password);
                                         if (textView2 != null) {
-                                            i = 2131364990;
-                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364990);
+                                            i = R.id.settings_account_email_container;
+                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.settings_account_email_container);
                                             if (linearLayout2 != null) {
-                                                i = 2131364991;
-                                                TextView textView3 = (TextView) view.findViewById(2131364991);
+                                                i = R.id.settings_account_email_label;
+                                                TextView textView3 = (TextView) view.findViewById(R.id.settings_account_email_label);
                                                 if (textView3 != null) {
-                                                    i = 2131364992;
-                                                    TextView textView4 = (TextView) view.findViewById(2131364992);
+                                                    i = R.id.settings_account_email_text;
+                                                    TextView textView4 = (TextView) view.findViewById(R.id.settings_account_email_text);
                                                     if (textView4 != null) {
-                                                        i = 2131364993;
-                                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364993);
+                                                        i = R.id.settings_account_information_data_wrap;
+                                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.settings_account_information_data_wrap);
                                                         if (linearLayout3 != null) {
-                                                            i = 2131364994;
-                                                            TextView textView5 = (TextView) view.findViewById(2131364994);
+                                                            i = R.id.settings_account_information_header;
+                                                            TextView textView5 = (TextView) view.findViewById(R.id.settings_account_information_header);
                                                             if (textView5 != null) {
-                                                                i = 2131364995;
-                                                                TextView textView6 = (TextView) view.findViewById(2131364995);
+                                                                i = R.id.settings_account_management_header;
+                                                                TextView textView6 = (TextView) view.findViewById(R.id.settings_account_management_header);
                                                                 if (textView6 != null) {
-                                                                    i = 2131364996;
-                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364996);
+                                                                    i = R.id.settings_account_mfa_container;
+                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.settings_account_mfa_container);
                                                                     if (linearLayout4 != null) {
-                                                                        i = 2131364997;
-                                                                        LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131364997);
+                                                                        i = R.id.settings_account_mfa_disabled_container;
+                                                                        LinearLayout linearLayout5 = (LinearLayout) view.findViewById(R.id.settings_account_mfa_disabled_container);
                                                                         if (linearLayout5 != null) {
-                                                                            i = 2131364998;
-                                                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364998);
+                                                                            i = R.id.settings_account_mfa_enable;
+                                                                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.settings_account_mfa_enable);
                                                                             if (materialButton != null) {
-                                                                                i = 2131364999;
-                                                                                LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131364999);
+                                                                                i = R.id.settings_account_mfa_enabled_container;
+                                                                                LinearLayout linearLayout6 = (LinearLayout) view.findViewById(R.id.settings_account_mfa_enabled_container);
                                                                                 if (linearLayout6 != null) {
-                                                                                    i = 2131365000;
-                                                                                    TextView textView7 = (TextView) view.findViewById(2131365000);
+                                                                                    i = R.id.settings_account_mfa_enabled_header;
+                                                                                    TextView textView7 = (TextView) view.findViewById(R.id.settings_account_mfa_enabled_header);
                                                                                     if (textView7 != null) {
-                                                                                        i = 2131365001;
-                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365001);
+                                                                                        i = R.id.settings_account_mfa_flipper;
+                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.settings_account_mfa_flipper);
                                                                                         if (appViewFlipper != null) {
-                                                                                            i = 2131365002;
-                                                                                            LottieAnimationView lottieAnimationView = (LottieAnimationView) view.findViewById(2131365002);
+                                                                                            i = R.id.settings_account_mfa_lottie;
+                                                                                            LottieAnimationView lottieAnimationView = (LottieAnimationView) view.findViewById(R.id.settings_account_mfa_lottie);
                                                                                             if (lottieAnimationView != null) {
-                                                                                                i = 2131365003;
-                                                                                                TextView textView8 = (TextView) view.findViewById(2131365003);
+                                                                                                i = R.id.settings_account_mfa_sales_pitch;
+                                                                                                TextView textView8 = (TextView) view.findViewById(R.id.settings_account_mfa_sales_pitch);
                                                                                                 if (textView8 != null) {
-                                                                                                    i = 2131365005;
-                                                                                                    LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131365005);
+                                                                                                    i = R.id.settings_account_name_container;
+                                                                                                    LinearLayout linearLayout7 = (LinearLayout) view.findViewById(R.id.settings_account_name_container);
                                                                                                     if (linearLayout7 != null) {
-                                                                                                        i = 2131365006;
-                                                                                                        TextView textView9 = (TextView) view.findViewById(2131365006);
+                                                                                                        i = R.id.settings_account_name_label;
+                                                                                                        TextView textView9 = (TextView) view.findViewById(R.id.settings_account_name_label);
                                                                                                         if (textView9 != null) {
-                                                                                                            i = 2131365007;
-                                                                                                            TextView textView10 = (TextView) view.findViewById(2131365007);
+                                                                                                            i = R.id.settings_account_name_text;
+                                                                                                            TextView textView10 = (TextView) view.findViewById(R.id.settings_account_name_text);
                                                                                                             if (textView10 != null) {
-                                                                                                                i = 2131365008;
-                                                                                                                LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131365008);
+                                                                                                                i = R.id.settings_account_phone_container;
+                                                                                                                LinearLayout linearLayout8 = (LinearLayout) view.findViewById(R.id.settings_account_phone_container);
                                                                                                                 if (linearLayout8 != null) {
-                                                                                                                    i = 2131365009;
-                                                                                                                    TextView textView11 = (TextView) view.findViewById(2131365009);
+                                                                                                                    i = R.id.settings_account_phone_label;
+                                                                                                                    TextView textView11 = (TextView) view.findViewById(R.id.settings_account_phone_label);
                                                                                                                     if (textView11 != null) {
-                                                                                                                        i = 2131365010;
-                                                                                                                        TextView textView12 = (TextView) view.findViewById(2131365010);
+                                                                                                                        i = R.id.settings_account_phone_text;
+                                                                                                                        TextView textView12 = (TextView) view.findViewById(R.id.settings_account_phone_text);
                                                                                                                         if (textView12 != null) {
-                                                                                                                            i = 2131365011;
-                                                                                                                            TextView textView13 = (TextView) view.findViewById(2131365011);
+                                                                                                                            i = R.id.settings_account_private_data_delete;
+                                                                                                                            TextView textView13 = (TextView) view.findViewById(R.id.settings_account_private_data_delete);
                                                                                                                             if (textView13 != null) {
-                                                                                                                                i = 2131365012;
-                                                                                                                                TextView textView14 = (TextView) view.findViewById(2131365012);
+                                                                                                                                i = R.id.settings_account_private_data_disable;
+                                                                                                                                TextView textView14 = (TextView) view.findViewById(R.id.settings_account_private_data_disable);
                                                                                                                                 if (textView14 != null) {
-                                                                                                                                    i = 2131365013;
-                                                                                                                                    LinearLayout linearLayout9 = (LinearLayout) view.findViewById(2131365013);
+                                                                                                                                    i = R.id.settings_account_private_data_wrap;
+                                                                                                                                    LinearLayout linearLayout9 = (LinearLayout) view.findViewById(R.id.settings_account_private_data_wrap);
                                                                                                                                     if (linearLayout9 != null) {
-                                                                                                                                        i = 2131365014;
-                                                                                                                                        TextView textView15 = (TextView) view.findViewById(2131365014);
+                                                                                                                                        i = R.id.settings_account_remove_avatar;
+                                                                                                                                        TextView textView15 = (TextView) view.findViewById(R.id.settings_account_remove_avatar);
                                                                                                                                         if (textView15 != null) {
-                                                                                                                                            i = 2131365015;
-                                                                                                                                            TextView textView16 = (TextView) view.findViewById(2131365015);
+                                                                                                                                            i = R.id.settings_account_remove_two_fa;
+                                                                                                                                            TextView textView16 = (TextView) view.findViewById(R.id.settings_account_remove_two_fa);
                                                                                                                                             if (textView16 != null) {
-                                                                                                                                                i = 2131365016;
-                                                                                                                                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365016);
+                                                                                                                                                i = R.id.settings_account_save;
+                                                                                                                                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.settings_account_save);
                                                                                                                                                 if (floatingActionButton != null) {
-                                                                                                                                                    i = 2131365017;
-                                                                                                                                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131365017);
+                                                                                                                                                    i = R.id.settings_account_scroll;
+                                                                                                                                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.settings_account_scroll);
                                                                                                                                                     if (nestedScrollView != null) {
-                                                                                                                                                        i = 2131365018;
-                                                                                                                                                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365018);
+                                                                                                                                                        i = R.id.settings_account_sms_backup;
+                                                                                                                                                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_account_sms_backup);
                                                                                                                                                         if (checkedSetting != null) {
-                                                                                                                                                            i = 2131365019;
-                                                                                                                                                            TextView textView17 = (TextView) view.findViewById(2131365019);
+                                                                                                                                                            i = R.id.settings_account_sms_phone;
+                                                                                                                                                            TextView textView17 = (TextView) view.findViewById(R.id.settings_account_sms_phone);
                                                                                                                                                             if (textView17 != null) {
-                                                                                                                                                                i = 2131365020;
-                                                                                                                                                                TextView textView18 = (TextView) view.findViewById(2131365020);
+                                                                                                                                                                i = R.id.settings_account_tag;
+                                                                                                                                                                TextView textView18 = (TextView) view.findViewById(R.id.settings_account_tag);
                                                                                                                                                                 if (textView18 != null) {
-                                                                                                                                                                    i = 2131365021;
-                                                                                                                                                                    LinearLayout linearLayout10 = (LinearLayout) view.findViewById(2131365021);
+                                                                                                                                                                    i = R.id.settings_account_tag_container;
+                                                                                                                                                                    LinearLayout linearLayout10 = (LinearLayout) view.findViewById(R.id.settings_account_tag_container);
                                                                                                                                                                     if (linearLayout10 != null) {
-                                                                                                                                                                        i = 2131365022;
-                                                                                                                                                                        TextView textView19 = (TextView) view.findViewById(2131365022);
+                                                                                                                                                                        i = R.id.settings_account_tag_label;
+                                                                                                                                                                        TextView textView19 = (TextView) view.findViewById(R.id.settings_account_tag_label);
                                                                                                                                                                         if (textView19 != null) {
-                                                                                                                                                                            i = 2131365023;
-                                                                                                                                                                            TextView textView20 = (TextView) view.findViewById(2131365023);
+                                                                                                                                                                            i = R.id.settings_account_tag_text;
+                                                                                                                                                                            TextView textView20 = (TextView) view.findViewById(R.id.settings_account_tag_text);
                                                                                                                                                                             if (textView20 != null) {
-                                                                                                                                                                                i = 2131365024;
-                                                                                                                                                                                RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131365024);
+                                                                                                                                                                                i = R.id.settings_account_verification;
+                                                                                                                                                                                RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(R.id.settings_account_verification);
                                                                                                                                                                                 if (relativeLayout2 != null) {
-                                                                                                                                                                                    i = 2131365025;
-                                                                                                                                                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365025);
+                                                                                                                                                                                    i = R.id.settings_account_verification_button;
+                                                                                                                                                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.settings_account_verification_button);
                                                                                                                                                                                     if (materialButton2 != null) {
-                                                                                                                                                                                        i = 2131365026;
-                                                                                                                                                                                        TextView textView21 = (TextView) view.findViewById(2131365026);
+                                                                                                                                                                                        i = R.id.settings_account_verification_title;
+                                                                                                                                                                                        TextView textView21 = (TextView) view.findViewById(R.id.settings_account_verification_title);
                                                                                                                                                                                         if (textView21 != null) {
-                                                                                                                                                                                            i = 2131365027;
-                                                                                                                                                                                            TextView textView22 = (TextView) view.findViewById(2131365027);
+                                                                                                                                                                                            i = R.id.settings_account_view_backup_codes;
+                                                                                                                                                                                            TextView textView22 = (TextView) view.findViewById(R.id.settings_account_view_backup_codes);
                                                                                                                                                                                             if (textView22 != null) {
-                                                                                                                                                                                                i = 2131365053;
-                                                                                                                                                                                                TextView textView23 = (TextView) view.findViewById(2131365053);
+                                                                                                                                                                                                i = R.id.settings_blocked_users;
+                                                                                                                                                                                                TextView textView23 = (TextView) view.findViewById(R.id.settings_blocked_users);
                                                                                                                                                                                                 if (textView23 != null) {
                                                                                                                                                                                                     return new WidgetSettingsAccountBinding((CoordinatorLayout) view, relativeLayout, findViewById, dimmerView, textView, simpleDraweeView, frameLayout, imageView, linearLayout, textView2, linearLayout2, textView3, textView4, linearLayout3, textView5, textView6, linearLayout4, linearLayout5, materialButton, linearLayout6, textView7, appViewFlipper, lottieAnimationView, textView8, linearLayout7, textView9, textView10, linearLayout8, textView11, textView12, textView13, textView14, linearLayout9, textView15, textView16, floatingActionButton, nestedScrollView, checkedSetting, textView17, textView18, linearLayout10, textView19, textView20, relativeLayout2, materialButton2, textView21, textView22, textView23);
                                                                                                                                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java
index 3f12571ca1..8417f0ce54 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java
@@ -2,7 +2,9 @@ package com.discord.widgets.settings.account;
 
 import androidx.fragment.app.FragmentManager;
 import c.a.a.e.b;
+import com.discord.R;
 import com.discord.models.user.MeUser;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.stateful.StatefulViews;
 import com.discord.utilities.user.UserUtils;
@@ -27,7 +29,7 @@ public final class WidgetSettingsAccount$configureUI$2<T> implements Action1<Str
                 b.C0013b bVar = b.j;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-                b.C0013b.a(bVar, parentFragmentManager, 4, this.this$0.getString(2131892698), null, "User Settings", "My Account", null, null, false, false, 968);
+                b.C0013b.a(bVar, parentFragmentManager, 4, this.this$0.getString(R.string.premium_upsell_animated_avatar_active_mobile), null, Traits.Location.Page.USER_SETTINGS, "My Account", null, null, false, false, 968);
                 return;
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java
index 68cd947235..89d57a1d66 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.account;
 
 import android.view.View;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.models.user.MeUser;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -28,7 +29,7 @@ public final class WidgetSettingsAccount$configureUI$3 implements View.OnClickLi
         String forUser$default = IconUtils.getForUser$default(Long.valueOf(this.$user.getId()), null, Integer.valueOf(this.$user.getDiscriminator()), false, null, 24, null);
         SimpleDraweeView simpleDraweeView2 = WidgetSettingsAccount.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.settingsAccountAvatar");
-        IconUtils.setIcon$default(simpleDraweeView2, forUser$default, 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView2, forUser$default, (int) R.dimen.avatar_size_hero, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         TextView textView = WidgetSettingsAccount.access$getBinding$p(this.this$0).A;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountRemoveAvatar");
         textView.setVisibility(4);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java
index 54cfacc739..bf1a93f7cd 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java
@@ -1,8 +1,10 @@
 package com.discord.widgets.settings.account;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.api.auth.mfa.DisableMfaRequestBody;
 import com.discord.api.auth.mfa.DisableMfaResponse;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreMFA;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.rest.RestAPI;
@@ -38,7 +40,7 @@ public final class WidgetSettingsAccount$showRemove2FAModal$1 extends o implemen
 
         public final void invoke(DisableMfaResponse disableMfaResponse) {
             m.checkNotNullParameter(disableMfaResponse, "it");
-            c.a.e.o.h(this.this$0.this$0.requireContext(), this.this$0.this$0.requireContext().getString(2131894804), 0, null, 12);
+            c.a.e.o.h(this.this$0.this$0.requireContext(), this.this$0.this$0.requireContext().getString(R.string.user_settings_mfa_removed), 0, null, 12);
             StoreStream.Companion companion = StoreStream.Companion;
             companion.getAuthentication().setAuthed(disableMfaResponse.a());
             companion.getMFA().updatePendingMFAState(StoreMFA.MFAActivationState.PENDING_DISABLED);
@@ -61,7 +63,7 @@ public final class WidgetSettingsAccount$showRemove2FAModal$1 extends o implemen
 
     public final void invoke(Context context, String str) {
         m.checkNotNullParameter(context, "<anonymous parameter 0>");
-        m.checkNotNullParameter(str, "code");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().disableMFA(new DisableMfaRequestBody(str)), this.this$0, null, 2, null), WidgetSettingsAccount.access$getBinding$p(this.this$0).d, 0, 2, null), false, 1, null), WidgetSettingsAccount.class, this.this$0.requireContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
index 5de29ebd82..0ec72cc217 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.l;
@@ -14,6 +15,7 @@ import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.LottieAnimationView;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -66,7 +68,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     private Action1<String> accountAvatarSelectedResult;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccount$binding$2.INSTANCE, null, 2, null);
     private String lastIconUrl;
-    private final StatefulViews state = new StatefulViews(2131364985);
+    private final StatefulViews state = new StatefulViews(R.id.settings_account_avatar);
 
     /* compiled from: WidgetSettingsAccount.kt */
     public static final class Companion {
@@ -98,8 +100,8 @@ public final class WidgetSettingsAccount extends AppFragment {
         public final void launch(Context context, boolean z2, Redirect redirect) {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
-            intent.putExtra("com.discord.extra.HINT_DATA_MANAGEMENT", z2);
-            intent.putExtra("extra_redirect", redirect);
+            intent.putExtra(WidgetSettingsAccount.EXTRA_HINT_DATA_MANAGEMENT, z2);
+            intent.putExtra(WidgetSettingsAccount.EXTRA_REDIRECT, redirect);
             if (redirect != null) {
                 intent.addFlags(268435456);
                 intent.addFlags(67108864);
@@ -267,7 +269,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     }
 
     public WidgetSettingsAccount() {
-        super(2131559242);
+        super(R.layout.widget_settings_account);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccount widgetSettingsAccount, Model model) {
@@ -305,17 +307,17 @@ public final class WidgetSettingsAccount extends AppFragment {
         if (meUser.getEmail() == null) {
             TextView textView = getBinding().L;
             m.checkNotNullExpressionValue(textView, "binding.settingsAccountVerificationTitle");
-            textView.setText(getString(2131886249));
+            textView.setText(getString(R.string.add_email_banner_title));
             MaterialButton materialButton = getBinding().K;
             m.checkNotNullExpressionValue(materialButton, "binding.settingsAccountVerificationButton");
-            materialButton.setText(getString(2131886251));
+            materialButton.setText(getString(R.string.add_email_short));
         } else {
             TextView textView2 = getBinding().L;
             m.checkNotNullExpressionValue(textView2, "binding.settingsAccountVerificationTitle");
-            textView2.setText(getString(2131894938));
+            textView2.setText(getString(R.string.verify_your_email));
             MaterialButton materialButton2 = getBinding().K;
             m.checkNotNullExpressionValue(materialButton2, "binding.settingsAccountVerificationButton");
-            materialButton2.setText(getString(2131894923));
+            materialButton2.setText(getString(R.string.verify));
         }
         getBinding().K.setOnClickListener(WidgetSettingsAccount$configureAccountVerificationBanner$1.INSTANCE);
     }
@@ -375,7 +377,7 @@ public final class WidgetSettingsAccount extends AppFragment {
         UserUtils userUtils = UserUtils.INSTANCE;
         TextView textView2 = getBinding().G;
         m.checkNotNullExpressionValue(textView2, "binding.settingsAccountTag");
-        textView.setText(UserUtils.getUserNameWithDiscriminator$default(userUtils, component1, Integer.valueOf(ColorCompat.getThemedColor(textView2.getContext(), 2130969888)), null, 2, null));
+        textView.setText(UserUtils.getUserNameWithDiscriminator$default(userUtils, component1, Integer.valueOf(ColorCompat.getThemedColor(textView2.getContext(), (int) R.attr.primary_400)), null, 2, null));
         LinearLayout linearLayout = getBinding().t;
         m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountNameContainer");
         linearLayout.setVisibility(component4 != null ? 0 : 8);
@@ -454,7 +456,7 @@ public final class WidgetSettingsAccount extends AppFragment {
             m.checkNotNullExpressionValue(textView12, "binding.settingsAccountSmsPhone");
             Context context = textView12.getContext();
             m.checkNotNullExpressionValue(context, "binding.settingsAccountSmsPhone.context");
-            charSequence = b.h(context, 2131891508, new Object[]{component1.getPhoneNumber()}, null, 4);
+            charSequence = b.h(context, R.string.mfa_sms_auth_current_phone, new Object[]{component1.getPhoneNumber()}, null, 4);
         }
         ViewExtensions.setTextAndVisibilityBy(textView11, charSequence);
         CheckedSetting checkedSetting = getBinding().E;
@@ -462,12 +464,12 @@ public final class WidgetSettingsAccount extends AppFragment {
         checkedSetting.setChecked(userUtils.isMfaSMSEnabled(component1));
         CheckedSetting checkedSetting2 = getBinding().E;
         if (sMSBackupDisabledMessage == null) {
-            sMSBackupDisabledMessage = getString(2131891509);
+            sMSBackupDisabledMessage = getString(R.string.mfa_sms_auth_sales_pitch);
             m.checkNotNullExpressionValue(sMSBackupDisabledMessage, "getString(R.string.mfa_sms_auth_sales_pitch)");
         }
         CheckedSetting.i(checkedSetting2, sMSBackupDisabledMessage, false, 2);
-        if (getMostRecentIntent().getSerializableExtra("extra_redirect") == Redirect.SMS_BACKUP) {
-            getMostRecentIntent().removeExtra("extra_redirect");
+        if (getMostRecentIntent().getSerializableExtra(EXTRA_REDIRECT) == Redirect.SMS_BACKUP) {
+            getMostRecentIntent().removeExtra(EXTRA_REDIRECT);
             WidgetEnableSMSBackupDialog.Companion companion = WidgetEnableSMSBackupDialog.Companion;
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -481,7 +483,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     }
 
     private final void configureUpdatedUser(User user) {
-        o.i(this, 2131893359, 0, 4);
+        o.i(this, R.string.saved_settings, 0, 4);
         StatefulViews.clear$default(this.state, false, 1, null);
         StoreStream.Companion.getAuthentication().setAuthed(user.q());
         AppFragment.hideKeyboard$default(this, null, 1, null);
@@ -495,10 +497,10 @@ public final class WidgetSettingsAccount extends AppFragment {
     private final String getSMSBackupDisabledMessage(MeUser meUser) {
         UserUtils userUtils = UserUtils.INSTANCE;
         if (userUtils.isPartner(meUser) || userUtils.isStaff(meUser)) {
-            return getString(2131891513);
+            return getString(R.string.mfa_sms_disabled_partner);
         }
         if (meUser.getEmail() == null) {
-            return getString(2131891512);
+            return getString(R.string.mfa_sms_disabled_no_email);
         }
         return null;
     }
@@ -524,13 +526,13 @@ public final class WidgetSettingsAccount extends AppFragment {
         if (!m.areEqual(str, this.lastIconUrl)) {
             SimpleDraweeView simpleDraweeView2 = getBinding().f;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.settingsAccountAvatar");
-            IconUtils.setIcon$default(simpleDraweeView2, str, 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
+            IconUtils.setIcon$default(simpleDraweeView2, str, (int) R.dimen.avatar_size_hero, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
             this.lastIconUrl = str;
         }
         TextView textView = getBinding().A;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountRemoveAvatar");
         int i = 0;
-        if (str != null && w.contains$default((CharSequence) str, (CharSequence) "asset://asset/images/default_avatar", false, 2, (Object) null)) {
+        if (str != null && w.contains$default((CharSequence) str, (CharSequence) DEFAULT_AVATAR_URL_SEGMENT, false, 2, (Object) null)) {
             z2 = false;
         }
         if (!z2) {
@@ -540,7 +542,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     }
 
     private final void showOwnsGuildModal() {
-        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888080).setMessage(2131888081), 2131892004, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(R.string.delete_account_transfer_ownership).setMessage(R.string.delete_account_transfer_ownership_body), (int) R.string.okay, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton$default.show(parentFragmentManager);
@@ -550,11 +552,11 @@ public final class WidgetSettingsAccount extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
-            String string = requireContext().getString(2131894461);
+            String string = requireContext().getString(R.string.two_fa_remove);
             m.checkNotNullExpressionValue(string, "requireContext().getString(R.string.two_fa_remove)");
-            String string2 = requireContext().getString(2131894801);
+            String string2 = requireContext().getString(R.string.user_settings_mfa_enable_code_body);
             m.checkNotNullExpressionValue(string2, "requireContext().getStri…ngs_mfa_enable_code_body)");
-            String string3 = requireContext().getString(2131894418);
+            String string3 = requireContext().getString(R.string.two_fa_auth_code);
             m.checkNotNullExpressionValue(string3, "requireContext().getStri….string.two_fa_auth_code)");
             WidgetNoticeDialog.Companion.showInputModal$default(companion, appActivity, string, string2, string3, new WidgetSettingsAccount$showRemove2FAModal$1(this), null, null, 96, null);
         }
@@ -570,11 +572,11 @@ public final class WidgetSettingsAccount extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         if (!t.startsWith$default(str, "image", false, 2, null)) {
-            o.g(getContext(), 2131894783, 0, null, 12);
+            o.g(getContext(), R.string.user_settings_image_upload_filetype_error, 0, null, 12);
             return;
         }
         FragmentManager parentFragmentManager = getParentFragmentManager();
@@ -584,7 +586,7 @@ public final class WidgetSettingsAccount extends AppFragment {
 
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         MGImages.requestDataUrl(getContext(), uri, str, this.accountAvatarSelectedResult);
@@ -594,13 +596,13 @@ public final class WidgetSettingsAccount extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131894807);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.user_settings_my_account);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         setRetainInstance(true);
         this.state.setupUnsavedChangesConfirmation(this);
         this.state.setupTextWatcherWithSaveAction(this, getBinding().C, new View[0]);
-        if (getMostRecentIntent().getBooleanExtra("com.discord.extra.HINT_DATA_MANAGEMENT", false)) {
+        if (getMostRecentIntent().getBooleanExtra(EXTRA_HINT_DATA_MANAGEMENT, false)) {
             LinearLayout linearLayout = getBinding().f1944z;
             m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountPrivateDataWrap");
             CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(linearLayout);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java
index 4464f0bf9f..87da09ea64 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java
@@ -4,6 +4,7 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.view.View;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.widgets.settings.account.WidgetSettingsAccountBackupCodes;
 import d0.z.d.m;
@@ -23,6 +24,6 @@ public final class WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder
         if (clipboardManager != null) {
             clipboardManager.setPrimaryClip(newPlainText);
         }
-        o.g(view.getContext(), 2131887645, 0, null, 12);
+        o.g(view.getContext(), R.string.copied_text, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java
index e064a93f7a..d0db557aaf 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAccountBackupCodesBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.google.android.material.button.MaterialButton;
@@ -20,17 +21,17 @@ public final /* synthetic */ class WidgetSettingsAccountBackupCodes$binding$2 ex
 
     public final WidgetSettingsAccountBackupCodesBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131365042;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365042);
+            i = R.id.settings_backup_codes_generate;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.settings_backup_codes_generate);
             if (materialButton != null) {
-                i = 2131365043;
-                TextView textView = (TextView) view.findViewById(2131365043);
+                i = R.id.settings_backup_codes_info;
+                TextView textView = (TextView) view.findViewById(R.id.settings_backup_codes_info);
                 if (textView != null) {
-                    i = 2131365044;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365044);
+                    i = R.id.settings_backup_codes_rv;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.settings_backup_codes_rv);
                     if (recyclerView != null) {
                         return new WidgetSettingsAccountBackupCodesBinding((CoordinatorLayout) view, dimmerView, materialButton, textView, recyclerView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java
index 9ea9a23432..9712ad0e08 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.settings.account;
 
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.auth.mfa.BackupCode;
 import com.discord.api.auth.mfa.GetBackupCodesResponse;
 import com.discord.widgets.settings.account.WidgetSettingsAccountBackupCodes;
@@ -43,7 +44,7 @@ public final class WidgetSettingsAccountBackupCodes$getBackupCodes$1 extends o i
         }
         ArrayList arrayList3 = new ArrayList();
         if (!arrayList.isEmpty()) {
-            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.h(this.this$0.requireContext(), 2131894739, new Object[0], null, 4)));
+            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.h(this.this$0.requireContext(), R.string.user_settings_available_codes, new Object[0], null, 4)));
             ArrayList arrayList4 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList, 10));
             for (BackupCode backupCode : arrayList) {
                 arrayList4.add(new WidgetSettingsAccountBackupCodes.BackupCodeItem(backupCode));
@@ -51,7 +52,7 @@ public final class WidgetSettingsAccountBackupCodes$getBackupCodes$1 extends o i
             arrayList3.addAll(arrayList4);
         }
         if (!arrayList2.isEmpty()) {
-            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.h(this.this$0.requireContext(), 2131894850, new Object[0], null, 4)));
+            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.h(this.this$0.requireContext(), R.string.user_settings_used_backup_codes, new Object[0], null, 4)));
             ArrayList arrayList5 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList2, 10));
             for (BackupCode backupCode2 : arrayList2) {
                 arrayList5.add(new WidgetSettingsAccountBackupCodes.BackupCodeItem(backupCode2));
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
index f027116410..63256107d1 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
@@ -12,6 +12,7 @@ import c.a.e.l;
 import c.a.e.q;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.auth.mfa.BackupCode;
 import com.discord.api.auth.mfa.GetBackupCodesRequestBody;
 import com.discord.app.AppActivity;
@@ -99,9 +100,9 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
                 Objects.requireNonNull(a2, "null cannot be cast to non-null type java.lang.String");
                 String substring2 = a2.substring(4);
                 m.checkNotNullExpressionValue(substring2, "(this as java.lang.String).substring(startIndex)");
-                b.n(textView, 2131886818, new Object[]{substring, substring2}, null, 4);
+                b.n(textView, R.string.backup_codes_dash, new Object[]{substring, substring2}, null, 4);
                 if (backupCodeItem.getBackupCode().b()) {
-                    this.binding.b.setCompoundDrawablesWithIntrinsicBounds(0, 0, 2131231540, 0);
+                    this.binding.b.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_check_brand_24dp, 0);
                     this.binding.b.setOnClickListener(null);
                     return;
                 }
@@ -119,7 +120,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<Adapter, MGRecyclerDataPayload> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return i != 0 ? i != 1 ? new MGRecyclerViewHolder<>(0, this) : new BackupCodeViewHolder(2131559264, this) : new BackupCodeHeaderViewHolder(2131559265, this);
+            return i != 0 ? i != 1 ? new MGRecyclerViewHolder<>(0, this) : new BackupCodeViewHolder(R.layout.widget_settings_item_backup_code, this) : new BackupCodeHeaderViewHolder(R.layout.widget_settings_item_backup_code_header, this);
         }
     }
 
@@ -269,7 +270,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
     }
 
     public WidgetSettingsAccountBackupCodes() {
-        super(2131559243);
+        super(R.layout.widget_settings_account_backup_codes);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountBackupCodes widgetSettingsAccountBackupCodes, List list) {
@@ -312,7 +313,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
             getBinding().b.setDimmed(true, true);
-            WidgetNoticeDialog.Companion.showInputModal(appActivity, b.h(requireContext(), 2131894425, new Object[0], null, 4), b.h(requireContext(), 2131894769, new Object[0], null, 4), b.h(requireContext(), 2131888750, new Object[0], null, 4), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1(this), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2(this), Boolean.FALSE);
+            WidgetNoticeDialog.Companion.showInputModal(appActivity, b.h(requireContext(), R.string.two_fa_backup_codes_label, new Object[0], null, 4), b.h(requireContext(), R.string.user_settings_enter_password_view_codes, new Object[0], null, 4), b.h(requireContext(), R.string.form_label_password, new Object[0], null, 4), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1(this), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2(this), Boolean.FALSE);
         }
     }
 
@@ -320,12 +321,12 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131894425);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.two_fa_backup_codes_label);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.settingsBackupCodesInfo");
-        b.n(textView, 2131894424, new Object[0], null, 4);
+        b.n(textView, R.string.two_fa_backup_codes_body, new Object[0], null, 4);
         RecyclerView recyclerView = getBinding().e;
         m.checkNotNullExpressionValue(recyclerView, "binding.settingsBackupCodesRv");
         this.backupCodesAdapter = new Adapter(recyclerView);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java
index 343cc530b3..70b432ae19 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.account;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAccountChangePasswordBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetSettingsAccountChangePassword$binding$2
 
     public final WidgetSettingsAccountChangePasswordBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362277;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362277);
+        int i = R.id.change_password_current_password_input;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.change_password_current_password_input);
         if (textInputLayout != null) {
-            i = 2131362278;
-            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362278);
+            i = R.id.change_password_new_password_input;
+            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.change_password_new_password_input);
             if (textInputLayout2 != null) {
-                i = 2131362279;
-                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362279);
+                i = R.id.change_password_save;
+                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.change_password_save);
                 if (floatingActionButton != null) {
-                    i = 2131362280;
-                    TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131362280);
+                    i = R.id.change_password_two_factor;
+                    TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(R.id.change_password_two_factor);
                     if (textInputLayout3 != null) {
-                        i = 2131362956;
-                        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                        i = R.id.dimmer_view;
+                        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                         if (dimmerView != null) {
                             return new WidgetSettingsAccountChangePasswordBinding((CoordinatorLayout) view, textInputLayout, textInputLayout2, floatingActionButton, textInputLayout3, dimmerView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java
index 2caf7a6404..601b6e3079 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.account;
 import android.content.Context;
 import androidx.fragment.app.FragmentActivity;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.api.user.User;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.auth.GoogleSmartLockManager;
@@ -20,7 +21,7 @@ public final class WidgetSettingsAccountChangePassword$saveNewPassword$1<T> impl
 
     public final void call(User user) {
         GoogleSmartLockManager googleSmartLockManager;
-        o.i(this.this$0, 2131893359, 0, 4);
+        o.i(this.this$0, R.string.saved_settings, 0, 4);
         StoreStream.Companion.getAuthentication().setAuthed(user.q());
         Context context = this.this$0.getContext();
         if (!(context == null || (googleSmartLockManager = GoogleSmartLockManagerKt.googleSmartLockManager(context)) == null)) {
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
index f734203085..06c9809a99 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsAccountChangePasswordBinding;
 import com.discord.models.user.MeUser;
@@ -33,7 +34,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountChangePassword$binding$2.INSTANCE, null, 2, null);
     private GoogleSmartLockManager googleSmartLockManager;
-    private final StatefulViews state = new StatefulViews(2131362278);
+    private final StatefulViews state = new StatefulViews(R.id.change_password_new_password_input);
 
     /* compiled from: WidgetSettingsAccountChangePassword.kt */
     public static final class Companion {
@@ -51,7 +52,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
     }
 
     public WidgetSettingsAccountChangePassword() {
-        super(2131559244);
+        super(R.layout.widget_settings_account_change_password);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountChangePassword widgetSettingsAccountChangePassword, MeUser meUser) {
@@ -98,14 +99,14 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout4, "binding.changePasswordCurrentPasswordInput");
             TextInputLayout textInputLayout5 = getBinding().b;
             m.checkNotNullExpressionValue(textInputLayout5, "binding.changePasswordCurrentPasswordInput");
-            textInputLayout4.setError(textInputLayout5.getContext().getString(2131892124));
+            textInputLayout4.setError(textInputLayout5.getContext().getString(R.string.password_required));
         } else if (!AuthUtils.INSTANCE.isValidPasswordLength(textOrEmpty2)) {
             getBinding().f1945c.requestFocus();
             TextInputLayout textInputLayout6 = getBinding().f1945c;
             m.checkNotNullExpressionValue(textInputLayout6, "binding.changePasswordNewPasswordInput");
             TextInputLayout textInputLayout7 = getBinding().f1945c;
             m.checkNotNullExpressionValue(textInputLayout7, "binding.changePasswordNewPasswordInput");
-            textInputLayout6.setError(textInputLayout7.getContext().getString(2131892113));
+            textInputLayout6.setError(textInputLayout7.getContext().getString(R.string.password_length_error));
         } else {
             if (meUser.getMfaEnabled()) {
                 if (str == null || str.length() == 0) {
@@ -114,7 +115,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
                     m.checkNotNullExpressionValue(textInputLayout8, "binding.changePasswordTwoFactor");
                     TextInputLayout textInputLayout9 = getBinding().e;
                     m.checkNotNullExpressionValue(textInputLayout9, "binding.changePasswordTwoFactor");
-                    textInputLayout8.setError(textInputLayout9.getContext().getString(2131894465));
+                    textInputLayout8.setError(textInputLayout9.getContext().getString(R.string.two_fa_token_required));
                     return;
                 }
             }
@@ -131,8 +132,8 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "view.context");
         this.googleSmartLockManager = new GoogleSmartLockManager(context, null, 2, null);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131887264);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.change_password);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java
index 5e7c8f5aa9..a8fdcace9e 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.account;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAccountContactsNameEditBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetSettingsAccountContactsNameEdit$binding
 
     public final WidgetSettingsAccountContactsNameEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363048;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363048);
+        int i = R.id.edit_account_name_wrap;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.edit_account_name_wrap);
         if (textInputLayout != null) {
-            i = 2131365004;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365004);
+            i = R.id.settings_account_name_clear;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.settings_account_name_clear);
             if (materialButton != null) {
-                i = 2131365016;
-                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365016);
+                i = R.id.settings_account_save;
+                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.settings_account_save);
                 if (floatingActionButton != null) {
                     return new WidgetSettingsAccountContactsNameEditBinding((CoordinatorLayout) view, textInputLayout, materialButton, floatingActionButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
index 5a93da0554..b8facbba8a 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsAccountContactsNameEditBinding;
 import com.discord.models.domain.ModelConnectedAccount;
@@ -50,7 +51,7 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment {
     }
 
     public WidgetSettingsAccountContactsNameEdit() {
-        super(2131559245);
+        super(R.layout.widget_settings_account_contacts_name_edit);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountContactsNameEdit widgetSettingsAccountContactsNameEdit, List list) {
@@ -113,8 +114,8 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131887634);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.contact_sync_update_name_title);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountNameWrap");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java
index 1725c7f954..63dd970af5 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.account;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAccountEmailEditBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetSettingsAccountEmailEdit$binding$2 exte
 
     public final WidgetSettingsAccountEmailEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363047;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363047);
+        int i = R.id.edit_account_email_wrap;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.edit_account_email_wrap);
         if (textInputLayout != null) {
-            i = 2131365016;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365016);
+            i = R.id.settings_account_save;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.settings_account_save);
             if (floatingActionButton != null) {
                 return new WidgetSettingsAccountEmailEditBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
index 6c6c35a89a..4cd12ec175 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
@@ -7,6 +7,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsAccountEmailEditBinding;
 import com.discord.models.user.MeUser;
@@ -34,7 +35,7 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountEmailEdit$binding$2.INSTANCE, null, 2, null);
     private final ActivityResultLauncher<Intent> passwordVerifyLauncher = WidgetUserPasswordVerify.Companion.registerForResult(this, new WidgetSettingsAccountEmailEdit$passwordVerifyLauncher$1(this));
-    private final StatefulViews state = new StatefulViews(2131363047);
+    private final StatefulViews state = new StatefulViews(R.id.edit_account_email_wrap);
     private final Lazy validationManager$delegate = g.lazy(new WidgetSettingsAccountEmailEdit$validationManager$2(this));
 
     /* compiled from: WidgetSettingsAccountEmailEdit.kt */
@@ -53,7 +54,7 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment {
     }
 
     public WidgetSettingsAccountEmailEdit() {
-        super(2131559247);
+        super(R.layout.widget_settings_account_email_edit);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountEmailEdit widgetSettingsAccountEmailEdit, MeUser meUser) {
@@ -104,8 +105,8 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131894708);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.user_settings_account_change_email_title);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountEmailWrap");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java
index 5048884a8f..b7d532706f 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsAccountEditBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -20,20 +21,20 @@ public final /* synthetic */ class WidgetSettingsAccountUsernameEdit$binding$2 e
 
     public final WidgetSettingsAccountEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363041;
-        TextView textView = (TextView) view.findViewById(2131363041);
+        int i = R.id.dtddd;
+        TextView textView = (TextView) view.findViewById(R.id.dtddd);
         if (textView != null) {
-            i = 2131363046;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363046);
+            i = R.id.edit_account_discriminator_wrap;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.edit_account_discriminator_wrap);
             if (textInputLayout != null) {
-                i = 2131363050;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363050);
+                i = R.id.edit_account_tag_layout_container;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.edit_account_tag_layout_container);
                 if (relativeLayout != null) {
-                    i = 2131363051;
-                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363051);
+                    i = R.id.edit_account_username_wrap;
+                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.edit_account_username_wrap);
                     if (textInputLayout2 != null) {
-                        i = 2131365016;
-                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365016);
+                        i = R.id.settings_account_save;
+                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.settings_account_save);
                         if (floatingActionButton != null) {
                             return new WidgetSettingsAccountEditBinding((CoordinatorLayout) view, textView, textInputLayout, relativeLayout, textInputLayout2, floatingActionButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java
index 0411e97e95..b7ff8ced65 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java
@@ -3,6 +3,8 @@ package com.discord.widgets.settings.account;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.e.b;
+import com.discord.R;
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 /* compiled from: WidgetSettingsAccountUsernameEdit.kt */
 public final class WidgetSettingsAccountUsernameEdit$configureUI$1 implements View.OnFocusChangeListener {
@@ -34,7 +36,7 @@ public final class WidgetSettingsAccountUsernameEdit$configureUI$1 implements Vi
             b.C0013b bVar = b.j;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            b.C0013b.a(bVar, parentFragmentManager, 0, this.this$0.getString(2131892727), null, "User Settings", "Edit Account", null, null, false, false, 968);
+            b.C0013b.a(bVar, parentFragmentManager, 0, this.this$0.getString(R.string.premium_upsell_tag_active_mobile), null, Traits.Location.Page.USER_SETTINGS, "Edit Account", null, null, false, false, 968);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
index 7e65765701..3239b25ff4 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.account;
 
+import com.discord.R;
 import com.discord.utilities.auth.AuthUtils;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
@@ -24,9 +25,9 @@ public final class WidgetSettingsAccountUsernameEdit$validationManager$2 extends
     public final ValidationManager mo1invoke() {
         TextInputLayout textInputLayout = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).f1947c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap");
-        InputValidator[] inputValidatorArr = {BasicTextInputValidator.Companion.createRequiredInputValidator(2131894878)};
+        InputValidator[] inputValidatorArr = {BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.username_required)};
         TextInputLayout textInputLayout2 = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountDiscriminatorWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.EditTextInput("discriminator", textInputLayout2, AuthUtils.INSTANCE.createDiscriminatorInputValidator(2131892283, 2131892289)));
+        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.EditTextInput("discriminator", textInputLayout2, AuthUtils.INSTANCE.createDiscriminatorInputValidator(R.string.premium_change_discriminator_length_error, R.string.premium_change_discriminator_zero_error)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
index 08b0682efa..18938e486f 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
@@ -10,6 +10,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsAccountEditBinding;
 import com.discord.models.user.MeUser;
@@ -39,7 +40,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountUsernameEdit$binding$2.INSTANCE, null, 2, null);
     private final ActivityResultLauncher<Intent> passwordVerifyLauncher = WidgetUserPasswordVerify.Companion.registerForResult(this, new WidgetSettingsAccountUsernameEdit$passwordVerifyLauncher$1(this));
-    private final StatefulViews state = new StatefulViews(2131363051, 2131363046);
+    private final StatefulViews state = new StatefulViews(R.id.edit_account_username_wrap, R.id.edit_account_discriminator_wrap);
     private final Lazy validationManager$delegate = g.lazy(new WidgetSettingsAccountUsernameEdit$validationManager$2(this));
 
     /* compiled from: WidgetSettingsAccountUsernameEdit.kt */
@@ -58,7 +59,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     }
 
     public WidgetSettingsAccountUsernameEdit() {
-        super(2131559246);
+        super(R.layout.widget_settings_account_edit);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountUsernameEdit widgetSettingsAccountUsernameEdit, MeUser meUser) {
@@ -137,8 +138,8 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131894713);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.user_settings_account_change_username_title);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountDiscriminatorWrap");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java
index bf20a80dc5..4c5c5807e9 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsBlockedUsersBinding;
 import d0.z.d.k;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetSettingsBlockedUsers$binding$2 extends
 
     public final WidgetSettingsBlockedUsersBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362136;
-        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362136);
+        int i = R.id.blocked_users_flipper;
+        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.blocked_users_flipper);
         if (appViewFlipper != null) {
-            i = 2131362137;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362137);
+            i = R.id.blocked_users_list_recycler;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.blocked_users_list_recycler);
             if (recyclerView != null) {
-                i = 2131363348;
-                ImageView imageView = (ImageView) view.findViewById(2131363348);
+                i = R.id.friends_list_item_empty_no_blocked;
+                ImageView imageView = (ImageView) view.findViewById(R.id.friends_list_item_empty_no_blocked);
                 if (imageView != null) {
                     return new WidgetSettingsBlockedUsersBinding((CoordinatorLayout) view, appViewFlipper, recyclerView, imageView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
index 00d9e45442..d10ce6ffca 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
@@ -11,6 +11,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsBlockedUsersBinding;
@@ -53,7 +54,7 @@ public final class WidgetSettingsBlockedUsers extends AppFragment {
     }
 
     public WidgetSettingsBlockedUsers() {
-        super(2131559253);
+        super(R.layout.widget_settings_blocked_users);
         WidgetSettingsBlockedUsers$viewModel$2 widgetSettingsBlockedUsers$viewModel$2 = WidgetSettingsBlockedUsers$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsBlockedUsersViewModel.class), new WidgetSettingsBlockedUsers$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsBlockedUsers$viewModel$2));
@@ -131,7 +132,7 @@ public final class WidgetSettingsBlockedUsers extends AppFragment {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        setActionBarTitle(2131894746);
+        setActionBarTitle(R.string.user_settings_blocked_users);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         RecyclerView recyclerView = getBinding().f1957c;
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
index 2f2713f100..14cc00c9d2 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
@@ -6,6 +6,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.LayoutRes;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsItemBlockedUserBinding;
 import com.discord.models.user.User;
 import com.discord.utilities.icon.IconUtils;
@@ -32,14 +33,14 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi
             m.checkNotNullParameter(widgetSettingsBlockedUsersAdapter, "adapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i2 = 2131362133;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362133);
+            int i2 = R.id.blocked_user_item_avatar;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.blocked_user_item_avatar);
             if (simpleDraweeView != null) {
-                i2 = 2131362134;
-                TextView textView = (TextView) view.findViewById(2131362134);
+                i2 = R.id.blocked_user_item_name;
+                TextView textView = (TextView) view.findViewById(R.id.blocked_user_item_name);
                 if (textView != null) {
-                    i2 = 2131365608;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365608);
+                    i2 = R.id.unblock_user_button;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.unblock_user_button);
                     if (materialButton != null) {
                         WidgetSettingsItemBlockedUserBinding widgetSettingsItemBlockedUserBinding = new WidgetSettingsItemBlockedUserBinding((RelativeLayout) view, relativeLayout, simpleDraweeView, textView, materialButton);
                         m.checkNotNullExpressionValue(widgetSettingsItemBlockedUserBinding, "WidgetSettingsItemBlocke…serBinding.bind(itemView)");
@@ -61,7 +62,7 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi
             this.binding.a.setOnClickListener(new WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder$onConfigure$1(this, item));
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.blockedUserItemAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, item.getUser(), 2131165297, null, null, null, 56, null);
+            IconUtils.setIcon$default(simpleDraweeView, item.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
             TextView textView = this.binding.f1965c;
             m.checkNotNullExpressionValue(textView, "binding.blockedUserItemName");
             textView.setText(item.getUser().getUsername());
@@ -89,7 +90,7 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi
     public MGRecyclerViewHolder<WidgetSettingsBlockedUsersAdapter, WidgetSettingsBlockedUsersViewModel.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            return new BlockedUserViewHolder(2131559266, this);
+            return new BlockedUserViewHolder(R.layout.widget_settings_item_blocked_user, this);
         }
         throw invalidViewTypeException(i);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java
index e90be71357..5230de4505 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.account;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class WidgetSettingsBlockedUsersViewModel$onClickUnblock$1 extends
     }
 
     public final void invoke(Void r2) {
-        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131894673);
+        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, R.string.user_has_been_unblocked);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java
index 7d15548e83..256faf320a 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.account;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetSettingsBlockedUsersViewModel$onClickUnblock$2 extends
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
index 449b1fbf1d..b4e8e604be 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
@@ -390,6 +390,6 @@ public final class WidgetSettingsBlockedUsersViewModel extends AppViewModel<View
     }
 
     public final void onClickUnblock(long j) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship("Blocked Users List", j), false, 1, null), this, null, 2, null), WidgetSettingsBlockedUsersViewModel.class, (Context) null, (Function1) null, new WidgetSettingsBlockedUsersViewModel$onClickUnblock$2(this), (Function0) null, (Function0) null, new WidgetSettingsBlockedUsersViewModel$onClickUnblock$1(this), 54, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship(LOCATION, j), false, 1, null), this, null, 2, null), WidgetSettingsBlockedUsersViewModel.class, (Context) null, (Function1) null, new WidgetSettingsBlockedUsersViewModel$onClickUnblock$2(this), (Function0) null, (Function0) null, new WidgetSettingsBlockedUsersViewModel$onClickUnblock$1(this), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java
index 893d02f391..e17394f4c7 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.account.mfa;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsEnableMfaDownloadBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetEnableMFADownload$binding$2 extends k i
 
     public final WidgetSettingsEnableMfaDownloadBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        TextView textView = (TextView) view.findViewById(2131364129);
+        TextView textView = (TextView) view.findViewById(R.id.mfa_download_body);
         if (textView != null) {
             return new WidgetSettingsEnableMfaDownloadBinding((LinearLayout) view, textView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364129)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.mfa_download_body)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java
index 525ecc58d4..81fe174d97 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java
@@ -6,8 +6,10 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsEnableMfaDownloadBinding;
+import com.discord.utilities.auth.AuthUtils;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import d0.z.d.m;
@@ -18,7 +20,7 @@ public final class WidgetEnableMFADownload extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetEnableMFADownload$binding$2.INSTANCE, null, 2, null);
 
     public WidgetEnableMFADownload() {
-        super(2131559258);
+        super(R.layout.widget_settings_enable_mfa_download);
     }
 
     private final WidgetSettingsEnableMfaDownloadBinding getBinding() {
@@ -31,7 +33,7 @@ public final class WidgetEnableMFADownload extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.mfaDownloadBody");
-        b.n(textView, 2131894435, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4);
+        b.n(textView, R.string.two_fa_download_app_body, new Object[]{AuthUtils.URL_AUTHY, AuthUtils.URL_GOOGLE_AUTHENTICATOR}, null, 4);
         TextView textView2 = getBinding().b;
         m.checkNotNullExpressionValue(textView2, "binding.mfaDownloadBody");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java
index a7febe7aea..9efccc0daf 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.account.mfa;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsEnableMfaInputBinding;
 import com.discord.views.CodeVerificationView;
 import d0.z.d.k;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetEnableMFAInput$binding$2 extends k impl
 
     public final WidgetSettingsEnableMfaInputBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131365701);
+        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(R.id.user_settings_mfa_enable_input_code);
         if (codeVerificationView != null) {
             return new WidgetSettingsEnableMfaInputBinding((LinearLayout) view, codeVerificationView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365701)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.user_settings_mfa_enable_input_code)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java
index c120d6f076..95f9d79af1 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.g0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsEnableMfaInputBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -24,7 +25,7 @@ public final class WidgetEnableMFAInput extends AppFragment {
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetEnableMFAViewModel.class), new WidgetEnableMFAInput$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetEnableMFAInput$viewModel$2.INSTANCE));
 
     public WidgetEnableMFAInput() {
-        super(2131559259);
+        super(R.layout.widget_settings_enable_mfa_input);
     }
 
     public static final /* synthetic */ WidgetEnableMFAViewModel access$getViewModel$p(WidgetEnableMFAInput widgetEnableMFAInput) {
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java
index f8fa27ef16..a1810b6eb2 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.account.mfa;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsEnableMfaKeyBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,14 +18,14 @@ public final /* synthetic */ class WidgetEnableMFAKey$binding$2 extends k implem
 
     public final WidgetSettingsEnableMfaKeyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363135;
-        TextView textView = (TextView) view.findViewById(2131363135);
+        int i = R.id.enable_mfa_key_code;
+        TextView textView = (TextView) view.findViewById(R.id.enable_mfa_key_code);
         if (textView != null) {
-            i = 2131363136;
-            TextView textView2 = (TextView) view.findViewById(2131363136);
+            i = R.id.enable_mfa_key_launch_authy;
+            TextView textView2 = (TextView) view.findViewById(R.id.enable_mfa_key_launch_authy);
             if (textView2 != null) {
-                i = 2131363137;
-                TextView textView3 = (TextView) view.findViewById(2131363137);
+                i = R.id.enable_mfa_key_launch_google_auth;
+                TextView textView3 = (TextView) view.findViewById(R.id.enable_mfa_key_launch_google_auth);
                 if (textView3 != null) {
                     return new WidgetSettingsEnableMfaKeyBinding((LinearLayout) view, textView, textView2, textView3);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.java
index 2d9ba05b6a..15c40c9fec 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$1.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.view.View;
+import com.discord.utilities.auth.AuthUtils;
 import d0.z.d.m;
 /* compiled from: WidgetEnableMFAKey.kt */
 public final class WidgetEnableMFAKey$showLaunchTexts$1 implements View.OnClickListener {
@@ -17,7 +18,7 @@ public final class WidgetEnableMFAKey$showLaunchTexts$1 implements View.OnClickL
     public final void onClick(View view) {
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
-        Intent launchIntentForPackage = this.$pm.getLaunchIntentForPackage("com.authy.authy");
+        Intent launchIntentForPackage = this.$pm.getLaunchIntentForPackage(AuthUtils.AUTHY_PACKAGE);
         if (launchIntentForPackage != null) {
             context.startActivity(launchIntentForPackage);
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.java
index bbab53d0d0..da80deab27 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$showLaunchTexts$2.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.view.View;
+import com.discord.utilities.auth.AuthUtils;
 import d0.z.d.m;
 /* compiled from: WidgetEnableMFAKey.kt */
 public final class WidgetEnableMFAKey$showLaunchTexts$2 implements View.OnClickListener {
@@ -17,7 +18,7 @@ public final class WidgetEnableMFAKey$showLaunchTexts$2 implements View.OnClickL
     public final void onClick(View view) {
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
-        Intent launchIntentForPackage = this.$pm.getLaunchIntentForPackage("com.google.android.apps.authenticator2");
+        Intent launchIntentForPackage = this.$pm.getLaunchIntentForPackage(AuthUtils.GOOGLE_AUTHENTICATOR_PACKAGE);
         if (launchIntentForPackage != null) {
             context.startActivity(launchIntentForPackage);
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
index 080e0aef96..518a64f03c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
@@ -13,6 +13,7 @@ import c.a.e.g0;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsEnableMfaKeyBinding;
 import com.discord.utilities.auth.AuthUtils;
@@ -54,7 +55,7 @@ public final class WidgetEnableMFAKey extends AppFragment {
     }
 
     public WidgetEnableMFAKey() {
-        super(2131559260);
+        super(R.layout.widget_settings_enable_mfa_key);
     }
 
     public static final /* synthetic */ void access$copyCodeToClipboard(WidgetEnableMFAKey widgetEnableMFAKey, Context context) {
@@ -71,7 +72,7 @@ public final class WidgetEnableMFAKey extends AppFragment {
         if (clipboardManager != null) {
             clipboardManager.setPrimaryClip(newPlainText);
         }
-        o.g(context, 2131887645, 0, null, 12);
+        o.g(context, R.string.copied_text, 0, null, 12);
     }
 
     private final WidgetSettingsEnableMfaKeyBinding getBinding() {
@@ -87,19 +88,19 @@ public final class WidgetEnableMFAKey extends AppFragment {
         FragmentActivity activity = getActivity();
         if (activity != null && (packageManager = activity.getPackageManager()) != null) {
             Companion companion = Companion;
-            if (Companion.access$isPackageInstalled(companion, "com.authy.authy", packageManager)) {
+            if (Companion.access$isPackageInstalled(companion, AuthUtils.AUTHY_PACKAGE, packageManager)) {
                 TextView textView = getBinding().f1961c;
                 m.checkNotNullExpressionValue(textView, "binding.enableMfaKeyLaunchAuthy");
-                textView.setText(b.k(this, 2131891089, new Object[]{b.k(this, 2131894416, new Object[0], null, 4)}, null, 4));
+                textView.setText(b.k(this, R.string.launch_app, new Object[]{b.k(this, R.string.two_fa_app_name_authy, new Object[0], null, 4)}, null, 4));
                 TextView textView2 = getBinding().f1961c;
                 m.checkNotNullExpressionValue(textView2, "binding.enableMfaKeyLaunchAuthy");
                 textView2.setVisibility(0);
                 getBinding().f1961c.setOnClickListener(new WidgetEnableMFAKey$showLaunchTexts$1(packageManager));
             }
-            if (Companion.access$isPackageInstalled(companion, "com.google.android.apps.authenticator2", packageManager)) {
+            if (Companion.access$isPackageInstalled(companion, AuthUtils.GOOGLE_AUTHENTICATOR_PACKAGE, packageManager)) {
                 TextView textView3 = getBinding().d;
                 m.checkNotNullExpressionValue(textView3, "binding.enableMfaKeyLaunchGoogleAuth");
-                textView3.setText(b.k(this, 2131891089, new Object[]{b.k(this, 2131894417, new Object[0], null, 4)}, null, 4));
+                textView3.setText(b.k(this, R.string.launch_app, new Object[]{b.k(this, R.string.two_fa_app_name_google_authenticator, new Object[0], null, 4)}, null, 4));
                 TextView textView4 = getBinding().d;
                 m.checkNotNullExpressionValue(textView4, "binding.enableMfaKeyLaunchGoogleAuth");
                 textView4.setVisibility(0);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java
index 0f7f7737c8..938805f84f 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.account.mfa;
 
 import android.view.View;
 import android.widget.FrameLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetEnableMfaStepsBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.steps.StepsView;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetEnableMFASteps$binding$2 extends k impl
 
     public final WidgetEnableMfaStepsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131363138;
-            StepsView stepsView = (StepsView) view.findViewById(2131363138);
+            i = R.id.enable_mfa_stepsview;
+            StepsView stepsView = (StepsView) view.findViewById(R.id.enable_mfa_stepsview);
             if (stepsView != null) {
                 return new WidgetEnableMfaStepsBinding((FrameLayout) view, dimmerView, stepsView);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
index 5b1379ddfa..bdb9021e56 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
@@ -11,6 +11,7 @@ import c.a.a.r;
 import c.a.e.g0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetEnableMfaStepsBinding;
 import com.discord.utilities.auth.AuthUtils;
@@ -54,7 +55,7 @@ public final class WidgetEnableMFASteps extends AppFragment {
     }
 
     public WidgetEnableMFASteps() {
-        super(2131559036);
+        super(R.layout.widget_enable_mfa_steps);
     }
 
     public static final /* synthetic */ WidgetEnableMfaStepsBinding access$getBinding$p(WidgetEnableMFASteps widgetEnableMFASteps) {
@@ -90,15 +91,15 @@ public final class WidgetEnableMFASteps extends AppFragment {
     public void onSaveInstanceState(Bundle bundle) {
         m.checkNotNullParameter(bundle, "outState");
         super.onSaveInstanceState(bundle);
-        bundle.putString("STATE_TOTP_SECRET_KEY", getViewModel().getTotpSecret());
-        bundle.putString("STATE_TOTP_PASSWORD_KEY", getViewModel().getPassword());
+        bundle.putString(STATE_TOTP_SECRET_KEY, getViewModel().getTotpSecret());
+        bundle.putString(STATE_TOTP_PASSWORD_KEY, getViewModel().getPassword());
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f1795c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, 2131887193, 0, null, null, null, null, false, false, false, 2042), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, null, false, false, false, 2046), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, null, false, false, false, 766), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, null, false, false, false, 1022)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this));
+        getBinding().f1795c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, R.string.cancel, 0, null, null, null, null, false, false, false, 2042), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, null, false, false, false, 2046), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, null, false, false, false, 766), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, null, false, false, false, 1022)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this));
     }
 
     @Override // com.discord.app.AppFragment
@@ -111,9 +112,9 @@ public final class WidgetEnableMFASteps extends AppFragment {
     public void onViewStateRestored(Bundle bundle) {
         super.onViewStateRestored(bundle);
         String str = null;
-        String string = bundle != null ? bundle.getString("STATE_TOTP_SECRET_KEY") : null;
+        String string = bundle != null ? bundle.getString(STATE_TOTP_SECRET_KEY) : null;
         if (bundle != null) {
-            str = bundle.getString("STATE_TOTP_PASSWORD_KEY");
+            str = bundle.getString(STATE_TOTP_PASSWORD_KEY);
         }
         if (string != null) {
             getViewModel().setTotpSecret(string);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java
index 409ed9be73..6d179c25b0 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.account.mfa;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsEnableMfaSuccessBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetEnableMFASuccess$binding$2 extends k im
 
     public final WidgetSettingsEnableMfaSuccessBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364130);
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.mfa_success_enable_sms);
         if (materialButton != null) {
             return new WidgetSettingsEnableMfaSuccessBinding((LinearLayout) view, materialButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364130)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.mfa_success_enable_sms)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java
index 70ffb95ac0..d148e14989 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.account.mfa;
 import android.view.View;
 import androidx.fragment.app.Fragment;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsEnableMfaSuccessBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -15,7 +16,7 @@ public final class WidgetEnableMFASuccess extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetEnableMFASuccess$binding$2.INSTANCE, null, 2, null);
 
     public WidgetEnableMFASuccess() {
-        super(2131559261);
+        super(R.layout.widget_settings_enable_mfa_success);
     }
 
     private final WidgetSettingsEnableMfaSuccessBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java
index dcf28dd5b8..f844c7b281 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java
@@ -6,6 +6,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.PaymentMethodListItemBinding;
 import com.discord.models.domain.ModelPaymentSource;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
@@ -62,7 +63,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
     public static final class PaymentSourceAddViewHolder extends MGRecyclerViewHolder<PaymentSourceAdapter, Item> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PaymentSourceAddViewHolder(PaymentSourceAdapter paymentSourceAdapter) {
-            super(2131558627, paymentSourceAdapter);
+            super((int) R.layout.payment_method_list_add_item, paymentSourceAdapter);
             m.checkNotNullParameter(paymentSourceAdapter, "adapter");
         }
 
@@ -164,7 +165,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PaymentSourceHeaderViewHolder(PaymentSourceAdapter paymentSourceAdapter) {
-            super(2131558628, paymentSourceAdapter);
+            super((int) R.layout.payment_method_list_header, paymentSourceAdapter);
             m.checkNotNullParameter(paymentSourceAdapter, "adapter");
         }
 
@@ -176,9 +177,9 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
             TextView textView = (TextView) view;
             int ordinal = ((PaymentSourceHeader) item).getHeaderType().ordinal();
             if (ordinal == 0) {
-                i2 = 2131886081;
+                i2 = R.string._default;
             } else if (ordinal == 1) {
-                i2 = 2131892032;
+                i2 = R.string.other_options;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -279,14 +280,14 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PaymentSourceItemViewHolder(PaymentSourceAdapter paymentSourceAdapter) {
-            super(2131558629, paymentSourceAdapter);
+            super((int) R.layout.payment_method_list_item, paymentSourceAdapter);
             m.checkNotNullParameter(paymentSourceAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364391;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364391);
+            int i = R.id.payment_method_edit;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.payment_method_edit);
             if (materialButton != null) {
-                i = 2131364393;
-                PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364393);
+                i = R.id.payment_method_summary;
+                PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(R.id.payment_method_summary);
                 if (paymentSourceView != null) {
                     PaymentMethodListItemBinding paymentMethodListItemBinding = new PaymentMethodListItemBinding((RelativeLayout) view, materialButton, paymentSourceView);
                     m.checkNotNullExpressionValue(paymentMethodListItemBinding, "PaymentMethodListItemBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java
index 3b6ae8893d..79986a4534 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java
@@ -9,6 +9,7 @@ import androidx.annotation.StyleRes;
 import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.PaymentSourceViewBinding;
 import com.discord.models.domain.ModelPaymentSource;
 import com.discord.utilities.billing.PremiumUtilsKt;
@@ -31,24 +32,24 @@ public final class PaymentSourceView extends ConstraintLayout {
     public PaymentSourceView(Context context, AttributeSet attributeSet, @StyleRes int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558630, this);
-        int i2 = 2131364405;
-        ImageView imageView = (ImageView) findViewById(2131364405);
+        LayoutInflater.from(context).inflate(R.layout.payment_source_view, this);
+        int i2 = R.id.payment_source_view_icon;
+        ImageView imageView = (ImageView) findViewById(R.id.payment_source_view_icon);
         if (imageView != null) {
-            i2 = 2131364406;
-            CardView cardView = (CardView) findViewById(2131364406);
+            i2 = R.id.payment_source_view_icon_wrapper;
+            CardView cardView = (CardView) findViewById(R.id.payment_source_view_icon_wrapper);
             if (cardView != null) {
-                i2 = 2131364407;
-                TextView textView = (TextView) findViewById(2131364407);
+                i2 = R.id.payment_source_view_invalid;
+                TextView textView = (TextView) findViewById(R.id.payment_source_view_invalid);
                 if (textView != null) {
-                    i2 = 2131364408;
-                    ImageView imageView2 = (ImageView) findViewById(2131364408);
+                    i2 = R.id.payment_source_view_premium;
+                    ImageView imageView2 = (ImageView) findViewById(R.id.payment_source_view_premium);
                     if (imageView2 != null) {
-                        i2 = 2131364409;
-                        TextView textView2 = (TextView) findViewById(2131364409);
+                        i2 = R.id.payment_source_view_subtext;
+                        TextView textView2 = (TextView) findViewById(R.id.payment_source_view_subtext);
                         if (textView2 != null) {
-                            i2 = 2131364410;
-                            TextView textView3 = (TextView) findViewById(2131364410);
+                            i2 = R.id.payment_source_view_title;
+                            TextView textView3 = (TextView) findViewById(R.id.payment_source_view_title);
                             if (textView3 != null) {
                                 PaymentSourceViewBinding paymentSourceViewBinding = new PaymentSourceViewBinding(this, imageView, cardView, textView, imageView2, textView2, textView3);
                                 m.checkNotNullExpressionValue(paymentSourceViewBinding, "PaymentSourceViewBinding…ater.from(context), this)");
@@ -71,7 +72,7 @@ public final class PaymentSourceView extends ConstraintLayout {
     private final void bindCard(ModelPaymentSource.ModelPaymentSourceCard modelPaymentSourceCard) {
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewTitle");
-        b.n(textView, 2131892149, new Object[]{modelPaymentSourceCard.getBrand(), modelPaymentSourceCard.getLast4()}, null, 4);
+        b.n(textView, R.string.payment_source_card_ending, new Object[]{modelPaymentSourceCard.getBrand(), modelPaymentSourceCard.getLast4()}, null, 4);
         TimeUtils timeUtils = TimeUtils.INSTANCE;
         int expiresMonth = modelPaymentSourceCard.getExpiresMonth();
         TextView textView2 = this.binding.e;
@@ -81,11 +82,11 @@ public final class PaymentSourceView extends ConstraintLayout {
         String localizedMonthName = timeUtils.getLocalizedMonthName(expiresMonth, context);
         TextView textView3 = this.binding.e;
         m.checkNotNullExpressionValue(textView3, "binding.paymentSourceViewSubtext");
-        b.n(textView3, 2131892151, new Object[]{localizedMonthName, Integer.valueOf(modelPaymentSourceCard.getExpiresYear())}, null, 4);
+        b.n(textView3, R.string.payment_source_card_expires, new Object[]{localizedMonthName, Integer.valueOf(modelPaymentSourceCard.getExpiresYear())}, null, 4);
     }
 
     private final void bindPaypal(ModelPaymentSource.ModelPaymentSourcePaypal modelPaymentSourcePaypal) {
-        this.binding.f.setText(2131892176);
+        this.binding.f.setText(R.string.payment_source_paypal);
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewSubtext");
         textView.setText(modelPaymentSourcePaypal.getEmail());
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java
index ee2f4d8e87..213597dd10 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.appcompat.widget.Toolbar;
+import com.discord.R;
 import com.discord.databinding.WidgetPaymentSourceEditDialogBinding;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
@@ -22,47 +23,47 @@ public final /* synthetic */ class WidgetPaymentSourceEditDialog$binding$2 exten
 
     public final WidgetPaymentSourceEditDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361871;
-        Toolbar toolbar = (Toolbar) view.findViewById(2131361871);
+        int i = R.id.action_bar_toolbar;
+        Toolbar toolbar = (Toolbar) view.findViewById(R.id.action_bar_toolbar);
         if (toolbar != null) {
-            i = 2131362947;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362947);
+            i = R.id.dialog_delete;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.dialog_delete);
             if (materialButton != null) {
-                i = 2131362948;
-                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362948);
+                i = R.id.dialog_save;
+                LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.dialog_save);
                 if (loadingButton != null) {
-                    i = 2131364394;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364394);
+                    i = R.id.payment_source_edit_address1;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.payment_source_edit_address1);
                     if (textInputLayout != null) {
-                        i = 2131364395;
-                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131364395);
+                        i = R.id.payment_source_edit_address2;
+                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.payment_source_edit_address2);
                         if (textInputLayout2 != null) {
-                            i = 2131364396;
-                            TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131364396);
+                            i = R.id.payment_source_edit_city;
+                            TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(R.id.payment_source_edit_city);
                             if (textInputLayout3 != null) {
-                                i = 2131364397;
-                                TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(2131364397);
+                                i = R.id.payment_source_edit_country;
+                                TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(R.id.payment_source_edit_country);
                                 if (textInputLayout4 != null) {
-                                    i = 2131364398;
-                                    CheckBox checkBox = (CheckBox) view.findViewById(2131364398);
+                                    i = R.id.payment_source_edit_default;
+                                    CheckBox checkBox = (CheckBox) view.findViewById(R.id.payment_source_edit_default);
                                     if (checkBox != null) {
-                                        i = 2131364399;
-                                        TextView textView = (TextView) view.findViewById(2131364399);
+                                        i = R.id.payment_source_edit_error;
+                                        TextView textView = (TextView) view.findViewById(R.id.payment_source_edit_error);
                                         if (textView != null) {
-                                            i = 2131364400;
-                                            TextView textView2 = (TextView) view.findViewById(2131364400);
+                                            i = R.id.payment_source_edit_help;
+                                            TextView textView2 = (TextView) view.findViewById(R.id.payment_source_edit_help);
                                             if (textView2 != null) {
-                                                i = 2131364401;
-                                                TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(2131364401);
+                                                i = R.id.payment_source_edit_name;
+                                                TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(R.id.payment_source_edit_name);
                                                 if (textInputLayout5 != null) {
-                                                    i = 2131364402;
-                                                    TextInputLayout textInputLayout6 = (TextInputLayout) view.findViewById(2131364402);
+                                                    i = R.id.payment_source_edit_postal_code;
+                                                    TextInputLayout textInputLayout6 = (TextInputLayout) view.findViewById(R.id.payment_source_edit_postal_code);
                                                     if (textInputLayout6 != null) {
-                                                        i = 2131364403;
-                                                        TextInputLayout textInputLayout7 = (TextInputLayout) view.findViewById(2131364403);
+                                                        i = R.id.payment_source_edit_state;
+                                                        TextInputLayout textInputLayout7 = (TextInputLayout) view.findViewById(R.id.payment_source_edit_state);
                                                         if (textInputLayout7 != null) {
-                                                            i = 2131364404;
-                                                            PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364404);
+                                                            i = R.id.payment_source_summary;
+                                                            PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(R.id.payment_source_summary);
                                                             if (paymentSourceView != null) {
                                                                 return new WidgetPaymentSourceEditDialogBinding((LinearLayout) view, toolbar, materialButton, loadingButton, textInputLayout, textInputLayout2, textInputLayout3, textInputLayout4, checkBox, textView, textView2, textInputLayout5, textInputLayout6, textInputLayout7, paymentSourceView);
                                                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.java
index 8db8ee752b..b0262ba0bf 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$caProvinces$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.billing;
 
 import android.content.Context;
 import android.content.res.AssetManager;
+import com.adjust.sdk.Constants;
 import com.discord.widgets.settings.billing.WidgetPaymentSourceEditDialog;
 import com.google.gson.Gson;
 import d0.y.b;
@@ -32,7 +33,7 @@ public final class WidgetPaymentSourceEditDialog$caProvinces$2 extends o impleme
     public final WidgetPaymentSourceEditDialog.StateEntry[] mo1invoke() {
         AssetManager assets;
         Context context = this.this$0.getContext();
-        InputStreamReader inputStreamReader = new InputStreamReader((context == null || (assets = context.getAssets()) == null) ? null : assets.open("data/canadian-provinces.json"), "UTF-8");
+        InputStreamReader inputStreamReader = new InputStreamReader((context == null || (assets = context.getAssets()) == null) ? null : assets.open("data/canadian-provinces.json"), Constants.ENCODING);
         WidgetPaymentSourceEditDialog.StateEntry[] stateEntryArr = (WidgetPaymentSourceEditDialog.StateEntry[]) new Gson().e(inputStreamReader, WidgetPaymentSourceEditDialog.StateEntry[].class);
         b.closeFinally(inputStreamReader, null);
         return stateEntryArr;
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java
index afeffa0b3e..30d2b99513 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.billing;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,7 +23,7 @@ public final class WidgetPaymentSourceEditDialog$deletePaymentSource$1 extends o
     }
 
     public final void invoke(Void r4) {
-        c.a.e.o.i(this.this$0, 2131892157, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.payment_source_deleted, 0, 4);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java
index 0dcece48bc..d7a6c76c16 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.billing;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import d0.z.d.m;
 /* compiled from: WidgetPaymentSourceEditDialog.kt */
@@ -18,6 +19,6 @@ public final class WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2 impleme
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this.this$0, 2131892155, new Object[0], null, 4), b.k(this.this$0, 2131892156, new Object[0], null, 4), b.k(this.this$0, 2131892004, new Object[0], null, 4), "", null, null, null, null, null, null, null, 0, null, 16352, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this.this$0, R.string.payment_source_delete, new Object[0], null, 4), b.k(this.this$0, R.string.payment_source_delete_disabled_tooltip, new Object[0], null, 4), b.k(this.this$0, R.string.okay, new Object[0], null, 4), "", null, null, null, null, null, null, null, 0, null, 16352, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java
index 3f8b887ecc..58a4679c3e 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.billing;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,7 +23,7 @@ public final class WidgetPaymentSourceEditDialog$updatePaymentSource$1 extends o
     }
 
     public final void invoke(Void r4) {
-        c.a.e.o.i(this.this$0, 2131892160, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.payment_source_edit_saved, 0, 4);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.java
index e4abffee85..88045c364e 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$usStates$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.billing;
 
 import android.content.Context;
 import android.content.res.AssetManager;
+import com.adjust.sdk.Constants;
 import com.discord.widgets.settings.billing.WidgetPaymentSourceEditDialog;
 import com.google.gson.Gson;
 import d0.y.b;
@@ -32,7 +33,7 @@ public final class WidgetPaymentSourceEditDialog$usStates$2 extends o implements
     public final WidgetPaymentSourceEditDialog.StateEntry[] mo1invoke() {
         AssetManager assets;
         Context context = this.this$0.getContext();
-        InputStreamReader inputStreamReader = new InputStreamReader((context == null || (assets = context.getAssets()) == null) ? null : assets.open("data/states.json"), "UTF-8");
+        InputStreamReader inputStreamReader = new InputStreamReader((context == null || (assets = context.getAssets()) == null) ? null : assets.open("data/states.json"), Constants.ENCODING);
         WidgetPaymentSourceEditDialog.StateEntry[] stateEntryArr = (WidgetPaymentSourceEditDialog.StateEntry[]) new Gson().e(inputStreamReader, WidgetPaymentSourceEditDialog.StateEntry[].class);
         b.closeFinally(inputStreamReader, null);
         return stateEntryArr;
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java
index 79d288f4cd..a2ba8ca6eb 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java
@@ -20,8 +20,10 @@ import c.a.e.j0;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetPaymentSourceEditDialogBinding;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.domain.ModelPaymentSource;
 import com.discord.models.domain.PatchPaymentSourceRaw;
 import com.discord.models.domain.billing.ModelBillingAddress;
@@ -90,7 +92,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
             m.checkNotNullParameter(str, "paymentSourceId");
             WidgetPaymentSourceEditDialog widgetPaymentSourceEditDialog = new WidgetPaymentSourceEditDialog();
             Bundle bundle = new Bundle();
-            bundle.putString("ARG_PAYMENT_SOURCE_ID", str);
+            bundle.putString(WidgetPaymentSourceEditDialog.ARG_PAYMENT_SOURCE_ID, str);
             widgetPaymentSourceEditDialog.setArguments(bundle);
             widgetPaymentSourceEditDialog.show(fragmentManager, "javaClass");
         }
@@ -171,7 +173,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
     }
 
     public WidgetPaymentSourceEditDialog() {
-        super(2131559162);
+        super(R.layout.widget_payment_source_edit_dialog);
         WidgetPaymentSourceEditDialog$viewModel$2 widgetPaymentSourceEditDialog$viewModel$2 = WidgetPaymentSourceEditDialog$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsBillingViewModel.class), new WidgetPaymentSourceEditDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPaymentSourceEditDialog$viewModel$2));
@@ -257,7 +259,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         TextView textView = getBinding().k;
         m.checkNotNullExpressionValue(textView, "binding.paymentSourceEditHelp");
         boolean z2 = false;
-        textView.setText(component1 instanceof ModelPaymentSource.ModelPaymentSourcePaypal ? b.k(this, 2131892159, new Object[]{"https://www.paypal.com"}, null, 4) : b.k(this, 2131892158, new Object[0], null, 4));
+        textView.setText(component1 instanceof ModelPaymentSource.ModelPaymentSourcePaypal ? b.k(this, R.string.payment_source_edit_help_paypal, new Object[]{"https://www.paypal.com"}, null, 4) : b.k(this, R.string.payment_source_edit_help_card, new Object[0], null, 4));
         StateEntry[] statesFor = getStatesFor(component1);
         ModelBillingAddress billingAddress = component1.getBillingAddress();
         TextInputLayout textInputLayout = getBinding().l;
@@ -314,10 +316,10 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         if (m.areEqual(component1.getBillingAddress().getCountry(), "CA")) {
             TextInputLayout textInputLayout8 = getBinding().n;
             m.checkNotNullExpressionValue(textInputLayout8, "binding.paymentSourceEditState");
-            textInputLayout8.setHint(b.k(this, 2131886871, new Object[0], null, 4));
+            textInputLayout8.setHint(b.k(this, R.string.billing_address_province, new Object[0], null, 4));
             TextInputLayout textInputLayout9 = getBinding().m;
             m.checkNotNullExpressionValue(textInputLayout9, "binding.paymentSourceEditPostalCode");
-            textInputLayout9.setHint(b.k(this, 2131886868, new Object[0], null, 4));
+            textInputLayout9.setHint(b.k(this, R.string.billing_address_postal_code, new Object[0], null, 4));
         }
         if (statesFor.length == 0) {
             z2 = true;
@@ -366,21 +368,21 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         TextInputLayout textInputLayout = getBinding().l;
         m.checkNotNullExpressionValue(textInputLayout, "binding.paymentSourceEditName");
         BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion;
-        inputArr[0] = new Input.TextInputLayoutInput("name", textInputLayout, companion.createRequiredInputValidator(2131886867));
+        inputArr[0] = new Input.TextInputLayoutInput(ModelAuditLogEntry.CHANGE_KEY_NAME, textInputLayout, companion.createRequiredInputValidator(R.string.billing_address_name_error_required));
         TextInputLayout textInputLayout2 = getBinding().e;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.paymentSourceEditAddress1");
-        inputArr[1] = new Input.TextInputLayoutInput("line_1", textInputLayout2, companion.createRequiredInputValidator(2131886859));
+        inputArr[1] = new Input.TextInputLayoutInput("line_1", textInputLayout2, companion.createRequiredInputValidator(R.string.billing_address_address_error_required));
         TextInputLayout textInputLayout3 = getBinding().g;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.paymentSourceEditCity");
-        inputArr[2] = new Input.TextInputLayoutInput("city", textInputLayout3, companion.createRequiredInputValidator(2131886862));
+        inputArr[2] = new Input.TextInputLayoutInput("city", textInputLayout3, companion.createRequiredInputValidator(R.string.billing_address_city_error_required));
         TextInputLayout textInputLayout4 = getBinding().n;
         m.checkNotNullExpressionValue(textInputLayout4, "binding.paymentSourceEditState");
         InputValidator[] inputValidatorArr = new InputValidator[1];
-        inputValidatorArr[0] = companion.createRequiredInputValidator(m.areEqual(component1.getBillingAddress().getCountry(), "CA") ? 2131886872 : 2131886875);
+        inputValidatorArr[0] = companion.createRequiredInputValidator(m.areEqual(component1.getBillingAddress().getCountry(), "CA") ? R.string.billing_address_province_error_required : R.string.billing_address_state_error_required);
         inputArr[3] = new Input.TextInputLayoutInput("state", textInputLayout4, inputValidatorArr);
         TextInputLayout textInputLayout5 = getBinding().m;
         m.checkNotNullExpressionValue(textInputLayout5, "binding.paymentSourceEditPostalCode");
-        inputArr[4] = new Input.TextInputLayoutInput("postal_code", textInputLayout5, companion.createRequiredInputValidator(2131886870));
+        inputArr[4] = new Input.TextInputLayoutInput("postal_code", textInputLayout5, companion.createRequiredInputValidator(R.string.billing_address_postal_code_error_required));
         this.validationManager = new ValidationManager(inputArr);
     }
 
@@ -388,7 +390,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         n.a aVar = n.j;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        CharSequence k = b.k(this, 2131892161, new Object[0], null, 4);
+        CharSequence k = b.k(this, R.string.payment_source_edit_select_state, new Object[0], null, 4);
         ArrayList arrayList = new ArrayList(stateEntryArr.length);
         for (StateEntry stateEntry : stateEntryArr) {
             arrayList.add(stateEntry.getLabel());
@@ -491,7 +493,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         Dialog dialog = getDialog();
         if (dialog != null && (window = dialog.getWindow()) != null) {
             if (!AccessibilityUtils.INSTANCE.isReducedMotionEnabled()) {
-                window.getAttributes().windowAnimations = 2131952407;
+                window.getAttributes().windowAnimations = R.style.UiKit_Dialog_Animation;
             }
             window.setLayout(-1, -1);
             window.setBackgroundDrawable(new ColorDrawable(0));
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java b/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java
index a5023274ad..450c58288c 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java
@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
+import com.discord.R;
 import com.discord.databinding.ViewConnectionGuildIntegrationBinding;
 import com.discord.models.domain.ModelConnectedAccountIntegration;
 import com.discord.models.domain.ModelConnectedIntegrationGuild;
@@ -26,22 +27,22 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout {
     public ConnectionsGuildIntegrationView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558756, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_connection_guild_integration, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365889;
-        TextView textView = (TextView) inflate.findViewById(2131365889);
+        int i = R.id.widget_connection_integration_guild_handle;
+        TextView textView = (TextView) inflate.findViewById(R.id.widget_connection_integration_guild_handle);
         if (textView != null) {
-            i = 2131365890;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365890);
+            i = R.id.widget_connection_integration_guild_icon;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.widget_connection_integration_guild_icon);
             if (simpleDraweeView != null) {
-                i = 2131365891;
-                TextView textView2 = (TextView) inflate.findViewById(2131365891);
+                i = R.id.widget_connection_integration_guild_join_error;
+                TextView textView2 = (TextView) inflate.findViewById(R.id.widget_connection_integration_guild_join_error);
                 if (textView2 != null) {
-                    i = 2131365892;
-                    TextView textView3 = (TextView) inflate.findViewById(2131365892);
+                    i = R.id.widget_connection_integration_guild_name;
+                    TextView textView3 = (TextView) inflate.findViewById(R.id.widget_connection_integration_guild_name);
                     if (textView3 != null) {
-                        i = 2131365893;
-                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365893);
+                        i = R.id.widget_connection_integration_join_guild;
+                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.widget_connection_integration_join_guild);
                         if (materialButton != null) {
                             ViewConnectionGuildIntegrationBinding viewConnectionGuildIntegrationBinding = new ViewConnectionGuildIntegrationBinding((CardView) inflate, textView, simpleDraweeView, textView2, textView3, materialButton);
                             m.checkNotNullExpressionValue(viewConnectionGuildIntegrationBinding, "ViewConnectionGuildInteg…rom(context), this, true)");
@@ -65,7 +66,7 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout {
             TextView textView2 = this.binding.e;
             m.checkNotNullExpressionValue(textView2, "binding.widgetConnectionIntegrationGuildName");
             textView2.setText(guild.getName());
-            String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(guild.getId()), guild.getIcon(), null, false, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165297))), 12, null);
+            String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(guild.getId()), guild.getIcon(), null, false, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.avatar_size_standard))), 12, null);
             SimpleDraweeView simpleDraweeView = this.binding.f1654c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.widgetConnectionIntegrationGuildIcon");
             IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
@@ -75,7 +76,7 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout {
         materialButton.setEnabled(!(joinStatus instanceof WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining));
         MaterialButton materialButton2 = this.binding.f;
         m.checkNotNullExpressionValue(materialButton2, "binding.widgetConnectionIntegrationJoinGuild");
-        materialButton2.setText(m.areEqual(joinStatus, WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining.INSTANCE) ? getResources().getString(2131890981) : getResources().getString(2131890951));
+        materialButton2.setText(m.areEqual(joinStatus, WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining.INSTANCE) ? getResources().getString(R.string.joining_guild) : getResources().getString(R.string.join));
         TextView textView3 = this.binding.d;
         m.checkNotNullExpressionValue(textView3, "binding.widgetConnectionIntegrationGuildJoinError");
         int i = 0;
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.java
index 90a8a520b2..9d7a15a7ff 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$2.java
@@ -27,6 +27,6 @@ public final class WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        NoticeBuilders.INSTANCE.showNotice(a.x(view, "v", "v.context"), this.this$0.this$0.getFragmentManager(), new StoreNotices.Dialog(StoreNotices.Dialog.Type.DELETE_CONNECTION_MODAL, h0.mapOf(o.to("platform_name", this.$connectedAccount.getType()), o.to("platform_title", this.$platform.getProperName()), o.to("connection_id", this.$connectionId))));
+        NoticeBuilders.INSTANCE.showNotice(a.x(view, "v", "v.context"), this.this$0.this$0.getFragmentManager(), new StoreNotices.Dialog(StoreNotices.Dialog.Type.DELETE_CONNECTION_MODAL, h0.mapOf(o.to(WidgetSettingsUserConnections.PLATFORM_NAME, this.$connectedAccount.getType()), o.to(WidgetSettingsUserConnections.PLATFORM_TITLE, this.$platform.getProperName()), o.to(WidgetSettingsUserConnections.CONNECTION_ID, this.$connectionId))));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java
index 94823b1b39..9668c3f388 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsConnectionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetSettingsUserConnections$binding$2 exten
 
     public final WidgetSettingsConnectionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362734;
-        TextView textView = (TextView) view.findViewById(2131362734);
+        int i = R.id.connections_empty;
+        TextView textView = (TextView) view.findViewById(R.id.connections_empty);
         if (textView != null) {
-            i = 2131362735;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362735);
+            i = R.id.connections_recycler;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.connections_recycler);
             if (recyclerView != null) {
                 return new WidgetSettingsConnectionsBinding((CoordinatorLayout) view, textView, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda$1.java
index 7242e7a586..fb9f99363d 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.connections;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -23,7 +24,7 @@ public final class WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda
     }
 
     public final void invoke(String str) {
-        m.checkNotNullParameter(str, "id");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_ID);
         WidgetSettingsUserConnections.access$getViewModel$p(this.this$0).joinConnectionIntegrationGuild(str);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java
index 1c7f9b754c..bb0543c997 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.settings.connections;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import d0.z.d.m;
 import rx.functions.Action2;
 /* compiled from: WidgetSettingsUserConnections.kt */
@@ -14,7 +15,7 @@ public final class WidgetSettingsUserConnections$onViewBound$2<T1, T2> implement
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364070 && this.this$0.getContext() != null) {
+        if (menuItem.getItemId() == R.id.menu_add_connections && this.this$0.getContext() != null) {
             WidgetSettingsUserConnectionsAdd.Companion.show(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
index 1dc47eee84..8bd2eee23c 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
@@ -19,6 +19,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.activity.ActivityType;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSettingsConnectionsBinding;
@@ -77,38 +78,38 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 m.checkNotNullParameter(adapter2, "adapter");
                 this.this$0 = adapter;
                 View view = this.itemView;
-                int i2 = 2131362729;
-                ImageView imageView = (ImageView) view.findViewById(2131362729);
+                int i2 = R.id.connected_account_disconnect;
+                ImageView imageView = (ImageView) view.findViewById(R.id.connected_account_disconnect);
                 if (imageView != null) {
-                    i2 = 2131362730;
-                    View findViewById = view.findViewById(2131362730);
+                    i2 = R.id.connected_account_divider;
+                    View findViewById = view.findViewById(R.id.connected_account_divider);
                     if (findViewById != null) {
-                        i2 = 2131362731;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131362731);
+                        i2 = R.id.connected_account_img;
+                        ImageView imageView2 = (ImageView) view.findViewById(R.id.connected_account_img);
                         if (imageView2 != null) {
-                            i2 = 2131362732;
-                            TextView textView = (TextView) view.findViewById(2131362732);
+                            i2 = R.id.connected_account_name;
+                            TextView textView = (TextView) view.findViewById(R.id.connected_account_name);
                             if (textView != null) {
-                                i2 = 2131363021;
-                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131363021);
+                                i2 = R.id.display_activity_switch;
+                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(R.id.display_activity_switch);
                                 if (switchMaterial != null) {
-                                    i2 = 2131363023;
-                                    SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131363023);
+                                    i2 = R.id.display_switch;
+                                    SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(R.id.display_switch);
                                     if (switchMaterial2 != null) {
-                                        i2 = 2131363024;
-                                        View findViewById2 = view.findViewById(2131363024);
+                                        i2 = R.id.divider;
+                                        View findViewById2 = view.findViewById(R.id.divider);
                                         if (findViewById2 != null) {
-                                            i2 = 2131363243;
-                                            TextView textView2 = (TextView) view.findViewById(2131363243);
+                                            i2 = R.id.extra_info;
+                                            TextView textView2 = (TextView) view.findViewById(R.id.extra_info);
                                             if (textView2 != null) {
-                                                i2 = 2131363803;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363803);
+                                                i2 = R.id.integrations_root;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.integrations_root);
                                                 if (linearLayout != null) {
-                                                    i2 = 2131363941;
-                                                    TextView textView3 = (TextView) view.findViewById(2131363941);
+                                                    i2 = R.id.label;
+                                                    TextView textView3 = (TextView) view.findViewById(R.id.label);
                                                     if (textView3 != null) {
-                                                        i2 = 2131365412;
-                                                        SwitchMaterial switchMaterial3 = (SwitchMaterial) view.findViewById(2131365412);
+                                                        i2 = R.id.sync_friends_switch;
+                                                        SwitchMaterial switchMaterial3 = (SwitchMaterial) view.findViewById(R.id.sync_friends_switch);
                                                         if (switchMaterial3 != null) {
                                                             WidgetSettingsItemConnectedAccountBinding widgetSettingsItemConnectedAccountBinding = new WidgetSettingsItemConnectedAccountBinding((CardView) view, imageView, findViewById, imageView2, textView, switchMaterial, switchMaterial2, findViewById2, textView2, linearLayout, textView3, switchMaterial3);
                                                             m.checkNotNullExpressionValue(widgetSettingsItemConnectedAccountBinding, "WidgetSettingsItemConnec…untBinding.bind(itemView)");
@@ -191,7 +192,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 switchMaterial4.setVisibility(from.getCanShowActivity() ? 0 : 8);
                 SwitchMaterial switchMaterial5 = this.binding.e;
                 m.checkNotNullExpressionValue(switchMaterial5, "binding.displayActivitySwitch");
-                b.n(switchMaterial5, 2131888196, new Object[]{t.capitalize(from.getProperName())}, null, 4);
+                b.n(switchMaterial5, R.string.display_activity, new Object[]{t.capitalize(from.getProperName())}, null, 4);
                 SwitchMaterial switchMaterial6 = this.binding.e;
                 m.checkNotNullExpressionValue(switchMaterial6, "binding.displayActivitySwitch");
                 switchMaterial6.setChecked(connection.isShowActivity());
@@ -202,7 +203,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                     textView2.setVisibility(0);
                     TextView textView3 = this.binding.g;
                     m.checkNotNullExpressionValue(textView3, "binding.extraInfo");
-                    b.n(textView3, 2131893696, new Object[0], null, 4);
+                    b.n(textView3, R.string.spotify_connection_info_android, new Object[0], null, 4);
                     this.binding.g.setOnClickListener(new WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$6(this, userConnectionItem));
                 } else {
                     TextView textView4 = this.binding.g;
@@ -214,7 +215,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                     LinearLayout linearLayout = this.binding.h;
                     m.checkNotNullExpressionValue(linearLayout, "binding.integrationsRoot");
                     linearLayout.setVisibility(0);
-                    int indexOfChild = this.binding.h.indexOfChild(this.binding.h.findViewById(2131363941));
+                    int indexOfChild = this.binding.h.indexOfChild(this.binding.h.findViewById(R.id.label));
                     if (indexOfChild != -1) {
                         LinearLayout linearLayout2 = this.binding.h;
                         int i2 = indexOfChild + 1;
@@ -264,7 +265,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<Adapter, UserConnectionItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ViewHolder(this, 2131559267, this);
+            return new ViewHolder(this, R.layout.widget_settings_item_connected_account, this);
         }
     }
 
@@ -313,7 +314,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
     }
 
     public WidgetSettingsUserConnections() {
-        super(2131559255);
+        super(R.layout.widget_settings_connections);
         WidgetSettingsUserConnections$viewModel$2 widgetSettingsUserConnections$viewModel$2 = WidgetSettingsUserConnections$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsUserConnectionsViewModel.class), new WidgetSettingsUserConnections$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsUserConnections$viewModel$2));
@@ -393,9 +394,9 @@ public final class WidgetSettingsUserConnections extends AppFragment {
             this.adapter = (Adapter) companion.configure(new Adapter(recyclerView, supportFragmentManager, new WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda$1(this)));
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131887568);
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623945, new WidgetSettingsUserConnections$onViewBound$2(this), null, 4, null);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.connections);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_connections, new WidgetSettingsUserConnections$onViewBound$2(this), null, 4, null);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java
index e35384b706..ec3cf416c7 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.connections;
 import android.view.View;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsConnectionsAddBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetSettingsUserConnectionsAdd$binding$2 ex
 
     public final WidgetSettingsConnectionsAddBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362735);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.connections_recycler);
         if (recyclerView != null) {
             return new WidgetSettingsConnectionsAddBinding((NestedScrollView) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362735)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.connections_recycler)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
index b8c27dea0c..8601154626 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
@@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetSettingsConnectionsAddBinding;
 import com.discord.databinding.WidgetSettingsItemAddConnectedAccountBinding;
@@ -63,11 +64,11 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
                 m.checkNotNullParameter(function0, "dialogDismissCallback");
                 this.dialogDismissCallback = function0;
                 View view = this.itemView;
-                int i2 = 2131361907;
-                ImageView imageView = (ImageView) view.findViewById(2131361907);
+                int i2 = R.id.add_connected_account_image;
+                ImageView imageView = (ImageView) view.findViewById(R.id.add_connected_account_image);
                 if (imageView != null) {
-                    i2 = 2131361908;
-                    TextView textView = (TextView) view.findViewById(2131361908);
+                    i2 = R.id.add_connected_account_text;
+                    TextView textView = (TextView) view.findViewById(R.id.add_connected_account_text);
                     if (textView != null) {
                         WidgetSettingsItemAddConnectedAccountBinding widgetSettingsItemAddConnectedAccountBinding = new WidgetSettingsItemAddConnectedAccountBinding((LinearLayout) view, imageView, textView);
                         m.checkNotNullExpressionValue(widgetSettingsItemAddConnectedAccountBinding, "WidgetSettingsItemAddCon…untBinding.bind(itemView)");
@@ -110,7 +111,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<Adapter, PlatformItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ViewHolder(2131559263, this, this.dialogDismissCallback);
+            return new ViewHolder(R.layout.widget_settings_item_add_connected_account, this, this.dialogDismissCallback);
         }
     }
 
@@ -207,7 +208,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559256;
+        return R.layout.widget_settings_connections_add;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java
index ef778e0d34..f172f5b84b 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.connections;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetConnectionsAddXboxBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.CodeVerificationView;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetSettingsUserConnectionsAddXbox$binding$
 
     public final WidgetConnectionsAddXboxBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362736;
-        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362736);
+        int i = R.id.connections_xbox_code;
+        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(R.id.connections_xbox_code);
         if (codeVerificationView != null) {
-            i = 2131362737;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362737);
+            i = R.id.connections_xbox_login;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.connections_xbox_login);
             if (linearLayout != null) {
-                i = 2131362956;
-                DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                i = R.id.dimmer_view;
+                DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                 if (dimmerView != null) {
                     return new WidgetConnectionsAddXboxBinding((CoordinatorLayout) view, codeVerificationView, linearLayout, dimmerView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
index a1e2b5d614..44d8656193 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
@@ -8,6 +8,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetConnectionsAddXboxBinding;
@@ -46,7 +47,7 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
     }
 
     public WidgetSettingsUserConnectionsAddXbox() {
-        super(2131559007);
+        super(R.layout.widget_connections_add_xbox);
     }
 
     public static final /* synthetic */ WidgetConnectionsAddXboxBinding access$getBinding$p(WidgetSettingsUserConnectionsAddXbox widgetSettingsUserConnectionsAddXbox) {
@@ -70,7 +71,7 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
     }
 
     private final void showPinError() {
-        o.g(getContext(), 2131887551, 0, null, 12);
+        o.g(getContext(), R.string.connection_invalid_pin, 0, null, 12);
         getBinding().b.b();
     }
 
@@ -91,8 +92,8 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131887568);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.connections);
         trackXboxLinkStep();
         getBinding().f1775c.setOnClickListener(WidgetSettingsUserConnectionsAddXbox$onViewBound$1.INSTANCE);
         getBinding().b.setOnCodeEntered(new WidgetSettingsUserConnectionsAddXbox$onViewBound$2(this));
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java b/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java
index 3da210c576..469bb3e6a4 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java
@@ -11,6 +11,7 @@ import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.z.l0.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ExperimentOverridesListItemBinding;
 import com.discord.views.experiments.ExperimentOverrideView;
 import d0.t.n;
@@ -119,14 +120,14 @@ public final class ExperimentOverridesAdapter extends RecyclerView.Adapter<Exper
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public ExperimentViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558502, viewGroup, false);
-        ExperimentOverrideView experimentOverrideView = (ExperimentOverrideView) inflate.findViewById(2131363215);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.experiment_overrides_list_item, viewGroup, false);
+        ExperimentOverrideView experimentOverrideView = (ExperimentOverrideView) inflate.findViewById(R.id.experiment_overrides_list_item_experiment_override_view);
         if (experimentOverrideView != null) {
             ExperimentOverridesListItemBinding experimentOverridesListItemBinding = new ExperimentOverridesListItemBinding((CardView) inflate, experimentOverrideView);
             m.checkNotNullExpressionValue(experimentOverridesListItemBinding, "ExperimentOverridesListI….context), parent, false)");
             return new ExperimentViewHolder(experimentOverridesListItemBinding);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363215)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.experiment_overrides_list_item_experiment_override_view)));
     }
 
     public final void setData(List<? extends Item> list) {
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java
index 38db3aeeb7..ec83cfc4d0 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsDeveloperBinding;
 import com.discord.views.CheckedSetting;
 import com.google.android.material.button.MaterialButton;
@@ -20,29 +21,29 @@ public final /* synthetic */ class WidgetSettingsDeveloper$binding$2 extends k i
 
     public final WidgetSettingsDeveloperBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362917;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362917);
+        int i = R.id.developer_settings_crash_discord_jnibridge;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.developer_settings_crash_discord_jnibridge);
         if (materialButton != null) {
-            i = 2131362918;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362918);
+            i = R.id.developer_settings_crash_discord_nonfatal;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.developer_settings_crash_discord_nonfatal);
             if (materialButton2 != null) {
-                i = 2131362919;
-                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362919);
+                i = R.id.developer_settings_crash_kotlin;
+                MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.developer_settings_crash_kotlin);
                 if (materialButton3 != null) {
-                    i = 2131362920;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362920);
+                    i = R.id.developer_settings_experiments;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.developer_settings_experiments);
                     if (recyclerView != null) {
-                        i = 2131362921;
-                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362921);
+                        i = R.id.developer_settings_notices;
+                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.developer_settings_notices);
                         if (recyclerView2 != null) {
-                            i = 2131362922;
-                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131362922);
+                            i = R.id.developer_settings_simulate_gateway_reconnect;
+                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(R.id.developer_settings_simulate_gateway_reconnect);
                             if (materialButton4 != null) {
-                                i = 2131365071;
-                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365071);
+                                i = R.id.settings_developer_screenshot_bug_reporting;
+                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.settings_developer_screenshot_bug_reporting);
                                 if (checkedSetting != null) {
-                                    i = 2131365469;
-                                    TextView textView = (TextView) view.findViewById(2131365469);
+                                    i = R.id.textView;
+                                    TextView textView = (TextView) view.findViewById(R.id.textView);
                                     if (textView != null) {
                                         return new WidgetSettingsDeveloperBinding((CoordinatorLayout) view, materialButton, materialButton2, materialButton3, recyclerView, recyclerView2, materialButton4, checkedSetting, textView);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java
index 879b752b7b..447b329065 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.developer;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.dimen.DimenUtils;
@@ -44,7 +45,7 @@ public final class WidgetSettingsDeveloper$setupNoticesSection$1 extends o imple
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ItemTouchHelper mo1invoke() {
-        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this.this$0, 2131100329), ContextCompat.getDrawable(this.this$0.requireContext(), 2131231596), DimenUtils.dpToPixels(8));
+        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this.this$0, (int) R.color.status_red_500), ContextCompat.getDrawable(this.this$0.requireContext(), R.drawable.ic_delete_white_24dp), DimenUtils.dpToPixels(8));
         return new ItemTouchHelper(new AnonymousClass1(swipeRevealConfiguration, swipeRevealConfiguration, swipeRevealConfiguration));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.java
index 9681699c74..c3c2905344 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1.java
@@ -4,6 +4,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.IconListItemTextViewBinding;
 import com.discord.widgets.settings.developer.WidgetSettingsDeveloper;
 import d0.z.d.m;
@@ -21,7 +22,7 @@ public final class WidgetSettingsDeveloper$setupNoticesSection$noticesAdapter$1
     public final WidgetSettingsDeveloper.NoticeViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) {
         m.checkNotNullParameter(layoutInflater, "layoutInflater");
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = layoutInflater.inflate(2131558527, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.icon_list_item_text_view, viewGroup, false);
         Objects.requireNonNull(inflate, "rootView");
         IconListItemTextViewBinding iconListItemTextViewBinding = new IconListItemTextViewBinding((TextView) inflate);
         m.checkNotNullExpressionValue(iconListItemTextViewBinding, "IconListItemTextViewBind…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
index 6b0716305f..8c4bdee7dc 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.IconListItemTextViewBinding;
 import com.discord.databinding.WidgetSettingsDeveloperBinding;
@@ -100,7 +101,7 @@ public final class WidgetSettingsDeveloper extends AppFragment {
     }
 
     public WidgetSettingsDeveloper() {
-        super(2131559257);
+        super(R.layout.widget_settings_developer);
     }
 
     public static final /* synthetic */ ExperimentOverridesAdapter access$getExperimentOverridesAdapter$p(WidgetSettingsDeveloper widgetSettingsDeveloper) {
@@ -169,7 +170,7 @@ public final class WidgetSettingsDeveloper extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setActionBarDisplayHomeAsUpEnabled(true);
-        setActionBarTitle(2131888133);
+        setActionBarTitle(R.string.developer_options);
         setupCrashes();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
index c7bdd54019..2023878511 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
@@ -6,6 +6,7 @@ import c.d.b.a.a;
 import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.SkuDetails;
+import com.discord.R;
 import com.discord.api.premium.SubscriptionInterval;
 import com.discord.app.AppLog;
 import com.discord.app.AppViewModel;
@@ -680,7 +681,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
         } else if (!(downgrade == null || skuDetails3 == null)) {
             googlePlaySku = downgrade;
         }
-        return n.listOf((Object[]) new WidgetChoosePlanAdapter.Item[]{new WidgetChoosePlanAdapter.Item.Header(2131887016), new WidgetChoosePlanAdapter.Item.Plan(fromSkuName, skuDetails, googlePlaySku, this.oldSkuName, skuDetails2, true), new WidgetChoosePlanAdapter.Item.Divider()});
+        return n.listOf((Object[]) new WidgetChoosePlanAdapter.Item[]{new WidgetChoosePlanAdapter.Item.Header(R.string.billing_switch_plan_current_plan), new WidgetChoosePlanAdapter.Item.Plan(fromSkuName, skuDetails, googlePlaySku, this.oldSkuName, skuDetails2, true), new WidgetChoosePlanAdapter.Item.Divider()});
     }
 
     private final WidgetChoosePlanAdapter.Item.Header getHeaderForSkuSection(GooglePlaySku.Section section) {
@@ -838,7 +839,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
             StringBuilder K = a.K("Purchase query failure. ");
             K.append(purchaseQueryFailure.getNewSkuName());
             Logger.e$default(appLog, K.toString(), new Exception(), null, 4, null);
-            this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(2131886893));
+            this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(R.string.billing_error_purchase));
         }
     }
 
@@ -887,7 +888,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
                 }
                 sb.append(z2);
                 Logger.e$default(appLog, sb.toString(), new Exception(), null, 4, null);
-                this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(2131886894));
+                this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(R.string.billing_error_purchase_details_not_found));
                 return;
             }
             BillingFlowParams.a aVar = new BillingFlowParams.a();
@@ -904,7 +905,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
                     StringBuilder P = a.P("Subscription without matching purchase. oldSkuName: ", str, "; skuName: ");
                     P.append(googlePlaySku.getSkuName());
                     Logger.e$default(appLog2, P.toString(), new Exception(), null, 4, null);
-                    this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(2131886893));
+                    this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(R.string.billing_error_purchase));
                     return;
                 }
                 int prorationMode = getProrationMode(skuDetails3, skuDetails2);
@@ -923,7 +924,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
                         StringBuilder P2 = a.P("No premium subscription for downgrade found. oldSkuName: ", str, "; skuName: ");
                         P2.append(googlePlaySku.getSkuName());
                         Logger.e$default(appLog3, P2.toString(), new Exception(), null, 4, null);
-                        this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(2131886893));
+                        this.eventSubject.j.onNext(new Event.ErrorSkuPurchase(R.string.billing_error_purchase));
                         return;
                     }
                     StoreGooglePlayPurchases googlePlayPurchases = StoreStream.Companion.getGooglePlayPurchases();
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
index 58527bf8a2..1e7e6cdb77 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreOutboundPromotions;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -84,7 +85,7 @@ public final class ClaimOutboundPromoViewModel extends AppViewModel<ViewState> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public CopyCode(String str) {
                 super(null);
-                m.checkNotNullParameter(str, "code");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
                 this.code = str;
             }
 
@@ -100,7 +101,7 @@ public final class ClaimOutboundPromoViewModel extends AppViewModel<ViewState> {
             }
 
             public final CopyCode copy(String str) {
-                m.checkNotNullParameter(str, "code");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
                 return new CopyCode(str);
             }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ClaimStatus.java b/app/src/main/java/com/discord/widgets/settings/premium/ClaimStatus.java
index 2b6381ff8c..3b3cff402a 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/ClaimStatus.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ClaimStatus.java
@@ -5,6 +5,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import c.d.b.a.a;
 import com.discord.api.utcdatetime.UtcDateTime;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.UtcDateTimeParceler;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -36,7 +37,7 @@ public abstract class ClaimStatus implements Parcelable {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public Claimed(long j, String str, String str2, String str3, UtcDateTime utcDateTime) {
             super(null);
-            m.checkNotNullParameter(str, "code");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
             m.checkNotNullParameter(str2, "body");
             m.checkNotNullParameter(str3, "link");
             m.checkNotNullParameter(utcDateTime, "redeemBy");
@@ -87,7 +88,7 @@ public abstract class ClaimStatus implements Parcelable {
         }
 
         public final Claimed copy(long j, String str, String str2, String str3, UtcDateTime utcDateTime) {
-            m.checkNotNullParameter(str, "code");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE);
             m.checkNotNullParameter(str2, "body");
             m.checkNotNullParameter(str3, "link");
             m.checkNotNullParameter(utcDateTime, "redeemBy");
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel$handleGooglePlayPurchaseEvent$1.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel$handleGooglePlayPurchaseEvent$1.java
index 8675f9d792..a3b8eac5d7 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel$handleGooglePlayPurchaseEvent$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel$handleGooglePlayPurchaseEvent$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.premium;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.widgets.settings.premium.SettingsGiftingViewModel;
 import d0.z.d.m;
@@ -29,6 +30,6 @@ public final class SettingsGiftingViewModel$handleGooglePlayPurchaseEvent$1 exte
         m.checkNotNullParameter(error, "it");
         SettingsGiftingViewModel.access$getStoreEntitlements$p(this.this$0).fetchMyGiftEntitlements();
         PublishSubject access$getGiftPurchaseEventSubject$p = SettingsGiftingViewModel.access$getGiftPurchaseEventSubject$p(this.this$0);
-        access$getGiftPurchaseEventSubject$p.j.onNext(new SettingsGiftingViewModel.GiftPurchaseEvent.ErrorGiftPurchase(2131886893));
+        access$getGiftPurchaseEventSubject$p.j.onNext(new SettingsGiftingViewModel.GiftPurchaseEvent.ErrorGiftPurchase(R.string.billing_error_purchase));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java
index e979bd63fd..842f73a128 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsGiftingViewModel.java
@@ -5,12 +5,15 @@ import android.content.Context;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.BuildConfig;
+import com.discord.R;
 import com.discord.api.premium.ClaimedOutboundPromotion;
 import com.discord.api.premium.OutboundPromotion;
 import com.discord.app.AppComponent;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelEntitlement;
 import com.discord.models.domain.ModelGift;
+import com.discord.models.domain.ModelUserSettings;
 import com.discord.stores.StoreEntitlements;
 import com.discord.stores.StoreGifting;
 import com.discord.stores.StoreGooglePlayPurchases;
@@ -20,6 +23,7 @@ import com.discord.stores.StoreUser;
 import com.discord.stores.StoreUserSettingsSystem;
 import com.discord.utilities.billing.GooglePlayBillingManager;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.settings.premium.ClaimStatus;
 import d0.t.h0;
 import d0.t.n;
@@ -1300,19 +1304,19 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
     }
 
     private final String getPromoImageUrl(long j) {
-        String str = m.areEqual(this.storeUserSettingsSystem.getTheme(), "light") ? "logo-light" : "logo-dark";
-        String str2 = "https://cdn.discordapp.com";
+        String str = m.areEqual(this.storeUserSettingsSystem.getTheme(), ModelUserSettings.THEME_LIGHT) ? "logo-light" : "logo-dark";
+        String str2 = BuildConfig.HOST_CDN;
         if (!(str2.length() > 0)) {
             str2 = null;
         }
         if (str2 == null) {
-            str2 = "https://discord.com/api/";
+            str2 = BuildConfig.HOST_API;
         }
         StringBuilder sb = new StringBuilder();
         sb.append(str2);
         sb.append("/promotions/");
         sb.append(j);
-        sb.append('/');
+        sb.append(MentionUtilsKt.SLASH_CHAR);
         return a.C(sb, str, "?size=256");
     }
 
@@ -1364,7 +1368,7 @@ public final class SettingsGiftingViewModel extends AppViewModel<ViewState> {
             storeGifting.generateGiftCode(skuId.longValue(), purchaseQuerySuccess.getSubscriptionPlanId(), new SettingsGiftingViewModel$handleGooglePlayPurchaseEvent$2(this, event), new SettingsGiftingViewModel$handleGooglePlayPurchaseEvent$1(this));
         } else if (event instanceof StoreGooglePlayPurchases.Event.PurchaseQueryFailure) {
             PublishSubject<GiftPurchaseEvent> publishSubject2 = this.giftPurchaseEventSubject;
-            publishSubject2.j.onNext(new GiftPurchaseEvent.ErrorGiftPurchase(2131886893));
+            publishSubject2.j.onNext(new GiftPurchaseEvent.ErrorGiftPurchase(R.string.billing_error_purchase));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
index 144ae3e4de..032b642a0a 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
@@ -3,9 +3,11 @@ package com.discord.widgets.settings.premium;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
+import androidx.core.view.PointerIconCompat;
 import c.d.b.a.a;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.SkuDetails;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelEntitlement;
 import com.discord.models.domain.ModelPaymentSource;
@@ -850,14 +852,14 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null) {
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, true, null, null, false, null, null, null, null, 1019, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, true, null, null, false, null, null, null, null, PointerIconCompat.TYPE_ZOOM_OUT, null));
         }
     }
 
     private final void onCancelError() {
         if (getViewState() instanceof ViewState.Loaded) {
             PublishSubject<Event> publishSubject = this.eventSubject;
-            publishSubject.j.onNext(new Event.ErrorToast(2131892265));
+            publishSubject.j.onNext(new Event.ErrorToast(R.string.premium_alert_error_title));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java
index 6d2df920b1..bce8d70204 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChoosePlanBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -20,17 +21,17 @@ public final /* synthetic */ class WidgetChoosePlan$binding$2 extends k implemen
 
     public final WidgetChoosePlanBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362651;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362651);
+        int i = R.id.choose_plan_empty_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.choose_plan_empty_container);
         if (linearLayout != null) {
-            i = 2131362652;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362652);
+            i = R.id.choose_plan_empty_description;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.choose_plan_empty_description);
             if (linkifiedTextView != null) {
-                i = 2131362653;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362653);
+                i = R.id.choose_plan_recycler;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.choose_plan_recycler);
                 if (recyclerView != null) {
-                    i = 2131362956;
-                    DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                    i = R.id.dimmer_view;
+                    DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                     if (dimmerView != null) {
                         return new WidgetChoosePlanBinding((CoordinatorLayout) view, linearLayout, linkifiedTextView, recyclerView, dimmerView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$viewModel$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$viewModel$2.java
index bae2df9144..c0d7cfdcec 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$viewModel$2.java
@@ -20,8 +20,8 @@ public final class WidgetChoosePlan$viewModel$2 extends o implements Function0<A
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<ChoosePlanViewModel.ViewState> mo1invoke() {
-        String stringExtra = this.this$0.getMostRecentIntent().getStringExtra("result_extra_current_sku_name");
-        Serializable serializableExtra = this.this$0.getMostRecentIntent().getSerializableExtra("result_view_type");
+        String stringExtra = this.this$0.getMostRecentIntent().getStringExtra(WidgetChoosePlan.RESULT_EXTRA_OLD_SKU_NAME);
+        Serializable serializableExtra = this.this$0.getMostRecentIntent().getSerializableExtra(WidgetChoosePlan.RESULT_VIEW_TYPE);
         Objects.requireNonNull(serializableExtra, "null cannot be cast to non-null type com.discord.widgets.settings.premium.WidgetChoosePlan.ViewType");
         return new ChoosePlanViewModel((WidgetChoosePlan.ViewType) serializableExtra, stringExtra, null, 4, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
index 04de3be824..d27f9183c9 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
@@ -21,6 +21,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChoosePlanBinding;
 import com.discord.stores.StoreGooglePlayPurchases;
@@ -76,9 +77,9 @@ public final class WidgetChoosePlan extends AppFragment {
             m.checkNotNullParameter(viewType, "viewType");
             m.checkNotNullParameter(location, "locationTrait");
             Intent intent = new Intent();
-            intent.putExtra("result_extra_current_sku_name", str);
-            intent.putExtra("result_extra_location_trait", location);
-            intent.putExtra("result_view_type", viewType);
+            intent.putExtra(WidgetChoosePlan.RESULT_EXTRA_OLD_SKU_NAME, str);
+            intent.putExtra(WidgetChoosePlan.RESULT_EXTRA_LOCATION_TRAIT, location);
+            intent.putExtra(WidgetChoosePlan.RESULT_VIEW_TYPE, viewType);
             AnalyticsTracker.paymentFlowStarted$default(AnalyticsTracker.INSTANCE, location, subscription, null, null, 12, null);
             if (activityResultLauncher != null) {
                 l.g.f(context, activityResultLauncher, WidgetChoosePlan.class, intent);
@@ -120,7 +121,7 @@ public final class WidgetChoosePlan extends AppFragment {
     }
 
     public WidgetChoosePlan() {
-        super(2131558999);
+        super(R.layout.widget_choose_plan);
         WidgetChoosePlan$viewModel$2 widgetChoosePlan$viewModel$2 = new WidgetChoosePlan$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChoosePlanViewModel.class), new WidgetChoosePlan$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChoosePlan$viewModel$2));
@@ -224,7 +225,7 @@ public final class WidgetChoosePlan extends AppFragment {
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         m.checkNotNullExpressionValue(recyclerView2, "it");
         this.adapter = (WidgetChoosePlanAdapter) companion.configure(new WidgetChoosePlanAdapter(recyclerView2));
-        Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("result_extra_location_trait");
+        Serializable serializableExtra = getMostRecentIntent().getSerializableExtra(RESULT_EXTRA_LOCATION_TRAIT);
         Objects.requireNonNull(serializableExtra, "null cannot be cast to non-null type com.discord.utilities.analytics.Traits.Location");
         Traits.Location location = (Traits.Location) serializableExtra;
         WidgetChoosePlanAdapter widgetChoosePlanAdapter = this.adapter;
@@ -255,7 +256,7 @@ public final class WidgetChoosePlan extends AppFragment {
         setUpRecycler();
         LinkifiedTextView linkifiedTextView = getBinding().f1771c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.choosePlanEmptyDescription");
-        b.n(linkifiedTextView, 2131892555, new Object[]{c.a.e.f.a.a(360055386693L, null)}, null, 4);
+        b.n(linkifiedTextView, R.string.premium_no_plans_body, new Object[]{c.a.e.f.a.a(360055386693L, null)}, null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
index 606a36cf7f..e81b1d95b4 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.android.billingclient.api.SkuDetails;
+import com.discord.R;
 import com.discord.databinding.WidgetChoosePlanAdapterHeaderItemBinding;
 import com.discord.databinding.WidgetChoosePlanAdapterPlanItemBinding;
 import com.discord.utilities.billing.GooglePlaySku;
@@ -32,7 +33,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
     public static final class DividerViewHolder extends MGRecyclerViewHolder<WidgetChoosePlanAdapter, Item> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public DividerViewHolder(WidgetChoosePlanAdapter widgetChoosePlanAdapter) {
-            super(2131559000, widgetChoosePlanAdapter);
+            super((int) R.layout.widget_choose_plan_adapter_divider_item, widgetChoosePlanAdapter);
             m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter");
         }
     }
@@ -43,17 +44,17 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(WidgetChoosePlanAdapter widgetChoosePlanAdapter) {
-            super(2131559001, widgetChoosePlanAdapter);
+            super((int) R.layout.widget_choose_plan_adapter_header_item, widgetChoosePlanAdapter);
             m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131364809);
+            TextView textView = (TextView) view.findViewById(R.id.select_subscription_header_text);
             if (textView != null) {
                 WidgetChoosePlanAdapterHeaderItemBinding widgetChoosePlanAdapterHeaderItemBinding = new WidgetChoosePlanAdapterHeaderItemBinding((FrameLayout) view, textView);
                 m.checkNotNullExpressionValue(widgetChoosePlanAdapterHeaderItemBinding, "WidgetChoosePlanAdapterH…temBinding.bind(itemView)");
                 this.binding = widgetChoosePlanAdapterHeaderItemBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364809)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.select_subscription_header_text)));
         }
 
         public void onConfigure(int i, Item item) {
@@ -329,7 +330,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PlanViewHeader(WidgetChoosePlanAdapter widgetChoosePlanAdapter) {
-            super(2131559002, widgetChoosePlanAdapter);
+            super((int) R.layout.widget_choose_plan_adapter_plan_item, widgetChoosePlanAdapter);
             m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter");
             WidgetChoosePlanAdapterPlanItemBinding a = WidgetChoosePlanAdapterPlanItemBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetChoosePlanAdapterP…temBinding.bind(itemView)");
@@ -368,7 +369,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
             }
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(view, 2130969432, 0, 2, (Object) null);
+            int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(view, (int) R.attr.ic_navigate_next, 0, 2, (Object) null);
             TextView textView5 = this.binding.g;
             m.checkNotNullExpressionValue(textView5, "binding.planItemPrice");
             DrawableCompat.setCompoundDrawablesCompat$default(textView5, 0, 0, themedDrawableRes$default, 0, 11, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$binding$2.java
index 9a907c72de..dfd37ae48c 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.appcompat.widget.LinearLayoutCompat;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetClaimOutboundPromoBinding;
 import com.google.android.material.button.MaterialButton;
@@ -21,38 +22,38 @@ public final /* synthetic */ class WidgetClaimOutboundPromo$binding$2 extends k
 
     public final WidgetClaimOutboundPromoBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362657;
-        TextView textView = (TextView) view.findViewById(2131362657);
+        int i = R.id.claimPromoBody;
+        TextView textView = (TextView) view.findViewById(R.id.claimPromoBody);
         if (textView != null) {
-            i = 2131362658;
-            TextView textView2 = (TextView) view.findViewById(2131362658);
+            i = R.id.claimPromoCode;
+            TextView textView2 = (TextView) view.findViewById(R.id.claimPromoCode);
             if (textView2 != null) {
-                i = 2131362659;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362659);
+                i = R.id.claimPromoCodeBox;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.claimPromoCodeBox);
                 if (linearLayout != null) {
-                    i = 2131362660;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362660);
+                    i = R.id.claimPromoCopyButton;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.claimPromoCopyButton);
                     if (materialButton != null) {
-                        i = 2131362661;
-                        LinearLayoutCompat linearLayoutCompat = (LinearLayoutCompat) view.findViewById(2131362661);
+                        i = R.id.claimPromoFailure;
+                        LinearLayoutCompat linearLayoutCompat = (LinearLayoutCompat) view.findViewById(R.id.claimPromoFailure);
                         if (linearLayoutCompat != null) {
-                            i = 2131362662;
-                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362662);
+                            i = R.id.claimPromoFailureCloseButton;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.claimPromoFailureCloseButton);
                             if (materialButton2 != null) {
-                                i = 2131362663;
-                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362663);
+                                i = R.id.claimPromoFlipper;
+                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.claimPromoFlipper);
                                 if (appViewFlipper != null) {
-                                    i = 2131362664;
-                                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362664);
+                                    i = R.id.claimPromoLoading;
+                                    FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.claimPromoLoading);
                                     if (frameLayout != null) {
-                                        i = 2131362665;
-                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362665);
+                                        i = R.id.claimPromoMaybeLaterButton;
+                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.claimPromoMaybeLaterButton);
                                         if (materialButton3 != null) {
-                                            i = 2131362666;
-                                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131362666);
+                                            i = R.id.claimPromoRedeemButton;
+                                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(R.id.claimPromoRedeemButton);
                                             if (materialButton4 != null) {
-                                                i = 2131362667;
-                                                LinearLayoutCompat linearLayoutCompat2 = (LinearLayoutCompat) view.findViewById(2131362667);
+                                                i = R.id.claimPromoSuccess;
+                                                LinearLayoutCompat linearLayoutCompat2 = (LinearLayoutCompat) view.findViewById(R.id.claimPromoSuccess);
                                                 if (linearLayoutCompat2 != null) {
                                                     return new WidgetClaimOutboundPromoBinding((LinearLayoutCompat) view, textView, textView2, linearLayout, materialButton, linearLayoutCompat, materialButton2, appViewFlipper, frameLayout, materialButton3, materialButton4, linearLayoutCompat2);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
index 4f0c39c6a8..8d01994a60 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
@@ -22,6 +22,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetClaimOutboundPromoBinding;
@@ -75,11 +76,11 @@ public final class WidgetClaimOutboundPromo extends AppDialog {
             m.checkNotNullParameter(function1, "onPromoClaimed");
             if (fragment.getParentFragmentManager().findFragmentByTag("javaClass") == null) {
                 if (claimStatus instanceof ClaimStatus.Unclaimed) {
-                    FragmentKt.setFragmentResultListener(fragment, "KEY_PROMO_CLAIMED", new WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2(function1));
+                    FragmentKt.setFragmentResultListener(fragment, WidgetClaimOutboundPromo.KEY_PROMO_CLAIMED, new WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2(function1));
                 }
                 WidgetClaimOutboundPromo widgetClaimOutboundPromo = new WidgetClaimOutboundPromo();
                 Bundle bundle = new Bundle();
-                bundle.putParcelable("ARG_CLAIM_STATUS", claimStatus);
+                bundle.putParcelable(WidgetClaimOutboundPromo.ARG_CLAIM_STATUS, claimStatus);
                 widgetClaimOutboundPromo.setArguments(bundle);
                 FragmentManager parentFragmentManager = fragment.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "fragment.parentFragmentManager");
@@ -89,7 +90,7 @@ public final class WidgetClaimOutboundPromo extends AppDialog {
     }
 
     public WidgetClaimOutboundPromo() {
-        super(2131559003);
+        super(R.layout.widget_claim_outbound_promo);
         WidgetClaimOutboundPromo$viewModel$2 widgetClaimOutboundPromo$viewModel$2 = new WidgetClaimOutboundPromo$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ClaimOutboundPromoViewModel.class), new WidgetClaimOutboundPromo$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetClaimOutboundPromo$viewModel$2));
@@ -158,7 +159,7 @@ public final class WidgetClaimOutboundPromo extends AppDialog {
     }
 
     private final ClaimStatus getClaimStatus() {
-        Parcelable parcelable = getArgumentsOrDefault().getParcelable("ARG_CLAIM_STATUS");
+        Parcelable parcelable = getArgumentsOrDefault().getParcelable(ARG_CLAIM_STATUS);
         m.checkNotNull(parcelable);
         return (ClaimStatus) parcelable;
     }
@@ -171,17 +172,17 @@ public final class WidgetClaimOutboundPromo extends AppDialog {
         Unit unit;
         if (event instanceof ClaimOutboundPromoViewModel.Event.Claimed) {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("KEY_PROMO_CLAIMED", ((ClaimOutboundPromoViewModel.Event.Claimed) event).getClaimedStatus());
+            bundle.putParcelable(KEY_PROMO_CLAIMED, ((ClaimOutboundPromoViewModel.Event.Claimed) event).getClaimedStatus());
             unit = Unit.a;
-            FragmentKt.setFragmentResult(this, "KEY_PROMO_CLAIMED", bundle);
+            FragmentKt.setFragmentResult(this, KEY_PROMO_CLAIMED, bundle);
         } else if (event instanceof ClaimOutboundPromoViewModel.Event.CopyCode) {
             Object systemService = requireContext().getSystemService("clipboard");
             Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.content.ClipboardManager");
             ((ClipboardManager) systemService).setPrimaryClip(ClipData.newPlainText("Promo Code", ((ClaimOutboundPromoViewModel.Event.CopyCode) event).getCode()));
             MaterialButton materialButton = getBinding().e;
             m.checkNotNullExpressionValue(materialButton, "binding.claimPromoCopyButton");
-            b.n(materialButton, 2131887644, new Object[0], null, 4);
-            setCodeBoxColor(ContextCompat.getColor(requireContext(), 2131100254));
+            b.n(materialButton, R.string.copied, new Object[0], null, 4);
+            setCodeBoxColor(ContextCompat.getColor(requireContext(), R.color.status_green_600));
             unit = Unit.a;
         } else if (event instanceof ClaimOutboundPromoViewModel.Event.OpenRedemptionUrl) {
             UriHandler uriHandler = UriHandler.INSTANCE;
@@ -215,7 +216,7 @@ public final class WidgetClaimOutboundPromo extends AppDialog {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         ViewCompat.setBackground(getBinding().d, this.codeBoxBackground);
-        setCodeBoxColor(ColorCompat.getThemedColor(view, 2130968949));
+        setCodeBoxColor(ColorCompat.getThemedColor(view, (int) R.attr.colorInteractiveNormal));
         getBinding().e.setOnClickListener(new WidgetClaimOutboundPromo$onViewBound$1(this));
         getBinding().i.setOnClickListener(new WidgetClaimOutboundPromo$onViewBound$2(this));
         getBinding().h.setOnClickListener(new WidgetClaimOutboundPromo$onViewBound$3(this));
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$binding$2.java
index d52e48ae4c..f5955d21a4 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.premium;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetOutboundPromoTermsBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetOutboundPromoTerms$binding$2 extends k
 
     public final WidgetOutboundPromoTermsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364590;
-        TextView textView = (TextView) view.findViewById(2131364590);
+        int i = R.id.promoTermsClose;
+        TextView textView = (TextView) view.findViewById(R.id.promoTermsClose);
         if (textView != null) {
-            i = 2131364591;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364591);
+            i = R.id.promoTermsContent;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.promoTermsContent);
             if (linkifiedTextView != null) {
                 return new WidgetOutboundPromoTermsBinding((LinearLayout) view, textView, linkifiedTextView);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1.java
index 369fb386e9..13217110f4 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.settings.premium;
 
 import android.content.Context;
+import com.discord.R;
 import com.discord.utilities.textprocessing.node.UrlNode;
 import d0.z.d.m;
 import kotlin.Unit;
@@ -19,7 +20,7 @@ public final class WidgetOutboundPromoTerms$renderContext$1 implements UrlNode.R
         Context requireContext = widgetOutboundPromoTerms.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
         this.context = requireContext;
-        this.linkColorAttrResId = 2130968987;
+        this.linkColorAttrResId = R.attr.colorTextLink;
         this.onLongPressUrl = WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1.INSTANCE;
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java
index b0c092078a..97ee8d30b6 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.u.b.b.e;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetOutboundPromoTermsBinding;
 import com.discord.simpleast.core.node.Node;
@@ -41,7 +42,7 @@ public final class WidgetOutboundPromoTerms extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetOutboundPromoTerms widgetOutboundPromoTerms = new WidgetOutboundPromoTerms();
             Bundle bundle = new Bundle();
-            bundle.putString("ARG_CONTENT", str);
+            bundle.putString(WidgetOutboundPromoTerms.ARG_CONTENT, str);
             widgetOutboundPromoTerms.setArguments(bundle);
             widgetOutboundPromoTerms.show(fragmentManager, WidgetOutboundPromoTerms.class.getName());
         }
@@ -64,7 +65,7 @@ public final class WidgetOutboundPromoTerms extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559161;
+        return R.layout.widget_outbound_promo_terms;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -72,7 +73,7 @@ public final class WidgetOutboundPromoTerms extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         getBinding().b.setOnClickListener(new WidgetOutboundPromoTerms$onViewCreated$1(this));
-        String string = getArgumentsOrDefault().getString("ARG_CONTENT", "");
+        String string = getArgumentsOrDefault().getString(ARG_CONTENT, "");
         Parser<UrlNode.RenderContext, Node<UrlNode.RenderContext>, MessageParseState> parser = this.parser;
         m.checkNotNullExpressionValue(string, "content");
         getBinding().f1877c.setDraweeSpanStringBuilder(AstRenderer.render(Parser.parse$default(parser, string, MessageParseState.Companion.getInitialState(), null, 4, null), getRenderContext()));
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java
index 56e45a9137..75c01a46db 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsGiftingBinding;
 import com.discord.utilities.dimmer.DimmerView;
@@ -26,62 +27,62 @@ public final /* synthetic */ class WidgetSettingsGifting$binding$2 extends k imp
 
     public final WidgetSettingsGiftingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131363401;
-            GiftSelectView giftSelectView = (GiftSelectView) view.findViewById(2131363401);
+            i = R.id.gift_select_premium_tier_1_month;
+            GiftSelectView giftSelectView = (GiftSelectView) view.findViewById(R.id.gift_select_premium_tier_1_month);
             if (giftSelectView != null) {
-                i = 2131363402;
-                GiftSelectView giftSelectView2 = (GiftSelectView) view.findViewById(2131363402);
+                i = R.id.gift_select_premium_tier_1_year;
+                GiftSelectView giftSelectView2 = (GiftSelectView) view.findViewById(R.id.gift_select_premium_tier_1_year);
                 if (giftSelectView2 != null) {
-                    i = 2131363403;
-                    GiftSelectView giftSelectView3 = (GiftSelectView) view.findViewById(2131363403);
+                    i = R.id.gift_select_premium_tier_2_month;
+                    GiftSelectView giftSelectView3 = (GiftSelectView) view.findViewById(R.id.gift_select_premium_tier_2_month);
                     if (giftSelectView3 != null) {
-                        i = 2131363404;
-                        GiftSelectView giftSelectView4 = (GiftSelectView) view.findViewById(2131363404);
+                        i = R.id.gift_select_premium_tier_2_year;
+                        GiftSelectView giftSelectView4 = (GiftSelectView) view.findViewById(R.id.gift_select_premium_tier_2_year);
                         if (giftSelectView4 != null) {
-                            i = 2131364531;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364531);
+                            i = R.id.premium_tier_1_gift_learn_more;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.premium_tier_1_gift_learn_more);
                             if (linkifiedTextView != null) {
-                                i = 2131364533;
-                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131364533);
+                                i = R.id.premium_tier_2_gift_learn_more;
+                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.premium_tier_2_gift_learn_more);
                                 if (linkifiedTextView2 != null) {
-                                    i = 2131365072;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365072);
+                                    i = R.id.settings_gifting_flipper;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.settings_gifting_flipper);
                                     if (appViewFlipper != null) {
-                                        i = 2131365073;
-                                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131365073);
+                                        i = R.id.settings_gifting_gift_code_input_progress;
+                                        ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.settings_gifting_gift_code_input_progress);
                                         if (progressBar != null) {
-                                            i = 2131365074;
-                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365074);
+                                            i = R.id.settings_gifting_gift_code_input_wrap;
+                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.settings_gifting_gift_code_input_wrap);
                                             if (textInputLayout != null) {
-                                                i = 2131365075;
-                                                TextView textView = (TextView) view.findViewById(2131365075);
+                                                i = R.id.settings_gifting_gifts_you_purchased_header;
+                                                TextView textView = (TextView) view.findViewById(R.id.settings_gifting_gifts_you_purchased_header);
                                                 if (textView != null) {
-                                                    i = 2131365076;
-                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365076);
+                                                    i = R.id.settings_gifting_gifts_you_purchased_recycler;
+                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.settings_gifting_gifts_you_purchased_recycler);
                                                     if (recyclerView != null) {
-                                                        i = 2131365077;
-                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365077);
+                                                        i = R.id.settings_gifting_purchase_gift_section;
+                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_gifting_purchase_gift_section);
                                                         if (linearLayout != null) {
-                                                            i = 2131365078;
-                                                            TextView textView2 = (TextView) view.findViewById(2131365078);
+                                                            i = R.id.settings_gifting_redeem_codes_header;
+                                                            TextView textView2 = (TextView) view.findViewById(R.id.settings_gifting_redeem_codes_header);
                                                             if (textView2 != null) {
-                                                                i = 2131365079;
-                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365079);
+                                                                i = R.id.settings_gifting_retry;
+                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.settings_gifting_retry);
                                                                 if (materialButton != null) {
-                                                                    i = 2131365080;
-                                                                    TextView textView3 = (TextView) view.findViewById(2131365080);
+                                                                    i = R.id.settings_gifting_select_classic_gift_header;
+                                                                    TextView textView3 = (TextView) view.findViewById(R.id.settings_gifting_select_classic_gift_header);
                                                                     if (textView3 != null) {
-                                                                        i = 2131365081;
-                                                                        TextView textView4 = (TextView) view.findViewById(2131365081);
+                                                                        i = R.id.settings_gifting_select_gift_header;
+                                                                        TextView textView4 = (TextView) view.findViewById(R.id.settings_gifting_select_gift_header);
                                                                         if (textView4 != null) {
-                                                                            i = 2131365082;
-                                                                            TextView textView5 = (TextView) view.findViewById(2131365082);
+                                                                            i = R.id.settings_gifting_your_gifts_header;
+                                                                            TextView textView5 = (TextView) view.findViewById(R.id.settings_gifting_your_gifts_header);
                                                                             if (textView5 != null) {
-                                                                                i = 2131365083;
-                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131365083);
+                                                                                i = R.id.settings_gifting_your_gifts_recycler;
+                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.settings_gifting_your_gifts_recycler);
                                                                                 if (recyclerView2 != null) {
                                                                                     return new WidgetSettingsGiftingBinding((CoordinatorLayout) view, dimmerView, giftSelectView, giftSelectView2, giftSelectView3, giftSelectView4, linkifiedTextView, linkifiedTextView2, appViewFlipper, progressBar, textInputLayout, textView, recyclerView, linearLayout, textView2, materialButton, textView3, textView4, textView5, recyclerView2);
                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java
index 33ac089136..83b0cfc03d 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.settings.premium;
 
 import c.a.l.b;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.billing.GooglePlayInAppSku;
@@ -60,7 +61,7 @@ public final class WidgetSettingsGifting$onViewBound$chooseGiftCallback$1 extend
             giftingUtils.buyGift(requireAppActivity, googlePlayInAppSku, location, new AnonymousClass1(this));
         } catch (Exception unused) {
             WidgetSettingsGifting widgetSettingsGifting = this.this$0;
-            c.a.e.o.j(widgetSettingsGifting, b.k(widgetSettingsGifting, 2131888413, new Object[0], null, 4), 0, 4);
+            c.a.e.o.j(widgetSettingsGifting, b.k(widgetSettingsGifting, R.string.error_occurred_try_again, new Object[0], null, 4), 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
index 577e6bd412..d97026fecb 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
@@ -21,6 +21,7 @@ import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.android.billingclient.api.SkuDetails;
+import com.discord.R;
 import com.discord.api.premium.SubscriptionPlan;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -110,7 +111,7 @@ public final class WidgetSettingsGifting extends AppFragment {
     }
 
     public WidgetSettingsGifting() {
-        super(2131559262);
+        super(R.layout.widget_settings_gifting);
         WidgetSettingsGifting$viewModel$2 widgetSettingsGifting$viewModel$2 = WidgetSettingsGifting$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsGiftingViewModel.class), new WidgetSettingsGifting$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsGifting$viewModel$2));
@@ -195,7 +196,7 @@ public final class WidgetSettingsGifting extends AppFragment {
             }
             SettingsGiftingViewModel.ViewState.Loaded loaded = (SettingsGiftingViewModel.ViewState.Loaded) viewState;
             boolean z2 = loaded.getResolvingGiftState() instanceof SettingsGiftingViewModel.ResolvingGiftState.Resolving;
-            CharSequence k = loaded.getResolvingGiftState() instanceof SettingsGiftingViewModel.ResolvingGiftState.Error ? b.k(this, 2131886408, new Object[0], null, 4) : null;
+            CharSequence k = loaded.getResolvingGiftState() instanceof SettingsGiftingViewModel.ResolvingGiftState.Error ? b.k(this, R.string.application_entitlement_code_redemption_invalid, new Object[0], null, 4) : null;
             ProgressBar progressBar = getBinding().j;
             m.checkNotNullExpressionValue(progressBar, "binding.settingsGiftingGiftCodeInputProgress");
             progressBar.setVisibility(z2 ? 0 : 8);
@@ -344,7 +345,7 @@ public final class WidgetSettingsGifting extends AppFragment {
         TextInputLayout textInputLayout = getBinding().k;
         m.checkNotNullExpressionValue(textInputLayout, "binding.settingsGiftingGiftCodeInputWrap");
         ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetSettingsGifting$onViewBound$2(this), 1, null);
-        getBinding().k.setErrorTextColor(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100329)));
+        getBinding().k.setErrorTextColor(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), (int) R.color.status_red_500)));
         WidgetSettingsGiftingOutboundPromosAdapter widgetSettingsGiftingOutboundPromosAdapter = new WidgetSettingsGiftingOutboundPromosAdapter(new WidgetSettingsGifting$onViewBound$3(getViewModel()), new WidgetSettingsGifting$onViewBound$4(getViewModel()));
         RecyclerView recyclerView = getBinding().f1963s;
         m.checkNotNullExpressionValue(recyclerView, "binding.settingsGiftingYourGiftsRecycler");
@@ -372,10 +373,10 @@ public final class WidgetSettingsGifting extends AppFragment {
         this.giftingAdapter = (WidgetSettingsGiftingAdapter) companion.configure(new WidgetSettingsGiftingAdapter(recyclerView3));
         LinkifiedTextView linkifiedTextView = getBinding().g;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.premiumTier1GiftLearnMore");
-        b.m(linkifiedTextView, 2131892307, new Object[0], WidgetSettingsGifting$onViewBound$7.INSTANCE);
+        b.m(linkifiedTextView, R.string.premium_classic_payment_gift_blurb_mobile, new Object[0], WidgetSettingsGifting$onViewBound$7.INSTANCE);
         LinkifiedTextView linkifiedTextView2 = getBinding().h;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.premiumTier2GiftLearnMore");
-        b.m(linkifiedTextView2, 2131892565, new Object[0], WidgetSettingsGifting$onViewBound$8.INSTANCE);
+        b.m(linkifiedTextView2, R.string.premium_payment_gift_blurb_mobile, new Object[0], WidgetSettingsGifting$onViewBound$8.INSTANCE);
         Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("com.discord.intent.extra.EXTRA_LOCATION");
         if (!(serializableExtra instanceof Traits.Location)) {
             serializableExtra = null;
@@ -412,7 +413,7 @@ public final class WidgetSettingsGifting extends AppFragment {
                 m.checkNotNullExpressionValue(textView4, "binding.planItemPrice");
                 Context context2 = textView4.getContext();
                 m.checkNotNullExpressionValue(context2, "binding.planItemPrice.context");
-                int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(context2, 2130969432, 0, 2, (Object) null);
+                int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(context2, (int) R.attr.ic_navigate_next, 0, 2, (Object) null);
                 TextView textView5 = key.i.g;
                 m.checkNotNullExpressionValue(textView5, "binding.planItemPrice");
                 DrawableCompat.setCompoundDrawablesCompat$default(textView5, 0, 0, themedDrawableRes$default, 0, 11, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java
index 8e15a204ee..607a8fa19e 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java
@@ -11,6 +11,7 @@ import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.application.Application;
 import com.discord.api.premium.SubscriptionInterval;
 import com.discord.app.AppViewFlipper;
@@ -66,30 +67,30 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public EntitlementListItem(WidgetSettingsGiftingAdapter widgetSettingsGiftingAdapter) {
-            super(2131558764, widgetSettingsGiftingAdapter);
+            super((int) R.layout.view_gift_entitlement_list_item, widgetSettingsGiftingAdapter);
             m.checkNotNullParameter(widgetSettingsGiftingAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363389;
-            TextView textView = (TextView) view.findViewById(2131363389);
+            int i = R.id.gift_entitlement_code;
+            TextView textView = (TextView) view.findViewById(R.id.gift_entitlement_code);
             if (textView != null) {
-                i = 2131363390;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363390);
+                i = R.id.gift_entitlement_code_container;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.gift_entitlement_code_container);
                 if (relativeLayout != null) {
                     FrameLayout frameLayout = (FrameLayout) view;
-                    i = 2131363392;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131363392);
+                    i = R.id.gift_entitlement_copy;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.gift_entitlement_copy);
                     if (materialButton != null) {
-                        i = 2131363393;
-                        View findViewById = view.findViewById(2131363393);
+                        i = R.id.gift_entitlement_divider;
+                        View findViewById = view.findViewById(R.id.gift_entitlement_divider);
                         if (findViewById != null) {
-                            i = 2131363394;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363394);
+                            i = R.id.gift_entitlement_flipper;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.gift_entitlement_flipper);
                             if (appViewFlipper != null) {
-                                i = 2131363395;
-                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363395);
+                                i = R.id.gift_entitlement_generate;
+                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.gift_entitlement_generate);
                                 if (materialButton2 != null) {
-                                    i = 2131363396;
-                                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363396);
+                                    i = R.id.gift_entitlement_revoke;
+                                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.gift_entitlement_revoke);
                                     if (linkifiedTextView != null) {
                                         ViewGiftEntitlementListItemBinding viewGiftEntitlementListItemBinding = new ViewGiftEntitlementListItemBinding(frameLayout, textView, relativeLayout, frameLayout, materialButton, findViewById, appViewFlipper, materialButton2, linkifiedTextView);
                                         m.checkNotNullExpressionValue(viewGiftEntitlementListItemBinding, "ViewGiftEntitlementListItemBinding.bind(itemView)");
@@ -143,14 +144,14 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                     m.checkNotNullExpressionValue(materialButton, "binding.giftEntitlementCopy");
                     View view6 = this.itemView;
                     m.checkNotNullExpressionValue(view6, "itemView");
-                    materialButton.setText(b.j(view6, areEqual ? 2131887644 : 2131887646, new Object[0], null, 4));
+                    materialButton.setText(b.j(view6, areEqual ? R.string.copied : R.string.copy, new Object[0], null, 4));
                     RelativeLayout relativeLayout = this.binding.f1656c;
                     if (areEqual) {
                         m.checkNotNullExpressionValue(context, "context");
-                        i2 = DrawableCompat.getThemedDrawableRes$default(context, 2130969335, 0, 2, (Object) null);
+                        i2 = DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.gift_code_copied_outline, 0, 2, (Object) null);
                     } else {
                         m.checkNotNullExpressionValue(context, "context");
-                        i2 = DrawableCompat.getThemedDrawableRes$default(context, 2130969903, 0, 2, (Object) null);
+                        i2 = DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.primary_660_bg_outline, 0, 2, (Object) null);
                     }
                     relativeLayout.setBackgroundResource(i2);
                     this.binding.e.setOnClickListener(new WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$3(this, giftItem));
@@ -158,7 +159,7 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                     CharSequence timeString = giftingUtils.getTimeString(giftItem.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context);
                     LinkifiedTextView linkifiedTextView = this.binding.i;
                     m.checkNotNullExpressionValue(linkifiedTextView, "binding.giftEntitlementRevoke");
-                    b.m(linkifiedTextView, 2131889130, new Object[]{timeString}, new WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4(this, giftItem));
+                    b.m(linkifiedTextView, R.string.gift_inventory_expires_in_mobile, new Object[]{timeString}, new WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4(this, giftItem));
                     TextView textView = this.binding.b;
                     m.checkNotNullExpressionValue(textView, "binding.giftEntitlementCode");
                     textView.setText(giftingUtils.generateGiftUrl(giftItem.getGift().getCode()));
@@ -177,13 +178,13 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                     m.checkNotNullExpressionValue(view8, "itemView");
                     Context context2 = view8.getContext();
                     m.checkNotNullExpressionValue(context2, "itemView.context");
-                    frameLayout.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context2, 2130969900, 0, 2, (Object) null));
+                    frameLayout.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context2, (int) R.attr.primary_630_bg_bottom_corners, 0, 2, (Object) null));
                     return;
                 }
                 FrameLayout frameLayout2 = this.binding.d;
                 View view9 = this.itemView;
                 m.checkNotNullExpressionValue(view9, "itemView");
-                frameLayout2.setBackgroundColor(ColorCompat.getThemedColor(view9.getContext(), 2130969898));
+                frameLayout2.setBackgroundColor(ColorCompat.getThemedColor(view9.getContext(), (int) R.attr.primary_630));
             }
         }
     }
@@ -398,7 +399,7 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
     public static final class NoGiftsListItem extends MGRecyclerViewHolder<WidgetSettingsGiftingAdapter, GiftItem> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public NoGiftsListItem(WidgetSettingsGiftingAdapter widgetSettingsGiftingAdapter) {
-            super(2131558794, widgetSettingsGiftingAdapter);
+            super((int) R.layout.view_no_gifts_list_item, widgetSettingsGiftingAdapter);
             m.checkNotNullParameter(widgetSettingsGiftingAdapter, "adapter");
         }
     }
@@ -409,20 +410,20 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public SkuListItem(WidgetSettingsGiftingAdapter widgetSettingsGiftingAdapter) {
-            super(2131558766, widgetSettingsGiftingAdapter);
+            super((int) R.layout.view_gift_sku_list_item, widgetSettingsGiftingAdapter);
             m.checkNotNullParameter(widgetSettingsGiftingAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363405;
-            ImageView imageView = (ImageView) view.findViewById(2131363405);
+            int i = R.id.gift_sku_arrow;
+            ImageView imageView = (ImageView) view.findViewById(R.id.gift_sku_arrow);
             if (imageView != null) {
-                i = 2131363406;
-                TextView textView = (TextView) view.findViewById(2131363406);
+                i = R.id.gift_sku_copies;
+                TextView textView = (TextView) view.findViewById(R.id.gift_sku_copies);
                 if (textView != null) {
-                    i = 2131363407;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363407);
+                    i = R.id.gift_sku_icon;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.gift_sku_icon);
                     if (simpleDraweeView != null) {
-                        i = 2131363408;
-                        TextView textView2 = (TextView) view.findViewById(2131363408);
+                        i = R.id.gift_sku_name;
+                        TextView textView2 = (TextView) view.findViewById(R.id.gift_sku_name);
                         if (textView2 != null) {
                             ViewGiftSkuListItemBinding viewGiftSkuListItemBinding = new ViewGiftSkuListItemBinding((CardView) view, imageView, textView, simpleDraweeView, textView2);
                             m.checkNotNullExpressionValue(viewGiftSkuListItemBinding, "ViewGiftSkuListItemBinding.bind(itemView)");
@@ -453,7 +454,7 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                 TextView textView2 = this.binding.e;
                 m.checkNotNullExpressionValue(textView2, "binding.giftSkuName");
                 if (from != null) {
-                    Pair pair = from.getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131889142, 2131755128) : new Pair(2131889143, 2131755129);
+                    Pair pair = from.getInterval() == SubscriptionInterval.MONTHLY ? new Pair(Integer.valueOf((int) R.string.gift_inventory_subscription_months), Integer.valueOf((int) R.plurals.gift_inventory_subscription_months_intervalCount)) : new Pair(Integer.valueOf((int) R.string.gift_inventory_subscription_years), Integer.valueOf((int) R.plurals.gift_inventory_subscription_years_intervalCount));
                     int intValue = ((Number) pair.component1()).intValue();
                     int intValue2 = ((Number) pair.component2()).intValue();
                     View view = this.itemView;
@@ -465,8 +466,8 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                 textView2.setText(charSequence);
                 TextView textView3 = this.binding.f1658c;
                 m.checkNotNullExpressionValue(textView3, "binding.giftSkuCopies");
-                textView3.setText(StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755125, giftItem.getCopies().intValue(), giftItem.getCopies()));
-                this.binding.b.setImageResource(giftItem.getExpanded().booleanValue() ? 2131231550 : 2131231554);
+                textView3.setText(StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.gift_inventory_copies_copies, giftItem.getCopies().intValue(), giftItem.getCopies()));
+                this.binding.b.setImageResource(giftItem.getExpanded().booleanValue() ? R.drawable.ic_chevron_down_primary_300_12dp : R.drawable.ic_chevron_right_primary_300_12dp);
                 PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
                 if (premiumUtils.isNitroSku(giftItem.getSku())) {
                     this.binding.d.setImageResource(premiumUtils.getNitroGiftIcon(giftItem.getSku()));
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java
index d064dfc263..e376f700c4 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.ViewGiftOutboundPromoListItemBinding;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -51,27 +52,27 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
         /* JADX WARN: Multi-variable type inference failed */
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public OutboundPromoViewHolder(ViewGroup viewGroup, Function1<? super SettingsGiftingViewModel.OutboundPromoItem, Unit> function1, Function1<? super SettingsGiftingViewModel.OutboundPromoItem, Unit> function12) {
-            super(LayoutInflater.from(viewGroup.getContext()).inflate(2131558765, viewGroup, false));
+            super(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.view_gift_outbound_promo_list_item, viewGroup, false));
             m.checkNotNullParameter(viewGroup, "parent");
             m.checkNotNullParameter(function1, "onMoreDetailsClick");
             m.checkNotNullParameter(function12, "onButtonClick");
             this.onMoreDetailsClick = function1;
             this.onButtonClick = function12;
             View view = this.itemView;
-            int i = 2131363383;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363383);
+            int i = R.id.giftPromoButton;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.giftPromoButton);
             if (materialButton != null) {
-                i = 2131363384;
-                TextView textView = (TextView) view.findViewById(2131363384);
+                i = R.id.giftPromoDescription;
+                TextView textView = (TextView) view.findViewById(R.id.giftPromoDescription);
                 if (textView != null) {
-                    i = 2131363385;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363385);
+                    i = R.id.giftPromoImage;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.giftPromoImage);
                     if (simpleDraweeView != null) {
-                        i = 2131363386;
-                        TextView textView2 = (TextView) view.findViewById(2131363386);
+                        i = R.id.giftPromoMoreDetails;
+                        TextView textView2 = (TextView) view.findViewById(R.id.giftPromoMoreDetails);
                         if (textView2 != null) {
-                            i = 2131363387;
-                            TextView textView3 = (TextView) view.findViewById(2131363387);
+                            i = R.id.giftPromoTitle;
+                            TextView textView3 = (TextView) view.findViewById(R.id.giftPromoTitle);
                             if (textView3 != null) {
                                 ViewGiftOutboundPromoListItemBinding viewGiftOutboundPromoListItemBinding = new ViewGiftOutboundPromoListItemBinding((MaterialCardView) view, materialButton, textView, simpleDraweeView, textView2, textView3);
                                 textView2.setOnClickListener(new WidgetSettingsGiftingOutboundPromosAdapter$OutboundPromoViewHolder$$special$$inlined$also$lambda$1(this));
@@ -127,10 +128,10 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
                 String renderUtcDate = timeUtils.renderUtcDate(g, context, 1);
                 TextView textView2 = this.binding.f1657c;
                 m.checkNotNullExpressionValue(textView2, "binding.giftPromoDescription");
-                b.n(textView2, 2131891545, new Object[]{renderUtcDate}, null, 4);
+                b.n(textView2, R.string.mobile_outbound_promotion_card_unclaimed_body, new Object[]{renderUtcDate}, null, 4);
                 MaterialButton materialButton = this.binding.b;
                 m.checkNotNullExpressionValue(materialButton, "binding.giftPromoButton");
-                b.n(materialButton, 2131892810, new Object[0], null, 4);
+                b.n(materialButton, R.string.promotion_card_action_claim, new Object[0], null, 4);
             } else if (claimStatus instanceof ClaimStatus.Claimed) {
                 long g2 = ((ClaimStatus.Claimed) outboundPromoItem.getClaimStatus()).getRedeemBy().g();
                 TimeUtils timeUtils2 = TimeUtils.INSTANCE;
@@ -141,10 +142,10 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
                 String renderUtcDate2 = timeUtils2.renderUtcDate(g2, context2, 1);
                 TextView textView3 = this.binding.f1657c;
                 m.checkNotNullExpressionValue(textView3, "binding.giftPromoDescription");
-                b.n(textView3, 2131891544, new Object[]{renderUtcDate2}, null, 4);
+                b.n(textView3, R.string.mobile_outbound_promotion_card_claimed_body, new Object[]{renderUtcDate2}, null, 4);
                 MaterialButton materialButton2 = this.binding.b;
                 m.checkNotNullExpressionValue(materialButton2, "binding.giftPromoButton");
-                b.n(materialButton2, 2131892047, new Object[0], null, 4);
+                b.n(materialButton2, R.string.outbound_promotion_see_code, new Object[0], null, 4);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java
index 93e42df2b1..82749e9cab 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java
@@ -13,6 +13,7 @@ import c.a.j.s2;
 import c.a.j.t2;
 import c.a.j.u2;
 import c.a.j.x;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsPremiumBinding;
 import com.discord.views.ActiveSubscriptionView;
@@ -32,104 +33,104 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
     public final WidgetSettingsPremiumBinding invoke(View view) {
         int i;
         m.checkNotNullParameter(view, "p1");
-        View findViewById = view.findViewById(2131361860);
-        int i2 = 2131364512;
+        View findViewById = view.findViewById(R.id.account_credits);
+        int i2 = R.id.premium_settings_credit_header;
         if (findViewById != null) {
-            AccountCreditView accountCreditView = (AccountCreditView) findViewById.findViewById(2131362877);
+            AccountCreditView accountCreditView = (AccountCreditView) findViewById.findViewById(R.id.credit_nitro);
             if (accountCreditView != null) {
-                AccountCreditView accountCreditView2 = (AccountCreditView) findViewById.findViewById(2131362878);
+                AccountCreditView accountCreditView2 = (AccountCreditView) findViewById.findViewById(R.id.credit_nitro_classic);
                 if (accountCreditView2 != null) {
-                    View findViewById2 = findViewById.findViewById(2131362879);
+                    View findViewById2 = findViewById.findViewById(R.id.credit_nitro_divider);
                     if (findViewById2 != null) {
                         x xVar = new x((CardView) findViewById, accountCreditView, accountCreditView2, findViewById2);
-                        View findViewById3 = view.findViewById(2131364390);
+                        View findViewById3 = view.findViewById(R.id.payment);
                         if (findViewById3 != null) {
-                            int i3 = 2131361900;
-                            MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131361900);
+                            int i3 = R.id.active_subscriptions_bottom_button;
+                            MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(R.id.active_subscriptions_bottom_button);
                             if (materialButton != null) {
-                                i3 = 2131364509;
-                                View findViewById4 = findViewById3.findViewById(2131364509);
+                                i3 = R.id.premium_settings_billing_divider;
+                                View findViewById4 = findViewById3.findViewById(R.id.premium_settings_billing_divider);
                                 if (findViewById4 != null) {
-                                    i3 = 2131364510;
-                                    TextView textView = (TextView) findViewById3.findViewById(2131364510);
+                                    i3 = R.id.premium_settings_billing_information;
+                                    TextView textView = (TextView) findViewById3.findViewById(R.id.premium_settings_billing_information);
                                     if (textView != null) {
-                                        i3 = 2131364513;
-                                        TextView textView2 = (TextView) findViewById3.findViewById(2131364513);
+                                        i3 = R.id.premium_settings_google_play_manage;
+                                        TextView textView2 = (TextView) findViewById3.findViewById(R.id.premium_settings_google_play_manage);
                                         if (textView2 != null) {
                                             LinearLayout linearLayout = (LinearLayout) findViewById3;
-                                            i3 = 2131364519;
-                                            TextView textView3 = (TextView) findViewById3.findViewById(2131364519);
+                                            i3 = R.id.premium_settings_payment_header;
+                                            TextView textView3 = (TextView) findViewById3.findViewById(R.id.premium_settings_payment_header);
                                             if (textView3 != null) {
                                                 j0 j0Var = new j0(linearLayout, materialButton, findViewById4, textView, textView2, linearLayout, textView3);
-                                                View findViewById5 = view.findViewById(2131364506);
+                                                View findViewById5 = view.findViewById(R.id.premium_perks);
                                                 if (findViewById5 != null) {
-                                                    int i4 = 2131363646;
-                                                    TextView textView4 = (TextView) findViewById5.findViewById(2131363646);
+                                                    int i4 = R.id.guild_subscription_perk;
+                                                    TextView textView4 = (TextView) findViewById5.findViewById(R.id.guild_subscription_perk);
                                                     if (textView4 != null) {
-                                                        i4 = 2131364023;
-                                                        TextView textView5 = (TextView) findViewById5.findViewById(2131364023);
+                                                        i4 = R.id.max_guilds_perk;
+                                                        TextView textView5 = (TextView) findViewById5.findViewById(R.id.max_guilds_perk);
                                                         if (textView5 != null) {
-                                                            i4 = 2131364024;
-                                                            TextView textView6 = (TextView) findViewById5.findViewById(2131364024);
+                                                            i4 = R.id.max_message_length_perk;
+                                                            TextView textView6 = (TextView) findViewById5.findViewById(R.id.max_message_length_perk);
                                                             if (textView6 != null) {
-                                                                i4 = 2131365635;
-                                                                TextView textView7 = (TextView) findViewById5.findViewById(2131365635);
+                                                                i4 = R.id.upload_size_perk;
+                                                                TextView textView7 = (TextView) findViewById5.findViewById(R.id.upload_size_perk);
                                                                 if (textView7 != null) {
                                                                     s2 s2Var = new s2((LinearLayout) findViewById5, textView4, textView5, textView6, textView7);
-                                                                    ActiveSubscriptionView activeSubscriptionView = (ActiveSubscriptionView) view.findViewById(2131364507);
+                                                                    ActiveSubscriptionView activeSubscriptionView = (ActiveSubscriptionView) view.findViewById(R.id.premium_settings_active_guild_subscription);
                                                                     if (activeSubscriptionView != null) {
-                                                                        ActiveSubscriptionView activeSubscriptionView2 = (ActiveSubscriptionView) view.findViewById(2131364508);
+                                                                        ActiveSubscriptionView activeSubscriptionView2 = (ActiveSubscriptionView) view.findViewById(R.id.premium_settings_active_subscription);
                                                                         if (activeSubscriptionView2 != null) {
-                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364511);
+                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.premium_settings_credit_container);
                                                                             if (linearLayout2 != null) {
-                                                                                TextView textView8 = (TextView) view.findViewById(2131364512);
+                                                                                TextView textView8 = (TextView) view.findViewById(R.id.premium_settings_credit_header);
                                                                                 if (textView8 != null) {
-                                                                                    TextView textView9 = (TextView) view.findViewById(2131364514);
+                                                                                    TextView textView9 = (TextView) view.findViewById(R.id.premium_settings_grandfathered);
                                                                                     if (textView9 != null) {
-                                                                                        TextView textView10 = (TextView) view.findViewById(2131364515);
+                                                                                        TextView textView10 = (TextView) view.findViewById(R.id.premium_settings_legalese);
                                                                                         if (textView10 != null) {
-                                                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364522);
+                                                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.premium_settings_retry);
                                                                                             if (materialButton2 != null) {
-                                                                                                ScrollView scrollView = (ScrollView) view.findViewById(2131364523);
+                                                                                                ScrollView scrollView = (ScrollView) view.findViewById(R.id.premium_settings_scrollview);
                                                                                                 if (scrollView != null) {
-                                                                                                    i2 = 2131364524;
-                                                                                                    Button button = (Button) view.findViewById(2131364524);
+                                                                                                    i2 = R.id.premium_settings_status_notice_button;
+                                                                                                    Button button = (Button) view.findViewById(R.id.premium_settings_status_notice_button);
                                                                                                     if (button != null) {
-                                                                                                        CardView cardView = (CardView) view.findViewById(2131364525);
+                                                                                                        CardView cardView = (CardView) view.findViewById(R.id.premium_settings_status_notice_container);
                                                                                                         if (cardView != null) {
-                                                                                                            i2 = 2131364526;
-                                                                                                            TextView textView11 = (TextView) view.findViewById(2131364526);
+                                                                                                            i2 = R.id.premium_settings_status_notice_tv;
+                                                                                                            TextView textView11 = (TextView) view.findViewById(R.id.premium_settings_status_notice_tv);
                                                                                                             if (textView11 != null) {
-                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364527);
+                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.premium_settings_subscription_container);
                                                                                                                 if (linearLayout3 != null) {
-                                                                                                                    i2 = 2131364528;
-                                                                                                                    TextView textView12 = (TextView) view.findViewById(2131364528);
+                                                                                                                    i2 = R.id.premium_settings_subscriptions_header;
+                                                                                                                    TextView textView12 = (TextView) view.findViewById(R.id.premium_settings_subscriptions_header);
                                                                                                                     if (textView12 != null) {
-                                                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364529);
+                                                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.premium_settings_view_flipper);
                                                                                                                         if (appViewFlipper != null) {
-                                                                                                                            i2 = 2131364530;
-                                                                                                                            View findViewById6 = view.findViewById(2131364530);
+                                                                                                                            i2 = R.id.premium_tier_1;
+                                                                                                                            View findViewById6 = view.findViewById(R.id.premium_tier_1);
                                                                                                                             if (findViewById6 != null) {
-                                                                                                                                int i5 = 2131364521;
-                                                                                                                                MaterialButton materialButton3 = (MaterialButton) findViewById6.findViewById(2131364521);
+                                                                                                                                int i5 = R.id.premium_settings_premium_classic;
+                                                                                                                                MaterialButton materialButton3 = (MaterialButton) findViewById6.findViewById(R.id.premium_settings_premium_classic);
                                                                                                                                 if (materialButton3 != null) {
-                                                                                                                                    i5 = 2131365558;
-                                                                                                                                    TextView textView13 = (TextView) findViewById6.findViewById(2131365558);
+                                                                                                                                    i5 = R.id.tier_1_guild_subscription_perk;
+                                                                                                                                    TextView textView13 = (TextView) findViewById6.findViewById(R.id.tier_1_guild_subscription_perk);
                                                                                                                                     if (textView13 != null) {
-                                                                                                                                        i5 = 2131365557;
-                                                                                                                                        TextView textView14 = (TextView) findViewById6.findViewById(2131365557);
+                                                                                                                                        i5 = R.id.tier1_upload_size_perk;
+                                                                                                                                        TextView textView14 = (TextView) findViewById6.findViewById(R.id.tier1_upload_size_perk);
                                                                                                                                         if (textView14 != null) {
                                                                                                                                             t2 t2Var = new t2((LinearLayout) findViewById6, materialButton3, textView13, textView14);
-                                                                                                                                            View findViewById7 = view.findViewById(2131364532);
+                                                                                                                                            View findViewById7 = view.findViewById(R.id.premium_tier_2);
                                                                                                                                             if (findViewById7 != null) {
-                                                                                                                                                int i6 = 2131364516;
-                                                                                                                                                ImageView imageView = (ImageView) findViewById7.findViewById(2131364516);
+                                                                                                                                                int i6 = R.id.premium_settings_nitro;
+                                                                                                                                                ImageView imageView = (ImageView) findViewById7.findViewById(R.id.premium_settings_nitro);
                                                                                                                                                 if (imageView != null) {
-                                                                                                                                                    i6 = 2131364517;
-                                                                                                                                                    ImageView imageView2 = (ImageView) findViewById7.findViewById(2131364517);
+                                                                                                                                                    i6 = R.id.premium_settings_nitro_wumpus;
+                                                                                                                                                    ImageView imageView2 = (ImageView) findViewById7.findViewById(R.id.premium_settings_nitro_wumpus);
                                                                                                                                                     if (imageView2 != null) {
-                                                                                                                                                        i6 = 2131364520;
-                                                                                                                                                        MaterialButton materialButton4 = (MaterialButton) findViewById7.findViewById(2131364520);
+                                                                                                                                                        i6 = R.id.premium_settings_premium;
+                                                                                                                                                        MaterialButton materialButton4 = (MaterialButton) findViewById7.findViewById(R.id.premium_settings_premium);
                                                                                                                                                         if (materialButton4 != null) {
                                                                                                                                                             return new WidgetSettingsPremiumBinding((CoordinatorLayout) view, xVar, j0Var, s2Var, activeSubscriptionView, activeSubscriptionView2, linearLayout2, textView8, textView9, textView10, materialButton2, scrollView, button, cardView, textView11, linearLayout3, textView12, appViewFlipper, t2Var, new u2((LinearLayout) findViewById7, imageView, imageView2, materialButton4));
                                                                                                                                                         }
@@ -137,45 +138,45 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
                                                                                                                                                 }
                                                                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i6)));
                                                                                                                                             }
-                                                                                                                                            i2 = 2131364532;
+                                                                                                                                            i2 = R.id.premium_tier_2;
                                                                                                                                         }
                                                                                                                                     }
                                                                                                                                 }
                                                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i5)));
                                                                                                                             }
                                                                                                                         } else {
-                                                                                                                            i2 = 2131364529;
+                                                                                                                            i2 = R.id.premium_settings_view_flipper;
                                                                                                                         }
                                                                                                                     }
                                                                                                                 } else {
-                                                                                                                    i2 = 2131364527;
+                                                                                                                    i2 = R.id.premium_settings_subscription_container;
                                                                                                                 }
                                                                                                             }
                                                                                                         } else {
-                                                                                                            i2 = 2131364525;
+                                                                                                            i2 = R.id.premium_settings_status_notice_container;
                                                                                                         }
                                                                                                     }
                                                                                                 } else {
-                                                                                                    i2 = 2131364523;
+                                                                                                    i2 = R.id.premium_settings_scrollview;
                                                                                                 }
                                                                                             } else {
-                                                                                                i2 = 2131364522;
+                                                                                                i2 = R.id.premium_settings_retry;
                                                                                             }
                                                                                         } else {
-                                                                                            i2 = 2131364515;
+                                                                                            i2 = R.id.premium_settings_legalese;
                                                                                         }
                                                                                     } else {
-                                                                                        i2 = 2131364514;
+                                                                                        i2 = R.id.premium_settings_grandfathered;
                                                                                     }
                                                                                 }
                                                                             } else {
-                                                                                i2 = 2131364511;
+                                                                                i2 = R.id.premium_settings_credit_container;
                                                                             }
                                                                         } else {
-                                                                            i2 = 2131364508;
+                                                                            i2 = R.id.premium_settings_active_subscription;
                                                                         }
                                                                     } else {
-                                                                        i2 = 2131364507;
+                                                                        i2 = R.id.premium_settings_active_guild_subscription;
                                                                     }
                                                                 }
                                                             }
@@ -183,7 +184,7 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
                                                     }
                                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(i4)));
                                                 }
-                                                i2 = 2131364506;
+                                                i2 = R.id.premium_perks;
                                             }
                                         }
                                     }
@@ -191,19 +192,19 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
                             }
                             throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i3)));
                         }
-                        i2 = 2131364390;
+                        i2 = R.id.payment;
                     } else {
-                        i = 2131362879;
+                        i = R.id.credit_nitro_divider;
                     }
                 } else {
-                    i = 2131362878;
+                    i = R.id.credit_nitro_classic;
                 }
             } else {
-                i = 2131362877;
+                i = R.id.credit_nitro;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(i)));
         }
-        i2 = 2131361860;
+        i2 = R.id.account_credits;
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i2)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java
index c6efa47d2b..e7f450863c 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java
@@ -26,6 +26,6 @@ public final class WidgetSettingsPremium$configureButtons$$inlined$forEach$lambd
         Context requireContext = this.this$0.requireContext();
         WidgetChoosePlan.ViewType viewType = m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1973s.b) ? WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_1 : WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_2;
         ModelSubscription modelSubscription = this.$premiumSubscription$inlined;
-        WidgetChoosePlan.Companion.launch$default(companion, requireContext, null, viewType, modelSubscription != null ? modelSubscription.getPaymentGatewayPlanId() : null, new Traits.Location("User Settings", WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), "Button CTA", "buy", null, 16, null), Traits.Subscription.Companion.withGatewayPlanId(m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1973s.b) ? GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName() : GooglePlaySku.PREMIUM_TIER_2_MONTHLY.getSkuName()), 2, null);
+        WidgetChoosePlan.Companion.launch$default(companion, requireContext, null, viewType, modelSubscription != null ? modelSubscription.getPaymentGatewayPlanId() : null, new Traits.Location(Traits.Location.Page.USER_SETTINGS, WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), Traits.Location.Obj.BUTTON_CTA, "buy", null, 16, null), Traits.Subscription.Companion.withGatewayPlanId(m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1973s.b) ? GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName() : GooglePlaySku.PREMIUM_TIER_2_MONTHLY.getSkuName()), 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumGuildSubscriptionViewCallbacks$3.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumGuildSubscriptionViewCallbacks$3.java
index 3107a934e3..c7894f09a3 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumGuildSubscriptionViewCallbacks$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumGuildSubscriptionViewCallbacks$3.java
@@ -20,6 +20,6 @@ public final class WidgetSettingsPremium$getPremiumGuildSubscriptionViewCallback
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        WidgetChoosePlan.Companion.launch$default(WidgetChoosePlan.Companion, this.this$0.requireContext(), null, WidgetChoosePlan.ViewType.SWITCH_PLANS, this.$skuName, new Traits.Location("User Settings", WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), "Button CTA", "buy", null, 16, null), null, 34, null);
+        WidgetChoosePlan.Companion.launch$default(WidgetChoosePlan.Companion, this.this$0.requireContext(), null, WidgetChoosePlan.ViewType.SWITCH_PLANS, this.$skuName, new Traits.Location(Traits.Location.Page.USER_SETTINGS, WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), Traits.Location.Obj.BUTTON_CTA, "buy", null, 16, null), null, 34, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$2.java
index 7ff5f29572..601c87c07f 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.premium;
 
+import com.discord.R;
 import com.discord.utilities.billing.GooglePlayBillingManager;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -17,7 +18,7 @@ public final class WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$man
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        c.a.e.o.i(this.this$0, 2131886893, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.billing_error_purchase, 0, 4);
         GooglePlayBillingManager.INSTANCE.queryPurchases();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$3.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$3.java
index 1ca1dbe746..65a3a48c20 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$managePlanCallback$3.java
@@ -21,6 +21,6 @@ public final class WidgetSettingsPremium$getPremiumSubscriptionViewCallbacks$man
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        WidgetChoosePlan.Companion.launch$default(WidgetChoosePlan.Companion, this.this$0.requireContext(), null, WidgetChoosePlan.ViewType.SWITCH_PLANS, this.$premiumSubscription.getPaymentGatewayPlanId(), new Traits.Location("User Settings", WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), "Button CTA", "buy", null, 16, null), null, 34, null);
+        WidgetChoosePlan.Companion.launch$default(WidgetChoosePlan.Companion, this.this$0.requireContext(), null, WidgetChoosePlan.ViewType.SWITCH_PLANS, this.$premiumSubscription.getPaymentGatewayPlanId(), new Traits.Location(Traits.Location.Page.USER_SETTINGS, WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), Traits.Location.Obj.BUTTON_CTA, "buy", null, 16, null), null, 34, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java
index 77fdf21a5c..ead972888e 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.settings.premium;
 
 import c.a.l.b;
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -26,7 +27,7 @@ public final class WidgetSettingsPremium$onViewBound$1 extends o implements Func
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.a.put("maxUploadStandard", b.k(this.this$0, 2131888546, new Object[0], null, 4).toString());
-        renderContext.a.put("maxUploadPremium", b.k(this.this$0, 2131888544, new Object[0], null, 4).toString());
+        renderContext.a.put("maxUploadStandard", b.k(this.this$0, R.string.file_upload_limit_standard, new Object[0], null, 4).toString());
+        renderContext.a.put("maxUploadPremium", b.k(this.this$0, R.string.file_upload_limit_premium_tier_2, new Object[0], null, 4).toString());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$2.java
index c2075deb0b..7bb4844c6c 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.settings.premium;
 
 import c.a.l.b;
+import com.discord.R;
 import com.discord.i18n.RenderContext;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -26,7 +27,7 @@ public final class WidgetSettingsPremium$onViewBound$2 extends o implements Func
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.a.put("maxUploadStandard", b.k(this.this$0, 2131888546, new Object[0], null, 4).toString());
-        renderContext.a.put("maxUploadPremium", b.k(this.this$0, 2131888543, new Object[0], null, 4).toString());
+        renderContext.a.put("maxUploadStandard", b.k(this.this$0, R.string.file_upload_limit_standard, new Object[0], null, 4).toString());
+        renderContext.a.put("maxUploadPremium", b.k(this.this$0, R.string.file_upload_limit_premium_tier_1, new Object[0], null, 4).toString());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$6.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$6.java
index 066b27eb6a..d1def75105 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$6.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$6.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.settings.premium;
 
 import com.discord.i18n.RenderContext;
+import com.discord.utilities.rest.SendUtils;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.text.NumberFormat;
@@ -32,7 +33,7 @@ public final class WidgetSettingsPremium$onViewBound$6 extends o implements Func
         m.checkNotNullExpressionValue(format, "numberFormat.format(Send…_MESSAGE_CHARACTER_COUNT)");
         map.put("nonPremiumMaxMessageLength", format);
         Map<String, String> map2 = renderContext.a;
-        String format2 = this.$numberFormat.format((Object) 4000);
+        String format2 = this.$numberFormat.format(Integer.valueOf((int) SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM));
         m.checkNotNullExpressionValue(format2, "numberFormat.format(Send…_CHARACTER_COUNT_PREMIUM)");
         map2.put("premiumMaxMessageLength", format2);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
index 5226ed4794..c93c721cc4 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
@@ -26,6 +26,7 @@ import c.a.l.b;
 import c.d.b.a.a;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.SkuDetails;
+import com.discord.R;
 import com.discord.api.premium.SubscriptionInterval;
 import com.discord.api.premium.SubscriptionPlan;
 import com.discord.app.AppFragment;
@@ -239,7 +240,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         public final void launch(Context context, Integer num, String str) {
             m.checkNotNullParameter(context, "context");
             StoreStream.Companion.getAnalytics().onUserSettingsPaneViewed("Discord Nitro", str);
-            l.d(context, WidgetSettingsPremium.class, new Intent().putExtra("intent_section", num).putExtra("analytics_location_section", str));
+            l.d(context, WidgetSettingsPremium.class, new Intent().putExtra(WidgetSettingsPremium.INTENT_SCROLL_TO_SECTION, num).putExtra(WidgetSettingsPremium.ANALYTICS_LOCATION_SECTION, str));
         }
     }
 
@@ -292,7 +293,7 @@ public final class WidgetSettingsPremium extends AppFragment {
     }
 
     public WidgetSettingsPremium() {
-        super(2131559274);
+        super(R.layout.widget_settings_premium);
         WidgetSettingsPremium$viewModel$2 widgetSettingsPremium$viewModel$2 = WidgetSettingsPremium$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsPremiumViewModel.class), new WidgetSettingsPremium$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsPremium$viewModel$2));
@@ -597,9 +598,9 @@ public final class WidgetSettingsPremium extends AppFragment {
         if (planType != null) {
             int ordinal = planType.ordinal();
             if (ordinal == 2) {
-                charSequence = b.k(this, 2131892325, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_MONTHLY_END_DATE())}, null, 4);
+                charSequence = b.k(this, R.string.premium_grandfathered_monthly, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_MONTHLY_END_DATE())}, null, 4);
             } else if (ordinal == 3) {
-                charSequence = b.k(this, 2131892335, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_YEARLY_END_DATE())}, null, 4);
+                charSequence = b.k(this, R.string.premium_grandfathered_yearly, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_YEARLY_END_DATE())}, null, 4);
             }
         }
         TextView textView = getBinding().i;
@@ -620,9 +621,9 @@ public final class WidgetSettingsPremium extends AppFragment {
         }
         int ordinal = premiumSubscription.getPlanType().getInterval().ordinal();
         if (ordinal == 0) {
-            i = 2131886931;
+            i = R.string.billing_payment_premium_legalese_monthly;
         } else if (ordinal == 1) {
-            i = 2131886932;
+            i = R.string.billing_payment_premium_legalese_yearly;
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -635,7 +636,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         textView2.setVisibility(0);
         TextView textView3 = getBinding().j;
         m.checkNotNullExpressionValue(textView3, "binding.premiumSettingsLegalese");
-        b.n(textView3, i, new Object[]{b.k(this, 2131894243, new Object[0], null, 4), b.k(this, 2131892756, new Object[0], null, 4), googleSubscriptionRenewalPrice}, null, 4);
+        b.n(textView3, i, new Object[]{b.k(this, R.string.terms_of_service_url, new Object[0], null, 4), b.k(this, R.string.privacy_policy_url, new Object[0], null, 4), googleSubscriptionRenewalPrice}, null, 4);
         TextView textView4 = getBinding().j;
         m.checkNotNullExpressionValue(textView4, "binding.premiumSettingsLegalese");
         textView4.setMovementMethod(LinkMovementMethod.getInstance());
@@ -681,15 +682,15 @@ public final class WidgetSettingsPremium extends AppFragment {
             if (isGoogleSubscription && a != null) {
                 obj2 = a;
             } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM) {
-                obj2 = b.k(this, 2131892678, new Object[0], null, 4);
+                obj2 = b.k(this, R.string.premium_tier_2, new Object[0], null, 4);
             } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_CLASSIC) {
-                obj2 = b.k(this, 2131892675, new Object[0], null, 4);
+                obj2 = b.k(this, R.string.premium_tier_1, new Object[0], null, 4);
             } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_GUILD) {
-                obj2 = b.k(this, 2131892488, new Object[0], null, 4);
+                obj2 = b.k(this, R.string.premium_guild_subscription_title, new Object[0], null, 4);
             }
         }
         if (isAppleSubscription) {
-            charSequence = b.k(this, 2131886920, new Object[0], null, 4);
+            charSequence = b.k(this, R.string.billing_managed_by_apple, new Object[0], null, 4);
         } else {
             if (premiumSubscription != null) {
                 int ordinal3 = premiumSubscription.getStatus().ordinal();
@@ -701,13 +702,13 @@ public final class WidgetSettingsPremium extends AppFragment {
                         googleSubscriptionRenewalPrice = PremiumUtilsKt.getFormattedPriceUsd(renewalInvoicePreview != null ? renewalInvoicePreview.getTotal() : 0, requireContext());
                     }
                     objArr[1] = googleSubscriptionRenewalPrice;
-                    charSequence = b.k(this, 2131892622, objArr, null, 4);
+                    charSequence = b.k(this, R.string.premium_settings_renewal_info, objArr, null, 4);
                 } else if (ordinal3 == 2) {
-                    charSequence = b.k(this, 2131892619, new Object[]{obj2, obj}, null, 4);
+                    charSequence = b.k(this, R.string.premium_settings_past_due_info, new Object[]{obj2, obj}, null, 4);
                 } else if (ordinal3 == 3) {
-                    charSequence = b.k(this, 2131892616, new Object[]{obj}, null, 4);
+                    charSequence = b.k(this, R.string.premium_settings_cancelled_info, new Object[]{obj}, null, 4);
                 } else if (ordinal3 == 4) {
-                    charSequence = b.k(this, 2131892610, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, premiumSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null)}, null, 4);
+                    charSequence = b.k(this, R.string.premium_settings_account_hold_info, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, premiumSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null)}, null, 4);
                 }
             }
             charSequence = null;
@@ -726,7 +727,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         MaterialButton materialButton = getBinding().f1972c.b;
         m.checkNotNullExpressionValue(materialButton, "binding.payment.activeSubscriptionsBottomButton");
         if (isAppleSubscription) {
-            charSequence2 = b.k(this, 2131886919, new Object[0], null, 4);
+            charSequence2 = b.k(this, R.string.billing_manage_subscription, new Object[0], null, 4);
         }
         ViewExtensions.setTextAndVisibilityBy(materialButton, charSequence2);
         getBinding().f1972c.b.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$1(isAppleSubscription));
@@ -789,7 +790,7 @@ public final class WidgetSettingsPremium extends AppFragment {
                             charSequence3 = skuDetails.a();
                             m.checkNotNullExpressionValue(charSequence3, "skuDetails.description");
                         }
-                        charSequence = b.k(this, 2131892574, new Object[]{charSequence3, renderUtcDate$default}, null, 4);
+                        charSequence = b.k(this, R.string.premium_pending_plan_change_notice, new Object[]{charSequence3, renderUtcDate$default}, null, 4);
                     } else if (isAccountHold) {
                         String paymentGatewayPlanId2 = modelSubscription.getPaymentGatewayPlanId();
                         if (paymentGatewayPlanId2 != null) {
@@ -812,7 +813,7 @@ public final class WidgetSettingsPremium extends AppFragment {
                             i3++;
                         }
                         charSequence2 = getPlanString(subscriptionPlanType);
-                        charSequence = b.k(this, 2131892614, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null), charSequence2}, null, 4);
+                        charSequence = b.k(this, R.string.premium_settings_account_hold_notice_info, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null), charSequence2}, null, 4);
                     } else {
                         charSequence = "";
                     }
@@ -828,7 +829,7 @@ public final class WidgetSettingsPremium extends AppFragment {
                     if (isAccountHold) {
                         Button button2 = getBinding().m;
                         m.checkNotNullExpressionValue(button2, "binding.premiumSettingsStatusNoticeButton");
-                        b.n(button2, 2131892613, new Object[0], null, 4);
+                        b.n(button2, R.string.premium_settings_account_hold_notice_change_payment_method_button, new Object[0], null, 4);
                         getBinding().m.setOnClickListener(new WidgetSettingsPremium$configureStatusNotice$1(this, modelSubscription));
                         return;
                     }
@@ -848,7 +849,7 @@ public final class WidgetSettingsPremium extends AppFragment {
     private final String getAnalyticsLocationSection() {
         String string;
         Bundle extras = getMostRecentIntent().getExtras();
-        return (extras == null || (string = extras.getString("analytics_location_section")) == null) ? "Discord Nitro" : string;
+        return (extras == null || (string = extras.getString(ANALYTICS_LOCATION_SECTION)) == null) ? "Discord Nitro" : string;
     }
 
     private final WidgetSettingsPremiumBinding getBinding() {
@@ -875,16 +876,16 @@ public final class WidgetSettingsPremium extends AppFragment {
         if (subscriptionPlanType != null) {
             int ordinal = subscriptionPlanType.ordinal();
             if (ordinal == 4) {
-                return b.k(this, 2131892587, new Object[0], null, 4);
+                return b.k(this, R.string.premium_plan_month_tier_1, new Object[0], null, 4);
             }
             if (ordinal == 5) {
-                return b.k(this, 2131892591, new Object[0], null, 4);
+                return b.k(this, R.string.premium_plan_year_tier_1, new Object[0], null, 4);
             }
             if (ordinal == 6) {
-                return b.k(this, 2131892588, new Object[0], null, 4);
+                return b.k(this, R.string.premium_plan_month_tier_2, new Object[0], null, 4);
             }
             if (ordinal == 7) {
-                return b.k(this, 2131892592, new Object[0], null, 4);
+                return b.k(this, R.string.premium_plan_year_tier_2, new Object[0], null, 4);
             }
         }
         return "";
@@ -920,7 +921,7 @@ public final class WidgetSettingsPremium extends AppFragment {
     }
 
     private final CharSequence getPriceText(SkuDetails skuDetails) {
-        return skuDetails != null ? b.k(this, 2131892626, new Object[]{skuDetails.b()}, null, 4) : b.k(this, 2131894039, new Object[0], null, 4);
+        return skuDetails != null ? b.k(this, R.string.premium_settings_starting_at_per_month, new Object[]{skuDetails.b()}, null, 4) : b.k(this, R.string.stream_premium_upsell_cta, new Object[0], null, 4);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0056: APUT  
@@ -935,7 +936,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         SkuDetails skuDetails;
         SubscriptionPlanType planType;
         boolean isGoogleSubscription = modelSubscription != null ? modelSubscription.isGoogleSubscription() : false;
-        int i = (modelSubscription == null || (planType = modelSubscription.getPlanType()) == null) ? false : planType.isMonthlyInterval() ? 2131886953 : 2131886959;
+        int i = (modelSubscription == null || (planType = modelSubscription.getPlanType()) == null) ? false : planType.isMonthlyInterval() ? R.string.billing_price_per_month : R.string.billing_price_per_year;
         String b = (modelSubscription == null || (skuDetails = (SkuDetails) map.get(modelSubscription.getPaymentGatewayPlanId())) == null) ? null : skuDetails.b();
         if (isGoogleSubscription && b != null) {
             return b.k(this, i, new Object[]{b}, null, 4);
@@ -986,7 +987,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this, 2131892277, new Object[0], null, 4), b.k(this, 2131892269, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.k(this, 2131892276, new Object[0], null, 4), b.k(this, 2131891657, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364252, new WidgetSettingsPremium$showCancelConfirmationAlert$1(settingsPremiumViewModel))), null, null, null, 2130969796, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this, R.string.premium_cancel_confirm_header, new Object[0], null, 4), b.k(this, R.string.premium_cancel_confirm_body, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.k(this, R.string.premium_cancel_confirm_button, new Object[0], null, 4), b.k(this, R.string.nevermind, new Object[0], null, 4), g0.mapOf(d0.o.to(Integer.valueOf((int) R.id.notice_ok), new WidgetSettingsPremium$showCancelConfirmationAlert$1(settingsPremiumViewModel))), null, null, null, Integer.valueOf((int) R.attr.notice_theme_positive_red), null, null, 0, null, 15808, null);
     }
 
     private final void showContent(SettingsPremiumViewModel.ViewState.Loaded loaded) {
@@ -1008,7 +1009,7 @@ public final class WidgetSettingsPremium extends AppFragment {
             configurePaymentInfo(loaded);
             configureStatusNotice(loaded.getPremiumSubscription(), loaded.getSkuDetails());
             Bundle extras = getMostRecentIntent().getExtras();
-            Integer valueOf3 = extras != null ? Integer.valueOf(extras.getInt("intent_section", -1)) : null;
+            Integer valueOf3 = extras != null ? Integer.valueOf(extras.getInt(INTENT_SCROLL_TO_SECTION, -1)) : null;
             if (valueOf3 == null || valueOf3.intValue() != -1) {
                 try {
                     Observable<Long> d02 = Observable.d0(300, TimeUnit.MILLISECONDS);
@@ -1017,7 +1018,7 @@ public final class WidgetSettingsPremium extends AppFragment {
                 } catch (Exception e) {
                     Logger.e$default(AppLog.g, "Error Scrolling to section", e, null, 4, null);
                 }
-                getMostRecentIntent().removeExtra("intent_section");
+                getMostRecentIntent().removeExtra(INTENT_SCROLL_TO_SECTION);
                 return;
             }
             return;
@@ -1039,7 +1040,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this, 2131886919, new Object[0], null, 4), b.k(this, 2131892529, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.k(this, 2131892444, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.k(this, R.string.billing_manage_subscription, new Object[0], null, 4), b.k(this, R.string.premium_manage_via_desktop, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.k(this, R.string.premium_guild_subscription_header_subscribe_tooltip_close, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showFailureUI() {
@@ -1060,28 +1061,28 @@ public final class WidgetSettingsPremium extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131892684);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.premium_title);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextView textView = getBinding().d.e;
         m.checkNotNullExpressionValue(textView, "binding.premiumPerks.uploadSizePerk");
-        textView.setText(b.d(view, 2131892585, new Object[0], new WidgetSettingsPremium$onViewBound$1(this)));
+        textView.setText(b.d(view, R.string.premium_perks_upload_size, new Object[0], new WidgetSettingsPremium$onViewBound$1(this)));
         TextView textView2 = getBinding().f1973s.d;
         m.checkNotNullExpressionValue(textView2, "binding.premiumTier1.tier1UploadSizePerk");
-        textView2.setText(b.d(view, 2131892585, new Object[0], new WidgetSettingsPremium$onViewBound$2(this)));
+        textView2.setText(b.d(view, R.string.premium_perks_upload_size, new Object[0], new WidgetSettingsPremium$onViewBound$2(this)));
         TextView textView3 = getBinding().d.b;
         m.checkNotNullExpressionValue(textView3, "binding.premiumPerks.guildSubscriptionPerk");
-        textView3.setText(b.d(view, 2131892581, new Object[0], WidgetSettingsPremium$onViewBound$3.INSTANCE));
+        textView3.setText(b.d(view, R.string.premium_perks_tier_2_guild_subscription, new Object[0], WidgetSettingsPremium$onViewBound$3.INSTANCE));
         TextView textView4 = getBinding().f1973s.f165c;
         m.checkNotNullExpressionValue(textView4, "binding.premiumTier1.tier1GuildSubscriptionPerk");
-        textView4.setText(b.d(view, 2131892577, new Object[0], WidgetSettingsPremium$onViewBound$4.INSTANCE));
+        textView4.setText(b.d(view, R.string.premium_perks_tier_1_guild_subscription, new Object[0], WidgetSettingsPremium$onViewBound$4.INSTANCE));
         NumberFormat instance = NumberFormat.getInstance(this.localeManager.getPrimaryLocale(requireContext()));
         TextView textView5 = getBinding().d.f160c;
         m.checkNotNullExpressionValue(textView5, "binding.premiumPerks.maxGuildsPerk");
-        textView5.setText(b.d(view, 2131892582, new Object[0], new WidgetSettingsPremium$onViewBound$5(instance)));
+        textView5.setText(b.d(view, R.string.premium_perks_tier_2_max_guilds, new Object[0], new WidgetSettingsPremium$onViewBound$5(instance)));
         TextView textView6 = getBinding().d.d;
         m.checkNotNullExpressionValue(textView6, "binding.premiumPerks.maxMessageLengthPerk");
-        textView6.setText(b.e(this, 2131892298, new Object[0], new WidgetSettingsPremium$onViewBound$6(instance)));
+        textView6.setText(b.e(this, R.string.premium_chat_perks_max_message_length, new Object[0], new WidgetSettingsPremium$onViewBound$6(instance)));
         configureButtonText$default(this, null, 1, null);
         for (TextView textView7 : n.listOf((Object[]) new TextView[]{getBinding().q, getBinding().h, getBinding().f1972c.g})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java
index 7625bffa7c..a612354af3 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ViewSettingsBoostedSampleGuildBinding;
 import com.discord.models.guild.Guild;
 import com.discord.utilities.icon.IconUtils;
@@ -32,20 +33,20 @@ public final class SettingsPremiumGuildSubscriptionSampleGuildAdapter extends MG
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GuildListItem(SettingsPremiumGuildSubscriptionSampleGuildAdapter settingsPremiumGuildSubscriptionSampleGuildAdapter) {
-            super(2131558836, settingsPremiumGuildSubscriptionSampleGuildAdapter);
+            super((int) R.layout.view_settings_boosted_sample_guild, settingsPremiumGuildSubscriptionSampleGuildAdapter);
             m.checkNotNullParameter(settingsPremiumGuildSubscriptionSampleGuildAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362175;
-            TextView textView = (TextView) view.findViewById(2131362175);
+            int i = R.id.boosted_sample_guild_count;
+            TextView textView = (TextView) view.findViewById(R.id.boosted_sample_guild_count);
             if (textView != null) {
-                i = 2131362176;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362176);
+                i = R.id.boosted_sample_guild_icon;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.boosted_sample_guild_icon);
                 if (simpleDraweeView != null) {
-                    i = 2131362177;
-                    TextView textView2 = (TextView) view.findViewById(2131362177);
+                    i = R.id.boosted_sample_guild_name;
+                    TextView textView2 = (TextView) view.findViewById(R.id.boosted_sample_guild_name);
                     if (textView2 != null) {
-                        i = 2131362178;
-                        PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(2131362178);
+                        i = R.id.boosted_sample_guild_progress;
+                        PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(R.id.boosted_sample_guild_progress);
                         if (premiumGuildProgressView != null) {
                             ViewSettingsBoostedSampleGuildBinding viewSettingsBoostedSampleGuildBinding = new ViewSettingsBoostedSampleGuildBinding((CardView) view, textView, simpleDraweeView, textView2, premiumGuildProgressView);
                             m.checkNotNullExpressionValue(viewSettingsBoostedSampleGuildBinding, "ViewSettingsBoostedSampl…ildBinding.bind(itemView)");
@@ -74,7 +75,7 @@ public final class SettingsPremiumGuildSubscriptionSampleGuildAdapter extends MG
             textView.setText(item.getGuild().getName());
             TextView textView2 = this.binding.b;
             m.checkNotNullExpressionValue(textView2, "binding.boostedSampleGuildCount");
-            textView2.setText(StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755271, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
+            textView2.setText(StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.premium_guild_subscription_available_numSubscriptions, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
             this.binding.e.a(item.getGuild().getPremiumTier(), premiumSubscriptionCount);
             this.itemView.setOnClickListener(new SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem$onConfigure$1(this, item));
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
index 5794eba098..58226daa64 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
@@ -4,6 +4,7 @@ import a0.a.a.b;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.premium.PremiumTier;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelPremiumGuildSubscription;
@@ -723,7 +724,7 @@ public final class SettingsPremiumGuildViewModel extends AppViewModel<ViewState>
             }
         }
         if (!hashMap.isEmpty()) {
-            arrayList.add(new WidgetSettingsPremiumGuildSubscriptionAdapter.Item.HeaderItem(2131892415));
+            arrayList.add(new WidgetSettingsPremiumGuildSubscriptionAdapter.Item.HeaderItem(R.string.premium_guild_subscription_active_title));
         }
         for (Map.Entry entry : hashMap.entrySet()) {
             Long l2 = (Long) entry.getKey();
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java
index b6dae4bd10..df078f576e 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java
@@ -8,6 +8,7 @@ import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.n3;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsBoostBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -27,42 +28,42 @@ public final /* synthetic */ class WidgetSettingsPremiumGuildSubscription$bindin
 
     public final WidgetSettingsBoostBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364234;
-        View findViewById = view.findViewById(2131364234);
+        int i = R.id.no_guilds;
+        View findViewById = view.findViewById(R.id.no_guilds);
         if (findViewById != null) {
-            int i2 = 2131365056;
-            ImageView imageView = (ImageView) findViewById.findViewById(2131365056);
+            int i2 = R.id.settings_boost_no_guilds_image;
+            ImageView imageView = (ImageView) findViewById.findViewById(R.id.settings_boost_no_guilds_image);
             if (imageView != null) {
-                i2 = 2131365057;
-                TextView textView = (TextView) findViewById.findViewById(2131365057);
+                i2 = R.id.settings_boost_no_guilds_subtitle;
+                TextView textView = (TextView) findViewById.findViewById(R.id.settings_boost_no_guilds_subtitle);
                 if (textView != null) {
-                    i2 = 2131365058;
-                    TextView textView2 = (TextView) findViewById.findViewById(2131365058);
+                    i2 = R.id.settings_boost_no_guilds_title;
+                    TextView textView2 = (TextView) findViewById.findViewById(R.id.settings_boost_no_guilds_title);
                     if (textView2 != null) {
                         n3 n3Var = new n3((LinearLayoutCompat) findViewById, imageView, textView, textView2);
-                        i = 2131365054;
-                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365054);
+                        i = R.id.settings_boost_flipper;
+                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.settings_boost_flipper);
                         if (appViewFlipper != null) {
-                            i = 2131365055;
-                            PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131365055);
+                            i = R.id.settings_boost_marketing_view;
+                            PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(R.id.settings_boost_marketing_view);
                             if (premiumSubscriptionMarketingView != null) {
-                                i = 2131365059;
-                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365059);
+                                i = R.id.settings_boost_recycler;
+                                RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.settings_boost_recycler);
                                 if (recyclerView != null) {
-                                    i = 2131365060;
-                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365060);
+                                    i = R.id.settings_boost_retry;
+                                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.settings_boost_retry);
                                     if (materialButton != null) {
-                                        i = 2131365061;
-                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131365061);
+                                        i = R.id.settings_boost_sample_guilds;
+                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.settings_boost_sample_guilds);
                                         if (recyclerView2 != null) {
-                                            i = 2131365062;
-                                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365062);
+                                            i = R.id.settings_boost_subtext;
+                                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.settings_boost_subtext);
                                             if (linkifiedTextView != null) {
-                                                i = 2131365063;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365063);
+                                                i = R.id.settings_boost_subtext_container;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.settings_boost_subtext_container);
                                                 if (linearLayout != null) {
-                                                    i = 2131365064;
-                                                    PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131365064);
+                                                    i = R.id.settings_boost_upsell_view;
+                                                    PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(R.id.settings_boost_upsell_view);
                                                     if (premiumGuildSubscriptionUpsellView != null) {
                                                         return new WidgetSettingsBoostBinding((CoordinatorLayout) view, n3Var, appViewFlipper, premiumSubscriptionMarketingView, recyclerView, materialButton, recyclerView2, linkifiedTextView, linearLayout, premiumGuildSubscriptionUpsellView);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
index fd0df7ab8a..cca822fb46 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
@@ -18,6 +18,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsBoostBinding;
@@ -69,7 +70,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
     }
 
     public WidgetSettingsPremiumGuildSubscription() {
-        super(2131559254);
+        super(R.layout.widget_settings_boost);
         WidgetSettingsPremiumGuildSubscription$viewModel$2 widgetSettingsPremiumGuildSubscription$viewModel$2 = WidgetSettingsPremiumGuildSubscription$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsPremiumGuildViewModel.class), new WidgetSettingsPremiumGuildSubscription$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsPremiumGuildSubscription$viewModel$2));
@@ -217,8 +218,8 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131892488);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.premium_guild_subscription_title);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().e;
         m.checkNotNullExpressionValue(recyclerView, "binding.settingsBoostRecycler");
@@ -229,7 +230,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
         String a = f.a.a(360028038352L, null);
         LinkifiedTextView linkifiedTextView = getBinding().h;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsBoostSubtext");
-        c.a.l.b.n(linkifiedTextView, 2131892487, new Object[]{a}, null, 4);
+        c.a.l.b.n(linkifiedTextView, R.string.premium_guild_subscription_subtitle_mobile_2, new Object[]{a}, null, 4);
         getBinding().h.setOnClickListener(new WidgetSettingsPremiumGuildSubscription$onViewBound$1(a));
         getBinding().f.setOnClickListener(new WidgetSettingsPremiumGuildSubscription$onViewBound$2(this));
         getBinding().e.setHasFixedSize(false);
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java
index 0f6e538571..8d3386d20b 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java
@@ -15,12 +15,14 @@ import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ViewSettingsBoostedBoostListitemBinding;
 import com.discord.databinding.ViewSettingsBoostedGuildListitemBinding;
 import com.discord.databinding.ViewSettingsBoostedHeaderListitemBinding;
 import com.discord.models.domain.ModelPremiumGuildSubscription;
 import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot;
 import com.discord.models.guild.Guild;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -55,26 +57,26 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GuildListItem(WidgetSettingsPremiumGuildSubscriptionAdapter widgetSettingsPremiumGuildSubscriptionAdapter) {
-            super(2131558834, widgetSettingsPremiumGuildSubscriptionAdapter);
+            super((int) R.layout.view_settings_boosted_guild_listitem, widgetSettingsPremiumGuildSubscriptionAdapter);
             m.checkNotNullParameter(widgetSettingsPremiumGuildSubscriptionAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362171;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362171);
+            int i = R.id.boosted_guild_banner;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.boosted_guild_banner);
             if (simpleDraweeView != null) {
-                i = 2131362172;
-                View findViewById = view.findViewById(2131362172);
+                i = R.id.boosted_guild_gradient;
+                View findViewById = view.findViewById(R.id.boosted_guild_gradient);
                 if (findViewById != null) {
-                    i = 2131362173;
-                    PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(2131362173);
+                    i = R.id.boosted_guild_progress_view;
+                    PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(R.id.boosted_guild_progress_view);
                     if (premiumGuildProgressView != null) {
-                        i = 2131362175;
-                        TextView textView = (TextView) view.findViewById(2131362175);
+                        i = R.id.boosted_sample_guild_count;
+                        TextView textView = (TextView) view.findViewById(R.id.boosted_sample_guild_count);
                         if (textView != null) {
-                            i = 2131362176;
-                            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362176);
+                            i = R.id.boosted_sample_guild_icon;
+                            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(R.id.boosted_sample_guild_icon);
                             if (simpleDraweeView2 != null) {
-                                i = 2131362177;
-                                TextView textView2 = (TextView) view.findViewById(2131362177);
+                                i = R.id.boosted_sample_guild_name;
+                                TextView textView2 = (TextView) view.findViewById(R.id.boosted_sample_guild_name);
                                 if (textView2 != null) {
                                     ViewSettingsBoostedGuildListitemBinding viewSettingsBoostedGuildListitemBinding = new ViewSettingsBoostedGuildListitemBinding((LinearLayout) view, simpleDraweeView, findViewById, premiumGuildProgressView, textView, simpleDraweeView2, textView2);
                                     m.checkNotNullExpressionValue(viewSettingsBoostedGuildListitemBinding, "ViewSettingsBoostedGuild…temBinding.bind(itemView)");
@@ -103,14 +105,14 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                         IconUtils iconUtils = IconUtils.INSTANCE;
                         Guild guild = guildItem.getGuild();
                         m.checkNotNullExpressionValue(context, "context");
-                        simpleDraweeView.setImageURI(iconUtils.getBannerForGuild(guild, Integer.valueOf(context.getResources().getDimensionPixelSize(2131165685))));
+                        simpleDraweeView.setImageURI(iconUtils.getBannerForGuild(guild, Integer.valueOf(context.getResources().getDimensionPixelSize(R.dimen.nav_panel_width))));
                         View view2 = this.binding.f1673c;
                         m.checkNotNullExpressionValue(view2, "binding.boostedGuildGradient");
                         view2.setVisibility(0);
                     } else {
                         SimpleDraweeView simpleDraweeView2 = this.binding.b;
                         m.checkNotNullExpressionValue(context, "context");
-                        simpleDraweeView2.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130968718, 0, 2, (Object) null));
+                        simpleDraweeView2.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.bg_subscription_placeholder_pattern, 0, 2, (Object) null));
                         View view3 = this.binding.f1673c;
                         m.checkNotNullExpressionValue(view3, "binding.boostedGuildGradient");
                         view3.setVisibility(8);
@@ -121,10 +123,10 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                     TextView textView = this.binding.g;
                     m.checkNotNullExpressionValue(textView, "binding.boostedSampleGuildName");
                     textView.setText(guildItem.getGuild().getName());
-                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755279, guildItem.getSubscriptionCount(), Integer.valueOf(guildItem.getSubscriptionCount()));
+                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, R.plurals.premium_guild_subscription_guild_subsription_subtitle_numSubscriptions, guildItem.getSubscriptionCount(), Integer.valueOf(guildItem.getSubscriptionCount()));
                     TextView textView2 = this.binding.e;
                     m.checkNotNullExpressionValue(textView2, "binding.boostedSampleGuildCount");
-                    textView2.setText(b.h(context, 2131892443, new Object[]{i18nPluralString}, null, 4));
+                    textView2.setText(b.h(context, R.string.premium_guild_subscription_guild_subsription_subtitle, new Object[]{i18nPluralString}, null, 4));
                     this.binding.d.a(guildItem.getGuild().getPremiumTier(), guildItem.getGuild().getPremiumSubscriptionCount());
                     return;
                 }
@@ -139,7 +141,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderListItem(WidgetSettingsPremiumGuildSubscriptionAdapter widgetSettingsPremiumGuildSubscriptionAdapter) {
-            super(2131558835, widgetSettingsPremiumGuildSubscriptionAdapter);
+            super((int) R.layout.view_settings_boosted_header_listitem, widgetSettingsPremiumGuildSubscriptionAdapter);
             m.checkNotNullParameter(widgetSettingsPremiumGuildSubscriptionAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -419,20 +421,20 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PremiumGuildSubListItem(WidgetSettingsPremiumGuildSubscriptionAdapter widgetSettingsPremiumGuildSubscriptionAdapter) {
-            super(2131558833, widgetSettingsPremiumGuildSubscriptionAdapter);
+            super((int) R.layout.view_settings_boosted_boost_listitem, widgetSettingsPremiumGuildSubscriptionAdapter);
             m.checkNotNullParameter(widgetSettingsPremiumGuildSubscriptionAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362167;
-            TextView textView = (TextView) view.findViewById(2131362167);
+            int i = R.id.boosted_boost_action;
+            TextView textView = (TextView) view.findViewById(R.id.boosted_boost_action);
             if (textView != null) {
-                i = 2131362168;
-                ImageView imageView = (ImageView) view.findViewById(2131362168);
+                i = R.id.boosted_boost_cancelled;
+                ImageView imageView = (ImageView) view.findViewById(R.id.boosted_boost_cancelled);
                 if (imageView != null) {
-                    i = 2131362169;
-                    TextView textView2 = (TextView) view.findViewById(2131362169);
+                    i = R.id.boosted_boost_cooldown;
+                    TextView textView2 = (TextView) view.findViewById(R.id.boosted_boost_cooldown);
                     if (textView2 != null) {
-                        i = 2131362170;
-                        TextView textView3 = (TextView) view.findViewById(2131362170);
+                        i = R.id.boosted_boost_date;
+                        TextView textView3 = (TextView) view.findViewById(R.id.boosted_boost_date);
                         if (textView3 != null) {
                             ViewSettingsBoostedBoostListitemBinding viewSettingsBoostedBoostListitemBinding = new ViewSettingsBoostedBoostListitemBinding((RelativeLayout) view, textView, imageView, textView2, textView3);
                             m.checkNotNullExpressionValue(viewSettingsBoostedBoostListitemBinding, "ViewSettingsBoostedBoost…temBinding.bind(itemView)");
@@ -454,11 +456,11 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
         }
 
         private final void showPremiumGuildSubPopup(View view, boolean z2, boolean z3, boolean z4, Item.PremiumGuildSubscriptionItem premiumGuildSubscriptionItem) {
-            PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(view.getContext(), 2131951661), view);
-            popupMenu.getMenuInflater().inflate(2131623964, popupMenu.getMenu());
-            MenuItem findItem = popupMenu.getMenu().findItem(2131364120);
-            MenuItem findItem2 = popupMenu.getMenu().findItem(2131364119);
-            MenuItem findItem3 = popupMenu.getMenu().findItem(2131364121);
+            PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(view.getContext(), (int) R.style.AppTheme_PopupMenu), view);
+            popupMenu.getMenuInflater().inflate(R.menu.menu_settings_premium_guild_sub, popupMenu.getMenu());
+            MenuItem findItem = popupMenu.getMenu().findItem(R.id.menu_settings_premium_guild_sub_transfer);
+            MenuItem findItem2 = popupMenu.getMenu().findItem(R.id.menu_settings_premium_guild_sub_cancel);
+            MenuItem findItem3 = popupMenu.getMenu().findItem(R.id.menu_settings_premium_guild_sub_uncancel);
             boolean canceled = premiumGuildSubscriptionItem.getSubscriptionSlot().getCanceled();
             m.checkNotNullExpressionValue(findItem, "transfer");
             boolean z5 = true;
@@ -499,7 +501,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                 boolean z5 = (premiumGuildSubscription != null ? Long.valueOf(premiumGuildSubscription.getGuildId()) : null) != null;
                 boolean z6 = premiumGuildSubscriptionItem.getSubscriptionSlot().getCooldownExpiresAtTimestamp() > currentTimeMillis;
                 ModelPremiumGuildSubscription premiumGuildSubscription2 = premiumGuildSubscriptionItem.getSubscriptionSlot().getPremiumGuildSubscription();
-                long id2 = ((premiumGuildSubscription2 != null ? premiumGuildSubscription2.getId() : 0) >>> 22) + 1420070400000L;
+                long id2 = ((premiumGuildSubscription2 != null ? premiumGuildSubscription2.getId() : 0) >>> 22) + SnowflakeUtils.DISCORD_EPOCH;
                 boolean canceled = premiumGuildSubscriptionItem.getSubscriptionSlot().getCanceled();
                 ImageView imageView = this.binding.f1672c;
                 m.checkNotNullExpressionValue(imageView, "binding.boostedBoostCancelled");
@@ -519,7 +521,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                     z3 = z6;
                     z2 = z5;
                     i2 = 0;
-                    str2 = t.replace$default(b.h(context, 2131892474, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, subscriptionEndsAt, context, (String) null, (java.text.DateFormat) null, 0, 28, (Object) null)}, null, 4).toString(), "*", "", false, 4, (Object) null);
+                    str2 = t.replace$default(b.h(context, R.string.premium_guild_subscription_pending_cancelation, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, subscriptionEndsAt, context, (String) null, (java.text.DateFormat) null, 0, 28, (Object) null)}, null, 4).toString(), "*", "", false, 4, (Object) null);
                 }
                 if (z3) {
                     long max = Math.max(premiumGuildSubscriptionItem.getSubscriptionSlot().getCooldownExpiresAtTimestamp() - currentTimeMillis, 0L);
@@ -533,7 +535,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                     z4 = true;
                     objArr[1] = String.valueOf(j3);
                     objArr[2] = String.valueOf((j2 - (3600000 * j3)) / 60000);
-                    charSequence = b.h(context, 2131892337, objArr, null, 4);
+                    charSequence = b.h(context, R.string.premium_guild_cooldown_available_countdown, objArr, null, 4);
                 } else {
                     str3 = str;
                     z4 = true;
@@ -558,13 +560,13 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                 }
                 TextView textView6 = this.binding.b;
                 m.checkNotNullExpressionValue(textView6, "binding.boostedBoostAction");
-                textView6.setText((z2 || z3) ? "" : context.getString(2131892479));
+                textView6.setText((z2 || z3) ? "" : context.getString(R.string.premium_guild_subscription_select_server_button));
                 if (z3 && ((canceled || !WidgetSettingsPremiumGuildSubscriptionAdapter.access$getCanCancelBoosts$p((WidgetSettingsPremiumGuildSubscriptionAdapter) this.adapter)) && (!canceled || !WidgetSettingsPremiumGuildSubscriptionAdapter.access$getCanUncancelBoosts$p((WidgetSettingsPremiumGuildSubscriptionAdapter) this.adapter)))) {
                     z4 = false;
                 }
                 if (z4) {
                     m.checkNotNullExpressionValue(context, str3);
-                    i3 = DrawableCompat.getThemedDrawableRes$default(context, 2130969440, i2, 2, (Object) null);
+                    i3 = DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.ic_overflow, i2, 2, (Object) null);
                 } else {
                     i3 = 0;
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet$binding$2.java
index 915ae20759..9833f70b4b 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetEditProfileBannerSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textview.MaterialTextView;
@@ -20,32 +21,32 @@ public final /* synthetic */ class WidgetEditProfileBannerSheet$binding$2 extend
 
     public final WidgetEditProfileBannerSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362105;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362105);
+        int i = R.id.banner_change_image_item_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.banner_change_image_item_container);
         if (linearLayout != null) {
-            i = 2131362106;
-            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362106);
+            i = R.id.banner_change_image_item_description;
+            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.banner_change_image_item_description);
             if (materialTextView != null) {
-                i = 2131362107;
-                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131362107);
+                i = R.id.banner_change_image_item_title;
+                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(R.id.banner_change_image_item_title);
                 if (materialTextView2 != null) {
-                    i = 2131362108;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362108);
+                    i = R.id.banner_color_item_container;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.banner_color_item_container);
                     if (constraintLayout != null) {
-                        i = 2131362109;
-                        MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131362109);
+                        i = R.id.banner_color_item_description;
+                        MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(R.id.banner_color_item_description);
                         if (materialTextView3 != null) {
-                            i = 2131362110;
-                            MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(2131362110);
+                            i = R.id.banner_color_item_title;
+                            MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(R.id.banner_color_item_title);
                             if (materialTextView4 != null) {
-                                i = 2131362111;
-                                ImageView imageView = (ImageView) view.findViewById(2131362111);
+                                i = R.id.banner_color_preview;
+                                ImageView imageView = (ImageView) view.findViewById(R.id.banner_color_preview);
                                 if (imageView != null) {
-                                    i = 2131362113;
-                                    MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(2131362113);
+                                    i = R.id.banner_remove_image_item;
+                                    MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(R.id.banner_remove_image_item);
                                     if (materialTextView5 != null) {
-                                        i = 2131364535;
-                                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364535);
+                                        i = R.id.premium_upsell_button;
+                                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.premium_upsell_button);
                                         if (materialButton != null) {
                                             return new WidgetEditProfileBannerSheetBinding((LinearLayout) view, linearLayout, materialTextView, materialTextView2, constraintLayout, materialTextView3, materialTextView4, imageView, materialTextView5, materialButton);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java
index c5627703fa..4bc342a61c 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetEditProfileBannerSheet.java
@@ -15,6 +15,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetEditProfileBannerSheetBinding;
@@ -78,9 +79,9 @@ public final class WidgetEditProfileBannerSheet extends AppBottomSheet {
             m.checkNotNullParameter(function1, "onColorSelected");
             WidgetEditProfileBannerSheet widgetEditProfileBannerSheet = new WidgetEditProfileBannerSheet();
             Bundle bundle = new Bundle();
-            bundle.putString("ARG_DEFAULT_BANNER_COLOR_HEX", str);
-            bundle.putString("ARG_INITIAL_COLOR_PREVIEW_HEX", str2);
-            bundle.putBoolean("ARG_HAS_BANNER_IMAGE", z2);
+            bundle.putString(WidgetEditProfileBannerSheet.ARG_DEFAULT_BANNER_COLOR_HEX, str);
+            bundle.putString(WidgetEditProfileBannerSheet.ARG_INITIAL_COLOR_PREVIEW_HEX, str2);
+            bundle.putBoolean(WidgetEditProfileBannerSheet.ARG_HAS_BANNER_IMAGE, z2);
             widgetEditProfileBannerSheet.setArguments(bundle);
             widgetEditProfileBannerSheet.setOnChangeProfileBannerImage(function0);
             widgetEditProfileBannerSheet.setOnRemoveProfileBannerImage(function02);
@@ -156,7 +157,7 @@ public final class WidgetEditProfileBannerSheet extends AppBottomSheet {
                 z2 = true;
             }
             if (z2 && !getViewModel().getUpsellViewedTracked()) {
-                AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, AnalyticsTracker.PremiumUpsellType.CustomProfileBannerUpsell, new Traits.Location("User Settings", "User Profile", "Edit Profile Banner", null, null, 24, null), null, null, 12, null);
+                AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, AnalyticsTracker.PremiumUpsellType.CustomProfileBannerUpsell, new Traits.Location(Traits.Location.Page.USER_SETTINGS, "User Profile", Traits.Location.Obj.EDIT_PROFILE_BANNER, null, null, 24, null), null, null, 12, null);
                 getViewModel().setUpsellViewedTracked(true);
             }
             getBinding().b.setOnClickListener(new WidgetEditProfileBannerSheet$configureUi$2(this, viewState));
@@ -175,27 +176,27 @@ public final class WidgetEditProfileBannerSheet extends AppBottomSheet {
     private final void launchColorPicker(@ColorInt int i) {
         ColorPickerDialog.k kVar = new ColorPickerDialog.k();
         kVar.h = i;
-        kVar.f2413s = ColorCompat.getThemedColor(getContext(), 2130968904);
+        kVar.f2413s = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundPrimary);
         kVar.i = false;
         kVar.j = false;
         kVar.f = 0;
-        kVar.a = 2131894743;
-        kVar.r = ColorCompat.getThemedColor(getContext(), 2130968932);
+        kVar.a = R.string.user_settings_banner_color_title;
+        kVar.r = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorHeaderPrimary);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f2414x = fontUtils.getThemedFontResId(getContext(), 2130969322);
+        kVar.f2414x = fontUtils.getThemedFontResId(getContext(), R.attr.font_display_bold);
         kVar.l = true;
-        kVar.e = 2131887438;
-        kVar.p = ColorCompat.getThemedColor(getContext(), 2130968995);
-        kVar.d = 2131893521;
-        kVar.w = ColorCompat.getColor(getContext(), 2131100433);
-        kVar.f2415y = fontUtils.getThemedFontResId(getContext(), 2130969328);
-        kVar.t = ColorCompat.getThemedColor(getContext(), 2130968989);
-        kVar.u = 2131231123;
-        kVar.f2416z = fontUtils.getThemedFontResId(getContext(), 2130969327);
+        kVar.e = R.string.color_picker_use_default;
+        kVar.p = ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand);
+        kVar.d = R.string.select;
+        kVar.w = ColorCompat.getColor(getContext(), (int) R.color.white);
+        kVar.f2415y = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_semibold);
+        kVar.t = ColorCompat.getThemedColor(getContext(), (int) R.attr.colorTextMuted);
+        kVar.u = R.drawable.drawable_cpv_edit_text_background;
+        kVar.f2416z = fontUtils.getThemedFontResId(getContext(), R.attr.font_primary_normal);
         ColorPickerDialog a = kVar.a();
         a.j = new WidgetEditProfileBannerSheet$launchColorPicker$1(this);
         AppBottomSheet.hideKeyboard$default(this, null, 1, null);
-        a.show(getParentFragmentManager(), "DIALOG_TAG_COLOR_PICKER");
+        a.show(getParentFragmentManager(), DIALOG_TAG_COLOR_PICKER);
     }
 
     private final void navigateToUpsellModal() {
@@ -205,26 +206,26 @@ public final class WidgetEditProfileBannerSheet extends AppBottomSheet {
         AnalyticsTracker.PremiumUpsellType premiumUpsellType = AnalyticsTracker.PremiumUpsellType.CustomProfileUpsellModal;
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        String obj = b.i(resources, 2131892597, new Object[0], null, 4).toString();
+        String obj = b.i(resources, R.string.premium_profile_customization_upsell_header, new Object[0], null, 4).toString();
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        String obj2 = b.i(resources2, 2131892595, new Object[0], null, 4).toString();
+        String obj2 = b.i(resources2, R.string.premium_profile_customization_upsell_body, new Object[0], null, 4).toString();
         Objects.requireNonNull(bVar);
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(premiumUpsellType, "premiumUpsellType");
         d dVar = new d();
         Bundle bundle = new Bundle();
-        bundle.putInt("extra_image_drawable_res", 2131232283);
+        bundle.putInt("extra_image_drawable_res", R.drawable.img_profile_banner_value_prop);
         bundle.putString("extra_header_text", obj);
         bundle.putString("extra_body_text", obj2);
         dVar.setArguments(bundle);
         dVar.show(parentFragmentManager, d.class.getName());
-        AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, premiumUpsellType, null, null, new Traits.Source("User Settings", "User Profile", "Edit Profile Banner", null, null, 24, null), 6, null);
+        AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, premiumUpsellType, null, null, new Traits.Source(Traits.Location.Page.USER_SETTINGS, "User Profile", Traits.Location.Obj.EDIT_PROFILE_BANNER, null, null, 24, null), 6, null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559030;
+        return R.layout.widget_edit_profile_banner_sheet;
     }
 
     public final Function0<Unit> getOnChangeProfileBannerImage() {
@@ -259,18 +260,18 @@ public final class WidgetEditProfileBannerSheet extends AppBottomSheet {
         super.onViewCreated(view, bundle);
         getBinding().g.setOnClickListener(new WidgetEditProfileBannerSheet$onViewCreated$1(this));
         getBinding().f.setOnClickListener(new WidgetEditProfileBannerSheet$onViewCreated$2(this));
-        boolean z2 = getArgumentsOrDefault().getBoolean("ARG_HAS_BANNER_IMAGE");
+        boolean z2 = getArgumentsOrDefault().getBoolean(ARG_HAS_BANNER_IMAGE);
         MaterialTextView materialTextView = getBinding().f1787c;
         m.checkNotNullExpressionValue(materialTextView, "binding.bannerChangeImageItemTitle");
         int i = 0;
         if (z2) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            charSequence = b.i(resources, 2131894753, new Object[0], null, 4);
+            charSequence = b.i(resources, R.string.user_settings_change_profile_banner, new Object[0], null, 4);
         } else {
             Resources resources2 = getResources();
             m.checkNotNullExpressionValue(resources2, "resources");
-            charSequence = b.i(resources2, 2131894848, new Object[0], null, 4);
+            charSequence = b.i(resources2, R.string.user_settings_upload_banner, new Object[0], null, 4);
         }
         materialTextView.setText(charSequence);
         MaterialTextView materialTextView2 = getBinding().f;
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$binding$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$binding$2.java
index e15a4ae2cd..0f7eb9ca70 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.settings.profile;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import com.discord.R;
 import com.discord.databinding.WidgetProfileMarketingSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,14 +19,14 @@ public final /* synthetic */ class WidgetProfileMarketingSheet$binding$2 extends
 
     public final WidgetProfileMarketingSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364573;
-        ImageView imageView = (ImageView) view.findViewById(2131364573);
+        int i = R.id.profile_marketing_image;
+        ImageView imageView = (ImageView) view.findViewById(R.id.profile_marketing_image);
         if (imageView != null) {
-            i = 2131364574;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364574);
+            i = R.id.profile_marketing_skip_button;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.profile_marketing_skip_button);
             if (materialButton != null) {
-                i = 2131364575;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364575);
+                i = R.id.profile_marketing_update_profile_button;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.profile_marketing_update_profile_button);
                 if (materialButton2 != null) {
                     return new WidgetProfileMarketingSheetBinding((FrameLayout) view, imageView, materialButton, materialButton2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet.java
index f02b9b4332..c768974c8b 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet.java
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.k.a;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetProfileMarketingSheetBinding;
@@ -74,7 +75,7 @@ public final class WidgetProfileMarketingSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559169;
+        return R.layout.widget_profile_marketing_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$binding$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$binding$2.java
index e9efef57ea..4f87fd0897 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetSettingsUserProfileBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -25,38 +26,38 @@ public final /* synthetic */ class WidgetSettingsUserProfile$binding$2 extends k
 
     public final WidgetSettingsUserProfileBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362121;
-        CardView cardView = (CardView) view.findViewById(2131362121);
+        int i = R.id.bio_editor_card;
+        CardView cardView = (CardView) view.findViewById(R.id.bio_editor_card);
         if (cardView != null) {
-            i = 2131362122;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131362122);
+            i = R.id.bio_editor_text_input_field;
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.bio_editor_text_input_field);
             if (textInputEditText != null) {
-                i = 2131362123;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362123);
+                i = R.id.bio_editor_text_input_field_wrap;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.bio_editor_text_input_field_wrap);
                 if (textInputLayout != null) {
-                    i = 2131362124;
-                    TextView textView = (TextView) view.findViewById(2131362124);
+                    i = R.id.bio_header;
+                    TextView textView = (TextView) view.findViewById(R.id.bio_header);
                     if (textView != null) {
-                        i = 2131362125;
-                        CardView cardView2 = (CardView) view.findViewById(2131362125);
+                        i = R.id.bio_preview_card;
+                        CardView cardView2 = (CardView) view.findViewById(R.id.bio_preview_card);
                         if (cardView2 != null) {
-                            i = 2131362126;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362126);
+                            i = R.id.bio_preview_text;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.bio_preview_text);
                             if (linkifiedTextView != null) {
-                                i = 2131362956;
-                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                                i = R.id.dimmer_view;
+                                DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                                 if (dimmerView != null) {
-                                    i = 2131364572;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364572);
+                                    i = R.id.profile_container;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.profile_container);
                                     if (linearLayout != null) {
-                                        i = 2131364740;
-                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364740);
+                                        i = R.id.save_fab;
+                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.save_fab);
                                         if (floatingActionButton != null) {
-                                            i = 2131365128;
-                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131365128);
+                                            i = R.id.settings_profile_scroll;
+                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.settings_profile_scroll);
                                             if (nestedScrollView != null) {
-                                                i = 2131365702;
-                                                UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365702);
+                                                i = R.id.user_settings_profile_header_view;
+                                                UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(R.id.user_settings_profile_header_view);
                                                 if (userProfileHeaderView != null) {
                                                     return new WidgetSettingsUserProfileBinding((TouchInterceptingCoordinatorLayout) view, cardView, textInputEditText, textInputLayout, textView, cardView2, linkifiedTextView, dimmerView, linearLayout, floatingActionButton, nestedScrollView, userProfileHeaderView);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$1.java
index 789f2f9d97..9b07caaa8e 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$1.java
@@ -2,6 +2,8 @@ package com.discord.widgets.settings.profile;
 
 import androidx.fragment.app.FragmentManager;
 import c.a.a.e.b;
+import com.discord.R;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.user.UserUtils;
 import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
@@ -38,6 +40,6 @@ public final class WidgetSettingsUserProfile$configureAvatarSelect$1 extends o i
         b.C0013b bVar = b.j;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        b.C0013b.a(bVar, parentFragmentManager, 4, this.this$0.getString(2131892698), null, "User Settings", "User Profile", null, null, false, false, 968);
+        b.C0013b.a(bVar, parentFragmentManager, 4, this.this$0.getString(R.string.premium_upsell_animated_avatar_active_mobile), null, Traits.Location.Page.USER_SETTINGS, "User Profile", null, null, false, false, 968);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$2.java
index a530e9f96b..45aaa13f55 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.settings.profile;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetSettingsUserProfile$onViewBoundOrOnResume$2 extends o i
     }
 
     public final void invoke(SettingsUserProfileViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetSettingsUserProfile.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
index ed724f30e6..ce382fa2bc 100644
--- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.appcompat.app.AlertDialog;
 import androidx.cardview.widget.CardView;
+import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
@@ -16,6 +17,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.z.b0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.ViewDialogConfirmationBinding;
 import com.discord.databinding.WidgetSettingsUserProfileBinding;
@@ -85,7 +87,7 @@ public final class WidgetSettingsUserProfile extends AppFragment {
     }
 
     public WidgetSettingsUserProfile() {
-        super(2131559277);
+        super(R.layout.widget_settings_user_profile);
         WidgetSettingsUserProfile$viewModel$2 widgetSettingsUserProfile$viewModel$2 = WidgetSettingsUserProfile$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsUserProfileViewModel.class), new WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsUserProfile$viewModel$2));
@@ -166,10 +168,10 @@ public final class WidgetSettingsUserProfile extends AppFragment {
     private final void configureAvatarSelect(SettingsUserProfileViewModel.ViewState.Loaded loaded) {
         this.avatarSelectedResult = new WidgetSettingsUserProfile$configureAvatarSelect$1(this, loaded);
         b0[] b0VarArr = new b0[1];
-        b0VarArr[0] = new b0(loaded.getHasAvatarForDisplay() ? getString(2131894750) : getString(2131894847), null, null, null, null, null, null, 116);
+        b0VarArr[0] = new b0(loaded.getHasAvatarForDisplay() ? getString(R.string.user_settings_change_avatar) : getString(R.string.user_settings_upload_avatar), null, null, null, null, null, null, 116);
         List mutableListOf = n.mutableListOf(b0VarArr);
         if (loaded.getHasAvatarForDisplay()) {
-            mutableListOf.add(new b0(getString(2131894831), null, null, null, null, Integer.valueOf(ColorCompat.getColor(requireContext(), 2131100329)), null, 84));
+            mutableListOf.add(new b0(getString(R.string.user_settings_remove_avatar), null, null, null, null, Integer.valueOf(ColorCompat.getColor(requireContext(), (int) R.color.status_red_500)), null, 84));
         }
         getBinding().i.setOnAvatarEdit(new WidgetSettingsUserProfile$configureAvatarSelect$2(this, mutableListOf));
     }
@@ -249,14 +251,14 @@ public final class WidgetSettingsUserProfile extends AppFragment {
         } else if (!loaded.isDirty() || this.discardConfirmed.get()) {
             return false;
         } else {
-            ViewDialogConfirmationBinding a = ViewDialogConfirmationBinding.a(LayoutInflater.from(getActivity()).inflate(2131558757, (ViewGroup) null, false));
+            ViewDialogConfirmationBinding a = ViewDialogConfirmationBinding.a(LayoutInflater.from(getActivity()).inflate(R.layout.view_dialog_confirmation, (ViewGroup) null, false));
             m.checkNotNullExpressionValue(a, "ViewDialogConfirmationBi…tInflater.from(activity))");
             AlertDialog create = new AlertDialog.Builder(requireContext()).setView(a.a).create();
             m.checkNotNullExpressionValue(create, "AlertDialog.Builder(requ…logBinding.root).create()");
-            a.d.setText(2131888168);
-            a.e.setText(2131888169);
+            a.d.setText(R.string.discard_changes);
+            a.e.setText(R.string.discard_changes_description);
             a.b.setOnClickListener(new WidgetSettingsUserProfile$handleBackPressed$1(create));
-            a.f1655c.setText(2131892004);
+            a.f1655c.setText(R.string.okay);
             a.f1655c.setOnClickListener(new WidgetSettingsUserProfile$handleBackPressed$2(this, create));
             create.show();
             return true;
@@ -282,11 +284,11 @@ public final class WidgetSettingsUserProfile extends AppFragment {
     /* JADX WARNING: Unknown variable types count: 1 */
     @Override // com.discord.app.AppFragment
     public void onImageChosen(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageChosen(uri, str);
         if (!t.startsWith$default(str, "image", false, 2, null)) {
-            o.g(getContext(), 2131894783, 0, null, 12);
+            o.g(getContext(), R.string.user_settings_image_upload_filetype_error, 0, null, 12);
         } else if (m.areEqual(str, "image/gif")) {
             Context context = getContext();
             Function1<? super String, Unit> function1 = this.imageSelectedResult;
@@ -295,7 +297,7 @@ public final class WidgetSettingsUserProfile extends AppFragment {
             }
             MGImages.requestDataUrl(context, uri, str, (Action1) function1);
         } else {
-            MGImages.requestImageCrop(requireContext(), this, uri, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 5.0f : 1.0f, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 2.0f : 1.0f, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 1080 : 1024);
+            MGImages.requestImageCrop(requireContext(), this, uri, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 5.0f : 1.0f, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 2.0f : 1.0f, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? MAX_BANNER_IMAGE_SIZE : 1024);
         }
     }
 
@@ -303,7 +305,7 @@ public final class WidgetSettingsUserProfile extends AppFragment {
     /* JADX WARNING: Unknown variable types count: 1 */
     @Override // com.discord.app.AppFragment
     public void onImageCropped(Uri uri, String str) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "mimeType");
         super.onImageCropped(uri, str);
         Context context = getContext();
@@ -320,10 +322,10 @@ public final class WidgetSettingsUserProfile extends AppFragment {
         super.onViewBound(view);
         SharedPreferences.Editor edit = SharedPreferencesProvider.INSTANCE.get().edit();
         m.checkExpressionValueIsNotNull(edit, "editor");
-        edit.putBoolean("USER_PROFILE_SETTINGS_VIEWED_CACHE_KEY", true);
+        edit.putBoolean(USER_PROFILE_SETTINGS_VIEWED_CACHE_KEY, true);
         edit.apply();
-        setActionBarTitle(2131894851);
-        setActionBarSubtitle(2131894701);
+        setActionBarTitle(R.string.user_settings_user_profile);
+        setActionBarSubtitle(R.string.user_settings);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         getBinding().h.setOnClickListener(new WidgetSettingsUserProfile$onViewBound$2(this, view));
         ((TouchInterceptingCoordinatorLayout) view).setOnInterceptTouchEvent(new WidgetSettingsUserProfile$onViewBound$3(this));
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java
index 13eede399b..cd19683b06 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java
@@ -6,6 +6,7 @@ import androidx.cardview.widget.CardView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetIncomingShareBinding;
 import com.discord.utilities.dimmer.DimmerView;
@@ -25,44 +26,44 @@ public final /* synthetic */ class WidgetIncomingShare$binding$2 extends k imple
 
     public final WidgetIncomingShareBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131363237;
-            ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363237);
+            i = R.id.external_share_activity_action_preview;
+            ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(R.id.external_share_activity_action_preview);
             if (viewEmbedGameInvite != null) {
-                i = 2131363238;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363238);
+                i = R.id.external_share_comment;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.external_share_comment);
                 if (textInputLayout != null) {
-                    i = 2131363239;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363239);
+                    i = R.id.external_share_list;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.external_share_list);
                     if (recyclerView != null) {
-                        i = 2131363240;
-                        CardView cardView = (CardView) view.findViewById(2131363240);
+                        i = R.id.external_share_list_wrap;
+                        CardView cardView = (CardView) view.findViewById(R.id.external_share_list_wrap);
                         if (cardView != null) {
-                            i = 2131363241;
-                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363241);
+                            i = R.id.external_share_search;
+                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.external_share_search);
                             if (textInputLayout2 != null) {
-                                i = 2131363242;
-                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363242);
+                                i = R.id.external_share_search_results;
+                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.external_share_search_results);
                                 if (recyclerView2 != null) {
-                                    i = 2131363772;
-                                    ImageView imageView = (ImageView) view.findViewById(2131363772);
+                                    i = R.id.incoming_share_no_results_img;
+                                    ImageView imageView = (ImageView) view.findViewById(R.id.incoming_share_no_results_img);
                                     if (imageView != null) {
-                                        i = 2131363773;
-                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363773);
+                                        i = R.id.incoming_share_results_flipper;
+                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.incoming_share_results_flipper);
                                         if (appViewFlipper != null) {
-                                            i = 2131364758;
-                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364758);
+                                            i = R.id.scroll_view;
+                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.scroll_view);
                                             if (nestedScrollView != null) {
-                                                i = 2131364769;
-                                                AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364769);
+                                                i = R.id.search_flipper;
+                                                AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(R.id.search_flipper);
                                                 if (appViewFlipper2 != null) {
-                                                    i = 2131365871;
-                                                    ViewGlobalSearchItem viewGlobalSearchItem = (ViewGlobalSearchItem) view.findViewById(2131365871);
+                                                    i = R.id.widget_channel_search_item;
+                                                    ViewGlobalSearchItem viewGlobalSearchItem = (ViewGlobalSearchItem) view.findViewById(R.id.widget_channel_search_item);
                                                     if (viewGlobalSearchItem != null) {
-                                                        i = 2131365872;
-                                                        ImageView imageView2 = (ImageView) view.findViewById(2131365872);
+                                                        i = R.id.widget_channel_search_item_remove;
+                                                        ImageView imageView2 = (ImageView) view.findViewById(R.id.widget_channel_search_item_remove);
                                                         if (imageView2 != null) {
                                                             return new WidgetIncomingShareBinding((CoordinatorLayout) view, dimmerView, viewEmbedGameInvite, textInputLayout, recyclerView, cardView, textInputLayout2, recyclerView2, imageView, appViewFlipper, nestedScrollView, appViewFlipper2, viewGlobalSearchItem, imageView2);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java
index c61599573b..392624b998 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.share;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.share.WidgetIncomingShare;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -17,7 +18,7 @@ public final class WidgetIncomingShare$configureUi$2<T1, T2> implements Action2<
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364113) {
+        if (menuItem.getItemId() == R.id.menu_send) {
             WidgetIncomingShare widgetIncomingShare = this.this$0;
             m.checkNotNullExpressionValue(context, "ctx");
             WidgetIncomingShare.access$onSendClicked(widgetIncomingShare, context, this.$this_configureUi.getReceiver(), this.$this_configureUi.getGameInviteModel(), this.$this_configureUi.getContentModel(), this.$this_configureUi.isOnCooldown(), this.$this_configureUi.getMaxFileSizeMB(), this.$this_configureUi.isUserPremium());
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java
index 099a933555..7121d3509c 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
@@ -107,7 +108,7 @@ public final class WidgetIncomingShare$onSendClicked$3 extends o implements Func
             int coerceAtLeast = f.coerceAtLeast((int) (((MessageResult.Slowmode) messageResult).getCooldownMs() / 1000), 1);
             Resources resources = this.$context.getResources();
             m.checkNotNullExpressionValue(resources, "context.resources");
-            c.a.e.o.h(this.$context, StringResourceUtilsKt.getQuantityString(resources, this.$context, 2131755048, coerceAtLeast, Integer.valueOf(coerceAtLeast)), 0, null, 12);
+            c.a.e.o.h(this.$context, StringResourceUtilsKt.getQuantityString(resources, this.$context, (int) R.plurals.channel_slowmode_cooldown_seconds, coerceAtLeast, Integer.valueOf(coerceAtLeast)), 0, null, 12);
         } else if (messageResult instanceof MessageResult.UnknownFailure) {
             SendUtils sendUtils = SendUtils.INSTANCE;
             Error error = ((MessageResult.UnknownFailure) messageResult).getError();
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
index 7afdff7604..79a1457fdc 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
@@ -20,6 +20,7 @@ import c.a.a.a;
 import c.a.e.l;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -172,7 +173,7 @@ public final class WidgetIncomingShare extends AppFragment {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558778, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.view_image, viewGroup, false);
             Objects.requireNonNull(inflate, "rootView");
             ViewImageBinding viewImageBinding = new ViewImageBinding((SimpleDraweeView) inflate);
             m.checkNotNullExpressionValue(viewImageBinding, "ViewImageBinding.inflate….context), parent, false)");
@@ -208,7 +209,7 @@ public final class WidgetIncomingShare extends AppFragment {
 
         public final void launch(Context context, String str, String str2) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("android.intent.extra.TEXT", str).putExtra("EXTRA_RECIPIENT", str2);
+            Intent putExtra = new Intent().putExtra("android.intent.extra.TEXT", str).putExtra(WidgetIncomingShare.EXTRA_RECIPIENT, str2);
             m.checkNotNullExpressionValue(putExtra, "Intent()\n          .putE…TRA_RECIPIENT, recipient)");
             l.d(context, WidgetIncomingShare.class, putExtra);
         }
@@ -237,7 +238,7 @@ public final class WidgetIncomingShare extends AppFragment {
                 m.checkNotNullParameter(intent, "recentIntent");
                 ShareUtils.SharedContent sharedContent = ShareUtils.INSTANCE.getSharedContent(intent, false);
                 Long directShareId = IntentUtils.INSTANCE.getDirectShareId(intent);
-                String stringExtra = intent.getStringExtra("EXTRA_RECIPIENT");
+                String stringExtra = intent.getStringExtra(WidgetIncomingShare.EXTRA_RECIPIENT);
                 String action = intent.getAction();
                 Uri data = (action != null && action.hashCode() == -1103390587 && action.equals("com.discord.intent.action.SDK")) ? intent.getData() : null;
                 String stringExtra2 = intent.getStringExtra("com.discord.intent.extra.EXTRA_ACTIVITY");
@@ -447,7 +448,7 @@ public final class WidgetIncomingShare extends AppFragment {
     }
 
     public WidgetIncomingShare() {
-        super(2131559125);
+        super(R.layout.widget_incoming_share);
     }
 
     public static final /* synthetic */ void access$configureUi(WidgetIncomingShare widgetIncomingShare, Model model, Clock clock) {
@@ -525,7 +526,7 @@ public final class WidgetIncomingShare extends AppFragment {
             i = 8;
         }
         cardView.setVisibility(i);
-        getBinding().d.setHint(z2 ? 2131886236 : 2131894554);
+        getBinding().d.setHint(z2 ? R.string.add_a_comment_optional : R.string.upload_area_leave_a_comment);
     }
 
     private final void configureUi(Model model, Clock clock) {
@@ -550,7 +551,7 @@ public final class WidgetIncomingShare extends AppFragment {
                 editText.setImeOptions(4);
             }
             String comment = model.getComment();
-            setActionBarOptionsMenu(!(comment == null || t.isBlank(comment)) || (((uris = model.getContentModel().getUris()) != null && !uris.isEmpty()) || model.getGameInviteModel() != null) ? 2131623952 : 2131623951, new WidgetIncomingShare$configureUi$2(this, model), null);
+            setActionBarOptionsMenu(!(comment == null || t.isBlank(comment)) || (((uris = model.getContentModel().getUris()) != null && !uris.isEmpty()) || model.getGameInviteModel() != null) ? R.menu.menu_external_share : R.menu.menu_empty, new WidgetIncomingShare$configureUi$2(this, model), null);
             WidgetGlobalSearchModel.ItemDataPayload receiver = model.getReceiver();
             if (receiver instanceof WidgetGlobalSearchModel.ItemUser) {
                 getBinding().l.onConfigure((WidgetGlobalSearchModel.ItemUser) model.getReceiver());
@@ -575,7 +576,7 @@ public final class WidgetIncomingShare extends AppFragment {
             if (editText2 != null) {
                 editText2.setImeOptions(5);
             }
-            AppFragment.setActionBarOptionsMenu$default(this, 2131623951, null, null, 4, null);
+            AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_empty, null, null, 4, null);
         }
         AppViewFlipper appViewFlipper3 = getBinding().i;
         m.checkNotNullExpressionValue(appViewFlipper3, "binding.incomingShareResultsFlipper");
@@ -650,7 +651,7 @@ public final class WidgetIncomingShare extends AppFragment {
                 }
                 Uri uri = (Uri) obj;
                 Context context2 = getContext();
-                AnalyticsTracker.addAttachment("share", AttachmentUtilsKt.getMimeType$default(context2 != null ? context2.getContentResolver() : null, uri, null, 4, null), i);
+                AnalyticsTracker.addAttachment(AnalyticsTracker.ATTACHMENT_SOURCE_SHARE, AttachmentUtilsKt.getMimeType$default(context2 != null ? context2.getContentResolver() : null, uri, null, 4, null), i);
                 i = i2;
             }
         }
@@ -664,7 +665,7 @@ public final class WidgetIncomingShare extends AppFragment {
         boolean z6;
         int i2;
         if (z2) {
-            c.a.e.o.g(context, 2131887349, 0, null, 12);
+            c.a.e.o.g(context, R.string.channel_slowmode_desc_short, 0, null, 12);
             return;
         }
         if (itemDataPayload instanceof WidgetGlobalSearchModel.ItemChannel) {
@@ -811,10 +812,10 @@ public final class WidgetIncomingShare extends AppFragment {
         this.selectedReceiverPublisher.onNext(null);
         AppViewFlipper appViewFlipper = getBinding().k;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.searchFlipper");
-        appViewFlipper.setInAnimation(AnimationUtils.loadAnimation(context, 2130771970));
+        appViewFlipper.setInAnimation(AnimationUtils.loadAnimation(context, R.anim.abc_grow_fade_in_from_bottom));
         AppViewFlipper appViewFlipper2 = getBinding().k;
         m.checkNotNullExpressionValue(appViewFlipper2, "binding.searchFlipper");
-        appViewFlipper2.setOutAnimation(AnimationUtils.loadAnimation(context, 2130771973));
+        appViewFlipper2.setOutAnimation(AnimationUtils.loadAnimation(context, R.anim.abc_shrink_fade_out_from_bottom));
         setOnNewIntentListener(new WidgetIncomingShare$onViewBound$5(this));
         initialize(ContentModel.Companion.get(getMostRecentIntent()));
     }
diff --git a/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$1.java b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$1.java
index c3c8b0c45e..81b2cbab1d 100644
--- a/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.stage;
 
+import com.discord.api.permission.Permission;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.utilities.permissions.PermissionUtils;
 import d0.t.n;
@@ -34,7 +35,7 @@ public final class GuildIdsWithVisibleStageInstanceModel$compute$1 extends o imp
         if (!(keySet instanceof Collection) || !keySet.isEmpty()) {
             i = 0;
             for (Number number : keySet) {
-                if (PermissionUtils.can(1024, (Long) this.$permissionsByChannel.get(Long.valueOf(number.longValue()))) && (i = i + 1) < 0) {
+                if (PermissionUtils.can(Permission.VIEW_CHANNEL, (Long) this.$permissionsByChannel.get(Long.valueOf(number.longValue()))) && (i = i + 1) < 0) {
                     n.throwCountOverflow();
                 }
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelAPI.java b/app/src/main/java/com/discord/widgets/stage/StageChannelAPI.java
index f4c8ce701d..266fb73112 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelAPI.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelAPI.java
@@ -3,6 +3,7 @@ package com.discord.widgets.stage;
 import com.discord.api.channel.Channel;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.rest.RestAPI;
@@ -51,7 +52,7 @@ public final class StageChannelAPI {
     }
 
     public final Observable<StageInstance> startStageInstance(long j, String str, StageInstancePrivacyLevel stageInstancePrivacyLevel, boolean z2) {
-        m.checkNotNullParameter(str, "topic");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         m.checkNotNullParameter(stageInstancePrivacyLevel, "privacyLevel");
         return RestAPI.Companion.getApi().startStageInstance(new RestAPIParams.StartStageInstanceBody(j, str, stageInstancePrivacyLevel, z2));
     }
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
index a3469079d2..f326e68a4c 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
@@ -5,6 +5,7 @@ import androidx.annotation.MainThread;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.o;
 import c.q.a.k.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreGuilds;
@@ -289,13 +290,13 @@ public final class StageChannelJoinHelper {
         if (ordinal == 0) {
             function0.mo1invoke();
         } else if (ordinal == 1) {
-            o.g(context, 2131887288, 0, null, 12);
+            o.g(context, R.string.channel_locked, 0, null, 12);
         } else if (ordinal == 2) {
             c.a.a.m.j.a(fragmentManager);
         } else if (ordinal == 3) {
-            o.g(context, 2131894479, 0, null, 12);
+            o.g(context, R.string.unable_to_join_channel_full, 0, null, 12);
         } else if (ordinal == 4) {
-            o.g(context, 2131890090, 0, null, 12);
+            o.g(context, R.string.guild_settings_public_welcome_invalid_channel, 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java
index 94a9799e25..0b5e8fbc52 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java
@@ -7,10 +7,12 @@ import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import c.a.f.d;
 import c.q.a.k.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.fcm.NotificationClient;
 import com.discord.utilities.lifecycle.ApplicationProvider;
 import com.discord.utilities.voice.VoiceEngineForegroundService;
 import com.discord.utilities.voice.VoiceEngineNotificationBuilder;
@@ -58,13 +60,13 @@ public final class StageChannelNotifications {
 
             public final void cancel(Context context) {
                 m.checkNotNullParameter(context, "context");
-                NotificationManagerCompat.from(context).cancel("stage-channels", 102);
+                NotificationManagerCompat.from(context).cancel(StageChannelNotifications.NOTIFICATION_TAG, 102);
             }
 
             public final void notify(Context context, Notification notification) {
                 m.checkNotNullParameter(context, "context");
                 m.checkNotNullParameter(notification, "notification");
-                NotificationManagerCompat.from(context).notify("stage-channels", 102, notification);
+                NotificationManagerCompat.from(context).notify(StageChannelNotifications.NOTIFICATION_TAG, 102, notification);
             }
         }
 
@@ -91,12 +93,12 @@ public final class StageChannelNotifications {
     }
 
     private final NotificationCompat.Builder createChannelNotificationBuilder(Context context, Channel channel) {
-        NotificationCompat.Builder color = new NotificationCompat.Builder(context, "Calls").setAutoCancel(true).setOnlyAlertOnce(true).setColor(ColorCompat.getThemedColor(context, 2130969008));
+        NotificationCompat.Builder color = new NotificationCompat.Builder(context, NotificationClient.NOTIF_CHANNEL_CALLS).setAutoCancel(true).setOnlyAlertOnce(true).setColor(ColorCompat.getThemedColor(context, (int) R.attr.color_brand_500));
         String z2 = channel.z();
         if (z2 == null) {
             z2 = channel.m();
         }
-        return color.setContentTitle(z2).setSmallIcon(2131231516).setContentIntent(VoiceEngineNotificationBuilder.getCallScreenNavigationIntent$default(VoiceEngineNotificationBuilder.INSTANCE, context, channel.h(), null, null, 6, null));
+        return color.setContentTitle(z2).setSmallIcon(R.drawable.ic_channel_stage_24dp_white).setContentIntent(VoiceEngineNotificationBuilder.getCallScreenNavigationIntent$default(VoiceEngineNotificationBuilder.INSTANCE, context, channel.h(), null, null, 6, null));
     }
 
     public final void onInviteToSpeakRescinded() {
@@ -109,7 +111,7 @@ public final class StageChannelNotifications {
         if (d.a && (channel = this.channelsStore.getChannel(j)) != null) {
             Application application = ApplicationProvider.INSTANCE.get();
             VoiceEngineForegroundService.Companion companion = VoiceEngineForegroundService.Companion;
-            a.G(w0.i, j0.b, null, new StageChannelNotifications$onInvitedToSpeak$1(channel, createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131893846)).addAction(0, application.getString(2131893843), companion.stageInviteAckPendingIntent(application, j, true)).addAction(0, application.getString(2131893845), companion.stageInviteAckPendingIntent(application, j, false)), application, null), 2, null);
+            a.G(w0.i, j0.b, null, new StageChannelNotifications$onInvitedToSpeak$1(channel, createChannelNotificationBuilder(application, channel).setContentText(application.getString(R.string.stage_speak_invite_header)).addAction(0, application.getString(R.string.stage_speak_invite_accept), companion.stageInviteAckPendingIntent(application, j, true)).addAction(0, application.getString(R.string.stage_speak_invite_decline), companion.stageInviteAckPendingIntent(application, j, false)), application, null), 2, null);
         }
     }
 
@@ -118,7 +120,7 @@ public final class StageChannelNotifications {
         if (channel != null) {
             Application application = ApplicationProvider.INSTANCE.get();
             Notifications.InvitedToSpeak invitedToSpeak = Notifications.InvitedToSpeak.INSTANCE;
-            Notification build = createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131888410)).build();
+            Notification build = createChannelNotificationBuilder(application, channel).setContentText(application.getString(R.string.error_generic_title)).build();
             m.checkNotNullExpressionValue(build, "createChannelNotificatio…le))\n            .build()");
             invitedToSpeak.notify(application, build);
         }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/DiscoveryIntroCardManager.java b/app/src/main/java/com/discord/widgets/stage/discovery/DiscoveryIntroCardManager.java
index 2d35cee5c6..71cc5e22ac 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/DiscoveryIntroCardManager.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/DiscoveryIntroCardManager.java
@@ -10,10 +10,10 @@ public final class DiscoveryIntroCardManager {
     }
 
     public final boolean hasUserSeenDiscoveryIntroCard() {
-        return SharedPreferencesProvider.INSTANCE.get().getBoolean("DISCOVERY_INTRO_CARD_SHOWN_KEY", false);
+        return SharedPreferencesProvider.INSTANCE.get().getBoolean(DISCOVERY_INTRO_CARD_SHOWN_KEY, false);
     }
 
     public final void markUserSeenDiscoveryIntroCard() {
-        SharedPreferencesProvider.INSTANCE.get().edit().putBoolean("DISCOVERY_INTRO_CARD_SHOWN_KEY", true).apply();
+        SharedPreferencesProvider.INSTANCE.get().edit().putBoolean(DISCOVERY_INTRO_CARD_SHOWN_KEY, true).apply();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java b/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java
index bffcc41d60..9560360935 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetDiscoveryIntroCardBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import d0.z.d.m;
@@ -13,17 +14,17 @@ public final class IntroductionCardViewHolder extends MGRecyclerViewHolder<Disco
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public IntroductionCardViewHolder(DiscoveryAdapter discoveryAdapter) {
-        super(2131559026, discoveryAdapter);
+        super((int) R.layout.widget_discovery_intro_card, discoveryAdapter);
         m.checkNotNullParameter(discoveryAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131363004;
-        ImageView imageView = (ImageView) view.findViewById(2131363004);
+        int i = R.id.discovery_intro_card_dismiss;
+        ImageView imageView = (ImageView) view.findViewById(R.id.discovery_intro_card_dismiss);
         if (imageView != null) {
-            i = 2131363005;
-            TextView textView = (TextView) view.findViewById(2131363005);
+            i = R.id.discovery_intro_card_subtitle;
+            TextView textView = (TextView) view.findViewById(R.id.discovery_intro_card_subtitle);
             if (textView != null) {
-                i = 2131363006;
-                TextView textView2 = (TextView) view.findViewById(2131363006);
+                i = R.id.discovery_intro_card_title;
+                TextView textView2 = (TextView) view.findViewById(R.id.discovery_intro_card_title);
                 if (textView2 != null) {
                     WidgetDiscoveryIntroCardBinding widgetDiscoveryIntroCardBinding = new WidgetDiscoveryIntroCardBinding((ConstraintLayout) view, imageView, textView, textView2);
                     m.checkNotNullExpressionValue(widgetDiscoveryIntroCardBinding, "WidgetDiscoveryIntroCardBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java b/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java
index d6cedce109..78b91fc6b1 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.databinding.WidgetDiscoveryStageCardBinding;
 import com.discord.models.guild.Guild;
@@ -40,27 +41,27 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StageCardViewHolder(DiscoveryAdapter discoveryAdapter) {
-        super(2131559028, discoveryAdapter);
+        super((int) R.layout.widget_discovery_stage_card, discoveryAdapter);
         m.checkNotNullParameter(discoveryAdapter, "adapter");
         View view = this.itemView;
         LinearLayout linearLayout = (LinearLayout) view;
-        int i = 2131363010;
-        DiscoveryStageCardBodyView discoveryStageCardBodyView = (DiscoveryStageCardBodyView) view.findViewById(2131363010);
+        int i = R.id.discovery_stage_card_body_view;
+        DiscoveryStageCardBodyView discoveryStageCardBodyView = (DiscoveryStageCardBodyView) view.findViewById(R.id.discovery_stage_card_body_view);
         if (discoveryStageCardBodyView != null) {
-            i = 2131363011;
-            DiscoveryStageCardControlsView discoveryStageCardControlsView = (DiscoveryStageCardControlsView) view.findViewById(2131363011);
+            i = R.id.discovery_stage_card_controls;
+            DiscoveryStageCardControlsView discoveryStageCardControlsView = (DiscoveryStageCardControlsView) view.findViewById(R.id.discovery_stage_card_controls);
             if (discoveryStageCardControlsView != null) {
-                i = 2131363012;
-                TextView textView = (TextView) view.findViewById(2131363012);
+                i = R.id.discovery_stage_card_error;
+                TextView textView = (TextView) view.findViewById(R.id.discovery_stage_card_error);
                 if (textView != null) {
-                    i = 2131363015;
-                    DiscoveryStageCardTopHatView discoveryStageCardTopHatView = (DiscoveryStageCardTopHatView) view.findViewById(2131363015);
+                    i = R.id.discovery_stage_card_top_hat;
+                    DiscoveryStageCardTopHatView discoveryStageCardTopHatView = (DiscoveryStageCardTopHatView) view.findViewById(R.id.discovery_stage_card_top_hat);
                     if (discoveryStageCardTopHatView != null) {
-                        i = 2131365218;
-                        View findViewById = view.findViewById(2131365218);
+                        i = R.id.stage_card_controls_divider;
+                        View findViewById = view.findViewById(R.id.stage_card_controls_divider);
                         if (findViewById != null) {
-                            i = 2131365219;
-                            View findViewById2 = view.findViewById(2131365219);
+                            i = R.id.stage_card_top_hat_divider;
+                            View findViewById2 = view.findViewById(R.id.stage_card_top_hat_divider);
                             if (findViewById2 != null) {
                                 WidgetDiscoveryStageCardBinding widgetDiscoveryStageCardBinding = new WidgetDiscoveryStageCardBinding((LinearLayout) view, linearLayout, discoveryStageCardBodyView, discoveryStageCardControlsView, textView, discoveryStageCardTopHatView, findViewById, findViewById2);
                                 m.checkNotNullExpressionValue(widgetDiscoveryStageCardBinding, "WidgetDiscoveryStageCardBinding.bind(itemView)");
@@ -99,7 +100,7 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
         m.checkNotNullParameter(component4, "speakers");
         TextView textView = discoveryStageCardBodyView.i.e;
         textView.setText(component3.getName());
-        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, component3.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231858 : component3.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232096 : 0, 0, 11, (Object) null);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, component3.getFeatures().contains(GuildFeature.PARTNERED) ? R.drawable.ic_partnered_badge_banner : component3.getFeatures().contains(GuildFeature.VERIFIED) ? R.drawable.ic_verified_badge_banner : 0, 0, 11, (Object) null);
         TextView textView2 = discoveryStageCardBodyView.i.g;
         m.checkNotNullExpressionValue(textView2, "binding.stageDiscoveryStageName");
         if (component1 == null) {
@@ -152,7 +153,7 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
             discoveryStageCardControlsView2.i.d.setOnClickListener(new j(1, stageCardViewHolder$onConfigure$2));
             TextView textView7 = discoveryStageCardControlsView2.i.f197c;
             m.checkNotNullExpressionValue(textView7, "binding.discoveryControlJoinedAs");
-            textView7.setText((r18 == null || !StageRoles.m26isSpeakerimpl(r18.m28unboximpl())) ? discoveryStageCardControlsView2.getContext().getString(2131893760) : discoveryStageCardControlsView2.getContext().getString(2131893801));
+            textView7.setText((r18 == null || !StageRoles.m26isSpeakerimpl(r18.m28unboximpl())) ? discoveryStageCardControlsView2.getContext().getString(R.string.stage_discovery_audience_join_notice) : discoveryStageCardControlsView2.getContext().getString(R.string.stage_discovery_speaker_join_notice));
         } else if (ordinal != 3) {
             TextView textView8 = this.binding.e;
             m.checkNotNullExpressionValue(textView8, "binding.discoveryStageCardError");
@@ -188,7 +189,7 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
             boolean isSpeaker = component9.isSpeaker();
             Objects.requireNonNull(discoveryStageCardTopHatView2);
             m.checkNotNullParameter(displayName, "displayName");
-            int i3 = isSpeaker ? 2131893786 : 2131893782;
+            int i3 = isSpeaker ? R.string.stage_discovery_live_stage_tile_friends_guilds_context_speaker_hook : R.string.stage_discovery_live_stage_tile_friends_guilds_context_audience_hook;
             TextView textView10 = discoveryStageCardTopHatView2.i.f71c;
             m.checkNotNullExpressionValue(textView10, "binding.discoveryStageCardTopHatText");
             Object[] objArr = new Object[1];
@@ -196,7 +197,7 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
             textView10.setText(b.d(discoveryStageCardTopHatView2, i3, objArr, new c.a.z.k0.b(discoveryStageCardTopHatView2)));
             SimpleDraweeView simpleDraweeView3 = discoveryStageCardTopHatView2.i.b;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.discoveryStageCardTopHatIcon");
-            SimpleDraweeViewExtensionsKt.setUserIcon$default(simpleDraweeView3, Long.valueOf(userId), userAvatar, null, false, 2131165291, 12, null);
+            SimpleDraweeViewExtensionsKt.setUserIcon$default(simpleDraweeView3, Long.valueOf(userId), userAvatar, null, false, R.dimen.avatar_size_medium, 12, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryAnalyticsTracker.java b/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryAnalyticsTracker.java
index 30df00d641..0e0d1df40c 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryAnalyticsTracker.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryAnalyticsTracker.java
@@ -1,6 +1,8 @@
 package com.discord.widgets.stage.discovery;
 
+import androidx.core.os.EnvironmentCompat;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.analytics.AnalyticsUtils;
 import com.discord.utilities.collections.CollectionExtensionsKt;
 import com.discord.utilities.time.ClockFactory;
@@ -27,7 +29,7 @@ public final class StageDiscoveryAnalyticsTracker {
     private static int lastVisibleIndex = -1;
     private static int lastVisibleIndexAtLoad = -1;
     private static boolean loadEventSent = true;
-    private static String loadId = "unknown";
+    private static String loadId = EnvironmentCompat.MEDIA_UNKNOWN;
     private static Long stageJoinTimestampMillis;
     private static final AnalyticsUtils.Tracker tracker = AnalyticsUtils.Tracker.Companion.getInstance();
 
@@ -157,7 +159,7 @@ public final class StageDiscoveryAnalyticsTracker {
         }
 
         public final Map<String, Object> toSerializedMap() {
-            return CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("index", Integer.valueOf(this.index)), o.to("guild_id", this.guildId), o.to("stage_instance_id", this.stageInstanceId), o.to("recommendation_source", u.toList(this.recommendationSource)), o.to("recommendation_score", this.recommendationScore)));
+            return CollectionExtensionsKt.filterNonNullValues(h0.mapOf(o.to("index", Integer.valueOf(this.index)), o.to(ModelAuditLogEntry.CHANGE_KEY_GUILD_ID, this.guildId), o.to("stage_instance_id", this.stageInstanceId), o.to("recommendation_source", u.toList(this.recommendationSource)), o.to("recommendation_score", this.recommendationScore)));
         }
 
         public String toString() {
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java
index 761c35a557..caac8636fb 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetDiscoveryBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -20,29 +21,29 @@ public final /* synthetic */ class WidgetDiscovery$binding$2 extends k implement
 
     public final WidgetDiscoveryBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363000;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363000);
+        int i = R.id.discovery_empty_state;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.discovery_empty_state);
         if (constraintLayout != null) {
-            i = 2131363001;
-            TextView textView = (TextView) view.findViewById(2131363001);
+            i = R.id.discovery_empty_state_header;
+            TextView textView = (TextView) view.findViewById(R.id.discovery_empty_state_header);
             if (textView != null) {
-                i = 2131363002;
-                TextView textView2 = (TextView) view.findViewById(2131363002);
+                i = R.id.discovery_empty_state_subheader;
+                TextView textView2 = (TextView) view.findViewById(R.id.discovery_empty_state_subheader);
                 if (textView2 != null) {
-                    i = 2131363003;
-                    ImageView imageView = (ImageView) view.findViewById(2131363003);
+                    i = R.id.discovery_empty_state_wumpus;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.discovery_empty_state_wumpus);
                     if (imageView != null) {
-                        i = 2131363007;
-                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363007);
+                        i = R.id.discovery_recycler;
+                        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.discovery_recycler);
                         if (recyclerView != null) {
-                            i = 2131363018;
-                            TextView textView3 = (TextView) view.findViewById(2131363018);
+                            i = R.id.discovery_start_stage;
+                            TextView textView3 = (TextView) view.findViewById(R.id.discovery_start_stage);
                             if (textView3 != null) {
-                                i = 2131363019;
-                                TextView textView4 = (TextView) view.findViewById(2131363019);
+                                i = R.id.discovery_title;
+                                TextView textView4 = (TextView) view.findViewById(R.id.discovery_title);
                                 if (textView4 != null) {
-                                    i = 2131365409;
-                                    SwipeRefreshLayout swipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(2131365409);
+                                    i = R.id.swipe_refresh_layout;
+                                    SwipeRefreshLayout swipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(R.id.swipe_refresh_layout);
                                     if (swipeRefreshLayout != null) {
                                         return new WidgetDiscoveryBinding((ConstraintLayout) view, constraintLayout, textView, textView2, imageView, recyclerView, textView3, textView4, swipeRefreshLayout);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$1.java
index cf6322ad98..6c82740e1a 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.stage.discovery;
 
 import android.content.Context;
+import androidx.core.view.PointerIconCompat;
 import androidx.fragment.app.FragmentManager;
 import com.discord.widgets.stage.StageChannelJoinHelper;
 import d0.z.d.m;
@@ -30,7 +31,7 @@ public final class WidgetDiscovery$configureAdapter$1 extends o implements Funct
         Context requireContext = this.this$0.requireContext();
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, j, false, false, null, null, null, null, null, 1016, null);
+        StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, j, false, false, null, null, null, null, null, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, null);
         StageDiscoveryAnalyticsTracker.INSTANCE.trackStageDiscoveryStageOpened(j);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$3.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$3.java
index 1822939e0d..825644c6f7 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$3.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$configureAdapter$3.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.stage.discovery;
 
 import android.content.Context;
+import androidx.core.view.PointerIconCompat;
 import androidx.fragment.app.FragmentManager;
 import com.discord.stores.StoreStream;
 import com.discord.widgets.stage.StageChannelJoinHelper;
@@ -35,7 +36,7 @@ public final class WidgetDiscovery$configureAdapter$3 extends o implements Funct
             Context requireContext = this.this$0.requireContext();
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, j, false, false, null, null, null, null, null, 1016, null);
+            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, j, false, false, null, null, null, null, null, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, null);
             StageDiscoveryAnalyticsTracker.INSTANCE.trackStageDiscoveryStageOpened(j);
             return;
         }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java
index 8acb79a5ee..24c60ed2c1 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java
@@ -12,6 +12,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetDiscoveryBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
@@ -40,7 +41,7 @@ public final class WidgetDiscovery extends AppFragment implements OnTabSelectedL
     private final Lazy viewModel$delegate;
 
     public WidgetDiscovery() {
-        super(2131559025);
+        super(R.layout.widget_discovery);
         WidgetDiscovery$viewModel$2 widgetDiscovery$viewModel$2 = WidgetDiscovery$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetDiscoveryViewModel.class), new WidgetDiscovery$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetDiscovery$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java
index 0bf30d097e..1d469b35f2 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java
@@ -9,6 +9,7 @@ import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreUser;
 import com.discord.stores.StoreUserAffinities;
 import com.discord.stores.StoreUserRelationships;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.widgets.stage.model.DiscoveryModel;
 import com.discord.widgets.stage.model.DiscoverySource;
 import com.discord.widgets.stage.model.DiscoverySpeakerModel;
@@ -86,7 +87,7 @@ public final class WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryMo
                         } else if (t.getGuildIsVerified()) {
                             linkedHashSet.add(GuildFeature.VERIFIED);
                         }
-                        discoveryModel = new DiscoveryModel(t.getTopic(), Long.valueOf((t.getStageInstanceId() >>> 22) + 1420070400000L), t.getChannelId(), new Guild(null, null, null, t.getGuildName(), null, 0, t.getGuildId(), null, 0, t.getGuildIcon(), null, null, false, 0, 0, null, null, linkedHashSet, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, -131657, 1, null), t.getStageInstanceId(), arrayList, t.getSpeakerCount(), t.getAudienceSize(), DiscoverySource.RICH_PRESENCE, 4, null);
+                        discoveryModel = new DiscoveryModel(t.getTopic(), Long.valueOf((t.getStageInstanceId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH), t.getChannelId(), new Guild(null, null, null, t.getGuildName(), null, 0, t.getGuildId(), null, 0, t.getGuildIcon(), null, null, false, 0, 0, null, null, linkedHashSet, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, -131657, 1, null), t.getStageInstanceId(), arrayList, t.getSpeakerCount(), t.getAudienceSize(), DiscoverySource.RICH_PRESENCE, 4, null);
                     }
                     if (discoveryModel != null) {
                         R.add(discoveryModel);
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java
index 720f8159f7..0a297537b6 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java
@@ -8,6 +8,7 @@ import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreStageChannels;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.widgets.stage.model.DiscoveryModel;
 import com.discord.widgets.stage.model.DiscoverySource;
 import com.discord.widgets.stage.model.DiscoverySpeakerModel;
@@ -88,7 +89,7 @@ public final class WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryM
                     Map map = (Map) this.$guildMembers.get(Long.valueOf(guild.getId()));
                     arrayList.add(new DiscoverySpeakerModel(id2, avatar, (map == null || (guildMember = (GuildMember) a.c(user, map)) == null) ? null : guildMember.getNick(), user.getUsername()));
                 }
-                return new DiscoveryModel(stageInstance.f(), Long.valueOf((stageInstance.c() >>> 22) + 1420070400000L), h, guild, stageInstance.c(), arrayList, arrayList.size(), stageChannel.getAudienceSize(), DiscoverySource.USER_GUILDS, 3, null);
+                return new DiscoveryModel(stageInstance.f(), Long.valueOf((stageInstance.c() >>> 22) + SnowflakeUtils.DISCORD_EPOCH), h, guild, stageInstance.c(), arrayList, arrayList.size(), stageChannel.getAudienceSize(), DiscoverySource.USER_GUILDS, 3, null);
             }
         }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java
index e6e9829e53..009fc31483 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java
@@ -1135,7 +1135,7 @@ public final class WidgetDiscoveryViewModel extends AppViewModel<ViewState> {
         }
         if (!z2 || this.hasFirstUserInteraction) {
             long currentTimeMillis = this.clock.currentTimeMillis() - this.lastInteraction;
-            if (currentTimeMillis >= ((long) 3005000)) {
+            if (currentTimeMillis >= ((long) MIN_TIME_BEFORE_AUTO_REFRESH_MS)) {
                 Logger.v$default(AppLog.g, a.o("Auto-refresh timeout triggered; delta=", currentTimeMillis), null, 2, null);
                 fetchAndRefreshStageCardItems(context);
                 return;
diff --git a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java
index 78b1e46e39..faaac09d52 100644
--- a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.stage.model;
 
 import a0.a.a.b;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.guild.Guild;
 import d0.o;
 import d0.t.u;
@@ -58,7 +59,7 @@ public final class DiscoveryModel implements Comparable<DiscoveryModel> {
     }
 
     public DiscoveryModel(String str, Long l, long j, Guild guild, long j2, List<DiscoverySpeakerModel> list, int i, int i2, DiscoverySource discoverySource, int i3, Double d) {
-        m.checkNotNullParameter(str, "topic");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         m.checkNotNullParameter(guild, "guild");
         m.checkNotNullParameter(list, "speakers");
         m.checkNotNullParameter(discoverySource, "source");
@@ -129,7 +130,7 @@ public final class DiscoveryModel implements Comparable<DiscoveryModel> {
     }
 
     public final DiscoveryModel copy(String str, Long l, long j, Guild guild, long j2, List<DiscoverySpeakerModel> list, int i, int i2, DiscoverySource discoverySource, int i3, Double d) {
-        m.checkNotNullParameter(str, "topic");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         m.checkNotNullParameter(guild, "guild");
         m.checkNotNullParameter(list, "speakers");
         m.checkNotNullParameter(discoverySource, "source");
diff --git a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java
index abeaf4c9f4..ebd78dbb5b 100644
--- a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java
+++ b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java
@@ -4,6 +4,7 @@ import com.discord.api.guildmember.GuildMember;
 import com.discord.api.stageinstance.RecommendedStageInstance;
 import com.discord.models.guild.Guild;
 import com.discord.nullserializable.NullSerializable;
+import com.discord.utilities.SnowflakeUtils;
 import d0.d0.f;
 import d0.t.g0;
 import d0.t.o;
@@ -48,6 +49,6 @@ public final class DiscoveryModelKt {
             NullSerializable<String> a = guildMember.j().a();
             arrayList.add(new DiscoverySpeakerModel(i, a != null ? a.a() : null, guildMember.e(), guildMember.j().r()));
         }
-        return new DiscoveryModel(recommendedStageInstance.b().f(), Long.valueOf((recommendedStageInstance.b().c() >>> 22) + 1420070400000L), recommendedStageInstance.b().a(), new Guild(null, null, null, recommendedStageInstance.a().d(), null, 0, recommendedStageInstance.a().c(), null, 0, recommendedStageInstance.a().b(), null, null, false, 0, 0, null, null, recommendedStageInstance.a().a(), 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, -131657, 1, null), recommendedStageInstance.b().c(), arrayList, recommendedStageInstance.g().size(), recommendedStageInstance.c(), discoverySource, recommendedStageInstance.f(), Double.valueOf(recommendedStageInstance.e()));
+        return new DiscoveryModel(recommendedStageInstance.b().f(), Long.valueOf((recommendedStageInstance.b().c() >>> 22) + SnowflakeUtils.DISCORD_EPOCH), recommendedStageInstance.b().a(), new Guild(null, null, null, recommendedStageInstance.a().d(), null, 0, recommendedStageInstance.a().c(), null, 0, recommendedStageInstance.a().b(), null, null, false, 0, 0, null, null, recommendedStageInstance.a().a(), 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, false, -131657, 1, null), recommendedStageInstance.b().c(), arrayList, recommendedStageInstance.g().size(), recommendedStageInstance.c(), discoverySource, recommendedStageInstance.f(), Double.valueOf(recommendedStageInstance.e()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java
index 1f610ac71f..be2659f358 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.Space;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageSettingsBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.CheckedSetting;
@@ -25,44 +26,44 @@ public final /* synthetic */ class WidgetStageSettings$binding$2 extends k imple
 
     public final WidgetStageSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364265;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364265);
+        int i = R.id.notify_members_check;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.notify_members_check);
         if (checkedSetting != null) {
-            i = 2131365272;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365272);
+            i = R.id.stage_start_creation_options;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.stage_start_creation_options);
             if (linearLayout != null) {
-                i = 2131365273;
-                View findViewById = view.findViewById(2131365273);
+                i = R.id.stage_start_divider;
+                View findViewById = view.findViewById(R.id.stage_start_divider);
                 if (findViewById != null) {
-                    i = 2131365274;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365274);
+                    i = R.id.stage_start_help_text;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.stage_start_help_text);
                     if (linkifiedTextView != null) {
-                        i = 2131365275;
-                        CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365275);
+                        i = R.id.stage_start_members_radio_button;
+                        CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.stage_start_members_radio_button);
                         if (checkedSetting2 != null) {
-                            i = 2131365276;
-                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131365276);
+                            i = R.id.stage_start_public_disclaimer;
+                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.stage_start_public_disclaimer);
                             if (linkifiedTextView2 != null) {
-                                i = 2131365277;
-                                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365277);
+                                i = R.id.stage_start_public_radio_button;
+                                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.stage_start_public_radio_button);
                                 if (checkedSetting3 != null) {
-                                    i = 2131365278;
-                                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131365278);
+                                    i = R.id.stage_start_screen_title;
+                                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.stage_start_screen_title);
                                     if (screenTitleView != null) {
-                                        i = 2131365279;
-                                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365279);
+                                        i = R.id.stage_start_topic_layout;
+                                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.stage_start_topic_layout);
                                         if (textInputLayout != null) {
-                                            i = 2131365280;
-                                            TextView textView = (TextView) view.findViewById(2131365280);
+                                            i = R.id.stage_start_topic_title;
+                                            TextView textView = (TextView) view.findViewById(R.id.stage_start_topic_title);
                                             if (textView != null) {
-                                                i = 2131365288;
-                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365288);
+                                                i = R.id.start_stage_button;
+                                                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.start_stage_button);
                                                 if (materialButton != null) {
-                                                    i = 2131365289;
-                                                    Space space = (Space) view.findViewById(2131365289);
+                                                    i = R.id.start_stage_button_spacer;
+                                                    Space space = (Space) view.findViewById(R.id.start_stage_button_spacer);
                                                     if (space != null) {
-                                                        i = 2131365578;
-                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365578);
+                                                        i = R.id.topic_input;
+                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.topic_input);
                                                         if (textInputEditText != null) {
                                                             return new WidgetStageSettingsBinding((CoordinatorLayout) view, checkedSetting, linearLayout, findViewById, linkifiedTextView, checkedSetting2, linkifiedTextView2, checkedSetting3, screenTitleView, textInputLayout, textView, materialButton, space, textInputEditText);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureStageUI$5.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureStageUI$5.java
index e67fbe0fa3..d1e2379d64 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureStageUI$5.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureStageUI$5.java
@@ -3,6 +3,7 @@ package com.discord.widgets.stage.settings;
 import android.graphics.Typeface;
 import android.text.style.ForegroundColorSpan;
 import android.view.View;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
@@ -41,11 +42,11 @@ public final class WidgetStageSettings$configureStageUI$5 extends o implements F
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            Typeface themedFont = FontUtils.INSTANCE.getThemedFont(this.this$0.this$0.requireContext(), 2130969328);
+            Typeface themedFont = FontUtils.INSTANCE.getThemedFont(this.this$0.this$0.requireContext(), R.attr.font_primary_semibold);
             if (themedFont != null) {
                 hook.a.add(new TypefaceSpanCompat(themedFont));
             }
-            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), 2130969877)));
+            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), (int) R.attr.primary_000)));
         }
     }
 
@@ -98,11 +99,11 @@ public final class WidgetStageSettings$configureStageUI$5 extends o implements F
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            Typeface themedFont = FontUtils.INSTANCE.getThemedFont(this.this$0.this$0.requireContext(), 2130969328);
+            Typeface themedFont = FontUtils.INSTANCE.getThemedFont(this.this$0.this$0.requireContext(), R.attr.font_primary_semibold);
             if (themedFont != null) {
                 hook.a.add(new TypefaceSpanCompat(themedFont));
             }
-            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), 2130968987)));
+            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), (int) R.attr.colorTextLink)));
             AnonymousClass2 r0 = new AnonymousClass2(this);
             m.checkNotNullParameter(r0, "onClick");
             hook.f2047c = new Hook.a(null, r0);
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$onViewCreated$1.java
index 90fb7f3c62..92063d20ae 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$onViewCreated$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$onViewCreated$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.stage.settings;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetStageSettings$onViewCreated$1 extends o implements Func
     }
 
     public final void invoke(String str) {
-        m.checkNotNullParameter(str, "topic");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         TextInputLayout textInputLayout = WidgetStageSettings.access$getBinding$p(this.this$0).h;
         m.checkNotNullExpressionValue(textInputLayout, "binding.stageStartTopicLayout");
         textInputLayout.setError(null);
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java
index a7ad8c8264..9ea4ff9252 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java
@@ -15,6 +15,7 @@ import c.a.e.l;
 import c.a.k.a;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
 import com.discord.app.AppActivity;
@@ -80,8 +81,8 @@ public final class WidgetStageSettings extends AppFragment {
         public final void launch(Context context, long j, boolean z2, ActivityResultLauncher<Intent> activityResultLauncher) {
             m.checkNotNullParameter(context, "context");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_EXTRA_CHANNEL_ID", j);
-            intent.putExtra("INTENT_EXTRA_EVENT_CREATION", z2);
+            intent.putExtra(WidgetStageSettings.INTENT_EXTRA_CHANNEL_ID, j);
+            intent.putExtra(WidgetStageSettings.INTENT_EXTRA_CREATING_EVENT, z2);
             if (activityResultLauncher != null) {
                 l.g.f(context, activityResultLauncher, WidgetStageSettings.class, intent);
             } else {
@@ -99,7 +100,7 @@ public final class WidgetStageSettings extends AppFragment {
     }
 
     public WidgetStageSettings() {
-        super(2131559292);
+        super(R.layout.widget_stage_settings);
         TooltipManager tooltipManager = null;
         AppLog appLog = AppLog.g;
         m.checkNotNullParameter(appLog, "logger");
@@ -147,13 +148,13 @@ public final class WidgetStageSettings extends AppFragment {
         }
         boolean z2 = stage.getStageInstance() == null;
         ScreenTitleView screenTitleView = getBinding().g;
-        String string = getString(z2 ? 2131893871 : 2131888240);
+        String string = getString(z2 ? R.string.start_stage_channel_event_modal_title : R.string.edit_stage_channel_title);
         m.checkNotNullExpressionValue(string, "getString(\n            i…e\n            }\n        )");
         screenTitleView.setTitle(string);
-        getBinding().g.setSubtitle(getString(z2 ? 2131893870 : 2131888239));
+        getBinding().g.setSubtitle(getString(z2 ? R.string.start_stage_channel_event_modal_subtitle : R.string.edit_stage_channel_subtitle));
         MaterialButton materialButton = getBinding().i;
         materialButton.setEnabled(stage.getStagePrivacyLevel() != null);
-        materialButton.setText(getString(z2 ? 2131893868 : 2131893353));
+        materialButton.setText(getString(z2 ? R.string.start_stage_channel_event_modal_button : R.string.save_changes));
         StageInstance stageInstance = stage.getStageInstance();
         StageInstancePrivacyLevel e = stageInstance != null ? stageInstance.e() : null;
         StageInstancePrivacyLevel stageInstancePrivacyLevel = StageInstancePrivacyLevel.PUBLIC;
@@ -162,7 +163,7 @@ public final class WidgetStageSettings extends AppFragment {
         boolean canEveryoneJoin = stage.getCanEveryoneJoin();
         CheckedSetting checkedSetting = getBinding().f;
         checkedSetting.setChecked(stage.getStagePrivacyLevel() == stageInstancePrivacyLevel);
-        checkedSetting.setLabelTagText(2131892925);
+        checkedSetting.setLabelTagText(R.string.recommended);
         checkedSetting.setLabelTagVisibility(stage.isPublicRecommended());
         if (z3) {
             checkedSetting.e(WidgetStageSettings$configureStageUI$2$1.INSTANCE);
@@ -174,13 +175,13 @@ public final class WidgetStageSettings extends AppFragment {
         LinkifiedTextView linkifiedTextView = getBinding().e;
         boolean z4 = stage.getStagePrivacyLevel() == stageInstancePrivacyLevel;
         if (z3) {
-            charSequence = getString(2131893879);
+            charSequence = getString(R.string.start_stage_channel_event_public_permanent_disclaimer);
         } else if (!canInvite) {
-            charSequence = getString(2131893880);
+            charSequence = getString(R.string.start_stage_channel_event_public_permissions_disclaimer);
         } else if (!canEveryoneJoin) {
-            charSequence = getString(2131893876);
+            charSequence = getString(R.string.start_stage_channel_event_public_everyone_warning);
         } else if (z4) {
-            String string2 = getString(2131893877);
+            String string2 = getString(R.string.start_stage_channel_event_public_explanation);
             m.checkNotNullExpressionValue(string2, "getString(R.string.start…event_public_explanation)");
             charSequence = b.l(string2, new Object[]{f.a.a(1500010879761L, null)}, null, 2);
         } else {
@@ -200,13 +201,13 @@ public final class WidgetStageSettings extends AppFragment {
         if (z2) {
             LinkifiedTextView linkifiedTextView3 = getBinding().f1994c;
             m.checkNotNullExpressionValue(linkifiedTextView3, "binding.stageStartHelpText");
-            linkifiedTextView3.setText(b.e(this, stage.getHasOtherStageChannels() ? 2131893898 : 2131893900, new Object[]{stage.getChannel().m()}, new WidgetStageSettings$configureStageUI$5(this, stage)));
+            linkifiedTextView3.setText(b.e(this, stage.getHasOtherStageChannels() ? R.string.start_stage_modal_set_topic_change_channel : R.string.start_stage_modal_set_topic_help_text, new Object[]{stage.getChannel().m()}, new WidgetStageSettings$configureStageUI$5(this, stage)));
         }
         CheckedSetting checkedSetting3 = getBinding().b;
         checkedSetting3.setVisibility(stage.getShowStageNotificationSurfaces() && stage.getCanMentionEveryone() && z2 ? 0 : 8);
         checkedSetting3.setChecked(stage.getSendStartNotification());
         checkedSetting3.setOnCheckedListener(new WidgetStageSettings$configureStageUI$$inlined$apply$lambda$3(this, stage, z2));
-        checkedSetting3.setLabelTagText(2131886082);
+        checkedSetting3.setLabelTagText(R.string._new);
         checkedSetting3.setLabelTagVisibility(this.tooltipManager.b(LiveStageNotificationBadgeTooltip.INSTANCE, true));
     }
 
@@ -252,7 +253,7 @@ public final class WidgetStageSettings extends AppFragment {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         WidgetStagePublicNoticeBottomSheet.Companion.registerForResult$default(WidgetStagePublicNoticeBottomSheet.Companion, this, null, new WidgetStageSettings$onCreate$1(this), 2, null);
-        WidgetChannelSelector.Companion.registerForResult(this, "REQUEST_KEY_STAGE_CHANNEL", false, new WidgetStageSettings$onCreate$2(this));
+        WidgetChannelSelector.Companion.registerForResult(this, REQUEST_KEY_STAGE_CHANNEL, false, new WidgetStageSettings$onCreate$2(this));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java
index fdf50ba562..3ba169c5b5 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java
@@ -6,13 +6,16 @@ import androidx.annotation.MainThread;
 import androidx.fragment.app.FragmentManager;
 import c.a.k.a;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildFeature;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
 import com.discord.app.AppLog;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.guild.Guild;
 import com.discord.stores.StoreChannels;
@@ -410,7 +413,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Stage(String str, Channel channel, long j, boolean z2, boolean z3, StageInstancePrivacyLevel stageInstancePrivacyLevel, boolean z4, StageInstance stageInstance, boolean z5, boolean z6, boolean z7, boolean z8) {
                 super(null);
-                m.checkNotNullParameter(str, "topic");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
                 m.checkNotNullParameter(channel, "channel");
                 this.topic = str;
                 this.channel = channel;
@@ -479,7 +482,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
             }
 
             public final Stage copy(String str, Channel channel, long j, boolean z2, boolean z3, StageInstancePrivacyLevel stageInstancePrivacyLevel, boolean z4, StageInstance stageInstance, boolean z5, boolean z6, boolean z7, boolean z8) {
-                m.checkNotNullParameter(str, "topic");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
                 m.checkNotNullParameter(channel, "channel");
                 return new Stage(str, channel, j, z2, z3, stageInstancePrivacyLevel, z4, stageInstance, z5, z6, z7, z8);
             }
@@ -741,7 +744,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
             StoreState.Loaded loaded = (StoreState.Loaded) storeState;
             boolean canEveryoneRole = PermissionUtils.INSTANCE.canEveryoneRole(1049600, loaded.getSelectedChannel(), loaded.getGuildRoles());
             boolean can = PermissionUtils.can(1, loaded.getSelectedChannelPermissions());
-            boolean can2 = PermissionUtils.can(131072, loaded.getSelectedChannelPermissions());
+            boolean can2 = PermissionUtils.can(Permission.MENTION_EVERYONE, loaded.getSelectedChannelPermissions());
             if (!(getViewState() instanceof ViewState.Stage)) {
                 AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
                 boolean z2 = canEveryoneRole && can;
@@ -775,7 +778,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
             } else {
                 stageInstancePrivacyLevel = stagePrivacyLevel;
             }
-            updateViewState(new ViewState.Stage(str, selectedChannel, meUserId, can, canEveryoneRole, stageInstancePrivacyLevel, z4, loaded.getStageInstance(), !loaded.getOtherGuildStageChannels().isEmpty(), (stage != null ? stage.getSendStartNotification() : z3) && can2 && memberCount <= 50000, z3, can2));
+            updateViewState(new ViewState.Stage(str, selectedChannel, meUserId, can, canEveryoneRole, stageInstancePrivacyLevel, z4, loaded.getStageInstance(), !loaded.getOtherGuildStageChannels().isEmpty(), (stage != null ? stage.getSendStartNotification() : z3) && can2 && memberCount <= LARGE_GUILD_MEMBER_COUNT, z3, can2));
         }
     }
 
@@ -871,7 +874,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(stageChannelAPI2.updateStageInstance(n02.longValue(), str, stage.getStagePrivacyLevel()), false, 1, null), this, null, 2, null), WidgetStageSettingsViewModel.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageSettingsViewModel$openStage$2(this), 60, (Object) null);
                 return;
             }
-            this.eventSubject.j.onNext(new Event.InvalidTopic(2131893874));
+            this.eventSubject.j.onNext(new Event.InvalidTopic(R.string.start_stage_channel_event_modal_topic_required));
         }
     }
 
@@ -880,7 +883,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
     }
 
     public final void setTopic(String str) {
-        m.checkNotNullParameter(str, "topic");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Stage)) {
             viewState = null;
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java
index 8d96349c6c..f627bed6a2 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.StageAudienceBlockedBottomSheetHeaderItemBinding;
 import com.discord.databinding.StageAudienceBlockedBottomSheetItemBinding;
 import com.discord.models.user.User;
@@ -48,14 +49,14 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(StageAudienceBlockedBottomSheetAdapter stageAudienceBlockedBottomSheetAdapter) {
-            super(2131558677, stageAudienceBlockedBottomSheetAdapter);
+            super((int) R.layout.stage_audience_blocked_bottom_sheet_header_item, stageAudienceBlockedBottomSheetAdapter);
             m.checkNotNullParameter(stageAudienceBlockedBottomSheetAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362904;
-            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362904);
+            int i = R.id.description;
+            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.description);
             if (materialTextView != null) {
-                i = 2131365561;
-                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131365561);
+                i = R.id.title;
+                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(R.id.title);
                 if (materialTextView2 != null) {
                     StageAudienceBlockedBottomSheetHeaderItemBinding stageAudienceBlockedBottomSheetHeaderItemBinding = new StageAudienceBlockedBottomSheetHeaderItemBinding((ConstraintLayout) view, materialTextView, materialTextView2);
                     m.checkNotNullExpressionValue(stageAudienceBlockedBottomSheetHeaderItemBinding, "StageAudienceBlockedBott…temBinding.bind(itemView)");
@@ -73,10 +74,10 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
                 MaterialTextView materialTextView = this.binding.f1631c;
                 m.checkNotNullExpressionValue(materialTextView, "binding.title");
                 ListItem.Header header = (ListItem.Header) mGRecyclerDataPayload;
-                materialTextView.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131893719, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755333, header.getNumBlockedUsers(), new Object[0])}, null, 4));
+                materialTextView.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.stage_blocked_users_title_plural, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.stage_blocked_users_title_plural_number, header.getNumBlockedUsers(), new Object[0])}, null, 4));
                 MaterialTextView materialTextView2 = this.binding.b;
                 m.checkNotNullExpressionValue(materialTextView2, "binding.description");
-                materialTextView2.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), 2131893715, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), 2131755331, header.getNumBlockedUsers(), Integer.valueOf(header.getNumBlockedUsers()))}, null, 4));
+                materialTextView2.setText(b.h(a.x(this.itemView, "itemView", "itemView.context"), R.string.stage_blocked_users_body, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.stage_blocked_users_body_number, header.getNumBlockedUsers(), Integer.valueOf(header.getNumBlockedUsers()))}, null, 4));
             }
         }
     }
@@ -243,30 +244,30 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ParticipantViewHolder(StageAudienceBlockedBottomSheetAdapter stageAudienceBlockedBottomSheetAdapter) {
-            super(2131558678, stageAudienceBlockedBottomSheetAdapter);
+            super((int) R.layout.stage_audience_blocked_bottom_sheet_item, stageAudienceBlockedBottomSheetAdapter);
             m.checkNotNullParameter(stageAudienceBlockedBottomSheetAdapter, "adapter");
             View view = this.itemView;
             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-            int i = 2131365228;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365228);
+            int i = R.id.stage_channel_blocked_member_icon;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.stage_channel_blocked_member_icon);
             if (simpleDraweeView != null) {
-                i = 2131365229;
-                CutoutView cutoutView = (CutoutView) view.findViewById(2131365229);
+                i = R.id.stage_channel_blocked_member_icon_container;
+                CutoutView cutoutView = (CutoutView) view.findViewById(R.id.stage_channel_blocked_member_icon_container);
                 if (cutoutView != null) {
-                    i = 2131365230;
-                    TextView textView = (TextView) view.findViewById(2131365230);
+                    i = R.id.stage_channel_blocked_member_name;
+                    TextView textView = (TextView) view.findViewById(R.id.stage_channel_blocked_member_name);
                     if (textView != null) {
-                        i = 2131365231;
-                        ImageView imageView = (ImageView) view.findViewById(2131365231);
+                        i = R.id.stage_channel_blocked_member_speaker;
+                        ImageView imageView = (ImageView) view.findViewById(R.id.stage_channel_blocked_member_speaker);
                         if (imageView != null) {
-                            i = 2131365232;
-                            TextView textView2 = (TextView) view.findViewById(2131365232);
+                            i = R.id.stage_channel_blocked_text;
+                            TextView textView2 = (TextView) view.findViewById(R.id.stage_channel_blocked_text);
                             if (textView2 != null) {
-                                i = 2131365233;
-                                View findViewById = view.findViewById(2131365233);
+                                i = R.id.stage_channel_blocked_text_divider;
+                                View findViewById = view.findViewById(R.id.stage_channel_blocked_text_divider);
                                 if (findViewById != null) {
-                                    i = 2131365234;
-                                    TextView textView3 = (TextView) view.findViewById(2131365234);
+                                    i = R.id.stage_channel_blocked_text_speaker;
+                                    TextView textView3 = (TextView) view.findViewById(R.id.stage_channel_blocked_text_speaker);
                                     if (textView3 != null) {
                                         StageAudienceBlockedBottomSheetItemBinding stageAudienceBlockedBottomSheetItemBinding = new StageAudienceBlockedBottomSheetItemBinding((ConstraintLayout) view, constraintLayout, simpleDraweeView, cutoutView, textView, imageView, textView2, findViewById, textView3);
                                         m.checkNotNullExpressionValue(stageAudienceBlockedBottomSheetItemBinding, "StageAudienceBlockedBott…temBinding.bind(itemView)");
@@ -289,8 +290,8 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
                 ListItem.Participant participant = (ListItem.Participant) mGRecyclerDataPayload;
                 this.binding.f1632c.setCutoutEnabled(participant.isSpeaker());
                 ImageView imageView = this.binding.e;
-                imageView.setBackgroundResource(2131231281);
-                imageView.setImageResource(2131231786);
+                imageView.setBackgroundResource(R.drawable.drawable_uikit_white_circle);
+                imageView.setImageResource(R.drawable.ic_mic_grey_24dp);
                 imageView.setVisibility(participant.isSpeaker() ? 0 : 4);
                 imageView.setActivated(participant.isSpeaker());
                 View view = this.itemView;
@@ -298,16 +299,16 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
                 Resources resources = view.getResources();
                 TextView textView = this.binding.f;
                 m.checkNotNullExpressionValue(textView, "binding.stageChannelBlockedTextSpeaker");
-                textView.setText(participant.isSpeaker() ? resources.getString(2131893850) : resources.getString(2131893710));
+                textView.setText(participant.isSpeaker() ? resources.getString(R.string.stage_speaker) : resources.getString(R.string.stage_audience));
                 TextView textView2 = this.binding.d;
                 User user = participant.getParticipant().getUser();
                 String nickname = participant.getParticipant().getNickname();
                 Context context = textView2.getContext();
                 m.checkNotNullExpressionValue(context, "context");
-                textView2.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nickname, context, 2130968932, 2130969328, 2131427362, 2130968989, 2130969327, 2131427363));
+                textView2.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nickname, context, R.attr.colorHeaderPrimary, R.attr.font_primary_semibold, R.integer.uikit_textsize_large_sp, R.attr.colorTextMuted, R.attr.font_primary_normal, R.integer.uikit_textsize_medium_sp));
                 SimpleDraweeView simpleDraweeView = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.stageChannelBlockedMemberIcon");
-                IconUtils.setIcon$default(simpleDraweeView, participant.getParticipant().getUser().getUsername(), Long.valueOf(participant.getParticipant().getUser().getId()), participant.getParticipant().getUser().getAvatar(), 2131165290, 0, null, null, participant.getParticipant().getGuildMember(), 224, null);
+                IconUtils.setIcon$default(simpleDraweeView, participant.getParticipant().getUser().getUsername(), Long.valueOf(participant.getParticipant().getUser().getId()), participant.getParticipant().getUser().getAvatar(), Integer.valueOf((int) R.dimen.avatar_size_large), 0, null, null, participant.getParticipant().getGuildMember(), 224, null);
                 SimpleDraweeView simpleDraweeView2 = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.stageChannelBlockedMemberIcon");
                 simpleDraweeView2.setAlpha(0.5f);
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java
index 36b3cf0523..34173c1830 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.stage.sheet;
 
 import android.view.View;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetEndStageBottomSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -17,11 +18,11 @@ public final /* synthetic */ class WidgetEndStageBottomSheet$binding$2 extends k
 
     public final WidgetEndStageBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362243;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362243);
+        int i = R.id.cancel;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.cancel);
         if (materialButton != null) {
-            i = 2131362715;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362715);
+            i = R.id.confirm;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.confirm);
             if (materialButton2 != null) {
                 return new WidgetEndStageBottomSheetBinding((NestedScrollView) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
index d0d510a777..816a6d4cf8 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentKt;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetEndStageBottomSheetBinding;
 import com.discord.utilities.rest.RestAPI;
@@ -52,7 +53,7 @@ public final class WidgetEndStageBottomSheet extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(str, "requestKey");
             WidgetEndStageBottomSheet widgetEndStageBottomSheet = new WidgetEndStageBottomSheet();
-            widgetEndStageBottomSheet.setArguments(BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_CHANNEL_ID", Long.valueOf(j)), o.to("INTENT_EXTRA_REQUEST_KEY", str)));
+            widgetEndStageBottomSheet.setArguments(BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_CHANNEL_ID", Long.valueOf(j)), o.to(WidgetEndStageBottomSheet.EXTRA_REQUEST_KEY, str)));
             widgetEndStageBottomSheet.show(fragmentManager, WidgetEndStageBottomSheet.class.getSimpleName());
         }
     }
@@ -93,7 +94,7 @@ public final class WidgetEndStageBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559039;
+        return R.layout.widget_end_stage_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java
index 6bd3a65227..972feb675d 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.stage.sheet;
 
 import android.view.View;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageAudienceBlockedBottomSheetBinding;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import com.google.android.material.button.MaterialButton;
@@ -18,14 +19,14 @@ public final /* synthetic */ class WidgetStageAudienceBlockedBottomSheet$binding
 
     public final WidgetStageAudienceBlockedBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361812;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131361812);
+        int i = R.id.accept_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.accept_button);
         if (materialButton != null) {
-            i = 2131362135;
-            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131362135);
+            i = R.id.blocked_users;
+            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(R.id.blocked_users);
             if (maxHeightRecyclerView != null) {
-                i = 2131362245;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362245);
+                i = R.id.cancel_button;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.cancel_button);
                 if (materialButton2 != null) {
                     return new WidgetStageAudienceBlockedBottomSheetBinding((ConstraintLayout) view, materialButton, maxHeightRecyclerView, materialButton2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
index d39b6e9b38..75faf7a70c 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
@@ -10,6 +10,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetStageAudienceBlockedBottomSheetBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -50,7 +51,7 @@ public final class WidgetStageAudienceBlockedBottomSheet extends AppBottomSheet
         public final void show(FragmentManager fragmentManager, long j, boolean z2) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetStageAudienceBlockedBottomSheet widgetStageAudienceBlockedBottomSheet = new WidgetStageAudienceBlockedBottomSheet();
-            widgetStageAudienceBlockedBottomSheet.setArguments(BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_CHANNEL_ID", Long.valueOf(j)), o.to("LAUNCH_FULL_SCREEN", Boolean.valueOf(z2))));
+            widgetStageAudienceBlockedBottomSheet.setArguments(BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_CHANNEL_ID", Long.valueOf(j)), o.to(WidgetStageAudienceBlockedBottomSheet.EXTRA_LAUNCH_FULL_SCREEN, Boolean.valueOf(z2))));
             widgetStageAudienceBlockedBottomSheet.show(fragmentManager, WidgetStageAudienceBlockedBottomSheet.class.getSimpleName());
         }
     }
@@ -112,7 +113,7 @@ public final class WidgetStageAudienceBlockedBottomSheet extends AppBottomSheet
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559280;
+        return R.layout.widget_stage_audience_blocked_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java
index 44edaa8d1d..478baf54fa 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageAudienceNoticeBottomSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -20,41 +21,41 @@ public final /* synthetic */ class WidgetStageAudienceNoticeBottomSheet$binding$
 
     public final WidgetStageAudienceNoticeBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362181;
-        Barrier barrier = (Barrier) view.findViewById(2131362181);
+        int i = R.id.bottom_of_bullets;
+        Barrier barrier = (Barrier) view.findViewById(R.id.bottom_of_bullets);
         if (barrier != null) {
-            i = 2131362204;
-            ImageView imageView = (ImageView) view.findViewById(2131362204);
+            i = R.id.bullet_1_icon;
+            ImageView imageView = (ImageView) view.findViewById(R.id.bullet_1_icon);
             if (imageView != null) {
-                i = 2131362205;
-                TextView textView = (TextView) view.findViewById(2131362205);
+                i = R.id.bullet_1_label;
+                TextView textView = (TextView) view.findViewById(R.id.bullet_1_label);
                 if (textView != null) {
-                    i = 2131362206;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131362206);
+                    i = R.id.bullet_2_icon;
+                    ImageView imageView2 = (ImageView) view.findViewById(R.id.bullet_2_icon);
                     if (imageView2 != null) {
-                        i = 2131362207;
-                        TextView textView2 = (TextView) view.findViewById(2131362207);
+                        i = R.id.bullet_2_label;
+                        TextView textView2 = (TextView) view.findViewById(R.id.bullet_2_label);
                         if (textView2 != null) {
-                            i = 2131362208;
-                            ImageView imageView3 = (ImageView) view.findViewById(2131362208);
+                            i = R.id.bullet_3_icon;
+                            ImageView imageView3 = (ImageView) view.findViewById(R.id.bullet_3_icon);
                             if (imageView3 != null) {
-                                i = 2131362209;
-                                TextView textView3 = (TextView) view.findViewById(2131362209);
+                                i = R.id.bullet_3_label;
+                                TextView textView3 = (TextView) view.findViewById(R.id.bullet_3_label);
                                 if (textView3 != null) {
-                                    i = 2131362210;
-                                    ImageView imageView4 = (ImageView) view.findViewById(2131362210);
+                                    i = R.id.bullet_4_icon;
+                                    ImageView imageView4 = (ImageView) view.findViewById(R.id.bullet_4_icon);
                                     if (imageView4 != null) {
-                                        i = 2131362211;
-                                        TextView textView4 = (TextView) view.findViewById(2131362211);
+                                        i = R.id.bullet_4_label;
+                                        TextView textView4 = (TextView) view.findViewById(R.id.bullet_4_label);
                                         if (textView4 != null) {
-                                            i = 2131362212;
-                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362212);
+                                            i = R.id.button;
+                                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.button);
                                             if (materialButton != null) {
-                                                i = 2131365200;
-                                                ImageView imageView5 = (ImageView) view.findViewById(2131365200);
+                                                i = R.id.sparkle;
+                                                ImageView imageView5 = (ImageView) view.findViewById(R.id.sparkle);
                                                 if (imageView5 != null) {
-                                                    i = 2131365561;
-                                                    TextView textView5 = (TextView) view.findViewById(2131365561);
+                                                    i = R.id.title;
+                                                    TextView textView5 = (TextView) view.findViewById(R.id.title);
                                                     if (textView5 != null) {
                                                         return new WidgetStageAudienceNoticeBottomSheetBinding((CoordinatorLayout) view, barrier, imageView, textView, imageView2, textView2, imageView3, textView3, imageView4, textView4, materialButton, imageView5, textView5);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
index 5320faa57d..47cfdcaef8 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
 import com.discord.app.AppBottomSheet;
@@ -89,7 +90,7 @@ public final class WidgetStageAudienceNoticeBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559281;
+        return R.layout.widget_stage_audience_notice_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeManager.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeManager.java
index bf7d05d080..8b04f492aa 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeManager.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeManager.java
@@ -10,10 +10,10 @@ public final class WidgetStageAudienceNoticeManager {
     }
 
     public final boolean hasUserSeenAudienceNotice() {
-        return SharedPreferencesProvider.INSTANCE.get().getBoolean("STAGE_AUDIENCE_NOTICE_SHOWN_KEY", false);
+        return SharedPreferencesProvider.INSTANCE.get().getBoolean(STAGE_AUDIENCE_NOTICE_SHOWN_KEY, false);
     }
 
     public final void markUserSeenAudienceNotice() {
-        SharedPreferencesProvider.INSTANCE.get().edit().putBoolean("STAGE_AUDIENCE_NOTICE_SHOWN_KEY", true).apply();
+        SharedPreferencesProvider.INSTANCE.get().edit().putBoolean(STAGE_AUDIENCE_NOTICE_SHOWN_KEY, true).apply();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java
index 7f6c4546a2..1ff49bcf53 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageModeratorJoinBottomSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetStageModeratorJoinBottomSheet$binding$2
 
     public final WidgetStageModeratorJoinBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363930;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363930);
+        int i = R.id.join_audience;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.join_audience);
         if (materialButton != null) {
-            i = 2131363932;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363932);
+            i = R.id.join_speaker;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.join_speaker);
             if (materialButton2 != null) {
-                i = 2131365200;
-                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131365200);
+                i = R.id.sparkle;
+                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.sparkle);
                 if (appCompatImageView != null) {
-                    i = 2131365386;
-                    TextView textView = (TextView) view.findViewById(2131365386);
+                    i = R.id.subtitle;
+                    TextView textView = (TextView) view.findViewById(R.id.subtitle);
                     if (textView != null) {
-                        i = 2131365561;
-                        TextView textView2 = (TextView) view.findViewById(2131365561);
+                        i = R.id.title;
+                        TextView textView2 = (TextView) view.findViewById(R.id.title);
                         if (textView2 != null) {
                             return new WidgetStageModeratorJoinBottomSheetBinding((CoordinatorLayout) view, materialButton, materialButton2, appCompatImageView, textView, textView2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java
index 42a0131127..55bc658810 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.stage.sheet;
 
 import android.view.View;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -22,7 +23,7 @@ public final class WidgetStageModeratorJoinBottomSheet$onViewCreated$1 implement
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.e.o.g(this.this$0.this$0.getContext(), 2131893747, 0, null, 12);
+            c.a.e.o.g(this.this$0.this$0.getContext(), R.string.stage_channel_permission_microphone_denied, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
index b228db6bde..1d3a6fe548 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
@@ -7,6 +7,7 @@ import androidx.core.os.BundleKt;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetStageModeratorJoinBottomSheetBinding;
@@ -76,7 +77,7 @@ public final class WidgetStageModeratorJoinBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559289;
+        return R.layout.widget_stage_moderator_join_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java
index 70d10190aa..cc2c415383 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStagePublicNoticeBottomSheetBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.ScreenTitleView;
@@ -21,23 +22,23 @@ public final /* synthetic */ class WidgetStagePublicNoticeBottomSheet$binding$2
 
     public final WidgetStagePublicNoticeBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364601;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364601);
+        int i = R.id.public_notice_confirm;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.public_notice_confirm);
         if (materialButton != null) {
-            i = 2131364602;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364602);
+            i = R.id.public_notice_dismiss;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.public_notice_dismiss);
             if (materialButton2 != null) {
-                i = 2131364603;
-                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364603);
+                i = R.id.public_notice_header_icon;
+                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.public_notice_header_icon);
                 if (appCompatImageView != null) {
-                    i = 2131364604;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364604);
+                    i = R.id.public_notice_info_wrap;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.public_notice_info_wrap);
                     if (linearLayout != null) {
-                        i = 2131364605;
-                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364605);
+                        i = R.id.public_notice_title;
+                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(R.id.public_notice_title);
                         if (screenTitleView != null) {
-                            i = 2131364793;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364793);
+                            i = R.id.section_three;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.section_three);
                             if (linkifiedTextView != null) {
                                 return new WidgetStagePublicNoticeBottomSheetBinding((CoordinatorLayout) view, materialButton, materialButton2, appCompatImageView, linearLayout, screenTitleView, linkifiedTextView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java
index 1a1af5aee6..674ef0ec5e 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentManager;
 import c.a.e.f;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetStagePublicNoticeBottomSheetBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -36,7 +37,7 @@ public final class WidgetStagePublicNoticeBottomSheet extends AppBottomSheet {
 
         public static /* synthetic */ void registerForResult$default(Companion companion, Fragment fragment, String str, Function0 function0, int i, Object obj) {
             if ((i & 2) != 0) {
-                str = "PUBLIC_OPTION_REQUEST_KEY";
+                str = WidgetStagePublicNoticeBottomSheet.PUBLIC_OPTION_REQUEST_KEY;
             }
             companion.registerForResult(fragment, str, function0);
         }
@@ -64,7 +65,7 @@ public final class WidgetStagePublicNoticeBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559290;
+        return R.layout.widget_stage_public_notice_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -78,6 +79,6 @@ public final class WidgetStagePublicNoticeBottomSheet extends AppBottomSheet {
         getBinding().b.setOnClickListener(new WidgetStagePublicNoticeBottomSheet$onViewCreated$2(this));
         LinkifiedTextView linkifiedTextView = getBinding().d;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.sectionThree");
-        b.n(linkifiedTextView, 2131893908, new Object[]{f.a.a(1500010879761L, null)}, null, 4);
+        b.n(linkifiedTextView, R.string.start_stage_public_info_section_three, new Object[]{f.a.a(1500010879761L, null)}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java
index 4d8513ec94..b0239146fe 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.constraintlayout.widget.Group;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageRaisedHandsBottomSheetBinding;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import com.google.android.material.switchmaterial.SwitchMaterial;
@@ -21,45 +22,45 @@ public final /* synthetic */ class WidgetStageRaisedHandsBottomSheet$binding$2 e
 
     public final WidgetStageRaisedHandsBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363710;
-        View findViewById = view.findViewById(2131363710);
+        int i = R.id.header;
+        View findViewById = view.findViewById(R.id.header);
         if (findViewById != null) {
-            i = 2131364615;
-            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364615);
+            i = R.id.raised_hands_count_label;
+            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.raised_hands_count_label);
             if (materialTextView != null) {
-                i = 2131364616;
-                Group group = (Group) view.findViewById(2131364616);
+                i = R.id.raised_hands_empty_group;
+                Group group = (Group) view.findViewById(R.id.raised_hands_empty_group);
                 if (group != null) {
-                    i = 2131364617;
-                    ImageView imageView = (ImageView) view.findViewById(2131364617);
+                    i = R.id.raised_hands_empty_sparkle;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.raised_hands_empty_sparkle);
                     if (imageView != null) {
-                        i = 2131364618;
-                        MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131364618);
+                        i = R.id.raised_hands_empty_subtitle;
+                        MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(R.id.raised_hands_empty_subtitle);
                         if (materialTextView2 != null) {
-                            i = 2131364619;
-                            MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131364619);
+                            i = R.id.raised_hands_empty_title;
+                            MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(R.id.raised_hands_empty_title);
                             if (materialTextView3 != null) {
-                                i = 2131365264;
-                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365264);
+                                i = R.id.stage_raise_hands_enabled_toggle;
+                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(R.id.stage_raise_hands_enabled_toggle);
                                 if (switchMaterial != null) {
                                     CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
-                                    i = 2131365271;
-                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365271);
+                                    i = R.id.stage_raised_hands_recycler;
+                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(R.id.stage_raised_hands_recycler);
                                     if (maxHeightRecyclerView != null) {
-                                        i = 2131365386;
-                                        MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(2131365386);
+                                        i = R.id.subtitle;
+                                        MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(R.id.subtitle);
                                         if (materialTextView4 != null) {
-                                            i = 2131365561;
-                                            MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(2131365561);
+                                            i = R.id.title;
+                                            MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(R.id.title);
                                             if (materialTextView5 != null) {
-                                                i = 2131365566;
-                                                MaterialTextView materialTextView6 = (MaterialTextView) view.findViewById(2131365566);
+                                                i = R.id.toggle_speaker_state_button;
+                                                MaterialTextView materialTextView6 = (MaterialTextView) view.findViewById(R.id.toggle_speaker_state_button);
                                                 if (materialTextView6 != null) {
-                                                    i = 2131365567;
-                                                    Group group2 = (Group) view.findViewById(2131365567);
+                                                    i = R.id.toggle_speaker_state_group;
+                                                    Group group2 = (Group) view.findViewById(R.id.toggle_speaker_state_group);
                                                     if (group2 != null) {
-                                                        i = 2131365568;
-                                                        ImageView imageView2 = (ImageView) view.findViewById(2131365568);
+                                                        i = R.id.toggle_speaker_state_icon;
+                                                        ImageView imageView2 = (ImageView) view.findViewById(R.id.toggle_speaker_state_icon);
                                                         if (imageView2 != null) {
                                                             return new WidgetStageRaisedHandsBottomSheetBinding(coordinatorLayout, findViewById, materialTextView, group, imageView, materialTextView2, materialTextView3, switchMaterial, coordinatorLayout, maxHeightRecyclerView, materialTextView4, materialTextView5, materialTextView6, group2, imageView2);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java
index 4c6dcdfdf7..70990b2995 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.stage.sheet;
 
 import android.view.View;
+import com.discord.R;
 import com.discord.widgets.stage.sheet.WidgetStageRaisedHandsBottomSheetViewModel;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.e.o.g(this.this$0.this$0.getContext(), 2131893747, 0, null, 12);
+            c.a.e.o.g(this.this$0.this$0.getContext(), R.string.stage_channel_permission_microphone_denied, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$onResume$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$onResume$2.java
index b5cbd93033..86b6e18ab7 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$onResume$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$onResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.stage.sheet;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.stage.sheet.WidgetStageRaisedHandsBottomSheetViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetStageRaisedHandsBottomSheet$onResume$2 extends o implem
     }
 
     public final void invoke(WidgetStageRaisedHandsBottomSheetViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetStageRaisedHandsBottomSheet.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
index f78d4f66f4..60c5b6e4a5 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
@@ -16,6 +16,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetStageRaisedHandsBottomSheetBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
@@ -104,9 +105,9 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(materialTextView, "binding.toggleSpeakerStateButton");
         boolean isSpeaker = loaded.isSpeaker();
         if (isSpeaker) {
-            str = getString(2131891576);
+            str = getString(R.string.move_me_to_audience);
         } else if (!isSpeaker) {
-            str = getString(2131891564);
+            str = getString(R.string.moderator_raise_own_hand);
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -114,9 +115,9 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
         ImageView imageView = getBinding().h;
         boolean isSpeaker2 = loaded.isSpeaker();
         if (isSpeaker2) {
-            i = 2131232007;
+            i = R.drawable.ic_stage_move_to_audience;
         } else if (!isSpeaker2) {
-            i = 2131232008;
+            i = R.drawable.ic_stage_move_to_speaker;
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -126,7 +127,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
     private final void configureUI(WidgetStageRaisedHandsBottomSheetViewModel.ViewState viewState) {
         if (viewState instanceof WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded) {
             WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded loaded = (WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded) viewState;
-            getBinding().f.setText(loaded.isRequestToSpeakEnabled() ? 2131893001 : 2131893002);
+            getBinding().f.setText(loaded.isRequestToSpeakEnabled() ? R.string.request_to_speak_area_all_roles : R.string.request_to_speak_area_all_roles_disabled);
             SwitchMaterial switchMaterial = getBinding().d;
             switchMaterial.setEnabled(!loaded.isUpdatingRequestToSpeakPermissions());
             if (!loaded.isUpdatingRequestToSpeakPermissions()) {
@@ -141,7 +142,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
             group.setVisibility(loaded.isEmpty() ? 0 : 8);
             MaterialTextView materialTextView = getBinding().b;
             m.checkNotNullExpressionValue(materialTextView, "binding.raisedHandsCountLabel");
-            b.n(materialTextView, 2131893010, new Object[]{Integer.valueOf(loaded.getRaisedHandsParticipants().size())}, null, 4);
+            b.n(materialTextView, R.string.request_to_speak_list_title, new Object[]{Integer.valueOf(loaded.getRaisedHandsParticipants().size())}, null, 4);
             configureToggleSpeakerState(loaded);
             getAdapter().setData(loaded.getRaisedHandsParticipants());
         }
@@ -173,7 +174,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559291;
+        return R.layout.widget_stage_raised_hands_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -190,7 +191,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
         this.hasReceivedInitialRaisedHandsState = false;
         MaxHeightRecyclerView maxHeightRecyclerView = getBinding().e;
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(getContext(), 1);
-        Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131232409);
+        Drawable drawable = ContextCompat.getDrawable(view.getContext(), R.drawable.widget_stage_raised_hands_divider);
         if (drawable != null) {
             dividerItemDecoration.setDrawable(drawable);
         }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java
index dc0df4f0e7..3fe2dfae5f 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java
@@ -8,12 +8,14 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.role.GuildRole;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.StageRaisedHandsItemUserBinding;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
 import com.discord.stores.StoreVoiceParticipants;
+import com.discord.utilities.SnowflakeUtils;
 import com.discord.utilities.extensions.SimpleDraweeViewExtensionsKt;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
@@ -185,23 +187,23 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderParticipant(WidgetStageRaisedHandsBottomSheetAdapter widgetStageRaisedHandsBottomSheetAdapter) {
-            super(2131558679, widgetStageRaisedHandsBottomSheetAdapter);
+            super((int) R.layout.stage_raised_hands_item_user, widgetStageRaisedHandsBottomSheetAdapter);
             m.checkNotNullParameter(widgetStageRaisedHandsBottomSheetAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131365266;
-            ImageView imageView = (ImageView) view.findViewById(2131365266);
+            int i = R.id.stage_raised_hands_item_dismiss_button;
+            ImageView imageView = (ImageView) view.findViewById(R.id.stage_raised_hands_item_dismiss_button);
             if (imageView != null) {
-                i = 2131365267;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365267);
+                i = R.id.stage_raised_hands_item_invite_button;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.stage_raised_hands_item_invite_button);
                 if (imageView2 != null) {
-                    i = 2131365268;
-                    TextView textView = (TextView) view.findViewById(2131365268);
+                    i = R.id.stage_raised_hands_item_role;
+                    TextView textView = (TextView) view.findViewById(R.id.stage_raised_hands_item_role);
                     if (textView != null) {
-                        i = 2131365269;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365269);
+                        i = R.id.stage_raised_hands_item_user_avatar;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.stage_raised_hands_item_user_avatar);
                         if (simpleDraweeView != null) {
-                            i = 2131365270;
-                            TextView textView2 = (TextView) view.findViewById(2131365270);
+                            i = R.id.stage_raised_hands_item_user_name;
+                            TextView textView2 = (TextView) view.findViewById(R.id.stage_raised_hands_item_user_name);
                             if (textView2 != null) {
                                 StageRaisedHandsItemUserBinding stageRaisedHandsItemUserBinding = new StageRaisedHandsItemUserBinding((ConstraintLayout) view, imageView, imageView2, textView, simpleDraweeView, textView2);
                                 m.checkNotNullExpressionValue(stageRaisedHandsItemUserBinding, "StageRaisedHandsItemUserBinding.bind(itemView)");
@@ -222,14 +224,14 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
         private final String getParticipantMemberInfo(Context context, ListItem.Participant participant) {
             String f;
             if (isNewUser(participant.getParticipant().getUser())) {
-                String string = context.getString(2131893014);
+                String string = context.getString(R.string.request_to_speak_member_info_new_to_discord);
                 m.checkNotNullExpressionValue(string, "context.getString(R.stri…mber_info_new_to_discord)");
                 return string;
             }
             GuildMember member = participant.getMember();
             UtcDateTime joinedAt = member != null ? member.getJoinedAt() : null;
             if (joinedAt == null) {
-                String string2 = context.getString(2131893015);
+                String string2 = context.getString(R.string.request_to_speak_member_info_non_member);
                 m.checkNotNullExpressionValue(string2, "context.getString(R.stri…k_member_info_non_member)");
                 return string2;
             } else if (!participant.getMember().getRoles().isEmpty()) {
@@ -237,22 +239,22 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
                 if (role != null && (f = role.f()) != null) {
                     return f;
                 }
-                String string3 = context.getString(2131893012);
+                String string3 = context.getString(R.string.request_to_speak_member_info_member_roles);
                 m.checkNotNullExpressionValue(string3, "context.getString(R.stri…member_info_member_roles)");
                 return string3;
-            } else if (ClockFactory.get().currentTimeMillis() - joinedAt.g() < ((long) 86400000)) {
-                String string4 = context.getString(2131893013);
+            } else if (ClockFactory.get().currentTimeMillis() - joinedAt.g() < ((long) WidgetStageRaisedHandsBottomSheetAdapter.MILLIS_PER_DAY)) {
+                String string4 = context.getString(R.string.request_to_speak_member_info_new_member);
                 m.checkNotNullExpressionValue(string4, "context.getString(R.stri…k_member_info_new_member)");
                 return string4;
             } else {
-                String string5 = context.getString(2131893011);
+                String string5 = context.getString(R.string.request_to_speak_member_info_member);
                 m.checkNotNullExpressionValue(string5, "context.getString(R.stri…speak_member_info_member)");
                 return string5;
             }
         }
 
         private final boolean isNewUser(User user) {
-            return ClockFactory.get().currentTimeMillis() - ((user.getId() >>> 22) + 1420070400000L) <= ((long) 604800000);
+            return ClockFactory.get().currentTimeMillis() - ((user.getId() >>> 22) + SnowflakeUtils.DISCORD_EPOCH) <= ((long) 604800000);
         }
 
         public void onConfigure(int i, ListItem listItem) {
@@ -268,7 +270,7 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
             this.binding.b.setOnClickListener(new WidgetStageRaisedHandsBottomSheetAdapter$ViewHolderParticipant$onConfigure$3(this, component1));
             SimpleDraweeView simpleDraweeView = this.binding.e;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.stageRaisedHandsItemUserAvatar");
-            SimpleDraweeViewExtensionsKt.setUserIcon$default(simpleDraweeView, component1.getUser(), false, 2131165297, 2, null);
+            SimpleDraweeViewExtensionsKt.setUserIcon$default(simpleDraweeView, component1.getUser(), false, R.dimen.avatar_size_standard, 2, null);
             TextView textView = this.binding.f;
             m.checkNotNullExpressionValue(textView, "binding.stageRaisedHandsItemUserName");
             textView.setText(component1.getDisplayName());
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
index 83d2a24304..94eb4a7e86 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
@@ -5,6 +5,7 @@ import androidx.annotation.MainThread;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppViewModel;
 import com.discord.restapi.RestAPIParams;
@@ -553,7 +554,7 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
 
     @MainThread
     private final void handleStoreState(StoreState storeState) {
-        updateViewState(new ViewState.Loaded(storeState.getChannel(), storeState.getRaisedHandsParticipants(), PermissionUtils.INSTANCE.canEveryoneRole(4294967296L, storeState.getChannel(), storeState.getRoles()), StageRoles.m26isSpeakerimpl(storeState.m47getMyStageRoles1LxfuJo()), false, false, 48, null));
+        updateViewState(new ViewState.Loaded(storeState.getChannel(), storeState.getRaisedHandsParticipants(), PermissionUtils.INSTANCE.canEveryoneRole(Permission.REQUEST_TO_SPEAK, storeState.getChannel(), storeState.getRoles()), StageRoles.m26isSpeakerimpl(storeState.m47getMyStageRoles1LxfuJo()), false, false, 48, null));
     }
 
     private final Observable<Void> setUserSuppressed(long j, boolean z2) {
@@ -588,7 +589,7 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null) {
             updateViewState(ViewState.Loaded.copy$default(loaded, null, null, false, false, true, false, 47, null));
-            Pair<Long, Long> computeAllowDenyUpdateBits = PermissionOverwriteUtilsKt.computeAllowDenyUpdateBits(AnimatableValueParser.F0(loaded.getChannel(), loaded.getChannel().f()), 4294967296L, z2);
+            Pair<Long, Long> computeAllowDenyUpdateBits = PermissionOverwriteUtilsKt.computeAllowDenyUpdateBits(AnimatableValueParser.F0(loaded.getChannel(), loaded.getChannel().f()), Permission.REQUEST_TO_SPEAK, z2);
             long longValue = computeAllowDenyUpdateBits.component1().longValue();
             long longValue2 = computeAllowDenyUpdateBits.component2().longValue();
             Subscription subscription = this.lastRequestToSpeakSubscription;
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java
index c6de819033..4b2ede4d12 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageStartEventBottomSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputEditText;
@@ -21,29 +22,29 @@ public final /* synthetic */ class WidgetStageStartEventBottomSheet$binding$2 ex
 
     public final WidgetStageStartEventBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365200;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131365200);
+        int i = R.id.sparkle;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(R.id.sparkle);
         if (appCompatImageView != null) {
-            i = 2131365202;
-            TextView textView = (TextView) view.findViewById(2131365202);
+            i = R.id.speaker_hint;
+            TextView textView = (TextView) view.findViewById(R.id.speaker_hint);
             if (textView != null) {
-                i = 2131365288;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365288);
+                i = R.id.start_stage_button;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.start_stage_button);
                 if (materialButton != null) {
-                    i = 2131365386;
-                    TextView textView2 = (TextView) view.findViewById(2131365386);
+                    i = R.id.subtitle;
+                    TextView textView2 = (TextView) view.findViewById(R.id.subtitle);
                     if (textView2 != null) {
-                        i = 2131365561;
-                        TextView textView3 = (TextView) view.findViewById(2131365561);
+                        i = R.id.title;
+                        TextView textView3 = (TextView) view.findViewById(R.id.title);
                         if (textView3 != null) {
-                            i = 2131365578;
-                            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365578);
+                            i = R.id.topic_input;
+                            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.topic_input);
                             if (textInputEditText != null) {
-                                i = 2131365579;
-                                TextView textView4 = (TextView) view.findViewById(2131365579);
+                                i = R.id.topic_label;
+                                TextView textView4 = (TextView) view.findViewById(R.id.topic_label);
                                 if (textView4 != null) {
-                                    i = 2131365580;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365580);
+                                    i = R.id.topic_layout;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.topic_layout);
                                     if (textInputLayout != null) {
                                         return new WidgetStageStartEventBottomSheetBinding((CoordinatorLayout) view, appCompatImageView, textView, materialButton, textView2, textView3, textInputEditText, textView4, textInputLayout);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$onResume$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$onResume$1.java
index 9f38b6dfdd..18bf80c11e 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$onResume$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$onResume$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.stage.sheet;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.stage.sheet.WidgetStageStartEventBottomSheetViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetStageStartEventBottomSheet$onResume$1 extends o impleme
     }
 
     public final void invoke(WidgetStageStartEventBottomSheetViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetStageStartEventBottomSheet.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
index 26f7e9f493..47a26ce73a 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetStageStartEventBottomSheetBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -104,13 +105,13 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
             }
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.title");
-            textView.setText(getString(loaded.getStageInstance() == null ? 2131893871 : 2131888242));
+            textView.setText(getString(loaded.getStageInstance() == null ? R.string.start_stage_channel_event_modal_title : R.string.edit_stage_title));
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.subtitle");
-            textView2.setText(getString(loaded.getStageInstance() == null ? 2131893870 : 2131888241));
+            textView2.setText(getString(loaded.getStageInstance() == null ? R.string.start_stage_channel_event_modal_subtitle : R.string.edit_stage_subtitle));
             MaterialButton materialButton2 = getBinding().f1995c;
             m.checkNotNullExpressionValue(materialButton2, "binding.startStageButton");
-            materialButton2.setText(getString(loaded.getStageInstance() == null ? 2131893868 : 2131893353));
+            materialButton2.setText(getString(loaded.getStageInstance() == null ? R.string.start_stage_channel_event_modal_button : R.string.save_changes));
             TextView textView3 = getBinding().b;
             m.checkNotNullExpressionValue(textView3, "binding.speakerHint");
             if (loaded.getStageInstance() != null) {
@@ -150,7 +151,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559293;
+        return R.layout.widget_stage_start_event_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
index 8db81e5a29..85c2044726 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
@@ -3,10 +3,12 @@ package com.discord.widgets.stage.sheet;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.stageinstance.StageInstancePrivacyLevel;
 import com.discord.app.AppViewModel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreStageInstances;
 import com.discord.stores.StoreStream;
@@ -330,7 +332,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
             public Loaded(Channel channel, String str, StageInstance stageInstance) {
                 super(null);
                 m.checkNotNullParameter(channel, "channel");
-                m.checkNotNullParameter(str, "topic");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
                 this.channel = channel;
                 this.topic = str;
                 this.stageInstance = stageInstance;
@@ -363,7 +365,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
 
             public final Loaded copy(Channel channel, String str, StageInstance stageInstance) {
                 m.checkNotNullParameter(channel, "channel");
-                m.checkNotNullParameter(str, "topic");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
                 return new Loaded(channel, str, stageInstance);
             }
 
@@ -461,7 +463,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
 
     private final void emitSetStatusFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.SetTopicFailure(2131888073));
+        publishSubject.j.onNext(new Event.SetTopicFailure(R.string.default_failure_to_perform_action_message));
     }
 
     private final void emitSetStatusSuccessEvent(Channel channel) {
@@ -507,7 +509,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
             String obj = w.trim(topic).toString();
             String str = obj.length() > 0 ? obj : null;
             if (str == null) {
-                this.eventSubject.j.onNext(new Event.InvalidTopic(2131893874));
+                this.eventSubject.j.onNext(new Event.InvalidTopic(R.string.start_stage_channel_event_modal_topic_required));
             } else if (loaded.getStageInstance() == null) {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.INSTANCE.startStageInstance(this.channelId, str, StageInstancePrivacyLevel.GUILD_ONLY, false), false, 1, null), this, null, 2, null), WidgetStageStartEventBottomSheetViewModel.class, (Context) null, (Function1) null, new WidgetStageStartEventBottomSheetViewModel$openStage$1(this), (Function0) null, (Function0) null, new WidgetStageStartEventBottomSheetViewModel$openStage$2(this, z2, loaded), 54, (Object) null);
             } else {
@@ -517,7 +519,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
     }
 
     public final void setTopic(String str) {
-        m.checkNotNullParameter(str, "topic");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Loaded)) {
             viewState = null;
diff --git a/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageAdapter.java b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageAdapter.java
index c774ffc888..1875896235 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageAdapter.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageAdapter.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.ModeratorStartStageContinueItemBinding;
 import com.discord.databinding.ModeratorStartStageHeaderItemBinding;
 import com.discord.databinding.ModeratorStartStageListItemBinding;
@@ -49,7 +50,7 @@ public final class ModeratorStartStageAdapter extends MGRecyclerAdapterSimple<Mo
         public ContinueViewHolder(ModeratorStartStageAdapter moderatorStartStageAdapter, ModeratorStartStageContinueItemBinding moderatorStartStageContinueItemBinding, int i, DefaultConstructorMarker defaultConstructorMarker) {
             this(moderatorStartStageAdapter, moderatorStartStageContinueItemBinding);
             if ((i & 1) != 0) {
-                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(2131558570, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
+                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(R.layout.moderator_start_stage_continue_item, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
                 Objects.requireNonNull(inflate, "rootView");
                 ModeratorStartStageContinueItemBinding moderatorStartStageContinueItemBinding2 = new ModeratorStartStageContinueItemBinding((ConstraintLayout) inflate);
                 m.checkNotNullExpressionValue(moderatorStartStageContinueItemBinding2, "ModeratorStartStageConti…ontext), recycler, false)");
@@ -105,15 +106,15 @@ public final class ModeratorStartStageAdapter extends MGRecyclerAdapterSimple<Mo
         public HeaderViewHolder(ModeratorStartStageAdapter moderatorStartStageAdapter, ModeratorStartStageHeaderItemBinding moderatorStartStageHeaderItemBinding, int i, DefaultConstructorMarker defaultConstructorMarker) {
             this(moderatorStartStageAdapter, moderatorStartStageHeaderItemBinding);
             if ((i & 1) != 0) {
-                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(2131558571, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
-                int i2 = 2131364163;
-                ImageView imageView = (ImageView) inflate.findViewById(2131364163);
+                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(R.layout.moderator_start_stage_header_item, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
+                int i2 = R.id.moderator_start_stage_icon;
+                ImageView imageView = (ImageView) inflate.findViewById(R.id.moderator_start_stage_icon);
                 if (imageView != null) {
-                    i2 = 2131364164;
-                    TextView textView = (TextView) inflate.findViewById(2131364164);
+                    i2 = R.id.moderator_start_stage_subtitle;
+                    TextView textView = (TextView) inflate.findViewById(R.id.moderator_start_stage_subtitle);
                     if (textView != null) {
-                        i2 = 2131364165;
-                        TextView textView2 = (TextView) inflate.findViewById(2131364165);
+                        i2 = R.id.moderator_start_stage_title;
+                        TextView textView2 = (TextView) inflate.findViewById(R.id.moderator_start_stage_title);
                         if (textView2 != null) {
                             ModeratorStartStageHeaderItemBinding moderatorStartStageHeaderItemBinding2 = new ModeratorStartStageHeaderItemBinding((ConstraintLayout) inflate, imageView, textView, textView2);
                             m.checkNotNullExpressionValue(moderatorStartStageHeaderItemBinding2, "ModeratorStartStageHeade…ontext), recycler, false)");
@@ -149,21 +150,21 @@ public final class ModeratorStartStageAdapter extends MGRecyclerAdapterSimple<Mo
         public ListItemViewHolder(ModeratorStartStageAdapter moderatorStartStageAdapter, ModeratorStartStageListItemBinding moderatorStartStageListItemBinding, int i, DefaultConstructorMarker defaultConstructorMarker) {
             this(moderatorStartStageAdapter, moderatorStartStageListItemBinding);
             if ((i & 1) != 0) {
-                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(2131558572, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
-                int i2 = 2131361987;
-                ImageView imageView = (ImageView) inflate.findViewById(2131361987);
+                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(R.layout.moderator_start_stage_list_item, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
+                int i2 = R.id.arrow;
+                ImageView imageView = (ImageView) inflate.findViewById(R.id.arrow);
                 if (imageView != null) {
-                    i2 = 2131363730;
-                    ImageView imageView2 = (ImageView) inflate.findViewById(2131363730);
+                    i2 = R.id.icon;
+                    ImageView imageView2 = (ImageView) inflate.findViewById(R.id.icon);
                     if (imageView2 != null) {
-                        i2 = 2131363731;
-                        ImageView imageView3 = (ImageView) inflate.findViewById(2131363731);
+                        i2 = R.id.icon_bg;
+                        ImageView imageView3 = (ImageView) inflate.findViewById(R.id.icon_bg);
                         if (imageView3 != null) {
-                            i2 = 2131365386;
-                            MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131365386);
+                            i2 = R.id.subtitle;
+                            MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(R.id.subtitle);
                             if (materialTextView != null) {
-                                i2 = 2131365561;
-                                MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131365561);
+                                i2 = R.id.title;
+                                MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(R.id.title);
                                 if (materialTextView2 != null) {
                                     ModeratorStartStageListItemBinding moderatorStartStageListItemBinding2 = new ModeratorStartStageListItemBinding((ConstraintLayout) inflate, imageView, imageView2, imageView3, materialTextView, materialTextView2);
                                     m.checkNotNullExpressionValue(moderatorStartStageListItemBinding2, "ModeratorStartStageListI…ontext), recycler, false)");
@@ -205,7 +206,7 @@ public final class ModeratorStartStageAdapter extends MGRecyclerAdapterSimple<Mo
                 materialTextView3.setText(event.getEvent().f());
                 MaterialTextView materialTextView4 = this.binding.d;
                 m.checkNotNullExpressionValue(materialTextView4, "binding.subtitle");
-                materialTextView4.setText(b.h(this.this$0.getContext(), 2131889312, new Object[]{GuildScheduledEventUtilitiesKt.getEventStartingTimeString(event.getEvent(), this.this$0.getContext())}, null, 4));
+                materialTextView4.setText(b.h(this.this$0.getContext(), R.string.guild_event_start_prompt_description, new Object[]{GuildScheduledEventUtilitiesKt.getEventStartingTimeString(event.getEvent(), this.this$0.getContext())}, null, 4));
             }
         }
     }
@@ -229,12 +230,12 @@ public final class ModeratorStartStageAdapter extends MGRecyclerAdapterSimple<Mo
         public WaitingViewHolder(ModeratorStartStageAdapter moderatorStartStageAdapter, ModeratorStartStageWaitingItemBinding moderatorStartStageWaitingItemBinding, int i, DefaultConstructorMarker defaultConstructorMarker) {
             this(moderatorStartStageAdapter, moderatorStartStageWaitingItemBinding);
             if ((i & 1) != 0) {
-                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(2131558573, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
-                int i2 = 2131364166;
-                UserSummaryView userSummaryView = (UserSummaryView) inflate.findViewById(2131364166);
+                View inflate = LayoutInflater.from(moderatorStartStageAdapter.getContext()).inflate(R.layout.moderator_start_stage_waiting_item, (ViewGroup) moderatorStartStageAdapter.getRecycler(), false);
+                int i2 = R.id.moderator_start_stage_waiting_user_list;
+                UserSummaryView userSummaryView = (UserSummaryView) inflate.findViewById(R.id.moderator_start_stage_waiting_user_list);
                 if (userSummaryView != null) {
-                    i2 = 2131364167;
-                    TextView textView = (TextView) inflate.findViewById(2131364167);
+                    i2 = R.id.moderator_start_stage_waiting_user_text;
+                    TextView textView = (TextView) inflate.findViewById(R.id.moderator_start_stage_waiting_user_text);
                     if (textView != null) {
                         ModeratorStartStageWaitingItemBinding moderatorStartStageWaitingItemBinding2 = new ModeratorStartStageWaitingItemBinding((ConstraintLayout) inflate, userSummaryView, textView);
                         m.checkNotNullExpressionValue(moderatorStartStageWaitingItemBinding2, "ModeratorStartStageWaiti…ontext), recycler, false)");
@@ -260,11 +261,11 @@ public final class ModeratorStartStageAdapter extends MGRecyclerAdapterSimple<Mo
             int size = waiting.getUsers().size();
             CharSequence charSequence = null;
             if (size == 1) {
-                charSequence = b.h(this.this$0.getContext(), 2131893712, new Object[]{waiting.getUsers().get(0).getNickOrUserName()}, null, 4);
+                charSequence = b.h(this.this$0.getContext(), R.string.stage_audience_waiting_one, new Object[]{waiting.getUsers().get(0).getNickOrUserName()}, null, 4);
             } else if (size == 2) {
-                charSequence = b.h(this.this$0.getContext(), 2131893713, new Object[]{waiting.getUsers().get(0).getNickOrUserName(), waiting.getUsers().get(1).getNickOrUserName()}, null, 4);
+                charSequence = b.h(this.this$0.getContext(), R.string.stage_audience_waiting_two, new Object[]{waiting.getUsers().get(0).getNickOrUserName(), waiting.getUsers().get(1).getNickOrUserName()}, null, 4);
             } else if (size == 3) {
-                charSequence = StringResourceUtilsKt.getI18nPluralString(this.this$0.getContext(), 2131755330, waiting.getUsers().size() - 2, waiting.getUsers().get(0).getNickOrUserName(), waiting.getUsers().get(1).getNickOrUserName());
+                charSequence = StringResourceUtilsKt.getI18nPluralString(this.this$0.getContext(), R.plurals.stage_audience_waiting_many_numOthers, waiting.getUsers().size() - 2, waiting.getUsers().get(0).getNickOrUserName(), waiting.getUsers().get(1).getNickOrUserName());
             }
             ViewExtensions.setTextAndVisibilityBy(textView, charSequence);
         }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageItem.java b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageItem.java
index 7beee88129..81b5a9549b 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageItem.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageItem.java
@@ -3,7 +3,9 @@ package com.discord.widgets.stage.start;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
 import com.discord.models.guild.UserGuildMember;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
@@ -207,8 +209,8 @@ public abstract class ModeratorStartStageItem implements MGRecyclerDataPayload {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Event(GuildScheduledEvent guildScheduledEvent) {
-                super(0, String.valueOf(guildScheduledEvent.e()), 2131231629, 2131100254, 1, null);
-                m.checkNotNullParameter(guildScheduledEvent, "event");
+                super(0, String.valueOf(guildScheduledEvent.e()), R.drawable.ic_event_20dp, R.color.status_green_600, 1, null);
+                m.checkNotNullParameter(guildScheduledEvent, NotificationCompat.CATEGORY_EVENT);
                 this.event = guildScheduledEvent;
             }
 
@@ -224,7 +226,7 @@ public abstract class ModeratorStartStageItem implements MGRecyclerDataPayload {
             }
 
             public final Event copy(GuildScheduledEvent guildScheduledEvent) {
-                m.checkNotNullParameter(guildScheduledEvent, "event");
+                m.checkNotNullParameter(guildScheduledEvent, NotificationCompat.CATEGORY_EVENT);
                 return new Event(guildScheduledEvent);
             }
 
@@ -273,14 +275,14 @@ public abstract class ModeratorStartStageItem implements MGRecyclerDataPayload {
 
                 /* JADX INFO: super call moved to the top of the method (can break code semantics) */
                 public ScheduleEvent(String str) {
-                    super(str, 2131231629, 2131099764, 2131893360, 2131893361, null);
+                    super(str, R.drawable.ic_event_20dp, R.color.brand_new_500, R.string.schedule_event, R.string.schedule_event_description, null);
                     m.checkNotNullParameter(str, "key");
                     this.key = str;
                 }
 
                 /* JADX INFO: this call moved to the top of the method (can break code semantics) */
                 public /* synthetic */ ScheduleEvent(String str, int i, DefaultConstructorMarker defaultConstructorMarker) {
-                    this((i & 1) != 0 ? "KEY_SCHEDULE_EVENT" : str);
+                    this((i & 1) != 0 ? ModeratorStartStageItem.KEY_SCHEDULE_EVENT : str);
                 }
 
                 public static /* synthetic */ ScheduleEvent copy$default(ScheduleEvent scheduleEvent, String str, int i, Object obj) {
@@ -337,14 +339,14 @@ public abstract class ModeratorStartStageItem implements MGRecyclerDataPayload {
 
                 /* JADX INFO: super call moved to the top of the method (can break code semantics) */
                 public StartStage(String str) {
-                    super(str, 2131231514, 2131100254, 2131893750, 2131893749, null);
+                    super(str, R.drawable.ic_channel_stage_24dp, R.color.status_green_600, R.string.stage_channel_start_title, R.string.stage_channel_start_subtitle, null);
                     m.checkNotNullParameter(str, "key");
                     this.key = str;
                 }
 
                 /* JADX INFO: this call moved to the top of the method (can break code semantics) */
                 public /* synthetic */ StartStage(String str, int i, DefaultConstructorMarker defaultConstructorMarker) {
-                    this((i & 1) != 0 ? "KEY_START_STAGE" : str);
+                    this((i & 1) != 0 ? ModeratorStartStageItem.KEY_START_STAGE : str);
                 }
 
                 public static /* synthetic */ StartStage copy$default(StartStage startStage, String str, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java
index e7aca32d43..b6fca7a606 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.f;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetStartStageServerSelectionBulletItemBinding;
 import com.discord.databinding.WidgetStartStageServerSelectionGuildItemBinding;
 import com.discord.utilities.icon.IconUtils;
@@ -34,18 +35,18 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public BulletViewHolder(StartStageServerSelectionAdapter startStageServerSelectionAdapter) {
-            super(2131559296, startStageServerSelectionAdapter);
+            super(R.layout.widget_start_stage_server_selection_bullet_item, startStageServerSelectionAdapter);
             m.checkNotNullParameter(startStageServerSelectionAdapter, "adapter");
             View view = this.itemView;
             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-            int i = 2131365293;
-            ImageView imageView = (ImageView) view.findViewById(2131365293);
+            int i = R.id.start_stage_server_selection_bullet_item_divider;
+            ImageView imageView = (ImageView) view.findViewById(R.id.start_stage_server_selection_bullet_item_divider);
             if (imageView != null) {
-                i = 2131365294;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365294);
+                i = R.id.start_stage_server_selection_bullet_item_icon;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.start_stage_server_selection_bullet_item_icon);
                 if (imageView2 != null) {
-                    i = 2131365295;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365295);
+                    i = R.id.start_stage_server_selection_bullet_item_text;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.start_stage_server_selection_bullet_item_text);
                     if (linkifiedTextView != null) {
                         WidgetStartStageServerSelectionBulletItemBinding widgetStartStageServerSelectionBulletItemBinding = new WidgetStartStageServerSelectionBulletItemBinding((ConstraintLayout) view, constraintLayout, imageView, imageView2, linkifiedTextView);
                         m.checkNotNullExpressionValue(widgetStartStageServerSelectionBulletItemBinding, "WidgetStartStageServerSe…temBinding.bind(itemView)");
@@ -91,7 +92,7 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
                 this.binding.d.setImageResource(bulletItem.getImageRes());
                 LinkifiedTextView linkifiedTextView = this.binding.e;
                 m.checkNotNullExpressionValue(linkifiedTextView, "binding.startStageServerSelectionBulletItemText");
-                if (bulletItem.getStringRes() != 2131893889) {
+                if (bulletItem.getStringRes() != R.string.start_stage_modal_server_selection_bullet_1) {
                     m.checkNotNullExpressionValue(context, "context");
                     charSequence = b.h(context, bulletItem.getStringRes(), new Object[0], null, 4);
                 } else {
@@ -109,21 +110,21 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GuildViewHolder(StartStageServerSelectionAdapter startStageServerSelectionAdapter) {
-            super(2131559297, startStageServerSelectionAdapter);
+            super(R.layout.widget_start_stage_server_selection_guild_item, startStageServerSelectionAdapter);
             m.checkNotNullParameter(startStageServerSelectionAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131365298;
-            ImageView imageView = (ImageView) view.findViewById(2131365298);
+            int i = R.id.start_stage_server_selection_guild_item_arrow;
+            ImageView imageView = (ImageView) view.findViewById(R.id.start_stage_server_selection_guild_item_arrow);
             if (imageView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131365300;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365300);
+                i = R.id.start_stage_server_selection_guild_item_divider;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.start_stage_server_selection_guild_item_divider);
                 if (imageView2 != null) {
-                    i = 2131365301;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365301);
+                    i = R.id.start_stage_server_selection_guild_item_icon;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.start_stage_server_selection_guild_item_icon);
                     if (simpleDraweeView != null) {
-                        i = 2131365302;
-                        TextView textView = (TextView) view.findViewById(2131365302);
+                        i = R.id.start_stage_server_selection_guild_item_text;
+                        TextView textView = (TextView) view.findViewById(R.id.start_stage_server_selection_guild_item_text);
                         if (textView != null) {
                             WidgetStartStageServerSelectionGuildItemBinding widgetStartStageServerSelectionGuildItemBinding = new WidgetStartStageServerSelectionGuildItemBinding(constraintLayout, imageView, constraintLayout, imageView2, simpleDraweeView, textView);
                             m.checkNotNullExpressionValue(widgetStartStageServerSelectionGuildItemBinding, "WidgetStartStageServerSe…temBinding.bind(itemView)");
@@ -208,13 +209,13 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
             int ordinal = startStageServerSelectionItem.getPosition().ordinal();
             boolean z2 = true;
             if (ordinal == 0) {
-                i2 = 2131231059;
+                i2 = R.drawable.drawable_bg_start_stage_list_item_top;
             } else if (ordinal == 1) {
-                i2 = 2131231057;
+                i2 = R.drawable.drawable_bg_start_stage_list_item_middle;
             } else if (ordinal == 2) {
-                i2 = 2131231056;
+                i2 = R.drawable.drawable_bg_start_stage_list_item_bottom;
             } else if (ordinal == 3) {
-                i2 = 2131231058;
+                i2 = R.drawable.drawable_bg_start_stage_list_item_only;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionItem.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionItem.java
index 74db0b4920..8ec4a6c9a2 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionItem.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionItem.java
@@ -4,6 +4,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.models.guild.Guild;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import d0.z.d.m;
@@ -25,7 +26,7 @@ public abstract class StartStageServerSelectionItem implements MGRecyclerDataPay
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public BulletItem(@DrawableRes int i, @StringRes int i2, ItemPosition itemPosition, int i3, String str) {
             super(null);
-            m.checkNotNullParameter(itemPosition, "position");
+            m.checkNotNullParameter(itemPosition, ModelAuditLogEntry.CHANGE_KEY_POSITION);
             m.checkNotNullParameter(str, "key");
             this.imageRes = i;
             this.stringRes = i2;
@@ -88,7 +89,7 @@ public abstract class StartStageServerSelectionItem implements MGRecyclerDataPay
         }
 
         public final BulletItem copy(@DrawableRes int i, @StringRes int i2, ItemPosition itemPosition, int i3, String str) {
-            m.checkNotNullParameter(itemPosition, "position");
+            m.checkNotNullParameter(itemPosition, ModelAuditLogEntry.CHANGE_KEY_POSITION);
             m.checkNotNullParameter(str, "key");
             return new BulletItem(i, i2, itemPosition, i3, str);
         }
@@ -178,7 +179,7 @@ public abstract class StartStageServerSelectionItem implements MGRecyclerDataPay
             super(null);
             m.checkNotNullParameter(guild, "guild");
             m.checkNotNullParameter(channel, "defaultStageChannel");
-            m.checkNotNullParameter(itemPosition, "position");
+            m.checkNotNullParameter(itemPosition, ModelAuditLogEntry.CHANGE_KEY_POSITION);
             m.checkNotNullParameter(str, "key");
             this.guild = guild;
             this.defaultStageChannel = channel;
@@ -234,7 +235,7 @@ public abstract class StartStageServerSelectionItem implements MGRecyclerDataPay
         public final GuildItem copy(Guild guild, Channel channel, ItemPosition itemPosition, int i, String str) {
             m.checkNotNullParameter(guild, "guild");
             m.checkNotNullParameter(channel, "defaultStageChannel");
-            m.checkNotNullParameter(itemPosition, "position");
+            m.checkNotNullParameter(itemPosition, ModelAuditLogEntry.CHANGE_KEY_POSITION);
             m.checkNotNullParameter(str, "key");
             return new GuildItem(guild, channel, itemPosition, i, str);
         }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java
index 581c99347b..012a7ae13b 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.stage.start;
 import android.content.Context;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppViewModel;
 import com.discord.models.guild.Guild;
@@ -196,7 +197,7 @@ public final class StartStageServerSelectionViewModel extends AppViewModel<ViewS
 
     static {
         StartStageServerSelectionItem.ItemPosition itemPosition = StartStageServerSelectionItem.ItemPosition.Middle;
-        bulletItems = n.listOf((Object[]) new StartStageServerSelectionItem.BulletItem[]{new StartStageServerSelectionItem.BulletItem(2131231746, 2131893889, StartStageServerSelectionItem.ItemPosition.Top, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131231514, 2131893890, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131232116, 2131893891, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131231932, 2131893892, StartStageServerSelectionItem.ItemPosition.Bottom, 0, null, 24, null)});
+        bulletItems = n.listOf((Object[]) new StartStageServerSelectionItem.BulletItem[]{new StartStageServerSelectionItem.BulletItem(R.drawable.ic_house_24dp, R.string.start_stage_modal_server_selection_bullet_1, StartStageServerSelectionItem.ItemPosition.Top, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(R.drawable.ic_channel_stage_24dp, R.string.start_stage_modal_server_selection_bullet_2, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(R.drawable.ic_wand_24dp, R.string.start_stage_modal_server_selection_bullet_3, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(R.drawable.ic_raised_hand_action_24dp, R.string.start_stage_modal_server_selection_bullet_4, StartStageServerSelectionItem.ItemPosition.Bottom, 0, null, 24, null)});
     }
 
     public StartStageServerSelectionViewModel() {
@@ -233,7 +234,7 @@ public final class StartStageServerSelectionViewModel extends AppViewModel<ViewS
         if (getViewState() == null) {
             StageDiscoveryAnalyticsTracker.INSTANCE.trackStageDiscoveryStartStageClicked(z2);
         }
-        int i = !z2 ? 2131893895 : 2131893897;
+        int i = !z2 ? R.string.start_stage_modal_server_selection_empty_title : R.string.start_stage_modal_server_selection_title;
         if (!z2) {
             list = bulletItems;
         } else {
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage$binding$2.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage$binding$2.java
index 5604aef1cd..4c487e8174 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.Button;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetModeratorStartStageBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetModeratorStartStage$binding$2 extends k
 
     public final WidgetModeratorStartStageBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364162;
-        Button button = (Button) view.findViewById(2131364162);
+        int i = R.id.moderator_start_stage_exit_stage_button;
+        Button button = (Button) view.findViewById(R.id.moderator_start_stage_exit_stage_button);
         if (button != null) {
-            i = 2131364624;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+            i = R.id.recycler_view;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
             if (recyclerView != null) {
                 return new WidgetModeratorStartStageBinding((ConstraintLayout) view, button, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java
index 6b1ca9d36a..0287c57ac1 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java
@@ -13,6 +13,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppTransitionActivity;
 import com.discord.databinding.WidgetModeratorStartStageBinding;
@@ -63,7 +64,7 @@ public final class WidgetModeratorStartStage extends AppFragment {
     }
 
     public WidgetModeratorStartStage() {
-        super(2131559146);
+        super(R.layout.widget_moderator_start_stage);
         WidgetModeratorStartStage$viewModel$2 widgetModeratorStartStage$viewModel$2 = new WidgetModeratorStartStage$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ModeratorStartStageViewModel.class), new WidgetModeratorStartStage$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetModeratorStartStage$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java
index 92223aea02..cf108d1be0 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetStartStageServerSelectionBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -20,26 +21,26 @@ public final /* synthetic */ class WidgetStartStageServerSelection$binding$2 ext
 
     public final WidgetStartStageServerSelectionBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362675;
-        ImageView imageView = (ImageView) view.findViewById(2131362675);
+        int i = R.id.close_button;
+        ImageView imageView = (ImageView) view.findViewById(R.id.close_button);
         if (imageView != null) {
-            i = 2131364624;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364624);
+            i = R.id.recycler_view;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
             if (recyclerView != null) {
-                i = 2131365291;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365291);
+                i = R.id.start_stage_server_selection_banner;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.start_stage_server_selection_banner);
                 if (imageView2 != null) {
-                    i = 2131365296;
-                    Button button = (Button) view.findViewById(2131365296);
+                    i = R.id.start_stage_server_selection_button;
+                    Button button = (Button) view.findViewById(R.id.start_stage_server_selection_button);
                     if (button != null) {
-                        i = 2131365297;
-                        TextView textView = (TextView) view.findViewById(2131365297);
+                        i = R.id.start_stage_server_selection_button_hint;
+                        TextView textView = (TextView) view.findViewById(R.id.start_stage_server_selection_button_hint);
                         if (textView != null) {
-                            i = 2131365303;
-                            TextView textView2 = (TextView) view.findViewById(2131365303);
+                            i = R.id.start_stage_server_selection_subtitle;
+                            TextView textView2 = (TextView) view.findViewById(R.id.start_stage_server_selection_subtitle);
                             if (textView2 != null) {
-                                i = 2131365304;
-                                TextView textView3 = (TextView) view.findViewById(2131365304);
+                                i = R.id.start_stage_server_selection_title;
+                                TextView textView3 = (TextView) view.findViewById(R.id.start_stage_server_selection_title);
                                 if (textView3 != null) {
                                     return new WidgetStartStageServerSelectionBinding((ConstraintLayout) view, imageView, recyclerView, imageView2, button, textView, textView2, textView3);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java
index 4b16cd182e..d044521ed9 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java
@@ -16,6 +16,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetStartStageServerSelectionBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -77,7 +78,7 @@ public final class WidgetStartStageServerSelection extends AppFragment {
     }
 
     public WidgetStartStageServerSelection() {
-        super(2131559295);
+        super(R.layout.widget_start_stage_server_selection);
         WidgetStartStageServerSelection$viewModel$2 widgetStartStageServerSelection$viewModel$2 = WidgetStartStageServerSelection$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(StartStageServerSelectionViewModel.class), new WidgetStartStageServerSelection$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetStartStageServerSelection$viewModel$2));
diff --git a/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java b/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java
index 19d36581ea..6797059eb3 100644
--- a/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java
+++ b/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java
@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.voice.state.StageRequestToSpeakState;
 import com.discord.databinding.UserProfileStageActionsViewBinding;
@@ -216,13 +217,13 @@ public final class UserProfileStageActionsView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558728, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.user_profile_stage_actions_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365697;
-        TextView textView = (TextView) inflate.findViewById(2131365697);
+        int i = R.id.user_profile_stage_invite_to_speak;
+        TextView textView = (TextView) inflate.findViewById(R.id.user_profile_stage_invite_to_speak);
         if (textView != null) {
-            i = 2131365698;
-            TextView textView2 = (TextView) inflate.findViewById(2131365698);
+            i = R.id.user_profile_stage_move_to_audience;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.user_profile_stage_move_to_audience);
             if (textView2 != null) {
                 UserProfileStageActionsViewBinding userProfileStageActionsViewBinding = new UserProfileStageActionsViewBinding((LinearLayout) inflate, textView, textView2);
                 m.checkNotNullExpressionValue(userProfileStageActionsViewBinding, "UserProfileStageActionsV…rom(context), this, true)");
@@ -254,8 +255,8 @@ public final class UserProfileStageActionsView extends LinearLayout {
         TextView textView = this.binding.b;
         textView.setVisibility(viewState.getUserRequestToSpeakState().getCanBeInvitedToSpeak() ? 0 : 8);
         textView.setEnabled(!viewState.isInvitingToSpeak());
-        textView.setText(viewState.isMe() ? 2131891564 : 2131893752);
-        DrawableCompat.setCompoundDrawablesCompat$default(textView, viewState.isMe() ? 2131232008 : 2131232005, 0, 0, 0, 14, (Object) null);
+        textView.setText(viewState.isMe() ? R.string.moderator_raise_own_hand : R.string.stage_channel_user_invite_to_speak);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView, viewState.isMe() ? R.drawable.ic_stage_move_to_speaker : R.drawable.ic_stage_invite_speak, 0, 0, 0, 14, (Object) null);
         TextView textView2 = this.binding.f1645c;
         StageRoles r3 = viewState.m51getUserStageRoletwRsX0();
         if (r3 != null && StageRoles.m26isSpeakerimpl(r3.m28unboximpl())) {
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java
index 541471777b..05f45b8fd9 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetChatStatusBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -19,11 +20,11 @@ public final /* synthetic */ class WidgetChatStatus$binding$2 extends k implemen
     public final WidgetChatStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         LinearLayout linearLayout = (LinearLayout) view;
-        int i = 2131362630;
-        ImageView imageView = (ImageView) view.findViewById(2131362630);
+        int i = R.id.chat_status_unread_messages_mark;
+        ImageView imageView = (ImageView) view.findViewById(R.id.chat_status_unread_messages_mark);
         if (imageView != null) {
-            i = 2131362631;
-            TextView textView = (TextView) view.findViewById(2131362631);
+            i = R.id.chat_status_unread_messages_text;
+            TextView textView = (TextView) view.findViewById(R.id.chat_status_unread_messages_text);
             if (textView != null) {
                 return new WidgetChatStatusBinding((LinearLayout) view, linearLayout, imageView, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
index 3259d25eea..a9b6357606 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.MainThread;
 import androidx.fragment.app.Fragment;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChatStatusBinding;
 import com.discord.models.application.Unread;
@@ -194,7 +195,7 @@ public final class WidgetChatStatus extends AppFragment {
     }
 
     public WidgetChatStatus() {
-        super(2131558998);
+        super(R.layout.widget_chat_status);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChatStatus widgetChatStatus, Model model) {
@@ -222,14 +223,14 @@ public final class WidgetChatStatus extends AppFragment {
         if (z2) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            return c.a.l.b.i(resources, 2131891668, new Object[]{String.valueOf(i), renderUtcDate$default}, null, 4);
+            return c.a.l.b.i(resources, R.string.new_messages_estimated, new Object[]{String.valueOf(i), renderUtcDate$default}, null, 4);
         }
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755232, i, Integer.valueOf(i));
+        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.new_messages_count, i, Integer.valueOf(i));
         Resources resources3 = getResources();
         m.checkNotNullExpressionValue(resources3, "resources");
-        return c.a.l.b.i(resources3, 2131891666, new Object[]{quantityString, renderUtcDate$default}, null, 4);
+        return c.a.l.b.i(resources3, R.string.new_messages, new Object[]{quantityString, renderUtcDate$default}, null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java
index b68aa34d1c..4a69ed2edf 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetGlobalStatusIndicatorBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -19,27 +20,27 @@ public final /* synthetic */ class WidgetGlobalStatusIndicator$binding$2 extends
 
     public final WidgetGlobalStatusIndicatorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361951;
-        TextView textView = (TextView) view.findViewById(2131361951);
+        int i = R.id.alert_text;
+        TextView textView = (TextView) view.findViewById(R.id.alert_text);
         if (textView != null) {
             LinearLayout linearLayout = (LinearLayout) view;
-            i = 2131363776;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363776);
+            i = R.id.indicator_accept;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.indicator_accept);
             if (materialButton != null) {
-                i = 2131363777;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363777);
+                i = R.id.indicator_actions;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.indicator_actions);
                 if (linearLayout2 != null) {
-                    i = 2131363778;
-                    LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363778);
+                    i = R.id.indicator_content;
+                    LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.indicator_content);
                     if (linearLayout3 != null) {
-                        i = 2131363779;
-                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363779);
+                        i = R.id.indicator_decline;
+                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.indicator_decline);
                         if (materialButton2 != null) {
-                            i = 2131363780;
-                            ImageView imageView = (ImageView) view.findViewById(2131363780);
+                            i = R.id.indicator_icon;
+                            ImageView imageView = (ImageView) view.findViewById(R.id.indicator_icon);
                             if (imageView != null) {
-                                i = 2131363781;
-                                TextView textView2 = (TextView) view.findViewById(2131363781);
+                                i = R.id.indicator_text;
+                                TextView textView2 = (TextView) view.findViewById(R.id.indicator_text);
                                 if (textView2 != null) {
                                     return new WidgetGlobalStatusIndicatorBinding(linearLayout, textView, linearLayout, materialButton, linearLayout2, linearLayout3, materialButton2, imageView, textView2);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java
index d969a6e0bd..52acfff35c 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.status;
 
 import android.view.View;
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -22,7 +23,7 @@ public final class WidgetGlobalStatusIndicator$setupStageContainerClicks$2 imple
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.e.o.g(this.this$0.this$0.getContext(), 2131893747, 0, null, 12);
+            c.a.e.o.g(this.this$0.this$0.getContext(), R.string.stage_channel_permission_microphone_denied, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
index 9b6c9cbace..3b4de32476 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
@@ -17,6 +17,7 @@ import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetGlobalStatusIndicatorBinding;
@@ -51,7 +52,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetGlobalStatusIndicator() {
-        super(2131559064);
+        super(R.layout.widget_global_status_indicator);
         WidgetGlobalStatusIndicator$viewModel$2 widgetGlobalStatusIndicator$viewModel$2 = WidgetGlobalStatusIndicator$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGlobalStatusIndicatorViewModel.class), new WidgetGlobalStatusIndicator$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGlobalStatusIndicator$viewModel$2));
@@ -159,14 +160,14 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void setupConnectingState() {
         resetContentVisibility(getBinding());
-        getBinding().f1813c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907));
-        getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130968932));
+        getBinding().f1813c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
+        getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorHeaderPrimary));
         TextView textView = getBinding().i;
         m.checkNotNullExpressionValue(textView, "binding.indicatorText");
-        textView.setText(getString(2131887548));
+        textView.setText(getString(R.string.connecting));
         AnimatedVectorDrawableCompat animatedVectorDrawableCompat = null;
         if (this.connectingVector == null) {
-            this.connectingVector = AnimatedVectorDrawableCompat.create(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969434, 0, 2, (Object) null));
+            this.connectingVector = AnimatedVectorDrawableCompat.create(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_network_connecting_animated_vector, 0, 2, (Object) null));
         }
         ImageView imageView = getBinding().h;
         imageView.setVisibility(0);
@@ -202,7 +203,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         TextView textView = getBinding().i;
         m.checkNotNullExpressionValue(textView, "binding.indicatorText");
         textView.setText(str);
-        getBinding().i.setTextColor(ColorCompat.getColor(getContext(), 2131100433));
+        getBinding().i.setTextColor(ColorCompat.getColor(getContext(), (int) R.color.white));
         ImageView imageView = getBinding().h;
         imageView.setVisibility(0);
         imageView.setImageResource(voiceViewUtils.getCallIndicatorIcon(callOngoing.getHasVideo(), callOngoing.getStreamContext()));
@@ -210,12 +211,12 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void setupOfflineState(boolean z2) {
         resetContentVisibility(getBinding());
-        getBinding().f1813c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907));
-        getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130968932));
-        getBinding().i.setText(z2 ? 2131891655 : 2131891654);
+        getBinding().f1813c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
+        getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorHeaderPrimary));
+        getBinding().i.setText(z2 ? R.string.network_offline_airplane_mode : R.string.network_offline);
         ImageView imageView = getBinding().h;
         imageView.setVisibility(0);
-        imageView.setImageResource(z2 ? DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969433, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969435, 0, 2, (Object) null));
+        imageView.setImageResource(z2 ? DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_network_airplane_mode, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_network_offline, 0, 2, (Object) null));
     }
 
     private final void setupStageContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) {
@@ -227,8 +228,8 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x014c: APUT  (r3v4 java.lang.Object[]), (0 ??[int, short, byte, char]), (r11v3 java.lang.CharSequence) */
     private final void setupStageIndicatorStatus(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) {
         resetContentVisibility(getBinding());
-        int color = stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100433) : ColorCompat.getThemedColor(requireContext(), 2130968932);
-        getBinding().f1813c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100254) : ColorCompat.getThemedColor(requireContext(), 2130968907));
+        int color = stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), R.color.white) : ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorHeaderPrimary);
+        getBinding().f1813c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), R.color.status_green_600) : ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundTertiary));
         getBinding().i.setTextColor(color);
         getBinding().g.setTextColor(color);
         LinearLayout linearLayout = getBinding().e;
@@ -238,7 +239,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         ImageView imageView = getBinding().h;
         WidgetGlobalStatusIndicatorState.State state = this.lastIndicatorState;
         imageView.setVisibility(state != null && !state.isViewingCall() ? 0 : 8);
-        Drawable drawable = ContextCompat.getDrawable(imageView.getContext(), 2131231513);
+        Drawable drawable = ContextCompat.getDrawable(imageView.getContext(), R.drawable.ic_channel_stage_16dp);
         CharSequence charSequence = null;
         if (drawable != null) {
             m.checkNotNullExpressionValue(drawable, "drawable");
@@ -248,12 +249,12 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         }
         imageView.setImageDrawable(drawable);
         if (stageChannelOngoing.isInvitedToSpeak()) {
-            getBinding().i.setText(2131893846);
-            getBinding().d.setText(2131893843);
+            getBinding().i.setText(R.string.stage_speak_invite_header);
+            getBinding().d.setText(R.string.stage_speak_invite_accept);
             MaterialButton materialButton = getBinding().d;
             m.checkNotNullExpressionValue(materialButton, "binding.indicatorAccept");
             materialButton.setEnabled(!stageChannelOngoing.isAckingInvitation());
-            getBinding().g.setText(2131893845);
+            getBinding().g.setText(R.string.stage_speak_invite_decline);
             MaterialButton materialButton2 = getBinding().g;
             m.checkNotNullExpressionValue(materialButton2, "binding.indicatorDecline");
             materialButton2.setEnabled(!stageChannelOngoing.isAckingInvitation());
@@ -269,8 +270,8 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
             if (context != null) {
                 Object[] objArr = new Object[1];
                 Context context2 = getContext();
-                objArr[0] = context2 != null ? StringResourceUtilsKt.getI18nPluralString(context2, 2131755344, stageChannelOngoing.getBlockedUsersOnStage(), Integer.valueOf(stageChannelOngoing.getBlockedUsersOnStage())) : null;
-                charSequence = b.h(context, 2131893844, objArr, null, 4);
+                objArr[0] = context2 != null ? StringResourceUtilsKt.getI18nPluralString(context2, R.plurals.stage_speak_invite_blocked_users_number, stageChannelOngoing.getBlockedUsersOnStage(), Integer.valueOf(stageChannelOngoing.getBlockedUsersOnStage())) : null;
+                charSequence = b.h(context, R.string.stage_speak_invite_blocked_users, objArr, null, 4);
             }
             textView2.setText(charSequence);
             return;
@@ -287,15 +288,15 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         m.checkNotNullExpressionValue(textView3, "binding.indicatorText");
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder();
         if (f != null) {
-            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969328, f);
-            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969328, ": ");
+            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, R.attr.font_primary_semibold, f);
+            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, R.attr.font_primary_semibold, ": ");
         }
         if (charSequence != null) {
-            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969327, charSequence);
-            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969327, ": ");
+            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, R.attr.font_primary_normal, charSequence);
+            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, R.attr.font_primary_normal, ": ");
         }
         if (m != null) {
-            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969327, m);
+            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, R.attr.font_primary_normal, m);
         }
         textView3.setText(spannableStringBuilder);
     }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java
index 7bb5815772..8b5cfb7f7a 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.status;
 
 import android.view.View;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetThreadStatusBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.LoadingButton;
@@ -19,11 +20,11 @@ public final /* synthetic */ class WidgetThreadStatus$binding$2 extends k implem
     public final WidgetThreadStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ConstraintLayout constraintLayout = (ConstraintLayout) view;
-        int i = 2131365551;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365551);
+        int i = R.id.thread_status_button;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.thread_status_button);
         if (loadingButton != null) {
-            i = 2131365552;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365552);
+            i = R.id.thread_status_text;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.thread_status_text);
             if (linkifiedTextView != null) {
                 return new WidgetThreadStatusBinding((ConstraintLayout) view, constraintLayout, loadingButton, linkifiedTextView);
             }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
index 73dce3d64d..9664d6064e 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetThreadStatusBinding;
 import com.discord.utilities.color.ColorCompat;
@@ -135,7 +136,7 @@ public final class WidgetThreadStatus extends AppFragment {
     }
 
     public WidgetThreadStatus() {
-        super(2131559313);
+        super(R.layout.widget_thread_status);
         WidgetThreadStatus$viewModel$2 widgetThreadStatus$viewModel$2 = WidgetThreadStatus$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadStatusViewModel.class), new WidgetThreadStatus$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadStatus$viewModel$2));
@@ -164,7 +165,7 @@ public final class WidgetThreadStatus extends AppFragment {
     private final void handleEvent(Event event) {
         if (event instanceof Event.Error) {
             Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(((Event.Error) event).getCode());
-            o.i(this, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891644, 0, 4);
+            o.i(this, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : R.string.network_error_bad_request, 0, 4);
         } else if (event instanceof Event.ShowNotificationSettings) {
             WidgetThreadNotificationSettings.Companion.launch$default(WidgetThreadNotificationSettings.Companion, requireContext(), ((Event.ShowNotificationSettings) event).getChannelId(), false, 4, null);
         }
@@ -192,11 +193,11 @@ public final class WidgetThreadStatus extends AppFragment {
             loadingButton.setVisibility(i);
             LinkifiedTextView linkifiedTextView = getBinding().d;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.threadStatusText");
-            linkifiedTextView.setText(archived.isLocked() ? getResources().getString(2131894305) : getResources().getString(2131894303));
-            getBinding().f2014c.setText(getResources().getString(2131894484));
+            linkifiedTextView.setText(archived.isLocked() ? getResources().getString(R.string.thread_header_notice_locked) : getResources().getString(R.string.thread_header_notice_archived));
+            getBinding().f2014c.setText(getResources().getString(R.string.unarchive));
             LoadingButton loadingButton2 = getBinding().f2014c;
             m.checkNotNullExpressionValue(loadingButton2, "binding.threadStatusButton");
-            loadingButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968892)));
+            loadingButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorBackgroundAccent)));
             getBinding().f2014c.setOnClickListener(new WidgetThreadStatus$updateView$1(this));
         } else if (threadStatus instanceof WidgetThreadStatusViewModel.Status.Unjoined) {
             ConstraintLayout constraintLayout3 = getBinding().b;
@@ -207,11 +208,11 @@ public final class WidgetThreadStatus extends AppFragment {
             loadingButton3.setVisibility(0);
             LinkifiedTextView linkifiedTextView2 = getBinding().d;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.threadStatusText");
-            linkifiedTextView2.setText(getResources().getString(2131894304));
-            getBinding().f2014c.setText(getResources().getString(2131890951));
+            linkifiedTextView2.setText(getResources().getString(R.string.thread_header_notice_join));
+            getBinding().f2014c.setText(getResources().getString(R.string.join));
             LoadingButton loadingButton4 = getBinding().f2014c;
             m.checkNotNullExpressionValue(loadingButton4, "binding.threadStatusButton");
-            loadingButton4.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130969008)));
+            loadingButton4.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand_500)));
             getBinding().f2014c.setOnClickListener(new WidgetThreadStatus$updateView$2(this));
         } else if (threadStatus instanceof WidgetThreadStatusViewModel.Status.ThreadNotificationsNudge) {
             ConstraintLayout constraintLayout4 = getBinding().b;
@@ -220,11 +221,11 @@ public final class WidgetThreadStatus extends AppFragment {
             LoadingButton loadingButton5 = getBinding().f2014c;
             m.checkNotNullExpressionValue(loadingButton5, "binding.threadStatusButton");
             loadingButton5.setVisibility(0);
-            getBinding().f2014c.setText(getResources().getString(2131893590));
+            getBinding().f2014c.setText(getResources().getString(R.string.settings));
             getBinding().f2014c.setOnClickListener(new WidgetThreadStatus$updateView$3(this, threadStatus));
             LinkifiedTextView linkifiedTextView3 = getBinding().d;
             m.checkNotNullExpressionValue(linkifiedTextView3, "binding.threadStatusText");
-            c.a.l.b.m(linkifiedTextView3, 2131894317, new Object[0], new WidgetThreadStatus$updateView$4(this));
+            c.a.l.b.m(linkifiedTextView3, R.string.thread_notification_settings_nudge_description_mobile, new Object[0], new WidgetThreadStatus$updateView$4(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$binding$2.java
index 7963fbb1de..9e5257adde 100644
--- a/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.PremiumStickerUpsellDialogBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -19,20 +20,20 @@ public final /* synthetic */ class StickerPremiumUpsellDialog$binding$2 extends
 
     public final PremiumStickerUpsellDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362675;
-        TextView textView = (TextView) view.findViewById(2131362675);
+        int i = R.id.close_button;
+        TextView textView = (TextView) view.findViewById(R.id.close_button);
         if (textView != null) {
-            i = 2131364537;
-            ImageView imageView = (ImageView) view.findViewById(2131364537);
+            i = R.id.premium_upsell_close;
+            ImageView imageView = (ImageView) view.findViewById(R.id.premium_upsell_close);
             if (imageView != null) {
-                i = 2131364538;
-                TextView textView2 = (TextView) view.findViewById(2131364538);
+                i = R.id.premium_upsell_description;
+                TextView textView2 = (TextView) view.findViewById(R.id.premium_upsell_description);
                 if (textView2 != null) {
-                    i = 2131364545;
-                    TextView textView3 = (TextView) view.findViewById(2131364545);
+                    i = R.id.premium_upsell_perk_boosts;
+                    TextView textView3 = (TextView) view.findViewById(R.id.premium_upsell_perk_boosts);
                     if (textView3 != null) {
-                        i = 2131365383;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365383);
+                        i = R.id.subscribe_button;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.subscribe_button);
                         if (materialButton != null) {
                             return new PremiumStickerUpsellDialogBinding((RelativeLayout) view, textView, imageView, textView2, textView3, materialButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$onViewBoundOrOnResume$2.java
index d4999e5fee..0c10510a31 100644
--- a/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog$onViewBoundOrOnResume$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.stickers;
 
 import android.content.Context;
 import android.view.View;
+import com.discord.utilities.analytics.Traits;
 import com.discord.widgets.settings.premium.WidgetSettingsPremium;
 import d0.z.d.m;
 /* compiled from: StickerPremiumUpsellDialog.kt */
@@ -18,6 +19,6 @@ public final class StickerPremiumUpsellDialog$onViewBoundOrOnResume$2 implements
         WidgetSettingsPremium.Companion companion = WidgetSettingsPremium.Companion;
         Context requireContext = this.this$0.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        companion.launch(requireContext, 1, "Stickers Nitro Upsell Modal");
+        companion.launch(requireContext, 1, Traits.Location.Section.STICKER_PREMIUM_TIER_2_UPSELL_MODAL);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog.java b/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog.java
index a9e0415dd6..1d993e952d 100644
--- a/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog.java
+++ b/app/src/main/java/com/discord/widgets/stickers/StickerPremiumUpsellDialog.java
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.PremiumStickerUpsellDialogBinding;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -38,13 +39,13 @@ public final class StickerPremiumUpsellDialog extends AppDialog {
         public final void show(FragmentManager fragmentManager, Traits.Location location) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(location, "analyticsLocation");
-            AnalyticsTracker.INSTANCE.openModal("Stickers Nitro Upsell Modal", location);
+            AnalyticsTracker.INSTANCE.openModal(Traits.Location.Section.STICKER_PREMIUM_TIER_2_UPSELL_MODAL, location);
             new StickerPremiumUpsellDialog().show(fragmentManager, StickerPremiumUpsellDialog.class.getSimpleName());
         }
     }
 
     public StickerPremiumUpsellDialog() {
-        super(2131558654);
+        super(R.layout.premium_sticker_upsell_dialog);
     }
 
     private final PremiumStickerUpsellDialogBinding getBinding() {
@@ -70,17 +71,17 @@ public final class StickerPremiumUpsellDialog extends AppDialog {
         if (skuPrice != null) {
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.premiumUpsellDescription");
-            b.n(textView, 2131892720, new Object[]{skuPrice}, null, 4);
+            b.n(textView, R.string.premium_upsell_feature_pretext, new Object[]{skuPrice}, null, 4);
         } else {
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.premiumUpsellDescription");
-            b.n(textView2, 2131892722, new Object[0], null, 4);
+            b.n(textView2, R.string.premium_upsell_feature_pretext_without_price, new Object[0], null, 4);
         }
         TextView textView3 = getBinding().e;
         m.checkNotNullExpressionValue(textView3, "binding.premiumUpsellPerkBoosts");
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        b.n(textView3, 2131892718, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755303, 2, 2)}, null, 4);
+        b.n(textView3, R.string.premium_upsell_feature_free_guild_subscription, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, R.plurals.premium_upsell_feature_free_guild_subscription_numFreeGuildSubscriptions, 2, 2)}, null, 4);
         getBinding().f1625c.setOnClickListener(new StickerPremiumUpsellDialog$onViewBoundOrOnResume$1(this));
         getBinding().f.setOnClickListener(new StickerPremiumUpsellDialog$onViewBoundOrOnResume$2(this));
         getBinding().b.setOnClickListener(new StickerPremiumUpsellDialog$onViewBoundOrOnResume$3(this));
diff --git a/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java b/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java
index 902586cb6f..7fb49328d2 100644
--- a/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java
+++ b/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java
@@ -1,10 +1,11 @@
 package com.discord.widgets.stickers;
 
+import com.discord.utilities.analytics.Traits;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: StickerPurchaseLocation.kt */
 public enum StickerPurchaseLocation {
-    EXPRESSION_PICKER("Expression Picker"),
-    STICKER_POPOUT("Sticker Popout"),
+    EXPRESSION_PICKER(Traits.Location.Section.EXPRESSION_PICKER),
+    STICKER_POPOUT(Traits.Location.Section.STICKER_POPOUT),
     STICKER_UPSELL_POPOUT("Sticker Upsell Popout");
     
     public static final Companion Companion = new Companion(null);
diff --git a/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$binding$2.java
index e7b63fe4c1..97e9560f22 100644
--- a/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.stickers;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.StickerPremiumUpsellDialogBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,14 +19,14 @@ public final /* synthetic */ class UnsendableStickerPremiumUpsellDialog$binding$
 
     public final StickerPremiumUpsellDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365339;
-        TextView textView = (TextView) view.findViewById(2131365339);
+        int i = R.id.sticker_premium_upsell_close_button;
+        TextView textView = (TextView) view.findViewById(R.id.sticker_premium_upsell_close_button);
         if (textView != null) {
-            i = 2131365340;
-            TextView textView2 = (TextView) view.findViewById(2131365340);
+            i = R.id.sticker_premium_upsell_description;
+            TextView textView2 = (TextView) view.findViewById(R.id.sticker_premium_upsell_description);
             if (textView2 != null) {
-                i = 2131365341;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365341);
+                i = R.id.sticker_premium_upsell_subscribe_button;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.sticker_premium_upsell_subscribe_button);
                 if (materialButton != null) {
                     return new StickerPremiumUpsellDialogBinding((RelativeLayout) view, textView, textView2, materialButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$onViewBound$2.java b/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$onViewBound$2.java
index 93618ec656..86d889117d 100644
--- a/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog$onViewBound$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.stickers;
 
 import android.content.Context;
 import android.view.View;
+import com.discord.utilities.analytics.Traits;
 import com.discord.widgets.settings.premium.WidgetSettingsPremium;
 import d0.z.d.m;
 /* compiled from: UnsendableStickerPremiumUpsellDialog.kt */
@@ -17,7 +18,7 @@ public final class UnsendableStickerPremiumUpsellDialog$onViewBound$2 implements
         WidgetSettingsPremium.Companion companion = WidgetSettingsPremium.Companion;
         Context requireContext = this.this$0.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        WidgetSettingsPremium.Companion.launch$default(companion, requireContext, null, "Expression Picker", 2, null);
+        WidgetSettingsPremium.Companion.launch$default(companion, requireContext, null, Traits.Location.Section.EXPRESSION_PICKER, 2, null);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog.java b/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog.java
index 4d63f88b7f..88bae75f82 100644
--- a/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog.java
+++ b/app/src/main/java/com/discord/widgets/stickers/UnsendableStickerPremiumUpsellDialog.java
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.StickerPremiumUpsellDialogBinding;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -33,12 +34,12 @@ public final class UnsendableStickerPremiumUpsellDialog extends AppDialog {
         public final void show(FragmentManager fragmentManager) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             new UnsendableStickerPremiumUpsellDialog().show(fragmentManager, UnsendableStickerPremiumUpsellDialog.class.getSimpleName());
-            AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, AnalyticsTracker.PremiumUpsellType.StickerPickerUpsell, new Traits.Location(null, "Sticker Picker Upsell", null, null, null, 29, null), null, null, 12, null);
+            AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, AnalyticsTracker.PremiumUpsellType.StickerPickerUpsell, new Traits.Location(null, Traits.Location.Section.STICKER_PICKER_UPSELL, null, null, null, 29, null), null, null, 12, null);
         }
     }
 
     public UnsendableStickerPremiumUpsellDialog() {
-        super(2131558687);
+        super(R.layout.sticker_premium_upsell_dialog);
     }
 
     private final StickerPremiumUpsellDialogBinding getBinding() {
@@ -51,7 +52,7 @@ public final class UnsendableStickerPremiumUpsellDialog extends AppDialog {
         super.onViewBound(view);
         TextView textView = getBinding().f1637c;
         m.checkNotNullExpressionValue(textView, "binding.stickerPremiumUpsellDescription");
-        textView.setText(b.k(this, 2131892725, new Object[0], null, 4));
+        textView.setText(b.k(this, R.string.premium_upsell_global_stickers_description_mobile, new Object[0], null, 4));
         getBinding().b.setOnClickListener(new UnsendableStickerPremiumUpsellDialog$onViewBound$1(this));
         getBinding().d.setOnClickListener(new UnsendableStickerPremiumUpsellDialog$onViewBound$2(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$binding$2.java
index 92382885a5..21331e3409 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGuildStickerSheetBinding;
 import com.discord.views.sticker.StickerView;
@@ -22,48 +23,48 @@ public final /* synthetic */ class WidgetGuildStickerSheet$binding$2 extends k i
 
     public final WidgetGuildStickerSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363024;
-        View findViewById = view.findViewById(2131363024);
+        int i = R.id.divider;
+        View findViewById = view.findViewById(R.id.divider);
         if (findViewById != null) {
-            i = 2131363630;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363630);
+            i = R.id.guild_sticker_sheet_button_container;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.guild_sticker_sheet_button_container);
             if (frameLayout != null) {
-                i = 2131363631;
-                TextView textView = (TextView) view.findViewById(2131363631);
+                i = R.id.guild_sticker_sheet_description;
+                TextView textView = (TextView) view.findViewById(R.id.guild_sticker_sheet_description);
                 if (textView != null) {
                     AppViewFlipper appViewFlipper = (AppViewFlipper) view;
-                    i = 2131363633;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363633);
+                    i = R.id.guild_sticker_sheet_guild_container;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_sticker_sheet_guild_container);
                     if (linearLayout != null) {
-                        i = 2131363634;
-                        TextView textView2 = (TextView) view.findViewById(2131363634);
+                        i = R.id.guild_sticker_sheet_guild_header;
+                        TextView textView2 = (TextView) view.findViewById(R.id.guild_sticker_sheet_guild_header);
                         if (textView2 != null) {
-                            i = 2131363635;
-                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363635);
+                            i = R.id.guild_sticker_sheet_guild_icon;
+                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.guild_sticker_sheet_guild_icon);
                             if (simpleDraweeView != null) {
-                                i = 2131363636;
-                                TextView textView3 = (TextView) view.findViewById(2131363636);
+                                i = R.id.guild_sticker_sheet_guild_icon_text;
+                                TextView textView3 = (TextView) view.findViewById(R.id.guild_sticker_sheet_guild_icon_text);
                                 if (textView3 != null) {
-                                    i = 2131363637;
-                                    FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363637);
+                                    i = R.id.guild_sticker_sheet_guild_icon_wrapper;
+                                    FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.guild_sticker_sheet_guild_icon_wrapper);
                                     if (frameLayout2 != null) {
-                                        i = 2131363638;
-                                        TextView textView4 = (TextView) view.findViewById(2131363638);
+                                        i = R.id.guild_sticker_sheet_guild_info;
+                                        TextView textView4 = (TextView) view.findViewById(R.id.guild_sticker_sheet_guild_info);
                                         if (textView4 != null) {
-                                            i = 2131363639;
-                                            TextView textView5 = (TextView) view.findViewById(2131363639);
+                                            i = R.id.guild_sticker_sheet_guild_name;
+                                            TextView textView5 = (TextView) view.findViewById(R.id.guild_sticker_sheet_guild_name);
                                             if (textView5 != null) {
-                                                i = 2131363640;
-                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363640);
+                                                i = R.id.guild_sticker_sheet_join_btn;
+                                                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_sticker_sheet_join_btn);
                                                 if (materialButton != null) {
-                                                    i = 2131363641;
-                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363641);
+                                                    i = R.id.guild_sticker_sheet_premium_btn;
+                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.guild_sticker_sheet_premium_btn);
                                                     if (materialButton2 != null) {
-                                                        i = 2131363642;
-                                                        StickerView stickerView = (StickerView) view.findViewById(2131363642);
+                                                        i = R.id.guild_sticker_sheet_sticker;
+                                                        StickerView stickerView = (StickerView) view.findViewById(R.id.guild_sticker_sheet_sticker);
                                                         if (stickerView != null) {
-                                                            i = 2131363643;
-                                                            TextView textView6 = (TextView) view.findViewById(2131363643);
+                                                            i = R.id.guild_sticker_sheet_sticker_name;
+                                                            TextView textView6 = (TextView) view.findViewById(R.id.guild_sticker_sheet_sticker_name);
                                                             if (textView6 != null) {
                                                                 return new WidgetGuildStickerSheetBinding(appViewFlipper, findViewById, frameLayout, textView, appViewFlipper, linearLayout, textView2, simpleDraweeView, textView3, frameLayout2, textView4, textView5, materialButton, materialButton2, stickerView, textView6);
                                                             }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1.java
index 36fbffb041..ff132d9c07 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1.java
@@ -26,6 +26,6 @@ public final class WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda
         StickerPremiumUpsellDialog.Companion companion = StickerPremiumUpsellDialog.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.show(parentFragmentManager, new Traits.Location(null, "Sticker Popout", null, null, null, 29, null));
+        companion.show(parentFragmentManager, new Traits.Location(null, Traits.Location.Section.STICKER_POPOUT, null, null, null, 29, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java
index 64e6790ade..dfcef3fe71 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java
@@ -14,6 +14,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.guild.GuildFeature;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerType;
@@ -147,8 +148,8 @@ public final class WidgetGuildStickerSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(simpleDraweeView, "guildStickerSheetGuildIcon");
             IconUtils.setIcon$default((ImageView) simpleDraweeView, guild, 0, (MGImages.ChangeDetector) null, true, 12, (Object) null);
         } else {
-            binding.h.setBackgroundResource(2131231092);
-            int themedColor = ColorCompat.getThemedColor(requireContext(), 2130968905);
+            binding.h.setBackgroundResource(R.drawable.drawable_circle_black);
+            int themedColor = ColorCompat.getThemedColor(requireContext(), (int) R.attr.colorBackgroundSecondary);
             FrameLayout frameLayout = binding.h;
             m.checkNotNullExpressionValue(frameLayout, "guildStickerSheetGuildIconWrapper");
             frameLayout.setBackgroundTintList(ColorStateList.valueOf(themedColor));
@@ -156,19 +157,19 @@ public final class WidgetGuildStickerSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(textView, "guildStickerSheetGuildIconText");
             textView.setText(guild.getShortName());
         }
-        int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231858 : guild.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232096 : 0;
+        int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? R.drawable.ic_partnered_badge_banner : guild.getFeatures().contains(GuildFeature.VERIFIED) ? R.drawable.ic_verified_badge_banner : 0;
         TextView textView2 = binding.j;
         m.checkNotNullExpressionValue(textView2, "guildStickerSheetGuildName");
         DrawableCompat.setCompoundDrawablesCompat(textView2, i, 0, 0, 0);
         TextView textView3 = binding.j;
         m.checkNotNullExpressionValue(textView3, "guildStickerSheetGuildName");
         textView3.setText(guild.getName());
-        int i2 = z3 ? 2131893982 : 2131893981;
+        int i2 = z3 ? R.string.sticker_popout_public_server : R.string.sticker_popout_private_server;
         String str = null;
         CharSequence k = b.k(this, i2, new Object[0], null, 4);
         if (num != null) {
             String format = NumberFormat.getNumberInstance(new LocaleManager().getPrimaryLocale(requireContext())).format(Integer.valueOf(num.intValue()));
-            str = b.k(this, 2131890667, new Object[]{format}, null, 4).toString() + " • ";
+            str = b.k(this, R.string.instant_invite_guild_members_online, new Object[]{format}, null, 4).toString() + " • ";
         }
         if (str == null) {
             str = "";
@@ -213,22 +214,7 @@ public final class WidgetGuildStickerSheet extends AppBottomSheet {
     }
 
     private final int getCustomStickerInfoText(boolean z2, boolean z3, boolean z4, boolean z5) {
-        if (z2 && !z5) {
-            return 2131893969;
-        }
-        if (z2 && z5) {
-            return 2131893977;
-        }
-        if (z3 && !z5) {
-            return 2131893971;
-        }
-        if (z3 && z5) {
-            return 2131893978;
-        }
-        if (!z4 || z5) {
-            return (!z4 || !z5) ? 2131893980 : 2131893979;
-        }
-        return 2131893984;
+        return (!z2 || z5) ? (!z2 || !z5) ? (!z3 || z5) ? (!z3 || !z5) ? (!z4 || z5) ? (!z4 || !z5) ? R.string.sticker_popout_premium_unjoined_private_guild_description : R.string.sticker_popout_premium_unjoined_discoverable_guild_description : R.string.sticker_popout_unjoined_discoverable_guild_description : R.string.sticker_popout_premium_joined_guild_description : R.string.sticker_popout_joined_guild_description : R.string.sticker_popout_premium_current_guild_description : R.string.sticker_popout_current_guild_description;
     }
 
     private final GuildStickerSheetViewModel getViewModel() {
@@ -255,6 +241,6 @@ public final class WidgetGuildStickerSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559098;
+        return R.layout.widget_guild_sticker_sheet;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java
index 45cc9fdbbd..1e0c911a9f 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.stickers;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.StickerPackDetailsDialogBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,20 +18,20 @@ public final /* synthetic */ class WidgetStickerPackDetailsDialog$binding$2 exte
 
     public final StickerPackDetailsDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365325;
-        TextView textView = (TextView) view.findViewById(2131365325);
+        int i = R.id.sticker_pack_details_animated;
+        TextView textView = (TextView) view.findViewById(R.id.sticker_pack_details_animated);
         if (textView != null) {
-            i = 2131365326;
-            TextView textView2 = (TextView) view.findViewById(2131365326);
+            i = R.id.sticker_pack_details_close;
+            TextView textView2 = (TextView) view.findViewById(R.id.sticker_pack_details_close);
             if (textView2 != null) {
-                i = 2131365327;
-                TextView textView3 = (TextView) view.findViewById(2131365327);
+                i = R.id.sticker_pack_details_limited;
+                TextView textView3 = (TextView) view.findViewById(R.id.sticker_pack_details_limited);
                 if (textView3 != null) {
-                    i = 2131365328;
-                    TextView textView4 = (TextView) view.findViewById(2131365328);
+                    i = R.id.sticker_pack_details_pack;
+                    TextView textView4 = (TextView) view.findViewById(R.id.sticker_pack_details_pack);
                     if (textView4 != null) {
-                        i = 2131365329;
-                        TextView textView5 = (TextView) view.findViewById(2131365329);
+                        i = R.id.sticker_pack_details_premium;
+                        TextView textView5 = (TextView) view.findViewById(R.id.sticker_pack_details_premium);
                         if (textView5 != null) {
                             return new StickerPackDetailsDialogBinding((FrameLayout) view, textView, textView2, textView3, textView4, textView5);
                         }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java
index 66ffa42c40..32fc66ceb3 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java
@@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.StickerPackDetailsDialogBinding;
 import com.discord.models.sticker.dto.ModelStickerPack;
@@ -56,7 +57,7 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
             bundle.putLong("com.discord.intent.EXTRA_STICKER_PACK_ID", j);
             if (num != null) {
                 num.intValue();
-                bundle.putInt("EXTRA_Y_POSITION", num.intValue());
+                bundle.putInt(WidgetStickerPackDetailsDialog.EXTRA_Y_POSITION, num.intValue());
             }
             WidgetStickerPackDetailsDialog widgetStickerPackDetailsDialog = new WidgetStickerPackDetailsDialog();
             widgetStickerPackDetailsDialog.setArguments(bundle);
@@ -65,8 +66,8 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
     }
 
     public WidgetStickerPackDetailsDialog() {
-        super(2131558685);
-        setStyle(1, 2131951653);
+        super(R.layout.sticker_pack_details_dialog);
+        setStyle(1, R.style.AppTheme_Dialog_Popup_Tooltip);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetStickerPackDetailsDialog widgetStickerPackDetailsDialog, StoreStickers.StickerPackState stickerPackState) {
@@ -79,20 +80,20 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
             ModelStickerPack stickerPack = ((StoreStickers.StickerPackState.Loaded) stickerPackState).getStickerPack();
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.stickerPackDetailsPack");
-            textView.setText(b.k(this, 2131893954, new Object[]{stickerPack.getName()}, null, 4));
+            textView.setText(b.k(this, R.string.sticker_picker_pack_details, new Object[]{stickerPack.getName()}, null, 4));
             TextView textView2 = getBinding().b;
             m.checkNotNullExpressionValue(textView2, "binding.stickerPackDetailsAnimated");
             int i = 8;
             textView2.setVisibility(stickerPack.isAnimatedPack() ? 0 : 8);
             TextView textView3 = getBinding().b;
             m.checkNotNullExpressionValue(textView3, "binding.stickerPackDetailsAnimated");
-            textView3.setText("・ " + getString(2131893955));
+            textView3.setText("・ " + getString(R.string.sticker_picker_pack_details_animated));
             TextView textView4 = getBinding().f;
             m.checkNotNullExpressionValue(textView4, "binding.stickerPackDetailsPremium");
             textView4.setVisibility(stickerPack.isPremiumPack() ? 0 : 8);
             TextView textView5 = getBinding().f;
             m.checkNotNullExpressionValue(textView5, "binding.stickerPackDetailsPremium");
-            textView5.setText("・ " + getString(2131893957));
+            textView5.setText("・ " + getString(R.string.sticker_picker_pack_details_premium));
             TextView textView6 = getBinding().d;
             m.checkNotNullExpressionValue(textView6, "binding.stickerPackDetailsLimited");
             if (stickerPack.isLimitedPack()) {
@@ -106,7 +107,7 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
             StickerUtils stickerUtils = StickerUtils.INSTANCE;
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            sb.append(b.k(this, 2131893956, new Object[]{stickerUtils.getLimitedTimeLeftString(requireContext, stickerPack.getStoreListing())}, null, 4));
+            sb.append(b.k(this, R.string.sticker_picker_pack_details_limited_time_left, new Object[]{stickerUtils.getLimitedTimeLeftString(requireContext, stickerPack.getStoreListing())}, null, 4));
             textView7.setText(sb.toString());
         }
     }
@@ -124,13 +125,13 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
             window.setGravity(81);
         }
         Bundle arguments = getArguments();
-        Integer valueOf = arguments != null ? Integer.valueOf(arguments.getInt("EXTRA_Y_POSITION", 0)) : null;
+        Integer valueOf = arguments != null ? Integer.valueOf(arguments.getInt(EXTRA_Y_POSITION, 0)) : null;
         Window window2 = onCreateDialog.getWindow();
         if (!(window2 == null || (attributes = window2.getAttributes()) == null)) {
             if (valueOf != null && valueOf.intValue() == 0) {
                 Context context = onCreateDialog.getContext();
                 m.checkNotNullExpressionValue(context, "context");
-                valueOf = Integer.valueOf((int) (context.getResources().getDimension(2131165340) / ((float) 2)));
+                valueOf = Integer.valueOf((int) (context.getResources().getDimension(R.dimen.default_keyboard_height) / ((float) 2)));
             }
             attributes.y = valueOf.intValue();
         }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java
index 6c9deb6de2..e5d67f79c6 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetStickerSheetBinding;
 import com.discord.views.LoadingButton;
 import com.discord.views.sticker.StickerView;
@@ -22,38 +23,38 @@ public final /* synthetic */ class WidgetStickerSheet$binding$2 extends k implem
 
     public final WidgetStickerSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365343;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365343);
+        int i = R.id.sticker_sheet_buy_button;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.sticker_sheet_buy_button);
         if (loadingButton != null) {
-            i = 2131365344;
-            TextView textView = (TextView) view.findViewById(2131365344);
+            i = R.id.sticker_sheet_sticker_info;
+            TextView textView = (TextView) view.findViewById(R.id.sticker_sheet_sticker_info);
             if (textView != null) {
-                i = 2131365345;
-                TextView textView2 = (TextView) view.findViewById(2131365345);
+                i = R.id.sticker_sheet_sticker_name;
+                TextView textView2 = (TextView) view.findViewById(R.id.sticker_sheet_sticker_name);
                 if (textView2 != null) {
-                    i = 2131365347;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365347);
+                    i = R.id.sticker_sheet_stickers_container;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.sticker_sheet_stickers_container);
                     if (linearLayout != null) {
-                        i = 2131365348;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365348);
+                        i = R.id.sticker_sheet_view_button;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.sticker_sheet_view_button);
                         if (materialButton != null) {
-                            i = 2131365349;
-                            Chip chip = (Chip) view.findViewById(2131365349);
+                            i = R.id.sticker_sheet_view_limited_chip;
+                            Chip chip = (Chip) view.findViewById(R.id.sticker_sheet_view_limited_chip);
                             if (chip != null) {
-                                i = 2131365350;
-                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365350);
+                                i = R.id.sticker_sheet_view_limited_container;
+                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.sticker_sheet_view_limited_container);
                                 if (relativeLayout != null) {
-                                    i = 2131365366;
-                                    StickerView stickerView = (StickerView) view.findViewById(2131365366);
+                                    i = R.id.stickers_sheet_sticker_1;
+                                    StickerView stickerView = (StickerView) view.findViewById(R.id.stickers_sheet_sticker_1);
                                     if (stickerView != null) {
-                                        i = 2131365367;
-                                        StickerView stickerView2 = (StickerView) view.findViewById(2131365367);
+                                        i = R.id.stickers_sheet_sticker_2;
+                                        StickerView stickerView2 = (StickerView) view.findViewById(R.id.stickers_sheet_sticker_2);
                                         if (stickerView2 != null) {
-                                            i = 2131365368;
-                                            StickerView stickerView3 = (StickerView) view.findViewById(2131365368);
+                                            i = R.id.stickers_sheet_sticker_3;
+                                            StickerView stickerView3 = (StickerView) view.findViewById(R.id.stickers_sheet_sticker_3);
                                             if (stickerView3 != null) {
-                                                i = 2131365369;
-                                                StickerView stickerView4 = (StickerView) view.findViewById(2131365369);
+                                                i = R.id.stickers_sheet_sticker_4;
+                                                StickerView stickerView4 = (StickerView) view.findViewById(R.id.stickers_sheet_sticker_4);
                                                 if (stickerView4 != null) {
                                                     return new WidgetStickerSheetBinding((LinearLayout) view, loadingButton, textView, textView2, linearLayout, materialButton, chip, relativeLayout, stickerView, stickerView2, stickerView3, stickerView4);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$3.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$3.java
index 509764b611..d5c9f4a64b 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$3.java
@@ -25,7 +25,7 @@ public final class WidgetStickerSheet$configureUI$3 implements View.OnClickListe
             StickerPremiumUpsellDialog.Companion companion = StickerPremiumUpsellDialog.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            companion.show(parentFragmentManager, new Traits.Location(null, "Sticker Popout", null, null, null, 29, null));
+            companion.show(parentFragmentManager, new Traits.Location(null, Traits.Location.Section.STICKER_POPOUT, null, null, null, 29, null));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
index cad4baa49f..7aa0098e7a 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.sticker.Sticker;
@@ -19,6 +20,7 @@ import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetStickerSheetBinding;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import com.discord.stores.StoreStream;
+import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.stickers.StickerUtils;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -58,11 +60,11 @@ public final class WidgetStickerSheet extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(sticker, "sticker");
             if (sticker.k() == StickerType.STANDARD && (findChannelByIdInternal$app_productionCanaryRelease = StoreStream.Companion.getChannels().findChannelByIdInternal$app_productionCanaryRelease(j)) != null) {
-                String str = findChannelByIdInternal$app_productionCanaryRelease.f() == 0 ? "DM Channel" : "Guild Channel";
+                String str = findChannelByIdInternal$app_productionCanaryRelease.f() == 0 ? "DM Channel" : Traits.Location.Page.GUILD_CHANNEL;
                 WidgetStickerSheet widgetStickerSheet = new WidgetStickerSheet();
                 Bundle bundle = new Bundle();
                 bundle.putSerializable("com.discord.intent.extra.EXTRA_STICKER", sticker);
-                bundle.putString("widget_sticker_sheet_analytics_location", str);
+                bundle.putString(WidgetStickerSheet.ANALYTICS_LOCATION, str);
                 widgetStickerSheet.setArguments(bundle);
                 widgetStickerSheet.show(fragmentManager, WidgetStickerSheet.class.getName());
             }
@@ -99,7 +101,7 @@ public final class WidgetStickerSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView2, "binding.stickerSheetStickerInfo");
         boolean z2 = true;
         int i = 0;
-        textView2.setText((component4 || viewState.isUserPremiumTier2() || component1.isPremiumPack()) ? b.k(this, 2131893975, new Object[]{component1.getName()}, null, 4) : !component1.canBePurchased() ? b.k(this, 2131893976, new Object[]{component1.getName()}, null, 4) : b.e(this, 2131893973, new Object[]{component1.getName(), String.valueOf(StickerUtils.INSTANCE.calculatePremiumStickerPackDiscount())}, WidgetStickerSheet$configureUI$2.INSTANCE));
+        textView2.setText((component4 || viewState.isUserPremiumTier2() || component1.isPremiumPack()) ? b.k(this, R.string.sticker_popout_pack_info_premium, new Object[]{component1.getName()}, null, 4) : !component1.canBePurchased() ? b.k(this, R.string.sticker_popout_pack_info_unavailable, new Object[]{component1.getName()}, null, 4) : b.e(this, R.string.sticker_popout_pack_info, new Object[]{component1.getName(), String.valueOf(StickerUtils.INSTANCE.calculatePremiumStickerPackDiscount())}, WidgetStickerSheet$configureUI$2.INSTANCE));
         try {
             getBinding().h.d(component1.getStickers().get(0), 0);
             getBinding().i.d(component1.getStickers().get(1), 0);
@@ -108,7 +110,7 @@ public final class WidgetStickerSheet extends AppBottomSheet {
         } catch (IndexOutOfBoundsException unused) {
         }
         Bundle arguments = getArguments();
-        String string = arguments != null ? arguments.getString("widget_sticker_sheet_analytics_location") : null;
+        String string = arguments != null ? arguments.getString(ANALYTICS_LOCATION) : null;
         StickerUtils stickerUtils = StickerUtils.INSTANCE;
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
@@ -160,6 +162,6 @@ public final class WidgetStickerSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559301;
+        return R.layout.widget_sticker_sheet;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet$binding$2.java
index a2f94b43ee..c5feb509fd 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.stickers;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetUnknownStickerSheetBinding;
 import com.discord.views.sticker.StickerView;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetUnknownStickerSheet$binding$2 extends k
 
     public final WidgetUnknownStickerSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365615;
-        StickerView stickerView = (StickerView) view.findViewById(2131365615);
+        int i = R.id.unknown_sticker_sheet_sticker;
+        StickerView stickerView = (StickerView) view.findViewById(R.id.unknown_sticker_sheet_sticker);
         if (stickerView != null) {
-            i = 2131365616;
-            TextView textView = (TextView) view.findViewById(2131365616);
+            i = R.id.unknown_sticker_sheet_sticker_name;
+            TextView textView = (TextView) view.findViewById(R.id.unknown_sticker_sheet_sticker_name);
             if (textView != null) {
                 return new WidgetUnknownStickerSheetBinding((LinearLayout) view, stickerView, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
index e88e362d66..4baa72cc6f 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.sticker.StickerPartial;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetUnknownStickerSheetBinding;
@@ -56,7 +57,7 @@ public final class WidgetUnknownStickerSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559317;
+        return R.layout.widget_unknown_sticker_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java b/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java
index 1cb962d331..1b5ff64e7b 100644
--- a/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java
+++ b/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java
@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.TabsHostBottomNavigationViewBinding;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.color.ColorCompatKt;
@@ -137,7 +138,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         m.checkNotNullExpressionValue(textView3, "binding.tabsHostBottomNavHomeNotificationsBadge");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        textView3.setContentDescription(b.i(resources, 2131891474, new Object[]{String.valueOf(i)}, null, 4));
+        textView3.setContentDescription(b.i(resources, R.string.mentions_count, new Object[]{String.valueOf(i)}, null, 4));
         TextView textView4 = this.binding.d;
         m.checkNotNullExpressionValue(textView4, "binding.tabsHostBottomNavFriendsNotificationsBadge");
         textView4.setText(String.valueOf(i2));
@@ -151,7 +152,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         m.checkNotNullExpressionValue(textView6, "binding.tabsHostBottomNavFriendsNotificationsBadge");
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        textView6.setContentDescription(b.i(resources2, 2131890633, new Object[]{String.valueOf(i2)}, null, 4));
+        textView6.setContentDescription(b.i(resources2, R.string.incoming_friend_requests_count, new Object[]{String.valueOf(i2)}, null, 4));
     }
 
     public final void addHeightChangedListener(HeightChangedListener heightChangedListener) {
@@ -206,7 +207,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         Iterator<T> it = map.entrySet().iterator();
         while (it.hasNext()) {
             Map.Entry entry = (Map.Entry) it.next();
-            ColorCompatKt.tintWithColor((ImageView) entry.getKey(), ColorCompat.getThemedColor(getContext(), ((NavigationTab) entry.getValue()) == navigationTab ? 2130968985 : 2130968949));
+            ColorCompatKt.tintWithColor((ImageView) entry.getKey(), ColorCompat.getThemedColor(getContext(), ((NavigationTab) entry.getValue()) == navigationTab ? R.attr.colorTabsIconActive : R.attr.colorInteractiveNormal));
         }
         Map<View, ? extends NavigationTab> map2 = this.iconToNavigationTabMap;
         if (map2 == null) {
diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java
index 02f80f5a33..6407a35d19 100644
--- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentContainerView;
+import com.discord.R;
 import com.discord.databinding.WidgetTabsHostBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,33 +19,33 @@ public final /* synthetic */ class WidgetTabsHost$binding$2 extends k implements
 
     public final WidgetTabsHostBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365931;
-        TabsHostBottomNavigationView tabsHostBottomNavigationView = (TabsHostBottomNavigationView) view.findViewById(2131365931);
+        int i = R.id.widget_tabs_host_bottom_navigation_view;
+        TabsHostBottomNavigationView tabsHostBottomNavigationView = (TabsHostBottomNavigationView) view.findViewById(R.id.widget_tabs_host_bottom_navigation_view);
         if (tabsHostBottomNavigationView != null) {
             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-            i = 2131365933;
-            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365933);
+            i = R.id.widget_tabs_host_discovery;
+            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.widget_tabs_host_discovery);
             if (fragmentContainerView != null) {
-                i = 2131365934;
-                FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365934);
+                i = R.id.widget_tabs_host_friends;
+                FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(R.id.widget_tabs_host_friends);
                 if (fragmentContainerView2 != null) {
-                    i = 2131365935;
-                    FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131365935);
+                    i = R.id.widget_tabs_host_global_status_indicator;
+                    FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(R.id.widget_tabs_host_global_status_indicator);
                     if (fragmentContainerView3 != null) {
-                        i = 2131365936;
-                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131365936);
+                        i = R.id.widget_tabs_host_home;
+                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(R.id.widget_tabs_host_home);
                         if (fragmentContainerView4 != null) {
-                            i = 2131365937;
-                            FragmentContainerView fragmentContainerView5 = (FragmentContainerView) view.findViewById(2131365937);
+                            i = R.id.widget_tabs_host_mentions;
+                            FragmentContainerView fragmentContainerView5 = (FragmentContainerView) view.findViewById(R.id.widget_tabs_host_mentions);
                             if (fragmentContainerView5 != null) {
-                                i = 2131365938;
-                                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365938);
+                                i = R.id.widget_tabs_host_nav_host;
+                                FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.widget_tabs_host_nav_host);
                                 if (frameLayout != null) {
-                                    i = 2131365939;
-                                    FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365939);
+                                    i = R.id.widget_tabs_host_non_fullscreen_nav_host;
+                                    FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.widget_tabs_host_non_fullscreen_nav_host);
                                     if (frameLayout2 != null) {
-                                        i = 2131365940;
-                                        FragmentContainerView fragmentContainerView6 = (FragmentContainerView) view.findViewById(2131365940);
+                                        i = R.id.widget_tabs_host_user_settings;
+                                        FragmentContainerView fragmentContainerView6 = (FragmentContainerView) view.findViewById(R.id.widget_tabs_host_user_settings);
                                         if (fragmentContainerView6 != null) {
                                             return new WidgetTabsHostBinding(constraintLayout, tabsHostBottomNavigationView, constraintLayout, fragmentContainerView, fragmentContainerView2, fragmentContainerView3, fragmentContainerView4, fragmentContainerView5, frameLayout, frameLayout2, fragmentContainerView6);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.java
index 7e0e5223ad..f8dd8a3380 100644
--- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.java
+++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.tabs;
 
 import androidx.fragment.app.Fragment;
+import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.widgets.status.WidgetGlobalStatusIndicatorState;
 import d0.z.d.m;
@@ -30,7 +31,7 @@ public final class WidgetTabsHost$configureSystemStatusBar$1 extends o implement
     public final void invoke(WidgetGlobalStatusIndicatorState.State state) {
         m.checkNotNullParameter(state, "state");
         WidgetTabsHost.access$setPanelWindowInsetsListeners(this.this$0, state.isVisible());
-        int color = ColorCompat.getColor(this.this$0, 2131100384);
+        int color = ColorCompat.getColor(this.this$0, (int) R.color.transparent);
         if (!state.isVisible()) {
             color = this.$defaultStatusBarColor;
         }
diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
index c1b8c875ce..c447c6dd46 100644
--- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
+++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
@@ -15,6 +15,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetTabsHostBinding;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -67,7 +68,7 @@ public final class WidgetTabsHost extends AppFragment {
     }
 
     public WidgetTabsHost() {
-        super(2131559303);
+        super(R.layout.widget_tabs_host);
         WidgetTabsHost$viewModel$2 widgetTabsHost$viewModel$2 = WidgetTabsHost$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(TabsHostViewModel.class), new WidgetTabsHost$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetTabsHost$viewModel$2));
@@ -102,7 +103,7 @@ public final class WidgetTabsHost extends AppFragment {
     }
 
     private final void configureSystemStatusBar() {
-        int themedColor = ColorCompat.getThemedColor(this, 2130968907);
+        int themedColor = ColorCompat.getThemedColor(this, (int) R.attr.colorBackgroundTertiary);
         ColorCompat.setStatusBarColor$default((Fragment) this, themedColor, false, 4, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(this.globalStatusIndicatorStateObserver.observeState(), this), WidgetTabsHost.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetTabsHost$configureSystemStatusBar$1(this, themedColor), 62, (Object) null);
     }
@@ -241,14 +242,14 @@ public final class WidgetTabsHost extends AppFragment {
                 tabsHostBottomNavigationView2.setVisibility(0);
                 ValueAnimator ofFloat = ValueAnimator.ofFloat(translationY, 0.0f);
                 ofFloat.setInterpolator(new FastOutSlowInInterpolator());
-                ofFloat.setDuration(250L);
+                ofFloat.setDuration(BOTTOM_TABS_UPWARD_ANIMATION_DURATION_MS);
                 ofFloat.addUpdateListener(new WidgetTabsHost$updateViews$$inlined$apply$lambda$1(this));
                 ofFloat.start();
                 this.bottomNavAnimator = ofFloat;
             } else if (bottomNavHeight > 0) {
                 ValueAnimator ofFloat2 = ValueAnimator.ofFloat(translationY, (float) bottomNavHeight);
                 ofFloat2.setInterpolator(new FastOutSlowInInterpolator());
-                ofFloat2.setDuration(200L);
+                ofFloat2.setDuration(BOTTOM_TABS_DOWNWARD_ANIMATION_DURATION_MS);
                 ofFloat2.addUpdateListener(new WidgetTabsHost$updateViews$$inlined$apply$lambda$2(this));
                 ofFloat2.start();
                 this.bottomNavAnimator = ofFloat2;
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$binding$2.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$binding$2.java
index 38d9352070..7e40077278 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetTosAcceptBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.google.android.material.button.MaterialButton;
@@ -21,26 +22,26 @@ public final /* synthetic */ class WidgetTosAccept$binding$2 extends k implement
 
     public final WidgetTosAcceptBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361952;
-        CheckBox checkBox = (CheckBox) view.findViewById(2131361952);
+        int i = R.id.alert_tos_ack;
+        CheckBox checkBox = (CheckBox) view.findViewById(R.id.alert_tos_ack);
         if (checkBox != null) {
-            i = 2131361953;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131361953);
+            i = R.id.alert_tos_ack_continue;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.alert_tos_ack_continue);
             if (materialButton != null) {
-                i = 2131361954;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131361954);
+                i = R.id.alert_tos_ack_wrap;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.alert_tos_ack_wrap);
                 if (linearLayout != null) {
-                    i = 2131361955;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131361955);
+                    i = R.id.alert_tos_privacy_policy;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.alert_tos_privacy_policy);
                     if (linkifiedTextView != null) {
-                        i = 2131361956;
-                        LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131361956);
+                        i = R.id.alert_tos_terms_of_service;
+                        LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.alert_tos_terms_of_service);
                         if (linkifiedTextView2 != null) {
-                            i = 2131361957;
-                            TextView textView = (TextView) view.findViewById(2131361957);
+                            i = R.id.alert_tos_text_description;
+                            TextView textView = (TextView) view.findViewById(R.id.alert_tos_text_description);
                             if (textView != null) {
-                                i = 2131361958;
-                                TextView textView2 = (TextView) view.findViewById(2131361958);
+                                i = R.id.alert_tos_text_title;
+                                TextView textView2 = (TextView) view.findViewById(R.id.alert_tos_text_title);
                                 if (textView2 != null) {
                                     return new WidgetTosAcceptBinding((RelativeLayout) view, checkBox, materialButton, linearLayout, linkifiedTextView, linkifiedTextView2, textView, textView2);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java
index b557c82b96..938905f794 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.tos;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -11,7 +12,7 @@ public final class WidgetTosAccept$onViewBound$2<T1, T2> implements Action2<Menu
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364118) {
+        if (menuItem.getItemId() == R.id.menu_settings_log_out) {
             StoreStream.Companion.getAuthentication().logout();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
index 6babca5669..315fd272b9 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetTosAcceptBinding;
 import com.discord.models.requiredaction.RequiredAction;
@@ -43,7 +44,7 @@ public final class WidgetTosAccept extends AppFragment {
     }
 
     public WidgetTosAccept() {
-        super(2131559314);
+        super(R.layout.widget_tos_accept);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetTosAccept widgetTosAccept, RequiredAction requiredAction) {
@@ -58,10 +59,10 @@ public final class WidgetTosAccept extends AppFragment {
         if (requiredAction == RequiredAction.AGREEMENTS) {
             LinkifiedTextView linkifiedTextView = getBinding().e;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.alertTosTermsOfService");
-            b.n(linkifiedTextView, 2131894243, new Object[0], null, 4);
+            b.n(linkifiedTextView, R.string.terms_of_service_url, new Object[0], null, 4);
             LinkifiedTextView linkifiedTextView2 = getBinding().d;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.alertTosPrivacyPolicy");
-            b.n(linkifiedTextView2, 2131892756, new Object[0], null, 4);
+            b.n(linkifiedTextView2, R.string.privacy_policy_url, new Object[0], null, 4);
             getBinding().b.setOnCheckedChangeListener(new WidgetTosAccept$configureUI$1(this));
             MaterialButton materialButton = getBinding().f2015c;
             m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
@@ -81,7 +82,7 @@ public final class WidgetTosAccept extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setOnBackPressed$default(this, WidgetTosAccept$onViewBound$1.INSTANCE, 0, 2, null);
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623963, WidgetTosAccept$onViewBound$2.INSTANCE, null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_settings_logout, WidgetTosAccept$onViewBound$2.INSTANCE, null, 4, null);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java
index d994dce9bf..cc33342bb8 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetTosReportViolationBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.LoadingButton;
@@ -21,23 +22,23 @@ public final /* synthetic */ class WidgetTosReportViolation$binding$2 extends k
 
     public final WidgetTosReportViolationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364637;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364637);
+        int i = R.id.report_button;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(R.id.report_button);
         if (loadingButton != null) {
-            i = 2131364638;
-            TextView textView = (TextView) view.findViewById(2131364638);
+            i = R.id.report_header;
+            TextView textView = (TextView) view.findViewById(R.id.report_header);
             if (textView != null) {
-                i = 2131364649;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364649);
+                i = R.id.report_reasons_container;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.report_reasons_container);
                 if (linearLayout != null) {
-                    i = 2131364650;
-                    TextView textView2 = (TextView) view.findViewById(2131364650);
+                    i = R.id.report_reasons_header;
+                    TextView textView2 = (TextView) view.findViewById(R.id.report_reasons_header);
                     if (textView2 != null) {
-                        i = 2131364651;
-                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131364651);
+                        i = R.id.report_reasons_loading;
+                        ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.report_reasons_loading);
                         if (progressBar != null) {
-                            i = 2131364652;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364652);
+                            i = R.id.report_tooltip;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.report_tooltip);
                             if (linkifiedTextView != null) {
                                 return new WidgetTosReportViolationBinding((CoordinatorLayout) view, loadingButton, textView, linearLayout, textView2, progressBar, linkifiedTextView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
index 07145f8260..394b265fe2 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
@@ -17,6 +17,7 @@ import c.a.e.j0;
 import c.a.e.l;
 import c.a.e.o;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.report.ReportReason;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -155,15 +156,15 @@ public final class WidgetTosReportViolation extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(str, "target");
             Intent intent = new Intent();
-            intent.putExtra("EXTRA_CHANNEL_ID", l);
-            intent.putExtra("EXTRA_MESSAGE_ID", l2);
-            intent.putExtra("EXTRA_TARGET", str);
+            intent.putExtra(WidgetTosReportViolation.EXTRA_CHANNEL_ID, l);
+            intent.putExtra(WidgetTosReportViolation.EXTRA_MESSAGE_ID, l2);
+            intent.putExtra(WidgetTosReportViolation.EXTRA_TARGET, str);
             l.d(context, WidgetTosReportViolation.class, intent);
         }
     }
 
     public WidgetTosReportViolation() {
-        super(2131559315);
+        super(R.layout.widget_tos_report_violation);
         WidgetTosReportViolation$viewModel$2 widgetTosReportViolation$viewModel$2 = new WidgetTosReportViolation$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetTosReportViolationViewModel.class), new WidgetTosReportViolation$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetTosReportViolation$viewModel$2));
@@ -258,11 +259,11 @@ public final class WidgetTosReportViolation extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, c.a.l.b.k(this, 2131891799, new Object[0], null, 4), c.a.l.b.k(this, 2131892983, new Object[]{"https://dis.gd/request"}, null, 4), c.a.l.b.k(this, 2131892004, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, new WidgetTosReportViolation$handleReportSubmissionError$1(this), 8176, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, c.a.l.b.k(this, R.string.notice_dispatch_error, new Object[0], null, 4), c.a.l.b.k(this, R.string.report_modal_error, new Object[]{"https://dis.gd/request"}, null, 4), c.a.l.b.k(this, R.string.okay, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, new WidgetTosReportViolation$handleReportSubmissionError$1(this), 8176, null);
     }
 
     private final void handleReportSubmitted() {
-        o.i(this, 2131892992, 0, 4);
+        o.i(this, R.string.report_modal_submitted, 0, 4);
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
             appActivity.finish();
@@ -286,14 +287,14 @@ public final class WidgetTosReportViolation extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarTitle(2131892976);
+        setActionBarTitle(R.string.report);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextView textView = getBinding().f2016c;
         m.checkNotNullExpressionValue(textView, "binding.reportHeader");
-        c.a.l.b.n(textView, 2131892977, new Object[]{getArgs().getTarget()}, null, 4);
+        c.a.l.b.n(textView, R.string.report_message, new Object[]{getArgs().getTarget()}, null, 4);
         LinkifiedTextView linkifiedTextView = getBinding().g;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.reportTooltip");
-        c.a.l.b.n(linkifiedTextView, 2131888810, new Object[]{"https://discord.com/guidelines"}, null, 4);
+        c.a.l.b.n(linkifiedTextView, R.string.form_report_help_text, new Object[]{"https://discord.com/guidelines"}, null, 4);
         getBinding().b.setIsLoading(false);
         LoadingButton loadingButton = getBinding().b;
         m.checkNotNullExpressionValue(loadingButton, "binding.reportButton");
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
index 3503b0a814..0bc204723e 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.api.report.ReportReason;
 import com.discord.databinding.WidgetTosReportViolationReasonBinding;
 import com.google.android.material.radiobutton.MaterialRadioButton;
@@ -30,16 +31,16 @@ public final class WidgetTosReportViolationReasonView extends RelativeLayout {
     public WidgetTosReportViolationReasonView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131559316, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.widget_tos_report_violation_reason, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131364646;
-        TextView textView = (TextView) inflate.findViewById(2131364646);
+        int i2 = R.id.report_reason_descriptipn;
+        TextView textView = (TextView) inflate.findViewById(R.id.report_reason_descriptipn);
         if (textView != null) {
-            i2 = 2131364647;
-            TextView textView2 = (TextView) inflate.findViewById(2131364647);
+            i2 = R.id.report_reason_header;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.report_reason_header);
             if (textView2 != null) {
-                i2 = 2131364648;
-                MaterialRadioButton materialRadioButton = (MaterialRadioButton) inflate.findViewById(2131364648);
+                i2 = R.id.report_reason_radio;
+                MaterialRadioButton materialRadioButton = (MaterialRadioButton) inflate.findViewById(R.id.report_reason_radio);
                 if (materialRadioButton != null) {
                     WidgetTosReportViolationReasonBinding widgetTosReportViolationReasonBinding = new WidgetTosReportViolationReasonBinding((RelativeLayout) inflate, textView, textView2, materialRadioButton);
                     m.checkNotNullExpressionValue(widgetTosReportViolationReasonBinding, "WidgetTosReportViolation…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java b/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java
index 1a3780d5e0..7fd5e3ebbb 100644
--- a/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java
+++ b/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.e.b;
+import com.discord.R;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -30,7 +31,7 @@ public final class Badge$Companion$onBadgeClick$1 extends o implements Function1
     public final void invoke(Badge badge) {
         m.checkNotNullParameter(badge, "badge");
         if (badge.getShowPremiumUpSell()) {
-            b.C0013b.a(b.j, this.$fragmentManager, 5, this.$context.getString(2131892706), null, null, "Profile Modal", "Badge", badge.getObjectType(), false, false, 792);
+            b.C0013b.a(b.j, this.$fragmentManager, 5, this.$context.getString(R.string.premium_upsell_badge_active_mobile), null, null, "Profile Modal", "Badge", badge.getObjectType(), false, false, 792);
             return;
         }
         Context context = this.$context;
diff --git a/app/src/main/java/com/discord/widgets/user/Badge.java b/app/src/main/java/com/discord/widgets/user/Badge.java
index b8dd6c51a5..341d951ea6 100644
--- a/app/src/main/java/com/discord/widgets/user/Badge.java
+++ b/app/src/main/java/com/discord/widgets/user/Badge.java
@@ -5,6 +5,7 @@ import androidx.annotation.DrawableRes;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.models.domain.ModelUserProfile;
 import com.discord.models.user.User;
 import com.discord.utilities.user.UserUtils;
@@ -48,66 +49,67 @@ public final class Badge {
             ArrayList arrayList = new ArrayList(8);
             UserUtils userUtils = UserUtils.INSTANCE;
             if (userUtils.isStaff(user)) {
-                arrayList.add(new Badge(2131231926, context.getString(2131893709), null, false, null, 28, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_staff_32dp, context.getString(R.string.staff_badge_tooltip), null, false, null, 28, null));
             }
             if (userUtils.isPartner(user)) {
-                arrayList.add(new Badge(2131231915, context.getString(2131892111), null, false, null, 28, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_partner_32dp, context.getString(R.string.partner_badge_tooltip), null, false, null, 28, null));
             }
             if (userUtils.isCertifiedModerator(user)) {
-                arrayList.add(new Badge(2131231912, context.getString(2131887230), null, false, null, 28, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_certified_moderator_32dp, context.getString(R.string.certified_moderator_badge_tooltip), null, false, null, 28, null));
             }
             if (userUtils.isHypeSquad(user)) {
-                arrayList.add(new Badge(2131231913, context.getString(2131890490), null, false, null, 28, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_hypesquad_32dp, context.getString(R.string.hypesquad_badge_tooltip), null, false, null, 28, null));
             }
             boolean z4 = false;
             if (userUtils.isHypesquadHouse1(user)) {
-                arrayList.add(new Badge(i == 1 ? 2131231749 : 2131231748, context.getString(2131890498), b.h(context, 2131890507, new Object[]{b.h(context, 2131890498, new Object[0], null, 4)}, null, 4), false, null, 24, null));
+                arrayList.add(new Badge(i == 1 ? R.drawable.ic_hypesquad_house1_winner_32dp : R.drawable.ic_hypesquad_house1_32dp, context.getString(R.string.hypesquad_house_1), b.h(context, R.string.hypesquad_online_badge_tooltip, new Object[]{b.h(context, R.string.hypesquad_house_1, new Object[0], null, 4)}, null, 4), false, null, 24, null));
             }
             if (userUtils.isHypesquadHouse2(user)) {
-                arrayList.add(new Badge(i == 2 ? 2131231751 : 2131231750, b.h(context, 2131890499, new Object[0], null, 4), b.h(context, 2131890507, new Object[]{context.getString(2131890499)}, null, 4), false, null, 24, null));
+                arrayList.add(new Badge(i == 2 ? R.drawable.ic_hypesquad_house2_winner_32dp : R.drawable.ic_hypesquad_house2_32dp, b.h(context, R.string.hypesquad_house_2, new Object[0], null, 4), b.h(context, R.string.hypesquad_online_badge_tooltip, new Object[]{context.getString(R.string.hypesquad_house_2)}, null, 4), false, null, 24, null));
             }
             if (userUtils.isHypesquadHouse3(user)) {
-                arrayList.add(new Badge(i == 3 ? 2131231753 : 2131231752, context.getString(2131890500), b.h(context, 2131890507, new Object[]{b.h(context, 2131890500, new Object[0], null, 4)}, null, 4), false, null, 24, null));
+                arrayList.add(new Badge(i == 3 ? R.drawable.ic_hypesquad_house3_winner_32dp : R.drawable.ic_hypesquad_house3_32dp, context.getString(R.string.hypesquad_house_3), b.h(context, R.string.hypesquad_online_badge_tooltip, new Object[]{b.h(context, R.string.hypesquad_house_3, new Object[0], null, 4)}, null, 4), false, null, 24, null));
             }
             if (userUtils.isBugHunterLevel1(user)) {
-                arrayList.add(new Badge(2131231910, context.getString(2131887079), null, false, null, 28, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_bughunter_level_1_32dp, context.getString(R.string.bug_hunter_badge_tooltip), null, false, null, 28, null));
             }
             if (userUtils.isBugHunterLevel2(user)) {
-                arrayList.add(new Badge(2131231911, context.getString(2131887079), null, false, null, 28, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_bughunter_level_2_32dp, context.getString(R.string.bug_hunter_badge_tooltip), null, false, null, 28, null));
             }
             if (userUtils.isVerifiedDeveloper(user)) {
-                arrayList.add(new Badge(2131231927, context.getString(2131894922), null, false, null, 28, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_verified_developer_32dp, context.getString(R.string.verified_developer_badge_tooltip), null, false, null, 28, null));
             }
             if (userUtils.isPremiumEarlySupporter(user)) {
-                arrayList.add(new Badge(2131231916, context.getString(2131888228), null, !z2 && z3, "PREMIUM_EARLY_SUPPORTER", 4, null));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_premium_early_supporter_32dp, context.getString(R.string.early_supporter_tooltip), null, !z2 && z3, "PREMIUM_EARLY_SUPPORTER", 4, null));
             }
             if (modelUserProfile.isPremium()) {
-                arrayList.add(new Badge(2131231914, context.getString(2131892684), b.h(context, 2131892267, new Object[]{modelUserProfile.getPremiumSince(context)}, null, 4), !z2 && z3, "PREMIUM"));
+                arrayList.add(new Badge(R.drawable.ic_profile_badge_nitro_32dp, context.getString(R.string.premium_title), b.h(context, R.string.premium_badge_tooltip, new Object[]{modelUserProfile.getPremiumSince(context)}, null, 4), !z2 && z3, "PREMIUM"));
             }
             if (modelUserProfile.isPremiumGuildSubscriber()) {
                 Integer premiumGuildMonthsSubscribed = modelUserProfile.getPremiumGuildMonthsSubscribed();
-                int i2 = 2131231917;
-                if (premiumGuildMonthsSubscribed.intValue() >= 24) {
-                    i2 = 2131231925;
+                int intValue = premiumGuildMonthsSubscribed.intValue();
+                int i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl1_32dp;
+                if (intValue >= 24) {
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl9_32dp;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 18) {
-                    i2 = 2131231924;
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl8_32dp;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 15) {
-                    i2 = 2131231923;
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl7_32dp;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 12) {
-                    i2 = 2131231922;
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl6_32dp;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 9) {
-                    i2 = 2131231921;
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl5_32dp;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 6) {
-                    i2 = 2131231920;
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl4_32dp;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 3) {
-                    i2 = 2131231919;
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl3_32dp;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 2) {
-                    i2 = 2131231918;
+                    i2 = R.drawable.ic_profile_badge_premium_guild_subscription_lvl2_32dp;
                 } else {
                     premiumGuildMonthsSubscribed.intValue();
                 }
-                String string = context.getString(2131892684);
-                CharSequence h = b.h(context, 2131892489, new Object[]{modelUserProfile.getPremiumGuildSince(context)}, null, 4);
+                String string = context.getString(R.string.premium_title);
+                CharSequence h = b.h(context, R.string.premium_guild_subscription_tooltip, new Object[]{modelUserProfile.getPremiumGuildSince(context)}, null, 4);
                 if (!z2 && z3) {
                     z4 = true;
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java
index ff38a533a0..f0c8cc9179 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetBanUserBinding;
 import com.discord.views.CheckedSetting;
 import com.google.android.material.button.MaterialButton;
@@ -20,32 +21,32 @@ public final /* synthetic */ class WidgetBanUser$binding$2 extends k implements
 
     public final WidgetBanUserBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362095;
-        TextView textView = (TextView) view.findViewById(2131362095);
+        int i = R.id.ban_user_body;
+        TextView textView = (TextView) view.findViewById(R.id.ban_user_body);
         if (textView != null) {
-            i = 2131362096;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362096);
+            i = R.id.ban_user_button_container;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.ban_user_button_container);
             if (linearLayout != null) {
-                i = 2131362097;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362097);
+                i = R.id.ban_user_cancel;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.ban_user_cancel);
                 if (materialButton != null) {
-                    i = 2131362098;
-                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362098);
+                    i = R.id.ban_user_confirm;
+                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.ban_user_confirm);
                     if (materialButton2 != null) {
-                        i = 2131362099;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362099);
+                        i = R.id.ban_user_delete_messages_1_day;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.ban_user_delete_messages_1_day);
                         if (checkedSetting != null) {
-                            i = 2131362100;
-                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362100);
+                            i = R.id.ban_user_delete_messages_7_days;
+                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.ban_user_delete_messages_7_days);
                             if (checkedSetting2 != null) {
-                                i = 2131362101;
-                                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362101);
+                                i = R.id.ban_user_delete_messages_none;
+                                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.ban_user_delete_messages_none);
                                 if (checkedSetting3 != null) {
-                                    i = 2131362102;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362102);
+                                    i = R.id.ban_user_reason;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.ban_user_reason);
                                     if (textInputLayout != null) {
-                                        i = 2131362103;
-                                        TextView textView2 = (TextView) view.findViewById(2131362103);
+                                        i = R.id.ban_user_title;
+                                        TextView textView2 = (TextView) view.findViewById(R.id.ban_user_title);
                                         if (textView2 != null) {
                                             LinearLayout linearLayout2 = (LinearLayout) view;
                                             return new WidgetBanUserBinding(linearLayout2, textView, linearLayout, materialButton, materialButton2, checkedSetting, checkedSetting2, checkedSetting3, textInputLayout, textView2, linearLayout2);
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java
index bd47614d1d..aa37466b4b 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.content.Context;
 import android.view.View;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -46,7 +47,7 @@ public final class WidgetBanUser$onViewBound$3 implements View.OnClickListener {
         public final void invoke(Void r7) {
             Context context = this.this$0.this$0.getContext();
             Context context2 = this.this$0.this$0.getContext();
-            c.a.e.o.h(context, context2 != null ? b.h(context2, 2131886825, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
+            c.a.e.o.h(context, context2 != null ? b.h(context2, R.string.ban_user_confirmed, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
             this.this$0.this$0.dismiss();
         }
     }
@@ -64,13 +65,13 @@ public final class WidgetBanUser$onViewBound$3 implements View.OnClickListener {
         List access$getHistoryRadios$p = WidgetBanUser.access$getHistoryRadios$p(this.this$0);
         RadioManager access$getDeleteHistoryRadioManager$p = WidgetBanUser.access$getDeleteHistoryRadioManager$p(this.this$0);
         switch (((CheckedSetting) access$getHistoryRadios$p.get(access$getDeleteHistoryRadioManager$p != null ? access$getDeleteHistoryRadioManager$p.b() : 0)).getId()) {
-            case 2131362099:
+            case R.id.ban_user_delete_messages_1_day /* 2131362099 */:
                 i = 1;
                 break;
-            case 2131362100:
+            case R.id.ban_user_delete_messages_7_days /* 2131362100 */:
                 i = 7;
                 break;
-            case 2131362101:
+            case R.id.ban_user_delete_messages_none /* 2131362101 */:
             default:
                 i = 0;
                 break;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java
index 2974e93072..fbd125cc39 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetBanUserBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -49,7 +50,7 @@ public final class WidgetBanUser extends AppDialog {
     }
 
     public WidgetBanUser() {
-        super(2131558881);
+        super(R.layout.widget_ban_user);
     }
 
     public static final /* synthetic */ WidgetBanUserBinding access$getBinding$p(WidgetBanUser widgetBanUser) {
@@ -99,10 +100,10 @@ public final class WidgetBanUser extends AppDialog {
         long j2 = getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", -1);
         TextView textView = getBinding().i;
         m.checkNotNullExpressionValue(textView, "binding.banUserTitle");
-        b.n(textView, 2131886828, new Object[]{string}, null, 4);
+        b.n(textView, R.string.ban_user_title, new Object[]{string}, null, 4);
         TextView textView2 = getBinding().b;
         m.checkNotNullExpressionValue(textView2, "binding.banUserBody");
-        b.n(textView2, 2131886824, new Object[]{string}, null, 4);
+        b.n(textView2, R.string.ban_user_body, new Object[]{string}, null, 4);
         getBinding().f1694c.setOnClickListener(new WidgetBanUser$onViewBound$2(this));
         getBinding().d.setOnClickListener(new WidgetBanUser$onViewBound$3(this, j, j2, string));
     }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java
index 6b91eeba7c..ba3d3d1978 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetKickUserBinding;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -19,20 +20,20 @@ public final /* synthetic */ class WidgetKickUser$binding$2 extends k implements
 
     public final WidgetKickUserBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363936;
-        TextView textView = (TextView) view.findViewById(2131363936);
+        int i = R.id.kick_user_body;
+        TextView textView = (TextView) view.findViewById(R.id.kick_user_body);
         if (textView != null) {
-            i = 2131363937;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363937);
+            i = R.id.kick_user_cancel;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.kick_user_cancel);
             if (materialButton != null) {
-                i = 2131363938;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363938);
+                i = R.id.kick_user_confirm;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.kick_user_confirm);
                 if (materialButton2 != null) {
-                    i = 2131363939;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363939);
+                    i = R.id.kick_user_reason;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.kick_user_reason);
                     if (textInputLayout != null) {
-                        i = 2131363940;
-                        TextView textView2 = (TextView) view.findViewById(2131363940);
+                        i = R.id.kick_user_title;
+                        TextView textView2 = (TextView) view.findViewById(R.id.kick_user_title);
                         if (textView2 != null) {
                             return new WidgetKickUserBinding((LinearLayout) view, textView, materialButton, materialButton2, textInputLayout, textView2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
index 6af8a9a8c0..5e22e06b15 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.content.Context;
 import android.view.View;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -42,7 +43,7 @@ public final class WidgetKickUser$onViewBoundOrOnResume$2 implements View.OnClic
         public final void invoke(Void r7) {
             Context context = this.this$0.this$0.getContext();
             Context context2 = this.this$0.this$0.getContext();
-            c.a.e.o.h(context, context2 != null ? b.h(context2, 2131891071, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
+            c.a.e.o.h(context, context2 != null ? b.h(context2, R.string.kick_user_confirmed, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
             this.this$0.this$0.dismiss();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
index fa417c601f..219c2ad2a4 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetKickUserBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -42,7 +43,7 @@ public final class WidgetKickUser extends AppDialog {
     }
 
     public WidgetKickUser() {
-        super(2131559127);
+        super(R.layout.widget_kick_user);
     }
 
     public static final /* synthetic */ WidgetKickUserBinding access$getBinding$p(WidgetKickUser widgetKickUser) {
@@ -65,10 +66,10 @@ public final class WidgetKickUser extends AppDialog {
         long j2 = getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", -1);
         TextView textView = getBinding().f;
         m.checkNotNullExpressionValue(textView, "binding.kickUserTitle");
-        b.n(textView, 2131891074, new Object[]{string}, null, 4);
+        b.n(textView, R.string.kick_user_title, new Object[]{string}, null, 4);
         TextView textView2 = getBinding().b;
         m.checkNotNullExpressionValue(textView2, "binding.kickUserBody");
-        b.n(textView2, 2131891070, new Object[]{string}, null, 4);
+        b.n(textView2, R.string.kick_user_body, new Object[]{string}, null, 4);
         getBinding().f1857c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this));
         getBinding().d.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$2(this, j, j2, string));
     }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java
index 75633115aa..1b5420a538 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetPruneUsersBinding;
 import com.discord.views.CheckedSetting;
 import com.google.android.material.button.MaterialButton;
@@ -20,26 +21,26 @@ public final /* synthetic */ class WidgetPruneUsers$binding$2 extends k implemen
 
     public final WidgetPruneUsersBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364592;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364592);
+        int i = R.id.prune_user_cancel;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.prune_user_cancel);
         if (materialButton != null) {
-            i = 2131364593;
-            TextView textView = (TextView) view.findViewById(2131364593);
+            i = R.id.prune_user_header;
+            TextView textView = (TextView) view.findViewById(R.id.prune_user_header);
             if (textView != null) {
-                i = 2131364594;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364594);
+                i = R.id.prune_user_prune;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.prune_user_prune);
                 if (materialButton2 != null) {
-                    i = 2131364595;
-                    TextView textView2 = (TextView) view.findViewById(2131364595);
+                    i = R.id.prune_users_estimate_text;
+                    TextView textView2 = (TextView) view.findViewById(R.id.prune_users_estimate_text);
                     if (textView2 != null) {
-                        i = 2131364596;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364596);
+                        i = R.id.prune_users_history_1_radio;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.prune_users_history_1_radio);
                         if (checkedSetting != null) {
-                            i = 2131364597;
-                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364597);
+                            i = R.id.prune_users_history_2_radio;
+                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.prune_users_history_2_radio);
                             if (checkedSetting2 != null) {
-                                i = 2131364598;
-                                ProgressBar progressBar = (ProgressBar) view.findViewById(2131364598);
+                                i = R.id.prune_users_loading_progressbar;
+                                ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.prune_users_loading_progressbar);
                                 if (progressBar != null) {
                                     return new WidgetPruneUsersBinding((ScrollView) view, materialButton, textView, materialButton2, textView2, checkedSetting, checkedSetting2, progressBar);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
index 78542826ca..4539a10ed2 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
@@ -12,6 +12,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.WidgetPruneUsersBinding;
 import com.discord.utilities.KotlinExtensionsKt;
@@ -58,7 +59,7 @@ public final class WidgetPruneUsers extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetPruneUsers widgetPruneUsers = new WidgetPruneUsers();
             Bundle bundle = new Bundle();
-            bundle.putLong("ARG_GUILD_ID", j);
+            bundle.putLong(WidgetPruneUsers.ARG_GUILD_ID, j);
             widgetPruneUsers.setArguments(bundle);
             widgetPruneUsers.show(fragmentManager, WidgetPruneUsers.class.getName());
         }
@@ -77,7 +78,7 @@ public final class WidgetPruneUsers extends AppDialog {
     }
 
     public WidgetPruneUsers() {
-        super(2131559170);
+        super(R.layout.widget_prune_users);
         WidgetPruneUsers$viewModel$2 widgetPruneUsers$viewModel$2 = new WidgetPruneUsers$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetPruneUsersViewModel.class), new WidgetPruneUsers$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPruneUsers$viewModel$2));
@@ -138,7 +139,7 @@ public final class WidgetPruneUsers extends AppDialog {
         CheckedSetting checkedSetting;
         if (viewState instanceof WidgetPruneUsersViewModel.ViewState.Loading) {
             StringBuilder sb = new StringBuilder();
-            sb.append(b.k(this, 2131892822, new Object[0], null, 4));
+            sb.append(b.k(this, R.string.prune_members, new Object[0], null, 4));
             sb.append(" - ");
             WidgetPruneUsersViewModel.ViewState.Loading loading = (WidgetPruneUsersViewModel.ViewState.Loading) viewState;
             sb.append(loading.getGuildName());
@@ -174,12 +175,12 @@ public final class WidgetPruneUsers extends AppDialog {
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
             WidgetPruneUsersViewModel.ViewState.Loaded loaded = (WidgetPruneUsersViewModel.ViewState.Loaded) viewState;
-            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755080, loaded.getPruneCount(), Integer.valueOf(loaded.getPruneCount()));
+            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext, R.plurals.form_help_last_seen_members, loaded.getPruneCount(), Integer.valueOf(loaded.getPruneCount()));
             Context requireContext2 = requireContext();
             m.checkNotNullExpressionValue(requireContext2, "requireContext()");
-            CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext2, 2131755079, loaded.getPruneDays().getCount(), Integer.valueOf(loaded.getPruneDays().getCount()));
+            CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext2, R.plurals.form_help_last_seen_days, loaded.getPruneDays().getCount(), Integer.valueOf(loaded.getPruneDays().getCount()));
             TextView textView3 = getBinding().e;
-            b.n(textView3, 2131888616, new Object[]{i18nPluralString, i18nPluralString2}, null, 4);
+            b.n(textView3, R.string.form_help_last_seen, new Object[]{i18nPluralString, i18nPluralString2}, null, 4);
             textView3.setVisibility(0);
             MaterialButton materialButton2 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton2, "binding.pruneUserPrune");
@@ -212,12 +213,12 @@ public final class WidgetPruneUsers extends AppDialog {
         CheckedSetting checkedSetting = getBinding().f;
         Context context = checkedSetting.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        checkedSetting.setText(StringResourceUtilsKt.getI18nPluralString(context, 2131755219, 7, 7));
+        checkedSetting.setText(StringResourceUtilsKt.getI18nPluralString(context, R.plurals.last_seen_days, 7, 7));
         checkedSetting.e(new WidgetPruneUsers$onViewBound$$inlined$apply$lambda$1(this));
         CheckedSetting checkedSetting2 = getBinding().g;
         Context context2 = checkedSetting2.getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        checkedSetting2.setText(StringResourceUtilsKt.getI18nPluralString(context2, 2131755219, 30, 30));
+        checkedSetting2.setText(StringResourceUtilsKt.getI18nPluralString(context2, R.plurals.last_seen_days, 30, 30));
         checkedSetting2.e(new WidgetPruneUsers$onViewBound$$inlined$apply$lambda$2(this));
         getBinding().b.setOnClickListener(new WidgetPruneUsers$onViewBound$3(this));
         getBinding().d.setOnClickListener(new WidgetPruneUsers$onViewBound$4(this));
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$retry$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$retry$1.java
index b96ae57dcd..60a2348fb6 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$retry$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$retry$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user;
 
+import com.discord.utilities.analytics.Traits;
 import com.discord.widgets.user.WidgetUserMentions;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,7 +26,7 @@ public final class WidgetUserMentions$Model$MessageLoader$retry$1 extends o impl
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetUserMentions.Model.MessageLoader.access$setRetrySubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java
index c948005391..5279b76163 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.user;
 
 import android.view.View;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetUserMentionsFilterBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -17,14 +18,14 @@ public final /* synthetic */ class WidgetUserMentions$WidgetUserMentionFilter$bi
 
     public final WidgetUserMentionsFilterBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365658;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365658);
+        int i = R.id.user_mentions_filter_include_everyone;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.user_mentions_filter_include_everyone);
         if (checkedSetting != null) {
-            i = 2131365659;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365659);
+            i = R.id.user_mentions_filter_include_roles;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.user_mentions_filter_include_roles);
             if (checkedSetting2 != null) {
-                i = 2131365660;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365660);
+                i = R.id.user_mentions_filter_this_server;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.user_mentions_filter_this_server);
                 if (checkedSetting3 != null) {
                     return new WidgetUserMentionsFilterBinding((NestedScrollView) view, checkedSetting, checkedSetting2, checkedSetting3);
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java
index 823def4981..b6fa7025cf 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetUserMentionsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetUserMentions$binding$2 extends k implem
 
     public final WidgetUserMentionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361871;
-        Toolbar toolbar = (Toolbar) view.findViewById(2131361871);
+        int i = R.id.action_bar_toolbar;
+        Toolbar toolbar = (Toolbar) view.findViewById(R.id.action_bar_toolbar);
         if (toolbar != null) {
-            i = 2131365661;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365661);
+            i = R.id.user_mentions_list;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.user_mentions_list);
             if (recyclerView != null) {
                 return new WidgetUserMentionsBinding((CoordinatorLayout) view, toolbar, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java
index 933a38c61e..29212f6756 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.widgets.user.WidgetUserMentions;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -46,7 +47,7 @@ public final class WidgetUserMentions$configureToolbar$1<T1, T2> implements Acti
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364126) {
+        if (menuItem.getItemId() == R.id.menu_user_mentions_filter) {
             WidgetUserMentions.WidgetUserMentionFilter.Companion companion = WidgetUserMentions.WidgetUserMentionFilter.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
index 58a03bef58..48a7ea8374 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
@@ -5,6 +5,8 @@ import android.content.Context;
 import android.net.Uri;
 import android.view.View;
 import androidx.annotation.MainThread;
+import androidx.appcompat.widget.ActivityChooserModel;
+import androidx.core.app.NotificationCompat;
 import androidx.core.os.BundleKt;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -14,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
@@ -81,7 +84,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
     private static final String EXTRA_IS_EMBEDDED = "EXTRA_HIDE_TITLE";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetUserMentions$binding$2.INSTANCE, null, 2, null);
     private final Lazy dismissViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGlobalSearchDismissModel.class), new WidgetUserMentions$$special$$inlined$activityViewModels$1(this), new WidgetUserMentions$$special$$inlined$activityViewModels$2(this));
-    private final Lazy isEmbedded$delegate = FragmentExtensionsKt.booleanExtra$default(this, "EXTRA_HIDE_TITLE", false, 2, null);
+    private final Lazy isEmbedded$delegate = FragmentExtensionsKt.booleanExtra$default(this, EXTRA_IS_EMBEDDED, false, 2, null);
     private WidgetChatListAdapter mentionsAdapter;
     private final Model.MessageLoader mentionsLoader = new Model.MessageLoader(1000);
     private final StoreTabsNavigation storeTabsNavigation = StoreStream.Companion.getTabsNavigation();
@@ -105,7 +108,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
 
         public final WidgetUserMentions create(boolean z2) {
             WidgetUserMentions widgetUserMentions = new WidgetUserMentions();
-            widgetUserMentions.setArguments(BundleKt.bundleOf(o.to("EXTRA_HIDE_TITLE", Boolean.valueOf(z2))));
+            widgetUserMentions.setArguments(BundleKt.bundleOf(o.to(WidgetUserMentions.EXTRA_IS_EMBEDDED, Boolean.valueOf(z2))));
             return widgetUserMentions;
         }
     }
@@ -850,7 +853,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
 
         @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
         public boolean onQuickDownloadClicked(Uri uri, String str) {
-            m.checkNotNullParameter(uri, "uri");
+            m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             m.checkNotNullParameter(str, "fileName");
             return false;
         }
@@ -900,7 +903,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
         @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
         public void onUserActivityAction(long j, long j2, long j3, MessageActivityType messageActivityType, Activity activity, Application application) {
             m.checkNotNullParameter(messageActivityType, "actionType");
-            m.checkNotNullParameter(activity, "activity");
+            m.checkNotNullParameter(activity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
             m.checkNotNullParameter(application, "application");
         }
 
@@ -1021,7 +1024,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
 
         @Override // com.discord.app.AppBottomSheet
         public int getContentViewResId() {
-            return 2131559325;
+            return R.layout.widget_user_mentions_filter;
         }
 
         @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -1049,7 +1052,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
                 Context context = getContext();
                 CharSequence charSequence = null;
                 if (context != null) {
-                    charSequence = c.a.l.b.h(context, 2131894272, new Object[]{this.guildName}, null, 4);
+                    charSequence = c.a.l.b.h(context, R.string.this_server_named, new Object[]{this.guildName}, null, 4);
                 }
                 checkedSetting3.setText(charSequence);
                 getBinding().d.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$1(this));
@@ -1078,7 +1081,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
     }
 
     public WidgetUserMentions() {
-        super(2131559324);
+        super(R.layout.widget_user_mentions);
         WidgetUserMentions$viewModel$2 widgetUserMentions$viewModel$2 = WidgetUserMentions$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetUserMentionsViewModel.class), new WidgetUserMentions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetUserMentions$viewModel$2));
@@ -1102,13 +1105,13 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
 
     private final void configureToolbar(String str) {
         AppFragment.bindToolbar$default(this, null, 1, null);
-        String string = this.mentionsLoader.getFilters().getAllGuilds() ? getString(2131886343) : str;
+        String string = this.mentionsLoader.getFilters().getAllGuilds() ? getString(R.string.all_servers) : str;
         if (isEmbedded()) {
             setActionBarTitle(string);
         } else {
             setActionBarSubtitle(string);
         }
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623967, new WidgetUserMentions$configureToolbar$1(this, str), null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_user_mentions, new WidgetUserMentions$configureToolbar$1(this, str), null, 4, null);
     }
 
     private final void configureUI(Model model) {
@@ -1208,7 +1211,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
             AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
             getBinding().b.setNavigationOnClickListener(new WidgetUserMentions$onViewBound$1(this));
         } else {
-            setActionBarTitle(2131892912);
+            setActionBarTitle(R.string.recent_mentions);
         }
         WidgetChatListAdapter widgetChatListAdapter = (WidgetChatListAdapter) MGRecyclerAdapter.Companion.configure(createAdapter(new WidgetUserMentions$onViewBound$2(this.mentionsLoader)));
         this.mentionsAdapter = widgetChatListAdapter;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java
index 62a7b32aa8..e49e3672c6 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetUserMutualFriendsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetUserMutualFriends$binding$2 extends k i
 
     public final WidgetUserMutualFriendsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365662);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.user_mutual_friends_recycler_view);
         if (recyclerView != null) {
             return new WidgetUserMutualFriendsBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365662)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.user_mutual_friends_recycler_view)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
index b16cc9db63..8de71bebff 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.a.j.u5;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserMutualFriendsBinding;
 import com.discord.databinding.WidgetUserProfileAdapterItemFriendBinding;
@@ -382,39 +383,39 @@ public final class WidgetUserMutualFriends extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public ViewHolder(MutualFriendsAdapter mutualFriendsAdapter) {
-                super(2131559332, mutualFriendsAdapter);
+                super((int) R.layout.widget_user_profile_adapter_item_friend, mutualFriendsAdapter);
                 m.checkNotNullParameter(mutualFriendsAdapter, "adapter");
                 View view = this.itemView;
-                int i = 2131364206;
-                View findViewById = view.findViewById(2131364206);
+                int i = R.id.mutual_server_1;
+                View findViewById = view.findViewById(R.id.mutual_server_1);
                 if (findViewById != null) {
                     u5 a = u5.a(findViewById);
-                    i = 2131364207;
-                    View findViewById2 = view.findViewById(2131364207);
+                    i = R.id.mutual_server_2;
+                    View findViewById2 = view.findViewById(R.id.mutual_server_2);
                     if (findViewById2 != null) {
                         u5 a2 = u5.a(findViewById2);
-                        i = 2131364208;
-                        View findViewById3 = view.findViewById(2131364208);
+                        i = R.id.mutual_server_3;
+                        View findViewById3 = view.findViewById(R.id.mutual_server_3);
                         if (findViewById3 != null) {
                             u5 a3 = u5.a(findViewById3);
-                            i = 2131364209;
-                            View findViewById4 = view.findViewById(2131364209);
+                            i = R.id.mutual_server_4;
+                            View findViewById4 = view.findViewById(R.id.mutual_server_4);
                             if (findViewById4 != null) {
                                 u5 a4 = u5.a(findViewById4);
-                                i = 2131365670;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365670);
+                                i = R.id.user_profile_adapter_item_friend_avatar;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.user_profile_adapter_item_friend_avatar);
                                 if (simpleDraweeView != null) {
-                                    i = 2131365671;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365671);
+                                    i = R.id.user_profile_adapter_item_friend_mutual;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.user_profile_adapter_item_friend_mutual);
                                     if (linearLayout != null) {
-                                        i = 2131365674;
-                                        StatusView statusView = (StatusView) view.findViewById(2131365674);
+                                        i = R.id.user_profile_adapter_item_friend_status;
+                                        StatusView statusView = (StatusView) view.findViewById(R.id.user_profile_adapter_item_friend_status);
                                         if (statusView != null) {
-                                            i = 2131365675;
-                                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365675);
+                                            i = R.id.user_profile_adapter_item_friend_user_game;
+                                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(R.id.user_profile_adapter_item_friend_user_game);
                                             if (simpleDraweeSpanTextView != null) {
-                                                i = 2131365676;
-                                                TextView textView = (TextView) view.findViewById(2131365676);
+                                                i = R.id.user_profile_adapter_item_friend_user_name;
+                                                TextView textView = (TextView) view.findViewById(R.id.user_profile_adapter_item_friend_user_name);
                                                 if (textView != null) {
                                                     WidgetUserProfileAdapterItemFriendBinding widgetUserProfileAdapterItemFriendBinding = new WidgetUserProfileAdapterItemFriendBinding((RelativeLayout) view, a, a2, a3, a4, simpleDraweeView, linearLayout, statusView, simpleDraweeSpanTextView, textView);
                                                     m.checkNotNullExpressionValue(widgetUserProfileAdapterItemFriendBinding, "WidgetUserProfileAdapter…endBinding.bind(itemView)");
@@ -454,7 +455,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
                 PresenceUtils.setPresenceText$default(presence, booleanValue, simpleDraweeSpanTextView, true, false, 16, null);
                 SimpleDraweeView simpleDraweeView = this.binding.f;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.userProfileAdapterItemFriendAvatar");
-                IconUtils.setIcon$default(simpleDraweeView, mutualFriend.getUser(), 2131165297, null, null, null, 56, null);
+                IconUtils.setIcon$default(simpleDraweeView, mutualFriend.getUser(), R.dimen.avatar_size_standard, null, null, null, 56, null);
                 int i2 = 0;
                 while (i2 <= 3) {
                     u5 u5Var = i2 != 1 ? i2 != 2 ? i2 != 3 ? i2 != 4 ? this.binding.e : this.binding.e : this.binding.d : this.binding.f2029c : this.binding.b;
@@ -510,7 +511,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
         public MGRecyclerViewHolder<?, Model.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
             if (i == 0) {
-                return new WidgetUserProfileEmptyListItem(2131559331, this, 2130969521, 2131891742);
+                return new WidgetUserProfileEmptyListItem(R.layout.widget_user_profile_adapter_item_empty, this, R.attr.img_no_mutual_friends, R.string.no_mutual_friends);
             }
             if (i == 1) {
                 return new ViewHolder(this);
@@ -520,7 +521,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
     }
 
     public WidgetUserMutualFriends() {
-        super(2131559326);
+        super(R.layout.widget_user_mutual_friends);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserMutualFriends widgetUserMutualFriends, Model model) {
@@ -530,7 +531,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
     private final void configureUI(Model model) {
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        setActionBarTitle(StringResourceUtilsKt.getQuantityString(resources, 2131755364, 2131891637, model.getNumMutualFriends(), Integer.valueOf(model.getNumMutualFriends())));
+        setActionBarTitle(StringResourceUtilsKt.getQuantityString(resources, (int) R.plurals.user_profile_mutual_friends_count, (int) R.string.mutual_friends, model.getNumMutualFriends(), Integer.valueOf(model.getNumMutualFriends())));
         User user = model.getUser();
         setActionBarSubtitle(user != null ? user.getUsername() : null);
         MutualFriendsAdapter mutualFriendsAdapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java
index 81bdfb3c80..d335d3605c 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetUserMutualGuildsBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetUserMutualGuilds$binding$2 extends k im
 
     public final WidgetUserMutualGuildsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365663);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.user_mutual_guilds_recycler_view);
         if (recyclerView != null) {
             return new WidgetUserMutualGuildsBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365663)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.user_mutual_guilds_recycler_view)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
index f5f3d5daac..a3c464dbcb 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
@@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserMutualGuildsBinding;
 import com.discord.databinding.WidgetUserProfileAdapterItemServerBinding;
@@ -61,20 +62,20 @@ public final class WidgetUserMutualGuilds extends AppFragment {
                 super(i, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i2 = 2131365677;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365677);
+                int i2 = R.id.user_profile_adapter_item_server_image;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.user_profile_adapter_item_server_image);
                 if (simpleDraweeView != null) {
-                    i2 = 2131365678;
-                    TextView textView = (TextView) view.findViewById(2131365678);
+                    i2 = R.id.user_profile_adapter_item_server_name;
+                    TextView textView = (TextView) view.findViewById(R.id.user_profile_adapter_item_server_name);
                     if (textView != null) {
-                        i2 = 2131365679;
-                        TextView textView2 = (TextView) view.findViewById(2131365679);
+                        i2 = R.id.user_profile_adapter_item_server_nick;
+                        TextView textView2 = (TextView) view.findViewById(R.id.user_profile_adapter_item_server_nick);
                         if (textView2 != null) {
-                            i2 = 2131365680;
-                            TextView textView3 = (TextView) view.findViewById(2131365680);
+                            i2 = R.id.user_profile_adapter_item_server_text;
+                            TextView textView3 = (TextView) view.findViewById(R.id.user_profile_adapter_item_server_text);
                             if (textView3 != null) {
-                                i2 = 2131365681;
-                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365681);
+                                i2 = R.id.user_profile_adapter_item_server_wrap;
+                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.user_profile_adapter_item_server_wrap);
                                 if (relativeLayout != null) {
                                     WidgetUserProfileAdapterItemServerBinding widgetUserProfileAdapterItemServerBinding = new WidgetUserProfileAdapterItemServerBinding((RelativeLayout) view, simpleDraweeView, textView, textView2, textView3, relativeLayout);
                                     m.checkNotNullExpressionValue(widgetUserProfileAdapterItemServerBinding, "WidgetUserProfileAdapter…verBinding.bind(itemView)");
@@ -139,10 +140,10 @@ public final class WidgetUserMutualGuilds extends AppFragment {
         public MGRecyclerViewHolder<?, Model.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
             if (i == 0) {
-                return new WidgetUserProfileEmptyListItem(2131559331, this, 2130969522, 2131891743);
+                return new WidgetUserProfileEmptyListItem(R.layout.widget_user_profile_adapter_item_empty, this, R.attr.img_no_mutual_servers, R.string.no_mutual_guilds);
             }
             if (i == 1) {
-                return new ViewHolder(2131559334, this);
+                return new ViewHolder(R.layout.widget_user_profile_adapter_item_server, this);
             }
             throw invalidViewTypeException(i);
         }
@@ -415,7 +416,7 @@ public final class WidgetUserMutualGuilds extends AppFragment {
     }
 
     public WidgetUserMutualGuilds() {
-        super(2131559327);
+        super(R.layout.widget_user_mutual_guilds);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserMutualGuilds widgetUserMutualGuilds, Model model) {
@@ -424,7 +425,7 @@ public final class WidgetUserMutualGuilds extends AppFragment {
 
     private final void configureUI(Model model) {
         int numMutualGuilds = model.getNumMutualGuilds();
-        setActionBarTitle(StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755365, 2131891638, Integer.valueOf(numMutualGuilds), Integer.valueOf(numMutualGuilds)));
+        setActionBarTitle(StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.user_profile_mutual_guilds_count, R.string.mutual_guilds, Integer.valueOf(numMutualGuilds), Integer.valueOf(numMutualGuilds)));
         User user = model.getUser();
         setActionBarSubtitle(user != null ? user.getUsername() : null);
         Adapter adapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java
index 554e54c1ff..8374b97191 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.user;
 
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetUserPasswordVerifyBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetUserPasswordVerify$binding$2 extends k
 
     public final WidgetUserPasswordVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131363049;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363049);
+            i = R.id.edit_account_password_wrap;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.edit_account_password_wrap);
             if (textInputLayout != null) {
-                i = 2131365016;
-                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365016);
+                i = R.id.settings_account_save;
+                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.settings_account_save);
                 if (floatingActionButton != null) {
                     return new WidgetUserPasswordVerifyBinding((CoordinatorLayout) view, dimmerView, textInputLayout, floatingActionButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
index 2449403e05..b22ddd07cb 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user;
 
+import com.discord.R;
 import com.discord.utilities.auth.AuthUtils;
 import com.discord.utilities.view.validators.BasicTextInputValidator;
 import com.discord.utilities.view.validators.Input;
@@ -23,6 +24,6 @@ public final class WidgetUserPasswordVerify$validationManager$2 extends o implem
     public final ValidationManager mo1invoke() {
         TextInputLayout textInputLayout = WidgetUserPasswordVerify.access$getBinding$p(this.this$0).f2025c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("password", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131892124), AuthUtils.INSTANCE.createPasswordInputValidator(2131892113)));
+        return new ValidationManager(new Input.TextInputLayoutInput("password", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(R.string.password_required), AuthUtils.INSTANCE.createPasswordInputValidator(R.string.password_length_error)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
index cabeb744da..551433e6af 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
@@ -12,6 +12,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserPasswordVerifyBinding;
 import com.discord.restapi.RestAPIParams;
@@ -48,7 +49,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     private static final String INTENT_EXTRA_PHONE_TOKEN = "INTENT_EXTRA_PHONE_TOKEN";
     private static final String INTENT_EXTRA_USERNAME = "INTENT_EXTRA_USERNAME";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetUserPasswordVerify$binding$2.INSTANCE, null, 2, null);
-    private final StatefulViews state = new StatefulViews(2131363049);
+    private final StatefulViews state = new StatefulViews(R.id.edit_account_password_wrap);
     private final Lazy validationManager$delegate = g.lazy(new WidgetUserPasswordVerify$validationManager$2(this));
 
     /* compiled from: WidgetUserPasswordVerify.kt */
@@ -81,7 +82,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             Bundle bundle = new Bundle();
-            bundle.putSerializable("INTENT_EXTRA_ACTION", Action.RemovePhoneNumber);
+            bundle.putSerializable(WidgetUserPasswordVerify.INTENT_EXTRA_ACTION, Action.RemovePhoneNumber);
             launch(context, activityResultLauncher, bundle);
         }
 
@@ -89,10 +90,10 @@ public final class WidgetUserPasswordVerify extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             Bundle bundle = new Bundle();
-            bundle.putSerializable("INTENT_EXTRA_ACTION", Action.UpdateAccountInfo);
-            bundle.putString("INTENT_EXTRA_EMAIL", str);
-            bundle.putString("INTENT_EXTRA_USERNAME", str2);
-            bundle.putString("INTENT_EXTRA_DISCRIMINATOR", str3);
+            bundle.putSerializable(WidgetUserPasswordVerify.INTENT_EXTRA_ACTION, Action.UpdateAccountInfo);
+            bundle.putString(WidgetUserPasswordVerify.INTENT_EXTRA_EMAIL, str);
+            bundle.putString(WidgetUserPasswordVerify.INTENT_EXTRA_USERNAME, str2);
+            bundle.putString(WidgetUserPasswordVerify.INTENT_EXTRA_DISCRIMINATOR, str3);
             launch(context, activityResultLauncher, bundle);
         }
 
@@ -101,8 +102,8 @@ public final class WidgetUserPasswordVerify extends AppFragment {
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             m.checkNotNullParameter(str, "phoneToken");
             Bundle bundle = new Bundle();
-            bundle.putSerializable("INTENT_EXTRA_ACTION", Action.UpdatePhoneNumber);
-            bundle.putString("INTENT_EXTRA_PHONE_TOKEN", str);
+            bundle.putSerializable(WidgetUserPasswordVerify.INTENT_EXTRA_ACTION, Action.UpdatePhoneNumber);
+            bundle.putString(WidgetUserPasswordVerify.INTENT_EXTRA_PHONE_TOKEN, str);
             launch(context, activityResultLauncher, bundle);
         }
 
@@ -129,7 +130,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     }
 
     public WidgetUserPasswordVerify() {
-        super(2131559328);
+        super(R.layout.widget_user_password_verify);
     }
 
     public static final /* synthetic */ void access$finishWithSuccess(WidgetUserPasswordVerify widgetUserPasswordVerify) {
@@ -150,7 +151,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
 
     private final void finishWithSuccess() {
         StatefulViews.clear$default(this.state, false, 1, null);
-        o.i(this, 2131893359, 0, 4);
+        o.i(this, R.string.saved_settings, 0, 4);
         FragmentActivity activity = getActivity();
         if (activity != null) {
             activity.setResult(-1);
@@ -191,7 +192,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
             TextInputLayout textInputLayout = getBinding().f2025c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
             String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
-            Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("INTENT_EXTRA_ACTION");
+            Serializable serializableExtra = getMostRecentIntent().getSerializableExtra(INTENT_EXTRA_ACTION);
             Objects.requireNonNull(serializableExtra, "null cannot be cast to non-null type com.discord.widgets.user.WidgetUserPasswordVerify.Companion.Action");
             int ordinal = ((Companion.Action) serializableExtra).ordinal();
             if (ordinal == 0) {
@@ -205,14 +206,14 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     }
 
     private final void updateAccountInfo(String str) {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_USERNAME");
-        String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_DISCRIMINATOR");
-        String stringExtra3 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_EMAIL");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_USERNAME);
+        String stringExtra2 = getMostRecentIntent().getStringExtra(INTENT_EXTRA_DISCRIMINATOR);
+        String stringExtra3 = getMostRecentIntent().getStringExtra(INTENT_EXTRA_EMAIL);
         ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().patchUser(new RestAPIParams.UserInfo(null, stringExtra3, str, null, stringExtra, StoreStream.Companion.getNotifications().getPushToken(), null, stringExtra2, null, null, 841, null)), false, 1, null), this, null, 2, null), getBinding().b, 0, 2, null).k(q.h(new WidgetUserPasswordVerify$updateAccountInfo$1(this, stringExtra3, str), getContext(), new WidgetUserPasswordVerify$updateAccountInfo$2(this)));
     }
 
     private final void updatePhoneNumber(String str) {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_PHONE_TOKEN");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_PHONE_TOKEN);
         m.checkNotNull(stringExtra);
         m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…TENT_EXTRA_PHONE_TOKEN)!!");
         ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().userPhoneWithToken(new RestAPIParams.VerificationPhoneCode(stringExtra, str)), false, 1, null), this, null, 2, null), getBinding().b, 0, 2, null).k(q.h(new WidgetUserPasswordVerify$updatePhoneNumber$1(this), getContext(), new WidgetUserPasswordVerify$updatePhoneNumber$2(this)));
@@ -222,8 +223,8 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894701);
-        setActionBarTitle(2131894726);
+        setActionBarSubtitle(R.string.user_settings);
+        setActionBarTitle(R.string.user_settings_account_verify_password_title_in_title_case);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().d;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java
index 26da16dba9..25bfbf4e60 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.RadioGroup;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetUserSetCustomStatusBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -22,35 +23,35 @@ public final /* synthetic */ class WidgetUserSetCustomStatus$binding$2 extends k
 
     public final WidgetUserSetCustomStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364958;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364958);
+        int i = R.id.set_custom_status_emoji;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.set_custom_status_emoji);
         if (simpleDraweeView != null) {
-            i = 2131364959;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364959);
+            i = R.id.set_custom_status_emoji_button;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.set_custom_status_emoji_button);
             if (frameLayout != null) {
-                i = 2131364960;
-                RadioGroup radioGroup = (RadioGroup) view.findViewById(2131364960);
+                i = R.id.set_custom_status_expiration;
+                RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.set_custom_status_expiration);
                 if (radioGroup != null) {
-                    i = 2131364961;
-                    MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(2131364961);
+                    i = R.id.set_custom_status_expiration_1_hour;
+                    MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(R.id.set_custom_status_expiration_1_hour);
                     if (materialRadioButton != null) {
-                        i = 2131364962;
-                        MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(2131364962);
+                        i = R.id.set_custom_status_expiration_30_minutes;
+                        MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(R.id.set_custom_status_expiration_30_minutes);
                         if (materialRadioButton2 != null) {
-                            i = 2131364963;
-                            MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(2131364963);
+                            i = R.id.set_custom_status_expiration_4_hours;
+                            MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(R.id.set_custom_status_expiration_4_hours);
                             if (materialRadioButton3 != null) {
-                                i = 2131364964;
-                                MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(2131364964);
+                                i = R.id.set_custom_status_expiration_never;
+                                MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(R.id.set_custom_status_expiration_never);
                                 if (materialRadioButton4 != null) {
-                                    i = 2131364965;
-                                    MaterialRadioButton materialRadioButton5 = (MaterialRadioButton) view.findViewById(2131364965);
+                                    i = R.id.set_custom_status_expiration_tomorrow;
+                                    MaterialRadioButton materialRadioButton5 = (MaterialRadioButton) view.findViewById(R.id.set_custom_status_expiration_tomorrow);
                                     if (materialRadioButton5 != null) {
-                                        i = 2131364966;
-                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364966);
+                                        i = R.id.set_custom_status_save;
+                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.set_custom_status_save);
                                         if (floatingActionButton != null) {
-                                            i = 2131364967;
-                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364967);
+                                            i = R.id.set_custom_status_text;
+                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.set_custom_status_text);
                                             if (textInputLayout != null) {
                                                 return new WidgetUserSetCustomStatusBinding((CoordinatorLayout) view, simpleDraweeView, frameLayout, radioGroup, materialRadioButton, materialRadioButton2, materialRadioButton3, materialRadioButton4, materialRadioButton5, floatingActionButton, textInputLayout);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
index 4b493048eb..26a5ec6525 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
@@ -17,6 +17,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserSetCustomStatusBinding;
@@ -83,7 +84,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
     }
 
     public WidgetUserSetCustomStatus() {
-        super(2131559336);
+        super(R.layout.widget_user_set_custom_status);
         WidgetUserSetCustomStatus$viewModel$2 widgetUserSetCustomStatus$viewModel$2 = WidgetUserSetCustomStatus$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetUserSetCustomStatusViewModel.class), new WidgetUserSetCustomStatus$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetUserSetCustomStatus$viewModel$2));
@@ -143,7 +144,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
             WidgetUserSetCustomStatusViewModel.FormState formState = loaded.getFormState();
             Editable editable = null;
             if (formState.getEmoji() != null) {
-                String imageUri = formState.getEmoji().getImageUri(true, IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165338)), getContext());
+                String imageUri = formState.getEmoji().getImageUri(true, IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.custom_status_emoji_preview_size)), getContext());
                 if (!m.areEqual(imageUri, this.currentEmojiUri)) {
                     SimpleDraweeView simpleDraweeView = getBinding().b;
                     m.checkNotNullExpressionValue(simpleDraweeView, "binding.setCustomStatusEmoji");
@@ -151,7 +152,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
                     this.currentEmojiUri = imageUri;
                 }
             } else {
-                getBinding().b.setActualImageResource(2131231988);
+                getBinding().b.setActualImageResource(R.drawable.ic_smiley_desaturated);
                 this.currentEmojiUri = null;
             }
             TextInputLayout textInputLayout = getBinding().j;
@@ -209,7 +210,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
             window.setSoftInputMode(32);
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131888013);
+        setActionBarTitle(R.string.custom_status);
         this.expirationRadioManager = new RadioManager(n.listOf((Object[]) new MaterialRadioButton[]{getBinding().g, getBinding().e, getBinding().d, getBinding().f, getBinding().h}));
         getBinding().f2031c.setOnClickListener(new WidgetUserSetCustomStatus$onViewBound$1(this));
         getBinding().j.setEndIconOnClickListener(new WidgetUserSetCustomStatus$onViewBound$2(this));
@@ -221,28 +222,28 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
         setExpirationOnCheck(materialRadioButton, WidgetUserSetCustomStatusViewModel.FormState.Expiration.NEVER);
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755057, 30, 30);
+        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), (int) R.plurals.custom_status_clear_in_minutes_minutes, 30, 30);
         MaterialRadioButton materialRadioButton2 = getBinding().e;
         m.checkNotNullExpressionValue(materialRadioButton2, "binding.setCustomStatusExpiration30Minutes");
-        materialRadioButton2.setText(b.k(this, 2131888017, new Object[]{quantityString}, null, 4));
+        materialRadioButton2.setText(b.k(this, R.string.custom_status_clear_in_minutes, new Object[]{quantityString}, null, 4));
         MaterialRadioButton materialRadioButton3 = getBinding().e;
         m.checkNotNullExpressionValue(materialRadioButton3, "binding.setCustomStatusExpiration30Minutes");
         setExpirationOnCheck(materialRadioButton3, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_30_MINUTES);
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755056, 1, 1);
+        CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.custom_status_clear_in_hours_hours, 1, 1);
         MaterialRadioButton materialRadioButton4 = getBinding().d;
         m.checkNotNullExpressionValue(materialRadioButton4, "binding.setCustomStatusExpiration1Hour");
-        materialRadioButton4.setText(b.k(this, 2131888016, new Object[]{quantityString2}, null, 4));
+        materialRadioButton4.setText(b.k(this, R.string.custom_status_clear_in_hours, new Object[]{quantityString2}, null, 4));
         MaterialRadioButton materialRadioButton5 = getBinding().d;
         m.checkNotNullExpressionValue(materialRadioButton5, "binding.setCustomStatusExpiration1Hour");
         setExpirationOnCheck(materialRadioButton5, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_1_HOUR);
         Resources resources3 = getResources();
         m.checkNotNullExpressionValue(resources3, "resources");
-        CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources3, requireContext(), 2131755056, 4, 4);
+        CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources3, requireContext(), (int) R.plurals.custom_status_clear_in_hours_hours, 4, 4);
         MaterialRadioButton materialRadioButton6 = getBinding().f;
         m.checkNotNullExpressionValue(materialRadioButton6, "binding.setCustomStatusExpiration4Hours");
-        materialRadioButton6.setText(b.k(this, 2131888016, new Object[]{quantityString3}, null, 4));
+        materialRadioButton6.setText(b.k(this, R.string.custom_status_clear_in_hours, new Object[]{quantityString3}, null, 4));
         MaterialRadioButton materialRadioButton7 = getBinding().f;
         m.checkNotNullExpressionValue(materialRadioButton7, "binding.setCustomStatusExpiration4Hours");
         setExpirationOnCheck(materialRadioButton7, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_4_HOURS);
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
index 61b10f518b..6da91cf731 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
@@ -1,7 +1,9 @@
 package com.discord.widgets.user;
 
 import android.content.Context;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelCustomStatusSetting;
 import com.discord.models.domain.emoji.Emoji;
@@ -201,7 +203,7 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
         }
 
         public FormState(Emoji emoji, String str, Expiration expiration) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(expiration, "expiration");
             this.emoji = emoji;
             this.text = str;
@@ -234,7 +236,7 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
         }
 
         public final FormState copy(Emoji emoji, String str, Expiration expiration) {
-            m.checkNotNullParameter(str, "text");
+            m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
             m.checkNotNullParameter(expiration, "expiration");
             return new FormState(emoji, str, expiration);
         }
@@ -507,12 +509,12 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
 
     private final void emitSetStatusFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.SetStatusFailure(2131888073));
+        publishSubject.j.onNext(new Event.SetStatusFailure(R.string.default_failure_to_perform_action_message));
     }
 
     private final void emitSetStatusSuccessEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.SetStatusSuccess(2131888028));
+        publishSubject.j.onNext(new Event.SetStatusSuccess(R.string.custom_status_update_success));
     }
 
     private final Emoji getEmojiFromSetting(ModelCustomStatusSetting modelCustomStatusSetting, EmojiSet emojiSet) {
@@ -671,7 +673,7 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
     }
 
     public final void setStatusText(String str) {
-        m.checkNotNullParameter(str, "text");
+        m.checkNotNullParameter(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Loaded)) {
             viewState = null;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java
index 1e207bb803..bf95f1b0da 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
 import c.a.j.x3;
+import com.discord.R;
 import com.discord.databinding.WidgetUserStatusUpdateBinding;
 import com.discord.widgets.user.profile.UserStatusPresenceCustomView;
 import d0.z.d.k;
@@ -19,26 +20,26 @@ public final /* synthetic */ class WidgetUserStatusSheet$binding$2 extends k imp
 
     public final WidgetUserStatusUpdateBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363438;
-        TextView textView = (TextView) view.findViewById(2131363438);
+        int i = R.id.guild_actions_overview_header_tv;
+        TextView textView = (TextView) view.findViewById(R.id.guild_actions_overview_header_tv);
         if (textView != null) {
-            i = 2131365748;
-            UserStatusPresenceCustomView userStatusPresenceCustomView = (UserStatusPresenceCustomView) view.findViewById(2131365748);
+            i = R.id.user_status_update_custom;
+            UserStatusPresenceCustomView userStatusPresenceCustomView = (UserStatusPresenceCustomView) view.findViewById(R.id.user_status_update_custom);
             if (userStatusPresenceCustomView != null) {
-                i = 2131365749;
-                View findViewById = view.findViewById(2131365749);
+                i = R.id.user_status_update_dnd;
+                View findViewById = view.findViewById(R.id.user_status_update_dnd);
                 if (findViewById != null) {
                     x3 a = x3.a(findViewById);
-                    i = 2131365750;
-                    View findViewById2 = view.findViewById(2131365750);
+                    i = R.id.user_status_update_idle;
+                    View findViewById2 = view.findViewById(R.id.user_status_update_idle);
                     if (findViewById2 != null) {
                         x3 a2 = x3.a(findViewById2);
-                        i = 2131365751;
-                        View findViewById3 = view.findViewById(2131365751);
+                        i = R.id.user_status_update_invisible;
+                        View findViewById3 = view.findViewById(R.id.user_status_update_invisible);
                         if (findViewById3 != null) {
                             x3 a3 = x3.a(findViewById3);
-                            i = 2131365752;
-                            View findViewById4 = view.findViewById(2131365752);
+                            i = R.id.user_status_update_online;
+                            View findViewById4 = view.findViewById(R.id.user_status_update_online);
                             if (findViewById4 != null) {
                                 return new WidgetUserStatusUpdateBinding((NestedScrollView) view, textView, userStatusPresenceCustomView, a, a2, a3, x3.a(findViewById4));
                             }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
index 3487f34e36..dbc1d01554 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.j.x3;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.presence.ClientStatus;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetUserStatusUpdateBinding;
@@ -109,7 +110,7 @@ public final class WidgetUserStatusSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559338;
+        return R.layout.widget_user_status_update;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -128,25 +129,25 @@ public final class WidgetUserStatusSheet extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        getBinding().f.b.setImageResource(2131232019);
-        getBinding().f.d.setText(2131893931);
+        getBinding().f.b.setImageResource(R.drawable.ic_status_online_16dp);
+        getBinding().f.d.setText(R.string.status_online);
         x3 x3Var = getBinding().f;
         m.checkNotNullExpressionValue(x3Var, "binding.userStatusUpdateOnline");
         x3Var.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$1(this));
-        getBinding().d.b.setImageResource(2131232017);
-        getBinding().d.d.setText(2131893927);
+        getBinding().d.b.setImageResource(R.drawable.ic_status_idle_16dp);
+        getBinding().d.d.setText(R.string.status_idle);
         x3 x3Var2 = getBinding().d;
         m.checkNotNullExpressionValue(x3Var2, "binding.userStatusUpdateIdle");
         x3Var2.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$2(this));
-        getBinding().f2037c.b.setImageResource(2131232016);
-        getBinding().f2037c.d.setText(2131893925);
-        getBinding().f2037c.f189c.setText(2131893926);
+        getBinding().f2037c.b.setImageResource(R.drawable.ic_status_dnd_16dp);
+        getBinding().f2037c.d.setText(R.string.status_dnd);
+        getBinding().f2037c.f189c.setText(R.string.status_dnd_help);
         x3 x3Var3 = getBinding().f2037c;
         m.checkNotNullExpressionValue(x3Var3, "binding.userStatusUpdateDnd");
         x3Var3.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$3(this));
-        getBinding().e.b.setImageResource(2131232018);
-        getBinding().e.d.setText(2131893928);
-        getBinding().e.f189c.setText(2131893929);
+        getBinding().e.b.setImageResource(R.drawable.ic_status_invisible_16dp);
+        getBinding().e.d.setText(R.string.status_invisible);
+        getBinding().e.f189c.setText(R.string.status_invisible_helper);
         x3 x3Var4 = getBinding().e;
         m.checkNotNullExpressionValue(x3Var4, "binding.userStatusUpdateInvisible");
         x3Var4.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$4(this));
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java
index cdddd91244..e420afca30 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user.account;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetUserAccountVerifyBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import d0.z.d.k;
@@ -18,17 +19,17 @@ public final /* synthetic */ class WidgetUserAccountVerify$binding$2 extends k i
 
     public final WidgetUserAccountVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365761;
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365761);
+        int i = R.id.verify_account_by_email;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.verify_account_by_email);
         if (relativeLayout != null) {
-            i = 2131365762;
-            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131365762);
+            i = R.id.verify_account_by_phone;
+            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(R.id.verify_account_by_phone);
             if (relativeLayout2 != null) {
-                i = 2131365763;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365763);
+                i = R.id.verify_account_support;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.verify_account_support);
                 if (linkifiedTextView != null) {
-                    i = 2131365764;
-                    TextView textView = (TextView) view.findViewById(2131365764);
+                    i = R.id.verify_account_text_body;
+                    TextView textView = (TextView) view.findViewById(R.id.verify_account_text_body);
                     if (textView != null) {
                         return new WidgetUserAccountVerifyBinding((RelativeLayout) view, relativeLayout, relativeLayout2, linkifiedTextView, textView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
index d23b1cf6c0..d49a30430e 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
@@ -10,6 +10,7 @@ import c.a.e.f;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserAccountVerifyBinding;
 import com.discord.models.requiredaction.RequiredAction;
@@ -51,7 +52,7 @@ public final class WidgetUserAccountVerify extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserAccountVerify() {
-        super(2131559321);
+        super(R.layout.widget_user_account_verify);
     }
 
     private final WidgetUserAccountVerifyBinding getBinding() {
@@ -67,10 +68,10 @@ public final class WidgetUserAccountVerify extends WidgetUserAccountVerifyBase {
         WidgetUserAccountVerifyBinding binding = getBinding();
         TextView textView = binding.e;
         m.checkNotNullExpressionValue(textView, "verifyAccountTextBody");
-        textView.setText(b.k(this, 2131894896, new Object[0], null, 4));
+        textView.setText(b.k(this, R.string.verification_body, new Object[0], null, 4));
         LinkifiedTextView linkifiedTextView = binding.d;
         m.checkNotNullExpressionValue(linkifiedTextView, "verifyAccountSupport");
-        linkifiedTextView.setText(b.k(this, 2131894904, new Object[]{f.c()}, null, 4));
+        linkifiedTextView.setText(b.k(this, R.string.verification_footer_support, new Object[]{f.c()}, null, 4));
         RelativeLayout relativeLayout = binding.b;
         relativeLayout.setVisibility(isEmailAllowed() ? 0 : 8);
         relativeLayout.setOnClickListener(new WidgetUserAccountVerify$onViewBound$$inlined$with$lambda$1(this));
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java
index c6ee819b71..49346f2420 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.user.account;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -11,7 +12,7 @@ public final class WidgetUserAccountVerifyBase$setOptionsMenu$1<T1, T2> implemen
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364118) {
+        if (menuItem.getItemId() == R.id.menu_settings_log_out) {
             StoreStream.Companion.getAuthentication().logout();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java
index bbb723d75a..0673c34adb 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java
@@ -7,6 +7,7 @@ import androidx.annotation.LayoutRes;
 import androidx.fragment.app.FragmentActivity;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppLog;
 import com.discord.models.requiredaction.RequiredAction;
@@ -41,9 +42,9 @@ public abstract class WidgetUserAccountVerifyBase extends AppFragment {
         public final Intent getLaunchIntent(Mode mode, boolean z2, boolean z3) {
             m.checkNotNullParameter(mode, "mode");
             Intent intent = new Intent();
-            intent.putExtra("INTENT_PHONE_ALLOWED", z2);
-            intent.putExtra("INTENT_EMAIL_ALLOWED", z3);
-            intent.putExtra("INTENT_MODE", mode.ordinal());
+            intent.putExtra(WidgetUserAccountVerifyBase.INTENT_PHONE_ALLOWED, z2);
+            intent.putExtra(WidgetUserAccountVerifyBase.INTENT_EMAIL_ALLOWED, z3);
+            intent.putExtra(WidgetUserAccountVerifyBase.INTENT_MODE, mode.ordinal());
             return intent;
         }
     }
@@ -116,7 +117,7 @@ public abstract class WidgetUserAccountVerifyBase extends AppFragment {
         if (mode == null) {
             m.throwUninitializedPropertyAccessException("mode");
         }
-        AppFragment.setActionBarOptionsMenu$default(this, mode == Mode.FORCED ? 2131623963 : 2131623951, WidgetUserAccountVerifyBase$setOptionsMenu$1.INSTANCE, null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, mode == Mode.FORCED ? R.menu.menu_settings_logout : R.menu.menu_empty, WidgetUserAccountVerifyBase$setOptionsMenu$1.INSTANCE, null, 4, null);
     }
 
     public final Mode getMode() {
@@ -147,7 +148,7 @@ public abstract class WidgetUserAccountVerifyBase extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        int intExtra = getMostRecentIntent().getIntExtra("INTENT_MODE", -1);
+        int intExtra = getMostRecentIntent().getIntExtra(INTENT_MODE, -1);
         Mode.values();
         if (intExtra < 0 || 3 <= intExtra) {
             AppLog appLog = AppLog.g;
@@ -163,8 +164,8 @@ public abstract class WidgetUserAccountVerifyBase extends AppFragment {
         }
         this.mode = Mode.values()[intExtra];
         setOptionsMenu();
-        this.isPhoneAllowed = getMostRecentIntent().getBooleanExtra("INTENT_PHONE_ALLOWED", this.isPhoneAllowed);
-        this.isEmailAllowed = getMostRecentIntent().getBooleanExtra("INTENT_EMAIL_ALLOWED", this.isEmailAllowed);
+        this.isPhoneAllowed = getMostRecentIntent().getBooleanExtra(INTENT_PHONE_ALLOWED, this.isPhoneAllowed);
+        this.isEmailAllowed = getMostRecentIntent().getBooleanExtra(INTENT_EMAIL_ALLOWED, this.isEmailAllowed);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java
index 31689e7c5f..d93fadb841 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user.email;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetUserEmailUpdateBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.google.android.material.button.MaterialButton;
@@ -20,20 +21,20 @@ public final /* synthetic */ class WidgetUserEmailUpdate$binding$2 extends k imp
 
     public final WidgetUserEmailUpdateBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361959;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131361959);
+        int i = R.id.alert_verify_email_anchor;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.alert_verify_email_anchor);
         if (linearLayout != null) {
-            i = 2131361960;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131361960);
+            i = R.id.alert_verify_email_change;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.alert_verify_email_change);
             if (materialButton != null) {
-                i = 2131361961;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131361961);
+                i = R.id.alert_verify_email_change_email;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.alert_verify_email_change_email);
                 if (textInputLayout != null) {
-                    i = 2131361962;
-                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131361962);
+                    i = R.id.alert_verify_email_change_password;
+                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.alert_verify_email_change_password);
                     if (textInputLayout2 != null) {
-                        i = 2131362956;
-                        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+                        i = R.id.dimmer_view;
+                        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
                         if (dimmerView != null) {
                             return new WidgetUserEmailUpdateBinding((RelativeLayout) view, linearLayout, materialButton, textInputLayout, textInputLayout2, dimmerView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
index 194f729bbd..00b01864a8 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
@@ -9,6 +9,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserEmailUpdateBinding;
@@ -69,7 +70,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserEmailUpdate() {
-        super(2131559322);
+        super(R.layout.widget_user_email_update);
     }
 
     public static final /* synthetic */ WidgetUserEmailUpdateBinding access$getBinding$p(WidgetUserEmailUpdate widgetUserEmailUpdate) {
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$binding$2.java
index 0c2677ea48..7b2e62ec72 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user.email;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetUserEmailVerifyBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,14 +19,14 @@ public final /* synthetic */ class WidgetUserEmailVerify$binding$2 extends k imp
 
     public final WidgetUserEmailVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361959;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131361959);
+        int i = R.id.alert_verify_email_anchor;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.alert_verify_email_anchor);
         if (linearLayout != null) {
-            i = 2131361960;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131361960);
+            i = R.id.alert_verify_email_change;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.alert_verify_email_change);
             if (materialButton != null) {
-                i = 2131361963;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131361963);
+                i = R.id.alert_verify_email_resend;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.alert_verify_email_resend);
                 if (materialButton2 != null) {
                     return new WidgetUserEmailVerifyBinding((RelativeLayout) view, linearLayout, materialButton, materialButton2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java
index 3904c48925..eaee1ebb48 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.user.email;
 
 import android.view.View;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.restapi.RestAPIParams;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -37,7 +38,7 @@ public final class WidgetUserEmailVerify$configureUI$2 implements View.OnClickLi
         public final void invoke(Void r6) {
             WidgetUserEmailVerify$configureUI$2 widgetUserEmailVerify$configureUI$2 = this.this$0;
             WidgetUserEmailVerify widgetUserEmailVerify = widgetUserEmailVerify$configureUI$2.this$0;
-            c.a.e.o.j(widgetUserEmailVerify, b.k(widgetUserEmailVerify, 2131894898, new Object[]{widgetUserEmailVerify$configureUI$2.$model.getEmail()}, null, 4), 0, 4);
+            c.a.e.o.j(widgetUserEmailVerify, b.k(widgetUserEmailVerify, R.string.verification_email_body, new Object[]{widgetUserEmailVerify$configureUI$2.$model.getEmail()}, null, 4), 0, 4);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
index 5cc3094d69..1bfef4c1aa 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
@@ -6,6 +6,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.WidgetUserEmailVerifyBinding;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreStream;
@@ -127,7 +128,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserEmailVerify() {
-        super(2131559323);
+        super(R.layout.widget_user_email_verify);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserEmailVerify widgetUserEmailVerify, Model model) {
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java
index 15c907e981..01f83369b1 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user.phone;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetUserPhoneManageBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.phone.PhoneOrEmailInputView;
@@ -20,23 +21,23 @@ public final /* synthetic */ class WidgetUserPhoneManage$binding$2 extends k imp
 
     public final WidgetUserPhoneManageBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362956;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+        int i = R.id.dimmer_view;
+        DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
         if (dimmerView != null) {
-            i = 2131364636;
-            TextView textView = (TextView) view.findViewById(2131364636);
+            i = R.id.remove_phone;
+            TextView textView = (TextView) view.findViewById(R.id.remove_phone);
             if (textView != null) {
-                i = 2131365664;
-                TextView textView2 = (TextView) view.findViewById(2131365664);
+                i = R.id.user_phone_add_description_note;
+                TextView textView2 = (TextView) view.findViewById(R.id.user_phone_add_description_note);
                 if (textView2 != null) {
-                    i = 2131365665;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365665);
+                    i = R.id.user_phone_add_next;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.user_phone_add_next);
                     if (materialButton != null) {
-                        i = 2131365666;
-                        PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131365666);
+                        i = R.id.user_phone_add_number;
+                        PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(R.id.user_phone_add_number);
                         if (phoneOrEmailInputView != null) {
-                            i = 2131365667;
-                            TextView textView3 = (TextView) view.findViewById(2131365667);
+                            i = R.id.user_phone_title;
+                            TextView textView3 = (TextView) view.findViewById(R.id.user_phone_title);
                             if (textView3 != null) {
                                 return new WidgetUserPhoneManageBinding((FrameLayout) view, dimmerView, textView, textView2, materialButton, phoneOrEmailInputView, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
index 18ce6a1a2b..5601121442 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
@@ -6,11 +6,13 @@ import android.content.res.Resources;
 import android.view.View;
 import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.l;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserPhoneManageBinding;
 import com.discord.models.user.MeUser;
@@ -27,6 +29,7 @@ import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import com.discord.widgets.user.WidgetUserPasswordVerify;
 import com.discord.widgets.user.account.WidgetUserAccountVerifyBase;
+import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.button.MaterialButton;
 import d0.g0.t;
 import d0.o;
@@ -58,14 +61,14 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
             m.checkNotNullParameter(mode, "mode");
             Intent launchIntent = WidgetUserAccountVerifyBase.Companion.getLaunchIntent(mode, true, false);
             if (mode == WidgetUserAccountVerifyBase.Mode.NO_HISTORY_FROM_USER_SETTINGS) {
-                launchIntent.addFlags(1073741824);
+                launchIntent.addFlags(BasicMeasure.EXACTLY);
             }
             l.d(context, WidgetUserPhoneManage.class, launchIntent);
         }
     }
 
     public WidgetUserPhoneManage() {
-        super(2131559329);
+        super(R.layout.widget_user_phone_manage);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserPhoneManage widgetUserPhoneManage, MeUser meUser) {
@@ -102,16 +105,16 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
 
     private final void configureUI(MeUser meUser) {
         if (meUser.getPhoneNumber() != null) {
-            getBinding().g.setText(2131892222);
+            getBinding().g.setText(R.string.phone_verification_update_title);
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.userPhoneAddDescriptionNote");
-            b.n(textView, 2131892218, new Object[]{meUser.getPhoneNumber()}, null, 4);
+            b.n(textView, R.string.phone_verification_current_phone, new Object[]{meUser.getPhoneNumber()}, null, 4);
             TextView textView2 = getBinding().f2026c;
             m.checkNotNullExpressionValue(textView2, "binding.removePhone");
             textView2.setVisibility(0);
         } else {
-            getBinding().g.setText(2131888407);
-            getBinding().d.setText(2131888404);
+            getBinding().g.setText(R.string.enter_phone_title);
+            getBinding().d.setText(R.string.enter_phone_description);
             TextView textView3 = getBinding().f2026c;
             m.checkNotNullExpressionValue(textView3, "binding.removePhone");
             textView3.setVisibility(8);
@@ -132,7 +135,7 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
         MaterialButton materialButton = getBinding().e;
         m.checkNotNullExpressionValue(materialButton, "binding.userPhoneAddNext");
         boolean z2 = true;
-        if (!(textOrEmpty.length() > 0) || !t.startsWith$default(textOrEmpty, "+", false, 2, null)) {
+        if (!(textOrEmpty.length() > 0) || !t.startsWith$default(textOrEmpty, BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX, false, 2, null)) {
             z2 = false;
         }
         materialButton.setEnabled(z2);
@@ -148,23 +151,23 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        CharSequence i = b.i(resources, 2131894722, new Object[0], null, 4);
+        CharSequence i = b.i(resources, R.string.user_settings_account_remove_phone_number_warning_title, new Object[0], null, 4);
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        CharSequence i2 = b.i(resources2, 2131894721, new Object[0], null, 4);
+        CharSequence i2 = b.i(resources2, R.string.user_settings_account_remove_phone_number_warning_body, new Object[0], null, 4);
         Resources resources3 = getResources();
         m.checkNotNullExpressionValue(resources3, "resources");
-        CharSequence i3 = b.i(resources3, 2131892939, new Object[0], null, 4);
+        CharSequence i3 = b.i(resources3, R.string.remove, new Object[0], null, 4);
         Resources resources4 = getResources();
         m.checkNotNullExpressionValue(resources4, "resources");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, i, i2, i3, b.i(resources4, 2131887193, new Object[0], null, 4), g0.mapOf(o.to(2131364252, new WidgetUserPhoneManage$removePhoneNumber$1(this))), null, null, null, 2130969796, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, i, i2, i3, b.i(resources4, R.string.cancel, new Object[0], null, 4), g0.mapOf(o.to(Integer.valueOf((int) R.id.notice_ok), new WidgetUserPhoneManage$removePhoneNumber$1(this))), null, null, null, Integer.valueOf((int) R.attr.notice_theme_positive_red), null, null, 0, null, 15808, null);
     }
 
     @Override // com.discord.widgets.user.account.WidgetUserAccountVerifyBase, com.discord.app.AppFragment
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, !isForced(), Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(view, 2130969372, 0, 2, (Object) null)), !isForced() ? 2131887410 : null, null, 8, null);
+        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, !isForced(), Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(view, (int) R.attr.ic_action_bar_close, 0, 2, (Object) null)), !isForced() ? Integer.valueOf((int) R.string.close) : null, null, 8, null);
         getBinding().f.b(this);
         StorePhone phone = StoreStream.Companion.getPhone();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{phone}, false, null, null, new WidgetUserPhoneManage$onViewBound$1(phone), 14, null), this, null, 2, null), WidgetUserPhoneManage.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserPhoneManage$onViewBound$2(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java
index 06dba7bc2c..5a33a70e39 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user.phone;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetUserPhoneVerifyBinding;
 import com.discord.utilities.dimmer.DimmerView;
 import com.discord.views.CodeVerificationView;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetUserPhoneVerify$binding$2 extends k imp
 
     public final WidgetUserPhoneVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362675;
-        ImageView imageView = (ImageView) view.findViewById(2131362675);
+        int i = R.id.close_button;
+        ImageView imageView = (ImageView) view.findViewById(R.id.close_button);
         if (imageView != null) {
-            i = 2131362956;
-            DimmerView dimmerView = (DimmerView) view.findViewById(2131362956);
+            i = R.id.dimmer_view;
+            DimmerView dimmerView = (DimmerView) view.findViewById(R.id.dimmer_view);
             if (dimmerView != null) {
-                i = 2131364439;
-                CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131364439);
+                i = R.id.phone_digit_verification_view;
+                CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(R.id.phone_digit_verification_view);
                 if (codeVerificationView != null) {
                     return new WidgetUserPhoneVerifyBinding((RelativeLayout) view, imageView, dimmerView, codeVerificationView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
index 40357fcad8..554a8fa973 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
@@ -6,10 +6,12 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.fragment.app.Fragment;
 import c.a.e.l;
 import c.a.e.q;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserPhoneVerifyBinding;
 import com.discord.restapi.RestAPIParams;
@@ -47,9 +49,9 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
             m.checkNotNullParameter(mode, "mode");
             Intent launchIntent = WidgetUserAccountVerifyBase.Companion.getLaunchIntent(mode, true, false);
             if (mode == WidgetUserAccountVerifyBase.Mode.NO_HISTORY_FROM_USER_SETTINGS) {
-                launchIntent.addFlags(1073741824);
+                launchIntent.addFlags(BasicMeasure.EXACTLY);
             }
-            launchIntent.putExtra("INTENT_EXTRA_PHONE_NUMBER", str);
+            launchIntent.putExtra(WidgetUserPhoneVerify.INTENT_EXTRA_PHONE_NUMBER, str);
             l.g.f(context, activityResultLauncher, WidgetUserPhoneVerify.class, launchIntent);
         }
 
@@ -63,7 +65,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserPhoneVerify() {
-        super(2131559330);
+        super(R.layout.widget_user_phone_verify);
     }
 
     public static final /* synthetic */ WidgetUserPhoneVerifyBinding access$getBinding$p(WidgetUserPhoneVerify widgetUserPhoneVerify) {
@@ -91,7 +93,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
     }
 
     private final void handleCodeEntered(String str) {
-        String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_PHONE_NUMBER");
+        String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_PHONE_NUMBER);
         if (stringExtra != null) {
             m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…A_PHONE_NUMBER) ?: return");
             ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), false, 1, null), getBinding().f2027c, 0, 2, null), this, null, 2, null).k(q.h(new WidgetUserPhoneVerify$handleCodeEntered$1(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$2(this)));
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
index 2178c74fb3..ee18e7d26c 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
@@ -2,6 +2,7 @@ package com.discord.widgets.user.presence;
 
 import a0.a.a.b;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserPresence;
 import d0.z.d.m;
@@ -52,7 +53,7 @@ public final class ModelStageRichPresence {
 
     public ModelStageRichPresence(long j, long j2, boolean z2, long j3, boolean z3, boolean z4, String str, String str2, String str3, Set<Long> set, Set<Long> set2, int i, int i2) {
         m.checkNotNullParameter(str, "guildName");
-        m.checkNotNullParameter(str3, "topic");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         m.checkNotNullParameter(set, "knownUserIds");
         m.checkNotNullParameter(set2, "speakerIds");
         this.channelId = j;
@@ -128,7 +129,7 @@ public final class ModelStageRichPresence {
 
     public final ModelStageRichPresence copy(long j, long j2, boolean z2, long j3, boolean z3, boolean z4, String str, String str2, String str3, Set<Long> set, Set<Long> set2, int i, int i2) {
         m.checkNotNullParameter(str, "guildName");
-        m.checkNotNullParameter(str3, "topic");
+        m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_TOPIC);
         m.checkNotNullParameter(set, "knownUserIds");
         m.checkNotNullParameter(set2, "speakerIds");
         return new ModelStageRichPresence(j, j2, z2, j3, z3, z4, str, str2, str3, set, set2, i, i2);
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java
index 18b2124199..b2ebd7070f 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.annotation.MainThread;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityParty;
 import com.discord.api.activity.ActivityTimestamps;
@@ -54,7 +55,7 @@ public final class ViewHolderGameRichPresence extends ViewHolderUserRichPresence
                 ActivityParty i = activity.i();
                 if (i != null) {
                     PresenceUtils presenceUtils = PresenceUtils.INSTANCE;
-                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = getRoot().getContext()) == null) ? null : b.h(context, 2131894650, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
+                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = getRoot().getContext()) == null) ? null : b.h(context, R.string.user_activity_state_size, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
                 }
                 charSequence = "";
                 String str2 = l + ' ' + charSequence;
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java
index 17cff106b1..a98bc03f67 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java
@@ -9,6 +9,7 @@ import androidx.annotation.MainThread;
 import androidx.core.view.ViewKt;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityAssets;
 import com.discord.api.activity.ActivityPlatform;
@@ -87,14 +88,14 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc
         TextView richPresenceDetails = getRichPresenceDetails();
         if (richPresenceDetails != null) {
             m.checkNotNullExpressionValue(context2, "context");
-            ViewExtensions.setTextAndVisibilityBy(richPresenceDetails, b.h(context2, 2131894643, new Object[]{replace$default}, null, 4));
+            ViewExtensions.setTextAndVisibilityBy(richPresenceDetails, b.h(context2, R.string.user_activity_listening_artists, new Object[]{replace$default}, null, 4));
         }
         TextView richPresenceTime = getRichPresenceTime();
         m.checkNotNullExpressionValue(context2, "context");
         Object[] objArr = new Object[1];
         ActivityAssets b = primaryActivity.b();
         objArr[0] = b != null ? b.b() : null;
-        ViewExtensions.setTextAndVisibilityBy(richPresenceTime, b.h(context2, 2131894642, objArr, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(richPresenceTime, b.h(context2, R.string.user_activity_listening_album, objArr, null, 4));
         getRichPresenceTextContainer().setSelected(true);
         configureAssetUi(primaryActivity, streamContext);
         Button richPresencePrimaryButton = getRichPresencePrimaryButton();
@@ -111,7 +112,7 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc
         if (z2) {
             Button richPresencePrimaryButton2 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton2 != null) {
-                b.n(richPresencePrimaryButton2, 2131894621, new Object[0], null, 4);
+                b.n(richPresencePrimaryButton2, R.string.user_activity_cannot_play_self, new Object[0], null, 4);
             }
             Button richPresencePrimaryButton3 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton3 != null) {
@@ -120,7 +121,7 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc
         } else {
             Button richPresencePrimaryButton4 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton4 != null) {
-                b.n(richPresencePrimaryButton4, 2131894646, new Object[]{primaryActivity.h()}, null, 4);
+                b.n(richPresencePrimaryButton4, R.string.user_activity_play_on_platform, new Object[]{primaryActivity.h()}, null, 4);
             }
             Button richPresencePrimaryButton5 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton5 != null) {
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java
index 090db2c992..ddc7ac0591 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java
@@ -11,6 +11,7 @@ import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.ViewKt;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityTimestamps;
 import com.discord.api.application.Application;
@@ -136,11 +137,11 @@ public final class ViewHolderPlatformRichPresence extends ViewHolderUserRichPres
             if (richPresencePrimaryButton2 != null) {
                 Context context3 = getRoot().getContext();
                 m.checkNotNullExpressionValue(context3, "root.context");
-                richPresencePrimaryButton2.setText(b.h(context3, 2131894624, new Object[]{from.getProperName()}, null, 4));
+                richPresencePrimaryButton2.setText(b.h(context3, R.string.user_activity_connect_platform, new Object[]{from.getProperName()}, null, 4));
             }
             Button richPresencePrimaryButton3 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton3 != null) {
-                richPresencePrimaryButton3.setBackgroundColor(from.getColorResId() == null ? ColorCompat.getThemedColor(getRichPresencePrimaryButton(), 2130968908) : ColorCompat.getColor(getRichPresencePrimaryButton(), from.getColorResId().intValue()));
+                richPresencePrimaryButton3.setBackgroundColor(from.getColorResId() == null ? ColorCompat.getThemedColor(getRichPresencePrimaryButton(), (int) R.attr.colorButtonNormal) : ColorCompat.getColor(getRichPresencePrimaryButton(), from.getColorResId().intValue()));
             }
             Button richPresencePrimaryButton4 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton4 != null) {
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java
index cc8c3493d6..97f2978256 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java
@@ -9,6 +9,7 @@ import androidx.annotation.MainThread;
 import androidx.core.view.ViewKt;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityAssets;
 import com.discord.api.activity.ActivityTimestamps;
@@ -92,7 +93,7 @@ public final class ViewHolderStageChannelRichPresence extends ViewHolderUserRich
             }
             textView.setVisibility(i);
             if (hasIcon) {
-                SimpleDraweeViewExtensionsKt.setGuildIcon$default(getRichPresenceImageLarge(), true, guild, (float) resources.getDimensionPixelSize(2131165446), Integer.valueOf(IconUtils.getMediaProxySize(resources.getDimensionPixelSize(2131165290))), null, null, null, false, null, 496, null);
+                SimpleDraweeViewExtensionsKt.setGuildIcon$default(getRichPresenceImageLarge(), true, guild, (float) resources.getDimensionPixelSize(R.dimen.guild_icon_radius), Integer.valueOf(IconUtils.getMediaProxySize(resources.getDimensionPixelSize(R.dimen.avatar_size_large))), null, null, null, false, null, 496, null);
             } else {
                 this.richPresenceImageLargeText.setText(guild.getShortName());
             }
@@ -116,7 +117,7 @@ public final class ViewHolderStageChannelRichPresence extends ViewHolderUserRich
                 richPresenceDetails.setVisibility((b != null ? b.d() : null) != null ? 0 : 8);
                 ActivityAssets b2 = activity.b();
                 if (b2 != null && (d = b2.d()) != null) {
-                    b.n(richPresenceDetails, 2131893799, new Object[]{d}, null, 4);
+                    b.n(richPresenceDetails, R.string.stage_discovery_origin_text, new Object[]{d}, null, 4);
                     return;
                 }
                 return;
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java
index 1a8209d576..a5c1dd5f93 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityParty;
 import com.discord.api.activity.ActivityTimestamps;
@@ -63,7 +64,7 @@ public final class ViewHolderStreamRichPresence extends ViewHolderUserRichPresen
         if (activityParty != null) {
             PresenceUtils presenceUtils = PresenceUtils.INSTANCE;
             if (presenceUtils.getMaxSize(activityParty) != 0) {
-                charSequence = b.j(getRoot(), 2131894650, new Object[]{String.valueOf(presenceUtils.getCurrentSize(activityParty)), String.valueOf(presenceUtils.getMaxSize(activityParty))}, null, 4);
+                charSequence = b.j(getRoot(), R.string.user_activity_state_size, new Object[]{String.valueOf(presenceUtils.getCurrentSize(activityParty)), String.valueOf(presenceUtils.getMaxSize(activityParty))}, null, 4);
             }
         }
         charSequence = "";
@@ -84,7 +85,7 @@ public final class ViewHolderStreamRichPresence extends ViewHolderUserRichPresen
             Guild guild = streamContext.getGuild();
             CharSequence charSequence = null;
             String name = guild != null ? guild.getName() : null;
-            getRichPresenceHeader().setText(name != null ? b.j(getRichPresenceHeader(), 2131894631, new Object[]{name}, null, 4) : b.j(getRichPresenceHeader(), 2131894630, new Object[0], null, 4));
+            getRichPresenceHeader().setText(name != null ? b.j(getRichPresenceHeader(), R.string.user_activity_header_streaming_to_guild, new Object[]{name}, null, 4) : b.j(getRichPresenceHeader(), R.string.user_activity_header_streaming_to_dm, new Object[0], null, 4));
             if (activity == null || !ActivityUtilsKt.isGameActivity(activity)) {
                 getRichPresenceTextContainer().setVisibility(8);
                 return;
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
index 2000eddf2c..22aa5e153c 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
@@ -23,6 +23,7 @@ import c.a.j.r5;
 import c.a.j.s5;
 import c.a.j.v5;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityAssets;
 import com.discord.api.activity.ActivityParty;
@@ -125,25 +126,25 @@ public class ViewHolderUserRichPresence {
                 return new ViewHolderGameRichPresence(viewGroup, simpleDraweeView, simpleDraweeView2, textView, textView2, textView3, textView4, textView5, linearLayout, materialButton, materialButton2);
             } else if (i != 2) {
                 if (i == 3) {
-                    View inflate = from.inflate(2131559165, viewGroup, false);
+                    View inflate = from.inflate(R.layout.widget_platform_rich_presence, viewGroup, false);
                     viewGroup.addView(inflate);
-                    Barrier barrier = (Barrier) inflate.findViewById(2131362114);
+                    Barrier barrier = (Barrier) inflate.findViewById(R.id.barrier);
                     if (barrier != null) {
-                        Space space = (Space) inflate.findViewById(2131363746);
+                        Space space = (Space) inflate.findViewById(R.id.image_bottom_guideline);
                         if (space != null) {
-                            LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131364663);
+                            LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(R.id.rich_presence_container_data);
                             if (linearLayout2 != null) {
-                                TextView textView6 = (TextView) inflate.findViewById(2131364665);
+                                TextView textView6 = (TextView) inflate.findViewById(R.id.rich_presence_header);
                                 if (textView6 != null) {
-                                    SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) inflate.findViewById(2131364666);
+                                    SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) inflate.findViewById(R.id.rich_presence_image_large);
                                     if (simpleDraweeView3 != null) {
-                                        SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) inflate.findViewById(2131364669);
+                                        SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) inflate.findViewById(R.id.rich_presence_image_small);
                                         if (simpleDraweeView4 != null) {
-                                            MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131364673);
+                                            MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(R.id.rich_presence_primary_button);
                                             if (materialButton3 != null) {
-                                                TextView textView7 = (TextView) inflate.findViewById(2131364677);
+                                                TextView textView7 = (TextView) inflate.findViewById(R.id.rich_presence_time);
                                                 if (textView7 != null) {
-                                                    TextView textView8 = (TextView) inflate.findViewById(2131364678);
+                                                    TextView textView8 = (TextView) inflate.findViewById(R.id.rich_presence_title);
                                                     if (textView8 != null) {
                                                         m.checkNotNullExpressionValue(new j5((LinearLayout) inflate, barrier, space, linearLayout2, textView6, simpleDraweeView3, simpleDraweeView4, materialButton3, textView7, textView8), "WidgetPlatformRichPresen…e(inflater, parent, true)");
                                                         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.richPresenceImageLarge");
@@ -155,52 +156,52 @@ public class ViewHolderUserRichPresence {
                                                         m.checkNotNullExpressionValue(materialButton3, "binding.richPresencePrimaryButton");
                                                         viewHolderUserRichPresence = new ViewHolderPlatformRichPresence(viewGroup, simpleDraweeView3, simpleDraweeView4, textView6, textView8, textView7, linearLayout2, materialButton3);
                                                     } else {
-                                                        i3 = 2131364678;
+                                                        i3 = R.id.rich_presence_title;
                                                     }
                                                 } else {
-                                                    i3 = 2131364677;
+                                                    i3 = R.id.rich_presence_time;
                                                 }
                                             } else {
-                                                i3 = 2131364673;
+                                                i3 = R.id.rich_presence_primary_button;
                                             }
                                         } else {
-                                            i3 = 2131364669;
+                                            i3 = R.id.rich_presence_image_small;
                                         }
                                     } else {
-                                        i3 = 2131364666;
+                                        i3 = R.id.rich_presence_image_large;
                                     }
                                 } else {
-                                    i3 = 2131364665;
+                                    i3 = R.id.rich_presence_header;
                                 }
                             } else {
-                                i3 = 2131364663;
+                                i3 = R.id.rich_presence_container_data;
                             }
                         } else {
-                            i3 = 2131363746;
+                            i3 = R.id.image_bottom_guideline;
                         }
                     } else {
-                        i3 = 2131362114;
+                        i3 = R.id.barrier;
                     }
                     throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i3)));
                 } else if (i == 4) {
-                    View inflate2 = from.inflate(2131559302, viewGroup, false);
+                    View inflate2 = from.inflate(R.layout.widget_stream_rich_presence, viewGroup, false);
                     viewGroup.addView(inflate2);
-                    LinearLayout linearLayout3 = (LinearLayout) inflate2.findViewById(2131364663);
+                    LinearLayout linearLayout3 = (LinearLayout) inflate2.findViewById(R.id.rich_presence_container_data);
                     if (linearLayout3 != null) {
-                        TextView textView9 = (TextView) inflate2.findViewById(2131364664);
+                        TextView textView9 = (TextView) inflate2.findViewById(R.id.rich_presence_details);
                         if (textView9 != null) {
-                            TextView textView10 = (TextView) inflate2.findViewById(2131364665);
+                            TextView textView10 = (TextView) inflate2.findViewById(R.id.rich_presence_header);
                             if (textView10 != null) {
-                                SimpleDraweeView simpleDraweeView5 = (SimpleDraweeView) inflate2.findViewById(2131364666);
+                                SimpleDraweeView simpleDraweeView5 = (SimpleDraweeView) inflate2.findViewById(R.id.rich_presence_image_large);
                                 if (simpleDraweeView5 != null) {
-                                    TextView textView11 = (TextView) inflate2.findViewById(2131364676);
+                                    TextView textView11 = (TextView) inflate2.findViewById(R.id.rich_presence_state);
                                     if (textView11 != null) {
-                                        TextView textView12 = (TextView) inflate2.findViewById(2131364677);
+                                        TextView textView12 = (TextView) inflate2.findViewById(R.id.rich_presence_time);
                                         if (textView12 != null) {
-                                            TextView textView13 = (TextView) inflate2.findViewById(2131364678);
+                                            TextView textView13 = (TextView) inflate2.findViewById(R.id.rich_presence_title);
                                             str2 = "Missing required view with ID: ";
                                             if (textView13 != null) {
-                                                StreamPreviewView streamPreviewView = (StreamPreviewView) inflate2.findViewById(2131365373);
+                                                StreamPreviewView streamPreviewView = (StreamPreviewView) inflate2.findViewById(R.id.stream_preview);
                                                 if (streamPreviewView != null) {
                                                     m.checkNotNullExpressionValue(new s5((ConstraintLayout) inflate2, linearLayout3, textView9, textView10, simpleDraweeView5, textView11, textView12, textView13, streamPreviewView), "WidgetStreamRichPresence…e(inflater, parent, true)");
                                                     m.checkNotNullExpressionValue(simpleDraweeView5, "binding.richPresenceImageLarge");
@@ -213,34 +214,34 @@ public class ViewHolderUserRichPresence {
                                                     m.checkNotNullExpressionValue(streamPreviewView, "binding.streamPreview");
                                                     viewHolderUserRichPresence = new ViewHolderStreamRichPresence(viewGroup, simpleDraweeView5, textView10, textView13, textView9, textView12, textView11, linearLayout3, streamPreviewView);
                                                 } else {
-                                                    i4 = 2131365373;
+                                                    i4 = R.id.stream_preview;
                                                 }
                                             } else {
-                                                i4 = 2131364678;
+                                                i4 = R.id.rich_presence_title;
                                             }
                                         } else {
                                             str2 = "Missing required view with ID: ";
-                                            i4 = 2131364677;
+                                            i4 = R.id.rich_presence_time;
                                         }
                                     } else {
                                         str2 = "Missing required view with ID: ";
-                                        i4 = 2131364676;
+                                        i4 = R.id.rich_presence_state;
                                     }
                                 } else {
                                     str2 = "Missing required view with ID: ";
-                                    i4 = 2131364666;
+                                    i4 = R.id.rich_presence_image_large;
                                 }
                             } else {
                                 str2 = "Missing required view with ID: ";
-                                i4 = 2131364665;
+                                i4 = R.id.rich_presence_header;
                             }
                         } else {
                             str2 = "Missing required view with ID: ";
-                            i4 = 2131364664;
+                            i4 = R.id.rich_presence_details;
                         }
                     } else {
                         str2 = "Missing required view with ID: ";
-                        i4 = 2131364663;
+                        i4 = R.id.rich_presence_container_data;
                     }
                     throw new NullPointerException(str2.concat(inflate2.getResources().getResourceName(i4)));
                 } else if (i != 5) {
@@ -261,30 +262,30 @@ public class ViewHolderUserRichPresence {
                     m.checkNotNullExpressionValue(linearLayout4, "binding.richPresenceContainerData");
                     return new ViewHolderUserRichPresence(viewGroup, simpleDraweeView6, simpleDraweeView7, textView14, textView15, textView16, textView17, textView18, linearLayout4, a2.g, a2.h, 0, 2048, null);
                 } else {
-                    View inflate3 = from.inflate(2131559287, viewGroup, false);
+                    View inflate3 = from.inflate(R.layout.widget_stage_channel_rich_presence, viewGroup, false);
                     viewGroup.addView(inflate3);
-                    Barrier barrier2 = (Barrier) inflate3.findViewById(2131362114);
+                    Barrier barrier2 = (Barrier) inflate3.findViewById(R.id.barrier);
                     if (barrier2 != null) {
-                        Space space2 = (Space) inflate3.findViewById(2131363746);
+                        Space space2 = (Space) inflate3.findViewById(R.id.image_bottom_guideline);
                         if (space2 != null) {
-                            LinearLayout linearLayout5 = (LinearLayout) inflate3.findViewById(2131364663);
+                            LinearLayout linearLayout5 = (LinearLayout) inflate3.findViewById(R.id.rich_presence_container_data);
                             if (linearLayout5 != null) {
-                                TextView textView19 = (TextView) inflate3.findViewById(2131364664);
+                                TextView textView19 = (TextView) inflate3.findViewById(R.id.rich_presence_details);
                                 if (textView19 != null) {
-                                    TextView textView20 = (TextView) inflate3.findViewById(2131364665);
+                                    TextView textView20 = (TextView) inflate3.findViewById(R.id.rich_presence_header);
                                     if (textView20 != null) {
-                                        SimpleDraweeView simpleDraweeView8 = (SimpleDraweeView) inflate3.findViewById(2131364666);
+                                        SimpleDraweeView simpleDraweeView8 = (SimpleDraweeView) inflate3.findViewById(R.id.rich_presence_image_large);
                                         if (simpleDraweeView8 != null) {
-                                            TextView textView21 = (TextView) inflate3.findViewById(2131364667);
+                                            TextView textView21 = (TextView) inflate3.findViewById(R.id.rich_presence_image_large_text);
                                             if (textView21 != null) {
-                                                FrameLayout frameLayout = (FrameLayout) inflate3.findViewById(2131364668);
+                                                FrameLayout frameLayout = (FrameLayout) inflate3.findViewById(R.id.rich_presence_image_large_wrap);
                                                 if (frameLayout != null) {
-                                                    MaterialButton materialButton4 = (MaterialButton) inflate3.findViewById(2131364673);
+                                                    MaterialButton materialButton4 = (MaterialButton) inflate3.findViewById(R.id.rich_presence_primary_button);
                                                     if (materialButton4 != null) {
-                                                        TextView textView22 = (TextView) inflate3.findViewById(2131364677);
+                                                        TextView textView22 = (TextView) inflate3.findViewById(R.id.rich_presence_time);
                                                         str3 = "Missing required view with ID: ";
                                                         if (textView22 != null) {
-                                                            TextView textView23 = (TextView) inflate3.findViewById(2131364678);
+                                                            TextView textView23 = (TextView) inflate3.findViewById(R.id.rich_presence_title);
                                                             if (textView23 != null) {
                                                                 m.checkNotNullExpressionValue(new r5((LinearLayout) inflate3, barrier2, space2, linearLayout5, textView19, textView20, simpleDraweeView8, textView21, frameLayout, materialButton4, textView22, textView23), "WidgetStageChannelRichPr…e(inflater, parent, true)");
                                                                 m.checkNotNullExpressionValue(simpleDraweeView8, "binding.richPresenceImageLarge");
@@ -297,82 +298,82 @@ public class ViewHolderUserRichPresence {
                                                                 m.checkNotNullExpressionValue(textView21, "binding.richPresenceImageLargeText");
                                                                 viewHolderUserRichPresence = new ViewHolderStageChannelRichPresence(viewGroup, simpleDraweeView8, textView20, textView23, textView19, textView22, linearLayout5, materialButton4, textView21);
                                                             } else {
-                                                                i5 = 2131364678;
+                                                                i5 = R.id.rich_presence_title;
                                                             }
                                                         } else {
-                                                            i5 = 2131364677;
+                                                            i5 = R.id.rich_presence_time;
                                                         }
                                                     } else {
                                                         str3 = "Missing required view with ID: ";
-                                                        i5 = 2131364673;
+                                                        i5 = R.id.rich_presence_primary_button;
                                                     }
                                                 } else {
                                                     str3 = "Missing required view with ID: ";
-                                                    i5 = 2131364668;
+                                                    i5 = R.id.rich_presence_image_large_wrap;
                                                 }
                                             } else {
                                                 str3 = "Missing required view with ID: ";
-                                                i5 = 2131364667;
+                                                i5 = R.id.rich_presence_image_large_text;
                                             }
                                         } else {
                                             str3 = "Missing required view with ID: ";
-                                            i5 = 2131364666;
+                                            i5 = R.id.rich_presence_image_large;
                                         }
                                     } else {
                                         str3 = "Missing required view with ID: ";
-                                        i5 = 2131364665;
+                                        i5 = R.id.rich_presence_header;
                                     }
                                 } else {
                                     str3 = "Missing required view with ID: ";
-                                    i5 = 2131364664;
+                                    i5 = R.id.rich_presence_details;
                                 }
                             } else {
                                 str3 = "Missing required view with ID: ";
-                                i5 = 2131364663;
+                                i5 = R.id.rich_presence_container_data;
                             }
                         } else {
                             str3 = "Missing required view with ID: ";
-                            i5 = 2131363746;
+                            i5 = R.id.image_bottom_guideline;
                         }
                     } else {
                         str3 = "Missing required view with ID: ";
-                        i5 = 2131362114;
+                        i5 = R.id.barrier;
                     }
                     throw new NullPointerException(str3.concat(inflate3.getResources().getResourceName(i5)));
                 }
                 return viewHolderUserRichPresence;
             } else {
-                View inflate4 = from.inflate(2131559147, viewGroup, false);
+                View inflate4 = from.inflate(R.layout.widget_music_rich_presence, viewGroup, false);
                 viewGroup.addView(inflate4);
-                Barrier barrier3 = (Barrier) inflate4.findViewById(2131362114);
+                Barrier barrier3 = (Barrier) inflate4.findViewById(R.id.barrier);
                 if (barrier3 != null) {
-                    Space space3 = (Space) inflate4.findViewById(2131363746);
+                    Space space3 = (Space) inflate4.findViewById(R.id.image_bottom_guideline);
                     if (space3 != null) {
-                        LinearLayout linearLayout6 = (LinearLayout) inflate4.findViewById(2131364663);
+                        LinearLayout linearLayout6 = (LinearLayout) inflate4.findViewById(R.id.rich_presence_container_data);
                         if (linearLayout6 != null) {
-                            TextView textView24 = (TextView) inflate4.findViewById(2131364664);
+                            TextView textView24 = (TextView) inflate4.findViewById(R.id.rich_presence_details);
                             if (textView24 != null) {
-                                TextView textView25 = (TextView) inflate4.findViewById(2131364665);
+                                TextView textView25 = (TextView) inflate4.findViewById(R.id.rich_presence_header);
                                 if (textView25 != null) {
-                                    i2 = 2131364666;
-                                    SimpleDraweeView simpleDraweeView9 = (SimpleDraweeView) inflate4.findViewById(2131364666);
+                                    i2 = R.id.rich_presence_image_large;
+                                    SimpleDraweeView simpleDraweeView9 = (SimpleDraweeView) inflate4.findViewById(R.id.rich_presence_image_large);
                                     if (simpleDraweeView9 != null) {
-                                        SimpleDraweeView simpleDraweeView10 = (SimpleDraweeView) inflate4.findViewById(2131364669);
+                                        SimpleDraweeView simpleDraweeView10 = (SimpleDraweeView) inflate4.findViewById(R.id.rich_presence_image_small);
                                         if (simpleDraweeView10 != null) {
-                                            TextView textView26 = (TextView) inflate4.findViewById(2131364670);
+                                            TextView textView26 = (TextView) inflate4.findViewById(R.id.rich_presence_music_duration);
                                             str = "Missing required view with ID: ";
                                             if (textView26 != null) {
-                                                TextView textView27 = (TextView) inflate4.findViewById(2131364671);
+                                                TextView textView27 = (TextView) inflate4.findViewById(R.id.rich_presence_music_elapsed);
                                                 if (textView27 != null) {
-                                                    FrameLayout frameLayout2 = (FrameLayout) inflate4.findViewById(2131364672);
+                                                    FrameLayout frameLayout2 = (FrameLayout) inflate4.findViewById(R.id.rich_presence_music_progress_container);
                                                     if (frameLayout2 != null) {
-                                                        MaterialButton materialButton5 = (MaterialButton) inflate4.findViewById(2131364673);
+                                                        MaterialButton materialButton5 = (MaterialButton) inflate4.findViewById(R.id.rich_presence_primary_button);
                                                         if (materialButton5 != null) {
-                                                            SeekBar seekBar = (SeekBar) inflate4.findViewById(2131364675);
+                                                            SeekBar seekBar = (SeekBar) inflate4.findViewById(R.id.rich_presence_seekbar);
                                                             if (seekBar != null) {
-                                                                TextView textView28 = (TextView) inflate4.findViewById(2131364677);
+                                                                TextView textView28 = (TextView) inflate4.findViewById(R.id.rich_presence_time);
                                                                 if (textView28 != null) {
-                                                                    TextView textView29 = (TextView) inflate4.findViewById(2131364678);
+                                                                    TextView textView29 = (TextView) inflate4.findViewById(R.id.rich_presence_title);
                                                                     if (textView29 != null) {
                                                                         m.checkNotNullExpressionValue(new i5((LinearLayout) inflate4, barrier3, space3, linearLayout6, textView24, textView25, simpleDraweeView9, simpleDraweeView10, textView26, textView27, frameLayout2, materialButton5, seekBar, textView28, textView29), "WidgetMusicRichPresenceB…e(inflater, parent, true)");
                                                                         m.checkNotNullExpressionValue(simpleDraweeView9, "binding.richPresenceImageLarge");
@@ -388,51 +389,51 @@ public class ViewHolderUserRichPresence {
                                                                         m.checkNotNullExpressionValue(textView27, "binding.richPresenceMusicElapsed");
                                                                         return new ViewHolderMusicRichPresence(viewGroup, simpleDraweeView9, simpleDraweeView10, textView25, textView29, textView24, textView28, linearLayout6, materialButton5, seekBar, textView26, textView27);
                                                                     }
-                                                                    i2 = 2131364678;
+                                                                    i2 = R.id.rich_presence_title;
                                                                 } else {
-                                                                    i2 = 2131364677;
+                                                                    i2 = R.id.rich_presence_time;
                                                                 }
                                                             } else {
-                                                                i2 = 2131364675;
+                                                                i2 = R.id.rich_presence_seekbar;
                                                             }
                                                         } else {
-                                                            i2 = 2131364673;
+                                                            i2 = R.id.rich_presence_primary_button;
                                                         }
                                                     } else {
-                                                        i2 = 2131364672;
+                                                        i2 = R.id.rich_presence_music_progress_container;
                                                     }
                                                 } else {
-                                                    i2 = 2131364671;
+                                                    i2 = R.id.rich_presence_music_elapsed;
                                                 }
                                             } else {
-                                                i2 = 2131364670;
+                                                i2 = R.id.rich_presence_music_duration;
                                             }
                                         } else {
                                             str = "Missing required view with ID: ";
-                                            i2 = 2131364669;
+                                            i2 = R.id.rich_presence_image_small;
                                         }
                                     } else {
                                         str = "Missing required view with ID: ";
                                     }
                                 } else {
                                     str = "Missing required view with ID: ";
-                                    i2 = 2131364665;
+                                    i2 = R.id.rich_presence_header;
                                 }
                             } else {
                                 str = "Missing required view with ID: ";
-                                i2 = 2131364664;
+                                i2 = R.id.rich_presence_details;
                             }
                         } else {
                             str = "Missing required view with ID: ";
-                            i2 = 2131364663;
+                            i2 = R.id.rich_presence_container_data;
                         }
                     } else {
                         str = "Missing required view with ID: ";
-                        i2 = 2131363746;
+                        i2 = R.id.image_bottom_guideline;
                     }
                 } else {
                     str = "Missing required view with ID: ";
-                    i2 = 2131362114;
+                    i2 = R.id.barrier;
                 }
                 throw new NullPointerException(str.concat(inflate4.getResources().getResourceName(i2)));
             }
@@ -608,7 +609,7 @@ public class ViewHolderUserRichPresence {
                 ActivityParty i = activity.i();
                 if (i != null) {
                     PresenceUtils presenceUtils = PresenceUtils.INSTANCE;
-                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = this.root.getContext()) == null) ? null : b.h(context, 2131894650, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
+                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = this.root.getContext()) == null) ? null : b.h(context, R.string.user_activity_state_size, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
                 }
                 charSequence = "";
                 String str2 = l + ' ' + charSequence;
@@ -691,10 +692,10 @@ public class ViewHolderUserRichPresence {
     public final CharSequence friendlyTime(ActivityTimestamps activityTimestamps) {
         m.checkNotNullParameter(activityTimestamps, "$this$friendlyTime");
         if (activityTimestamps.b() > 0) {
-            return TimeUtils.INSTANCE.toFriendlyString(ClockFactory.get().currentTimeMillis(), activityTimestamps.b(), getString(2131894652), "timeDelta");
+            return TimeUtils.INSTANCE.toFriendlyString(ClockFactory.get().currentTimeMillis(), activityTimestamps.b(), getString(R.string.user_activity_timestamp_end_simple), "timeDelta");
         }
         if (activityTimestamps.c() > 0) {
-            return TimeUtils.INSTANCE.toFriendlyString(activityTimestamps.c(), ClockFactory.get().currentTimeMillis(), getString(2131894654), "timeDelta");
+            return TimeUtils.INSTANCE.toFriendlyString(activityTimestamps.c(), ClockFactory.get().currentTimeMillis(), getString(R.string.user_activity_timestamp_start_simple), "timeDelta");
         }
         return null;
     }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java b/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java
index 0376277927..fa40c36b52 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java
@@ -8,6 +8,7 @@ import c.f.g.a.a.d;
 import c.f.g.e.v;
 import c.f.g.f.a;
 import c.f.g.f.c;
+import com.discord.R;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -38,7 +39,7 @@ public final class DraweeSpanStringBuilderExtensionsKt {
                 cVar.a(intValue2);
             }
             a aVar = new a(context.getResources());
-            aVar.f = ContextCompat.getDrawable(context, 2131230899);
+            aVar.f = ContextCompat.getDrawable(context, R.drawable.asset_default_avatar_32dp);
             aVar.r = cVar;
             ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
             aVar.n = v.l;
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java
index 54c0552820..235e6966bd 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java
@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.UserProfileAdminViewBinding;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -273,28 +274,28 @@ public final class UserProfileAdminView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558724, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.user_profile_admin_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365682;
-        TextView textView = (TextView) inflate.findViewById(2131365682);
+        int i = R.id.user_profile_admin_ban;
+        TextView textView = (TextView) inflate.findViewById(R.id.user_profile_admin_ban);
         if (textView != null) {
-            i = 2131365683;
-            TextView textView2 = (TextView) inflate.findViewById(2131365683);
+            i = R.id.user_profile_admin_edit_member;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.user_profile_admin_edit_member);
             if (textView2 != null) {
-                i = 2131365684;
-                TextView textView3 = (TextView) inflate.findViewById(2131365684);
+                i = R.id.user_profile_admin_kick;
+                TextView textView3 = (TextView) inflate.findViewById(R.id.user_profile_admin_kick);
                 if (textView3 != null) {
-                    i = 2131365685;
-                    TextView textView4 = (TextView) inflate.findViewById(2131365685);
+                    i = R.id.user_profile_admin_server_deafen;
+                    TextView textView4 = (TextView) inflate.findViewById(R.id.user_profile_admin_server_deafen);
                     if (textView4 != null) {
-                        i = 2131365686;
-                        TextView textView5 = (TextView) inflate.findViewById(2131365686);
+                        i = R.id.user_profile_admin_server_disconnect;
+                        TextView textView5 = (TextView) inflate.findViewById(R.id.user_profile_admin_server_disconnect);
                         if (textView5 != null) {
-                            i = 2131365687;
-                            TextView textView6 = (TextView) inflate.findViewById(2131365687);
+                            i = R.id.user_profile_admin_server_move;
+                            TextView textView6 = (TextView) inflate.findViewById(R.id.user_profile_admin_server_move);
                             if (textView6 != null) {
-                                i = 2131365688;
-                                TextView textView7 = (TextView) inflate.findViewById(2131365688);
+                                i = R.id.user_profile_admin_server_mute;
+                                TextView textView7 = (TextView) inflate.findViewById(R.id.user_profile_admin_server_mute);
                                 if (textView7 != null) {
                                     UserProfileAdminViewBinding userProfileAdminViewBinding = new UserProfileAdminViewBinding((LinearLayout) inflate, textView, textView2, textView3, textView4, textView5, textView6, textView7);
                                     m.checkNotNullExpressionValue(userProfileAdminViewBinding, "UserProfileAdminViewBind…rom(context), this, true)");
@@ -354,7 +355,7 @@ public final class UserProfileAdminView extends LinearLayout {
         TextView textView2 = this.binding.d;
         m.checkNotNullExpressionValue(textView2, "binding.userProfileAdminKick");
         textView2.setVisibility(viewState.getShowKickButton() ? 0 : 8);
-        this.binding.d.setText(viewState.isMultiUserDM() ? 2131892949 : 2131891066);
+        this.binding.d.setText(viewState.isMultiUserDM() ? R.string.remove_from_group : R.string.kick);
         TextView textView3 = this.binding.b;
         m.checkNotNullExpressionValue(textView3, "binding.userProfileAdminBan");
         textView3.setVisibility(viewState.getShowBanButton() ? 0 : 8);
@@ -363,8 +364,8 @@ public final class UserProfileAdminView extends LinearLayout {
         textView4.setVisibility(viewState.getShowServerMuteButton() ? 0 : 8);
         boolean isServerMuted = viewState.isServerMuted();
         boolean isMe = viewState.isMe();
-        int themedDrawableRes$default = isServerMuted ? DrawableCompat.getThemedDrawableRes$default(this, 2130969428, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969426, 0, 2, (Object) null);
-        int i2 = isServerMuted ? 2131893579 : 2131893566;
+        int themedDrawableRes$default = isServerMuted ? DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_mic_muted_grey, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_mic_grey, 0, 2, (Object) null);
+        int i2 = isServerMuted ? R.string.server_unmute : R.string.server_mute;
         TextView textView5 = this.binding.h;
         m.checkNotNullExpressionValue(textView5, "binding.userProfileAdminServerMute");
         ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView5, themedDrawableRes$default, 0, 0, 0, 14, null);
@@ -373,9 +374,9 @@ public final class UserProfileAdminView extends LinearLayout {
         m.checkNotNullExpressionValue(textView6, "binding.userProfileAdminServerDeafen");
         textView6.setVisibility(viewState.getShowServerDeafenButton() ? 0 : 8);
         boolean isServerDeafened = viewState.isServerDeafened();
-        int themedDrawableRes$default2 = isServerDeafened ? DrawableCompat.getThemedDrawableRes$default(this, 2130969418, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969418, 0, 2, (Object) null);
-        int i3 = isServerDeafened ? 2131893578 : 2131893554;
-        int i4 = isMe ? 2131888177 : 2131888176;
+        int themedDrawableRes$default2 = isServerDeafened ? DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_headset_deafened_grey, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, (int) R.attr.ic_headset_deafened_grey, 0, 2, (Object) null);
+        int i3 = isServerDeafened ? R.string.server_undeafen : R.string.server_deafen;
+        int i4 = isMe ? R.string.disconnect_self : R.string.disconnect_other;
         TextView textView7 = this.binding.e;
         m.checkNotNullExpressionValue(textView7, "binding.userProfileAdminServerDeafen");
         ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView7, themedDrawableRes$default2, 0, 0, 0, 14, null);
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java
index 62bb0fffbd..fe9373ad23 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java
@@ -11,6 +11,7 @@ import androidx.annotation.LayoutRes;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.UserProfileConnectionsViewBinding;
 import com.discord.models.domain.ModelConnectedAccount;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
@@ -116,7 +117,7 @@ public final class UserProfileConnectionsView extends LinearLayout {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<ConnectedAccountsAdapter, ConnectedAccountItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ViewHolder(2131558527, this);
+            return new ViewHolder(R.layout.icon_list_item_text_view, this);
         }
 
         public final void setOnConnectedAccountClick(Function3<? super String, ? super Integer, ? super String, Unit> function3) {
@@ -263,16 +264,16 @@ public final class UserProfileConnectionsView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558725, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.user_profile_connections_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365689;
-        TextView textView = (TextView) inflate.findViewById(2131365689);
+        int i = R.id.user_profile_connections_mutual_friends_item;
+        TextView textView = (TextView) inflate.findViewById(R.id.user_profile_connections_mutual_friends_item);
         if (textView != null) {
-            i = 2131365690;
-            TextView textView2 = (TextView) inflate.findViewById(2131365690);
+            i = R.id.user_profile_connections_mutual_guilds_item;
+            TextView textView2 = (TextView) inflate.findViewById(R.id.user_profile_connections_mutual_guilds_item);
             if (textView2 != null) {
-                i = 2131365691;
-                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365691);
+                i = R.id.user_profile_connections_view_recycler;
+                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.user_profile_connections_view_recycler);
                 if (recyclerView != null) {
                     UserProfileConnectionsViewBinding userProfileConnectionsViewBinding = new UserProfileConnectionsViewBinding((LinearLayout) inflate, textView, textView2, recyclerView);
                     m.checkNotNullExpressionValue(userProfileConnectionsViewBinding, "UserProfileConnectionsVi…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$notifyAvatarColorListenerAsync$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$notifyAvatarColorListenerAsync$1.java
index 8380a31963..3b4cf16d63 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$notifyAvatarColorListenerAsync$1.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$notifyAvatarColorListenerAsync$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.profile;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class UserProfileHeaderView$notifyAvatarColorListenerAsync$1 extend
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         UserProfileHeaderView.access$setSyncAvatarRepresentativeColorSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateBannerBackgroundColorAsync$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateBannerBackgroundColorAsync$1.java
index a807a345eb..a8455548d1 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateBannerBackgroundColorAsync$1.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateBannerBackgroundColorAsync$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.profile;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class UserProfileHeaderView$updateBannerBackgroundColorAsync$1 exte
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         UserProfileHeaderView.access$setSetBannerBackgroundColorSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
index ec049542c4..9f8bc75851 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
@@ -86,7 +86,7 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         public final BadgeViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) {
             m.checkNotNullParameter(layoutInflater, "inflater");
             m.checkNotNullParameter(viewGroup, "parent");
-            View inflate = layoutInflater.inflate(2131558726, viewGroup, false);
+            View inflate = layoutInflater.inflate(R.layout.user_profile_header_badge, viewGroup, false);
             Objects.requireNonNull(inflate, "rootView");
             ImageView imageView = (ImageView) inflate;
             UserProfileHeaderBadgeBinding userProfileHeaderBadgeBinding = new UserProfileHeaderBadgeBinding(imageView, imageView);
@@ -148,40 +148,40 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558727, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.user_profile_header_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362087;
-        CardView cardView = (CardView) inflate.findViewById(2131362087);
+        int i = R.id.avatar_edit;
+        CardView cardView = (CardView) inflate.findViewById(R.id.avatar_edit);
         if (cardView != null) {
-            i = 2131362104;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362104);
+            i = R.id.banner;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.banner);
             if (simpleDraweeView != null) {
-                i = 2131362112;
-                CardView cardView2 = (CardView) inflate.findViewById(2131362112);
+                i = R.id.banner_edit;
+                CardView cardView2 = (CardView) inflate.findViewById(R.id.banner_edit);
                 if (cardView2 != null) {
-                    i = 2131363382;
-                    ImageView imageView = (ImageView) inflate.findViewById(2131363382);
+                    i = R.id.gif_tag;
+                    ImageView imageView = (ImageView) inflate.findViewById(R.id.gif_tag);
                     if (imageView != null) {
-                        i = 2131363947;
-                        UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131363947);
+                        i = R.id.large_avatar;
+                        UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(R.id.large_avatar);
                         if (userAvatarPresenceView != null) {
-                            i = 2131363948;
-                            Barrier barrier = (Barrier) inflate.findViewById(2131363948);
+                            i = R.id.large_avatar_barrier;
+                            Barrier barrier = (Barrier) inflate.findViewById(R.id.large_avatar_barrier);
                             if (barrier != null) {
-                                i = 2131365692;
-                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365692);
+                                i = R.id.user_profile_header_badges_recycler;
+                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.user_profile_header_badges_recycler);
                                 if (recyclerView != null) {
-                                    i = 2131365693;
-                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131365693);
+                                    i = R.id.user_profile_header_custom_status;
+                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(R.id.user_profile_header_custom_status);
                                     if (simpleDraweeSpanTextView != null) {
-                                        i = 2131365694;
-                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365694);
+                                        i = R.id.user_profile_header_name_wrap;
+                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.user_profile_header_name_wrap);
                                         if (linearLayout != null) {
-                                            i = 2131365695;
-                                            UsernameView usernameView = (UsernameView) inflate.findViewById(2131365695);
+                                            i = R.id.user_profile_header_primary_name;
+                                            UsernameView usernameView = (UsernameView) inflate.findViewById(R.id.user_profile_header_primary_name);
                                             if (usernameView != null) {
-                                                i = 2131365696;
-                                                SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = (SimpleDraweeSpanTextView) inflate.findViewById(2131365696);
+                                                i = R.id.user_profile_header_secondary_name;
+                                                SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = (SimpleDraweeSpanTextView) inflate.findViewById(R.id.user_profile_header_secondary_name);
                                                 if (simpleDraweeSpanTextView2 != null) {
                                                     ConstraintLayout constraintLayout = (ConstraintLayout) inflate;
                                                     UserProfileHeaderViewBinding userProfileHeaderViewBinding = new UserProfileHeaderViewBinding(constraintLayout, cardView, simpleDraweeView, cardView2, imageView, userAvatarPresenceView, barrier, recyclerView, simpleDraweeSpanTextView, linearLayout, usernameView, simpleDraweeSpanTextView2, constraintLayout);
@@ -200,7 +200,7 @@ public final class UserProfileHeaderView extends ConstraintLayout {
                                                     recyclerView.setAdapter(simpleRecyclerAdapter);
                                                     TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.UserProfileHeaderView);
                                                     m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…le.UserProfileHeaderView)");
-                                                    this.userProfileHeaderBackgroundColor = obtainStyledAttributes.getColor(0, ColorCompat.getThemedColor(this, 2130969904));
+                                                    this.userProfileHeaderBackgroundColor = obtainStyledAttributes.getColor(0, ColorCompat.getThemedColor(this, (int) R.attr.primary_700));
                                                     obtainStyledAttributes.recycle();
                                                     return;
                                                 }
@@ -284,9 +284,9 @@ public final class UserProfileHeaderView extends ConstraintLayout {
     private final void configurePrimaryName(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
         User user = loaded.getUser();
         GuildMember guildMember = loaded.getGuildMember();
-        int dimension = (int) getResources().getDimension(2131165291);
+        int dimension = (int) getResources().getDimension(R.dimen.avatar_size_medium);
         this.binding.i.b(getPrimaryNameTextForUser(user, guildMember), loaded.getShowMediumAvatar() ? IconUtils.getForUser(loaded.getUser(), true, Integer.valueOf(dimension)) : null, true, Integer.valueOf(dimension), Integer.valueOf(this.userProfileHeaderBackgroundColor));
-        this.binding.i.a(user.isBot(), user.isSystemUser() ? 2131894149 : 2131887056, UserUtils.INSTANCE.isVerifiedBot(user));
+        this.binding.i.a(user.isBot(), user.isSystemUser() ? R.string.system_dm_tag_system : R.string.bot_tag, UserUtils.INSTANCE.isVerifiedBot(user));
     }
 
     private final void configureSecondaryName(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
@@ -294,7 +294,7 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         GuildMember guildMember = loaded.getGuildMember();
         DraweeSpanStringBuilder draweeSpanStringBuilder = new DraweeSpanStringBuilder();
         if (loaded.getShowSmallAvatar()) {
-            int dimension = (int) getResources().getDimension(2131165292);
+            int dimension = (int) getResources().getDimension(R.dimen.avatar_size_profile_small);
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
             DraweeSpanStringBuilderExtensionsKt.setAvatar(draweeSpanStringBuilder, context, IconUtils.getForUser(loaded.getUser(), true, Integer.valueOf(dimension)), true, Integer.valueOf(dimension), Integer.valueOf(this.userProfileHeaderBackgroundColor), 8194);
@@ -345,7 +345,7 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         String nick = guildMember != null ? guildMember.getNick() : null;
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        return UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nick, context, 2130968932, 2130969322, 2131427364, 2130968933, 2130969328, 2131427364);
+        return UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nick, context, R.attr.colorHeaderPrimary, R.attr.font_display_bold, R.integer.uikit_textsize_xxlarge_sp, R.attr.colorHeaderSecondary, R.attr.font_primary_semibold, R.integer.uikit_textsize_xxlarge_sp);
     }
 
     private final CharSequence getSecondaryNameTextForUser(User user, GuildMember guildMember) {
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
index 16f9a18ee7..2a3edb7763 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.appcompat.widget.AppCompatImageView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.ViewUserStatusPresenceCustomBinding;
 import com.discord.models.domain.emoji.ModelEmojiCustom;
 import com.discord.models.domain.emoji.ModelEmojiUnicode;
@@ -273,16 +274,16 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558849, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.view_user_status_presence_custom, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365742;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131365742);
+        int i = R.id.user_status_presence_custom_clear;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(R.id.user_status_presence_custom_clear);
         if (appCompatImageView != null) {
-            i = 2131365743;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365743);
+            i = R.id.user_status_presence_custom_emoji;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(R.id.user_status_presence_custom_emoji);
             if (simpleDraweeView != null) {
-                i = 2131365744;
-                TextView textView = (TextView) inflate.findViewById(2131365744);
+                i = R.id.user_status_presence_custom_text;
+                TextView textView = (TextView) inflate.findViewById(R.id.user_status_presence_custom_text);
                 if (textView != null) {
                     ViewUserStatusPresenceCustomBinding viewUserStatusPresenceCustomBinding = new ViewUserStatusPresenceCustomBinding((LinearLayout) inflate, appCompatImageView, simpleDraweeView, textView);
                     m.checkNotNullExpressionValue(viewUserStatusPresenceCustomBinding, "ViewUserStatusPresenceCu…rom(context), this, true)");
@@ -311,7 +312,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
         String str = null;
         if (emoji != null) {
             if (emoji.getId() != null) {
-                str = ModelEmojiCustom.getImageUri(Long.parseLong(emoji.getId()), emoji.isAnimated(), IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165338)));
+                str = ModelEmojiCustom.getImageUri(Long.parseLong(emoji.getId()), emoji.isAnimated(), IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(R.dimen.custom_status_emoji_preview_size)));
             } else {
                 ModelEmojiUnicode modelEmojiUnicode = StoreStream.Companion.getEmojis().getUnicodeEmojiSurrogateMap().get(emoji.getName());
                 if (modelEmojiUnicode != null) {
@@ -349,7 +350,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
             appCompatImageView.setVisibility(0);
         } else if (viewState instanceof ViewState.WithPlaceholder) {
             configurePlaceholderEmoji(((ViewState.WithPlaceholder) viewState).getPlaceholderEmoji());
-            this.binding.d.setText(2131888025);
+            this.binding.d.setText(R.string.custom_status_set_custom_status);
             AppCompatImageView appCompatImageView2 = this.binding.b;
             m.checkNotNullExpressionValue(appCompatImageView2, "binding.userStatusPresenceCustomClear");
             appCompatImageView2.setVisibility(8);
diff --git a/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java b/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java
index 85fde55b76..bfa5a3c0d4 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.annotation.AttrRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.StringRes;
+import com.discord.R;
 import com.discord.databinding.WidgetUserProfileAdapterItemEmptyBinding;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
@@ -21,11 +22,11 @@ public final class WidgetUserProfileEmptyListItem<T extends MGRecyclerAdapter<D>
         super(i, t);
         m.checkNotNullParameter(t, "adapter");
         View view = this.itemView;
-        int i4 = 2131365668;
-        ImageView imageView = (ImageView) view.findViewById(2131365668);
+        int i4 = R.id.user_profile_adapter_item_empty;
+        ImageView imageView = (ImageView) view.findViewById(R.id.user_profile_adapter_item_empty);
         if (imageView != null) {
-            i4 = 2131365669;
-            TextView textView = (TextView) view.findViewById(2131365669);
+            i4 = R.id.user_profile_adapter_item_empty_text;
+            TextView textView = (TextView) view.findViewById(R.id.user_profile_adapter_item_empty_text);
             if (textView != null) {
                 WidgetUserProfileAdapterItemEmptyBinding widgetUserProfileAdapterItemEmptyBinding = new WidgetUserProfileAdapterItemEmptyBinding((LinearLayout) view, imageView, textView);
                 m.checkNotNullExpressionValue(widgetUserProfileAdapterItemEmptyBinding, "WidgetUserProfileAdapter…ptyBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java b/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java
index 4550a31899..acee052f43 100644
--- a/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java
+++ b/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.databinding.ViewGlobalSearchItemBinding;
 import com.discord.models.guild.Guild;
@@ -43,27 +44,27 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
     public ViewGlobalSearchItem(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "ctx");
-        LayoutInflater.from(context).inflate(2131558767, this);
-        int i2 = 2131363435;
-        Guideline guideline = (Guideline) findViewById(2131363435);
+        LayoutInflater.from(context).inflate(R.layout.view_global_search_item, this);
+        int i2 = R.id.guideline;
+        Guideline guideline = (Guideline) findViewById(R.id.guideline);
         if (guideline != null) {
-            i2 = 2131363854;
-            TextView textView = (TextView) findViewById(2131363854);
+            i2 = R.id.item_description_tv;
+            TextView textView = (TextView) findViewById(R.id.item_description_tv);
             if (textView != null) {
-                i2 = 2131363878;
-                TextView textView2 = (TextView) findViewById(2131363878);
+                i2 = R.id.item_group_tv;
+                TextView textView2 = (TextView) findViewById(R.id.item_group_tv);
                 if (textView2 != null) {
-                    i2 = 2131363890;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363890);
+                    i2 = R.id.item_icon_iv;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.item_icon_iv);
                     if (simpleDraweeView != null) {
-                        i2 = 2131363920;
-                        TextView textView3 = (TextView) findViewById(2131363920);
+                        i2 = R.id.item_mentions_tv;
+                        TextView textView3 = (TextView) findViewById(R.id.item_mentions_tv);
                         if (textView3 != null) {
-                            i2 = 2131363922;
-                            TextView textView4 = (TextView) findViewById(2131363922);
+                            i2 = R.id.item_name_tv;
+                            TextView textView4 = (TextView) findViewById(R.id.item_name_tv);
                             if (textView4 != null) {
-                                i2 = 2131363926;
-                                ImageView imageView = (ImageView) findViewById(2131363926);
+                                i2 = R.id.item_unread;
+                                ImageView imageView = (ImageView) findViewById(R.id.item_unread);
                                 if (imageView != null) {
                                     ViewGlobalSearchItemBinding viewGlobalSearchItemBinding = new ViewGlobalSearchItemBinding(this, guideline, textView, textView2, simpleDraweeView, textView3, textView4, imageView);
                                     m.checkNotNullExpressionValue(viewGlobalSearchItemBinding, "ViewGlobalSearchItemBind…Inflater.from(ctx), this)");
@@ -125,17 +126,17 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         if (AnimatableValueParser.t1(itemChannel.getChannel())) {
             SimpleDraweeView simpleDraweeView2 = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.itemIconIv");
-            IconUtils.setIcon$default(simpleDraweeView2, itemChannel.getChannel(), 2131165297, null, 8, null);
+            IconUtils.setIcon$default(simpleDraweeView2, itemChannel.getChannel(), R.dimen.avatar_size_standard, null, 8, null);
         } else if (AnimatableValueParser.m1(itemChannel.getChannel())) {
             MGImages mGImages = MGImages.INSTANCE;
             SimpleDraweeView simpleDraweeView3 = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.itemIconIv");
-            MGImages.setImage$default(mGImages, simpleDraweeView3, 2131231530, (MGImages.ChangeDetector) null, 4, (Object) null);
+            MGImages.setImage$default(mGImages, simpleDraweeView3, (int) R.drawable.ic_channel_voice_grey_18dp, (MGImages.ChangeDetector) null, 4, (Object) null);
         } else {
             MGImages mGImages2 = MGImages.INSTANCE;
             SimpleDraweeView simpleDraweeView4 = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView4, "binding.itemIconIv");
-            MGImages.setImage$default(mGImages2, simpleDraweeView4, 2131231521, (MGImages.ChangeDetector) null, 4, (Object) null);
+            MGImages.setImage$default(mGImages2, simpleDraweeView4, (int) R.drawable.ic_channel_text_grey_18dp, (MGImages.ChangeDetector) null, 4, (Object) null);
         }
         TextView textView = this.binding.f1659c;
         m.checkNotNullExpressionValue(textView, "binding.itemGroupTv");
@@ -162,7 +163,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
                 if (A == 3) {
                     TextView textView5 = this.binding.b;
                     m.checkNotNullExpressionValue(textView5, "binding.itemDescriptionTv");
-                    int color = ColorCompat.getColor(textView5, 2131100470);
+                    int color = ColorCompat.getColor(textView5, (int) R.color.white_alpha_40);
                     TextView textView6 = this.binding.b;
                     m.checkNotNullExpressionValue(textView6, "binding.itemDescriptionTv");
                     textView6.setText(u.joinToString$default(AnimatableValueParser.G0(itemChannel.getChannel()), null, null, null, 0, null, new ViewGlobalSearchItem$onConfigure$2(color), 31, null));
@@ -195,7 +196,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         configure(itemGuild);
         SimpleDraweeView simpleDraweeView = this.binding.d;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIconIv");
-        IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForGuild$default(itemGuild.getGuild(), "asset://asset/images/default_icon.jpg", false, null, 12, null), 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
+        IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForGuild$default(itemGuild.getGuild(), IconUtils.DEFAULT_ICON, false, null, 12, null), 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.itemNameTv");
         textView.setText(toStyledText(itemGuild.getMatchedResult(), itemGuild.getGuild().getName()));
@@ -214,7 +215,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIconIv");
         IconUtils.setIcon$default(simpleDraweeView, itemUser.getUser(), 0, null, null, null, 60, null);
         if (itemUser.isFriend()) {
-            this.binding.f1659c.setText(2131888856);
+            this.binding.f1659c.setText(R.string.friends);
         } else {
             TextView textView = this.binding.f1659c;
             m.checkNotNullExpressionValue(textView, "binding.itemGroupTv");
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java
index be674cc9b1..0ea7eb113a 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user.search;
 import android.view.View;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetGlobalSearchBinding;
 import com.google.android.material.button.MaterialButton;
@@ -21,26 +22,26 @@ public final /* synthetic */ class WidgetGlobalSearch$binding$2 extends k implem
 
     public final WidgetGlobalSearchBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363411;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363411);
+        int i = R.id.global_search_add_a_friend_btn;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.global_search_add_a_friend_btn);
         if (materialButton != null) {
-            i = 2131363412;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363412);
+            i = R.id.global_search_bar;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.global_search_bar);
             if (textInputLayout != null) {
-                i = 2131363413;
-                TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363413);
+                i = R.id.global_search_bar_text;
+                TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.global_search_bar_text);
                 if (textInputEditText != null) {
-                    i = 2131363414;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363414);
+                    i = R.id.global_search_guild_list;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.global_search_guild_list);
                     if (recyclerView != null) {
-                        i = 2131363415;
-                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363415);
+                        i = R.id.global_search_join_guild_btn;
+                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.global_search_join_guild_btn);
                         if (materialButton2 != null) {
-                            i = 2131363416;
-                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363416);
+                            i = R.id.global_search_recycler;
+                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.global_search_recycler);
                             if (recyclerView2 != null) {
-                                i = 2131363417;
-                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363417);
+                                i = R.id.global_search_view_flipper;
+                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(R.id.global_search_view_flipper);
                                 if (appViewFlipper != null) {
                                     return new WidgetGlobalSearchBinding((CoordinatorLayout) view, materialButton, textInputLayout, textInputEditText, recyclerView, materialButton2, recyclerView2, appViewFlipper);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
index 3045583cd5..8e99690165 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.View;
 import c.d.b.a.a;
 import com.discord.utilities.view.extensions.ViewExtensions;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.friends.WidgetFriendsAdd;
 import com.discord.widgets.tabs.NavigationTab;
 import com.google.android.material.textfield.TextInputLayout;
@@ -23,7 +24,7 @@ public final class WidgetGlobalSearch$onViewBound$6 implements View.OnClickListe
         Context x2 = a.x(view, "it", "it.context");
         TextInputLayout textInputLayout = WidgetGlobalSearch.access$getBinding$p(this.this$0).f1811c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
-        companion.show(x2, w.trimStart(ViewExtensions.getTextOrEmpty(textInputLayout), '@', '#', '*'), "QuickSwitcher");
+        companion.show(x2, w.trimStart(ViewExtensions.getTextOrEmpty(textInputLayout), MentionUtilsKt.MENTIONS_CHAR, MentionUtilsKt.CHANNELS_CHAR, '*'), "QuickSwitcher");
         WidgetGlobalSearch.onSelected$default(this.this$0, NavigationTab.FRIENDS, null, 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
index 38f4d6e831..6d5bb79bc5 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.a.n;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -33,6 +34,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.tabs.NavigationTab;
 import com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel;
 import com.discord.widgets.user.search.WidgetGlobalSearchModel;
@@ -98,7 +100,7 @@ public final class WidgetGlobalSearch extends AppFragment {
         }
 
         private final Pair<Integer, Character>[] getFILTER_OPTIONS_LIST() {
-            return new Pair[]{o.to(2131894879, '@'), o.to(2131894255, '#'), o.to(2131895000, '!'), o.to(2131893582, '*')};
+            return new Pair[]{o.to(Integer.valueOf((int) R.string.users), Character.valueOf(MentionUtilsKt.MENTIONS_CHAR)), o.to(Integer.valueOf((int) R.string.text_channels), Character.valueOf(MentionUtilsKt.CHANNELS_CHAR)), o.to(Integer.valueOf((int) R.string.voice_channels), '!'), o.to(Integer.valueOf((int) R.string.servers), '*')};
         }
 
         private final WidgetGlobalSearchModel.ItemDataPayload toWidgetGlobalSearchModelItem(WidgetGlobalSearchGuildsModel.Item item) {
@@ -118,13 +120,13 @@ public final class WidgetGlobalSearch extends AppFragment {
 
         public final WidgetGlobalSearch create(String str) {
             WidgetGlobalSearch widgetGlobalSearch = new WidgetGlobalSearch();
-            widgetGlobalSearch.setArguments(BundleKt.bundleOf(o.to("EXTRA_SEARCH_TEXT", str)));
+            widgetGlobalSearch.setArguments(BundleKt.bundleOf(o.to(WidgetGlobalSearch.EXTRA_SEARCH_TEXT, str)));
             return widgetGlobalSearch;
         }
     }
 
     public WidgetGlobalSearch() {
-        super(2131559059);
+        super(R.layout.widget_global_search);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGlobalSearch widgetGlobalSearch, WidgetGlobalSearchModel widgetGlobalSearchModel) {
@@ -321,7 +323,7 @@ public final class WidgetGlobalSearch extends AppFragment {
         n.a aVar = c.a.a.n.j;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        String string = getString(2131888550);
+        String string = getString(R.string.filter_options);
         m.checkNotNullExpressionValue(string, "getString(R.string.filter_options)");
         aVar.a(parentFragmentManager, string, (String[]) array, new WidgetGlobalSearch$showFilterPickerDialog$1(this));
     }
@@ -341,12 +343,12 @@ public final class WidgetGlobalSearch extends AppFragment {
         this.resultsAdapter = (WidgetGlobalSearchAdapter) companion.configure(new WidgetGlobalSearchAdapter(recyclerView));
         RecyclerView recyclerView2 = getBinding().e;
         m.checkNotNullExpressionValue(recyclerView2, "binding.globalSearchGuildList");
-        this.guildsAdapter = (WidgetGlobalSearchGuildsAdapter) companion.configure(new WidgetGlobalSearchGuildsAdapter(recyclerView2, ColorCompat.getThemedColor(view, 2130969898)));
+        this.guildsAdapter = (WidgetGlobalSearchGuildsAdapter) companion.configure(new WidgetGlobalSearchGuildsAdapter(recyclerView2, ColorCompat.getThemedColor(view, (int) R.attr.primary_630)));
         TextInputLayout textInputLayout = getBinding().f1811c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetGlobalSearch$onViewBound$1(this));
         Bundle arguments = getArguments();
-        if (!(arguments == null || (string = arguments.getString("EXTRA_SEARCH_TEXT")) == null)) {
+        if (!(arguments == null || (string = arguments.getString(EXTRA_SEARCH_TEXT)) == null)) {
             TextInputLayout textInputLayout2 = getBinding().f1811c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.globalSearchBar");
             ViewExtensions.setText(textInputLayout2, string);
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java
index 19620f708a..284dde5e02 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.WidgetChannelSearchItemHeaderBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -55,7 +56,7 @@ public final class WidgetGlobalSearchAdapter extends MGRecyclerAdapterSimple<Wid
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(WidgetGlobalSearchAdapter widgetGlobalSearchAdapter) {
-            super(2131558902, widgetGlobalSearchAdapter);
+            super((int) R.layout.widget_channel_search_item_header, widgetGlobalSearchAdapter);
             m.checkNotNullParameter(widgetGlobalSearchAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -86,7 +87,7 @@ public final class WidgetGlobalSearchAdapter extends MGRecyclerAdapterSimple<Wid
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public SearchViewHolder(WidgetGlobalSearchAdapter widgetGlobalSearchAdapter) {
-            super(2131558901, widgetGlobalSearchAdapter);
+            super((int) R.layout.widget_channel_search_item, widgetGlobalSearchAdapter);
             m.checkNotNullParameter(widgetGlobalSearchAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "null cannot be cast to non-null type com.discord.widgets.user.search.ViewGlobalSearchItem");
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
index 2edb291833..62517cdf63 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
@@ -9,6 +9,7 @@ import androidx.core.os.BundleKt;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.accessibility.AccessibilityUtils;
@@ -56,14 +57,14 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             dismiss(fragmentManager);
             WidgetGlobalSearchDialog widgetGlobalSearchDialog = new WidgetGlobalSearchDialog();
-            widgetGlobalSearchDialog.setArguments(BundleKt.bundleOf(o.to("EXTRA_SEARCH_TEXT", str)));
+            widgetGlobalSearchDialog.setArguments(BundleKt.bundleOf(o.to(WidgetGlobalSearch.EXTRA_SEARCH_TEXT, str)));
             widgetGlobalSearchDialog.show(fragmentManager, "javaClass");
             AnalyticsTracker.INSTANCE.quickSwitcherOpen();
         }
     }
 
     public WidgetGlobalSearchDialog() {
-        super(2131559060);
+        super(R.layout.widget_global_search_dialog);
     }
 
     private final WidgetGlobalSearchDismissModel getDismissViewModel() {
@@ -71,7 +72,7 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
     }
 
     private final WidgetGlobalSearch getFragment() {
-        Fragment findFragmentById = getChildFragmentManager().findFragmentById(2131365895);
+        Fragment findFragmentById = getChildFragmentManager().findFragmentById(R.id.widget_global_search_container);
         Objects.requireNonNull(findFragmentById, "null cannot be cast to non-null type com.discord.widgets.user.search.WidgetGlobalSearch");
         return (WidgetGlobalSearch) findFragmentById;
     }
@@ -84,7 +85,7 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
 
     @Override // com.discord.app.AppDialog, androidx.fragment.app.DialogFragment
     public Dialog onCreateDialog(Bundle bundle) {
-        setStyle(0, 2131951654);
+        setStyle(0, R.style.AppTheme_GlobalSearchDialog);
         return super.onCreateDialog(bundle);
     }
 
@@ -95,7 +96,7 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
         Dialog dialog = getDialog();
         if (dialog != null && (window = dialog.getWindow()) != null) {
             if (!AccessibilityUtils.INSTANCE.isReducedMotionEnabled()) {
-                window.getAttributes().windowAnimations = 2131952482;
+                window.getAttributes().windowAnimations = R.style.UiKit_QuickSwitcher_Animation;
             }
             window.setLayout(-1, -1);
             window.setBackgroundDrawable(new ColorDrawable(0));
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java
index 91b451049d..43ff7ea291 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java
@@ -10,6 +10,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.LayoutRes;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetGlobalSearchItemGuildBinding;
 import com.discord.databinding.WidgetGuildsListItemDmBinding;
 import com.discord.databinding.WidgetGuildsListItemGuildBinding;
@@ -54,8 +55,8 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             textView.setText(String.valueOf(i));
             Context context = textView.getContext();
             m.checkNotNullExpressionValue(context, "context");
-            textView.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130969812, 0, 2, (Object) null));
-            textView.setContentDescription(b.h(context, 2131891474, new Object[]{String.valueOf(i)}, null, 4));
+            textView.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.overlay_guild_mentions_primary_630, 0, 2, (Object) null));
+            textView.setContentDescription(b.h(context, R.string.mentions_count, new Object[]{String.valueOf(i)}, null, 4));
         }
 
         public void onConfigure(int i, WidgetGlobalSearchGuildsModel.Item item) {
@@ -90,7 +91,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             configureMentionsCount(textView, item.getMentionCount());
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildsItemDmAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, item.getChannel(), 2131165290, null, 8, null);
+            IconUtils.setIcon$default(simpleDraweeView, item.getChannel(), R.dimen.avatar_size_large, null, 8, null);
         }
     }
 
@@ -115,11 +116,11 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             m.checkNotNullParameter(widgetGlobalSearchGuildsAdapter, "adapter");
             this.overlayColor = i2;
             View view = this.itemView;
-            int i3 = 2131363702;
-            ImageView imageView = (ImageView) view.findViewById(2131363702);
+            int i3 = R.id.guilds_item_selected;
+            ImageView imageView = (ImageView) view.findViewById(R.id.guilds_item_selected);
             if (imageView != null) {
-                i3 = 2131363703;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363703);
+                i3 = R.id.guilds_item_unread;
+                ImageView imageView2 = (ImageView) view.findViewById(R.id.guilds_item_unread);
                 if (imageView2 != null) {
                     WidgetGlobalSearchItemGuildBinding widgetGlobalSearchItemGuildBinding = new WidgetGlobalSearchItemGuildBinding((RelativeLayout) view, imageView, imageView2);
                     m.checkNotNullExpressionValue(widgetGlobalSearchItemGuildBinding, "WidgetGlobalSearchItemGuildBinding.bind(itemView)");
@@ -151,7 +152,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             Integer valueOf = Integer.valueOf(this.overlayColor);
             SimpleDraweeView simpleDraweeView2 = this.bindingGuild.d;
             m.checkNotNullExpressionValue(simpleDraweeView2, "bindingGuild.guildsItemAvatar");
-            SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, isSelected, guild3, (float) simpleDraweeView2.getResources().getDimensionPixelSize(2131165446), null, valueOf, null, null, false, null, 488, null);
+            SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, isSelected, guild3, (float) simpleDraweeView2.getResources().getDimensionPixelSize(R.dimen.guild_icon_radius), null, valueOf, null, null, false, null, 488, null);
             TextView textView = this.bindingGuild.e;
             m.checkNotNullExpressionValue(textView, "bindingGuild.guildsItemAvatarText");
             String str = null;
@@ -198,13 +199,13 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
     public MGRecyclerViewHolder<?, WidgetGlobalSearchGuildsModel.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 1) {
-            return new ItemDivider(this, 2131559061);
+            return new ItemDivider(this, R.layout.widget_global_search_item_divider);
         }
         if (i == 2) {
-            return new ItemDirectMessage(this, 2131559062);
+            return new ItemDirectMessage(this, R.layout.widget_global_search_item_dm);
         }
         if (i == 3) {
-            return new ItemGuild(this, 2131559063, this.overlayColor);
+            return new ItemGuild(this, R.layout.widget_global_search_item_guild, this.overlayColor);
         }
         throw invalidViewTypeException(i);
     }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
index 7f2e4cfb10..b8956eacc7 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.user.search;
 
 import a0.a.a.b;
+import androidx.core.app.FrameMetricsAggregator;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
@@ -98,7 +99,7 @@ public final class WidgetGlobalSearchGuildsModel {
         }
 
         public Item() {
-            this(0, 0, null, null, 0, false, false, false, 0, 511, null);
+            this(0, 0, null, null, 0, false, false, false, 0, FrameMetricsAggregator.EVERY_DURATION, null);
         }
 
         /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001c: INVOKE  (r4v1 int) = (r0v0 'this' com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel$Item A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel.Item.getType():int), ('-' char), (r2v0 long)] */
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.java
index 950491920b..409479682d 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICATE$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.user.search;
 
 import com.discord.api.channel.Channel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.permissions.PermissionUtils;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -23,7 +24,7 @@ public final class WidgetGlobalSearchModel$Companion$DEFAULT_PERMISSIONS_PREDICA
 
     public final boolean invoke(Channel channel, Map<Long, Long> map) {
         m.checkNotNullParameter(channel, "channel");
-        m.checkNotNullParameter(map, "permissions");
+        m.checkNotNullParameter(map, ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS);
         return PermissionUtils.hasAccess(channel, map);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.java
index 05657c22aa..10abc8a115 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$6.java
@@ -2,6 +2,7 @@ package com.discord.widgets.user.search;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.widgets.user.search.WidgetGlobalSearchModel;
 import d0.z.d.m;
@@ -31,6 +32,6 @@ public final class WidgetGlobalSearchModel$Companion$create$filteredResults$6 ex
             o0 = 0L;
         }
         long longValue = ((Number) o0).longValue();
-        return PermissionUtils.can(1024, Long.valueOf(longValue)) && PermissionUtils.can(1048576, Long.valueOf(longValue));
+        return PermissionUtils.can(Permission.VIEW_CHANNEL, Long.valueOf(longValue)) && PermissionUtils.can(Permission.CONNECT, Long.valueOf(longValue));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java
index e1f8130363..90d2d7cdfc 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.user.search;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.discord.utilities.permissions.PermissionUtils;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,7 +26,7 @@ public final class WidgetGlobalSearchModel$Companion$getForSend$1 extends o impl
 
     public final boolean invoke(Channel channel, Map<Long, Long> map) {
         m.checkNotNullParameter(channel, "channel");
-        m.checkNotNullParameter(map, "permissions");
+        m.checkNotNullParameter(map, ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS);
         if (AnimatableValueParser.z1(channel)) {
             PermissionUtils permissionUtils = PermissionUtils.INSTANCE;
             long o0 = a.o0(channel, map);
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
index f727b1f5df..8753cc400b 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
@@ -4,6 +4,7 @@ import a0.a.a.b;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
@@ -17,6 +18,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.rx.ObservableWithLeadingEdgeThrottle;
 import com.discord.utilities.search.SearchUtils;
 import com.discord.utilities.string.StringUtilsKt;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel;
 import d0.f0.n;
 import d0.f0.q;
@@ -388,10 +390,10 @@ public final class WidgetGlobalSearchModel {
             if (searchType == 0 && t.isBlank(searchContext.getFilter())) {
                 Channel channel = channelContext.getChannels().get(function12.invoke(searchContext));
                 ItemDataPayload invoke = channel != null ? widgetGlobalSearchModel$Companion$create$4.invoke(channel, "") : null;
-                return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(invoke == null ? q.plus(n.sequenceOf(new ItemHeader(2131894107, 0, false, 6, null)), take) : q.plus(q.plus(n.sequenceOf(new ItemHeader(2131892867, 0, false, 6, null), invoke), n.sequenceOf(new ItemHeader(2131894107, 0, false, 6, null))), q.filterNot(take, new WidgetGlobalSearchModel$Companion$create$results$1(channel)))), widgetGlobalSearchGuildsModel.getItems());
+                return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(invoke == null ? q.plus(n.sequenceOf(new ItemHeader(R.string.suggestions, 0, false, 6, null)), take) : q.plus(q.plus(n.sequenceOf(new ItemHeader(R.string.quickswitcher_last_channel, 0, false, 6, null), invoke), n.sequenceOf(new ItemHeader(R.string.suggestions, 0, false, 6, null))), q.filterNot(take, new WidgetGlobalSearchModel$Companion$create$results$1(channel)))), widgetGlobalSearchGuildsModel.getItems());
             }
             if (q.firstOrNull(take) != null) {
-                take = q.plus(n.sequenceOf(new ItemHeader(2131894107, 0, false, 6, null)), take);
+                take = q.plus(n.sequenceOf(new ItemHeader(R.string.suggestions, 0, false, 6, null)), take);
             }
             return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(take), null, 8, null);
         }
@@ -592,7 +594,7 @@ public final class WidgetGlobalSearchModel {
 
         public String toString() {
             String y0 = AnimatableValueParser.y0(getChannel());
-            return String.valueOf('#') + y0;
+            return String.valueOf((char) MentionUtilsKt.CHANNELS_CHAR) + y0;
         }
     }
 
@@ -1041,7 +1043,7 @@ public final class WidgetGlobalSearchModel {
         }
 
         public String toString() {
-            StringBuilder H = a.H('@');
+            StringBuilder H = a.H(MentionUtilsKt.MENTIONS_CHAR);
             H.append(getMatchedResult().getValue());
             return H.toString();
         }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java b/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java
index 4b30b35fa4..497c003a65 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java
@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.databinding.UserProfileVoiceSettingsViewBinding;
 import com.discord.views.calls.VolumeSliderView;
 import com.google.android.material.switchmaterial.SwitchMaterial;
@@ -120,19 +121,19 @@ public final class UserProfileVoiceSettingsView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558729, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.user_profile_voice_settings_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365712;
-        SwitchMaterial switchMaterial = (SwitchMaterial) inflate.findViewById(2131365712);
+        int i = R.id.user_sheet_deafen;
+        SwitchMaterial switchMaterial = (SwitchMaterial) inflate.findViewById(R.id.user_sheet_deafen);
         if (switchMaterial != null) {
-            i = 2131365724;
-            SwitchMaterial switchMaterial2 = (SwitchMaterial) inflate.findViewById(2131365724);
+            i = R.id.user_sheet_muted;
+            SwitchMaterial switchMaterial2 = (SwitchMaterial) inflate.findViewById(R.id.user_sheet_muted);
             if (switchMaterial2 != null) {
-                i = 2131365740;
-                TextView textView = (TextView) inflate.findViewById(2131365740);
+                i = R.id.user_sheet_volume_label;
+                TextView textView = (TextView) inflate.findViewById(R.id.user_sheet_volume_label);
                 if (textView != null) {
-                    i = 2131365741;
-                    VolumeSliderView volumeSliderView = (VolumeSliderView) inflate.findViewById(2131365741);
+                    i = R.id.user_sheet_volume_slider;
+                    VolumeSliderView volumeSliderView = (VolumeSliderView) inflate.findViewById(R.id.user_sheet_volume_slider);
                     if (volumeSliderView != null) {
                         UserProfileVoiceSettingsViewBinding userProfileVoiceSettingsViewBinding = new UserProfileVoiceSettingsViewBinding((LinearLayout) inflate, switchMaterial, switchMaterial2, textView, volumeSliderView);
                         m.checkNotNullExpressionValue(userProfileVoiceSettingsViewBinding, "UserProfileVoiceSettings…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java
index ae86bb1488..9a0d3ee5a7 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.widget.ContentLoadingProgressBar;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetUserSheetBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.widgets.roles.RolesListView;
@@ -32,122 +33,122 @@ public final /* synthetic */ class WidgetUserSheet$binding$2 extends k implement
 
     public final WidgetUserSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361808;
-        CardView cardView = (CardView) view.findViewById(2131361808);
+        int i = R.id.about_me_card;
+        CardView cardView = (CardView) view.findViewById(R.id.about_me_card);
         if (cardView != null) {
-            i = 2131361809;
-            TextView textView = (TextView) view.findViewById(2131361809);
+            i = R.id.about_me_header;
+            TextView textView = (TextView) view.findViewById(R.id.about_me_header);
             if (textView != null) {
-                i = 2131361810;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131361810);
+                i = R.id.about_me_text;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.about_me_text);
                 if (linkifiedTextView != null) {
-                    i = 2131363981;
-                    ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(2131363981);
+                    i = R.id.loading_progress_bar;
+                    ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(R.id.loading_progress_bar);
                     if (contentLoadingProgressBar != null) {
-                        i = 2131364662;
-                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364662);
+                        i = R.id.rich_presence_container;
+                        FrameLayout frameLayout = (FrameLayout) view.findViewById(R.id.rich_presence_container);
                         if (frameLayout != null) {
-                            i = 2131365703;
-                            Button button = (Button) view.findViewById(2131365703);
+                            i = R.id.user_sheet_add_friend_action_button;
+                            Button button = (Button) view.findViewById(R.id.user_sheet_add_friend_action_button);
                             if (button != null) {
-                                i = 2131365704;
-                                CardView cardView2 = (CardView) view.findViewById(2131365704);
+                                i = R.id.user_sheet_admin_card;
+                                CardView cardView2 = (CardView) view.findViewById(R.id.user_sheet_admin_card);
                                 if (cardView2 != null) {
-                                    i = 2131365705;
-                                    UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(2131365705);
+                                    i = R.id.user_sheet_admin_view;
+                                    UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(R.id.user_sheet_admin_view);
                                     if (userProfileAdminView != null) {
-                                        i = 2131365707;
-                                        Button button2 = (Button) view.findViewById(2131365707);
+                                        i = R.id.user_sheet_call_action_button;
+                                        Button button2 = (Button) view.findViewById(R.id.user_sheet_call_action_button);
                                         if (button2 != null) {
-                                            i = 2131365708;
-                                            TextView textView2 = (TextView) view.findViewById(2131365708);
+                                            i = R.id.user_sheet_connections_header;
+                                            TextView textView2 = (TextView) view.findViewById(R.id.user_sheet_connections_header);
                                             if (textView2 != null) {
-                                                i = 2131365709;
-                                                UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(2131365709);
+                                                i = R.id.user_sheet_connections_view;
+                                                UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(R.id.user_sheet_connections_view);
                                                 if (userProfileConnectionsView != null) {
-                                                    i = 2131365710;
-                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365710);
+                                                    i = R.id.user_sheet_content;
+                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.user_sheet_content);
                                                     if (linearLayout != null) {
-                                                        i = 2131365711;
-                                                        TextView textView3 = (TextView) view.findViewById(2131365711);
+                                                        i = R.id.user_sheet_copy_id;
+                                                        TextView textView3 = (TextView) view.findViewById(R.id.user_sheet_copy_id);
                                                         if (textView3 != null) {
-                                                            i = 2131365713;
-                                                            TextView textView4 = (TextView) view.findViewById(2131365713);
+                                                            i = R.id.user_sheet_developer_header;
+                                                            TextView textView4 = (TextView) view.findViewById(R.id.user_sheet_developer_header);
                                                             if (textView4 != null) {
-                                                                i = 2131365714;
-                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365714);
+                                                                i = R.id.user_sheet_friend_request_accept_button;
+                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.user_sheet_friend_request_accept_button);
                                                                 if (materialButton != null) {
-                                                                    i = 2131365715;
-                                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365715);
+                                                                    i = R.id.user_sheet_friend_request_ignore_button;
+                                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.user_sheet_friend_request_ignore_button);
                                                                     if (materialButton2 != null) {
-                                                                        i = 2131365716;
-                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365716);
+                                                                        i = R.id.user_sheet_friend_request_incoming_container;
+                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.user_sheet_friend_request_incoming_container);
                                                                         if (linearLayout2 != null) {
-                                                                            i = 2131365717;
-                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365717);
+                                                                            i = R.id.user_sheet_guild_container;
+                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.user_sheet_guild_container);
                                                                             if (linearLayout3 != null) {
-                                                                                i = 2131365718;
-                                                                                TextView textView5 = (TextView) view.findViewById(2131365718);
+                                                                                i = R.id.user_sheet_guild_header;
+                                                                                TextView textView5 = (TextView) view.findViewById(R.id.user_sheet_guild_header);
                                                                                 if (textView5 != null) {
-                                                                                    i = 2131365720;
-                                                                                    TextView textView6 = (TextView) view.findViewById(2131365720);
+                                                                                    i = R.id.user_sheet_incoming_friend_request_header;
+                                                                                    TextView textView6 = (TextView) view.findViewById(R.id.user_sheet_incoming_friend_request_header);
                                                                                     if (textView6 != null) {
-                                                                                        i = 2131365721;
-                                                                                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365721);
+                                                                                        i = R.id.user_sheet_loading_container;
+                                                                                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(R.id.user_sheet_loading_container);
                                                                                         if (frameLayout2 != null) {
-                                                                                            i = 2131365722;
-                                                                                            Button button3 = (Button) view.findViewById(2131365722);
+                                                                                            i = R.id.user_sheet_message_action_button;
+                                                                                            Button button3 = (Button) view.findViewById(R.id.user_sheet_message_action_button);
                                                                                             if (button3 != null) {
-                                                                                                i = 2131365723;
-                                                                                                ImageView imageView = (ImageView) view.findViewById(2131365723);
+                                                                                                i = R.id.user_sheet_more_button;
+                                                                                                ImageView imageView = (ImageView) view.findViewById(R.id.user_sheet_more_button);
                                                                                                 if (imageView != null) {
-                                                                                                    i = 2131365725;
-                                                                                                    TextView textView7 = (TextView) view.findViewById(2131365725);
+                                                                                                    i = R.id.user_sheet_note_header;
+                                                                                                    TextView textView7 = (TextView) view.findViewById(R.id.user_sheet_note_header);
                                                                                                     if (textView7 != null) {
-                                                                                                        i = 2131365726;
-                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365726);
+                                                                                                        i = R.id.user_sheet_note_text_field;
+                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(R.id.user_sheet_note_text_field);
                                                                                                         if (textInputEditText != null) {
-                                                                                                            i = 2131365727;
-                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365727);
+                                                                                                            i = R.id.user_sheet_note_text_field_wrap;
+                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.user_sheet_note_text_field_wrap);
                                                                                                             if (textInputLayout != null) {
-                                                                                                                i = 2131365728;
-                                                                                                                Button button4 = (Button) view.findViewById(2131365728);
+                                                                                                                i = R.id.user_sheet_pending_friend_request_action_button;
+                                                                                                                Button button4 = (Button) view.findViewById(R.id.user_sheet_pending_friend_request_action_button);
                                                                                                                 if (button4 != null) {
-                                                                                                                    i = 2131365729;
-                                                                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131365729);
+                                                                                                                    i = R.id.user_sheet_profile_actions_container;
+                                                                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.user_sheet_profile_actions_container);
                                                                                                                     if (linearLayout4 != null) {
-                                                                                                                        i = 2131365730;
-                                                                                                                        View findViewById = view.findViewById(2131365730);
+                                                                                                                        i = R.id.user_sheet_profile_actions_divider;
+                                                                                                                        View findViewById = view.findViewById(R.id.user_sheet_profile_actions_divider);
                                                                                                                         if (findViewById != null) {
-                                                                                                                            i = 2131365731;
-                                                                                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131365731);
+                                                                                                                            i = R.id.user_sheet_profile_edit_button;
+                                                                                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.user_sheet_profile_edit_button);
                                                                                                                             if (materialButton3 != null) {
-                                                                                                                                i = 2131365732;
-                                                                                                                                FrameLayout frameLayout3 = (FrameLayout) view.findViewById(2131365732);
+                                                                                                                                i = R.id.user_sheet_profile_edit_container;
+                                                                                                                                FrameLayout frameLayout3 = (FrameLayout) view.findViewById(R.id.user_sheet_profile_edit_container);
                                                                                                                                 if (frameLayout3 != null) {
-                                                                                                                                    i = 2131365733;
-                                                                                                                                    UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365733);
+                                                                                                                                    i = R.id.user_sheet_profile_header_view;
+                                                                                                                                    UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(R.id.user_sheet_profile_header_view);
                                                                                                                                     if (userProfileHeaderView != null) {
-                                                                                                                                        i = 2131365734;
-                                                                                                                                        CardView cardView3 = (CardView) view.findViewById(2131365734);
+                                                                                                                                        i = R.id.user_sheet_profile_stage_actions_card;
+                                                                                                                                        CardView cardView3 = (CardView) view.findViewById(R.id.user_sheet_profile_stage_actions_card);
                                                                                                                                         if (cardView3 != null) {
-                                                                                                                                            i = 2131365735;
-                                                                                                                                            UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(2131365735);
+                                                                                                                                            i = R.id.user_sheet_profile_stage_actions_view;
+                                                                                                                                            UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(R.id.user_sheet_profile_stage_actions_view);
                                                                                                                                             if (userProfileStageActionsView != null) {
-                                                                                                                                                i = 2131365736;
-                                                                                                                                                TextView textView8 = (TextView) view.findViewById(2131365736);
+                                                                                                                                                i = R.id.user_sheet_profile_voice_settings_header;
+                                                                                                                                                TextView textView8 = (TextView) view.findViewById(R.id.user_sheet_profile_voice_settings_header);
                                                                                                                                                 if (textView8 != null) {
-                                                                                                                                                    i = 2131365737;
-                                                                                                                                                    UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(2131365737);
+                                                                                                                                                    i = R.id.user_sheet_profile_voice_settings_view;
+                                                                                                                                                    UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(R.id.user_sheet_profile_voice_settings_view);
                                                                                                                                                     if (userProfileVoiceSettingsView != null) {
-                                                                                                                                                        i = 2131365738;
-                                                                                                                                                        RolesListView rolesListView = (RolesListView) view.findViewById(2131365738);
+                                                                                                                                                        i = R.id.user_sheet_roles_list;
+                                                                                                                                                        RolesListView rolesListView = (RolesListView) view.findViewById(R.id.user_sheet_roles_list);
                                                                                                                                                         if (rolesListView != null) {
-                                                                                                                                                            i = 2131365739;
-                                                                                                                                                            Button button5 = (Button) view.findViewById(2131365739);
+                                                                                                                                                            i = R.id.user_sheet_video_action_button;
+                                                                                                                                                            Button button5 = (Button) view.findViewById(R.id.user_sheet_video_action_button);
                                                                                                                                                             if (button5 != null) {
-                                                                                                                                                                i = 2131365838;
-                                                                                                                                                                CardView cardView4 = (CardView) view.findViewById(2131365838);
+                                                                                                                                                                i = R.id.voice_settings_view_card;
+                                                                                                                                                                CardView cardView4 = (CardView) view.findViewById(R.id.voice_settings_view_card);
                                                                                                                                                                 if (cardView4 != null) {
                                                                                                                                                                     return new WidgetUserSheetBinding((NestedScrollView) view, cardView, textView, linkifiedTextView, contentLoadingProgressBar, frameLayout, button, cardView2, userProfileAdminView, button2, textView2, userProfileConnectionsView, linearLayout, textView3, textView4, materialButton, materialButton2, linearLayout2, linearLayout3, textView5, textView6, frameLayout2, button3, imageView, textView7, textInputEditText, textInputLayout, button4, linearLayout4, findViewById, materialButton3, frameLayout3, userProfileHeaderView, cardView3, userProfileStageActionsView, textView8, userProfileVoiceSettingsView, rolesListView, button5, cardView4);
                                                                                                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$6.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$6.java
index 4ce0a6338a..b818007684 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$6.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$6.java
@@ -5,6 +5,7 @@ import android.view.View;
 import androidx.fragment.app.FragmentManager;
 import c.a.a.l;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.models.user.User;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import com.discord.widgets.user.usersheet.WidgetUserSheetViewModel;
@@ -88,6 +89,7 @@ public final class WidgetUserSheet$configureProfileActionButtons$6 implements Vi
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         int i = this.$userRelationshipType;
+        Integer valueOf = Integer.valueOf((int) R.id.notice_ok);
         if (i == 3) {
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -99,7 +101,7 @@ public final class WidgetUserSheet$configureProfileActionButtons$6 implements Vi
             m.checkNotNullParameter(requireContext, "context");
             m.checkNotNullParameter(r9, "onAccept");
             m.checkNotNullParameter(r10, "onIgnore");
-            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager, b.h(requireContext, 2131890631, new Object[0], null, 4), b.h(requireContext, 2131894688, new Object[0], null, 4), b.h(requireContext, 2131888840, new Object[0], null, 4), b.h(requireContext, 2131888846, new Object[0], null, 4), h0.mapOf(d0.o.to(2131364252, new k(0, r9)), d0.o.to(2131364247, new k(1, r10))), null, null, null, null, null, null, 0, null, 16320, null);
+            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager, b.h(requireContext, R.string.incoming_friend_request, new Object[0], null, 4), b.h(requireContext, R.string.user_profile_incoming_friend_request_dialog_body, new Object[0], null, 4), b.h(requireContext, R.string.friend_request_accept, new Object[0], null, 4), b.h(requireContext, R.string.friend_request_ignore, new Object[0], null, 4), h0.mapOf(d0.o.to(valueOf, new k(0, r9)), d0.o.to(Integer.valueOf((int) R.id.notice_cancel), new k(1, r10))), null, null, null, null, null, null, 0, null, 16320, null);
         } else if (i == 4) {
             User user = this.$viewState.getUser();
             Context requireContext2 = this.this$0.requireContext();
@@ -111,7 +113,7 @@ public final class WidgetUserSheet$configureProfileActionButtons$6 implements Vi
             m.checkNotNullParameter(requireContext2, "context");
             m.checkNotNullParameter(parentFragmentManager2, "fragmentManager");
             m.checkNotNullParameter(r102, "onConfirm");
-            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager2, b.h(requireContext2, 2131892048, new Object[0], null, 4), b.h(requireContext2, 2131892049, new Object[]{user.getUsername()}, null, 4), b.h(requireContext2, 2131888076, new Object[0], null, 4), b.h(requireContext2, 2131887193, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364252, new l(r102))), null, null, null, 2130969796, null, null, 0, null, 15808, null);
+            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager2, b.h(requireContext2, R.string.outgoing_friend_request, new Object[0], null, 4), b.h(requireContext2, R.string.outgoing_friend_request_delete_msg, new Object[]{user.getUsername()}, null, 4), b.h(requireContext2, R.string.delete, new Object[0], null, 4), b.h(requireContext2, R.string.cancel, new Object[0], null, 4), g0.mapOf(d0.o.to(valueOf, new l(r102))), null, null, null, Integer.valueOf((int) R.attr.notice_theme_positive_red), null, null, 0, null, 15808, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java
index e346a4546f..d6e511d37a 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -22,7 +23,7 @@ public final class WidgetUserSheet$onViewCreated$2 extends o implements Function
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.e.o.g(this.this$0.this$0.getContext(), 2131893747, 0, null, 12);
+            c.a.e.o.g(this.this$0.this$0.getContext(), R.string.stage_channel_permission_microphone_denied, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
index 3e54617f97..70f1a288b3 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
@@ -21,6 +21,7 @@ import c.a.e.j0;
 import c.a.e.o;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.activity.Activity;
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
@@ -150,18 +151,18 @@ public final class WidgetUserSheet extends AppBottomSheet {
             m.checkNotNullParameter(streamPreviewClickBehavior, "streamPreviewClickBehavior");
             WidgetUserSheet widgetUserSheet = new WidgetUserSheet();
             Bundle bundle = new Bundle();
-            bundle.putLong("ARG_USER_ID", j);
+            bundle.putLong(WidgetUserSheet.ARG_USER_ID, j);
             if (l != null) {
-                bundle.putLong("ARG_CHANNEL_ID", l.longValue());
+                bundle.putLong(WidgetUserSheet.ARG_CHANNEL_ID, l.longValue());
             }
             if (str != null) {
-                bundle.putString("ARG_FRIEND_TOKEN", str);
+                bundle.putString(WidgetUserSheet.ARG_FRIEND_TOKEN, str);
             }
             if (l2 != null) {
-                bundle.putLong("ARG_GUILD_ID", l2.longValue());
+                bundle.putLong(WidgetUserSheet.ARG_GUILD_ID, l2.longValue());
             }
-            bundle.putBoolean("ARG_IS_VOICE_CONTEXT", bool != null ? bool.booleanValue() : false);
-            bundle.putSerializable("ARG_STREAM_PREVIEW_CLICK_BEHAVIOR", streamPreviewClickBehavior);
+            bundle.putBoolean(WidgetUserSheet.ARG_IS_VOICE_CONTEXT, bool != null ? bool.booleanValue() : false);
+            bundle.putSerializable(WidgetUserSheet.ARG_STREAM_PREVIEW_CLICK_BEHAVIOR, streamPreviewClickBehavior);
             widgetUserSheet.setArguments(bundle);
             widgetUserSheet.show(fragmentManager, WidgetUserSheet.class.getName());
         }
@@ -184,7 +185,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void acceptFriendRequest(String str) {
-        getViewModel().addRelationship(null, str, 2131886115);
+        getViewModel().addRelationship(null, str, R.string.accept_request_button_after);
     }
 
     public static final /* synthetic */ void access$acceptFriendRequest(WidgetUserSheet widgetUserSheet, String str) {
@@ -228,7 +229,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void addFriend(String str) {
-        getViewModel().addRelationship(null, str, 2131888855);
+        getViewModel().addRelationship(null, str, R.string.friend_request_sent);
     }
 
     private final void configureAboutMe(WidgetUserSheetViewModel.ViewState.Loaded loaded) {
@@ -308,7 +309,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
         RolesListView rolesListView2 = getBinding().J;
         RolesListView rolesListView3 = getBinding().J;
         m.checkNotNullExpressionValue(rolesListView3, "binding.userSheetRolesList");
-        rolesListView2.updateView(roleItems, ColorCompat.getThemedColor(rolesListView3.getContext(), 2130969885));
+        rolesListView2.updateView(roleItems, ColorCompat.getThemedColor(rolesListView3.getContext(), (int) R.attr.primary_300));
         String guildSectionHeaderText = loaded.getGuildSectionHeaderText();
         if (guildSectionHeaderText != null) {
             TextView textView = getBinding().r;
@@ -351,21 +352,21 @@ public final class WidgetUserSheet extends AppBottomSheet {
         if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Empty) {
             TextInputLayout textInputLayout = getBinding().f2035y;
             m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout.setHint(getString(2131891786));
+            textInputLayout.setHint(getString(R.string.note_placeholder_mobile));
             TextInputLayout textInputLayout2 = getBinding().f2035y;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap");
             textInputLayout2.setEnabled(true);
         } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loading) {
             TextInputLayout textInputLayout3 = getBinding().f2035y;
             m.checkNotNullExpressionValue(textInputLayout3, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout3.setHint(getString(2131891154));
+            textInputLayout3.setHint(getString(R.string.loading_note));
             TextInputLayout textInputLayout4 = getBinding().f2035y;
             m.checkNotNullExpressionValue(textInputLayout4, "binding.userSheetNoteTextFieldWrap");
             textInputLayout4.setEnabled(false);
         } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded) {
             TextInputLayout textInputLayout5 = getBinding().f2035y;
             m.checkNotNullExpressionValue(textInputLayout5, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout5.setHint(getString(2131891786));
+            textInputLayout5.setHint(getString(R.string.note_placeholder_mobile));
             TextInputLayout textInputLayout6 = getBinding().f2035y;
             m.checkNotNullExpressionValue(textInputLayout6, "binding.userSheetNoteTextFieldWrap");
             textInputLayout6.setEnabled(true);
@@ -583,7 +584,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
         } else if (event instanceof WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream) {
             handleRequestPermissionsForSpectateStream((WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream) event);
         } else if (event instanceof WidgetUserSheetViewModel.Event.UserNotFound) {
-            o.i(this, 2131894686, 0, 4);
+            o.i(this, R.string.user_profile_failure_to_open_message, 0, 4);
             handleDismissSheet();
         } else if (event instanceof WidgetUserSheetViewModel.Event.DismissSheet) {
             handleDismissSheet();
@@ -640,7 +641,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void handleMoveUser(WidgetUserSheetViewModel.Event.LaunchMoveUser launchMoveUser) {
-        WidgetChannelSelector.Companion.launchForVocal$default(WidgetChannelSelector.Companion, this, launchMoveUser.getGuildId(), "REQUEST_KEY_MOVE_USER", false, 0, 24, null);
+        WidgetChannelSelector.Companion.launchForVocal$default(WidgetChannelSelector.Companion, this, launchMoveUser.getGuildId(), REQUEST_KEY_MOVE_USER, false, 0, 24, null);
     }
 
     private final void handleRequestPermissionsForSpectateStream(WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream requestPermissionsForSpectateStream) {
@@ -656,7 +657,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void ignoreFriendRequest() {
-        getViewModel().removeRelationship(2131888847);
+        getViewModel().removeRelationship(R.string.friend_request_ignored);
     }
 
     private final void onStreamPreviewClicked(StreamContext streamContext) {
@@ -700,7 +701,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559337;
+        return R.layout.widget_user_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -720,8 +721,8 @@ public final class WidgetUserSheet extends AppBottomSheet {
         if (viewHolderUserRichPresence != null) {
             viewHolderUserRichPresence.disposeSubscriptions();
         }
-        long j = getArgumentsOrDefault().getLong("ARG_USER_ID");
-        long j2 = getArgumentsOrDefault().getLong("ARG_GUILD_ID");
+        long j = getArgumentsOrDefault().getLong(ARG_USER_ID);
+        long j2 = getArgumentsOrDefault().getLong(ARG_GUILD_ID);
         if (j > 0 && j2 > 0) {
             StoreStream.Companion.getGuildSubscriptions().unsubscribeUser(j2, j);
         }
@@ -738,8 +739,8 @@ public final class WidgetUserSheet extends AppBottomSheet {
     public void onResume() {
         super.onResume();
         AppBottomSheet.hideKeyboard$default(this, null, 1, null);
-        long j = getArgumentsOrDefault().getLong("ARG_USER_ID");
-        long j2 = getArgumentsOrDefault().getLong("ARG_GUILD_ID");
+        long j = getArgumentsOrDefault().getLong(ARG_USER_ID);
+        long j2 = getArgumentsOrDefault().getLong(ARG_GUILD_ID);
         if (j > 0 && j2 > 0) {
             StoreStream.Companion.getGuildSubscriptions().subscribeUser(j2, j);
         }
@@ -749,7 +750,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        long j = getArgumentsOrDefault().getLong("ARG_USER_ID");
+        long j = getArgumentsOrDefault().getLong(ARG_USER_ID);
         boolean z2 = j == StoreStream.Companion.getUsers().getMe().getId();
         getBinding().v.setOnClickListener(new WidgetUserSheet$onViewCreated$1(this, j));
         UserProfileHeaderView userProfileHeaderView = getBinding().E;
@@ -783,6 +784,6 @@ public final class WidgetUserSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(textView, "header");
             accessibilityUtils.setViewIsHeading(textView);
         }
-        WidgetChannelSelector.Companion.registerForResult$default(WidgetChannelSelector.Companion, this, "REQUEST_KEY_MOVE_USER", false, new WidgetUserSheet$onViewCreated$17(this), 4, null);
+        WidgetChannelSelector.Companion.registerForResult$default(WidgetChannelSelector.Companion, this, REQUEST_KEY_MOVE_USER, false, new WidgetUserSheet$onViewCreated$17(this), 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java
index 98aa3cf8f1..87f571de25 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPIAbortMessages;
 import d0.z.d.m;
@@ -50,7 +51,7 @@ public final class WidgetUserSheetViewModel$addRelationship$2 extends o implemen
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final Boolean mo1invoke() {
-            WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888073);
+            WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0.this$0, R.string.default_failure_to_perform_action_message);
             return null;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java
index 4db7e40af7..ed16fc7a53 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class WidgetUserSheetViewModel$disconnectUser$1 extends o implement
     }
 
     public final void invoke(Void r2) {
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888178);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.disconnect_user_success);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java
index daa8ce638f..53a5790ca6 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetUserSheetViewModel$disconnectUser$2 extends o implement
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java
index 15ec286d67..18310d5ee3 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetUserSheetViewModel$guildDeafenUser$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java
index 0ad329fc1e..8684408608 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetUserSheetViewModel$guildMuteUser$2 extends o implements
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java
index 9c72200713..f6454522e8 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetUserSheetViewModel$launchVideoCall$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java
index 06536cd833..bcdef45717 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetUserSheetViewModel$launchVoiceCall$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java
index f296bd123d..c1917522ce 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class WidgetUserSheetViewModel$moveUserToChannel$1 extends o implem
     }
 
     public final void invoke(Void r2) {
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131891580);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.move_to_success);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java
index a0ee5cad10..a864d6cc77 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetUserSheetViewModel$moveUserToChannel$2 extends o implem
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java
index e3f2365a60..1c2554bf66 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.user.usersheet;
 
+import com.discord.R;
 import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -25,6 +26,6 @@ public final class WidgetUserSheetViewModel$removeRelationship$2 extends o imple
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888073);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, R.string.default_failure_to_perform_action_message);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
index 49baf9c7fe..86cf90d1e4 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
@@ -6,7 +6,9 @@ import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.api.role.GuildRole;
 import com.discord.api.voice.state.StageRequestToSpeakState;
 import com.discord.api.voice.state.VoiceState;
@@ -1854,7 +1856,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 this.storeApplicationStreamPreviews.fetchStreamPreviewIfNotFetching(streamContext);
                 this.fetchedPreviews.add(encodedStreamKey);
             }
-            UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z6, storeState.getStageChannel(), storeState.m57getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), PermissionUtils.can(4194304, storeState.getPermissions()), false, false, 192, null);
+            UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z6, storeState.getStageChannel(), storeState.m57getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), PermissionUtils.can(Permission.MUTE_MEMBERS, storeState.getPermissions()), false, false, 192, null);
             z3 = !m.areEqual(userProfile, StoreUserProfile.Companion.getEMPTY_PROFILE());
             if (z3) {
                 if (user2 instanceof MeUser) {
@@ -1928,7 +1930,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         }
         this.storeApplicationStreamPreviews.fetchStreamPreviewIfNotFetching(streamContext);
         this.fetchedPreviews.add(encodedStreamKey);
-        UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z6, storeState.getStageChannel(), storeState.m57getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), PermissionUtils.can(4194304, storeState.getPermissions()), false, false, 192, null);
+        UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z6, storeState.getStageChannel(), storeState.m57getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), PermissionUtils.can(Permission.MUTE_MEMBERS, storeState.getPermissions()), false, false, 192, null);
         z3 = !m.areEqual(userProfile, StoreUserProfile.Companion.getEMPTY_PROFILE());
         if (z3) {
         }
@@ -2164,7 +2166,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
     public final void onStreamPreviewClicked(StreamContext streamContext) {
         m.checkNotNullParameter(streamContext, "streamContext");
         if (streamContext.getJoinability() == StreamContext.Joinability.MISSING_PERMISSIONS) {
-            emitShowToastEvent(2131887288);
+            emitShowToastEvent(R.string.channel_locked);
         } else {
             emitRequestStreamPermissionsEvent(streamContext.getStream());
         }
@@ -2235,7 +2237,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             if (loaded.isMe()) {
                 StoreMediaSettings.SelfMuteFailure selfMuteFailure = this.storeMediaSettings.toggleSelfMuted();
                 if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) {
-                    emitShowToastEvent(2131894885);
+                    emitShowToastEvent(R.string.vad_permission_small);
                     return;
                 }
                 return;
diff --git a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
index 4d2b6a0769..fe11801003 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.voice.call;
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
 import c.a.e.q;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppComponent;
 import com.discord.rtcconnection.RtcConnection;
@@ -177,7 +178,7 @@ public final class PrivateCallLaunchUtilsKt$callAndLaunch$1 extends o implements
             if (str != null) {
                 this.$doCall$6.mo1invoke();
             } else {
-                c.a.e.o.g(this.this$0.$context, 2131891766, 0, null, 12);
+                c.a.e.o.g(this.this$0.$context, R.string.no_video_devices, 0, null, 12);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java
index 821fa97ff0..98ccd53268 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.call;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -22,6 +23,6 @@ public final class WidgetCallFailed$sendFriendRequest$1 extends o implements Fun
     }
 
     public final void invoke(Void r4) {
-        c.a.e.o.i(this.this$0, 2131888855, 0, 4);
+        c.a.e.o.i(this.this$0, R.string.friend_request_sent, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java
index 6e9a6a7735..4aeecd1621 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentManager;
 import c.a.e.q;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppDialog;
 import com.discord.databinding.ViewDialogConfirmationBinding;
 import com.discord.models.user.User;
@@ -43,14 +44,14 @@ public final class WidgetCallFailed extends AppDialog {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetCallFailed widgetCallFailed = new WidgetCallFailed();
             Bundle bundle = new Bundle();
-            bundle.putLong("INTENT_USER_ID", j);
+            bundle.putLong(WidgetCallFailed.INTENT_USER_ID, j);
             widgetCallFailed.setArguments(bundle);
             widgetCallFailed.show(fragmentManager, WidgetCallFailed.class.getSimpleName());
         }
     }
 
     public WidgetCallFailed() {
-        super(2131558757);
+        super(R.layout.view_dialog_confirmation);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetCallFailed widgetCallFailed, User user) {
@@ -65,7 +66,7 @@ public final class WidgetCallFailed extends AppDialog {
         if (user != null) {
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationText");
-            b.n(textView, 2131887139, new Object[]{user.getUsername()}, null, 4);
+            b.n(textView, R.string.call_invite_not_friends, new Object[]{user.getUsername()}, null, 4);
             MaterialButton materialButton = getBinding().f1655c;
             m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm");
             setOnClickAndDismissListener(materialButton, new WidgetCallFailed$configureUI$$inlined$let$lambda$1(this, user));
@@ -88,19 +89,19 @@ public final class WidgetCallFailed extends AppDialog {
         super.onViewBound(view);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader");
-        textView.setText(getString(2131893860));
+        textView.setText(getString(R.string.start_call));
         MaterialButton materialButton = getBinding().f1655c;
         m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm");
-        materialButton.setText(getString(2131886254));
+        materialButton.setText(getString(R.string.add_friend_button));
         MaterialButton materialButton2 = getBinding().b;
         m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationCancel");
-        materialButton2.setText(getString(2131892004));
+        materialButton2.setText(getString(R.string.okay));
         getBinding().b.setOnClickListener(new WidgetCallFailed$onViewBound$1(this));
     }
 
     @Override // com.discord.app.AppDialog
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getUsers().observeUser(getArgumentsOrDefault().getLong("INTENT_USER_ID")), this, null, 2, null), WidgetCallFailed.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCallFailed$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getUsers().observeUser(getArgumentsOrDefault().getLong(INTENT_USER_ID)), this, null, 2, null), WidgetCallFailed.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCallFailed$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java
index 739ce383f5..1166d1ddba 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
+import com.discord.R;
 import com.discord.databinding.WidgetVoiceCallIncomingBinding;
 import com.discord.widgets.voice.fullscreen.grid.PrivateCallBlurredGridView;
 import com.discord.widgets.voice.fullscreen.grid.PrivateCallGridView;
@@ -22,35 +23,35 @@ public final /* synthetic */ class WidgetVoiceCallIncoming$binding$2 extends k i
 
     public final WidgetVoiceCallIncomingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363762;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363762);
+        int i = R.id.incoming_call_accept_alt_container;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.incoming_call_accept_alt_container);
         if (linearLayout != null) {
-            i = 2131363763;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363763);
+            i = R.id.incoming_call_accept_button;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.incoming_call_accept_button);
             if (floatingActionButton != null) {
-                i = 2131363764;
-                FloatingActionButton floatingActionButton2 = (FloatingActionButton) view.findViewById(2131363764);
+                i = R.id.incoming_call_accept_video_button;
+                FloatingActionButton floatingActionButton2 = (FloatingActionButton) view.findViewById(R.id.incoming_call_accept_video_button);
                 if (floatingActionButton2 != null) {
-                    i = 2131363765;
-                    PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) view.findViewById(2131363765);
+                    i = R.id.incoming_call_blurred_view;
+                    PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) view.findViewById(R.id.incoming_call_blurred_view);
                     if (privateCallBlurredGridView != null) {
-                        i = 2131363766;
-                        FloatingActionButton floatingActionButton3 = (FloatingActionButton) view.findViewById(2131363766);
+                        i = R.id.incoming_call_decline_button;
+                        FloatingActionButton floatingActionButton3 = (FloatingActionButton) view.findViewById(R.id.incoming_call_decline_button);
                         if (floatingActionButton3 != null) {
-                            i = 2131363767;
-                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363767);
+                            i = R.id.incoming_call_status_container;
+                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.incoming_call_status_container);
                             if (linearLayout2 != null) {
-                                i = 2131363768;
-                                TextView textView = (TextView) view.findViewById(2131363768);
+                                i = R.id.incoming_call_status_primary;
+                                TextView textView = (TextView) view.findViewById(R.id.incoming_call_status_primary);
                                 if (textView != null) {
-                                    i = 2131363769;
-                                    TextView textView2 = (TextView) view.findViewById(2131363769);
+                                    i = R.id.incoming_call_status_secondary;
+                                    TextView textView2 = (TextView) view.findViewById(R.id.incoming_call_status_secondary);
                                     if (textView2 != null) {
-                                        i = 2131363770;
-                                        Guideline guideline = (Guideline) view.findViewById(2131363770);
+                                        i = R.id.incoming_call_top_guideline;
+                                        Guideline guideline = (Guideline) view.findViewById(R.id.incoming_call_top_guideline);
                                         if (guideline != null) {
-                                            i = 2131363771;
-                                            PrivateCallGridView privateCallGridView = (PrivateCallGridView) view.findViewById(2131363771);
+                                            i = R.id.incoming_call_users_grid_view;
+                                            PrivateCallGridView privateCallGridView = (PrivateCallGridView) view.findViewById(R.id.incoming_call_users_grid_view);
                                             if (privateCallGridView != null) {
                                                 return new WidgetVoiceCallIncomingBinding((ConstraintLayout) view, linearLayout, floatingActionButton, floatingActionButton2, privateCallBlurredGridView, floatingActionButton3, linearLayout2, textView, textView2, guideline, privateCallGridView);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
index 56ecf5ea5d..9c6207641c 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.app.DiscordConnectService;
@@ -218,7 +219,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
     }
 
     public WidgetVoiceCallIncoming() {
-        super(2131559340);
+        super(R.layout.widget_voice_call_incoming);
     }
 
     private final WidgetVoiceCallIncomingBinding getBinding() {
@@ -248,7 +249,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
             }
         }
         textView.setText(str);
-        getBinding().h.setText(component1.isVideoCall() ? 2131890634 : 2131890628);
+        getBinding().h.setText(component1.isVideoCall() ? R.string.incoming_video_call : R.string.incoming_call);
         getBinding().i.configure(component2);
         getBinding().e.configure(component2);
         LinearLayout linearLayout = getBinding().b;
@@ -315,7 +316,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
         if (Build.VERSION.SDK_INT >= 28) {
             window.getAttributes().layoutInDisplayCutoutMode = 1;
         }
-        int color = ColorCompat.getColor(this, 2131100384);
+        int color = ColorCompat.getColor(this, (int) R.color.transparent);
         ColorCompat.setStatusBarTranslucent(this);
         ColorCompat.setStatusBarColor((Fragment) this, color, true);
         ViewCompat.setOnApplyWindowInsetsListener((ViewGroup) view, WidgetVoiceCallIncoming$onViewBound$1.INSTANCE);
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java
index cac8dc33ad..f2e306b39a 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.call;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetVoiceCallInlineBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,10 +19,10 @@ public final /* synthetic */ class WidgetVoiceCallInline$binding$2 extends k imp
     public final WidgetVoiceCallInlineBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         LinearLayout linearLayout = (LinearLayout) view;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365822);
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.voice_connected_ptt);
         if (materialButton != null) {
             return new WidgetVoiceCallInlineBinding((LinearLayout) view, linearLayout, materialButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365822)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.voice_connected_ptt)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
index c98ec4c9f4..fb2540a6d2 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
@@ -7,6 +7,7 @@ import androidx.core.view.ViewKt;
 import androidx.fragment.app.Fragment;
 import c.a.p.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetVoiceCallInlineBinding;
@@ -30,7 +31,7 @@ import rx.Observable;
 public final class WidgetVoiceCallInline extends AppFragment {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.V(WidgetVoiceCallInline.class, "binding", "getBinding()Lcom/discord/databinding/WidgetVoiceCallInlineBinding;", 0)};
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding(this, WidgetVoiceCallInline$binding$2.INSTANCE, new WidgetVoiceCallInline$binding$3(this));
-    private final ViewVisibilityObserver inlineVoiceVisibilityObserver = ViewVisibilityObserverProvider.INSTANCE.get("INLINE_VOICE_FEATURE");
+    private final ViewVisibilityObserver inlineVoiceVisibilityObserver = ViewVisibilityObserverProvider.INSTANCE.get(ViewVisibilityObserverProvider.INLINE_VOICE_FEATURE);
 
     /* compiled from: WidgetVoiceCallInline.kt */
     public static final class Model {
@@ -210,7 +211,7 @@ public final class WidgetVoiceCallInline extends AppFragment {
     }
 
     public WidgetVoiceCallInline() {
-        super(2131559341);
+        super(R.layout.widget_voice_call_inline);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetVoiceCallInline widgetVoiceCallInline, Model model) {
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
index 38a9030f12..5c656a9a88 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
@@ -11,6 +11,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.fragment.app.FragmentManager;
 import c.a.k.a;
+import com.discord.R;
 import com.discord.app.AppComponent;
 import com.discord.app.AppLog;
 import com.discord.databinding.AnchoredVoiceControlsViewBinding;
@@ -62,28 +63,28 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
     public AnchoredVoiceControlsView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558432, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.anchored_voice_controls_view, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131365824;
-        ImageView imageView = (ImageView) inflate.findViewById(2131365824);
+        int i2 = R.id.voice_fullscreen_controls_camera;
+        ImageView imageView = (ImageView) inflate.findViewById(R.id.voice_fullscreen_controls_camera);
         if (imageView != null) {
-            i2 = 2131365825;
-            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365825);
+            i2 = R.id.voice_fullscreen_controls_controls_wrap;
+            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(R.id.voice_fullscreen_controls_controls_wrap);
             if (linearLayout != null) {
-                i2 = 2131365826;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131365826);
+                i2 = R.id.voice_fullscreen_controls_disconnect;
+                ImageView imageView2 = (ImageView) inflate.findViewById(R.id.voice_fullscreen_controls_disconnect);
                 if (imageView2 != null) {
-                    i2 = 2131365827;
-                    ImageView imageView3 = (ImageView) inflate.findViewById(2131365827);
+                    i2 = R.id.voice_fullscreen_controls_mute_state;
+                    ImageView imageView3 = (ImageView) inflate.findViewById(R.id.voice_fullscreen_controls_mute_state);
                     if (imageView3 != null) {
-                        i2 = 2131365828;
-                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365828);
+                        i2 = R.id.voice_fullscreen_controls_ptt;
+                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(R.id.voice_fullscreen_controls_ptt);
                         if (materialButton != null) {
-                            i2 = 2131365829;
-                            ImageView imageView4 = (ImageView) inflate.findViewById(2131365829);
+                            i2 = R.id.voice_fullscreen_controls_screenshare;
+                            ImageView imageView4 = (ImageView) inflate.findViewById(R.id.voice_fullscreen_controls_screenshare);
                             if (imageView4 != null) {
-                                i2 = 2131365830;
-                                ImageView imageView5 = (ImageView) inflate.findViewById(2131365830);
+                                i2 = R.id.voice_fullscreen_controls_speaker;
+                                ImageView imageView5 = (ImageView) inflate.findViewById(R.id.voice_fullscreen_controls_speaker);
                                 if (imageView5 != null) {
                                     AnchoredVoiceControlsViewBinding anchoredVoiceControlsViewBinding = new AnchoredVoiceControlsViewBinding((LinearLayout) inflate, imageView, linearLayout, imageView2, imageView3, materialButton, imageView4, imageView5);
                                     m.checkNotNullExpressionValue(anchoredVoiceControlsViewBinding, "AnchoredVoiceControlsVie…rom(context), this, true)");
@@ -178,34 +179,34 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
         if (cameraState == CameraState.CAMERA_ON) {
             ImageView imageView2 = this.binding.b;
             m.checkNotNullExpressionValue(imageView2, "binding.voiceFullscreenControlsCamera");
-            imageView2.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968946)));
+            imageView2.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorInteractiveActive)));
             ImageView imageView3 = this.binding.b;
             m.checkNotNullExpressionValue(imageView3, "binding.voiceFullscreenControlsCamera");
-            imageView3.setContentDescription(getContext().getString(2131887152));
+            imageView3.setContentDescription(getContext().getString(R.string.camera_on));
         } else {
             ImageView imageView4 = this.binding.b;
             m.checkNotNullExpressionValue(imageView4, "binding.voiceFullscreenControlsCamera");
-            imageView4.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968949)));
+            imageView4.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), (int) R.attr.colorInteractiveNormal)));
             ImageView imageView5 = this.binding.b;
             m.checkNotNullExpressionValue(imageView5, "binding.voiceFullscreenControlsCamera");
-            imageView5.setContentDescription(getContext().getString(2131887151));
+            imageView5.setContentDescription(getContext().getString(R.string.camera_off));
         }
         if (state.getActiveAudioDevice() == DiscordAudioManager.DeviceTypes.BLUETOOTH_HEADSET) {
-            this.binding.g.setImageResource(2131231432);
+            this.binding.g.setImageResource(R.drawable.ic_audio_output_bluetooth_white_24dp);
         } else {
-            this.binding.g.setImageResource(2131231433);
+            this.binding.g.setImageResource(R.drawable.ic_audio_output_white_24dp);
         }
         if (state.getActiveAudioDevice() == DiscordAudioManager.DeviceTypes.EARPIECE || state.getActiveAudioDevice() == DiscordAudioManager.DeviceTypes.WIRED_HEADSET) {
             ImageView imageView6 = this.binding.g;
             m.checkNotNullExpressionValue(imageView6, "binding.voiceFullscreenControlsSpeaker");
-            int themedColor = ColorCompat.getThemedColor(imageView6.getContext(), 2130968949);
+            int themedColor = ColorCompat.getThemedColor(imageView6.getContext(), (int) R.attr.colorInteractiveNormal);
             ImageView imageView7 = this.binding.g;
             m.checkNotNullExpressionValue(imageView7, "binding.voiceFullscreenControlsSpeaker");
             imageView7.setImageTintList(ColorStateList.valueOf(themedColor));
         } else {
             ImageView imageView8 = this.binding.g;
             m.checkNotNullExpressionValue(imageView8, "binding.voiceFullscreenControlsSpeaker");
-            int themedColor2 = ColorCompat.getThemedColor(imageView8.getContext(), 2130968946);
+            int themedColor2 = ColorCompat.getThemedColor(imageView8.getContext(), (int) R.attr.colorInteractiveActive);
             ImageView imageView9 = this.binding.g;
             m.checkNotNullExpressionValue(imageView9, "binding.voiceFullscreenControlsSpeaker");
             imageView9.setImageTintList(ColorStateList.valueOf(themedColor2));
@@ -219,17 +220,17 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
         imageView11.setActivated(z2);
         ImageView imageView12 = this.binding.d;
         m.checkNotNullExpressionValue(imageView12, "binding.voiceFullscreenControlsMuteState");
-        imageView12.setContentDescription(getContext().getString(z2 ? 2131894504 : 2131891618));
+        imageView12.setContentDescription(getContext().getString(z2 ? R.string.unmute : R.string.mute));
         this.binding.d.setOnClickListener(new AnchoredVoiceControlsView$configureUI$3(function0));
         ImageView imageView13 = this.binding.f;
         m.checkNotNullExpressionValue(imageView13, "binding.voiceFullscreenControlsScreenshare");
         imageView13.setActivated(z3);
-        this.binding.f.setImageResource(z3 ? 2131231805 : 2131231804);
+        this.binding.f.setImageResource(z3 ? R.drawable.ic_mobile_screenshare_end_24dp : R.drawable.ic_mobile_screenshare_24dp);
         ImageView imageView14 = this.binding.f;
         m.checkNotNullExpressionValue(imageView14, "binding.voiceFullscreenControlsScreenshare");
         Context context = getContext();
         if (context != null) {
-            str = context.getString(z3 ? 2131894013 : 2131893424);
+            str = context.getString(z3 ? R.string.stop_streaming : R.string.screenshare_screen);
         } else {
             str = null;
         }
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java
index af853dc441..4b79c0ed7b 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java
@@ -1,13 +1,14 @@
 package com.discord.widgets.voice.controls;
 
 import androidx.annotation.DrawableRes;
+import com.discord.R;
 /* compiled from: VoiceControlsOutputSelectorState.kt */
 public enum VoiceControlsOutputSelectorState {
-    SPEAKER_ON(2131231991, true, false),
-    SPEAKER_OFF(2131231993, false, false),
-    BLUETOOTH_ON_AND_MORE(2131231992, true, true),
-    SPEAKER_ON_AND_MORE(2131231991, true, true),
-    SPEAKER_OFF_AND_MORE(2131231993, false, true);
+    SPEAKER_ON(R.drawable.ic_sound_24dp, true, false),
+    SPEAKER_OFF(R.drawable.ic_sound_quiet_24dp, false, false),
+    BLUETOOTH_ON_AND_MORE(R.drawable.ic_sound_bluetooth_24dp, true, true),
+    SPEAKER_ON_AND_MORE(R.drawable.ic_sound_24dp, true, true),
+    SPEAKER_OFF_AND_MORE(R.drawable.ic_sound_quiet_24dp, false, true);
     
     private final int audioOutputIconRes;
     private final boolean isButtonActive;
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java
index f171565595..71e1378e8f 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java
@@ -15,8 +15,10 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
 import c.a.l.b;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.databinding.VoiceControlsSheetViewBinding;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.color.ColorCompatKt;
@@ -133,7 +135,7 @@ public final class VoiceControlsSheetView extends LinearLayout {
         imageView.setVisibility(i);
         ImageView imageView2 = this.binding.j;
         m.checkNotNullExpressionValue(imageView2, "binding.moveToAudienceButton");
-        imageView2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(imageView.getContext(), 2131100468)));
+        imageView2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(imageView.getContext(), (int) R.color.white_alpha_24)));
         imageView.setOnClickListener(new VoiceControlsSheetView$configureMoveToAudienceButton$$inlined$apply$lambda$1(this, stageRoles, function0));
     }
 
@@ -150,13 +152,13 @@ public final class VoiceControlsSheetView extends LinearLayout {
             ImageView imageView2 = this.binding.k;
             m.checkNotNullExpressionValue(imageView2, "binding.muteButton");
             imageView2.setBackgroundTintList(ColorStateList.valueOf(defaultButtonBackgroundTint));
-            this.binding.k.setImageResource(isMeMutedByAnySource ? 2131231790 : 2131231801);
+            this.binding.k.setImageResource(isMeMutedByAnySource ? R.drawable.ic_mic_mute_red_strike_24dp : R.drawable.ic_mic_white_24dp);
             this.binding.k.setOnClickListener(new VoiceControlsSheetView$configureMuteButton$1(function0));
             ImageView imageView3 = this.binding.k;
             m.checkNotNullExpressionValue(imageView3, "binding.muteButton");
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            imageView3.setContentDescription(b.h(context2, isMeMutedByAnySource ? 2131894504 : 2131891618, new Object[0], null, 4));
+            imageView3.setContentDescription(b.h(context2, isMeMutedByAnySource ? R.string.unmute : R.string.mute, new Object[0], null, 4));
             return;
         }
         ImageView imageView4 = this.binding.k;
@@ -217,13 +219,13 @@ public final class VoiceControlsSheetView extends LinearLayout {
         numericBadgingView2.setBadgeNumber(i);
         ImageView imageView = this.binding.o;
         if (StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) {
-            imageView.setContentDescription(imageView.getResources().getString(2131893005));
+            imageView.setContentDescription(imageView.getResources().getString(R.string.request_to_speak_area_title));
             ViewExtensions.setEnabledAndAlpha$default(imageView, true, 0.0f, 2, null);
-            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131232012));
+            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), R.drawable.ic_stage_raised_hand_list));
         } else {
-            imageView.setContentDescription(imageView.getResources().getString(!callModel.canRequestToSpeak() ? 2131886745 : callModel.isMyHandRaised() ? 2131886742 : 2131886743));
+            imageView.setContentDescription(imageView.getResources().getString(!callModel.canRequestToSpeak() ? R.string.audience_raise_hand_no_permission : callModel.isMyHandRaised() ? R.string.audience_lower_hand : R.string.audience_raise_hand_cta));
             ViewExtensions.setEnabledAndAlpha(imageView, !z2 && callModel.canRequestToSpeak(), 0.2f);
-            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131232009));
+            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), R.drawable.ic_stage_raised_hand));
         }
         if (callModel.isMyHandRaised() && !StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) {
             z3 = true;
@@ -243,13 +245,13 @@ public final class VoiceControlsSheetView extends LinearLayout {
         boolean z3 = true;
         boolean z4 = !AnimatableValueParser.w1(callModel.getChannel());
         boolean isStreaming = callModel.isStreaming();
-        int i = isStreaming ? 2131894013 : 2131891559;
+        int i = isStreaming ? R.string.stop_streaming : R.string.mobile_stream_screen_share;
         ImageView imageView = this.binding.p;
         m.checkNotNullExpressionValue(imageView, "binding.screenShareButton");
         int i2 = 0;
         imageView.setVisibility(z4 && z2 ? 0 : 8);
-        int i3 = isStreaming ? 2131231805 : 2131231804;
-        int i4 = isStreaming ? -16777216 : -1;
+        int i3 = isStreaming ? R.drawable.ic_mobile_screenshare_end_24dp : R.drawable.ic_mobile_screenshare_24dp;
+        int i4 = isStreaming ? ViewCompat.MEASURED_STATE_MASK : -1;
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
         int defaultButtonBackgroundTint = getDefaultButtonBackgroundTint(context, isStreaming);
@@ -310,7 +312,7 @@ public final class VoiceControlsSheetView extends LinearLayout {
             i = 8;
         }
         imageView.setVisibility(i);
-        int i2 = z4 ? -16777216 : -1;
+        int i2 = z4 ? ViewCompat.MEASURED_STATE_MASK : -1;
         ImageView imageView2 = this.binding.w;
         m.checkNotNullExpressionValue(imageView2, "binding.videoButton");
         imageView2.setImageTintList(ColorStateList.valueOf(i2));
@@ -325,20 +327,20 @@ public final class VoiceControlsSheetView extends LinearLayout {
 
     private final int getDefaultButtonBackgroundTint(Context context, boolean z2) {
         if (z2) {
-            return ColorCompat.getColor(context, 2131100433);
+            return ColorCompat.getColor(context, (int) R.color.white);
         }
         if (!z2) {
-            return ColorCompat.getColor(context, 2131100468);
+            return ColorCompat.getColor(context, (int) R.color.white_alpha_24);
         }
         throw new NoWhenBranchMatchedException();
     }
 
     private final int getDefaultButtonIconTint(Context context, boolean z2) {
         if (!z2) {
-            return ColorCompat.getColor(context, 2131100433);
+            return ColorCompat.getColor(context, (int) R.color.white);
         }
         TypedValue typedValue = new TypedValue();
-        context.getTheme().resolveAttribute(2130968761, typedValue, true);
+        context.getTheme().resolveAttribute(R.attr.call_controls_active_button_icon_color, typedValue, true);
         return ColorCompat.getColor(context, typedValue.resourceId);
     }
 
@@ -368,7 +370,7 @@ public final class VoiceControlsSheetView extends LinearLayout {
             i2 = 8;
             materialTextView.setVisibility(8);
             ImageView imageView2 = this.binding.g;
-            imageView2.setImageResource(stageRoles == null ? 2131231485 : 2131232006);
+            imageView2.setImageResource(stageRoles == null ? R.drawable.ic_call_disconnect_24dp : R.drawable.ic_stage_leave_20dp);
             imageView2.setVisibility(z7 ? 0 : 8);
             imageView2.setOnClickListener(new VoiceControlsSheetView$configureUI$$inlined$apply$lambda$2(stageRoles, z7, function02));
             m.checkNotNullExpressionValue(imageView2, "binding.disconnectButton…sconnectClick() }\n      }");
@@ -390,7 +392,7 @@ public final class VoiceControlsSheetView extends LinearLayout {
         button.setVisibility(i2);
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.deafenSecondaryButton");
-        b.n(textView, z4 ? 2131894496 : 2131888065, new Object[0], null, 4);
+        b.n(textView, z4 ? R.string.undeafen : R.string.deafen, new Object[0], null, 4);
         this.binding.f.setOnClickListener(new VoiceControlsSheetView$configureUI$4(function08));
         TextView textView2 = this.binding.f;
         m.checkNotNullExpressionValue(textView2, "binding.deafenSecondaryButton");
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java
index 4e8b0bd64c..4512a7e9d1 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.voice.controls;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetScreenShareNfxSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetScreenShareNfxSheet$binding$2 extends k
 
     public final WidgetScreenShareNfxSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364748;
-        TextView textView = (TextView) view.findViewById(2131364748);
+        int i = R.id.screen_share_nfx_cancel_button;
+        TextView textView = (TextView) view.findViewById(R.id.screen_share_nfx_cancel_button);
         if (textView != null) {
-            i = 2131364749;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364749);
+            i = R.id.screen_share_nfx_cta;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.screen_share_nfx_cta);
             if (materialButton != null) {
                 return new WidgetScreenShareNfxSheetBinding((NestedScrollView) view, textView, materialButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
index e87504a18e..f0ed107cde 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
@@ -8,6 +8,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetScreenShareNfxSheetBinding;
 import com.discord.utilities.cache.SharedPreferencesProvider;
@@ -51,7 +52,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet {
             WidgetScreenShareNfxSheet widgetScreenShareNfxSheet = new WidgetScreenShareNfxSheet();
             Bundle bundle = new Bundle();
             bundle.putLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", j);
-            bundle.putSerializable("ARG_VOICE_BOTTOM_SHEET_PARAMS", voiceBottomSheetParams);
+            bundle.putSerializable(WidgetScreenShareNfxSheet.ARG_VOICE_BOTTOM_SHEET_PARAMS, voiceBottomSheetParams);
             widgetScreenShareNfxSheet.setArguments(bundle);
             widgetScreenShareNfxSheet.show(fragmentManager, WidgetScreenShareNfxSheet.class.getName());
             SharedPreferences.Editor edit = SharedPreferencesProvider.INSTANCE.get().edit();
@@ -157,7 +158,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet {
     }
 
     private final VoiceBottomSheetParams getVoiceBottomSheetParams() {
-        return (VoiceBottomSheetParams) requireArguments().getSerializable("ARG_VOICE_BOTTOM_SHEET_PARAMS");
+        return (VoiceBottomSheetParams) requireArguments().getSerializable(ARG_VOICE_BOTTOM_SHEET_PARAMS);
     }
 
     private final void maybeNavigateToVoiceBottomSheet() {
@@ -172,7 +173,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559177;
+        return R.layout.widget_screen_share_nfx_sheet;
     }
 
     @Override // androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java
index 216159e68f..b7595fb79f 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java
@@ -1,33 +1,34 @@
 package com.discord.widgets.voice.feedback;
 
 import androidx.annotation.StringRes;
+import com.discord.R;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 /* compiled from: FeedbackIssue.kt */
 public enum FeedbackIssue implements MGRecyclerDataPayload {
-    OTHER(2131887132),
-    COULD_NOT_HEAR_AUDIO(2131887129),
-    NOBODY_COULD_HEAR_ME(2131887131),
-    AUDIO_ECHOS(2131887125),
-    AUDIO_ROBOTIC(2131887126),
-    AUDIO_CUT_IN_AND_OUT(2131887124),
-    VOLUME_TOO_LOW_OR_HIGH(2131887128),
-    BACKGROUND_NOISE_TOO_LOUD(2131887127),
-    SPEAKERPHONE_ISSUE(2131887133),
-    HEADSET_OR_BLUETOOTH_ISSUE(2131887130),
-    STREAM_REPORT_ENDED_BLACK(2131894061),
-    STREAM_REPORT_ENDED_BLURRY(2131894062),
-    STREAM_REPORT_ENDED_LAGGING(2131894063),
-    STREAM_REPORT_ENDED_OUT_OF_SYNC(2131894064),
-    STREAM_REPORT_ENDED_AUDIO_MISSING(2131894059),
-    STREAM_REPORT_ENDED_AUDIO_POOR(2131894060),
-    STREAM_REPORT_ENDED_STREAM_STOPPED_UNEXPECTEDLY(2131894065),
-    GUILD_DELETE_TOO_HARD(2131889248),
-    GUILD_DELETE_TEST(2131889247),
-    GUILD_DELETE_ACCIDENT(2131889239),
-    GUILD_DELETE_TEMPLATE(2131889246),
-    GUILD_DELETE_LONELY(2131889243),
-    GUILD_DELETE_INACTIVE(2131889242),
-    GUILD_DELETE_OTHER(2131889244);
+    OTHER(R.string.call_feedback_option_other),
+    COULD_NOT_HEAR_AUDIO(R.string.call_feedback_option_could_not_hear_audio),
+    NOBODY_COULD_HEAR_ME(R.string.call_feedback_option_nobody_could_hear_me),
+    AUDIO_ECHOS(R.string.call_feedback_option_audio_echos),
+    AUDIO_ROBOTIC(R.string.call_feedback_option_audio_robotic),
+    AUDIO_CUT_IN_AND_OUT(R.string.call_feedback_option_audio_cut),
+    VOLUME_TOO_LOW_OR_HIGH(R.string.call_feedback_option_bad_volume),
+    BACKGROUND_NOISE_TOO_LOUD(R.string.call_feedback_option_background_noise),
+    SPEAKERPHONE_ISSUE(R.string.call_feedback_option_speakerphone),
+    HEADSET_OR_BLUETOOTH_ISSUE(R.string.call_feedback_option_headset),
+    STREAM_REPORT_ENDED_BLACK(R.string.stream_report_ended_black),
+    STREAM_REPORT_ENDED_BLURRY(R.string.stream_report_ended_blurry),
+    STREAM_REPORT_ENDED_LAGGING(R.string.stream_report_ended_lagging),
+    STREAM_REPORT_ENDED_OUT_OF_SYNC(R.string.stream_report_ended_out_of_sync),
+    STREAM_REPORT_ENDED_AUDIO_MISSING(R.string.stream_report_ended_audio_missing),
+    STREAM_REPORT_ENDED_AUDIO_POOR(R.string.stream_report_ended_audio_poor),
+    STREAM_REPORT_ENDED_STREAM_STOPPED_UNEXPECTEDLY(R.string.stream_report_ended_stream_stopped_unexpectedly),
+    GUILD_DELETE_TOO_HARD(R.string.guild_delete_feedback_too_hard),
+    GUILD_DELETE_TEST(R.string.guild_delete_feedback_test),
+    GUILD_DELETE_ACCIDENT(R.string.guild_delete_feedback_accident),
+    GUILD_DELETE_TEMPLATE(R.string.guild_delete_feedback_template),
+    GUILD_DELETE_LONELY(R.string.guild_delete_feedback_lonely),
+    GUILD_DELETE_INACTIVE(R.string.guild_delete_feedback_inactive),
+    GUILD_DELETE_OTHER(R.string.guild_delete_feedback_other);
     
     private final String key = String.valueOf(hashCode());
     private final int reasonStringRes;
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java
index cabd62b318..f324c6443c 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java
@@ -13,6 +13,7 @@ import androidx.annotation.LayoutRes;
 import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.databinding.FeedbackViewBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
@@ -77,7 +78,7 @@ public final class FeedbackView extends LinearLayout {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<IssuesAdapter, FeedbackIssue> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new IssueViewHolder(2131558666, this);
+            return new IssueViewHolder(R.layout.selectable_list_item, this);
         }
 
         public final void setOnIssueClick(Function1<? super FeedbackIssue, Unit> function1) {
@@ -91,31 +92,31 @@ public final class FeedbackView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558505, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(R.layout.feedback_view, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131363262;
-        ImageButton imageButton = (ImageButton) inflate.findViewById(2131363262);
+        int i = R.id.feedback_happy_rating;
+        ImageButton imageButton = (ImageButton) inflate.findViewById(R.id.feedback_happy_rating);
         if (imageButton != null) {
-            i = 2131363263;
-            TextView textView = (TextView) inflate.findViewById(2131363263);
+            i = R.id.feedback_issue_section_header;
+            TextView textView = (TextView) inflate.findViewById(R.id.feedback_issue_section_header);
             if (textView != null) {
-                i = 2131363264;
-                CardView cardView = (CardView) inflate.findViewById(2131363264);
+                i = R.id.feedback_issues_card;
+                CardView cardView = (CardView) inflate.findViewById(R.id.feedback_issues_card);
                 if (cardView != null) {
-                    i = 2131363265;
-                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363265);
+                    i = R.id.feedback_issues_recycler;
+                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(R.id.feedback_issues_recycler);
                     if (recyclerView != null) {
-                        i = 2131363266;
-                        ImageButton imageButton2 = (ImageButton) inflate.findViewById(2131363266);
+                        i = R.id.feedback_neutral_rating;
+                        ImageButton imageButton2 = (ImageButton) inflate.findViewById(R.id.feedback_neutral_rating);
                         if (imageButton2 != null) {
-                            i = 2131363267;
-                            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363267);
+                            i = R.id.feedback_rating_container;
+                            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(R.id.feedback_rating_container);
                             if (constraintLayout != null) {
-                                i = 2131363268;
-                                TextView textView2 = (TextView) inflate.findViewById(2131363268);
+                                i = R.id.feedback_rating_summary_prompt;
+                                TextView textView2 = (TextView) inflate.findViewById(R.id.feedback_rating_summary_prompt);
                                 if (textView2 != null) {
-                                    i = 2131363269;
-                                    ImageView imageView = (ImageView) inflate.findViewById(2131363269);
+                                    i = R.id.feedback_sad_rating;
+                                    ImageView imageView = (ImageView) inflate.findViewById(R.id.feedback_sad_rating);
                                     if (imageView != null) {
                                         FeedbackViewBinding feedbackViewBinding = new FeedbackViewBinding((LinearLayout) inflate, imageButton, textView, cardView, recyclerView, imageButton2, constraintLayout, textView2, imageView);
                                         m.checkNotNullExpressionValue(feedbackViewBinding, "FeedbackViewBinding.infl…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java
index 7e5c33b21c..18ded0a3e8 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.feedback;
 
 import android.view.View;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetIssueDetailsFormBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.google.android.material.button.MaterialButton;
@@ -19,14 +20,14 @@ public final /* synthetic */ class WidgetIssueDetailsForm$binding$2 extends k im
 
     public final WidgetIssueDetailsFormBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363847;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363847);
+        int i = R.id.issue_details_cx_prompt;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.issue_details_cx_prompt);
         if (linkifiedTextView != null) {
-            i = 2131363848;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363848);
+            i = R.id.issue_details_input;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.issue_details_input);
             if (textInputLayout != null) {
-                i = 2131363849;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363849);
+                i = R.id.issue_details_submit_button;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.issue_details_submit_button);
                 if (materialButton != null) {
                     return new WidgetIssueDetailsFormBinding((NestedScrollView) view, linkifiedTextView, textInputLayout, materialButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBoundOrOnResume$1.java
index 6d18d4a2df..22076e633f 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBoundOrOnResume$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.feedback;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.voice.feedback.IssueDetailsFormViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetIssueDetailsForm$onViewBoundOrOnResume$1 extends o impl
     }
 
     public final void invoke(IssueDetailsFormViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetIssueDetailsForm.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java
index 83a670dc66..8c23d182f4 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java
@@ -12,6 +12,7 @@ import c.a.e.l;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetIssueDetailsFormBinding;
@@ -54,14 +55,14 @@ public final class WidgetIssueDetailsForm extends AppFragment {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(pendingFeedback, "pendingFeedback");
             Intent intent = new Intent();
-            intent.putExtra("ARG_PENDING_VOICE_FEEDBACK", pendingFeedback);
-            intent.putExtra("ARG_SHOW_CX_PROMPT", z2);
+            intent.putExtra(WidgetIssueDetailsForm.ARG_PENDING_VOICE_FEEDBACK, pendingFeedback);
+            intent.putExtra(WidgetIssueDetailsForm.ARG_SHOW_CX_PROMPT, z2);
             l.d(context, WidgetIssueDetailsForm.class, intent);
         }
     }
 
     public WidgetIssueDetailsForm() {
-        super(2131559126);
+        super(R.layout.widget_issue_details_form);
         WidgetIssueDetailsForm$viewModel$2 widgetIssueDetailsForm$viewModel$2 = new WidgetIssueDetailsForm$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(IssueDetailsFormViewModel.class), new WidgetIssueDetailsForm$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetIssueDetailsForm$viewModel$2));
@@ -88,7 +89,7 @@ public final class WidgetIssueDetailsForm extends AppFragment {
     }
 
     private final PendingFeedback getPendingFeedback() {
-        Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("ARG_PENDING_VOICE_FEEDBACK");
+        Serializable serializableExtra = getMostRecentIntent().getSerializableExtra(ARG_PENDING_VOICE_FEEDBACK);
         Objects.requireNonNull(serializableExtra, "null cannot be cast to non-null type com.discord.widgets.voice.feedback.PendingFeedback");
         return (PendingFeedback) serializableExtra;
     }
@@ -99,7 +100,7 @@ public final class WidgetIssueDetailsForm extends AppFragment {
 
     private final void handleEvent(IssueDetailsFormViewModel.Event event) {
         if (m.areEqual(event, IssueDetailsFormViewModel.Event.Close.INSTANCE)) {
-            o.i(this, 2131887122, 0, 4);
+            o.i(this, R.string.call_feedback_confirmation, 0, 4);
             AppActivity appActivity = getAppActivity();
             if (appActivity != null) {
                 appActivity.hideKeyboard(getBinding().f1856c);
@@ -109,14 +110,14 @@ public final class WidgetIssueDetailsForm extends AppFragment {
     }
 
     private final boolean shouldShowCxPrompt() {
-        return getMostRecentIntent().getBooleanExtra("ARG_SHOW_CX_PROMPT", false);
+        return getMostRecentIntent().getBooleanExtra(ARG_SHOW_CX_PROMPT, false);
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarTitle(2131888535);
+        setActionBarTitle(R.string.feedback_modal_title);
         MaterialButton materialButton = getBinding().d;
         m.checkNotNullExpressionValue(materialButton, "binding.issueDetailsSubmitButton");
         materialButton.setEnabled(false);
@@ -132,7 +133,7 @@ public final class WidgetIssueDetailsForm extends AppFragment {
         linkifiedTextView.setVisibility(shouldShowCxPrompt() ? 0 : 8);
         LinkifiedTextView linkifiedTextView2 = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.issueDetailsCxPrompt");
-        b.n(linkifiedTextView2, 2131888536, new Object[]{f.c()}, null, 4);
+        b.n(linkifiedTextView2, R.string.feedback_need_more_help, new Object[]{f.c()}, null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetNavigator.java b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetNavigator.java
index baa8275723..751be462b1 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetNavigator.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetNavigator.java
@@ -37,7 +37,7 @@ public final class CallFeedbackSheetNavigator {
         WidgetFeedbackSheet newInstance = WidgetFeedbackSheet.Companion.newInstance(WidgetFeedbackSheet.FeedbackType.CALL);
         Bundle arguments = newInstance.getArguments();
         m.checkNotNull(arguments);
-        arguments.putParcelable("ARG_CONFIG", config);
+        arguments.putParcelable(WidgetFeedbackSheet.ARG_CALL_FEEDBACK_CONFIG, config);
         newInstance.show(fragmentManager, WidgetFeedbackSheet.class.getName());
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
index 8b0bfa09ca..75229a72ea 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
@@ -6,6 +6,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.VisibleForTesting;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.stores.StoreAnalytics;
 import com.discord.stores.StoreExperiments;
@@ -337,7 +338,7 @@ public final class CallFeedbackSheetViewModel extends AppViewModel<FeedbackSheet
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public CallFeedbackSheetViewModel(Config config, StoreAnalytics storeAnalytics, StoreExperiments storeExperiments, Observable<StoreState> observable) {
-        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131887138, 2131887134, 2131887123));
+        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), R.string.call_feedback_sheet_title, Integer.valueOf((int) R.string.call_feedback_prompt), R.string.call_feedback_issue_section_header));
         m.checkNotNullParameter(config, "config");
         m.checkNotNullParameter(storeAnalytics, "storeAnalytics");
         m.checkNotNullParameter(storeExperiments, "storeExperiments");
@@ -376,7 +377,7 @@ public final class CallFeedbackSheetViewModel extends AppViewModel<FeedbackSheet
     }
 
     private final FeedbackSheetViewModel.ViewState createViewState(FeedbackRating feedbackRating, List<? extends FeedbackIssue> list) {
-        return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131887138, 2131887134, 2131887123);
+        return new FeedbackSheetViewModel.ViewState(feedbackRating, list, R.string.call_feedback_sheet_title, Integer.valueOf((int) R.string.call_feedback_prompt), R.string.call_feedback_issue_section_header);
     }
 
     private final void emitSubmittedEvent(boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetNavigator.java b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetNavigator.java
index 0745d62d4d..76447197bb 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetNavigator.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetNavigator.java
@@ -35,8 +35,8 @@ public final class StreamFeedbackSheetNavigator {
         WidgetFeedbackSheet newInstance = WidgetFeedbackSheet.Companion.newInstance(WidgetFeedbackSheet.FeedbackType.STREAM);
         Bundle arguments = newInstance.getArguments();
         m.checkNotNull(arguments);
-        arguments.putString("ARG_STREAM_FEEDBACK_STREAM_KEY ", str);
-        arguments.putString("ARG_STREAM_FEEDBACK_MEDIA_SESSION_ID", str2);
+        arguments.putString(WidgetFeedbackSheet.ARG_STREAM_FEEDBACK_STREAM_KEY, str);
+        arguments.putString(WidgetFeedbackSheet.ARG_STREAM_FEEDBACK_MEDIA_SESSION_ID, str2);
         newInstance.show(fragmentManager, WidgetFeedbackSheet.class.getName());
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
index c5e5d774a3..67e0188364 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.feedback.stream;
 
 import android.content.Context;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelApplicationStream;
 import com.discord.stores.StoreAnalytics;
@@ -158,7 +159,7 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel<FeedbackShe
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StreamFeedbackSheetViewModel(String str, String str2, StoreExperiments storeExperiments, StoreAnalytics storeAnalytics, Observable<StoreState> observable) {
-        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131894054, 2131894076, 2131894070));
+        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), R.string.stream_report_a_problem_post_stream, Integer.valueOf((int) R.string.stream_report_rating_body), R.string.stream_report_placeholder));
         m.checkNotNullParameter(str, "streamKey");
         m.checkNotNullParameter(storeExperiments, "storeExperiments");
         m.checkNotNullParameter(storeAnalytics, "storeAnalytics");
@@ -193,7 +194,7 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel<FeedbackShe
     }
 
     private final FeedbackSheetViewModel.ViewState createViewState(FeedbackRating feedbackRating, List<? extends FeedbackIssue> list) {
-        return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131894054, 2131894076, 2131894070);
+        return new FeedbackSheetViewModel.ViewState(feedbackRating, list, R.string.stream_report_a_problem_post_stream, Integer.valueOf((int) R.string.stream_report_rating_body), R.string.stream_report_placeholder);
     }
 
     private final void emitSubmittedEvent(boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java
index f0343de169..4025718e8f 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java
@@ -14,6 +14,7 @@ import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.g4;
 import c.a.j.h4;
+import com.discord.R;
 import com.discord.databinding.WidgetCallFullscreenBinding;
 import com.discord.views.calls.StageCallVisitCommunityView;
 import com.discord.views.calls.VideoCallParticipantView;
@@ -37,111 +38,111 @@ public final /* synthetic */ class WidgetCallFullscreen$binding$2 extends k impl
 
     public final WidgetCallFullscreenBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131361871;
-        Toolbar toolbar = (Toolbar) view.findViewById(2131361871);
+        int i = R.id.action_bar_toolbar;
+        Toolbar toolbar = (Toolbar) view.findViewById(R.id.action_bar_toolbar);
         if (toolbar != null) {
-            i = 2131361872;
-            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131361872);
+            i = R.id.action_bar_toolbar_layout;
+            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.action_bar_toolbar_layout);
             if (appBarLayout != null) {
-                i = 2131361873;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131361873);
+                i = R.id.action_bar_underlay;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.action_bar_underlay);
                 if (relativeLayout != null) {
-                    i = 2131362004;
-                    View findViewById = view.findViewById(2131362004);
+                    i = R.id.audio_share;
+                    View findViewById = view.findViewById(R.id.audio_share);
                     if (findViewById != null) {
                         g4 g4Var = new g4(findViewById, findViewById);
-                        Barrier barrier = (Barrier) view.findViewById(2131362217);
+                        Barrier barrier = (Barrier) view.findViewById(R.id.call_audio_share_warning_barrier);
                         if (barrier != null) {
                             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                            CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view.findViewById(2131362219);
+                            CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view.findViewById(R.id.call_controls_sheet_container);
                             if (coordinatorLayout != null) {
-                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362220);
+                                MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.call_floating_push_to_talk);
                                 if (materialButton != null) {
-                                    TextView textView = (TextView) view.findViewById(2131362221);
+                                    TextView textView = (TextView) view.findViewById(R.id.call_fullscreen_mentions);
                                     if (textView != null) {
-                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131362222);
+                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(R.id.call_non_video_container);
                                         if (constraintLayout2 != null) {
-                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362223);
+                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.call_participants_hidden);
                                             if (linearLayout != null) {
-                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362224);
+                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.call_participants_show_button);
                                                 if (materialButton2 != null) {
-                                                    VideoCallParticipantView videoCallParticipantView = (VideoCallParticipantView) view.findViewById(2131362225);
+                                                    VideoCallParticipantView videoCallParticipantView = (VideoCallParticipantView) view.findViewById(R.id.call_pip);
                                                     if (videoCallParticipantView != null) {
-                                                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362226);
+                                                        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.call_stage_recycler);
                                                         if (recyclerView != null) {
-                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362227);
+                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(R.id.call_stop_streaming_button);
                                                             if (materialButton3 != null) {
-                                                                ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131362228);
+                                                                ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(R.id.call_streaming_active);
                                                                 if (constraintLayout3 != null) {
-                                                                    TextView textView2 = (TextView) view.findViewById(2131362229);
+                                                                    TextView textView2 = (TextView) view.findViewById(R.id.call_streaming_active_body);
                                                                     if (textView2 != null) {
-                                                                        TextView textView3 = (TextView) view.findViewById(2131362230);
+                                                                        TextView textView3 = (TextView) view.findViewById(R.id.call_streaming_active_header);
                                                                         if (textView3 != null) {
-                                                                            ImageView imageView = (ImageView) view.findViewById(2131362231);
+                                                                            ImageView imageView = (ImageView) view.findViewById(R.id.call_streaming_active_illustration);
                                                                             if (imageView != null) {
-                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362233);
+                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(R.id.call_video_recycler);
                                                                                 if (recyclerView2 != null) {
-                                                                                    StageCallVisitCommunityView stageCallVisitCommunityView = (StageCallVisitCommunityView) view.findViewById(2131362234);
+                                                                                    StageCallVisitCommunityView stageCallVisitCommunityView = (StageCallVisitCommunityView) view.findViewById(R.id.call_visit_community);
                                                                                     if (stageCallVisitCommunityView != null) {
-                                                                                        View findViewById2 = view.findViewById(2131364552);
+                                                                                        View findViewById2 = view.findViewById(R.id.private_call);
                                                                                         if (findViewById2 != null) {
-                                                                                            int i2 = 2131364553;
-                                                                                            PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) findViewById2.findViewById(2131364553);
+                                                                                            int i2 = R.id.private_call_blurred_grid_view;
+                                                                                            PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) findViewById2.findViewById(R.id.private_call_blurred_grid_view);
                                                                                             if (privateCallBlurredGridView != null) {
-                                                                                                i2 = 2131364554;
-                                                                                                TextView textView4 = (TextView) findViewById2.findViewById(2131364554);
+                                                                                                i2 = R.id.private_call_connectivity_status_bar;
+                                                                                                TextView textView4 = (TextView) findViewById2.findViewById(R.id.private_call_connectivity_status_bar);
                                                                                                 if (textView4 != null) {
                                                                                                     RelativeLayout relativeLayout2 = (RelativeLayout) findViewById2;
-                                                                                                    i2 = 2131364556;
-                                                                                                    LinearLayout linearLayout2 = (LinearLayout) findViewById2.findViewById(2131364556);
+                                                                                                    i2 = R.id.private_call_container_content;
+                                                                                                    LinearLayout linearLayout2 = (LinearLayout) findViewById2.findViewById(R.id.private_call_container_content);
                                                                                                     if (linearLayout2 != null) {
-                                                                                                        i2 = 2131364557;
-                                                                                                        PrivateCallGridView privateCallGridView = (PrivateCallGridView) findViewById2.findViewById(2131364557);
+                                                                                                        i2 = R.id.private_call_grid_view;
+                                                                                                        PrivateCallGridView privateCallGridView = (PrivateCallGridView) findViewById2.findViewById(R.id.private_call_grid_view);
                                                                                                         if (privateCallGridView != null) {
-                                                                                                            i2 = 2131364558;
-                                                                                                            TextView textView5 = (TextView) findViewById2.findViewById(2131364558);
+                                                                                                            i2 = R.id.private_call_status_duration;
+                                                                                                            TextView textView5 = (TextView) findViewById2.findViewById(R.id.private_call_status_duration);
                                                                                                             if (textView5 != null) {
-                                                                                                                i2 = 2131364559;
-                                                                                                                TextView textView6 = (TextView) findViewById2.findViewById(2131364559);
+                                                                                                                i2 = R.id.private_call_status_primary;
+                                                                                                                TextView textView6 = (TextView) findViewById2.findViewById(R.id.private_call_status_primary);
                                                                                                                 if (textView6 != null) {
-                                                                                                                    i2 = 2131364560;
-                                                                                                                    TextView textView7 = (TextView) findViewById2.findViewById(2131364560);
+                                                                                                                    i2 = R.id.private_call_status_secondary;
+                                                                                                                    TextView textView7 = (TextView) findViewById2.findViewById(R.id.private_call_status_secondary);
                                                                                                                     if (textView7 != null) {
                                                                                                                         h4 h4Var = new h4(relativeLayout2, privateCallBlurredGridView, textView4, relativeLayout2, linearLayout2, privateCallGridView, textView5, textView6, textView7);
-                                                                                                                        ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131365215);
+                                                                                                                        ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(R.id.stage_call_speaking_chip);
                                                                                                                         if (constraintLayout4 != null) {
-                                                                                                                            UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131365216);
+                                                                                                                            UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(R.id.stage_call_speaking_user_summary);
                                                                                                                             if (userSummaryView != null) {
-                                                                                                                                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131365217);
+                                                                                                                                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(R.id.stage_call_speaking_user_summary_label);
                                                                                                                                 if (materialTextView != null) {
-                                                                                                                                    ViewStub viewStub = (ViewStub) view.findViewById(2131365290);
+                                                                                                                                    ViewStub viewStub = (ViewStub) view.findViewById(R.id.start_stage_event_button_stub);
                                                                                                                                     if (viewStub != null) {
-                                                                                                                                        Barrier barrier2 = (Barrier) view.findViewById(2131365576);
+                                                                                                                                        Barrier barrier2 = (Barrier) view.findViewById(R.id.top_of_ui);
                                                                                                                                         if (barrier2 != null) {
-                                                                                                                                            VoiceControlsSheetView voiceControlsSheetView = (VoiceControlsSheetView) view.findViewById(2131365823);
+                                                                                                                                            VoiceControlsSheetView voiceControlsSheetView = (VoiceControlsSheetView) view.findViewById(R.id.voice_controls_sheet_view);
                                                                                                                                             if (voiceControlsSheetView != null) {
-                                                                                                                                                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365896);
+                                                                                                                                                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(R.id.widget_global_status);
                                                                                                                                                 if (fragmentContainerView != null) {
                                                                                                                                                     return new WidgetCallFullscreenBinding(constraintLayout, toolbar, appBarLayout, relativeLayout, g4Var, barrier, constraintLayout, coordinatorLayout, materialButton, textView, constraintLayout2, linearLayout, materialButton2, videoCallParticipantView, recyclerView, materialButton3, constraintLayout3, textView2, textView3, imageView, recyclerView2, stageCallVisitCommunityView, h4Var, constraintLayout4, userSummaryView, materialTextView, viewStub, barrier2, voiceControlsSheetView, fragmentContainerView);
                                                                                                                                                 }
-                                                                                                                                                i = 2131365896;
+                                                                                                                                                i = R.id.widget_global_status;
                                                                                                                                             } else {
-                                                                                                                                                i = 2131365823;
+                                                                                                                                                i = R.id.voice_controls_sheet_view;
                                                                                                                                             }
                                                                                                                                         } else {
-                                                                                                                                            i = 2131365576;
+                                                                                                                                            i = R.id.top_of_ui;
                                                                                                                                         }
                                                                                                                                     } else {
-                                                                                                                                        i = 2131365290;
+                                                                                                                                        i = R.id.start_stage_event_button_stub;
                                                                                                                                     }
                                                                                                                                 } else {
-                                                                                                                                    i = 2131365217;
+                                                                                                                                    i = R.id.stage_call_speaking_user_summary_label;
                                                                                                                                 }
                                                                                                                             } else {
-                                                                                                                                i = 2131365216;
+                                                                                                                                i = R.id.stage_call_speaking_user_summary;
                                                                                                                             }
                                                                                                                         } else {
-                                                                                                                            i = 2131365215;
+                                                                                                                            i = R.id.stage_call_speaking_chip;
                                                                                                                         }
                                                                                                                     }
                                                                                                                 }
@@ -152,54 +153,54 @@ public final /* synthetic */ class WidgetCallFullscreen$binding$2 extends k impl
                                                                                             }
                                                                                             throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i2)));
                                                                                         }
-                                                                                        i = 2131364552;
+                                                                                        i = R.id.private_call;
                                                                                     } else {
-                                                                                        i = 2131362234;
+                                                                                        i = R.id.call_visit_community;
                                                                                     }
                                                                                 } else {
-                                                                                    i = 2131362233;
+                                                                                    i = R.id.call_video_recycler;
                                                                                 }
                                                                             } else {
-                                                                                i = 2131362231;
+                                                                                i = R.id.call_streaming_active_illustration;
                                                                             }
                                                                         } else {
-                                                                            i = 2131362230;
+                                                                            i = R.id.call_streaming_active_header;
                                                                         }
                                                                     } else {
-                                                                        i = 2131362229;
+                                                                        i = R.id.call_streaming_active_body;
                                                                     }
                                                                 } else {
-                                                                    i = 2131362228;
+                                                                    i = R.id.call_streaming_active;
                                                                 }
                                                             } else {
-                                                                i = 2131362227;
+                                                                i = R.id.call_stop_streaming_button;
                                                             }
                                                         } else {
-                                                            i = 2131362226;
+                                                            i = R.id.call_stage_recycler;
                                                         }
                                                     } else {
-                                                        i = 2131362225;
+                                                        i = R.id.call_pip;
                                                     }
                                                 } else {
-                                                    i = 2131362224;
+                                                    i = R.id.call_participants_show_button;
                                                 }
                                             } else {
-                                                i = 2131362223;
+                                                i = R.id.call_participants_hidden;
                                             }
                                         } else {
-                                            i = 2131362222;
+                                            i = R.id.call_non_video_container;
                                         }
                                     } else {
-                                        i = 2131362221;
+                                        i = R.id.call_fullscreen_mentions;
                                     }
                                 } else {
-                                    i = 2131362220;
+                                    i = R.id.call_floating_push_to_talk;
                                 }
                             } else {
-                                i = 2131362219;
+                                i = R.id.call_controls_sheet_container;
                             }
                         } else {
-                            i = 2131362217;
+                            i = R.id.call_audio_share_warning_barrier;
                         }
                     }
                 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.java
index 1ba1bd4d63..1a21468c01 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureConnectionStatusText$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.fullscreen;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetCallFullscreen$configureConnectionStatusText$2 extends
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetCallFullscreen.access$setConnectedTimerSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
index 07efaf27c3..d7bb06a142 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.voice.fullscreen;
 import android.content.Context;
 import android.view.MenuItem;
 import androidx.fragment.app.FragmentManager;
+import com.discord.R;
 import com.discord.utilities.streams.StreamContext;
 import com.discord.utilities.voice.DiscordOverlayService;
 import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel;
@@ -51,21 +52,21 @@ public final class WidgetCallFullscreen$configureMenu$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131364075:
+            case R.id.menu_call_overlay_launcher /* 2131364075 */:
                 DiscordOverlayService.Companion companion = DiscordOverlayService.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launchForConnect(context);
                 return;
-            case 2131364076:
+            case R.id.menu_call_switch_camera /* 2131364076 */:
                 WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed();
                 return;
-            case 2131364077:
+            case R.id.menu_call_video_list /* 2131364077 */:
                 WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
                 companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().h(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this));
                 return;
-            case 2131364078:
+            case R.id.menu_call_voice_settings /* 2131364078 */:
                 WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion;
                 Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().h());
                 FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java
index 31c14fafe5..9869919d62 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.fullscreen;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel;
 import d0.z.d.m;
 import rx.functions.Action1;
@@ -14,16 +15,16 @@ public final class WidgetCallFullscreen$configureMenu$2<T> implements Action1<Me
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131364076);
+        MenuItem findItem = menu.findItem(R.id.menu_call_switch_camera);
         m.checkNotNullExpressionValue(findItem, "switchCameraMenuItem");
         findItem.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.SWITCH_CAMERA));
-        MenuItem findItem2 = menu.findItem(2131364078);
+        MenuItem findItem2 = menu.findItem(R.id.menu_call_voice_settings);
         m.checkNotNullExpressionValue(findItem2, "voiceSettingsMenuItem");
         findItem2.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.VOICE_SETTINGS));
-        MenuItem findItem3 = menu.findItem(2131364075);
+        MenuItem findItem3 = menu.findItem(R.id.menu_call_overlay_launcher);
         m.checkNotNullExpressionValue(findItem3, "overlayLauncherMenuItem");
         findItem3.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.LAUNCH_OVERLAY));
-        MenuItem findItem4 = menu.findItem(2131364077);
+        MenuItem findItem4 = menu.findItem(R.id.menu_call_video_list);
         m.checkNotNullExpressionValue(findItem4, "listMenuItem");
         findItem4.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.SHOW_PARTICIPANT_LIST));
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java
index f5a781dd1d..7b38cab790 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureStageUi$4.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.fullscreen;
 
 import android.graphics.Typeface;
 import android.text.style.ForegroundColorSpan;
+import com.discord.R;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.utilities.color.ColorCompat;
@@ -36,11 +37,11 @@ public final class WidgetCallFullscreen$configureStageUi$4 extends o implements
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            Typeface themedFont = FontUtils.INSTANCE.getThemedFont(this.this$0.this$0.requireContext(), 2130969328);
+            Typeface themedFont = FontUtils.INSTANCE.getThemedFont(this.this$0.this$0.requireContext(), R.attr.font_primary_semibold);
             if (themedFont != null) {
                 hook.a.add(new TypefaceSpanCompat(themedFont));
             }
-            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), 2130969877)));
+            hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), (int) R.attr.primary_000)));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.java
index b49bf4fc6c..adfb06c945 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$1.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.WindowInsetsCompat;
+import com.discord.R;
 import d0.z.d.m;
 import java.util.Objects;
 /* compiled from: WidgetCallFullscreen.kt */
@@ -20,7 +21,7 @@ public final class WidgetCallFullscreen$initializeSystemUiListeners$1 implements
         WidgetCallFullscreen.access$setVoiceControlsSheetPeekHeight(this.this$0);
         m.checkNotNullExpressionValue(view, "view");
         m.checkNotNullExpressionValue(windowInsetsCompat, "insets");
-        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), this.this$0.getResources().getDimensionPixelSize(2131165786) + windowInsetsCompat.getSystemWindowInsetBottom());
+        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), this.this$0.getResources().getDimensionPixelSize(R.dimen.voice_controls_sheet_bottom_padding) + windowInsetsCompat.getSystemWindowInsetBottom());
         ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
         Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams");
         ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) layoutParams;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java
index 1a691339ff..0ca34a3d42 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java
@@ -8,6 +8,7 @@ import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.R;
 import com.discord.widgets.voice.fullscreen.grid.VideoCallGridAdapter;
 import com.google.android.material.appbar.AppBarLayout;
 import d0.z.d.m;
@@ -44,7 +45,7 @@ public final class WidgetCallFullscreen$initializeSystemUiListeners$5 implements
         ViewCompat.dispatchApplyWindowInsets(WidgetCallFullscreen.access$getBinding$p(this.this$0).i, build);
         RecyclerView recyclerView = WidgetCallFullscreen.access$getBinding$p(this.this$0).m;
         m.checkNotNullExpressionValue(recyclerView, "binding.callStageRecycler");
-        recyclerView.setPadding(recyclerView.getPaddingLeft(), this.this$0.getResources().getDimensionPixelOffset(2131165724) + build.getSystemWindowInsetTop(), recyclerView.getPaddingRight(), recyclerView.getPaddingBottom());
+        recyclerView.setPadding(recyclerView.getPaddingLeft(), this.this$0.getResources().getDimensionPixelOffset(R.dimen.stage_details_top_padding) + build.getSystemWindowInsetTop(), recyclerView.getPaddingRight(), recyclerView.getPaddingBottom());
         return build;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java
index 0d5578e21e..cb589991c5 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.fullscreen;
 
+import com.discord.R;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -16,7 +17,7 @@ public final class WidgetCallFullscreen$onViewBound$3 extends o implements Funct
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        c.a.e.o.g(this.this$0.getContext(), 2131892198, 0, null, 12);
+        c.a.e.o.g(this.this$0.getContext(), R.string.permission_microphone_denied, 0, null, 12);
         WidgetCallFullscreen.access$leaveActivity(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java
index fb9fe19171..7df290eb4f 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java
@@ -16,6 +16,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -36,6 +37,7 @@ import c.a.k.a;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
@@ -187,7 +189,7 @@ public final class WidgetCallFullscreen extends AppFragment {
             Intent intent = new Intent(context, AppActivity.Call.class);
             intent.putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", j);
             intent.putExtra("com.discord.intent.extra.EXTRA_STREAM_KEY", str);
-            intent.putExtra("INTENT_EXTRA_CONNECT_ON_LAUNCH", z2);
+            intent.putExtra(WidgetCallFullscreen.INTENT_EXTRA_CONNECT_ON_LAUNCH, z2);
             context.startActivity(intent, (transition == null || (activityOptions = transition.toActivityOptions(context)) == null) ? null : activityOptions.toBundle());
         }
     }
@@ -212,7 +214,7 @@ public final class WidgetCallFullscreen extends AppFragment {
     }
 
     public WidgetCallFullscreen() {
-        super(2131558883);
+        super(R.layout.widget_call_fullscreen);
         AppLog appLog = AppLog.g;
         m.checkNotNullParameter(appLog, "logger");
         WeakReference<c.a.k.a> weakReference = a.b.a;
@@ -350,7 +352,7 @@ public final class WidgetCallFullscreen extends AppFragment {
             TextView textView2 = getBinding().h;
             m.checkNotNullExpressionValue(textView2, "binding.callFullscreenMentions");
             if (textView2.getVisibility() == 0) {
-                i = 2131231496;
+                i = R.drawable.ic_call_toolbar_stage_minimize_cutout;
                 toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i));
                 StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q;
                 m.checkNotNullExpressionValue(stageCallVisitCommunityView, "binding.callVisitCommunity");
@@ -367,7 +369,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                             z3 = true;
                             SimpleDraweeView simpleDraweeView = stageCallVisitCommunityView2.i.b;
                             m.checkNotNullExpressionValue(simpleDraweeView, "binding.visitCommunityIcon");
-                            SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, true, guild, (float) stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165446), Integer.valueOf(IconUtils.getMediaProxySize(stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165291))), null, null, null, false, null, 496, null);
+                            SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, true, guild, (float) stageCallVisitCommunityView2.getResources().getDimensionPixelSize(R.dimen.guild_icon_radius), Integer.valueOf(IconUtils.getMediaProxySize(stageCallVisitCommunityView2.getResources().getDimensionPixelSize(R.dimen.avatar_size_medium))), null, null, null, false, null, 496, null);
                             TextView textView3 = stageCallVisitCommunityView2.i.f150c;
                             m.checkNotNullExpressionValue(textView3, "binding.visitCommunityIconText");
                             textView3.setText(!z3 ? null : guild.getShortName());
@@ -378,7 +380,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                     z3 = false;
                     SimpleDraweeView simpleDraweeView = stageCallVisitCommunityView2.i.b;
                     m.checkNotNullExpressionValue(simpleDraweeView, "binding.visitCommunityIcon");
-                    SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, true, guild, (float) stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165446), Integer.valueOf(IconUtils.getMediaProxySize(stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165291))), null, null, null, false, null, 496, null);
+                    SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, true, guild, (float) stageCallVisitCommunityView2.getResources().getDimensionPixelSize(R.dimen.guild_icon_radius), Integer.valueOf(IconUtils.getMediaProxySize(stageCallVisitCommunityView2.getResources().getDimensionPixelSize(R.dimen.avatar_size_medium))), null, null, null, false, null, 496, null);
                     TextView textView3 = stageCallVisitCommunityView2.i.f150c;
                     m.checkNotNullExpressionValue(textView3, "binding.visitCommunityIconText");
                     textView3.setText(!z3 ? null : guild.getShortName());
@@ -386,7 +388,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                     z2 = true;
                 }
                 stageCallVisitCommunityView.setVisibility(!z2 ? 0 : 8);
-                int color = ColorCompat.getColor(this, 2131100384);
+                int color = ColorCompat.getColor(this, (int) R.color.transparent);
                 titleText = valid.getTitleText();
                 if (titleText == null) {
                     titleText = "";
@@ -399,11 +401,11 @@ public final class WidgetCallFullscreen extends AppFragment {
             }
         }
         if (valid.getDisplayMode() == displayMode2) {
-            i = 2131231495;
+            i = R.drawable.ic_call_toolbar_stage_minimize;
         } else {
             TextView textView4 = getBinding().h;
             m.checkNotNullExpressionValue(textView4, "binding.callFullscreenMentions");
-            i = textView4.getVisibility() == 0 ? 2131231494 : 2131231493;
+            i = textView4.getVisibility() == 0 ? R.drawable.ic_call_toolbar_icon_minimize_cutout : R.drawable.ic_call_toolbar_icon_minimize;
         }
         toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i));
         StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q;
@@ -413,7 +415,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         }
         z2 = false;
         stageCallVisitCommunityView.setVisibility(!z2 ? 0 : 8);
-        int color = ColorCompat.getColor(this, 2131100384);
+        int color = ColorCompat.getColor(this, (int) R.color.transparent);
         titleText = valid.getTitleText();
         if (titleText == null) {
         }
@@ -571,7 +573,7 @@ public final class WidgetCallFullscreen extends AppFragment {
     private final void configureMenu(WidgetCallFullscreenViewModel.ViewState.Valid valid) {
         if (!m.areEqual(valid.getMenuItems(), this.lastMenuItems)) {
             this.lastMenuItems = valid.getMenuItems();
-            setActionBarOptionsMenu(2131623939, new WidgetCallFullscreen$configureMenu$1(this, valid), new WidgetCallFullscreen$configureMenu$2(valid));
+            setActionBarOptionsMenu(R.menu.menu_call_fullscreen, new WidgetCallFullscreen$configureMenu$1(this, valid), new WidgetCallFullscreen$configureMenu$2(valid));
         }
     }
 
@@ -607,7 +609,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         configureMenu(valid);
         configureActionBar(valid);
         enableWakeLock();
-        getBinding().r.i.setText(valid.getCallModel().isConnected() ? 2131892008 : 2131895014);
+        getBinding().r.i.setText(valid.getCallModel().isConnected() ? R.string.ongoing_call : R.string.voice_status_not_connected);
         TextView textView2 = getBinding().r.h;
         m.checkNotNullExpressionValue(textView2, "binding.privateCall.privateCallStatusPrimary");
         if (AnimatableValueParser.r1(valid.getCallModel().getChannel())) {
@@ -694,7 +696,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                         m.checkNotNullExpressionValue(materialTextView, "binding.stageCallSpeakingUserSummaryLabel");
                         Resources resources = getResources();
                         m.checkNotNullExpressionValue(resources, "resources");
-                        materialTextView.setText(b.e(this, 2131893834, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, 2131755343, 2131893835, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$4(this)));
+                        materialTextView.setText(b.e(this, R.string.stage_is_speaking_hook, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, (int) R.plurals.stage_is_speaking_hook_count, (int) R.string.stage_is_speaking_zero_quantity_hook, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$4(this)));
                     }
                     arrayList = new ArrayList();
                     boolean z4 = !stageCallModel.getSpeakers().isEmpty();
@@ -718,7 +720,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                     configureMenu(valid);
                     configureActionBar(valid);
                     enableWakeLock();
-                    WidgetEndStageBottomSheet.Companion.registerForResult(this, "END_STAGE_REQUEST_KEY", new WidgetCallFullscreen$configureStageUi$5(this, valid));
+                    WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$5(this, valid));
                 }
             }
             z2 = false;
@@ -743,7 +745,7 @@ public final class WidgetCallFullscreen extends AppFragment {
             configureMenu(valid);
             configureActionBar(valid);
             enableWakeLock();
-            WidgetEndStageBottomSheet.Companion.registerForResult(this, "END_STAGE_REQUEST_KEY", new WidgetCallFullscreen$configureStageUi$5(this, valid));
+            WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$5(this, valid));
         }
     }
 
@@ -754,7 +756,7 @@ public final class WidgetCallFullscreen extends AppFragment {
             VoiceControlsSheetView voiceControlsSheetView = getBinding().w;
             m.checkNotNullExpressionValue(voiceControlsSheetView, "binding.voiceControlsSheetView");
             VoiceControlsSheetSwipeTooltip voiceControlsSheetSwipeTooltip = VoiceControlsSheetSwipeTooltip.INSTANCE;
-            String string = getResources().getString(2131895002);
+            String string = getResources().getString(R.string.voice_controls_sheet_tooltip_swipe_up);
             m.checkNotNullExpressionValue(string, "resources.getString(R.st…s_sheet_tooltip_swipe_up)");
             int dpToPixels = DimenUtils.dpToPixels(-12);
             Observable<Unit> F = getUnsubscribeSignal().F(WidgetCallFullscreen$configureSwipeTooltip$1.INSTANCE);
@@ -771,28 +773,28 @@ public final class WidgetCallFullscreen extends AppFragment {
                 if (floatingViewGravity == floatingViewGravity) {
                     View rootView = voiceControlsSheetView.getRootView();
                     Objects.requireNonNull(rootView, "null cannot be cast to non-null type android.view.ViewGroup");
-                    View inflate = from.inflate(2131558461, (ViewGroup) rootView, false);
-                    TextView textView = (TextView) inflate.findViewById(2131362898);
+                    View inflate = from.inflate(R.layout.default_tooltip_view_top, (ViewGroup) rootView, false);
+                    TextView textView = (TextView) inflate.findViewById(R.id.default_tooltip_text);
                     if (textView != null) {
                         viewBinding = new j((ConstraintLayout) inflate, textView);
                         m.checkNotNullExpressionValue(textView, "defaultTooltipText");
                         textView.setText(string);
                         m.checkNotNullExpressionValue(viewBinding, "DefaultTooltipViewTopBin…ext = tooltipText\n      }");
                     } else {
-                        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362898)));
+                        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(R.id.default_tooltip_text)));
                     }
                 } else {
                     View rootView2 = voiceControlsSheetView.getRootView();
                     Objects.requireNonNull(rootView2, "null cannot be cast to non-null type android.view.ViewGroup");
-                    View inflate2 = from.inflate(2131558460, (ViewGroup) rootView2, false);
-                    TextView textView2 = (TextView) inflate2.findViewById(2131362898);
+                    View inflate2 = from.inflate(R.layout.default_tooltip_view_bottom, (ViewGroup) rootView2, false);
+                    TextView textView2 = (TextView) inflate2.findViewById(R.id.default_tooltip_text);
                     if (textView2 != null) {
                         viewBinding = new i((ConstraintLayout) inflate2, textView2);
                         m.checkNotNullExpressionValue(textView2, "defaultTooltipText");
                         textView2.setText(string);
                         m.checkNotNullExpressionValue(viewBinding, "DefaultTooltipViewBottom…ext = tooltipText\n      }");
                     } else {
-                        throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(2131362898)));
+                        throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(R.id.default_tooltip_text)));
                     }
                 }
                 viewBinding.getRoot().setOnClickListener(new c.a.w.b(defaultTooltipCreator, voiceControlsSheetSwipeTooltip));
@@ -817,7 +819,7 @@ public final class WidgetCallFullscreen extends AppFragment {
 
     private final void configureValidUI(WidgetCallFullscreenViewModel.ViewState.Valid valid) {
         configureBottomControls(valid);
-        getBinding().a.setBackgroundResource(valid.getDisplayMode().ordinal() != 1 ? 2131099689 : 2131100179);
+        getBinding().a.setBackgroundResource(valid.getDisplayMode().ordinal() != 1 ? R.color.black : R.color.primary_dark_800);
         int ordinal = valid.getDisplayMode().ordinal();
         if (ordinal == 0) {
             configureGridUi(valid);
@@ -1111,10 +1113,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891768);
-        String string2 = requireContext.getString(2131891755);
+        String string = requireContext.getString(R.string.no_video_permission_dialog_title);
+        String string2 = requireContext.getString(R.string.no_screenshare_permission_dialog_body);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…e_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showNoVadPermissionDialog() {
@@ -1124,10 +1126,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131894886);
-        String string2 = requireContext.getString(2131894882);
+        String string = requireContext.getString(R.string.vad_permission_title);
+        String string2 = requireContext.getString(R.string.vad_permission_body);
         m.checkNotNullExpressionValue(string2, "context.getString(R.string.vad_permission_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showNoVideoPermissionDialog() {
@@ -1137,10 +1139,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891768);
-        String string2 = requireContext.getString(2131891767);
+        String string = requireContext.getString(R.string.no_video_permission_dialog_title);
+        String string2 = requireContext.getString(R.string.no_video_permission_dialog_body);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…o_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerDeafenedDialog() {
@@ -1150,10 +1152,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893557);
-        String string2 = requireContext.getString(2131893556);
+        String string = requireContext.getString(R.string.server_deafened_dialog_title);
+        String string2 = requireContext.getString(R.string.server_deafened_dialog_body);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ver_deafened_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerMutedDialog() {
@@ -1163,10 +1165,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893569);
-        String string2 = requireContext.getString(2131893568);
+        String string = requireContext.getString(R.string.server_muted_dialog_title);
+        String string2 = requireContext.getString(R.string.server_muted_dialog_body);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…server_muted_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showSuppressedDialog() {
@@ -1176,15 +1178,15 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131894115);
-        String string2 = requireContext.getString(2131894118);
+        String string = requireContext.getString(R.string.suppressed);
+        String string2 = requireContext.getString(R.string.suppressed_permission_body);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ppressed_permission_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     public final void handleEvent(WidgetCallFullscreenViewModel.Event event) {
         Unit unit;
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         if (m.areEqual(event, WidgetCallFullscreenViewModel.Event.ShowSuppressedDialog.INSTANCE)) {
             showSuppressedDialog();
             unit = Unit.a;
@@ -1302,7 +1304,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         initializeSystemUiListeners(viewGroup);
         Context context = viewGroup.getContext();
         d0.z.d.m.checkNotNullExpressionValue(context, "view.context");
-        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(context, 2130969373, 0, 2, (Object) null)), 2131888189, null, 8, null);
+        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(context, (int) R.attr.ic_action_bar_down, 0, 2, (Object) null)), Integer.valueOf((int) R.string.dismiss), null, 8, null);
         AppTransitionActivity.a aVar = requireAppActivity().j;
         setUpGridRecycler();
         setUpStageRecycler();
@@ -1329,7 +1331,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         if (channel != null && AnimatableValueParser.w1(channel)) {
             requireAppActivity().j = AppTransitionActivity.Transition.TYPE_SLIDE_VERTICAL_WITH_FADE.getAnimations();
         }
-        if (!getMostRecentIntent().getBooleanExtra("INTENT_EXTRA_CONNECT_ON_LAUNCH", false)) {
+        if (!getMostRecentIntent().getBooleanExtra(INTENT_EXTRA_CONNECT_ON_LAUNCH, false)) {
             return;
         }
         if (channel == null || !AnimatableValueParser.w1(channel)) {
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$startTapForwardingJob$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$startTapForwardingJob$1.java
index 60fad5c0fa..2416aaef4a 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$startTapForwardingJob$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$startTapForwardingJob$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.fullscreen;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetCallFullscreenViewModel$startTapForwardingJob$1 extends
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetCallFullscreenViewModel.access$setForwardVideoGridInteractionSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
index bbad55a26b..efe3437709 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
@@ -9,8 +9,10 @@ import c.d.b.a.a;
 import co.discord.media_engine.VideoInputDeviceDescription;
 import co.discord.media_engine.VideoInputDeviceFacing;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildMaxVideoChannelUsers;
+import com.discord.api.permission.Permission;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelApplicationStream;
@@ -2175,7 +2177,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
         	at jadx.core.codegen.ClassGen.addMethod(ClassGen.java:298)
         	at jadx.core.codegen.ClassGen.lambda$addInnerClsAndMethods$3(ClassGen.java:267)
         	at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183)
-        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
+        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1541)
         	at java.base/java.util.stream.SortedOps$RefSortingSink.end(SortedOps.java:395)
         	at java.base/java.util.stream.Sink$ChainedReference.end(Sink.java:258)
         */
@@ -2258,7 +2260,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
     public final void onCameraPermissionsGranted() {
         StoreMediaEngine.selectDefaultVideoDevice$default(this.mediaEngineStore, null, 1, null);
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.AccessibilityAnnouncement(2131887145));
+        publishSubject.j.onNext(new Event.AccessibilityAnnouncement(R.string.camera_a11y_turned_on));
     }
 
     @Override // com.discord.app.AppViewModel, androidx.lifecycle.ViewModel
@@ -2286,7 +2288,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
             }
             ViewState.Valid valid3 = valid;
             if (valid3 != null) {
-                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(valid3.isDeafened() ? 2131894998 : 2131894989));
+                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(valid3.isDeafened() ? R.string.voice_channel_undeafened : R.string.voice_channel_deafened));
                 return;
             }
             return;
@@ -2354,7 +2356,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
         if (selfMuteFailure == null) {
             if (valid != null) {
                 boolean isMeMutedByAnySource = valid.getCallModel().isMeMutedByAnySource();
-                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(isMeMutedByAnySource ? 2131894999 : 2131894994));
+                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(isMeMutedByAnySource ? R.string.voice_channel_unmuted : R.string.voice_channel_muted));
             }
         } else if (selfMuteFailure.ordinal() == 0) {
             emitShowNoVadPermissionDialogEvent();
@@ -2560,7 +2562,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
             }
             if (valid.getCameraState() == CameraState.CAMERA_ON) {
                 this.mediaEngineStore.selectVideoInputDevice(null);
-                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(2131887144));
+                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(R.string.camera_a11y_turned_off));
                 return;
             }
             int numUsersConnected = valid.getCallModel().getNumUsersConnected();
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java
index a3d8d6ca70..b968b7f79e 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.fullscreen;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetGuildCallOnboardingBinding;
 import com.discord.views.JoinVoiceChannelButton;
 import d0.z.d.k;
@@ -17,10 +18,10 @@ public final /* synthetic */ class WidgetGuildCallOnboardingSheet$binding$2 exte
 
     public final WidgetGuildCallOnboardingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        JoinVoiceChannelButton joinVoiceChannelButton = (JoinVoiceChannelButton) view.findViewById(2131363440);
+        JoinVoiceChannelButton joinVoiceChannelButton = (JoinVoiceChannelButton) view.findViewById(R.id.guild_call_onboarding_connect);
         if (joinVoiceChannelButton != null) {
             return new WidgetGuildCallOnboardingBinding((LinearLayout) view, joinVoiceChannelButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363440)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.guild_call_onboarding_connect)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$onResume$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$onResume$2.java
index a199ae878a..9f93b2a2aa 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$onResume$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$onResume$2.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.fullscreen;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.voice.fullscreen.WidgetGuildCallOnboardingSheetViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetGuildCallOnboardingSheet$onResume$2 extends o implement
     }
 
     public final void invoke(WidgetGuildCallOnboardingSheetViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetGuildCallOnboardingSheet.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java
index fd1c76df41..b60f52656b 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.a.z.f;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetGuildCallOnboardingBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -100,24 +101,24 @@ public final class WidgetGuildCallOnboardingSheet extends AppBottomSheet {
             int ordinal = joinability.ordinal();
             if (ordinal != 0) {
                 if (ordinal == 1) {
-                    joinVoiceChannelButton.setText(2131887289);
-                    joinVoiceChannelButton.a(joinVoiceChannelButton, 2131887288);
+                    joinVoiceChannelButton.setText(R.string.channel_locked_short);
+                    joinVoiceChannelButton.a(joinVoiceChannelButton, R.string.channel_locked);
                     return;
                 } else if (ordinal != 2) {
                     if (ordinal == 3) {
-                        joinVoiceChannelButton.setText(2131894479);
-                        joinVoiceChannelButton.a(joinVoiceChannelButton, 2131894479);
+                        joinVoiceChannelButton.setText(R.string.unable_to_join_channel_full);
+                        joinVoiceChannelButton.a(joinVoiceChannelButton, R.string.unable_to_join_channel_full);
                         return;
                     } else if (ordinal == 4) {
-                        joinVoiceChannelButton.setText(2131887529);
-                        joinVoiceChannelButton.a(joinVoiceChannelButton, 2131890090);
+                        joinVoiceChannelButton.setText(R.string.connect_to_voice);
+                        joinVoiceChannelButton.a(joinVoiceChannelButton, R.string.guild_settings_public_welcome_invalid_channel);
                         return;
                     } else {
                         return;
                     }
                 }
             }
-            joinVoiceChannelButton.setText(2131887529);
+            joinVoiceChannelButton.setText(R.string.connect_to_voice);
             joinVoiceChannelButton.setOnClickListener(new f(widgetGuildCallOnboardingSheet$configureUI$1));
         }
     }
@@ -148,7 +149,7 @@ public final class WidgetGuildCallOnboardingSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559067;
+        return R.layout.widget_guild_call_onboarding;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java
index f082de134b..1de9b66ab0 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.voice.fullscreen;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetStartCallSheetBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -17,11 +18,11 @@ public final /* synthetic */ class WidgetStartCallSheet$binding$2 extends k impl
 
     public final WidgetStartCallSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365286;
-        TextView textView = (TextView) view.findViewById(2131365286);
+        int i = R.id.start_call_sheet_video_item;
+        TextView textView = (TextView) view.findViewById(R.id.start_call_sheet_video_item);
         if (textView != null) {
-            i = 2131365287;
-            TextView textView2 = (TextView) view.findViewById(2131365287);
+            i = R.id.start_call_sheet_voice_item;
+            TextView textView2 = (TextView) view.findViewById(R.id.start_call_sheet_voice_item);
             if (textView2 != null) {
                 return new WidgetStartCallSheetBinding((LinearLayout) view, textView, textView2);
             }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
index cc57c72f7d..7835a0b3d5 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
@@ -6,6 +6,7 @@ import android.view.View;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetStartCallSheetBinding;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -35,7 +36,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetStartCallSheet widgetStartCallSheet = new WidgetStartCallSheet();
             Bundle bundle = new Bundle();
-            bundle.putLong("ARG_VOICE_CHANNEL_ID", j);
+            bundle.putLong(WidgetStartCallSheet.ARG_VOICE_CHANNEL_ID, j);
             widgetStartCallSheet.setArguments(bundle);
             widgetStartCallSheet.show(fragmentManager, WidgetStartCallSheet.class.getName());
         }
@@ -67,7 +68,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559294;
+        return R.layout.widget_start_call_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
@@ -84,7 +85,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        long j = getArgumentsOrDefault().getLong("ARG_VOICE_CHANNEL_ID");
+        long j = getArgumentsOrDefault().getLong(ARG_VOICE_CHANNEL_ID);
         getBinding().f1996c.setOnClickListener(new WidgetStartCallSheet$onViewCreated$1(this, j));
         getBinding().b.setOnClickListener(new WidgetStartCallSheet$onViewCreated$2(this, j));
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallBlurredGridView.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallBlurredGridView.java
index 281c60afc8..62fb9cc3d9 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallBlurredGridView.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallBlurredGridView.java
@@ -6,6 +6,7 @@ import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import android.widget.GridLayout;
 import androidx.core.graphics.ColorUtils;
+import com.discord.R;
 import com.discord.stores.StoreVoiceParticipants;
 import com.discord.utilities.collections.CollectionExtensionsKt;
 import com.discord.utilities.color.ColorCompat;
@@ -38,7 +39,7 @@ public final class PrivateCallBlurredGridView extends FrameLayout {
         this.gridViewItems = new LinkedHashMap<>();
         gridLayout.setLayoutParams(new FrameLayout.LayoutParams(-1, -1));
         gridLayout.setColumnCount(getColumnSize());
-        int alphaComponent = ColorUtils.setAlphaComponent(ColorCompat.getColor(getContext(), 2131100173), (int) 204.0d);
+        int alphaComponent = ColorUtils.setAlphaComponent(ColorCompat.getColor(getContext(), (int) R.color.primary_dark_600), (int) 204.0d);
         realtimeBlurView.setLayoutParams(new FrameLayout.LayoutParams(-1, -1));
         realtimeBlurView.setBlurRadius((float) DimenUtils.dpToPixels(64));
         realtimeBlurView.setOverlayColor(alphaComponent);
@@ -58,7 +59,7 @@ public final class PrivateCallBlurredGridView extends FrameLayout {
         this.gridViewItems = new LinkedHashMap<>();
         gridLayout.setLayoutParams(new FrameLayout.LayoutParams(-1, -1));
         gridLayout.setColumnCount(getColumnSize());
-        int alphaComponent = ColorUtils.setAlphaComponent(ColorCompat.getColor(getContext(), 2131100173), (int) 204.0d);
+        int alphaComponent = ColorUtils.setAlphaComponent(ColorCompat.getColor(getContext(), (int) R.color.primary_dark_600), (int) 204.0d);
         realtimeBlurView.setLayoutParams(new FrameLayout.LayoutParams(-1, -1));
         realtimeBlurView.setBlurRadius((float) DimenUtils.dpToPixels(64));
         realtimeBlurView.setOverlayColor(alphaComponent);
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallGridView.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallGridView.java
index 7d35987dcd..39358212cc 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallGridView.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/PrivateCallGridView.java
@@ -9,10 +9,12 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 import androidx.core.view.ViewGroupKt;
+import com.discord.R;
 import com.discord.stores.StoreVoiceParticipants;
 import com.discord.utilities.collections.CollectionExtensionsKt;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.views.VoiceUserView;
+import com.google.android.material.badge.BadgeDrawable;
 import d0.t.n;
 import d0.t.u;
 import d0.z.d.m;
@@ -88,7 +90,7 @@ public final class PrivateCallGridView extends TableLayout {
         }
         VoiceUserView voiceUserView2 = voiceUserView;
         int i = VoiceUserView.i;
-        voiceUserView2.a(voiceUser, 2131165298);
+        voiceUserView2.a(voiceUser, R.dimen.avatar_size_unrestricted);
         voiceUserView2.setSelected(false);
         return voiceUserView2;
     }
@@ -109,7 +111,7 @@ public final class PrivateCallGridView extends TableLayout {
         if (!(i == 0 && list.size() == 2)) {
             return null;
         }
-        View inflate = TableLayout.inflate(getContext(), 2131558811, null);
+        View inflate = TableLayout.inflate(getContext(), R.layout.view_private_call_grid_spacer, null);
         Objects.requireNonNull(inflate, "null cannot be cast to non-null type android.widget.TextView");
         return (TextView) inflate;
     }
@@ -123,14 +125,14 @@ public final class PrivateCallGridView extends TableLayout {
         if (!z2 || !isOverflowingParticipants(list)) {
             return null;
         }
-        View inflate = TableLayout.inflate(getContext(), 2131558810, null);
+        View inflate = TableLayout.inflate(getContext(), R.layout.view_private_call_grid_overflow, null);
         Objects.requireNonNull(inflate, "null cannot be cast to non-null type android.widget.TextView");
         TextView textView = (TextView) inflate;
         TableRow.LayoutParams layoutParams = new TableRow.LayoutParams(DimenUtils.dpToPixels(92), DimenUtils.dpToPixels(92));
         int dpToPixels = DimenUtils.dpToPixels(2) * 4;
         layoutParams.setMargins(dpToPixels, dpToPixels, dpToPixels, dpToPixels);
         textView.setLayoutParams(layoutParams);
-        textView.setText("+" + String.valueOf(list.size() - getMaxShownParticipants()));
+        textView.setText(BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX + String.valueOf(list.size() - getMaxShownParticipants()));
         return textView;
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java
index 2954c3dfb9..fdc37d280f 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.j.q1;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.views.calls.VideoCallParticipantView;
 import d0.t.n;
 import d0.z.d.m;
@@ -204,7 +205,7 @@ public final class VideoCallGridAdapter extends RecyclerView.Adapter<VideoCallGr
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public VideoCallGridViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558730, viewGroup, false);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.video_call_grid_item, viewGroup, false);
         Objects.requireNonNull(inflate, "rootView");
         VideoCallParticipantView videoCallParticipantView = (VideoCallParticipantView) inflate;
         m.checkNotNullExpressionValue(new q1(videoCallParticipantView), "VideoCallGridItemBinding…parent, false\n          )");
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java
index dca1c70a40..bc5732ce8b 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.databinding.WidgetStageChannelAudienceRoleBinding;
 import com.discord.utilities.locale.LocaleManager;
 import com.discord.widgets.voice.fullscreen.stage.StageCallItem;
@@ -17,10 +18,10 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public AudienceHeaderViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559283, stageCallAdapter, null);
+        super(R.layout.widget_stage_channel_audience_role, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
-        TextView textView = (TextView) view.findViewById(2131365226);
+        TextView textView = (TextView) view.findViewById(R.id.stage_channel_audience_role_text);
         if (textView != null) {
             WidgetStageChannelAudienceRoleBinding widgetStageChannelAudienceRoleBinding = new WidgetStageChannelAudienceRoleBinding((ConstraintLayout) view, textView);
             m.checkNotNullExpressionValue(widgetStageChannelAudienceRoleBinding, "WidgetStageChannelAudien…oleBinding.bind(itemView)");
@@ -31,7 +32,7 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder {
             this.numberFormatter = NumberFormat.getNumberInstance(localeManager.getPrimaryLocale(view2.getContext()));
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365226)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.stage_channel_audience_role_text)));
     }
 
     @SuppressLint({"SetTextI18n"})
@@ -41,6 +42,6 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder {
         String format = this.numberFormatter.format(Integer.valueOf(((StageCallItem.AudienceHeaderItem) stageCallItem).getAudienceSize()));
         TextView textView = this.binding.b;
         m.checkNotNullExpressionValue(textView, "binding.stageChannelAudienceRoleText");
-        b.n(textView, 2131886746, new Object[]{format}, null, 4);
+        b.n(textView, R.string.audience_section_header, new Object[]{format}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
index 3a6c5033f6..98624bf9e3 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
+import com.discord.R;
 import com.discord.databinding.WidgetStageChannelAudienceBinding;
 import com.discord.models.user.User;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -20,21 +21,21 @@ public final class AudienceViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public AudienceViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559282, stageCallAdapter, null);
+        super(R.layout.widget_stage_channel_audience, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
         ConstraintLayout constraintLayout = (ConstraintLayout) view;
-        int i = 2131365222;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365222);
+        int i = R.id.stage_channel_audience_member_icon;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.stage_channel_audience_member_icon);
         if (simpleDraweeView != null) {
-            i = 2131365223;
-            CutoutView cutoutView = (CutoutView) view.findViewById(2131365223);
+            i = R.id.stage_channel_audience_member_icon_container;
+            CutoutView cutoutView = (CutoutView) view.findViewById(R.id.stage_channel_audience_member_icon_container);
             if (cutoutView != null) {
-                i = 2131365224;
-                TextView textView = (TextView) view.findViewById(2131365224);
+                i = R.id.stage_channel_audience_member_name;
+                TextView textView = (TextView) view.findViewById(R.id.stage_channel_audience_member_name);
                 if (textView != null) {
-                    i = 2131365225;
-                    ImageView imageView = (ImageView) view.findViewById(2131365225);
+                    i = R.id.stage_channel_audience_member_raised_hand;
+                    ImageView imageView = (ImageView) view.findViewById(R.id.stage_channel_audience_member_raised_hand);
                     if (imageView != null) {
                         WidgetStageChannelAudienceBinding widgetStageChannelAudienceBinding = new WidgetStageChannelAudienceBinding((ConstraintLayout) view, constraintLayout, simpleDraweeView, cutoutView, textView, imageView);
                         m.checkNotNullExpressionValue(widgetStageChannelAudienceBinding, "WidgetStageChannelAudienceBinding.bind(itemView)");
@@ -60,20 +61,20 @@ public final class AudienceViewHolder extends StageCallViewHolder {
         textView.setText(audienceItem.getVoiceUser().getDisplayName());
         Drawable drawable2 = null;
         if (audienceItem.isBlocked()) {
-            drawable = ContextCompat.getDrawable(textView.getContext(), 2131231474);
+            drawable = ContextCompat.getDrawable(textView.getContext(), R.drawable.ic_blocked_12dp);
             if (drawable != null) {
-                drawable.setTint(ContextCompat.getColor(textView.getContext(), 2131100329));
+                drawable.setTint(ContextCompat.getColor(textView.getContext(), R.color.status_red_500));
             }
         } else {
             drawable = null;
         }
         if (audienceItem.getVoiceUser().isBooster()) {
-            drawable2 = ContextCompat.getDrawable(textView.getContext(), 2131231477);
+            drawable2 = ContextCompat.getDrawable(textView.getContext(), R.drawable.ic_boosted_badge_12dp);
         }
         DrawableCompat.setCompoundDrawablesCompat$default(textView, drawable, (Drawable) null, drawable2, (Drawable) null, 10, (Object) null);
         User user = audienceItem.getVoiceUser().getUser();
         SimpleDraweeView simpleDraweeView = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.stageChannelAudienceMemberIcon");
-        IconUtils.setIcon$default(simpleDraweeView, user.getUsername(), Long.valueOf(user.getId()), user.getAvatar(), Integer.valueOf(user.getDiscriminator()), 2131165290, null, null, audienceItem.getVoiceUser().getGuildMember(), 192, null);
+        IconUtils.setIcon$default(simpleDraweeView, user.getUsername(), Long.valueOf(user.getId()), user.getAvatar(), Integer.valueOf(user.getDiscriminator()), R.dimen.avatar_size_large, null, null, audienceItem.getVoiceUser().getGuildMember(), 192, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
index ea8d84690a..edebbb20a2 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
@@ -5,6 +5,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetStageChannelDetailsBinding;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.utilities.locale.LocaleManager;
@@ -19,44 +20,44 @@ public final class DetailsViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public DetailsViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559284, stageCallAdapter, null);
+        super(R.layout.widget_stage_channel_details, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131364599;
-        ImageView imageView = (ImageView) view.findViewById(2131364599);
+        int i = R.id.public_dot;
+        ImageView imageView = (ImageView) view.findViewById(R.id.public_dot);
         if (imageView != null) {
-            i = 2131364600;
-            ImageView imageView2 = (ImageView) view.findViewById(2131364600);
+            i = R.id.public_icon;
+            ImageView imageView2 = (ImageView) view.findViewById(R.id.public_icon);
             if (imageView2 != null) {
-                i = 2131364606;
-                TextView textView = (TextView) view.findViewById(2131364606);
+                i = R.id.public_text;
+                TextView textView = (TextView) view.findViewById(R.id.public_text);
                 if (textView != null) {
-                    i = 2131365921;
-                    TextView textView2 = (TextView) view.findViewById(2131365921);
+                    i = R.id.widget_stage_channel_details_blocked_count;
+                    TextView textView2 = (TextView) view.findViewById(R.id.widget_stage_channel_details_blocked_count);
                     if (textView2 != null) {
-                        i = 2131365922;
-                        ImageView imageView3 = (ImageView) view.findViewById(2131365922);
+                        i = R.id.widget_stage_channel_details_blocked_icon;
+                        ImageView imageView3 = (ImageView) view.findViewById(R.id.widget_stage_channel_details_blocked_icon);
                         if (imageView3 != null) {
-                            i = 2131365923;
-                            ImageView imageView4 = (ImageView) view.findViewById(2131365923);
+                            i = R.id.widget_stage_channel_details_dot;
+                            ImageView imageView4 = (ImageView) view.findViewById(R.id.widget_stage_channel_details_dot);
                             if (imageView4 != null) {
-                                i = 2131365924;
-                                TextView textView3 = (TextView) view.findViewById(2131365924);
+                                i = R.id.widget_stage_channel_details_listener_count;
+                                TextView textView3 = (TextView) view.findViewById(R.id.widget_stage_channel_details_listener_count);
                                 if (textView3 != null) {
-                                    i = 2131365925;
-                                    ImageView imageView5 = (ImageView) view.findViewById(2131365925);
+                                    i = R.id.widget_stage_channel_details_listener_icon;
+                                    ImageView imageView5 = (ImageView) view.findViewById(R.id.widget_stage_channel_details_listener_icon);
                                     if (imageView5 != null) {
-                                        i = 2131365926;
-                                        TextView textView4 = (TextView) view.findViewById(2131365926);
+                                        i = R.id.widget_stage_channel_details_name;
+                                        TextView textView4 = (TextView) view.findViewById(R.id.widget_stage_channel_details_name);
                                         if (textView4 != null) {
-                                            i = 2131365927;
-                                            TextView textView5 = (TextView) view.findViewById(2131365927);
+                                            i = R.id.widget_stage_channel_details_speaker_count;
+                                            TextView textView5 = (TextView) view.findViewById(R.id.widget_stage_channel_details_speaker_count);
                                             if (textView5 != null) {
-                                                i = 2131365928;
-                                                ImageView imageView6 = (ImageView) view.findViewById(2131365928);
+                                                i = R.id.widget_stage_channel_details_speaker_icon;
+                                                ImageView imageView6 = (ImageView) view.findViewById(R.id.widget_stage_channel_details_speaker_icon);
                                                 if (imageView6 != null) {
-                                                    i = 2131365929;
-                                                    TextView textView6 = (TextView) view.findViewById(2131365929);
+                                                    i = R.id.widget_stage_channel_details_topic;
+                                                    TextView textView6 = (TextView) view.findViewById(R.id.widget_stage_channel_details_topic);
                                                     if (textView6 != null) {
                                                         WidgetStageChannelDetailsBinding widgetStageChannelDetailsBinding = new WidgetStageChannelDetailsBinding((ConstraintLayout) view, imageView, imageView2, textView, textView2, imageView3, imageView4, textView3, imageView5, textView4, textView5, imageView6, textView6);
                                                         m.checkNotNullExpressionValue(widgetStageChannelDetailsBinding, "WidgetStageChannelDetailsBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java
index 2043f34ec4..d443e797d9 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java
@@ -1,11 +1,12 @@
 package com.discord.widgets.voice.fullscreen.stage;
 
+import com.discord.R;
 import d0.z.d.m;
 /* compiled from: StageCallViewHolder.kt */
 public final class DividerViewHolder extends StageCallViewHolder {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public DividerViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559285, stageCallAdapter, null);
+        super(R.layout.widget_stage_channel_divider, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
index 3bd87ac394..2cb245127a 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
@@ -10,6 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.z.i0.g;
 import c.a.z.i0.h;
 import c.a.z.i0.i;
+import com.discord.R;
 import com.discord.databinding.WidgetStageChannelSpeakerBinding;
 import com.discord.stores.StoreVoiceParticipants;
 import com.discord.utilities.colors.RepresentativeColorsKt;
@@ -31,17 +32,17 @@ public final class SpeakerViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public SpeakerViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559288, stageCallAdapter, null);
+        super(R.layout.widget_stage_channel_speaker, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
-        StageCallSpeakerView stageCallSpeakerView = (StageCallSpeakerView) view.findViewById(2131365240);
+        StageCallSpeakerView stageCallSpeakerView = (StageCallSpeakerView) view.findViewById(R.id.stage_channel_speaker_container);
         if (stageCallSpeakerView != null) {
             WidgetStageChannelSpeakerBinding widgetStageChannelSpeakerBinding = new WidgetStageChannelSpeakerBinding((ConstraintLayout) view, stageCallSpeakerView);
             m.checkNotNullExpressionValue(widgetStageChannelSpeakerBinding, "WidgetStageChannelSpeakerBinding.bind(itemView)");
             this.binding = widgetStageChannelSpeakerBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365240)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(R.id.stage_channel_speaker_container)));
     }
 
     public void onConfigure(int i, StageCallItem stageCallItem) {
@@ -56,7 +57,7 @@ public final class SpeakerViewHolder extends StageCallViewHolder {
         m.checkNotNullExpressionValue(constraintLayout, "binding.root");
         Resources resources = constraintLayout.getResources();
         int speakersPerRow = speakerItem.getSpeakersPerRow();
-        layoutParams.height = resources.getDimensionPixelSize(speakersPerRow != 1 ? speakersPerRow != 2 ? 2131165722 : 2131165723 : 2131165721);
+        layoutParams.height = resources.getDimensionPixelSize(speakersPerRow != 1 ? speakersPerRow != 2 ? R.dimen.speaker_height_three_up : R.dimen.speaker_height_two_up : R.dimen.speaker_height_single);
         stageCallSpeakerView.setLayoutParams(layoutParams);
         StageCallSpeakerView stageCallSpeakerView2 = this.binding.b;
         StoreVoiceParticipants.VoiceUser voiceUser = speakerItem.getVoiceUser();
@@ -67,7 +68,7 @@ public final class SpeakerViewHolder extends StageCallViewHolder {
         String colorId = RepresentativeColorsKt.getColorId(voiceUser.getUser());
         stageCallSpeakerView2.i.b.setOnBitmapLoadedListener(new g(colorId));
         stageCallSpeakerView2.i.h.setPulsing(voiceUser.isSpeaking());
-        stageCallSpeakerView2.i.b.a(voiceUser, 2131165288);
+        stageCallSpeakerView2.i.b.a(voiceUser, R.dimen.avatar_size_hero);
         stageCallSpeakerView2.i.b.setRingMargin(DimenUtils.dpToPixels(2));
         ImageView imageView = stageCallSpeakerView2.i.f;
         m.checkNotNullExpressionValue(imageView, "binding.stageChannelSpeakerMuteIndicator");
diff --git a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
index 46abfe123b..ad051f4fb7 100644
--- a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
@@ -6,6 +6,7 @@ import co.discord.media_engine.VideoInputDeviceDescription;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildMaxVideoChannelUsers;
+import com.discord.api.permission.Permission;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.models.domain.ModelApplicationStream;
@@ -368,7 +369,7 @@ public final class CallModel {
     }
 
     public final boolean canRequestToSpeak() {
-        return AnimatableValueParser.w1(this.channel) && PermissionUtils.can(4294967296L, this.channelPermissions);
+        return AnimatableValueParser.w1(this.channel) && PermissionUtils.can(Permission.REQUEST_TO_SPEAK, this.channelPermissions);
     }
 
     public final Map<Long, StoreVoiceParticipants.VoiceUser> component1() {
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.java
index 08f3a38973..2232e400b2 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion$get$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.settings;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.api.permission.Permission;
 import com.discord.models.domain.ModelVoiceRegion;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.guild.Guild;
@@ -68,7 +69,7 @@ public final class WidgetVoiceChannelSettings$Model$Companion$get$1 extends o im
         }
         List sortedWith = u.sortedWith(arrayList, new WidgetVoiceChannelSettings$Model$Companion$get$1$$special$$inlined$compareBy$1(t.getCASE_INSENSITIVE_ORDER(d0.a)));
         boolean canAndIsElevated = PermissionUtils.canAndIsElevated(16, Long.valueOf(longValue), me2.getMfaEnabled(), guild.getMfaLevel());
-        boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(268435456, Long.valueOf(longValue), me2.getMfaEnabled(), guild.getMfaLevel());
+        boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(Permission.MANAGE_ROLES, Long.valueOf(longValue), me2.getMfaEnabled(), guild.getMfaLevel());
         int maxVoiceBitrateKbps = GuildUtilsKt.getMaxVoiceBitrateKbps(guild, channel);
         Experiment guildExperiment = this.$experimentStore.getGuildExperiment("2020-09_guild_voice_channel_latency_routing", guild.getId(), false);
         return new WidgetVoiceChannelSettings.Model(channel, canAndIsElevated, canAndIsElevated2, maxVoiceBitrateKbps, sortedWith, guildExperiment != null && guildExperiment.getBucket() == 1, guild.getId());
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java
index 4f83934491..60aa017917 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java
@@ -5,6 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.discord.R;
 import com.discord.databinding.WidgetVoiceChannelSettingsBinding;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.TextInputLayout;
@@ -21,68 +22,68 @@ public final /* synthetic */ class WidgetVoiceChannelSettings$binding$2 extends
 
     public final WidgetVoiceChannelSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362127;
-        View findViewById = view.findViewById(2131362127);
+        int i = R.id.bitrate_divider;
+        View findViewById = view.findViewById(R.id.bitrate_divider);
         if (findViewById != null) {
-            i = 2131362128;
-            SeekBar seekBar = (SeekBar) view.findViewById(2131362128);
+            i = R.id.bitrate_seekbar;
+            SeekBar seekBar = (SeekBar) view.findViewById(R.id.bitrate_seekbar);
             if (seekBar != null) {
-                i = 2131362129;
-                TextView textView = (TextView) view.findViewById(2131362129);
+                i = R.id.bitrate_title;
+                TextView textView = (TextView) view.findViewById(R.id.bitrate_title);
                 if (textView != null) {
-                    i = 2131362369;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362369);
+                    i = R.id.channel_settings_edit_name;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.channel_settings_edit_name);
                     if (textInputLayout != null) {
-                        i = 2131362370;
-                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362370);
+                        i = R.id.channel_settings_edit_topic;
+                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(R.id.channel_settings_edit_topic);
                         if (textInputLayout2 != null) {
-                            i = 2131362374;
-                            TextView textView2 = (TextView) view.findViewById(2131362374);
+                            i = R.id.channel_settings_permissions;
+                            TextView textView2 = (TextView) view.findViewById(R.id.channel_settings_permissions);
                             if (textView2 != null) {
-                                i = 2131362382;
-                                TextView textView3 = (TextView) view.findViewById(2131362382);
+                                i = R.id.channel_settings_region_override;
+                                TextView textView3 = (TextView) view.findViewById(R.id.channel_settings_region_override);
                                 if (textView3 != null) {
-                                    i = 2131362383;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362383);
+                                    i = R.id.channel_settings_region_override_container;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.channel_settings_region_override_container);
                                     if (linearLayout != null) {
-                                        i = 2131362384;
-                                        TextView textView4 = (TextView) view.findViewById(2131362384);
+                                        i = R.id.channel_settings_region_override_help;
+                                        TextView textView4 = (TextView) view.findViewById(R.id.channel_settings_region_override_help);
                                         if (textView4 != null) {
-                                            i = 2131362385;
-                                            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362385);
+                                            i = R.id.channel_settings_save;
+                                            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(R.id.channel_settings_save);
                                             if (floatingActionButton != null) {
-                                                i = 2131362389;
-                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362389);
+                                                i = R.id.channel_settings_section_user_management;
+                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(R.id.channel_settings_section_user_management);
                                                 if (linearLayout2 != null) {
-                                                    i = 2131362883;
-                                                    TextView textView5 = (TextView) view.findViewById(2131362883);
+                                                    i = R.id.current_bitrate_display;
+                                                    TextView textView5 = (TextView) view.findViewById(R.id.current_bitrate_display);
                                                     if (textView5 != null) {
-                                                        i = 2131362884;
-                                                        TextView textView6 = (TextView) view.findViewById(2131362884);
+                                                        i = R.id.current_user_limit_display;
+                                                        TextView textView6 = (TextView) view.findViewById(R.id.current_user_limit_display);
                                                         if (textView6 != null) {
-                                                            i = 2131364627;
-                                                            View findViewById2 = view.findViewById(2131364627);
+                                                            i = R.id.region_override_divider;
+                                                            View findViewById2 = view.findViewById(R.id.region_override_divider);
                                                             if (findViewById2 != null) {
-                                                                i = 2131365051;
-                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365051);
+                                                                i = R.id.settings_bitrate;
+                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(R.id.settings_bitrate);
                                                                 if (linearLayout3 != null) {
-                                                                    i = 2131365052;
-                                                                    TextView textView7 = (TextView) view.findViewById(2131365052);
+                                                                    i = R.id.settings_bitrate_help;
+                                                                    TextView textView7 = (TextView) view.findViewById(R.id.settings_bitrate_help);
                                                                     if (textView7 != null) {
-                                                                        i = 2131365138;
-                                                                        LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131365138);
+                                                                        i = R.id.settings_user_limit;
+                                                                        LinearLayout linearLayout4 = (LinearLayout) view.findViewById(R.id.settings_user_limit);
                                                                         if (linearLayout4 != null) {
-                                                                            i = 2131365139;
-                                                                            TextView textView8 = (TextView) view.findViewById(2131365139);
+                                                                            i = R.id.settings_user_limit_help;
+                                                                            TextView textView8 = (TextView) view.findViewById(R.id.settings_user_limit_help);
                                                                             if (textView8 != null) {
-                                                                                i = 2131365651;
-                                                                                View findViewById3 = view.findViewById(2131365651);
+                                                                                i = R.id.user_limit_divider;
+                                                                                View findViewById3 = view.findViewById(R.id.user_limit_divider);
                                                                                 if (findViewById3 != null) {
-                                                                                    i = 2131365652;
-                                                                                    SeekBar seekBar2 = (SeekBar) view.findViewById(2131365652);
+                                                                                    i = R.id.user_limit_seekbar;
+                                                                                    SeekBar seekBar2 = (SeekBar) view.findViewById(R.id.user_limit_seekbar);
                                                                                     if (seekBar2 != null) {
-                                                                                        i = 2131365653;
-                                                                                        TextView textView9 = (TextView) view.findViewById(2131365653);
+                                                                                        i = R.id.user_limit_title;
+                                                                                        TextView textView9 = (TextView) view.findViewById(R.id.user_limit_title);
                                                                                         if (textView9 != null) {
                                                                                             return new WidgetVoiceChannelSettingsBinding((CoordinatorLayout) view, findViewById, seekBar, textView, textInputLayout, textInputLayout2, textView2, textView3, linearLayout, textView4, floatingActionButton, linearLayout2, textView5, textView6, findViewById2, linearLayout3, textView7, linearLayout4, textView8, findViewById3, seekBar2, textView9);
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java
index 38a0a2b79c..d74c178f12 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.settings;
 
 import android.content.Context;
 import android.view.MenuItem;
+import com.discord.R;
 import com.discord.widgets.voice.settings.WidgetVoiceChannelSettings;
 import d0.z.d.m;
 import rx.functions.Action2;
@@ -17,7 +18,7 @@ public final class WidgetVoiceChannelSettings$configureUI$1<T1, T2> implements A
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131364079) {
+        if (menuItem.getItemId() == R.id.menu_channel_settings_delete) {
             WidgetVoiceChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel());
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java
index 0289345204..5631a9b500 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.settings;
 
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -23,6 +24,6 @@ public final class WidgetVoiceChannelSettings$saveChannel$1 extends o implements
     }
 
     public final void invoke(Channel channel) {
-        c.a.e.o.g(this.this$0.getContext(), 2131887343, 0, null, 12);
+        c.a.e.o.g(this.this$0.getContext(), R.string.channel_settings_have_been_updated, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$showRegionDialog$2.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$showRegionDialog$2.java
index f55fb3f696..13a4b8628b 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$showRegionDialog$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$showRegionDialog$2.java
@@ -2,6 +2,7 @@ package com.discord.widgets.voice.settings;
 
 import android.widget.TextView;
 import c.a.l.b;
+import com.discord.R;
 import com.discord.models.domain.ModelVoiceRegion;
 import com.discord.utilities.stateful.StatefulViews;
 import d0.z.d.m;
@@ -37,7 +38,7 @@ public final class WidgetVoiceChannelSettings$showRegionDialog$2 extends o imple
             access$getState$p.put(textView.getId(), null);
             TextView textView2 = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f;
             m.checkNotNullExpressionValue(textView2, "binding.channelSettingsRegionOverride");
-            textView2.setText(b.k(this.this$0, 2131886802, new Object[0], null, 4));
+            textView2.setText(b.k(this.this$0, R.string.automatic_region, new Object[0], null, 4));
         } else {
             StatefulViews access$getState$p2 = WidgetVoiceChannelSettings.access$getState$p(this.this$0);
             TextView textView3 = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f;
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
index 684627be65..b1d28d9aa6 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
@@ -19,6 +19,7 @@ import c.a.e.q;
 import c.a.j.j4;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetVoiceChannelSettingsBinding;
@@ -61,7 +62,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private static final String INTENT_EXTRA_CHANNEL_ID = "INTENT_EXTRA_CHANNEL_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetVoiceChannelSettings$binding$2.INSTANCE, null, 2, null);
-    private final StatefulViews state = new StatefulViews(2131362369, 2131362370, 2131362884, 2131362883, 2131362382);
+    private final StatefulViews state = new StatefulViews(R.id.channel_settings_edit_name, R.id.channel_settings_edit_topic, R.id.current_user_limit_display, R.id.current_bitrate_display, R.id.channel_settings_region_override);
 
     /* compiled from: WidgetVoiceChannelSettings.kt */
     public static final class Companion {
@@ -74,7 +75,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
 
         public final void launch(long j, Context context) {
             m.checkNotNullParameter(context, "context");
-            Intent putExtra = new Intent().putExtra("INTENT_EXTRA_CHANNEL_ID", j);
+            Intent putExtra = new Intent().putExtra(WidgetVoiceChannelSettings.INTENT_EXTRA_CHANNEL_ID, j);
             m.checkNotNullExpressionValue(putExtra, "Intent().putExtra(INTENT…RA_CHANNEL_ID, channelId)");
             l.d(context, WidgetVoiceChannelSettings.class, putExtra);
         }
@@ -257,7 +258,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
     }
 
     public WidgetVoiceChannelSettings() {
-        super(2131559342);
+        super(R.layout.widget_voice_channel_settings);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetVoiceChannelSettings widgetVoiceChannelSettings, Model model) {
@@ -323,9 +324,9 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         this.state.clear(true);
         int i = 0;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131887342);
+        setActionBarTitle(R.string.channel_settings);
         setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2));
-        AppFragment.setActionBarOptionsMenu$default(this, 2131623968, new WidgetVoiceChannelSettings$configureUI$1(this, model), null, 4, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_voice_channel_settings, new WidgetVoiceChannelSettings$configureUI$1(this, model), null, 4, null);
         TextView textView = getBinding().l;
         m.checkNotNullExpressionValue(textView, "binding.currentUserLimitDisplay");
         StatefulViews statefulViews = this.state;
@@ -334,7 +335,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         textView.setText((CharSequence) statefulViews.get(textView2.getId(), getUserLimitDisplayString(model.getChannel().B())));
         TextView textView3 = getBinding().p;
         m.checkNotNullExpressionValue(textView3, "binding.settingsUserLimitHelp");
-        c.a.l.b.n(textView3, 2131888634, new Object[0], null, 4);
+        c.a.l.b.n(textView3, R.string.form_help_user_limit, new Object[0], null, 4);
         SeekBar seekBar = getBinding().r;
         m.checkNotNullExpressionValue(seekBar, "binding.userLimitSeekbar");
         seekBar.setProgress(model.getChannel().B());
@@ -349,7 +350,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         textView4.setText((CharSequence) statefulViews2.get(textView5.getId(), getBitrateDisplayString(c2)));
         TextView textView6 = getBinding().n;
         m.checkNotNullExpressionValue(textView6, "binding.settingsBitrateHelp");
-        c.a.l.b.n(textView6, 2131888603, new Object[]{"64"}, null, 4);
+        c.a.l.b.n(textView6, R.string.form_help_bitrate, new Object[]{"64"}, null, 4);
         SeekBar seekBar2 = getBinding().b;
         m.checkNotNullExpressionValue(seekBar2, "binding.bitrateSeekbar");
         int maxBitrate = model.getMaxBitrate();
@@ -376,7 +377,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         }
         ModelVoiceRegion modelVoiceRegion = (ModelVoiceRegion) obj;
         if (modelVoiceRegion == null || (str = modelVoiceRegion.getName()) == null) {
-            str = getString(2131886802);
+            str = getString(R.string.automatic_region);
             m.checkNotNullExpressionValue(str, "getString(R.string.automatic_region)");
         }
         TextView textView8 = getBinding().f;
@@ -384,7 +385,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         textView8.setText(str);
         TextView textView9 = getBinding().h;
         m.checkNotNullExpressionValue(textView9, "binding.channelSettingsRegionOverrideHelp");
-        c.a.l.b.n(textView9, 2131888623, new Object[0], null, 4);
+        c.a.l.b.n(textView9, R.string.form_help_region_override, new Object[0], null, 4);
         getBinding().g.setOnClickListener(new WidgetVoiceChannelSettings$configureUI$4(this, model));
         if (!model.getCanManageChannel() || !model.getShouldShowRtcRegionOption()) {
             z2 = false;
@@ -455,7 +456,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         m.checkNotNullExpressionValue(linearLayout2, "binding.root");
         Context context = linearLayout2.getContext();
         m.checkNotNullExpressionValue(context, "binding.root.context");
-        c.a.l.b.n(textView, 2131888085, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
+        c.a.l.b.n(textView, R.string.delete_channel_body, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
         create.show();
     }
 
@@ -471,11 +472,11 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         if (i == 0) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            return c.a.l.b.i(resources, 2131891765, new Object[0], null, 4);
+            return c.a.l.b.i(resources, R.string.no_user_limit, new Object[0], null, 4);
         }
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        return StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755241, i, Integer.valueOf(i));
+        return StringResourceUtilsKt.getQuantityString(resources2, requireContext(), (int) R.plurals.num_users_num, i, Integer.valueOf(i));
     }
 
     public static final void launch(long j, Context context) {
@@ -490,8 +491,8 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         n.a aVar = n.j;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        CharSequence k = c.a.l.b.k(this, 2131888757, new Object[0], null, 4);
-        List listOf = d0.t.m.listOf(c.a.l.b.k(this, 2131886802, new Object[0], null, 4));
+        CharSequence k = c.a.l.b.k(this, R.string.form_label_region_override, new Object[0], null, 4);
+        List listOf = d0.t.m.listOf(c.a.l.b.k(this, R.string.automatic_region, new Object[0], null, 4));
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
         for (ModelVoiceRegion modelVoiceRegion : list) {
             arrayList.add(modelVoiceRegion.getName());
@@ -534,6 +535,6 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", -1)), this, null, 2, null), WidgetVoiceChannelSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetVoiceChannelSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getMostRecentIntent().getLongExtra(INTENT_EXTRA_CHANNEL_ID, -1)), this, null, 2, null), WidgetVoiceChannelSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetVoiceChannelSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java
index 93a2fa35d3..37f77d6901 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java
@@ -9,6 +9,7 @@ import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.api.voice.state.VoiceState;
 import com.discord.databinding.VoiceUserListItemHeaderBinding;
 import com.discord.databinding.VoiceUserListItemUserBinding;
@@ -338,7 +339,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
     public static final class ViewHolderDivider extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderDivider(CallParticipantsAdapter callParticipantsAdapter) {
-            super(2131558856, callParticipantsAdapter);
+            super((int) R.layout.voice_user_list_item_divider, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
         }
     }
@@ -349,7 +350,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderHeader(CallParticipantsAdapter callParticipantsAdapter) {
-            super(2131558857, callParticipantsAdapter);
+            super((int) R.layout.voice_user_list_item_header, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -369,7 +370,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
                 m.checkNotNullExpressionValue(textView, "binding.voiceUserListItemHeaderLabel");
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.voiceUserListItemHeaderLabel");
-                textView.setText(b.j(textView2, 2131889177, new Object[]{((ListItem.SpectatorsHeader) mGRecyclerDataPayload).getStreamerName()}, null, 4));
+                textView.setText(b.j(textView2, R.string.go_live_watching_user, new Object[]{((ListItem.SpectatorsHeader) mGRecyclerDataPayload).getStreamerName()}, null, 4));
             }
         }
     }
@@ -378,7 +379,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
     public static final class ViewHolderInvite extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderInvite(CallParticipantsAdapter callParticipantsAdapter) {
-            super(2131558858, callParticipantsAdapter);
+            super((int) R.layout.voice_user_list_item_invite, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
         }
 
@@ -402,36 +403,36 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderUser(CallParticipantsAdapter callParticipantsAdapter, boolean z2) {
-            super(2131558859, callParticipantsAdapter);
+            super((int) R.layout.voice_user_list_item_user, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
             this.quantizeUserAvatar = z2;
             View view = this.itemView;
-            int i = 2131365843;
-            ImageView imageView = (ImageView) view.findViewById(2131365843);
+            int i = R.id.voice_user_list_item_deafen_indicator;
+            ImageView imageView = (ImageView) view.findViewById(R.id.voice_user_list_item_deafen_indicator);
             if (imageView != null) {
-                i = 2131365845;
-                TextView textView = (TextView) view.findViewById(2131365845);
+                i = R.id.voice_user_list_item_live_indicator;
+                TextView textView = (TextView) view.findViewById(R.id.voice_user_list_item_live_indicator);
                 if (textView != null) {
-                    i = 2131365846;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131365846);
+                    i = R.id.voice_user_list_item_mute_indicator;
+                    ImageView imageView2 = (ImageView) view.findViewById(R.id.voice_user_list_item_mute_indicator);
                     if (imageView2 != null) {
-                        i = 2131365847;
-                        ImageView imageView3 = (ImageView) view.findViewById(2131365847);
+                        i = R.id.voice_user_list_item_spectating_indicator;
+                        ImageView imageView3 = (ImageView) view.findViewById(R.id.voice_user_list_item_spectating_indicator);
                         if (imageView3 != null) {
-                            i = 2131365848;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365848);
+                            i = R.id.voice_user_list_item_toggle_ringing;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.voice_user_list_item_toggle_ringing);
                             if (materialButton != null) {
-                                i = 2131365849;
-                                VoiceUserView voiceUserView = (VoiceUserView) view.findViewById(2131365849);
+                                i = R.id.voice_user_list_item_user_avatar;
+                                VoiceUserView voiceUserView = (VoiceUserView) view.findViewById(R.id.voice_user_list_item_user_avatar);
                                 if (voiceUserView != null) {
-                                    i = 2131365850;
-                                    TextView textView2 = (TextView) view.findViewById(2131365850);
+                                    i = R.id.voice_user_list_item_user_name;
+                                    TextView textView2 = (TextView) view.findViewById(R.id.voice_user_list_item_user_name);
                                     if (textView2 != null) {
-                                        i = 2131365851;
-                                        StreamPreviewView streamPreviewView = (StreamPreviewView) view.findViewById(2131365851);
+                                        i = R.id.voice_user_list_item_user_stream_preview;
+                                        StreamPreviewView streamPreviewView = (StreamPreviewView) view.findViewById(R.id.voice_user_list_item_user_stream_preview);
                                         if (streamPreviewView != null) {
-                                            i = 2131365852;
-                                            ImageView imageView4 = (ImageView) view.findViewById(2131365852);
+                                            i = R.id.voice_user_list_item_video_indicator;
+                                            ImageView imageView4 = (ImageView) view.findViewById(R.id.voice_user_list_item_video_indicator);
                                             if (imageView4 != null) {
                                                 VoiceUserListItemUserBinding voiceUserListItemUserBinding = new VoiceUserListItemUserBinding((LinearLayout) view, imageView, textView, imageView2, imageView3, materialButton, voiceUserView, textView2, streamPreviewView, imageView4);
                                                 m.checkNotNullExpressionValue(voiceUserListItemUserBinding, "VoiceUserListItemUserBinding.bind(itemView)");
@@ -465,7 +466,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
             if (this.quantizeUserAvatar) {
                 this.binding.g.setOnBitmapLoadedListener(new CallParticipantsAdapter$ViewHolderUser$onConfigure$1(colorId));
             }
-            this.binding.g.a(participant, 2131165297);
+            this.binding.g.a(participant, R.dimen.avatar_size_standard);
             TextView textView = this.binding.h;
             m.checkNotNullExpressionValue(textView, "binding.voiceUserListItemUserName");
             textView.setText(participant.getDisplayName());
@@ -479,11 +480,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
             if (participant.isRinging()) {
                 MaterialButton materialButton3 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton3, "binding.voiceUserListItemToggleRinging");
-                charSequence = b.j(materialButton3, 2131894010, new Object[0], null, 4);
+                charSequence = b.j(materialButton3, R.string.stop_ringing, new Object[0], null, 4);
             } else {
                 MaterialButton materialButton4 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton4, "binding.voiceUserListItemToggleRinging");
-                charSequence = b.j(materialButton4, 2131893040, new Object[0], null, 4);
+                charSequence = b.j(materialButton4, R.string.ring, new Object[0], null, 4);
             }
             materialButton2.setText(charSequence);
             this.binding.f.setOnClickListener(new CallParticipantsAdapter$ViewHolderUser$onConfigure$3(this, participant));
@@ -492,11 +493,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
             if (participant.isRinging()) {
                 MaterialButton materialButton6 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton6, "binding.voiceUserListItemToggleRinging");
-                charSequence2 = b.j(materialButton6, 2131894011, new Object[]{participant.getDisplayName()}, null, 4);
+                charSequence2 = b.j(materialButton6, R.string.stop_ringing_username_a11y_label, new Object[]{participant.getDisplayName()}, null, 4);
             } else {
                 MaterialButton materialButton7 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton7, "binding.voiceUserListItemToggleRinging");
-                charSequence2 = b.j(materialButton7, 2131893041, new Object[]{participant.getDisplayName()}, null, 4);
+                charSequence2 = b.j(materialButton7, R.string.ring_username_a11y_label, new Object[]{participant.getDisplayName()}, null, 4);
             }
             materialButton5.setContentDescription(charSequence2);
             if (!participant.isConnected() || participant.getVoiceState() == null) {
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java
index bbfe23672a..1647aa8a09 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.voice.sheet;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.discord.R;
 import com.discord.databinding.WidgetVoiceNoiseCancellationBottomSheetBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -18,11 +19,11 @@ public final /* synthetic */ class WidgetNoiseCancellationBottomSheet$binding$2
 
     public final WidgetVoiceNoiseCancellationBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364240;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364240);
+        int i = R.id.noise_cancellation_enable_button;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.noise_cancellation_enable_button);
         if (materialButton != null) {
-            i = 2131364241;
-            TextView textView = (TextView) view.findViewById(2131364241);
+            i = R.id.noise_cancellation_learn_more;
+            TextView textView = (TextView) view.findViewById(R.id.noise_cancellation_learn_more);
             if (textView != null) {
                 return new WidgetVoiceNoiseCancellationBottomSheetBinding((LinearLayout) view, materialButton, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.java
index 795bf4af89..528bf46ea0 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$onResume$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.sheet;
 
+import androidx.core.app.NotificationCompat;
 import com.discord.widgets.voice.sheet.WidgetNoiseCancellationBottomSheetViewModel;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -24,7 +25,7 @@ public final class WidgetNoiseCancellationBottomSheet$onResume$1 extends o imple
     }
 
     public final void invoke(WidgetNoiseCancellationBottomSheetViewModel.Event event) {
-        m.checkNotNullParameter(event, "event");
+        m.checkNotNullParameter(event, NotificationCompat.CATEGORY_EVENT);
         WidgetNoiseCancellationBottomSheet.access$handleEvent(this.this$0, event);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
index 7f137c88e3..f1aad4095f 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
@@ -12,6 +12,7 @@ import c.a.e.j0;
 import c.a.e.o;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetVoiceNoiseCancellationBottomSheetBinding;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -68,7 +69,7 @@ public final class WidgetNoiseCancellationBottomSheet extends AppBottomSheet {
     private final void configureUI() {
         TextView textView = getBinding().f2043c;
         m.checkNotNullExpressionValue(textView, "binding.noiseCancellationLearnMore");
-        b.n(textView, 2131891092, new Object[]{f.a.a(360040843952L, null)}, null, 4);
+        b.n(textView, R.string.learn_more_link, new Object[]{f.a.a(360040843952L, null)}, null, 4);
         TextView textView2 = getBinding().f2043c;
         m.checkNotNullExpressionValue(textView2, "binding.noiseCancellationLearnMore");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -91,7 +92,7 @@ public final class WidgetNoiseCancellationBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559343;
+        return R.layout.widget_voice_noise_cancellation_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
index 084e4e89d7..6f9e5316a6 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
@@ -3,6 +3,7 @@ package com.discord.widgets.voice.sheet;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
+import com.discord.R;
 import com.discord.app.AppViewModel;
 import com.discord.stores.StoreMediaSettings;
 import com.discord.stores.StoreStream;
@@ -103,6 +104,6 @@ public final class WidgetNoiseCancellationBottomSheetViewModel extends AppViewMo
     public final void onNoiseCancellationButtonPressed() {
         this.mediaSettingsStore.setVoiceConfiguration(StoreMediaSettings.NoiseProcessing.Cancellation);
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.ShowToast(2131891771));
+        publishSubject.j.onNext(new Event.ShowToast(R.string.noise_cancellation_on));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java
index 18741865e2..a16b1a87fc 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java
@@ -10,6 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import c.a.j.k0;
 import c.a.j.l0;
+import com.discord.R;
 import com.discord.databinding.WidgetVoiceBottomSheetBinding;
 import com.discord.utilities.view.recycler.MaxHeightRecyclerView;
 import com.discord.widgets.voice.controls.AnchoredVoiceControlsView;
@@ -27,68 +28,68 @@ public final /* synthetic */ class WidgetVoiceBottomSheet$binding$2 extends k im
 
     public final WidgetVoiceBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363113;
-        View findViewById = view.findViewById(2131363113);
+        int i = R.id.empty;
+        View findViewById = view.findViewById(R.id.empty);
         if (findViewById != null) {
             k0 k0Var = new k0((LinearLayout) findViewById);
-            i = 2131363710;
-            View findViewById2 = view.findViewById(2131363710);
+            i = R.id.header;
+            View findViewById2 = view.findViewById(R.id.header);
             if (findViewById2 != null) {
-                int i2 = 2131365564;
-                Barrier barrier = (Barrier) findViewById2.findViewById(2131365564);
+                int i2 = R.id.title_text_barrier;
+                Barrier barrier = (Barrier) findViewById2.findViewById(R.id.title_text_barrier);
                 if (barrier != null) {
-                    i2 = 2131365811;
-                    ImageView imageView = (ImageView) findViewById2.findViewById(2131365811);
+                    i2 = R.id.voice_bottom_sheet_header_deafen;
+                    ImageView imageView = (ImageView) findViewById2.findViewById(R.id.voice_bottom_sheet_header_deafen);
                     if (imageView != null) {
-                        i2 = 2131365812;
-                        ImageView imageView2 = (ImageView) findViewById2.findViewById(2131365812);
+                        i2 = R.id.voice_bottom_sheet_header_icon;
+                        ImageView imageView2 = (ImageView) findViewById2.findViewById(R.id.voice_bottom_sheet_header_icon);
                         if (imageView2 != null) {
-                            i2 = 2131365813;
-                            ImageView imageView3 = (ImageView) findViewById2.findViewById(2131365813);
+                            i2 = R.id.voice_bottom_sheet_header_invite;
+                            ImageView imageView3 = (ImageView) findViewById2.findViewById(R.id.voice_bottom_sheet_header_invite);
                             if (imageView3 != null) {
-                                i2 = 2131365814;
-                                ImageView imageView4 = (ImageView) findViewById2.findViewById(2131365814);
+                                i2 = R.id.voice_bottom_sheet_header_noise_cancellation;
+                                ImageView imageView4 = (ImageView) findViewById2.findViewById(R.id.voice_bottom_sheet_header_noise_cancellation);
                                 if (imageView4 != null) {
-                                    i2 = 2131365815;
-                                    ImageView imageView5 = (ImageView) findViewById2.findViewById(2131365815);
+                                    i2 = R.id.voice_bottom_sheet_header_settings;
+                                    ImageView imageView5 = (ImageView) findViewById2.findViewById(R.id.voice_bottom_sheet_header_settings);
                                     if (imageView5 != null) {
-                                        i2 = 2131365816;
-                                        TextView textView = (TextView) findViewById2.findViewById(2131365816);
+                                        i2 = R.id.voice_bottom_sheet_header_subtitle;
+                                        TextView textView = (TextView) findViewById2.findViewById(R.id.voice_bottom_sheet_header_subtitle);
                                         if (textView != null) {
-                                            i2 = 2131365817;
-                                            TextView textView2 = (TextView) findViewById2.findViewById(2131365817);
+                                            i2 = R.id.voice_bottom_sheet_header_title;
+                                            TextView textView2 = (TextView) findViewById2.findViewById(R.id.voice_bottom_sheet_header_title);
                                             if (textView2 != null) {
                                                 l0 l0Var = new l0((ConstraintLayout) findViewById2, barrier, imageView, imageView2, imageView3, imageView4, imageView5, textView, textView2);
-                                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365807);
+                                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(R.id.voice_bottom_sheet_bottom_content_container);
                                                 if (constraintLayout != null) {
-                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365808);
+                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.voice_bottom_sheet_connect);
                                                     if (materialButton != null) {
-                                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365809);
+                                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(R.id.voice_bottom_sheet_connect_container);
                                                         if (relativeLayout != null) {
-                                                            AnchoredVoiceControlsView anchoredVoiceControlsView = (AnchoredVoiceControlsView) view.findViewById(2131365810);
+                                                            AnchoredVoiceControlsView anchoredVoiceControlsView = (AnchoredVoiceControlsView) view.findViewById(R.id.voice_bottom_sheet_controls);
                                                             if (anchoredVoiceControlsView != null) {
-                                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365818);
+                                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.voice_bottom_sheet_join_video);
                                                                 if (materialButton2 != null) {
-                                                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365819);
+                                                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(R.id.voice_bottom_sheet_recycler);
                                                                     if (maxHeightRecyclerView != null) {
                                                                         CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
                                                                         return new WidgetVoiceBottomSheetBinding(coordinatorLayout, k0Var, l0Var, constraintLayout, materialButton, relativeLayout, anchoredVoiceControlsView, materialButton2, maxHeightRecyclerView, coordinatorLayout);
                                                                     }
-                                                                    i = 2131365819;
+                                                                    i = R.id.voice_bottom_sheet_recycler;
                                                                 } else {
-                                                                    i = 2131365818;
+                                                                    i = R.id.voice_bottom_sheet_join_video;
                                                                 }
                                                             } else {
-                                                                i = 2131365810;
+                                                                i = R.id.voice_bottom_sheet_controls;
                                                             }
                                                         } else {
-                                                            i = 2131365809;
+                                                            i = R.id.voice_bottom_sheet_connect_container;
                                                         }
                                                     } else {
-                                                        i = 2131365808;
+                                                        i = R.id.voice_bottom_sheet_connect;
                                                     }
                                                 } else {
-                                                    i = 2131365807;
+                                                    i = R.id.voice_bottom_sheet_bottom_content_container;
                                                 }
                                             }
                                         }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.java
index 003bc040a0..82399432c5 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$3.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.voice.sheet;
 
+import com.discord.utilities.analytics.Traits;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -24,7 +25,7 @@ public final class WidgetVoiceBottomSheet$onResume$3 extends o implements Functi
     }
 
     public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "subscription");
+        m.checkNotNullParameter(subscription, Traits.Payment.Type.SUBSCRIPTION);
         WidgetVoiceBottomSheet.access$setViewModelEventSubscription$p(this.this$0, subscription);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
index 003eb0a26e..5ec1ff8015 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
@@ -20,6 +20,7 @@ import c.a.e.o;
 import c.a.j.k0;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetVoiceBottomSheetBinding;
@@ -384,8 +385,8 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
             WidgetVoiceBottomSheet widgetVoiceBottomSheet = new WidgetVoiceBottomSheet();
             Bundle bundle = new Bundle();
             bundle.putLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", j);
-            bundle.putSerializable("ARG_FEATURE_CONTEXT", featureContext);
-            bundle.putBoolean("ARG_FORWARD_TO_FULLSCREEN_IF_VIDEO_ACTIVATED", z2);
+            bundle.putSerializable(WidgetVoiceBottomSheet.ARG_FEATURE_CONTEXT, featureContext);
+            bundle.putBoolean(WidgetVoiceBottomSheet.ARG_FORWARD_TO_FULLSCREEN_IF_VIDEO_ACTIVATED, z2);
             widgetVoiceBottomSheet.setArguments(bundle);
             widgetVoiceBottomSheet.show(fragmentManager, WidgetVoiceBottomSheet.class.getSimpleName());
             return widgetVoiceBottomSheet;
@@ -485,7 +486,7 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
             CoordinatorLayout coordinatorLayout = getBinding().i;
             CoordinatorLayout coordinatorLayout2 = getBinding().i;
             m.checkNotNullExpressionValue(coordinatorLayout2, "binding.voiceBottomSheetRoot");
-            coordinatorLayout.setBackgroundColor(ColorCompat.getThemedColor(coordinatorLayout2, 2130968904));
+            coordinatorLayout.setBackgroundColor(ColorCompat.getThemedColor(coordinatorLayout2, (int) R.attr.colorBackgroundPrimary));
             return;
         }
         if (bottomContent instanceof BottomContent.Controls) {
@@ -513,7 +514,7 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
             CoordinatorLayout coordinatorLayout3 = getBinding().i;
             CoordinatorLayout coordinatorLayout4 = getBinding().i;
             m.checkNotNullExpressionValue(coordinatorLayout4, "binding.voiceBottomSheetRoot");
-            coordinatorLayout3.setBackgroundColor(ColorCompat.getThemedColor(coordinatorLayout4, 2130968905));
+            coordinatorLayout3.setBackgroundColor(ColorCompat.getThemedColor(coordinatorLayout4, (int) R.attr.colorBackgroundSecondary));
         } else if (bottomContent instanceof BottomContent.Connect) {
             AnchoredVoiceControlsView anchoredVoiceControlsView4 = getBinding().f;
             m.checkNotNullExpressionValue(anchoredVoiceControlsView4, "binding.voiceBottomSheetControls");
@@ -524,12 +525,12 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
             relativeLayout3.setVisibility(0);
             BottomContent.Connect connect = (BottomContent.Connect) bottomContent;
             if (connect.isConnectEnabled()) {
-                getBinding().d.setText(2131890978);
+                getBinding().d.setText(R.string.join_voice_channel_cta);
                 MaterialButton materialButton = getBinding().d;
                 m.checkNotNullExpressionValue(materialButton, "binding.voiceBottomSheetConnect");
                 materialButton.setEnabled(true);
             } else {
-                getBinding().d.setText(2131887289);
+                getBinding().d.setText(R.string.channel_locked_short);
                 MaterialButton materialButton2 = getBinding().d;
                 m.checkNotNullExpressionValue(materialButton2, "binding.voiceBottomSheetConnect");
                 materialButton2.setEnabled(false);
@@ -542,7 +543,7 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
             CoordinatorLayout coordinatorLayout5 = getBinding().i;
             CoordinatorLayout coordinatorLayout6 = getBinding().i;
             m.checkNotNullExpressionValue(coordinatorLayout6, "binding.voiceBottomSheetRoot");
-            coordinatorLayout5.setBackgroundColor(ColorCompat.getThemedColor(coordinatorLayout6, 2130968904));
+            coordinatorLayout5.setBackgroundColor(ColorCompat.getThemedColor(coordinatorLayout6, (int) R.attr.colorBackgroundPrimary));
         }
     }
 
@@ -612,7 +613,7 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         imageView.setActivated(viewState.isDeafened());
         ImageView imageView2 = getBinding().f2038c.b;
         m.checkNotNullExpressionValue(imageView2, "binding.header.voiceBottomSheetHeaderDeafen");
-        imageView2.setContentDescription(viewState.isDeafened() ? getString(2131894496) : getString(2131888065));
+        imageView2.setContentDescription(viewState.isDeafened() ? getString(R.string.undeafen) : getString(R.string.deafen));
         getBinding().f2038c.b.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$1(this));
         ImageView imageView3 = getBinding().f2038c.f123c;
         m.checkNotNullExpressionValue(imageView3, "binding.header.voiceBottomSheetHeaderInvite");
@@ -622,9 +623,9 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         getBinding().f2038c.d.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$4(this));
         if (viewState.isNoiseCancellationActive() != null) {
             if (m.areEqual(viewState.isNoiseCancellationActive(), Boolean.TRUE)) {
-                getBinding().f2038c.d.setImageResource(2131231834);
+                getBinding().f2038c.d.setImageResource(R.drawable.ic_noise_cancellation_active_24dp);
             } else {
-                getBinding().f2038c.d.setImageResource(2131231835);
+                getBinding().f2038c.d.setImageResource(R.drawable.ic_noise_cancellation_disabled_24dp);
             }
             ImageView imageView4 = getBinding().f2038c.d;
             m.checkNotNullExpressionValue(imageView4, "binding.header.voiceBott…etHeaderNoiseCancellation");
@@ -752,14 +753,14 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         d0.z.d.m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         d0.z.d.m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891768);
-        String string2 = requireContext.getString(2131891755);
+        String string = requireContext.getString(R.string.no_video_permission_dialog_title);
+        String string2 = requireContext.getString(R.string.no_screenshare_permission_dialog_body);
         d0.z.d.m.checkNotNullExpressionValue(string2, "context.getString(R.stri…e_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showNoVideoDevicesToast() {
-        o.i(this, 2131891766, 0, 4);
+        o.i(this, R.string.no_video_devices, 0, 4);
     }
 
     private final void showNoVideoPermissionDialog() {
@@ -770,10 +771,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         d0.z.d.m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         d0.z.d.m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891768);
-        String string2 = requireContext.getString(2131891767);
+        String string = requireContext.getString(R.string.no_video_permission_dialog_title);
+        String string2 = requireContext.getString(R.string.no_video_permission_dialog_body);
         d0.z.d.m.checkNotNullExpressionValue(string2, "context.getString(R.stri…o_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerDeafenedDialog() {
@@ -784,10 +785,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         d0.z.d.m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         d0.z.d.m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893557);
-        String string2 = requireContext.getString(2131893556);
+        String string = requireContext.getString(R.string.server_deafened_dialog_title);
+        String string2 = requireContext.getString(R.string.server_deafened_dialog_body);
         d0.z.d.m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ver_deafened_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerMutedDialog() {
@@ -798,10 +799,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         d0.z.d.m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         d0.z.d.m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893569);
-        String string2 = requireContext.getString(2131893568);
+        String string = requireContext.getString(R.string.server_muted_dialog_title);
+        String string2 = requireContext.getString(R.string.server_muted_dialog_body);
         d0.z.d.m.checkNotNullExpressionValue(string2, "context.getString(R.stri…server_muted_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showSuppressedDialog() {
@@ -812,15 +813,15 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         d0.z.d.m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         d0.z.d.m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131894115);
-        String string2 = requireContext.getString(2131894118);
+        String string = requireContext.getString(R.string.suppressed);
+        String string2 = requireContext.getString(R.string.suppressed_permission_body);
         d0.z.d.m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ppressed_permission_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131892004), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(R.string.okay), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559339;
+        return R.layout.widget_voice_bottom_sheet;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1<? super com.discord.utilities.streams.StreamContext, kotlin.Unit>, kotlin.jvm.functions.Function1<com.discord.utilities.streams.StreamContext, kotlin.Unit> */
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java
index f91c4e3a59..33535c1488 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java
@@ -9,6 +9,7 @@ import androidx.lifecycle.ViewModelKt;
 import c.a.k.a;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildMaxVideoChannelUsers;
 import com.discord.app.AppLog;
@@ -1170,7 +1171,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
                 return;
             }
             this.mediaSettingsStore.toggleSelfDeafened();
-            this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(callModel.isDeafenedByAnySource() ? 2131894998 : 2131894989));
+            this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(callModel.isDeafenedByAnySource() ? R.string.voice_channel_undeafened : R.string.voice_channel_deafened));
         }
     }
 
@@ -1218,10 +1219,10 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
         if (selfMuteFailure == null) {
             WidgetVoiceBottomSheet.BottomContent bottomContent = requireViewState().getBottomContent();
             if (bottomContent != null && (bottomContent instanceof WidgetVoiceBottomSheet.BottomContent.Controls)) {
-                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(((WidgetVoiceBottomSheet.BottomContent.Controls) bottomContent).isMuted() ? 2131894999 : 2131894994));
+                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(((WidgetVoiceBottomSheet.BottomContent.Controls) bottomContent).isMuted() ? R.string.voice_channel_unmuted : R.string.voice_channel_muted));
             }
         } else if (selfMuteFailure.ordinal() == 0) {
-            this.eventSubject.j.onNext(new Event.ShowToast(2131894885));
+            this.eventSubject.j.onNext(new Event.ShowToast(R.string.vad_permission_small));
         }
     }
 
@@ -1241,11 +1242,11 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
             this.mediaSettingsStore.toggleNoiseCancellation();
             if (booleanValue) {
                 PublishSubject<Event> publishSubject2 = this.eventSubject;
-                publishSubject2.j.onNext(new Event.ShowToast(2131891770));
+                publishSubject2.j.onNext(new Event.ShowToast(R.string.noise_cancellation_off));
                 return;
             }
             PublishSubject<Event> publishSubject3 = this.eventSubject;
-            publishSubject3.j.onNext(new Event.ShowToast(2131891771));
+            publishSubject3.j.onNext(new Event.ShowToast(R.string.noise_cancellation_on));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java
index 54378bb771..ee49880643 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java
@@ -3,6 +3,7 @@ package com.discord.widgets.voice.sheet;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
+import com.discord.R;
 import com.discord.databinding.WidgetVoiceSettingsBottomSheetBinding;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import d0.z.d.k;
@@ -18,27 +19,27 @@ public final /* synthetic */ class WidgetVoiceSettingsBottomSheet$binding$2 exte
 
     public final WidgetVoiceSettingsBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365831;
-        TextView textView = (TextView) view.findViewById(2131365831);
+        int i = R.id.voice_settings_invite;
+        TextView textView = (TextView) view.findViewById(R.id.voice_settings_invite);
         if (textView != null) {
-            i = 2131365832;
-            SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365832);
+            i = R.id.voice_settings_noise_suppression;
+            SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(R.id.voice_settings_noise_suppression);
             if (switchMaterial != null) {
-                i = 2131365833;
-                TextView textView2 = (TextView) view.findViewById(2131365833);
+                i = R.id.voice_settings_notifications;
+                TextView textView2 = (TextView) view.findViewById(R.id.voice_settings_notifications);
                 if (textView2 != null) {
-                    i = 2131365834;
-                    TextView textView3 = (TextView) view.findViewById(2131365834);
+                    i = R.id.voice_settings_report;
+                    TextView textView3 = (TextView) view.findViewById(R.id.voice_settings_report);
                     if (textView3 != null) {
                         NestedScrollView nestedScrollView = (NestedScrollView) view;
-                        i = 2131365836;
-                        TextView textView4 = (TextView) view.findViewById(2131365836);
+                        i = R.id.voice_settings_stage_settings;
+                        TextView textView4 = (TextView) view.findViewById(R.id.voice_settings_stage_settings);
                         if (textView4 != null) {
-                            i = 2131365837;
-                            SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131365837);
+                            i = R.id.voice_settings_toggle_video_participants;
+                            SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(R.id.voice_settings_toggle_video_participants);
                             if (switchMaterial2 != null) {
-                                i = 2131365839;
-                                TextView textView5 = (TextView) view.findViewById(2131365839);
+                                i = R.id.voice_settings_voice_settings;
+                                TextView textView5 = (TextView) view.findViewById(R.id.voice_settings_voice_settings);
                                 if (textView5 != null) {
                                     return new WidgetVoiceSettingsBottomSheetBinding(nestedScrollView, textView, switchMaterial, textView2, textView3, nestedScrollView, textView4, switchMaterial2, textView5);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
index fd7d24fa68..b78c15d9de 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
@@ -11,6 +11,7 @@ import c.a.e.h0;
 import c.a.e.j0;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.R;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetVoiceSettingsBottomSheetBinding;
@@ -57,7 +58,7 @@ public final class WidgetVoiceSettingsBottomSheet extends AppBottomSheet {
             WidgetVoiceSettingsBottomSheet widgetVoiceSettingsBottomSheet = new WidgetVoiceSettingsBottomSheet();
             Bundle bundle = new Bundle();
             if (l != null) {
-                bundle.putLong("ARG_CHANNEL_ID", l.longValue());
+                bundle.putLong(WidgetVoiceSettingsBottomSheet.ARG_CHANNEL_ID, l.longValue());
             }
             widgetVoiceSettingsBottomSheet.setArguments(bundle);
             widgetVoiceSettingsBottomSheet.show(fragmentManager, WidgetVoiceSettingsBottomSheet.class.getName());
@@ -154,7 +155,7 @@ public final class WidgetVoiceSettingsBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559344;
+        return R.layout.widget_voice_settings_bottom_sheet;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/voice/stream/StreamNavigator.java b/app/src/main/java/com/discord/widgets/voice/stream/StreamNavigator.java
index 943d912649..833409e63e 100644
--- a/app/src/main/java/com/discord/widgets/voice/stream/StreamNavigator.java
+++ b/app/src/main/java/com/discord/widgets/voice/stream/StreamNavigator.java
@@ -18,7 +18,7 @@ public final class StreamNavigator {
 
     public static final void handleActivityResult(int i, int i2, Intent intent, Function1<? super Intent, Unit> function1) {
         m.checkNotNullParameter(function1, "intentCallback");
-        if (i2 == -1 && i == 420 && intent != null) {
+        if (i2 == -1 && i == START_SCREENSHARE_REQUEST_CODE && intent != null) {
             function1.invoke(intent);
         }
     }
@@ -29,7 +29,7 @@ public final class StreamNavigator {
             m.checkNotNullExpressionValue(requireContext, "fragment?.requireContext() ?: return");
             Object systemService = requireContext.getSystemService("media_projection");
             Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.media.projection.MediaProjectionManager");
-            fragment.startActivityForResult(((MediaProjectionManager) systemService).createScreenCaptureIntent(), 420);
+            fragment.startActivityForResult(((MediaProjectionManager) systemService).createScreenCaptureIntent(), START_SCREENSHARE_REQUEST_CODE);
         }
     }
 }
diff --git a/app/src/main/java/com/esotericsoftware/kryo/io/ByteBufferOutput.java b/app/src/main/java/com/esotericsoftware/kryo/io/ByteBufferOutput.java
index db824325cf..9063aa70d5 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/io/ByteBufferOutput.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/io/ByteBufferOutput.java
@@ -27,7 +27,7 @@ public class ByteBufferOutput extends Output {
         this.byteOrder = ByteOrder.BIG_ENDIAN;
         if (i2 >= -1) {
             this.capacity = i;
-            this.maxCapacity = i2 == -1 ? 2147483639 : i2;
+            this.maxCapacity = i2 == -1 ? Util.MAX_SAFE_ARRAY_SIZE : i2;
             ByteBuffer allocateDirect = ByteBuffer.allocateDirect(i);
             this.niobuffer = allocateDirect;
             allocateDirect.order(this.byteOrder);
@@ -307,7 +307,7 @@ public class ByteBufferOutput extends Output {
         } else if (i >= -1) {
             this.niobuffer = byteBuffer;
             if (i == -1) {
-                i = 2147483639;
+                i = Util.MAX_SAFE_ARRAY_SIZE;
             }
             this.maxCapacity = i;
             this.byteOrder = byteBuffer.order();
diff --git a/app/src/main/java/com/esotericsoftware/kryo/io/Output.java b/app/src/main/java/com/esotericsoftware/kryo/io/Output.java
index bf4d492251..54f04a0482 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/io/Output.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/io/Output.java
@@ -24,7 +24,7 @@ public class Output extends OutputStream {
             throw new IllegalArgumentException(a.l("bufferSize: ", i, " cannot be greater than maxBufferSize: ", i2));
         } else if (i2 >= -1) {
             this.capacity = i;
-            this.maxCapacity = i2 == -1 ? 2147483639 : i2;
+            this.maxCapacity = i2 == -1 ? Util.MAX_SAFE_ARRAY_SIZE : i2;
             this.buffer = new byte[i];
         } else {
             throw new IllegalArgumentException(a.j("maxBufferSize cannot be < -1: ", i2));
@@ -342,7 +342,7 @@ public class Output extends OutputStream {
         } else if (i >= -1) {
             this.buffer = bArr;
             if (i == -1) {
-                i = 2147483639;
+                i = Util.MAX_SAFE_ARRAY_SIZE;
             }
             this.maxCapacity = i;
             this.capacity = bArr.length;
diff --git a/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.java b/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.java
index f72b7a8683..13959d8a12 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeMemoryOutput.java
@@ -1,5 +1,6 @@
 package com.esotericsoftware.kryo.io;
 
+import com.discord.api.permission.Permission;
 import com.esotericsoftware.kryo.KryoException;
 import com.esotericsoftware.kryo.util.UnsafeUtil;
 import com.esotericsoftware.kryo.util.Util;
@@ -245,21 +246,21 @@ public final class UnsafeMemoryOutput extends ByteBufferOutput {
             this.position -= 2;
             return 2;
         }
-        long j6 = j4 | 32768 | ((j5 & 127) << 16);
+        long j6 = j4 | Permission.ATTACH_FILES | ((j5 & 127) << 16);
         long j7 = j5 >>> 7;
         if (j7 == 0) {
             writeLittleEndianInt((int) j6);
             this.position--;
             return 3;
         }
-        long j8 = j6 | 8388608 | ((j7 & 127) << 24);
+        long j8 = j6 | Permission.DEAFEN_MEMBERS | ((j7 & 127) << 24);
         long j9 = j7 >>> 7;
         if (j9 == 0) {
             writeLittleEndianInt((int) j8);
             this.position += 0;
             return 4;
         }
-        writeLittleEndianLong((((j9 & 127) << 32) | 2147483648L | j8) & 68719476735L);
+        writeLittleEndianLong((((j9 & 127) << 32) | Permission.USE_APPLICATION_COMMANDS | j8) & 68719476735L);
         this.position -= 3;
         return 5;
     }
@@ -294,7 +295,7 @@ public final class UnsafeMemoryOutput extends ByteBufferOutput {
             this.position += 0;
             return 4;
         }
-        long j7 = (((long) ((int) (((long) i4) | 2147483648L))) & 4294967295L) | ((j6 & 127) << 32);
+        long j7 = (((long) ((int) (((long) i4) | Permission.USE_APPLICATION_COMMANDS))) & 4294967295L) | ((j6 & 127) << 32);
         long j8 = j6 >>> 7;
         if (j8 == 0) {
             writeLittleEndianLong(j7);
diff --git a/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeOutput.java b/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeOutput.java
index 79212947e0..c55e0c6001 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeOutput.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/io/UnsafeOutput.java
@@ -1,5 +1,6 @@
 package com.esotericsoftware.kryo.io;
 
+import com.discord.api.permission.Permission;
 import com.esotericsoftware.kryo.KryoException;
 import com.esotericsoftware.kryo.util.UnsafeUtil;
 import com.esotericsoftware.kryo.util.Util;
@@ -228,7 +229,7 @@ public final class UnsafeOutput extends Output {
             this.position += 0;
             return 4;
         }
-        writeLittleEndianLong(((((long) (i9 & 127)) << 32) | ((long) i8) | 2147483648L) & 68719476735L);
+        writeLittleEndianLong(((((long) (i9 & 127)) << 32) | ((long) i8) | Permission.USE_APPLICATION_COMMANDS) & 68719476735L);
         this.position -= 3;
         return 5;
     }
@@ -263,7 +264,7 @@ public final class UnsafeOutput extends Output {
             this.position += 0;
             return 4;
         }
-        long j7 = (((long) i4) & 4294967295L) | 2147483648L | ((j6 & 127) << 32);
+        long j7 = (((long) i4) & 4294967295L) | Permission.USE_APPLICATION_COMMANDS | ((j6 & 127) << 32);
         long j8 = j6 >>> 7;
         if (j8 == 0) {
             writeLittleEndianLong(j7);
diff --git a/app/src/main/java/com/esotericsoftware/kryo/serializers/DefaultSerializers.java b/app/src/main/java/com/esotericsoftware/kryo/serializers/DefaultSerializers.java
index b6d7f82d83..47c250480e 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/serializers/DefaultSerializers.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/serializers/DefaultSerializers.java
@@ -182,7 +182,7 @@ public class DefaultSerializers {
             instance.setFirstDayOfWeek(input.readInt(true));
             instance.setMinimalDaysInFirstWeek(input.readInt(true));
             long readLong = input.readLong(false);
-            if (readLong != -12219292800000L && (instance instanceof GregorianCalendar)) {
+            if (readLong != DEFAULT_GREGORIAN_CUTOVER && (instance instanceof GregorianCalendar)) {
                 ((GregorianCalendar) instance).setGregorianChange(new Date(readLong));
             }
             return instance;
@@ -197,7 +197,7 @@ public class DefaultSerializers {
             if (calendar instanceof GregorianCalendar) {
                 output.writeLong(((GregorianCalendar) calendar).getGregorianChange().getTime(), false);
             } else {
-                output.writeLong(-12219292800000L, false);
+                output.writeLong(DEFAULT_GREGORIAN_CUTOVER, false);
             }
         }
     }
diff --git a/app/src/main/java/com/esotericsoftware/kryo/util/IdentityMap.java b/app/src/main/java/com/esotericsoftware/kryo/util/IdentityMap.java
index 81aa31b354..cf11074e08 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/util/IdentityMap.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/util/IdentityMap.java
@@ -286,17 +286,17 @@ public class IdentityMap<K, V> {
     }
 
     private int hash2(int i) {
-        int i2 = i * -1105259343;
+        int i2 = i * PRIME2;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash3(int i) {
-        int i2 = i * -1262997959;
+        int i2 = i * PRIME3;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash4(int i) {
-        int i2 = i * -825114047;
+        int i2 = i * PRIME4;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
diff --git a/app/src/main/java/com/esotericsoftware/kryo/util/IdentityObjectIntMap.java b/app/src/main/java/com/esotericsoftware/kryo/util/IdentityObjectIntMap.java
index c9fe12337d..c568d15236 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/util/IdentityObjectIntMap.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/util/IdentityObjectIntMap.java
@@ -95,17 +95,17 @@ public class IdentityObjectIntMap<K> {
     }
 
     private int hash2(int i) {
-        int i2 = i * -1105259343;
+        int i2 = i * PRIME2;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash3(int i) {
-        int i2 = i * -1262997959;
+        int i2 = i * PRIME3;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash4(int i) {
-        int i2 = i * -825114047;
+        int i2 = i * PRIME4;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
diff --git a/app/src/main/java/com/esotericsoftware/kryo/util/IntMap.java b/app/src/main/java/com/esotericsoftware/kryo/util/IntMap.java
index a10120ff77..bcb56e329d 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/util/IntMap.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/util/IntMap.java
@@ -308,17 +308,17 @@ public class IntMap<V> {
     }
 
     private int hash2(int i) {
-        int i2 = i * -1105259343;
+        int i2 = i * PRIME2;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash3(int i) {
-        int i2 = i * -1262997959;
+        int i2 = i * PRIME3;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash4(int i) {
-        int i2 = i * -825114047;
+        int i2 = i * PRIME4;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
diff --git a/app/src/main/java/com/esotericsoftware/kryo/util/ObjectMap.java b/app/src/main/java/com/esotericsoftware/kryo/util/ObjectMap.java
index ea0ab682ee..24ebb2a5b0 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/util/ObjectMap.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/util/ObjectMap.java
@@ -314,17 +314,17 @@ public class ObjectMap<K, V> {
     }
 
     private int hash2(int i) {
-        int i2 = i * -1105259343;
+        int i2 = i * PRIME2;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash3(int i) {
-        int i2 = i * -1262997959;
+        int i2 = i * PRIME3;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
     private int hash4(int i) {
-        int i2 = i * -825114047;
+        int i2 = i * PRIME4;
         return (i2 ^ (i2 >>> this.hashShift)) & this.mask;
     }
 
diff --git a/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java b/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
index 196b191c5a..d6e44deab1 100644
--- a/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
+++ b/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
@@ -5,6 +5,7 @@ import c.f.b.a.d;
 import c.f.b.a.e;
 import c.f.b.b.g;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import com.facebook.common.internal.Supplier;
 import java.io.File;
 import java.util.Objects;
@@ -68,7 +69,7 @@ public class DiskCacheConfig {
         this.f2195c = supplier;
         this.d = bVar.f2196c;
         this.e = 10485760;
-        this.f = 2097152;
+        this.f = Permission.SPEAK;
         g gVar = bVar.d;
         Objects.requireNonNull(gVar);
         this.g = gVar;
diff --git a/app/src/main/java/com/facebook/drawee/view/DraweeView.java b/app/src/main/java/com/facebook/drawee/view/DraweeView.java
index 31adfc109f..9b62f2a1ba 100644
--- a/app/src/main/java/com/facebook/drawee/view/DraweeView.java
+++ b/app/src/main/java/com/facebook/drawee/view/DraweeView.java
@@ -11,6 +11,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.f.d.d.i;
 import c.f.g.b.c;
 import c.f.j.r.b;
@@ -168,14 +169,14 @@ public class DraweeView<DH extends DraweeHierarchy> extends ImageView {
             int i3 = layoutParams.height;
             boolean z2 = true;
             if (i3 == 0 || i3 == -2) {
-                aspectRatioMeasure$Spec.b = View.MeasureSpec.makeMeasureSpec(View.resolveSize((int) ((((float) (View.MeasureSpec.getSize(aspectRatioMeasure$Spec.a) - paddingRight)) / f) + ((float) paddingBottom)), aspectRatioMeasure$Spec.b), 1073741824);
+                aspectRatioMeasure$Spec.b = View.MeasureSpec.makeMeasureSpec(View.resolveSize((int) ((((float) (View.MeasureSpec.getSize(aspectRatioMeasure$Spec.a) - paddingRight)) / f) + ((float) paddingBottom)), aspectRatioMeasure$Spec.b), BasicMeasure.EXACTLY);
             } else {
                 int i4 = layoutParams.width;
                 if (!(i4 == 0 || i4 == -2)) {
                     z2 = false;
                 }
                 if (z2) {
-                    aspectRatioMeasure$Spec.a = View.MeasureSpec.makeMeasureSpec(View.resolveSize((int) ((((float) (View.MeasureSpec.getSize(aspectRatioMeasure$Spec.b) - paddingBottom)) * f) + ((float) paddingRight)), aspectRatioMeasure$Spec.a), 1073741824);
+                    aspectRatioMeasure$Spec.a = View.MeasureSpec.makeMeasureSpec(View.resolveSize((int) ((((float) (View.MeasureSpec.getSize(aspectRatioMeasure$Spec.b) - paddingBottom)) * f) + ((float) paddingRight)), aspectRatioMeasure$Spec.a), BasicMeasure.EXACTLY);
                 }
             }
         }
diff --git a/app/src/main/java/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.java b/app/src/main/java/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.java
index c651285e2f..0f82a1e5e6 100644
--- a/app/src/main/java/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.java
@@ -6,6 +6,7 @@ import android.graphics.ColorSpace;
 import android.graphics.Rect;
 import android.os.Build;
 import androidx.annotation.VisibleForTesting;
+import androidx.exifinterface.media.ExifInterface;
 import c.f.d.d.c;
 import c.f.d.d.m;
 import c.f.j.j.e;
@@ -20,7 +21,7 @@ import java.util.Locale;
 import java.util.Objects;
 @c
 public abstract class DalvikPurgeableDecoder implements d {
-    public static final byte[] a = {-1, -39};
+    public static final byte[] a = {-1, ExifInterface.MARKER_EOI};
     public final b b;
 
     @c.f.m.d
diff --git a/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java b/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
index 20445b1460..195d2c51a6 100644
--- a/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
@@ -3,6 +3,7 @@ package com.facebook.imagepipeline.platform;
 import android.annotation.TargetApi;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import androidx.exifinterface.media.ExifInterface;
 import c.f.d.d.c;
 import c.f.j.l.n;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -53,7 +54,7 @@ public class KitKatPurgeableDecoder extends DalvikPurgeableDecoder {
             w.i(0, w2, 0, i);
             if (bArr != null) {
                 w2[i] = -1;
-                w2[i + 1] = -39;
+                w2[i + 1] = ExifInterface.MARKER_EOI;
                 i = i2;
             }
             Bitmap decodeByteArray = BitmapFactory.decodeByteArray(w2, 0, i, options);
diff --git a/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java b/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
index e39fdebbd5..476f02bc0b 100644
--- a/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
+++ b/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
@@ -174,7 +174,7 @@ public class LocalExifThumbnailProducer implements j1<e> {
                         }
                     }
                     synchronizedPool2.release(acquire);
-                    int u0 = AnimatableValueParser.u0(Integer.parseInt(exifInterface.getAttribute("Orientation")));
+                    int u0 = AnimatableValueParser.u0(Integer.parseInt(exifInterface.getAttribute(androidx.exifinterface.media.ExifInterface.TAG_ORIENTATION)));
                     int intValue = pair != null ? ((Integer) pair.first).intValue() : -1;
                     if (pair != null) {
                         i2 = ((Integer) pair.second).intValue();
diff --git a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
index 513e2aa624..d5ee76caf4 100644
--- a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
+++ b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
@@ -1,11 +1,13 @@
 package com.facebook.imagepipeline.request;
 
 import android.net.Uri;
+import androidx.core.app.NotificationCompat;
 import c.f.d.d.d;
 import c.f.d.d.i;
 import c.f.j.d.e;
 import c.f.j.d.f;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.facebook.cache.common.CacheKey;
 import java.io.File;
 import java.util.Arrays;
@@ -91,7 +93,7 @@ public class ImageRequest {
                 i = str != null && str.startsWith("video/") ? 2 : 3;
             } else if (c.f.d.l.b.c(uri)) {
                 i = 4;
-            } else if ("asset".equals(c.f.d.l.b.a(uri))) {
+            } else if (ModelAuditLogEntry.CHANGE_KEY_ASSET.equals(c.f.d.l.b.a(uri))) {
                 i = 5;
             } else if ("res".equals(c.f.d.l.b.a(uri))) {
                 i = 6;
@@ -154,7 +156,7 @@ public class ImageRequest {
 
     public String toString() {
         i I2 = AnimatableValueParser.I2(this);
-        I2.c("uri", this.f2214c);
+        I2.c(NotificationCompat.MessagingStyle.Message.KEY_DATA_URI, this.f2214c);
         I2.c("cacheChoice", this.b);
         I2.c("decodeOptions", this.h);
         I2.c("postprocessor", this.q);
diff --git a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
index 426db7e728..df8ca3a3fa 100644
--- a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
@@ -6,6 +6,7 @@ import c.f.j.d.b;
 import c.f.j.d.d;
 import c.f.j.d.e;
 import c.f.j.d.f;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.facebook.imagepipeline.request.ImageRequest;
 import java.util.Objects;
 public class ImageRequestBuilder {
@@ -57,7 +58,7 @@ public class ImageRequestBuilder {
                     throw new BuilderException("Resource URI must not be empty");
                 }
             }
-            if (!"asset".equals(c.f.d.l.b.a(this.a)) || this.a.isAbsolute()) {
+            if (!ModelAuditLogEntry.CHANGE_KEY_ASSET.equals(c.f.d.l.b.a(this.a)) || this.a.isAbsolute()) {
                 return new ImageRequest(this);
             }
             throw new BuilderException("Asset URI path must be absolute.");
diff --git a/app/src/main/java/com/facebook/soloader/SoLoader.java b/app/src/main/java/com/facebook/soloader/SoLoader.java
index 9eb785f0e4..21dc3f9f85 100644
--- a/app/src/main/java/com/facebook/soloader/SoLoader.java
+++ b/app/src/main/java/com/facebook/soloader/SoLoader.java
@@ -14,6 +14,7 @@ import c.f.m.j;
 import c.f.m.k;
 import c.f.m.l;
 import c.f.m.m;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import dalvik.system.BaseDexClassLoader;
 import java.io.File;
@@ -107,7 +108,7 @@ public class SoLoader {
         public final String a(String str) {
             try {
                 File file = new File(str);
-                MessageDigest instance = MessageDigest.getInstance("MD5");
+                MessageDigest instance = MessageDigest.getInstance(Constants.MD5);
                 FileInputStream fileInputStream = new FileInputStream(file);
                 byte[] bArr = new byte[4096];
                 while (true) {
diff --git a/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java b/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java
index 1900da9730..51f3cd1edd 100644
--- a/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java
+++ b/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java
@@ -1,6 +1,8 @@
 package com.franmontiel.persistentcookiejar.persistence;
 
 import c.q.a.k.a;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.g0.t;
 import d0.g0.w;
 import d0.z.d.m;
@@ -20,7 +22,7 @@ public class SerializableCookie implements Serializable {
         long j;
         boolean z3;
         String str = (String) objectInputStream.readObject();
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (m.areEqual(w.trim(str).toString(), str)) {
             String str2 = (String) objectInputStream.readObject();
             m.checkParameterIsNotNull(str2, "value");
@@ -46,7 +48,7 @@ public class SerializableCookie implements Serializable {
                 if (c02 != null) {
                     String str4 = (String) objectInputStream.readObject();
                     m.checkParameterIsNotNull(str4, "path");
-                    if (t.startsWith$default(str4, "/", false, 2, null)) {
+                    if (t.startsWith$default(str4, AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, false, 2, null)) {
                         boolean z4 = objectInputStream.readBoolean();
                         boolean z5 = objectInputStream.readBoolean();
                         if (objectInputStream.readBoolean()) {
diff --git a/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.java b/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.java
index 0db4e6ce45..a1be6db529 100644
--- a/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.java
+++ b/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SharedPrefsCookiePersistor.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
+import com.adjust.sdk.Constants;
 import f0.n;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -24,7 +25,7 @@ public class SharedPrefsCookiePersistor implements CookiePersistor {
 
     public static String b(n nVar) {
         StringBuilder sb = new StringBuilder();
-        sb.append(nVar.k ? "https" : "http");
+        sb.append(nVar.k ? Constants.SCHEME : "http");
         sb.append("://");
         sb.append(nVar.i);
         sb.append(nVar.j);
diff --git a/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java b/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
index 70066e1908..d846c51b98 100644
--- a/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
+++ b/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
@@ -12,6 +12,7 @@ import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import androidx.core.view.ViewCompat;
 import c.h.a.a.c;
 import c.h.a.a.d;
 import c.h.a.a.e;
@@ -105,7 +106,7 @@ public class RealtimeBlurView extends View {
                         int i = (-iArr[0]) + iArr[0];
                         int i2 = (-iArr[1]) + iArr[1];
                         RealtimeBlurView realtimeBlurView4 = RealtimeBlurView.this;
-                        realtimeBlurView4.q.eraseColor(realtimeBlurView4.m & 16777215);
+                        realtimeBlurView4.q.eraseColor(realtimeBlurView4.m & ViewCompat.MEASURED_SIZE_MASK);
                         int save = RealtimeBlurView.this.f2221s.save();
                         RealtimeBlurView realtimeBlurView5 = RealtimeBlurView.this;
                         realtimeBlurView5.t = true;
diff --git a/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerBroadcastReceiver.java b/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerBroadcastReceiver.java
index bb8a2704e7..bc759e3dfa 100644
--- a/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerBroadcastReceiver.java
+++ b/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerBroadcastReceiver.java
@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Base64;
+import androidx.core.app.NotificationCompat;
 import c.i.a.b.j.b;
 import c.i.a.b.j.i;
 import c.i.a.b.j.n;
@@ -16,7 +17,7 @@ public class AlarmManagerSchedulerBroadcastReceiver extends BroadcastReceiver {
     @Override // android.content.BroadcastReceiver
     public void onReceive(Context context, Intent intent) {
         String queryParameter = intent.getData().getQueryParameter("backendName");
-        String queryParameter2 = intent.getData().getQueryParameter("extras");
+        String queryParameter2 = intent.getData().getQueryParameter(NotificationCompat.MessagingStyle.Message.KEY_EXTRAS_BUNDLE);
         int intValue = Integer.valueOf(intent.getData().getQueryParameter("priority")).intValue();
         int i = intent.getExtras().getInt("attemptNumber");
         n.b(context);
diff --git a/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerService.java b/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerService.java
index c5f7fcaae0..4ab0823a65 100644
--- a/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerService.java
+++ b/app/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerService.java
@@ -4,6 +4,7 @@ import android.app.job.JobParameters;
 import android.app.job.JobService;
 import android.util.Base64;
 import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 import c.i.a.b.j.b;
 import c.i.a.b.j.i;
 import c.i.a.b.j.n;
@@ -18,7 +19,7 @@ public class JobInfoSchedulerService extends JobService {
     @Override // android.app.job.JobService
     public boolean onStartJob(JobParameters jobParameters) {
         String string = jobParameters.getExtras().getString("backendName");
-        String string2 = jobParameters.getExtras().getString("extras");
+        String string2 = jobParameters.getExtras().getString(NotificationCompat.MessagingStyle.Message.KEY_EXTRAS_BUNDLE);
         int i2 = jobParameters.getExtras().getInt("priority");
         int i3 = jobParameters.getExtras().getInt("attemptNumber");
         n.b(getApplicationContext());
diff --git a/app/src/main/java/com/google/android/exoplayer2/Format.java b/app/src/main/java/com/google/android/exoplayer2/Format.java
index 588964526d..718d11c1c3 100644
--- a/app/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/app/src/main/java/com/google/android/exoplayer2/Format.java
@@ -3,6 +3,7 @@ package com.google.android.exoplayer2;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.i2.f0;
 import c.i.a.c.z1.c0;
 import c.i.a.c.z1.w;
@@ -140,7 +141,7 @@ public final class Format implements Parcelable {
             this.f = -1;
             this.g = -1;
             this.l = -1;
-            this.o = Long.MAX_VALUE;
+            this.o = RecyclerView.FOREVER_NS;
             this.p = -1;
             this.q = -1;
             this.r = -1.0f;
diff --git a/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 962d915037..70ef05a6ac 100644
--- a/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -37,6 +37,8 @@ import c.i.a.c.v1.x;
 import c.i.a.c.v1.y;
 import c.i.a.c.v1.z;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
+import com.discord.restapi.RestAPIAbortCodes;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.AudioSink;
@@ -247,7 +249,7 @@ public final class DefaultAudioSink implements AudioSink {
             int i2 = this.g;
             switch (i2) {
                 case 5:
-                    i = 80000;
+                    i = RestAPIAbortCodes.RELATIONSHIP_INCOMING_DISABLED;
                     break;
                 case 6:
                 case 18:
@@ -336,7 +338,7 @@ public final class DefaultAudioSink implements AudioSink {
         @Override // com.google.android.exoplayer2.audio.DefaultAudioSink.b
         public long b(long j) {
             d0 d0Var = this.f2241c;
-            if (d0Var.o < 1024) {
+            if (d0Var.o < Permission.VIEW_CHANNEL) {
                 return (long) (((double) d0Var.f993c) * ((double) j));
             }
             long j2 = d0Var.n;
diff --git a/app/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/app/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
index d4c5244c9b..c2bb72f0cf 100644
--- a/app/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
+++ b/app/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
@@ -1,6 +1,7 @@
 package com.google.android.exoplayer2.decoder;
 
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c.i.a.c.x1.a;
 import c.i.a.c.x1.b;
 import java.nio.ByteBuffer;
@@ -93,6 +94,6 @@ public class DecoderInputBuffer extends a {
     }
 
     public final boolean t() {
-        return k(1073741824);
+        return k(BasicMeasure.EXACTLY);
     }
 }
diff --git a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index 9eac512dda..fad784322f 100644
--- a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -12,6 +12,7 @@ import android.util.Pair;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.d2.r;
 import c.i.a.c.h0;
 import c.i.a.c.h2.u;
@@ -27,6 +28,7 @@ import c.i.a.c.z1.q;
 import c.i.a.c.z1.w;
 import c.i.a.c.z1.x;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -473,7 +475,7 @@ public class DefaultDrmSession implements DrmSession {
                     m(bArr, 1, z2);
                 } else if (this.n == 4 || p()) {
                     if (!h0.d.equals(this.l)) {
-                        j = Long.MAX_VALUE;
+                        j = RecyclerView.FOREVER_NS;
                     } else {
                         Map<String, String> o = o();
                         if (o == null) {
@@ -530,7 +532,7 @@ public class DefaultDrmSession implements DrmSession {
         }
     }
 
-    @EnsuresNonNullIf(expression = {"sessionId"}, result = true)
+    @EnsuresNonNullIf(expression = {"sessionId"}, result = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS)
     public final boolean i() {
         int i = this.n;
         return i == 3 || i == 4;
@@ -552,7 +554,7 @@ public class DefaultDrmSession implements DrmSession {
         }
     }
 
-    @EnsuresNonNullIf(expression = {"sessionId"}, result = true)
+    @EnsuresNonNullIf(expression = {"sessionId"}, result = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS)
     public final boolean l(boolean z2) {
         if (i()) {
             return true;
diff --git a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index bc4ac2d83b..6dbd543830 100644
--- a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -9,6 +9,7 @@ import android.util.Pair;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.exifinterface.media.ExifInterface;
 import c.i.a.c.b2.h;
 import c.i.a.c.b2.s;
 import c.i.a.c.i2.f0;
@@ -810,7 +811,7 @@ public final class MediaCodecUtil {
                 String group2 = matcher2.group(1);
                 if ("1".equals(group2)) {
                     i6 = 1;
-                } else if ("2".equals(group2)) {
+                } else if (ExifInterface.GPS_MEASUREMENT_2D.equals(group2)) {
                     i6 = 2;
                 } else {
                     c.d.b.a.a.g0("Unknown HEVC profile string: ", group2, "MediaCodecUtil");
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java b/app/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
index 7ab06527e7..cb488a99bb 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
@@ -6,6 +6,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 public final class AspectRatioFrameLayout extends FrameLayout {
     public final c i;
     @Nullable
@@ -98,7 +99,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
                             cVar.l = true;
                             AspectRatioFrameLayout.this.post(cVar);
                         }
-                        super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824), View.MeasureSpec.makeMeasureSpec(measuredHeight, 1073741824));
+                        super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(measuredHeight, BasicMeasure.EXACTLY));
                     }
                     f = this.k;
                     measuredWidth = (int) (f4 * f);
@@ -108,7 +109,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
                     cVar.k = true;
                     if (!cVar.l) {
                     }
-                    super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824), View.MeasureSpec.makeMeasureSpec(measuredHeight, 1073741824));
+                    super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(measuredHeight, BasicMeasure.EXACTLY));
                 }
                 f2 = this.k;
             } else if (f6 > 0.0f) {
@@ -122,7 +123,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
                 cVar.k = true;
                 if (!cVar.l) {
                 }
-                super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824), View.MeasureSpec.makeMeasureSpec(measuredHeight, 1073741824));
+                super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(measuredHeight, BasicMeasure.EXACTLY));
             }
             measuredHeight = (int) (f3 / f2);
             cVar = this.i;
@@ -131,7 +132,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
             cVar.k = true;
             if (!cVar.l) {
             }
-            super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824), View.MeasureSpec.makeMeasureSpec(measuredHeight, 1073741824));
+            super.onMeasure(View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(measuredHeight, BasicMeasure.EXACTLY));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 16e711e515..ae790325cc 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -18,6 +18,7 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.g2.b;
 import c.i.a.c.g2.c;
 import c.i.a.c.g2.k;
@@ -302,7 +303,7 @@ public class DefaultTimeBar extends View implements k {
                 return j / ((long) width);
             }
         }
-        return Long.MAX_VALUE;
+        return RecyclerView.FOREVER_NS;
     }
 
     public final void h() {
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 8cae77d0ff..6e89755817 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -41,6 +41,7 @@ import c.i.a.c.p1;
 import c.i.a.c.r1;
 import c.i.a.c.v0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.utilities.auth.GoogleSmartLockManager;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.flac.PictureFrame;
@@ -836,7 +837,7 @@ public class PlayerView extends FrameLayout {
         }
     }
 
-    @EnsuresNonNullIf(expression = {"controller"}, result = true)
+    @EnsuresNonNullIf(expression = {"controller"}, result = GoogleSmartLockManager.SET_DISCORD_ACCOUNT_DETAILS)
     public final boolean o() {
         if (!this.v) {
             return false;
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
index 708fda0267..b99cd51473 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.accessibility.CaptioningManager;
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import c.i.a.c.e2.b;
 import c.i.a.c.e2.c;
 import c.i.a.c.e2.k;
@@ -103,7 +104,7 @@ public final class SubtitleView extends FrameLayout implements k {
         if (i < 21) {
             return new b(userStyle.foregroundColor, userStyle.backgroundColor, 0, userStyle.edgeType, userStyle.edgeColor, userStyle.getTypeface());
         }
-        return new b(userStyle.hasForegroundColor() ? userStyle.foregroundColor : -1, userStyle.hasBackgroundColor() ? userStyle.backgroundColor : -16777216, userStyle.hasWindowColor() ? userStyle.windowColor : 0, userStyle.hasEdgeType() ? userStyle.edgeType : 0, userStyle.hasEdgeColor() ? userStyle.edgeColor : -1, userStyle.getTypeface());
+        return new b(userStyle.hasForegroundColor() ? userStyle.foregroundColor : -1, userStyle.hasBackgroundColor() ? userStyle.backgroundColor : ViewCompat.MEASURED_STATE_MASK, userStyle.hasWindowColor() ? userStyle.windowColor : 0, userStyle.hasEdgeType() ? userStyle.edgeType : 0, userStyle.hasEdgeColor() ? userStyle.edgeColor : -1, userStyle.getTypeface());
     }
 
     private <T extends View & a> void setView(T t) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java b/app/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
index aa53432d27..54946cf767 100644
--- a/app/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
+++ b/app/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
 import c.i.a.c.h2.e;
 import c.i.a.c.h2.l;
 import c.i.a.c.i2.f0;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,7 +41,7 @@ public final class AssetDataSource extends e {
             Objects.requireNonNull(path);
             if (path.startsWith("/android_asset/")) {
                 path = path.substring(15);
-            } else if (path.startsWith("/")) {
+            } else if (path.startsWith(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN)) {
                 path = path.substring(1);
             }
             q(lVar);
diff --git a/app/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java b/app/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
index 1287cad457..3f138ec9b7 100644
--- a/app/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
+++ b/app/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
@@ -10,6 +10,7 @@ import c.d.b.a.a;
 import c.i.a.c.h2.e;
 import c.i.a.c.h2.l;
 import c.i.a.c.i2.f0;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import java.io.EOFException;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -66,7 +67,7 @@ public final class RawResourceDataSource extends e {
             if (TextUtils.equals("android.resource", uri.getScheme())) {
                 String path = uri.getPath();
                 Objects.requireNonNull(path);
-                if (path.startsWith("/")) {
+                if (path.startsWith(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN)) {
                     path = path.substring(1);
                 }
                 String host = uri.getHost();
diff --git a/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index a85470e81c..7169b22597 100644
--- a/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -2,11 +2,13 @@ package com.google.android.exoplayer2.upstream.cache;
 
 import android.util.Log;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import c.i.a.c.h2.h;
 import c.i.a.c.h2.l;
 import c.i.a.c.i2.f0;
 import c.i.a.c.i2.y;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.permission.Permission;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -39,12 +41,12 @@ public final class CacheDataSink implements h {
     public CacheDataSink(Cache cache, long j) {
         AnimatableValueParser.E(j > 0 || j == -1, "fragmentSize must be positive or C.LENGTH_UNSET.");
         int i = (j > -1 ? 1 : (j == -1 ? 0 : -1));
-        if (i != 0 && j < 2097152) {
+        if (i != 0 && j < Permission.SPEAK) {
             Log.w("CacheDataSink", "fragmentSize is below the minimum recommended value of 2097152. This may cause poor cache performance.");
         }
         Objects.requireNonNull(cache);
         this.a = cache;
-        this.b = i == 0 ? Long.MAX_VALUE : j;
+        this.b = i == 0 ? RecyclerView.FOREVER_NS : j;
         this.f2300c = 20480;
     }
 
@@ -53,7 +55,7 @@ public final class CacheDataSink implements h {
         Objects.requireNonNull(lVar.h);
         if (lVar.g != -1 || !lVar.c(2)) {
             this.d = lVar;
-            this.e = lVar.c(4) ? this.b : Long.MAX_VALUE;
+            this.e = lVar.c(4) ? this.b : RecyclerView.FOREVER_NS;
             this.i = 0;
             try {
                 c(lVar);
diff --git a/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
index 798f18b4b0..cba5d7a545 100644
--- a/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
+++ b/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -53,8 +53,8 @@ public class FlexboxLayout extends ViewGroup implements a {
         public float m = -1.0f;
         public int n = -1;
         public int o = -1;
-        public int p = 16777215;
-        public int q = 16777215;
+        public int p = ViewCompat.MEASURED_SIZE_MASK;
+        public int q = ViewCompat.MEASURED_SIZE_MASK;
         public boolean r;
 
         public static class a implements Parcelable.Creator<LayoutParams> {
@@ -81,8 +81,8 @@ public class FlexboxLayout extends ViewGroup implements a {
             this.m = obtainStyledAttributes.getFraction(R.a.FlexboxLayout_Layout_layout_flexBasisPercent, 1, 1, -1.0f);
             this.n = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_minWidth, -1);
             this.o = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_minHeight, -1);
-            this.p = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_maxWidth, 16777215);
-            this.q = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_maxHeight, 16777215);
+            this.p = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_maxWidth, ViewCompat.MEASURED_SIZE_MASK);
+            this.q = obtainStyledAttributes.getDimensionPixelSize(R.a.FlexboxLayout_Layout_layout_maxHeight, ViewCompat.MEASURED_SIZE_MASK);
             this.r = obtainStyledAttributes.getBoolean(R.a.FlexboxLayout_Layout_layout_wrapBefore, false);
             obtainStyledAttributes.recycle();
         }
diff --git a/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java b/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
index b2b059eca5..4e8680f227 100644
--- a/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
+++ b/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
@@ -10,6 +10,7 @@ import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearSmoothScroller;
 import androidx.recyclerview.widget.OrientationHelper;
 import androidx.recyclerview.widget.RecyclerView;
@@ -59,8 +60,8 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         public float l = -1.0f;
         public int m;
         public int n;
-        public int o = 16777215;
-        public int p = 16777215;
+        public int o = ViewCompat.MEASURED_SIZE_MASK;
+        public int p = ViewCompat.MEASURED_SIZE_MASK;
         public boolean q;
 
         public static class a implements Parcelable.Creator<LayoutParams> {
diff --git a/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java b/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
index 9bb7df20f3..7bcf9a11bc 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
@@ -6,6 +6,7 @@ import android.os.Parcelable;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import c.i.a.f.c.a.d.e;
+import com.adjust.sdk.Constants;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.google.android.gms.common.internal.ReflectedParcelable;
 import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
@@ -60,7 +61,7 @@ public class Credential extends AbstractSafeParcelable implements ReflectedParce
                 boolean z2 = false;
                 if (!TextUtils.isEmpty(str4)) {
                     Uri parse = Uri.parse(str4);
-                    if (parse.isAbsolute() && parse.isHierarchical() && !TextUtils.isEmpty(parse.getScheme()) && !TextUtils.isEmpty(parse.getAuthority()) && ("http".equalsIgnoreCase(parse.getScheme()) || "https".equalsIgnoreCase(parse.getScheme()))) {
+                    if (parse.isAbsolute() && parse.isHierarchical() && !TextUtils.isEmpty(parse.getScheme()) && !TextUtils.isEmpty(parse.getAuthority()) && ("http".equalsIgnoreCase(parse.getScheme()) || Constants.SCHEME.equalsIgnoreCase(parse.getScheme()))) {
                         z2 = true;
                     }
                 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
index 9cd9361542..a76946ea2a 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
@@ -6,9 +6,11 @@ import android.os.Parcelable;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import c.i.a.f.c.a.f.d;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.common.api.Scope;
 import com.google.android.gms.common.internal.ReflectedParcelable;
 import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
@@ -76,9 +78,9 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
         for (int i = 0; i < length; i++) {
             hashSet.add(new Scope(jSONArray.getString(i)));
         }
-        String optString2 = jSONObject.optString("id");
+        String optString2 = jSONObject.optString(ModelAuditLogEntry.CHANGE_KEY_ID);
         String optString3 = jSONObject.has("tokenId") ? jSONObject.optString("tokenId") : null;
-        String optString4 = jSONObject.has("email") ? jSONObject.optString("email") : null;
+        String optString4 = jSONObject.has(NotificationCompat.CATEGORY_EMAIL) ? jSONObject.optString(NotificationCompat.CATEGORY_EMAIL) : null;
         String optString5 = jSONObject.has("displayName") ? jSONObject.optString("displayName") : null;
         String optString6 = jSONObject.has("givenName") ? jSONObject.optString("givenName") : null;
         String optString7 = jSONObject.has("familyName") ? jSONObject.optString("familyName") : null;
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
index f8d7911034..14f52de7f3 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
@@ -6,6 +6,7 @@ import android.os.Parcelable;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import c.i.a.f.c.a.f.e;
 import c.i.a.f.c.a.f.f;
 import c.i.a.f.e.h.a;
@@ -108,7 +109,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
     static {
         Scope scope = new Scope("profile");
         i = scope;
-        new Scope("email");
+        new Scope(NotificationCompat.CATEGORY_EMAIL);
         Scope scope2 = new Scope("openid");
         j = scope2;
         Scope scope3 = new Scope("https://www.googleapis.com/auth/games_lite");
diff --git a/app/src/main/java/com/google/android/gms/common/Feature.java b/app/src/main/java/com/google/android/gms/common/Feature.java
index ae23c67a11..decd85103a 100644
--- a/app/src/main/java/com/google/android/gms/common/Feature.java
+++ b/app/src/main/java/com/google/android/gms/common/Feature.java
@@ -7,6 +7,7 @@ import androidx.annotation.RecentlyNonNull;
 import c.i.a.f.e.k.k;
 import c.i.a.f.e.r;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
 import java.util.Arrays;
 /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
@@ -47,7 +48,7 @@ public class Feature extends AbstractSafeParcelable {
     @RecentlyNonNull
     public String toString() {
         k kVar = new k(this, null);
-        kVar.a("name", this.i);
+        kVar.a(ModelAuditLogEntry.CHANGE_KEY_NAME, this.i);
         kVar.a("version", Long.valueOf(v0()));
         return kVar.toString();
     }
diff --git a/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java b/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
index ae1e4a8ae0..295e7e10e9 100644
--- a/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
+++ b/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
@@ -19,6 +19,7 @@ import c.i.a.f.g.g;
 import c.i.a.f.g.h;
 import c.i.a.f.g.i;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import com.google.android.gms.common.util.DynamiteApi;
 import dalvik.system.DelegateLastClassLoader;
 import java.lang.reflect.Field;
@@ -576,7 +577,7 @@ public final class DynamiteModule {
             StringBuilder sb = new StringBuilder(str2.length() + 42 + String.valueOf(str).length());
             sb.append("content://com.google.android.gms.chimera/");
             sb.append(str2);
-            sb.append("/");
+            sb.append(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
             sb.append(str);
             Cursor query = contentResolver.query(Uri.parse(sb.toString()), null, null, null, null);
             if (query != null) {
diff --git a/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java b/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
index b311fda1c0..aeb58e46d6 100644
--- a/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
+++ b/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
@@ -22,6 +22,7 @@ import c.i.a.f.i.b.r6;
 import c.i.a.f.i.b.t9;
 import c.i.a.f.i.b.u4;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.gms.internal.measurement.zzae;
 import com.google.android.gms.measurement.internal.zzku;
 import java.util.ArrayList;
@@ -82,7 +83,7 @@ public class AppMeasurement {
             Objects.requireNonNull(bundle, "null reference");
             this.mAppId = (String) c.D0(bundle, "app_id", String.class, null);
             this.mOrigin = (String) c.D0(bundle, "origin", String.class, null);
-            this.mName = (String) c.D0(bundle, "name", String.class, null);
+            this.mName = (String) c.D0(bundle, ModelAuditLogEntry.CHANGE_KEY_NAME, String.class, null);
             this.mValue = c.D0(bundle, "value", Object.class, null);
             this.mTriggerEventName = (String) c.D0(bundle, "trigger_event_name", String.class, null);
             this.mTriggerTimeout = ((Long) c.D0(bundle, "trigger_timeout", Long.class, 0L)).longValue();
@@ -110,7 +111,7 @@ public class AppMeasurement {
             }
             String str3 = this.mName;
             if (str3 != null) {
-                bundle.putString("name", str3);
+                bundle.putString(ModelAuditLogEntry.CHANGE_KEY_NAME, str3);
             }
             Object obj = this.mValue;
             if (obj != null) {
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java
index 2b27dc6798..70b5e0e0ce 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java
@@ -11,6 +11,7 @@ import c.d.b.a.a;
 import c.i.a.f.h.m.e;
 import c.i.a.f.j.b.e.k0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.esotericsoftware.kryo.Kryo;
 import com.google.android.gms.common.internal.ReflectedParcelable;
 import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
 import com.google.android.gms.internal.nearby.zzgs;
@@ -112,7 +113,7 @@ public class Update extends AbstractSafeParcelable implements ReflectedParcelabl
             HashMap hashMap = new HashMap();
             String str2 = null;
             int i2 = -1;
-            byte b = -2147483648;
+            byte b = Kryo.NULL;
             while (i < bArr2.length) {
                 try {
                     int i3 = i + 1;
diff --git a/app/src/main/java/com/google/android/material/animation/MotionSpec.java b/app/src/main/java/com/google/android/material/animation/MotionSpec.java
index 42081be9cc..28cf7fa3ce 100644
--- a/app/src/main/java/com/google/android/material/animation/MotionSpec.java
+++ b/app/src/main/java/com/google/android/material/animation/MotionSpec.java
@@ -66,7 +66,7 @@ public class MotionSpec {
         } catch (Exception e) {
             StringBuilder K = a.K("Can't load animation resource ID #0x");
             K.append(Integer.toHexString(i));
-            Log.w("MotionSpec", K.toString(), e);
+            Log.w(TAG, K.toString(), e);
             return null;
         }
     }
diff --git a/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java b/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
index 0522088b81..b76e4a5567 100644
--- a/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
+++ b/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
@@ -260,7 +260,7 @@ public class AppBarLayout extends LinearLayout implements CoordinatorLayout.Atta
             } else {
                 valueAnimator2.cancel();
             }
-            this.offsetAnimator.setDuration((long) Math.min(i2, 600));
+            this.offsetAnimator.setDuration((long) Math.min(i2, (int) MAX_OFFSET_ANIMATION_DURATION));
             this.offsetAnimator.setIntValues(topBottomOffsetForScrollingSibling, i);
             this.offsetAnimator.start();
         }
diff --git a/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java b/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java
index 65b6d60b3b..c9ed3b21dd 100644
--- a/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java
+++ b/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java
@@ -25,6 +25,7 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.math.MathUtils;
@@ -36,6 +37,7 @@ import c.i.a.g.a.d;
 import com.google.android.material.R;
 import com.google.android.material.animation.AnimationUtils;
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.internal.CollapsingTextHelper;
 import com.google.android.material.internal.DescendantOffsetUtils;
 import com.google.android.material.internal.ThemeEnforcement;
@@ -198,7 +200,7 @@ public class CollapsingToolbarLayout extends FrameLayout {
         this.collapsingTextHelper = collapsingTextHelper;
         collapsingTextHelper.setTextSizeInterpolator(AnimationUtils.DECELERATE_INTERPOLATOR);
         TypedArray obtainStyledAttributes = ThemeEnforcement.obtainStyledAttributes(context2, attributeSet, R.styleable.CollapsingToolbarLayout, i, i2, new int[0]);
-        collapsingTextHelper.setExpandedTextGravity(obtainStyledAttributes.getInt(R.styleable.CollapsingToolbarLayout_expandedTitleGravity, 8388691));
+        collapsingTextHelper.setExpandedTextGravity(obtainStyledAttributes.getInt(R.styleable.CollapsingToolbarLayout_expandedTitleGravity, BadgeDrawable.BOTTOM_START));
         collapsingTextHelper.setCollapsedTextGravity(obtainStyledAttributes.getInt(R.styleable.CollapsingToolbarLayout_collapsedTitleGravity, 8388627));
         int dimensionPixelSize = obtainStyledAttributes.getDimensionPixelSize(R.styleable.CollapsingToolbarLayout_expandedTitleMargin, 0);
         this.expandedMarginBottom = dimensionPixelSize;
@@ -238,7 +240,7 @@ public class CollapsingToolbarLayout extends FrameLayout {
         if (obtainStyledAttributes.hasValue(i9)) {
             collapsingTextHelper.setMaxLines(obtainStyledAttributes.getInt(i9, 1));
         }
-        this.scrimAnimationDuration = (long) obtainStyledAttributes.getInt(R.styleable.CollapsingToolbarLayout_scrimAnimationDuration, 600);
+        this.scrimAnimationDuration = (long) obtainStyledAttributes.getInt(R.styleable.CollapsingToolbarLayout_scrimAnimationDuration, DEFAULT_SCRIM_ANIMATION_DURATION);
         setContentScrim(obtainStyledAttributes.getDrawable(R.styleable.CollapsingToolbarLayout_contentScrim));
         setStatusBarScrim(obtainStyledAttributes.getDrawable(R.styleable.CollapsingToolbarLayout_statusBarScrim));
         this.toolbarId = obtainStyledAttributes.getResourceId(R.styleable.CollapsingToolbarLayout_toolbarId, -1);
@@ -656,7 +658,7 @@ public class CollapsingToolbarLayout extends FrameLayout {
         WindowInsetsCompat windowInsetsCompat = this.lastInsets;
         int systemWindowInsetTop = windowInsetsCompat != null ? windowInsetsCompat.getSystemWindowInsetTop() : 0;
         if (mode == 0 && systemWindowInsetTop > 0) {
-            super.onMeasure(i, View.MeasureSpec.makeMeasureSpec(getMeasuredHeight() + systemWindowInsetTop, 1073741824));
+            super.onMeasure(i, View.MeasureSpec.makeMeasureSpec(getMeasuredHeight() + systemWindowInsetTop, BasicMeasure.EXACTLY));
         }
         ViewGroup viewGroup = this.toolbar;
         if (viewGroup != null) {
diff --git a/app/src/main/java/com/google/android/material/badge/BadgeDrawable.java b/app/src/main/java/com/google/android/material/badge/BadgeDrawable.java
index 2cc1a95238..3bda5584bd 100644
--- a/app/src/main/java/com/google/android/material/badge/BadgeDrawable.java
+++ b/app/src/main/java/com/google/android/material/badge/BadgeDrawable.java
@@ -367,7 +367,7 @@ public class BadgeDrawable extends Drawable implements TextDrawableHelper.TextDr
             return NumberFormat.getInstance().format((long) getNumber());
         }
         Context context = this.contextRef.get();
-        return context == null ? "" : context.getString(R.string.mtrl_exceed_max_badge_number_suffix, Integer.valueOf(this.maxBadgeNumber), "+");
+        return context == null ? "" : context.getString(R.string.mtrl_exceed_max_badge_number_suffix, Integer.valueOf(this.maxBadgeNumber), DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX);
     }
 
     private void loadDefaultStateFromAttributes(Context context, AttributeSet attributeSet, @AttrRes int i, @StyleRes int i2) {
@@ -382,7 +382,7 @@ public class BadgeDrawable extends Drawable implements TextDrawableHelper.TextDr
         if (obtainStyledAttributes.hasValue(i4)) {
             setBadgeTextColor(readColorFromAttributes(context, obtainStyledAttributes, i4));
         }
-        setBadgeGravity(obtainStyledAttributes.getInt(R.styleable.Badge_badgeGravity, 8388661));
+        setBadgeGravity(obtainStyledAttributes.getInt(R.styleable.Badge_badgeGravity, TOP_END));
         setHorizontalOffset(obtainStyledAttributes.getDimensionPixelOffset(R.styleable.Badge_horizontalOffset, 0));
         setVerticalOffset(obtainStyledAttributes.getDimensionPixelOffset(R.styleable.Badge_verticalOffset, 0));
         obtainStyledAttributes.recycle();
diff --git a/app/src/main/java/com/google/android/material/badge/BadgeUtils.java b/app/src/main/java/com/google/android/material/badge/BadgeUtils.java
index eea5bd780f..b8da425288 100644
--- a/app/src/main/java/com/google/android/material/badge/BadgeUtils.java
+++ b/app/src/main/java/com/google/android/material/badge/BadgeUtils.java
@@ -117,7 +117,7 @@ public class BadgeUtils {
             if (actionMenuItemView != null) {
                 detachBadgeDrawable(badgeDrawable, actionMenuItemView);
             } else {
-                c.d.b.a.a.d0("Trying to remove badge from a null menuItemView: ", i, "BadgeUtils");
+                c.d.b.a.a.d0("Trying to remove badge from a null menuItemView: ", i, LOG_TAG);
             }
         }
     }
diff --git a/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java b/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
index 57f9cc8ce0..facfb9dfcf 100644
--- a/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
+++ b/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
@@ -21,8 +21,10 @@ import androidx.annotation.Nullable;
 import androidx.annotation.Px;
 import androidx.appcompat.widget.ActionMenuView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.motion.widget.Key;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.customview.view.AbsSavedState;
@@ -614,7 +616,7 @@ public class BottomAppBar extends Toolbar implements CoordinatorLayout.AttachedB
     }
 
     private void createFabTranslationXAnimation(int i2, @NonNull List<Animator> list) {
-        ObjectAnimator ofFloat = ObjectAnimator.ofFloat(findDependentFab(), "translationX", getFabTranslationX(i2));
+        ObjectAnimator ofFloat = ObjectAnimator.ofFloat(findDependentFab(), Key.TRANSLATION_X, getFabTranslationX(i2));
         ofFloat.setDuration(300L);
         list.add(ofFloat);
     }
@@ -622,9 +624,9 @@ public class BottomAppBar extends Toolbar implements CoordinatorLayout.AttachedB
     private void createMenuViewTranslationAnimation(int i2, boolean z2, @NonNull List<Animator> list) {
         ActionMenuView actionMenuView = getActionMenuView();
         if (actionMenuView != null) {
-            Animator ofFloat = ObjectAnimator.ofFloat(actionMenuView, "alpha", 1.0f);
+            Animator ofFloat = ObjectAnimator.ofFloat(actionMenuView, Key.ALPHA, 1.0f);
             if (Math.abs(actionMenuView.getTranslationX() - ((float) getActionMenuViewTranslationX(actionMenuView, i2, z2))) > 1.0f) {
-                ObjectAnimator ofFloat2 = ObjectAnimator.ofFloat(actionMenuView, "alpha", 0.0f);
+                ObjectAnimator ofFloat2 = ObjectAnimator.ofFloat(actionMenuView, Key.ALPHA, 0.0f);
                 ofFloat2.addListener(new g(actionMenuView, i2, z2));
                 AnimatorSet animatorSet = new AnimatorSet();
                 animatorSet.setDuration(150L);
@@ -840,7 +842,7 @@ public class BottomAppBar extends Toolbar implements CoordinatorLayout.AttachedB
         int measuredWidth = isLayoutRtl ? getMeasuredWidth() : 0;
         for (int i3 = 0; i3 < getChildCount(); i3++) {
             View childAt = getChildAt(i3);
-            if ((childAt.getLayoutParams() instanceof Toolbar.LayoutParams) && (((Toolbar.LayoutParams) childAt.getLayoutParams()).gravity & 8388615) == 8388611) {
+            if ((childAt.getLayoutParams() instanceof Toolbar.LayoutParams) && (((Toolbar.LayoutParams) childAt.getLayoutParams()).gravity & GravityCompat.RELATIVE_HORIZONTAL_GRAVITY_MASK) == 8388611) {
                 measuredWidth = isLayoutRtl ? Math.min(measuredWidth, childAt.getLeft()) : Math.max(measuredWidth, childAt.getRight());
             }
         }
diff --git a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationItemView.java b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationItemView.java
index 5526a71c33..ad34519210 100644
--- a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationItemView.java
+++ b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationItemView.java
@@ -350,7 +350,7 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
         this.largeLabel.setEnabled(z2);
         this.icon.setEnabled(z2);
         if (z2) {
-            ViewCompat.setPointerIcon(this, PointerIconCompat.getSystemIcon(getContext(), 1002));
+            ViewCompat.setPointerIcon(this, PointerIconCompat.getSystemIcon(getContext(), PointerIconCompat.TYPE_HAND));
         } else {
             ViewCompat.setPointerIcon(this, null);
         }
diff --git a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java
index 2eade09c34..7488c54087 100644
--- a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java
+++ b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java
@@ -23,6 +23,7 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.menu.MenuBuilder;
 import androidx.appcompat.view.menu.MenuItemImpl;
 import androidx.appcompat.view.menu.MenuView;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.util.Pools;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
@@ -110,7 +111,7 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
         AutoTransition autoTransition = new AutoTransition();
         this.set = autoTransition;
         autoTransition.setOrdering(0);
-        autoTransition.setDuration(115L);
+        autoTransition.setDuration(ACTIVE_ANIMATION_DURATION_MS);
         autoTransition.setInterpolator((TimeInterpolator) new FastOutSlowInInterpolator());
         autoTransition.addTransition(new TextScale());
         this.onClickListener = new a();
@@ -375,7 +376,7 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
         int size = View.MeasureSpec.getSize(i);
         int size2 = this.menu.getVisibleItems().size();
         int childCount = getChildCount();
-        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(this.itemHeight, 1073741824);
+        int makeMeasureSpec = View.MeasureSpec.makeMeasureSpec(this.itemHeight, BasicMeasure.EXACTLY);
         if (!isShifting(this.labelVisibilityMode, size2) || !this.itemHorizontalTranslationEnabled) {
             int min = Math.min(size / (size2 == 0 ? 1 : size2), this.activeItemMaxWidth);
             int i3 = size - (size2 * min);
@@ -422,12 +423,12 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
         for (int i11 = 0; i11 < childCount; i11++) {
             View childAt2 = getChildAt(i11);
             if (childAt2.getVisibility() != 8) {
-                childAt2.measure(View.MeasureSpec.makeMeasureSpec(this.tempChildWidths[i11], 1073741824), makeMeasureSpec);
+                childAt2.measure(View.MeasureSpec.makeMeasureSpec(this.tempChildWidths[i11], BasicMeasure.EXACTLY), makeMeasureSpec);
                 childAt2.getLayoutParams().width = childAt2.getMeasuredWidth();
                 i10 += childAt2.getMeasuredWidth();
             }
         }
-        setMeasuredDimension(View.resolveSizeAndState(i10, View.MeasureSpec.makeMeasureSpec(i10, 1073741824), 0), View.resolveSizeAndState(this.itemHeight, makeMeasureSpec, 0));
+        setMeasuredDimension(View.resolveSizeAndState(i10, View.MeasureSpec.makeMeasureSpec(i10, BasicMeasure.EXACTLY), 0), View.resolveSizeAndState(this.itemHeight, makeMeasureSpec, 0));
     }
 
     public void removeBadge(int i) {
diff --git a/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java b/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
index 6ff2949a0e..2414ccf364 100644
--- a/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
+++ b/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
@@ -33,6 +33,7 @@ import androidx.customview.widget.ViewDragHelper;
 import com.google.android.material.R;
 import com.google.android.material.internal.ViewUtils;
 import com.google.android.material.resources.MaterialResources;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.ShapeAppearanceModel;
 import java.lang.annotation.Retention;
@@ -767,7 +768,7 @@ public class BottomSheetBehavior<V extends View> extends CoordinatorLayout.Behav
         return this.fitToContents ? this.fitToContentsOffset : this.expandedOffset;
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float getHalfExpandedRatio() {
         return this.halfExpandedRatio;
     }
@@ -1113,7 +1114,7 @@ public class BottomSheetBehavior<V extends View> extends CoordinatorLayout.Behav
 
     @Deprecated
     public void setBottomSheetCallback(BottomSheetCallback bottomSheetCallback) {
-        Log.w("BottomSheetBehavior", "BottomSheetBehavior now supports multiple callbacks. `setBottomSheetCallback()` removes all existing callbacks, including ones set internally by library authors, which may result in unintended behavior. This may change in the future. Please use `addBottomSheetCallback()` and `removeBottomSheetCallback()` instead to set your own callbacks.");
+        Log.w(TAG, "BottomSheetBehavior now supports multiple callbacks. `setBottomSheetCallback()` removes all existing callbacks, including ones set internally by library authors, which may result in unintended behavior. This may change in the future. Please use `addBottomSheetCallback()` and `removeBottomSheetCallback()` instead to set your own callbacks.");
         this.callbacks.clear();
         if (bottomSheetCallback != null) {
             this.callbacks.add(bottomSheetCallback);
diff --git a/app/src/main/java/com/google/android/material/button/MaterialButton.java b/app/src/main/java/com/google/android/material/button/MaterialButton.java
index 5fe0b2627d..2b390a731e 100644
--- a/app/src/main/java/com/google/android/material/button/MaterialButton.java
+++ b/app/src/main/java/com/google/android/material/button/MaterialButton.java
@@ -580,7 +580,7 @@ public class MaterialButton extends AppCompatButton implements Checkable, Shapea
         if (!isUsingOriginalBackground()) {
             super.setBackgroundDrawable(drawable);
         } else if (drawable != getBackground()) {
-            Log.w("MaterialButton", "MaterialButton manages its own background to control elevation, shape, color and states. Consider using backgroundTint, shapeAppearance and other attributes where available. A custom background will ignore these attributes and you should consider handling interaction states such as pressed, focused and disabled");
+            Log.w(LOG_TAG, "MaterialButton manages its own background to control elevation, shape, color and states. Consider using backgroundTint, shapeAppearance and other attributes where available. A custom background will ignore these attributes and you should consider handling interaction states such as pressed, focused and disabled");
             c.i.a.g.b.a aVar = this.materialButtonHelper;
             aVar.o = true;
             aVar.a.setSupportBackgroundTintList(aVar.j);
diff --git a/app/src/main/java/com/google/android/material/card/MaterialCardView.java b/app/src/main/java/com/google/android/material/card/MaterialCardView.java
index 419ab0379e..fe2efcaba5 100644
--- a/app/src/main/java/com/google/android/material/card/MaterialCardView.java
+++ b/app/src/main/java/com/google/android/material/card/MaterialCardView.java
@@ -31,6 +31,7 @@ import com.google.android.material.R;
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.internal.ThemeEnforcement;
 import com.google.android.material.resources.MaterialResources;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.MaterialShapeUtils;
 import com.google.android.material.shape.ShapeAppearanceModel;
@@ -182,7 +183,7 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
         return this.cardViewHelper.d.top;
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float getProgress() {
         return this.cardViewHelper.e.getInterpolation();
     }
@@ -260,14 +261,14 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
     @Override // android.view.View
     public void onInitializeAccessibilityEvent(@NonNull AccessibilityEvent accessibilityEvent) {
         super.onInitializeAccessibilityEvent(accessibilityEvent);
-        accessibilityEvent.setClassName("androidx.cardview.widget.CardView");
+        accessibilityEvent.setClassName(ACCESSIBILITY_CLASS_NAME);
         accessibilityEvent.setChecked(isChecked());
     }
 
     @Override // android.view.View
     public void onInitializeAccessibilityNodeInfo(@NonNull AccessibilityNodeInfo accessibilityNodeInfo) {
         super.onInitializeAccessibilityNodeInfo(accessibilityNodeInfo);
-        accessibilityNodeInfo.setClassName("androidx.cardview.widget.CardView");
+        accessibilityNodeInfo.setClassName(ACCESSIBILITY_CLASS_NAME);
         accessibilityNodeInfo.setCheckable(isCheckable());
         accessibilityNodeInfo.setClickable(isClickable());
         accessibilityNodeInfo.setChecked(isChecked());
@@ -315,7 +316,7 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
     public void setBackgroundDrawable(Drawable drawable) {
         if (this.isParentCardViewDoneInitializing) {
             if (!this.cardViewHelper.t) {
-                Log.i("MaterialCardView", "Setting a custom background is not supported.");
+                Log.i(LOG_TAG, "Setting a custom background is not supported.");
                 this.cardViewHelper.t = true;
             }
             super.setBackgroundDrawable(drawable);
diff --git a/app/src/main/java/com/google/android/material/chip/Chip.java b/app/src/main/java/com/google/android/material/chip/Chip.java
index 9e262bcf50..a378c3e6f1 100644
--- a/app/src/main/java/com/google/android/material/chip/Chip.java
+++ b/app/src/main/java/com/google/android/material/chip/Chip.java
@@ -42,6 +42,7 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.core.view.PointerIconCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.customview.widget.ExploreByTouchHelper;
@@ -168,9 +169,9 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
             accessibilityNodeInfoCompat.setCheckable(Chip.this.isCheckable());
             accessibilityNodeInfoCompat.setClickable(Chip.this.isClickable());
             if (Chip.this.isCheckable() || Chip.this.isClickable()) {
-                accessibilityNodeInfoCompat.setClassName(Chip.this.isCheckable() ? "android.widget.CompoundButton" : "android.widget.Button");
+                accessibilityNodeInfoCompat.setClassName(Chip.this.isCheckable() ? Chip.COMPOUND_BUTTON_ACCESSIBILITY_CLASS_NAME : Chip.BUTTON_ACCESSIBILITY_CLASS_NAME);
             } else {
-                accessibilityNodeInfoCompat.setClassName("android.view.View");
+                accessibilityNodeInfoCompat.setClassName(Chip.GENERIC_VIEW_ACCESSIBILITY_CLASS_NAME);
             }
             CharSequence text = Chip.this.getText();
             if (Build.VERSION.SDK_INT >= 23) {
@@ -381,13 +382,13 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
                     return true;
                 }
             } catch (NoSuchMethodException e) {
-                Log.e("Chip", "Unable to send Accessibility Exit event", e);
+                Log.e(TAG, "Unable to send Accessibility Exit event", e);
             } catch (IllegalAccessException e2) {
-                Log.e("Chip", "Unable to send Accessibility Exit event", e2);
+                Log.e(TAG, "Unable to send Accessibility Exit event", e2);
             } catch (InvocationTargetException e3) {
-                Log.e("Chip", "Unable to send Accessibility Exit event", e3);
+                Log.e(TAG, "Unable to send Accessibility Exit event", e3);
             } catch (NoSuchFieldException e4) {
-                Log.e("Chip", "Unable to send Accessibility Exit event", e4);
+                Log.e(TAG, "Unable to send Accessibility Exit event", e4);
             }
         }
         return false;
@@ -497,21 +498,21 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
 
     private void validateAttributes(@Nullable AttributeSet attributeSet) {
         if (attributeSet != null) {
-            if (attributeSet.getAttributeValue("http://schemas.android.com/apk/res/android", "background") != null) {
-                Log.w("Chip", "Do not set the background; Chip manages its own background drawable.");
+            if (attributeSet.getAttributeValue(NAMESPACE_ANDROID, "background") != null) {
+                Log.w(TAG, "Do not set the background; Chip manages its own background drawable.");
             }
-            if (attributeSet.getAttributeValue("http://schemas.android.com/apk/res/android", "drawableLeft") != null) {
+            if (attributeSet.getAttributeValue(NAMESPACE_ANDROID, "drawableLeft") != null) {
                 throw new UnsupportedOperationException("Please set left drawable using R.attr#chipIcon.");
-            } else if (attributeSet.getAttributeValue("http://schemas.android.com/apk/res/android", "drawableStart") != null) {
+            } else if (attributeSet.getAttributeValue(NAMESPACE_ANDROID, "drawableStart") != null) {
                 throw new UnsupportedOperationException("Please set start drawable using R.attr#chipIcon.");
-            } else if (attributeSet.getAttributeValue("http://schemas.android.com/apk/res/android", "drawableEnd") != null) {
+            } else if (attributeSet.getAttributeValue(NAMESPACE_ANDROID, "drawableEnd") != null) {
                 throw new UnsupportedOperationException("Please set end drawable using R.attr#closeIcon.");
-            } else if (attributeSet.getAttributeValue("http://schemas.android.com/apk/res/android", "drawableRight") != null) {
+            } else if (attributeSet.getAttributeValue(NAMESPACE_ANDROID, "drawableRight") != null) {
                 throw new UnsupportedOperationException("Please set end drawable using R.attr#closeIcon.");
-            } else if (!attributeSet.getAttributeBooleanValue("http://schemas.android.com/apk/res/android", "singleLine", true) || attributeSet.getAttributeIntValue("http://schemas.android.com/apk/res/android", "lines", 1) != 1 || attributeSet.getAttributeIntValue("http://schemas.android.com/apk/res/android", "minLines", 1) != 1 || attributeSet.getAttributeIntValue("http://schemas.android.com/apk/res/android", "maxLines", 1) != 1) {
+            } else if (!attributeSet.getAttributeBooleanValue(NAMESPACE_ANDROID, "singleLine", true) || attributeSet.getAttributeIntValue(NAMESPACE_ANDROID, "lines", 1) != 1 || attributeSet.getAttributeIntValue(NAMESPACE_ANDROID, "minLines", 1) != 1 || attributeSet.getAttributeIntValue(NAMESPACE_ANDROID, "maxLines", 1) != 1) {
                 throw new UnsupportedOperationException("Chip does not support multi-line text");
-            } else if (attributeSet.getAttributeIntValue("http://schemas.android.com/apk/res/android", "gravity", 8388627) != 8388627) {
-                Log.w("Chip", "Chip text must be vertically center and start aligned");
+            } else if (attributeSet.getAttributeIntValue(NAMESPACE_ANDROID, "gravity", 8388627) != 8388627) {
+                Log.w(TAG, "Chip text must be vertically center and start aligned");
             }
         }
     }
@@ -915,9 +916,9 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
     public void onInitializeAccessibilityNodeInfo(@NonNull AccessibilityNodeInfo accessibilityNodeInfo) {
         super.onInitializeAccessibilityNodeInfo(accessibilityNodeInfo);
         if (isCheckable() || isClickable()) {
-            accessibilityNodeInfo.setClassName(isCheckable() ? "android.widget.CompoundButton" : "android.widget.Button");
+            accessibilityNodeInfo.setClassName(isCheckable() ? COMPOUND_BUTTON_ACCESSIBILITY_CLASS_NAME : BUTTON_ACCESSIBILITY_CLASS_NAME);
         } else {
-            accessibilityNodeInfo.setClassName("android.view.View");
+            accessibilityNodeInfo.setClassName(GENERIC_VIEW_ACCESSIBILITY_CLASS_NAME);
         }
         accessibilityNodeInfo.setCheckable(isCheckable());
         accessibilityNodeInfo.setClickable(isClickable());
@@ -934,7 +935,7 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
         if (!getCloseIconTouchBounds().contains(motionEvent.getX(), motionEvent.getY()) || !isEnabled()) {
             return null;
         }
-        return PointerIcon.getSystemIcon(getContext(), 1002);
+        return PointerIcon.getSystemIcon(getContext(), PointerIconCompat.TYPE_HAND);
     }
 
     @Override // android.widget.TextView, android.view.View
@@ -1009,13 +1010,13 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
         if (drawable == getBackgroundDrawable() || drawable == this.ripple) {
             super.setBackground(drawable);
         } else {
-            Log.w("Chip", "Do not set the background; Chip manages its own background drawable.");
+            Log.w(TAG, "Do not set the background; Chip manages its own background drawable.");
         }
     }
 
     @Override // android.view.View
     public void setBackgroundColor(int i) {
-        Log.w("Chip", "Do not set the background color; Chip manages its own background drawable.");
+        Log.w(TAG, "Do not set the background color; Chip manages its own background drawable.");
     }
 
     @Override // androidx.appcompat.widget.AppCompatCheckBox, android.view.View
@@ -1023,23 +1024,23 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
         if (drawable == getBackgroundDrawable() || drawable == this.ripple) {
             super.setBackgroundDrawable(drawable);
         } else {
-            Log.w("Chip", "Do not set the background drawable; Chip manages its own background drawable.");
+            Log.w(TAG, "Do not set the background drawable; Chip manages its own background drawable.");
         }
     }
 
     @Override // androidx.appcompat.widget.AppCompatCheckBox, android.view.View
     public void setBackgroundResource(int i) {
-        Log.w("Chip", "Do not set the background resource; Chip manages its own background drawable.");
+        Log.w(TAG, "Do not set the background resource; Chip manages its own background drawable.");
     }
 
     @Override // android.view.View
     public void setBackgroundTintList(@Nullable ColorStateList colorStateList) {
-        Log.w("Chip", "Do not set the background tint list; Chip manages its own background drawable.");
+        Log.w(TAG, "Do not set the background tint list; Chip manages its own background drawable.");
     }
 
     @Override // android.view.View
     public void setBackgroundTintMode(@Nullable PorterDuff.Mode mode) {
-        Log.w("Chip", "Do not set the background tint mode; Chip manages its own background drawable.");
+        Log.w(TAG, "Do not set the background tint mode; Chip manages its own background drawable.");
     }
 
     public void setCheckable(boolean z2) {
@@ -1511,7 +1512,7 @@ public class Chip extends AppCompatCheckBox implements ChipDrawable.Delegate, Sh
     @Override // android.widget.TextView
     public void setGravity(int i) {
         if (i != 8388627) {
-            Log.w("Chip", "Chip text must be vertically center and start aligned");
+            Log.w(TAG, "Chip text must be vertically center and start aligned");
         } else {
             super.setGravity(i);
         }
diff --git a/app/src/main/java/com/google/android/material/chip/ChipDrawable.java b/app/src/main/java/com/google/android/material/chip/ChipDrawable.java
index a35d0e3804..7da4f752ab 100644
--- a/app/src/main/java/com/google/android/material/chip/ChipDrawable.java
+++ b/app/src/main/java/com/google/android/material/chip/ChipDrawable.java
@@ -38,7 +38,9 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.graphics.drawable.TintAwareDrawable;
+import androidx.core.internal.view.SupportMenu;
 import androidx.core.text.BidiFormatter;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.R;
 import com.google.android.material.animation.MotionSpec;
 import com.google.android.material.canvas.CanvasCompat;
@@ -408,7 +410,7 @@ public class ChipDrawable extends MaterialShapeDrawable implements TintAwareDraw
     private void drawDebug(@NonNull Canvas canvas, @NonNull Rect rect) {
         Paint paint = this.debugPaint;
         if (paint != null) {
-            paint.setColor(ColorUtils.setAlphaComponent(-16777216, 127));
+            paint.setColor(ColorUtils.setAlphaComponent(ViewCompat.MEASURED_STATE_MASK, 127));
             canvas.drawRect(rect, this.debugPaint);
             if (showsChipIcon() || showsCheckedIcon()) {
                 calculateChipIconBounds(rect, this.rectF);
@@ -421,7 +423,7 @@ public class ChipDrawable extends MaterialShapeDrawable implements TintAwareDraw
                 calculateCloseIconBounds(rect, this.rectF);
                 canvas.drawRect(this.rectF, this.debugPaint);
             }
-            this.debugPaint.setColor(ColorUtils.setAlphaComponent(-65536, 127));
+            this.debugPaint.setColor(ColorUtils.setAlphaComponent(SupportMenu.CATEGORY_MASK, 127));
             calculateChipTouchBounds(rect, this.rectF);
             canvas.drawRect(this.rectF, this.debugPaint);
             this.debugPaint.setColor(ColorUtils.setAlphaComponent(-16711936, 127));
@@ -533,7 +535,7 @@ public class ChipDrawable extends MaterialShapeDrawable implements TintAwareDraw
             setEllipsize(TextUtils.TruncateAt.END);
         }
         setChipIconVisible(obtainStyledAttributes.getBoolean(R.styleable.Chip_chipIconVisible, false));
-        if (!(attributeSet == null || attributeSet.getAttributeValue("http://schemas.android.com/apk/res-auto", "chipIconEnabled") == null || attributeSet.getAttributeValue("http://schemas.android.com/apk/res-auto", "chipIconVisible") != null)) {
+        if (!(attributeSet == null || attributeSet.getAttributeValue(NAMESPACE_APP, "chipIconEnabled") == null || attributeSet.getAttributeValue(NAMESPACE_APP, "chipIconVisible") != null)) {
             setChipIconVisible(obtainStyledAttributes.getBoolean(R.styleable.Chip_chipIconEnabled, false));
         }
         setChipIcon(MaterialResources.getDrawable(this.context, obtainStyledAttributes, R.styleable.Chip_chipIcon));
@@ -543,7 +545,7 @@ public class ChipDrawable extends MaterialShapeDrawable implements TintAwareDraw
         }
         setChipIconSize(obtainStyledAttributes.getDimension(R.styleable.Chip_chipIconSize, -1.0f));
         setCloseIconVisible(obtainStyledAttributes.getBoolean(R.styleable.Chip_closeIconVisible, false));
-        if (!(attributeSet == null || attributeSet.getAttributeValue("http://schemas.android.com/apk/res-auto", "closeIconEnabled") == null || attributeSet.getAttributeValue("http://schemas.android.com/apk/res-auto", "closeIconVisible") != null)) {
+        if (!(attributeSet == null || attributeSet.getAttributeValue(NAMESPACE_APP, "closeIconEnabled") == null || attributeSet.getAttributeValue(NAMESPACE_APP, "closeIconVisible") != null)) {
             setCloseIconVisible(obtainStyledAttributes.getBoolean(R.styleable.Chip_closeIconEnabled, false));
         }
         setCloseIcon(MaterialResources.getDrawable(this.context, obtainStyledAttributes, R.styleable.Chip_closeIcon));
@@ -551,7 +553,7 @@ public class ChipDrawable extends MaterialShapeDrawable implements TintAwareDraw
         setCloseIconSize(obtainStyledAttributes.getDimension(R.styleable.Chip_closeIconSize, 0.0f));
         setCheckable(obtainStyledAttributes.getBoolean(R.styleable.Chip_android_checkable, false));
         setCheckedIconVisible(obtainStyledAttributes.getBoolean(R.styleable.Chip_checkedIconVisible, false));
-        if (!(attributeSet == null || attributeSet.getAttributeValue("http://schemas.android.com/apk/res-auto", "checkedIconEnabled") == null || attributeSet.getAttributeValue("http://schemas.android.com/apk/res-auto", "checkedIconVisible") != null)) {
+        if (!(attributeSet == null || attributeSet.getAttributeValue(NAMESPACE_APP, "checkedIconEnabled") == null || attributeSet.getAttributeValue(NAMESPACE_APP, "checkedIconVisible") != null)) {
             setCheckedIconVisible(obtainStyledAttributes.getBoolean(R.styleable.Chip_checkedIconEnabled, false));
         }
         setCheckedIcon(MaterialResources.getDrawable(this.context, obtainStyledAttributes, R.styleable.Chip_checkedIcon));
diff --git a/app/src/main/java/com/google/android/material/circularreveal/CircularRevealHelper.java b/app/src/main/java/com/google/android/material/circularreveal/CircularRevealHelper.java
index 4805558747..7ff2ec154e 100644
--- a/app/src/main/java/com/google/android/material/circularreveal/CircularRevealHelper.java
+++ b/app/src/main/java/com/google/android/material/circularreveal/CircularRevealHelper.java
@@ -13,6 +13,8 @@ import android.view.View;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
 import com.google.android.material.circularreveal.CircularRevealWidget;
 import com.google.android.material.math.MathUtils;
@@ -75,8 +77,8 @@ public class CircularRevealHelper {
             canvas.drawCircle(revealInfo.centerX, revealInfo.centerY, revealInfo.radius, this.scrimPaint);
         }
         if (shouldDrawCircularReveal()) {
-            drawDebugCircle(canvas, -16777216, 10.0f);
-            drawDebugCircle(canvas, -65536, 5.0f);
+            drawDebugCircle(canvas, ViewCompat.MEASURED_STATE_MASK, 10.0f);
+            drawDebugCircle(canvas, SupportMenu.CATEGORY_MASK, 5.0f);
         }
         drawOverlayDrawable(canvas);
     }
diff --git a/app/src/main/java/com/google/android/material/datepicker/CalendarConstraints.java b/app/src/main/java/com/google/android/material/datepicker/CalendarConstraints.java
index b03b0c61a1..2e26f99793 100644
--- a/app/src/main/java/com/google/android/material/datepicker/CalendarConstraints.java
+++ b/app/src/main/java/com/google/android/material/datepicker/CalendarConstraints.java
@@ -43,10 +43,10 @@ public final class CalendarConstraints implements Parcelable {
         @NonNull
         public CalendarConstraints build() {
             Bundle bundle = new Bundle();
-            bundle.putParcelable("DEEP_COPY_VALIDATOR_KEY", this.validator);
+            bundle.putParcelable(DEEP_COPY_VALIDATOR_KEY, this.validator);
             Month h = Month.h(this.start);
             Month h2 = Month.h(this.end);
-            DateValidator dateValidator = (DateValidator) bundle.getParcelable("DEEP_COPY_VALIDATOR_KEY");
+            DateValidator dateValidator = (DateValidator) bundle.getParcelable(DEEP_COPY_VALIDATOR_KEY);
             Long l = this.openAt;
             return new CalendarConstraints(h, h2, dateValidator, l == null ? null : Month.h(l.longValue()), null);
         }
diff --git a/app/src/main/java/com/google/android/material/datepicker/MaterialCalendar.java b/app/src/main/java/com/google/android/material/datepicker/MaterialCalendar.java
index 2e3978d825..720972a61b 100644
--- a/app/src/main/java/com/google/android/material/datepicker/MaterialCalendar.java
+++ b/app/src/main/java/com/google/android/material/datepicker/MaterialCalendar.java
@@ -291,10 +291,10 @@ public final class MaterialCalendar<S> extends c.i.a.g.d.i<S> {
     public static <T> MaterialCalendar<T> newInstance(@NonNull DateSelector<T> dateSelector, @StyleRes int i2, @NonNull CalendarConstraints calendarConstraints) {
         MaterialCalendar<T> materialCalendar = new MaterialCalendar<>();
         Bundle bundle = new Bundle();
-        bundle.putInt("THEME_RES_ID_KEY", i2);
-        bundle.putParcelable("GRID_SELECTOR_KEY", dateSelector);
-        bundle.putParcelable("CALENDAR_CONSTRAINTS_KEY", calendarConstraints);
-        bundle.putParcelable("CURRENT_MONTH_KEY", calendarConstraints.getOpenAt());
+        bundle.putInt(THEME_RES_ID_KEY, i2);
+        bundle.putParcelable(GRID_SELECTOR_KEY, dateSelector);
+        bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, calendarConstraints);
+        bundle.putParcelable(CURRENT_MONTH_KEY, calendarConstraints.getOpenAt());
         materialCalendar.setArguments(bundle);
         return materialCalendar;
     }
@@ -339,10 +339,10 @@ public final class MaterialCalendar<S> extends c.i.a.g.d.i<S> {
         if (bundle == null) {
             bundle = getArguments();
         }
-        this.themeResId = bundle.getInt("THEME_RES_ID_KEY");
-        this.dateSelector = (DateSelector) bundle.getParcelable("GRID_SELECTOR_KEY");
-        this.calendarConstraints = (CalendarConstraints) bundle.getParcelable("CALENDAR_CONSTRAINTS_KEY");
-        this.current = (Month) bundle.getParcelable("CURRENT_MONTH_KEY");
+        this.themeResId = bundle.getInt(THEME_RES_ID_KEY);
+        this.dateSelector = (DateSelector) bundle.getParcelable(GRID_SELECTOR_KEY);
+        this.calendarConstraints = (CalendarConstraints) bundle.getParcelable(CALENDAR_CONSTRAINTS_KEY);
+        this.current = (Month) bundle.getParcelable(CURRENT_MONTH_KEY);
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -394,10 +394,10 @@ public final class MaterialCalendar<S> extends c.i.a.g.d.i<S> {
     @Override // androidx.fragment.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putInt("THEME_RES_ID_KEY", this.themeResId);
-        bundle.putParcelable("GRID_SELECTOR_KEY", this.dateSelector);
-        bundle.putParcelable("CALENDAR_CONSTRAINTS_KEY", this.calendarConstraints);
-        bundle.putParcelable("CURRENT_MONTH_KEY", this.current);
+        bundle.putInt(THEME_RES_ID_KEY, this.themeResId);
+        bundle.putParcelable(GRID_SELECTOR_KEY, this.dateSelector);
+        bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, this.calendarConstraints);
+        bundle.putParcelable(CURRENT_MONTH_KEY, this.current);
     }
 
     public void setCurrentMonth(Month month) {
diff --git a/app/src/main/java/com/google/android/material/datepicker/MaterialCalendarGridView.java b/app/src/main/java/com/google/android/material/datepicker/MaterialCalendarGridView.java
index 6463d23412..58f5e8a427 100644
--- a/app/src/main/java/com/google/android/material/datepicker/MaterialCalendarGridView.java
+++ b/app/src/main/java/com/google/android/material/datepicker/MaterialCalendarGridView.java
@@ -151,7 +151,7 @@ public final class MaterialCalendarGridView extends GridView {
     @Override // android.widget.GridView, android.widget.AbsListView, android.view.View
     public void onMeasure(int i, int i2) {
         if (this.j) {
-            super.onMeasure(i, View.MeasureSpec.makeMeasureSpec(16777215, Integer.MIN_VALUE));
+            super.onMeasure(i, View.MeasureSpec.makeMeasureSpec(ViewCompat.MEASURED_SIZE_MASK, Integer.MIN_VALUE));
             getLayoutParams().height = getMeasuredHeight();
             return;
         }
diff --git a/app/src/main/java/com/google/android/material/datepicker/MaterialDatePicker.java b/app/src/main/java/com/google/android/material/datepicker/MaterialDatePicker.java
index d1ad581b9a..ec219fc67a 100644
--- a/app/src/main/java/com/google/android/material/datepicker/MaterialDatePicker.java
+++ b/app/src/main/java/com/google/android/material/datepicker/MaterialDatePicker.java
@@ -327,12 +327,12 @@ public final class MaterialDatePicker<S> extends DialogFragment {
     public static <S> MaterialDatePicker<S> newInstance(@NonNull Builder<S> builder) {
         MaterialDatePicker<S> materialDatePicker = new MaterialDatePicker<>();
         Bundle bundle = new Bundle();
-        bundle.putInt("OVERRIDE_THEME_RES_ID", builder.overrideThemeResId);
-        bundle.putParcelable("DATE_SELECTOR_KEY", builder.dateSelector);
-        bundle.putParcelable("CALENDAR_CONSTRAINTS_KEY", builder.calendarConstraints);
-        bundle.putInt("TITLE_TEXT_RES_ID_KEY", builder.titleTextResId);
-        bundle.putCharSequence("TITLE_TEXT_KEY", builder.titleText);
-        bundle.putInt("INPUT_MODE_KEY", builder.inputMode);
+        bundle.putInt(OVERRIDE_THEME_RES_ID, builder.overrideThemeResId);
+        bundle.putParcelable(DATE_SELECTOR_KEY, builder.dateSelector);
+        bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, builder.calendarConstraints);
+        bundle.putInt(TITLE_TEXT_RES_ID_KEY, builder.titleTextResId);
+        bundle.putCharSequence(TITLE_TEXT_KEY, builder.titleText);
+        bundle.putInt(INPUT_MODE_KEY, builder.inputMode);
         materialDatePicker.setArguments(bundle);
         return materialDatePicker;
     }
@@ -429,12 +429,12 @@ public final class MaterialDatePicker<S> extends DialogFragment {
         if (bundle == null) {
             bundle = getArguments();
         }
-        this.overrideThemeResId = bundle.getInt("OVERRIDE_THEME_RES_ID");
-        this.dateSelector = (DateSelector) bundle.getParcelable("DATE_SELECTOR_KEY");
-        this.calendarConstraints = (CalendarConstraints) bundle.getParcelable("CALENDAR_CONSTRAINTS_KEY");
-        this.titleTextResId = bundle.getInt("TITLE_TEXT_RES_ID_KEY");
-        this.titleText = bundle.getCharSequence("TITLE_TEXT_KEY");
-        this.inputMode = bundle.getInt("INPUT_MODE_KEY");
+        this.overrideThemeResId = bundle.getInt(OVERRIDE_THEME_RES_ID);
+        this.dateSelector = (DateSelector) bundle.getParcelable(DATE_SELECTOR_KEY);
+        this.calendarConstraints = (CalendarConstraints) bundle.getParcelable(CALENDAR_CONSTRAINTS_KEY);
+        this.titleTextResId = bundle.getInt(TITLE_TEXT_RES_ID_KEY);
+        this.titleText = bundle.getCharSequence(TITLE_TEXT_KEY);
+        this.inputMode = bundle.getInt(INPUT_MODE_KEY);
     }
 
     @Override // androidx.fragment.app.DialogFragment
@@ -507,15 +507,15 @@ public final class MaterialDatePicker<S> extends DialogFragment {
     @Override // androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public final void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putInt("OVERRIDE_THEME_RES_ID", this.overrideThemeResId);
-        bundle.putParcelable("DATE_SELECTOR_KEY", this.dateSelector);
+        bundle.putInt(OVERRIDE_THEME_RES_ID, this.overrideThemeResId);
+        bundle.putParcelable(DATE_SELECTOR_KEY, this.dateSelector);
         CalendarConstraints.Builder builder = new CalendarConstraints.Builder(this.calendarConstraints);
         if (this.calendar.getCurrentMonth() != null) {
             builder.setOpenAt(this.calendar.getCurrentMonth().n);
         }
-        bundle.putParcelable("CALENDAR_CONSTRAINTS_KEY", builder.build());
-        bundle.putInt("TITLE_TEXT_RES_ID_KEY", this.titleTextResId);
-        bundle.putCharSequence("TITLE_TEXT_KEY", this.titleText);
+        bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, builder.build());
+        bundle.putInt(TITLE_TEXT_RES_ID_KEY, this.titleTextResId);
+        bundle.putCharSequence(TITLE_TEXT_KEY, this.titleText);
     }
 
     @Override // androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/google/android/material/datepicker/MaterialStyledDatePickerDialog.java b/app/src/main/java/com/google/android/material/datepicker/MaterialStyledDatePickerDialog.java
index 9eb16b3609..a0f7846eb4 100644
--- a/app/src/main/java/com/google/android/material/datepicker/MaterialStyledDatePickerDialog.java
+++ b/app/src/main/java/com/google/android/material/datepicker/MaterialStyledDatePickerDialog.java
@@ -40,9 +40,9 @@ public class MaterialStyledDatePickerDialog extends DatePickerDialog {
         Context context2 = getContext();
         int resolveOrThrow = MaterialAttributes.resolveOrThrow(getContext(), R.attr.colorSurface, getClass().getCanonicalName());
         int i5 = DEF_STYLE_RES;
-        MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(context2, null, 16843612, i5);
+        MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(context2, null, DEF_STYLE_ATTR, i5);
         materialShapeDrawable.setFillColor(ColorStateList.valueOf(resolveOrThrow));
-        Rect dialogBackgroundInsets = MaterialDialogs.getDialogBackgroundInsets(context2, 16843612, i5);
+        Rect dialogBackgroundInsets = MaterialDialogs.getDialogBackgroundInsets(context2, DEF_STYLE_ATTR, i5);
         this.backgroundInsets = dialogBackgroundInsets;
         this.background = MaterialDialogs.insetDrawable(materialShapeDrawable, dialogBackgroundInsets);
     }
diff --git a/app/src/main/java/com/google/android/material/datepicker/MaterialTextInputPicker.java b/app/src/main/java/com/google/android/material/datepicker/MaterialTextInputPicker.java
index e729d2f11f..944f11f1b7 100644
--- a/app/src/main/java/com/google/android/material/datepicker/MaterialTextInputPicker.java
+++ b/app/src/main/java/com/google/android/material/datepicker/MaterialTextInputPicker.java
@@ -48,9 +48,9 @@ public final class MaterialTextInputPicker<S> extends i<S> {
     public static <T> MaterialTextInputPicker<T> newInstance(DateSelector<T> dateSelector, @StyleRes int i, @NonNull CalendarConstraints calendarConstraints) {
         MaterialTextInputPicker<T> materialTextInputPicker = new MaterialTextInputPicker<>();
         Bundle bundle = new Bundle();
-        bundle.putInt("THEME_RES_ID_KEY", i);
-        bundle.putParcelable("DATE_SELECTOR_KEY", dateSelector);
-        bundle.putParcelable("CALENDAR_CONSTRAINTS_KEY", calendarConstraints);
+        bundle.putInt(THEME_RES_ID_KEY, i);
+        bundle.putParcelable(DATE_SELECTOR_KEY, dateSelector);
+        bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, calendarConstraints);
         materialTextInputPicker.setArguments(bundle);
         return materialTextInputPicker;
     }
@@ -71,9 +71,9 @@ public final class MaterialTextInputPicker<S> extends i<S> {
         if (bundle == null) {
             bundle = getArguments();
         }
-        this.themeResId = bundle.getInt("THEME_RES_ID_KEY");
-        this.dateSelector = (DateSelector) bundle.getParcelable("DATE_SELECTOR_KEY");
-        this.calendarConstraints = (CalendarConstraints) bundle.getParcelable("CALENDAR_CONSTRAINTS_KEY");
+        this.themeResId = bundle.getInt(THEME_RES_ID_KEY);
+        this.dateSelector = (DateSelector) bundle.getParcelable(DATE_SELECTOR_KEY);
+        this.calendarConstraints = (CalendarConstraints) bundle.getParcelable(CALENDAR_CONSTRAINTS_KEY);
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -85,8 +85,8 @@ public final class MaterialTextInputPicker<S> extends i<S> {
     @Override // androidx.fragment.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putInt("THEME_RES_ID_KEY", this.themeResId);
-        bundle.putParcelable("DATE_SELECTOR_KEY", this.dateSelector);
-        bundle.putParcelable("CALENDAR_CONSTRAINTS_KEY", this.calendarConstraints);
+        bundle.putInt(THEME_RES_ID_KEY, this.themeResId);
+        bundle.putParcelable(DATE_SELECTOR_KEY, this.dateSelector);
+        bundle.putParcelable(CALENDAR_CONSTRAINTS_KEY, this.calendarConstraints);
     }
 }
diff --git a/app/src/main/java/com/google/android/material/elevation/ElevationOverlayProvider.java b/app/src/main/java/com/google/android/material/elevation/ElevationOverlayProvider.java
index 4f499dd8d6..b7a3566896 100644
--- a/app/src/main/java/com/google/android/material/elevation/ElevationOverlayProvider.java
+++ b/app/src/main/java/com/google/android/material/elevation/ElevationOverlayProvider.java
@@ -38,7 +38,7 @@ public class ElevationOverlayProvider {
         if (f2 <= 0.0f || f <= 0.0f) {
             return 0.0f;
         }
-        return Math.min(((((float) Math.log1p((double) (f / f2))) * 4.5f) + 2.0f) / 100.0f, 1.0f);
+        return Math.min(((((float) Math.log1p((double) (f / f2))) * FORMULA_MULTIPLIER) + FORMULA_OFFSET) / 100.0f, 1.0f);
     }
 
     @ColorInt
diff --git a/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java b/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
index 37a7c5e659..b1987d390d 100644
--- a/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
+++ b/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
@@ -454,7 +454,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
             return i2;
         }
         Resources resources = getResources();
-        return i != -1 ? i != 1 ? resources.getDimensionPixelSize(R.dimen.design_fab_size_normal) : resources.getDimensionPixelSize(R.dimen.design_fab_size_mini) : Math.max(resources.getConfiguration().screenWidthDp, resources.getConfiguration().screenHeightDp) < 470 ? getSizeDimension(1) : getSizeDimension(0);
+        return i != -1 ? i != 1 ? resources.getDimensionPixelSize(R.dimen.design_fab_size_normal) : resources.getDimensionPixelSize(R.dimen.design_fab_size_mini) : Math.max(resources.getConfiguration().screenWidthDp, resources.getConfiguration().screenHeightDp) < AUTO_MINI_LARGEST_SCREEN_WIDTH ? getSizeDimension(1) : getSizeDimension(0);
     }
 
     private void offsetRectWithShadow(@NonNull Rect rect) {
@@ -778,7 +778,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
         }
         ExtendableSavedState extendableSavedState = (ExtendableSavedState) parcelable;
         super.onRestoreInstanceState(extendableSavedState.getSuperState());
-        this.expandableWidgetHelper.onRestoreInstanceState((Bundle) Preconditions.checkNotNull(extendableSavedState.extendableStates.get("expandableWidgetHelper")));
+        this.expandableWidgetHelper.onRestoreInstanceState((Bundle) Preconditions.checkNotNull(extendableSavedState.extendableStates.get(EXPANDABLE_WIDGET_HELPER_KEY)));
     }
 
     @Override // android.view.View
@@ -788,7 +788,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
             onSaveInstanceState = new Bundle();
         }
         ExtendableSavedState extendableSavedState = new ExtendableSavedState(onSaveInstanceState);
-        extendableSavedState.extendableStates.put("expandableWidgetHelper", this.expandableWidgetHelper.onSaveInstanceState());
+        extendableSavedState.extendableStates.put(EXPANDABLE_WIDGET_HELPER_KEY, this.expandableWidgetHelper.onSaveInstanceState());
         return extendableSavedState;
     }
 
@@ -825,17 +825,17 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
 
     @Override // android.view.View
     public void setBackgroundColor(int i) {
-        Log.i("FloatingActionButton", "Setting a custom background is not supported.");
+        Log.i(LOG_TAG, "Setting a custom background is not supported.");
     }
 
     @Override // android.view.View
     public void setBackgroundDrawable(Drawable drawable) {
-        Log.i("FloatingActionButton", "Setting a custom background is not supported.");
+        Log.i(LOG_TAG, "Setting a custom background is not supported.");
     }
 
     @Override // android.view.View
     public void setBackgroundResource(int i) {
-        Log.i("FloatingActionButton", "Setting a custom background is not supported.");
+        Log.i(LOG_TAG, "Setting a custom background is not supported.");
     }
 
     @Override // android.view.View
diff --git a/app/src/main/java/com/google/android/material/internal/CollapsingTextHelper.java b/app/src/main/java/com/google/android/material/internal/CollapsingTextHelper.java
index a45af3098c..5b82de3904 100644
--- a/app/src/main/java/com/google/android/material/internal/CollapsingTextHelper.java
+++ b/app/src/main/java/com/google/android/material/internal/CollapsingTextHelper.java
@@ -161,7 +161,7 @@ public final class CollapsingTextHelper {
         } else {
             this.collapsedDrawY = this.textPaint.ascent() + ((float) this.collapsedBounds.bottom);
         }
-        int i2 = absoluteGravity & 8388615;
+        int i2 = absoluteGravity & GravityCompat.RELATIVE_HORIZONTAL_GRAVITY_MASK;
         if (i2 == 1) {
             this.collapsedDrawX = ((float) this.collapsedBounds.centerX()) - (measureText / 2.0f);
         } else if (i2 != 5) {
@@ -192,7 +192,7 @@ public final class CollapsingTextHelper {
         } else {
             this.expandedDrawY = this.textPaint.descent() + (((float) this.expandedBounds.bottom) - height);
         }
-        int i4 = absoluteGravity2 & 8388615;
+        int i4 = absoluteGravity2 & GravityCompat.RELATIVE_HORIZONTAL_GRAVITY_MASK;
         if (i4 == 1) {
             this.expandedDrawX = ((float) this.expandedBounds.centerX()) - (measureText2 / 2.0f);
         } else if (i4 != 5) {
@@ -319,7 +319,7 @@ public final class CollapsingTextHelper {
             aVar.i = i;
             staticLayout = aVar.a();
         } catch (a.C0116a e) {
-            Log.e("CollapsingTextHelper", e.getCause().getMessage(), e);
+            Log.e(TAG, e.getCause().getMessage(), e);
             staticLayout = null;
         }
         return (StaticLayout) Preconditions.checkNotNull(staticLayout);
@@ -337,7 +337,7 @@ public final class CollapsingTextHelper {
         float f4 = (float) lineBaseline;
         canvas.drawText(charSequence, 0, charSequence.length(), 0.0f, f4, this.textPaint);
         String trim = this.textToDrawCollapsed.toString().trim();
-        if (trim.endsWith("…")) {
+        if (trim.endsWith(ELLIPSIS_NORMAL)) {
             trim = trim.substring(0, trim.length() - 1);
         }
         this.textPaint.setAlpha(alpha);
@@ -360,13 +360,13 @@ public final class CollapsingTextHelper {
     }
 
     private float getCollapsedTextLeftBound(int i, int i2) {
-        return (i2 == 17 || (i2 & 7) == 1) ? (((float) i) / 2.0f) - (calculateCollapsedTextWidth() / 2.0f) : ((i2 & 8388613) == 8388613 || (i2 & 5) == 5) ? this.isRtl ? (float) this.collapsedBounds.left : ((float) this.collapsedBounds.right) - calculateCollapsedTextWidth() : this.isRtl ? ((float) this.collapsedBounds.right) - calculateCollapsedTextWidth() : (float) this.collapsedBounds.left;
+        return (i2 == 17 || (i2 & 7) == 1) ? (((float) i) / 2.0f) - (calculateCollapsedTextWidth() / 2.0f) : ((i2 & GravityCompat.END) == 8388613 || (i2 & 5) == 5) ? this.isRtl ? (float) this.collapsedBounds.left : ((float) this.collapsedBounds.right) - calculateCollapsedTextWidth() : this.isRtl ? ((float) this.collapsedBounds.right) - calculateCollapsedTextWidth() : (float) this.collapsedBounds.left;
     }
 
     private float getCollapsedTextRightBound(@NonNull RectF rectF, int i, int i2) {
         if (i2 == 17 || (i2 & 7) == 1) {
             return (calculateCollapsedTextWidth() / 2.0f) + (((float) i) / 2.0f);
-        } else if ((i2 & 8388613) != 8388613 && (i2 & 5) != 5) {
+        } else if ((i2 & GravityCompat.END) != 8388613 && (i2 & 5) != 5) {
             return this.isRtl ? (float) this.collapsedBounds.right : rectF.left + calculateCollapsedTextWidth();
         } else {
             if (!this.isRtl) {
diff --git a/app/src/main/java/com/google/android/material/internal/ForegroundLinearLayout.java b/app/src/main/java/com/google/android/material/internal/ForegroundLinearLayout.java
index 221d62bc3d..161408a577 100644
--- a/app/src/main/java/com/google/android/material/internal/ForegroundLinearLayout.java
+++ b/app/src/main/java/com/google/android/material/internal/ForegroundLinearLayout.java
@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.core.view.GravityCompat;
 import com.google.android.material.R;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
 public class ForegroundLinearLayout extends LinearLayoutCompat {
@@ -155,7 +156,7 @@ public class ForegroundLinearLayout extends LinearLayoutCompat {
     public void setForegroundGravity(int i) {
         if (this.foregroundGravity != i) {
             if ((8388615 & i) == 0) {
-                i |= 8388611;
+                i |= GravityCompat.START;
             }
             if ((i & 112) == 0) {
                 i |= 48;
diff --git a/app/src/main/java/com/google/android/material/internal/ManufacturerUtils.java b/app/src/main/java/com/google/android/material/internal/ManufacturerUtils.java
index 5717f25fa0..b0d7f6afd1 100644
--- a/app/src/main/java/com/google/android/material/internal/ManufacturerUtils.java
+++ b/app/src/main/java/com/google/android/material/internal/ManufacturerUtils.java
@@ -17,14 +17,14 @@ public class ManufacturerUtils {
     }
 
     public static boolean isLGEDevice() {
-        return Build.MANUFACTURER.toLowerCase(Locale.ENGLISH).equals("lge");
+        return Build.MANUFACTURER.toLowerCase(Locale.ENGLISH).equals(LGE);
     }
 
     public static boolean isMeizuDevice() {
-        return Build.MANUFACTURER.toLowerCase(Locale.ENGLISH).equals("meizu");
+        return Build.MANUFACTURER.toLowerCase(Locale.ENGLISH).equals(MEIZU);
     }
 
     public static boolean isSamsungDevice() {
-        return Build.MANUFACTURER.toLowerCase(Locale.ENGLISH).equals("samsung");
+        return Build.MANUFACTURER.toLowerCase(Locale.ENGLISH).equals(SAMSUNG);
     }
 }
diff --git a/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java b/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
index 8d0ad14aa0..e1299407f7 100644
--- a/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
+++ b/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
@@ -504,7 +504,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
             if (sparseParcelableArray != null) {
                 this.menuView.restoreHierarchyState(sparseParcelableArray);
             }
-            Bundle bundle2 = bundle.getBundle("android:menu:adapter");
+            Bundle bundle2 = bundle.getBundle(STATE_ADAPTER);
             if (bundle2 != null) {
                 c cVar = this.adapter;
                 Objects.requireNonNull(cVar);
@@ -538,7 +538,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
                     }
                 }
             }
-            SparseArray sparseParcelableArray3 = bundle.getSparseParcelableArray("android:menu:header");
+            SparseArray sparseParcelableArray3 = bundle.getSparseParcelableArray(STATE_HEADER);
             if (sparseParcelableArray3 != null) {
                 this.headerLayout.restoreHierarchyState(sparseParcelableArray3);
             }
@@ -577,12 +577,12 @@ public class NavigationMenuPresenter implements MenuPresenter {
                 }
             }
             bundle2.putSparseParcelableArray("android:menu:action_views", sparseArray2);
-            bundle.putBundle("android:menu:adapter", bundle2);
+            bundle.putBundle(STATE_ADAPTER, bundle2);
         }
         if (this.headerLayout != null) {
             SparseArray<? extends Parcelable> sparseArray3 = new SparseArray<>();
             this.headerLayout.saveHierarchyState(sparseArray3);
-            bundle.putSparseParcelableArray("android:menu:header", sparseArray3);
+            bundle.putSparseParcelableArray(STATE_HEADER, sparseArray3);
         }
         return bundle;
     }
diff --git a/app/src/main/java/com/google/android/material/internal/TextScale.java b/app/src/main/java/com/google/android/material/internal/TextScale.java
index e9c1095c8d..f2286f3e87 100644
--- a/app/src/main/java/com/google/android/material/internal/TextScale.java
+++ b/app/src/main/java/com/google/android/material/internal/TextScale.java
@@ -33,7 +33,7 @@ public class TextScale extends Transition {
     private void captureValues(@NonNull TransitionValues transitionValues) {
         View view = transitionValues.view;
         if (view instanceof TextView) {
-            transitionValues.values.put("android:textscale:scale", Float.valueOf(((TextView) view).getScaleX()));
+            transitionValues.values.put(PROPNAME_SCALE, Float.valueOf(((TextView) view).getScaleX()));
         }
     }
 
@@ -60,9 +60,9 @@ public class TextScale extends Transition {
         Map<String, Object> map = transitionValues.values;
         Map<String, Object> map2 = transitionValues2.values;
         float f = 1.0f;
-        float floatValue = map.get("android:textscale:scale") != null ? ((Float) map.get("android:textscale:scale")).floatValue() : 1.0f;
-        if (map2.get("android:textscale:scale") != null) {
-            f = ((Float) map2.get("android:textscale:scale")).floatValue();
+        float floatValue = map.get(PROPNAME_SCALE) != null ? ((Float) map.get(PROPNAME_SCALE)).floatValue() : 1.0f;
+        if (map2.get(PROPNAME_SCALE) != null) {
+            f = ((Float) map2.get(PROPNAME_SCALE)).floatValue();
         }
         if (floatValue == f) {
             return null;
diff --git a/app/src/main/java/com/google/android/material/internal/ThemeEnforcement.java b/app/src/main/java/com/google/android/material/internal/ThemeEnforcement.java
index ae7ed8ad6a..3cd142aab7 100644
--- a/app/src/main/java/com/google/android/material/internal/ThemeEnforcement.java
+++ b/app/src/main/java/com/google/android/material/internal/ThemeEnforcement.java
@@ -24,7 +24,7 @@ public final class ThemeEnforcement {
     }
 
     public static void checkAppCompatTheme(@NonNull Context context) {
-        checkTheme(context, APPCOMPAT_CHECK_ATTRS, "Theme.AppCompat");
+        checkTheme(context, APPCOMPAT_CHECK_ATTRS, APPCOMPAT_THEME_NAME);
     }
 
     private static void checkCompatibleTheme(@NonNull Context context, AttributeSet attributeSet, @AttrRes int i, @StyleRes int i2) {
@@ -41,7 +41,7 @@ public final class ThemeEnforcement {
     }
 
     public static void checkMaterialTheme(@NonNull Context context) {
-        checkTheme(context, MATERIAL_CHECK_ATTRS, "Theme.MaterialComponents");
+        checkTheme(context, MATERIAL_CHECK_ATTRS, MATERIAL_THEME_NAME);
     }
 
     private static void checkTextAppearance(@NonNull Context context, AttributeSet attributeSet, @NonNull @StyleableRes int[] iArr, @AttrRes int i, @StyleRes int i2, @Nullable @StyleableRes int... iArr2) {
diff --git a/app/src/main/java/com/google/android/material/navigation/NavigationView.java b/app/src/main/java/com/google/android/material/navigation/NavigationView.java
index 37119776a5..d8857b2777 100644
--- a/app/src/main/java/com/google/android/material/navigation/NavigationView.java
+++ b/app/src/main/java/com/google/android/material/navigation/NavigationView.java
@@ -32,6 +32,7 @@ import androidx.appcompat.view.SupportMenuInflater;
 import androidx.appcompat.view.menu.MenuBuilder;
 import androidx.appcompat.view.menu.MenuItemImpl;
 import androidx.appcompat.widget.TintTypedArray;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -374,9 +375,9 @@ public class NavigationView extends ScrimInsetsFrameLayout {
     public void onMeasure(int i, int i2) {
         int mode = View.MeasureSpec.getMode(i);
         if (mode == Integer.MIN_VALUE) {
-            i = View.MeasureSpec.makeMeasureSpec(Math.min(View.MeasureSpec.getSize(i), this.maxWidth), 1073741824);
+            i = View.MeasureSpec.makeMeasureSpec(Math.min(View.MeasureSpec.getSize(i), this.maxWidth), BasicMeasure.EXACTLY);
         } else if (mode == 0) {
-            i = View.MeasureSpec.makeMeasureSpec(this.maxWidth, 1073741824);
+            i = View.MeasureSpec.makeMeasureSpec(this.maxWidth, BasicMeasure.EXACTLY);
         }
         super.onMeasure(i, i2);
     }
diff --git a/app/src/main/java/com/google/android/material/resources/MaterialResources.java b/app/src/main/java/com/google/android/material/resources/MaterialResources.java
index 1c88dcd1ef..2079ded649 100644
--- a/app/src/main/java/com/google/android/material/resources/MaterialResources.java
+++ b/app/src/main/java/com/google/android/material/resources/MaterialResources.java
@@ -66,10 +66,10 @@ public class MaterialResources {
     }
 
     public static boolean isFontScaleAtLeast1_3(@NonNull Context context) {
-        return context.getResources().getConfiguration().fontScale >= 1.3f;
+        return context.getResources().getConfiguration().fontScale >= FONT_SCALE_1_3;
     }
 
     public static boolean isFontScaleAtLeast2_0(@NonNull Context context) {
-        return context.getResources().getConfiguration().fontScale >= 2.0f;
+        return context.getResources().getConfiguration().fontScale >= FONT_SCALE_2_0;
     }
 }
diff --git a/app/src/main/java/com/google/android/material/resources/TextAppearance.java b/app/src/main/java/com/google/android/material/resources/TextAppearance.java
index 09bc8e478e..c4df204a9e 100644
--- a/app/src/main/java/com/google/android/material/resources/TextAppearance.java
+++ b/app/src/main/java/com/google/android/material/resources/TextAppearance.java
@@ -14,6 +14,7 @@ import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.res.ResourcesCompat;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.R;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
 public class TextAppearance {
@@ -172,7 +173,7 @@ public class TextAppearance {
             } catch (Exception e) {
                 StringBuilder K = c.d.b.a.a.K("Error loading font ");
                 K.append(this.fontFamily);
-                Log.d("TextAppearance", K.toString(), e);
+                Log.d(TAG, K.toString(), e);
             }
         }
         createFallbackFont();
@@ -207,7 +208,7 @@ public class TextAppearance {
         } catch (Exception e) {
             StringBuilder K = c.d.b.a.a.K("Error loading font ");
             K.append(this.fontFamily);
-            Log.d("TextAppearance", K.toString(), e);
+            Log.d(TAG, K.toString(), e);
             this.fontResolved = true;
             textAppearanceFontCallback.onFontRetrievalFailed(-3);
         }
@@ -216,7 +217,7 @@ public class TextAppearance {
     public void updateDrawState(@NonNull Context context, @NonNull TextPaint textPaint, @NonNull TextAppearanceFontCallback textAppearanceFontCallback) {
         updateMeasureState(context, textPaint, textAppearanceFontCallback);
         ColorStateList colorStateList = this.textColor;
-        textPaint.setColor(colorStateList != null ? colorStateList.getColorForState(textPaint.drawableState, colorStateList.getDefaultColor()) : -16777216);
+        textPaint.setColor(colorStateList != null ? colorStateList.getColorForState(textPaint.drawableState, colorStateList.getDefaultColor()) : ViewCompat.MEASURED_STATE_MASK);
         float f = this.shadowRadius;
         float f2 = this.shadowDx;
         float f3 = this.shadowDy;
diff --git a/app/src/main/java/com/google/android/material/ripple/RippleUtils.java b/app/src/main/java/com/google/android/material/ripple/RippleUtils.java
index d018a4ae9e..434e705bc4 100644
--- a/app/src/main/java/com/google/android/material/ripple/RippleUtils.java
+++ b/app/src/main/java/com/google/android/material/ripple/RippleUtils.java
@@ -68,7 +68,7 @@ public class RippleUtils {
         }
         int i = Build.VERSION.SDK_INT;
         if (i >= 22 && i <= 27 && Color.alpha(colorStateList.getDefaultColor()) == 0 && Color.alpha(colorStateList.getColorForState(ENABLED_PRESSED_STATE_SET, 0)) != 0) {
-            Log.w(LOG_TAG, "Use a non-transparent color for the default color as it will be used to finish ripple animations.");
+            Log.w(LOG_TAG, TRANSPARENT_DEFAULT_COLOR_WARNING);
         }
         return colorStateList;
     }
diff --git a/app/src/main/java/com/google/android/material/shadow/ShadowRenderer.java b/app/src/main/java/com/google/android/material/shadow/ShadowRenderer.java
index 0571290404..6b2941444e 100644
--- a/app/src/main/java/com/google/android/material/shadow/ShadowRenderer.java
+++ b/app/src/main/java/com/google/android/material/shadow/ShadowRenderer.java
@@ -13,6 +13,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.view.ViewCompat;
 @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
 public class ShadowRenderer {
     private static final int COLOR_ALPHA_END = 0;
@@ -35,7 +36,7 @@ public class ShadowRenderer {
     private Paint transparentPaint;
 
     public ShadowRenderer() {
-        this(-16777216);
+        this(ViewCompat.MEASURED_STATE_MASK);
     }
 
     public ShadowRenderer(int i) {
diff --git a/app/src/main/java/com/google/android/material/shape/RelativeCornerSize.java b/app/src/main/java/com/google/android/material/shape/RelativeCornerSize.java
index 71702bf5a7..077d6d1d68 100644
--- a/app/src/main/java/com/google/android/material/shape/RelativeCornerSize.java
+++ b/app/src/main/java/com/google/android/material/shape/RelativeCornerSize.java
@@ -3,6 +3,7 @@ package com.google.android.material.shape;
 import android.graphics.RectF;
 import androidx.annotation.FloatRange;
 import androidx.annotation.NonNull;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import java.util.Arrays;
 public final class RelativeCornerSize implements CornerSize {
     private final float percent;
@@ -23,7 +24,7 @@ public final class RelativeCornerSize implements CornerSize {
         return rectF.height() * this.percent;
     }
 
-    @FloatRange(from = 0.0d, to = 1.0d)
+    @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
     public float getRelativePercent() {
         return this.percent;
     }
diff --git a/app/src/main/java/com/google/android/material/shape/ShapePath.java b/app/src/main/java/com/google/android/material/shape/ShapePath.java
index 06533cd1ef..3c1b1935d6 100644
--- a/app/src/main/java/com/google/android/material/shape/ShapePath.java
+++ b/app/src/main/java/com/google/android/material/shape/ShapePath.java
@@ -515,7 +515,7 @@ public class ShapePath {
         PathLineOperation.access$102(pathLineOperation, f2);
         this.operations.add(pathLineOperation);
         c cVar = new c(pathLineOperation, getEndX(), getEndY());
-        addShadowCompatOperation(cVar, cVar.b() + 270.0f, cVar.b() + 270.0f);
+        addShadowCompatOperation(cVar, cVar.b() + ANGLE_UP, cVar.b() + ANGLE_UP);
         setEndX(f);
         setEndY(f2);
     }
@@ -534,7 +534,7 @@ public class ShapePath {
     }
 
     public void reset(float f, float f2) {
-        reset(f, f2, 270.0f, 0.0f);
+        reset(f, f2, ANGLE_UP, 0.0f);
     }
 
     public void reset(float f, float f2, float f3, float f4) {
diff --git a/app/src/main/java/com/google/android/material/slider/BaseSlider.java b/app/src/main/java/com/google/android/material/slider/BaseSlider.java
index 9be093f4ae..5fe2f8e102 100644
--- a/app/src/main/java/com/google/android/material/slider/BaseSlider.java
+++ b/app/src/main/java/com/google/android/material/slider/BaseSlider.java
@@ -38,6 +38,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.math.MathUtils;
 import androidx.core.view.ViewCompat;
@@ -296,8 +297,8 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
                 invalidateVirtualView(i);
                 return true;
             }
-            if (i2 == 16908349 && bundle != null && bundle.containsKey("android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE")) {
-                if (BaseSlider.access$600(this.a, i, bundle.getFloat("android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE"))) {
+            if (i2 == 16908349 && bundle != null && bundle.containsKey(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE)) {
+                if (BaseSlider.access$600(this.a, i, bundle.getFloat(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE))) {
                     BaseSlider.access$700(this.a);
                     this.a.postInvalidate();
                     invalidateVirtualView(i);
@@ -488,7 +489,7 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
             f2 = 1.0f;
         }
         ValueAnimator ofFloat = ValueAnimator.ofFloat(animatorCurrentValueOrDefault, f2);
-        ofFloat.setDuration(z2 ? 83 : 117);
+        ofFloat.setDuration(z2 ? LABEL_ANIMATION_ENTER_DURATION : LABEL_ANIMATION_EXIT_DURATION);
         ofFloat.setInterpolator(z2 ? AnimationUtils.DECELERATE_INTERPOLATOR : AnimationUtils.FAST_OUT_LINEAR_IN_INTERPOLATOR);
         ofFloat.addUpdateListener(new b());
         return ofFloat;
@@ -1006,7 +1007,7 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
     }
 
     private boolean snapThumbToValue(int i, float f2) {
-        if (((double) Math.abs(f2 - this.values.get(i).floatValue())) < 1.0E-4d) {
+        if (((double) Math.abs(f2 - this.values.get(i).floatValue())) < THRESHOLD) {
             return false;
         }
         this.values.set(i, Float.valueOf(getClampedValue(i, f2)));
@@ -1049,19 +1050,19 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
 
     private void validateStepSize() {
         if (this.stepSize > 0.0f && !valueLandsOnTick(this.valueTo)) {
-            throw new IllegalStateException(String.format("The stepSize(%s) must be 0, or a factor of the valueFrom(%s)-valueTo(%s) range", Float.toString(this.stepSize), Float.toString(this.valueFrom), Float.toString(this.valueTo)));
+            throw new IllegalStateException(String.format(EXCEPTION_ILLEGAL_STEP_SIZE, Float.toString(this.stepSize), Float.toString(this.valueFrom), Float.toString(this.valueTo)));
         }
     }
 
     private void validateValueFrom() {
         if (this.valueFrom >= this.valueTo) {
-            throw new IllegalStateException(String.format("valueFrom(%s) must be smaller than valueTo(%s)", Float.toString(this.valueFrom), Float.toString(this.valueTo)));
+            throw new IllegalStateException(String.format(EXCEPTION_ILLEGAL_VALUE_FROM, Float.toString(this.valueFrom), Float.toString(this.valueTo)));
         }
     }
 
     private void validateValueTo() {
         if (this.valueTo <= this.valueFrom) {
-            throw new IllegalStateException(String.format("valueTo(%s) must be greater than valueFrom(%s)", Float.toString(this.valueTo), Float.toString(this.valueFrom)));
+            throw new IllegalStateException(String.format(EXCEPTION_ILLEGAL_VALUE_TO, Float.toString(this.valueTo), Float.toString(this.valueFrom)));
         }
     }
 
@@ -1070,16 +1071,16 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
         while (it.hasNext()) {
             Float next = it.next();
             if (next.floatValue() < this.valueFrom || next.floatValue() > this.valueTo) {
-                throw new IllegalStateException(String.format("Slider value(%s) must be greater or equal to valueFrom(%s), and lower or equal to valueTo(%s)", Float.toString(next.floatValue()), Float.toString(this.valueFrom), Float.toString(this.valueTo)));
+                throw new IllegalStateException(String.format(EXCEPTION_ILLEGAL_VALUE, Float.toString(next.floatValue()), Float.toString(this.valueFrom), Float.toString(this.valueTo)));
             } else if (this.stepSize > 0.0f && !valueLandsOnTick(next.floatValue())) {
-                throw new IllegalStateException(String.format("Value(%s) must be equal to valueFrom(%s) plus a multiple of stepSize(%s) when using stepSize(%s)", Float.toString(next.floatValue()), Float.toString(this.valueFrom), Float.toString(this.stepSize), Float.toString(this.stepSize)));
+                throw new IllegalStateException(String.format(EXCEPTION_ILLEGAL_DISCRETE_VALUE, Float.toString(next.floatValue()), Float.toString(this.valueFrom), Float.toString(this.stepSize), Float.toString(this.stepSize)));
             }
         }
     }
 
     private boolean valueLandsOnTick(float f2) {
         double doubleValue = new BigDecimal(Float.toString(f2)).subtract(new BigDecimal(Float.toString(this.valueFrom))).divide(new BigDecimal(Float.toString(this.stepSize)), MathContext.DECIMAL64).doubleValue();
-        return Math.abs(((double) Math.round(doubleValue)) - doubleValue) < 1.0E-4d;
+        return Math.abs(((double) Math.round(doubleValue)) - doubleValue) < THRESHOLD;
     }
 
     private float valueToX(float f2) {
@@ -1090,15 +1091,15 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
         float f2 = this.stepSize;
         if (f2 != 0.0f) {
             if (((float) ((int) f2)) != f2) {
-                Log.w(TAG, String.format("Floating point value used for %s(%s). Using floats can have rounding errors which may result in incorrect values. Instead, consider using integers with a custom LabelFormatter to display the  value correctly.", "stepSize", Float.valueOf(f2)));
+                Log.w(TAG, String.format(WARNING_FLOATING_POINT_ERRROR, "stepSize", Float.valueOf(f2)));
             }
             float f3 = this.valueFrom;
             if (((float) ((int) f3)) != f3) {
-                Log.w(TAG, String.format("Floating point value used for %s(%s). Using floats can have rounding errors which may result in incorrect values. Instead, consider using integers with a custom LabelFormatter to display the  value correctly.", "valueFrom", Float.valueOf(f3)));
+                Log.w(TAG, String.format(WARNING_FLOATING_POINT_ERRROR, "valueFrom", Float.valueOf(f3)));
             }
             float f4 = this.valueTo;
             if (((float) ((int) f4)) != f4) {
-                Log.w(TAG, String.format("Floating point value used for %s(%s). Using floats can have rounding errors which may result in incorrect values. Instead, consider using integers with a custom LabelFormatter to display the  value correctly.", "valueTo", Float.valueOf(f4)));
+                Log.w(TAG, String.format(WARNING_FLOATING_POINT_ERRROR, "valueTo", Float.valueOf(f4)));
             }
         }
     }
@@ -1402,7 +1403,7 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
         if (this.labelBehavior == 1) {
             i4 = this.labels.get(0).getIntrinsicHeight();
         }
-        super.onMeasure(i, View.MeasureSpec.makeMeasureSpec(i3 + i4, 1073741824));
+        super.onMeasure(i, View.MeasureSpec.makeMeasureSpec(i3 + i4, BasicMeasure.EXACTLY));
     }
 
     @Override // android.view.View
@@ -1600,7 +1601,7 @@ public abstract class BaseSlider<S extends BaseSlider<S, L, T>, L extends BaseOn
 
     public void setStepSize(float f2) {
         if (f2 < 0.0f) {
-            throw new IllegalArgumentException(String.format("The stepSize(%s) must be 0, or a factor of the valueFrom(%s)-valueTo(%s) range", Float.toString(f2), Float.toString(this.valueFrom), Float.toString(this.valueTo)));
+            throw new IllegalArgumentException(String.format(EXCEPTION_ILLEGAL_STEP_SIZE, Float.toString(f2), Float.toString(this.valueFrom), Float.toString(this.valueTo)));
         } else if (this.stepSize != f2) {
             this.stepSize = f2;
             this.dirtyConfig = true;
diff --git a/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java b/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java
index e1fbd7ac25..8830a0d1f9 100644
--- a/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java
+++ b/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java
@@ -440,7 +440,7 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationStart(Animator animator) {
-            BaseTransientBottomBar.access$1600(BaseTransientBottomBar.this).animateContentIn(70, 180);
+            BaseTransientBottomBar.access$1600(BaseTransientBottomBar.this).animateContentIn(70, BaseTransientBottomBar.ANIMATION_FADE_DURATION);
         }
     }
 
@@ -479,7 +479,7 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationStart(Animator animator) {
-            BaseTransientBottomBar.access$1600(BaseTransientBottomBar.this).animateContentOut(0, 180);
+            BaseTransientBottomBar.access$1600(BaseTransientBottomBar.this).animateContentOut(0, BaseTransientBottomBar.ANIMATION_FADE_DURATION);
         }
     }
 
@@ -878,7 +878,7 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
 
     private void startFadeInAnimation() {
         ValueAnimator alphaAnimator = getAlphaAnimator(0.0f, 1.0f);
-        ValueAnimator scaleAnimator = getScaleAnimator(0.8f, 1.0f);
+        ValueAnimator scaleAnimator = getScaleAnimator(ANIMATION_SCALE_FROM_VALUE, 1.0f);
         AnimatorSet animatorSet = new AnimatorSet();
         animatorSet.playTogether(alphaAnimator, scaleAnimator);
         animatorSet.setDuration(150L);
diff --git a/app/src/main/java/com/google/android/material/snackbar/Snackbar.java b/app/src/main/java/com/google/android/material/snackbar/Snackbar.java
index f2a1da6923..e658ca4f07 100644
--- a/app/src/main/java/com/google/android/material/snackbar/Snackbar.java
+++ b/app/src/main/java/com/google/android/material/snackbar/Snackbar.java
@@ -21,6 +21,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StringRes;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import com.google.android.material.R;
 import com.google.android.material.snackbar.BaseTransientBottomBar;
@@ -65,7 +66,7 @@ public class Snackbar extends BaseTransientBottomBar<Snackbar> {
             for (int i3 = 0; i3 < childCount; i3++) {
                 View childAt = getChildAt(i3);
                 if (childAt.getLayoutParams().width == -1) {
-                    childAt.measure(View.MeasureSpec.makeMeasureSpec(measuredWidth, 1073741824), View.MeasureSpec.makeMeasureSpec(childAt.getMeasuredHeight(), 1073741824));
+                    childAt.measure(View.MeasureSpec.makeMeasureSpec(measuredWidth, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(childAt.getMeasuredHeight(), BasicMeasure.EXACTLY));
                 }
             }
         }
diff --git a/app/src/main/java/com/google/android/material/snackbar/SnackbarContentLayout.java b/app/src/main/java/com/google/android/material/snackbar/SnackbarContentLayout.java
index 6aa149785e..0f7af2ce4f 100644
--- a/app/src/main/java/com/google/android/material/snackbar/SnackbarContentLayout.java
+++ b/app/src/main/java/com/google/android/material/snackbar/SnackbarContentLayout.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.view.ViewCompat;
 import com.google.android.material.R;
 import com.google.android.material.color.MaterialColors;
@@ -105,7 +106,7 @@ public class SnackbarContentLayout extends LinearLayout implements ContentViewCa
         int i3;
         super.onMeasure(i, i2);
         if (this.maxWidth > 0 && getMeasuredWidth() > (i3 = this.maxWidth)) {
-            i = View.MeasureSpec.makeMeasureSpec(i3, 1073741824);
+            i = View.MeasureSpec.makeMeasureSpec(i3, BasicMeasure.EXACTLY);
             super.onMeasure(i, i2);
         }
         int dimensionPixelSize = getResources().getDimensionPixelSize(R.dimen.design_snackbar_padding_vertical_2lines);
diff --git a/app/src/main/java/com/google/android/material/tabs/TabLayout.java b/app/src/main/java/com/google/android/material/tabs/TabLayout.java
index ce877742d8..6b41e8d3c8 100644
--- a/app/src/main/java/com/google/android/material/tabs/TabLayout.java
+++ b/app/src/main/java/com/google/android/material/tabs/TabLayout.java
@@ -44,8 +44,10 @@ import androidx.annotation.RestrictTo;
 import androidx.annotation.StringRes;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.TooltipCompat;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.util.Pools;
+import androidx.core.view.GravityCompat;
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.core.view.PointerIconCompat;
 import androidx.core.view.ViewCompat;
@@ -507,7 +509,7 @@ public class TabLayout extends HorizontalScrollView {
             setGravity(17);
             setOrientation(!TabLayout.this.inlineLabel ? 1 : 0);
             setClickable(true);
-            ViewCompat.setPointerIcon(this, PointerIconCompat.getSystemIcon(getContext(), 1002));
+            ViewCompat.setPointerIcon(this, PointerIconCompat.getSystemIcon(getContext(), PointerIconCompat.TYPE_HAND));
         }
 
         public static /* synthetic */ void access$100(TabView tabView, Context context) {
@@ -1350,7 +1352,7 @@ public class TabLayout extends HorizontalScrollView {
             this.tabIconTint = MaterialResources.getColorStateList(context2, obtainStyledAttributes, R.styleable.TabLayout_tabIconTint);
             this.tabIconTintMode = ViewUtils.parseTintMode(obtainStyledAttributes.getInt(R.styleable.TabLayout_tabIconTintMode, -1), null);
             this.tabRippleColorStateList = MaterialResources.getColorStateList(context2, obtainStyledAttributes, R.styleable.TabLayout_tabRippleColor);
-            this.tabIndicatorAnimationDuration = obtainStyledAttributes.getInt(R.styleable.TabLayout_tabIndicatorAnimationDuration, 300);
+            this.tabIndicatorAnimationDuration = obtainStyledAttributes.getInt(R.styleable.TabLayout_tabIndicatorAnimationDuration, ANIMATION_DURATION);
             this.requestedTabMinWidth = obtainStyledAttributes.getDimensionPixelSize(R.styleable.TabLayout_tabMinWidth, -1);
             this.requestedTabMaxWidth = obtainStyledAttributes.getDimensionPixelSize(R.styleable.TabLayout_tabMaxWidth, -1);
             this.tabBackgroundResId = obtainStyledAttributes.getResourceId(R.styleable.TabLayout_tabBackground, 0);
@@ -1455,14 +1457,14 @@ public class TabLayout extends HorizontalScrollView {
 
     private void applyGravityForModeScrollable(int i) {
         if (i == 0) {
-            Log.w("TabLayout", "MODE_SCROLLABLE + GRAVITY_FILL is not supported, GRAVITY_START will be used instead");
+            Log.w(LOG_TAG, "MODE_SCROLLABLE + GRAVITY_FILL is not supported, GRAVITY_START will be used instead");
         } else if (i == 1) {
             this.slidingTabIndicator.setGravity(1);
             return;
         } else if (i != 2) {
             return;
         }
-        this.slidingTabIndicator.setGravity(8388611);
+        this.slidingTabIndicator.setGravity(GravityCompat.START);
     }
 
     private void applyModeAndGravity() {
@@ -1473,7 +1475,7 @@ public class TabLayout extends HorizontalScrollView {
             applyGravityForModeScrollable(this.tabGravity);
         } else if (i2 == 1 || i2 == 2) {
             if (this.tabGravity == 2) {
-                Log.w("TabLayout", "GRAVITY_START is not supported with the current tab mode, GRAVITY_CENTER will be used instead");
+                Log.w(LOG_TAG, "GRAVITY_START is not supported with the current tab mode, GRAVITY_CENTER will be used instead");
             }
             this.slidingTabIndicator.setGravity(1);
         }
@@ -1905,7 +1907,7 @@ public class TabLayout extends HorizontalScrollView {
         boolean z2 = false;
         if (mode != Integer.MIN_VALUE) {
             if (mode == 0) {
-                i2 = View.MeasureSpec.makeMeasureSpec(getPaddingBottom() + getPaddingTop() + round, 1073741824);
+                i2 = View.MeasureSpec.makeMeasureSpec(getPaddingBottom() + getPaddingTop() + round, BasicMeasure.EXACTLY);
             }
         } else if (getChildCount() == 1 && View.MeasureSpec.getSize(i2) >= round) {
             getChildAt(0).setMinimumHeight(round);
@@ -1926,7 +1928,7 @@ public class TabLayout extends HorizontalScrollView {
                 if (i4 != 1) {
                 }
                 if (z2) {
-                    childAt.measure(View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), 1073741824), HorizontalScrollView.getChildMeasureSpec(i2, getPaddingBottom() + getPaddingTop(), childAt.getLayoutParams().height));
+                    childAt.measure(View.MeasureSpec.makeMeasureSpec(getMeasuredWidth(), BasicMeasure.EXACTLY), HorizontalScrollView.getChildMeasureSpec(i2, getPaddingBottom() + getPaddingTop(), childAt.getLayoutParams().height));
                 }
             }
         }
diff --git a/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java b/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java
index d51bfcfdf7..2095899f5d 100644
--- a/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java
+++ b/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java
@@ -48,6 +48,7 @@ import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.text.BidiFormatter;
 import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.GravityCompat;
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
@@ -62,6 +63,7 @@ import c.i.a.g.j.o;
 import c.i.a.g.j.p;
 import com.google.android.material.R;
 import com.google.android.material.animation.AnimationUtils;
+import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.internal.CheckableImageButton;
 import com.google.android.material.internal.CollapsingTextHelper;
@@ -449,12 +451,12 @@ public class TextInputLayout extends LinearLayout {
         LinearLayout linearLayout = new LinearLayout(context2);
         this.startLayout = linearLayout;
         linearLayout.setOrientation(0);
-        linearLayout.setLayoutParams(new FrameLayout.LayoutParams(-2, -1, 8388611));
+        linearLayout.setLayoutParams(new FrameLayout.LayoutParams(-2, -1, GravityCompat.START));
         frameLayout.addView(linearLayout);
         LinearLayout linearLayout2 = new LinearLayout(context2);
         this.endLayout = linearLayout2;
         linearLayout2.setOrientation(0);
-        linearLayout2.setLayoutParams(new FrameLayout.LayoutParams(-2, -1, 8388613));
+        linearLayout2.setLayoutParams(new FrameLayout.LayoutParams(-2, -1, GravityCompat.END));
         frameLayout.addView(linearLayout2);
         FrameLayout frameLayout2 = new FrameLayout(context2);
         this.endIconFrame = frameLayout2;
@@ -462,7 +464,7 @@ public class TextInputLayout extends LinearLayout {
         TimeInterpolator timeInterpolator = AnimationUtils.LINEAR_INTERPOLATOR;
         collapsingTextHelper.setTextSizeInterpolator(timeInterpolator);
         collapsingTextHelper.setPositionInterpolator(timeInterpolator);
-        collapsingTextHelper.setCollapsedTextGravity(8388659);
+        collapsingTextHelper.setCollapsedTextGravity(BadgeDrawable.TOP_START);
         int[] iArr = R.styleable.TextInputLayout;
         int i5 = R.styleable.TextInputLayout_counterTextAppearance;
         int i6 = R.styleable.TextInputLayout_counterOverflowTextAppearance;
@@ -1118,7 +1120,7 @@ public class TextInputLayout extends LinearLayout {
     private void setEditText(EditText editText) {
         if (this.editText == null) {
             if (this.endIconMode != 3 && !(editText instanceof TextInputEditText)) {
-                Log.i("TextInputLayout", "EditText added is not a TextInputEditText. Please switch to using that class instead.");
+                Log.i(LOG_TAG, "EditText added is not a TextInputEditText. Please switch to using that class instead.");
             }
             this.editText = editText;
             onApplyBoxBackgroundMode();
diff --git a/app/src/main/java/com/google/android/material/timepicker/MaterialTimePicker.java b/app/src/main/java/com/google/android/material/timepicker/MaterialTimePicker.java
index 7a68e9a9c9..588c2de067 100644
--- a/app/src/main/java/com/google/android/material/timepicker/MaterialTimePicker.java
+++ b/app/src/main/java/com/google/android/material/timepicker/MaterialTimePicker.java
@@ -254,11 +254,11 @@ public final class MaterialTimePicker extends DialogFragment {
     private static MaterialTimePicker newInstance(@NonNull Builder builder) {
         MaterialTimePicker materialTimePicker = new MaterialTimePicker();
         Bundle bundle = new Bundle();
-        bundle.putParcelable("TIME_PICKER_TIME_MODEL", Builder.access$000(builder));
-        bundle.putInt("TIME_PICKER_INPUT_MODE", Builder.access$100(builder));
-        bundle.putInt("TIME_PICKER_TITLE_RES", Builder.access$200(builder));
+        bundle.putParcelable(TIME_MODEL_EXTRA, Builder.access$000(builder));
+        bundle.putInt(INPUT_MODE_EXTRA, Builder.access$100(builder));
+        bundle.putInt(TITLE_RES_EXTRA, Builder.access$200(builder));
         if (Builder.access$300(builder) != null) {
-            bundle.putString("TIME_PICKER_TITLE_TEXT", Builder.access$300(builder).toString());
+            bundle.putString(TITLE_TEXT_EXTRA, Builder.access$300(builder).toString());
         }
         materialTimePicker.setArguments(bundle);
         return materialTimePicker;
@@ -266,14 +266,14 @@ public final class MaterialTimePicker extends DialogFragment {
 
     private void restoreState(@Nullable Bundle bundle) {
         if (bundle != null) {
-            TimeModel timeModel = (TimeModel) bundle.getParcelable("TIME_PICKER_TIME_MODEL");
+            TimeModel timeModel = (TimeModel) bundle.getParcelable(TIME_MODEL_EXTRA);
             this.time = timeModel;
             if (timeModel == null) {
                 this.time = new TimeModel(0, 0, 10, 0);
             }
-            this.inputMode = bundle.getInt("TIME_PICKER_INPUT_MODE", 0);
-            this.titleResId = bundle.getInt("TIME_PICKER_TITLE_RES", 0);
-            this.titleText = bundle.getString("TIME_PICKER_TITLE_TEXT");
+            this.inputMode = bundle.getInt(INPUT_MODE_EXTRA, 0);
+            this.titleResId = bundle.getInt(TITLE_RES_EXTRA, 0);
+            this.titleText = bundle.getString(TITLE_TEXT_EXTRA);
         }
     }
 
@@ -421,10 +421,10 @@ public final class MaterialTimePicker extends DialogFragment {
     @Override // androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public void onSaveInstanceState(@NonNull Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putParcelable("TIME_PICKER_TIME_MODEL", this.time);
-        bundle.putInt("TIME_PICKER_INPUT_MODE", this.inputMode);
-        bundle.putInt("TIME_PICKER_TITLE_RES", this.titleResId);
-        bundle.putString("TIME_PICKER_TITLE_TEXT", this.titleText);
+        bundle.putParcelable(TIME_MODEL_EXTRA, this.time);
+        bundle.putInt(INPUT_MODE_EXTRA, this.inputMode);
+        bundle.putInt(TITLE_RES_EXTRA, this.titleResId);
+        bundle.putString(TITLE_TEXT_EXTRA, this.titleText);
     }
 
     public boolean removeOnCancelListener(@NonNull DialogInterface.OnCancelListener onCancelListener) {
diff --git a/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java b/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
index f7aeb93db2..eb3071f6da 100644
--- a/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
+++ b/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
@@ -21,8 +21,10 @@ import android.widget.ImageView;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.motion.widget.Key;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.view.ViewCompat;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.google.android.material.R;
 import com.google.android.material.animation.AnimationUtils;
 import com.google.android.material.animation.AnimatorSetCompat;
@@ -312,7 +314,7 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation
                 objectAnimator = ObjectAnimator.ofInt(circularRevealWidget, CircularRevealWidget.CircularRevealScrimColorProperty.CIRCULAR_REVEAL_SCRIM_COLOR, backgroundTint);
             }
             objectAnimator.setEvaluator(ArgbEvaluatorCompat.getInstance());
-            fabTransformationSpec.timings.getTiming("color").apply(objectAnimator);
+            fabTransformationSpec.timings.getTiming(ModelAuditLogEntry.CHANGE_KEY_COLOR).apply(objectAnimator);
             list.add(objectAnimator);
         }
     }
@@ -357,7 +359,7 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation
         } else {
             objectAnimator = ObjectAnimator.ofFloat(view2, View.TRANSLATION_Z, -elevation);
         }
-        fabTransformationSpec.timings.getTiming("elevation").apply(objectAnimator);
+        fabTransformationSpec.timings.getTiming(Key.ELEVATION).apply(objectAnimator);
         list.add(objectAnimator);
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java b/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
index c9686d240f..132fdbd687 100644
--- a/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
+++ b/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
@@ -31,6 +31,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
 import androidx.core.util.Preconditions;
+import androidx.core.view.InputDeviceCompat;
 import androidx.core.view.ViewCompat;
 import androidx.transition.ArcMotion;
 import androidx.transition.PathMotion;
@@ -45,6 +46,7 @@ import c.i.a.g.l.k;
 import com.google.android.material.R;
 import com.google.android.material.animation.AnimationUtils;
 import com.google.android.material.internal.ViewUtils;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import com.google.android.material.shape.AbsoluteCornerSize;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.ShapeAppearanceModel;
@@ -71,7 +73,7 @@ public final class MaterialContainerTransform extends Transition {
     public static final int TRANSITION_DIRECTION_AUTO = 0;
     public static final int TRANSITION_DIRECTION_ENTER = 1;
     public static final int TRANSITION_DIRECTION_RETURN = 2;
-    private static final String[] TRANSITION_PROPS = {"materialContainerTransition:bounds", "materialContainerTransition:shapeAppearance"};
+    private static final String[] TRANSITION_PROPS = {PROP_BOUNDS, PROP_SHAPE_APPEARANCE};
     @ColorInt
     private int containerColor = 0;
     private boolean drawDebugEnabled = false;
@@ -122,9 +124,9 @@ public final class MaterialContainerTransform extends Transition {
     }
 
     public static class ProgressThresholds {
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         private final float end;
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         private final float start;
 
         public ProgressThresholds(@FloatRange(from = 0.0d, to = 1.0d) float f, @FloatRange(from = 0.0d, to = 1.0d) float f2) {
@@ -140,12 +142,12 @@ public final class MaterialContainerTransform extends Transition {
             return progressThresholds.end;
         }
 
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         public float getEnd() {
             return this.end;
         }
 
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         public float getStart() {
             return this.start;
         }
@@ -440,7 +442,7 @@ public final class MaterialContainerTransform extends Transition {
                     canvas.drawPath(path, this.E);
                 }
                 RectF rectF3 = this.f2372x;
-                this.E.setColor(-256);
+                this.E.setColor(InputDeviceCompat.SOURCE_ANY);
                 canvas.drawRect(rectF3, this.E);
                 RectF rectF4 = this.w;
                 this.E.setColor(-16711936);
@@ -623,8 +625,8 @@ public final class MaterialContainerTransform extends Transition {
             } else {
                 rectF = k.c(view4);
             }
-            transitionValues.values.put("materialContainerTransition:bounds", rectF);
-            transitionValues.values.put("materialContainerTransition:shapeAppearance", captureShapeAppearance(view4, rectF, shapeAppearanceModel));
+            transitionValues.values.put(PROP_BOUNDS, rectF);
+            transitionValues.values.put(PROP_SHAPE_APPEARANCE, captureShapeAppearance(view4, rectF, shapeAppearanceModel));
         }
     }
 
@@ -694,13 +696,13 @@ public final class MaterialContainerTransform extends Transition {
         c.i.a.g.l.a aVar;
         c.i.a.g.l.d dVar;
         if (!(transitionValues == null || transitionValues2 == null)) {
-            RectF rectF = (RectF) transitionValues.values.get("materialContainerTransition:bounds");
-            ShapeAppearanceModel shapeAppearanceModel = (ShapeAppearanceModel) transitionValues.values.get("materialContainerTransition:shapeAppearance");
+            RectF rectF = (RectF) transitionValues.values.get(PROP_BOUNDS);
+            ShapeAppearanceModel shapeAppearanceModel = (ShapeAppearanceModel) transitionValues.values.get(PROP_SHAPE_APPEARANCE);
             if (rectF == null || shapeAppearanceModel == null) {
                 Log.w(TAG, "Skipping due to null start bounds. Ensure start view is laid out and measured.");
             } else {
-                RectF rectF2 = (RectF) transitionValues2.values.get("materialContainerTransition:bounds");
-                ShapeAppearanceModel shapeAppearanceModel2 = (ShapeAppearanceModel) transitionValues2.values.get("materialContainerTransition:shapeAppearance");
+                RectF rectF2 = (RectF) transitionValues2.values.get(PROP_BOUNDS);
+                ShapeAppearanceModel shapeAppearanceModel2 = (ShapeAppearanceModel) transitionValues2.values.get(PROP_SHAPE_APPEARANCE);
                 if (rectF2 == null || shapeAppearanceModel2 == null) {
                     Log.w(TAG, "Skipping due to null end bounds. Ensure end view is laid out and measured.");
                     return null;
diff --git a/app/src/main/java/com/google/android/material/transition/MaterialElevationScale.java b/app/src/main/java/com/google/android/material/transition/MaterialElevationScale.java
index 3c834e10ff..48236e309d 100644
--- a/app/src/main/java/com/google/android/material/transition/MaterialElevationScale.java
+++ b/app/src/main/java/com/google/android/material/transition/MaterialElevationScale.java
@@ -18,8 +18,8 @@ public final class MaterialElevationScale extends h<ScaleProvider> {
 
     private static ScaleProvider createPrimaryAnimatorProvider(boolean z2) {
         ScaleProvider scaleProvider = new ScaleProvider(z2);
-        scaleProvider.setOutgoingEndScale(0.85f);
-        scaleProvider.setIncomingStartScale(0.85f);
+        scaleProvider.setOutgoingEndScale(DEFAULT_SCALE);
+        scaleProvider.setIncomingStartScale(DEFAULT_SCALE);
         return scaleProvider;
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/MaterialFade.java b/app/src/main/java/com/google/android/material/transition/MaterialFade.java
index 4ef85699db..e134c813ff 100644
--- a/app/src/main/java/com/google/android/material/transition/MaterialFade.java
+++ b/app/src/main/java/com/google/android/material/transition/MaterialFade.java
@@ -24,7 +24,7 @@ public final class MaterialFade extends h<FadeProvider> {
     private static VisibilityAnimatorProvider createSecondaryAnimatorProvider() {
         ScaleProvider scaleProvider = new ScaleProvider();
         scaleProvider.setScaleOnDisappear(false);
-        scaleProvider.setIncomingStartScale(0.8f);
+        scaleProvider.setIncomingStartScale(DEFAULT_START_SCALE);
         return scaleProvider;
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/MaterialFadeThrough.java b/app/src/main/java/com/google/android/material/transition/MaterialFadeThrough.java
index e52130e222..85d0162e2d 100644
--- a/app/src/main/java/com/google/android/material/transition/MaterialFadeThrough.java
+++ b/app/src/main/java/com/google/android/material/transition/MaterialFadeThrough.java
@@ -21,7 +21,7 @@ public final class MaterialFadeThrough extends h<FadeThroughProvider> {
     private static VisibilityAnimatorProvider createSecondaryAnimatorProvider() {
         ScaleProvider scaleProvider = new ScaleProvider();
         scaleProvider.setScaleOnDisappear(false);
-        scaleProvider.setIncomingStartScale(0.92f);
+        scaleProvider.setIncomingStartScale(DEFAULT_START_SCALE);
         return scaleProvider;
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/MaterialSharedAxis.java b/app/src/main/java/com/google/android/material/transition/MaterialSharedAxis.java
index bb59d78696..8f49666915 100644
--- a/app/src/main/java/com/google/android/material/transition/MaterialSharedAxis.java
+++ b/app/src/main/java/com/google/android/material/transition/MaterialSharedAxis.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.core.view.GravityCompat;
 import androidx.transition.TransitionValues;
 import c.d.b.a.a;
 import c.i.a.g.l.h;
@@ -31,7 +32,7 @@ public final class MaterialSharedAxis extends h<VisibilityAnimatorProvider> {
 
     private static VisibilityAnimatorProvider createPrimaryAnimatorProvider(int i, boolean z2) {
         if (i == 0) {
-            return new SlideDistanceProvider(z2 ? 8388613 : 8388611);
+            return new SlideDistanceProvider(z2 ? GravityCompat.END : GravityCompat.START);
         } else if (i == 1) {
             return new SlideDistanceProvider(z2 ? 80 : 48);
         } else if (i == 2) {
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
index 07c0e71cbb..4cf67b902c 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
@@ -36,6 +36,7 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
 import androidx.core.util.Preconditions;
+import androidx.core.view.InputDeviceCompat;
 import androidx.core.view.ViewCompat;
 import c.i.a.g.l.l.e;
 import c.i.a.g.l.l.f;
@@ -46,6 +47,7 @@ import c.i.a.g.l.l.k;
 import com.google.android.material.R;
 import com.google.android.material.animation.AnimationUtils;
 import com.google.android.material.internal.ViewUtils;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import com.google.android.material.shape.AbsoluteCornerSize;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.ShapeAppearanceModel;
@@ -73,7 +75,7 @@ public final class MaterialContainerTransform extends Transition {
     public static final int TRANSITION_DIRECTION_AUTO = 0;
     public static final int TRANSITION_DIRECTION_ENTER = 1;
     public static final int TRANSITION_DIRECTION_RETURN = 2;
-    private static final String[] TRANSITION_PROPS = {"materialContainerTransition:bounds", "materialContainerTransition:shapeAppearance"};
+    private static final String[] TRANSITION_PROPS = {PROP_BOUNDS, PROP_SHAPE_APPEARANCE};
     @ColorInt
     private int containerColor = 0;
     private boolean drawDebugEnabled = false;
@@ -124,9 +126,9 @@ public final class MaterialContainerTransform extends Transition {
     }
 
     public static class ProgressThresholds {
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         private final float end;
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         private final float start;
 
         public ProgressThresholds(@FloatRange(from = 0.0d, to = 1.0d) float f, @FloatRange(from = 0.0d, to = 1.0d) float f2) {
@@ -142,12 +144,12 @@ public final class MaterialContainerTransform extends Transition {
             return progressThresholds.end;
         }
 
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         public float getEnd() {
             return this.end;
         }
 
-        @FloatRange(from = 0.0d, to = 1.0d)
+        @FloatRange(from = ShadowDrawableWrapper.COS_45, to = 1.0d)
         public float getStart() {
             return this.start;
         }
@@ -442,7 +444,7 @@ public final class MaterialContainerTransform extends Transition {
                     canvas.drawPath(path, this.E);
                 }
                 RectF rectF3 = this.f2382x;
-                this.E.setColor(-256);
+                this.E.setColor(InputDeviceCompat.SOURCE_ANY);
                 canvas.drawRect(rectF3, this.E);
                 RectF rectF4 = this.w;
                 this.E.setColor(-16711936);
@@ -625,8 +627,8 @@ public final class MaterialContainerTransform extends Transition {
             } else {
                 rectF = k.c(view4);
             }
-            transitionValues.values.put("materialContainerTransition:bounds", rectF);
-            transitionValues.values.put("materialContainerTransition:shapeAppearance", captureShapeAppearance(view4, rectF, shapeAppearanceModel));
+            transitionValues.values.put(PROP_BOUNDS, rectF);
+            transitionValues.values.put(PROP_SHAPE_APPEARANCE, captureShapeAppearance(view4, rectF, shapeAppearanceModel));
         }
     }
 
@@ -696,13 +698,13 @@ public final class MaterialContainerTransform extends Transition {
         c.i.a.g.l.l.a aVar;
         c.i.a.g.l.l.d dVar;
         if (!(transitionValues == null || transitionValues2 == null)) {
-            RectF rectF = (RectF) transitionValues.values.get("materialContainerTransition:bounds");
-            ShapeAppearanceModel shapeAppearanceModel = (ShapeAppearanceModel) transitionValues.values.get("materialContainerTransition:shapeAppearance");
+            RectF rectF = (RectF) transitionValues.values.get(PROP_BOUNDS);
+            ShapeAppearanceModel shapeAppearanceModel = (ShapeAppearanceModel) transitionValues.values.get(PROP_SHAPE_APPEARANCE);
             if (rectF == null || shapeAppearanceModel == null) {
                 Log.w(TAG, "Skipping due to null start bounds. Ensure start view is laid out and measured.");
             } else {
-                RectF rectF2 = (RectF) transitionValues2.values.get("materialContainerTransition:bounds");
-                ShapeAppearanceModel shapeAppearanceModel2 = (ShapeAppearanceModel) transitionValues2.values.get("materialContainerTransition:shapeAppearance");
+                RectF rectF2 = (RectF) transitionValues2.values.get(PROP_BOUNDS);
+                ShapeAppearanceModel shapeAppearanceModel2 = (ShapeAppearanceModel) transitionValues2.values.get(PROP_SHAPE_APPEARANCE);
                 if (rectF2 == null || shapeAppearanceModel2 == null) {
                     Log.w(TAG, "Skipping due to null end bounds. Ensure end view is laid out and measured.");
                     return null;
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java
index 0a0e1600ff..c2f6825217 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java
@@ -13,6 +13,7 @@ import android.view.Window;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import c.i.a.g.l.l.i;
@@ -228,7 +229,7 @@ public class MaterialContainerTransformSharedElementCallback extends SharedEleme
         }
         if (!this.entering && !list2.isEmpty() && this.returnEndBounds != null) {
             View view = list2.get(0);
-            view.measure(View.MeasureSpec.makeMeasureSpec(this.returnEndBounds.width(), 1073741824), View.MeasureSpec.makeMeasureSpec(this.returnEndBounds.height(), 1073741824));
+            view.measure(View.MeasureSpec.makeMeasureSpec(this.returnEndBounds.width(), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(this.returnEndBounds.height(), BasicMeasure.EXACTLY));
             Rect rect = this.returnEndBounds;
             view.layout(rect.left, rect.top, rect.right, rect.bottom);
         }
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialElevationScale.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialElevationScale.java
index 0d734bc3fc..6fc94a25a2 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialElevationScale.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialElevationScale.java
@@ -20,8 +20,8 @@ public final class MaterialElevationScale extends h<ScaleProvider> {
 
     private static ScaleProvider createPrimaryAnimatorProvider(boolean z2) {
         ScaleProvider scaleProvider = new ScaleProvider(z2);
-        scaleProvider.setOutgoingEndScale(0.85f);
-        scaleProvider.setIncomingStartScale(0.85f);
+        scaleProvider.setOutgoingEndScale(DEFAULT_SCALE);
+        scaleProvider.setIncomingStartScale(DEFAULT_SCALE);
         return scaleProvider;
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialFade.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialFade.java
index c546ae8ace..5b7ccf6f5a 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialFade.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialFade.java
@@ -26,7 +26,7 @@ public final class MaterialFade extends h<FadeProvider> {
     private static VisibilityAnimatorProvider createSecondaryAnimatorProvider() {
         ScaleProvider scaleProvider = new ScaleProvider();
         scaleProvider.setScaleOnDisappear(false);
-        scaleProvider.setIncomingStartScale(0.8f);
+        scaleProvider.setIncomingStartScale(DEFAULT_START_SCALE);
         return scaleProvider;
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialFadeThrough.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialFadeThrough.java
index 7fb30bd0be..a62dd0fbc3 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialFadeThrough.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialFadeThrough.java
@@ -23,7 +23,7 @@ public final class MaterialFadeThrough extends h<FadeThroughProvider> {
     private static VisibilityAnimatorProvider createSecondaryAnimatorProvider() {
         ScaleProvider scaleProvider = new ScaleProvider();
         scaleProvider.setScaleOnDisappear(false);
-        scaleProvider.setIncomingStartScale(0.92f);
+        scaleProvider.setIncomingStartScale(DEFAULT_START_SCALE);
         return scaleProvider;
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialSharedAxis.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialSharedAxis.java
index 58fd3178d0..e865200b96 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialSharedAxis.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialSharedAxis.java
@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
+import androidx.core.view.GravityCompat;
 import c.d.b.a.a;
 import c.i.a.g.l.l.h;
 import java.lang.annotation.Retention;
@@ -33,7 +34,7 @@ public final class MaterialSharedAxis extends h<VisibilityAnimatorProvider> {
 
     private static VisibilityAnimatorProvider createPrimaryAnimatorProvider(int i, boolean z2) {
         if (i == 0) {
-            return new SlideDistanceProvider(z2 ? 8388613 : 8388611);
+            return new SlideDistanceProvider(z2 ? GravityCompat.END : GravityCompat.START);
         } else if (i == 1) {
             return new SlideDistanceProvider(z2 ? 80 : 48);
         } else if (i == 2) {
diff --git a/app/src/main/java/com/google/firebase/FirebaseCommonRegistrar.java b/app/src/main/java/com/google/firebase/FirebaseCommonRegistrar.java
index 04964b2693..98e27cb47e 100644
--- a/app/src/main/java/com/google/firebase/FirebaseCommonRegistrar.java
+++ b/app/src/main/java/com/google/firebase/FirebaseCommonRegistrar.java
@@ -10,11 +10,12 @@ import c.i.c.l.o;
 import c.i.c.x.b;
 import c.i.c.x.e;
 import c.i.c.x.h;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.ArrayList;
 import java.util.List;
 public class FirebaseCommonRegistrar implements g {
     public static String a(String str) {
-        return str.replace(' ', '_').replace('/', '_');
+        return str.replace(' ', '_').replace(MentionUtilsKt.SLASH_CHAR, '_');
     }
 
     @Override // c.i.c.l.g
diff --git a/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java b/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
index e4a2c3fb4c..b113c4197a 100644
--- a/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
+++ b/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
@@ -20,6 +20,7 @@ import c.i.c.w.m;
 import c.i.c.w.p;
 import c.i.c.w.q;
 import c.i.c.w.r;
+import com.adjust.sdk.Constants;
 import com.google.firebase.encoders.EncodingException;
 import java.util.ArrayDeque;
 import java.util.Queue;
@@ -101,7 +102,7 @@ public class FirebaseMessagingService extends EnhancedIntentService {
                         aVar.b("fcm", "_ln", stringExtra);
                         Bundle bundle = new Bundle();
                         bundle.putString("source", "Firebase");
-                        bundle.putString("medium", "notification");
+                        bundle.putString(Constants.MEDIUM, "notification");
                         bundle.putString("campaign", stringExtra);
                         aVar.a("fcm", "_cmp", bundle);
                     } else {
@@ -158,7 +159,7 @@ public class FirebaseMessagingService extends EnhancedIntentService {
                 if (q.c(intent)) {
                     q.b("_nr", intent);
                 }
-                if (!"com.google.firebase.messaging.RECEIVE_DIRECT_BOOT".equals(intent.getAction())) {
+                if (!ACTION_DIRECT_BOOT_REMOTE_INTENT.equals(intent.getAction())) {
                     try {
                         c.i.c.c.b();
                         c.i.c.c b = c.i.c.c.b();
@@ -214,7 +215,7 @@ public class FirebaseMessagingService extends EnhancedIntentService {
     @Override // com.google.firebase.messaging.EnhancedIntentService
     public void handleIntent(Intent intent) {
         String action = intent.getAction();
-        if ("com.google.android.c2dm.intent.RECEIVE".equals(action) || "com.google.firebase.messaging.RECEIVE_DIRECT_BOOT".equals(action)) {
+        if ("com.google.android.c2dm.intent.RECEIVE".equals(action) || ACTION_DIRECT_BOOT_REMOTE_INTENT.equals(action)) {
             handleMessageIntent(intent);
         } else if ("com.google.firebase.messaging.NOTIFICATION_DISMISS".equals(action)) {
             if (q.c(intent)) {
diff --git a/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java b/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
index d4a5ff5c82..4b2ebe52c7 100644
--- a/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
+++ b/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
@@ -7,6 +7,7 @@ import c.i.d.k;
 import c.i.d.o;
 import c.i.d.p.b;
 import c.i.d.q.q;
+import com.google.android.material.badge.BadgeDrawable;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
@@ -876,7 +877,7 @@ public final class TypeAdapters {
 
         public String toString() {
             StringBuilder K = a.K("Factory[type=");
-            a.a0(this.j, K, "+");
+            a.a0(this.j, K, BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX);
             a.a0(this.i, K, ",adapter=");
             K.append(this.k);
             K.append("]");
@@ -907,7 +908,7 @@ public final class TypeAdapters {
 
         public String toString() {
             StringBuilder K = a.K("Factory[type=");
-            a.a0(this.i, K, "+");
+            a.a0(this.i, K, BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX);
             a.a0(this.j, K, ",adapter=");
             K.append(this.k);
             K.append("]");
diff --git a/app/src/main/java/com/hcaptcha/sdk/HCaptchaSize.java b/app/src/main/java/com/hcaptcha/sdk/HCaptchaSize.java
index cee473d60b..5e362dd5b3 100644
--- a/app/src/main/java/com/hcaptcha/sdk/HCaptchaSize.java
+++ b/app/src/main/java/com/hcaptcha/sdk/HCaptchaSize.java
@@ -2,10 +2,11 @@ package com.hcaptcha.sdk;
 
 import androidx.annotation.NonNull;
 import c.g.a.a.f0;
+import com.adjust.sdk.Constants;
 import java.io.Serializable;
 public enum HCaptchaSize implements Serializable {
     INVISIBLE("invisible"),
-    NORMAL("normal"),
+    NORMAL(Constants.NORMAL),
     COMPACT("compact");
     
     public final String size;
diff --git a/app/src/main/java/com/hcaptcha/sdk/HCaptchaTheme.java b/app/src/main/java/com/hcaptcha/sdk/HCaptchaTheme.java
index fab8a24600..dd7ba1ae44 100644
--- a/app/src/main/java/com/hcaptcha/sdk/HCaptchaTheme.java
+++ b/app/src/main/java/com/hcaptcha/sdk/HCaptchaTheme.java
@@ -2,10 +2,11 @@ package com.hcaptcha.sdk;
 
 import androidx.annotation.NonNull;
 import c.g.a.a.f0;
+import com.discord.models.domain.ModelUserSettings;
 import java.io.Serializable;
 public enum HCaptchaTheme implements Serializable {
-    DARK("dark"),
-    LIGHT("light"),
+    DARK(ModelUserSettings.THEME_DARK),
+    LIGHT(ModelUserSettings.THEME_LIGHT),
     CONTRAST("contrast");
     
     public final String theme;
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
index cff178750c..991285bb38 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
@@ -22,6 +22,8 @@ import androidx.annotation.ColorInt;
 import androidx.core.view.ViewCompat;
 import c.i.a.f.e.o.c;
 import c.k.a.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.google.android.material.badge.BadgeDrawable;
 import java.util.Locale;
 public class ColorPanelView extends View {
     public Drawable i;
@@ -36,7 +38,7 @@ public class ColorPanelView extends View {
     public int r = -9539986;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2407s = -16777216;
+    public int f2407s = ViewCompat.MEASURED_STATE_MASK;
     public int t;
 
     public ColorPanelView(Context context, AttributeSet attributeSet) {
@@ -97,7 +99,7 @@ public class ColorPanelView extends View {
         }
         Toast makeText = Toast.makeText(context, sb.toString(), 0);
         if (i < rect.height()) {
-            makeText.setGravity(8388661, i2, (iArr[1] + height) - rect.top);
+            makeText.setGravity(BadgeDrawable.TOP_END, i2, (iArr[1] + height) - rect.top);
         } else {
             makeText.setGravity(81, 0, height);
         }
@@ -158,7 +160,7 @@ public class ColorPanelView extends View {
     public void onRestoreInstanceState(Parcelable parcelable) {
         if (parcelable instanceof Bundle) {
             Bundle bundle = (Bundle) parcelable;
-            this.f2407s = bundle.getInt("color");
+            this.f2407s = bundle.getInt(ModelAuditLogEntry.CHANGE_KEY_COLOR);
             parcelable = bundle.getParcelable("instanceState");
         }
         super.onRestoreInstanceState(parcelable);
@@ -168,7 +170,7 @@ public class ColorPanelView extends View {
     public Parcelable onSaveInstanceState() {
         Bundle bundle = new Bundle();
         bundle.putParcelable("instanceState", super.onSaveInstanceState());
-        bundle.putInt("color", this.f2407s);
+        bundle.putInt(ModelAuditLogEntry.CHANGE_KEY_COLOR, this.f2407s);
         return bundle;
     }
 
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java
index 01373f351b..26e96f3925 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java
@@ -32,11 +32,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.motion.widget.Key;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 import c.k.a.a.b;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import com.jaredrummler.android.colorpicker.ColorPickerView;
 import java.util.Arrays;
 import java.util.Locale;
@@ -247,7 +251,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
                     if ((colorPanelView != view || ColorUtils.calculateLuminance(colorPanelView.getColor()) < 0.65d) && Color.alpha(colorPanelView.getColor()) > 165) {
                         imageView.setColorFilter((ColorFilter) null);
                     } else {
-                        imageView.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
+                        imageView.setColorFilter(ViewCompat.MEASURED_STATE_MASK, PorterDuff.Mode.SRC_IN);
                     }
                     colorPanelView.setTag(Boolean.valueOf(colorPanelView == view));
                 }
@@ -275,7 +279,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         public int f = 1;
         public int[] g = ColorPickerDialog.i;
         @ColorInt
-        public int h = -16777216;
+        public int h = ViewCompat.MEASURED_STATE_MASK;
         public boolean i = false;
         public boolean j = true;
         public boolean k = true;
@@ -318,11 +322,11 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         public ColorPickerDialog a() {
             ColorPickerDialog colorPickerDialog = new ColorPickerDialog();
             Bundle bundle = new Bundle();
-            bundle.putInt("id", 0);
+            bundle.putInt(ModelAuditLogEntry.CHANGE_KEY_ID, 0);
             bundle.putInt("dialogType", this.f);
-            bundle.putInt("color", this.h);
+            bundle.putInt(ModelAuditLogEntry.CHANGE_KEY_COLOR, this.h);
             bundle.putIntArray("presets", this.g);
-            bundle.putBoolean("alpha", this.i);
+            bundle.putBoolean(Key.ALPHA, this.i);
             bundle.putBoolean("allowCustom", this.k);
             bundle.putBoolean("allowPresets", this.j);
             bundle.putBoolean("allowReset", this.l);
@@ -559,7 +563,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
             }
         }
         this.m = n(this.m, this.n);
-        int i4 = getArguments().getInt("color");
+        int i4 = getArguments().getInt(ModelAuditLogEntry.CHANGE_KEY_COLOR);
         if (i4 != this.n) {
             this.m = n(this.m, i4);
         }
@@ -652,14 +656,14 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         if (this.F) {
             this.f2411z.setText(String.format("%08X", Integer.valueOf(i2)));
         } else {
-            this.f2411z.setText(String.format("%06X", Integer.valueOf(i2 & 16777215)));
+            this.f2411z.setText(String.format("%06X", Integer.valueOf(i2 & ViewCompat.MEASURED_SIZE_MASK)));
         }
     }
 
     public final int m(@ColorInt int i2, double d2) {
         long parseLong = Long.parseLong(String.format("#%06X", Integer.valueOf(16777215 & i2)).substring(1), 16);
-        double d3 = 0.0d;
-        int i3 = (d2 > 0.0d ? 1 : (d2 == 0.0d ? 0 : -1));
+        double d3 = ShadowDrawableWrapper.COS_45;
+        int i3 = (d2 > ShadowDrawableWrapper.COS_45 ? 1 : (d2 == ShadowDrawableWrapper.COS_45 ? 0 : -1));
         if (i3 >= 0) {
             d3 = 255.0d;
         }
@@ -699,15 +703,15 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
 
     @Override // androidx.fragment.app.DialogFragment
     public Dialog onCreateDialog(Bundle bundle) {
-        this.p = getArguments().getInt("id");
-        this.F = getArguments().getBoolean("alpha");
+        this.p = getArguments().getInt(ModelAuditLogEntry.CHANGE_KEY_ID);
+        this.F = getArguments().getBoolean(Key.ALPHA);
         this.q = getArguments().getBoolean("showColorShades");
         this.r = getArguments().getInt("colorShape");
         if (bundle == null) {
-            this.n = getArguments().getInt("color");
+            this.n = getArguments().getInt(ModelAuditLogEntry.CHANGE_KEY_COLOR);
             this.o = getArguments().getInt("dialogType");
         } else {
-            this.n = bundle.getInt("color");
+            this.n = bundle.getInt(ModelAuditLogEntry.CHANGE_KEY_COLOR);
             this.o = bundle.getInt("dialogType");
         }
         View inflate = LayoutInflater.from(requireContext()).inflate(R.d.cpv_dialog, (ViewGroup) null);
@@ -745,7 +749,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
 
     @Override // androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
     public void onSaveInstanceState(Bundle bundle) {
-        bundle.putInt("color", this.n);
+        bundle.putInt(ModelAuditLogEntry.CHANGE_KEY_COLOR, this.n);
         bundle.putInt("dialogType", this.o);
         super.onSaveInstanceState(bundle);
     }
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
index 1bb1d3cfcf..9ccb0c4f6b 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
@@ -19,6 +19,8 @@ import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.constraintlayout.motion.widget.Key;
+import androidx.core.view.ViewCompat;
 public class ColorPickerView extends View {
     public float A = 360.0f;
     public float B = 0.0f;
@@ -249,7 +251,7 @@ public class ColorPickerView extends View {
             canvas.drawRect((float) rect3.left, (float) rect3.top, (float) (rect2.right + 1), (float) (rect2.bottom + 1), this.t);
             if (this.u == null) {
                 float f = (float) rect2.left;
-                this.u = new LinearGradient(f, (float) rect2.top, f, (float) rect2.bottom, -1, -16777216, Shader.TileMode.CLAMP);
+                this.u = new LinearGradient(f, (float) rect2.top, f, (float) rect2.bottom, -1, (int) ViewCompat.MEASURED_STATE_MASK, Shader.TileMode.CLAMP);
             }
             b bVar = this.f2418x;
             if (bVar == null || bVar.f2421c != this.A) {
@@ -279,7 +281,7 @@ public class ColorPickerView extends View {
             Point point = new Point();
             point.x = (int) ((f3 * ((float) rect4.width())) + ((float) rect4.left));
             point.y = (int) (((1.0f - f4) * ((float) rect4.height())) + ((float) rect4.top));
-            this.p.setColor(-16777216);
+            this.p.setColor(ViewCompat.MEASURED_STATE_MASK);
             canvas.drawCircle((float) point.x, (float) point.y, (float) (this.l - c.i.a.f.e.o.c.z(getContext(), 1.0f)), this.p);
             this.p.setColor(-2236963);
             canvas.drawCircle((float) point.x, (float) point.y, (float) this.l, this.p);
@@ -425,7 +427,7 @@ public class ColorPickerView extends View {
     public void onRestoreInstanceState(Parcelable parcelable) {
         if (parcelable instanceof Bundle) {
             Bundle bundle = (Bundle) parcelable;
-            this.f2420z = bundle.getInt("alpha");
+            this.f2420z = bundle.getInt(Key.ALPHA);
             this.A = bundle.getFloat("hue");
             this.B = bundle.getFloat("sat");
             this.C = bundle.getFloat("val");
@@ -440,7 +442,7 @@ public class ColorPickerView extends View {
     public Parcelable onSaveInstanceState() {
         Bundle bundle = new Bundle();
         bundle.putParcelable("instanceState", super.onSaveInstanceState());
-        bundle.putInt("alpha", this.f2420z);
+        bundle.putInt(Key.ALPHA, this.f2420z);
         bundle.putFloat("hue", this.A);
         bundle.putFloat("sat", this.B);
         bundle.putFloat("val", this.C);
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
index 87a1c07552..58c0c43758 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
@@ -5,6 +5,7 @@ import android.content.ContextWrapper;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import androidx.annotation.ColorInt;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -14,7 +15,7 @@ import c.d.b.a.a;
 import c.k.a.a.f;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 public class ColorPreferenceCompat extends Preference implements f {
-    public int i = -16777216;
+    public int i = ViewCompat.MEASURED_STATE_MASK;
     public boolean j;
     public int k;
     public int l;
@@ -134,7 +135,7 @@ public class ColorPreferenceCompat extends Preference implements f {
 
     @Override // androidx.preference.Preference
     public Object onGetDefaultValue(TypedArray typedArray, int i) {
-        return Integer.valueOf(typedArray.getInteger(i, -16777216));
+        return Integer.valueOf(typedArray.getInteger(i, ViewCompat.MEASURED_STATE_MASK));
     }
 
     @Override // androidx.preference.Preference
@@ -146,6 +147,6 @@ public class ColorPreferenceCompat extends Preference implements f {
             persistInt(intValue);
             return;
         }
-        this.i = getPersistedInt(-16777216);
+        this.i = getPersistedInt(ViewCompat.MEASURED_STATE_MASK);
     }
 }
diff --git a/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java b/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
index 9fc42c7fb3..31f05fa9f4 100644
--- a/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
+++ b/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
@@ -21,6 +21,7 @@ import c.b.a.d.f;
 import c.b.a.d.g;
 import c.b.a.d.h;
 import c.f.g.a.a.d;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.lytefast.flexinput.R;
@@ -41,6 +42,7 @@ import java.util.List;
 import java.util.Objects;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
+import org.webrtc.MediaStreamTrack;
 /* compiled from: FileListAdapter.kt */
 public final class FileListAdapter extends RecyclerView.Adapter<b> {
     public final SelectionCoordinator<?, ? super Attachment<? extends File>> a;
@@ -88,7 +90,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
         @Override // android.os.AsyncTask
         public void onPostExecute(List<? extends Attachment<? extends File>> list) {
             List<? extends Attachment<? extends File>> list2 = list;
-            m.checkNotNullParameter(list2, "files");
+            m.checkNotNullParameter(list2, ChatInputComponentTypes.FILES);
             FileListAdapter fileListAdapter = this.a;
             fileListAdapter.b = list2;
             fileListAdapter.notifyDataSetChanged();
@@ -336,13 +338,13 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
                         bVar2.d.setVisibility(0);
                         bVar2.a(file);
                         return;
-                    } else if (t.startsWith$default(str, "video", false, 2, null)) {
+                    } else if (t.startsWith$default(str, MediaStreamTrack.VIDEO_TRACK_KIND, false, 2, null)) {
                         ImageView imageView2 = bVar2.d;
                         imageView2.setImageResource(DrawableCompat.getThemedDrawableRes$default(imageView2, R.b.ic_flex_input_movie, 0, 2, (Object) null));
                         bVar2.d.setVisibility(0);
                         bVar2.a(file);
                         return;
-                    } else if (t.startsWith$default(str, "audio", false, 2, null)) {
+                    } else if (t.startsWith$default(str, MediaStreamTrack.AUDIO_TRACK_KIND, false, 2, null)) {
                         ImageView imageView3 = bVar2.d;
                         imageView3.setImageResource(DrawableCompat.getThemedDrawableRes$default(imageView3, R.b.ic_flex_input_audio, 0, 2, (Object) null));
                         bVar2.d.setVisibility(0);
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
index 21b06ddc4d..e4ecf59546 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
@@ -199,7 +199,7 @@ public class FilesFragment extends Fragment {
             return null;
         }
         this.recyclerView = (RecyclerView) inflate.findViewById(R.e.list);
-        if (hasPermissions("android.permission.READ_EXTERNAL_STORAGE")) {
+        if (hasPermissions(REQUIRED_PERMISSION)) {
             Context context = inflate.getContext();
             m.checkNotNullExpressionValue(context, "context");
             ContentResolver contentResolver = context.getContentResolver();
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
index 15c8b0dcf3..63f655b07f 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
@@ -111,7 +111,7 @@ public class MediaFragment extends Fragment {
 
         @Override // androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
         public final void onRefresh() {
-            if (MediaFragment.access$hasPermissions(this.f2428c, "android.permission.READ_EXTERNAL_STORAGE")) {
+            if (MediaFragment.access$hasPermissions(this.f2428c, MediaFragment.REQUIRED_PERMISSION)) {
                 i iVar = this.b;
                 Context context = this.a.getContext();
                 m.checkNotNullExpressionValue(context, "context");
@@ -192,7 +192,7 @@ public class MediaFragment extends Fragment {
         SelectionCoordinator<Attachment<Object>, Media> selectionCoordinator2 = this.selectionCoordinator;
         m.checkNotNull(selectionCoordinator2);
         i iVar = new i(selectionCoordinator2, width, width);
-        if (hasPermissions("android.permission.READ_EXTERNAL_STORAGE")) {
+        if (hasPermissions(REQUIRED_PERMISSION)) {
             RecyclerView recyclerView = this.recyclerView;
             if (recyclerView != null) {
                 recyclerView.setLayoutManager(new GridLayoutManager(inflate.getContext(), 3));
diff --git a/app/src/main/java/com/lytefast/flexinput/model/Attachment.java b/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
index a4a963f6c0..bfaf6fd134 100644
--- a/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
+++ b/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
@@ -7,8 +7,10 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
 import androidx.annotation.CallSuper;
+import androidx.core.app.NotificationCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.w;
 import d0.y.b;
 import d0.z.d.m;
@@ -121,7 +123,7 @@ public class Attachment<T> implements Parcelable {
                     mimeType = contentResolver.getType(inputContentInfoCompat.getContentUri());
                 }
                 if (mimeType != null) {
-                    String str3 = substringAfterLast$default + '.' + w.substringAfterLast$default(mimeType, '/', null, 2, null);
+                    String str3 = substringAfterLast$default + '.' + w.substringAfterLast$default(mimeType, MentionUtilsKt.SLASH_CHAR, null, 2, null);
                     if (str3 != null) {
                         str2 = str3;
                         Uri contentUri = inputContentInfoCompat.getContentUri();
@@ -154,7 +156,7 @@ public class Attachment<T> implements Parcelable {
     }
 
     public Attachment(long j, Uri uri, String str, T t) {
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "displayName");
         this.f2429id = j;
         this.uri = uri;
diff --git a/app/src/main/java/com/lytefast/flexinput/model/Media.java b/app/src/main/java/com/lytefast/flexinput/model/Media.java
index 63860c9fda..e24c74beb7 100644
--- a/app/src/main/java/com/lytefast/flexinput/model/Media.java
+++ b/app/src/main/java/com/lytefast/flexinput/model/Media.java
@@ -3,6 +3,7 @@ package com.lytefast.flexinput.model;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 /* compiled from: Media.kt */
 public final class Media extends Attachment<String> {
@@ -29,7 +30,7 @@ public final class Media extends Attachment<String> {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public Media(long j, Uri uri, String str, String str2, boolean z2, Long l) {
         super(j, uri, str, str2);
-        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         m.checkNotNullParameter(str, "displayName");
         this.i = z2;
         this.j = l;
diff --git a/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java b/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
index db32ed3035..0c3ee59b6a 100644
--- a/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
+++ b/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
@@ -3,6 +3,7 @@ package com.lytefast.flexinput.utils;
 import android.os.Parcelable;
 import android.util.Log;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.models.domain.ModelAuditLogEntry;
 import com.lytefast.flexinput.adapters.AttachmentPreviewAdapter;
 import com.lytefast.flexinput.model.Attachment;
 import com.lytefast.flexinput.utils.SelectionCoordinator;
@@ -151,7 +152,7 @@ public class SelectionAggregator<T extends Attachment<? extends Object>> {
                 Iterator it2 = arrayList.iterator();
                 while (it2.hasNext()) {
                     Integer num = (Integer) it2.next();
-                    m.checkNotNullExpressionValue(num, "position");
+                    m.checkNotNullExpressionValue(num, ModelAuditLogEntry.CHANGE_KEY_POSITION);
                     adapter.notifyItemChanged(num.intValue());
                 }
             }
diff --git a/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java b/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
index 3fe03ffb2a..ea5469d744 100644
--- a/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
+++ b/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
@@ -1,6 +1,7 @@
 package com.lytefast.flexinput.utils;
 
 import androidx.collection.ArrayMap;
+import androidx.core.app.NotificationCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import c.b.a.g.b;
 import d0.z.d.e0;
@@ -30,7 +31,7 @@ public class SelectionCoordinator<I, T extends I> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RestorationException(String str) {
             super(str);
-            m.checkNotNullParameter(str, "msg");
+            m.checkNotNullParameter(str, NotificationCompat.CATEGORY_MESSAGE);
         }
     }
 
diff --git a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
index d3ab7317bb..5ab2f86277 100644
--- a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
+++ b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
@@ -1,5 +1,6 @@
 package com.lytefast.flexinput.viewmodel;
 
+import androidx.core.app.FrameMetricsAggregator;
 import c.d.b.a.a;
 import com.lytefast.flexinput.model.Attachment;
 import d0.t.n;
@@ -21,7 +22,7 @@ public final class FlexInputState {
     public final boolean i;
 
     public FlexInputState() {
-        this(null, false, null, null, false, false, false, false, false, 511);
+        this(null, false, null, null, false, false, false, false, false, FrameMetricsAggregator.EVERY_DURATION);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List<? extends com.lytefast.flexinput.model.Attachment<? extends java.lang.Object>> */
diff --git a/app/src/main/java/com/otaliastudios/cameraview/CameraView.java b/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
index 5fbf3bf169..2f31b97ebf 100644
--- a/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
+++ b/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
@@ -24,10 +24,12 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.OnLifecycleEvent;
+import androidx.vectordrawable.graphics.drawable.PathInterpolatorCompat;
 import c.o.a.l;
 import c.o.a.m.h;
 import c.o.a.m.j;
@@ -377,7 +379,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             int integer15 = obtainStyledAttributes.getInteger(R.c.CameraView_cameraAudioBitRate, 0);
             float f = obtainStyledAttributes.getFloat(R.c.CameraView_cameraPreviewFrameRate, 0.0f);
             boolean z4 = obtainStyledAttributes.getBoolean(R.c.CameraView_cameraPreviewFrameRateExact, false);
-            long integer16 = (long) obtainStyledAttributes.getInteger(R.c.CameraView_cameraAutoFocusResetDelay, 3000);
+            long integer16 = (long) obtainStyledAttributes.getInteger(R.c.CameraView_cameraAutoFocusResetDelay, PathInterpolatorCompat.MAX_NUM_POINTS);
             boolean z5 = obtainStyledAttributes.getBoolean(R.c.CameraView_cameraPictureMetering, true);
             boolean z6 = obtainStyledAttributes.getBoolean(R.c.CameraView_cameraPictureSnapshotMetering, false);
             int integer17 = obtainStyledAttributes.getInteger(R.c.CameraView_cameraSnapshotMaxWidth, 0);
@@ -1053,7 +1055,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     @Override // android.widget.FrameLayout, android.view.View
     public void onMeasure(int i2, int i3) {
         if (this.K) {
-            super.onMeasure(View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i2), 1073741824), View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i3), 1073741824));
+            super.onMeasure(View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i2), BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i3), BasicMeasure.EXACTLY));
             return;
         }
         c.o.a.x.b C = this.f2433x.C(c.o.a.n.t.b.VIEW);
@@ -1080,10 +1082,10 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             }
         } else {
             if (mode == Integer.MIN_VALUE && layoutParams.width == -1) {
-                mode = 1073741824;
+                mode = BasicMeasure.EXACTLY;
             }
             if (mode2 == Integer.MIN_VALUE && layoutParams.height == -1) {
-                mode2 = 1073741824;
+                mode2 = BasicMeasure.EXACTLY;
             }
         }
         c.o.a.b bVar2 = j;
@@ -1101,7 +1103,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             super.onMeasure(i2, i3);
         } else if (mode == 0 && mode2 == 0) {
             bVar2.a(1, "onMeasure:", "both are completely free.", "We respect that and extend to the whole preview size.", "(" + f + "x" + f2 + ")");
-            super.onMeasure(View.MeasureSpec.makeMeasureSpec((int) f, 1073741824), View.MeasureSpec.makeMeasureSpec((int) f2, 1073741824));
+            super.onMeasure(View.MeasureSpec.makeMeasureSpec((int) f, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec((int) f2, BasicMeasure.EXACTLY));
         } else {
             float f3 = f2 / f;
             if (mode == 0 || mode2 == 0) {
@@ -1111,7 +1113,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                     size2 = Math.round(((float) size) * f3);
                 }
                 bVar2.a(1, "onMeasure:", "one dimension was free, we adapted it to fit the ratio.", c.d.b.a.a.n("(", size, "x", size2, ")"));
-                super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, 1073741824), View.MeasureSpec.makeMeasureSpec(size2, 1073741824));
+                super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(size2, BasicMeasure.EXACTLY));
             } else if (mode == 1073741824 || mode2 == 1073741824) {
                 if (mode == Integer.MIN_VALUE) {
                     size = Math.min(Math.round(((float) size2) / f3), size);
@@ -1119,7 +1121,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                     size2 = Math.min(Math.round(((float) size) * f3), size2);
                 }
                 bVar2.a(1, "onMeasure:", "one dimension was EXACTLY, another AT_MOST.", "We have TRIED to fit the aspect ratio, but it's not guaranteed.", c.d.b.a.a.n("(", size, "x", size2, ")"));
-                super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, 1073741824), View.MeasureSpec.makeMeasureSpec(size2, 1073741824));
+                super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(size2, BasicMeasure.EXACTLY));
             } else {
                 float f4 = (float) size2;
                 float f5 = (float) size;
@@ -1129,7 +1131,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                     size = Math.round(f4 / f3);
                 }
                 bVar2.a(1, "onMeasure:", "both dimension were AT_MOST.", "We fit the preview aspect ratio.", c.d.b.a.a.n("(", size, "x", size2, ")"));
-                super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, 1073741824), View.MeasureSpec.makeMeasureSpec(size2, 1073741824));
+                super.onMeasure(View.MeasureSpec.makeMeasureSpec(size, BasicMeasure.EXACTLY), View.MeasureSpec.makeMeasureSpec(size2, BasicMeasure.EXACTLY));
             }
         }
     }
diff --git a/app/src/main/java/d0/e0/p/d/b.java b/app/src/main/java/d0/e0/p/d/b.java
index dfbfbdecf7..a24992b63d 100644
--- a/app/src/main/java/d0/e0/p/d/b.java
+++ b/app/src/main/java/d0/e0/p/d/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.l;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.m0.c.x;
@@ -18,7 +19,7 @@ public final class b extends i {
 
     @Override // d0.e0.p.d.i
     public Collection<x> getFunctions(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         j();
         throw null;
     }
@@ -36,7 +37,7 @@ public final class b extends i {
 
     @Override // d0.e0.p.d.i
     public Collection<n0> getProperties(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         j();
         throw null;
     }
diff --git a/app/src/main/java/d0/e0/p/d/h.java b/app/src/main/java/d0/e0/p/d/h.java
index 5199176d91..0daefae1b2 100644
--- a/app/src/main/java/d0/e0/p/d/h.java
+++ b/app/src/main/java/d0/e0/p/d/h.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.i;
 import d0.e0.p.d.m0.c.d;
@@ -587,15 +588,15 @@ public final class h<T> extends i implements d0.e0.c<T>, z {
             String simpleName = cls.getSimpleName();
             Method enclosingMethod = cls.getEnclosingMethod();
             if (enclosingMethod != null) {
-                d0.z.d.m.checkNotNullExpressionValue(simpleName, "name");
+                d0.z.d.m.checkNotNullExpressionValue(simpleName, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 return d0.g0.w.substringAfter$default(simpleName, enclosingMethod.getName() + "$", (String) null, 2, (Object) null);
             }
             Constructor<?> enclosingConstructor = cls.getEnclosingConstructor();
             if (enclosingConstructor != null) {
-                d0.z.d.m.checkNotNullExpressionValue(simpleName, "name");
+                d0.z.d.m.checkNotNullExpressionValue(simpleName, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 return d0.g0.w.substringAfter$default(simpleName, enclosingConstructor.getName() + "$", (String) null, 2, (Object) null);
             }
-            d0.z.d.m.checkNotNullExpressionValue(simpleName, "name");
+            d0.z.d.m.checkNotNullExpressionValue(simpleName, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return d0.g0.w.substringAfter$default(simpleName, '$', (String) null, 2, (Object) null);
         }
 
@@ -763,7 +764,7 @@ public final class h<T> extends i implements d0.e0.c<T>, z {
 
     @Override // d0.e0.p.d.i
     public Collection<x> getFunctions(d0.e0.p.d.m0.g.e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.e0.p.d.m0.k.a0.i memberScope$kotlin_reflection = getMemberScope$kotlin_reflection();
         d0.e0.p.d.m0.d.b.d dVar = d0.e0.p.d.m0.d.b.d.FROM_REFLECTION;
         return u.plus((Collection) memberScope$kotlin_reflection.getContributedFunctions(eVar, dVar), (Iterable) getStaticScope$kotlin_reflection().getContributedFunctions(eVar, dVar));
@@ -811,7 +812,7 @@ public final class h<T> extends i implements d0.e0.c<T>, z {
 
     @Override // d0.e0.p.d.i
     public Collection<n0> getProperties(d0.e0.p.d.m0.g.e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.e0.p.d.m0.k.a0.i memberScope$kotlin_reflection = getMemberScope$kotlin_reflection();
         d0.e0.p.d.m0.d.b.d dVar = d0.e0.p.d.m0.d.b.d.FROM_REFLECTION;
         return u.plus((Collection) memberScope$kotlin_reflection.getContributedVariables(eVar, dVar), (Iterable) getStaticScope$kotlin_reflection().getContributedVariables(eVar, dVar));
diff --git a/app/src/main/java/d0/e0/p/d/i.java b/app/src/main/java/d0/e0/p/d/i.java
index 16243f00bb..3acf8981c6 100644
--- a/app/src/main/java/d0/e0/p/d/i.java
+++ b/app/src/main/java/d0/e0/p/d/i.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.k1.a.k;
@@ -270,7 +272,7 @@ public abstract class i implements d0.z.d.e {
     }
 
     public final Method findDefaultMethod(String str, String str2, boolean z2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "desc");
         if (m.areEqual(str, "<init>")) {
             return null;
@@ -289,7 +291,7 @@ public abstract class i implements d0.z.d.e {
 
     public final x findFunctionDescriptor(String str, String str2) {
         Collection<x> collection;
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "signature");
         if (m.areEqual(str, "<init>")) {
             collection = d0.t.u.toList(getConstructorDescriptors());
@@ -316,7 +318,7 @@ public abstract class i implements d0.z.d.e {
         sb.append(str2);
         sb.append(") not resolved in ");
         sb.append(this);
-        sb.append(':');
+        sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         if (joinToString$default.length() != 0) {
             z2 = false;
         }
@@ -326,7 +328,7 @@ public abstract class i implements d0.z.d.e {
 
     public final Method findMethodBySignature(String str, String str2) {
         Method f2;
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "desc");
         if (m.areEqual(str, "<init>")) {
             return null;
@@ -346,7 +348,7 @@ public abstract class i implements d0.z.d.e {
     }
 
     public final n0 findPropertyDescriptor(String str, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "signature");
         MatchResult matchEntire = j.matchEntire(str2);
         boolean z2 = true;
@@ -401,7 +403,7 @@ public abstract class i implements d0.z.d.e {
             sb.append(str2);
             sb.append(") not resolved in ");
             sb.append(this);
-            sb.append(':');
+            sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
             if (joinToString$default.length() != 0) {
                 z2 = false;
             }
@@ -419,7 +421,7 @@ public abstract class i implements d0.z.d.e {
             ClassLoader safeClassLoader = d0.e0.p.d.m0.c.k1.b.b.getSafeClassLoader(getJClass());
             String substring = str.substring(i2 + 1, i3 - 1);
             m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
-            Class<?> loadClass = safeClassLoader.loadClass(d0.g0.t.replace$default(substring, '/', '.', false, 4, (Object) null));
+            Class<?> loadClass = safeClassLoader.loadClass(d0.g0.t.replace$default(substring, (char) MentionUtilsKt.SLASH_CHAR, '.', false, 4, (Object) null));
             m.checkNotNullExpressionValue(loadClass, "jClass.safeClassLoader.l…d - 1).replace('/', '.'))");
             return loadClass;
         } else if (charAt == 'S') {
diff --git a/app/src/main/java/d0/e0/p/d/j.java b/app/src/main/java/d0/e0/p/d/j.java
index e88313f2c9..46a68814a2 100644
--- a/app/src/main/java/d0/e0/p/d/j.java
+++ b/app/src/main/java/d0/e0/p/d/j.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.f;
 import d0.e0.p.d.c;
 import d0.e0.p.d.c0;
@@ -220,7 +221,7 @@ public final class j extends f<Object> implements i<Object>, KFunction<Object>,
     public j(i iVar, String str, String str2, Object obj) {
         this(iVar, str, str2, null, obj);
         m.checkNotNullParameter(iVar, "container");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "signature");
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/j0.java b/app/src/main/java/d0/e0/p/d/j0.java
index 4c2584156e..39cc0a7df7 100644
--- a/app/src/main/java/d0/e0/p/d/j0.java
+++ b/app/src/main/java/d0/e0/p/d/j0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import d0.e0.p.d.m0.b.q.c;
 import d0.e0.p.d.m0.c.c0;
 import d0.e0.p.d.m0.c.h;
@@ -273,7 +274,7 @@ public final class j0 {
             return 0L;
         }
         if (d0.z.d.m.areEqual(type, Double.TYPE)) {
-            return Double.valueOf(0.0d);
+            return Double.valueOf((double) ShadowDrawableWrapper.COS_45);
         }
         if (d0.z.d.m.areEqual(type, Void.TYPE)) {
             throw new IllegalStateException("Parameter with void type is illegal");
diff --git a/app/src/main/java/d0/e0/p/d/k.java b/app/src/main/java/d0/e0/p/d/k.java
index 9d711e1568..62972b8c32 100644
--- a/app/src/main/java/d0/e0/p/d/k.java
+++ b/app/src/main/java/d0/e0/p/d/k.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.s;
@@ -62,7 +63,7 @@ public final class k<V> extends p<V> implements KMutableProperty0<V> {
     public k(i iVar, String str, String str2, Object obj) {
         super(iVar, str, str2, obj);
         m.checkNotNullParameter(iVar, "container");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "signature");
         c0.b<a<V>> lazy = c0.lazy(new b(this));
         m.checkNotNullExpressionValue(lazy, "ReflectProperties.lazy { Setter(this) }");
diff --git a/app/src/main/java/d0/e0/p/d/l.java b/app/src/main/java/d0/e0/p/d/l.java
index cd0ec29828..83c2f9312c 100644
--- a/app/src/main/java/d0/e0/p/d/l.java
+++ b/app/src/main/java/d0/e0/p/d/l.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.e;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.m0.c.n0;
@@ -64,7 +65,7 @@ public final class l<T, V> extends q<T, V> implements e<T, V> {
     public l(i iVar, String str, String str2, Object obj) {
         super(iVar, str, str2, obj);
         m.checkNotNullParameter(iVar, "container");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "signature");
         c0.b<a<T, V>> lazy = c0.lazy(new b(this));
         m.checkNotNullExpressionValue(lazy, "ReflectProperties.lazy { Setter(this) }");
diff --git a/app/src/main/java/d0/e0/p/d/l0/b.java b/app/src/main/java/d0/e0/p/d/l0/b.java
index 7747889c81..a9142657d5 100644
--- a/app/src/main/java/d0/e0/p/d/l0/b.java
+++ b/app/src/main/java/d0/e0/p/d/l0/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.l0;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.a0;
 import d0.g;
 import d0.t.k;
@@ -239,7 +240,7 @@ public final class b {
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final String mo1invoke() {
-            StringBuilder H = c.d.b.a.a.H('@');
+            StringBuilder H = c.d.b.a.a.H(MentionUtilsKt.MENTIONS_CHAR);
             H.append(this.$annotationClass.getCanonicalName());
             u.joinTo$default(this.$values.entrySet(), H, ", ", "(", ")", 0, null, a.i, 48, null);
             String sb = H.toString();
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/g.java b/app/src/main/java/d0/e0/p/d/m0/b/g.java
index b6a4727b27..36ab892208 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/g.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.k;
 import d0.e0.p.d.m0.b.p.c;
 import d0.e0.p.d.m0.c.g1.c;
@@ -89,7 +90,7 @@ public final class g {
             }
             if (eVar != null) {
                 b bVar = k.a.f2475y;
-                e identifier = e.identifier("name");
+                e identifier = e.identifier(ModelAuditLogEntry.CHANGE_KEY_NAME);
                 String asString = eVar.asString();
                 m.checkNotNullExpressionValue(asString, "name.asString()");
                 c0Var3 = d0.e0.p.d.m0.n.o1.a.replaceAnnotations(c0Var3, d0.e0.p.d.m0.c.g1.g.f.create(u.plus(c0Var3.getAnnotations(), new j(hVar, bVar, g0.mapOf(o.to(identifier, new w(asString)))))));
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/h.java b/app/src/main/java/d0/e0/p/d/m0/b/h.java
index 16be036ccb..fa3616328d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/h.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b;
 
+import com.discord.utilities.font.FontUtils;
 import d0.e0.p.d.m0.b.k;
 import d0.e0.p.d.m0.c.e0;
 import d0.e0.p.d.m0.c.g1.g;
@@ -489,7 +490,7 @@ public abstract class h {
             case 146:
             case 148:
             case 149:
-            case 150:
+            case FontUtils.MAX_FONT_SCALING /* 150 */:
             case 151:
             case 152:
             case 153:
@@ -1034,7 +1035,7 @@ public abstract class h {
             case 149:
                 objArr[2] = "isCollectionOrNullableCollection";
                 break;
-            case 150:
+            case FontUtils.MAX_FONT_SCALING /* 150 */:
                 objArr[2] = "isListOrNullableList";
                 break;
             case 151:
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/k.java b/app/src/main/java/d0/e0/p/d/m0/b/k.java
index d9f4759704..c7ba9e975a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/k.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b;
 
+import androidx.core.app.NotificationCompat;
 import d0.e0.p.d.m0.g.b;
 import d0.e0.p.d.m0.g.c;
 import d0.e0.p.d.m0.g.e;
@@ -380,7 +381,7 @@ public final class k {
         b child6 = bVar3.child(e.identifier("ranges"));
         m.checkNotNullExpressionValue(child6, "BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(\"ranges\"))");
         o = child6;
-        m.checkNotNullExpressionValue(bVar3.child(e.identifier("text")), "BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(\"text\"))");
+        m.checkNotNullExpressionValue(bVar3.child(e.identifier(NotificationCompat.MessagingStyle.Message.KEY_TEXT)), "BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(\"text\"))");
         b child7 = bVar3.child(e.identifier("internal"));
         m.checkNotNullExpressionValue(child7, "BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(\"internal\"))");
         p = n0.setOf((Object[]) new b[]{bVar3, child5, child6, child4, bVar2, child7, bVar});
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/l.java b/app/src/main/java/d0/e0/p/d/m0/b/l.java
index 541be5e3a7..2ac2c4e7be 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/l.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b;
 
+import androidx.exifinterface.media.ExifInterface;
 import d0.e0.p.d.m0.c.c0;
 import d0.e0.p.d.m0.c.f;
 import d0.e0.p.d.m0.c.g1.g;
@@ -42,7 +43,7 @@ public final class l {
         g.a aVar = g.f;
         g empty = aVar.getEMPTY();
         j1 j1Var = j1.IN_VARIANCE;
-        zVar.setTypeParameterDescriptors(d0.t.m.listOf(k0.createWithDefaultBound(zVar, empty, false, j1Var, e.identifier("T"), 0, oVar)));
+        zVar.setTypeParameterDescriptors(d0.t.m.listOf(k0.createWithDefaultBound(zVar, empty, false, j1Var, e.identifier(ExifInterface.GPS_DIRECTION_TRUE), 0, oVar)));
         zVar.createTypeConstructor();
         a = zVar;
         c0 errorModule2 = t.getErrorModule();
@@ -50,7 +51,7 @@ public final class l {
         z zVar3 = new z(new n(errorModule2, k.d), fVar, false, false, k.g.shortName(), u0Var, oVar);
         zVar3.setModality(zVar2);
         zVar3.setVisibility(uVar);
-        zVar3.setTypeParameterDescriptors(d0.t.m.listOf(k0.createWithDefaultBound(zVar3, aVar.getEMPTY(), false, j1Var, e.identifier("T"), 0, oVar)));
+        zVar3.setTypeParameterDescriptors(d0.t.m.listOf(k0.createWithDefaultBound(zVar3, aVar.getEMPTY(), false, j1Var, e.identifier(ExifInterface.GPS_DIRECTION_TRUE), 0, oVar)));
         zVar3.createTypeConstructor();
         b = zVar3;
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/o.java b/app/src/main/java/d0/e0/p/d/m0/b/o.java
index a00501a975..e92043face 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/o.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.e0;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.g.a;
@@ -68,7 +69,7 @@ public final class o {
     }
 
     public final boolean isShortNameOfUnsignedArray(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return e.contains(eVar);
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/p/a.java b/app/src/main/java/d0/e0/p/d/m0/b/p/a.java
index 0d3358c883..6ae8a1b7de 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/p/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/p/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b.p;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.f;
 import d0.e0.p.d.m0.b.p.c;
 import d0.e0.p.d.m0.c.c0;
@@ -75,7 +76,7 @@ public final class a implements b {
     @Override // d0.e0.p.d.m0.c.h1.b
     public boolean shouldCreateClass(d0.e0.p.d.m0.g.b bVar, d0.e0.p.d.m0.g.e eVar) {
         m.checkNotNullParameter(bVar, "packageFqName");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         String asString = eVar.asString();
         m.checkNotNullExpressionValue(asString, "name.asString()");
         return (t.startsWith$default(asString, "Function", false, 2, null) || t.startsWith$default(asString, "KFunction", false, 2, null) || t.startsWith$default(asString, "SuspendFunction", false, 2, null) || t.startsWith$default(asString, "KSuspendFunction", false, 2, null)) && c.i.parseClassName(asString, bVar) != null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/p/e.java b/app/src/main/java/d0/e0/p/d/m0/b/p/e.java
index ca5f775ffc..55b46587bb 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/p/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/p/e.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b.p;
 
+import androidx.exifinterface.media.ExifInterface;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.g1.g;
@@ -55,9 +56,9 @@ public final class e extends g0 {
                 z0 z0Var = (z0) zVar.getValue();
                 String asString = z0Var.getName().asString();
                 m.checkNotNullExpressionValue(asString, "typeParameter.name.asString()");
-                if (m.areEqual(asString, "T")) {
+                if (m.areEqual(asString, ExifInterface.GPS_DIRECTION_TRUE)) {
                     str = "instance";
-                } else if (m.areEqual(asString, "E")) {
+                } else if (m.areEqual(asString, ExifInterface.LONGITUDE_EAST)) {
                     str = "receiver";
                 } else {
                     str = asString.toLowerCase();
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/q/e.java b/app/src/main/java/d0/e0/p/d/m0/b/q/e.java
index b6f8722ffb..f79b81707b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/q/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/q/e.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b.q;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.k;
 import d0.e0.p.d.m0.c.c0;
 import d0.e0.p.d.m0.c.e0;
@@ -152,7 +153,7 @@ public final class e implements d0.e0.p.d.m0.c.h1.b {
     @Override // d0.e0.p.d.m0.c.h1.b
     public boolean shouldCreateClass(d0.e0.p.d.m0.g.b bVar, d0.e0.p.d.m0.g.e eVar) {
         d0.z.d.m.checkNotNullParameter(bVar, "packageFqName");
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return d0.z.d.m.areEqual(eVar, d) && d0.z.d.m.areEqual(bVar, f2482c);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/q/g.java b/app/src/main/java/d0/e0/p/d/m0/b/q/g.java
index cba0730012..751635a401 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/q/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/q/g.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.b.q;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.h;
 import d0.e0.p.d.m0.b.q.f;
 import d0.e0.p.d.m0.c.b;
@@ -276,7 +277,7 @@ public final class g implements d0.e0.p.d.m0.c.h1.a, d0.e0.p.d.m0.c.h1.c {
         boolean z2;
         boolean z3;
         boolean z4;
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(eVar2, "classDescriptor");
         boolean z5 = false;
         if (m.areEqual(eVar, a.e.getCLONE_NAME()) && (eVar2 instanceof d0.e0.p.d.m0.l.b.e0.d) && h.isArrayOrPrimitiveArray(eVar2)) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/b0.java b/app/src/main/java/d0/e0/p/d/m0/c/b0.java
index f11536fe70..d42afc4176 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/b0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/b0.java
@@ -1,12 +1,13 @@
 package d0.e0.p.d.m0.c;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: ModuleCapability.kt */
 public final class b0<T> {
     public final String a;
 
     public b0(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.a = str;
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/d0.java b/app/src/main/java/d0/e0/p/d/m0/c/d0.java
index cd11c216c2..464f77b2c3 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/d0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/d0.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.c;
 
+import androidx.exifinterface.media.ExifInterface;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.d0.f;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.e0.p.d.m0.c.i1.k0;
@@ -89,14 +91,14 @@ public final class d0 {
             super(oVar, mVar, eVar, u0.a, false);
             m.checkNotNullParameter(oVar, "storageManager");
             m.checkNotNullParameter(mVar, "container");
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.q = z2;
             IntRange until = f.until(0, i);
             ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(until, 10));
             Iterator<Integer> it = until.iterator();
             while (it.hasNext()) {
                 int nextInt = ((c0) it).nextInt();
-                arrayList.add(k0.createWithDefaultBound(this, g.f.getEMPTY(), false, j1.INVARIANT, e.identifier(m.stringPlus("T", Integer.valueOf(nextInt))), nextInt, oVar));
+                arrayList.add(k0.createWithDefaultBound(this, g.f.getEMPTY(), false, j1.INVARIANT, e.identifier(m.stringPlus(ExifInterface.GPS_DIRECTION_TRUE, Integer.valueOf(nextInt))), nextInt, oVar));
             }
             this.r = arrayList;
             this.f2486s = new i(this, a1.computeConstructorTypeParameters(this), m0.setOf(d0.e0.p.d.m0.k.x.a.getModule(this).getBuiltIns().getAnyType()), oVar);
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/e1.java b/app/src/main/java/d0/e0/p/d/m0/c/e1.java
index 62aeef0e39..0082e806fe 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/e1.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/e1.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c;
 
+import androidx.core.os.EnvironmentCompat;
 import d0.t.g0;
 import d0.z.d.m;
 import java.util.Map;
@@ -108,7 +109,7 @@ public final class e1 {
         public static final i f2495c = new i();
 
         public i() {
-            super("unknown", false);
+            super(EnvironmentCompat.MEDIA_UNKNOWN, false);
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/f1.java b/app/src/main/java/d0/e0/p/d/m0/c/f1.java
index 10c0e74746..3ebf5b42b9 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/f1.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/f1.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: Visibility.kt */
 public abstract class f1 {
@@ -7,7 +8,7 @@ public abstract class f1 {
     public final boolean b;
 
     public f1(String str, boolean z2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.a = str;
         this.b = z2;
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/h1/a.java b/app/src/main/java/d0/e0/p/d/m0/c/h1/a.java
index 781d4b1acf..25600bd2e1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/h1/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/h1/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.h1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.d;
 import d0.e0.p.d.m0.c.e;
 import d0.e0.p.d.m0.c.t0;
@@ -23,7 +24,7 @@ public interface a {
 
         @Override // d0.e0.p.d.m0.c.h1.a
         public Collection<t0> getFunctions(d0.e0.p.d.m0.g.e eVar, e eVar2) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(eVar2, "classDescriptor");
             return n.emptyList();
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/a.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/a.java
index 41947f21b2..736c74d76e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.q0;
 import d0.e0.p.d.m0.c.y0;
@@ -94,7 +95,7 @@ public abstract class a extends u {
         Object[] objArr = new Object[((i == 2 || i == 3 || i == 4 || i == 5 || i == 8 || i == 11 || i == 13 || i == 15 || i == 16 || i == 18 || i == 19) ? 2 : 3)];
         switch (i) {
             case 1:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 2:
             case 3:
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/b.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/b.java
index a0ac8dd704..3beba81ec0 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.u0;
@@ -39,7 +40,7 @@ public abstract class b extends f {
         if (i == 1) {
             objArr[0] = "containingDeclaration";
         } else if (i == 2) {
-            objArr[0] = "name";
+            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
         } else if (i == 3) {
             objArr[0] = "variance";
         } else if (i == 4) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java
index 9319a80870..82ac5c22cb 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.g1.g;
@@ -109,7 +110,7 @@ public abstract class b0 extends l implements m0 {
                 objArr[0] = "annotations";
                 break;
             case 4:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 5:
                 objArr[0] = "source";
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java
index 358911147d..5382735d66 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.m0;
@@ -119,7 +120,7 @@ public class c0 extends n0 implements n0 {
                     objArr[0] = "substitution";
                     break;
                 case 18:
-                    objArr[0] = "name";
+                    objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                     break;
                 default:
                     objArr[0] = "owner";
@@ -490,7 +491,7 @@ public class c0 extends n0 implements n0 {
                         break;
                     case 4:
                     case 11:
-                        objArr[0] = "name";
+                        objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                         break;
                     case 5:
                     case 12:
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java
index cb819cef73..2717d9f2e6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.d;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.i1.j0;
@@ -111,7 +112,7 @@ public abstract class e extends l implements y0 {
         super(mVar, gVar, eVar, u0Var);
         m.checkNotNullParameter(mVar, "containingDeclaration");
         m.checkNotNullParameter(gVar, "annotations");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(u0Var, "sourceElement");
         m.checkNotNullParameter(uVar, "visibilityImpl");
         this.m = uVar;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java
index f2862275e6..b50cffdb7f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.x0;
@@ -320,7 +321,7 @@ public abstract class f extends l implements z0 {
                 objArr[0] = "annotations";
                 break;
             case 3:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 4:
                 objArr[0] = "variance";
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/g0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/g0.java
index 84466b7a44..212e070f2b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/g0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/g0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
@@ -52,7 +53,7 @@ public class g0 extends q implements t0 {
                 break;
             case 2:
             case 7:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 3:
             case 8:
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/h.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/h.java
index 2b1e79fcbb..aff3830662 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/h.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.u0;
 import d0.e0.p.d.m0.g.e;
@@ -38,7 +39,7 @@ public abstract class h extends a {
         if (i == 1) {
             objArr[0] = "containingDeclaration";
         } else if (i == 2) {
-            objArr[0] = "name";
+            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
         } else if (i == 3) {
             objArr[0] = "source";
         } else if (i == 4 || i == 5) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java
index afef3dced4..805b7157c4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c0;
 import d0.e0.p.d.m0.c.j0;
 import d0.e0.p.d.m0.g.b;
@@ -50,7 +51,7 @@ public class h0 extends j {
             e shortName = bVar.shortName();
             m.checkNotNullExpressionValue(shortName, "subFqName.shortName()");
             if (function1.invoke(shortName).booleanValue()) {
-                m.checkNotNullParameter(shortName, "name");
+                m.checkNotNullParameter(shortName, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 j0 j0Var = null;
                 if (!shortName.isSpecial()) {
                     c0 c0Var = this.b;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java
index d49c08febf..102ac427ab 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java
@@ -1,6 +1,7 @@
 package d0.e0.p.d.m0.c.i1;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.d;
 import d0.e0.p.d.m0.c.f;
 import d0.e0.p.d.m0.c.g1.g;
@@ -102,7 +103,7 @@ public class i extends h {
         Object[] objArr = new Object[i2];
         switch (i) {
             case 1:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 2:
                 objArr[0] = "modality";
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java
index b52f8c2281..2e07fff96b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.b;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.e0.p.d.m0.c.m;
@@ -28,7 +29,7 @@ public abstract class k extends b implements m {
         Object[] objArr = new Object[((i == 2 || i == 3 || i == 5 || i == 6) ? 2 : 3)];
         switch (i) {
             case 1:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 2:
             case 3:
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java
index 2079740542..03fa731fb3 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.u0;
@@ -73,7 +74,7 @@ public class k0 extends f {
             case 9:
             case 15:
             case 22:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 4:
             case 11:
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/l.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/l.java
index 3e3af21ef5..083337e863 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/l.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.n;
@@ -40,7 +41,7 @@ public abstract class l extends k implements n {
                 objArr[0] = "annotations";
                 break;
             case 2:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 3:
                 objArr[0] = "source";
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java
index 14bd668791..a9f9b5b73c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.d1;
 import d0.e0.p.d.m0.c.g1.g;
@@ -36,7 +37,7 @@ public class l0 extends m0 implements c1 {
         public final l0 createWithDestructuringDeclarations(d0.e0.p.d.m0.c.a aVar, c1 c1Var, int i, g gVar, e eVar, c0 c0Var, boolean z2, boolean z3, boolean z4, c0 c0Var2, u0 u0Var, Function0<? extends List<? extends d1>> function0) {
             m.checkNotNullParameter(aVar, "containingDeclaration");
             m.checkNotNullParameter(gVar, "annotations");
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(c0Var, "outType");
             m.checkNotNullParameter(u0Var, "source");
             return function0 == null ? new l0(aVar, c1Var, i, gVar, eVar, c0Var, z2, z3, z4, c0Var2, u0Var) : new b(aVar, c1Var, i, gVar, eVar, c0Var, z2, z3, z4, c0Var2, u0Var, function0);
@@ -70,7 +71,7 @@ public class l0 extends m0 implements c1 {
             super(aVar, c1Var, i, gVar, eVar, c0Var, z2, z3, z4, c0Var2, u0Var);
             m.checkNotNullParameter(aVar, "containingDeclaration");
             m.checkNotNullParameter(gVar, "annotations");
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(c0Var, "outType");
             m.checkNotNullParameter(u0Var, "source");
             m.checkNotNullParameter(function0, "destructuringVariables");
@@ -104,7 +105,7 @@ public class l0 extends m0 implements c1 {
         super(aVar, gVar, eVar, c0Var, u0Var);
         m.checkNotNullParameter(aVar, "containingDeclaration");
         m.checkNotNullParameter(gVar, "annotations");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(c0Var, "outType");
         m.checkNotNullParameter(u0Var, "source");
         this.o = i;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/m0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/m0.java
index 642460e150..f22dcb87af 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/m0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/m0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.d1;
 import d0.e0.p.d.m0.c.g1.g;
@@ -70,7 +71,7 @@ public abstract class m0 extends l implements d1 {
                 objArr[0] = "annotations";
                 break;
             case 2:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 3:
                 objArr[0] = "source";
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/n0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/n0.java
index e3a384b8df..85537b6e61 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/n0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/n0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.u0;
 import d0.e0.p.d.m0.g.e;
@@ -36,7 +37,7 @@ public abstract class n0 extends m0 {
         if (i == 1) {
             objArr[0] = "annotations";
         } else if (i == 2) {
-            objArr[0] = "name";
+            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
         } else if (i == 3) {
             objArr[0] = "source";
         } else if (i != 4) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java
index 80dc4118b3..b0666dee8a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.d;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.e0.p.d.m0.c.m;
@@ -212,7 +213,7 @@ public class o extends h {
                         case 5:
                         case 8:
                         case 10:
-                            objArr[0] = "name";
+                            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                             break;
                         case 2:
                         case 6:
@@ -547,7 +548,7 @@ public class o extends h {
                 break;
             case 2:
             case 9:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 3:
             case 10:
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java
index 86d77ea968..3ce744acec 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.i1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
@@ -312,7 +313,7 @@ public abstract class q extends l implements x {
                     objArr[0] = "visibility";
                     break;
                 case 16:
-                    objArr[0] = "name";
+                    objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                     break;
                 case 18:
                 case 20:
@@ -803,7 +804,7 @@ public abstract class q extends l implements x {
                 objArr[0] = "annotations";
                 break;
             case 2:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 3:
                 objArr[0] = "kind";
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java
index f316792e59..db424d465a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java
@@ -1,6 +1,7 @@
 package d0.e0.p.d.m0.c.i1;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.d;
 import d0.e0.p.d.m0.c.f;
 import d0.e0.p.d.m0.c.g1.g;
@@ -113,7 +114,7 @@ public class z extends h {
                 objArr[0] = "kind";
                 break;
             case 2:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 3:
                 objArr[0] = "source";
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java
index 08758c1ad7..fe3bec9efd 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c.k1.a;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.m0.e.b.b0.b;
 import d0.e0.p.d.m0.e.b.p;
 import d0.g0.t;
@@ -57,7 +58,7 @@ public final class f implements p {
     public String getLocation() {
         String name = this.b.getName();
         m.checkNotNullExpressionValue(name, "klass.name");
-        return m.stringPlus(t.replace$default(name, '.', '/', false, 4, (Object) null), ".class");
+        return m.stringPlus(t.replace$default(name, '.', (char) MentionUtilsKt.SLASH_CHAR, false, 4, (Object) null), ".class");
     }
 
     public int hashCode() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java
index 3f6c1dcef4..cccb7aa436 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.c.k1.b;
 
+import androidx.exifinterface.media.ExifInterface;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.c;
 import d0.f0.q;
 import d0.g0.t;
@@ -146,13 +148,13 @@ public final class b {
     public static final String getDesc(Class<?> cls) {
         m.checkNotNullParameter(cls, "<this>");
         if (m.areEqual(cls, Void.TYPE)) {
-            return "V";
+            return ExifInterface.GPS_MEASUREMENT_INTERRUPTED;
         }
         String name = createArrayType(cls).getName();
         m.checkNotNullExpressionValue(name, "createArrayType().name");
         String substring = name.substring(1);
         m.checkNotNullExpressionValue(substring, "(this as java.lang.String).substring(startIndex)");
-        return t.replace$default(substring, '.', '/', false, 4, (Object) null);
+        return t.replace$default(substring, '.', (char) MentionUtilsKt.SLASH_CHAR, false, 4, (Object) null);
     }
 
     public static final List<Type> getParameterizedTypeArguments(Type type) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/w.java b/app/src/main/java/d0/e0/p/d/m0/c/w.java
index 0173a773a2..9dff32510d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/w.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/w.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.c;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.d.b.d;
 import d0.e0.p.d.m0.g.e;
 import d0.e0.p.d.m0.k.a0.i;
@@ -102,7 +103,7 @@ public final class w {
                     return null;
                 }
                 i unsubstitutedInnerClassesScope = ((e) contributedClassifier).getUnsubstitutedInnerClassesScope();
-                m.checkNotNullExpressionValue(eVar, "name");
+                m.checkNotNullExpressionValue(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 h contributedClassifier2 = unsubstitutedInnerClassesScope.getContributedClassifier(eVar, dVar);
                 if (contributedClassifier2 instanceof e) {
                     contributedClassifier = (e) contributedClassifier2;
@@ -136,7 +137,7 @@ public final class w {
                         break;
                     }
                     i unsubstitutedInnerClassesScope2 = ((e) contributedClassifier3).getUnsubstitutedInnerClassesScope();
-                    m.checkNotNullExpressionValue(next, "name");
+                    m.checkNotNullExpressionValue(next, ModelAuditLogEntry.CHANGE_KEY_NAME);
                     h contributedClassifier4 = unsubstitutedInnerClassesScope2.getContributedClassifier(next, dVar);
                     if (contributedClassifier4 instanceof e) {
                         contributedClassifier3 = (e) contributedClassifier4;
@@ -171,7 +172,7 @@ public final class w {
                     return null;
                 }
                 i unsubstitutedInnerClassesScope3 = ((e) contributedClassifier).getUnsubstitutedInnerClassesScope();
-                m.checkNotNullExpressionValue(eVar2, "name");
+                m.checkNotNullExpressionValue(eVar2, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 h contributedClassifier5 = unsubstitutedInnerClassesScope3.getContributedClassifier(eVar2, dVar);
                 if (contributedClassifier5 instanceof e) {
                     contributedClassifier = (e) contributedClassifier5;
diff --git a/app/src/main/java/d0/e0/p/d/m0/d/a.java b/app/src/main/java/d0/e0/p/d/m0/d/a.java
index 5aa1500c4b..e95f0329be 100644
--- a/app/src/main/java/d0/e0/p/d/m0/d/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/d/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.e0;
 import d0.e0.p.d.m0.d.b.b;
 import d0.e0.p.d.m0.d.b.c;
@@ -12,7 +13,7 @@ public final class a {
         m.checkNotNullParameter(cVar, "<this>");
         m.checkNotNullParameter(bVar, "from");
         m.checkNotNullParameter(e0Var, "scopeOwner");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         String asString = e0Var.getFqName().asString();
         m.checkNotNullExpressionValue(asString, "scopeOwner.fqName.asString()");
         String asString2 = eVar.asString();
@@ -25,7 +26,7 @@ public final class a {
         m.checkNotNullParameter(cVar, "<this>");
         m.checkNotNullParameter(bVar, "from");
         m.checkNotNullParameter(eVar, "scopeOwner");
-        m.checkNotNullParameter(eVar2, "name");
+        m.checkNotNullParameter(eVar2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (cVar != c.a.a && (location = bVar.getLocation()) != null) {
             d0.e0.p.d.m0.d.b.e position = cVar.getRequiresPosition() ? location.getPosition() : d0.e0.p.d.m0.d.b.e.i.getNO_POSITION();
             String filePath = location.getFilePath();
@@ -43,7 +44,7 @@ public final class a {
         m.checkNotNullParameter(cVar, "<this>");
         m.checkNotNullParameter(bVar, "from");
         m.checkNotNullParameter(str, "packageFqName");
-        m.checkNotNullParameter(str2, "name");
+        m.checkNotNullParameter(str2, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (cVar != c.a.a && (location = bVar.getLocation()) != null) {
             cVar.record(location.getFilePath(), cVar.getRequiresPosition() ? location.getPosition() : d0.e0.p.d.m0.d.b.e.i.getNO_POSITION(), str, f.PACKAGE, str2);
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/d/b/c.java b/app/src/main/java/d0/e0/p/d/m0/d/b/c.java
index 6beba2bc35..b942d9e1c4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/d/b/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/d/b/c.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.d.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: LookupTracker.kt */
 public interface c {
@@ -16,10 +17,10 @@ public interface c {
         @Override // d0.e0.p.d.m0.d.b.c
         public void record(String str, e eVar, String str2, f fVar, String str3) {
             m.checkNotNullParameter(str, "filePath");
-            m.checkNotNullParameter(eVar, "position");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_POSITION);
             m.checkNotNullParameter(str2, "scopeFqName");
             m.checkNotNullParameter(fVar, "scopeKind");
-            m.checkNotNullParameter(str3, "name");
+            m.checkNotNullParameter(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/c0.java b/app/src/main/java/d0/e0/p/d/m0/e/a/c0.java
index 8ec58d5b65..54146cbd0e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/c0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/c0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.g.e;
 import d0.e0.p.d.m0.o.m.a;
 import d0.g0.t;
@@ -43,7 +44,7 @@ public final class c0 {
     }
 
     public static final List<e> getPropertyNamesCandidatesByAccessorName(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         String asString = eVar.asString();
         m.checkNotNullExpressionValue(asString, "name.asString()");
         z zVar = z.a;
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/d0.java b/app/src/main/java/d0/e0/p/d/m0/e/a/d0.java
index e052f21481..a29c1923e0 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/d0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/d0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.h;
 import d0.e0.p.d.m0.c.m0;
 import d0.e0.p.d.m0.c.n0;
@@ -127,7 +128,7 @@ public final class d0 {
         }
         h hVar = h.m;
         e name = t.getName();
-        m.checkNotNullExpressionValue(name, "name");
+        m.checkNotNullExpressionValue(name, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (!hVar.getSameAsBuiltinMethodWithErasedValueParameters(name)) {
             return null;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java b/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java
index c2bce35066..3070ba56d4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.e.b.w;
 import d0.e0.p.d.m0.g.e;
 import d0.e0.p.d.m0.k.y.d;
@@ -46,7 +47,7 @@ public class e0 {
             public final String b;
 
             public C0219a(e eVar, String str) {
-                m.checkNotNullParameter(eVar, "name");
+                m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(str, "signature");
                 this.a = eVar;
                 this.b = str;
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/g.java b/app/src/main/java/d0/e0/p/d/m0/e/a/g.java
index 276f3030cb..c0ab0282f7 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/g.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.h;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.t0;
@@ -43,7 +44,7 @@ public final class g extends e0 {
     }
 
     public final List<e> getBuiltinFunctionNamesByJvmName(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         List<e> list = e0.a.getJVM_SHORT_NAME_TO_BUILTIN_SHORT_NAMES_MAP().get(eVar);
         return list == null ? n.emptyList() : list;
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java
index 93f2d2f2db..36e6e6246e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.g0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.d;
@@ -138,7 +139,7 @@ public final class a {
             case 12:
             case 19:
             default:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 18:
                 objArr[0] = "kotlin/reflect/jvm/internal/impl/load/java/components/DescriptorResolverUtils";
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/h0/f.java b/app/src/main/java/d0/e0/p/d/m0/e/a/h0/f.java
index 238105f4f2..e1e8d3b2a5 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/h0/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/h0/f.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.h0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
@@ -86,7 +87,7 @@ public class f extends g0 implements b {
                 break;
             case 2:
             case 7:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 3:
             case 14:
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/h0/g.java b/app/src/main/java/d0/e0/p/d/m0/e/a/h0/g.java
index 5138e86575..b0b182e477 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/h0/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/h0/g.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.h0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.h;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
@@ -72,7 +73,7 @@ public class g extends c0 implements b {
                 break;
             case 4:
             case 11:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 5:
             case 12:
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i.java
index 5ace75677c..547329d2f1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.k;
 import d0.e0.p.d.m0.g.b;
 import d0.e0.p.d.m0.g.c;
@@ -29,7 +30,7 @@ public final class i {
     static {
         c cVar = k.a.r;
         b bVar = k.a.N;
-        Map<b, e> mapOf = h0.mapOf(o.to(j.access$childSafe(cVar, "name"), e.identifier("name")), o.to(j.access$childSafe(cVar, "ordinal"), e.identifier("ordinal")), o.to(j.access$child(k.a.J, "size"), e.identifier("size")), o.to(j.access$child(bVar, "size"), e.identifier("size")), o.to(j.access$childSafe(k.a.f, "length"), e.identifier("length")), o.to(j.access$child(bVar, "keys"), e.identifier("keySet")), o.to(j.access$child(bVar, "values"), e.identifier("values")), o.to(j.access$child(bVar, "entries"), e.identifier("entrySet")));
+        Map<b, e> mapOf = h0.mapOf(o.to(j.access$childSafe(cVar, ModelAuditLogEntry.CHANGE_KEY_NAME), e.identifier(ModelAuditLogEntry.CHANGE_KEY_NAME)), o.to(j.access$childSafe(cVar, "ordinal"), e.identifier("ordinal")), o.to(j.access$child(k.a.J, "size"), e.identifier("size")), o.to(j.access$child(bVar, "size"), e.identifier("size")), o.to(j.access$childSafe(k.a.f, "length"), e.identifier("length")), o.to(j.access$child(bVar, "keys"), e.identifier("keySet")), o.to(j.access$child(bVar, "values"), e.identifier("values")), o.to(j.access$child(bVar, "entries"), e.identifier("entrySet")));
         b = mapOf;
         Set<Map.Entry<b, e>> entrySet = mapOf.entrySet();
         ArrayList<Pair> arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(entrySet, 10));
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java
index f0264e34af..7a81489a9d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.d0.f;
 import d0.e0.p.d.m0.e.a.k0.g;
 import d0.e0.p.d.m0.e.a.k0.n;
@@ -105,20 +106,20 @@ public class a implements b {
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.b
     public n findFieldByName(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return this.e.get(eVar);
     }
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.b
     public Collection<r> findMethodsByName(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         List<r> list = this.d.get(eVar);
         return list == null ? d0.t.n.emptyList() : list;
     }
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.b
     public w findRecordComponentByName(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return this.f.get(eVar);
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/b.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/b.java
index ffbfa34212..46b843700d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.e.a.k0.n;
 import d0.e0.p.d.m0.e.a.k0.r;
 import d0.e0.p.d.m0.e.a.k0.w;
@@ -18,19 +19,19 @@ public interface b {
 
         @Override // d0.e0.p.d.m0.e.a.i0.l.b
         public n findFieldByName(e eVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return null;
         }
 
         @Override // d0.e0.p.d.m0.e.a.i0.l.b
         public List<r> findMethodsByName(e eVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return d0.t.n.emptyList();
         }
 
         @Override // d0.e0.p.d.m0.e.a.i0.l.b
         public w findRecordComponentByName(e eVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return null;
         }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java
index 8fff7819f4..07c212419a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.t0;
 import d0.e0.p.d.m0.d.b.b;
@@ -97,7 +98,7 @@ public final class d implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         recordLookup(eVar, bVar);
         d0.e0.p.d.m0.c.e contributedClassifier = this.e.getContributedClassifier(eVar, bVar);
@@ -143,7 +144,7 @@ public final class d implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         recordLookup(eVar, bVar);
         j jVar = this.e;
@@ -162,7 +163,7 @@ public final class d implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<d0.e0.p.d.m0.c.n0> getContributedVariables(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         recordLookup(eVar, bVar);
         j jVar = this.e;
@@ -206,7 +207,7 @@ public final class d implements i {
     }
 
     public void recordLookup(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         d0.e0.p.d.m0.d.a.record(this.f2565c.getComponents().getLookupTracker(), bVar, this.d, eVar);
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java
index 5329bb3a7f..8876e2d01b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.i1.e0;
 import d0.e0.p.d.m0.c.i1.l0;
@@ -299,7 +300,7 @@ public final class h extends k {
         }
 
         public final d0.e0.p.d.m0.c.i1.h invoke(d0.e0.p.d.m0.g.e eVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             if (!h.access$getNestedClassIndex$p(this.this$0).mo1invoke().contains(eVar)) {
                 n nVar = (n) h.access$getEnumEntryIndex$p(this.this$0).mo1invoke().get(eVar);
                 if (nVar == null) {
@@ -629,7 +630,7 @@ public final class h extends k {
             }
             d0.e0.p.d.m0.e.a.g gVar = d0.e0.p.d.m0.e.a.g.m;
             d0.e0.p.d.m0.g.e name2 = t0Var.getName();
-            m.checkNotNullExpressionValue(name2, "name");
+            m.checkNotNullExpressionValue(name2, ModelAuditLogEntry.CHANGE_KEY_NAME);
             List<d0.e0.p.d.m0.g.e> builtinFunctionNamesByJvmName = gVar.getBuiltinFunctionNamesByJvmName(name2);
             if (!(builtinFunctionNamesByJvmName instanceof Collection) || !builtinFunctionNamesByJvmName.isEmpty()) {
                 Iterator<T> it3 = builtinFunctionNamesByJvmName.iterator();
@@ -679,10 +680,10 @@ public final class h extends k {
             if (!z3) {
                 d0.e0.p.d.m0.e.a.h hVar = d0.e0.p.d.m0.e.a.h.m;
                 d0.e0.p.d.m0.g.e name3 = t0Var.getName();
-                m.checkNotNullExpressionValue(name3, "name");
+                m.checkNotNullExpressionValue(name3, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 if (hVar.getSameAsBuiltinMethodWithErasedValueParameters(name3)) {
                     d0.e0.p.d.m0.g.e name4 = t0Var.getName();
-                    m.checkNotNullExpressionValue(name4, "name");
+                    m.checkNotNullExpressionValue(name4, ModelAuditLogEntry.CHANGE_KEY_NAME);
                     Set<t0> C2 = C(name4);
                     ArrayList arrayList2 = new ArrayList();
                     for (t0 t0Var2 : C2) {
@@ -711,7 +712,7 @@ public final class h extends k {
                     t0 u = u(t0Var);
                     if (u != null) {
                         d0.e0.p.d.m0.g.e name5 = t0Var.getName();
-                        m.checkNotNullExpressionValue(name5, "name");
+                        m.checkNotNullExpressionValue(name5, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         Set<t0> C3 = C(name5);
                         if (!C3.isEmpty()) {
                             Iterator<T> it6 = C3.iterator();
@@ -774,7 +775,7 @@ public final class h extends k {
     public void c(Collection<t0> collection, d0.e0.p.d.m0.g.e eVar) {
         boolean z2;
         m.checkNotNullParameter(collection, "result");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (this.o.isRecord() && this.f.mo1invoke().findRecordComponentByName(eVar) != null) {
             if (!collection.isEmpty()) {
                 Iterator it = collection.iterator();
@@ -812,7 +813,7 @@ public final class h extends k {
     public void f(Collection<t0> collection, d0.e0.p.d.m0.g.e eVar) {
         boolean z2;
         m.checkNotNullParameter(collection, "result");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         Set<t0> C = C(eVar);
         if (!d0.e0.p.d.m0.e.a.g.m.getSameAsRenamedInJvmBuiltin(eVar) && !d0.e0.p.d.m0.e.a.h.m.getSameAsBuiltinMethodWithErasedValueParameters(eVar)) {
             if (!C.isEmpty()) {
@@ -857,7 +858,7 @@ public final class h extends k {
     @Override // d0.e0.p.d.m0.e.a.i0.l.k
     public void g(d0.e0.p.d.m0.g.e eVar, Collection<n0> collection) {
         r rVar;
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(collection, "result");
         if (this.o.isAnnotationType() && (rVar = (r) d0.t.u.singleOrNull(this.f.mo1invoke().findMethodsByName(eVar))) != null) {
             d0.e0.p.d.m0.e.a.h0.g create = d0.e0.p.d.m0.e.a.h0.g.create(this.n, d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(this.f2574c, rVar), d0.e0.p.d.m0.c.z.FINAL, f0.toDescriptorVisibility(rVar.getVisibility()), false, rVar.getName(), this.f2574c.getComponents().getSourceElementFactory().source(rVar), false);
@@ -890,7 +891,7 @@ public final class h extends k {
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
     public d0.e0.p.d.m0.c.h getContributedClassifier(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
         d0.e0.p.d.m0.m.i<d0.e0.p.d.m0.g.e, d0.e0.p.d.m0.c.i1.h> iVar;
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         recordLookup(eVar, bVar);
         h hVar = (h) this.d;
@@ -903,7 +904,7 @@ public final class h extends k {
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.k, d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         recordLookup(eVar, bVar);
         return super.getContributedFunctions(eVar, bVar);
@@ -911,7 +912,7 @@ public final class h extends k {
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.k, d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         recordLookup(eVar, bVar);
         return super.getContributedVariables(eVar, bVar);
@@ -1182,7 +1183,7 @@ public final class h extends k {
     }
 
     public void recordLookup(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         d0.e0.p.d.m0.d.a.record(this.f2574c.getComponents().getLookupTracker(), bVar, this.n, eVar);
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java
index 75f0287c17..b5c59a2978 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.e;
 import d0.e0.p.d.m0.c.t0;
 import d0.e0.p.d.m0.e.a.i0.l.b;
@@ -39,7 +40,7 @@ public final class j extends r {
         public final g b;
 
         public a(d0.e0.p.d.m0.g.e eVar, g gVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.a = eVar;
             this.b = gVar;
         }
@@ -251,7 +252,7 @@ public final class j extends r {
     @Override // d0.e0.p.d.m0.e.a.i0.l.k
     public void f(Collection<t0> collection, d0.e0.p.d.m0.g.e eVar) {
         m.checkNotNullParameter(collection, "result");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
     }
 
     public final e findClassifierByJavaClass$descriptors_jvm(g gVar) {
@@ -261,7 +262,7 @@ public final class j extends r {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
     public e getContributedClassifier(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return o(eVar, null);
     }
@@ -299,7 +300,7 @@ public final class j extends r {
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.k, d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<d0.e0.p.d.m0.c.n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return d0.t.n.emptyList();
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java
index 78fc78e6ac..909d5b5565 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.i1.l0;
 import d0.e0.p.d.m0.c.m;
@@ -248,7 +249,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
         }
 
         public final n0 invoke(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             k kVar = this.this$0;
             k kVar2 = kVar.d;
             if (kVar2 != null) {
@@ -273,7 +274,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
         }
 
         public final Collection<t0> invoke(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             k kVar = this.this$0.d;
             if (kVar != null) {
                 return (Collection) ((f.m) k.access$getDeclaredFunctions$p(kVar)).invoke(eVar);
@@ -337,7 +338,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
         }
 
         public final Collection<t0> invoke(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             LinkedHashSet linkedHashSet = new LinkedHashSet((Collection) ((f.m) k.access$getDeclaredFunctions$p(this.this$0)).invoke(eVar));
             k.access$retainMostSpecificMethods(this.this$0, linkedHashSet);
             this.this$0.f(linkedHashSet, eVar);
@@ -356,7 +357,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
         }
 
         public final List<n0> invoke(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             ArrayList arrayList = new ArrayList();
             d0.e0.p.d.m0.p.a.addIfNotNull(arrayList, k.access$getDeclaredField$p(this.this$0).invoke(eVar));
             this.this$0.g(eVar, arrayList);
@@ -465,7 +466,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
 
     public void c(Collection<t0> collection, d0.e0.p.d.m0.g.e eVar) {
         d0.z.d.m.checkNotNullParameter(collection, "result");
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
     }
 
     public abstract b d();
@@ -494,14 +495,14 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         return !getFunctionNames().contains(eVar) ? d0.t.n.emptyList() : (Collection) ((f.m) this.i).invoke(eVar);
     }
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         return !getVariableNames().contains(eVar) ? d0.t.n.emptyList() : (Collection) ((f.m) this.m).invoke(eVar);
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java
index 61cc111303..18af28436c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.m0.c.t0;
@@ -95,7 +96,7 @@ public final class o extends r {
     @Override // d0.e0.p.d.m0.e.a.i0.l.k
     public void f(Collection<t0> collection, e eVar) {
         m.checkNotNullParameter(collection, "result");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         o parentJavaStaticClassScope = k.getParentJavaStaticClassScope(this.o);
         Collection<? extends t0> resolveOverridesForStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForStaticMembers(eVar, parentJavaStaticClassScope == null ? d0.t.n0.emptySet() : u.toSet(parentJavaStaticClassScope.getContributedFunctions(eVar, d.WHEN_GET_SUPER_MEMBERS)), collection, this.o, this.f2574c.getComponents().getErrorReporter(), this.f2574c.getComponents().getKotlinTypeChecker().getOverridingUtil());
         m.checkNotNullExpressionValue(resolveOverridesForStaticMembers, "resolveOverridesForStaticMembers(\n            name,\n            functionsFromSupertypes,\n            result,\n            ownerDescriptor,\n            c.components.errorReporter,\n            c.components.kotlinTypeChecker.overridingUtil\n        )");
@@ -116,7 +117,7 @@ public final class o extends r {
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.r, d0.e0.p.d.m0.e.a.i0.l.k
     public void g(e eVar, Collection<n0> collection) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(collection, "result");
         f fVar = this.o;
         LinkedHashSet linkedHashSet = new LinkedHashSet();
@@ -148,7 +149,7 @@ public final class o extends r {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return null;
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/r.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/r.java
index 309907d819..da1a2e7665 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/r.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/r.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.i0.l;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.m0.c.q0;
@@ -22,7 +23,7 @@ public abstract class r extends k {
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.k
     public void g(e eVar, Collection<n0> collection) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(collection, "result");
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java
index 2358885c9b..368a733518 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.e.a.l0;
 
+import androidx.exifinterface.media.ExifInterface;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.d0.f;
 import d0.e0.p.d.m0.e.b.w;
 import d0.e0.p.d.m0.k.y.d;
@@ -32,7 +34,7 @@ public final class q {
             public final List<Pair<String, w>> b = new ArrayList();
 
             /* renamed from: c  reason: collision with root package name */
-            public Pair<String, w> f2586c = o.to("V", null);
+            public Pair<String, w> f2586c = o.to(ExifInterface.GPS_MEASUREMENT_INTERRUPTED, null);
             public final /* synthetic */ a d;
 
             public C0230a(a aVar, String str) {
@@ -112,7 +114,7 @@ public final class q {
         }
 
         public final void function(String str, Function1<? super C0230a, Unit> function1) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(function1, "block");
             Map access$getSignatures$p = q.access$getSignatures$p(this.b);
             C0230a aVar = new C0230a(this, str);
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/v.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/v.java
index 0446d1a562..eeb4062ec1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/v.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/v.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a.l0;
 
+import com.adjust.sdk.Constants;
 import d0.e0.p.d.m0.e.a.a0;
 import d0.e0.p.d.m0.g.b;
 import d0.e0.p.d.m0.n.d1;
@@ -31,8 +32,8 @@ public final class v {
     public static final <T> T select(Set<? extends T> set, T t, T t2, T t3, boolean z2) {
         Set<? extends T> set2;
         m.checkNotNullParameter(set, "<this>");
-        m.checkNotNullParameter(t, "low");
-        m.checkNotNullParameter(t2, "high");
+        m.checkNotNullParameter(t, Constants.LOW);
+        m.checkNotNullParameter(t2, Constants.HIGH);
         if (z2) {
             T t4 = set.contains(t) ? t : set.contains(t2) ? t2 : null;
             if (!m.areEqual(t4, t) || !m.areEqual(t3, t2)) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/z.java b/app/src/main/java/d0/e0/p/d/m0/e/a/z.java
index a59f502f57..aebb5addde 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/z.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.g.a;
 import d0.e0.p.d.m0.g.b;
 import d0.g0.t;
@@ -19,12 +20,12 @@ public final class z {
     }
 
     public static final boolean isGetterName(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return t.startsWith$default(str, "get", false, 2, null) || t.startsWith$default(str, "is", false, 2, null);
     }
 
     public static final boolean isSetterName(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return t.startsWith$default(str, "set", false, 2, null);
     }
 
@@ -41,7 +42,7 @@ public final class z {
     }
 
     public static final boolean startsWithIsPrefix(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (!t.startsWith$default(str, "is", false, 2, null) || str.length() == 2) {
             return false;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/a.java b/app/src/main/java/d0/e0/p/d/m0/e/b/a.java
index 15397321ee..5c7bba5cf0 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.m0.c.u0;
 import d0.e0.p.d.m0.e.b.p;
 import d0.e0.p.d.m0.e.b.s;
@@ -246,7 +247,7 @@ public abstract class a<A, C> implements d0.e0.p.d.m0.l.b.c<A, C> {
                         n nVar2 = this.a;
                         String internalName = facadeClassName.getInternalName();
                         m.checkNotNullExpressionValue(internalName, "facadeClassName.internalName");
-                        d0.e0.p.d.m0.g.a aVar2 = d0.e0.p.d.m0.g.a.topLevel(new d0.e0.p.d.m0.g.b(t.replace$default(internalName, '/', '.', false, 4, (Object) null)));
+                        d0.e0.p.d.m0.g.a aVar2 = d0.e0.p.d.m0.g.a.topLevel(new d0.e0.p.d.m0.g.b(t.replace$default(internalName, (char) MentionUtilsKt.SLASH_CHAR, '.', false, 4, (Object) null)));
                         m.checkNotNullExpressionValue(aVar2, "topLevel(FqName(facadeClassName.internalName.replace('/', '.')))");
                         return o.findKotlinClass(nVar2, aVar2);
                     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/b.java b/app/src/main/java/d0/e0/p/d/m0/e/b/b.java
index 65718e1350..8d45459e07 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/b.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.e.b;
 
+import androidx.exifinterface.media.ExifInterface;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.u0;
 import d0.e0.p.d.m0.e.b.p;
 import d0.e0.p.d.m0.e.b.s;
@@ -85,7 +87,7 @@ public final class b implements p.d {
 
     @Override // d0.e0.p.d.m0.e.b.p.d
     public p.c visitField(e eVar, String str, Object obj) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str, "desc");
         s.a aVar = s.a;
         String asString = eVar.asString();
@@ -108,7 +110,7 @@ public final class b implements p.d {
                                 }
                                 obj = Boolean.valueOf(z2);
                             }
-                        } else if (str.equals("S")) {
+                        } else if (str.equals(ExifInterface.LATITUDE_SOUTH)) {
                             obj = Short.valueOf((short) intValue);
                         }
                     } else if (str.equals("C")) {
@@ -129,7 +131,7 @@ public final class b implements p.d {
 
     @Override // d0.e0.p.d.m0.e.b.p.d
     public p.e visitMethod(e eVar, String str) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str, "desc");
         s.a aVar = s.a;
         String asString = eVar.asString();
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java b/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java
index 949ea3b4e4..ed6d06ef16 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b.b0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.u0;
 import d0.e0.p.d.m0.e.a.a0;
 import d0.e0.p.d.m0.e.b.b0.a;
@@ -97,7 +98,7 @@ public class b implements p.c {
             } else if (i == 4) {
                 objArr[0] = "enumClassId";
             } else if (i != 5) {
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
             } else {
                 objArr[0] = "enumEntryName";
             }
@@ -225,7 +226,7 @@ public class b implements p.c {
             } else if (i == 4) {
                 objArr[0] = "enumClassId";
             } else if (i != 5) {
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
             } else {
                 objArr[0] = "enumEntryName";
             }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/c.java b/app/src/main/java/d0/e0/p/d/m0/e/b/c.java
index 3a5979d6fa..56f70bff5c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/c.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c0;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.d0;
@@ -64,20 +65,20 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
             @Override // d0.e0.p.d.m0.e.b.p.a
             public p.a visitAnnotation(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.g.a aVar) {
-                m.checkNotNullParameter(eVar, "name");
+                m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(aVar, "classId");
                 return this.a.visitAnnotation(eVar, aVar);
             }
 
             @Override // d0.e0.p.d.m0.e.b.p.a
             public p.b visitArray(d0.e0.p.d.m0.g.e eVar) {
-                m.checkNotNullParameter(eVar, "name");
+                m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 return this.a.visitArray(eVar);
             }
 
             @Override // d0.e0.p.d.m0.e.b.p.a
             public void visitClassLiteral(d0.e0.p.d.m0.g.e eVar, f fVar) {
-                m.checkNotNullParameter(eVar, "name");
+                m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(fVar, "value");
                 this.a.visitClassLiteral(eVar, fVar);
             }
@@ -90,7 +91,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
             @Override // d0.e0.p.d.m0.e.b.p.a
             public void visitEnum(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.g.a aVar, d0.e0.p.d.m0.g.e eVar2) {
-                m.checkNotNullParameter(eVar, "name");
+                m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkNotNullParameter(aVar, "enumClassId");
                 m.checkNotNullParameter(eVar2, "enumEntryName");
                 this.a.visitEnum(eVar, aVar, eVar2);
@@ -174,7 +175,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
         @Override // d0.e0.p.d.m0.e.b.p.a
         public p.a visitAnnotation(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.g.a aVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(aVar, "classId");
             ArrayList arrayList = new ArrayList();
             c cVar = this.f2597c;
@@ -187,13 +188,13 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
         @Override // d0.e0.p.d.m0.e.b.p.a
         public p.b visitArray(d0.e0.p.d.m0.g.e eVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return new b(this, eVar, this.b);
         }
 
         @Override // d0.e0.p.d.m0.e.b.p.a
         public void visitClassLiteral(d0.e0.p.d.m0.g.e eVar, f fVar) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(fVar, "value");
             this.a.put(eVar, new r(fVar));
         }
@@ -205,7 +206,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
         @Override // d0.e0.p.d.m0.e.b.p.a
         public void visitEnum(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.g.a aVar, d0.e0.p.d.m0.g.e eVar2) {
-            m.checkNotNullParameter(eVar, "name");
+            m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(aVar, "enumClassId");
             m.checkNotNullParameter(eVar2, "enumEntryName");
             this.a.put(eVar, new j(aVar, eVar2));
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/d.java b/app/src/main/java/d0/e0/p/d/m0/e/b/d.java
index 11f15d0e86..63a210bcdb 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/d.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.m0.b.h;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.e;
@@ -44,8 +45,8 @@ public final class d {
             StringBuilder sb = new StringBuilder();
             String asString = fqName.asString();
             m.checkNotNullExpressionValue(asString, "fqName.asString()");
-            sb.append(t.replace$default(asString, '.', '/', false, 4, (Object) null));
-            sb.append('/');
+            sb.append(t.replace$default(asString, '.', (char) MentionUtilsKt.SLASH_CHAR, false, 4, (Object) null));
+            sb.append(MentionUtilsKt.SLASH_CHAR);
             sb.append(identifier);
             return sb.toString();
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/j.java b/app/src/main/java/d0/e0/p/d/m0/e/b/j.java
index 468b42ef77..ed4ee8fe7d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/j.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.m0.c.v0;
 import d0.e0.p.d.m0.f.a0.a;
 import d0.e0.p.d.m0.f.l;
@@ -82,7 +83,7 @@ public final class j implements f {
     public final d0.e0.p.d.m0.g.e getSimpleName() {
         String internalName = this.b.getInternalName();
         m.checkNotNullExpressionValue(internalName, "className.internalName");
-        d0.e0.p.d.m0.g.e identifier = d0.e0.p.d.m0.g.e.identifier(w.substringAfterLast$default(internalName, '/', null, 2, null));
+        d0.e0.p.d.m0.g.e identifier = d0.e0.p.d.m0.g.e.identifier(w.substringAfterLast$default(internalName, MentionUtilsKt.SLASH_CHAR, null, 2, null));
         m.checkNotNullExpressionValue(identifier, "identifier(className.internalName.substringAfterLast('/'))");
         return identifier;
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/m.java b/app/src/main/java/d0/e0/p/d/m0/e/b/m.java
index c98334fd0e..a9eeecdb86 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/m.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/m.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b;
 
+import androidx.exifinterface.media.ExifInterface;
 import c.d.b.a.a;
 import d0.e0.p.d.m0.b.i;
 import d0.e0.p.d.m0.e.b.k;
@@ -111,7 +112,7 @@ public final class m implements l<k> {
         }
         if (kVar instanceof k.d) {
             d jvmPrimitiveType = ((k.d) kVar).getJvmPrimitiveType();
-            return (jvmPrimitiveType == null || (desc = jvmPrimitiveType.getDesc()) == null) ? "V" : desc;
+            return (jvmPrimitiveType == null || (desc = jvmPrimitiveType.getDesc()) == null) ? ExifInterface.GPS_MEASUREMENT_INTERRUPTED : desc;
         } else if (kVar instanceof k.c) {
             StringBuilder H = a.H('L');
             H.append(((k.c) kVar).getInternalName());
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/s.java b/app/src/main/java/d0/e0/p/d/m0/e/b/s.java
index 8c8426417b..ed790581af 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/s.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/s.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.e.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.m0.f.a0.a;
 import d0.e0.p.d.m0.f.a0.b.e;
 import d0.e0.p.d.m0.f.z.c;
@@ -17,9 +19,9 @@ public final class s {
         }
 
         public final s fromFieldNameAndDesc(String str, String str2) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(str2, "desc");
-            return new s(str + '#' + str2, null);
+            return new s(str + MentionUtilsKt.CHANNELS_CHAR + str2, null);
         }
 
         public final s fromJvmMemberSignature(e eVar) {
@@ -40,14 +42,14 @@ public final class s {
         }
 
         public final s fromMethodNameAndDesc(String str, String str2) {
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(str2, "desc");
             return new s(m.stringPlus(str, str2), null);
         }
 
         public final s fromMethodSignatureAndParameterIndex(s sVar, int i) {
             m.checkNotNullParameter(sVar, "signature");
-            return new s(sVar.getSignature() + '@' + i, null);
+            return new s(sVar.getSignature() + MentionUtilsKt.MENTIONS_CHAR + i, null);
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/u.java b/app/src/main/java/d0/e0/p/d/m0/e/b/u.java
index 34105b52a4..eb67e19b38 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/u.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/u.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b;
 
+import androidx.exifinterface.media.ExifInterface;
 import d0.e0.p.d.m0.b.k;
 import d0.e0.p.d.m0.b.q.c;
 import d0.e0.p.d.m0.c.a;
@@ -51,7 +52,7 @@ public final class u {
         sb.append(")");
         if (z2) {
             if (d.hasVoidReturnType(xVar)) {
-                sb.append("V");
+                sb.append(ExifInterface.GPS_MEASUREMENT_INTERRUPTED);
             } else {
                 c0 returnType = xVar.getReturnType();
                 m.checkNotNull(returnType);
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/w.java b/app/src/main/java/d0/e0/p/d/m0/e/b/w.java
index 90980ea855..9640cb7d3d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/w.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/w.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.e.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.u;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -62,7 +63,7 @@ public final class w {
     }
 
     public final Set<String> inJavaLang(String str, String... strArr) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(strArr, "signatures");
         String javaLang = javaLang(str);
         String[] strArr2 = new String[strArr.length];
@@ -71,7 +72,7 @@ public final class w {
     }
 
     public final Set<String> inJavaUtil(String str, String... strArr) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(strArr, "signatures");
         String javaUtil = javaUtil(str);
         String[] strArr2 = new String[strArr.length];
@@ -80,22 +81,22 @@ public final class w {
     }
 
     public final String javaFunction(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return m.stringPlus("java/util/function/", str);
     }
 
     public final String javaLang(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return m.stringPlus("java/lang/", str);
     }
 
     public final String javaUtil(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return m.stringPlus("java/util/", str);
     }
 
     public final String jvmDescriptor(String str, List<String> list, String str2) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(list, "parameters");
         m.checkNotNullParameter(str2, "ret");
         return str + '(' + u.joinToString$default(list, "", null, null, 0, null, new a(this), 30, null) + ')' + a(str2);
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/z.java b/app/src/main/java/d0/e0/p/d/m0/e/b/z.java
index 99111ed3a3..fdb7443b1a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/z.java
@@ -1,5 +1,8 @@
 package d0.e0.p.d.m0.e.b;
 
+import androidx.core.app.FrameMetricsAggregator;
+import androidx.core.view.PointerIconCompat;
+import androidx.media.AudioAttributesCompat;
 import d0.e0.p.d.m0.n.j1;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -29,11 +32,11 @@ public final class z {
 
     static {
         new a(null);
-        z zVar = new z(false, false, false, false, false, null, false, null, null, false, 1023, null);
+        z zVar = new z(false, false, false, false, false, null, false, null, null, false, AudioAttributesCompat.FLAG_ALL, null);
         a = zVar;
-        z zVar2 = new z(false, false, false, false, false, null, false, null, null, true, 511, null);
+        z zVar2 = new z(false, false, false, false, false, null, false, null, null, true, FrameMetricsAggregator.EVERY_DURATION, null);
         b = zVar2;
-        new z(false, true, false, false, false, null, false, null, null, false, 1021, null);
+        new z(false, true, false, false, false, null, false, null, null, false, PointerIconCompat.TYPE_GRABBING, null);
         f2603c = new z(false, false, false, false, false, zVar, false, null, null, false, 988, null);
         new z(false, false, false, false, false, zVar2, false, null, null, true, 476, null);
         new z(false, true, false, false, false, zVar, false, null, null, false, 988, null);
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java
index 3af3000351..dd0ec7d003 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java
@@ -1,6 +1,8 @@
 package d0.e0.p.d.m0.f.a0.b;
 
+import androidx.exifinterface.media.ExifInterface;
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.t;
 import d0.t.n;
 import d0.t.u;
@@ -20,7 +22,7 @@ public final class b {
     static {
         int i = 0;
         LinkedHashMap linkedHashMap = new LinkedHashMap();
-        List listOf = n.listOf((Object[]) new String[]{"Boolean", "Z", "Char", "C", "Byte", "B", "Short", "S", "Int", "I", "Float", "F", "Long", "J", "Double", "D"});
+        List listOf = n.listOf((Object[]) new String[]{"Boolean", "Z", "Char", "C", "Byte", "B", "Short", ExifInterface.LATITUDE_SOUTH, "Int", "I", "Float", "F", "Long", "J", "Double", "D"});
         int progressionLastElement = c.getProgressionLastElement(0, listOf.size() - 1, 2);
         if (progressionLastElement >= 0) {
             int i2 = 0;
@@ -29,13 +31,13 @@ public final class b {
                 StringBuilder sb = new StringBuilder();
                 String str = b;
                 sb.append(str);
-                sb.append('/');
+                sb.append(MentionUtilsKt.SLASH_CHAR);
                 sb.append((String) listOf.get(i2));
                 int i4 = i2 + 1;
                 linkedHashMap.put(sb.toString(), listOf.get(i4));
                 StringBuilder sb2 = new StringBuilder();
                 sb2.append(str);
-                sb2.append('/');
+                sb2.append(MentionUtilsKt.SLASH_CHAR);
                 linkedHashMap.put(a.C(sb2, (String) listOf.get(i2), "Array"), m.stringPlus("[", listOf.get(i4)));
                 if (i2 == progressionLastElement) {
                     break;
@@ -43,7 +45,7 @@ public final class b {
                 i2 = i3;
             }
         }
-        linkedHashMap.put(m.stringPlus(b, "/Unit"), "V");
+        linkedHashMap.put(m.stringPlus(b, "/Unit"), ExifInterface.GPS_MEASUREMENT_INTERRUPTED);
         a(linkedHashMap, "Any", "java/lang/Object");
         a(linkedHashMap, "Nothing", "java/lang/Void");
         a(linkedHashMap, "Annotation", "java/lang/annotation/Annotation");
@@ -80,7 +82,7 @@ public final class b {
     }
 
     public static final void a(Map<String, String> map, String str, String str2) {
-        map.put(b + '/' + str, 'L' + str2 + ';');
+        map.put(b + MentionUtilsKt.SLASH_CHAR + str, 'L' + str2 + ';');
     }
 
     public static final String mapClass(String str) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/e.java b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/e.java
index 04d826c222..cfa31cd749 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/e.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.f.a0.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: JvmMemberSignature.kt */
@@ -13,7 +15,7 @@ public abstract class e {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public a(String str, String str2) {
             super(null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(str2, "desc");
             this.a = str;
             this.b = str2;
@@ -21,7 +23,7 @@ public abstract class e {
 
         @Override // d0.e0.p.d.m0.f.a0.b.e
         public String asString() {
-            return getName() + ':' + getDesc();
+            return getName() + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + getDesc();
         }
 
         public final String component1() {
@@ -66,7 +68,7 @@ public abstract class e {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public b(String str, String str2) {
             super(null);
-            m.checkNotNullParameter(str, "name");
+            m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkNotNullParameter(str2, "desc");
             this.a = str;
             this.b = str2;
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/b.java b/app/src/main/java/d0/e0/p/d/m0/f/b.java
index cfc1d6e404..388c27f4df 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.f;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import d0.e0.p.d.m0.i.c;
 import d0.e0.p.d.m0.i.d;
 import d0.e0.p.d.m0.i.e;
@@ -845,7 +846,7 @@ public final class b extends g implements o {
                 this.type_ = EnumC0249c.BYTE;
                 this.intValue_ = 0;
                 this.floatValue_ = 0.0f;
-                this.doubleValue_ = 0.0d;
+                this.doubleValue_ = ShadowDrawableWrapper.COS_45;
                 this.stringValue_ = 0;
                 this.classId_ = 0;
                 this.enumValueId_ = 0;
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/y/b.java b/app/src/main/java/d0/e0/p/d/m0/f/y/b.java
index 38fffe6bd9..f4ca181df1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/y/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/y/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.f.y;
 
+import com.discord.utilities.font.FontUtils;
 import d0.e0.p.d.m0.f.b;
 import d0.e0.p.d.m0.f.c;
 import d0.e0.p.d.m0.f.d;
@@ -34,17 +35,17 @@ public final class b {
         c defaultInstance = c.getDefaultInstance();
         d0.e0.p.d.m0.f.b defaultInstance2 = d0.e0.p.d.m0.f.b.getDefaultInstance();
         w.b bVar = w.b.MESSAGE;
-        b = g.newRepeatedGeneratedExtension(defaultInstance, defaultInstance2, null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
-        f2623c = g.newRepeatedGeneratedExtension(d.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
-        d = g.newRepeatedGeneratedExtension(i.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
-        e = g.newRepeatedGeneratedExtension(n.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
+        b = g.newRepeatedGeneratedExtension(defaultInstance, defaultInstance2, null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
+        f2623c = g.newRepeatedGeneratedExtension(d.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
+        d = g.newRepeatedGeneratedExtension(i.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
+        e = g.newRepeatedGeneratedExtension(n.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
         f = g.newRepeatedGeneratedExtension(n.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 152, bVar, false, d0.e0.p.d.m0.f.b.class);
         g = g.newRepeatedGeneratedExtension(n.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 153, bVar, false, d0.e0.p.d.m0.f.b.class);
         h = g.newSingularGeneratedExtension(n.getDefaultInstance(), b.C0246b.c.getDefaultInstance(), b.C0246b.c.getDefaultInstance(), null, 151, bVar, b.C0246b.c.class);
-        i = g.newRepeatedGeneratedExtension(d0.e0.p.d.m0.f.g.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
-        j = g.newRepeatedGeneratedExtension(u.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
-        k = g.newRepeatedGeneratedExtension(q.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
-        l = g.newRepeatedGeneratedExtension(s.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
+        i = g.newRepeatedGeneratedExtension(d0.e0.p.d.m0.f.g.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
+        j = g.newRepeatedGeneratedExtension(u.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
+        k = g.newRepeatedGeneratedExtension(q.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
+        l = g.newRepeatedGeneratedExtension(s.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, FontUtils.MAX_FONT_SCALING, bVar, false, d0.e0.p.d.m0.f.b.class);
     }
 
     public static void registerAllExtensions(e eVar) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/z/a.java b/app/src/main/java/d0/e0/p/d/m0/f/z/a.java
index 0d51bceb30..99f588c9d4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/z/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/z/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.f.z;
 
+import androidx.core.os.EnvironmentCompat;
 import d0.t.j;
 import d0.t.k;
 import d0.t.n;
@@ -130,6 +131,6 @@ public abstract class a {
             }
             arrayList.add(Integer.valueOf(i2));
         }
-        return arrayList.isEmpty() ? "unknown" : u.joinToString$default(arrayList, ".", null, null, 0, null, null, 62, null);
+        return arrayList.isEmpty() ? EnvironmentCompat.MEDIA_UNKNOWN : u.joinToString$default(arrayList, ".", null, null, 0, null, null, 62, null);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/z/d.java b/app/src/main/java/d0/e0/p/d/m0/f/z/d.java
index 73c1fe4fb1..61aef9b620 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/z/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/z/d.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.f.z;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.e0.p.d.m0.f.o;
 import d0.e0.p.d.m0.f.p;
 import d0.t.u;
@@ -50,7 +52,7 @@ public final class d implements c {
         if (component1.isEmpty()) {
             return joinToString$default;
         }
-        return u.joinToString$default(component1, "/", null, null, 0, null, null, 62, null) + '/' + joinToString$default;
+        return u.joinToString$default(component1, AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, null, null, 0, null, null, 62, null) + MentionUtilsKt.SLASH_CHAR + joinToString$default;
     }
 
     @Override // d0.e0.p.d.m0.f.z.c
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/z/h.java b/app/src/main/java/d0/e0/p/d/m0/f/z/h.java
index ea1a77a970..6857d548e6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/z/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/z/h.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.f.z;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.f.c;
 import d0.e0.p.d.m0.f.d;
 import d0.e0.p.d.m0.f.i;
@@ -78,7 +79,7 @@ public final class h {
             }
             ArrayList R = c.d.b.a.a.R(list, "ids");
             for (Integer num : list) {
-                m.checkNotNullExpressionValue(num, "id");
+                m.checkNotNullExpressionValue(num, ModelAuditLogEntry.CHANGE_KEY_ID);
                 h create = create(num.intValue(), cVar, iVar);
                 if (create != null) {
                     R.add(create);
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/a.java b/app/src/main/java/d0/e0/p/d/m0/g/a.java
index 4b87e12bcc..64f2578bf1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/a.java
@@ -1,5 +1,8 @@
 package d0.e0.p.d.m0.g;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.g0.w;
 /* compiled from: ClassId */
 public final class a {
@@ -59,7 +62,7 @@ public final class a {
                 objArr[0] = "kotlin/reflect/jvm/internal/impl/name/ClassId";
                 break;
             case 8:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 10:
                 objArr[0] = "segment";
@@ -130,7 +133,7 @@ public final class a {
 
     public static a fromString(String str, boolean z2) {
         if (str != null) {
-            return new a(new b(w.substringBeforeLast(str, '/', "").replace('/', '.')), new b(w.substringAfterLast(str, '/', str)), z2);
+            return new a(new b(w.substringBeforeLast(str, (char) MentionUtilsKt.SLASH_CHAR, "").replace(MentionUtilsKt.SLASH_CHAR, '.')), new b(w.substringAfterLast(str, MentionUtilsKt.SLASH_CHAR, str)), z2);
         }
         a(12);
         throw null;
@@ -165,7 +168,7 @@ public final class a {
             a(13);
             throw null;
         }
-        String str = this.a.asString().replace('.', '/') + "/" + this.b.asString();
+        String str = this.a.asString().replace('.', MentionUtilsKt.SLASH_CHAR) + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + this.b.asString();
         if (str != null) {
             return str;
         }
@@ -244,7 +247,7 @@ public final class a {
         if (!this.a.isRoot()) {
             return asString();
         }
-        StringBuilder K = c.d.b.a.a.K("/");
+        StringBuilder K = c.d.b.a.a.K(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         K.append(asString());
         return K.toString();
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/b.java b/app/src/main/java/d0/e0/p/d/m0/g/b.java
index 6d6d46f799..ed83f25553 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.g;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import java.util.List;
 /* compiled from: FqName */
 public final class b {
@@ -87,7 +88,7 @@ public final class b {
                 objArr[0] = "kotlin/reflect/jvm/internal/impl/name/FqName";
                 break;
             case 8:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             case 12:
                 objArr[0] = "segment";
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/c.java b/app/src/main/java/d0/e0/p/d/m0/g/c.java
index 0497edc975..2926c181f5 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/c.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.g;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.k;
 import java.util.Collections;
 import java.util.List;
@@ -116,7 +117,7 @@ public final class c {
                     objArr[0] = "kotlin/reflect/jvm/internal/impl/name/FqNameUnsafe";
                     break;
                 case 9:
-                    objArr[0] = "name";
+                    objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                     break;
                 case 15:
                     objArr[0] = "segment";
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/e.java b/app/src/main/java/d0/e0/p/d/m0/g/e.java
index 7a320e9555..6c09e59abc 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/e.java
@@ -1,6 +1,7 @@
 package d0.e0.p.d.m0.g;
 
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 /* compiled from: Name */
 public final class e implements Comparable<e> {
     public final String i;
@@ -22,7 +23,7 @@ public final class e implements Comparable<e> {
         if (i == 1 || i == 2) {
             objArr[0] = "kotlin/reflect/jvm/internal/impl/name/Name";
         } else {
-            objArr[0] = "name";
+            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
         }
         if (i == 1) {
             objArr[1] = "asString";
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/f.java b/app/src/main/java/d0/e0/p/d/m0/g/f.java
index d4e8a182c2..d8c6c9dbcb 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/f.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.g;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import kotlin.text.Regex;
 /* compiled from: NameUtils.kt */
@@ -7,7 +8,7 @@ public final class f {
     public static final Regex a = new Regex("[^\\p{L}\\p{Digit}]");
 
     public static final String sanitizeAsJavaIdentifier(String str) {
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return a.replace(str, "_");
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/g.java b/app/src/main/java/d0/e0/p/d/m0/g/g.java
index dd11c82803..a584beca58 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/g.java
@@ -1,4 +1,6 @@
 package d0.e0.p.d.m0.g;
+
+import com.discord.models.domain.ModelAuditLogEntry;
 /* compiled from: SpecialNames */
 public class g {
     public static final e a = e.special("<no name provided>");
@@ -18,7 +20,7 @@ public class g {
         if (i != 1) {
             objArr[0] = "kotlin/reflect/jvm/internal/impl/name/SpecialNames";
         } else {
-            objArr[0] = "name";
+            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
         }
         if (i != 1) {
             objArr[1] = "safeIdentifier";
diff --git a/app/src/main/java/d0/e0/p/d/m0/i/c.java b/app/src/main/java/d0/e0/p/d/m0/i/c.java
index e6e740844a..2aca4b1413 100644
--- a/app/src/main/java/d0/e0/p/d/m0/i/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/i/c.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.i;
 
+import com.adjust.sdk.Constants;
+import com.google.android.material.badge.BadgeDrawable;
 import d0.e0.p.d.m0.i.r;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -138,7 +140,7 @@ public abstract class c implements Iterable<Byte> {
 
     public static c copyFromUtf8(String str) {
         try {
-            return new m(str.getBytes("UTF-8"));
+            return new m(str.getBytes(Constants.ENCODING));
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException("UTF-8 not supported?", e);
         }
@@ -187,7 +189,7 @@ public abstract class c implements Iterable<Byte> {
         StringBuilder sb = new StringBuilder(53);
         sb.append("ByteString would be too long: ");
         sb.append(size);
-        sb.append("+");
+        sb.append(BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX);
         sb.append(size2);
         throw new IllegalArgumentException(sb.toString());
     }
@@ -259,7 +261,7 @@ public abstract class c implements Iterable<Byte> {
 
     public String toStringUtf8() {
         try {
-            return toString("UTF-8");
+            return toString(Constants.ENCODING);
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException("UTF-8 not supported?", e);
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/i/d.java b/app/src/main/java/d0/e0/p/d/m0/i/d.java
index 7727f54582..6553ab8541 100644
--- a/app/src/main/java/d0/e0/p/d/m0/i/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/i/d.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.i;
 
+import com.adjust.sdk.Constants;
 import d0.e0.p.d.m0.i.n;
 import java.io.IOException;
 import java.io.InputStream;
@@ -530,9 +531,9 @@ public final class d {
     public String readString() throws IOException {
         int readRawVarint32 = readRawVarint32();
         if (readRawVarint32 > this.f2638c - this.e || readRawVarint32 <= 0) {
-            return readRawVarint32 == 0 ? "" : new String(a(readRawVarint32), "UTF-8");
+            return readRawVarint32 == 0 ? "" : new String(a(readRawVarint32), Constants.ENCODING);
         }
-        String str = new String(this.a, this.e, readRawVarint32, "UTF-8");
+        String str = new String(this.a, this.e, readRawVarint32, Constants.ENCODING);
         this.e += readRawVarint32;
         return str;
     }
@@ -551,7 +552,7 @@ public final class d {
             i = 0;
         }
         if (v.isValidUtf8(bArr, i, i + readRawVarint32)) {
-            return new String(bArr, i, readRawVarint32, "UTF-8");
+            return new String(bArr, i, readRawVarint32, Constants.ENCODING);
         }
         throw new InvalidProtocolBufferException("Protocol message had invalid UTF-8.");
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/i/h.java b/app/src/main/java/d0/e0/p/d/m0/i/h.java
index d8040cb037..fa07002477 100644
--- a/app/src/main/java/d0/e0/p/d/m0/i/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/i/h.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.i;
 
+import com.adjust.sdk.Constants;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 /* compiled from: Internal */
@@ -28,7 +29,7 @@ public class h {
 
     public static String toStringUtf8(byte[] bArr) {
         try {
-            return new String(bArr, "UTF-8");
+            return new String(bArr, Constants.ENCODING);
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException("UTF-8 not supported?", e);
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/i/w.java b/app/src/main/java/d0/e0/p/d/m0/i/w.java
index c2d09495f3..475f4db94b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/i/w.java
+++ b/app/src/main/java/d0/e0/p/d/m0/i/w.java
@@ -1,4 +1,6 @@
 package d0.e0.p.d.m0.i;
+
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 /* compiled from: WireFormat */
 public final class w {
 
@@ -92,7 +94,7 @@ public final class w {
         INT(0),
         LONG(0L),
         FLOAT(Float.valueOf(0.0f)),
-        DOUBLE(Double.valueOf(0.0d)),
+        DOUBLE(Double.valueOf((double) ShadowDrawableWrapper.COS_45)),
         BOOLEAN(Boolean.FALSE),
         STRING(""),
         BYTE_STRING(c.i),
diff --git a/app/src/main/java/d0/e0/p/d/m0/j/d.java b/app/src/main/java/d0/e0/p/d/m0/j/d.java
index 8341645771..ad88cefeea 100644
--- a/app/src/main/java/d0/e0/p/d/m0/j/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/j/d.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.j;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.m0.b.h;
 import d0.e0.p.d.m0.b.k;
 import d0.e0.p.d.m0.c.a1;
@@ -1502,7 +1504,7 @@ public final class d extends c implements h {
         d0.e0.p.d.m0.c.d unsubstitutedPrimaryConstructor;
         m.checkNotNullParameter(cVar, "annotation");
         StringBuilder sb = new StringBuilder();
-        sb.append('@');
+        sb.append(MentionUtilsKt.MENTIONS_CHAR);
         if (eVar != null) {
             sb.append(m.stringPlus(eVar.getRenderName(), ":"));
         }
@@ -1631,7 +1633,7 @@ public final class d extends c implements h {
 
     @Override // d0.e0.p.d.m0.j.c
     public String renderName(d0.e0.p.d.m0.g.e eVar, boolean z2) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         String c2 = c(q.render(eVar));
         return (!getBoldOnlyForNamesInHtml() || getTextFormat() != p.j || !z2) ? c2 : c.d.b.a.a.t("<b>", c2, "</b>");
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/a.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/a.java
index 1c88e5ae14..4f3bddf453 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.m0.c.t0;
@@ -24,7 +25,7 @@ public abstract class a implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return a().getContributedClassifier(eVar, bVar);
     }
@@ -39,7 +40,7 @@ public abstract class a implements i {
     /* JADX DEBUG: Type inference failed for r2v1. Raw type applied. Possible types: java.util.Collection<? extends d0.e0.p.d.m0.c.t0>, java.util.Collection<d0.e0.p.d.m0.c.t0> */
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return a().getContributedFunctions(eVar, bVar);
     }
@@ -47,7 +48,7 @@ public abstract class a implements i {
     /* JADX DEBUG: Type inference failed for r2v1. Raw type applied. Possible types: java.util.Collection<? extends d0.e0.p.d.m0.c.n0>, java.util.Collection<d0.e0.p.d.m0.c.n0> */
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<n0> getContributedVariables(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return a().getContributedVariables(eVar, bVar);
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java
index 5c7eaaf42a..b1f2da91fc 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.t0;
 import d0.e0.p.d.m0.g.e;
@@ -78,7 +79,7 @@ public final class b implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         i[] iVarArr = this.d;
         int length = iVarArr.length;
@@ -126,7 +127,7 @@ public final class b implements i {
     /* JADX DEBUG: Type inference failed for r1v2. Raw type applied. Possible types: java.util.Collection<? extends d0.e0.p.d.m0.c.t0>, java.util.Collection<d0.e0.p.d.m0.c.t0> */
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         i[] iVarArr = this.d;
         int length = iVarArr.length;
@@ -150,7 +151,7 @@ public final class b implements i {
     /* JADX DEBUG: Type inference failed for r1v2. Raw type applied. Possible types: java.util.Collection<? extends d0.e0.p.d.m0.c.n0>, java.util.Collection<d0.e0.p.d.m0.c.n0> */
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<d0.e0.p.d.m0.c.n0> getContributedVariables(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         i[] iVarArr = this.d;
         int length = iVarArr.length;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java
index d69d9afa1a..022424293a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.t.n;
 import d0.t.u;
 import d0.z.d.m;
@@ -48,7 +49,7 @@ public final class d {
             public final String b;
 
             public C0263a(int i, String str) {
-                m.checkNotNullParameter(str, "name");
+                m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 this.a = i;
                 this.b = str;
             }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java
index 718bf18292..7d2cb065b1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.n0;
@@ -141,7 +142,7 @@ public abstract class e extends j {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         List<m> b2 = b();
         i iVar = new i();
@@ -155,7 +156,7 @@ public abstract class e extends j {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         List<m> b2 = b();
         i iVar = new i();
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/g.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/g.java
index 9696c66321..dfbbb773fa 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/g.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.i;
 import d0.e0.p.d.m0.c.y0;
@@ -28,7 +29,7 @@ public final class g extends j {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         h contributedClassifier = this.b.getContributedClassifier(eVar, bVar);
         if (contributedClassifier == null) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/j.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/j.java
index 350c884ee1..4b9572a924 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/j.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.m0.c.t0;
@@ -21,7 +22,7 @@ public abstract class j implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return null;
     }
@@ -35,14 +36,14 @@ public abstract class j implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<? extends t0> getContributedFunctions(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return n.emptyList();
     }
 
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<? extends n0> getContributedVariables(e eVar, b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return n.emptyList();
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java
index 9523c0f17a..abb96f15bc 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.e;
 import d0.e0.p.d.m0.c.f;
 import d0.e0.p.d.m0.c.t0;
@@ -56,7 +57,7 @@ public final class m extends j {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
     public Void getContributedClassifier(d0.e0.p.d.m0.g.e eVar, b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         return null;
     }
@@ -72,7 +73,7 @@ public final class m extends j {
     /* JADX WARN: Multi-variable type inference failed */
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public i<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         i<t0> iVar = new i<>();
         for (Object obj : (List) d0.e0.p.d.m0.m.n.getValue(this.d, this, b[0])) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java
index ee48dfe26f..a9f878a83a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.n0;
@@ -114,7 +115,7 @@ public final class n implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         h contributedClassifier = this.b.getContributedClassifier(eVar, bVar);
         if (contributedClassifier == null) {
@@ -132,14 +133,14 @@ public final class n implements i {
 
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<? extends t0> getContributedFunctions(e eVar, b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         return a(this.b.getContributedFunctions(eVar, bVar));
     }
 
     @Override // d0.e0.p.d.m0.k.a0.i
     public Collection<? extends n0> getContributedVariables(e eVar, b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         return a(this.b.getContributedVariables(eVar, bVar));
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java
index a3efeb5856..b5d029e8d3 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k.a0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.m0.c.t0;
 import d0.e0.p.d.m0.g.e;
@@ -114,14 +115,14 @@ public final class o extends a {
 
     @Override // d0.e0.p.d.m0.k.a0.a, d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return p.selectMostSpecificInEachOverridableGroup(super.getContributedFunctions(eVar, bVar), c.i);
     }
 
     @Override // d0.e0.p.d.m0.k.a0.a, d0.e0.p.d.m0.k.a0.i
     public Collection<n0> getContributedVariables(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         return p.selectMostSpecificInEachOverridableGroup(super.getContributedVariables(eVar, bVar), d.i);
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/e.java b/app/src/main/java/d0/e0/p/d/m0/k/e.java
index 9daf705a7d..fdc8db4349 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/e.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.o;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
@@ -237,7 +238,7 @@ public class e {
             case 83:
             case 86:
             case 88:
-                objArr[0] = "name";
+                objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                 break;
             default:
                 objArr[0] = "containingDeclaration";
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/k.java b/app/src/main/java/d0/e0/p/d/m0/k/k.java
index 9b1d3989de..723f8f237a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/k.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.k;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
 import d0.e0.p.d.m0.c.i1.b0;
@@ -575,7 +576,7 @@ public class k {
                         objArr[0] = "subTypeParameter";
                         break;
                     case 50:
-                        objArr[0] = "name";
+                        objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                         break;
                     case 51:
                         objArr[0] = "membersFromSupertypes";
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/y/c.java b/app/src/main/java/d0/e0/p/d/m0/k/y/c.java
index 89af9f4a98..35ec48de82 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/y/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/y/c.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d.m0.k.y;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.e0.p.d.m0.g.a;
 import d0.e0.p.d.m0.g.b;
 /* compiled from: JvmClassName */
@@ -82,7 +84,7 @@ public class c {
             if (packageFqName.isRoot()) {
                 return new c(replace);
             }
-            return new c(packageFqName.asString().replace('.', '/') + "/" + replace);
+            return new c(packageFqName.asString().replace('.', MentionUtilsKt.SLASH_CHAR) + AutocompleteViewModel.COMMAND_DISCOVER_TOKEN + replace);
         }
         a(1);
         throw null;
@@ -90,7 +92,7 @@ public class c {
 
     public static c byFqNameWithoutInnerClasses(b bVar) {
         if (bVar != null) {
-            return new c(bVar.asString().replace('.', '/'));
+            return new c(bVar.asString().replace('.', MentionUtilsKt.SLASH_CHAR));
         }
         a(2);
         throw null;
@@ -115,7 +117,7 @@ public class c {
     }
 
     public b getFqNameForTopLevelClassMaybeWithDollars() {
-        return new b(this.a.replace('/', '.'));
+        return new b(this.a.replace(MentionUtilsKt.SLASH_CHAR, '.'));
     }
 
     public String getInternalName() {
@@ -128,9 +130,9 @@ public class c {
     }
 
     public b getPackageFqName() {
-        int lastIndexOf = this.a.lastIndexOf("/");
+        int lastIndexOf = this.a.lastIndexOf(AutocompleteViewModel.COMMAND_DISCOVER_TOKEN);
         if (lastIndexOf != -1) {
-            return new b(this.a.substring(0, lastIndexOf).replace('/', '.'));
+            return new b(this.a.substring(0, lastIndexOf).replace(MentionUtilsKt.SLASH_CHAR, '.'));
         }
         b bVar = b.a;
         if (bVar != null) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/y/d.java b/app/src/main/java/d0/e0/p/d/m0/k/y/d.java
index 3e5144ff85..435da285be 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/y/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/y/d.java
@@ -1,6 +1,9 @@
 package d0.e0.p.d.m0.k.y;
 
+import androidx.exifinterface.media.ExifInterface;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.i;
 import d0.e0.p.d.m0.g.b;
 import java.util.EnumMap;
@@ -13,10 +16,10 @@ public enum d {
     BOOLEAN(i.BOOLEAN, "boolean", "Z", "java.lang.Boolean"),
     CHAR(i.CHAR, "char", "C", "java.lang.Character"),
     BYTE(i.BYTE, "byte", "B", "java.lang.Byte"),
-    SHORT(i.SHORT, "short", "S", "java.lang.Short"),
+    SHORT(i.SHORT, "short", ExifInterface.LATITUDE_SOUTH, "java.lang.Short"),
     INT(i.INT, "int", "I", "java.lang.Integer"),
     FLOAT(i.FLOAT, "float", "F", "java.lang.Float"),
-    LONG(i.LONG, "long", "J", "java.lang.Long"),
+    LONG(i.LONG, Constants.LONG, "J", "java.lang.Long"),
     DOUBLE(i.DOUBLE, "double", "D", "java.lang.Double");
     
     public static final Set<b> q = new HashSet();
@@ -97,7 +100,7 @@ public enum d {
                 switch (i) {
                     case 1:
                     case 7:
-                        objArr[0] = "name";
+                        objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                         break;
                     case 2:
                     case 4:
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java b/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java
index 82c2be159e..795c823b55 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b.d0;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.m0.f.b;
 import d0.e0.p.d.m0.f.c;
 import d0.e0.p.d.m0.f.d;
@@ -68,8 +69,8 @@ public final class a extends d0.e0.p.d.m0.l.a {
         StringBuilder sb = new StringBuilder();
         String asString = bVar.asString();
         m.checkNotNullExpressionValue(asString, "fqName.asString()");
-        sb.append(t.replace$default(asString, '.', '/', false, 4, (Object) null));
-        sb.append('/');
+        sb.append(t.replace$default(asString, '.', (char) MentionUtilsKt.SLASH_CHAR, false, 4, (Object) null));
+        sb.append(MentionUtilsKt.SLASH_CHAR);
         sb.append(getBuiltInsFileName(bVar));
         return sb.toString();
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java
index cd6c564606..c9d26d20dc 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b.e0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a1;
 import d0.e0.p.d.m0.c.d0;
 import d0.e0.p.d.m0.c.m;
@@ -206,7 +207,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h
         public void c(d0.e0.p.d.m0.g.e eVar, List<t0> list) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(list, "functions");
             ArrayList arrayList = new ArrayList();
             for (c0 c0Var : this.i.mo1invoke()) {
@@ -218,7 +219,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h
         public void d(d0.e0.p.d.m0.g.e eVar, List<n0> list) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(list, "descriptors");
             ArrayList arrayList = new ArrayList();
             for (c0 c0Var : this.i.mo1invoke()) {
@@ -229,7 +230,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h
         public d0.e0.p.d.m0.g.a e(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.e0.p.d.m0.g.a createNestedClassId = d.access$getClassId$p(this.j).createNestedClassId(eVar);
             d0.z.d.m.checkNotNullExpressionValue(createNestedClassId, "classId.createNestedClassId(name)");
             return createNestedClassId;
@@ -263,7 +264,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         @Override // d0.e0.p.d.m0.l.b.e0.h, d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
         public d0.e0.p.d.m0.c.h getContributedClassifier(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
             d0.e0.p.d.m0.c.e findEnumEntry;
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             recordLookup(eVar, bVar);
             c access$getEnumEntries$p = d.access$getEnumEntries$p(this.j);
@@ -279,7 +280,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h, d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
         public Collection<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             recordLookup(eVar, bVar);
             return super.getContributedFunctions(eVar, bVar);
@@ -287,7 +288,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h, d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
         public Collection<n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             recordLookup(eVar, bVar);
             return super.getContributedVariables(eVar, bVar);
@@ -314,7 +315,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         }
 
         public void recordLookup(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             d0.e0.p.d.m0.d.a.record(this.f2679c.getComponents().getLookupTracker(), bVar, this.j, eVar);
         }
@@ -465,7 +466,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
             }
 
             public final d0.e0.p.d.m0.c.e invoke(d0.e0.p.d.m0.g.e eVar) {
-                d0.z.d.m.checkNotNullParameter(eVar, "name");
+                d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 d0.e0.p.d.m0.f.g gVar = (d0.e0.p.d.m0.f.g) c.access$getEnumEntryProtos$p(this.this$0).get(eVar);
                 if (gVar == null) {
                     return null;
@@ -553,7 +554,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         }
 
         public final d0.e0.p.d.m0.c.e findEnumEntry(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return this.b.invoke(eVar);
         }
     }
@@ -905,7 +906,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
     }
 
     public final boolean hasNestedClass$deserialization(d0.e0.p.d.m0.g.e eVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return b().getClassNames$deserialization().contains(eVar);
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java
index cf990d52b8..8b13b4252c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b.e0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.m;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.m0.c.t0;
@@ -472,7 +473,7 @@ public abstract class h extends j {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h.a
         public Collection<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             if (!getFunctionNames().contains(eVar)) {
                 return d0.t.n.emptyList();
@@ -483,7 +484,7 @@ public abstract class h extends j {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h.a
         public Collection<n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             if (!getVariableNames().contains(eVar)) {
                 return d0.t.n.emptyList();
@@ -499,7 +500,7 @@ public abstract class h extends j {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h.a
         public y0 getTypeAliasByName(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return (y0) ((Map) d0.e0.p.d.m0.m.n.getValue(this.j, this, a[5])).get(eVar);
         }
 
@@ -820,14 +821,14 @@ public abstract class h extends j {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h.a
         public Collection<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             return !getFunctionNames().contains(eVar) ? d0.t.n.emptyList() : (Collection) ((f.m) this.e).invoke(eVar);
         }
 
         @Override // d0.e0.p.d.m0.l.b.e0.h.a
         public Collection<n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             d0.z.d.m.checkNotNullParameter(bVar, "location");
             return !getVariableNames().contains(eVar) ? d0.t.n.emptyList() : (Collection) ((f.m) this.f).invoke(eVar);
         }
@@ -839,7 +840,7 @@ public abstract class h extends j {
 
         @Override // d0.e0.p.d.m0.l.b.e0.h.a
         public y0 getTypeAliasByName(d0.e0.p.d.m0.g.e eVar) {
-            d0.z.d.m.checkNotNullParameter(eVar, "name");
+            d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
             return this.g.invoke(eVar);
         }
 
@@ -946,12 +947,12 @@ public abstract class h extends j {
     }
 
     public void c(d0.e0.p.d.m0.g.e eVar, List<t0> list) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(list, "functions");
     }
 
     public void d(d0.e0.p.d.m0.g.e eVar, List<n0> list) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(list, "descriptors");
     }
 
@@ -972,7 +973,7 @@ public abstract class h extends j {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
     public d0.e0.p.d.m0.c.h getContributedClassifier(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         if (i(eVar)) {
             return this.f2679c.getComponents().deserializeClass(e(eVar));
@@ -985,14 +986,14 @@ public abstract class h extends j {
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<t0> getContributedFunctions(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         return this.d.getContributedFunctions(eVar, bVar);
     }
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
     public Collection<n0> getContributedVariables(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         return this.d.getContributedVariables(eVar, bVar);
     }
@@ -1010,7 +1011,7 @@ public abstract class h extends j {
     public abstract Set<d0.e0.p.d.m0.g.e> h();
 
     public boolean i(d0.e0.p.d.m0.g.e eVar) {
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return getClassNames$deserialization().contains(eVar);
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java
index 7153069c12..8f5adedf73 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b.e0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.e0;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.f.l;
@@ -64,7 +65,7 @@ public class i extends h {
 
     @Override // d0.e0.p.d.m0.l.b.e0.h
     public d0.e0.p.d.m0.g.a e(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return new d0.e0.p.d.m0.g.a(this.h, eVar);
     }
 
@@ -80,7 +81,7 @@ public class i extends h {
 
     @Override // d0.e0.p.d.m0.l.b.e0.h, d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
     public h getContributedClassifier(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         recordLookup(eVar, bVar);
         return super.getContributedClassifier(eVar, bVar);
@@ -107,8 +108,8 @@ public class i extends h {
     @Override // d0.e0.p.d.m0.l.b.e0.h
     public boolean i(e eVar) {
         boolean z2;
-        m.checkNotNullParameter(eVar, "name");
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (getClassNames$deserialization().contains(eVar)) {
             return true;
         }
@@ -131,7 +132,7 @@ public class i extends h {
     }
 
     public void recordLookup(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVar, "location");
         d0.e0.p.d.m0.d.a.record(this.f2679c.getComponents().getLookupTracker(), bVar, this.g, eVar);
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/j.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/j.java
index 404c726ce5..b7f5c810e9 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/j.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b.e0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.i1.c0;
 import d0.e0.p.d.m0.c.i1.d0;
@@ -34,7 +35,7 @@ public final class j extends c0 implements b {
         d0.z.d.m.checkNotNullParameter(gVar, "annotations");
         d0.z.d.m.checkNotNullParameter(zVar, "modality");
         d0.z.d.m.checkNotNullParameter(uVar, "visibility");
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(aVar, "kind");
         d0.z.d.m.checkNotNullParameter(nVar, "proto");
         d0.z.d.m.checkNotNullParameter(cVar, "nameResolver");
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/k.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/k.java
index def66c0b21..64a58387bd 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/k.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b.e0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
@@ -38,7 +39,7 @@ public final class k extends g0 implements b {
         super(mVar, t0Var, gVar, eVar, aVar, u0Var == null ? u0.a : u0Var);
         d0.z.d.m.checkNotNullParameter(mVar, "containingDeclaration");
         d0.z.d.m.checkNotNullParameter(gVar, "annotations");
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(aVar, "kind");
         d0.z.d.m.checkNotNullParameter(iVar, "proto");
         d0.z.d.m.checkNotNullParameter(cVar, "nameResolver");
@@ -67,7 +68,7 @@ public final class k extends g0 implements b {
         t0 t0Var = (t0) xVar;
         if (eVar == null) {
             e name = getName();
-            d0.z.d.m.checkNotNullExpressionValue(name, "name");
+            d0.z.d.m.checkNotNullExpressionValue(name, ModelAuditLogEntry.CHANGE_KEY_NAME);
             eVar2 = name;
         } else {
             eVar2 = eVar;
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java
index 4a42295845..83748342e4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b.e0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a1;
 import d0.e0.p.d.m0.c.h;
 import d0.e0.p.d.m0.c.i1.d;
@@ -52,7 +53,7 @@ public final class l extends e implements g {
         d0.z.d.m.checkNotNullParameter(oVar, "storageManager");
         d0.z.d.m.checkNotNullParameter(mVar, "containingDeclaration");
         d0.z.d.m.checkNotNullParameter(gVar, "annotations");
-        d0.z.d.m.checkNotNullParameter(eVar, "name");
+        d0.z.d.m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(uVar, "visibility");
         d0.z.d.m.checkNotNullParameter(rVar, "proto");
         d0.z.d.m.checkNotNullParameter(cVar, "nameResolver");
@@ -178,7 +179,7 @@ public final class l extends e implements g {
         d0.e0.p.d.m0.c.g1.g annotations = getAnnotations();
         d0.z.d.m.checkNotNullExpressionValue(annotations, "annotations");
         d0.e0.p.d.m0.g.e name = getName();
-        d0.z.d.m.checkNotNullExpressionValue(name, "name");
+        d0.z.d.m.checkNotNullExpressionValue(name, ModelAuditLogEntry.CHANGE_KEY_NAME);
         l lVar = new l(oVar, containingDeclaration, annotations, name, getVisibility(), getProto(), getNameResolver(), getTypeTable(), getVersionRequirementTable(), getContainerSource());
         List<z0> declaredTypeParameters = getDeclaredTypeParameters();
         j0 underlyingType = getUnderlyingType();
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/n.java b/app/src/main/java/d0/e0/p/d/m0/l/b/n.java
index 65796de3d0..f7039b9aee 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/n.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/n.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.l.b;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.c0;
 import d0.e0.p.d.m0.c.i1.a0;
 import d0.e0.p.d.m0.g.b;
@@ -24,7 +25,7 @@ public abstract class n extends a0 {
     public abstract g getClassDataFinder();
 
     public boolean hasTopLevelClass(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         i memberScope = getMemberScope();
         return (memberScope instanceof h) && ((h) memberScope).getClassNames$deserialization().contains(eVar);
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/b1.java b/app/src/main/java/d0/e0/p/d/m0/n/b1.java
index 6fd8b409a3..8410e131c7 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/b1.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/b1.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.n;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.k;
 import d0.e0.p.d.m0.g.b;
 import kotlin.jvm.functions.Function1;
@@ -9,6 +10,6 @@ public final class b1 implements Function1<b, Boolean> {
         if (bVar != null) {
             return Boolean.valueOf(!bVar.equals(k.a.G));
         }
-        throw new IllegalArgumentException(String.format("Argument for @NotNull parameter '%s' of %s.%s must not be null", "name", "kotlin/reflect/jvm/internal/impl/types/TypeSubstitutor$1", "invoke"));
+        throw new IllegalArgumentException(String.format("Argument for @NotNull parameter '%s' of %s.%s must not be null", ModelAuditLogEntry.CHANGE_KEY_NAME, "kotlin/reflect/jvm/internal/impl/types/TypeSubstitutor$1", "invoke"));
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/l.java b/app/src/main/java/d0/e0/p/d/m0/n/l.java
index 7bf66d8f78..86a2741f99 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/l.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.n;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.z.d.m;
 /* compiled from: TypeSubstitution.kt */
@@ -36,7 +37,7 @@ public class l extends z0 {
     @Override // d0.e0.p.d.m0.n.z0
     public c0 prepareTopLevelType(c0 c0Var, j1 j1Var) {
         m.checkNotNullParameter(c0Var, "topLevelType");
-        m.checkNotNullParameter(j1Var, "position");
+        m.checkNotNullParameter(j1Var, ModelAuditLogEntry.CHANGE_KEY_POSITION);
         return this.b.prepareTopLevelType(c0Var, j1Var);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/m1/a.java b/app/src/main/java/d0/e0/p/d/m0/n/m1/a.java
index 9a24414347..b0dadbb1fc 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/m1/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/m1/a.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.n.m1;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.a;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.c1;
@@ -123,7 +124,7 @@ public class a extends g0 {
                             objArr[0] = "kind";
                             break;
                         case 9:
-                            objArr[0] = "name";
+                            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                             break;
                         case 11:
                         case 17:
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/p.java b/app/src/main/java/d0/e0/p/d/m0/n/p.java
index 8537c8f969..5a6c5478ad 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/p.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/p.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.n;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -63,7 +64,7 @@ public final class p extends z0 {
     @Override // d0.e0.p.d.m0.n.z0
     public c0 prepareTopLevelType(c0 c0Var, j1 j1Var) {
         m.checkNotNullParameter(c0Var, "topLevelType");
-        m.checkNotNullParameter(j1Var, "position");
+        m.checkNotNullParameter(j1Var, ModelAuditLogEntry.CHANGE_KEY_POSITION);
         return this.d.prepareTopLevelType(this.f2706c.prepareTopLevelType(c0Var, j1Var), j1Var);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/t.java b/app/src/main/java/d0/e0/p/d/m0/n/t.java
index 8540c888c6..4bb763500b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/t.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/t.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.n;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.b.h;
 import d0.e0.p.d.m0.c.b;
 import d0.e0.p.d.m0.c.b0;
@@ -448,7 +449,7 @@ public class t {
                     objArr[0] = "typeSubstitution";
                     break;
                 default:
-                    objArr[0] = "name";
+                    objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                     break;
             }
             if (i == 2) {
@@ -587,7 +588,7 @@ public class t {
                         case 8:
                         case 14:
                         case 19:
-                            objArr[0] = "name";
+                            objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                             break;
                         case 2:
                         case 4:
@@ -857,7 +858,7 @@ public class t {
                 case 7:
                 case 11:
                 case 13:
-                    objArr[0] = "name";
+                    objArr[0] = ModelAuditLogEntry.CHANGE_KEY_NAME;
                     break;
                 case 2:
                 case 4:
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/z0.java b/app/src/main/java/d0/e0/p/d/m0/n/z0.java
index ea6b5d9813..c43577b016 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/z0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/z0.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.n;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.g1.g;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -62,7 +63,7 @@ public abstract class z0 {
 
     public c0 prepareTopLevelType(c0 c0Var, j1 j1Var) {
         m.checkNotNullParameter(c0Var, "topLevelType");
-        m.checkNotNullParameter(j1Var, "position");
+        m.checkNotNullParameter(j1Var, ModelAuditLogEntry.CHANGE_KEY_POSITION);
         return c0Var;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/o/d.java b/app/src/main/java/d0/e0/p/d/m0/o/d.java
index 4e24c96f87..a25feeb4c7 100644
--- a/app/src/main/java/d0/e0/p/d/m0/o/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/o/d.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.o;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.m0.c.x;
 import d0.e0.p.d.m0.g.e;
 import d0.e0.p.d.m0.o.c;
@@ -74,7 +75,7 @@ public final class d {
     /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: kotlin.jvm.functions.Function1<? super d0.e0.p.d.m0.c.x, java.lang.String> */
     /* JADX WARN: Multi-variable type inference failed */
     public d(e eVar, b[] bVarArr, Function1<? super x, String> function1) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(bVarArr, "checks");
         m.checkNotNullParameter(function1, "additionalChecks");
         b[] bVarArr2 = new b[bVarArr.length];
diff --git a/app/src/main/java/d0/e0/p/d/m0/p/c.java b/app/src/main/java/d0/e0/p/d/m0/p/c.java
index a466d9d4c0..ac24bfdc0e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/p/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/p/c.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.p;
 
+import c.a.r.n0.c.e;
 import d0.z.d.m;
 /* compiled from: exceptionUtils.kt */
 public final class c {
@@ -16,7 +17,7 @@ public final class c {
     }
 
     public static final RuntimeException rethrow(Throwable th) {
-        m.checkNotNullParameter(th, "e");
+        m.checkNotNullParameter(th, e.a);
         throw th;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/p/e.java b/app/src/main/java/d0/e0/p/d/m0/p/e.java
index e0f6bf7b77..34437cf175 100644
--- a/app/src/main/java/d0/e0/p/d/m0/p/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/p/e.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d.m0.p;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g;
 import d0.t.h0;
 import d0.z.d.m;
@@ -51,9 +52,9 @@ public final class e {
                 arrayList.add(m.stringPlus("under-migration:", migrationLevelForJsr305.getDescription()));
             }
             for (Map.Entry<String, h> entry : this.this$0.getUserDefinedLevelForSpecificJsr305Annotation().entrySet()) {
-                StringBuilder H = c.d.b.a.a.H('@');
+                StringBuilder H = c.d.b.a.a.H(MentionUtilsKt.MENTIONS_CHAR);
                 H.append(entry.getKey());
-                H.append(':');
+                H.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
                 H.append(entry.getValue().getDescription());
                 arrayList.add(H.toString());
             }
diff --git a/app/src/main/java/d0/e0/p/d/n.java b/app/src/main/java/d0/e0/p/d/n.java
index 4bd2eba881..08f22638c0 100644
--- a/app/src/main/java/d0/e0/p/d/n.java
+++ b/app/src/main/java/d0/e0/p/d/n.java
@@ -1,5 +1,7 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.i;
 import d0.e0.p.d.m0.c.k1.a.f;
@@ -126,7 +128,7 @@ public final class n extends i {
                     return null;
                 }
                 if (multifileClassName.length() > 0) {
-                    return n.this.getJClass().getClassLoader().loadClass(t.replace$default(multifileClassName, '/', '.', false, 4, (Object) null));
+                    return n.this.getJClass().getClassLoader().loadClass(t.replace$default(multifileClassName, (char) MentionUtilsKt.SLASH_CHAR, '.', false, 4, (Object) null));
                 }
                 return null;
             }
@@ -245,7 +247,7 @@ public final class n extends i {
     /* JADX DEBUG: Type inference failed for r3v1. Raw type applied. Possible types: java.util.Collection<? extends d0.e0.p.d.m0.c.t0>, java.util.Collection<d0.e0.p.d.m0.c.x> */
     @Override // d0.e0.p.d.i
     public Collection<x> getFunctions(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return this.l.mo1invoke().getScope().getContributedFunctions(eVar, d.FROM_REFLECTION);
     }
 
@@ -278,7 +280,7 @@ public final class n extends i {
     /* JADX DEBUG: Type inference failed for r3v1. Raw type applied. Possible types: java.util.Collection<? extends d0.e0.p.d.m0.c.n0>, java.util.Collection<d0.e0.p.d.m0.c.n0> */
     @Override // d0.e0.p.d.i
     public Collection<n0> getProperties(e eVar) {
-        m.checkNotNullParameter(eVar, "name");
+        m.checkNotNullParameter(eVar, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return this.l.mo1invoke().getScope().getContributedVariables(eVar, d.FROM_REFLECTION);
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/p.java b/app/src/main/java/d0/e0/p/d/p.java
index c36512d5fe..0a26b220a5 100644
--- a/app/src/main/java/d0/e0/p/d/p.java
+++ b/app/src/main/java/d0/e0/p/d/p.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.m0.c.n0;
 import d0.e0.p.d.s;
@@ -105,7 +106,7 @@ public class p<V> extends s<V> implements KProperty0<V> {
     public p(i iVar, String str, String str2, Object obj) {
         super(iVar, str, str2, obj);
         m.checkNotNullParameter(iVar, "container");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "signature");
         c0.b<a<V>> lazy = c0.lazy(new b(this));
         m.checkNotNullExpressionValue(lazy, "ReflectProperties.lazy { Getter(this) }");
diff --git a/app/src/main/java/d0/e0/p/d/q.java b/app/src/main/java/d0/e0/p/d/q.java
index 44997b61a1..50c7f3701f 100644
--- a/app/src/main/java/d0/e0/p/d/q.java
+++ b/app/src/main/java/d0/e0/p/d/q.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.g;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.m0.c.n0;
@@ -85,7 +86,7 @@ public class q<T, V> extends s<V> implements g<T, V> {
     public q(i iVar, String str, String str2, Object obj) {
         super(iVar, str, str2, obj);
         m.checkNotNullParameter(iVar, "container");
-        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkNotNullParameter(str2, "signature");
         c0.b<a<T, V>> lazy = c0.lazy(new b(this));
         m.checkNotNullExpressionValue(lazy, "ReflectProperties.lazy { Getter(this) }");
diff --git a/app/src/main/java/d0/e0/p/d/s.java b/app/src/main/java/d0/e0/p/d/s.java
index 2d8f464bc0..1abfc82d5c 100644
--- a/app/src/main/java/d0/e0/p/d/s.java
+++ b/app/src/main/java/d0/e0/p/d/s.java
@@ -1,5 +1,6 @@
 package d0.e0.p.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.p.d.c0;
 import d0.e0.p.d.e;
 import d0.e0.p.d.m0.c.g1.g;
@@ -307,7 +308,7 @@ public abstract class s<V> extends f<V> implements KProperty<V> {
     public s(i iVar, String str, String str2, Object obj) {
         this(iVar, str, str2, null, obj);
         d0.z.d.m.checkNotNullParameter(iVar, "container");
-        d0.z.d.m.checkNotNullParameter(str, "name");
+        d0.z.d.m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkNotNullParameter(str2, "signature");
     }
 
diff --git a/app/src/main/java/d0/g0/c.java b/app/src/main/java/d0/g0/c.java
index 4eb788b1e4..bfc502f782 100644
--- a/app/src/main/java/d0/g0/c.java
+++ b/app/src/main/java/d0/g0/c.java
@@ -1,5 +1,6 @@
 package d0.g0;
 
+import com.adjust.sdk.Constants;
 import d0.z.d.m;
 import java.nio.charset.Charset;
 /* compiled from: Charsets.kt */
@@ -12,7 +13,7 @@ public final class c {
     public static final c d = new c();
 
     static {
-        Charset forName = Charset.forName("UTF-8");
+        Charset forName = Charset.forName(Constants.ENCODING);
         m.checkNotNullExpressionValue(forName, "Charset.forName(\"UTF-8\")");
         a = forName;
         m.checkNotNullExpressionValue(Charset.forName("UTF-16"), "Charset.forName(\"UTF-16\")");
diff --git a/app/src/main/java/d0/t/u.java b/app/src/main/java/d0/t/u.java
index 830bd19654..329f9bde30 100644
--- a/app/src/main/java/d0/t/u.java
+++ b/app/src/main/java/d0/t/u.java
@@ -1,5 +1,6 @@
 package d0.t;
 
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 import d0.d0.f;
 import d0.g0.l;
 import d0.z.d.m;
@@ -98,7 +99,7 @@ public class u extends t {
 
     public static final double averageOfLong(Iterable<Long> iterable) {
         m.checkNotNullParameter(iterable, "$this$average");
-        double d = 0.0d;
+        double d = ShadowDrawableWrapper.COS_45;
         int i = 0;
         for (Long l : iterable) {
             d += (double) l.longValue();
diff --git a/app/src/main/java/d0/w/h/a/f.java b/app/src/main/java/d0/w/h/a/f.java
index 5438f87744..baa264efbd 100644
--- a/app/src/main/java/d0/w/h/a/f.java
+++ b/app/src/main/java/d0/w/h/a/f.java
@@ -1,6 +1,7 @@
 package d0.w.h.a;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.lang.reflect.Field;
 /* compiled from: DebugMetadata.kt */
@@ -37,7 +38,7 @@ public final class f {
             if (moduleName == null) {
                 str = eVar.c();
             } else {
-                str = moduleName + '/' + eVar.c();
+                str = moduleName + MentionUtilsKt.SLASH_CHAR + eVar.c();
             }
             return new StackTraceElement(str, eVar.m(), eVar.f(), i2);
         }
diff --git a/app/src/main/java/d0/w/h/a/h.java b/app/src/main/java/d0/w/h/a/h.java
index fbd79924c4..fea3e90111 100644
--- a/app/src/main/java/d0/w/h/a/h.java
+++ b/app/src/main/java/d0/w/h/a/h.java
@@ -1,5 +1,6 @@
 package d0.w.h.a;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.lang.reflect.Method;
 /* compiled from: DebugMetadata.kt */
@@ -34,7 +35,7 @@ public final class h {
         a aVar2 = b;
         if (aVar2 == null) {
             try {
-                a aVar3 = new a(Class.class.getDeclaredMethod("getModule", new Class[0]), aVar.getClass().getClassLoader().loadClass("java.lang.Module").getDeclaredMethod("getDescriptor", new Class[0]), aVar.getClass().getClassLoader().loadClass("java.lang.module.ModuleDescriptor").getDeclaredMethod("name", new Class[0]));
+                a aVar3 = new a(Class.class.getDeclaredMethod("getModule", new Class[0]), aVar.getClass().getClassLoader().loadClass("java.lang.Module").getDeclaredMethod("getDescriptor", new Class[0]), aVar.getClass().getClassLoader().loadClass("java.lang.module.ModuleDescriptor").getDeclaredMethod(ModelAuditLogEntry.CHANGE_KEY_NAME, new Class[0]));
                 b = aVar3;
                 aVar2 = aVar3;
             } catch (Exception unused) {
diff --git a/app/src/main/java/d0/y/h.java b/app/src/main/java/d0/y/h.java
index 37b75baf2d..aacce92239 100644
--- a/app/src/main/java/d0/y/h.java
+++ b/app/src/main/java/d0/y/h.java
@@ -1,5 +1,6 @@
 package d0.y;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.g0.w;
 import d0.z.d.m;
 import java.io.File;
@@ -28,7 +29,7 @@ public class h extends g {
     public static final String getExtension(File file) {
         m.checkNotNullParameter(file, "$this$extension");
         String name = file.getName();
-        m.checkNotNullExpressionValue(name, "name");
+        m.checkNotNullExpressionValue(name, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return w.substringAfterLast(name, '.', "");
     }
 }
diff --git a/app/src/main/java/d0/z/a.java b/app/src/main/java/d0/z/a.java
index 720a6ad802..183a6d79ef 100644
--- a/app/src/main/java/d0/z/a.java
+++ b/app/src/main/java/d0/z/a.java
@@ -1,5 +1,6 @@
 package d0.z;
 
+import com.adjust.sdk.Constants;
 import d0.e0.c;
 import d0.z.d.a0;
 import d0.z.d.e;
@@ -41,7 +42,7 @@ public final class a {
             case 3052374:
                 return name.equals("char") ? Character.class : cls;
             case 3327612:
-                return name.equals("long") ? Long.class : cls;
+                return name.equals(Constants.LONG) ? Long.class : cls;
             case 3625364:
                 return name.equals("void") ? Void.class : cls;
             case 64711720:
diff --git a/app/src/main/java/d0/z/d/f.java b/app/src/main/java/d0/z/d/f.java
index 3200c3490c..fc8cbd9866 100644
--- a/app/src/main/java/d0/z/d/f.java
+++ b/app/src/main/java/d0/z/d/f.java
@@ -1,5 +1,7 @@
 package d0.z.d;
 
+import com.adjust.sdk.Constants;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.e0.c;
 import d0.g0.w;
 import d0.t.g0;
@@ -83,12 +85,12 @@ public final class f implements c<Object>, e {
                     String simpleName = cls.getSimpleName();
                     Method enclosingMethod = cls.getEnclosingMethod();
                     if (enclosingMethod != null) {
-                        m.checkNotNullExpressionValue(simpleName, "name");
+                        m.checkNotNullExpressionValue(simpleName, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         str2 = w.substringAfter$default(simpleName, enclosingMethod.getName() + "$", (String) null, 2, (Object) null);
                     }
                     Constructor<?> enclosingConstructor = cls.getEnclosingConstructor();
                     if (enclosingConstructor != null) {
-                        m.checkNotNullExpressionValue(simpleName, "name");
+                        m.checkNotNullExpressionValue(simpleName, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         str2 = w.substringAfter$default(simpleName, enclosingConstructor.getName() + "$", (String) null, 2, (Object) null);
                     } else {
                         str2 = null;
@@ -96,7 +98,7 @@ public final class f implements c<Object>, e {
                     if (str2 != null) {
                         return str2;
                     }
-                    m.checkNotNullExpressionValue(simpleName, "name");
+                    m.checkNotNullExpressionValue(simpleName, ModelAuditLogEntry.CHANGE_KEY_NAME);
                     return w.substringAfter$default(simpleName, '$', (String) null, 2, (Object) null);
                 } else if (cls.isArray()) {
                     Class<?> componentType = cls.getComponentType();
@@ -138,7 +140,7 @@ public final class f implements c<Object>, e {
         hashMap.put("short", "kotlin.Short");
         hashMap.put("int", "kotlin.Int");
         hashMap.put("float", "kotlin.Float");
-        hashMap.put("long", "kotlin.Long");
+        hashMap.put(Constants.LONG, "kotlin.Long");
         hashMap.put("double", "kotlin.Double");
         j = hashMap;
         HashMap<String, String> hashMap2 = new HashMap<>();
diff --git a/app/src/main/java/defpackage/e.java b/app/src/main/java/defpackage/e.java
index cc32f9c965..04be8fee85 100644
--- a/app/src/main/java/defpackage/e.java
+++ b/app/src/main/java/defpackage/e.java
@@ -5,6 +5,7 @@ import android.view.View;
 import c.a.e.o;
 import c.a.z.r;
 import c.a.z.s;
+import com.discord.R;
 import com.discord.app.AppActivity;
 import com.discord.stores.StoreInviteSettings;
 import com.discord.stores.StoreStream;
@@ -38,7 +39,7 @@ public final class e implements View.OnClickListener {
             if (valueOf != null) {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreInviteSettings.generateInvite$default(StoreStream.Companion.getInviteSettings(), valueOf.longValue(), null, 2, null), overlayMenuView, null, 2, null), OverlayMenuView.class, (Context) null, (Function1) null, new r(overlayMenuView), (Function0) null, (Function0) null, new s(overlayMenuView), 54, (Object) null);
             } else {
-                o.g(overlayMenuView.getContext(), 2131890661, 0, null, 12);
+                o.g(overlayMenuView.getContext(), R.string.instant_invite_failed_to_generate, 0, null, 12);
             }
         } else if (i == 1) {
             OverlayMenuView overlayMenuView2 = (OverlayMenuView) this.j;
diff --git a/app/src/main/java/defpackage/h.java b/app/src/main/java/defpackage/h.java
index 29c09e4c20..72d8224020 100644
--- a/app/src/main/java/defpackage/h.java
+++ b/app/src/main/java/defpackage/h.java
@@ -3,6 +3,7 @@ package defpackage;
 import android.content.Context;
 import android.view.View;
 import c.a.e.o;
+import com.discord.R;
 import com.discord.rtcconnection.audio.DiscordAudioManager;
 import com.discord.stores.StoreMediaSettings;
 import com.discord.stores.StoreStream;
@@ -49,7 +50,7 @@ public final class h implements View.OnClickListener {
                     return;
                 }
                 m.checkNotNullExpressionValue(view, "it");
-                o.g(view.getContext(), 2131886753, 0, null, 12);
+                o.g(view.getContext(), R.string.audio_devices_toggle_unavailable, 0, null, 12);
             } else if (i2 != 2) {
                 if (i2 == 3) {
                     ((OverlayMenuView) this.j).getOnDismissRequested$app_productionCanaryRelease().mo1invoke();
@@ -59,15 +60,15 @@ public final class h implements View.OnClickListener {
                 throw null;
             } else if (((OverlayMenuView.a) this.j).f2154c.isSuppressed()) {
                 m.checkNotNullExpressionValue(view, "view");
-                o.g(view.getContext(), 2131894118, 0, null, 12);
+                o.g(view.getContext(), R.string.suppressed_permission_body, 0, null, 12);
             } else if (((OverlayMenuView.a) this.j).f2154c.isMuted()) {
                 m.checkNotNullExpressionValue(view, "view");
-                o.g(view.getContext(), 2131893568, 0, null, 12);
+                o.g(view.getContext(), R.string.server_muted_dialog_body, 0, null, 12);
             } else {
                 StoreMediaSettings.SelfMuteFailure selfMuteFailure = StoreStream.Companion.getMediaSettings().toggleSelfMuted();
                 if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) {
                     m.checkNotNullExpressionValue(view, "view");
-                    o.g(view.getContext(), 2131894885, 0, null, 12);
+                    o.g(view.getContext(), R.string.vad_permission_small, 0, null, 12);
                 }
             }
         } else {
diff --git a/app/src/main/java/e0/a/a/a/a.java b/app/src/main/java/e0/a/a/a/a.java
index 5666aeeb69..94e7d81224 100644
--- a/app/src/main/java/e0/a/a/a/a.java
+++ b/app/src/main/java/e0/a/a/a/a.java
@@ -9,6 +9,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import androidx.annotation.ColorInt;
+import androidx.core.view.ViewCompat;
 import me.dm7.barcodescanner.core.R;
 /* compiled from: BarcodeScannerView */
 public abstract class a extends FrameLayout implements Camera.PreviewCallback {
@@ -244,7 +245,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
         if (!this.p) {
             RelativeLayout relativeLayout = new RelativeLayout(getContext());
             relativeLayout.setGravity(17);
-            relativeLayout.setBackgroundColor(-16777216);
+            relativeLayout.setBackgroundColor(ViewCompat.MEASURED_STATE_MASK);
             relativeLayout.addView(this.j);
             addView(relativeLayout);
         } else {
diff --git a/app/src/main/java/e0/a/a/a/d.java b/app/src/main/java/e0/a/a/a/d.java
index dc77e36879..c6dc663428 100644
--- a/app/src/main/java/e0/a/a/a/d.java
+++ b/app/src/main/java/e0/a/a/a/d.java
@@ -10,6 +10,7 @@ import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.util.List;
 /* compiled from: CameraPreview */
 public class d extends SurfaceView implements SurfaceHolder.Callback {
@@ -108,7 +109,7 @@ public class d extends SurfaceView implements SurfaceHolder.Callback {
 
     public final void c(int i, int i2) {
         ViewGroup.LayoutParams layoutParams = getLayoutParams();
-        if (getDisplayOrientation() % 180 != 0) {
+        if (getDisplayOrientation() % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0) {
             i2 = i;
             i = i2;
         }
@@ -134,7 +135,7 @@ public class d extends SurfaceView implements SurfaceHolder.Callback {
         parameters.setPreviewSize(optimalPreviewSize.width, optimalPreviewSize.height);
         this.i.a.setParameters(parameters);
         Point point = new Point(getWidth(), getHeight());
-        if (getDisplayOrientation() % 180 != 0) {
+        if (getDisplayOrientation() % BaseTransientBottomBar.ANIMATION_FADE_DURATION != 0) {
             point = new Point(point.y, point.x);
         }
         float f = ((float) optimalPreviewSize.width) / ((float) optimalPreviewSize.height);
@@ -180,7 +181,7 @@ public class d extends SurfaceView implements SurfaceHolder.Callback {
             if (rotation == 1) {
                 i = 90;
             } else if (rotation == 2) {
-                i = 180;
+                i = BaseTransientBottomBar.ANIMATION_FADE_DURATION;
             } else if (rotation == 3) {
                 i = 270;
             }
diff --git a/app/src/main/java/f0/a.java b/app/src/main/java/f0/a.java
index 089495808c..16d302bcf9 100644
--- a/app/src/main/java/f0/a.java
+++ b/app/src/main/java/f0/a.java
@@ -1,5 +1,7 @@
 package f0;
 
+import com.adjust.sdk.Constants;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.t;
 import d0.z.d.m;
 import f0.f0.c;
@@ -44,13 +46,13 @@ public final class a {
         this.j = proxy;
         this.k = proxySelector;
         w.a aVar = new w.a();
-        String str2 = sSLSocketFactory != null ? "https" : "http";
+        String str2 = sSLSocketFactory != null ? Constants.SCHEME : "http";
         m.checkParameterIsNotNull(str2, "scheme");
         boolean z2 = true;
         if (t.equals(str2, "http", true)) {
             aVar.b = "http";
-        } else if (t.equals(str2, "https", true)) {
-            aVar.b = "https";
+        } else if (t.equals(str2, Constants.SCHEME, true)) {
+            aVar.b = Constants.SCHEME;
         } else {
             throw new IllegalArgumentException(c.d.b.a.a.s("unexpected scheme: ", str2));
         }
@@ -102,7 +104,7 @@ public final class a {
         StringBuilder sb;
         StringBuilder K = c.d.b.a.a.K("Address{");
         K.append(this.a.g);
-        K.append(':');
+        K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         K.append(this.a.h);
         K.append(", ");
         if (this.j != null) {
diff --git a/app/src/main/java/f0/f0/a.java b/app/src/main/java/f0/f0/a.java
index dad3267c06..cfdecd87f7 100644
--- a/app/src/main/java/f0/f0/a.java
+++ b/app/src/main/java/f0/f0/a.java
@@ -1,5 +1,6 @@
 package f0.f0;
 
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import f0.e;
 import f0.t;
@@ -13,7 +14,7 @@ public final class a implements t.b {
 
     @Override // f0.t.b
     public t a(e eVar) {
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         return this.a;
     }
 }
diff --git a/app/src/main/java/f0/f0/c.java b/app/src/main/java/f0/f0/c.java
index 2a834be5b0..0e3d747d8e 100644
--- a/app/src/main/java/f0/f0/c.java
+++ b/app/src/main/java/f0/f0/c.java
@@ -1,6 +1,11 @@
 package f0.f0;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
+import com.discord.api.permission.Permission;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.w;
 import d0.t.u;
 import d0.z.d.m;
@@ -110,7 +115,7 @@ public final class c {
     }
 
     public static final int b(String str, long j, TimeUnit timeUnit) {
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         boolean z2 = false;
         int i = (j > 0 ? 1 : (j == 0 ? 0 : -1));
         if (i >= 0) {
@@ -381,7 +386,7 @@ public final class c {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:11:0x0053, code lost:
-        if (r5 == Long.MAX_VALUE) goto L_0x0055;
+        if (r5 == androidx.recyclerview.widget.RecyclerView.FOREVER_NS) goto L_0x0055;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:12:0x0055, code lost:
         r11.timeout().a();
@@ -390,7 +395,7 @@ public final class c {
         r11.timeout().d(r0 + r5);
      */
     /* JADX WARNING: Code restructure failed: missing block: B:22:0x0080, code lost:
-        if (r5 != Long.MAX_VALUE) goto L_0x005d;
+        if (r5 != androidx.recyclerview.widget.RecyclerView.FOREVER_NS) goto L_0x005d;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:23:0x0083, code lost:
         return r12;
@@ -404,14 +409,14 @@ public final class c {
         xVar.timeout().d(Math.min(c2, timeUnit.toNanos((long) i)) + nanoTime);
         try {
             e eVar = new e();
-            while (xVar.h0(eVar, 8192) != -1) {
+            while (xVar.h0(eVar, Permission.MANAGE_MESSAGES) != -1) {
                 eVar.skip(eVar.j);
             }
             z2 = true;
         } catch (InterruptedIOException unused) {
             z2 = false;
         } catch (Throwable th) {
-            if (c2 == Long.MAX_VALUE) {
+            if (c2 == RecyclerView.FOREVER_NS) {
                 xVar.timeout().a();
             } else {
                 xVar.timeout().d(nanoTime + c2);
@@ -428,7 +433,7 @@ public final class c {
             ByteString byteString2 = bVar.i;
             String q = byteString.q();
             String q2 = byteString2.q();
-            m.checkParameterIsNotNull(q, "name");
+            m.checkParameterIsNotNull(q, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(q2, "value");
             arrayList.add(q);
             arrayList.add(w.trim(q2).toString());
@@ -457,7 +462,7 @@ public final class c {
             m.checkParameterIsNotNull(str, "scheme");
             int hashCode = str.hashCode();
             if (hashCode != 3213448) {
-                if (hashCode == 99617003 && str.equals("https")) {
+                if (hashCode == 99617003 && str.equals(Constants.SCHEME)) {
                     i = 443;
                     if (i2 == i) {
                         return B;
@@ -472,7 +477,7 @@ public final class c {
             if (i2 == i) {
             }
         }
-        return B + ':' + wVar.h;
+        return B + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + wVar.h;
     }
 
     public static final <T> List<T> z(List<? extends T> list) {
diff --git a/app/src/main/java/f0/f0/d/b.java b/app/src/main/java/f0/f0/d/b.java
index 15902a118d..6e46458efe 100644
--- a/app/src/main/java/f0/f0/d/b.java
+++ b/app/src/main/java/f0/f0/d/b.java
@@ -1,5 +1,7 @@
 package f0.f0.d;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.t;
 import d0.t.h0;
 import d0.t.n;
@@ -125,7 +127,7 @@ public final class b implements c {
                             m.checkParameterIsNotNull(userName, "username");
                             m.checkParameterIsNotNull(str4, "password");
                             m.checkParameterIsNotNull(charset, "charset");
-                            String f = ByteString.j.b(userName + ':' + str4, charset).f();
+                            String f = ByteString.j.b(userName + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + str4, charset).f();
                             StringBuilder sb = new StringBuilder();
                             sb.append("Basic ");
                             sb.append(f);
@@ -137,9 +139,9 @@ public final class b implements c {
                             RequestBody requestBody = zVar.e;
                             Map linkedHashMap = !zVar.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(zVar.f);
                             Headers.a e3 = zVar.d.e();
-                            m.checkParameterIsNotNull(str3, "name");
+                            m.checkParameterIsNotNull(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
                             m.checkParameterIsNotNull(sb2, "value");
-                            m.checkParameterIsNotNull(str3, "name");
+                            m.checkParameterIsNotNull(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
                             m.checkParameterIsNotNull(sb2, "value");
                             Headers.b bVar = Headers.i;
                             bVar.a(str3);
@@ -165,7 +167,7 @@ public final class b implements c {
                         m.checkParameterIsNotNull(userName, "username");
                         m.checkParameterIsNotNull(str4, "password");
                         m.checkParameterIsNotNull(charset, "charset");
-                        String f = ByteString.j.b(userName + ':' + str4, charset).f();
+                        String f = ByteString.j.b(userName + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + str4, charset).f();
                         StringBuilder sb = new StringBuilder();
                         sb.append("Basic ");
                         sb.append(f);
@@ -178,9 +180,9 @@ public final class b implements c {
                         if (!zVar.f.isEmpty()) {
                         }
                         Headers.a e3 = zVar.d.e();
-                        m.checkParameterIsNotNull(str3, "name");
+                        m.checkParameterIsNotNull(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         m.checkParameterIsNotNull(sb2, "value");
-                        m.checkParameterIsNotNull(str3, "name");
+                        m.checkParameterIsNotNull(str3, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         m.checkParameterIsNotNull(sb2, "value");
                         Headers.b bVar = Headers.i;
                         bVar.a(str3);
diff --git a/app/src/main/java/f0/f0/e/a.java b/app/src/main/java/f0/f0/e/a.java
index 7c8cca40d6..6c4ccd6501 100644
--- a/app/src/main/java/f0/f0/e/a.java
+++ b/app/src/main/java/f0/f0/e/a.java
@@ -1,5 +1,7 @@
 package f0.f0.e;
 
+import androidx.core.app.NotificationCompat;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.g0.t;
 import d0.g0.w;
 import d0.z.d.m;
@@ -94,7 +96,7 @@ public final class a implements Interceptor {
             aVar.k = -1;
             aVar.l = System.currentTimeMillis();
             Response a = aVar.a();
-            m.checkParameterIsNotNull(eVar, "call");
+            m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(a, "response");
             return a;
         } else if (zVar2 == null) {
@@ -104,12 +106,12 @@ public final class a implements Interceptor {
             Response.a aVar2 = new Response.a(response);
             aVar2.b(C0304a.a(b, response));
             Response a2 = aVar2.a();
-            m.checkParameterIsNotNull(eVar, "call");
+            m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(a2, "response");
             return a2;
         } else {
             if (response != null) {
-                m.checkParameterIsNotNull(eVar, "call");
+                m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                 m.checkParameterIsNotNull(response, "cachedResponse");
             }
             Response a3 = ((g) chain).a(zVar2);
@@ -136,7 +138,7 @@ public final class a implements Interceptor {
                             i = size;
                         }
                         if (aVar4.b(d) || !aVar4.c(d) || headers3.c(d) == null) {
-                            m.checkParameterIsNotNull(d, "name");
+                            m.checkParameterIsNotNull(d, ModelAuditLogEntry.CHANGE_KEY_NAME);
                             m.checkParameterIsNotNull(g, "value");
                             arrayList.add(d);
                             arrayList.add(w.trim(g).toString());
@@ -152,7 +154,7 @@ public final class a implements Interceptor {
                         String d2 = headers3.d(i3);
                         if (!aVar4.b(d2) && aVar4.c(d2)) {
                             String g2 = headers3.g(i3);
-                            m.checkParameterIsNotNull(d2, "name");
+                            m.checkParameterIsNotNull(d2, ModelAuditLogEntry.CHANGE_KEY_NAME);
                             m.checkParameterIsNotNull(g2, "value");
                             arrayList.add(d2);
                             arrayList.add(w.trim(g2).toString());
diff --git a/app/src/main/java/f0/f0/f/a.java b/app/src/main/java/f0/f0/f/a.java
index 0f95ad091e..2f9ee2a4dd 100644
--- a/app/src/main/java/f0/f0/f/a.java
+++ b/app/src/main/java/f0/f0/f/a.java
@@ -1,5 +1,6 @@
 package f0.f0.f;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 /* compiled from: Task.kt */
 public abstract class a {
@@ -11,7 +12,7 @@ public abstract class a {
     public final boolean d;
 
     public a(String str, boolean z2) {
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.f2746c = str;
         this.d = z2;
         this.b = -1;
diff --git a/app/src/main/java/f0/f0/f/c.java b/app/src/main/java/f0/f0/f/c.java
index 04a6d77d1e..2d71d8f051 100644
--- a/app/src/main/java/f0/f0/f/c.java
+++ b/app/src/main/java/f0/f0/f/c.java
@@ -1,6 +1,7 @@
 package f0.f0.f;
 
 import c.q.a.k.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import f0.f0.f.d;
 import java.util.ArrayList;
@@ -22,7 +23,7 @@ public final class c {
 
     public c(d dVar, String str) {
         m.checkParameterIsNotNull(dVar, "taskRunner");
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         this.e = dVar;
         this.f = str;
     }
diff --git a/app/src/main/java/f0/f0/f/d.java b/app/src/main/java/f0/f0/f/d.java
index ab7f1e69b1..be7541faba 100644
--- a/app/src/main/java/f0/f0/f/d.java
+++ b/app/src/main/java/f0/f0/f/d.java
@@ -1,5 +1,7 @@
 package f0.f0.f;
 
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -135,7 +137,7 @@ public final class d {
 
     static {
         String str = f0.f0.c.g + " TaskRunner";
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         a = new d(new c(new f0.f0.b(str, true)));
         Logger logger = Logger.getLogger(d.class.getName());
         m.checkExpressionValueIsNotNull(logger, "Logger.getLogger(TaskRunner::class.java.name)");
@@ -197,7 +199,7 @@ public final class d {
         byte[] bArr = f0.f0.c.a;
         while (!this.h.isEmpty()) {
             long c2 = this.j.c();
-            long j = Long.MAX_VALUE;
+            long j = RecyclerView.FOREVER_NS;
             Iterator<c> it = this.h.iterator();
             a aVar = null;
             while (true) {
diff --git a/app/src/main/java/f0/f0/g/a.java b/app/src/main/java/f0/f0/g/a.java
index 895b3bc589..21032fa04d 100644
--- a/app/src/main/java/f0/f0/g/a.java
+++ b/app/src/main/java/f0/f0/g/a.java
@@ -1,5 +1,6 @@
 package f0.f0.g;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import d0.z.d.m;
 import f0.f0.h.g;
 import f0.x;
@@ -37,7 +38,7 @@ public final class a implements Interceptor {
         m.checkParameterIsNotNull(xVar, "client");
         m.checkParameterIsNotNull(gVar, "chain");
         try {
-            c cVar = new c(eVar, eVar.j, dVar, dVar.a(gVar.g, gVar.h, gVar.i, xVar.L, xVar.q, !m.areEqual(gVar.f.f2814c, "GET")).k(xVar, gVar));
+            c cVar = new c(eVar, eVar.j, dVar, dVar.a(gVar.g, gVar.h, gVar.i, xVar.L, xVar.q, !m.areEqual(gVar.f.f2814c, ShareTarget.METHOD_GET)).k(xVar, gVar));
             eVar.q = cVar;
             eVar.v = cVar;
             synchronized (eVar) {
diff --git a/app/src/main/java/f0/f0/g/c.java b/app/src/main/java/f0/f0/g/c.java
index 83ba6bc314..bf49b91192 100644
--- a/app/src/main/java/f0/f0/g/c.java
+++ b/app/src/main/java/f0/f0/g/c.java
@@ -1,5 +1,6 @@
 package f0.f0.g;
 
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import f0.f0.h.d;
 import f0.f0.n.d;
@@ -139,7 +140,7 @@ public final class c {
                 t tVar = cVar.d;
                 e eVar = cVar.f2750c;
                 Objects.requireNonNull(tVar);
-                m.checkParameterIsNotNull(eVar, "call");
+                m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             }
             return (E) this.o.a(this.j, true, false, e);
         }
@@ -169,7 +170,7 @@ public final class c {
                         t tVar = cVar.d;
                         e eVar2 = cVar.f2750c;
                         Objects.requireNonNull(tVar);
-                        m.checkParameterIsNotNull(eVar2, "call");
+                        m.checkParameterIsNotNull(eVar2, NotificationCompat.CATEGORY_CALL);
                     }
                     if (h02 == -1) {
                         a(null);
@@ -197,7 +198,7 @@ public final class c {
     }
 
     public c(e eVar, t tVar, d dVar, d dVar2) {
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(tVar, "eventListener");
         m.checkParameterIsNotNull(dVar, "finder");
         m.checkParameterIsNotNull(dVar2, "codec");
@@ -217,13 +218,13 @@ public final class c {
                 t tVar = this.d;
                 e eVar = this.f2750c;
                 Objects.requireNonNull(tVar);
-                m.checkParameterIsNotNull(eVar, "call");
+                m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                 m.checkParameterIsNotNull(e, "ioe");
             } else {
                 t tVar2 = this.d;
                 e eVar2 = this.f2750c;
                 Objects.requireNonNull(tVar2);
-                m.checkParameterIsNotNull(eVar2, "call");
+                m.checkParameterIsNotNull(eVar2, NotificationCompat.CATEGORY_CALL);
             }
         }
         if (z2) {
@@ -231,13 +232,13 @@ public final class c {
                 t tVar3 = this.d;
                 e eVar3 = this.f2750c;
                 Objects.requireNonNull(tVar3);
-                m.checkParameterIsNotNull(eVar3, "call");
+                m.checkParameterIsNotNull(eVar3, NotificationCompat.CATEGORY_CALL);
                 m.checkParameterIsNotNull(e, "ioe");
             } else {
                 t tVar4 = this.d;
                 e eVar4 = this.f2750c;
                 Objects.requireNonNull(tVar4);
-                m.checkParameterIsNotNull(eVar4, "call");
+                m.checkParameterIsNotNull(eVar4, NotificationCompat.CATEGORY_CALL);
             }
         }
         return (E) this.f2750c.k(this, z3, z2, e);
@@ -254,7 +255,7 @@ public final class c {
         t tVar = this.d;
         e eVar = this.f2750c;
         Objects.requireNonNull(tVar);
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         return new a(this, this.f.h(zVar, contentLength), contentLength);
     }
 
@@ -265,7 +266,7 @@ public final class c {
             t tVar = this.d;
             e eVar = this.f2750c;
             Objects.requireNonNull(tVar);
-            m.checkParameterIsNotNull(eVar, "call");
+            m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(e, "ioe");
             g(e);
             throw e;
@@ -306,7 +307,7 @@ public final class c {
             t tVar = this.d;
             e eVar = this.f2750c;
             Objects.requireNonNull(tVar);
-            m.checkParameterIsNotNull(eVar, "call");
+            m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(e, "ioe");
             g(e);
             throw e;
@@ -317,7 +318,7 @@ public final class c {
         t tVar = this.d;
         e eVar = this.f2750c;
         Objects.requireNonNull(tVar);
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
     }
 
     public final void g(IOException iOException) {
@@ -325,7 +326,7 @@ public final class c {
         j e = this.f.e();
         e eVar = this.f2750c;
         synchronized (e) {
-            m.checkParameterIsNotNull(eVar, "call");
+            m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             if (iOException instanceof StreamResetException) {
                 if (((StreamResetException) iOException).errorCode == f0.f0.j.a.REFUSED_STREAM) {
                     int i = e.m + 1;
diff --git a/app/src/main/java/f0/f0/g/d.java b/app/src/main/java/f0/f0/g/d.java
index 57c91363d6..30052f41ba 100644
--- a/app/src/main/java/f0/f0/g/d.java
+++ b/app/src/main/java/f0/f0/g/d.java
@@ -1,5 +1,7 @@
 package f0.f0.g;
 
+import androidx.core.app.NotificationCompat;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.t.r;
 import f0.a;
 import f0.d0;
@@ -40,7 +42,7 @@ public final class d {
     public d(k kVar, a aVar, e eVar, t tVar) {
         d0.z.d.m.checkParameterIsNotNull(kVar, "connectionPool");
         d0.z.d.m.checkParameterIsNotNull(aVar, "address");
-        d0.z.d.m.checkParameterIsNotNull(eVar, "call");
+        d0.z.d.m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         d0.z.d.m.checkParameterIsNotNull(tVar, "eventListener");
         this.g = kVar;
         this.h = aVar;
@@ -106,7 +108,7 @@ public final class d {
                     t tVar = this.j;
                     e eVar = this.i;
                     Objects.requireNonNull(tVar);
-                    d0.z.d.m.checkParameterIsNotNull(eVar, "call");
+                    d0.z.d.m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                     d0.z.d.m.checkParameterIsNotNull(jVar, "connection");
                 }
             }
@@ -174,14 +176,14 @@ public final class d {
                                             t tVar2 = mVar2.h;
                                             e eVar3 = mVar2.g;
                                             Objects.requireNonNull(tVar2);
-                                            d0.z.d.m.checkParameterIsNotNull(eVar3, "call");
+                                            d0.z.d.m.checkParameterIsNotNull(eVar3, NotificationCompat.CATEGORY_CALL);
                                             d0.z.d.m.checkParameterIsNotNull(str, "domainName");
                                             List<InetAddress> a = mVar2.e.d.a(str);
                                             if (!a.isEmpty()) {
                                                 t tVar3 = mVar2.h;
                                                 e eVar4 = mVar2.g;
                                                 Objects.requireNonNull(tVar3);
-                                                d0.z.d.m.checkParameterIsNotNull(eVar4, "call");
+                                                d0.z.d.m.checkParameterIsNotNull(eVar4, NotificationCompat.CATEGORY_CALL);
                                                 d0.z.d.m.checkParameterIsNotNull(str, "domainName");
                                                 d0.z.d.m.checkParameterIsNotNull(a, "inetAddressList");
                                                 for (InetAddress inetAddress : a) {
@@ -208,7 +210,7 @@ public final class d {
                                             break;
                                         }
                                     } else {
-                                        throw new SocketException("No route to " + str + ':' + i5 + "; port is out of range");
+                                        throw new SocketException("No route to " + str + MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR + i5 + "; port is out of range");
                                     }
                                 } else {
                                     StringBuilder K2 = c.d.b.a.a.K("No route to ");
@@ -267,7 +269,7 @@ public final class d {
                                     t tVar4 = this.j;
                                     e eVar5 = this.i;
                                     Objects.requireNonNull(tVar4);
-                                    d0.z.d.m.checkParameterIsNotNull(eVar5, "call");
+                                    d0.z.d.m.checkParameterIsNotNull(eVar5, NotificationCompat.CATEGORY_CALL);
                                     d0.z.d.m.checkParameterIsNotNull(jVar2, "connection");
                                     z4 = z3;
                                     jVar = jVar2;
@@ -315,7 +317,7 @@ public final class d {
     }
 
     public final void c(IOException iOException) {
-        d0.z.d.m.checkParameterIsNotNull(iOException, "e");
+        d0.z.d.m.checkParameterIsNotNull(iOException, c.a.r.n0.c.e.a);
         this.f = null;
         if ((iOException instanceof StreamResetException) && ((StreamResetException) iOException).errorCode == f0.f0.j.a.REFUSED_STREAM) {
             this.f2751c++;
diff --git a/app/src/main/java/f0/f0/g/e.java b/app/src/main/java/f0/f0/g/e.java
index 40be52c123..7bd175fde9 100644
--- a/app/src/main/java/f0/f0/g/e.java
+++ b/app/src/main/java/f0/f0/g/e.java
@@ -1,5 +1,6 @@
 package f0.f0.g;
 
+import androidx.core.app.NotificationCompat;
 import d0.t.r;
 import d0.z.d.m;
 import f0.f;
@@ -169,7 +170,7 @@ public final class e implements f0.e {
     public static final String b(e eVar) {
         StringBuilder sb = new StringBuilder();
         sb.append(eVar.u ? "canceled " : "");
-        sb.append(eVar.f2755z ? "web socket" : "call");
+        sb.append(eVar.f2755z ? "web socket" : NotificationCompat.CATEGORY_CALL);
         sb.append(" to ");
         sb.append(eVar.f2754y.b.h());
         return sb.toString();
@@ -194,7 +195,7 @@ public final class e implements f0.e {
                 f0.f0.c.e(socket);
             }
             Objects.requireNonNull(this.j);
-            m.checkParameterIsNotNull(this, "call");
+            m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
         }
     }
 
@@ -217,7 +218,7 @@ public final class e implements f0.e {
             q qVar = this.f2753x.l;
             a aVar2 = new a(this, fVar);
             Objects.requireNonNull(qVar);
-            m.checkParameterIsNotNull(aVar2, "call");
+            m.checkParameterIsNotNull(aVar2, NotificationCompat.CATEGORY_CALL);
             synchronized (qVar) {
                 qVar.b.add(aVar2);
                 if (!aVar2.k.f2755z) {
@@ -264,14 +265,14 @@ public final class e implements f0.e {
             try {
                 q qVar2 = this.f2753x.l;
                 synchronized (qVar2) {
-                    m.checkParameterIsNotNull(this, "call");
+                    m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
                     qVar2.d.add(this);
                 }
                 return j();
             } finally {
                 qVar = this.f2753x.l;
                 Objects.requireNonNull(qVar);
-                m.checkParameterIsNotNull(this, "call");
+                m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
                 qVar.b(qVar.d, this);
             }
         } else {
@@ -304,7 +305,7 @@ public final class e implements f0.e {
                     f0.f0.c.e(m);
                 }
                 Objects.requireNonNull(this.j);
-                m.checkParameterIsNotNull(this, "call");
+                m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
                 m.checkParameterIsNotNull(jVar, "connection");
             } else {
                 if (!(m == null)) {
@@ -328,11 +329,11 @@ public final class e implements f0.e {
                 m.throwNpe();
             }
             Objects.requireNonNull(tVar);
-            m.checkParameterIsNotNull(this, "call");
+            m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(interruptedIOException, "ioe");
         } else {
             Objects.requireNonNull(this.j);
-            m.checkParameterIsNotNull(this, "call");
+            m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
         }
         return interruptedIOException;
     }
@@ -341,7 +342,7 @@ public final class e implements f0.e {
         h.a aVar = h.f2778c;
         this.m = h.a.g("response.body().close()");
         Objects.requireNonNull(this.j);
-        m.checkParameterIsNotNull(this, "call");
+        m.checkParameterIsNotNull(this, NotificationCompat.CATEGORY_CALL);
     }
 
     public final void i(boolean z2) {
diff --git a/app/src/main/java/f0/f0/g/j.java b/app/src/main/java/f0/f0/g/j.java
index e31fd7c75d..a49b85dc5c 100644
--- a/app/src/main/java/f0/f0/g/j.java
+++ b/app/src/main/java/f0/f0/g/j.java
@@ -1,5 +1,9 @@
 package f0.f0.g;
 
+import androidx.core.app.NotificationCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.t.u;
 import d0.z.d.m;
 import f0.d0;
@@ -76,7 +80,7 @@ public final class j extends e.c implements k {
     public int m;
     public int n = 1;
     public final List<Reference<e>> o = new ArrayList();
-    public long p = Long.MAX_VALUE;
+    public long p = RecyclerView.FOREVER_NS;
     public final d0 q;
 
     public j(k kVar, d0 d0Var) {
@@ -109,7 +113,7 @@ public final class j extends e.c implements k {
         Socket socket;
         Socket socket2;
         boolean z3;
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(tVar, "eventListener");
         if (this.e == null) {
             List<f0.m> list = this.q.a.f2742c;
@@ -163,7 +167,7 @@ public final class j extends e.c implements k {
                             InetSocketAddress inetSocketAddress = d0Var.f2744c;
                             Proxy proxy = d0Var.b;
                             Objects.requireNonNull(tVar);
-                            m.checkParameterIsNotNull(eVar, "call");
+                            m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                             m.checkParameterIsNotNull(inetSocketAddress, "inetSocketAddress");
                             m.checkParameterIsNotNull(proxy, "proxy");
                             m.checkParameterIsNotNull(e, "ioe");
@@ -180,7 +184,7 @@ public final class j extends e.c implements k {
                         InetSocketAddress inetSocketAddress2 = d0Var2.f2744c;
                         Proxy proxy2 = d0Var2.b;
                         Objects.requireNonNull(tVar);
-                        m.checkParameterIsNotNull(eVar, "call");
+                        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                         m.checkParameterIsNotNull(inetSocketAddress2, "inetSocketAddress");
                         m.checkParameterIsNotNull(proxy2, "proxy");
                         if (this.q.a()) {
@@ -212,7 +216,7 @@ public final class j extends e.c implements k {
                     InetSocketAddress inetSocketAddress = d0Var.f2744c;
                     Proxy proxy = d0Var.b;
                     Objects.requireNonNull(tVar);
-                    m.checkParameterIsNotNull(eVar, "call");
+                    m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                     m.checkParameterIsNotNull(inetSocketAddress, "inetSocketAddress");
                     m.checkParameterIsNotNull(proxy, "proxy");
                     m.checkParameterIsNotNull(e, "ioe");
@@ -224,7 +228,7 @@ public final class j extends e.c implements k {
                     if (z2) {
                         break;
                     }
-                    m.checkParameterIsNotNull(e, "e");
+                    m.checkParameterIsNotNull(e, c.a.r.n0.c.e.a);
                     bVar.f2749c = true;
                     if (bVar.b && !(e instanceof ProtocolException) && !(e instanceof InterruptedIOException) && ((!(e instanceof SSLHandshakeException) || !(e.getCause() instanceof CertificateException)) && !(e instanceof SSLPeerUnverifiedException) && (e instanceof SSLException))) {
                         z3 = true;
@@ -276,7 +280,7 @@ public final class j extends e.c implements k {
         this.b = socket;
         InetSocketAddress inetSocketAddress = this.q.f2744c;
         Objects.requireNonNull(tVar);
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(inetSocketAddress, "inetSocketAddress");
         m.checkParameterIsNotNull(proxy, "proxy");
         socket.setSoTimeout(i2);
@@ -322,11 +326,11 @@ public final class j extends e.c implements k {
         aVar2.g = c.f2745c;
         aVar2.k = -1;
         aVar2.l = -1;
-        m.checkParameterIsNotNull("Proxy-Authenticate", "name");
+        m.checkParameterIsNotNull("Proxy-Authenticate", ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull("OkHttp-Preemptive", "value");
         Headers.a aVar3 = aVar2.f;
         Objects.requireNonNull(aVar3);
-        m.checkParameterIsNotNull("Proxy-Authenticate", "name");
+        m.checkParameterIsNotNull("Proxy-Authenticate", ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull("OkHttp-Preemptive", "value");
         Headers.b bVar = Headers.i;
         bVar.a("Proxy-Authenticate");
@@ -410,7 +414,7 @@ public final class j extends e.c implements k {
                 InetSocketAddress inetSocketAddress = d0Var3.f2744c;
                 Proxy proxy = d0Var3.b;
                 Objects.requireNonNull(tVar);
-                m.checkParameterIsNotNull(eVar, "call");
+                m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                 m.checkParameterIsNotNull(inetSocketAddress, "inetSocketAddress");
                 m.checkParameterIsNotNull(proxy, "proxy");
                 i4++;
@@ -443,7 +447,7 @@ public final class j extends e.c implements k {
             return;
         }
         Objects.requireNonNull(tVar);
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         f0.a aVar2 = this.q.a;
         SSLSocketFactory sSLSocketFactory = aVar2.f;
         if (sSLSocketFactory == null) {
@@ -529,7 +533,7 @@ public final class j extends e.c implements k {
                 this.e = yVar;
                 h.a aVar5 = h.f2778c;
                 h.a.a(sSLSocket);
-                m.checkParameterIsNotNull(eVar, "call");
+                m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
                 if (this.e == y.HTTP_2) {
                     o(i);
                 }
@@ -846,7 +850,7 @@ public final class j extends e.c implements k {
         Object obj;
         StringBuilder K = c.d.b.a.a.K("Connection{");
         K.append(this.q.a.a.g);
-        K.append(':');
+        K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
         K.append(this.q.a.a.h);
         K.append(',');
         K.append(" proxy=");
diff --git a/app/src/main/java/f0/f0/g/k.java b/app/src/main/java/f0/f0/g/k.java
index 434ba576fb..daf50a0363 100644
--- a/app/src/main/java/f0/f0/g/k.java
+++ b/app/src/main/java/f0/f0/g/k.java
@@ -1,5 +1,6 @@
 package f0.f0.g;
 
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 import f0.d0;
 import f0.f0.f.c;
@@ -101,7 +102,7 @@ public final class k {
 
     public final boolean a(f0.a aVar, e eVar, List<d0> list, boolean z2) {
         m.checkParameterIsNotNull(aVar, "address");
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         Iterator<j> it = this.d.iterator();
         while (it.hasNext()) {
             j next = it.next();
diff --git a/app/src/main/java/f0/f0/g/m.java b/app/src/main/java/f0/f0/g/m.java
index ef732a8cdd..0a5f9e1219 100644
--- a/app/src/main/java/f0/f0/g/m.java
+++ b/app/src/main/java/f0/f0/g/m.java
@@ -1,5 +1,6 @@
 package f0.f0.g;
 
+import androidx.core.app.NotificationCompat;
 import d0.t.n;
 import f0.d0;
 import f0.e;
@@ -52,7 +53,7 @@ public final class m {
     public m(f0.a aVar, l lVar, e eVar, t tVar) {
         d0.z.d.m.checkParameterIsNotNull(aVar, "address");
         d0.z.d.m.checkParameterIsNotNull(lVar, "routeDatabase");
-        d0.z.d.m.checkParameterIsNotNull(eVar, "call");
+        d0.z.d.m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         d0.z.d.m.checkParameterIsNotNull(tVar, "eventListener");
         this.e = aVar;
         this.f = lVar;
@@ -61,12 +62,12 @@ public final class m {
         w wVar = aVar.a;
         n nVar = new n(this, aVar.j, wVar);
         Objects.requireNonNull(tVar);
-        d0.z.d.m.checkParameterIsNotNull(eVar, "call");
+        d0.z.d.m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         d0.z.d.m.checkParameterIsNotNull(wVar, "url");
         List<? extends Proxy> invoke = nVar.mo1invoke();
         this.a = invoke;
         this.b = 0;
-        d0.z.d.m.checkParameterIsNotNull(eVar, "call");
+        d0.z.d.m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         d0.z.d.m.checkParameterIsNotNull(wVar, "url");
         d0.z.d.m.checkParameterIsNotNull(invoke, "proxies");
     }
diff --git a/app/src/main/java/f0/f0/h/b.java b/app/src/main/java/f0/f0/h/b.java
index eaff869157..8a41a79dce 100644
--- a/app/src/main/java/f0/f0/h/b.java
+++ b/app/src/main/java/f0/f0/h/b.java
@@ -1,5 +1,6 @@
 package f0.f0.h;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import d0.z.d.m;
 import f0.f0.g.c;
@@ -51,12 +52,12 @@ public final class b implements Interceptor {
             t tVar = cVar.d;
             e eVar = cVar.f2750c;
             Objects.requireNonNull(tVar);
-            m.checkParameterIsNotNull(eVar, "call");
+            m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
             cVar.f.b(zVar);
             t tVar2 = cVar.d;
             e eVar2 = cVar.f2750c;
             Objects.requireNonNull(tVar2);
-            m.checkParameterIsNotNull(eVar2, "call");
+            m.checkParameterIsNotNull(eVar2, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(zVar, "request");
             Response.a aVar2 = null;
             if (!f.a(zVar.f2814c) || requestBody == null) {
@@ -98,7 +99,7 @@ public final class b implements Interceptor {
                     t tVar3 = cVar.d;
                     e eVar3 = cVar.f2750c;
                     Objects.requireNonNull(tVar3);
-                    m.checkParameterIsNotNull(eVar3, "call");
+                    m.checkParameterIsNotNull(eVar3, NotificationCompat.CATEGORY_CALL);
                     m.checkParameterIsNotNull(e, "ioe");
                     cVar.g(e);
                     throw e;
@@ -139,7 +140,7 @@ public final class b implements Interceptor {
             t tVar4 = cVar.d;
             e eVar4 = cVar.f2750c;
             Objects.requireNonNull(tVar4);
-            m.checkParameterIsNotNull(eVar4, "call");
+            m.checkParameterIsNotNull(eVar4, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(a, "response");
             if (!this.b || i2 != 101) {
                 m.checkParameterIsNotNull(a, "response");
@@ -178,7 +179,7 @@ public final class b implements Interceptor {
                     t tVar5 = cVar.d;
                     e eVar5 = cVar.f2750c;
                     Objects.requireNonNull(tVar5);
-                    m.checkParameterIsNotNull(eVar5, "call");
+                    m.checkParameterIsNotNull(eVar5, NotificationCompat.CATEGORY_CALL);
                     m.checkParameterIsNotNull(e4, "ioe");
                     cVar.g(e4);
                     throw e4;
@@ -234,7 +235,7 @@ public final class b implements Interceptor {
             t tVar6 = cVar.d;
             e eVar6 = cVar.f2750c;
             Objects.requireNonNull(tVar6);
-            m.checkParameterIsNotNull(eVar6, "call");
+            m.checkParameterIsNotNull(eVar6, NotificationCompat.CATEGORY_CALL);
             m.checkParameterIsNotNull(e6, "ioe");
             cVar.g(e6);
             throw e6;
diff --git a/app/src/main/java/f0/f0/h/e.java b/app/src/main/java/f0/f0/h/e.java
index 1e58b0a272..e63f644b65 100644
--- a/app/src/main/java/f0/f0/h/e.java
+++ b/app/src/main/java/f0/f0/h/e.java
@@ -1,6 +1,10 @@
 package f0.f0.h;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.g0.t;
 import d0.t.h0;
 import d0.z.d.m;
@@ -180,7 +184,7 @@ public final class e {
             m.checkParameterIsNotNull(wVar, str3);
             m.checkParameterIsNotNull(headers, "headers");
             Objects.requireNonNull(headers);
-            m.checkParameterIsNotNull("Set-Cookie", "name");
+            m.checkParameterIsNotNull("Set-Cookie", ModelAuditLogEntry.CHANGE_KEY_NAME);
             int size = headers.size();
             int i4 = 0;
             int i5 = 0;
@@ -236,7 +240,7 @@ public final class e {
                                 boolean z4 = false;
                                 boolean z5 = true;
                                 while (true) {
-                                    long j4 = Long.MAX_VALUE;
+                                    long j4 = RecyclerView.FOREVER_NS;
                                     long j5 = Long.MIN_VALUE;
                                     if (i7 < length) {
                                         int f = c.f(str4, ';', i7, length);
@@ -341,7 +345,7 @@ public final class e {
                                         if (str7.length() != str5.length()) {
                                             PublicSuffixDatabase.a aVar2 = PublicSuffixDatabase.d;
                                         }
-                                        String str8 = "/";
+                                        String str8 = AutocompleteViewModel.COMMAND_DISCOVER_TOKEN;
                                         if (str6 != null) {
                                             if (t.startsWith$default(str6, str8, false, 2, null)) {
                                                 str2 = str6;
@@ -349,7 +353,7 @@ public final class e {
                                             }
                                         }
                                         String b2 = wVar.b();
-                                        int lastIndexOf$default = d0.g0.w.lastIndexOf$default((CharSequence) b2, '/', 0, false, 6, (Object) null);
+                                        int lastIndexOf$default = d0.g0.w.lastIndexOf$default((CharSequence) b2, (char) MentionUtilsKt.SLASH_CHAR, 0, false, 6, (Object) null);
                                         if (lastIndexOf$default != 0) {
                                             if (b2 != null) {
                                                 str8 = b2.substring(0, lastIndexOf$default);
diff --git a/app/src/main/java/f0/f0/h/f.java b/app/src/main/java/f0/f0/h/f.java
index 4cfa28fff3..afde158b61 100644
--- a/app/src/main/java/f0/f0/h/f.java
+++ b/app/src/main/java/f0/f0/h/f.java
@@ -1,10 +1,11 @@
 package f0.f0.h;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import d0.z.d.m;
 /* compiled from: HttpMethod.kt */
 public final class f {
     public static final boolean a(String str) {
         m.checkParameterIsNotNull(str, "method");
-        return !m.areEqual(str, "GET") && !m.areEqual(str, "HEAD");
+        return !m.areEqual(str, ShareTarget.METHOD_GET) && !m.areEqual(str, "HEAD");
     }
 }
diff --git a/app/src/main/java/f0/f0/h/g.java b/app/src/main/java/f0/f0/h/g.java
index ec9bed638c..eaa0b5c792 100644
--- a/app/src/main/java/f0/f0/h/g.java
+++ b/app/src/main/java/f0/f0/h/g.java
@@ -1,5 +1,6 @@
 package f0.f0.h;
 
+import androidx.core.app.NotificationCompat;
 import c.d.b.a.a;
 import d0.z.d.m;
 import f0.f0.g.c;
@@ -27,7 +28,7 @@ public final class g implements Interceptor.Chain {
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends okhttp3.Interceptor> */
     /* JADX WARN: Multi-variable type inference failed */
     public g(e eVar, List<? extends Interceptor> list, int i, c cVar, z zVar, int i2, int i3, int i4) {
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(list, "interceptors");
         m.checkParameterIsNotNull(zVar, "request");
         this.b = eVar;
diff --git a/app/src/main/java/f0/f0/h/i.java b/app/src/main/java/f0/f0/h/i.java
index 39f8069ba9..afb7608dfe 100644
--- a/app/src/main/java/f0/f0/h/i.java
+++ b/app/src/main/java/f0/f0/h/i.java
@@ -1,5 +1,6 @@
 package f0.f0.h;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import d0.t.n;
 import d0.t.u;
 import d0.z.d.m;
@@ -137,7 +138,7 @@ public final class i implements Interceptor {
                 }
                 aVar.c(str, requestBody);
             } else {
-                aVar.c("GET", null);
+                aVar.c(ShareTarget.METHOD_GET, null);
             }
             if (!z2) {
                 aVar.d("Transfer-Encoding");
diff --git a/app/src/main/java/f0/f0/i/a.java b/app/src/main/java/f0/f0/i/a.java
index b3ff5334a2..46b8a8ac50 100644
--- a/app/src/main/java/f0/f0/i/a.java
+++ b/app/src/main/java/f0/f0/i/a.java
@@ -1,5 +1,7 @@
 package f0.f0.i;
 
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.w;
 import d0.z.d.m;
 import g0.g;
@@ -24,25 +26,25 @@ public final class a {
                 break;
             }
             m.checkParameterIsNotNull(b, "line");
-            int indexOf$default = w.indexOf$default((CharSequence) b, ':', 1, false, 4, (Object) null);
+            int indexOf$default = w.indexOf$default((CharSequence) b, (char) MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, 1, false, 4, (Object) null);
             if (indexOf$default != -1) {
                 String substring = b.substring(0, indexOf$default);
                 m.checkExpressionValueIsNotNull(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
                 String substring2 = b.substring(indexOf$default + 1);
                 m.checkExpressionValueIsNotNull(substring2, "(this as java.lang.String).substring(startIndex)");
-                m.checkParameterIsNotNull(substring, "name");
+                m.checkParameterIsNotNull(substring, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkParameterIsNotNull(substring2, "value");
                 arrayList.add(substring);
                 arrayList.add(w.trim(substring2).toString());
             } else if (b.charAt(0) == ':') {
                 String substring3 = b.substring(1);
                 m.checkExpressionValueIsNotNull(substring3, "(this as java.lang.String).substring(startIndex)");
-                m.checkParameterIsNotNull("", "name");
+                m.checkParameterIsNotNull("", ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkParameterIsNotNull(substring3, "value");
                 arrayList.add("");
                 arrayList.add(w.trim(substring3).toString());
             } else {
-                m.checkParameterIsNotNull("", "name");
+                m.checkParameterIsNotNull("", ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkParameterIsNotNull(b, "value");
                 arrayList.add("");
                 arrayList.add(w.trim(b).toString());
diff --git a/app/src/main/java/f0/f0/j/b.java b/app/src/main/java/f0/f0/j/b.java
index c502e32441..3216db2b27 100644
--- a/app/src/main/java/f0/f0/j/b.java
+++ b/app/src/main/java/f0/f0/j/b.java
@@ -1,5 +1,6 @@
 package f0.f0.j;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import okio.ByteString;
 /* compiled from: Header.kt */
@@ -29,7 +30,7 @@ public final class b {
     /* JADX WARNING: Illegal instructions before constructor call */
     public b(String str, String str2) {
         this(r0.c(str), r0.c(str2));
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(str2, "value");
         ByteString.a aVar = ByteString.j;
     }
@@ -37,12 +38,12 @@ public final class b {
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public b(ByteString byteString, String str) {
         this(byteString, ByteString.j.c(str));
-        m.checkParameterIsNotNull(byteString, "name");
+        m.checkParameterIsNotNull(byteString, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(str, "value");
     }
 
     public b(ByteString byteString, ByteString byteString2) {
-        m.checkParameterIsNotNull(byteString, "name");
+        m.checkParameterIsNotNull(byteString, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(byteString2, "value");
         this.h = byteString;
         this.i = byteString2;
diff --git a/app/src/main/java/f0/f0/j/c.java b/app/src/main/java/f0/f0/j/c.java
index f4884f0b6f..710d6cdf57 100644
--- a/app/src/main/java/f0/f0/j/c.java
+++ b/app/src/main/java/f0/f0/j/c.java
@@ -1,5 +1,9 @@
 package f0.f0.j;
 
+import androidx.browser.trusted.sharing.ShareTarget;
+import com.adjust.sdk.Constants;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.t.j;
 import d0.z.d.m;
 import f0.f0.j.p;
@@ -490,7 +494,7 @@ public final class c {
         ByteString byteString2 = b.d;
         ByteString byteString3 = b.e;
         ByteString byteString4 = b.b;
-        b[] bVarArr = {bVar, new b(byteString, "GET"), new b(byteString, "POST"), new b(byteString2, "/"), new b(byteString2, "/index.html"), new b(byteString3, "http"), new b(byteString3, "https"), new b(byteString4, "200"), new b(byteString4, "204"), new b(byteString4, "206"), new b(byteString4, "304"), new b(byteString4, "400"), new b(byteString4, "404"), new b(byteString4, "500"), new b("accept-charset", ""), new b("accept-encoding", "gzip, deflate"), new b("accept-language", ""), new b("accept-ranges", ""), new b("accept", ""), new b("access-control-allow-origin", ""), new b("age", ""), new b("allow", ""), new b("authorization", ""), new b("cache-control", ""), new b("content-disposition", ""), new b("content-encoding", ""), new b("content-language", ""), new b("content-length", ""), new b("content-location", ""), new b("content-range", ""), new b("content-type", ""), new b("cookie", ""), new b("date", ""), new b("etag", ""), new b("expect", ""), new b("expires", ""), new b("from", ""), new b("host", ""), new b("if-match", ""), new b("if-modified-since", ""), new b("if-none-match", ""), new b("if-range", ""), new b("if-unmodified-since", ""), new b("last-modified", ""), new b("link", ""), new b("location", ""), new b("max-forwards", ""), new b("proxy-authenticate", ""), new b("proxy-authorization", ""), new b("range", ""), new b("referer", ""), new b("refresh", ""), new b("retry-after", ""), new b("server", ""), new b("set-cookie", ""), new b("strict-transport-security", ""), new b("transfer-encoding", ""), new b("user-agent", ""), new b("vary", ""), new b("via", ""), new b("www-authenticate", "")};
+        b[] bVarArr = {bVar, new b(byteString, ShareTarget.METHOD_GET), new b(byteString, ShareTarget.METHOD_POST), new b(byteString2, AutocompleteViewModel.COMMAND_DISCOVER_TOKEN), new b(byteString2, "/index.html"), new b(byteString3, "http"), new b(byteString3, Constants.SCHEME), new b(byteString4, "200"), new b(byteString4, "204"), new b(byteString4, "206"), new b(byteString4, "304"), new b(byteString4, "400"), new b(byteString4, "404"), new b(byteString4, "500"), new b("accept-charset", ""), new b("accept-encoding", "gzip, deflate"), new b("accept-language", ""), new b("accept-ranges", ""), new b("accept", ""), new b("access-control-allow-origin", ""), new b("age", ""), new b(ModelAuditLogEntry.CHANGE_KEY_PERMISSIONS_GRANTED, ""), new b("authorization", ""), new b("cache-control", ""), new b("content-disposition", ""), new b("content-encoding", ""), new b("content-language", ""), new b("content-length", ""), new b("content-location", ""), new b("content-range", ""), new b("content-type", ""), new b("cookie", ""), new b("date", ""), new b("etag", ""), new b("expect", ""), new b("expires", ""), new b("from", ""), new b("host", ""), new b("if-match", ""), new b("if-modified-since", ""), new b("if-none-match", ""), new b("if-range", ""), new b("if-unmodified-since", ""), new b("last-modified", ""), new b("link", ""), new b("location", ""), new b("max-forwards", ""), new b("proxy-authenticate", ""), new b("proxy-authorization", ""), new b("range", ""), new b("referer", ""), new b("refresh", ""), new b("retry-after", ""), new b("server", ""), new b("set-cookie", ""), new b("strict-transport-security", ""), new b("transfer-encoding", ""), new b("user-agent", ""), new b("vary", ""), new b("via", ""), new b("www-authenticate", "")};
         a = bVarArr;
         LinkedHashMap linkedHashMap = new LinkedHashMap(bVarArr.length);
         int length = bVarArr.length;
@@ -506,7 +510,7 @@ public final class c {
     }
 
     public final ByteString a(ByteString byteString) throws IOException {
-        m.checkParameterIsNotNull(byteString, "name");
+        m.checkParameterIsNotNull(byteString, ModelAuditLogEntry.CHANGE_KEY_NAME);
         int j = byteString.j();
         for (int i = 0; i < j; i++) {
             byte b2 = (byte) 65;
diff --git a/app/src/main/java/f0/f0/j/l.java b/app/src/main/java/f0/f0/j/l.java
index b6a5df05db..05e116905c 100644
--- a/app/src/main/java/f0/f0/j/l.java
+++ b/app/src/main/java/f0/f0/j/l.java
@@ -1,5 +1,6 @@
 package f0.f0.j;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import f0.f0.c;
 import f0.f0.g.j;
@@ -218,7 +219,7 @@ public final class l implements d {
             if (m.areEqual(d, ":status")) {
                 jVar = f0.f0.h.j.a("HTTP/1.1 " + g);
             } else if (!b.contains(d)) {
-                m.checkParameterIsNotNull(d, "name");
+                m.checkParameterIsNotNull(d, ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkParameterIsNotNull(g, "value");
                 arrayList.add(d);
                 arrayList.add(d0.g0.w.trim(g).toString());
diff --git a/app/src/main/java/f0/f0/j/m.java b/app/src/main/java/f0/f0/j/m.java
index ed14ba926c..65bc7e4d71 100644
--- a/app/src/main/java/f0/f0/j/m.java
+++ b/app/src/main/java/f0/f0/j/m.java
@@ -1,5 +1,6 @@
 package f0.f0.j;
 
+import com.discord.api.permission.Permission;
 import d0.d0.f;
 import d0.t.u;
 import f0.f0.j.c;
@@ -497,7 +498,7 @@ public final class m implements Closeable {
 
     public final void d(b bVar, int i2) throws IOException {
         int readInt = this.m.readInt();
-        boolean z2 = (readInt & ((int) 2147483648L)) != 0;
+        boolean z2 = (readInt & ((int) Permission.USE_APPLICATION_COMMANDS)) != 0;
         byte readByte = this.m.readByte();
         byte[] bArr = f0.f0.c.a;
         bVar.g(i2, readInt & Integer.MAX_VALUE, (readByte & 255) + 1, z2);
diff --git a/app/src/main/java/f0/f0/j/n.java b/app/src/main/java/f0/f0/j/n.java
index 8c372b8831..a09a3aebcf 100644
--- a/app/src/main/java/f0/f0/j/n.java
+++ b/app/src/main/java/f0/f0/j/n.java
@@ -1,5 +1,6 @@
 package f0.f0.j;
 
+import com.discord.api.permission.Permission;
 import d0.z.d.m;
 import g0.e;
 import g0.v;
@@ -135,7 +136,7 @@ public final class n {
             m.checkParameterIsNotNull(eVar, "source");
             byte[] bArr = f0.f0.c.a;
             this.i.write(eVar, j);
-            while (this.i.j >= 16384) {
+            while (this.i.j >= Permission.EMBED_LINKS) {
                 a(false);
             }
         }
diff --git a/app/src/main/java/f0/f0/j/o.java b/app/src/main/java/f0/f0/j/o.java
index e45454d26a..5b76bbe09a 100644
--- a/app/src/main/java/f0/f0/j/o.java
+++ b/app/src/main/java/f0/f0/j/o.java
@@ -1,6 +1,7 @@
 package f0.f0.j;
 
 import c.d.b.a.a;
+import com.discord.api.permission.Permission;
 import d0.z.d.m;
 import f0.f0.j.c;
 import g0.e;
@@ -93,7 +94,7 @@ public final class o implements Closeable {
         }
         boolean z2 = true;
         if (i3 <= this.k) {
-            if ((((int) 2147483648L) & i2) != 0) {
+            if ((((int) Permission.USE_APPLICATION_COMMANDS) & i2) != 0) {
                 z2 = false;
             }
             if (z2) {
diff --git a/app/src/main/java/f0/f0/j/p.java b/app/src/main/java/f0/f0/j/p.java
index 74e5647c7f..f9f9e4d00c 100644
--- a/app/src/main/java/f0/f0/j/p.java
+++ b/app/src/main/java/f0/f0/j/p.java
@@ -1,10 +1,11 @@
 package f0.f0.j;
 
+import androidx.core.view.PointerIconCompat;
 import d0.t.j;
 import d0.z.d.m;
 /* compiled from: Huffman.kt */
 public final class p {
-    public static final int[] a = {8184, 8388568, 268435426, 268435427, 268435428, 268435429, 268435430, 268435431, 268435432, 16777194, 1073741820, 268435433, 268435434, 1073741821, 268435435, 268435436, 268435437, 268435438, 268435439, 268435440, 268435441, 268435442, 1073741822, 268435443, 268435444, 268435445, 268435446, 268435447, 268435448, 268435449, 268435450, 268435451, 20, 1016, 1017, 4090, 8185, 21, 248, 2042, 1018, 1019, 249, 2043, 250, 22, 23, 24, 0, 1, 2, 25, 26, 27, 28, 29, 30, 31, 92, 251, 32764, 32, 4091, 1020, 8186, 33, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 252, 115, 253, 8187, 524272, 8188, 16380, 34, 32765, 3, 35, 4, 36, 5, 37, 38, 39, 6, 116, 117, 40, 41, 42, 7, 43, 118, 44, 8, 9, 45, 119, 120, 121, 122, 123, 32766, 2044, 16381, 8189, 268435452, 1048550, 4194258, 1048551, 1048552, 4194259, 4194260, 4194261, 8388569, 4194262, 8388570, 8388571, 8388572, 8388573, 8388574, 16777195, 8388575, 16777196, 16777197, 4194263, 8388576, 16777198, 8388577, 8388578, 8388579, 8388580, 2097116, 4194264, 8388581, 4194265, 8388582, 8388583, 16777199, 4194266, 2097117, 1048553, 4194267, 4194268, 8388584, 8388585, 2097118, 8388586, 4194269, 4194270, 16777200, 2097119, 4194271, 8388587, 8388588, 2097120, 2097121, 4194272, 2097122, 8388589, 4194273, 8388590, 8388591, 1048554, 4194274, 4194275, 4194276, 8388592, 4194277, 4194278, 8388593, 67108832, 67108833, 1048555, 524273, 4194279, 8388594, 4194280, 33554412, 67108834, 67108835, 67108836, 134217694, 134217695, 67108837, 16777201, 33554413, 524274, 2097123, 67108838, 134217696, 134217697, 67108839, 134217698, 16777202, 2097124, 2097125, 67108840, 67108841, 268435453, 134217699, 134217700, 134217701, 1048556, 16777203, 1048557, 2097126, 4194281, 2097127, 2097128, 8388595, 4194282, 4194283, 33554414, 33554415, 16777204, 16777205, 67108842, 8388596, 67108843, 134217702, 67108844, 67108845, 134217703, 134217704, 134217705, 134217706, 134217707, 268435454, 134217708, 134217709, 134217710, 134217711, 134217712, 67108846};
+    public static final int[] a = {8184, 8388568, 268435426, 268435427, 268435428, 268435429, 268435430, 268435431, 268435432, 16777194, 1073741820, 268435433, 268435434, 1073741821, 268435435, 268435436, 268435437, 268435438, 268435439, 268435440, 268435441, 268435442, 1073741822, 268435443, 268435444, 268435445, 268435446, 268435447, 268435448, 268435449, 268435450, 268435451, 20, PointerIconCompat.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW, PointerIconCompat.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW, 4090, 8185, 21, 248, 2042, PointerIconCompat.TYPE_ZOOM_IN, PointerIconCompat.TYPE_ZOOM_OUT, 249, 2043, 250, 22, 23, 24, 0, 1, 2, 25, 26, 27, 28, 29, 30, 31, 92, 251, 32764, 32, 4091, PointerIconCompat.TYPE_GRAB, 8186, 33, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 252, 115, 253, 8187, 524272, 8188, 16380, 34, 32765, 3, 35, 4, 36, 5, 37, 38, 39, 6, 116, 117, 40, 41, 42, 7, 43, 118, 44, 8, 9, 45, 119, 120, 121, 122, 123, 32766, 2044, 16381, 8189, 268435452, 1048550, 4194258, 1048551, 1048552, 4194259, 4194260, 4194261, 8388569, 4194262, 8388570, 8388571, 8388572, 8388573, 8388574, 16777195, 8388575, 16777196, 16777197, 4194263, 8388576, 16777198, 8388577, 8388578, 8388579, 8388580, 2097116, 4194264, 8388581, 4194265, 8388582, 8388583, 16777199, 4194266, 2097117, 1048553, 4194267, 4194268, 8388584, 8388585, 2097118, 8388586, 4194269, 4194270, 16777200, 2097119, 4194271, 8388587, 8388588, 2097120, 2097121, 4194272, 2097122, 8388589, 4194273, 8388590, 8388591, 1048554, 4194274, 4194275, 4194276, 8388592, 4194277, 4194278, 8388593, 67108832, 67108833, 1048555, 524273, 4194279, 8388594, 4194280, 33554412, 67108834, 67108835, 67108836, 134217694, 134217695, 67108837, 16777201, 33554413, 524274, 2097123, 67108838, 134217696, 134217697, 67108839, 134217698, 16777202, 2097124, 2097125, 67108840, 67108841, 268435453, 134217699, 134217700, 134217701, 1048556, 16777203, 1048557, 2097126, 4194281, 2097127, 2097128, 8388595, 4194282, 4194283, 33554414, 33554415, 16777204, 16777205, 67108842, 8388596, 67108843, 134217702, 67108844, 67108845, 134217703, 134217704, 134217705, 134217706, 134217707, 268435454, 134217708, 134217709, 134217710, 134217711, 134217712, 67108846};
     public static final byte[] b = {13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 28, 6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10, 13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6, 15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6, 6, 6, 5, 6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28, 20, 22, 20, 20, 22, 22, 22, 23, 22, 23, 23, 23, 23, 23, 24, 23, 24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23, 24, 22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23, 21, 21, 22, 21, 23, 22, 23, 23, 20, 22, 22, 22, 23, 22, 22, 23, 26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27, 26, 24, 25, 19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27, 20, 24, 20, 21, 22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23, 26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27, 27, 27, 27, 27, 26};
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/f0/f0/k/h.java b/app/src/main/java/f0/f0/k/h.java
index 0f696440df..825c7fd794 100644
--- a/app/src/main/java/f0/f0/k/h.java
+++ b/app/src/main/java/f0/f0/k/h.java
@@ -1,6 +1,7 @@
 package f0.f0.k;
 
 import android.util.Log;
+import androidx.core.os.EnvironmentCompat;
 import d0.t.o;
 import d0.z.d.m;
 import f0.f0.k.b;
@@ -146,7 +147,7 @@ public class h {
         f.a aVar7 = f.e;
         hVar = f.d ? new f() : null;
         if (hVar == null) {
-            String property = System.getProperty("java.specification.version", "unknown");
+            String property = System.getProperty("java.specification.version", EnvironmentCompat.MEDIA_UNKNOWN);
             try {
                 m.checkExpressionValueIsNotNull(property, "jvmVersion");
             } catch (NumberFormatException unused) {
diff --git a/app/src/main/java/f0/f0/k/i/d.java b/app/src/main/java/f0/f0/k/i/d.java
index bd024faea4..c7b6768bcd 100644
--- a/app/src/main/java/f0/f0/k/i/d.java
+++ b/app/src/main/java/f0/f0/k/i/d.java
@@ -2,6 +2,7 @@ package f0.f0.k.i;
 
 import android.util.Log;
 import c.d.b.a.a;
+import com.discord.utilities.rest.SendUtils;
 import d0.g0.w;
 import d0.g0.y;
 import d0.z.d.m;
@@ -51,7 +52,7 @@ public final class d extends Handler {
                     indexOf$default = length;
                 }
                 while (true) {
-                    min = Math.min(indexOf$default, i2 + 4000);
+                    min = Math.min(indexOf$default, i2 + SendUtils.MAX_MESSAGE_CHARACTER_COUNT_PREMIUM);
                     String substring = message.substring(i2, min);
                     m.checkExpressionValueIsNotNull(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
                     Log.println(i, str, substring);
diff --git a/app/src/main/java/f0/f0/n/d.java b/app/src/main/java/f0/f0/n/d.java
index 50488789d7..c88f5455fa 100644
--- a/app/src/main/java/f0/f0/n/d.java
+++ b/app/src/main/java/f0/f0/n/d.java
@@ -1,5 +1,12 @@
 package f0.f0.n;
 
+import androidx.browser.trusted.sharing.ShareTarget;
+import androidx.core.app.NotificationCompat;
+import androidx.core.view.PointerIconCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import com.adjust.sdk.Constants;
+import com.discord.api.permission.Permission;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.g0.t;
 import d0.t.m;
 import f0.f0.n.h;
@@ -203,7 +210,7 @@ public final class d implements WebSocket, h.a {
         this.j = new ArrayDeque<>();
         this.k = new ArrayDeque<>();
         this.n = -1;
-        if (d0.z.d.m.areEqual("GET", zVar.f2814c)) {
+        if (d0.z.d.m.areEqual(ShareTarget.METHOD_GET, zVar.f2814c)) {
             ByteString.a aVar = ByteString.j;
             byte[] bArr = new byte[16];
             random.nextBytes(bArr);
@@ -217,13 +224,13 @@ public final class d implements WebSocket, h.a {
 
     @Override // okhttp3.WebSocket
     public boolean a(String str) {
-        d0.z.d.m.checkParameterIsNotNull(str, "text");
+        d0.z.d.m.checkParameterIsNotNull(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         ByteString c2 = ByteString.j.c(str);
         synchronized (this) {
             if (!this.p) {
                 if (!this.m) {
-                    if (this.l + ((long) c2.j()) > 16777216) {
-                        e(1001, null);
+                    if (this.l + ((long) c2.j()) > Permission.MOVE_MEMBERS) {
+                        e(PointerIconCompat.TYPE_CONTEXT_MENU, null);
                         return false;
                     }
                     this.l += (long) c2.j();
@@ -244,7 +251,7 @@ public final class d implements WebSocket, h.a {
 
     @Override // f0.f0.n.h.a
     public void c(String str) throws IOException {
-        d0.z.d.m.checkParameterIsNotNull(str, "text");
+        d0.z.d.m.checkParameterIsNotNull(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
         this.v.onMessage(this, str);
     }
 
@@ -308,7 +315,7 @@ public final class d implements WebSocket, h.a {
         c cVar;
         i iVar;
         h hVar;
-        d0.z.d.m.checkParameterIsNotNull(str, "reason");
+        d0.z.d.m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
         boolean z2 = false;
         if (i != -1) {
             synchronized (this) {
@@ -414,7 +421,7 @@ public final class d implements WebSocket, h.a {
                 if (t.equals("websocket", a3, true)) {
                     String a4 = Response.a(response, "Sec-WebSocket-Accept", null, 2);
                     ByteString.a aVar = ByteString.j;
-                    String f2 = aVar.c(this.b + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").g("SHA-1").f();
+                    String f2 = aVar.c(this.b + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").g(Constants.SHA1).f();
                     if (!d0.z.d.m.areEqual(f2, a4)) {
                         throw new ProtocolException("Expected 'Sec-WebSocket-Accept' header value '" + f2 + "' but was '" + a4 + '\'');
                     } else if (cVar == null) {
@@ -438,7 +445,7 @@ public final class d implements WebSocket, h.a {
         c cVar;
         h hVar;
         i iVar;
-        d0.z.d.m.checkParameterIsNotNull(exc, "e");
+        d0.z.d.m.checkParameterIsNotNull(exc, c.a.r.n0.c.e.a);
         synchronized (this) {
             if (!this.p) {
                 this.p = true;
@@ -517,7 +524,7 @@ public final class d implements WebSocket, h.a {
     }
 
     public final void j(String str, c cVar) throws IOException {
-        d0.z.d.m.checkParameterIsNotNull(str, "name");
+        d0.z.d.m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         d0.z.d.m.checkParameterIsNotNull(cVar, "streams");
         f fVar = this.f2785y;
         if (fVar == null) {
@@ -593,7 +600,7 @@ public final class d implements WebSocket, h.a {
                                     cVar.i.W(65535);
                                     long bytesRead = cVar.j.getBytesRead() + cVar.i.j;
                                     do {
-                                        cVar.k.a(eVar2, Long.MAX_VALUE);
+                                        cVar.k.a(eVar2, RecyclerView.FOREVER_NS);
                                     } while (cVar.j.getBytesRead() < bytesRead);
                                 } else {
                                     throw new IllegalArgumentException("Failed requirement.".toString());
diff --git a/app/src/main/java/f0/f0/n/e.java b/app/src/main/java/f0/f0/n/e.java
index f49844ada6..38bda31d47 100644
--- a/app/src/main/java/f0/f0/n/e.java
+++ b/app/src/main/java/f0/f0/n/e.java
@@ -1,5 +1,7 @@
 package f0.f0.n;
 
+import androidx.core.app.NotificationCompat;
+import androidx.core.view.PointerIconCompat;
 import d0.g0.s;
 import d0.g0.t;
 import d0.g0.w;
@@ -24,7 +26,7 @@ public final class e implements f {
     @Override // f0.f
     public void a(f0.e eVar, Response response) {
         int intValue;
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(response, "response");
         c cVar = response.u;
         try {
@@ -114,7 +116,7 @@ public final class e implements f {
             if (!(!z5 && num == null && (num2 == null || (8 <= (intValue = num2.intValue()) && 15 >= intValue)))) {
                 synchronized (this.a) {
                     this.a.k.clear();
-                    this.a.e(1010, "unexpected Sec-WebSocket-Extensions in response header");
+                    this.a.e(PointerIconCompat.TYPE_ALIAS, "unexpected Sec-WebSocket-Extensions in response header");
                 }
             }
             try {
@@ -143,8 +145,8 @@ public final class e implements f {
 
     @Override // f0.f
     public void b(f0.e eVar, IOException iOException) {
-        m.checkParameterIsNotNull(eVar, "call");
-        m.checkParameterIsNotNull(iOException, "e");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
+        m.checkParameterIsNotNull(iOException, c.a.r.n0.c.e.a);
         this.a.i(iOException, null);
     }
 }
diff --git a/app/src/main/java/f0/g.java b/app/src/main/java/f0/g.java
index 65ff7a816a..ad6d5e0790 100644
--- a/app/src/main/java/f0/g.java
+++ b/app/src/main/java/f0/g.java
@@ -1,5 +1,7 @@
 package f0;
 
+import com.adjust.sdk.Constants;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.t;
 import d0.t.n;
 import d0.t.u;
@@ -45,7 +47,7 @@ public final class g {
             m.checkExpressionValueIsNotNull(publicKey, "publicKey");
             byte[] encoded = publicKey.getEncoded();
             m.checkExpressionValueIsNotNull(encoded, "publicKey.encoded");
-            return ByteString.a.d(aVar, encoded, 0, 0, 3).g("SHA-256");
+            return ByteString.a.d(aVar, encoded, 0, 0, 3).g(Constants.SHA256);
         }
     }
 
@@ -78,7 +80,7 @@ public final class g {
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append((String) null);
-            sb.append('/');
+            sb.append(MentionUtilsKt.SLASH_CHAR);
             throw null;
         }
     }
@@ -138,7 +140,7 @@ public final class g {
                     m.checkExpressionValueIsNotNull(publicKey, "publicKey");
                     byte[] encoded = publicKey.getEncoded();
                     m.checkExpressionValueIsNotNull(encoded, "publicKey.encoded");
-                    sb.append(ByteString.a.d(aVar, encoded, 0, 0, 3).g("SHA-256").f());
+                    sb.append(ByteString.a.d(aVar, encoded, 0, 0, 3).g(Constants.SHA256).f());
                     O.append(sb.toString());
                     O.append(": ");
                     Principal subjectDN = x509Certificate2.getSubjectDN();
diff --git a/app/src/main/java/f0/g0/a.java b/app/src/main/java/f0/g0/a.java
index 7ae8838fea..25ed9d079e 100644
--- a/app/src/main/java/f0/g0/a.java
+++ b/app/src/main/java/f0/g0/a.java
@@ -1,5 +1,6 @@
 package f0.g0;
 
+import androidx.recyclerview.widget.RecyclerView;
 import d0.g0.t;
 import d0.t.n0;
 import d0.z.d.m;
@@ -221,7 +222,7 @@ public final class a implements Interceptor {
                     this.d.log("<-- END HTTP (encoded body omitted)");
                 } else {
                     g0.g c2 = responseBody.c();
-                    c2.j(Long.MAX_VALUE);
+                    c2.j(RecyclerView.FOREVER_NS);
                     e g = c2.g();
                     Long l = null;
                     if (t.equals("gzip", headers2.c("Content-Encoding"), true)) {
diff --git a/app/src/main/java/f0/j.java b/app/src/main/java/f0/j.java
index d0f2648bfc..f0abf73b9a 100644
--- a/app/src/main/java/f0/j.java
+++ b/app/src/main/java/f0/j.java
@@ -1,5 +1,6 @@
 package f0;
 
+import com.discord.utilities.font.FontUtils;
 import d0.g0.t;
 import d0.z.d.m;
 import java.util.Comparator;
@@ -179,7 +180,7 @@ public final class j {
         b.a(bVar, "TLS_PSK_WITH_3DES_EDE_CBC_SHA", 139);
         b.a(bVar, "TLS_PSK_WITH_AES_128_CBC_SHA", 140);
         b.a(bVar, "TLS_PSK_WITH_AES_256_CBC_SHA", 141);
-        b.a(bVar, "TLS_RSA_WITH_SEED_CBC_SHA", 150);
+        b.a(bVar, "TLS_RSA_WITH_SEED_CBC_SHA", FontUtils.MAX_FONT_SCALING);
         f = b.a(bVar, "TLS_RSA_WITH_AES_128_GCM_SHA256", 156);
         g = b.a(bVar, "TLS_RSA_WITH_AES_256_GCM_SHA384", 157);
         b.a(bVar, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", 158);
diff --git a/app/src/main/java/f0/n.java b/app/src/main/java/f0/n.java
index f9ca847574..62c8949c8d 100644
--- a/app/src/main/java/f0/n.java
+++ b/app/src/main/java/f0/n.java
@@ -1,6 +1,7 @@
 package f0;
 
 import a0.a.a.b;
+import com.discord.widgets.chat.input.autocomplete.AutocompleteViewModel;
 import d0.g0.t;
 import d0.g0.w;
 import d0.z.d.m;
@@ -190,7 +191,7 @@ public final class n {
         }
         String str3 = this.j;
         String b2 = wVar.b();
-        if (!(m.areEqual(b2, str3) || (t.startsWith$default(b2, str3, false, 2, null) && (t.endsWith$default(str3, "/", false, 2, null) || b2.charAt(str3.length()) == '/')))) {
+        if (!(m.areEqual(b2, str3) || (t.startsWith$default(b2, str3, false, 2, null) && (t.endsWith$default(str3, AutocompleteViewModel.COMMAND_DISCOVER_TOKEN, false, 2, null) || b2.charAt(str3.length()) == '/')))) {
             return false;
         }
         return !this.k || wVar.f2803c;
diff --git a/app/src/main/java/f0/q.java b/app/src/main/java/f0/q.java
index 83b204a92c..22e94de6ee 100644
--- a/app/src/main/java/f0/q.java
+++ b/app/src/main/java/f0/q.java
@@ -1,5 +1,7 @@
 package f0;
 
+import androidx.core.app.NotificationCompat;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import f0.f0.b;
 import f0.f0.c;
@@ -49,7 +51,7 @@ public final class q {
     }
 
     public final void c(e.a aVar) {
-        m.checkParameterIsNotNull(aVar, "call");
+        m.checkParameterIsNotNull(aVar, NotificationCompat.CATEGORY_CALL);
         aVar.i.decrementAndGet();
         b(this.f2799c, aVar);
     }
@@ -91,7 +93,7 @@ public final class q {
                         TimeUnit timeUnit = TimeUnit.SECONDS;
                         SynchronousQueue synchronousQueue = new SynchronousQueue();
                         String str = c.g + " Dispatcher";
-                        m.checkParameterIsNotNull(str, "name");
+                        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
                         this.a = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60, timeUnit, synchronousQueue, new b(str, false));
                     }
                     executorService = this.a;
diff --git a/app/src/main/java/f0/t.java b/app/src/main/java/f0/t.java
index 143e329d1d..d3508cb55d 100644
--- a/app/src/main/java/f0/t.java
+++ b/app/src/main/java/f0/t.java
@@ -1,5 +1,6 @@
 package f0;
 
+import androidx.core.app.NotificationCompat;
 import d0.z.d.m;
 /* compiled from: EventListener.kt */
 public abstract class t {
@@ -15,7 +16,7 @@ public abstract class t {
     }
 
     public void a(e eVar, k kVar) {
-        m.checkParameterIsNotNull(eVar, "call");
+        m.checkParameterIsNotNull(eVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(kVar, "connection");
     }
 }
diff --git a/app/src/main/java/f0/u.java b/app/src/main/java/f0/u.java
index 918ee75e26..e077eec6a2 100644
--- a/app/src/main/java/f0/u.java
+++ b/app/src/main/java/f0/u.java
@@ -1,5 +1,6 @@
 package f0;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import d0.z.d.m;
 import f0.f0.c;
 import g0.e;
@@ -12,7 +13,7 @@ import okhttp3.RequestBody;
 import okio.BufferedSink;
 /* compiled from: FormBody.kt */
 public final class u extends RequestBody {
-    public static final MediaType a = MediaType.a.a("application/x-www-form-urlencoded");
+    public static final MediaType a = MediaType.a.a(ShareTarget.ENCODING_TYPE_URL_ENCODED);
     public final List<String> b;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/f0/w.java b/app/src/main/java/f0/w.java
index 3ba623c84d..d6785ecd92 100644
--- a/app/src/main/java/f0/w.java
+++ b/app/src/main/java/f0/w.java
@@ -1,5 +1,8 @@
 package f0;
 
+import com.adjust.sdk.Constants;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.google.android.material.badge.BadgeDrawable;
 import d0.d0.f;
 import d0.g0.t;
 import d0.t.o;
@@ -124,7 +127,7 @@ public final class w {
             m.checkParameterIsNotNull(str, "scheme");
             int hashCode = str.hashCode();
             if (hashCode != 3213448) {
-                if (hashCode == 99617003 && str.equals("https")) {
+                if (hashCode == 99617003 && str.equals(Constants.SCHEME)) {
                     return 443;
                 }
             } else if (str.equals("http")) {
@@ -201,9 +204,10 @@ public final class w {
             byte[] bArr = c.a;
             int o = c.o(str9, 0, str.length());
             int p = c.p(str9, o, str.length());
-            char c4 = ':';
+            int i20 = p - o;
+            char c4 = MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
             char c5 = 65535;
-            if (p - o >= 2) {
+            if (i20 >= 2) {
                 char charAt2 = str9.charAt(o);
                 char c6 = 'Z';
                 char c7 = 'z';
@@ -225,7 +229,7 @@ public final class w {
             i = -1;
             if (i != -1) {
                 if (t.startsWith(str9, "https:", o, true)) {
-                    this.b = "https";
+                    this.b = Constants.SCHEME;
                     o += 6;
                 } else if (t.startsWith(str9, "http:", o, true)) {
                     this.b = "http";
@@ -243,25 +247,25 @@ public final class w {
             } else {
                 throw new IllegalArgumentException("Expected URL scheme 'http' or 'https' but no colon was found");
             }
-            int i20 = 0;
-            int i21 = o;
+            int i21 = 0;
+            int i22 = o;
             while (true) {
-                c2 = '/';
+                c2 = MentionUtilsKt.SLASH_CHAR;
                 c3 = '\\';
-                if (i21 >= p || !((charAt = str9.charAt(i21)) == '\\' || charAt == '/')) {
+                if (i22 >= p || !((charAt = str9.charAt(i22)) == '\\' || charAt == '/')) {
                     break;
                 }
-                i20++;
                 i21++;
+                i22++;
             }
             char c8 = '?';
-            if (i20 >= 2 || wVar == null || (!m.areEqual(wVar.d, this.b))) {
-                int i22 = o + i20;
-                char c9 = '#';
+            if (i21 >= 2 || wVar == null || (!m.areEqual(wVar.d, this.b))) {
+                int i23 = o + i21;
+                char c9 = MentionUtilsKt.CHANNELS_CHAR;
                 boolean z3 = false;
                 boolean z4 = false;
                 while (true) {
-                    g = c.g(str9, "@/\\?#", i22, p);
+                    g = c.g(str9, "@/\\?#", i23, p);
                     char charAt4 = g != p ? str9.charAt(g) : 65535;
                     if (charAt4 == c5 || charAt4 == c9 || charAt4 == c2 || charAt4 == c3 || charAt4 == c8) {
                         break;
@@ -270,10 +274,10 @@ public final class w {
                         i18 = p;
                     } else {
                         if (!z3) {
-                            int f = c.f(str9, c4, i22, g);
+                            int f = c.f(str9, c4, i23, g);
                             b bVar = w.b;
                             i19 = g;
-                            String a2 = b.a(bVar, str, i22, f, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240);
+                            String a2 = b.a(bVar, str, i23, f, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240);
                             if (z4) {
                                 a2 = this.f2804c + "%40" + a2;
                             }
@@ -292,52 +296,52 @@ public final class w {
                             sb.append(this.d);
                             sb.append("%40");
                             i18 = p;
-                            sb.append(b.a(w.b, str, i22, i19, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240));
+                            sb.append(b.a(w.b, str, i23, i19, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240));
                             this.d = sb.toString();
                             z2 = z3;
                         }
-                        i22 = i19 + 1;
+                        i23 = i19 + 1;
                         z3 = z2;
                     }
-                    c9 = '#';
+                    c9 = MentionUtilsKt.CHANNELS_CHAR;
                     c8 = '?';
                     c3 = '\\';
-                    c2 = '/';
+                    c2 = MentionUtilsKt.SLASH_CHAR;
                     c5 = 65535;
-                    c4 = ':';
+                    c4 = MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR;
                     p = i18;
                 }
                 i2 = p;
-                int i23 = i22;
+                int i24 = i23;
                 while (true) {
-                    if (i23 < g) {
-                        char charAt5 = str9.charAt(i23);
+                    if (i24 < g) {
+                        char charAt5 = str9.charAt(i24);
                         if (charAt5 == ':') {
-                            i14 = i23;
+                            i14 = i24;
                             break;
                         }
                         if (charAt5 == '[') {
                             do {
-                                i23++;
-                                if (i23 >= g) {
+                                i24++;
+                                if (i24 >= g) {
                                     break;
                                 }
-                            } while (str9.charAt(i23) != ']');
+                            } while (str9.charAt(i24) != ']');
                         }
-                        i23++;
+                        i24++;
                     } else {
                         i14 = g;
                         break;
                     }
                 }
-                int i24 = i14 + 1;
+                int i25 = i14 + 1;
                 char c10 = '\"';
-                if (i24 < g) {
+                if (i25 < g) {
                     b bVar2 = w.b;
-                    this.e = c.q.a.k.a.c0(b.d(bVar2, str, i22, i14, false, 4));
-                    i15 = i22;
+                    this.e = c.q.a.k.a.c0(b.d(bVar2, str, i23, i14, false, 4));
+                    i15 = i23;
                     try {
-                        i17 = Integer.parseInt(b.a(bVar2, str, i24, g, "", false, false, false, false, null, 248));
+                        i17 = Integer.parseInt(b.a(bVar2, str, i25, g, "", false, false, false, false, null, 248));
                         if (1 <= i17 && 65535 >= i17) {
                             i16 = 1;
                             this.f = i17;
@@ -346,7 +350,7 @@ public final class w {
                                 i3 = i16;
                             } else {
                                 StringBuilder K2 = c.d.b.a.a.K("Invalid URL port: \"");
-                                String substring2 = str9.substring(i24, g);
+                                String substring2 = str9.substring(i25, g);
                                 m.checkExpressionValueIsNotNull(substring2, "(this as java.lang.Strin…ing(startIndex, endIndex)");
                                 K2.append(substring2);
                                 K2.append('\"');
@@ -361,7 +365,7 @@ public final class w {
                     if (!(i17 == -1)) {
                     }
                 } else {
-                    i15 = i22;
+                    i15 = i23;
                     b bVar3 = w.b;
                     this.e = c.q.a.k.a.c0(b.d(bVar3, str, i15, i14, false, 4));
                     String str10 = this.b;
@@ -443,10 +447,10 @@ public final class w {
                                     str6 = str3;
                                     List<String> list4 = aVar4.g;
                                     int size = list4.size();
-                                    int i25 = r14 == true ? 1 : 0;
                                     int i26 = r14 == true ? 1 : 0;
                                     int i27 = r14 == true ? 1 : 0;
-                                    if (list4.get(size - i25).length() == 0) {
+                                    int i28 = r14 == true ? 1 : 0;
+                                    if (list4.get(size - i26).length() == 0) {
                                         List<String> list5 = aVar4.g;
                                         list5.set(list5.size() - r14, a3);
                                     } else {
@@ -463,10 +467,10 @@ public final class w {
                             if (z5) {
                                 str7 = str6;
                                 str8 = str2;
-                                int i28 = r14 == true ? 1 : 0;
+                                int i29 = r14 == true ? 1 : 0;
                                 Object[] objArr = r14 == true ? 1 : 0;
                                 Object[] objArr2 = r14 == true ? 1 : 0;
-                                i9 = i28;
+                                i9 = i29;
                                 i10 = i6;
                                 aVar5 = aVar2;
                                 i11 = i5;
@@ -526,7 +530,7 @@ public final class w {
                 }
             }
             if (g2 < i4 && str2.charAt(g2) == '?') {
-                int f2 = c.f(str2, '#', g2, i4);
+                int f2 = c.f(str2, MentionUtilsKt.CHANNELS_CHAR, g2, i4);
                 b bVar4 = w.b;
                 aVar.h = bVar4.e(b.a(bVar4, str9, g2 + 1, f2, " \"'<>#", true, false, true, false, null, 208));
                 g2 = f2;
@@ -560,16 +564,16 @@ public final class w {
                 z2 = false;
             }
             if (z2) {
-                sb.append(':');
+                sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
                 sb.append(this.d);
             }
-            sb.append('@');
+            sb.append(MentionUtilsKt.MENTIONS_CHAR);
             String str2 = this.e;
             if (str2 != null) {
                 if (str2 == null) {
                     m.throwNpe();
                 }
-                if (d0.g0.w.contains$default((CharSequence) str2, ':', false, 2, (Object) null)) {
+                if (d0.g0.w.contains$default((CharSequence) str2, (char) MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, false, 2, (Object) null)) {
                     sb.append('[');
                     sb.append(this.e);
                     sb.append(']');
@@ -588,14 +592,14 @@ public final class w {
                     m.checkParameterIsNotNull(str3, "scheme");
                     int hashCode = str3.hashCode();
                     if (hashCode != 3213448) {
-                        if (hashCode == 99617003 && str3.equals("https")) {
+                        if (hashCode == 99617003 && str3.equals(Constants.SCHEME)) {
                             i = 443;
                         }
                     } else if (str3.equals("http")) {
                         i = 80;
                     }
                 }
-                sb.append(':');
+                sb.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
                 sb.append(c2);
             }
             List<String> list = this.g;
@@ -603,7 +607,7 @@ public final class w {
             m.checkParameterIsNotNull(sb, "out");
             int size = list.size();
             for (int i2 = 0; i2 < size; i2++) {
-                sb.append('/');
+                sb.append(MentionUtilsKt.SLASH_CHAR);
                 sb.append(list.get(i2));
             }
             if (this.h != null) {
@@ -638,7 +642,7 @@ public final class w {
                 }
             }
             if (this.i != null) {
-                sb.append('#');
+                sb.append(MentionUtilsKt.CHANNELS_CHAR);
                 sb.append(this.i);
             }
             String sb2 = sb.toString();
@@ -751,7 +755,7 @@ public final class w {
                             z9 = z6;
                             str3 = str4;
                         } else {
-                            eVar.b0(z7 ? "+" : "%2B");
+                            eVar.b0(z7 ? BadgeDrawable.DEFAULT_EXCEED_MAX_BADGE_NUMBER_SUFFIX : "%2B");
                         }
                     }
                     z6 = z9;
@@ -815,7 +819,7 @@ public final class w {
             m.checkParameterIsNotNull(str, "scheme");
             int hashCode = str.hashCode();
             if (hashCode != 3213448) {
-                if (hashCode == 99617003 && str.equals("https")) {
+                if (hashCode == 99617003 && str.equals(Constants.SCHEME)) {
                     return 443;
                 }
             } else if (str.equals("http")) {
@@ -874,15 +878,15 @@ public final class w {
         this.j = list2;
         this.k = str5;
         this.l = str6;
-        this.f2803c = m.areEqual(str, "https");
+        this.f2803c = m.areEqual(str, Constants.SCHEME);
     }
 
     public final String a() {
         if (this.f.length() == 0) {
             return "";
         }
-        int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, ':', this.d.length() + 3, false, 4, (Object) null) + 1;
-        int indexOf$default2 = d0.g0.w.indexOf$default((CharSequence) this.l, '@', 0, false, 6, (Object) null);
+        int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, (char) MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR, this.d.length() + 3, false, 4, (Object) null) + 1;
+        int indexOf$default2 = d0.g0.w.indexOf$default((CharSequence) this.l, (char) MentionUtilsKt.MENTIONS_CHAR, 0, false, 6, (Object) null);
         String str = this.l;
         if (str != null) {
             String substring = str.substring(indexOf$default, indexOf$default2);
@@ -893,7 +897,7 @@ public final class w {
     }
 
     public final String b() {
-        int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, '/', this.d.length() + 3, false, 4, (Object) null);
+        int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, (char) MentionUtilsKt.SLASH_CHAR, this.d.length() + 3, false, 4, (Object) null);
         String str = this.l;
         int g = c.g(str, "?#", indexOf$default, str.length());
         String str2 = this.l;
@@ -906,13 +910,13 @@ public final class w {
     }
 
     public final List<String> c() {
-        int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, '/', this.d.length() + 3, false, 4, (Object) null);
+        int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, (char) MentionUtilsKt.SLASH_CHAR, this.d.length() + 3, false, 4, (Object) null);
         String str = this.l;
         int g = c.g(str, "?#", indexOf$default, str.length());
         ArrayList arrayList = new ArrayList();
         while (indexOf$default < g) {
             int i = indexOf$default + 1;
-            int f = c.f(this.l, '/', i, g);
+            int f = c.f(this.l, MentionUtilsKt.SLASH_CHAR, i, g);
             String str2 = this.l;
             if (str2 != null) {
                 String substring = str2.substring(i, f);
@@ -932,7 +936,7 @@ public final class w {
         }
         int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, '?', 0, false, 6, (Object) null) + 1;
         String str = this.l;
-        int f = c.f(str, '#', indexOf$default, str.length());
+        int f = c.f(str, MentionUtilsKt.CHANNELS_CHAR, indexOf$default, str.length());
         String str2 = this.l;
         if (str2 != null) {
             String substring = str2.substring(indexOf$default, f);
@@ -983,7 +987,7 @@ public final class w {
         int hashCode = str2.hashCode();
         int i3 = -1;
         if (hashCode != 3213448) {
-            if (hashCode == 99617003 && str2.equals("https")) {
+            if (hashCode == 99617003 && str2.equals(Constants.SCHEME)) {
                 i = 443;
                 if (i2 != i) {
                     i3 = this.h;
@@ -995,7 +999,7 @@ public final class w {
                 if (this.k == null) {
                     str = null;
                 } else {
-                    int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, '#', 0, false, 6, (Object) null) + 1;
+                    int indexOf$default = d0.g0.w.indexOf$default((CharSequence) this.l, (char) MentionUtilsKt.CHANNELS_CHAR, 0, false, 6, (Object) null) + 1;
                     String str3 = this.l;
                     if (str3 != null) {
                         str = str3.substring(indexOf$default);
diff --git a/app/src/main/java/f0/x.java b/app/src/main/java/f0/x.java
index 3f417c6042..5952dbf072 100644
--- a/app/src/main/java/f0/x.java
+++ b/app/src/main/java/f0/x.java
@@ -1,5 +1,6 @@
 package f0;
 
+import com.discord.api.permission.Permission;
 import d0.t.r;
 import d0.t.u;
 import d0.z.d.m;
@@ -137,7 +138,7 @@ public class x implements Cloneable, e.a {
             this.f2811x = 10000;
             this.f2812y = 10000;
             this.f2813z = 10000;
-            this.B = 1024;
+            this.B = Permission.VIEW_CHANNEL;
         }
 
         public final a a(long j, TimeUnit timeUnit) {
diff --git a/app/src/main/java/f0/z.java b/app/src/main/java/f0/z.java
index 436d43d8de..354acdb551 100644
--- a/app/src/main/java/f0/z.java
+++ b/app/src/main/java/f0/z.java
@@ -1,5 +1,8 @@
 package f0;
 
+import androidx.browser.trusted.sharing.ShareTarget;
+import com.discord.models.domain.ModelAuditLogEntry;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.g0.t;
 import d0.t.h0;
 import d0.t.n;
@@ -37,7 +40,7 @@ public final class z {
 
         public a() {
             this.e = new LinkedHashMap();
-            this.b = "GET";
+            this.b = ShareTarget.METHOD_GET;
             this.f2815c = new Headers.a();
         }
 
@@ -73,11 +76,11 @@ public final class z {
         }
 
         public a b(String str, String str2) {
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(str2, "value");
             Headers.a aVar = this.f2815c;
             Objects.requireNonNull(aVar);
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(str2, "value");
             Headers.b bVar = Headers.i;
             bVar.a(str);
@@ -93,7 +96,7 @@ public final class z {
             if (str.length() > 0) {
                 if (requestBody == null) {
                     m.checkParameterIsNotNull(str, "method");
-                    if (m.areEqual(str, "POST") || m.areEqual(str, "PUT") || m.areEqual(str, "PATCH") || m.areEqual(str, "PROPPATCH") || m.areEqual(str, "REPORT")) {
+                    if (m.areEqual(str, ShareTarget.METHOD_POST) || m.areEqual(str, "PUT") || m.areEqual(str, "PATCH") || m.areEqual(str, "PROPPATCH") || m.areEqual(str, "REPORT")) {
                         z2 = true;
                     }
                     if (!(!z2)) {
@@ -110,7 +113,7 @@ public final class z {
         }
 
         public a d(String str) {
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             this.f2815c.d(str);
             return this;
         }
@@ -166,7 +169,7 @@ public final class z {
         m.checkParameterIsNotNull(wVar, "url");
         m.checkParameterIsNotNull(str, "method");
         m.checkParameterIsNotNull(headers, "headers");
-        m.checkParameterIsNotNull(map, "tags");
+        m.checkParameterIsNotNull(map, ModelAuditLogEntry.CHANGE_KEY_TAGS);
         this.b = wVar;
         this.f2814c = str;
         this.d = headers;
@@ -185,7 +188,7 @@ public final class z {
     }
 
     public final String b(String str) {
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         return this.d.c(str);
     }
 
@@ -209,7 +212,7 @@ public final class z {
                     K.append(", ");
                 }
                 K.append(str);
-                K.append(':');
+                K.append(MentionUtilsKt.EMOJIS_AND_STICKERS_CHAR);
                 K.append(str2);
                 i = i2;
             }
diff --git a/app/src/main/java/g0/e.java b/app/src/main/java/g0/e.java
index 6bbef73c7c..add82375d8 100644
--- a/app/src/main/java/g0/e.java
+++ b/app/src/main/java/g0/e.java
@@ -1,5 +1,6 @@
 package g0;
 
+import androidx.recyclerview.widget.RecyclerView;
 import d0.g0.c;
 import d0.t.j;
 import d0.z.d.m;
@@ -313,8 +314,8 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
     @Override // g0.g
     public String F(long j) throws EOFException {
         if (j >= 0) {
-            long j2 = Long.MAX_VALUE;
-            if (j != Long.MAX_VALUE) {
+            long j2 = RecyclerView.FOREVER_NS;
+            if (j != RecyclerView.FOREVER_NS) {
                 j2 = j + 1;
             }
             byte b2 = (byte) 10;
@@ -628,7 +629,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
 
     @Override // g0.g
     public String X() throws EOFException {
-        return F(Long.MAX_VALUE);
+        return F(RecyclerView.FOREVER_NS);
     }
 
     @Override // g0.g
diff --git a/app/src/main/java/g0/l.java b/app/src/main/java/g0/l.java
index 203e07e5a0..a4f690be48 100644
--- a/app/src/main/java/g0/l.java
+++ b/app/src/main/java/g0/l.java
@@ -1,5 +1,6 @@
 package g0;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import d0.z.d.m;
 import java.io.EOFException;
@@ -103,7 +104,7 @@ public final class l implements x {
                     this.j.skip(j2);
                 }
                 if (((r >> 3) & 1) == 1) {
-                    long a = this.j.a((byte) 0, 0, Long.MAX_VALUE);
+                    long a = this.j.a((byte) 0, 0, RecyclerView.FOREVER_NS);
                     if (a != -1) {
                         if (z3) {
                             b(this.j.i, 0, a + 1);
@@ -117,7 +118,7 @@ public final class l implements x {
                     z2 = true;
                 }
                 if (z2) {
-                    long a2 = this.j.a((byte) 0, 0, Long.MAX_VALUE);
+                    long a2 = this.j.a((byte) 0, 0, RecyclerView.FOREVER_NS);
                     if (a2 != -1) {
                         if (z3) {
                             b(this.j.i, 0, a2 + 1);
diff --git a/app/src/main/java/g0/r.java b/app/src/main/java/g0/r.java
index f372f434aa..e8eb1db2da 100644
--- a/app/src/main/java/g0/r.java
+++ b/app/src/main/java/g0/r.java
@@ -1,5 +1,6 @@
 package g0;
 
+import androidx.recyclerview.widget.RecyclerView;
 import d0.z.d.m;
 import java.io.EOFException;
 import java.io.IOException;
@@ -115,13 +116,13 @@ public final class r implements g {
     @Override // g0.g
     public String F(long j) {
         if (j >= 0) {
-            long j2 = j == Long.MAX_VALUE ? Long.MAX_VALUE : j + 1;
+            long j2 = j == RecyclerView.FOREVER_NS ? Long.MAX_VALUE : j + 1;
             byte b = (byte) 10;
             long a2 = a(b, 0, j2);
             if (a2 != -1) {
                 return g0.z.a.a(this.i, a2);
             }
-            if (j2 < Long.MAX_VALUE && j(j2) && this.i.r(j2 - 1) == ((byte) 13) && j(1 + j2) && this.i.r(j2) == b) {
+            if (j2 < RecyclerView.FOREVER_NS && j(j2) && this.i.r(j2 - 1) == ((byte) 13) && j(1 + j2) && this.i.r(j2) == b) {
                 return g0.z.a.a(this.i, j2);
             }
             e eVar = new e();
@@ -141,7 +142,7 @@ public final class r implements g {
 
     @Override // g0.g
     public String X() {
-        return F(Long.MAX_VALUE);
+        return F(RecyclerView.FOREVER_NS);
     }
 
     @Override // g0.g
diff --git a/app/src/main/java/h0/a/a/d.java b/app/src/main/java/h0/a/a/d.java
index 5853d6a830..071a8b046a 100644
--- a/app/src/main/java/h0/a/a/d.java
+++ b/app/src/main/java/h0/a/a/d.java
@@ -1,6 +1,12 @@
 package h0.a.a;
 
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.ViewCompat;
 import c.d.b.a.a;
+import com.discord.utilities.font.FontUtils;
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.util.Objects;
 /* compiled from: ClassReader */
 public class d {
@@ -460,13 +466,13 @@ public class d {
                 case 147:
                 case 148:
                 case 149:
-                case 150:
+                case FontUtils.MAX_FONT_SCALING /* 150 */:
                 case 151:
                 case 152:
                 case 172:
                 case 173:
                 case 174:
-                case 175:
+                case HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION /* 175 */:
                 case 176:
                 case 177:
                 case 190:
@@ -497,7 +503,7 @@ public class d {
                 case 132:
                 case 178:
                 case 179:
-                case 180:
+                case BaseTransientBottomBar.ANIMATION_FADE_DURATION /* 180 */:
                 case 181:
                 case 182:
                 case 183:
@@ -1256,13 +1262,13 @@ public class d {
                                                             case 147:
                                                             case 148:
                                                             case 149:
-                                                            case 150:
+                                                            case FontUtils.MAX_FONT_SCALING /* 150 */:
                                                             case 151:
                                                             case 152:
                                                             case 172:
                                                             case 173:
                                                             case 174:
-                                                            case 175:
+                                                            case HideBottomViewOnScrollBehavior.EXIT_ANIMATION_DURATION /* 175 */:
                                                             case 176:
                                                             case 177:
                                                             case 190:
@@ -1799,7 +1805,7 @@ public class d {
                                                                 break;
                                                             case 178:
                                                             case 179:
-                                                            case 180:
+                                                            case BaseTransientBottomBar.ANIMATION_FADE_DURATION /* 180 */:
                                                             case 181:
                                                             case 182:
                                                             case 183:
@@ -2612,13 +2618,13 @@ public class d {
                 case 17:
                 case 18:
                 case 23:
-                    i3 = l & -256;
+                    i3 = l & InputDeviceCompat.SOURCE_ANY;
                     i2 = i + 3;
                     break;
                 case 19:
                 case 20:
                 case 21:
-                    i3 = l & -16777216;
+                    i3 = l & ViewCompat.MEASURED_STATE_MASK;
                     i2 = i + 1;
                     break;
                 case 22:
@@ -2627,7 +2633,7 @@ public class d {
                     switch (i4) {
                         case 64:
                         case 65:
-                            i3 = l & -16777216;
+                            i3 = l & ViewCompat.MEASURED_STATE_MASK;
                             int u = u(i + 1);
                             i2 = i + 3;
                             hVar.j = new p[u];
@@ -2649,7 +2655,7 @@ public class d {
                         case 68:
                         case 69:
                         case 70:
-                            i3 = l & -16777216;
+                            i3 = l & ViewCompat.MEASURED_STATE_MASK;
                             i2 = i + 3;
                             break;
                         case 71:
@@ -2669,7 +2675,7 @@ public class d {
             hVar.i = f != 0 ? null : new x(this.a, i2);
             return (f * 2) + i2 + 1;
         }
-        i3 = l & -65536;
+        i3 = l & SupportMenu.CATEGORY_MASK;
         i2 = i + 2;
         hVar.h = i3;
         int f = f(i2);
@@ -2742,10 +2748,11 @@ public class d {
                     int i7 = (f * 2) + 1 + i2;
                     String t = t(i7, cArr);
                     int i8 = i7 + 2;
+                    int i9 = l & InputDeviceCompat.SOURCE_ANY;
                     r rVar = (r) qVar;
                     Objects.requireNonNull(rVar);
                     c cVar = new c();
-                    c.q.a.k.a.K(l & -256, cVar);
+                    c.q.a.k.a.K(i9, cVar);
                     x.a(xVar, cVar);
                     cVar.j(rVar.d.l(t));
                     cVar.j(0);
diff --git a/app/src/main/java/h0/a/a/m.java b/app/src/main/java/h0/a/a/m.java
index 53c6d09559..b65a658d0e 100644
--- a/app/src/main/java/h0/a/a/m.java
+++ b/app/src/main/java/h0/a/a/m.java
@@ -1,5 +1,7 @@
 package h0.a.a;
 
+import androidx.core.view.ViewCompat;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import h0.a.a.v;
 import java.util.Objects;
 /* compiled from: Frame */
@@ -119,7 +121,7 @@ public class m {
                 return false;
             }
             String str = "java/lang/Object";
-            if ((i4 & -16777216) != (-16777216 & i5)) {
+            if ((i4 & ViewCompat.MEASURED_STATE_MASK) != (-16777216 & i5)) {
                 int i8 = i4 & -268435456;
                 if (i8 != 0 || (i4 & 251658240) == 33554432) {
                     if (!(i8 == 0 || (i4 & 251658240) == 33554432)) {
@@ -152,9 +154,9 @@ public class m {
                         Objects.requireNonNull(vVar.a);
                         ClassLoader classLoader = f.class.getClassLoader();
                         try {
-                            Class<?> cls = Class.forName(str2.replace('/', '.'), false, classLoader);
+                            Class<?> cls = Class.forName(str2.replace(MentionUtilsKt.SLASH_CHAR, '.'), false, classLoader);
                             try {
-                                Class<?> cls2 = Class.forName(str3.replace('/', '.'), false, classLoader);
+                                Class<?> cls2 = Class.forName(str3.replace(MentionUtilsKt.SLASH_CHAR, '.'), false, classLoader);
                                 if (cls.isAssignableFrom(cls2)) {
                                     str = str2;
                                 } else if (cls2.isAssignableFrom(cls)) {
@@ -163,7 +165,7 @@ public class m {
                                     do {
                                         cls = cls.getSuperclass();
                                     } while (!cls.isAssignableFrom(cls2));
-                                    str = cls.getName().replace('.', '/');
+                                    str = cls.getName().replace('.', MentionUtilsKt.SLASH_CHAR);
                                 }
                                 int n2 = vVar.n(str);
                                 v.a aVar = new v.a(vVar.k, 130, j, r);
diff --git a/app/src/main/java/h0/a/a/r.java b/app/src/main/java/h0/a/a/r.java
index 2468e17ea9..090c1fff5e 100644
--- a/app/src/main/java/h0/a/a/r.java
+++ b/app/src/main/java/h0/a/a/r.java
@@ -1,6 +1,8 @@
 package h0.a.a;
 
 import c.q.a.k.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import h0.a.a.v;
 /* compiled from: MethodWriter */
 public final class r extends q {
@@ -190,7 +192,7 @@ public final class r extends q {
                     }
                     i2 = i3 + i6;
                     break;
-                case 180:
+                case BaseTransientBottomBar.ANIMATION_FADE_DURATION /* 180 */:
                     int i9 = this.R;
                     if (charAt == 'D' || charAt == 'J') {
                         i5 = 1;
@@ -1396,7 +1398,7 @@ public final class r extends q {
                         w(i6 + 3, i + 3);
                     }
                 } else if (i7 == 0 && i2 == 1) {
-                    c2 = i5 < 63 ? '@' : 247;
+                    c2 = i5 < 63 ? MentionUtilsKt.MENTIONS_CHAR : 247;
                     if (c2 != 255) {
                     }
                     if (c2 == 0) {
diff --git a/app/src/main/java/h0/a/a/w.java b/app/src/main/java/h0/a/a/w.java
index e5a479b169..c06d07c341 100644
--- a/app/src/main/java/h0/a/a/w.java
+++ b/app/src/main/java/h0/a/a/w.java
@@ -1,6 +1,8 @@
 package h0.a.a;
 
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: Type */
 public final class w {
     public static final w a = new w(0, "VZCBSIFJD", 0, 1);
@@ -125,7 +127,7 @@ public final class w {
             for (int i2 = 0; i2 < length; i2++) {
                 char charAt = name.charAt(i2);
                 if (charAt == '.') {
-                    charAt = '/';
+                    charAt = MentionUtilsKt.SLASH_CHAR;
                 }
                 sb.append(charAt);
             }
@@ -231,7 +233,7 @@ public final class w {
             case 6:
                 return "float";
             case 7:
-                return "long";
+                return Constants.LONG;
             case 8:
                 return "double";
             case 9:
@@ -242,7 +244,7 @@ public final class w {
                 return sb.toString();
             case 10:
             case 12:
-                return this.k.substring(this.l, this.m).replace('/', '.');
+                return this.k.substring(this.l, this.m).replace(MentionUtilsKt.SLASH_CHAR, '.');
             case 11:
             default:
                 throw new AssertionError();
diff --git a/app/src/main/java/h0/c/l0.java b/app/src/main/java/h0/c/l0.java
index 315c8ae484..65e9311577 100644
--- a/app/src/main/java/h0/c/l0.java
+++ b/app/src/main/java/h0/c/l0.java
@@ -3,6 +3,7 @@ package h0.c;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.view.WindowManager;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import org.webrtc.TextureBufferImpl;
 import org.webrtc.VideoFrame;
 /* compiled from: CameraSession */
@@ -20,12 +21,9 @@ public final /* synthetic */ class l0 {
 
     public static int b(Context context) {
         int rotation = ((WindowManager) context.getSystemService("window")).getDefaultDisplay().getRotation();
-        if (rotation == 1) {
-            return 90;
+        if (rotation != 1) {
+            return rotation != 2 ? rotation != 3 ? 0 : 270 : BaseTransientBottomBar.ANIMATION_FADE_DURATION;
         }
-        if (rotation != 2) {
-            return rotation != 3 ? 0 : 270;
-        }
-        return 180;
+        return 90;
     }
 }
diff --git a/app/src/main/java/i0/e0/a/b.java b/app/src/main/java/i0/e0/a/b.java
index 0b12e8225e..33a5262482 100644
--- a/app/src/main/java/i0/e0/a/b.java
+++ b/app/src/main/java/i0/e0/a/b.java
@@ -1,5 +1,6 @@
 package i0.e0.a;
 
+import com.adjust.sdk.Constants;
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonWriter;
@@ -14,7 +15,7 @@ import okhttp3.RequestBody;
 /* compiled from: GsonRequestBodyConverter */
 public final class b<T> implements h<T, RequestBody> {
     public static final MediaType a = MediaType.a.a("application/json; charset=UTF-8");
-    public static final Charset b = Charset.forName("UTF-8");
+    public static final Charset b = Charset.forName(Constants.ENCODING);
 
     /* renamed from: c  reason: collision with root package name */
     public final Gson f2853c;
diff --git a/app/src/main/java/i0/m.java b/app/src/main/java/i0/m.java
index 6a21351a2b..1bb8eff2ef 100644
--- a/app/src/main/java/i0/m.java
+++ b/app/src/main/java/i0/m.java
@@ -1,5 +1,6 @@
 package i0;
 
+import androidx.core.app.NotificationCompat;
 import d0.k;
 import d0.l;
 import f0.z;
@@ -19,7 +20,7 @@ public final class m implements f<T> {
 
     @Override // i0.f
     public void a(d<T> dVar, Throwable th) {
-        d0.z.d.m.checkParameterIsNotNull(dVar, "call");
+        d0.z.d.m.checkParameterIsNotNull(dVar, NotificationCompat.CATEGORY_CALL);
         d0.z.d.m.checkParameterIsNotNull(th, "t");
         CancellableContinuation cancellableContinuation = this.a;
         k.a aVar = k.i;
@@ -28,7 +29,7 @@ public final class m implements f<T> {
 
     @Override // i0.f
     public void b(d<T> dVar, Response<T> response) {
-        d0.z.d.m.checkParameterIsNotNull(dVar, "call");
+        d0.z.d.m.checkParameterIsNotNull(dVar, NotificationCompat.CATEGORY_CALL);
         d0.z.d.m.checkParameterIsNotNull(response, "response");
         if (response.a()) {
             T t = response.b;
diff --git a/app/src/main/java/i0/o.java b/app/src/main/java/i0/o.java
index dc5b104875..bfa8dbb712 100644
--- a/app/src/main/java/i0/o.java
+++ b/app/src/main/java/i0/o.java
@@ -1,5 +1,6 @@
 package i0;
 
+import androidx.core.app.NotificationCompat;
 import d0.k;
 import d0.l;
 import d0.z.d.m;
@@ -15,7 +16,7 @@ public final class o implements f<T> {
 
     @Override // i0.f
     public void a(d<T> dVar, Throwable th) {
-        m.checkParameterIsNotNull(dVar, "call");
+        m.checkParameterIsNotNull(dVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(th, "t");
         CancellableContinuation cancellableContinuation = this.a;
         k.a aVar = k.i;
@@ -24,7 +25,7 @@ public final class o implements f<T> {
 
     @Override // i0.f
     public void b(d<T> dVar, Response<T> response) {
-        m.checkParameterIsNotNull(dVar, "call");
+        m.checkParameterIsNotNull(dVar, NotificationCompat.CATEGORY_CALL);
         m.checkParameterIsNotNull(response, "response");
         CancellableContinuation cancellableContinuation = this.a;
         k.a aVar = k.i;
diff --git a/app/src/main/java/i0/v.java b/app/src/main/java/i0/v.java
index 1756fced4b..c90b15372c 100644
--- a/app/src/main/java/i0/v.java
+++ b/app/src/main/java/i0/v.java
@@ -1,5 +1,6 @@
 package i0;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import f0.u;
 import f0.w;
@@ -82,7 +83,7 @@ public final class v {
         if (z2) {
             u.a aVar = this.l;
             Objects.requireNonNull(aVar);
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(str2, "value");
             List<String> list = aVar.a;
             w.b bVar = w.b;
@@ -92,7 +93,7 @@ public final class v {
         }
         u.a aVar2 = this.l;
         Objects.requireNonNull(aVar2);
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         m.checkParameterIsNotNull(str2, "value");
         List<String> list2 = aVar2.a;
         w.b bVar2 = w.b;
@@ -154,7 +155,7 @@ public final class v {
         }
         w.a aVar = this.f;
         Objects.requireNonNull(aVar);
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         if (aVar.h == null) {
             aVar.h = new ArrayList();
         }
diff --git a/app/src/main/java/i0/z.java b/app/src/main/java/i0/z.java
index 9753fe0e95..e05fb014e3 100644
--- a/app/src/main/java/i0/z.java
+++ b/app/src/main/java/i0/z.java
@@ -1,5 +1,6 @@
 package i0;
 
+import androidx.browser.trusted.sharing.ShareTarget;
 import c.d.b.a.a;
 import f0.e;
 import i0.c0;
@@ -65,13 +66,13 @@ public abstract class z<T> {
             if (annotation instanceof b) {
                 aVar.b("DELETE", ((b) annotation).value(), false);
             } else if (annotation instanceof f) {
-                aVar.b("GET", ((f) annotation).value(), false);
+                aVar.b(ShareTarget.METHOD_GET, ((f) annotation).value(), false);
             } else if (annotation instanceof g) {
                 aVar.b("HEAD", ((g) annotation).value(), false);
             } else if (annotation instanceof n) {
                 aVar.b("PATCH", ((n) annotation).value(), true);
             } else if (annotation instanceof o) {
-                aVar.b("POST", ((o) annotation).value(), true);
+                aVar.b(ShareTarget.METHOD_POST, ((o) annotation).value(), true);
             } else if (annotation instanceof p) {
                 aVar.b("PUT", ((p) annotation).value(), true);
             } else if (annotation instanceof m) {
diff --git a/app/src/main/java/j0/l/a/a.java b/app/src/main/java/j0/l/a/a.java
index eb5168e5a7..7920b3021f 100644
--- a/app/src/main/java/j0/l/a/a.java
+++ b/app/src/main/java/j0/l/a/a.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import rx.Producer;
@@ -57,6 +58,6 @@ public abstract class a<T, R> extends Subscriber<T> {
 
     @Override // rx.Subscriber
     public final void setProducer(Producer producer) {
-        producer.j(Long.MAX_VALUE);
+        producer.j(RecyclerView.FOREVER_NS);
     }
 }
diff --git a/app/src/main/java/j0/l/a/a1.java b/app/src/main/java/j0/l/a/a1.java
index af401fe874..7a3c9f533f 100644
--- a/app/src/main/java/j0/l/a/a1.java
+++ b/app/src/main/java/j0/l/a/a1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.a;
 import j0.l.e.c;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -123,7 +124,7 @@ public class a1<T> implements Observable.b<T, T> {
 
         @Override // rx.Subscriber
         public void onStart() {
-            request(Long.MAX_VALUE);
+            request(RecyclerView.FOREVER_NS);
         }
     }
 
diff --git a/app/src/main/java/j0/l/a/b1.java b/app/src/main/java/j0/l/a/b1.java
index 84546c7cb5..c26375e605 100644
--- a/app/src/main/java/j0/l/a/b1.java
+++ b/app/src/main/java/j0/l/a/b1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.g;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
@@ -143,7 +144,7 @@ public final class b1<T> implements Observable.b<T, T> {
                     }
                 } while (!compareAndSet(j2, j3));
                 if (i2 == 0) {
-                    this.parent.request(Long.MAX_VALUE);
+                    this.parent.request(RecyclerView.FOREVER_NS);
                 }
                 a();
             }
diff --git a/app/src/main/java/j0/l/a/e2.java b/app/src/main/java/j0/l/a/e2.java
index cd57529c29..ae63daa5d8 100644
--- a/app/src/main/java/j0/l/a/e2.java
+++ b/app/src/main/java/j0/l/a/e2.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import rx.Subscriber;
 /* compiled from: OperatorTakeUntil */
 public class e2 extends Subscriber<E> {
@@ -26,6 +27,6 @@ public class e2 extends Subscriber<E> {
 
     @Override // rx.Subscriber
     public void onStart() {
-        request(Long.MAX_VALUE);
+        request(RecyclerView.FOREVER_NS);
     }
 }
diff --git a/app/src/main/java/j0/l/a/f.java b/app/src/main/java/j0/l/a/f.java
index 6166625a74..597b44353a 100644
--- a/app/src/main/java/j0/l/a/f.java
+++ b/app/src/main/java/j0/l/a/f.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.e.h;
 import j0.l.e.m.e;
 import j0.o.l;
@@ -236,7 +237,7 @@ public final class f<T, R> implements Observable.a<R> {
                             return;
                         }
                     }
-                    if (!(j == 0 || j2 == Long.MAX_VALUE)) {
+                    if (!(j == 0 || j2 == RecyclerView.FOREVER_NS)) {
                         c.q.a.k.a.I(atomicLong, j);
                     }
                     i2 = addAndGet(-i2);
diff --git a/app/src/main/java/j0/l/a/g0.java b/app/src/main/java/j0/l/a/g0.java
index 8d93201d7c..8ad319df0f 100644
--- a/app/src/main/java/j0/l/a/g0.java
+++ b/app/src/main/java/j0/l/a/g0.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.o.l;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -73,7 +74,7 @@ public final class g0<T> implements Observable.a<T> {
             @Override // rx.functions.Action0
             public void call() {
                 b bVar = b.this;
-                if (bVar.o.compareAndSet(this.i, Long.MAX_VALUE)) {
+                if (bVar.o.compareAndSet(this.i, RecyclerView.FOREVER_NS)) {
                     bVar.unsubscribe();
                     if (bVar.m == null) {
                         bVar.i.onError(new TimeoutException());
@@ -106,7 +107,7 @@ public final class g0<T> implements Observable.a<T> {
 
         @Override // j0.g
         public void onCompleted() {
-            if (this.o.getAndSet(Long.MAX_VALUE) != Long.MAX_VALUE) {
+            if (this.o.getAndSet(RecyclerView.FOREVER_NS) != RecyclerView.FOREVER_NS) {
                 this.p.unsubscribe();
                 this.i.onCompleted();
                 this.l.unsubscribe();
@@ -115,7 +116,7 @@ public final class g0<T> implements Observable.a<T> {
 
         @Override // j0.g
         public void onError(Throwable th) {
-            if (this.o.getAndSet(Long.MAX_VALUE) != Long.MAX_VALUE) {
+            if (this.o.getAndSet(RecyclerView.FOREVER_NS) != RecyclerView.FOREVER_NS) {
                 this.p.unsubscribe();
                 this.i.onError(th);
                 this.l.unsubscribe();
@@ -127,7 +128,7 @@ public final class g0<T> implements Observable.a<T> {
         @Override // j0.g
         public void onNext(T t) {
             long j = this.o.get();
-            if (j != Long.MAX_VALUE) {
+            if (j != RecyclerView.FOREVER_NS) {
                 long j2 = j + 1;
                 if (this.o.compareAndSet(j, j2)) {
                     Subscription subscription = this.p.get();
diff --git a/app/src/main/java/j0/l/a/h1.java b/app/src/main/java/j0/l/a/h1.java
index 5853bd0bac..309bf403df 100644
--- a/app/src/main/java/j0/l/a/h1.java
+++ b/app/src/main/java/j0/l/a/h1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.a.e;
 import j0.l.e.h;
 import j0.l.e.n.n;
@@ -76,7 +77,7 @@ public final class h1<T> extends c<T> {
                         } else {
                             j3 = j2 + j;
                             if (j3 < 0) {
-                                j3 = Long.MAX_VALUE;
+                                j3 = RecyclerView.FOREVER_NS;
                             }
                         }
                     } else {
@@ -208,7 +209,7 @@ public final class h1<T> extends c<T> {
                         if (!isEmpty) {
                             a[] aVarArr = this.n.get();
                             int length = aVarArr.length;
-                            long j3 = Long.MAX_VALUE;
+                            long j3 = RecyclerView.FOREVER_NS;
                             int i2 = 0;
                             for (a aVar : aVarArr) {
                                 long j4 = aVar.get();
diff --git a/app/src/main/java/j0/l/a/j1.java b/app/src/main/java/j0/l/a/j1.java
index 4d9c97e19c..ac41511825 100644
--- a/app/src/main/java/j0/l/a/j1.java
+++ b/app/src/main/java/j0/l/a/j1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.a.e;
 import java.util.ArrayList;
 import java.util.List;
@@ -116,7 +117,7 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
                     }
                     if (j2 != 0) {
                         cVar.index = dVar2;
-                        if (j != Long.MAX_VALUE) {
+                        if (j != RecyclerView.FOREVER_NS) {
                             cVar.b(j2);
                         }
                     }
@@ -167,7 +168,7 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
                 j2 = this.totalRequested.get();
                 j3 = j2 + j;
                 if (j3 < 0) {
-                    j3 = Long.MAX_VALUE;
+                    j3 = RecyclerView.FOREVER_NS;
                 }
             } while (!this.totalRequested.compareAndSet(j2, j3));
         }
@@ -208,7 +209,7 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
                         if (j2 < 0 || i != 0) {
                             j3 = j2 + j;
                             if (j3 < 0) {
-                                j3 = Long.MAX_VALUE;
+                                j3 = RecyclerView.FOREVER_NS;
                             }
                         } else {
                             return;
@@ -341,7 +342,7 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
                 if (producer == null) {
                     long j5 = j3 + j4;
                     if (j5 < 0) {
-                        j5 = Long.MAX_VALUE;
+                        j5 = RecyclerView.FOREVER_NS;
                     }
                     this.u = j5;
                 } else if (j3 != 0) {
@@ -581,7 +582,7 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
                     }
                     if (j2 != 0) {
                         cVar.index = Integer.valueOf(intValue);
-                        if (j != Long.MAX_VALUE) {
+                        if (j != RecyclerView.FOREVER_NS) {
                             cVar.b(j2);
                         }
                     }
diff --git a/app/src/main/java/j0/l/a/k2.java b/app/src/main/java/j0/l/a/k2.java
index 3bac33bc3d..18cc22de48 100644
--- a/app/src/main/java/j0/l/a/k2.java
+++ b/app/src/main/java/j0/l/a/k2.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.Objects;
 import rx.Subscriber;
 /* compiled from: OperatorThrottleFirst */
@@ -38,6 +39,6 @@ public class k2 extends Subscriber<T> {
 
     @Override // rx.Subscriber
     public void onStart() {
-        request(Long.MAX_VALUE);
+        request(RecyclerView.FOREVER_NS);
     }
 }
diff --git a/app/src/main/java/j0/l/a/l0.java b/app/src/main/java/j0/l/a/l0.java
index 1ec576c515..42253517b4 100644
--- a/app/src/main/java/j0/l/a/l0.java
+++ b/app/src/main/java/j0/l/a/l0.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.k.b;
 import j0.l.a.a;
 import java.util.HashMap;
@@ -46,7 +47,7 @@ public final class l0<T, K, V> implements Observable.a<Map<K, V>>, Func0<Map<K,
 
         @Override // rx.Subscriber
         public void onStart() {
-            request(Long.MAX_VALUE);
+            request(RecyclerView.FOREVER_NS);
         }
     }
 
diff --git a/app/src/main/java/j0/l/a/m2.java b/app/src/main/java/j0/l/a/m2.java
index 28c56b1b05..8cc67d127e 100644
--- a/app/src/main/java/j0/l/a/m2.java
+++ b/app/src/main/java/j0/l/a/m2.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.q.a.k.a;
 import j0.l.b.b;
 import java.util.ArrayList;
@@ -47,6 +48,6 @@ public class m2 extends Subscriber<T> {
 
     @Override // rx.Subscriber
     public void onStart() {
-        request(Long.MAX_VALUE);
+        request(RecyclerView.FOREVER_NS);
     }
 }
diff --git a/app/src/main/java/j0/l/a/n.java b/app/src/main/java/j0/l/a/n.java
index 26b4204fc7..49758b4f01 100644
--- a/app/src/main/java/j0/l/a/n.java
+++ b/app/src/main/java/j0/l/a/n.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.a.q;
 import j0.l.e.d;
 import j0.l.e.h;
@@ -38,7 +39,7 @@ public final class n<T, R> implements Observable.a<R> {
             this.i = subscriber;
             this.j = bVar;
             if (i == Integer.MAX_VALUE) {
-                this.k = Long.MAX_VALUE;
+                this.k = RecyclerView.FOREVER_NS;
                 this.l = new e(h.i);
             } else {
                 this.k = (long) (i - (i >> 2));
diff --git a/app/src/main/java/j0/l/a/n1.java b/app/src/main/java/j0/l/a/n1.java
index 542e5370cf..08bfe8a268 100644
--- a/app/src/main/java/j0/l/a/n1.java
+++ b/app/src/main/java/j0/l/a/n1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import rx.Observable;
@@ -62,7 +63,7 @@ public final class n1<T> implements Observable.b<T, T> {
 
         @Override // rx.Subscriber
         public void onStart() {
-            request(Long.MAX_VALUE);
+            request(RecyclerView.FOREVER_NS);
         }
     }
 
diff --git a/app/src/main/java/j0/l/a/o.java b/app/src/main/java/j0/l/a/o.java
index 6b8eebba83..fa3830344b 100644
--- a/app/src/main/java/j0/l/a/o.java
+++ b/app/src/main/java/j0/l/a/o.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.concurrent.atomic.AtomicLong;
 import rx.Observable;
 import rx.Producer;
@@ -25,7 +26,7 @@ public final class o<T> implements Observable.a<T> {
             int i = (j > 0 ? 1 : (j == 0 ? 0 : -1));
             if (i < 0) {
                 throw new IllegalArgumentException(c.d.b.a.a.o("n >= 0 required but it was ", j));
-            } else if (j == Long.MAX_VALUE) {
+            } else if (j == RecyclerView.FOREVER_NS) {
                 if (c.q.a.k.a.p(this, j) == 0) {
                     Subscriber<? super T> subscriber = this.child;
                     T[] tArr = this.array;
diff --git a/app/src/main/java/j0/l/a/o1.java b/app/src/main/java/j0/l/a/o1.java
index 9d0711b37f..3dd934b4fd 100644
--- a/app/src/main/java/j0/l/a/o1.java
+++ b/app/src/main/java/j0/l/a/o1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.g;
 import j0.l.e.m.f;
 import j0.l.e.n.s;
@@ -104,7 +105,7 @@ public final class o1<R, T> implements Observable.b<R, T> {
                         return;
                     }
                 }
-                if (!(j2 == 0 || j == Long.MAX_VALUE)) {
+                if (!(j2 == 0 || j == RecyclerView.FOREVER_NS)) {
                     j = c.q.a.k.a.I(atomicLong, j2);
                 }
                 synchronized (this) {
diff --git a/app/src/main/java/j0/l/a/p0.java b/app/src/main/java/j0/l/a/p0.java
index 1858263f40..1efacfb569 100644
--- a/app/src/main/java/j0/l/a/p0.java
+++ b/app/src/main/java/j0/l/a/p0.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.a.q0;
 import rx.Scheduler;
 import rx.Subscriber;
@@ -125,6 +126,6 @@ public class p0 extends Subscriber<T> {
 
     @Override // rx.Subscriber
     public void onStart() {
-        request(Long.MAX_VALUE);
+        request(RecyclerView.FOREVER_NS);
     }
 }
diff --git a/app/src/main/java/j0/l/a/p2.java b/app/src/main/java/j0/l/a/p2.java
index d5e0046e01..ca780226d3 100644
--- a/app/src/main/java/j0/l/a/p2.java
+++ b/app/src/main/java/j0/l/a/p2.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.q.a.k.a;
 import j0.l.b.b;
 import java.util.ArrayList;
@@ -50,6 +51,6 @@ public class p2 extends Subscriber<T> {
 
     @Override // rx.Subscriber
     public void onStart() {
-        request(Long.MAX_VALUE);
+        request(RecyclerView.FOREVER_NS);
     }
 }
diff --git a/app/src/main/java/j0/l/a/q.java b/app/src/main/java/j0/l/a/q.java
index d0da863fba..6091f0bec7 100644
--- a/app/src/main/java/j0/l/a/q.java
+++ b/app/src/main/java/j0/l/a/q.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
@@ -23,8 +24,8 @@ public final class q<T> implements Observable.a<T> {
 
         @Override // rx.Producer
         public void j(long j) {
-            if (get() != Long.MAX_VALUE) {
-                if (j == Long.MAX_VALUE && compareAndSet(0, Long.MAX_VALUE)) {
+            if (get() != RecyclerView.FOREVER_NS) {
+                if (j == RecyclerView.FOREVER_NS && compareAndSet(0, RecyclerView.FOREVER_NS)) {
                     Subscriber<? super T> subscriber = this.o;
                     Iterator<? extends T> it = this.it;
                     while (!subscriber.isUnsubscribed()) {
diff --git a/app/src/main/java/j0/l/a/q1.java b/app/src/main/java/j0/l/a/q1.java
index 232e9b7b5e..6b6d77de6e 100644
--- a/app/src/main/java/j0/l/a/q1.java
+++ b/app/src/main/java/j0/l/a/q1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.q.a.k.a;
 import j0.l.a.o1;
 import java.util.Objects;
@@ -55,7 +56,7 @@ public class q1 extends Subscriber<T> {
         synchronized (bVar.n) {
             if (bVar.o == null) {
                 j = bVar.m;
-                if (j != Long.MAX_VALUE) {
+                if (j != RecyclerView.FOREVER_NS) {
                     j--;
                 }
                 bVar.m = 0;
diff --git a/app/src/main/java/j0/l/a/t.java b/app/src/main/java/j0/l/a/t.java
index 0032ce8fea..62d4364bf0 100644
--- a/app/src/main/java/j0/l/a/t.java
+++ b/app/src/main/java/j0/l/a/t.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.f;
 import java.util.concurrent.atomic.AtomicLong;
 import rx.Producer;
@@ -48,7 +49,7 @@ public class t implements Action0 {
                 t.this.i.onNext(t);
                 do {
                     j = t.this.l.get();
-                    if (j == Long.MAX_VALUE) {
+                    if (j == RecyclerView.FOREVER_NS) {
                         break;
                     }
                 } while (!t.this.l.compareAndSet(j, j - 1));
diff --git a/app/src/main/java/j0/l/a/u.java b/app/src/main/java/j0/l/a/u.java
index 9578e9c91a..1959dc1200 100644
--- a/app/src/main/java/j0/l/a/u.java
+++ b/app/src/main/java/j0/l/a/u.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.f;
 import rx.Producer;
 import rx.Subscriber;
@@ -46,6 +47,6 @@ public class u extends Subscriber<f<?>> {
 
     @Override // rx.Subscriber
     public void setProducer(Producer producer) {
-        producer.j(Long.MAX_VALUE);
+        producer.j(RecyclerView.FOREVER_NS);
     }
 }
diff --git a/app/src/main/java/j0/l/a/w.java b/app/src/main/java/j0/l/a/w.java
index ddce781d27..aa417cf834 100644
--- a/app/src/main/java/j0/l/a/w.java
+++ b/app/src/main/java/j0/l/a/w.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import rx.Observable;
@@ -47,7 +48,7 @@ public class w implements Action0 {
 
         @Override // rx.Subscriber
         public void setProducer(Producer producer) {
-            producer.j(Long.MAX_VALUE);
+            producer.j(RecyclerView.FOREVER_NS);
         }
     }
 
diff --git a/app/src/main/java/j0/l/a/x0.java b/app/src/main/java/j0/l/a/x0.java
index 6e0448695e..b3e3791764 100644
--- a/app/src/main/java/j0/l/a/x0.java
+++ b/app/src/main/java/j0/l/a/x0.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.e.h;
 import j0.l.e.j;
 import j0.l.e.m.g;
@@ -106,7 +107,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                 } catch (Throwable th2) {
                     th = th2;
                 }
-                if (j != Long.MAX_VALUE) {
+                if (j != RecyclerView.FOREVER_NS) {
                     eVar.m.a(1);
                 }
                 a(1);
@@ -156,7 +157,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
         public void j(long j) {
             int i = (j > 0 ? 1 : (j == 0 ? 0 : -1));
             if (i > 0) {
-                if (get() != Long.MAX_VALUE) {
+                if (get() != RecyclerView.FOREVER_NS) {
                     c.q.a.k.a.p(this, j);
                     this.subscriber.b();
                 }
@@ -201,7 +202,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
             this.l = i2;
             if (i2 == Integer.MAX_VALUE) {
                 this.f2879y = Integer.MAX_VALUE;
-                request(Long.MAX_VALUE);
+                request(RecyclerView.FOREVER_NS);
                 return;
             }
             this.f2879y = Math.max(1, i2 >> 1);
@@ -266,7 +267,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
             while (!a()) {
                 Queue<Object> queue = this.n;
                 long j3 = this.m.get();
-                boolean z4 = j3 == Long.MAX_VALUE;
+                boolean z4 = j3 == RecyclerView.FOREVER_NS;
                 if (queue != null) {
                     int i4 = 0;
                     while (true) {
@@ -373,7 +374,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                                             subscriber2 = subscriber;
                                         } else {
                                             subscriber2 = subscriber;
-                                            j2 = Long.MAX_VALUE;
+                                            j2 = RecyclerView.FOREVER_NS;
                                         }
                                         cVar.a((long) i9);
                                         j = j2;
@@ -624,7 +625,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                             } catch (Throwable th2) {
                                 th = th2;
                             }
-                            if (j != Long.MAX_VALUE) {
+                            if (j != RecyclerView.FOREVER_NS) {
                                 this.m.a(1);
                             }
                             int i3 = this.f2880z + 1;
diff --git a/app/src/main/java/j0/l/a/y1.java b/app/src/main/java/j0/l/a/y1.java
index 218de14540..7ca82499bf 100644
--- a/app/src/main/java/j0/l/a/y1.java
+++ b/app/src/main/java/j0/l/a/y1.java
@@ -1,5 +1,6 @@
 package j0.l.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.e.h;
 import j0.l.e.m.e;
 import j0.o.l;
@@ -194,7 +195,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
                 if (i2 != 0 || (!subscriber.isUnsubscribed() && !a(this.f2881s, z2, th4, eVar, subscriber, eVar.isEmpty()))) {
                     synchronized (this) {
                         long j4 = this.q;
-                        if (j4 != Long.MAX_VALUE) {
+                        if (j4 != RecyclerView.FOREVER_NS) {
                             j4 -= j3;
                             this.q = j4;
                         }
diff --git a/app/src/main/java/j0/l/b/a.java b/app/src/main/java/j0/l/b/a.java
index 51d694673f..52a61d0b3d 100644
--- a/app/src/main/java/j0/l/b/a.java
+++ b/app/src/main/java/j0/l/b/a.java
@@ -1,5 +1,6 @@
 package j0.l.b;
 
+import androidx.recyclerview.widget.RecyclerView;
 import rx.Producer;
 /* compiled from: ProducerArbiter */
 public final class a implements Producer {
@@ -39,10 +40,10 @@ public final class a implements Producer {
                 this.o = null;
             }
             long j3 = this.j;
-            if (j3 != Long.MAX_VALUE) {
+            if (j3 != RecyclerView.FOREVER_NS) {
                 long j4 = j3 + j;
-                if (j4 < 0 || j4 == Long.MAX_VALUE) {
-                    this.j = Long.MAX_VALUE;
+                if (j4 < 0 || j4 == RecyclerView.FOREVER_NS) {
+                    this.j = RecyclerView.FOREVER_NS;
                     j3 = Long.MAX_VALUE;
                 } else {
                     j3 = j4 - j2;
@@ -78,7 +79,7 @@ public final class a implements Producer {
             }
             try {
                 long j2 = this.j;
-                if (j2 != Long.MAX_VALUE) {
+                if (j2 != RecyclerView.FOREVER_NS) {
                     long j3 = j2 - j;
                     if (j3 >= 0) {
                         this.j = j3;
@@ -139,7 +140,7 @@ public final class a implements Producer {
             try {
                 long j2 = this.j + j;
                 if (j2 < 0) {
-                    j2 = Long.MAX_VALUE;
+                    j2 = RecyclerView.FOREVER_NS;
                 }
                 this.j = j2;
                 Producer producer = this.k;
diff --git a/app/src/main/java/j0/l/e/c.java b/app/src/main/java/j0/l/e/c.java
index 5f8b75ce82..32f8cc4c93 100644
--- a/app/src/main/java/j0/l/e/c.java
+++ b/app/src/main/java/j0/l/e/c.java
@@ -1,5 +1,6 @@
 package j0.l.e;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.l.a.a1;
 import j0.l.a.e;
 import java.util.concurrent.atomic.AtomicLong;
@@ -138,7 +139,7 @@ public final class c extends AtomicLong implements Producer {
                     }
                     throw th2;
                 }
-                if (get() != Long.MAX_VALUE) {
+                if (get() != RecyclerView.FOREVER_NS) {
                     long addAndGet = addAndGet((long) (-i));
                     if ((addAndGet == 0 || !z5) && (!z3 || z5)) {
                         break;
@@ -172,14 +173,14 @@ public final class c extends AtomicLong implements Producer {
                 long j2 = get();
                 boolean z3 = true;
                 z2 = j2 == 0;
-                long j3 = Long.MAX_VALUE;
-                if (j2 == Long.MAX_VALUE) {
+                long j3 = RecyclerView.FOREVER_NS;
+                if (j2 == RecyclerView.FOREVER_NS) {
                     break;
                 }
-                if (j == Long.MAX_VALUE) {
+                if (j == RecyclerView.FOREVER_NS) {
                     j3 = j;
                 } else {
-                    if (j2 <= Long.MAX_VALUE - j) {
+                    if (j2 <= RecyclerView.FOREVER_NS - j) {
                         j3 = j2 + j;
                     }
                     z3 = z2;
diff --git a/app/src/main/java/j0/q/a.java b/app/src/main/java/j0/q/a.java
index fdd1199d7e..a59af465bd 100644
--- a/app/src/main/java/j0/q/a.java
+++ b/app/src/main/java/j0/q/a.java
@@ -1,5 +1,6 @@
 package j0.q;
 
+import androidx.recyclerview.widget.RecyclerView;
 import j0.g;
 import java.util.ArrayList;
 import java.util.Objects;
@@ -152,7 +153,7 @@ public final class a<T> extends Subject<T, T> {
                             }
                         }
                     }
-                    if (!(j2 == 0 || j == Long.MAX_VALUE)) {
+                    if (!(j2 == 0 || j == RecyclerView.FOREVER_NS)) {
                         c.q.a.k.a.I(bVar.requested, j2);
                     }
                     bVar.node = aVar;
diff --git a/app/src/main/java/kotlin/collections/ArrayDeque.java b/app/src/main/java/kotlin/collections/ArrayDeque.java
index 951abb7646..0381457f52 100644
--- a/app/src/main/java/kotlin/collections/ArrayDeque.java
+++ b/app/src/main/java/kotlin/collections/ArrayDeque.java
@@ -1,5 +1,6 @@
 package kotlin.collections;
 
+import com.esotericsoftware.kryo.io.Util;
 import d0.d0.f;
 import d0.t.c;
 import d0.t.e;
@@ -30,7 +31,13 @@ public final class ArrayDeque<E> extends e<E> {
             if (i3 - i2 < 0) {
                 i3 = i2;
             }
-            return i3 - 2147483639 > 0 ? i2 > 2147483639 ? Integer.MAX_VALUE : 2147483639 : i3;
+            if (i3 - Util.MAX_SAFE_ARRAY_SIZE <= 0) {
+                return i3;
+            }
+            if (i2 > 2147483639) {
+                return Integer.MAX_VALUE;
+            }
+            return Util.MAX_SAFE_ARRAY_SIZE;
         }
     }
 
diff --git a/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java b/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
index 5c4cd323e7..29e4e0d672 100644
--- a/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
+++ b/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
@@ -1,6 +1,7 @@
 package kotlin.reflect.jvm.internal.impl.protobuf;
 
 import c.d.b.a.a;
+import com.adjust.sdk.Constants;
 import d0.e0.p.d.m0.i.c;
 import d0.e0.p.d.m0.i.j;
 import d0.e0.p.d.m0.i.n;
@@ -177,7 +178,7 @@ public final class CodedOutputStream {
 
     public static int computeStringSizeNoTag(String str) {
         try {
-            byte[] bytes = str.getBytes("UTF-8");
+            byte[] bytes = str.getBytes(Constants.ENCODING);
             return computeRawVarint32Size(bytes.length) + bytes.length;
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException("UTF-8 not supported.", e);
@@ -468,7 +469,7 @@ public final class CodedOutputStream {
     }
 
     public void writeStringNoTag(String str) throws IOException {
-        byte[] bytes = str.getBytes("UTF-8");
+        byte[] bytes = str.getBytes(Constants.ENCODING);
         writeRawVarint32(bytes.length);
         writeRawBytes(bytes);
     }
diff --git a/app/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java b/app/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java
index d65a52de4e..87cff35113 100644
--- a/app/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java
+++ b/app/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java
@@ -1,5 +1,6 @@
 package kotlinx.coroutines;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.w.b;
 import d0.w.d;
 import java.util.Objects;
@@ -70,6 +71,6 @@ public abstract class CoroutineDispatcher extends d0.w.a implements d {
 
     @Override // java.lang.Object
     public String toString() {
-        return getClass().getSimpleName() + '@' + c.q.a.k.a.u(this);
+        return getClass().getSimpleName() + MentionUtilsKt.MENTIONS_CHAR + c.q.a.k.a.u(this);
     }
 }
diff --git a/app/src/main/java/okhttp3/Headers.java b/app/src/main/java/okhttp3/Headers.java
index c8e74ba94f..343eab2e17 100644
--- a/app/src/main/java/okhttp3/Headers.java
+++ b/app/src/main/java/okhttp3/Headers.java
@@ -1,5 +1,6 @@
 package okhttp3;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.d0.f;
 import d0.g0.t;
 import d0.g0.w;
@@ -25,7 +26,7 @@ public final class Headers implements Iterable<Pair<? extends String, ? extends
         public final List<String> a = new ArrayList(20);
 
         public final a a(String str, String str2) {
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(str2, "value");
             b bVar = Headers.i;
             bVar.a(str);
@@ -35,7 +36,7 @@ public final class Headers implements Iterable<Pair<? extends String, ? extends
         }
 
         public final a b(String str, String str2) {
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(str2, "value");
             this.a.add(str);
             this.a.add(w.trim(str2).toString());
@@ -51,7 +52,7 @@ public final class Headers implements Iterable<Pair<? extends String, ? extends
         }
 
         public final a d(String str) {
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             int i = 0;
             while (i < this.a.size()) {
                 if (t.equals(str, this.a.get(i), true)) {
@@ -142,7 +143,7 @@ public final class Headers implements Iterable<Pair<? extends String, ? extends
     }
 
     public final String c(String str) {
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         String[] strArr = this.j;
         IntProgression step = f.step(f.downTo(strArr.length - 2, 0), 2);
         int first = step.getFirst();
diff --git a/app/src/main/java/okhttp3/MediaType.java b/app/src/main/java/okhttp3/MediaType.java
index 5120427283..c48c16a1d2 100644
--- a/app/src/main/java/okhttp3/MediaType.java
+++ b/app/src/main/java/okhttp3/MediaType.java
@@ -1,5 +1,6 @@
 package okhttp3;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.d0.f;
 import d0.g0.t;
 import d0.t.k;
@@ -113,7 +114,7 @@ public final class MediaType {
     /* JADX WARNING: Removed duplicated region for block: B:19:? A[RETURN, SYNTHETIC] */
     public final Charset a(Charset charset) {
         String str;
-        m.checkParameterIsNotNull("charset", "name");
+        m.checkParameterIsNotNull("charset", ModelAuditLogEntry.CHANGE_KEY_NAME);
         IntProgression step = f.step(k.getIndices(this.g), 2);
         int first = step.getFirst();
         int last = step.getLast();
diff --git a/app/src/main/java/okhttp3/MultipartBody.java b/app/src/main/java/okhttp3/MultipartBody.java
index b5547c1ce3..2be05a8673 100644
--- a/app/src/main/java/okhttp3/MultipartBody.java
+++ b/app/src/main/java/okhttp3/MultipartBody.java
@@ -1,5 +1,7 @@
 package okhttp3;
 
+import androidx.browser.trusted.sharing.ShareTarget;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.g0.w;
 import d0.z.d.m;
 import f0.f0.c;
@@ -16,7 +18,7 @@ import okio.ByteString;
 /* compiled from: MultipartBody.kt */
 public final class MultipartBody extends RequestBody {
     public static final MediaType a = MediaType.a.a("multipart/mixed");
-    public static final MediaType b = MediaType.a.a("multipart/form-data");
+    public static final MediaType b = MediaType.a.a(ShareTarget.ENCODING_TYPE_MULTIPART);
 
     /* renamed from: c  reason: collision with root package name */
     public static final byte[] f2898c = {(byte) 58, (byte) 32};
@@ -55,7 +57,7 @@ public final class MultipartBody extends RequestBody {
         }
 
         public static final Part b(String str, String str2, RequestBody requestBody) {
-            m.checkParameterIsNotNull(str, "name");
+            m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(requestBody, "body");
             StringBuilder sb = new StringBuilder();
             sb.append("form-data; name=");
@@ -68,7 +70,7 @@ public final class MultipartBody extends RequestBody {
             String sb2 = sb.toString();
             m.checkExpressionValueIsNotNull(sb2, "StringBuilder().apply(builderAction).toString()");
             ArrayList arrayList = new ArrayList(20);
-            m.checkParameterIsNotNull("Content-Disposition", "name");
+            m.checkParameterIsNotNull("Content-Disposition", ModelAuditLogEntry.CHANGE_KEY_NAME);
             m.checkParameterIsNotNull(sb2, "value");
             if (1 != 0) {
                 for (int i = 0; i < 19; i++) {
@@ -77,7 +79,7 @@ public final class MultipartBody extends RequestBody {
                         throw new IllegalArgumentException(c.j("Unexpected char %#04x at %d in header name: %s", Integer.valueOf(charAt), Integer.valueOf(i), "Content-Disposition").toString());
                     }
                 }
-                m.checkParameterIsNotNull("Content-Disposition", "name");
+                m.checkParameterIsNotNull("Content-Disposition", ModelAuditLogEntry.CHANGE_KEY_NAME);
                 m.checkParameterIsNotNull(sb2, "value");
                 arrayList.add("Content-Disposition");
                 arrayList.add(w.trim(sb2).toString());
diff --git a/app/src/main/java/okhttp3/Response.java b/app/src/main/java/okhttp3/Response.java
index 9787fc45e1..ca5238c719 100644
--- a/app/src/main/java/okhttp3/Response.java
+++ b/app/src/main/java/okhttp3/Response.java
@@ -1,5 +1,6 @@
 package okhttp3;
 
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import f0.f0.g.c;
 import f0.v;
@@ -165,7 +166,7 @@ public final class Response implements Closeable {
     public static String a(Response response, String str, String str2, int i) {
         int i2 = i & 2;
         Objects.requireNonNull(response);
-        m.checkParameterIsNotNull(str, "name");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_NAME);
         String c2 = response.n.c(str);
         if (c2 != null) {
             return c2;
diff --git a/app/src/main/java/okhttp3/WebSocketListener.java b/app/src/main/java/okhttp3/WebSocketListener.java
index 5d90f90fd0..28a889eb3e 100644
--- a/app/src/main/java/okhttp3/WebSocketListener.java
+++ b/app/src/main/java/okhttp3/WebSocketListener.java
@@ -1,17 +1,19 @@
 package okhttp3;
 
+import androidx.core.app.NotificationCompat;
+import com.discord.models.domain.ModelAuditLogEntry;
 import d0.z.d.m;
 import okio.ByteString;
 /* compiled from: WebSocketListener.kt */
 public abstract class WebSocketListener {
     public void onClosed(WebSocket webSocket, int i, String str) {
         m.checkParameterIsNotNull(webSocket, "webSocket");
-        m.checkParameterIsNotNull(str, "reason");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
     }
 
     public void onClosing(WebSocket webSocket, int i, String str) {
         m.checkParameterIsNotNull(webSocket, "webSocket");
-        m.checkParameterIsNotNull(str, "reason");
+        m.checkParameterIsNotNull(str, ModelAuditLogEntry.CHANGE_KEY_REASON);
     }
 
     public void onFailure(WebSocket webSocket, Throwable th, Response response) {
@@ -21,7 +23,7 @@ public abstract class WebSocketListener {
 
     public void onMessage(WebSocket webSocket, String str) {
         m.checkParameterIsNotNull(webSocket, "webSocket");
-        m.checkParameterIsNotNull(str, "text");
+        m.checkParameterIsNotNull(str, NotificationCompat.MessagingStyle.Message.KEY_TEXT);
     }
 
     public void onMessage(WebSocket webSocket, ByteString byteString) {
diff --git a/app/src/main/java/okhttp3/internal/connection/RouteException.java b/app/src/main/java/okhttp3/internal/connection/RouteException.java
index 8d25902aa7..68d9d3989c 100644
--- a/app/src/main/java/okhttp3/internal/connection/RouteException.java
+++ b/app/src/main/java/okhttp3/internal/connection/RouteException.java
@@ -1,5 +1,6 @@
 package okhttp3.internal.connection;
 
+import c.a.r.n0.c.e;
 import d0.z.d.m;
 import java.io.IOException;
 /* compiled from: RouteException.kt */
@@ -16,7 +17,7 @@ public final class RouteException extends RuntimeException {
     }
 
     public final void a(IOException iOException) {
-        m.checkParameterIsNotNull(iOException, "e");
+        m.checkParameterIsNotNull(iOException, e.a);
         this.firstConnectException.addSuppressed(iOException);
         this.lastConnectException = iOException;
     }
diff --git a/app/src/main/java/org/webrtc/AndroidVideoDecoder.java b/app/src/main/java/org/webrtc/AndroidVideoDecoder.java
index 274f1d31f3..7466cdb4c6 100644
--- a/app/src/main/java/org/webrtc/AndroidVideoDecoder.java
+++ b/app/src/main/java/org/webrtc/AndroidVideoDecoder.java
@@ -99,7 +99,7 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
 
     public AndroidVideoDecoder(MediaCodecWrapperFactory mediaCodecWrapperFactory, String str, VideoCodecMimeType videoCodecMimeType, int i, @Nullable EglBase.Context context) {
         if (isSupportedColorFormat(i)) {
-            Logging.d("AndroidVideoDecoder", "ctor name: " + str + " type: " + videoCodecMimeType + " color format: " + i + " context: " + context);
+            Logging.d(TAG, "ctor name: " + str + " type: " + videoCodecMimeType + " color format: " + i + " context: " + context);
             this.mediaCodecWrapperFactory = mediaCodecWrapperFactory;
             this.codecName = str;
             this.codecType = videoCodecMimeType;
@@ -184,7 +184,7 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
         if (i7 < ((i3 * i4) * 3) / 2) {
             StringBuilder K = a.K("Insufficient output buffer size: ");
             K.append(bufferInfo.size);
-            Logging.e("AndroidVideoDecoder", K.toString());
+            Logging.e(TAG, K.toString());
             return;
         }
         int i8 = (i7 >= ((i5 * i4) * 3) / 2 || i6 != i4 || i5 <= i3) ? i5 : (i7 * 2) / (i4 * 3);
@@ -226,9 +226,9 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
 
     private VideoCodecStatus initDecodeInternal(int i, int i2) {
         this.decoderThreadChecker.checkIsOnValidThread();
-        Logging.d("AndroidVideoDecoder", "initDecodeInternal name: " + this.codecName + " type: " + this.codecType + " width: " + i + " height: " + i2);
+        Logging.d(TAG, "initDecodeInternal name: " + this.codecName + " type: " + this.codecType + " width: " + i + " height: " + i2);
         if (this.outputThread != null) {
-            Logging.e("AndroidVideoDecoder", "initDecodeInternal called while the codec is already running");
+            Logging.e(TAG, "initDecodeInternal called while the codec is already running");
             return VideoCodecStatus.FALLBACK_SOFTWARE;
         }
         this.width = i;
@@ -250,17 +250,17 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
                 Thread createOutputThread = createOutputThread();
                 this.outputThread = createOutputThread;
                 createOutputThread.start();
-                Logging.d("AndroidVideoDecoder", "initDecodeInternal done");
+                Logging.d(TAG, "initDecodeInternal done");
                 return VideoCodecStatus.OK;
             } catch (IllegalArgumentException | IllegalStateException e) {
-                Logging.e("AndroidVideoDecoder", "initDecode failed", e);
+                Logging.e(TAG, "initDecode failed", e);
                 release();
                 return VideoCodecStatus.FALLBACK_SOFTWARE;
             }
         } catch (IOException | IllegalArgumentException | IllegalStateException unused) {
             StringBuilder K = a.K("Cannot create media decoder ");
             K.append(this.codecName);
-            Logging.e("AndroidVideoDecoder", K.toString());
+            Logging.e(TAG, K.toString());
             return VideoCodecStatus.FALLBACK_SOFTWARE;
         }
     }
@@ -278,13 +278,13 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
         int i;
         int i2;
         this.outputThreadChecker.checkIsOnValidThread();
-        Logging.d("AndroidVideoDecoder", "Decoder format changed: " + mediaFormat.toString());
-        if (!mediaFormat.containsKey("crop-left") || !mediaFormat.containsKey("crop-right") || !mediaFormat.containsKey("crop-bottom") || !mediaFormat.containsKey("crop-top")) {
+        Logging.d(TAG, "Decoder format changed: " + mediaFormat.toString());
+        if (!mediaFormat.containsKey(MEDIA_FORMAT_KEY_CROP_LEFT) || !mediaFormat.containsKey(MEDIA_FORMAT_KEY_CROP_RIGHT) || !mediaFormat.containsKey(MEDIA_FORMAT_KEY_CROP_BOTTOM) || !mediaFormat.containsKey(MEDIA_FORMAT_KEY_CROP_TOP)) {
             i2 = mediaFormat.getInteger("width");
             i = mediaFormat.getInteger("height");
         } else {
-            i2 = (mediaFormat.getInteger("crop-right") + 1) - mediaFormat.getInteger("crop-left");
-            i = (mediaFormat.getInteger("crop-bottom") + 1) - mediaFormat.getInteger("crop-top");
+            i2 = (mediaFormat.getInteger(MEDIA_FORMAT_KEY_CROP_RIGHT) + 1) - mediaFormat.getInteger(MEDIA_FORMAT_KEY_CROP_LEFT);
+            i = (mediaFormat.getInteger(MEDIA_FORMAT_KEY_CROP_BOTTOM) + 1) - mediaFormat.getInteger(MEDIA_FORMAT_KEY_CROP_TOP);
         }
         synchronized (this.dimensionLock) {
             if (!this.hasDecodedFirstFrame || (this.width == i2 && this.height == i)) {
@@ -299,7 +299,7 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
             this.colorFormat = mediaFormat.getInteger("color-format");
             StringBuilder K = a.K("Color: 0x");
             K.append(Integer.toHexString(this.colorFormat));
-            Logging.d("AndroidVideoDecoder", K.toString());
+            Logging.d(TAG, K.toString());
             if (!isSupportedColorFormat(this.colorFormat)) {
                 StringBuilder K2 = a.K("Unsupported color format: ");
                 K2.append(this.colorFormat);
@@ -308,13 +308,13 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
             }
         }
         synchronized (this.dimensionLock) {
-            if (mediaFormat.containsKey("stride")) {
-                this.stride = mediaFormat.getInteger("stride");
+            if (mediaFormat.containsKey(MEDIA_FORMAT_KEY_STRIDE)) {
+                this.stride = mediaFormat.getInteger(MEDIA_FORMAT_KEY_STRIDE);
             }
-            if (mediaFormat.containsKey("slice-height")) {
-                this.sliceHeight = mediaFormat.getInteger("slice-height");
+            if (mediaFormat.containsKey(MEDIA_FORMAT_KEY_SLICE_HEIGHT)) {
+                this.sliceHeight = mediaFormat.getInteger(MEDIA_FORMAT_KEY_SLICE_HEIGHT);
             }
-            Logging.d("AndroidVideoDecoder", "Frame stride and slice height: " + this.stride + " x " + this.sliceHeight);
+            Logging.d(TAG, "Frame stride and slice height: " + this.stride + " x " + this.sliceHeight);
             this.stride = Math.max(this.width, this.stride);
             this.sliceHeight = Math.max(this.height, this.sliceHeight);
         }
@@ -328,35 +328,35 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
 
     private void releaseCodecOnOutputThread() {
         this.outputThreadChecker.checkIsOnValidThread();
-        Logging.d("AndroidVideoDecoder", "Releasing MediaCodec on output thread");
+        Logging.d(TAG, "Releasing MediaCodec on output thread");
         try {
             this.codec.stop();
         } catch (Exception e) {
-            Logging.e("AndroidVideoDecoder", "Media decoder stop failed", e);
+            Logging.e(TAG, "Media decoder stop failed", e);
         }
         try {
             this.codec.release();
         } catch (Exception e2) {
-            Logging.e("AndroidVideoDecoder", "Media decoder release failed", e2);
+            Logging.e(TAG, "Media decoder release failed", e2);
             this.shutdownException = e2;
         }
-        Logging.d("AndroidVideoDecoder", "Release on output thread done");
+        Logging.d(TAG, "Release on output thread done");
     }
 
     /* JADX WARNING: Unknown variable types count: 1 */
     private VideoCodecStatus releaseInternal() {
         if (!this.running) {
-            Logging.d("AndroidVideoDecoder", "release: Decoder is not running.");
+            Logging.d(TAG, "release: Decoder is not running.");
             return VideoCodecStatus.OK;
         }
         ?? r2 = 0;
         try {
             this.running = false;
             if (!ThreadUtils.joinUninterruptibly(this.outputThread, 5000)) {
-                Logging.e("AndroidVideoDecoder", "Media decoder release timeout", new RuntimeException());
+                Logging.e(TAG, "Media decoder release timeout", new RuntimeException());
                 return VideoCodecStatus.TIMEOUT;
             } else if (this.shutdownException != null) {
-                Logging.e("AndroidVideoDecoder", "Media decoder release error", new RuntimeException(this.shutdownException));
+                Logging.e(TAG, "Media decoder release error", new RuntimeException(this.shutdownException));
                 this.shutdownException = null;
                 VideoCodecStatus videoCodecStatus = VideoCodecStatus.ERROR;
                 this.codec = null;
@@ -411,17 +411,17 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
             K.append(z2);
             K.append(", callback: ");
             K.append(this.callback);
-            Logging.d("AndroidVideoDecoder", K.toString());
+            Logging.d(TAG, K.toString());
             return VideoCodecStatus.UNINITIALIZED;
         }
         ByteBuffer byteBuffer = encodedImage.buffer;
         if (byteBuffer == null) {
-            Logging.e("AndroidVideoDecoder", "decode() - no input data");
+            Logging.e(TAG, "decode() - no input data");
             return VideoCodecStatus.ERR_PARAMETER;
         }
         int remaining = byteBuffer.remaining();
         if (remaining == 0) {
-            Logging.e("AndroidVideoDecoder", "decode() - input buffer empty");
+            Logging.e(TAG, "decode() - input buffer empty");
             return VideoCodecStatus.ERR_PARAMETER;
         }
         synchronized (this.dimensionLock) {
@@ -437,13 +437,13 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
             try {
                 int dequeueInputBuffer = this.codec.dequeueInputBuffer(500000);
                 if (dequeueInputBuffer < 0) {
-                    Logging.e("AndroidVideoDecoder", "decode() - no HW buffers available; decoder falling behind");
+                    Logging.e(TAG, "decode() - no HW buffers available; decoder falling behind");
                     return VideoCodecStatus.ERROR;
                 }
                 try {
                     ByteBuffer byteBuffer2 = this.codec.getInputBuffers()[dequeueInputBuffer];
                     if (byteBuffer2.capacity() < remaining) {
-                        Logging.e("AndroidVideoDecoder", "decode() - HW buffer too small");
+                        Logging.e(TAG, "decode() - HW buffer too small");
                         return VideoCodecStatus.ERROR;
                     }
                     byteBuffer2.put(encodedImage.buffer);
@@ -455,20 +455,20 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
                         }
                         return VideoCodecStatus.OK;
                     } catch (IllegalStateException e) {
-                        Logging.e("AndroidVideoDecoder", "queueInputBuffer failed", e);
+                        Logging.e(TAG, "queueInputBuffer failed", e);
                         this.frameInfos.pollLast();
                         return VideoCodecStatus.ERROR;
                     }
                 } catch (IllegalStateException e2) {
-                    Logging.e("AndroidVideoDecoder", "getInputBuffers failed", e2);
+                    Logging.e(TAG, "getInputBuffers failed", e2);
                     return VideoCodecStatus.ERROR;
                 }
             } catch (IllegalStateException e3) {
-                Logging.e("AndroidVideoDecoder", "dequeueInputBuffer failed", e3);
+                Logging.e(TAG, "dequeueInputBuffer failed", e3);
                 return VideoCodecStatus.ERROR;
             }
         } else {
-            Logging.e("AndroidVideoDecoder", "decode() - key frame required first");
+            Logging.e(TAG, "decode() - key frame required first");
             return VideoCodecStatus.NO_OUTPUT;
         }
     }
@@ -481,7 +481,7 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
             if (dequeueOutputBuffer == -2) {
                 reformat(this.codec.getOutputFormat());
             } else if (dequeueOutputBuffer < 0) {
-                Logging.v("AndroidVideoDecoder", "dequeueOutputBuffer returned " + dequeueOutputBuffer);
+                Logging.v(TAG, "dequeueOutputBuffer returned " + dequeueOutputBuffer);
             } else {
                 FrameInfo poll = this.frameInfos.poll();
                 Integer num = null;
@@ -498,7 +498,7 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
                 }
             }
         } catch (IllegalStateException e) {
-            Logging.e("AndroidVideoDecoder", "deliverDecodedFrame failed", e);
+            Logging.e(TAG, "deliverDecodedFrame failed", e);
         }
     }
 
@@ -522,7 +522,7 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
                 this.surface = new Surface(this.surfaceTextureHelper.getSurfaceTexture());
                 this.surfaceTextureHelper.startListening(this);
             } catch (Throwable th) {
-                Logging.e("AndroidVideoDecoder", "Error creating SurfaceTextureHelper", th);
+                Logging.e(TAG, "Error creating SurfaceTextureHelper", th);
                 Surface surface = this.surface;
                 if (surface != null) {
                     surface.release();
@@ -558,7 +558,7 @@ public class AndroidVideoDecoder implements VideoDecoder, VideoSink {
 
     @Override // org.webrtc.VideoDecoder
     public VideoCodecStatus release() {
-        Logging.d("AndroidVideoDecoder", "release");
+        Logging.d(TAG, "release");
         VideoCodecStatus releaseInternal = releaseInternal();
         if (this.surface != null) {
             releaseSurface();
diff --git a/app/src/main/java/org/webrtc/Camera1Enumerator.java b/app/src/main/java/org/webrtc/Camera1Enumerator.java
index 5e8845d46e..5b12cebf08 100644
--- a/app/src/main/java/org/webrtc/Camera1Enumerator.java
+++ b/app/src/main/java/org/webrtc/Camera1Enumerator.java
@@ -39,11 +39,11 @@ public class Camera1Enumerator implements CameraEnumerator {
 
     private static List<CameraEnumerationAndroid.CaptureFormat> enumerateFormats(int i) {
         int i2;
-        Logging.d("Camera1Enumerator", "Get supported formats for camera index " + i + ".");
+        Logging.d(TAG, "Get supported formats for camera index " + i + ".");
         long elapsedRealtime = SystemClock.elapsedRealtime();
         Camera camera = null;
         try {
-            Logging.d("Camera1Enumerator", "Opening camera with index " + i);
+            Logging.d(TAG, "Opening camera with index " + i);
             camera = Camera.open(i);
             Camera.Parameters parameters = camera.getParameters();
             camera.release();
@@ -62,16 +62,16 @@ public class Camera1Enumerator implements CameraEnumerator {
                     arrayList.add(new CameraEnumerationAndroid.CaptureFormat(size.width, size.height, i3, i2));
                 }
             } catch (Exception e) {
-                Logging.e("Camera1Enumerator", "getSupportedFormats() failed on camera index " + i, e);
+                Logging.e(TAG, "getSupportedFormats() failed on camera index " + i, e);
             }
             long elapsedRealtime2 = SystemClock.elapsedRealtime();
             StringBuilder L = a.L("Get supported formats for camera index ", i, " done. Time spent: ");
             L.append(elapsedRealtime2 - elapsedRealtime);
             L.append(" ms.");
-            Logging.d("Camera1Enumerator", L.toString());
+            Logging.d(TAG, L.toString());
             return arrayList;
         } catch (RuntimeException e2) {
-            Logging.e("Camera1Enumerator", "Open camera failed on camera index " + i, e2);
+            Logging.e(TAG, "Open camera failed on camera index " + i, e2);
             ArrayList arrayList2 = new ArrayList();
             if (camera != null) {
                 camera.release();
@@ -86,7 +86,7 @@ public class Camera1Enumerator implements CameraEnumerator {
     }
 
     public static int getCameraIndex(String str) {
-        Logging.d("Camera1Enumerator", "getCameraIndex: " + str);
+        Logging.d(TAG, "getCameraIndex: " + str);
         for (int i = 0; i < Camera.getNumberOfCameras(); i++) {
             if (str.equals(getDeviceName(i))) {
                 return i;
@@ -102,7 +102,7 @@ public class Camera1Enumerator implements CameraEnumerator {
             Camera.getCameraInfo(i, cameraInfo);
             return cameraInfo;
         } catch (Exception e) {
-            Logging.e("Camera1Enumerator", "getCameraInfo failed on index " + i, e);
+            Logging.e(TAG, "getCameraInfo failed on index " + i, e);
             return null;
         }
     }
@@ -143,9 +143,9 @@ public class Camera1Enumerator implements CameraEnumerator {
             String deviceName = getDeviceName(i);
             if (deviceName != null) {
                 arrayList.add(deviceName);
-                Logging.d("Camera1Enumerator", "Index: " + i + ". " + deviceName);
+                Logging.d(TAG, "Index: " + i + ". " + deviceName);
             } else {
-                Logging.e("Camera1Enumerator", "Index: " + i + ". Failed to query camera name.");
+                Logging.e(TAG, "Index: " + i + ". Failed to query camera name.");
             }
         }
         return (String[]) arrayList.toArray(new String[arrayList.size()]);
diff --git a/app/src/main/java/org/webrtc/Camera1Session.java b/app/src/main/java/org/webrtc/Camera1Session.java
index ad68aa2494..f57cc347f2 100644
--- a/app/src/main/java/org/webrtc/Camera1Session.java
+++ b/app/src/main/java/org/webrtc/Camera1Session.java
@@ -41,7 +41,7 @@ public class Camera1Session implements CameraSession {
         @Override // android.hardware.Camera.ErrorCallback
         public void onError(int i, Camera camera) {
             String j = i == 100 ? "Camera server died!" : a.j("Camera error: ", i);
-            Logging.e("Camera1Session", j);
+            Logging.e(Camera1Session.TAG, j);
             Camera1Session.access$000(Camera1Session.this);
             if (i == 2) {
                 Camera1Session.access$100(Camera1Session.this).onCameraDisconnected(Camera1Session.this);
@@ -60,9 +60,9 @@ public class Camera1Session implements CameraSession {
         public void onPreviewFrame(byte[] bArr, Camera camera) {
             Camera1Session.access$200(Camera1Session.this);
             if (camera != Camera1Session.access$300(Camera1Session.this)) {
-                Logging.e("Camera1Session", "Callback from a different camera. This should never happen.");
+                Logging.e(Camera1Session.TAG, "Callback from a different camera. This should never happen.");
             } else if (Camera1Session.access$400(Camera1Session.this) != SessionState.RUNNING) {
-                Logging.d("Camera1Session", "Bytebuffer frame captured but camera is no longer running.");
+                Logging.d(Camera1Session.TAG, "Bytebuffer frame captured but camera is no longer running.");
             } else {
                 long nanos = TimeUnit.MILLISECONDS.toNanos(SystemClock.elapsedRealtime());
                 if (!Camera1Session.access$500(Camera1Session.this)) {
@@ -82,7 +82,7 @@ public class Camera1Session implements CameraSession {
     }
 
     private Camera1Session(CameraSession.Events events, boolean z2, Context context, SurfaceTextureHelper surfaceTextureHelper, int i, Camera camera, Camera.CameraInfo cameraInfo, CameraEnumerationAndroid.CaptureFormat captureFormat, long j) {
-        Logging.d("Camera1Session", "Create new camera1 session on camera " + i);
+        Logging.d(TAG, "Create new camera1 session on camera " + i);
         this.events = events;
         this.captureToTexture = z2;
         this.applicationContext = context;
@@ -160,7 +160,7 @@ public class Camera1Session implements CameraSession {
 
     public static void create(CameraSession.CreateSessionCallback createSessionCallback, CameraSession.Events events, boolean z2, Context context, SurfaceTextureHelper surfaceTextureHelper, int i, int i2, int i3, int i4) {
         long nanoTime = System.nanoTime();
-        Logging.d("Camera1Session", "Open camera " + i);
+        Logging.d(TAG, "Open camera " + i);
         events.onCameraOpening();
         try {
             Camera open = Camera.open(i);
@@ -200,7 +200,7 @@ public class Camera1Session implements CameraSession {
 
     private static CameraEnumerationAndroid.CaptureFormat findClosestCaptureFormat(Camera.Parameters parameters, int i, int i2, int i3) {
         List<CameraEnumerationAndroid.CaptureFormat.FramerateRange> convertFramerates = Camera1Enumerator.convertFramerates(parameters.getSupportedPreviewFpsRange());
-        Logging.d("Camera1Session", "Available fps ranges: " + convertFramerates);
+        Logging.d(TAG, "Available fps ranges: " + convertFramerates);
         CameraEnumerationAndroid.CaptureFormat.FramerateRange closestSupportedFramerateRange = CameraEnumerationAndroid.getClosestSupportedFramerateRange(convertFramerates, i3);
         Size closestSupportedSize = CameraEnumerationAndroid.getClosestSupportedSize(Camera1Enumerator.convertSizes(parameters.getSupportedPreviewSizes()), i, i2);
         CameraEnumerationAndroid.reportCameraResolution(camera1ResolutionHistogram, closestSupportedSize);
@@ -225,7 +225,7 @@ public class Camera1Session implements CameraSession {
     public /* synthetic */ void a(VideoFrame videoFrame) {
         checkIsOnCameraThread();
         if (this.state != SessionState.RUNNING) {
-            Logging.d("Camera1Session", "Texture frame captured but camera is no longer running.");
+            Logging.d(TAG, "Texture frame captured but camera is no longer running.");
             return;
         }
         boolean z2 = true;
@@ -251,7 +251,7 @@ public class Camera1Session implements CameraSession {
     }
 
     private void startCapturing() {
-        Logging.d("Camera1Session", "Start capturing");
+        Logging.d(TAG, "Start capturing");
         checkIsOnCameraThread();
         this.state = SessionState.RUNNING;
         this.camera.setErrorCallback(new AnonymousClass1());
@@ -269,12 +269,12 @@ public class Camera1Session implements CameraSession {
     }
 
     private void stopInternal() {
-        Logging.d("Camera1Session", "Stop internal");
+        Logging.d(TAG, "Stop internal");
         checkIsOnCameraThread();
         SessionState sessionState = this.state;
         SessionState sessionState2 = SessionState.STOPPED;
         if (sessionState == sessionState2) {
-            Logging.d("Camera1Session", "Camera is already stopped");
+            Logging.d(TAG, "Camera is already stopped");
             return;
         }
         this.state = sessionState2;
@@ -282,7 +282,7 @@ public class Camera1Session implements CameraSession {
         this.camera.stopPreview();
         cameraReleaseSafe(this.camera);
         this.events.onCameraClosed(this);
-        Logging.d("Camera1Session", "Stop done");
+        Logging.d(TAG, "Stop done");
     }
 
     private static void updateCameraParameters(Camera camera, Camera.Parameters parameters, CameraEnumerationAndroid.CaptureFormat captureFormat, Size size, boolean z2) {
@@ -307,7 +307,7 @@ public class Camera1Session implements CameraSession {
     public void stop() {
         StringBuilder K = a.K("Stop camera1 session on camera ");
         K.append(this.cameraId);
-        Logging.d("Camera1Session", K.toString());
+        Logging.d(TAG, K.toString());
         checkIsOnCameraThread();
         if (this.state != SessionState.STOPPED) {
             long nanoTime = System.nanoTime();
diff --git a/app/src/main/java/org/webrtc/Camera2Capturer.java b/app/src/main/java/org/webrtc/Camera2Capturer.java
index f467171f6c..b465d2d32e 100644
--- a/app/src/main/java/org/webrtc/Camera2Capturer.java
+++ b/app/src/main/java/org/webrtc/Camera2Capturer.java
@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.camera2.CameraManager;
 import androidx.annotation.Nullable;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import org.webrtc.CameraSession;
 import org.webrtc.CameraVideoCapturer;
 @TargetApi(21)
@@ -15,7 +16,7 @@ public class Camera2Capturer extends CameraCapturer {
     public Camera2Capturer(Context context, String str, CameraVideoCapturer.CameraEventsHandler cameraEventsHandler) {
         super(str, cameraEventsHandler, new Camera2Enumerator(context));
         this.context = context;
-        this.cameraManager = (CameraManager) context.getSystemService("camera");
+        this.cameraManager = (CameraManager) context.getSystemService(ChatInputComponentTypes.CAMERA);
     }
 
     @Override // org.webrtc.CameraCapturer, org.webrtc.VideoCapturer
diff --git a/app/src/main/java/org/webrtc/Camera2Enumerator.java b/app/src/main/java/org/webrtc/Camera2Enumerator.java
index 6ab0d6c4fe..0ce49d32ff 100644
--- a/app/src/main/java/org/webrtc/Camera2Enumerator.java
+++ b/app/src/main/java/org/webrtc/Camera2Enumerator.java
@@ -13,6 +13,7 @@ import android.util.AndroidException;
 import android.util.Range;
 import android.util.Size;
 import androidx.annotation.Nullable;
+import com.discord.utilities.analytics.ChatInputComponentTypes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,7 +31,7 @@ public class Camera2Enumerator implements CameraEnumerator {
 
     public Camera2Enumerator(Context context) {
         this.context = context;
-        this.cameraManager = (CameraManager) context.getSystemService("camera");
+        this.cameraManager = (CameraManager) context.getSystemService(ChatInputComponentTypes.CAMERA);
     }
 
     public static List<CameraEnumerationAndroid.CaptureFormat.FramerateRange> convertFramerates(Range<Integer>[] rangeArr, int i) {
@@ -56,7 +57,7 @@ public class Camera2Enumerator implements CameraEnumerator {
         try {
             return this.cameraManager.getCameraCharacteristics(str);
         } catch (AndroidException e) {
-            Logging.e("Camera2Enumerator", "Camera access exception: " + e);
+            Logging.e(TAG, "Camera access exception: " + e);
             return null;
         }
     }
@@ -67,7 +68,7 @@ public class Camera2Enumerator implements CameraEnumerator {
 
     @Nullable
     public static List<CameraEnumerationAndroid.CaptureFormat> getSupportedFormats(Context context, String str) {
-        return getSupportedFormats((CameraManager) context.getSystemService("camera"), str);
+        return getSupportedFormats((CameraManager) context.getSystemService(ChatInputComponentTypes.CAMERA), str);
     }
 
     @Nullable
@@ -78,7 +79,7 @@ public class Camera2Enumerator implements CameraEnumerator {
             if (map.containsKey(str)) {
                 return map.get(str);
             }
-            Logging.d("Camera2Enumerator", "Get supported formats for camera index " + str + ".");
+            Logging.d(TAG, "Get supported formats for camera index " + str + ".");
             long elapsedRealtime = SystemClock.elapsedRealtime();
             try {
                 CameraCharacteristics cameraCharacteristics = cameraManager.getCameraCharacteristics(str);
@@ -97,16 +98,16 @@ public class Camera2Enumerator implements CameraEnumerator {
                     } catch (Exception unused) {
                         j = 0;
                     }
-                    int round = j == 0 ? i : ((int) Math.round(1.0E9d / ((double) j))) * 1000;
+                    int round = j == 0 ? i : ((int) Math.round(NANO_SECONDS_PER_SECOND / ((double) j))) * 1000;
                     arrayList.add(new CameraEnumerationAndroid.CaptureFormat(size.width, size.height, 0, round));
-                    Logging.d("Camera2Enumerator", "Format: " + size.width + "x" + size.height + "@" + round);
+                    Logging.d(TAG, "Format: " + size.width + "x" + size.height + "@" + round);
                 }
                 cachedSupportedFormats.put(str, arrayList);
                 long elapsedRealtime2 = SystemClock.elapsedRealtime();
-                Logging.d("Camera2Enumerator", "Get supported formats for camera index " + str + " done. Time spent: " + (elapsedRealtime2 - elapsedRealtime) + " ms.");
+                Logging.d(TAG, "Get supported formats for camera index " + str + " done. Time spent: " + (elapsedRealtime2 - elapsedRealtime) + " ms.");
                 return arrayList;
             } catch (Exception e) {
-                Logging.e("Camera2Enumerator", "getCameraCharacteristics(): " + e);
+                Logging.e(TAG, "getCameraCharacteristics(): " + e);
                 return new ArrayList();
             }
         }
@@ -129,7 +130,7 @@ public class Camera2Enumerator implements CameraEnumerator {
     }
 
     public static boolean isSupported(Context context) {
-        CameraManager cameraManager = (CameraManager) context.getSystemService("camera");
+        CameraManager cameraManager = (CameraManager) context.getSystemService(ChatInputComponentTypes.CAMERA);
         try {
             for (String str : cameraManager.getCameraIdList()) {
                 CameraCharacteristics cameraCharacteristics = cameraManager.getCameraCharacteristics(str);
@@ -139,10 +140,10 @@ public class Camera2Enumerator implements CameraEnumerator {
             }
             return true;
         } catch (AndroidException e) {
-            Logging.e("Camera2Enumerator", "Camera access exception: " + e);
+            Logging.e(TAG, "Camera access exception: " + e);
             return false;
         } catch (Throwable th) {
-            Logging.e("Camera2Enumerator", "Uncaught camera exception: " + th);
+            Logging.e(TAG, "Uncaught camera exception: " + th);
             return false;
         }
     }
@@ -157,7 +158,7 @@ public class Camera2Enumerator implements CameraEnumerator {
         try {
             return this.cameraManager.getCameraIdList();
         } catch (AndroidException e) {
-            Logging.e("Camera2Enumerator", "Camera access exception: " + e);
+            Logging.e(TAG, "Camera access exception: " + e);
             return new String[0];
         }
     }
diff --git a/app/src/main/java/org/webrtc/Camera2Session.java b/app/src/main/java/org/webrtc/Camera2Session.java
index 906190a884..c0e4744384 100644
--- a/app/src/main/java/org/webrtc/Camera2Session.java
+++ b/app/src/main/java/org/webrtc/Camera2Session.java
@@ -58,7 +58,7 @@ public class Camera2Session implements CameraSession {
 
         @Override // android.hardware.camera2.CameraCaptureSession.CaptureCallback
         public void onCaptureFailed(CameraCaptureSession cameraCaptureSession, CaptureRequest captureRequest, CaptureFailure captureFailure) {
-            Logging.d("Camera2Session", "Capture failed: " + captureFailure);
+            Logging.d(Camera2Session.TAG, "Capture failed: " + captureFailure);
         }
     }
 
@@ -73,7 +73,7 @@ public class Camera2Session implements CameraSession {
         @Override // android.hardware.camera2.CameraDevice.StateCallback
         public void onClosed(CameraDevice cameraDevice) {
             Camera2Session.access$000(Camera2Session.this);
-            Logging.d("Camera2Session", "Camera device closed.");
+            Logging.d(Camera2Session.TAG, "Camera device closed.");
             Camera2Session.access$500(Camera2Session.this).onCameraClosed(Camera2Session.this);
         }
 
@@ -99,7 +99,7 @@ public class Camera2Session implements CameraSession {
         @Override // android.hardware.camera2.CameraDevice.StateCallback
         public void onOpened(CameraDevice cameraDevice) {
             Camera2Session.access$000(Camera2Session.this);
-            Logging.d("Camera2Session", "Camera opened.");
+            Logging.d(Camera2Session.TAG, "Camera opened.");
             Camera2Session.access$702(Camera2Session.this, cameraDevice);
             Camera2Session.access$900(Camera2Session.this).setTextureSize(Camera2Session.access$800(Camera2Session.this).width, Camera2Session.access$800(Camera2Session.this).height);
             Camera2Session.access$1002(Camera2Session.this, new Surface(Camera2Session.access$900(Camera2Session.this).getSurfaceTexture()));
@@ -120,11 +120,11 @@ public class Camera2Session implements CameraSession {
             for (int i : (int[]) Camera2Session.access$1500(Camera2Session.this).get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES)) {
                 if (i == 3) {
                     builder.set(CaptureRequest.CONTROL_AF_MODE, 3);
-                    Logging.d("Camera2Session", "Using continuous video auto-focus.");
+                    Logging.d(Camera2Session.TAG, "Using continuous video auto-focus.");
                     return;
                 }
             }
-            Logging.d("Camera2Session", "Auto-focus is not available.");
+            Logging.d(Camera2Session.TAG, "Auto-focus is not available.");
         }
 
         private void chooseStabilizationMode(CaptureRequest.Builder builder) {
@@ -134,7 +134,7 @@ public class Camera2Session implements CameraSession {
                     if (i == 1) {
                         builder.set(CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE, 1);
                         builder.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE, 0);
-                        Logging.d("Camera2Session", "Using optical stabilization.");
+                        Logging.d(Camera2Session.TAG, "Using optical stabilization.");
                         return;
                     }
                 }
@@ -143,11 +143,11 @@ public class Camera2Session implements CameraSession {
                 if (i2 == 1) {
                     builder.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE, 1);
                     builder.set(CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE, 0);
-                    Logging.d("Camera2Session", "Using video stabilization.");
+                    Logging.d(Camera2Session.TAG, "Using video stabilization.");
                     return;
                 }
             }
-            Logging.d("Camera2Session", "Stabilization not available.");
+            Logging.d(Camera2Session.TAG, "Stabilization not available.");
         }
 
         /* access modifiers changed from: private */
@@ -155,7 +155,7 @@ public class Camera2Session implements CameraSession {
         public /* synthetic */ void a(VideoFrame videoFrame) {
             Camera2Session.access$000(Camera2Session.this);
             if (Camera2Session.access$200(Camera2Session.this) != SessionState.RUNNING) {
-                Logging.d("Camera2Session", "Texture frame captured but camera is no longer running.");
+                Logging.d(Camera2Session.TAG, "Texture frame captured but camera is no longer running.");
                 return;
             }
             if (!Camera2Session.access$1600(Camera2Session.this)) {
@@ -177,7 +177,7 @@ public class Camera2Session implements CameraSession {
         @Override // android.hardware.camera2.CameraCaptureSession.StateCallback
         public void onConfigured(CameraCaptureSession cameraCaptureSession) {
             Camera2Session.access$000(Camera2Session.this);
-            Logging.d("Camera2Session", "Camera capture session configured.");
+            Logging.d(Camera2Session.TAG, "Camera capture session configured.");
             Camera2Session.access$102(Camera2Session.this, cameraCaptureSession);
             try {
                 CaptureRequest.Builder createCaptureRequest = Camera2Session.access$700(Camera2Session.this).createCaptureRequest(3);
@@ -189,7 +189,7 @@ public class Camera2Session implements CameraSession {
                 createCaptureRequest.addTarget(Camera2Session.access$1000(Camera2Session.this));
                 cameraCaptureSession.setRepeatingRequest(createCaptureRequest.build(), new CameraCaptureCallback(), Camera2Session.access$1200(Camera2Session.this));
                 Camera2Session.access$900(Camera2Session.this).startListening(new d(this));
-                Logging.d("Camera2Session", "Camera device successfully started.");
+                Logging.d(Camera2Session.TAG, "Camera device successfully started.");
                 Camera2Session.access$400(Camera2Session.this).onDone(Camera2Session.this);
             } catch (CameraAccessException e) {
                 Camera2Session camera2Session = Camera2Session.this;
@@ -204,7 +204,7 @@ public class Camera2Session implements CameraSession {
     }
 
     private Camera2Session(CameraSession.CreateSessionCallback createSessionCallback, CameraSession.Events events, Context context, CameraManager cameraManager, SurfaceTextureHelper surfaceTextureHelper, String str, int i, int i2, int i3) {
-        Logging.d("Camera2Session", "Create new camera2 session on camera " + str);
+        Logging.d(TAG, "Create new camera2 session on camera " + str);
         this.constructionTimeNs = System.nanoTime();
         this.cameraThreadHandler = new Handler();
         this.callback = createSessionCallback;
@@ -341,8 +341,8 @@ public class Camera2Session implements CameraSession {
         this.fpsUnitFactor = fpsUnitFactor;
         List<CameraEnumerationAndroid.CaptureFormat.FramerateRange> convertFramerates = Camera2Enumerator.convertFramerates(rangeArr, fpsUnitFactor);
         List<Size> supportedSizes = Camera2Enumerator.getSupportedSizes(this.cameraCharacteristics);
-        Logging.d("Camera2Session", "Available preview sizes: " + supportedSizes);
-        Logging.d("Camera2Session", "Available fps ranges: " + convertFramerates);
+        Logging.d(TAG, "Available preview sizes: " + supportedSizes);
+        Logging.d(TAG, "Available fps ranges: " + convertFramerates);
         if (convertFramerates.isEmpty() || supportedSizes.isEmpty()) {
             reportError("No supported capture formats.");
             return;
@@ -353,7 +353,7 @@ public class Camera2Session implements CameraSession {
         this.captureFormat = new CameraEnumerationAndroid.CaptureFormat(closestSupportedSize.width, closestSupportedSize.height, closestSupportedFramerateRange);
         StringBuilder K = a.K("Using capture format: ");
         K.append(this.captureFormat);
-        Logging.d("Camera2Session", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     private int getFrameOrientation() {
@@ -368,7 +368,7 @@ public class Camera2Session implements CameraSession {
         checkIsOnCameraThread();
         StringBuilder K = a.K("Opening camera ");
         K.append(this.cameraId);
-        Logging.d("Camera2Session", K.toString());
+        Logging.d(TAG, K.toString());
         this.events.onCameraOpening();
         try {
             this.cameraManager.openCamera(this.cameraId, new CameraStateCallback(), this.cameraThreadHandler);
@@ -379,7 +379,7 @@ public class Camera2Session implements CameraSession {
 
     private void reportError(String str) {
         checkIsOnCameraThread();
-        Logging.e("Camera2Session", "Error: " + str);
+        Logging.e(TAG, "Error: " + str);
         boolean z2 = this.captureSession == null && this.state != SessionState.STOPPED;
         this.state = SessionState.STOPPED;
         stopInternal();
@@ -392,7 +392,7 @@ public class Camera2Session implements CameraSession {
 
     private void start() {
         checkIsOnCameraThread();
-        Logging.d("Camera2Session", "start");
+        Logging.d(TAG, "start");
         try {
             CameraCharacteristics cameraCharacteristics = this.cameraManager.getCameraCharacteristics(this.cameraId);
             this.cameraCharacteristics = cameraCharacteristics;
@@ -408,7 +408,7 @@ public class Camera2Session implements CameraSession {
     }
 
     private void stopInternal() {
-        Logging.d("Camera2Session", "Stop internal");
+        Logging.d(TAG, "Stop internal");
         checkIsOnCameraThread();
         this.surfaceTextureHelper.stopListening();
         CameraCaptureSession cameraCaptureSession = this.captureSession;
@@ -426,14 +426,14 @@ public class Camera2Session implements CameraSession {
             cameraDevice.close();
             this.cameraDevice = null;
         }
-        Logging.d("Camera2Session", "Stop done");
+        Logging.d(TAG, "Stop done");
     }
 
     @Override // org.webrtc.CameraSession
     public void stop() {
         StringBuilder K = a.K("Stop camera2 session on camera ");
         K.append(this.cameraId);
-        Logging.d("Camera2Session", K.toString());
+        Logging.d(TAG, K.toString());
         checkIsOnCameraThread();
         SessionState sessionState = this.state;
         SessionState sessionState2 = SessionState.STOPPED;
diff --git a/app/src/main/java/org/webrtc/CameraCapturer.java b/app/src/main/java/org/webrtc/CameraCapturer.java
index 2f4fe06966..0e2916a54c 100644
--- a/app/src/main/java/org/webrtc/CameraCapturer.java
+++ b/app/src/main/java/org/webrtc/CameraCapturer.java
@@ -53,7 +53,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
         @Override // org.webrtc.CameraSession.CreateSessionCallback
         public void onDone(CameraSession cameraSession) {
             CameraCapturer.access$000(CameraCapturer.this);
-            Logging.d("CameraCapturer", "Create session done. Switch state: " + CameraCapturer.access$100(CameraCapturer.this));
+            Logging.d(CameraCapturer.TAG, "Create session done. Switch state: " + CameraCapturer.access$100(CameraCapturer.this));
             CameraCapturer.access$300(CameraCapturer.this).removeCallbacks(CameraCapturer.access$200(CameraCapturer.this));
             synchronized (CameraCapturer.access$400(CameraCapturer.this)) {
                 CameraCapturer.access$500(CameraCapturer.this).onCapturerStarted(true);
@@ -87,7 +87,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
                 CameraCapturer.access$500(CameraCapturer.this).onCapturerStarted(false);
                 CameraCapturer.access$1710(CameraCapturer.this);
                 if (CameraCapturer.access$1700(CameraCapturer.this) <= 0) {
-                    Logging.w("CameraCapturer", "Opening camera failed, passing: " + str);
+                    Logging.w(CameraCapturer.TAG, "Opening camera failed, passing: " + str);
                     CameraCapturer.access$602(CameraCapturer.this, false);
                     CameraCapturer.access$400(CameraCapturer.this).notifyAll();
                     SwitchState access$100 = CameraCapturer.access$100(CameraCapturer.this);
@@ -105,8 +105,8 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
                         CameraCapturer.access$1000(CameraCapturer.this).onCameraError(str);
                     }
                 } else {
-                    Logging.w("CameraCapturer", "Opening camera failed, retry: " + str);
-                    CameraCapturer.access$1800(CameraCapturer.this, 500);
+                    Logging.w(CameraCapturer.TAG, "Opening camera failed, retry: " + str);
+                    CameraCapturer.access$1800(CameraCapturer.this, CameraCapturer.OPEN_CAMERA_DELAY_MS);
                 }
             }
         }
@@ -124,7 +124,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
                 if (cameraSession == CameraCapturer.access$700(CameraCapturer.this) || CameraCapturer.access$700(CameraCapturer.this) == null) {
                     CameraCapturer.access$1000(CameraCapturer.this).onCameraClosed();
                 } else {
-                    Logging.d("CameraCapturer", "onCameraClosed from another session.");
+                    Logging.d(CameraCapturer.TAG, "onCameraClosed from another session.");
                 }
             }
         }
@@ -134,7 +134,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
             CameraCapturer.access$000(CameraCapturer.this);
             synchronized (CameraCapturer.access$400(CameraCapturer.this)) {
                 if (cameraSession != CameraCapturer.access$700(CameraCapturer.this)) {
-                    Logging.w("CameraCapturer", "onCameraDisconnected from another session.");
+                    Logging.w(CameraCapturer.TAG, "onCameraDisconnected from another session.");
                     return;
                 }
                 CameraCapturer.access$1000(CameraCapturer.this).onCameraDisconnected();
@@ -147,7 +147,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
             CameraCapturer.access$000(CameraCapturer.this);
             synchronized (CameraCapturer.access$400(CameraCapturer.this)) {
                 if (cameraSession != CameraCapturer.access$700(CameraCapturer.this)) {
-                    Logging.w("CameraCapturer", "onCameraError from another session: " + str);
+                    Logging.w(CameraCapturer.TAG, "onCameraError from another session: " + str);
                     return;
                 }
                 CameraCapturer.access$1000(CameraCapturer.this).onCameraError(str);
@@ -160,7 +160,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
             CameraCapturer.access$000(CameraCapturer.this);
             synchronized (CameraCapturer.access$400(CameraCapturer.this)) {
                 if (CameraCapturer.access$700(CameraCapturer.this) != null) {
-                    Logging.w("CameraCapturer", "onCameraOpening while session was open.");
+                    Logging.w(CameraCapturer.TAG, "onCameraOpening while session was open.");
                 } else {
                     CameraCapturer.access$1000(CameraCapturer.this).onCameraOpening(CameraCapturer.access$1300(CameraCapturer.this));
                 }
@@ -172,7 +172,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
             CameraCapturer.access$000(CameraCapturer.this);
             synchronized (CameraCapturer.access$400(CameraCapturer.this)) {
                 if (cameraSession != CameraCapturer.access$700(CameraCapturer.this)) {
-                    Logging.w("CameraCapturer", "onFrameCaptured from another session.");
+                    Logging.w(CameraCapturer.TAG, "onFrameCaptured from another session.");
                     return;
                 }
                 if (!CameraCapturer.access$1100(CameraCapturer.this)) {
@@ -463,25 +463,25 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
 
     private void checkIsOnCameraThread() {
         if (Thread.currentThread() != this.cameraThreadHandler.getLooper().getThread()) {
-            Logging.e("CameraCapturer", "Check is on camera thread failed.");
+            Logging.e(TAG, "Check is on camera thread failed.");
             throw new RuntimeException("Not on camera thread.");
         }
     }
 
     private void createSessionInternal(int i) {
-        this.uiThreadHandler.postDelayed(this.openCameraTimeoutRunnable, (long) (i + 10000));
+        this.uiThreadHandler.postDelayed(this.openCameraTimeoutRunnable, (long) (i + OPEN_CAMERA_TIMEOUT));
         this.cameraThreadHandler.postDelayed(new AnonymousClass5(), (long) i);
     }
 
     private void reportCameraSwitchError(String str, @Nullable CameraVideoCapturer.CameraSwitchHandler cameraSwitchHandler) {
-        Logging.e("CameraCapturer", str);
+        Logging.e(TAG, str);
         if (cameraSwitchHandler != null) {
             cameraSwitchHandler.onCameraSwitchError(str);
         }
     }
 
     private void switchCameraInternal(@Nullable CameraVideoCapturer.CameraSwitchHandler cameraSwitchHandler, String str) {
-        Logging.d("CameraCapturer", "switchCamera internal");
+        Logging.d(TAG, "switchCamera internal");
         if (!Arrays.asList(this.cameraEnumerator.getDeviceNames()).contains(str)) {
             reportCameraSwitchError(a.s("Attempted to switch to unknown camera device ", str), cameraSwitchHandler);
             return;
@@ -500,7 +500,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
                     return;
                 }
                 this.switchState = SwitchState.IN_PROGRESS;
-                Logging.d("CameraCapturer", "switchCamera: Stopping session");
+                Logging.d(TAG, "switchCamera: Stopping session");
                 this.cameraStatistics.release();
                 this.cameraStatistics = null;
                 this.cameraThreadHandler.post(new AnonymousClass9(this.currentSession));
@@ -509,7 +509,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
                 this.sessionOpening = true;
                 this.openAttemptsRemaining = 1;
                 createSessionInternal(0);
-                Logging.d("CameraCapturer", "switchCamera done");
+                Logging.d(TAG, "switchCamera done");
                 return;
             }
             reportCameraSwitchError("switchCamera: camera is not running.", cameraSwitchHandler);
@@ -525,7 +525,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
     public void changeCaptureFormat(int i, int i2, int i3) {
         StringBuilder M = a.M("changeCaptureFormat: ", i, "x", i2, "@");
         M.append(i3);
-        Logging.d("CameraCapturer", M.toString());
+        Logging.d(TAG, M.toString());
         synchronized (this.stateLock) {
             stopCapture();
             startCapture(i, i2, i3);
@@ -536,7 +536,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
 
     @Override // org.webrtc.VideoCapturer
     public void dispose() {
-        Logging.d("CameraCapturer", "dispose");
+        Logging.d(TAG, "dispose");
         stopCapture();
     }
 
@@ -567,9 +567,9 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
         if (thread != null) {
             StackTraceElement[] stackTrace = thread.getStackTrace();
             if (stackTrace.length > 0) {
-                Logging.d("CameraCapturer", "CameraCapturer stack trace:");
+                Logging.d(TAG, "CameraCapturer stack trace:");
                 for (StackTraceElement stackTraceElement : stackTrace) {
-                    Logging.d("CameraCapturer", stackTraceElement.toString());
+                    Logging.d(TAG, stackTraceElement.toString());
                 }
             }
         }
@@ -584,7 +584,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
     public void startCapture(int i, int i2, int i3) {
         StringBuilder M = a.M("startCapture: ", i, "x", i2, "@");
         M.append(i3);
-        Logging.d("CameraCapturer", M.toString());
+        Logging.d(TAG, M.toString());
         if (this.applicationContext != null) {
             synchronized (this.stateLock) {
                 if (!this.sessionOpening) {
@@ -598,7 +598,7 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
                         return;
                     }
                 }
-                Logging.w("CameraCapturer", "Session already open");
+                Logging.w(TAG, "Session already open");
                 return;
             }
         }
@@ -607,41 +607,41 @@ public abstract class CameraCapturer implements CameraVideoCapturer {
 
     @Override // org.webrtc.VideoCapturer
     public void stopCapture() {
-        Logging.d("CameraCapturer", "Stop capture");
+        Logging.d(TAG, "Stop capture");
         synchronized (this.stateLock) {
             while (this.sessionOpening) {
-                Logging.d("CameraCapturer", "Stop capture: Waiting for session to open");
+                Logging.d(TAG, "Stop capture: Waiting for session to open");
                 try {
                     this.stateLock.wait();
                 } catch (InterruptedException unused) {
-                    Logging.w("CameraCapturer", "Stop capture interrupted while waiting for the session to open.");
+                    Logging.w(TAG, "Stop capture interrupted while waiting for the session to open.");
                     Thread.currentThread().interrupt();
                     return;
                 }
             }
             if (this.currentSession != null) {
-                Logging.d("CameraCapturer", "Stop capture: Nulling session");
+                Logging.d(TAG, "Stop capture: Nulling session");
                 this.cameraStatistics.release();
                 this.cameraStatistics = null;
                 this.cameraThreadHandler.post(new AnonymousClass6(this.currentSession));
                 this.currentSession = null;
                 this.capturerObserver.onCapturerStopped();
             } else {
-                Logging.d("CameraCapturer", "Stop capture: No session open");
+                Logging.d(TAG, "Stop capture: No session open");
             }
         }
-        Logging.d("CameraCapturer", "Stop capture done");
+        Logging.d(TAG, "Stop capture done");
     }
 
     @Override // org.webrtc.CameraVideoCapturer
     public void switchCamera(CameraVideoCapturer.CameraSwitchHandler cameraSwitchHandler) {
-        Logging.d("CameraCapturer", "switchCamera");
+        Logging.d(TAG, "switchCamera");
         this.cameraThreadHandler.post(new AnonymousClass7(cameraSwitchHandler));
     }
 
     @Override // org.webrtc.CameraVideoCapturer
     public void switchCamera(CameraVideoCapturer.CameraSwitchHandler cameraSwitchHandler, String str) {
-        Logging.d("CameraCapturer", "switchCamera");
+        Logging.d(TAG, "switchCamera");
         this.cameraThreadHandler.post(new AnonymousClass8(cameraSwitchHandler, str));
     }
 }
diff --git a/app/src/main/java/org/webrtc/CameraEnumerationAndroid.java b/app/src/main/java/org/webrtc/CameraEnumerationAndroid.java
index 732688cea9..fe22a80479 100644
--- a/app/src/main/java/org/webrtc/CameraEnumerationAndroid.java
+++ b/app/src/main/java/org/webrtc/CameraEnumerationAndroid.java
@@ -2,13 +2,14 @@ package org.webrtc;
 
 import android.graphics.ImageFormat;
 import c.d.b.a.a;
+import com.discord.widgets.settings.profile.WidgetSettingsUserProfile;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 public class CameraEnumerationAndroid {
-    public static final ArrayList<Size> COMMON_RESOLUTIONS = new ArrayList<>(Arrays.asList(new Size(160, 120), new Size(240, 160), new Size(320, 240), new Size(400, 240), new Size(480, 320), new Size(640, 360), new Size(640, 480), new Size(768, 480), new Size(854, 480), new Size(800, 600), new Size(960, 540), new Size(960, 640), new Size(1024, 576), new Size(1024, 600), new Size(1280, 720), new Size(1280, 1024), new Size(1920, 1080), new Size(1920, 1440), new Size(2560, 1440), new Size(3840, 2160)));
+    public static final ArrayList<Size> COMMON_RESOLUTIONS = new ArrayList<>(Arrays.asList(new Size(160, 120), new Size(240, 160), new Size(320, 240), new Size(400, 240), new Size(480, 320), new Size(640, 360), new Size(640, 480), new Size(768, 480), new Size(854, 480), new Size(800, 600), new Size(960, 540), new Size(960, 640), new Size(1024, 576), new Size(1024, 600), new Size(1280, 720), new Size(1280, 1024), new Size(1920, WidgetSettingsUserProfile.MAX_BANNER_IMAGE_SIZE), new Size(1920, 1440), new Size(2560, 1440), new Size(3840, 2160)));
     private static final String TAG = "CameraEnumerationAndroid";
 
     /* renamed from: org.webrtc.CameraEnumerationAndroid$1  reason: invalid class name */
@@ -35,7 +36,7 @@ public class CameraEnumerationAndroid {
         }
 
         public int diff(CaptureFormat.FramerateRange framerateRange) {
-            return progressivePenalty(framerateRange.min, 8000, 1, 4) + progressivePenalty(Math.abs((this.val$requestedFps * 1000) - framerateRange.max), 5000, 1, 3);
+            return progressivePenalty(framerateRange.min, MIN_FPS_THRESHOLD, 1, 4) + progressivePenalty(Math.abs((this.val$requestedFps * 1000) - framerateRange.max), MAX_FPS_DIFF_THRESHOLD, 1, 3);
         }
     }
 
diff --git a/app/src/main/java/org/webrtc/CameraVideoCapturer.java b/app/src/main/java/org/webrtc/CameraVideoCapturer.java
index 3cab0e0997..b31f2ba616 100644
--- a/app/src/main/java/org/webrtc/CameraVideoCapturer.java
+++ b/app/src/main/java/org/webrtc/CameraVideoCapturer.java
@@ -35,11 +35,11 @@ public interface CameraVideoCapturer extends VideoCapturer {
             @Override // java.lang.Runnable
             public void run() {
                 int round = Math.round((((float) CameraStatistics.access$000(CameraStatistics.this)) * 1000.0f) / 2000.0f);
-                Logging.d("CameraStatistics", "Camera fps: " + round + ".");
+                Logging.d(CameraStatistics.TAG, "Camera fps: " + round + ".");
                 if (CameraStatistics.access$000(CameraStatistics.this) == 0) {
                     CameraStatistics.access$104(CameraStatistics.this);
                     if (CameraStatistics.access$100(CameraStatistics.this) * 2000 >= 4000 && CameraStatistics.access$200(CameraStatistics.this) != null) {
-                        Logging.e("CameraStatistics", "Camera freezed.");
+                        Logging.e(CameraStatistics.TAG, "Camera freezed.");
                         if (CameraStatistics.access$300(CameraStatistics.this).isTextureInUse()) {
                             CameraStatistics.access$200(CameraStatistics.this).onCameraFreezed("Camera failure. Client must return video buffers.");
                             return;
diff --git a/app/src/main/java/org/webrtc/DynamicBitrateAdjuster.java b/app/src/main/java/org/webrtc/DynamicBitrateAdjuster.java
index 84281ad5ea..d5c8b884d1 100644
--- a/app/src/main/java/org/webrtc/DynamicBitrateAdjuster.java
+++ b/app/src/main/java/org/webrtc/DynamicBitrateAdjuster.java
@@ -1,4 +1,6 @@
 package org.webrtc;
+
+import com.google.android.material.shadow.ShadowDrawableWrapper;
 public class DynamicBitrateAdjuster extends BaseBitrateAdjuster {
     private static final double BITRATE_ADJUSTMENT_MAX_SCALE = 4.0d;
     private static final double BITRATE_ADJUSTMENT_SEC = 3.0d;
@@ -9,7 +11,7 @@ public class DynamicBitrateAdjuster extends BaseBitrateAdjuster {
     private double timeSinceLastAdjustmentMs;
 
     private double getBitrateAdjustmentScale() {
-        return Math.pow(4.0d, ((double) this.bitrateAdjustmentScaleExp) / 20.0d);
+        return Math.pow(BITRATE_ADJUSTMENT_MAX_SCALE, ((double) this.bitrateAdjustmentScaleExp) / 20.0d);
     }
 
     @Override // org.webrtc.BaseBitrateAdjuster, org.webrtc.BitrateAdjuster
@@ -22,11 +24,11 @@ public class DynamicBitrateAdjuster extends BaseBitrateAdjuster {
         int i2 = this.targetFps;
         if (i2 != 0) {
             int i3 = this.targetBitrateBps;
-            double d = (((double) i) - ((((double) i3) / 8.0d) / ((double) i2))) + this.deviationBytes;
+            double d = (((double) i) - ((((double) i3) / BITS_PER_BYTE) / ((double) i2))) + this.deviationBytes;
             this.deviationBytes = d;
             this.timeSinceLastAdjustmentMs = (1000.0d / ((double) i2)) + this.timeSinceLastAdjustmentMs;
-            double d2 = ((double) i3) / 8.0d;
-            double d3 = 3.0d * d2;
+            double d2 = ((double) i3) / BITS_PER_BYTE;
+            double d3 = BITRATE_ADJUSTMENT_SEC * d2;
             double min = Math.min(d, d3);
             this.deviationBytes = min;
             double max = Math.max(min, -d3);
@@ -46,7 +48,7 @@ public class DynamicBitrateAdjuster extends BaseBitrateAdjuster {
                         this.deviationBytes = d4;
                     }
                 }
-                this.timeSinceLastAdjustmentMs = 0.0d;
+                this.timeSinceLastAdjustmentMs = ShadowDrawableWrapper.COS_45;
             }
         }
     }
diff --git a/app/src/main/java/org/webrtc/EglBase.java b/app/src/main/java/org/webrtc/EglBase.java
index 08076e6cc6..059057dfff 100644
--- a/app/src/main/java/org/webrtc/EglBase.java
+++ b/app/src/main/java/org/webrtc/EglBase.java
@@ -43,7 +43,7 @@ public interface EglBase {
                 arrayList.add(1);
             }
             if (this.isRecordable) {
-                arrayList.add(12610);
+                arrayList.add(Integer.valueOf((int) EglBase.EGL_RECORDABLE_ANDROID));
                 arrayList.add(1);
             }
             arrayList.add(12344);
diff --git a/app/src/main/java/org/webrtc/EglBase10Impl.java b/app/src/main/java/org/webrtc/EglBase10Impl.java
index a03a812b59..2d3d2125a0 100644
--- a/app/src/main/java/org/webrtc/EglBase10Impl.java
+++ b/app/src/main/java/org/webrtc/EglBase10Impl.java
@@ -118,7 +118,7 @@ public class EglBase10Impl implements EglBase10 {
         this.eglDisplay = eglDisplay;
         this.eglConfig = getEglConfig(eglDisplay, iArr);
         int c2 = n0.c(iArr);
-        Logging.d("EglBase10Impl", "Using OpenGL ES version " + c2);
+        Logging.d(TAG, "Using OpenGL ES version " + c2);
         this.eglContext = createEglContext(eGLContext, this.eglDisplay, this.eglConfig, c2);
     }
 
@@ -131,7 +131,7 @@ public class EglBase10Impl implements EglBase10 {
     private EGLContext createEglContext(@Nullable EGLContext eGLContext, EGLDisplay eGLDisplay, EGLConfig eGLConfig, int i) {
         EGLContext eglCreateContext;
         if (eGLContext == null || eGLContext != EGL10.EGL_NO_CONTEXT) {
-            int[] iArr = {12440, i, 12344};
+            int[] iArr = {EGL_CONTEXT_CLIENT_VERSION, i, 12344};
             if (eGLContext == null) {
                 eGLContext = EGL10.EGL_NO_CONTEXT;
             }
diff --git a/app/src/main/java/org/webrtc/EglBase14Impl.java b/app/src/main/java/org/webrtc/EglBase14Impl.java
index 67ac7b116f..8405753bda 100644
--- a/app/src/main/java/org/webrtc/EglBase14Impl.java
+++ b/app/src/main/java/org/webrtc/EglBase14Impl.java
@@ -49,7 +49,7 @@ public class EglBase14Impl implements EglBase14 {
         this.eglDisplay = eglDisplay;
         this.eglConfig = getEglConfig(eglDisplay, iArr);
         int c2 = n0.c(iArr);
-        Logging.d("EglBase14Impl", "Using OpenGL ES version " + c2);
+        Logging.d(TAG, "Using OpenGL ES version " + c2);
         this.eglContext = createEglContext(eGLContext, this.eglDisplay, this.eglConfig, c2);
     }
 
@@ -141,7 +141,7 @@ public class EglBase14Impl implements EglBase14 {
         K.append(i);
         K.append(". isEGL14Supported: ");
         K.append(i >= 18);
-        Logging.d("EglBase14Impl", K.toString());
+        Logging.d(TAG, K.toString());
         return i >= 18;
     }
 
diff --git a/app/src/main/java/org/webrtc/EglRenderer.java b/app/src/main/java/org/webrtc/EglRenderer.java
index eca43b720b..a1945c656e 100644
--- a/app/src/main/java/org/webrtc/EglRenderer.java
+++ b/app/src/main/java/org/webrtc/EglRenderer.java
@@ -10,6 +10,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.view.Surface;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import h0.c.e;
 import h0.c.f;
 import h0.c.g;
@@ -161,7 +162,7 @@ public class EglRenderer implements VideoSink {
             try {
                 super.dispatchMessage(message);
             } catch (Exception e) {
-                Logging.e("EglRenderer", "Exception on EglRenderer thread", e);
+                Logging.e(EglRenderer.TAG, "Exception on EglRenderer thread", e);
                 this.exceptionCallback.run();
                 throw e;
             }
@@ -254,11 +255,11 @@ public class EglRenderer implements VideoSink {
     }
 
     private void logD(String str) {
-        Logging.d("EglRenderer", this.name + str);
+        Logging.d(TAG, this.name + str);
     }
 
     private void logE(String str, Throwable th) {
-        Logging.e("EglRenderer", this.name + str, th);
+        Logging.e(TAG, this.name + str, th);
     }
 
     private void logStatistics() {
@@ -267,7 +268,7 @@ public class EglRenderer implements VideoSink {
         synchronized (this.statisticsLock) {
             long j = nanoTime - this.statisticsStartTimeNs;
             if (j > 0) {
-                if (this.minRenderPeriodNs != Long.MAX_VALUE || this.framesReceived != 0) {
+                if (this.minRenderPeriodNs != RecyclerView.FOREVER_NS || this.framesReceived != 0) {
                     float nanos = ((float) (((long) this.framesRendered) * TimeUnit.SECONDS.toNanos(1))) / ((float) j);
                     logD("Duration: " + TimeUnit.NANOSECONDS.toMillis(j) + " ms. Frames received: " + this.framesReceived + ". Dropped: " + this.framesDropped + ". Rendered: " + this.framesRendered + ". Render fps: " + decimalFormat.format((double) nanos) + ". Average render time: " + averageTimeAsString(this.renderTimeNs, this.framesRendered) + ". Average swapBuffer time: " + averageTimeAsString(this.renderSwapBufferTimeNs, this.framesRendered) + ".");
                     resetStatistics(nanoTime);
@@ -277,7 +278,7 @@ public class EglRenderer implements VideoSink {
     }
 
     private void logW(String str) {
-        Logging.w("EglRenderer", this.name + str);
+        Logging.w(TAG, this.name + str);
     }
 
     private void notifyCallbacks(VideoFrame videoFrame, boolean z2) {
@@ -353,7 +354,7 @@ public class EglRenderer implements VideoSink {
         synchronized (this.fpsReductionLock) {
             long j = this.minRenderPeriodNs;
             z2 = true;
-            if (j != Long.MAX_VALUE) {
+            if (j != RecyclerView.FOREVER_NS) {
                 if (j > 0) {
                     long nanoTime = System.nanoTime();
                     long j2 = this.nextFrameTimeNs;
@@ -569,7 +570,7 @@ public class EglRenderer implements VideoSink {
                 logD("Initializing EglRenderer");
                 this.drawer = glDrawer;
                 this.usePresentationTimeStamp = z2;
-                HandlerThread handlerThread = new HandlerThread(this.name + "EglRenderer");
+                HandlerThread handlerThread = new HandlerThread(this.name + TAG);
                 handlerThread.start();
                 HandlerWithExceptionCallback handlerWithExceptionCallback = new HandlerWithExceptionCallback(handlerThread.getLooper(), new AnonymousClass2());
                 this.renderThreadHandler = handlerWithExceptionCallback;
@@ -693,7 +694,7 @@ public class EglRenderer implements VideoSink {
         synchronized (this.fpsReductionLock) {
             long j = this.minRenderPeriodNs;
             if (f <= 0.0f) {
-                this.minRenderPeriodNs = Long.MAX_VALUE;
+                this.minRenderPeriodNs = RecyclerView.FOREVER_NS;
             } else {
                 this.minRenderPeriodNs = (long) (((float) TimeUnit.SECONDS.toNanos(1)) / f);
             }
diff --git a/app/src/main/java/org/webrtc/FileVideoCapturer.java b/app/src/main/java/org/webrtc/FileVideoCapturer.java
index 09cb92cc55..4b696c9b65 100644
--- a/app/src/main/java/org/webrtc/FileVideoCapturer.java
+++ b/app/src/main/java/org/webrtc/FileVideoCapturer.java
@@ -70,7 +70,7 @@ public class FileVideoCapturer implements VideoCapturer {
                             i = Integer.parseInt(str3.substring(1));
                         }
                     }
-                    Logging.d("VideoReaderY4M", "Color space: " + str2);
+                    Logging.d(TAG, "Color space: " + str2);
                     if (!str2.equals("420") && !str2.equals("420mpeg2")) {
                         throw new IllegalArgumentException("Does not support any other color space than I420 or I420mpeg2");
                     } else if (i % 2 == 1 || i2 % 2 == 1) {
@@ -78,7 +78,7 @@ public class FileVideoCapturer implements VideoCapturer {
                     } else {
                         this.frameWidth = i;
                         this.frameHeight = i2;
-                        Logging.d("VideoReaderY4M", a.n("frame dim: (", i, ", ", i2, ")"));
+                        Logging.d(TAG, a.n("frame dim: (", i, ", ", i2, ")"));
                         return;
                     }
                 } else {
@@ -92,7 +92,7 @@ public class FileVideoCapturer implements VideoCapturer {
             try {
                 this.mediaFile.close();
             } catch (IOException e) {
-                Logging.e("VideoReaderY4M", "Problem closing file", e);
+                Logging.e(TAG, "Problem closing file", e);
             }
         }
 
@@ -134,7 +134,7 @@ public class FileVideoCapturer implements VideoCapturer {
         try {
             this.videoReader = new VideoReaderY4M(str);
         } catch (IOException e) {
-            Logging.d("FileVideoCapturer", "Could not open video file: " + str);
+            Logging.d(TAG, "Could not open video file: " + str);
             throw e;
         }
     }
diff --git a/app/src/main/java/org/webrtc/GlGenericDrawer.java b/app/src/main/java/org/webrtc/GlGenericDrawer.java
index eed993c82d..48d45b8c3a 100644
--- a/app/src/main/java/org/webrtc/GlGenericDrawer.java
+++ b/app/src/main/java/org/webrtc/GlGenericDrawer.java
@@ -43,7 +43,7 @@ public class GlGenericDrawer implements RendererCommon.GlDrawer {
     }
 
     public GlGenericDrawer(String str, ShaderCallbacks shaderCallbacks) {
-        this("varying vec2 tc;\nattribute vec4 in_pos;\nattribute vec4 in_tc;\nuniform mat4 tex_mat;\nvoid main() {\n  gl_Position = in_pos;\n  tc = (tex_mat * in_tc).xy;\n}\n", str, shaderCallbacks);
+        this(DEFAULT_VERTEX_SHADER_STRING, str, shaderCallbacks);
     }
 
     public static String createFragmentShaderString(String str, ShaderType shaderType) {
@@ -92,9 +92,9 @@ public class GlGenericDrawer implements RendererCommon.GlDrawer {
             }
             GlUtil.checkNoGLES2Error("Create shader");
             this.shaderCallbacks.onNewShader(createShader);
-            this.texMatrixLocation = createShader.getUniformLocation("tex_mat");
-            this.inPosLocation = createShader.getAttribLocation("in_pos");
-            this.inTcLocation = createShader.getAttribLocation("in_tc");
+            this.texMatrixLocation = createShader.getUniformLocation(TEXTURE_MATRIX_NAME);
+            this.inPosLocation = createShader.getAttribLocation(INPUT_VERTEX_COORDINATE_NAME);
+            this.inTcLocation = createShader.getAttribLocation(INPUT_TEXTURE_COORDINATE_NAME);
             glShader = createShader;
         }
         glShader.useProgram();
diff --git a/app/src/main/java/org/webrtc/GlRectDrawer.java b/app/src/main/java/org/webrtc/GlRectDrawer.java
index 27156785ff..9724f33905 100644
--- a/app/src/main/java/org/webrtc/GlRectDrawer.java
+++ b/app/src/main/java/org/webrtc/GlRectDrawer.java
@@ -18,7 +18,7 @@ public class GlRectDrawer extends GlGenericDrawer {
     }
 
     public GlRectDrawer() {
-        super("void main() {\n  gl_FragColor = sample(tc);\n}\n", new ShaderCallbacks());
+        super(FRAGMENT_SHADER, new ShaderCallbacks());
     }
 
     @Override // org.webrtc.GlGenericDrawer, org.webrtc.RendererCommon.GlDrawer
diff --git a/app/src/main/java/org/webrtc/GlShader.java b/app/src/main/java/org/webrtc/GlShader.java
index 5fc33ab0ff..de56ecd3df 100644
--- a/app/src/main/java/org/webrtc/GlShader.java
+++ b/app/src/main/java/org/webrtc/GlShader.java
@@ -27,7 +27,7 @@ public class GlShader {
             }
             StringBuilder K = a.K("Could not link program: ");
             K.append(GLES20.glGetProgramInfoLog(this.program));
-            Logging.e("GlShader", K.toString());
+            Logging.e(TAG, K.toString());
             throw new RuntimeException(GLES20.glGetProgramInfoLog(this.program));
         }
         StringBuilder K2 = a.K("glCreateProgram() failed. GLES20 error: ");
@@ -50,7 +50,7 @@ public class GlShader {
             K.append(GLES20.glGetShaderInfoLog(glCreateShader));
             K.append(" in shader:\n");
             K.append(str);
-            Logging.e("GlShader", K.toString());
+            Logging.e(TAG, K.toString());
             throw new RuntimeException(GLES20.glGetShaderInfoLog(glCreateShader));
         }
         StringBuilder K2 = a.K("glCreateShader() failed. GLES20 error: ");
@@ -83,7 +83,7 @@ public class GlShader {
     }
 
     public void release() {
-        Logging.d("GlShader", "Deleting shader.");
+        Logging.d(TAG, "Deleting shader.");
         int i = this.program;
         if (i != -1) {
             GLES20.glDeleteProgram(i);
diff --git a/app/src/main/java/org/webrtc/GlUtil.java b/app/src/main/java/org/webrtc/GlUtil.java
index 067fd13d64..97ed612102 100644
--- a/app/src/main/java/org/webrtc/GlUtil.java
+++ b/app/src/main/java/org/webrtc/GlUtil.java
@@ -1,6 +1,7 @@
 package org.webrtc;
 
 import android.opengl.GLES20;
+import androidx.work.Data;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
@@ -41,7 +42,7 @@ public class GlUtil {
         int i2 = iArr[0];
         GLES20.glBindTexture(i, i2);
         GLES20.glTexParameterf(i, 10241, 9729.0f);
-        GLES20.glTexParameterf(i, 10240, 9729.0f);
+        GLES20.glTexParameterf(i, Data.MAX_DATA_BYTES, 9729.0f);
         GLES20.glTexParameterf(i, 10242, 33071.0f);
         GLES20.glTexParameterf(i, 10243, 33071.0f);
         checkNoGLES2Error("generateTexture");
diff --git a/app/src/main/java/org/webrtc/HardwareVideoEncoder.java b/app/src/main/java/org/webrtc/HardwareVideoEncoder.java
index 6abe4ffbaa..b236b23f6b 100644
--- a/app/src/main/java/org/webrtc/HardwareVideoEncoder.java
+++ b/app/src/main/java/org/webrtc/HardwareVideoEncoder.java
@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.view.Surface;
 import androidx.annotation.Nullable;
 import c.d.b.a.a;
+import com.discord.models.domain.ModelAuditLogEntry;
 import h0.c.n;
 import h0.c.r0;
 import java.io.IOException;
@@ -123,7 +124,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
                     try {
                         this.countLock.wait();
                     } catch (InterruptedException e) {
-                        Logging.e("HardwareVideoEncoder", "Interrupted while waiting on busy count", e);
+                        Logging.e(HardwareVideoEncoder.TAG, "Interrupted while waiting on busy count", e);
                         z2 = true;
                     }
                 }
@@ -210,7 +211,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
         try {
             int dequeueInputBuffer = this.codec.dequeueInputBuffer(0);
             if (dequeueInputBuffer == -1) {
-                Logging.d("HardwareVideoEncoder", "Dropped frame, no input buffers available");
+                Logging.d(TAG, "Dropped frame, no input buffers available");
                 return VideoCodecStatus.NO_OUTPUT;
             }
             try {
@@ -219,15 +220,15 @@ public class HardwareVideoEncoder implements VideoEncoder {
                     this.codec.queueInputBuffer(dequeueInputBuffer, 0, i, timestampNs, 0);
                     return VideoCodecStatus.OK;
                 } catch (IllegalStateException e) {
-                    Logging.e("HardwareVideoEncoder", "queueInputBuffer failed", e);
+                    Logging.e(TAG, "queueInputBuffer failed", e);
                     return VideoCodecStatus.ERROR;
                 }
             } catch (IllegalStateException e2) {
-                Logging.e("HardwareVideoEncoder", "getInputBuffers failed", e2);
+                Logging.e(TAG, "getInputBuffers failed", e2);
                 return VideoCodecStatus.ERROR;
             }
         } catch (IllegalStateException e3) {
-            Logging.e("HardwareVideoEncoder", "dequeueInputBuffer failed", e3);
+            Logging.e(TAG, "dequeueInputBuffer failed", e3);
             return VideoCodecStatus.ERROR;
         }
     }
@@ -240,7 +241,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
             this.textureEglBase.swapBuffers(videoFrame.getTimestampNs());
             return VideoCodecStatus.OK;
         } catch (RuntimeException e) {
-            Logging.e("HardwareVideoEncoder", "encodeTexture failed", e);
+            Logging.e(TAG, "encodeTexture failed", e);
             return VideoCodecStatus.ERROR;
         }
     }
@@ -253,8 +254,8 @@ public class HardwareVideoEncoder implements VideoEncoder {
             int intValue = (this.useSurfaceMode ? this.surfaceColorFormat : this.yuvColorFormat).intValue();
             try {
                 MediaFormat createVideoFormat = MediaFormat.createVideoFormat(this.codecType.mimeType(), this.width, this.height);
-                createVideoFormat.setInteger("bitrate", this.adjustedBitrate);
-                createVideoFormat.setInteger("bitrate-mode", 2);
+                createVideoFormat.setInteger(ModelAuditLogEntry.CHANGE_KEY_BITRATE, this.adjustedBitrate);
+                createVideoFormat.setInteger(KEY_BITRATE_MODE, 2);
                 createVideoFormat.setInteger("color-format", intValue);
                 createVideoFormat.setInteger("frame-rate", this.bitrateAdjuster.getCodecConfigFramerate());
                 createVideoFormat.setInteger("i-frame-interval", this.keyFrameIntervalSec);
@@ -276,10 +277,10 @@ public class HardwareVideoEncoder implements VideoEncoder {
                         createVideoFormat.setInteger("profile", 8);
                         createVideoFormat.setInteger("level", 256);
                     } else if (c2 != 1) {
-                        Logging.w("HardwareVideoEncoder", "Unknown profile level id: " + str);
+                        Logging.w(TAG, "Unknown profile level id: " + str);
                     }
                 }
-                Logging.d("HardwareVideoEncoder", "Format: " + createVideoFormat);
+                Logging.d(TAG, "Format: " + createVideoFormat);
                 EGLContext eGLContext = null;
                 this.codec.configure(createVideoFormat, null, null, 1);
                 if (this.useSurfaceMode) {
@@ -303,35 +304,35 @@ public class HardwareVideoEncoder implements VideoEncoder {
                 createOutputThread.start();
                 return VideoCodecStatus.OK;
             } catch (IllegalStateException e) {
-                Logging.e("HardwareVideoEncoder", "initEncodeInternal failed", e);
+                Logging.e(TAG, "initEncodeInternal failed", e);
                 release();
                 return VideoCodecStatus.FALLBACK_SOFTWARE;
             }
         } catch (IOException | IllegalArgumentException unused) {
             StringBuilder K = a.K("Cannot create media encoder ");
             K.append(this.codecName);
-            Logging.e("HardwareVideoEncoder", K.toString());
+            Logging.e(TAG, K.toString());
             return VideoCodecStatus.FALLBACK_SOFTWARE;
         }
     }
 
     private void releaseCodecOnOutputThread() {
         this.outputThreadChecker.checkIsOnValidThread();
-        Logging.d("HardwareVideoEncoder", "Releasing MediaCodec on output thread");
+        Logging.d(TAG, "Releasing MediaCodec on output thread");
         this.outputBuffersBusyCount.waitForZero();
         try {
             this.codec.stop();
         } catch (Exception e) {
-            Logging.e("HardwareVideoEncoder", "Media encoder stop failed", e);
+            Logging.e(TAG, "Media encoder stop failed", e);
         }
         try {
             this.codec.release();
         } catch (Exception e2) {
-            Logging.e("HardwareVideoEncoder", "Media encoder release failed", e2);
+            Logging.e(TAG, "Media encoder release failed", e2);
             this.shutdownException = e2;
         }
         this.configBuffer = null;
-        Logging.d("HardwareVideoEncoder", "Release on output thread done");
+        Logging.d(TAG, "Release on output thread done");
     }
 
     private void requestKeyFrame(long j) {
@@ -342,7 +343,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
             this.codec.setParameters(bundle);
             this.lastKeyFrameNs = j;
         } catch (IllegalStateException e) {
-            Logging.e("HardwareVideoEncoder", "requestKeyFrame failed", e);
+            Logging.e(TAG, "requestKeyFrame failed", e);
         }
     }
 
@@ -373,7 +374,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
             this.codec.setParameters(bundle);
             return VideoCodecStatus.OK;
         } catch (IllegalStateException e) {
-            Logging.e("HardwareVideoEncoder", "updateBitrate failed", e);
+            Logging.e(TAG, "updateBitrate failed", e);
             return VideoCodecStatus.ERROR;
         }
     }
@@ -382,7 +383,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
         try {
             this.codec.releaseOutputBuffer(i, false);
         } catch (Exception e) {
-            Logging.e("HardwareVideoEncoder", "releaseOutputBuffer failed", e);
+            Logging.e(TAG, "releaseOutputBuffer failed", e);
         }
         this.outputBuffersBusyCount.decrement();
     }
@@ -403,7 +404,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
                 byteBuffer2.position(bufferInfo.offset);
                 byteBuffer2.limit(bufferInfo.offset + bufferInfo.size);
                 if ((bufferInfo.flags & 2) != 0) {
-                    Logging.d("HardwareVideoEncoder", "Config frame generated. Offset: " + bufferInfo.offset + ". Size: " + bufferInfo.size);
+                    Logging.d(TAG, "Config frame generated. Offset: " + bufferInfo.offset + ". Size: " + bufferInfo.size);
                     ByteBuffer allocateDirect = ByteBuffer.allocateDirect(bufferInfo.size);
                     this.configBuffer = allocateDirect;
                     allocateDirect.put(byteBuffer2);
@@ -418,12 +419,12 @@ public class HardwareVideoEncoder implements VideoEncoder {
                     z2 = false;
                 }
                 if (z2) {
-                    Logging.d("HardwareVideoEncoder", "Sync frame generated");
+                    Logging.d(TAG, "Sync frame generated");
                 }
                 if (!z2 || this.codecType != VideoCodecMimeType.H264) {
                     byteBuffer = byteBuffer2.slice();
                 } else {
-                    Logging.d("HardwareVideoEncoder", "Prepending config frame of size " + this.configBuffer.capacity() + " to output buffer with offset " + bufferInfo.offset + ", size " + bufferInfo.size);
+                    Logging.d(TAG, "Prepending config frame of size " + this.configBuffer.capacity() + " to output buffer with offset " + bufferInfo.offset + ", size " + bufferInfo.size);
                     byteBuffer = ByteBuffer.allocateDirect(bufferInfo.size + this.configBuffer.capacity());
                     this.configBuffer.rewind();
                     byteBuffer.put(this.configBuffer);
@@ -440,7 +441,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
                 this.outputBuffers = this.codec.getOutputBuffers();
             }
         } catch (IllegalStateException e) {
-            Logging.e("HardwareVideoEncoder", "deliverOutput failed", e);
+            Logging.e(TAG, "deliverOutput failed", e);
         }
     }
 
@@ -460,7 +461,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
             return resetCodec;
         }
         if (this.outputBuilders.size() > 2) {
-            Logging.w("HardwareVideoEncoder", "Dropped frame, encoder queue full");
+            Logging.w(TAG, "Dropped frame, encoder queue full");
             return VideoCodecStatus.NO_OUTPUT;
         }
         boolean z4 = false;
@@ -534,7 +535,7 @@ public class HardwareVideoEncoder implements VideoEncoder {
         K.append(settings.maxFramerate);
         K.append(" Use surface mode: ");
         K.append(this.useSurfaceMode);
-        Logging.d("HardwareVideoEncoder", K.toString());
+        Logging.d(TAG, K.toString());
         return initEncodeInternal();
     }
 
@@ -552,10 +553,10 @@ public class HardwareVideoEncoder implements VideoEncoder {
         } else {
             this.running = false;
             if (!ThreadUtils.joinUninterruptibly(this.outputThread, 5000)) {
-                Logging.e("HardwareVideoEncoder", "Media encoder release timeout");
+                Logging.e(TAG, "Media encoder release timeout");
                 videoCodecStatus = VideoCodecStatus.TIMEOUT;
             } else if (this.shutdownException != null) {
-                Logging.e("HardwareVideoEncoder", "Media encoder release exception", this.shutdownException);
+                Logging.e(TAG, "Media encoder release exception", this.shutdownException);
                 videoCodecStatus = VideoCodecStatus.ERROR;
             } else {
                 videoCodecStatus = VideoCodecStatus.OK;
diff --git a/app/src/main/java/org/webrtc/HardwareVideoEncoderFactory.java b/app/src/main/java/org/webrtc/HardwareVideoEncoderFactory.java
index da84319e17..423440884b 100644
--- a/app/src/main/java/org/webrtc/HardwareVideoEncoderFactory.java
+++ b/app/src/main/java/org/webrtc/HardwareVideoEncoderFactory.java
@@ -57,7 +57,7 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
         if (context instanceof EglBase14.Context) {
             this.sharedContext = (EglBase14.Context) context;
         } else {
-            Logging.w("HardwareVideoEncoderFactory", "No shared EglBase.Context.  Encoders will not use texture mode.");
+            Logging.w(TAG, "No shared EglBase.Context.  Encoders will not use texture mode.");
             this.sharedContext = null;
         }
         this.enableIntelVp8Encoder = z2;
@@ -71,7 +71,7 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
     }
 
     private BitrateAdjuster createBitrateAdjuster(VideoCodecMimeType videoCodecMimeType, String str) {
-        return str.startsWith("OMX.Exynos.") ? videoCodecMimeType == VideoCodecMimeType.VP8 ? new DynamicBitrateAdjuster() : new FramerateBitrateAdjuster() : new BaseBitrateAdjuster();
+        return str.startsWith(MediaCodecUtils.EXYNOS_PREFIX) ? videoCodecMimeType == VideoCodecMimeType.VP8 ? new DynamicBitrateAdjuster() : new FramerateBitrateAdjuster() : new BaseBitrateAdjuster();
     }
 
     @Nullable
@@ -85,7 +85,7 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
             try {
                 mediaCodecInfo = MediaCodecList.getCodecInfoAt(i);
             } catch (IllegalArgumentException e) {
-                Logging.e("HardwareVideoEncoderFactory", "Cannot retrieve encoder codec info", e);
+                Logging.e(TAG, "Cannot retrieve encoder codec info", e);
             }
             if (mediaCodecInfo != null && mediaCodecInfo.isEncoder() && isSupportedCodec(mediaCodecInfo, videoCodecMimeType)) {
                 return mediaCodecInfo;
@@ -95,13 +95,13 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
     }
 
     private int getForcedKeyFrameIntervalMs(VideoCodecMimeType videoCodecMimeType, String str) {
-        if (videoCodecMimeType != VideoCodecMimeType.VP8 || !str.startsWith("OMX.qcom.")) {
+        if (videoCodecMimeType != VideoCodecMimeType.VP8 || !str.startsWith(MediaCodecUtils.QCOM_PREFIX)) {
             return 0;
         }
         int i = Build.VERSION.SDK_INT;
         if (!(i == 21 || i == 22)) {
             if (i == 23) {
-                return 20000;
+                return QCOM_VP8_KEY_FRAME_INTERVAL_ANDROID_M_MS;
             }
             if (i <= 23) {
                 return 0;
@@ -122,7 +122,7 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
     }
 
     private boolean isH264HighProfileSupported(MediaCodecInfo mediaCodecInfo) {
-        return this.enableH264HighProfile && Build.VERSION.SDK_INT > 23 && mediaCodecInfo.getName().startsWith("OMX.Exynos.");
+        return this.enableH264HighProfile && Build.VERSION.SDK_INT > 23 && mediaCodecInfo.getName().startsWith(MediaCodecUtils.EXYNOS_PREFIX);
     }
 
     private boolean isHardwareSupportedInCurrentSdk(MediaCodecInfo mediaCodecInfo, VideoCodecMimeType videoCodecMimeType) {
@@ -156,12 +156,12 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
 
     private boolean isHardwareSupportedInCurrentSdkVp8(MediaCodecInfo mediaCodecInfo) {
         String name = mediaCodecInfo.getName();
-        return name.startsWith("OMX.qcom.") || (name.startsWith("OMX.Exynos.") && Build.VERSION.SDK_INT >= 23) || (name.startsWith("OMX.Intel.") && this.enableIntelVp8Encoder);
+        return name.startsWith(MediaCodecUtils.QCOM_PREFIX) || (name.startsWith(MediaCodecUtils.EXYNOS_PREFIX) && Build.VERSION.SDK_INT >= 23) || (name.startsWith(MediaCodecUtils.INTEL_PREFIX) && this.enableIntelVp8Encoder);
     }
 
     private boolean isHardwareSupportedInCurrentSdkVp9(MediaCodecInfo mediaCodecInfo) {
         String name = mediaCodecInfo.getName();
-        return (name.startsWith("OMX.qcom.") || name.startsWith("OMX.Exynos.")) && Build.VERSION.SDK_INT >= 24;
+        return (name.startsWith(MediaCodecUtils.QCOM_PREFIX) || name.startsWith(MediaCodecUtils.EXYNOS_PREFIX)) && Build.VERSION.SDK_INT >= 24;
     }
 
     private boolean isMediaCodecAllowed(MediaCodecInfo mediaCodecInfo) {
diff --git a/app/src/main/java/org/webrtc/MediaCodecUtils.java b/app/src/main/java/org/webrtc/MediaCodecUtils.java
index 2491459499..78dc3d826d 100644
--- a/app/src/main/java/org/webrtc/MediaCodecUtils.java
+++ b/app/src/main/java/org/webrtc/MediaCodecUtils.java
@@ -11,8 +11,8 @@ public class MediaCodecUtils {
     public static final int COLOR_QCOM_FORMATYVU420PackedSemiPlanar16m4ka = 2141391874;
     public static final int COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka = 2141391873;
     public static final int COLOR_QCOM_FORMATYVU420PackedSemiPlanar64x32Tile2m8ka = 2141391875;
-    public static final int[] DECODER_COLOR_FORMATS = {19, 21, 2141391872, 2141391873, 2141391874, 2141391875, 2141391876};
-    public static final int[] ENCODER_COLOR_FORMATS = {19, 21, 2141391872, 2141391876};
+    public static final int[] DECODER_COLOR_FORMATS = {19, 21, 2141391872, COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka, COLOR_QCOM_FORMATYVU420PackedSemiPlanar16m4ka, COLOR_QCOM_FORMATYVU420PackedSemiPlanar64x32Tile2m8ka, COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m};
+    public static final int[] ENCODER_COLOR_FORMATS = {19, 21, 2141391872, COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m};
     public static final String EXYNOS_PREFIX = "OMX.Exynos.";
     public static final String INTEL_PREFIX = "OMX.Intel.";
     public static final String NVIDIA_PREFIX = "OMX.Nvidia.";
diff --git a/app/src/main/java/org/webrtc/MediaCodecVideoDecoderFactory.java b/app/src/main/java/org/webrtc/MediaCodecVideoDecoderFactory.java
index f75c56fe03..c3d8283b07 100644
--- a/app/src/main/java/org/webrtc/MediaCodecVideoDecoderFactory.java
+++ b/app/src/main/java/org/webrtc/MediaCodecVideoDecoderFactory.java
@@ -30,7 +30,7 @@ public class MediaCodecVideoDecoderFactory implements VideoDecoderFactory {
             try {
                 mediaCodecInfo = MediaCodecList.getCodecInfoAt(i);
             } catch (IllegalArgumentException e) {
-                Logging.e("MediaCodecVideoDecoderFactory", "Cannot retrieve decoder codec info", e);
+                Logging.e(TAG, "Cannot retrieve decoder codec info", e);
             }
             if (mediaCodecInfo != null && !mediaCodecInfo.isEncoder() && isSupportedCodec(mediaCodecInfo, videoCodecMimeType)) {
                 return mediaCodecInfo;
@@ -50,10 +50,10 @@ public class MediaCodecVideoDecoderFactory implements VideoDecoderFactory {
     private boolean isH264HighProfileSupported(MediaCodecInfo mediaCodecInfo) {
         String name = mediaCodecInfo.getName();
         int i = Build.VERSION.SDK_INT;
-        if (name.startsWith("OMX.qcom.")) {
+        if (name.startsWith(MediaCodecUtils.QCOM_PREFIX)) {
             return true;
         }
-        return i >= 23 && name.startsWith("OMX.Exynos.");
+        return i >= 23 && name.startsWith(MediaCodecUtils.EXYNOS_PREFIX);
     }
 
     private boolean isSupportedCodec(MediaCodecInfo mediaCodecInfo, VideoCodecMimeType videoCodecMimeType) {
diff --git a/app/src/main/java/org/webrtc/MediaStream.java b/app/src/main/java/org/webrtc/MediaStream.java
index 69e70b8180..b30b5bb8ed 100644
--- a/app/src/main/java/org/webrtc/MediaStream.java
+++ b/app/src/main/java/org/webrtc/MediaStream.java
@@ -42,7 +42,7 @@ public class MediaStream {
                 return;
             }
         }
-        Logging.e("MediaStream", "Couldn't not find track");
+        Logging.e(TAG, "Couldn't not find track");
     }
 
     @CalledByNative
diff --git a/app/src/main/java/org/webrtc/MediaStreamTrack.java b/app/src/main/java/org/webrtc/MediaStreamTrack.java
index 2fcf84748d..71ce3d0d99 100644
--- a/app/src/main/java/org/webrtc/MediaStreamTrack.java
+++ b/app/src/main/java/org/webrtc/MediaStreamTrack.java
@@ -65,10 +65,10 @@ public class MediaStreamTrack {
             return null;
         }
         String nativeGetKind = nativeGetKind(j);
-        if (nativeGetKind.equals("audio")) {
+        if (nativeGetKind.equals(AUDIO_TRACK_KIND)) {
             return new AudioTrack(j);
         }
-        if (nativeGetKind.equals("video")) {
+        if (nativeGetKind.equals(VIDEO_TRACK_KIND)) {
             return new VideoTrack(j);
         }
         return null;
diff --git a/app/src/main/java/org/webrtc/NetworkMonitor.java b/app/src/main/java/org/webrtc/NetworkMonitor.java
index ce04b9cd04..76f6e82ea3 100644
--- a/app/src/main/java/org/webrtc/NetworkMonitor.java
+++ b/app/src/main/java/org/webrtc/NetworkMonitor.java
@@ -209,7 +209,7 @@ public class NetworkMonitor {
 
     @CalledByNative
     private void startMonitoring(@Nullable Context context, long j) {
-        Logging.d("NetworkMonitor", "Start monitoring with native observer " + j);
+        Logging.d(TAG, "Start monitoring with native observer " + j);
         if (context == null) {
             context = ContextUtils.getApplicationContext();
         }
@@ -223,7 +223,7 @@ public class NetworkMonitor {
 
     @CalledByNative
     private void stopMonitoring(long j) {
-        Logging.d("NetworkMonitor", "Stop monitoring with native observer " + j);
+        Logging.d(TAG, "Stop monitoring with native observer " + j);
         stopMonitoring();
         synchronized (this.nativeNetworkObservers) {
             this.nativeNetworkObservers.remove(Long.valueOf(j));
diff --git a/app/src/main/java/org/webrtc/NetworkMonitorAutoDetect.java b/app/src/main/java/org/webrtc/NetworkMonitorAutoDetect.java
index 0c75a14207..71aaae01ef 100644
--- a/app/src/main/java/org/webrtc/NetworkMonitorAutoDetect.java
+++ b/app/src/main/java/org/webrtc/NetworkMonitorAutoDetect.java
@@ -74,12 +74,12 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
             if (linkProperties == null) {
                 StringBuilder K = a.K("Detected unknown network: ");
                 K.append(network.toString());
-                Logging.w("NetworkMonitorAutoDetect", K.toString());
+                Logging.w(NetworkMonitorAutoDetect.TAG, K.toString());
                 return null;
             } else if (linkProperties.getInterfaceName() == null) {
                 StringBuilder K2 = a.K("Null interface name for network ");
                 K2.append(network.toString());
-                Logging.w("NetworkMonitorAutoDetect", K2.toString());
+                Logging.w(NetworkMonitorAutoDetect.TAG, K2.toString());
                 return null;
             } else {
                 NetworkState networkState = getNetworkState(network);
@@ -88,7 +88,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
                     StringBuilder K3 = a.K("Network ");
                     K3.append(network.toString());
                     K3.append(" is disconnected");
-                    Logging.d("NetworkMonitorAutoDetect", K3.toString());
+                    Logging.d(NetworkMonitorAutoDetect.TAG, K3.toString());
                     return null;
                 }
                 if (connectionType == NetworkChangeDetector.ConnectionType.CONNECTION_UNKNOWN || connectionType == NetworkChangeDetector.ConnectionType.CONNECTION_UNKNOWN_CELLULAR) {
@@ -100,7 +100,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
                     K4.append(networkState.getNetworkType());
                     K4.append(" and subtype ");
                     K4.append(networkState.getNetworkSubType());
-                    Logging.d("NetworkMonitorAutoDetect", K4.toString());
+                    Logging.d(NetworkMonitorAutoDetect.TAG, K4.toString());
                 }
                 return new NetworkChangeDetector.NetworkInformation(linkProperties.getInterfaceName(), connectionType, NetworkMonitorAutoDetect.access$400(networkState), NetworkMonitorAutoDetect.access$000(network), getIPAddresses(linkProperties));
             }
@@ -175,7 +175,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
             if (networkInfo == null) {
                 StringBuilder K = a.K("Couldn't retrieve information from network ");
                 K.append(network.toString());
-                Logging.w("NetworkMonitorAutoDetect", K.toString());
+                Logging.w(NetworkMonitorAutoDetect.TAG, K.toString());
                 return new NetworkState(false, -1, -1, -1, -1);
             } else if (networkInfo.getType() == 17) {
                 return networkInfo.getType() == 17 ? (Build.VERSION.SDK_INT < 23 || !network.equals(this.connectivityManager.getActiveNetwork()) || (activeNetworkInfo = this.connectivityManager.getActiveNetworkInfo()) == null || activeNetworkInfo.getType() == 17) ? new NetworkState(networkInfo.isConnected(), 17, -1, -1, -1) : new NetworkState(networkInfo.isConnected(), 17, -1, activeNetworkInfo.getType(), activeNetworkInfo.getSubtype()) : getNetworkState(networkInfo);
@@ -200,7 +200,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
         @SuppressLint({"NewApi"})
         public void releaseCallback(ConnectivityManager.NetworkCallback networkCallback) {
             if (supportNetworkCallback()) {
-                Logging.d("NetworkMonitorAutoDetect", "Unregister network callback");
+                Logging.d(NetworkMonitorAutoDetect.TAG, "Unregister network callback");
                 this.connectivityManager.unregisterNetworkCallback(networkCallback);
             }
         }
@@ -269,7 +269,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
         public void onAvailable(Network network) {
             StringBuilder K = a.K("Network becomes available: ");
             K.append(network.toString());
-            Logging.d("NetworkMonitorAutoDetect", K.toString());
+            Logging.d(NetworkMonitorAutoDetect.TAG, K.toString());
             onNetworkChanged(network);
         }
 
@@ -277,13 +277,13 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
         public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities) {
             StringBuilder K = a.K("capabilities changed: ");
             K.append(networkCapabilities.toString());
-            Logging.d("NetworkMonitorAutoDetect", K.toString());
+            Logging.d(NetworkMonitorAutoDetect.TAG, K.toString());
             onNetworkChanged(network);
         }
 
         @Override // android.net.ConnectivityManager.NetworkCallback
         public void onLinkPropertiesChanged(Network network, LinkProperties linkProperties) {
-            Logging.d("NetworkMonitorAutoDetect", "link properties changed");
+            Logging.d(NetworkMonitorAutoDetect.TAG, "link properties changed");
             onNetworkChanged(network);
         }
 
@@ -294,7 +294,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
             K.append(" is about to lose in ");
             K.append(i);
             K.append("ms");
-            Logging.d("NetworkMonitorAutoDetect", K.toString());
+            Logging.d(NetworkMonitorAutoDetect.TAG, K.toString());
         }
 
         @Override // android.net.ConnectivityManager.NetworkCallback
@@ -302,7 +302,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
             StringBuilder K = a.K("Network ");
             K.append(network.toString());
             K.append(" is disconnected");
-            Logging.d("NetworkMonitorAutoDetect", K.toString());
+            Logging.d(NetworkMonitorAutoDetect.TAG, K.toString());
             NetworkMonitorAutoDetect.access$100(NetworkMonitorAutoDetect.this).onNetworkDisconnect(NetworkMonitorAutoDetect.access$000(network));
         }
     }
@@ -341,7 +341,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
                     this.wifiP2pNetworkInfo = networkInformation;
                     this.observer.onNetworkConnect(networkInformation);
                 } catch (SocketException e) {
-                    Logging.e("NetworkMonitorAutoDetect", "Unable to get WifiP2p network interface", e);
+                    Logging.e(NetworkMonitorAutoDetect.TAG, "Unable to get WifiP2p network interface", e);
                 }
             }
         }
@@ -402,7 +402,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
         NetworkState networkState = this.connectivityManagerDelegate.getNetworkState();
         this.connectionType = getConnectionType(networkState);
         this.wifiSSID = getWifiSSID(networkState);
-        if (PeerConnectionFactory.fieldTrialsFindFullName("IncludeWifiDirect").equals("Enabled")) {
+        if (PeerConnectionFactory.fieldTrialsFindFullName("IncludeWifiDirect").equals(PeerConnectionFactory.TRIAL_ENABLED)) {
             this.wifiDirectManagerDelegate = new WifiDirectManagerDelegate(observer, context);
         }
         registerReceiver();
@@ -411,7 +411,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
             try {
                 this.connectivityManagerDelegate.requestMobileNetwork(networkCallback);
             } catch (SecurityException unused) {
-                Logging.w("NetworkMonitorAutoDetect", "Unable to obtain permission to request a cellular network.");
+                Logging.w(TAG, "Unable to obtain permission to request a cellular network.");
                 networkCallback = null;
             }
             this.mobileNetworkCallback = networkCallback;
@@ -448,7 +448,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver implements Netwo
             this.wifiSSID = wifiSSID;
             StringBuilder K = a.K("Network connectivity changed, type is: ");
             K.append(this.connectionType);
-            Logging.d("NetworkMonitorAutoDetect", K.toString());
+            Logging.d(TAG, K.toString());
             this.observer.onConnectionTypeChanged(connectionType);
         }
     }
diff --git a/app/src/main/java/org/webrtc/PeerConnectionFactory.java b/app/src/main/java/org/webrtc/PeerConnectionFactory.java
index ca33be3c61..e4623c2349 100644
--- a/app/src/main/java/org/webrtc/PeerConnectionFactory.java
+++ b/app/src/main/java/org/webrtc/PeerConnectionFactory.java
@@ -315,7 +315,7 @@ public class PeerConnectionFactory {
             nativeInjectLoggable(new JNILogging(initializationOptions.loggable), initializationOptions.loggableSeverity.ordinal());
             return;
         }
-        Logging.d("PeerConnectionFactory", "PeerConnectionFactory was initialized without an injected Loggable. Any existing Loggable will be deleted.");
+        Logging.d(TAG, "PeerConnectionFactory was initialized without an injected Loggable. Any existing Loggable will be deleted.");
         Logging.deleteInjectedLoggable();
         nativeDeleteLoggable();
     }
@@ -378,21 +378,21 @@ public class PeerConnectionFactory {
     private void onNetworkThreadReady() {
         this.networkThread = ThreadInfo.getCurrent();
         staticNetworkThread = this.networkThread;
-        Logging.d("PeerConnectionFactory", "onNetworkThreadReady");
+        Logging.d(TAG, "onNetworkThreadReady");
     }
 
     @CalledByNative
     private void onSignalingThreadReady() {
         this.signalingThread = ThreadInfo.getCurrent();
         staticSignalingThread = this.signalingThread;
-        Logging.d("PeerConnectionFactory", "onSignalingThreadReady");
+        Logging.d(TAG, "onSignalingThreadReady");
     }
 
     @CalledByNative
     private void onWorkerThreadReady() {
         this.workerThread = ThreadInfo.getCurrent();
         staticWorkerThread = this.workerThread;
-        Logging.d("PeerConnectionFactory", "onWorkerThreadReady");
+        Logging.d(TAG, "onWorkerThreadReady");
     }
 
     private static void printStackTrace(@Nullable ThreadInfo threadInfo, boolean z2) {
@@ -400,14 +400,14 @@ public class PeerConnectionFactory {
             String name = threadInfo.thread.getName();
             StackTraceElement[] stackTrace = threadInfo.thread.getStackTrace();
             if (stackTrace.length > 0) {
-                Logging.w("PeerConnectionFactory", name + " stacktrace:");
+                Logging.w(TAG, name + " stacktrace:");
                 for (StackTraceElement stackTraceElement : stackTrace) {
-                    Logging.w("PeerConnectionFactory", stackTraceElement.toString());
+                    Logging.w(TAG, stackTraceElement.toString());
                 }
             }
             if (z2) {
-                Logging.w("PeerConnectionFactory", "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***");
-                Logging.w("PeerConnectionFactory", "pid: " + Process.myPid() + ", tid: " + threadInfo.tid + ", name: " + name + "  >>> WebRTC <<<");
+                Logging.w(TAG, "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***");
+                Logging.w(TAG, "pid: " + Process.myPid() + ", tid: " + threadInfo.tid + ", name: " + name + "  >>> WebRTC <<<");
                 nativePrintStackTrace(threadInfo.tid);
             }
         }
diff --git a/app/src/main/java/org/webrtc/RtcCertificatePem.java b/app/src/main/java/org/webrtc/RtcCertificatePem.java
index bab895180f..19f33c5862 100644
--- a/app/src/main/java/org/webrtc/RtcCertificatePem.java
+++ b/app/src/main/java/org/webrtc/RtcCertificatePem.java
@@ -13,7 +13,7 @@ public class RtcCertificatePem {
     }
 
     public static RtcCertificatePem generateCertificate() {
-        return nativeGenerateCertificate(PeerConnection.KeyType.ECDSA, 2592000);
+        return nativeGenerateCertificate(PeerConnection.KeyType.ECDSA, DEFAULT_EXPIRY);
     }
 
     public static RtcCertificatePem generateCertificate(long j) {
@@ -21,7 +21,7 @@ public class RtcCertificatePem {
     }
 
     public static RtcCertificatePem generateCertificate(PeerConnection.KeyType keyType) {
-        return nativeGenerateCertificate(keyType, 2592000);
+        return nativeGenerateCertificate(keyType, DEFAULT_EXPIRY);
     }
 
     public static RtcCertificatePem generateCertificate(PeerConnection.KeyType keyType, long j) {
diff --git a/app/src/main/java/org/webrtc/ScreenCapturerAndroid.java b/app/src/main/java/org/webrtc/ScreenCapturerAndroid.java
index 3d97baed27..24d1dcd928 100644
--- a/app/src/main/java/org/webrtc/ScreenCapturerAndroid.java
+++ b/app/src/main/java/org/webrtc/ScreenCapturerAndroid.java
@@ -108,7 +108,7 @@ public class ScreenCapturerAndroid implements VideoCapturer, VideoSink {
 
     public void createVirtualDisplay() {
         this.surfaceTextureHelper.setTextureSize(this.width, this.height);
-        this.virtualDisplay = this.mediaProjection.createVirtualDisplay("WebRTC_ScreenCapture", this.width, this.height, 400, 3, new Surface(this.surfaceTextureHelper.getSurfaceTexture()), null, null);
+        this.virtualDisplay = this.mediaProjection.createVirtualDisplay("WebRTC_ScreenCapture", this.width, this.height, VIRTUAL_DISPLAY_DPI, 3, new Surface(this.surfaceTextureHelper.getSurfaceTexture()), null, null);
     }
 
     @Override // org.webrtc.VideoCapturer
diff --git a/app/src/main/java/org/webrtc/SurfaceEglRenderer.java b/app/src/main/java/org/webrtc/SurfaceEglRenderer.java
index b3d8642f42..c7df8ca753 100644
--- a/app/src/main/java/org/webrtc/SurfaceEglRenderer.java
+++ b/app/src/main/java/org/webrtc/SurfaceEglRenderer.java
@@ -20,7 +20,7 @@ public class SurfaceEglRenderer extends EglRenderer implements SurfaceHolder.Cal
     }
 
     private void logD(String str) {
-        Logging.d("SurfaceEglRenderer", this.name + ": " + str);
+        Logging.d(TAG, this.name + ": " + str);
     }
 
     private void updateFrameDimensionsAndReportEvents(VideoFrame videoFrame) {
diff --git a/app/src/main/java/org/webrtc/SurfaceTextureHelper.java b/app/src/main/java/org/webrtc/SurfaceTextureHelper.java
index 54bfb3592d..f2b9442879 100644
--- a/app/src/main/java/org/webrtc/SurfaceTextureHelper.java
+++ b/app/src/main/java/org/webrtc/SurfaceTextureHelper.java
@@ -66,7 +66,7 @@ public class SurfaceTextureHelper {
             try {
                 return new SurfaceTextureHelper(this.val$sharedContext, this.val$handler, this.val$alignTimestamps, this.val$yuvConverter, this.val$frameRefMonitor, null);
             } catch (RuntimeException e) {
-                Logging.e("SurfaceTextureHelper", this.val$threadName + " create failure", e);
+                Logging.e(SurfaceTextureHelper.TAG, this.val$threadName + " create failure", e);
                 return null;
             }
         }
@@ -109,7 +109,7 @@ public class SurfaceTextureHelper {
         public void run() {
             StringBuilder K = a.K("Setting listener to ");
             K.append(SurfaceTextureHelper.access$300(SurfaceTextureHelper.this));
-            Logging.d("SurfaceTextureHelper", K.toString());
+            Logging.d(SurfaceTextureHelper.TAG, K.toString());
             SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.this;
             SurfaceTextureHelper.access$402(surfaceTextureHelper, SurfaceTextureHelper.access$300(surfaceTextureHelper));
             SurfaceTextureHelper.access$302(SurfaceTextureHelper.this, null);
@@ -248,7 +248,7 @@ public class SurfaceTextureHelper {
             throw new IllegalStateException("Wrong thread.");
         } else if (!this.isQuitting && this.hasPendingTexture && !this.isTextureInUse && this.listener != null) {
             if (this.textureWidth == 0 || this.textureHeight == 0) {
-                Logging.w("SurfaceTextureHelper", "Texture size has not been set.");
+                Logging.w(TAG, "Texture size has not been set.");
                 return;
             }
             this.isTextureInUse = true;
@@ -292,7 +292,7 @@ public class SurfaceTextureHelper {
 
     public /* synthetic */ void c(SurfaceTexture surfaceTexture) {
         if (this.hasPendingTexture) {
-            Logging.d("SurfaceTextureHelper", "A frame is already pending, dropping frame.");
+            Logging.d(TAG, "A frame is already pending, dropping frame.");
         }
         this.hasPendingTexture = true;
         tryDeliverTextureFrame();
@@ -308,7 +308,7 @@ public class SurfaceTextureHelper {
     }
 
     public void dispose() {
-        Logging.d("SurfaceTextureHelper", "dispose()");
+        Logging.d(TAG, "dispose()");
         ThreadUtils.invokeAtFrontUninterruptibly(this.handler, new s(this));
     }
 
@@ -368,7 +368,7 @@ public class SurfaceTextureHelper {
     }
 
     public void stopListening() {
-        Logging.d("SurfaceTextureHelper", "stopListening()");
+        Logging.d(TAG, "stopListening()");
         this.handler.removeCallbacks(this.setListenerRunnable);
         ThreadUtils.invokeAtFrontUninterruptibly(this.handler, new w(this));
     }
diff --git a/app/src/main/java/org/webrtc/SurfaceViewRenderer.java b/app/src/main/java/org/webrtc/SurfaceViewRenderer.java
index 86fe841e25..8324398e2d 100644
--- a/app/src/main/java/org/webrtc/SurfaceViewRenderer.java
+++ b/app/src/main/java/org/webrtc/SurfaceViewRenderer.java
@@ -53,7 +53,7 @@ public class SurfaceViewRenderer extends SurfaceView implements SurfaceHolder.Ca
     }
 
     private void logD(String str) {
-        Logging.d("SurfaceViewRenderer", this.resourceName + ": " + str);
+        Logging.d(TAG, this.resourceName + ": " + str);
     }
 
     private void postOrRun(Runnable runnable) {
diff --git a/app/src/main/java/org/webrtc/VideoFileRenderer.java b/app/src/main/java/org/webrtc/VideoFileRenderer.java
index b06d4d4662..12817a41a2 100644
--- a/app/src/main/java/org/webrtc/VideoFileRenderer.java
+++ b/app/src/main/java/org/webrtc/VideoFileRenderer.java
@@ -3,6 +3,7 @@ package org.webrtc;
 import android.os.Handler;
 import android.os.HandlerThread;
 import c.d.b.a.a;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import h0.c.d0;
 import h0.c.e0;
 import h0.c.f0;
@@ -91,8 +92,8 @@ public class VideoFileRenderer implements VideoSink {
     /* renamed from: renderFrameOnRenderThread */
     public void a(VideoFrame videoFrame) {
         VideoFrame.Buffer buffer = videoFrame.getBuffer();
-        int i = videoFrame.getRotation() % 180 == 0 ? this.outputFileWidth : this.outputFileHeight;
-        int i2 = videoFrame.getRotation() % 180 == 0 ? this.outputFileHeight : this.outputFileWidth;
+        int i = videoFrame.getRotation() % BaseTransientBottomBar.ANIMATION_FADE_DURATION == 0 ? this.outputFileWidth : this.outputFileHeight;
+        int i2 = videoFrame.getRotation() % BaseTransientBottomBar.ANIMATION_FADE_DURATION == 0 ? this.outputFileHeight : this.outputFileWidth;
         float width = ((float) buffer.getWidth()) / ((float) buffer.getHeight());
         float f = ((float) i) / ((float) i2);
         int width2 = buffer.getWidth();
@@ -119,7 +120,7 @@ public class VideoFileRenderer implements VideoSink {
     public /* synthetic */ void c() {
         try {
             this.videoOutFile.close();
-            Logging.d("VideoFileRenderer", "Video written to disk as " + this.outputFileName + ". The number of frames is " + this.frameCount + " and the dimensions of the frames are " + this.outputFileWidth + "x" + this.outputFileHeight + ".");
+            Logging.d(TAG, "Video written to disk as " + this.outputFileName + ". The number of frames is " + this.frameCount + " and the dimensions of the frames are " + this.outputFileWidth + "x" + this.outputFileHeight + ".");
             this.fileThread.quit();
         } catch (IOException e) {
             throw new RuntimeException("Error closing output file", e);
@@ -153,7 +154,7 @@ public class VideoFileRenderer implements VideoSink {
             this.fileThread.join();
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            Logging.e("VideoFileRenderer", "Interrupted while waiting for the write to disk to complete.", e);
+            Logging.e(TAG, "Interrupted while waiting for the write to disk to complete.", e);
         }
     }
 }
diff --git a/app/src/main/java/org/webrtc/VideoFrame.java b/app/src/main/java/org/webrtc/VideoFrame.java
index 1399885acc..6d7b0d1bc1 100644
--- a/app/src/main/java/org/webrtc/VideoFrame.java
+++ b/app/src/main/java/org/webrtc/VideoFrame.java
@@ -1,6 +1,7 @@
 package org.webrtc;
 
 import android.graphics.Matrix;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.nio.ByteBuffer;
 public class VideoFrame implements RefCounted {
     private final Buffer buffer;
@@ -92,11 +93,11 @@ public class VideoFrame implements RefCounted {
     }
 
     public int getRotatedHeight() {
-        return this.rotation % 180 == 0 ? this.buffer.getHeight() : this.buffer.getWidth();
+        return this.rotation % BaseTransientBottomBar.ANIMATION_FADE_DURATION == 0 ? this.buffer.getHeight() : this.buffer.getWidth();
     }
 
     public int getRotatedWidth() {
-        return this.rotation % 180 == 0 ? this.buffer.getWidth() : this.buffer.getHeight();
+        return this.rotation % BaseTransientBottomBar.ANIMATION_FADE_DURATION == 0 ? this.buffer.getWidth() : this.buffer.getHeight();
     }
 
     @CalledByNative
diff --git a/app/src/main/java/org/webrtc/VideoFrameDrawer.java b/app/src/main/java/org/webrtc/VideoFrameDrawer.java
index cff38470f4..d065cff211 100644
--- a/app/src/main/java/org/webrtc/VideoFrameDrawer.java
+++ b/app/src/main/java/org/webrtc/VideoFrameDrawer.java
@@ -163,7 +163,7 @@ public class VideoFrameDrawer {
             K.append(this.renderWidth);
             K.append("x");
             K.append(this.renderHeight);
-            Logging.w("VideoFrameDrawer", K.toString());
+            Logging.w(TAG, K.toString());
             return;
         }
         boolean z2 = videoFrame.getBuffer() instanceof VideoFrame.TextureBuffer;
diff --git a/app/src/main/java/org/webrtc/YuvConverter.java b/app/src/main/java/org/webrtc/YuvConverter.java
index bfa05a5889..ee6ade2580 100644
--- a/app/src/main/java/org/webrtc/YuvConverter.java
+++ b/app/src/main/java/org/webrtc/YuvConverter.java
@@ -68,7 +68,7 @@ public class YuvConverter {
         this.i420TextureFrameBuffer = new GlTextureFrameBuffer(6408);
         ShaderCallbacks shaderCallbacks = new ShaderCallbacks();
         this.shaderCallbacks = shaderCallbacks;
-        this.drawer = new GlGenericDrawer("uniform vec2 xUnit;\nuniform vec4 coeffs;\n\nvoid main() {\n  gl_FragColor.r = coeffs.a + dot(coeffs.rgb,\n      sample(tc - 1.5 * xUnit).rgb);\n  gl_FragColor.g = coeffs.a + dot(coeffs.rgb,\n      sample(tc - 0.5 * xUnit).rgb);\n  gl_FragColor.b = coeffs.a + dot(coeffs.rgb,\n      sample(tc + 0.5 * xUnit).rgb);\n  gl_FragColor.a = coeffs.a + dot(coeffs.rgb,\n      sample(tc + 1.5 * xUnit).rgb);\n}\n", shaderCallbacks);
+        this.drawer = new GlGenericDrawer(FRAGMENT_SHADER, shaderCallbacks);
         this.videoFrameDrawer = videoFrameDrawer;
         threadChecker.detachThread();
     }
diff --git a/app/src/main/java/org/webrtc/YuvHelper.java b/app/src/main/java/org/webrtc/YuvHelper.java
index 2a88178e13..9c38d80409 100644
--- a/app/src/main/java/org/webrtc/YuvHelper.java
+++ b/app/src/main/java/org/webrtc/YuvHelper.java
@@ -1,6 +1,7 @@
 package org.webrtc;
 
 import c.d.b.a.a;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
 import java.nio.ByteBuffer;
 public class YuvHelper {
     public static void ABGRToI420(ByteBuffer byteBuffer, int i, ByteBuffer byteBuffer2, int i2, ByteBuffer byteBuffer3, int i3, ByteBuffer byteBuffer4, int i4, int i5, int i6) {
@@ -31,7 +32,7 @@ public class YuvHelper {
     }
 
     public static void I420Rotate(ByteBuffer byteBuffer, int i, ByteBuffer byteBuffer2, int i2, ByteBuffer byteBuffer3, int i3, ByteBuffer byteBuffer4, int i4, int i5, int i6) {
-        int i7 = i6 % 180;
+        int i7 = i6 % BaseTransientBottomBar.ANIMATION_FADE_DURATION;
         int i8 = i7 == 0 ? i4 : i5;
         int i9 = i7 == 0 ? i5 : i4;
         int i10 = (i8 + 1) / 2;
diff --git a/app/src/main/java/org/webrtc/audio/JavaAudioDeviceModule.java b/app/src/main/java/org/webrtc/audio/JavaAudioDeviceModule.java
index 9639385c98..6e15ed278e 100644
--- a/app/src/main/java/org/webrtc/audio/JavaAudioDeviceModule.java
+++ b/app/src/main/java/org/webrtc/audio/JavaAudioDeviceModule.java
@@ -9,6 +9,7 @@ import androidx.annotation.RequiresApi;
 import java.util.concurrent.ScheduledExecutorService;
 import org.webrtc.JniCommon;
 import org.webrtc.Logging;
+import org.webrtc.MediaStreamTrack;
 public class JavaAudioDeviceModule implements AudioDeviceModule {
     private static final String TAG = "JavaAudioDeviceModule";
     private final WebRtcAudioRecord audioInput;
@@ -116,7 +117,7 @@ public class JavaAudioDeviceModule implements AudioDeviceModule {
             this.useHardwareAcousticEchoCanceler = JavaAudioDeviceModule.isBuiltInAcousticEchoCancelerSupported();
             this.useHardwareNoiseSuppressor = JavaAudioDeviceModule.isBuiltInNoiseSuppressorSupported();
             this.context = context;
-            AudioManager audioManager = (AudioManager) context.getSystemService("audio");
+            AudioManager audioManager = (AudioManager) context.getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
             this.audioManager = audioManager;
             this.inputSampleRate = WebRtcAudioManager.getSampleRate(audioManager);
             this.outputSampleRate = WebRtcAudioManager.getSampleRate(audioManager);
@@ -124,25 +125,25 @@ public class JavaAudioDeviceModule implements AudioDeviceModule {
         }
 
         public JavaAudioDeviceModule createAudioDeviceModule() {
-            Logging.d("JavaAudioDeviceModule", "createAudioDeviceModule");
+            Logging.d(JavaAudioDeviceModule.TAG, "createAudioDeviceModule");
             if (this.useHardwareNoiseSuppressor) {
-                Logging.d("JavaAudioDeviceModule", "HW NS will be used.");
+                Logging.d(JavaAudioDeviceModule.TAG, "HW NS will be used.");
             } else {
                 if (JavaAudioDeviceModule.isBuiltInNoiseSuppressorSupported()) {
-                    Logging.d("JavaAudioDeviceModule", "Overriding default behavior; now using WebRTC NS!");
+                    Logging.d(JavaAudioDeviceModule.TAG, "Overriding default behavior; now using WebRTC NS!");
                 }
-                Logging.d("JavaAudioDeviceModule", "HW NS will not be used.");
+                Logging.d(JavaAudioDeviceModule.TAG, "HW NS will not be used.");
             }
             if (this.useHardwareAcousticEchoCanceler) {
-                Logging.d("JavaAudioDeviceModule", "HW AEC will be used.");
+                Logging.d(JavaAudioDeviceModule.TAG, "HW AEC will be used.");
             } else {
                 if (JavaAudioDeviceModule.isBuiltInAcousticEchoCancelerSupported()) {
-                    Logging.d("JavaAudioDeviceModule", "Overriding default behavior; now using WebRTC AEC!");
+                    Logging.d(JavaAudioDeviceModule.TAG, "Overriding default behavior; now using WebRTC AEC!");
                 }
-                Logging.d("JavaAudioDeviceModule", "HW AEC will not be used.");
+                Logging.d(JavaAudioDeviceModule.TAG, "HW AEC will not be used.");
             }
             if (this.useLowLatency && Build.VERSION.SDK_INT >= 26) {
-                Logging.d("JavaAudioDeviceModule", "Low latency mode will be used.");
+                Logging.d(JavaAudioDeviceModule.TAG, "Low latency mode will be used.");
             }
             ScheduledExecutorService scheduledExecutorService = this.scheduler;
             if (scheduledExecutorService == null) {
@@ -187,19 +188,19 @@ public class JavaAudioDeviceModule implements AudioDeviceModule {
         }
 
         public Builder setInputSampleRate(int i) {
-            Logging.d("JavaAudioDeviceModule", "Input sample rate overridden to: " + i);
+            Logging.d(JavaAudioDeviceModule.TAG, "Input sample rate overridden to: " + i);
             this.inputSampleRate = i;
             return this;
         }
 
         public Builder setOutputSampleRate(int i) {
-            Logging.d("JavaAudioDeviceModule", "Output sample rate overridden to: " + i);
+            Logging.d(JavaAudioDeviceModule.TAG, "Output sample rate overridden to: " + i);
             this.outputSampleRate = i;
             return this;
         }
 
         public Builder setSampleRate(int i) {
-            Logging.d("JavaAudioDeviceModule", "Input/Output sample rate overridden to: " + i);
+            Logging.d(JavaAudioDeviceModule.TAG, "Input/Output sample rate overridden to: " + i);
             this.inputSampleRate = i;
             this.outputSampleRate = i;
             return this;
@@ -217,7 +218,7 @@ public class JavaAudioDeviceModule implements AudioDeviceModule {
 
         public Builder setUseHardwareAcousticEchoCanceler(boolean z2) {
             if (z2 && !JavaAudioDeviceModule.isBuiltInAcousticEchoCancelerSupported()) {
-                Logging.e("JavaAudioDeviceModule", "HW AEC not supported");
+                Logging.e(JavaAudioDeviceModule.TAG, "HW AEC not supported");
                 z2 = false;
             }
             this.useHardwareAcousticEchoCanceler = z2;
@@ -226,7 +227,7 @@ public class JavaAudioDeviceModule implements AudioDeviceModule {
 
         public Builder setUseHardwareNoiseSuppressor(boolean z2) {
             if (z2 && !JavaAudioDeviceModule.isBuiltInNoiseSuppressorSupported()) {
-                Logging.e("JavaAudioDeviceModule", "HW NS not supported");
+                Logging.e(JavaAudioDeviceModule.TAG, "HW NS not supported");
                 z2 = false;
             }
             this.useHardwareNoiseSuppressor = z2;
@@ -304,19 +305,19 @@ public class JavaAudioDeviceModule implements AudioDeviceModule {
 
     @Override // org.webrtc.audio.AudioDeviceModule
     public void setMicrophoneMute(boolean z2) {
-        Logging.d("JavaAudioDeviceModule", "setMicrophoneMute: " + z2);
+        Logging.d(TAG, "setMicrophoneMute: " + z2);
         this.audioInput.setMicrophoneMute(z2);
     }
 
     @RequiresApi(23)
     public void setPreferredInputDevice(AudioDeviceInfo audioDeviceInfo) {
-        Logging.d("JavaAudioDeviceModule", "setPreferredInputDevice: " + audioDeviceInfo);
+        Logging.d(TAG, "setPreferredInputDevice: " + audioDeviceInfo);
         this.audioInput.setPreferredDevice(audioDeviceInfo);
     }
 
     @Override // org.webrtc.audio.AudioDeviceModule
     public void setSpeakerMute(boolean z2) {
-        Logging.d("JavaAudioDeviceModule", "setSpeakerMute: " + z2);
+        Logging.d(TAG, "setSpeakerMute: " + z2);
         this.audioOutput.setSpeakerMute(z2);
     }
 }
diff --git a/app/src/main/java/org/webrtc/audio/LowLatencyAudioBufferManager.java b/app/src/main/java/org/webrtc/audio/LowLatencyAudioBufferManager.java
index 33e3504bd1..73ddfb2f6b 100644
--- a/app/src/main/java/org/webrtc/audio/LowLatencyAudioBufferManager.java
+++ b/app/src/main/java/org/webrtc/audio/LowLatencyAudioBufferManager.java
@@ -17,7 +17,7 @@ public class LowLatencyAudioBufferManager {
                 if (this.bufferIncreaseCounter < 5) {
                     int bufferSizeInFrames = audioTrack.getBufferSizeInFrames();
                     int playbackRate = (audioTrack.getPlaybackRate() / 100) + bufferSizeInFrames;
-                    Logging.d("LowLatencyAudioBufferManager", "Underrun detected! Increasing AudioTrack buffer size from " + bufferSizeInFrames + " to " + playbackRate);
+                    Logging.d(TAG, "Underrun detected! Increasing AudioTrack buffer size from " + bufferSizeInFrames + " to " + playbackRate);
                     audioTrack.setBufferSizeInFrames(playbackRate);
                     this.bufferIncreaseCounter = this.bufferIncreaseCounter + 1;
                 }
@@ -32,7 +32,7 @@ public class LowLatencyAudioBufferManager {
                     int bufferSizeInFrames2 = audioTrack.getBufferSizeInFrames();
                     int max = Math.max(playbackRate2, bufferSizeInFrames2 - playbackRate2);
                     if (max != bufferSizeInFrames2) {
-                        Logging.d("LowLatencyAudioBufferManager", "Lowering AudioTrack buffer size from " + bufferSizeInFrames2 + " to " + max);
+                        Logging.d(TAG, "Lowering AudioTrack buffer size from " + bufferSizeInFrames2 + " to " + max);
                         audioTrack.setBufferSizeInFrames(max);
                     }
                     this.ticksUntilNextDecrease = 10;
diff --git a/app/src/main/java/org/webrtc/audio/VolumeLogger.java b/app/src/main/java/org/webrtc/audio/VolumeLogger.java
index ad98d68777..668cba428e 100644
--- a/app/src/main/java/org/webrtc/audio/VolumeLogger.java
+++ b/app/src/main/java/org/webrtc/audio/VolumeLogger.java
@@ -32,14 +32,14 @@ public class VolumeLogger {
                 K.append(" (max=");
                 K.append(this.maxRingVolume);
                 K.append(")");
-                Logging.d("VolumeLogger", K.toString());
+                Logging.d(VolumeLogger.TAG, K.toString());
             } else if (mode == 3) {
                 StringBuilder K2 = a.K("VOICE_CALL stream volume: ");
                 K2.append(VolumeLogger.access$000(VolumeLogger.this).getStreamVolume(0));
                 K2.append(" (max=");
                 K2.append(this.maxVoiceCallVolume);
                 K2.append(")");
-                Logging.d("VolumeLogger", K2.toString());
+                Logging.d(VolumeLogger.TAG, K2.toString());
             }
         }
     }
@@ -55,12 +55,12 @@ public class VolumeLogger {
     public void start() {
         StringBuilder K = a.K("start");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("VolumeLogger", K.toString());
+        Logging.d(TAG, K.toString());
         if (this.timer == null) {
             StringBuilder K2 = a.K("audio mode is: ");
             K2.append(WebRtcAudioUtils.modeToString(this.audioManager.getMode()));
-            Logging.d("VolumeLogger", K2.toString());
-            Timer timer = new Timer("WebRtcVolumeLevelLoggerThread");
+            Logging.d(TAG, K2.toString());
+            Timer timer = new Timer(THREAD_NAME);
             this.timer = timer;
             timer.schedule(new LogVolumeTask(this.audioManager.getStreamMaxVolume(2), this.audioManager.getStreamMaxVolume(0)), 0, 30000);
         }
@@ -69,7 +69,7 @@ public class VolumeLogger {
     public void stop() {
         StringBuilder K = a.K("stop");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("VolumeLogger", K.toString());
+        Logging.d(TAG, K.toString());
         Timer timer = this.timer;
         if (timer != null) {
             timer.cancel();
diff --git a/app/src/main/java/org/webrtc/audio/WebRtcAudioEffects.java b/app/src/main/java/org/webrtc/audio/WebRtcAudioEffects.java
index 55dc38178b..36a6a44cea 100644
--- a/app/src/main/java/org/webrtc/audio/WebRtcAudioEffects.java
+++ b/app/src/main/java/org/webrtc/audio/WebRtcAudioEffects.java
@@ -24,7 +24,7 @@ public class WebRtcAudioEffects {
     public WebRtcAudioEffects() {
         StringBuilder K = a.K("ctor");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("WebRtcAudioEffectsExternal", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     private static void assertTrue(boolean z2) {
@@ -70,7 +70,7 @@ public class WebRtcAudioEffects {
     }
 
     public void enable(int i) {
-        Logging.d("WebRtcAudioEffectsExternal", "enable(audioSession=" + i + ")");
+        Logging.d(TAG, "enable(audioSession=" + i + ")");
         boolean z2 = true;
         assertTrue(this.aec == null);
         assertTrue(this.ns == null);
@@ -82,7 +82,7 @@ public class WebRtcAudioEffects {
                 boolean enabled = create.getEnabled();
                 boolean z3 = this.shouldEnableAec && isAcousticEchoCancelerSupported();
                 if (this.aec.setEnabled(z3) != 0) {
-                    Logging.e("WebRtcAudioEffectsExternal", "Failed to set the AcousticEchoCanceler state");
+                    Logging.e(TAG, "Failed to set the AcousticEchoCanceler state");
                 }
                 StringBuilder K = a.K("AcousticEchoCanceler: was ");
                 K.append(enabled ? str : "disabled");
@@ -90,9 +90,9 @@ public class WebRtcAudioEffects {
                 K.append(z3);
                 K.append(", is now: ");
                 K.append(this.aec.getEnabled() ? str : "disabled");
-                Logging.d("WebRtcAudioEffectsExternal", K.toString());
+                Logging.d(TAG, K.toString());
             } else {
-                Logging.e("WebRtcAudioEffectsExternal", "Failed to create the AcousticEchoCanceler instance");
+                Logging.e(TAG, "Failed to create the AcousticEchoCanceler instance");
             }
         }
         if (isNoiseSuppressorSupported()) {
@@ -104,7 +104,7 @@ public class WebRtcAudioEffects {
                     z2 = false;
                 }
                 if (this.ns.setEnabled(z2) != 0) {
-                    Logging.e("WebRtcAudioEffectsExternal", "Failed to set the NoiseSuppressor state");
+                    Logging.e(TAG, "Failed to set the NoiseSuppressor state");
                 }
                 StringBuilder K2 = a.K("NoiseSuppressor: was ");
                 K2.append(enabled2 ? str : "disabled");
@@ -115,15 +115,15 @@ public class WebRtcAudioEffects {
                     str = "disabled";
                 }
                 K2.append(str);
-                Logging.d("WebRtcAudioEffectsExternal", K2.toString());
+                Logging.d(TAG, K2.toString());
                 return;
             }
-            Logging.e("WebRtcAudioEffectsExternal", "Failed to create the NoiseSuppressor instance");
+            Logging.e(TAG, "Failed to create the NoiseSuppressor instance");
         }
     }
 
     public void release() {
-        Logging.d("WebRtcAudioEffectsExternal", "release");
+        Logging.d(TAG, "release");
         AcousticEchoCanceler acousticEchoCanceler = this.aec;
         if (acousticEchoCanceler != null) {
             acousticEchoCanceler.release();
@@ -137,31 +137,31 @@ public class WebRtcAudioEffects {
     }
 
     public boolean setAEC(boolean z2) {
-        Logging.d("WebRtcAudioEffectsExternal", "setAEC(" + z2 + ")");
+        Logging.d(TAG, "setAEC(" + z2 + ")");
         if (!isAcousticEchoCancelerSupported()) {
-            Logging.w("WebRtcAudioEffectsExternal", "Platform AEC is not supported");
+            Logging.w(TAG, "Platform AEC is not supported");
             this.shouldEnableAec = false;
             return false;
         } else if (this.aec == null || z2 == this.shouldEnableAec) {
             this.shouldEnableAec = z2;
             return true;
         } else {
-            Logging.e("WebRtcAudioEffectsExternal", "Platform AEC state can't be modified while recording");
+            Logging.e(TAG, "Platform AEC state can't be modified while recording");
             return false;
         }
     }
 
     public boolean setNS(boolean z2) {
-        Logging.d("WebRtcAudioEffectsExternal", "setNS(" + z2 + ")");
+        Logging.d(TAG, "setNS(" + z2 + ")");
         if (!isNoiseSuppressorSupported()) {
-            Logging.w("WebRtcAudioEffectsExternal", "Platform NS is not supported");
+            Logging.w(TAG, "Platform NS is not supported");
             this.shouldEnableNs = false;
             return false;
         } else if (this.ns == null || z2 == this.shouldEnableNs) {
             this.shouldEnableNs = z2;
             return true;
         } else {
-            Logging.e("WebRtcAudioEffectsExternal", "Platform NS state can't be modified while recording");
+            Logging.e(TAG, "Platform NS state can't be modified while recording");
             return false;
         }
     }
diff --git a/app/src/main/java/org/webrtc/audio/WebRtcAudioManager.java b/app/src/main/java/org/webrtc/audio/WebRtcAudioManager.java
index 38ab798817..57afdfd3ea 100644
--- a/app/src/main/java/org/webrtc/audio/WebRtcAudioManager.java
+++ b/app/src/main/java/org/webrtc/audio/WebRtcAudioManager.java
@@ -6,6 +6,7 @@ import android.media.AudioRecord;
 import android.media.AudioTrack;
 import org.webrtc.CalledByNative;
 import org.webrtc.Logging;
+import org.webrtc.MediaStreamTrack;
 public class WebRtcAudioManager {
     private static final int BITS_PER_SAMPLE = 16;
     private static final int DEFAULT_FRAME_PER_BUFFER = 256;
@@ -14,7 +15,7 @@ public class WebRtcAudioManager {
 
     @CalledByNative
     public static AudioManager getAudioManager(Context context) {
-        return (AudioManager) context.getSystemService("audio");
+        return (AudioManager) context.getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
     }
 
     @CalledByNative
@@ -46,20 +47,17 @@ public class WebRtcAudioManager {
     @CalledByNative
     public static int getSampleRate(AudioManager audioManager) {
         if (WebRtcAudioUtils.runningOnEmulator()) {
-            Logging.d("WebRtcAudioManagerExternal", "Running emulator, overriding sample rate to 8 kHz.");
+            Logging.d(TAG, "Running emulator, overriding sample rate to 8 kHz.");
             return 8000;
         }
         int sampleRateForApiLevel = getSampleRateForApiLevel(audioManager);
-        Logging.d("WebRtcAudioManagerExternal", "Sample rate is set to " + sampleRateForApiLevel + " Hz");
+        Logging.d(TAG, "Sample rate is set to " + sampleRateForApiLevel + " Hz");
         return sampleRateForApiLevel;
     }
 
     private static int getSampleRateForApiLevel(AudioManager audioManager) {
         String property = audioManager.getProperty("android.media.property.OUTPUT_SAMPLE_RATE");
-        if (property == null) {
-            return 16000;
-        }
-        return Integer.parseInt(property);
+        return property == null ? DEFAULT_SAMPLE_RATE_HZ : Integer.parseInt(property);
     }
 
     private static boolean isLowLatencyInputSupported(Context context) {
diff --git a/app/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java b/app/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java
index 08fd27ecf4..bbe9065bff 100644
--- a/app/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java
+++ b/app/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java
@@ -93,7 +93,7 @@ public class WebRtcAudioRecord {
         @Override // java.lang.Thread, java.lang.Runnable
         public void run() {
             Process.setThreadPriority(-19);
-            Logging.d("WebRtcAudioRecordExternal", "AudioRecordThread" + WebRtcAudioUtils.getThreadInfo());
+            Logging.d(WebRtcAudioRecord.TAG, "AudioRecordThread" + WebRtcAudioUtils.getThreadInfo());
             WebRtcAudioRecord.access$100(WebRtcAudioRecord.access$000(WebRtcAudioRecord.this).getRecordingState() == 3);
             WebRtcAudioRecord.access$200(WebRtcAudioRecord.this, 0);
             System.nanoTime();
@@ -113,7 +113,7 @@ public class WebRtcAudioRecord {
                     }
                 } else {
                     String str = "AudioRecord.read failed: " + read;
-                    Logging.e("WebRtcAudioRecordExternal", str);
+                    Logging.e(WebRtcAudioRecord.TAG, str);
                     if (read == -3) {
                         this.keepAlive = false;
                         WebRtcAudioRecord.access$900(WebRtcAudioRecord.this, str);
@@ -128,12 +128,12 @@ public class WebRtcAudioRecord {
             } catch (IllegalStateException e) {
                 StringBuilder K = a.K("AudioRecord.stop failed: ");
                 K.append(e.getMessage());
-                Logging.e("WebRtcAudioRecordExternal", K.toString());
+                Logging.e(WebRtcAudioRecord.TAG, K.toString());
             }
         }
 
         public void stopThread() {
-            Logging.d("WebRtcAudioRecordExternal", "stopThread");
+            Logging.d(WebRtcAudioRecord.TAG, "stopThread");
             this.keepAlive = false;
         }
     }
@@ -161,7 +161,7 @@ public class WebRtcAudioRecord {
             this.isNoiseSuppressorSupported = z3;
             StringBuilder K = a.K("ctor");
             K.append(WebRtcAudioUtils.getThreadInfo());
-            Logging.d("WebRtcAudioRecordExternal", K.toString());
+            Logging.d(TAG, K.toString());
         } else {
             throw new IllegalArgumentException("HW NS not supported");
         }
@@ -231,20 +231,20 @@ public class WebRtcAudioRecord {
     }
 
     private static AudioRecord createAudioRecordOnLowerThanM(int i, int i2, int i3, int i4, int i5) {
-        Logging.d("WebRtcAudioRecordExternal", "createAudioRecordOnLowerThanM");
+        Logging.d(TAG, "createAudioRecordOnLowerThanM");
         return new AudioRecord(i, i2, i3, i4, i5);
     }
 
     @TargetApi(23)
     private static AudioRecord createAudioRecordOnMOrHigher(int i, int i2, int i3, int i4, int i5) {
-        Logging.d("WebRtcAudioRecordExternal", "createAudioRecordOnMOrHigher");
+        Logging.d(TAG, "createAudioRecordOnMOrHigher");
         return new AudioRecord.Builder().setAudioSource(i).setAudioFormat(new AudioFormat.Builder().setEncoding(i4).setSampleRate(i2).setChannelMask(i3).build()).setBufferSizeInBytes(i5).build();
     }
 
     private void doAudioRecordStateCallback(int i) {
         StringBuilder K = a.K("doAudioRecordStateCallback: ");
         K.append(audioStateToString(i));
-        Logging.d("WebRtcAudioRecordExternal", K.toString());
+        Logging.d(TAG, K.toString());
         JavaAudioDeviceModule.AudioRecordStateCallback audioRecordStateCallback = this.stateCallback;
         if (audioRecordStateCallback == null) {
             return;
@@ -254,19 +254,19 @@ public class WebRtcAudioRecord {
         } else if (i == 1) {
             audioRecordStateCallback.onWebRtcAudioRecordStop();
         } else {
-            Logging.e("WebRtcAudioRecordExternal", "Invalid audio state");
+            Logging.e(TAG, "Invalid audio state");
         }
     }
 
     @CalledByNative
     private boolean enableBuiltInAEC(boolean z2) {
-        Logging.d("WebRtcAudioRecordExternal", "enableBuiltInAEC(" + z2 + ")");
+        Logging.d(TAG, "enableBuiltInAEC(" + z2 + ")");
         return this.effects.setAEC(z2);
     }
 
     @CalledByNative
     private boolean enableBuiltInNS(boolean z2) {
-        Logging.d("WebRtcAudioRecordExternal", "enableBuiltInNS(" + z2 + ")");
+        Logging.d(TAG, "enableBuiltInNS(" + z2 + ")");
         return this.effects.setNS(z2);
     }
 
@@ -288,7 +288,7 @@ public class WebRtcAudioRecord {
 
     @CalledByNative
     private int initRecording(int i, int i2) {
-        Logging.d("WebRtcAudioRecordExternal", a.n("initRecording(sampleRate=", i, ", channels=", i2, ")"));
+        Logging.d(TAG, a.n("initRecording(sampleRate=", i, ", channels=", i2, ")"));
         if (this.audioRecord != null) {
             reportWebRtcAudioRecordInitError("InitRecording called twice without StopRecording.");
             return -1;
@@ -302,7 +302,7 @@ public class WebRtcAudioRecord {
         }
         StringBuilder K = a.K("byteBuffer.capacity: ");
         K.append(this.byteBuffer.capacity());
-        Logging.d("WebRtcAudioRecordExternal", K.toString());
+        Logging.d(TAG, K.toString());
         this.emptyBytes = new byte[this.byteBuffer.capacity()];
         nativeCacheDirectBufferAddress(this.nativeAudioRecord, this.byteBuffer);
         int channelCountToConfiguration = channelCountToConfiguration(i2);
@@ -311,9 +311,9 @@ public class WebRtcAudioRecord {
             reportWebRtcAudioRecordInitError(a.j("AudioRecord.getMinBufferSize failed: ", minBufferSize));
             return -1;
         }
-        Logging.d("WebRtcAudioRecordExternal", "AudioRecord.getMinBufferSize: " + minBufferSize);
+        Logging.d(TAG, "AudioRecord.getMinBufferSize: " + minBufferSize);
         int max = Math.max(minBufferSize * 2, this.byteBuffer.capacity());
-        Logging.d("WebRtcAudioRecordExternal", "bufferSizeInBytes: " + max);
+        Logging.d(TAG, "bufferSizeInBytes: " + max);
         try {
             if (Build.VERSION.SDK_INT >= 23) {
                 this.audioRecord = createAudioRecordOnMOrHigher(this.audioSource, i, channelCountToConfiguration, this.audioFormat, max);
@@ -337,7 +337,7 @@ public class WebRtcAudioRecord {
             logMainParametersExtended();
             int logRecordingConfigurations = logRecordingConfigurations(this.audioRecord, false);
             if (logRecordingConfigurations != 0) {
-                Logging.w("WebRtcAudioRecordExternal", "Potential microphone conflict. Active sessions: " + logRecordingConfigurations);
+                Logging.w(TAG, "Potential microphone conflict. Active sessions: " + logRecordingConfigurations);
             }
             return i3;
         } catch (IllegalArgumentException | UnsupportedOperationException e) {
@@ -350,7 +350,7 @@ public class WebRtcAudioRecord {
     @TargetApi(24)
     private static boolean logActiveRecordingConfigs(int i, List<AudioRecordingConfiguration> list) {
         assertTrue(!list.isEmpty());
-        Logging.d("WebRtcAudioRecordExternal", "AudioRecordingConfigurations: ");
+        Logging.d(TAG, "AudioRecordingConfigurations: ");
         for (AudioRecordingConfiguration audioRecordingConfiguration : list) {
             StringBuilder sb = new StringBuilder();
             int clientAudioSource = audioRecordingConfiguration.getClientAudioSource();
@@ -397,7 +397,7 @@ public class WebRtcAudioRecord {
                 sb.append(", id=");
                 sb.append(audioDevice.getId());
             }
-            Logging.d("WebRtcAudioRecordExternal", sb.toString());
+            Logging.d(TAG, sb.toString());
         }
         return true;
     }
@@ -409,7 +409,7 @@ public class WebRtcAudioRecord {
         K.append(this.audioRecord.getChannelCount());
         K.append(", sample rate: ");
         K.append(this.audioRecord.getSampleRate());
-        Logging.d("WebRtcAudioRecordExternal", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     @TargetApi(23)
@@ -417,21 +417,21 @@ public class WebRtcAudioRecord {
         if (Build.VERSION.SDK_INT >= 23) {
             StringBuilder K = a.K("AudioRecord: buffer size in frames: ");
             K.append(this.audioRecord.getBufferSizeInFrames());
-            Logging.d("WebRtcAudioRecordExternal", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
     @TargetApi(24)
     private int logRecordingConfigurations(AudioRecord audioRecord, boolean z2) {
         if (Build.VERSION.SDK_INT < 24) {
-            Logging.w("WebRtcAudioRecordExternal", "AudioManager#getActiveRecordingConfigurations() requires N or higher");
+            Logging.w(TAG, "AudioManager#getActiveRecordingConfigurations() requires N or higher");
             return 0;
         } else if (audioRecord == null) {
             return 0;
         } else {
             List<AudioRecordingConfiguration> activeRecordingConfigurations = this.audioManager.getActiveRecordingConfigurations();
             int size = activeRecordingConfigurations.size();
-            Logging.d("WebRtcAudioRecordExternal", "Number of active recording sessions: " + size);
+            Logging.d(TAG, "Number of active recording sessions: " + size);
             if (size > 0) {
                 logActiveRecordingConfigs(audioRecord.getAudioSessionId(), activeRecordingConfigurations);
                 if (z2) {
@@ -451,7 +451,7 @@ public class WebRtcAudioRecord {
     }
 
     private void releaseAudioResources() {
-        Logging.d("WebRtcAudioRecordExternal", "releaseAudioResources");
+        Logging.d(TAG, "releaseAudioResources");
         AudioRecord audioRecord = this.audioRecord;
         if (audioRecord != null) {
             audioRecord.release();
@@ -461,8 +461,8 @@ public class WebRtcAudioRecord {
     }
 
     private void reportWebRtcAudioRecordError(String str) {
-        Logging.e("WebRtcAudioRecordExternal", "Run-time recording error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioRecordExternal", this.context, this.audioManager);
+        Logging.e(TAG, "Run-time recording error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         JavaAudioDeviceModule.AudioRecordErrorCallback audioRecordErrorCallback = this.errorCallback;
         if (audioRecordErrorCallback != null) {
             audioRecordErrorCallback.onWebRtcAudioRecordError(str);
@@ -470,8 +470,8 @@ public class WebRtcAudioRecord {
     }
 
     private void reportWebRtcAudioRecordInitError(String str) {
-        Logging.e("WebRtcAudioRecordExternal", "Init recording error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioRecordExternal", this.context, this.audioManager);
+        Logging.e(TAG, "Init recording error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         logRecordingConfigurations(this.audioRecord, false);
         JavaAudioDeviceModule.AudioRecordErrorCallback audioRecordErrorCallback = this.errorCallback;
         if (audioRecordErrorCallback != null) {
@@ -480,8 +480,8 @@ public class WebRtcAudioRecord {
     }
 
     private void reportWebRtcAudioRecordStartError(JavaAudioDeviceModule.AudioRecordStartErrorCode audioRecordStartErrorCode, String str) {
-        Logging.e("WebRtcAudioRecordExternal", "Start recording error: " + audioRecordStartErrorCode + ". " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioRecordExternal", this.context, this.audioManager);
+        Logging.e(TAG, "Start recording error: " + audioRecordStartErrorCode + ". " + str);
+        WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         logRecordingConfigurations(this.audioRecord, false);
         JavaAudioDeviceModule.AudioRecordErrorCallback audioRecordErrorCallback = this.errorCallback;
         if (audioRecordErrorCallback != null) {
@@ -490,7 +490,7 @@ public class WebRtcAudioRecord {
     }
 
     private void scheduleLogRecordingConfigurationsTask(AudioRecord audioRecord) {
-        Logging.d("WebRtcAudioRecordExternal", "scheduleLogRecordingConfigurationsTask");
+        Logging.d(TAG, "scheduleLogRecordingConfigurationsTask");
         if (Build.VERSION.SDK_INT >= 24) {
             h0.c.u0.a aVar = new h0.c.u0.a(this, audioRecord);
             ScheduledFuture<String> scheduledFuture = this.future;
@@ -503,7 +503,7 @@ public class WebRtcAudioRecord {
 
     @CalledByNative
     private boolean startRecording() {
-        Logging.d("WebRtcAudioRecordExternal", "startRecording");
+        Logging.d(TAG, "startRecording");
         assertTrue(this.audioRecord != null);
         assertTrue(this.audioThread == null);
         try {
@@ -531,7 +531,7 @@ public class WebRtcAudioRecord {
 
     @CalledByNative
     private boolean stopRecording() {
-        Logging.d("WebRtcAudioRecordExternal", "stopRecording");
+        Logging.d(TAG, "stopRecording");
         assertTrue(this.audioThread != null);
         ScheduledFuture<String> scheduledFuture = this.future;
         if (scheduledFuture != null) {
@@ -541,9 +541,9 @@ public class WebRtcAudioRecord {
             this.future = null;
         }
         this.audioThread.stopThread();
-        if (!ThreadUtils.joinUninterruptibly(this.audioThread, 2000)) {
-            Logging.e("WebRtcAudioRecordExternal", "Join of AudioRecordJavaThread timed out");
-            WebRtcAudioUtils.logAudioState("WebRtcAudioRecordExternal", this.context, this.audioManager);
+        if (!ThreadUtils.joinUninterruptibly(this.audioThread, AUDIO_RECORD_THREAD_JOIN_TIMEOUT_MS)) {
+            Logging.e(TAG, "Join of AudioRecordJavaThread timed out");
+            WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         }
         this.audioThread = null;
         this.effects.release();
@@ -559,13 +559,13 @@ public class WebRtcAudioRecord {
             if (audioDevice != null && audioRecordingConfiguration.getClientAudioSource() == i && audioRecordingConfiguration.getClientAudioSessionId() == i2 && audioRecordingConfiguration.getClientFormat().getEncoding() == audioFormat.getEncoding() && audioRecordingConfiguration.getClientFormat().getSampleRate() == audioFormat.getSampleRate() && audioRecordingConfiguration.getClientFormat().getChannelMask() == audioFormat.getChannelMask() && audioRecordingConfiguration.getClientFormat().getChannelIndexMask() == audioFormat.getChannelIndexMask() && audioRecordingConfiguration.getFormat().getEncoding() != 0 && audioRecordingConfiguration.getFormat().getSampleRate() > 0) {
                 if (audioRecordingConfiguration.getFormat().getChannelMask() != 0 || audioRecordingConfiguration.getFormat().getChannelIndexMask() != 0) {
                     if (checkDeviceMatch(audioDevice, audioDeviceInfo)) {
-                        Logging.d("WebRtcAudioRecordExternal", "verifyAudioConfig: PASS");
+                        Logging.d(TAG, "verifyAudioConfig: PASS");
                         return true;
                     }
                 }
             }
         }
-        Logging.e("WebRtcAudioRecordExternal", "verifyAudioConfig: FAILED");
+        Logging.e(TAG, "verifyAudioConfig: FAILED");
         return false;
     }
 
@@ -574,7 +574,7 @@ public class WebRtcAudioRecord {
             logRecordingConfigurations(audioRecord, true);
             return "Scheduled task is done";
         }
-        Logging.d("WebRtcAudioRecordExternal", "audio record has changed");
+        Logging.d(TAG, "audio record has changed");
         return "Scheduled task is done";
     }
 
@@ -594,7 +594,7 @@ public class WebRtcAudioRecord {
         if (bool != null) {
             return bool.booleanValue();
         }
-        Logging.w("WebRtcAudioRecordExternal", "Audio configuration has not yet been verified");
+        Logging.w(TAG, "Audio configuration has not yet been verified");
         return false;
     }
 
@@ -604,7 +604,7 @@ public class WebRtcAudioRecord {
     }
 
     public void setMicrophoneMute(boolean z2) {
-        Logging.w("WebRtcAudioRecordExternal", "setMicrophoneMute(" + z2 + ")");
+        Logging.w(TAG, "setMicrophoneMute(" + z2 + ")");
         this.microphoneMute = z2;
     }
 
@@ -618,11 +618,11 @@ public class WebRtcAudioRecord {
     public void setPreferredDevice(@Nullable AudioDeviceInfo audioDeviceInfo) {
         StringBuilder K = a.K("setPreferredDevice ");
         K.append(audioDeviceInfo != null ? Integer.valueOf(audioDeviceInfo.getId()) : null);
-        Logging.d("WebRtcAudioRecordExternal", K.toString());
+        Logging.d(TAG, K.toString());
         this.preferredDevice = audioDeviceInfo;
         AudioRecord audioRecord = this.audioRecord;
         if (audioRecord != null && !audioRecord.setPreferredDevice(audioDeviceInfo)) {
-            Logging.e("WebRtcAudioRecordExternal", "setPreferredDevice failed");
+            Logging.e(TAG, "setPreferredDevice failed");
         }
     }
 }
diff --git a/app/src/main/java/org/webrtc/audio/WebRtcAudioTrack.java b/app/src/main/java/org/webrtc/audio/WebRtcAudioTrack.java
index 44a86e5548..c17e570f9f 100644
--- a/app/src/main/java/org/webrtc/audio/WebRtcAudioTrack.java
+++ b/app/src/main/java/org/webrtc/audio/WebRtcAudioTrack.java
@@ -60,7 +60,7 @@ public class WebRtcAudioTrack {
         @Override // java.lang.Thread, java.lang.Runnable
         public void run() {
             Process.setThreadPriority(-19);
-            Logging.d("WebRtcAudioTrackExternal", "AudioTrackThread" + WebRtcAudioUtils.getThreadInfo());
+            Logging.d(WebRtcAudioTrack.TAG, "AudioTrackThread" + WebRtcAudioUtils.getThreadInfo());
             WebRtcAudioTrack.access$100(WebRtcAudioTrack.access$000(WebRtcAudioTrack.this).getPlayState() == 3);
             WebRtcAudioTrack.access$200(WebRtcAudioTrack.this, 0);
             int capacity = WebRtcAudioTrack.access$300(WebRtcAudioTrack.this).capacity();
@@ -74,7 +74,7 @@ public class WebRtcAudioTrack {
                 }
                 int writeBytes = writeBytes(WebRtcAudioTrack.access$000(WebRtcAudioTrack.this), WebRtcAudioTrack.access$300(WebRtcAudioTrack.this), capacity);
                 if (writeBytes != capacity) {
-                    Logging.e("WebRtcAudioTrackExternal", "AudioTrack.write played invalid number of bytes: " + writeBytes);
+                    Logging.e(WebRtcAudioTrack.TAG, "AudioTrack.write played invalid number of bytes: " + writeBytes);
                     if (writeBytes < 0) {
                         this.keepAlive = false;
                         WebRtcAudioTrack webRtcAudioTrack = WebRtcAudioTrack.this;
@@ -89,7 +89,7 @@ public class WebRtcAudioTrack {
         }
 
         public void stopThread() {
-            Logging.d("WebRtcAudioTrackExternal", "stopThread");
+            Logging.d(WebRtcAudioTrack.TAG, "stopThread");
             this.keepAlive = false;
         }
     }
@@ -112,7 +112,7 @@ public class WebRtcAudioTrack {
         this.useLowLatency = z2;
         StringBuilder K = a.K("ctor");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("WebRtcAudioTrackExternal", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     @CalledByNative
@@ -184,7 +184,7 @@ public class WebRtcAudioTrack {
 
     @TargetApi(21)
     private static AudioTrack createAudioTrackOnLollipopOrHigher(int i, int i2, int i3, @Nullable AudioAttributes audioAttributes) {
-        Logging.d("WebRtcAudioTrackExternal", "createAudioTrackOnLollipopOrHigher");
+        Logging.d(TAG, "createAudioTrackOnLollipopOrHigher");
         logNativeOutputSampleRate(i);
         return new AudioTrack(getAudioAttributes(audioAttributes), new AudioFormat.Builder().setEncoding(2).setSampleRate(i).setChannelMask(i2).build(), i3, 1, 0);
     }
@@ -195,13 +195,13 @@ public class WebRtcAudioTrack {
 
     @TargetApi(26)
     private static AudioTrack createAudioTrackOnOreoOrHigher(int i, int i2, int i3, @Nullable AudioAttributes audioAttributes) {
-        Logging.d("WebRtcAudioTrackExternal", "createAudioTrackOnOreoOrHigher");
+        Logging.d(TAG, "createAudioTrackOnOreoOrHigher");
         logNativeOutputSampleRate(i);
         return new AudioTrack.Builder().setAudioAttributes(getAudioAttributes(audioAttributes)).setAudioFormat(new AudioFormat.Builder().setEncoding(2).setSampleRate(i).setChannelMask(i2).build()).setBufferSizeInBytes(i3).setPerformanceMode(1).setTransferMode(1).setSessionId(0).build();
     }
 
     private void doAudioTrackStateCallback(int i) {
-        Logging.d("WebRtcAudioTrackExternal", "doAudioTrackStateCallback: " + i);
+        Logging.d(TAG, "doAudioTrackStateCallback: " + i);
         JavaAudioDeviceModule.AudioTrackStateCallback audioTrackStateCallback = this.stateCallback;
         if (audioTrackStateCallback == null) {
             return;
@@ -211,7 +211,7 @@ public class WebRtcAudioTrack {
         } else if (i == 1) {
             audioTrackStateCallback.onWebRtcAudioTrackStop();
         } else {
-            Logging.e("WebRtcAudioTrackExternal", "Invalid audio state");
+            Logging.e(TAG, "Invalid audio state");
         }
     }
 
@@ -252,30 +252,30 @@ public class WebRtcAudioTrack {
     @CalledByNative
     private int getStreamMaxVolume() {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrackExternal", "getStreamMaxVolume");
+        Logging.d(TAG, "getStreamMaxVolume");
         return this.audioManager.getStreamMaxVolume(0);
     }
 
     @CalledByNative
     private int getStreamVolume() {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrackExternal", "getStreamVolume");
+        Logging.d(TAG, "getStreamVolume");
         return this.audioManager.getStreamVolume(0);
     }
 
     @CalledByNative
     private int initPlayout(int i, int i2, double d) {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrackExternal", "initPlayout(sampleRate=" + i + ", channels=" + i2 + ", bufferSizeFactor=" + d + ")");
+        Logging.d(TAG, "initPlayout(sampleRate=" + i + ", channels=" + i2 + ", bufferSizeFactor=" + d + ")");
         this.byteBuffer = ByteBuffer.allocateDirect((i / 100) * i2 * 2);
         StringBuilder K = a.K("byteBuffer.capacity: ");
         K.append(this.byteBuffer.capacity());
-        Logging.d("WebRtcAudioTrackExternal", K.toString());
+        Logging.d(TAG, K.toString());
         this.emptyBytes = new byte[this.byteBuffer.capacity()];
         nativeCacheDirectBufferAddress(this.nativeAudioTrack, this.byteBuffer);
         int channelCountToConfiguration = channelCountToConfiguration(i2);
         int minBufferSize = (int) (((double) AudioTrack.getMinBufferSize(i, channelCountToConfiguration, 2)) * d);
-        Logging.d("WebRtcAudioTrackExternal", "minBufferSizeInBytes: " + minBufferSize);
+        Logging.d(TAG, "minBufferSizeInBytes: " + minBufferSize);
         if (minBufferSize < this.byteBuffer.capacity()) {
             reportWebRtcAudioTrackInitError("AudioTrack.getMinBufferSize returns an invalid value.");
             return -1;
@@ -322,7 +322,7 @@ public class WebRtcAudioTrack {
         if (Build.VERSION.SDK_INT >= 24) {
             StringBuilder K = a.K("AudioTrack: buffer capacity in frames: ");
             K.append(this.audioTrack.getBufferCapacityInFrames());
-            Logging.d("WebRtcAudioTrackExternal", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
@@ -330,7 +330,7 @@ public class WebRtcAudioTrack {
         if (Build.VERSION.SDK_INT >= 23) {
             StringBuilder K = a.K("AudioTrack: buffer size in frames: ");
             K.append(this.audioTrack.getBufferSizeInFrames());
-            Logging.d("WebRtcAudioTrackExternal", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
@@ -343,7 +343,7 @@ public class WebRtcAudioTrack {
         K.append(this.audioTrack.getSampleRate());
         K.append(", max gain: ");
         K.append(AudioTrack.getMaxVolume());
-        Logging.d("WebRtcAudioTrackExternal", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     private void logMainParametersExtended() {
@@ -353,9 +353,9 @@ public class WebRtcAudioTrack {
 
     private static void logNativeOutputSampleRate(int i) {
         int nativeOutputSampleRate = AudioTrack.getNativeOutputSampleRate(0);
-        Logging.d("WebRtcAudioTrackExternal", "nativeOutputSampleRate: " + nativeOutputSampleRate);
+        Logging.d(TAG, "nativeOutputSampleRate: " + nativeOutputSampleRate);
         if (i != nativeOutputSampleRate) {
-            Logging.w("WebRtcAudioTrackExternal", "Unable to use fast mode since requested sample rate is not native");
+            Logging.w(TAG, "Unable to use fast mode since requested sample rate is not native");
         }
     }
 
@@ -363,7 +363,7 @@ public class WebRtcAudioTrack {
         if (Build.VERSION.SDK_INT >= 24) {
             StringBuilder K = a.K("underrun count: ");
             K.append(this.audioTrack.getUnderrunCount());
-            Logging.d("WebRtcAudioTrackExternal", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
@@ -372,7 +372,7 @@ public class WebRtcAudioTrack {
     private static native void nativeGetPlayoutData(long j, int i);
 
     private void releaseAudioResources() {
-        Logging.d("WebRtcAudioTrackExternal", "releaseAudioResources");
+        Logging.d(TAG, "releaseAudioResources");
         AudioTrack audioTrack = this.audioTrack;
         if (audioTrack != null) {
             audioTrack.release();
@@ -381,8 +381,8 @@ public class WebRtcAudioTrack {
     }
 
     private void reportWebRtcAudioTrackError(String str) {
-        Logging.e("WebRtcAudioTrackExternal", "Run-time playback error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioTrackExternal", this.context, this.audioManager);
+        Logging.e(TAG, "Run-time playback error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         JavaAudioDeviceModule.AudioTrackErrorCallback audioTrackErrorCallback = this.errorCallback;
         if (audioTrackErrorCallback != null) {
             audioTrackErrorCallback.onWebRtcAudioTrackError(str);
@@ -390,8 +390,8 @@ public class WebRtcAudioTrack {
     }
 
     private void reportWebRtcAudioTrackInitError(String str) {
-        Logging.e("WebRtcAudioTrackExternal", "Init playout error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioTrackExternal", this.context, this.audioManager);
+        Logging.e(TAG, "Init playout error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         JavaAudioDeviceModule.AudioTrackErrorCallback audioTrackErrorCallback = this.errorCallback;
         if (audioTrackErrorCallback != null) {
             audioTrackErrorCallback.onWebRtcAudioTrackInitError(str);
@@ -399,8 +399,8 @@ public class WebRtcAudioTrack {
     }
 
     private void reportWebRtcAudioTrackStartError(JavaAudioDeviceModule.AudioTrackStartErrorCode audioTrackStartErrorCode, String str) {
-        Logging.e("WebRtcAudioTrackExternal", "Start playout error: " + audioTrackStartErrorCode + ". " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioTrackExternal", this.context, this.audioManager);
+        Logging.e(TAG, "Start playout error: " + audioTrackStartErrorCode + ". " + str);
+        WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         JavaAudioDeviceModule.AudioTrackErrorCallback audioTrackErrorCallback = this.errorCallback;
         if (audioTrackErrorCallback != null) {
             audioTrackErrorCallback.onWebRtcAudioTrackStartError(audioTrackStartErrorCode, str);
@@ -410,9 +410,9 @@ public class WebRtcAudioTrack {
     @CalledByNative
     private boolean setStreamVolume(int i) {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrackExternal", "setStreamVolume(" + i + ")");
+        Logging.d(TAG, "setStreamVolume(" + i + ")");
         if (isVolumeFixed()) {
-            Logging.e("WebRtcAudioTrackExternal", "The device implements a fixed volume policy.");
+            Logging.e(TAG, "The device implements a fixed volume policy.");
             return false;
         }
         this.audioManager.setStreamVolume(0, i, 0);
@@ -423,7 +423,7 @@ public class WebRtcAudioTrack {
     private boolean startPlayout() {
         this.threadChecker.checkIsOnValidThread();
         this.volumeLogger.start();
-        Logging.d("WebRtcAudioTrackExternal", "startPlayout");
+        Logging.d(TAG, "startPlayout");
         assertTrue(this.audioTrack != null);
         assertTrue(this.audioThread == null);
         try {
@@ -454,28 +454,28 @@ public class WebRtcAudioTrack {
     private boolean stopPlayout() {
         this.threadChecker.checkIsOnValidThread();
         this.volumeLogger.stop();
-        Logging.d("WebRtcAudioTrackExternal", "stopPlayout");
+        Logging.d(TAG, "stopPlayout");
         assertTrue(this.audioThread != null);
         logUnderrunCount();
         this.audioThread.stopThread();
-        Logging.d("WebRtcAudioTrackExternal", "Stopping the AudioTrackThread...");
+        Logging.d(TAG, "Stopping the AudioTrackThread...");
         this.audioThread.interrupt();
-        if (!ThreadUtils.joinUninterruptibly(this.audioThread, 2000)) {
-            Logging.e("WebRtcAudioTrackExternal", "Join of AudioTrackThread timed out.");
-            WebRtcAudioUtils.logAudioState("WebRtcAudioTrackExternal", this.context, this.audioManager);
+        if (!ThreadUtils.joinUninterruptibly(this.audioThread, AUDIO_TRACK_THREAD_JOIN_TIMEOUT_MS)) {
+            Logging.e(TAG, "Join of AudioTrackThread timed out.");
+            WebRtcAudioUtils.logAudioState(TAG, this.context, this.audioManager);
         }
-        Logging.d("WebRtcAudioTrackExternal", "AudioTrackThread has now been stopped.");
+        Logging.d(TAG, "AudioTrackThread has now been stopped.");
         this.audioThread = null;
         if (this.audioTrack != null) {
-            Logging.d("WebRtcAudioTrackExternal", "Calling AudioTrack.stop...");
+            Logging.d(TAG, "Calling AudioTrack.stop...");
             try {
                 this.audioTrack.stop();
-                Logging.d("WebRtcAudioTrackExternal", "AudioTrack.stop is done.");
+                Logging.d(TAG, "AudioTrack.stop is done.");
                 doAudioTrackStateCallback(1);
             } catch (IllegalStateException e) {
                 StringBuilder K = a.K("AudioTrack.stop failed: ");
                 K.append(e.getMessage());
-                Logging.e("WebRtcAudioTrackExternal", K.toString());
+                Logging.e(TAG, K.toString());
             }
         }
         releaseAudioResources();
@@ -488,7 +488,7 @@ public class WebRtcAudioTrack {
     }
 
     public void setSpeakerMute(boolean z2) {
-        Logging.w("WebRtcAudioTrackExternal", "setSpeakerMute(" + z2 + ")");
+        Logging.w(TAG, "setSpeakerMute(" + z2 + ")");
         this.speakerMute = z2;
     }
 }
diff --git a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioEffects.java b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioEffects.java
index 258f15ab44..bc77f0e365 100644
--- a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioEffects.java
+++ b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioEffects.java
@@ -26,7 +26,7 @@ public class WebRtcAudioEffects {
     private WebRtcAudioEffects() {
         StringBuilder K = a.K("ctor");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("WebRtcAudioEffects", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     private static void assertTrue(boolean z2) {
@@ -37,13 +37,13 @@ public class WebRtcAudioEffects {
 
     public static boolean canUseAcousticEchoCanceler() {
         boolean z2 = isAcousticEchoCancelerSupported() && !WebRtcAudioUtils.useWebRtcBasedAcousticEchoCanceler() && !isAcousticEchoCancelerBlacklisted() && !isAcousticEchoCancelerExcludedByUUID();
-        Logging.d("WebRtcAudioEffects", "canUseAcousticEchoCanceler: " + z2);
+        Logging.d(TAG, "canUseAcousticEchoCanceler: " + z2);
         return z2;
     }
 
     public static boolean canUseNoiseSuppressor() {
         boolean z2 = isNoiseSuppressorSupported() && !WebRtcAudioUtils.useWebRtcBasedNoiseSuppressor() && !isNoiseSuppressorBlacklisted() && !isNoiseSuppressorExcludedByUUID();
-        Logging.d("WebRtcAudioEffects", "canUseNoiseSuppressor: " + z2);
+        Logging.d(TAG, "canUseNoiseSuppressor: " + z2);
         return z2;
     }
 
@@ -71,7 +71,7 @@ public class WebRtcAudioEffects {
         String str = Build.MODEL;
         boolean contains = blackListedModelsForAecUsage.contains(str);
         if (contains) {
-            Logging.w("WebRtcAudioEffects", str + " is blacklisted for HW AEC usage!");
+            Logging.w(TAG, str + " is blacklisted for HW AEC usage!");
         }
         return contains;
     }
@@ -112,7 +112,7 @@ public class WebRtcAudioEffects {
         String str = Build.MODEL;
         boolean contains = blackListedModelsForNsUsage.contains(str);
         if (contains) {
-            Logging.w("WebRtcAudioEffects", str + " is blacklisted for HW NS usage!");
+            Logging.w(TAG, str + " is blacklisted for HW NS usage!");
         }
         return contains;
     }
@@ -136,7 +136,7 @@ public class WebRtcAudioEffects {
     }
 
     public void enable(int i) {
-        Logging.d("WebRtcAudioEffects", "enable(audioSession=" + i + ")");
+        Logging.d(TAG, "enable(audioSession=" + i + ")");
         boolean z2 = true;
         assertTrue(this.aec == null);
         assertTrue(this.ns == null);
@@ -148,7 +148,7 @@ public class WebRtcAudioEffects {
                 boolean enabled = create.getEnabled();
                 boolean z3 = this.shouldEnableAec && canUseAcousticEchoCanceler();
                 if (this.aec.setEnabled(z3) != 0) {
-                    Logging.e("WebRtcAudioEffects", "Failed to set the AcousticEchoCanceler state");
+                    Logging.e(TAG, "Failed to set the AcousticEchoCanceler state");
                 }
                 StringBuilder K = a.K("AcousticEchoCanceler: was ");
                 K.append(enabled ? str : "disabled");
@@ -156,9 +156,9 @@ public class WebRtcAudioEffects {
                 K.append(z3);
                 K.append(", is now: ");
                 K.append(this.aec.getEnabled() ? str : "disabled");
-                Logging.d("WebRtcAudioEffects", K.toString());
+                Logging.d(TAG, K.toString());
             } else {
-                Logging.e("WebRtcAudioEffects", "Failed to create the AcousticEchoCanceler instance");
+                Logging.e(TAG, "Failed to create the AcousticEchoCanceler instance");
             }
         }
         if (isNoiseSuppressorSupported()) {
@@ -170,7 +170,7 @@ public class WebRtcAudioEffects {
                     z2 = false;
                 }
                 if (this.ns.setEnabled(z2) != 0) {
-                    Logging.e("WebRtcAudioEffects", "Failed to set the NoiseSuppressor state");
+                    Logging.e(TAG, "Failed to set the NoiseSuppressor state");
                 }
                 StringBuilder K2 = a.K("NoiseSuppressor: was ");
                 K2.append(enabled2 ? str : "disabled");
@@ -181,15 +181,15 @@ public class WebRtcAudioEffects {
                     str = "disabled";
                 }
                 K2.append(str);
-                Logging.d("WebRtcAudioEffects", K2.toString());
+                Logging.d(TAG, K2.toString());
                 return;
             }
-            Logging.e("WebRtcAudioEffects", "Failed to create the NoiseSuppressor instance");
+            Logging.e(TAG, "Failed to create the NoiseSuppressor instance");
         }
     }
 
     public void release() {
-        Logging.d("WebRtcAudioEffects", "release");
+        Logging.d(TAG, "release");
         AcousticEchoCanceler acousticEchoCanceler = this.aec;
         if (acousticEchoCanceler != null) {
             acousticEchoCanceler.release();
@@ -203,31 +203,31 @@ public class WebRtcAudioEffects {
     }
 
     public boolean setAEC(boolean z2) {
-        Logging.d("WebRtcAudioEffects", "setAEC(" + z2 + ")");
+        Logging.d(TAG, "setAEC(" + z2 + ")");
         if (!canUseAcousticEchoCanceler()) {
-            Logging.w("WebRtcAudioEffects", "Platform AEC is not supported");
+            Logging.w(TAG, "Platform AEC is not supported");
             this.shouldEnableAec = false;
             return false;
         } else if (this.aec == null || z2 == this.shouldEnableAec) {
             this.shouldEnableAec = z2;
             return true;
         } else {
-            Logging.e("WebRtcAudioEffects", "Platform AEC state can't be modified while recording");
+            Logging.e(TAG, "Platform AEC state can't be modified while recording");
             return false;
         }
     }
 
     public boolean setNS(boolean z2) {
-        Logging.d("WebRtcAudioEffects", "setNS(" + z2 + ")");
+        Logging.d(TAG, "setNS(" + z2 + ")");
         if (!canUseNoiseSuppressor()) {
-            Logging.w("WebRtcAudioEffects", "Platform NS is not supported");
+            Logging.w(TAG, "Platform NS is not supported");
             this.shouldEnableNs = false;
             return false;
         } else if (this.ns == null || z2 == this.shouldEnableNs) {
             this.shouldEnableNs = z2;
             return true;
         } else {
-            Logging.e("WebRtcAudioEffects", "Platform NS state can't be modified while recording");
+            Logging.e(TAG, "Platform NS state can't be modified while recording");
             return false;
         }
     }
diff --git a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioManager.java b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioManager.java
index 7f53b8b6c1..364f9065d3 100644
--- a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioManager.java
+++ b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioManager.java
@@ -10,6 +10,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 import org.webrtc.ContextUtils;
 import org.webrtc.Logging;
+import org.webrtc.MediaStreamTrack;
 public class WebRtcAudioManager {
     private static final int BITS_PER_SAMPLE = 16;
     private static final boolean DEBUG = false;
@@ -64,14 +65,14 @@ public class WebRtcAudioManager {
                     K.append(" (max=");
                     K.append(this.maxRingVolume);
                     K.append(")");
-                    Logging.d("WebRtcAudioManager", K.toString());
+                    Logging.d(WebRtcAudioManager.TAG, K.toString());
                 } else if (mode == 3) {
                     StringBuilder K2 = a.K("VOICE_CALL stream volume: ");
                     K2.append(VolumeLogger.access$000(VolumeLogger.this).getStreamVolume(0));
                     K2.append(" (max=");
                     K2.append(this.maxVoiceCallVolume);
                     K2.append(")");
-                    Logging.d("WebRtcAudioManager", K2.toString());
+                    Logging.d(WebRtcAudioManager.TAG, K2.toString());
                 }
             }
         }
@@ -97,7 +98,7 @@ public class WebRtcAudioManager {
         }
 
         public void start() {
-            Timer timer = new Timer("WebRtcVolumeLevelLoggerThread");
+            Timer timer = new Timer(THREAD_NAME);
             this.timer = timer;
             timer.schedule(new LogVolumeTask(this.audioManager.getStreamMaxVolume(2), this.audioManager.getStreamMaxVolume(0)), 0, 30000);
         }
@@ -106,14 +107,14 @@ public class WebRtcAudioManager {
     public WebRtcAudioManager(long j) {
         StringBuilder K = a.K("ctor");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("WebRtcAudioManager", K.toString());
+        Logging.d(TAG, K.toString());
         this.nativeAudioManager = j;
-        AudioManager audioManager = (AudioManager) ContextUtils.getApplicationContext().getSystemService("audio");
+        AudioManager audioManager = (AudioManager) ContextUtils.getApplicationContext().getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
         this.audioManager = audioManager;
         this.volumeLogger = new VolumeLogger(audioManager);
         storeAudioParameters();
         nativeCacheAudioParameters(this.sampleRate, this.outputChannels, this.inputChannels, this.hardwareAEC, this.hardwareAGC, this.hardwareNS, this.lowLatencyOutput, this.lowLatencyInput, this.proAudio, this.aAudio, this.outputBufferSize, this.inputBufferSize, j);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioManager");
+        WebRtcAudioUtils.logAudioState(TAG);
     }
 
     private static void assertTrue(boolean z2) {
@@ -125,7 +126,7 @@ public class WebRtcAudioManager {
     private void dispose() {
         StringBuilder K = a.K("dispose");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("WebRtcAudioManager", K.toString());
+        Logging.d(TAG, K.toString());
         if (this.initialized) {
             VolumeLogger.access$100(this.volumeLogger);
         }
@@ -155,17 +156,17 @@ public class WebRtcAudioManager {
 
     private int getNativeOutputSampleRate() {
         if (WebRtcAudioUtils.runningOnEmulator()) {
-            Logging.d("WebRtcAudioManager", "Running emulator, overriding sample rate to 8 kHz.");
+            Logging.d(TAG, "Running emulator, overriding sample rate to 8 kHz.");
             return 8000;
         } else if (WebRtcAudioUtils.isDefaultSampleRateOverridden()) {
             StringBuilder K = a.K("Default sample rate is overriden to ");
             K.append(WebRtcAudioUtils.getDefaultSampleRateHz());
             K.append(" Hz");
-            Logging.d("WebRtcAudioManager", K.toString());
+            Logging.d(TAG, K.toString());
             return WebRtcAudioUtils.getDefaultSampleRateHz();
         } else {
             int sampleRateForApiLevel = getSampleRateForApiLevel();
-            Logging.d("WebRtcAudioManager", "Sample rate is set to " + sampleRateForApiLevel + " Hz");
+            Logging.d(TAG, "Sample rate is set to " + sampleRateForApiLevel + " Hz");
             return sampleRateForApiLevel;
         }
     }
@@ -198,20 +199,20 @@ public class WebRtcAudioManager {
     private boolean init() {
         StringBuilder K = a.K("init");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("WebRtcAudioManager", K.toString());
+        Logging.d(TAG, K.toString());
         if (this.initialized) {
             return true;
         }
         StringBuilder K2 = a.K("audio mode is: ");
         K2.append(WebRtcAudioUtils.modeToString(this.audioManager.getMode()));
-        Logging.d("WebRtcAudioManager", K2.toString());
+        Logging.d(TAG, K2.toString());
         this.initialized = true;
         this.volumeLogger.start();
         return true;
     }
 
     private boolean isAAudioSupported() {
-        Logging.w("WebRtcAudioManager", "AAudio support is currently disabled on all devices!");
+        Logging.w(TAG, "AAudio support is currently disabled on all devices!");
         return false;
     }
 
@@ -226,7 +227,7 @@ public class WebRtcAudioManager {
     private boolean isDeviceBlacklistedForOpenSLESUsage() {
         boolean deviceIsBlacklistedForOpenSLESUsage = blacklistDeviceForOpenSLESUsageIsOverridden ? blacklistDeviceForOpenSLESUsage : WebRtcAudioUtils.deviceIsBlacklistedForOpenSLESUsage();
         if (deviceIsBlacklistedForOpenSLESUsage) {
-            Logging.d("WebRtcAudioManager", Build.MODEL + " is blacklisted for OpenSL ES usage!");
+            Logging.d(TAG, Build.MODEL + " is blacklisted for OpenSL ES usage!");
         }
         return deviceIsBlacklistedForOpenSLESUsage;
     }
@@ -254,14 +255,14 @@ public class WebRtcAudioManager {
 
     public static synchronized void setStereoInput(boolean z2) {
         synchronized (WebRtcAudioManager.class) {
-            Logging.w("WebRtcAudioManager", "Overriding default input behavior: setStereoInput(" + z2 + ')');
+            Logging.w(TAG, "Overriding default input behavior: setStereoInput(" + z2 + ')');
             useStereoInput = z2;
         }
     }
 
     public static synchronized void setStereoOutput(boolean z2) {
         synchronized (WebRtcAudioManager.class) {
-            Logging.w("WebRtcAudioManager", "Overriding default output behavior: setStereoOutput(" + z2 + ')');
+            Logging.w(TAG, "Overriding default output behavior: setStereoOutput(" + z2 + ')');
             useStereoOutput = z2;
         }
     }
diff --git a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioRecord.java b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioRecord.java
index b38d4f39d8..3a8eb594f0 100644
--- a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioRecord.java
+++ b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioRecord.java
@@ -49,7 +49,7 @@ public class WebRtcAudioRecord {
         @Override // java.lang.Thread, java.lang.Runnable
         public void run() {
             Process.setThreadPriority(-19);
-            Logging.d("WebRtcAudioRecord", "AudioRecordThread" + WebRtcAudioUtils.getThreadInfo());
+            Logging.d(WebRtcAudioRecord.TAG, "AudioRecordThread" + WebRtcAudioUtils.getThreadInfo());
             WebRtcAudioRecord.access$100(WebRtcAudioRecord.access$000(WebRtcAudioRecord.this).getRecordingState() == 3);
             System.nanoTime();
             while (this.keepAlive) {
@@ -68,7 +68,7 @@ public class WebRtcAudioRecord {
                     }
                 } else {
                     String str = "AudioRecord.read failed: " + read;
-                    Logging.e("WebRtcAudioRecord", str);
+                    Logging.e(WebRtcAudioRecord.TAG, str);
                     if (read == -3) {
                         this.keepAlive = false;
                         WebRtcAudioRecord.access$900(WebRtcAudioRecord.this, str);
@@ -82,12 +82,12 @@ public class WebRtcAudioRecord {
             } catch (IllegalStateException e) {
                 StringBuilder K = a.K("AudioRecord.stop failed: ");
                 K.append(e.getMessage());
-                Logging.e("WebRtcAudioRecord", K.toString());
+                Logging.e(WebRtcAudioRecord.TAG, K.toString());
             }
         }
 
         public void stopThread() {
-            Logging.d("WebRtcAudioRecord", "stopThread");
+            Logging.d(WebRtcAudioRecord.TAG, "stopThread");
             this.keepAlive = false;
         }
     }
@@ -143,7 +143,7 @@ public class WebRtcAudioRecord {
     public WebRtcAudioRecord(long j) {
         StringBuilder K = a.K("ctor");
         K.append(WebRtcAudioUtils.getThreadInfo());
-        Logging.d("WebRtcAudioRecord", K.toString());
+        Logging.d(TAG, K.toString());
         this.nativeAudioRecord = j;
     }
 
@@ -194,22 +194,22 @@ public class WebRtcAudioRecord {
     }
 
     private boolean enableBuiltInAEC(boolean z2) {
-        Logging.d("WebRtcAudioRecord", "enableBuiltInAEC(" + z2 + ')');
+        Logging.d(TAG, "enableBuiltInAEC(" + z2 + ')');
         WebRtcAudioEffects webRtcAudioEffects = this.effects;
         if (webRtcAudioEffects != null) {
             return webRtcAudioEffects.setAEC(z2);
         }
-        Logging.e("WebRtcAudioRecord", "Built-in AEC is not supported on this platform");
+        Logging.e(TAG, "Built-in AEC is not supported on this platform");
         return false;
     }
 
     private boolean enableBuiltInNS(boolean z2) {
-        Logging.d("WebRtcAudioRecord", "enableBuiltInNS(" + z2 + ')');
+        Logging.d(TAG, "enableBuiltInNS(" + z2 + ')');
         WebRtcAudioEffects webRtcAudioEffects = this.effects;
         if (webRtcAudioEffects != null) {
             return webRtcAudioEffects.setNS(z2);
         }
-        Logging.e("WebRtcAudioRecord", "Built-in NS is not supported on this platform");
+        Logging.e(TAG, "Built-in NS is not supported on this platform");
         return false;
     }
 
@@ -218,7 +218,7 @@ public class WebRtcAudioRecord {
     }
 
     private int initRecording(int i, int i2) {
-        Logging.d("WebRtcAudioRecord", a.n("initRecording(sampleRate=", i, ", channels=", i2, ")"));
+        Logging.d(TAG, a.n("initRecording(sampleRate=", i, ", channels=", i2, ")"));
         if (this.audioRecord != null) {
             reportWebRtcAudioRecordInitError("InitRecording called twice without StopRecording.");
             return -1;
@@ -227,7 +227,7 @@ public class WebRtcAudioRecord {
         this.byteBuffer = ByteBuffer.allocateDirect(i2 * 2 * i3);
         StringBuilder K = a.K("byteBuffer.capacity: ");
         K.append(this.byteBuffer.capacity());
-        Logging.d("WebRtcAudioRecord", K.toString());
+        Logging.d(TAG, K.toString());
         this.emptyBytes = new byte[this.byteBuffer.capacity()];
         nativeCacheDirectBufferAddress(this.byteBuffer, this.nativeAudioRecord);
         int channelCountToConfiguration = channelCountToConfiguration(i2);
@@ -236,9 +236,9 @@ public class WebRtcAudioRecord {
             reportWebRtcAudioRecordInitError(a.j("AudioRecord.getMinBufferSize failed: ", minBufferSize));
             return -1;
         }
-        Logging.d("WebRtcAudioRecord", "AudioRecord.getMinBufferSize: " + minBufferSize);
+        Logging.d(TAG, "AudioRecord.getMinBufferSize: " + minBufferSize);
         int max = Math.max(minBufferSize * 2, this.byteBuffer.capacity());
-        Logging.d("WebRtcAudioRecord", "bufferSizeInBytes: " + max);
+        Logging.d(TAG, "bufferSizeInBytes: " + max);
         try {
             AudioRecord audioRecord = new AudioRecord(audioSource, i, channelCountToConfiguration, 2, max);
             this.audioRecord = audioRecord;
@@ -270,14 +270,14 @@ public class WebRtcAudioRecord {
         K.append(this.audioRecord.getChannelCount());
         K.append(", sample rate: ");
         K.append(this.audioRecord.getSampleRate());
-        Logging.d("WebRtcAudioRecord", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     private void logMainParametersExtended() {
         if (Build.VERSION.SDK_INT >= 23) {
             StringBuilder K = a.K("AudioRecord: buffer size in frames: ");
             K.append(this.audioRecord.getBufferSizeInFrames());
-            Logging.d("WebRtcAudioRecord", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
@@ -286,7 +286,7 @@ public class WebRtcAudioRecord {
     private native void nativeDataIsRecorded(int i, long j);
 
     private void releaseAudioResources() {
-        Logging.d("WebRtcAudioRecord", "releaseAudioResources");
+        Logging.d(TAG, "releaseAudioResources");
         AudioRecord audioRecord = this.audioRecord;
         if (audioRecord != null) {
             audioRecord.release();
@@ -295,8 +295,8 @@ public class WebRtcAudioRecord {
     }
 
     private void reportWebRtcAudioRecordError(String str) {
-        Logging.e("WebRtcAudioRecord", "Run-time recording error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioRecord");
+        Logging.e(TAG, "Run-time recording error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG);
         WebRtcAudioRecordErrorCallback webRtcAudioRecordErrorCallback = errorCallback;
         if (webRtcAudioRecordErrorCallback != null) {
             webRtcAudioRecordErrorCallback.onWebRtcAudioRecordError(str);
@@ -304,8 +304,8 @@ public class WebRtcAudioRecord {
     }
 
     private void reportWebRtcAudioRecordInitError(String str) {
-        Logging.e("WebRtcAudioRecord", "Init recording error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioRecord");
+        Logging.e(TAG, "Init recording error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG);
         WebRtcAudioRecordErrorCallback webRtcAudioRecordErrorCallback = errorCallback;
         if (webRtcAudioRecordErrorCallback != null) {
             webRtcAudioRecordErrorCallback.onWebRtcAudioRecordInitError(str);
@@ -313,8 +313,8 @@ public class WebRtcAudioRecord {
     }
 
     private void reportWebRtcAudioRecordStartError(AudioRecordStartErrorCode audioRecordStartErrorCode, String str) {
-        Logging.e("WebRtcAudioRecord", "Start recording error: " + audioRecordStartErrorCode + ". " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioRecord");
+        Logging.e(TAG, "Start recording error: " + audioRecordStartErrorCode + ". " + str);
+        WebRtcAudioUtils.logAudioState(TAG);
         WebRtcAudioRecordErrorCallback webRtcAudioRecordErrorCallback = errorCallback;
         if (webRtcAudioRecordErrorCallback != null) {
             webRtcAudioRecordErrorCallback.onWebRtcAudioRecordStartError(audioRecordStartErrorCode, str);
@@ -323,18 +323,18 @@ public class WebRtcAudioRecord {
 
     public static synchronized void setAudioSource(int i) {
         synchronized (WebRtcAudioRecord.class) {
-            Logging.w("WebRtcAudioRecord", "Audio source is changed from: " + audioSource + " to " + i);
+            Logging.w(TAG, "Audio source is changed from: " + audioSource + " to " + i);
             audioSource = i;
         }
     }
 
     public static void setErrorCallback(WebRtcAudioRecordErrorCallback webRtcAudioRecordErrorCallback) {
-        Logging.d("WebRtcAudioRecord", "Set error callback");
+        Logging.d(TAG, "Set error callback");
         errorCallback = webRtcAudioRecordErrorCallback;
     }
 
     public static void setMicrophoneMute(boolean z2) {
-        Logging.w("WebRtcAudioRecord", "setMicrophoneMute(" + z2 + ")");
+        Logging.w(TAG, "setMicrophoneMute(" + z2 + ")");
         microphoneMute = z2;
     }
 
@@ -344,7 +344,7 @@ public class WebRtcAudioRecord {
 
     private boolean startRecording() {
         try {
-            Logging.d("WebRtcAudioRecord", "startRecording");
+            Logging.d(TAG, "startRecording");
             try {
                 assertTrue(this.audioRecord != null);
                 try {
@@ -366,26 +366,26 @@ public class WebRtcAudioRecord {
                         return false;
                     }
                 } catch (Throwable th) {
-                    Logging.e("WebRtcAudioRecord", "WebrtcAudioRecord.startRecording: audioThread != null!", th);
+                    Logging.e(TAG, "WebrtcAudioRecord.startRecording: audioThread != null!", th);
                     throw th;
                 }
             } catch (Throwable th2) {
-                Logging.e("WebRtcAudioRecord", "WebrtcAudioRecord.startRecording: audioRecord == null!", th2);
+                Logging.e(TAG, "WebrtcAudioRecord.startRecording: audioRecord == null!", th2);
                 throw th2;
             }
         } catch (Throwable th3) {
-            Logging.e("WebRtcAudioRecord", "WebrtcAudioRecord.startRecording fail hard!", th3);
+            Logging.e(TAG, "WebrtcAudioRecord.startRecording fail hard!", th3);
             throw th3;
         }
     }
 
     private boolean stopRecording() {
-        Logging.d("WebRtcAudioRecord", "stopRecording");
+        Logging.d(TAG, "stopRecording");
         assertTrue(this.audioThread != null);
         this.audioThread.stopThread();
-        if (!ThreadUtils.joinUninterruptibly(this.audioThread, 2000)) {
-            Logging.e("WebRtcAudioRecord", "Join of AudioRecordJavaThread timed out");
-            WebRtcAudioUtils.logAudioState("WebRtcAudioRecord");
+        if (!ThreadUtils.joinUninterruptibly(this.audioThread, AUDIO_RECORD_THREAD_JOIN_TIMEOUT_MS)) {
+            Logging.e(TAG, "Join of AudioRecordJavaThread timed out");
+            WebRtcAudioUtils.logAudioState(TAG);
         }
         this.audioThread = null;
         WebRtcAudioEffects webRtcAudioEffects = this.effects;
diff --git a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioTrack.java b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioTrack.java
index a066624c44..6eca9c12f4 100644
--- a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioTrack.java
+++ b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioTrack.java
@@ -12,6 +12,7 @@ import c.d.b.a.a;
 import java.nio.ByteBuffer;
 import org.webrtc.ContextUtils;
 import org.webrtc.Logging;
+import org.webrtc.MediaStreamTrack;
 import org.webrtc.ThreadUtils;
 public class WebRtcAudioTrack {
     private static final long AUDIO_TRACK_THREAD_JOIN_TIMEOUT_MS = 2000;
@@ -27,7 +28,7 @@ public class WebRtcAudioTrack {
     private static WebRtcAudioTrackErrorCallback errorCallbackOld;
     private static volatile boolean speakerMute;
     private static int usageAttribute;
-    private final AudioManager audioManager = ((AudioManager) ContextUtils.getApplicationContext().getSystemService("audio"));
+    private final AudioManager audioManager = ((AudioManager) ContextUtils.getApplicationContext().getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND));
     @Nullable
     private AudioTrackThread audioThread;
     @Nullable
@@ -57,7 +58,7 @@ public class WebRtcAudioTrack {
         @Override // java.lang.Thread, java.lang.Runnable
         public void run() {
             Process.setThreadPriority(-19);
-            Logging.d("WebRtcAudioTrack", "AudioTrackThread" + WebRtcAudioUtils.getThreadInfo());
+            Logging.d(WebRtcAudioTrack.TAG, "AudioTrackThread" + WebRtcAudioUtils.getThreadInfo());
             WebRtcAudioTrack.access$100(WebRtcAudioTrack.access$000(WebRtcAudioTrack.this).getPlayState() == 3);
             int capacity = WebRtcAudioTrack.access$200(WebRtcAudioTrack.this).capacity();
             while (this.keepAlive) {
@@ -71,7 +72,7 @@ public class WebRtcAudioTrack {
                 }
                 int writeBytes = writeBytes(WebRtcAudioTrack.access$000(WebRtcAudioTrack.this), WebRtcAudioTrack.access$200(WebRtcAudioTrack.this), capacity);
                 if (writeBytes != capacity) {
-                    Logging.e("WebRtcAudioTrack", "AudioTrack.write played invalid number of bytes: " + writeBytes);
+                    Logging.e(WebRtcAudioTrack.TAG, "AudioTrack.write played invalid number of bytes: " + writeBytes);
                     if (writeBytes < 0) {
                         this.keepAlive = false;
                         WebRtcAudioTrack webRtcAudioTrack2 = WebRtcAudioTrack.this;
@@ -81,20 +82,20 @@ public class WebRtcAudioTrack {
                 WebRtcAudioTrack.access$200(WebRtcAudioTrack.this).rewind();
             }
             if (WebRtcAudioTrack.access$000(WebRtcAudioTrack.this) != null) {
-                Logging.d("WebRtcAudioTrack", "Calling AudioTrack.stop...");
+                Logging.d(WebRtcAudioTrack.TAG, "Calling AudioTrack.stop...");
                 try {
                     WebRtcAudioTrack.access$000(WebRtcAudioTrack.this).stop();
-                    Logging.d("WebRtcAudioTrack", "AudioTrack.stop is done.");
+                    Logging.d(WebRtcAudioTrack.TAG, "AudioTrack.stop is done.");
                 } catch (IllegalStateException e) {
                     StringBuilder K = a.K("AudioTrack.stop failed: ");
                     K.append(e.getMessage());
-                    Logging.e("WebRtcAudioTrack", K.toString());
+                    Logging.e(WebRtcAudioTrack.TAG, K.toString());
                 }
             }
         }
 
         public void stopThread() {
-            Logging.d("WebRtcAudioTrack", "stopThread");
+            Logging.d(WebRtcAudioTrack.TAG, "stopThread");
             this.keepAlive = false;
         }
     }
@@ -126,7 +127,7 @@ public class WebRtcAudioTrack {
         ThreadUtils.ThreadChecker threadChecker = new ThreadUtils.ThreadChecker();
         this.threadChecker = threadChecker;
         threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrack", "ctor" + WebRtcAudioUtils.getThreadInfo());
+        Logging.d(TAG, "ctor" + WebRtcAudioUtils.getThreadInfo());
         this.nativeAudioTrack = j;
         this.useMediaTrack = z2;
     }
@@ -175,16 +176,16 @@ public class WebRtcAudioTrack {
 
     @TargetApi(21)
     private static AudioTrack createAudioTrackOnLollipopOrHigher(int i, int i2, int i3, boolean z2) {
-        Logging.d("WebRtcAudioTrack", "createAudioTrackOnLollipopOrHigher");
+        Logging.d(TAG, "createAudioTrackOnLollipopOrHigher");
         int nativeOutputSampleRate = AudioTrack.getNativeOutputSampleRate(getAudioManagerStreamType(z2));
-        Logging.d("WebRtcAudioTrack", "nativeOutputSampleRate: " + nativeOutputSampleRate);
+        Logging.d(TAG, "nativeOutputSampleRate: " + nativeOutputSampleRate);
         if (i != nativeOutputSampleRate) {
-            Logging.w("WebRtcAudioTrack", "Unable to use fast mode since requested sample rate is not native");
+            Logging.w(TAG, "Unable to use fast mode since requested sample rate is not native");
         }
         if (usageAttribute != DEFAULT_USAGE) {
             StringBuilder K = a.K("A non default usage attribute is used: ");
             K.append(usageAttribute);
-            Logging.w("WebRtcAudioTrack", K.toString());
+            Logging.w(TAG, K.toString());
         }
         int i4 = 1;
         AudioAttributes.Builder usage = new AudioAttributes.Builder().setUsage(z2 ? 1 : usageAttribute);
@@ -219,30 +220,30 @@ public class WebRtcAudioTrack {
 
     private int getStreamMaxVolume() {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrack", "getStreamMaxVolume");
+        Logging.d(TAG, "getStreamMaxVolume");
         assertTrue(this.audioManager != null);
         return this.audioManager.getStreamMaxVolume(getAudioManagerStreamType());
     }
 
     private int getStreamVolume() {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrack", "getStreamVolume");
+        Logging.d(TAG, "getStreamVolume");
         assertTrue(this.audioManager != null);
         return this.audioManager.getStreamVolume(getAudioManagerStreamType());
     }
 
     private int initPlayout(int i, int i2, double d) {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrack", "initPlayout(sampleRate=" + i + ", channels=" + i2 + ", bufferSizeFactor=" + d + ")");
+        Logging.d(TAG, "initPlayout(sampleRate=" + i + ", channels=" + i2 + ", bufferSizeFactor=" + d + ")");
         this.byteBuffer = ByteBuffer.allocateDirect((i / 100) * i2 * 2);
         StringBuilder K = a.K("byteBuffer.capacity: ");
         K.append(this.byteBuffer.capacity());
-        Logging.d("WebRtcAudioTrack", K.toString());
+        Logging.d(TAG, K.toString());
         this.emptyBytes = new byte[this.byteBuffer.capacity()];
         nativeCacheDirectBufferAddress(this.byteBuffer, this.nativeAudioTrack);
         int channelCountToConfiguration = channelCountToConfiguration(i2);
         int minBufferSize = (int) (((double) AudioTrack.getMinBufferSize(i, channelCountToConfiguration, 2)) * d);
-        Logging.d("WebRtcAudioTrack", "minBufferSizeInBytes: " + minBufferSize);
+        Logging.d(TAG, "minBufferSizeInBytes: " + minBufferSize);
         if (minBufferSize < this.byteBuffer.capacity()) {
             reportWebRtcAudioTrackInitError("AudioTrack.getMinBufferSize returns an invalid value.");
             return -1;
@@ -277,7 +278,7 @@ public class WebRtcAudioTrack {
         if (Build.VERSION.SDK_INT >= 24) {
             StringBuilder K = a.K("AudioTrack: buffer capacity in frames: ");
             K.append(this.audioTrack.getBufferCapacityInFrames());
-            Logging.d("WebRtcAudioTrack", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
@@ -285,7 +286,7 @@ public class WebRtcAudioTrack {
         if (Build.VERSION.SDK_INT >= 23) {
             StringBuilder K = a.K("AudioTrack: buffer size in frames: ");
             K.append(this.audioTrack.getBufferSizeInFrames());
-            Logging.d("WebRtcAudioTrack", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
@@ -298,7 +299,7 @@ public class WebRtcAudioTrack {
         K.append(this.audioTrack.getSampleRate());
         K.append(", max gain: ");
         K.append(AudioTrack.getMaxVolume());
-        Logging.d("WebRtcAudioTrack", K.toString());
+        Logging.d(TAG, K.toString());
     }
 
     private void logMainParametersExtended() {
@@ -310,7 +311,7 @@ public class WebRtcAudioTrack {
         if (Build.VERSION.SDK_INT >= 24) {
             StringBuilder K = a.K("underrun count: ");
             K.append(this.audioTrack.getUnderrunCount());
-            Logging.d("WebRtcAudioTrack", K.toString());
+            Logging.d(TAG, K.toString());
         }
     }
 
@@ -319,7 +320,7 @@ public class WebRtcAudioTrack {
     private native void nativeGetPlayoutData(int i, long j);
 
     private void releaseAudioResources() {
-        Logging.d("WebRtcAudioTrack", "releaseAudioResources");
+        Logging.d(TAG, "releaseAudioResources");
         AudioTrack audioTrack = this.audioTrack;
         if (audioTrack != null) {
             audioTrack.release();
@@ -328,8 +329,8 @@ public class WebRtcAudioTrack {
     }
 
     private void reportWebRtcAudioTrackError(String str) {
-        Logging.e("WebRtcAudioTrack", "Run-time playback error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioTrack");
+        Logging.e(TAG, "Run-time playback error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG);
         WebRtcAudioTrackErrorCallback webRtcAudioTrackErrorCallback = errorCallbackOld;
         if (webRtcAudioTrackErrorCallback != null) {
             webRtcAudioTrackErrorCallback.onWebRtcAudioTrackError(str);
@@ -341,8 +342,8 @@ public class WebRtcAudioTrack {
     }
 
     private void reportWebRtcAudioTrackInitError(String str) {
-        Logging.e("WebRtcAudioTrack", "Init playout error: " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioTrack");
+        Logging.e(TAG, "Init playout error: " + str);
+        WebRtcAudioUtils.logAudioState(TAG);
         WebRtcAudioTrackErrorCallback webRtcAudioTrackErrorCallback = errorCallbackOld;
         if (webRtcAudioTrackErrorCallback != null) {
             webRtcAudioTrackErrorCallback.onWebRtcAudioTrackInitError(str);
@@ -354,8 +355,8 @@ public class WebRtcAudioTrack {
     }
 
     private void reportWebRtcAudioTrackStartError(AudioTrackStartErrorCode audioTrackStartErrorCode, String str) {
-        Logging.e("WebRtcAudioTrack", "Start playout error: " + audioTrackStartErrorCode + ". " + str);
-        WebRtcAudioUtils.logAudioState("WebRtcAudioTrack");
+        Logging.e(TAG, "Start playout error: " + audioTrackStartErrorCode + ". " + str);
+        WebRtcAudioUtils.logAudioState(TAG);
         WebRtcAudioTrackErrorCallback webRtcAudioTrackErrorCallback = errorCallbackOld;
         if (webRtcAudioTrackErrorCallback != null) {
             webRtcAudioTrackErrorCallback.onWebRtcAudioTrackStartError(str);
@@ -368,33 +369,33 @@ public class WebRtcAudioTrack {
 
     public static synchronized void setAudioTrackUsageAttribute(int i) {
         synchronized (WebRtcAudioTrack.class) {
-            Logging.w("WebRtcAudioTrack", "Default usage attribute is changed from: " + DEFAULT_USAGE + " to " + i);
+            Logging.w(TAG, "Default usage attribute is changed from: " + DEFAULT_USAGE + " to " + i);
             usageAttribute = i;
         }
     }
 
     public static void setErrorCallback(ErrorCallback errorCallback2) {
-        Logging.d("WebRtcAudioTrack", "Set extended error callback");
+        Logging.d(TAG, "Set extended error callback");
         errorCallback = errorCallback2;
     }
 
     @Deprecated
     public static void setErrorCallback(WebRtcAudioTrackErrorCallback webRtcAudioTrackErrorCallback) {
-        Logging.d("WebRtcAudioTrack", "Set error callback (deprecated");
+        Logging.d(TAG, "Set error callback (deprecated");
         errorCallbackOld = webRtcAudioTrackErrorCallback;
     }
 
     public static void setSpeakerMute(boolean z2) {
-        Logging.w("WebRtcAudioTrack", "setSpeakerMute(" + z2 + ")");
+        Logging.w(TAG, "setSpeakerMute(" + z2 + ")");
         speakerMute = z2;
     }
 
     private boolean setStreamVolume(int i) {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrack", "setStreamVolume(" + i + ")");
+        Logging.d(TAG, "setStreamVolume(" + i + ")");
         assertTrue(this.audioManager != null);
         if (isVolumeFixed()) {
-            Logging.e("WebRtcAudioTrack", "The device implements a fixed volume policy.");
+            Logging.e(TAG, "The device implements a fixed volume policy.");
             return false;
         }
         this.audioManager.setStreamVolume(getAudioManagerStreamType(), i, 0);
@@ -404,7 +405,7 @@ public class WebRtcAudioTrack {
     private boolean startPlayout() {
         try {
             this.threadChecker.checkIsOnValidThread();
-            Logging.d("WebRtcAudioTrack", "startPlayout");
+            Logging.d(TAG, "startPlayout");
             try {
                 assertTrue(this.audioTrack != null);
                 try {
@@ -428,32 +429,32 @@ public class WebRtcAudioTrack {
                         return false;
                     }
                 } catch (Throwable th) {
-                    Logging.e("WebRtcAudioTrack", "startPlayout: audioThread != null!", th);
+                    Logging.e(TAG, "startPlayout: audioThread != null!", th);
                     throw th;
                 }
             } catch (Throwable th2) {
-                Logging.e("WebRtcAudioTrack", "startPlayout: audioTrack == null!", th2);
+                Logging.e(TAG, "startPlayout: audioTrack == null!", th2);
                 throw th2;
             }
         } catch (Throwable th3) {
-            Logging.e("WebRtcAudioTrack", "WebRtcAudioTrack.startPlayout fail hard!", th3);
+            Logging.e(TAG, "WebRtcAudioTrack.startPlayout fail hard!", th3);
             throw th3;
         }
     }
 
     private boolean stopPlayout() {
         this.threadChecker.checkIsOnValidThread();
-        Logging.d("WebRtcAudioTrack", "stopPlayout");
+        Logging.d(TAG, "stopPlayout");
         assertTrue(this.audioThread != null);
         logUnderrunCount();
         this.audioThread.stopThread();
-        Logging.d("WebRtcAudioTrack", "Stopping the AudioTrackThread...");
+        Logging.d(TAG, "Stopping the AudioTrackThread...");
         this.audioThread.interrupt();
-        if (!ThreadUtils.joinUninterruptibly(this.audioThread, 2000)) {
-            Logging.e("WebRtcAudioTrack", "Join of AudioTrackThread timed out.");
-            WebRtcAudioUtils.logAudioState("WebRtcAudioTrack");
+        if (!ThreadUtils.joinUninterruptibly(this.audioThread, AUDIO_TRACK_THREAD_JOIN_TIMEOUT_MS)) {
+            Logging.e(TAG, "Join of AudioTrackThread timed out.");
+            WebRtcAudioUtils.logAudioState(TAG);
         }
-        Logging.d("WebRtcAudioTrack", "AudioTrackThread has now been stopped.");
+        Logging.d(TAG, "AudioTrackThread has now been stopped.");
         this.audioThread = null;
         releaseAudioResources();
         return true;
diff --git a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioUtils.java b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioUtils.java
index c777d7185f..ac5aa94684 100644
--- a/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioUtils.java
+++ b/app/src/main/java/org/webrtc/voiceengine/WebRtcAudioUtils.java
@@ -8,6 +8,7 @@ import java.util.Arrays;
 import java.util.List;
 import org.webrtc.ContextUtils;
 import org.webrtc.Logging;
+import org.webrtc.MediaStreamTrack;
 public final class WebRtcAudioUtils {
     private static final String[] BLACKLISTED_AEC_MODELS = new String[0];
     private static final String[] BLACKLISTED_NS_MODELS = new String[0];
@@ -161,7 +162,7 @@ public final class WebRtcAudioUtils {
 
     public static void logAudioState(String str) {
         logDeviceInfo(str);
-        AudioManager audioManager = (AudioManager) ContextUtils.getApplicationContext().getSystemService("audio");
+        AudioManager audioManager = (AudioManager) ContextUtils.getApplicationContext().getSystemService(MediaStreamTrack.AUDIO_TRACK_KIND);
         logAudioStateBasic(str, audioManager);
         logAudioStateVolume(str, audioManager);
         logAudioDeviceInfo(str, audioManager);
@@ -258,7 +259,7 @@ public final class WebRtcAudioUtils {
 
     public static synchronized void setWebRtcBasedAutomaticGainControl(boolean z2) {
         synchronized (WebRtcAudioUtils.class) {
-            Logging.w("WebRtcAudioUtils", "setWebRtcBasedAutomaticGainControl() is deprecated");
+            Logging.w(TAG, "setWebRtcBasedAutomaticGainControl() is deprecated");
         }
     }
 
@@ -276,7 +277,7 @@ public final class WebRtcAudioUtils {
         boolean z2;
         synchronized (WebRtcAudioUtils.class) {
             if (useWebRtcBasedAcousticEchoCanceler) {
-                Logging.w("WebRtcAudioUtils", "Overriding default behavior; now using WebRTC AEC!");
+                Logging.w(TAG, "Overriding default behavior; now using WebRTC AEC!");
             }
             z2 = useWebRtcBasedAcousticEchoCanceler;
         }
@@ -293,7 +294,7 @@ public final class WebRtcAudioUtils {
         boolean z2;
         synchronized (WebRtcAudioUtils.class) {
             if (useWebRtcBasedNoiseSuppressor) {
-                Logging.w("WebRtcAudioUtils", "Overriding default behavior; now using WebRTC NS!");
+                Logging.w(TAG, "Overriding default behavior; now using WebRTC NS!");
             }
             z2 = useWebRtcBasedNoiseSuppressor;
         }
diff --git a/app/src/main/java/rx/Subscriber.java b/app/src/main/java/rx/Subscriber.java
index e3aba75ca5..9bbef409fe 100644
--- a/app/src/main/java/rx/Subscriber.java
+++ b/app/src/main/java/rx/Subscriber.java
@@ -1,5 +1,6 @@
 package rx;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import j0.g;
 import rx.internal.util.SubscriptionList;
@@ -32,7 +33,7 @@ public abstract class Subscriber<T> implements g<T>, Subscription {
         }
         long j3 = j2 + j;
         if (j3 < 0) {
-            this.requested = Long.MAX_VALUE;
+            this.requested = RecyclerView.FOREVER_NS;
         } else {
             this.requested = j3;
         }
@@ -78,7 +79,7 @@ public abstract class Subscriber<T> implements g<T>, Subscription {
         if (z2) {
             subscriber.setProducer(producer);
         } else if (j == Long.MIN_VALUE) {
-            producer.j(Long.MAX_VALUE);
+            producer.j(RecyclerView.FOREVER_NS);
         } else {
             producer.j(j);
         }
diff --git a/app/src/main/java/s/a/a/k.java b/app/src/main/java/s/a/a/k.java
index 1bdab7fd08..af55ce0b39 100644
--- a/app/src/main/java/s/a/a/k.java
+++ b/app/src/main/java/s/a/a/k.java
@@ -1,5 +1,6 @@
 package s.a.a;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.z.d.m;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
@@ -198,6 +199,6 @@ public class k {
     }
 
     public String toString() {
-        return getClass().getSimpleName() + '@' + Integer.toHexString(System.identityHashCode(this));
+        return getClass().getSimpleName() + MentionUtilsKt.MENTIONS_CHAR + Integer.toHexString(System.identityHashCode(this));
     }
 }
diff --git a/app/src/main/java/s/a/a/p.java b/app/src/main/java/s/a/a/p.java
index 4a73315a9f..7a9974837a 100644
--- a/app/src/main/java/s/a/a/p.java
+++ b/app/src/main/java/s/a/a/p.java
@@ -1,11 +1,12 @@
 package s.a.a;
 
 import c.q.a.k.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: Atomic.kt */
 public abstract class p {
     public abstract Object a(Object obj);
 
     public String toString() {
-        return getClass().getSimpleName() + '@' + a.u(this);
+        return getClass().getSimpleName() + MentionUtilsKt.MENTIONS_CHAR + a.u(this);
     }
 }
diff --git a/app/src/main/java/s/a/a1.java b/app/src/main/java/s/a/a1.java
index 442b9cea0a..60e9564d6e 100644
--- a/app/src/main/java/s/a/a1.java
+++ b/app/src/main/java/s/a/a1.java
@@ -1,6 +1,7 @@
 package s.a;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: CancellableContinuationImpl.kt */
@@ -29,7 +30,7 @@ public final class a1 extends i {
     public String toString() {
         StringBuilder K = a.K("InvokeOnCancel[");
         K.append(c.q.a.k.a.r(this.i));
-        K.append('@');
+        K.append(MentionUtilsKt.MENTIONS_CHAR);
         K.append(c.q.a.k.a.u(this));
         K.append(']');
         return K.toString();
diff --git a/app/src/main/java/s/a/b1.java b/app/src/main/java/s/a/b1.java
index 58afb703e2..98bfc4cd3a 100644
--- a/app/src/main/java/s/a/b1.java
+++ b/app/src/main/java/s/a/b1.java
@@ -1,6 +1,7 @@
 package s.a;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -37,7 +38,7 @@ public final class b1 extends d1<Job> {
     public String toString() {
         StringBuilder K = a.K("InvokeOnCancelling[");
         K.append(b1.class.getSimpleName());
-        K.append('@');
+        K.append(MentionUtilsKt.MENTIONS_CHAR);
         K.append(c.q.a.k.a.u(this));
         K.append(']');
         return K.toString();
diff --git a/app/src/main/java/s/a/b2/a.java b/app/src/main/java/s/a/b2/a.java
index f3788230a1..1d32165b12 100644
--- a/app/src/main/java/s/a/b2/a.java
+++ b/app/src/main/java/s/a/b2/a.java
@@ -1,6 +1,9 @@
 package s.a.b2;
 
+import androidx.recyclerview.widget.RecyclerView;
 import c.c.a.y.b;
+import com.discord.api.permission.Permission;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.c0.c;
 import d0.d0.f;
 import d0.z.d.m;
@@ -168,7 +171,7 @@ public final class a implements Executor, Closeable {
                 return null;
             }
             int b = b(i2);
-            long j2 = Long.MAX_VALUE;
+            long j2 = RecyclerView.FOREVER_NS;
             for (int i3 = 0; i3 < i2; i3++) {
                 b++;
                 if (b > i2) {
@@ -223,7 +226,7 @@ public final class a implements Executor, Closeable {
                     }
                 }
             }
-            if (j2 == Long.MAX_VALUE) {
+            if (j2 == RecyclerView.FOREVER_NS) {
                 j2 = 0;
             }
             this.m = j2;
@@ -290,7 +293,7 @@ public final class a implements Executor, Closeable {
                                         j = aVar3.parkedWorkersStack;
                                         i2 = this.indexInArray;
                                         this.nextParkedWorker = aVar3.o.get((int) (j & 2097151));
-                                    } while (!a.i.compareAndSet(aVar3, j, ((long) i2) | ((2097152 + j) & -2097152)));
+                                    } while (!a.i.compareAndSet(aVar3, j, ((long) i2) | ((Permission.SPEAK + j) & -2097152)));
                                 }
                             }
                         } else if (!z2) {
@@ -506,7 +509,7 @@ public final class a implements Executor, Closeable {
             z3 = false;
         }
         if (b.j.s() != 0) {
-            long addAndGet = j.addAndGet(this, 2097152);
+            long addAndGet = j.addAndGet(this, Permission.SPEAK);
             if (!z3 && !w() && !t(addAndGet)) {
                 w();
             }
@@ -540,7 +543,7 @@ public final class a implements Executor, Closeable {
         while (true) {
             long j2 = this.parkedWorkersStack;
             int i4 = (int) (2097151 & j2);
-            long j3 = (2097152 + j2) & -2097152;
+            long j3 = (Permission.SPEAK + j2) & -2097152;
             if (i4 == i2) {
                 i4 = i3 == 0 ? f(aVar) : i3;
             }
@@ -611,7 +614,7 @@ public final class a implements Executor, Closeable {
             }
         }
         long j2 = this.controlState;
-        return this.f2915s + '@' + c.q.a.k.a.u(this) + "[Pool Size {core = " + this.p + ", max = " + this.q + "}, Worker States {CPU = " + i2 + ", blocking = " + i3 + ", parked = " + i4 + ", dormant = " + i5 + ", terminated = " + i6 + "}, running workers queues = " + arrayList + ", global CPU queue size = " + this.m.c() + ", global blocking queue size = " + this.n.c() + ", Control State {created workers= " + ((int) (2097151 & j2)) + ", blocking tasks = " + ((int) ((4398044413952L & j2) >> 21)) + ", CPUs acquired = " + (this.p - ((int) ((9223367638808264704L & j2) >> 42))) + "}]";
+        return this.f2915s + MentionUtilsKt.MENTIONS_CHAR + c.q.a.k.a.u(this) + "[Pool Size {core = " + this.p + ", max = " + this.q + "}, Worker States {CPU = " + i2 + ", blocking = " + i3 + ", parked = " + i4 + ", dormant = " + i5 + ", terminated = " + i6 + "}, running workers queues = " + arrayList + ", global CPU queue size = " + this.m.c() + ", global blocking queue size = " + this.n.c() + ", Control State {created workers= " + ((int) (2097151 & j2)) + ", blocking tasks = " + ((int) ((4398044413952L & j2) >> 21)) + ", CPUs acquired = " + (this.p - ((int) ((9223367638808264704L & j2) >> 42))) + "}]";
     }
 
     public final boolean w() {
@@ -619,7 +622,7 @@ public final class a implements Executor, Closeable {
             long j2 = this.parkedWorkersStack;
             C0343a aVar = this.o.get((int) (2097151 & j2));
             if (aVar != null) {
-                long j3 = (2097152 + j2) & -2097152;
+                long j3 = (Permission.SPEAK + j2) & -2097152;
                 int f = f(aVar);
                 if (f >= 0 && i.compareAndSet(this, j2, ((long) f) | j3)) {
                     aVar.nextParkedWorker = l;
diff --git a/app/src/main/java/s/a/b2/j.java b/app/src/main/java/s/a/b2/j.java
index 04e389a1e6..1c13e0e2d0 100644
--- a/app/src/main/java/s/a/b2/j.java
+++ b/app/src/main/java/s/a/b2/j.java
@@ -1,6 +1,7 @@
 package s.a.b2;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 /* compiled from: Tasks.kt */
 public final class j extends h {
     public final Runnable k;
@@ -23,7 +24,7 @@ public final class j extends h {
     public String toString() {
         StringBuilder K = a.K("Task[");
         K.append(c.q.a.k.a.r(this.k));
-        K.append('@');
+        K.append(MentionUtilsKt.MENTIONS_CHAR);
         K.append(c.q.a.k.a.u(this.k));
         K.append(", ");
         K.append(this.i);
diff --git a/app/src/main/java/s/a/c0.java b/app/src/main/java/s/a/c0.java
index c99031b8da..dc729b8379 100644
--- a/app/src/main/java/s/a/c0.java
+++ b/app/src/main/java/s/a/c0.java
@@ -1,5 +1,6 @@
 package s.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import d0.d0.f;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
@@ -78,9 +79,9 @@ public final class c0 extends q0 implements Runnable {
                 while (true) {
                     Thread.interrupted();
                     long V = V();
-                    if (V == Long.MAX_VALUE) {
+                    if (V == RecyclerView.FOREVER_NS) {
                         long nanoTime = System.nanoTime();
-                        if (j == Long.MAX_VALUE) {
+                        if (j == RecyclerView.FOREVER_NS) {
                             j = n + nanoTime;
                         }
                         long j2 = j - nanoTime;
diff --git a/app/src/main/java/s/a/c1.java b/app/src/main/java/s/a/c1.java
index e56db98889..6cd3fb7c7b 100644
--- a/app/src/main/java/s/a/c1.java
+++ b/app/src/main/java/s/a/c1.java
@@ -1,6 +1,7 @@
 package s.a;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import kotlinx.coroutines.Job;
@@ -32,7 +33,7 @@ public final class c1 extends f1<Job> {
     public String toString() {
         StringBuilder K = a.K("InvokeOnCompletion[");
         K.append(c1.class.getSimpleName());
-        K.append('@');
+        K.append(MentionUtilsKt.MENTIONS_CHAR);
         K.append(c.q.a.k.a.u(this));
         K.append(']');
         return K.toString();
diff --git a/app/src/main/java/s/a/g1.java b/app/src/main/java/s/a/g1.java
index a1b2b02102..e75c7e98d6 100644
--- a/app/src/main/java/s/a/g1.java
+++ b/app/src/main/java/s/a/g1.java
@@ -1,5 +1,6 @@
 package s.a;
 
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.l;
 import d0.w.h.a.e;
 import d0.z.d.m;
@@ -903,7 +904,7 @@ public class g1 implements Job, q, o1 {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(N() + '{' + T(F()) + '}');
-        sb.append('@');
+        sb.append(MentionUtilsKt.MENTIONS_CHAR);
         sb.append(c.q.a.k.a.u(this));
         return sb.toString();
     }
diff --git a/app/src/main/java/s/a/k1.java b/app/src/main/java/s/a/k1.java
index 6af56f42aa..ea52d6dfb4 100644
--- a/app/src/main/java/s/a/k1.java
+++ b/app/src/main/java/s/a/k1.java
@@ -1,6 +1,7 @@
 package s.a;
 
 import c.q.a.k.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import kotlinx.coroutines.CoroutineDispatcher;
 import s.a.a.n;
 /* compiled from: MainCoroutineDispatcher.kt */
@@ -31,6 +32,6 @@ public abstract class k1 extends CoroutineDispatcher {
         if (I != null) {
             return I;
         }
-        return getClass().getSimpleName() + '@' + a.u(this);
+        return getClass().getSimpleName() + MentionUtilsKt.MENTIONS_CHAR + a.u(this);
     }
 }
diff --git a/app/src/main/java/s/a/p0.java b/app/src/main/java/s/a/p0.java
index 168c26a93c..8fb33629e7 100644
--- a/app/src/main/java/s/a/p0.java
+++ b/app/src/main/java/s/a/p0.java
@@ -1,5 +1,6 @@
 package s.a;
 
+import com.discord.api.permission.Permission;
 import d0.t.j;
 import java.util.Objects;
 import kotlinx.coroutines.CoroutineDispatcher;
@@ -19,7 +20,10 @@ public abstract class p0 extends CoroutineDispatcher {
     }
 
     public final long I(boolean z2) {
-        return z2 ? 4294967296L : 1;
+        if (z2) {
+            return Permission.REQUEST_TO_SPEAK;
+        }
+        return 1;
     }
 
     public final void K(i0<?> i0Var) {
diff --git a/app/src/main/java/s/a/q0.java b/app/src/main/java/s/a/q0.java
index 9bb6e4210a..f589ae3a92 100644
--- a/app/src/main/java/s/a/q0.java
+++ b/app/src/main/java/s/a/q0.java
@@ -1,5 +1,6 @@
 package s.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import d0.d0.f;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.concurrent.locks.LockSupport;
@@ -281,7 +282,7 @@ public abstract class q0 extends r0 implements g0 {
                         if (obj2 != s0.b) {
                             return 0;
                         }
-                        return Long.MAX_VALUE;
+                        return RecyclerView.FOREVER_NS;
                     } else if (!((m) obj2).c()) {
                         return 0;
                     }
@@ -296,7 +297,7 @@ public abstract class q0 extends r0 implements g0 {
                         return f.coerceAtLeast(cVar3.k - System.nanoTime(), 0);
                     }
                 }
-                return Long.MAX_VALUE;
+                return RecyclerView.FOREVER_NS;
             }
         }
         j = Long.MAX_VALUE;
diff --git a/app/src/main/java/s/a/s0.java b/app/src/main/java/s/a/s0.java
index f1a3581c3e..6e2be17de8 100644
--- a/app/src/main/java/s/a/s0.java
+++ b/app/src/main/java/s/a/s0.java
@@ -1,5 +1,6 @@
 package s.a;
 
+import androidx.recyclerview.widget.RecyclerView;
 import s.a.a.t;
 /* compiled from: EventLoop.common.kt */
 public final class s0 {
@@ -10,9 +11,6 @@ public final class s0 {
         if (j <= 0) {
             return 0;
         }
-        if (j >= 9223372036854L) {
-            return Long.MAX_VALUE;
-        }
-        return 1000000 * j;
+        return j >= 9223372036854L ? RecyclerView.FOREVER_NS : 1000000 * j;
     }
 }
diff --git a/app/src/main/java/s/a/z1/c.java b/app/src/main/java/s/a/z1/c.java
index f3435b7e5a..52924cd967 100644
--- a/app/src/main/java/s/a/z1/c.java
+++ b/app/src/main/java/s/a/z1/c.java
@@ -1,6 +1,7 @@
 package s.a.z1;
 
 import c.q.a.k.a;
+import com.discord.widgets.chat.input.MentionUtilsKt;
 import d0.b;
 import d0.z.d.m;
 import java.util.ArrayList;
@@ -121,7 +122,7 @@ public abstract class c<E> implements l<E> {
         String str2;
         StringBuilder sb = new StringBuilder();
         sb.append(getClass().getSimpleName());
-        sb.append('@');
+        sb.append(MentionUtilsKt.MENTIONS_CHAR);
         sb.append(a.u(this));
         sb.append('{');
         k j = this.a.j();
diff --git a/app/src/main/java/x/a/a/a.java b/app/src/main/java/x/a/a/a.java
index a9360d82ac..89c55e5515 100644
--- a/app/src/main/java/x/a/a/a.java
+++ b/app/src/main/java/x/a/a/a.java
@@ -41,7 +41,7 @@ public interface a extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsCallback");
+                    obtain.writeInterfaceToken(AbstractBinderC0346a.DESCRIPTOR);
                     obtain.writeString(str);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -67,7 +67,7 @@ public interface a extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsCallback");
+                    obtain.writeInterfaceToken(AbstractBinderC0346a.DESCRIPTOR);
                     obtain.writeString(str);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -94,7 +94,7 @@ public interface a extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsCallback");
+                    obtain.writeInterfaceToken(AbstractBinderC0346a.DESCRIPTOR);
                     if (bundle != null) {
                         obtain.writeInt(1);
                         bundle.writeToParcel(obtain, 0);
@@ -119,7 +119,7 @@ public interface a extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsCallback");
+                    obtain.writeInterfaceToken(AbstractBinderC0346a.DESCRIPTOR);
                     obtain.writeInt(i);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -145,7 +145,7 @@ public interface a extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsCallback");
+                    obtain.writeInterfaceToken(AbstractBinderC0346a.DESCRIPTOR);
                     obtain.writeString(str);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -171,7 +171,7 @@ public interface a extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsCallback");
+                    obtain.writeInterfaceToken(AbstractBinderC0346a.DESCRIPTOR);
                     obtain.writeInt(i);
                     if (uri != null) {
                         obtain.writeInt(1);
@@ -201,14 +201,14 @@ public interface a extends IInterface {
         }
 
         public AbstractBinderC0346a() {
-            attachInterface(this, "android.support.customtabs.ICustomTabsCallback");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static a asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("android.support.customtabs.ICustomTabsCallback");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof a)) ? new C0347a(iBinder) : (a) queryLocalInterface;
         }
 
@@ -239,7 +239,7 @@ public interface a extends IInterface {
                 Bundle bundle = null;
                 switch (i) {
                     case 2:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsCallback");
+                        parcel.enforceInterface(DESCRIPTOR);
                         int readInt = parcel.readInt();
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -248,7 +248,7 @@ public interface a extends IInterface {
                         parcel2.writeNoException();
                         return true;
                     case 3:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsCallback");
+                        parcel.enforceInterface(DESCRIPTOR);
                         String readString = parcel.readString();
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -257,7 +257,7 @@ public interface a extends IInterface {
                         parcel2.writeNoException();
                         return true;
                     case 4:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsCallback");
+                        parcel.enforceInterface(DESCRIPTOR);
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
                         }
@@ -265,7 +265,7 @@ public interface a extends IInterface {
                         parcel2.writeNoException();
                         return true;
                     case 5:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsCallback");
+                        parcel.enforceInterface(DESCRIPTOR);
                         String readString2 = parcel.readString();
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -274,7 +274,7 @@ public interface a extends IInterface {
                         parcel2.writeNoException();
                         return true;
                     case 6:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsCallback");
+                        parcel.enforceInterface(DESCRIPTOR);
                         int readInt2 = parcel.readInt();
                         Uri uri = parcel.readInt() != 0 ? (Uri) Uri.CREATOR.createFromParcel(parcel) : null;
                         if (parcel.readInt() != 0) {
@@ -287,7 +287,7 @@ public interface a extends IInterface {
                         parcel2.writeNoException();
                         return true;
                     case 7:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsCallback");
+                        parcel.enforceInterface(DESCRIPTOR);
                         String readString3 = parcel.readString();
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -305,7 +305,7 @@ public interface a extends IInterface {
                         return super.onTransact(i, parcel, parcel2, i2);
                 }
             } else {
-                parcel2.writeString("android.support.customtabs.ICustomTabsCallback");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/java/x/a/a/b.java b/app/src/main/java/x/a/a/b.java
index 29027cb16f..41511ff810 100644
--- a/app/src/main/java/x/a/a/b.java
+++ b/app/src/main/java/x/a/a/b.java
@@ -47,7 +47,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeString(str);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -74,7 +74,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     boolean z2 = true;
                     if (uri != null) {
@@ -111,7 +111,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     boolean z2 = false;
                     if (!this.b.transact(3, obtain, obtain2, 0) && a.getDefaultImpl() != null) {
@@ -135,7 +135,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     boolean z2 = true;
                     if (bundle != null) {
@@ -165,7 +165,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     obtain.writeString(str);
                     if (bundle != null) {
@@ -193,7 +193,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     boolean z2 = true;
                     if (uri != null) {
@@ -230,7 +230,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     boolean z2 = true;
                     if (uri != null) {
@@ -260,7 +260,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     boolean z2 = true;
                     if (uri != null) {
@@ -296,7 +296,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     boolean z2 = true;
                     if (bundle != null) {
@@ -326,7 +326,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     obtain.writeInt(i);
                     boolean z2 = true;
@@ -363,7 +363,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.ICustomTabsService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeLong(j);
                     boolean z2 = false;
                     if (!this.b.transact(2, obtain, obtain2, 0) && a.getDefaultImpl() != null) {
@@ -384,14 +384,14 @@ public interface b extends IInterface {
         }
 
         public a() {
-            attachInterface(this, "android.support.customtabs.ICustomTabsService");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static b asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("android.support.customtabs.ICustomTabsService");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof b)) ? new C0348a(iBinder) : (b) queryLocalInterface;
         }
 
@@ -429,19 +429,19 @@ public interface b extends IInterface {
                 Bundle bundle8 = null;
                 switch (i) {
                     case 2:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         boolean warmup = warmup(parcel.readLong());
                         parcel2.writeNoException();
                         parcel2.writeInt(warmup ? 1 : 0);
                         return true;
                     case 3:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         boolean newSession = newSession(a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder()));
                         parcel2.writeNoException();
                         parcel2.writeInt(newSession ? 1 : 0);
                         return true;
                     case 4:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         Uri uri2 = parcel.readInt() != 0 ? (Uri) Uri.CREATOR.createFromParcel(parcel) : null;
                         if (parcel.readInt() != 0) {
@@ -452,7 +452,7 @@ public interface b extends IInterface {
                         parcel2.writeInt(mayLaunchUrl ? 1 : 0);
                         return true;
                     case 5:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         String readString = parcel.readString();
                         if (parcel.readInt() != 0) {
                             bundle8 = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -467,7 +467,7 @@ public interface b extends IInterface {
                         }
                         return true;
                     case 6:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface2 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         if (parcel.readInt() != 0) {
                             bundle7 = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -477,7 +477,7 @@ public interface b extends IInterface {
                         parcel2.writeInt(updateVisuals ? 1 : 0);
                         return true;
                     case 7:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface3 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         if (parcel.readInt() != 0) {
                             uri = (Uri) Uri.CREATOR.createFromParcel(parcel);
@@ -487,7 +487,7 @@ public interface b extends IInterface {
                         parcel2.writeInt(requestPostMessageChannel ? 1 : 0);
                         return true;
                     case 8:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface4 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         String readString2 = parcel.readString();
                         if (parcel.readInt() != 0) {
@@ -498,7 +498,7 @@ public interface b extends IInterface {
                         parcel2.writeInt(postMessage);
                         return true;
                     case 9:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface5 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         int readInt = parcel.readInt();
                         Uri uri3 = parcel.readInt() != 0 ? (Uri) Uri.CREATOR.createFromParcel(parcel) : null;
@@ -510,7 +510,7 @@ public interface b extends IInterface {
                         parcel2.writeInt(validateRelationship ? 1 : 0);
                         return true;
                     case 10:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface6 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         if (parcel.readInt() != 0) {
                             bundle4 = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -520,7 +520,7 @@ public interface b extends IInterface {
                         parcel2.writeInt(newSessionWithExtras ? 1 : 0);
                         return true;
                     case 11:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface7 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         Uri uri4 = parcel.readInt() != 0 ? (Uri) Uri.CREATOR.createFromParcel(parcel) : null;
                         if (parcel.readInt() != 0) {
@@ -531,7 +531,7 @@ public interface b extends IInterface {
                         parcel2.writeInt(requestPostMessageChannelWithExtras ? 1 : 0);
                         return true;
                     case 12:
-                        parcel.enforceInterface("android.support.customtabs.ICustomTabsService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         a asInterface8 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                         Uri uri5 = parcel.readInt() != 0 ? (Uri) Uri.CREATOR.createFromParcel(parcel) : null;
                         int readInt2 = parcel.readInt();
@@ -546,7 +546,7 @@ public interface b extends IInterface {
                         return super.onTransact(i, parcel, parcel2, i2);
                 }
             } else {
-                parcel2.writeString("android.support.customtabs.ICustomTabsService");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/java/x/a/a/c.java b/app/src/main/java/x/a/a/c.java
index 5f89ae5e66..f5a0c1377a 100644
--- a/app/src/main/java/x/a/a/c.java
+++ b/app/src/main/java/x/a/a/c.java
@@ -36,7 +36,7 @@ public interface c extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.IPostMessageService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -62,7 +62,7 @@ public interface c extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.IPostMessageService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeStrongBinder(aVar != null ? aVar.asBinder() : null);
                     obtain.writeString(str);
                     if (bundle != null) {
@@ -86,14 +86,14 @@ public interface c extends IInterface {
         }
 
         public a() {
-            attachInterface(this, "android.support.customtabs.IPostMessageService");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static c asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("android.support.customtabs.IPostMessageService");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof c)) ? new C0349a(iBinder) : (c) queryLocalInterface;
         }
 
@@ -121,7 +121,7 @@ public interface c extends IInterface {
         public boolean onTransact(int i, Parcel parcel, Parcel parcel2, int i2) throws RemoteException {
             Bundle bundle = null;
             if (i == 2) {
-                parcel.enforceInterface("android.support.customtabs.IPostMessageService");
+                parcel.enforceInterface(DESCRIPTOR);
                 a asInterface = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                 if (parcel.readInt() != 0) {
                     bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -130,7 +130,7 @@ public interface c extends IInterface {
                 parcel2.writeNoException();
                 return true;
             } else if (i == 3) {
-                parcel.enforceInterface("android.support.customtabs.IPostMessageService");
+                parcel.enforceInterface(DESCRIPTOR);
                 a asInterface2 = a.AbstractBinderC0346a.asInterface(parcel.readStrongBinder());
                 String readString = parcel.readString();
                 if (parcel.readInt() != 0) {
@@ -142,7 +142,7 @@ public interface c extends IInterface {
             } else if (i != 1598968902) {
                 return super.onTransact(i, parcel, parcel2, i2);
             } else {
-                parcel2.writeString("android.support.customtabs.IPostMessageService");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/java/x/a/a/d/a.java b/app/src/main/java/x/a/a/d/a.java
index 945abfb2c7..90f5a39bab 100644
--- a/app/src/main/java/x/a/a/d/a.java
+++ b/app/src/main/java/x/a/a/d/a.java
@@ -35,7 +35,7 @@ public interface a extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityCallback");
+                    obtain.writeInterfaceToken(AbstractBinderC0350a.DESCRIPTOR);
                     obtain.writeString(str);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -58,14 +58,14 @@ public interface a extends IInterface {
         }
 
         public AbstractBinderC0350a() {
-            attachInterface(this, "android.support.customtabs.trusted.ITrustedWebActivityCallback");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static a asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("android.support.customtabs.trusted.ITrustedWebActivityCallback");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof a)) ? new C0351a(iBinder) : (a) queryLocalInterface;
         }
 
@@ -92,14 +92,14 @@ public interface a extends IInterface {
         @Override // android.os.Binder
         public boolean onTransact(int i, Parcel parcel, Parcel parcel2, int i2) throws RemoteException {
             if (i == 2) {
-                parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityCallback");
+                parcel.enforceInterface(DESCRIPTOR);
                 onExtraCallback(parcel.readString(), parcel.readInt() != 0 ? (Bundle) Bundle.CREATOR.createFromParcel(parcel) : null);
                 parcel2.writeNoException();
                 return true;
             } else if (i != 1598968902) {
                 return super.onTransact(i, parcel, parcel2, i2);
             } else {
-                parcel2.writeString("android.support.customtabs.trusted.ITrustedWebActivityCallback");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/java/x/a/a/d/b.java b/app/src/main/java/x/a/a/d/b.java
index 3785d99a32..0625b44ebb 100644
--- a/app/src/main/java/x/a/a/d/b.java
+++ b/app/src/main/java/x/a/a/d/b.java
@@ -35,7 +35,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     if (bundle != null) {
                         obtain.writeInt(1);
                         bundle.writeToParcel(obtain, 0);
@@ -66,7 +66,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     if (bundle != null) {
                         obtain.writeInt(1);
                         bundle.writeToParcel(obtain, 0);
@@ -91,7 +91,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     obtain.writeString(str);
                     if (bundle != null) {
                         obtain.writeInt(1);
@@ -119,7 +119,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     if (!this.b.transact(5, obtain, obtain2, 0) && a.getDefaultImpl() != null) {
                         return a.getDefaultImpl().getActiveNotifications();
                     }
@@ -139,7 +139,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     if (!this.b.transact(7, obtain, obtain2, 0) && a.getDefaultImpl() != null) {
                         return a.getDefaultImpl().getSmallIconBitmap();
                     }
@@ -159,7 +159,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     if (!this.b.transact(4, obtain, obtain2, 0) && a.getDefaultImpl() != null) {
                         return a.getDefaultImpl().getSmallIconId();
                     }
@@ -179,7 +179,7 @@ public interface b extends IInterface {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.customtabs.trusted.ITrustedWebActivityService");
+                    obtain.writeInterfaceToken(a.DESCRIPTOR);
                     if (bundle != null) {
                         obtain.writeInt(1);
                         bundle.writeToParcel(obtain, 0);
@@ -202,14 +202,14 @@ public interface b extends IInterface {
         }
 
         public a() {
-            attachInterface(this, "android.support.customtabs.trusted.ITrustedWebActivityService");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static b asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof b)) ? new C0352a(iBinder) : (b) queryLocalInterface;
         }
 
@@ -237,7 +237,7 @@ public interface b extends IInterface {
         public boolean onTransact(int i, Parcel parcel, Parcel parcel2, int i2) throws RemoteException {
             Bundle bundle = null;
             if (i == 9) {
-                parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+                parcel.enforceInterface(DESCRIPTOR);
                 String readString = parcel.readString();
                 if (parcel.readInt() != 0) {
                     bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
@@ -254,7 +254,7 @@ public interface b extends IInterface {
             } else if (i != 1598968902) {
                 switch (i) {
                     case 2:
-                        parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
                         }
@@ -268,7 +268,7 @@ public interface b extends IInterface {
                         }
                         return true;
                     case 3:
-                        parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
                         }
@@ -276,13 +276,13 @@ public interface b extends IInterface {
                         parcel2.writeNoException();
                         return true;
                     case 4:
-                        parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         int smallIconId = getSmallIconId();
                         parcel2.writeNoException();
                         parcel2.writeInt(smallIconId);
                         return true;
                     case 5:
-                        parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         Bundle activeNotifications = getActiveNotifications();
                         parcel2.writeNoException();
                         if (activeNotifications != null) {
@@ -293,7 +293,7 @@ public interface b extends IInterface {
                         }
                         return true;
                     case 6:
-                        parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
                         }
@@ -307,7 +307,7 @@ public interface b extends IInterface {
                         }
                         return true;
                     case 7:
-                        parcel.enforceInterface("android.support.customtabs.trusted.ITrustedWebActivityService");
+                        parcel.enforceInterface(DESCRIPTOR);
                         Bundle smallIconBitmap = getSmallIconBitmap();
                         parcel2.writeNoException();
                         if (smallIconBitmap != null) {
@@ -321,7 +321,7 @@ public interface b extends IInterface {
                         return super.onTransact(i, parcel, parcel2, i2);
                 }
             } else {
-                parcel2.writeString("android.support.customtabs.trusted.ITrustedWebActivityService");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/java/x/a/b/a/a.java b/app/src/main/java/x/a/b/a/a.java
index e4d18a2c9a..101c083eae 100644
--- a/app/src/main/java/x/a/b/a/a.java
+++ b/app/src/main/java/x/a/b/a/a.java
@@ -36,7 +36,7 @@ public interface a extends IInterface {
             public void cancel(String str, int i, String str2) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.v4.app.INotificationSideChannel");
+                    obtain.writeInterfaceToken(AbstractBinderC0353a.DESCRIPTOR);
                     obtain.writeString(str);
                     obtain.writeInt(i);
                     obtain.writeString(str2);
@@ -54,7 +54,7 @@ public interface a extends IInterface {
             public void cancelAll(String str) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.v4.app.INotificationSideChannel");
+                    obtain.writeInterfaceToken(AbstractBinderC0353a.DESCRIPTOR);
                     obtain.writeString(str);
                     if (this.b.transact(3, obtain, null, 1) || AbstractBinderC0353a.getDefaultImpl() == null) {
                         obtain.recycle();
@@ -70,7 +70,7 @@ public interface a extends IInterface {
             public void notify(String str, int i, String str2, Notification notification) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 try {
-                    obtain.writeInterfaceToken("android.support.v4.app.INotificationSideChannel");
+                    obtain.writeInterfaceToken(AbstractBinderC0353a.DESCRIPTOR);
                     obtain.writeString(str);
                     obtain.writeInt(i);
                     obtain.writeString(str2);
@@ -92,14 +92,14 @@ public interface a extends IInterface {
         }
 
         public AbstractBinderC0353a() {
-            attachInterface(this, "android.support.v4.app.INotificationSideChannel");
+            attachInterface(this, DESCRIPTOR);
         }
 
         public static a asInterface(IBinder iBinder) {
             if (iBinder == null) {
                 return null;
             }
-            IInterface queryLocalInterface = iBinder.queryLocalInterface("android.support.v4.app.INotificationSideChannel");
+            IInterface queryLocalInterface = iBinder.queryLocalInterface(DESCRIPTOR);
             return (queryLocalInterface == null || !(queryLocalInterface instanceof a)) ? new C0354a(iBinder) : (a) queryLocalInterface;
         }
 
@@ -123,21 +123,21 @@ public interface a extends IInterface {
         @Override // android.os.Binder
         public boolean onTransact(int i, Parcel parcel, Parcel parcel2, int i2) throws RemoteException {
             if (i == 1) {
-                parcel.enforceInterface("android.support.v4.app.INotificationSideChannel");
+                parcel.enforceInterface(DESCRIPTOR);
                 notify(parcel.readString(), parcel.readInt(), parcel.readString(), parcel.readInt() != 0 ? (Notification) Notification.CREATOR.createFromParcel(parcel) : null);
                 return true;
             } else if (i == 2) {
-                parcel.enforceInterface("android.support.v4.app.INotificationSideChannel");
+                parcel.enforceInterface(DESCRIPTOR);
                 cancel(parcel.readString(), parcel.readInt(), parcel.readString());
                 return true;
             } else if (i == 3) {
-                parcel.enforceInterface("android.support.v4.app.INotificationSideChannel");
+                parcel.enforceInterface(DESCRIPTOR);
                 cancelAll(parcel.readString());
                 return true;
             } else if (i != 1598968902) {
                 return super.onTransact(i, parcel, parcel2, i2);
             } else {
-                parcel2.writeString("android.support.v4.app.INotificationSideChannel");
+                parcel2.writeString(DESCRIPTOR);
                 return true;
             }
         }
diff --git a/app/src/main/res/layout-land/empty_friends_state_view.xml b/app/src/main/res/layout-land/empty_friends_state_view.xml
index 79cafa507a..7824b040e4 100644
--- a/app/src/main/res/layout-land/empty_friends_state_view.xml
+++ b/app/src/main/res/layout-land/empty_friends_state_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:id="@+id/empty_friends_state_title" android:layout_marginBottom="128dp" android:text="@string/friends_empty_state_all" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952001_friendslist_emptystate_title"/>
-    <TextView android:id="@+id/subtitle" android:layout_marginBottom="0dp" android:text="@string/friends_empty_state_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_title" style="@style/res_2131952000_friendslist_emptystate_subtitle"/>
-    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_add_friend" android:layout_marginBottom="64dp" android:text="@string/add_friend" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/res_2131952459_uikit_material_button_fit"/>
+    <TextView android:id="@+id/empty_friends_state_title" android:layout_marginBottom="128dp" android:text="@string/friends_empty_state_all" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/FriendsList_EmptyState_Title"/>
+    <TextView android:id="@+id/subtitle" android:layout_marginBottom="0dp" android:text="@string/friends_empty_state_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_title" style="@style/FriendsList_EmptyState_Subtitle"/>
+    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_add_friend" android:layout_marginBottom="64dp" android:text="@string/add_friend" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/UiKit_Material_Button_Fit"/>
 </merge>
diff --git a/app/src/main/res/layout-land/view_overlay_menu.xml b/app/src/main/res/layout-land/view_overlay_menu.xml
index 048dc5b808..93efae789c 100644
--- a/app/src/main/res/layout-land/view_overlay_menu.xml
+++ b/app/src/main/res/layout-land/view_overlay_menu.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/res_2131951648_apptheme_dark" android:orientation="horizontal" android:clipChildren="false" android:layout_width="300dp" android:layout_height="wrap_content" android:layoutDirection="ltr">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/AppTheme_Dark" android:orientation="horizontal" android:clipChildren="false" android:layout_width="300dp" android:layout_height="wrap_content" android:layoutDirection="ltr">
     <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginRight="8dp" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8dp" app:cardElevation="8dp">
         <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="match_parent">
-            <ImageView android:id="@+id/src_toggle" android:padding="16dp" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1" android:contentDescription="@string/use_speaker" style="@style/res_2131952449_uikit_imageview_clickable"/>
-            <ImageView android:id="@+id/mute_toggle" android:padding="16dp" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1" android:contentDescription="@string/mute" style="@style/res_2131952449_uikit_imageview_clickable"/>
-            <ImageView android:id="@+id/disconnect_btn" android:padding="16dp" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/res_2131952449_uikit_imageview_clickable"/>
+            <ImageView android:id="@+id/src_toggle" android:padding="16dp" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1" android:contentDescription="@string/use_speaker" style="@style/UiKit_ImageView_Clickable"/>
+            <ImageView android:id="@+id/mute_toggle" android:padding="16dp" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1" android:contentDescription="@string/mute" style="@style/UiKit_ImageView_Clickable"/>
+            <ImageView android:id="@+id/disconnect_btn" android:padding="16dp" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/UiKit_ImageView_Clickable"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
     <include android:id="@+id/content" layout="@layout/view_overlay_menu_content"/>
diff --git a/app/src/main/res/layout-v22/bottom_sheet_simple_selector_item.xml b/app/src/main/res/layout-v22/bottom_sheet_simple_selector_item.xml
index 8f02754c51..b908252ffe 100644
--- a/app/src/main/res/layout-v22/bottom_sheet_simple_selector_item.xml
+++ b/app/src/main/res/layout-v22/bottom_sheet_simple_selector_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="12dp">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/select_component_sheet_item_icon" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginStart="16dp" app:actualImageScaleType="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_title" android:layout_width="0dp" android:layout_height="wrap_content" android:drawablePadding="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_description" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952456_uikit_listitem_title"/>
-    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_description" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_title" app:layout_goneMarginTop="0dp" style="@style/res_2131952452_uikit_listitem_description"/>
+    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_title" android:layout_width="0dp" android:layout_height="wrap_content" android:drawablePadding="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_description" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem_Title"/>
+    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_description" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_title" app:layout_goneMarginTop="0dp" style="@style/UiKit_ListItem_Description"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/contact_sync_upsell_sheet.xml b/app/src/main/res/layout-v22/contact_sync_upsell_sheet.xml
index dd1fc3d20d..0e0eb81548 100644
--- a/app/src/main/res/layout-v22/contact_sync_upsell_sheet.xml
+++ b/app/src/main/res/layout-v22/contact_sync_upsell_sheet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_upsell_title" android:layout_marginTop="24dp" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:fontFamily="?attr/font_primary_bold" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_upsell_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_upsell_title" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_upsell_title" android:layout_marginTop="24dp" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:fontFamily="?attr/font_primary_bold" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1"/>
+    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_upsell_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_upsell_title" style="@style/UiKit_TextView_Medium"/>
     <LinearLayout android:orientation="vertical" android:id="@+id/contact_sync_upsell_cta" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0">
         <include android:id="@+id/contact_sync_upsell_toggle_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" layout="@layout/layout_contact_sync_toggle_info"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_upsell_next_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" android:layout_marginHorizontal="16dp" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/contact_sync_upsell_skip_button" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:text="@string/private_channel_add_members_modal_skip" android:layout_marginHorizontal="24dp" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_upsell_next_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" android:layout_marginHorizontal="16dp" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/contact_sync_upsell_skip_button" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:text="@string/private_channel_add_members_modal_skip" android:layout_marginHorizontal="24dp" style="@style/UiKit_Material_Button_Transparent_Fit"/>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/emoji_picker_premium_upsell.xml b/app/src/main/res/layout-v22/emoji_picker_premium_upsell.xml
index 6a05d34115..4d82f481a4 100644
--- a/app/src/main/res/layout-v22/emoji_picker_premium_upsell.xml
+++ b/app/src/main/res/layout-v22/emoji_picker_premium_upsell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:orientation="horizontal" android:background="@drawable/rounded_rectangle_4dp_radius" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:backgroundTint="?attr/colorBackgroundTertiary">
     <ImageView android:layout_width="22dp" android:layout_height="wrap_content" android:layout_margin="12dp" android:src="@drawable/ic_nitro_badge_nitro_gradient_16dp" android:adjustViewBounds="true" android:importantForAccessibility="no"/>
-    <TextView android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_body" android:layout_weight="1" android:lineSpacingMultiplier="1" android:layout_marginEnd="36dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:id="@+id/emojiPickerPremiumCta" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="12dp" android:paddingTop="16dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_cta" android:paddingHorizontal="12dp" android:paddingVertical="16dp" style="@style/res_2131952572_uikit_textview_link"/>
+    <TextView android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_body" android:layout_weight="1" android:lineSpacingMultiplier="1" android:layout_marginEnd="36dp" style="@style/UiKit_TextView"/>
+    <TextView android:id="@+id/emojiPickerPremiumCta" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="12dp" android:paddingTop="16dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_cta" android:paddingHorizontal="12dp" android:paddingVertical="16dp" style="@style/UiKit_TextView_Link"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/empty_friends_state_contact_sync_view.xml b/app/src/main/res/layout-v22/empty_friends_state_contact_sync_view.xml
index c3800e0f02..364ce56f8a 100644
--- a/app/src/main/res/layout-v22/empty_friends_state_contact_sync_view.xml
+++ b/app/src/main/res/layout-v22/empty_friends_state_contact_sync_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@+id/empty_friends_state_cs_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/img_contact_sync_empty_state_upsell" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_cs_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2"/>
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_friends_state_cs_title" android:text="@string/contact_sync_find_friends_title" app:layout_constraintBottom_toTopOf="@+id/cs_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_image" style="@style/res_2131952001_friendslist_emptystate_title"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/cs_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_empty_friends_subtitle" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_cs_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_title" style="@style/res_2131952000_friendslist_emptystate_subtitle"/>
-    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_cs_button" android:text="@string/get_started" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/cs_subtitle" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_friends_state_cs_title" android:text="@string/contact_sync_find_friends_title" app:layout_constraintBottom_toTopOf="@+id/cs_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_image" style="@style/FriendsList_EmptyState_Title"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/cs_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_empty_friends_subtitle" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_cs_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_title" style="@style/FriendsList_EmptyState_Subtitle"/>
+    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_cs_button" android:text="@string/get_started" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/cs_subtitle" style="@style/UiKit_Material_Button"/>
 </merge>
diff --git a/app/src/main/res/layout-v22/expression_picker_header_item.xml b/app/src/main/res/layout-v22/expression_picker_header_item.xml
index 2e020dff53..69aad231b8 100644
--- a/app/src/main/res/layout-v22/expression_picker_header_item.xml
+++ b/app/src/main/res/layout-v22/expression_picker_header_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/header_item_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="4dp" android:paddingTop="4dp" android:paddingRight="4dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:textAllCaps="true" android:paddingHorizontal="4dp" style="@style/res_2131952564_uikit_textview_bold"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/header_item_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="4dp" android:paddingTop="4dp" android:paddingRight="4dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:textAllCaps="true" android:paddingHorizontal="4dp" style="@style/UiKit_TextView_Bold"/>
diff --git a/app/src/main/res/layout-v22/flex_input_widget.xml b/app/src/main/res/layout-v22/flex_input_widget.xml
index 8251e6cc47..f7a4df3f03 100644
--- a/app/src/main/res/layout-v22/flex_input_widget.xml
+++ b/app/src/main/res/layout-v22/flex_input_widget.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:background="?attr/colorBackgroundPrimary" android:animateLayoutChanges="false" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center_vertical" android:id="@+id/attachment_preview_container" android:visibility="gone" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:background="?attr/colorBackgroundPrimary" android:animateLayoutChanges="false" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center_vertical" android:id="@+id/attachment_preview_container" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/attachment_preview_list" android:clipToPadding="false" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" app:layoutManager="LinearLayoutManager"/>
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4dp" style="@style/res_2131951976_flexinput_input_button"/>
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4dp" style="@style/FlexInput_Input_Button"/>
     </LinearLayout>
-    <RelativeLayout android:animateLayoutChanges="true" style="@style/res_2131952589_uikit_viewgroup">
-        <LinearLayout android:id="@+id/left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@+id/expand_btn" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131951975_flexinput_input"/>
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:layout_marginRight="8dp" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_media" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131951975_flexinput_input"/>
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gift_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" android:src="@drawable/ic_gift_24dp" android:contentDescription="@string/premium_gifting_purchase_gift" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131951975_flexinput_input"/>
+    <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup">
+        <LinearLayout android:id="@+id/left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@+id/expand_btn" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?attr/colorInteractiveNormal" style="@style/FlexInput_Input"/>
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:layout_marginRight="8dp" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_media" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/FlexInput_Input"/>
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gift_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" android:src="@drawable/ic_gift_24dp" android:contentDescription="@string/premium_gifting_purchase_gift" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/FlexInput_Input"/>
         </LinearLayout>
-        <LinearLayout android:id="@+id/main_input_container" android:background="@drawable/drawable_flex_input_bg" android:paddingLeft="12dp" android:paddingRight="4dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:layout_toLeftOf="@+id/send_btn_container" android:layout_toRightOf="@+id/left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:textColorHint="?attr/colorTextMuted" android:layout_gravity="center_vertical" android:id="@+id/text_input" android:background="@color/transparent" android:paddingTop="4dp" android:paddingBottom="4dp" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0dp" android:minHeight="40dp" android:maxLines="5" android:layout_weight="1" android:lineSpacingMultiplier="1" android:inputType="text|textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:id="@+id/main_input_container" android:background="@drawable/drawable_flex_input_bg" android:paddingLeft="12dp" android:paddingRight="4dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:layout_toLeftOf="@+id/send_btn_container" android:layout_toRightOf="@+id/left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:textColorHint="?attr/colorTextMuted" android:layout_gravity="center_vertical" android:id="@+id/text_input" android:background="@color/transparent" android:paddingTop="4dp" android:paddingBottom="4dp" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0dp" android:minHeight="40dp" android:maxLines="5" android:layout_weight="1" android:lineSpacingMultiplier="1" android:inputType="text|textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit_TextView"/>
             <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/expression_btn_container" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/expression_btn" android:background="@null" android:padding="8dp" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952447_uikit_imagebutton"/>
+                <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/expression_btn" android:background="@null" android:padding="8dp" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageButton"/>
                 <ImageView android:layout_gravity="bottom|right|center_vertical|center_horizontal|center" android:id="@+id/expression_btn_badge" android:visibility="gone" android:layout_width="7dp" android:layout_height="7dp" android:layout_marginRight="11dp" android:layout_marginBottom="11dp" android:src="@drawable/drawable_circle_red" android:importantForAccessibility="no" app:tint="@color/status_red_500"/>
             </FrameLayout>
         </LinearLayout>
         <FrameLayout android:id="@+id/send_btn_container" android:background="@drawable/drawable_circle_black" android:visibility="gone" android:clipToPadding="false" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?attr/chat_send_btn_bg">
             <ImageView android:layout_gravity="center" android:id="@+id/send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:importantForAccessibility="no" app:tint="?attr/chat_send_btn"/>
         </FrameLayout>
-        <TextView android:gravity="center" android:id="@+id/cannot_send_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="24dp" android:paddingRight="12dp" android:paddingBottom="24dp" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:gravity="center" android:id="@+id/cannot_send_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="24dp" android:paddingRight="12dp" android:paddingBottom="24dp" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit_TextView"/>
     </RelativeLayout>
     <FrameLayout android:id="@+id/expression_tray_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/default_keyboard_height"/>
     <FrameLayout android:id="@+id/default_window_insets_handler" android:visibility="visible" android:layout_width="match_parent" android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout-v22/gif_search_empty_state_text_box_view.xml b/app/src/main/res/layout-v22/gif_search_empty_state_text_box_view.xml
index 837e336721..193d577225 100644
--- a/app/src/main/res/layout-v22/gif_search_empty_state_text_box_view.xml
+++ b/app/src/main/res/layout-v22/gif_search_empty_state_text_box_view.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginTop="4dp" android:layout_marginRight="4dp" android:layout_marginBottom="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" android:layout_marginHorizontal="4dp" android:layout_marginVertical="4dp" android:paddingHorizontal="8dp" android:paddingVertical="4dp" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginTop="4dp" android:layout_marginRight="4dp" android:layout_marginBottom="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" android:layout_marginHorizontal="4dp" android:layout_marginVertical="4dp" android:paddingHorizontal="8dp" android:paddingVertical="4dp" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml b/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml
index 9072640a96..51fd59db87 100644
--- a/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml
+++ b/app/src/main/res/layout-v22/guild_scheduled_event_item_view.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/bg_guild_scheduled_event_list_item" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/guild_scheduled_event_list_item_status_icon" android:layout_width="20dp" android:layout_height="20dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_date_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxLines="1" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
-    <TextView android:textAppearance="@style/res_2131952575_uikit_textview_medium_singleline" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_scheduled_event_list_item_rsvp_text" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:fontFamily="?attr/font_primary_normal" android:backgroundTint="?attr/colorBackgroundSecondary" android:paddingHorizontal="8dp" android:paddingVertical="2dp" app:drawableStartCompat="@drawable/ic_bell_12dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textAppearance="@style/res_2131952579_uikit_textview_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_scheduled_event_list_item_title_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
-    <TextView android:textAppearance="@style/res_2131952579_uikit_textview_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_desc_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:fontFamily="?attr/font_primary_normal" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_title_text"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_date_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxLines="1" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
+    <TextView android:textAppearance="@style/UiKit_TextView_Medium_SingleLine" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_scheduled_event_list_item_rsvp_text" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:fontFamily="?attr/font_primary_normal" android:backgroundTint="?attr/colorBackgroundSecondary" android:paddingHorizontal="8dp" android:paddingVertical="2dp" app:drawableStartCompat="@drawable/ic_bell_12dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
+    <TextView android:textAppearance="@style/UiKit_TextView_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_scheduled_event_list_item_title_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
+    <TextView android:textAppearance="@style/UiKit_TextView_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_desc_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:fontFamily="?attr/font_primary_normal" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_title_text"/>
     <ImageView android:id="@+id/guild_scheduled_event_list_item_channel_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_desc_text" app:srcCompat="@drawable/ic_stage_20dp" app:tint="?attr/colorHeaderSecondary"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_channel_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_channel_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_channel_icon"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_channel_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_channel_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_channel_icon"/>
     <ImageView android:id="@+id/guild_scheduled_event_list_item_bottom_button" android:background="?attr/bg_pressed_highlight" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="16dp" android:contentDescription="@string/stage_instance_interested_label" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_channel_icon" app:srcCompat="@drawable/bg_guild_scheduled_event_list_item_interested_button_default"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:id="@+id/guild_scheduled_event_list_item_bottom_button_text" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_instance_interested_label" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_bell_16dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_bottom_button"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:id="@+id/guild_scheduled_event_list_item_bottom_button_text" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_instance_interested_label" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_bell_16dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_bottom_button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/layout_contact_sync_add_phone.xml b/app/src/main/res/layout-v22/layout_contact_sync_add_phone.xml
index e73935e6ca..8b248ca652 100644
--- a/app/src/main/res/layout-v22/layout_contact_sync_add_phone.xml
+++ b/app/src/main/res/layout-v22/layout_contact_sync_add_phone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingHorizontal="16dp">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_add_phone_title" android:text="@string/contact_sync_enter_phone_number_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_add_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/contact_sync_enter_phone_number_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_title" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_add_phone_title" android:text="@string/contact_sync_enter_phone_number_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_add_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/contact_sync_enter_phone_number_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_title" style="@style/UiKit_TextView"/>
     <com.discord.views.phone.PhoneOrEmailInputView android:id="@+id/contact_sync_add_phone_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" app:force_mode="2" app:hint="@string/phone_verification_phone_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_subtitle"/>
-    <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/contact_sync_add_phone_next" android:text="@string/next" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_input" style="@style/res_2131952585_uikit_user_phone_manage_confirm"/>
+    <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/contact_sync_add_phone_next" android:text="@string/next" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_input" style="@style/UiKit_User_Phone_Manage_Confirm"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/layout_contact_sync_landing.xml b/app/src/main/res/layout-v22/layout_contact_sync_landing.xml
index 2916112d2f..937f2700d5 100644
--- a/app/src/main/res/layout-v22/layout_contact_sync_landing.xml
+++ b/app/src/main/res/layout-v22/layout_contact_sync_landing.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_landing_title" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_landing_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_landing_title" style="@style/res_2131952574_uikit_textview_medium"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_landing_title" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_landing_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_landing_title" style="@style/UiKit_TextView_Medium"/>
     <LinearLayout android:orientation="vertical" android:id="@+id/contact_sync_landing_cta" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_toggle_info" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0">
         <com.discord.views.LoadingButton android:id="@+id/contact_sync_landing_next_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/get_started"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_landing_needs_permissions" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:visibility="gone" android:text="@string/contact_sync_needs_permissions_android" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_landing_needs_permissions" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:visibility="gone" android:text="@string/contact_sync_needs_permissions_android" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" style="@style/UiKit_TextView"/>
         <View android:id="@+id/contact_sync_landing_permissions_divider" android:background="?attr/colorBackgroundAccent" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="16dp"/>
     </LinearLayout>
     <include android:id="@+id/contact_sync_landing_toggle_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:layout_constraintBottom_toBottomOf="0" layout="@layout/layout_contact_sync_toggle_info"/>
diff --git a/app/src/main/res/layout-v22/layout_contact_sync_name_input.xml b/app/src/main/res/layout-v22/layout_contact_sync_name_input.xml
index c15fda5114..d9d3a469a8 100644
--- a/app/src/main/res/layout-v22/layout_contact_sync_name_input.xml
+++ b/app/src/main/res/layout-v22/layout_contact_sync_name_input.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingHorizontal="16dp" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_name_title" android:text="@string/contact_sync_enter_name_title" android:drawablePadding="16dp" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/contact_sync_name_subtitle" android:layout_marginTop="8dp" android:text="@string/contact_sync_enter_name_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_input_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_title" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/contact_sync_name_input_wrap" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:hint="@string/contact_sync_enter_name_input_header" app:endIconMode="2" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_prefill_hint" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_subtitle" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:id="@+id/contact_sync_name_input" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingHorizontal="16dp" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_name_title" android:text="@string/contact_sync_enter_name_title" android:drawablePadding="16dp" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/contact_sync_name_subtitle" android:layout_marginTop="8dp" android:text="@string/contact_sync_enter_name_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_input_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_title" style="@style/UiKit_TextView"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/contact_sync_name_input_wrap" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:hint="@string/contact_sync_enter_name_input_header" app:endIconMode="2" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_prefill_hint" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_subtitle" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:id="@+id/contact_sync_name_input" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
     </com.google.android.material.textfield.TextInputLayout>
-    <TextView android:id="@+id/contact_sync_name_prefill_hint" android:visibility="gone" android:text="@string/contact_sync_enter_name_prefill" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_next_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_input_wrap" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <TextView android:id="@+id/contact_sync_name_prefill_hint" android:visibility="gone" android:text="@string/contact_sync_enter_name_prefill" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_next_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_input_wrap" style="@style/UiKit_TextView_Subtext"/>
     <com.discord.views.LoadingButton android:id="@+id/contact_sync_name_next_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_prefill_hint" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml b/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml
index 0772886629..1ad7598948 100644
--- a/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml
+++ b/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/res_2131952574_uikit_textview_medium"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/UiKit_TextView_Medium"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/UiKit_ViewGroup_RecyclerView"/>
     <com.discord.views.LoadingButton android:id="@+id/contact_sync_suggestions_submit_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/next" app:layout_constraintBottom_toBottomOf="0" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next" app:lb_text_color="?attr/primary_100"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/layout_contact_sync_suggestions_empty.xml b/app/src/main/res/layout-v22/layout_contact_sync_suggestions_empty.xml
index 42eac453da..bd49cd0422 100644
--- a/app/src/main/res/layout-v22/layout_contact_sync_suggestions_empty.xml
+++ b/app/src/main/res/layout-v22/layout_contact_sync_suggestions_empty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_empty_title" android:text="@string/contact_sync_suggestions_empty_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_suggestions_empty_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_suggestions_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_empty_subtitle" android:textAlignment="center" android:paddingHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_invite_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_empty_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_invite_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/invite_friends" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_skip_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952458_uikit_material_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_skip_button" android:layout_marginBottom="8dp" android:text="@string/private_channel_add_members_modal_skip" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_empty_title" android:text="@string/contact_sync_suggestions_empty_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_suggestions_empty_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_suggestions_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_empty_subtitle" android:textAlignment="center" android:paddingHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_invite_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_empty_title" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_invite_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/invite_friends" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_skip_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_skip_button" android:layout_marginBottom="8dp" android:text="@string/private_channel_add_members_modal_skip" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button_Transparent_Fit"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/layout_contact_sync_verify_phone.xml b/app/src/main/res/layout-v22/layout_contact_sync_verify_phone.xml
index 79f4074224..0dda9dae50 100644
--- a/app/src/main/res/layout-v22/layout_contact_sync_verify_phone.xml
+++ b/app/src/main/res/layout-v22/layout_contact_sync_verify_phone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingHorizontal="16dp">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_verify_phone_title" android:text="@string/sms_confirmation_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_verify_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/verification_phone_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_verify_phone_title" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_verify_phone_title" android:text="@string/sms_confirmation_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_verify_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/verification_phone_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_verify_phone_title" style="@style/UiKit_TextView"/>
     <com.discord.views.CodeVerificationView android:id="@+id/contact_sync_verify_phone_code" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_verify_phone_subtitle"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/moderator_start_stage_header_item.xml b/app/src/main/res/layout-v22/moderator_start_stage_header_item.xml
index 6c288a842c..0e820beb13 100644
--- a/app/src/main/res/layout-v22/moderator_start_stage_header_item.xml
+++ b/app/src/main/res/layout-v22/moderator_start_stage_header_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/moderator_start_stage_icon" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/ic_mentions_empty" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" app:layout_constraintWidth_percent="0.33"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="30sp" android:gravity="center" android:id="@+id/moderator_start_stage_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="32dp" android:layout_marginTop="24dp" android:layout_marginRight="32dp" android:text="@string/stage_start_prompt_title_moderator" android:layout_marginHorizontal="32dp" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_icon"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/moderator_start_stage_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/stage_start_prompt_subtitle" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_title" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="30sp" android:gravity="center" android:id="@+id/moderator_start_stage_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="32dp" android:layout_marginTop="24dp" android:layout_marginRight="32dp" android:text="@string/stage_start_prompt_title_moderator" android:layout_marginHorizontal="32dp" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_icon"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/moderator_start_stage_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/stage_start_prompt_subtitle" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_title" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/moderator_start_stage_list_item.xml b/app/src/main/res/layout-v22/moderator_start_stage_list_item.xml
index 11d5551af9..aded0badd4 100644
--- a/app/src/main/res/layout-v22/moderator_start_stage_list_item.xml
+++ b/app/src/main/res/layout-v22/moderator_start_stage_list_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" android:paddingHorizontal="16dp" android:paddingVertical="12dp">
-    <ImageView android:id="@+id/icon_bg" android:layout_width="0dp" android:layout_height="0dp" android:src="@drawable/drawable_uikit_white_circle" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/subtitle" app:layout_constraintDimensionRatio="H,1:1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/title" app:tint="@color/status_green_600" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/icon" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_channel_stage_24dp" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/icon_bg" app:layout_constraintLeft_toLeftOf="@+id/icon_bg" app:layout_constraintRight_toRightOf="@+id/icon_bg" app:layout_constraintTop_toTopOf="@+id/icon_bg" app:tint="@color/white" style="@style/res_2131952448_uikit_imageview"/>
-    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <ImageView android:id="@+id/icon_bg" android:layout_width="0dp" android:layout_height="0dp" android:src="@drawable/drawable_uikit_white_circle" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/subtitle" app:layout_constraintDimensionRatio="H,1:1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/title" app:tint="@color/status_green_600" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/icon" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_channel_stage_24dp" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/icon_bg" app:layout_constraintLeft_toLeftOf="@+id/icon_bg" app:layout_constraintRight_toRightOf="@+id/icon_bg" app:layout_constraintTop_toTopOf="@+id/icon_bg" app:tint="@color/white" style="@style/UiKit_ImageView"/>
+    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_SingleLine"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_TextView_Medium_SingleLine"/>
     <ImageView android:id="@+id/arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_end_24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/overlay_bubble_menu.xml b/app/src/main/res/layout-v22/overlay_bubble_menu.xml
index f1f27defec..d1c2e5079b 100644
--- a/app/src/main/res/layout-v22/overlay_bubble_menu.xml
+++ b/app/src/main/res/layout-v22/overlay_bubble_menu.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/res_2131951648_apptheme_dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layoutDirection="ltr" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/AppTheme_Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layoutDirection="ltr" style="@style/UiKit_ViewGroup_LinearLayout">
     <LinearLayout android:gravity="right|center_vertical|center_horizontal|center" android:orientation="horizontal" android:id="@+id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
         <View android:id="@+id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size"/>
         <View android:background="@color/white_alpha_30" android:layout_width="1dp" android:layout_height="32dp" android:layout_marginLeft="8dp" android:layout_marginRight="8dp"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
-        <TextView android:gravity="center" android:id="@+id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4dp" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/res_2131952566_uikit_textview_h1_bold"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
+        <TextView android:gravity="center" android:id="@+id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4dp" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/UiKit_TextView_H1_Bold"/>
     </LinearLayout>
-    <com.discord.views.OverlayMenuView android:id="@+id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable"/>
+    <com.discord.views.OverlayMenuView android:id="@+id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/shiny_button.xml b/app/src/main/res/layout-v22/shiny_button.xml
index 4a14221579..e2d94ecbd5 100644
--- a/app/src/main/res/layout-v22/shiny_button.xml
+++ b/app/src/main/res/layout-v22/shiny_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <TextView android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textColor="@color/white" android:gravity="center" android:id="@+id/text" android:background="@drawable/drawable_button_green" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:drawablePadding="4dp" android:layout_centerInParent="true" android:paddingHorizontal="16dp" android:paddingVertical="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_white"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Button" android:textColor="@color/white" android:gravity="center" android:id="@+id/text" android:background="@drawable/drawable_button_green" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:drawablePadding="4dp" android:layout_centerInParent="true" android:paddingHorizontal="16dp" android:paddingVertical="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_white"/>
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/premium_shine" android:layout_alignTop="@+id/text" android:layout_alignBottom="@+id/text" android:layout_centerHorizontal="true" android:paddingEnd="24dp" android:layout_alignStart="@+id/text" android:layout_alignEnd="@+id/text"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout-v22/single_value_prop_premium_upsell_dialog.xml b/app/src/main/res/layout-v22/single_value_prop_premium_upsell_dialog.xml
index ddd983f9a3..9ed0101d78 100644
--- a/app/src/main/res/layout-v22/single_value_prop_premium_upsell_dialog.xml
+++ b/app/src/main/res/layout-v22/single_value_prop_premium_upsell_dialog.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="312dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout app:layout_constraintBottom_toTopOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="312dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout app:layout_constraintBottom_toTopOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
         <View android:id="@+id/transparent_space" android:layout_width="match_parent" android:layout_height="64dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
         <View android:id="@+id/content_background" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/transparent_space"/>
-        <ImageView android:layout_gravity="center_horizontal" android:id="@+id/value_prop_image" android:layout_width="224dp" android:layout_height="154dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:layout_marginHorizontal="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_header_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/upsell_header_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="24dp" android:fontFamily="@font/ginto_medium" android:textAlignment="center" android:paddingHorizontal="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_body_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/value_prop_image" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:id="@+id/upsell_body_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="4dp" android:layout_marginBottom="24dp" android:textAlignment="center" android:paddingHorizontal="20dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/upsell_header_text" style="@style/res_2131952563_uikit_textview"/>
+        <ImageView android:layout_gravity="center_horizontal" android:id="@+id/value_prop_image" android:layout_width="224dp" android:layout_height="154dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:layout_marginHorizontal="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_header_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/upsell_header_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="24dp" android:fontFamily="@font/ginto_medium" android:textAlignment="center" android:paddingHorizontal="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_body_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/value_prop_image" style="@style/UiKit_TextView"/>
+        <TextView android:id="@+id/upsell_body_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="4dp" android:layout_marginBottom="24dp" android:textAlignment="center" android:paddingHorizontal="20dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/upsell_header_text" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <LinearLayout android:id="@+id/button_container" style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/close_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <LinearLayout android:id="@+id/button_container" style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/close_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit_Material_Button_Transparent"/>
         <com.discord.views.premium.ShinyButton android:id="@+id/get_premium_button" android:layout_width="wrap_content" android:layout_height="40dp" app:sb_drawable_start="@drawable/ic_nitro_badge_white" app:sb_text="@string/premium_settings_get"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/stage_audience_blocked_bottom_sheet_item.xml b/app/src/main/res/layout-v22/stage_audience_blocked_bottom_sheet_item.xml
index 61b4e4f202..95f06ed9cd 100644
--- a/app/src/main/res/layout-v22/stage_audience_blocked_bottom_sheet_item.xml
+++ b/app/src/main/res/layout-v22/stage_audience_blocked_bottom_sheet_item.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_blocked_member_container" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:paddingHorizontal="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_blocked_member_container" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:paddingHorizontal="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <com.discord.views.CutoutView android:id="@+id/stage_channel_blocked_member_icon_container" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cutout_badgeInset="6dp" app:cutout_badgeRadius="14dp" app:cutout_style="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_blocked_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/res_2131951674_avatar_large"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_blocked_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/Avatar_Large"/>
     </com.discord.views.CutoutView>
     <ImageView android:id="@+id/stage_channel_blocked_member_speaker" android:padding="4dp" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_mic_white_18dp" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintCircle="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintCircleAngle="@integer/uikit_badge_angle" app:layout_constraintCircleRadius="26dp" app:tint="@color/white"/>
-    <TextView android:id="@+id/stage_channel_blocked_member_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_member_speaker" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
-    <TextView android:textColor="@color/status_red_500" android:id="@+id/stage_channel_blocked_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/blocked" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintStart_toStartOf="@+id/stage_channel_blocked_member_name" app:layout_constraintTop_toBottomOf="@+id/stage_channel_blocked_member_name" style="@style/res_2131952574_uikit_textview_medium"/>
-    <View android:id="@+id/stage_channel_blocked_text_divider" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toStartOf="@+id/stage_channel_blocked_text_speaker" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_text" style="@style/res_2131952418_uikit_divider_vertical"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/stage_channel_blocked_text_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speaker" app:layout_constraintBaseline_toBaselineOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text_divider" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <TextView android:id="@+id/stage_channel_blocked_member_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_member_speaker" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Medium_SingleLine"/>
+    <TextView android:textColor="@color/status_red_500" android:id="@+id/stage_channel_blocked_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/blocked" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintStart_toStartOf="@+id/stage_channel_blocked_member_name" app:layout_constraintTop_toBottomOf="@+id/stage_channel_blocked_member_name" style="@style/UiKit_TextView_Medium"/>
+    <View android:id="@+id/stage_channel_blocked_text_divider" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toStartOf="@+id/stage_channel_blocked_text_speaker" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_text" style="@style/UiKit_Divider_Vertical"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/stage_channel_blocked_text_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speaker" app:layout_constraintBaseline_toBaselineOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text_divider" style="@style/UiKit_TextView_Subtext"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/stage_raised_hands_item_user.xml b/app/src/main/res/layout-v22/stage_raised_hands_item_user.xml
index 8ffc1ece1a..68c6dac5be 100644
--- a/app/src/main/res/layout-v22/stage_raised_hands_item_user.xml
+++ b/app/src/main/res/layout-v22/stage_raised_hands_item_user.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" android:paddingVertical="12dp">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_raised_hands_item_user_avatar" android:layout_width="@dimen/avatar_size_raised_hands" android:layout_height="@dimen/avatar_size_raised_hands" app:actualImageScaleType="2" app:fadeDuration="0" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:roundAsCircle="true"/>
-    <TextView android:id="@+id/stage_raised_hands_item_user_name" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/stage_raised_hands_item_role" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toTopOf="@+id/stage_raised_hands_item_user_avatar" style="@style/res_2131952515_uikit_stage_listitem_title"/>
-    <TextView android:id="@+id/stage_raised_hands_item_role" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toBottomOf="@+id/stage_raised_hands_item_user_name" style="@style/res_2131952514_uikit_stage_listitem_subtitle"/>
-    <ImageView android:id="@+id/stage_raised_hands_item_invite_button" android:src="@drawable/ic_check_white_24dp" android:contentDescription="@string/stage_speak_invite_send" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_dismiss_button" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952512_uikit_stage_clickablebutton"/>
-    <ImageView android:id="@+id/stage_raised_hands_item_dismiss_button" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/dismiss" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952512_uikit_stage_clickablebutton"/>
+    <TextView android:id="@+id/stage_raised_hands_item_user_name" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/stage_raised_hands_item_role" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toTopOf="@+id/stage_raised_hands_item_user_avatar" style="@style/UiKit_Stage_ListItem_Title"/>
+    <TextView android:id="@+id/stage_raised_hands_item_role" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toBottomOf="@+id/stage_raised_hands_item_user_name" style="@style/UiKit_Stage_ListItem_Subtitle"/>
+    <ImageView android:id="@+id/stage_raised_hands_item_invite_button" android:src="@drawable/ic_check_white_24dp" android:contentDescription="@string/stage_speak_invite_send" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_dismiss_button" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_ClickableButton"/>
+    <ImageView android:id="@+id/stage_raised_hands_item_dismiss_button" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/dismiss" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_ClickableButton"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/sticker_premium_upsell_dialog.xml b/app/src/main/res/layout-v22/sticker_premium_upsell_dialog.xml
index 46cc2075a8..b09ca5079f 100644
--- a/app/src/main/res/layout-v22/sticker_premium_upsell_dialog.xml
+++ b/app/src/main/res/layout-v22/sticker_premium_upsell_dialog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:layout_gravity="center" android:layout_height="80dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" android:layout_marginVertical="32dp" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/premium_upsell_global_stickers_title_mobile" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/sticker_premium_upsell_description" android:layout_marginBottom="32dp" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/sticker_premium_upsell_subscribe_button" android:layout_marginBottom="16dp" android:text="@string/sticker_picker_premium_empty_state_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952460_uikit_material_button_green"/>
-        <TextView android:id="@+id/sticker_premium_upsell_close_button" android:layout_marginBottom="32dp" android:text="@string/close" style="@style/res_2131952413_uikit_dialog_textview_dismiss"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:layout_gravity="center" android:layout_height="80dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" android:layout_marginVertical="32dp" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/premium_upsell_global_stickers_title_mobile" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/sticker_premium_upsell_description" android:layout_marginBottom="32dp" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/sticker_premium_upsell_subscribe_button" android:layout_marginBottom="16dp" android:text="@string/sticker_picker_premium_empty_state_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green"/>
+        <TextView android:id="@+id/sticker_premium_upsell_close_button" android:layout_marginBottom="32dp" android:text="@string/close" style="@style/UiKit_Dialog_TextView_Dismiss"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout-v22/stub_call_fullscreen_start_stage_event_button.xml b/app/src/main/res/layout-v22/stub_call_fullscreen_start_stage_event_button.xml
index 284fc1907e..961c99577a 100644
--- a/app/src/main/res/layout-v22/stub_call_fullscreen_start_stage_event_button.xml
+++ b/app/src/main/res/layout-v22/stub_call_fullscreen_start_stage_event_button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/bg_start_stage_event_button" android:paddingLeft="16dp" android:paddingTop="13dp" android:paddingRight="16dp" android:paddingBottom="13dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:elevation="16dp" android:layout_marginHorizontal="16dp" android:paddingHorizontal="16dp" android:paddingVertical="13dp">
-    <ImageView android:id="@+id/icon" android:background="@drawable/bg_start_stage_cutout" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_channel_stage_16dp" android:scaleType="centerInside" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="@color/white" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/plus_badge" android:background="@drawable/drawable_circle_black" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_plus_dark_a60_24dp" android:scaleType="centerInside" android:layout_marginStart="16dp" android:backgroundTint="@color/white" app:layout_constraintCircle="@+id/icon" app:layout_constraintCircleAngle="45" app:layout_constraintCircleRadius="22dp" app:tint="@color/black" style="@style/res_2131952448_uikit_imageview"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952574_uikit_textview_medium"/>
+    <ImageView android:id="@+id/icon" android:background="@drawable/bg_start_stage_cutout" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_channel_stage_16dp" android:scaleType="centerInside" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="@color/white" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/plus_badge" android:background="@drawable/drawable_circle_black" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_plus_dark_a60_24dp" android:scaleType="centerInside" android:layout_marginStart="16dp" android:backgroundTint="@color/white" app:layout_constraintCircle="@+id/icon" app:layout_constraintCircleAngle="45" app:layout_constraintCircleRadius="22dp" app:tint="@color/black" style="@style/UiKit_ImageView"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Semibold"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_TextView_Medium"/>
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_end_24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/view_appcommands_optionheading_listitem.xml b/app/src/main/res/layout-v22/view_appcommands_optionheading_listitem.xml
index 61b69e31c6..2a9ef6f954 100644
--- a/app/src/main/res/layout-v22/view_appcommands_optionheading_listitem.xml
+++ b/app/src/main/res/layout-v22/view_appcommands_optionheading_listitem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <View android:id="@+id/divider" android:visibility="visible" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optionheading_title" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optionheading_title" style="@style/res_2131952418_uikit_divider_vertical"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="12sp" android:textColor="?attr/colorTextMuted" android:id="@+id/appcommands_optionheading_title" android:paddingLeft="8dp" android:paddingTop="14dp" android:paddingRight="8dp" android:paddingBottom="14dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:textAllCaps="true" android:paddingHorizontal="8dp" android:paddingVertical="14dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/divider" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <View android:id="@+id/divider" android:visibility="visible" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optionheading_title" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optionheading_title" style="@style/UiKit_Divider_Vertical"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="12sp" android:textColor="?attr/colorTextMuted" android:id="@+id/appcommands_optionheading_title" android:paddingLeft="8dp" android:paddingTop="14dp" android:paddingRight="8dp" android:paddingBottom="14dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:textAllCaps="true" android:paddingHorizontal="8dp" android:paddingVertical="14dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/divider" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/view_appcommands_optionparam_listitem.xml b/app/src/main/res/layout-v22/view_appcommands_optionparam_listitem.xml
index 87e2b49f9c..b701871e01 100644
--- a/app/src/main/res/layout-v22/view_appcommands_optionparam_listitem.xml
+++ b/app/src/main/res/layout-v22/view_appcommands_optionparam_listitem.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <TextView android:id="@+id/appcommands_optiontitle_title" android:background="?attr/colorBackgroundAccent" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginTop="8dp" android:layout_marginRight="4dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="4dp" android:layout_marginVertical="8dp" android:paddingHorizontal="8dp" android:paddingVertical="8dp" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:id="@+id/appcommands_optiontitle_title" android:background="?attr/colorBackgroundAccent" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginTop="8dp" android:layout_marginRight="4dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="4dp" android:layout_marginVertical="8dp" android:paddingHorizontal="8dp" android:paddingVertical="8dp" style="@style/UiKit_TextView"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout-v22/view_appcommands_optiontitle_listitem.xml b/app/src/main/res/layout-v22/view_appcommands_optiontitle_listitem.xml
index 0b059adc1c..35fdf5e28d 100644
--- a/app/src/main/res/layout-v22/view_appcommands_optiontitle_listitem.xml
+++ b/app/src/main/res/layout-v22/view_appcommands_optiontitle_listitem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/appcommands_optiontitle_avatar" android:visibility="visible" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optiontitle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optiontitle" app:placeholderImage="@drawable/ic_slash_command_24dp" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textColor="?attr/colorTextNormal" android:id="@+id/appcommands_optiontitle" android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:paddingStart="12dp" android:paddingEnd="8dp" android:paddingVertical="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/appcommands_optiontitle_avatar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/appcommands_optiontitle_avatar" android:visibility="visible" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optiontitle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optiontitle" app:placeholderImage="@drawable/ic_slash_command_24dp" style="@style/Avatar_Medium"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textColor="?attr/colorTextNormal" android:id="@+id/appcommands_optiontitle" android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:paddingStart="12dp" android:paddingEnd="8dp" android:paddingVertical="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/appcommands_optiontitle_avatar" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/view_chat_upload.xml b/app/src/main/res/layout-v22/view_chat_upload.xml
index 298930ede5..c93cc7f47e 100644
--- a/app/src/main/res/layout-v22/view_chat_upload.xml
+++ b/app/src/main/res/layout-v22/view_chat_upload.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/file_image" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/display_name" app:layout_constraintEnd_toStartOf="@+id/display_name" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/display_name" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/display_name"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="middle" android:id="@+id/display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/subtitle_text" app:layout_constraintLeft_toRightOf="@+id/file_image" app:layout_constraintRight_toLeftOf="@+id/subtitle_text" app:layout_constraintStart_toEndOf="@+id/file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="middle" android:id="@+id/display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/subtitle_text" app:layout_constraintLeft_toRightOf="@+id/file_image" app:layout_constraintRight_toLeftOf="@+id/subtitle_text" app:layout_constraintStart_toEndOf="@+id/file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Semibold"/>
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginHorizontal="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/display_name" app:layout_constraintEnd_toStartOf="@+id/failed_alert_icon" app:layout_constraintLeft_toRightOf="@+id/display_name" app:layout_constraintRight_toLeftOf="@+id/failed_alert_icon" app:layout_constraintStart_toEndOf="@+id/display_name"/>
     <ImageView android:id="@+id/failed_alert_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_alert_circle_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/display_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/display_name"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/view_connection_guild_integration.xml b/app/src/main/res/layout-v22/view_connection_guild_integration.xml
index 1d9fe2d71f..840d7b9e46 100644
--- a/app/src/main/res/layout-v22/view_connection_guild_integration.xml
+++ b/app/src/main/res/layout-v22/view_connection_guild_integration.xml
@@ -2,9 +2,9 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:cardCornerRadius="4dp" app:cardElevation="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="12dp">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/widget_connection_integration_guild_icon" android:layout_width="32dp" android:layout_height="32dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/widget_connection_integration_join_guild" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/widget_connection_integration_join_guild" app:roundAsCircle="true"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/widget_connection_integration_guild_name" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_handle" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toTopOf="@+id/widget_connection_integration_join_guild" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/widget_connection_integration_guild_handle" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toBottomOf="@+id/widget_connection_integration_join_guild" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_guild_name" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/widget_connection_integration_join_guild" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/join" android:layout_marginVertical="4dp" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_join_error" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952467_uikit_material_button_secondary"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorError" android:id="@+id/widget_connection_integration_guild_join_error" android:visibility="visible" android:layout_marginBottom="8dp" android:text="@string/error_occurred_try_again" android:lineSpacingMultiplier="1" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/widget_connection_integration_guild_name" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_join_guild" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/widget_connection_integration_guild_name" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_handle" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toTopOf="@+id/widget_connection_integration_join_guild" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/widget_connection_integration_guild_handle" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toBottomOf="@+id/widget_connection_integration_join_guild" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_guild_name" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/widget_connection_integration_join_guild" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/join" android:layout_marginVertical="4dp" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_join_error" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Material_Button_Secondary"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorError" android:id="@+id/widget_connection_integration_guild_join_error" android:visibility="visible" android:layout_marginBottom="8dp" android:text="@string/error_occurred_try_again" android:lineSpacingMultiplier="1" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/widget_connection_integration_guild_name" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_join_guild" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout-v22/view_discovery_stage_card_body.xml b/app/src/main/res/layout-v22/view_discovery_stage_card_body.xml
index e583d87648..8543374d73 100644
--- a/app/src/main/res/layout-v22/view_discovery_stage_card_body.xml
+++ b/app/src/main/res/layout-v22/view_discovery_stage_card_body.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <FrameLayout android:id="@+id/stage_discovery_guild_icon_wrap" android:layout_width="wrap_content" android:layout_height="20dp" app:layout_constraintBottom_toTopOf="@+id/stage_discovery_stage_name" app:layout_constraintEnd_toStartOf="@+id/stage_discovery_guild_name" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_discovery_guild_icon" app:fadeDuration="50" app:roundedCornerRadius="4dp" style="@style/res_2131952524_uikit_stagediscoveryavatar"/>
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/stage_discovery_guild_icon_text" android:background="@drawable/drawable_discovery_card_icon_bg_4dp_rounded" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_width="wrap_content" android:layout_height="20dp" android:minWidth="20dp" android:paddingHorizontal="4dp" style="@style/res_2131952563_uikit_textview"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_discovery_guild_icon" app:fadeDuration="50" app:roundedCornerRadius="4dp" style="@style/UiKit_StageDiscoveryAvatar"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/stage_discovery_guild_icon_text" android:background="@drawable/drawable_discovery_card_icon_bg_4dp_rounded" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_width="wrap_content" android:layout_height="20dp" android:minWidth="20dp" android:paddingHorizontal="4dp" style="@style/UiKit_TextView"/>
     </FrameLayout>
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_discovery_guild_name" android:layout_width="wrap_content" android:layout_height="20dp" android:drawablePadding="4dp" android:layout_marginStart="12dp" android:layout_marginEnd="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toStartOf="@+id/stage_discovery_badge_barrier" app:layout_constraintStart_toEndOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_discovery_guild_name" android:layout_width="wrap_content" android:layout_height="20dp" android:drawablePadding="4dp" android:layout_marginStart="12dp" android:layout_marginEnd="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toStartOf="@+id/stage_discovery_badge_barrier" app:layout_constraintStart_toEndOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Medium_SingleLine"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/stage_discovery_badge_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="5" app:constraint_referenced_ids="stage_discovery_audience_badge"/>
-    <LinearLayout android:id="@+id/stage_discovery_audience_badge" android:background="@drawable/drawable_discovery_card_icon_bg_12dp_rounded" android:paddingLeft="8dp" android:paddingTop="1dp" android:paddingRight="8dp" android:paddingBottom="1dp" android:layout_width="wrap_content" android:layout_height="20dp" android:paddingHorizontal="8dp" android:paddingVertical="1dp" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_discovery_badge_barrier" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:id="@+id/stage_discovery_audience_badge" android:background="@drawable/drawable_discovery_card_icon_bg_12dp_rounded" android:paddingLeft="8dp" android:paddingTop="1dp" android:paddingRight="8dp" android:paddingBottom="1dp" android:layout_width="wrap_content" android:layout_height="20dp" android:paddingHorizontal="8dp" android:paddingVertical="1dp" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_discovery_badge_barrier" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageView android:layout_gravity="center" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_headset_24dp" android:layout_marginEnd="6dp" app:tint="?attr/primary_300"/>
-        <TextView android:textColor="?attr/primary_300" android:layout_gravity="center" android:id="@+id/stage_discovery_audience_badge_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952574_uikit_textview_medium"/>
+        <TextView android:textColor="?attr/primary_300" android:layout_gravity="center" android:id="@+id/stage_discovery_audience_badge_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_Medium"/>
     </LinearLayout>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/primary_000" android:ellipsize="end" android:id="@+id/stage_discovery_stage_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:maxLines="2" app:layout_constraintBottom_toTopOf="@+id/stage_discovery_speakers_view" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_guild_icon_wrap" style="@style/res_2131952570_uikit_textview_large"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/primary_000" android:ellipsize="end" android:id="@+id/stage_discovery_stage_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:maxLines="2" app:layout_constraintBottom_toTopOf="@+id/stage_discovery_speakers_view" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_guild_icon_wrap" style="@style/UiKit_TextView_Large"/>
     <com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView android:id="@+id/stage_discovery_speakers_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginBottom="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_stage_name"/>
 </merge>
diff --git a/app/src/main/res/layout-v22/view_grid_image.xml b/app/src/main/res/layout-v22/view_grid_image.xml
index 3c5f59e19f..c4ccf3e886 100644
--- a/app/src/main/res/layout-v22/view_grid_image.xml
+++ b/app/src/main/res/layout-v22/view_grid_image.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951993_flexinput_items_photo">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/FlexInput_Items_Photo">
     <FrameLayout android:id="@+id/content_container" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/content_iv" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" app:placeholderImageScaleType="6" app:roundedCornerRadius="4dp" style="@style/res_2131951994_flexinput_items_photo_image"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/content_iv" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" app:placeholderImageScaleType="6" app:roundedCornerRadius="4dp" style="@style/FlexInput_Items_Photo_Image"/>
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveActive" android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/item_video_indicator" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/video" android:backgroundTint="?attr/colorBackgroundTertiary" android:paddingHorizontal="8dp" android:paddingVertical="4dp" style="UiKit.TextAppearance.Bold"/>
     </FrameLayout>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_check_indicator" android:visibility="gone" style="@style/res_2131951995_flexinput_items_photo_selection"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_check_indicator" android:visibility="gone" style="@style/FlexInput_Items_Photo_Selection"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout-v22/view_guild_role_subscription_channel_item.xml b/app/src/main/res/layout-v22/view_guild_role_subscription_channel_item.xml
index 864cc62e8e..e29ff0beb4 100644
--- a/app/src/main/res/layout-v22/view_guild_role_subscription_channel_item.xml
+++ b/app/src/main/res/layout-v22/view_guild_role_subscription_channel_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/channel_item_type_icon" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_item_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_weight="1" android:layout_marginHorizontal="8dp" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_item_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_weight="1" android:layout_marginHorizontal="8dp" style="@style/UiKit_TextView_Medium"/>
     <ImageView android:id="@+id/channel_item_selected" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_check_blurple" android:contentDescription="@string/select"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/view_guild_role_subscription_plan_details.xml b/app/src/main/res/layout-v22/view_guild_role_subscription_plan_details.xml
index 64a2e80fd8..ef15d74b99 100644
--- a/app/src/main/res/layout-v22/view_guild_role_subscription_plan_details.xml
+++ b/app/src/main/res/layout-v22/view_guild_role_subscription_plan_details.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:id="@+id/guild_role_subscription_plan_cover_image_label" android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_plan_setup_cover_photo_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <TextView android:id="@+id/guild_role_subscription_plan_cover_image_label" android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_plan_setup_cover_photo_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_plan_cover_image" android:background="@drawable/drawable_rect_rounded_bg_tertiary" android:layout_width="match_parent" android:layout_height="114dp" android:layout_marginLeft="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginTop="8dp" android:layout_marginRight="@dimen/guild_role_subscription_setup_default_padding" android:importantForAccessibility="no" android:layout_marginHorizontal="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image_label" app:placeholderImage="@drawable/ic_image_upload"/>
-    <ImageView android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_subscription_plan_details_edit_cover_image" android:background="@drawable/drawable_circle_interactive_text_normal" android:padding="4dp" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_edit_24dp" android:scaleType="centerInside" android:contentDescription="@string/guild_role_subscription_tier_detail_custom_image_a11y_label" android:translationX="-8dp" android:translationY="8dp" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintTop_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:tint="?attr/colorBackgroundSecondary" style="@style/res_2131952449_uikit_imageview_clickable"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_plan_cover_image_info" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_plan_setup_cover_photo_description" android:paddingHorizontal="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image" style="@style/res_2131952574_uikit_textview_medium"/>
-    <View android:id="@+id/guild_role_subscription_plan_details_divider" android:layout_margin="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image_info" style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:id="@+id/guild_role_subscription_plan_description_label" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_detail_description_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_details_divider" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_plan_description_layout" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_description_label" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_plan_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_plan_setup_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+    <ImageView android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_subscription_plan_details_edit_cover_image" android:background="@drawable/drawable_circle_interactive_text_normal" android:padding="4dp" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_edit_24dp" android:scaleType="centerInside" android:contentDescription="@string/guild_role_subscription_tier_detail_custom_image_a11y_label" android:translationX="-8dp" android:translationY="8dp" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintTop_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:tint="?attr/colorBackgroundSecondary" style="@style/UiKit_ImageView_Clickable"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_plan_cover_image_info" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_plan_setup_cover_photo_description" android:paddingHorizontal="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image" style="@style/UiKit_TextView_Medium"/>
+    <View android:id="@+id/guild_role_subscription_plan_details_divider" android:layout_margin="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image_info" style="@style/UiKit_Divider"/>
+    <TextView android:id="@+id/guild_role_subscription_plan_description_label" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_detail_description_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_details_divider" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_plan_description_layout" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_plan_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_plan_setup_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
     </com.google.android.material.textfield.TextInputLayout>
 </merge>
diff --git a/app/src/main/res/layout-v22/view_member_verification.xml b/app/src/main/res/layout-v22/view_member_verification.xml
index 519a471767..092d522347 100644
--- a/app/src/main/res/layout-v22/view_member_verification.xml
+++ b/app/src/main/res/layout-v22/view_member_verification.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" app:cardCornerRadius="4dp" app:cardElevation="0dp">
-    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:paddingHorizontal="8dp" android:paddingVertical="4dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:paddingHorizontal="8dp" android:paddingVertical="4dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageView android:layout_gravity="center_vertical" android:id="@+id/member_verification_verify_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" android:layout_marginEnd="8dp"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/member_verification_verify_text" android:layout_width="0dp" android:layout_height="match_parent" android:drawablePadding="8dp" android:layout_weight="1" style="@style/res_2131952570_uikit_textview_large"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_verify_button" android:padding="0dp" android:layout_width="wrap_content" android:text="@string/verify" style="@style/res_2131952458_uikit_material_button"/>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/member_verification_verified_check" android:visibility="gone" android:layout_margin="8dp" android:text="@string/guild_verified" android:drawablePadding="8dp" app:drawableLeftCompat="@drawable/ic_checkmark_green_16dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/member_verification_verify_text" android:layout_width="0dp" android:layout_height="match_parent" android:drawablePadding="8dp" android:layout_weight="1" style="@style/UiKit_TextView_Large"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_verify_button" android:padding="0dp" android:layout_width="wrap_content" android:text="@string/verify" style="@style/UiKit_Material_Button"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/member_verification_verified_check" android:visibility="gone" android:layout_margin="8dp" android:text="@string/guild_verified" android:drawablePadding="8dp" app:drawableLeftCompat="@drawable/ic_checkmark_green_16dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout-v22/view_mobile_report_block_user.xml b/app/src/main/res/layout-v22/view_mobile_report_block_user.xml
index b676a07ac6..1dbfc93fc9 100644
--- a/app/src/main/res/layout-v22/view_mobile_report_block_user.xml
+++ b/app/src/main/res/layout-v22/view_mobile_report_block_user.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_block_user_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_reports_block_element_header" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/mobile_reports_block_user_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_reports_block_element_description" style="@style/res_2131952574_uikit_textview_medium"/>
-    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/mobile_reports_block_user_avatar" android:importantForAccessibility="no" style="@style/res_2131951678_avatar_standard"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:id="@+id/mobile_reports_block_user_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginStart="16dp" style="@style/res_2131952580_uikit_textview_singleline"/>
-        <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:id="@+id/mobile_reports_block_user_button" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_height="32dp" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/block" android:insetTop="0dp" android:insetBottom="0dp" android:elevation="0dp" android:backgroundTint="@color/status_red" android:paddingHorizontal="16dp" android:paddingVertical="8dp" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_block_user_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_reports_block_element_header" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/mobile_reports_block_user_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_reports_block_element_description" style="@style/UiKit_TextView_Medium"/>
+    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/mobile_reports_block_user_avatar" android:importantForAccessibility="no" style="@style/Avatar_Standard"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:id="@+id/mobile_reports_block_user_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginStart="16dp" style="@style/UiKit_TextView_SingleLine"/>
+        <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextAppearance_Button" android:id="@+id/mobile_reports_block_user_button" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_height="32dp" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/block" android:insetTop="0dp" android:insetBottom="0dp" android:elevation="0dp" android:backgroundTint="@color/status_red" android:paddingHorizontal="16dp" android:paddingVertical="8dp" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml b/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml
index 16f8563ce9..297df729ae 100644
--- a/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml
+++ b/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
-    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/res_2131952416_uikit_divider"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <com.discord.views.LoadingButton android:id="@+id/report_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:elevation="0dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952458_uikit_material_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/report_node_bottom_button_cancel" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:elevation="0dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952471_uikit_material_button_transparent"/>
-    <TextView android:textColor="@color/status_red" android:id="@+id/report_node_bottom_button_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/UiKit_Divider"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView_Subtext"/>
+    <com.discord.views.LoadingButton android:id="@+id/report_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:elevation="0dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_Material_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/report_node_bottom_button_cancel" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:elevation="0dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_Material_Button_Transparent"/>
+    <TextView android:textColor="@color/status_red" android:id="@+id/report_node_bottom_button_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView_Subtext"/>
 </merge>
diff --git a/app/src/main/res/layout-v22/view_reports_menu_node.xml b/app/src/main/res/layout-v22/view_reports_menu_node.xml
index d57308a743..8fe032c529 100644
--- a/app/src/main/res/layout-v22/view_reports_menu_node.xml
+++ b/app/src/main/res/layout-v22/view_reports_menu_node.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
     <ScrollView android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toTopOf="@+id/mobile_reports_node_bottom_button" app:layout_constraintTop_toTopOf="0">
-        <LinearLayout android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+        <LinearLayout android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
             <ImageView android:id="@+id/mobile_reports_node_success_shield" android:visibility="gone" android:layout_width="100dp" android:layout_height="100dp" android:layout_marginBottom="16dp" android:src="@drawable/img_report_success_shield"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_node_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/mobile_reports_node_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/res_2131952570_uikit_textview_large"/>
-            <com.google.android.material.card.MaterialCardView android:id="@+id/mobile_reports_node_info_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" app:cardBackgroundColor="?attr/colorInfoHelpBackground" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:contentPadding="8dp" app:strokeColor="?attr/colorFocusPrimary" app:strokeWidth="1dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <com.facebook.drawee.view.SimpleDraweeView android:background="@drawable/ic_info_24dp" android:layout_width="24dp" android:layout_height="24dp" android:backgroundTint="?attr/colorFocusPrimary" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center" android:id="@+id/mobile_reports_node_info_text" android:textAlignment="center" android:layout_marginStart="8dp" style="@style/res_2131952574_uikit_textview_medium"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_node_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView_H1_Bold"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/mobile_reports_node_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView_Large"/>
+            <com.google.android.material.card.MaterialCardView android:id="@+id/mobile_reports_node_info_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" app:cardBackgroundColor="?attr/colorInfoHelpBackground" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:contentPadding="8dp" app:strokeColor="?attr/colorFocusPrimary" app:strokeWidth="1dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <com.facebook.drawee.view.SimpleDraweeView android:background="@drawable/ic_info_24dp" android:layout_width="24dp" android:layout_height="24dp" android:backgroundTint="?attr/colorFocusPrimary" style="@style/UiKit_ImageView"/>
+                    <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center" android:id="@+id/mobile_reports_node_info_text" android:textAlignment="center" android:layout_marginStart="8dp" style="@style/UiKit_TextView_Medium"/>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
             <include android:id="@+id/mobile_reports_node_block_user" android:visibility="gone" layout="@layout/view_mobile_report_block_user"/>
@@ -18,10 +18,10 @@
             <com.google.android.material.card.MaterialCardView android:id="@+id/mobile_reports_node_channel_preview" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:strokeColor="?attr/colorBackgroundModifierAccent" app:strokeWidth="1dp">
                 <include android:id="@+id/mobile_reports_channel_preview" layout="@layout/view_mobile_reports_channel_preview"/>
             </com.google.android.material.card.MaterialCardView>
-            <com.discord.widgets.mobile_reports.MobileReportsBreadcrumbs android:gravity="top|left|center_vertical|center_horizontal|center|start" android:orientation="vertical" android:id="@+id/mobile_reports_node_breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <LinearLayout android:id="@+id/mobile_reports_multiselect" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <LinearLayout android:id="@+id/mobile_reports_node_child_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+            <com.discord.widgets.mobile_reports.MobileReportsBreadcrumbs android:gravity="top|left|center_vertical|center_horizontal|center|start" android:orientation="vertical" android:id="@+id/mobile_reports_node_breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <LinearLayout android:id="@+id/mobile_reports_multiselect" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <LinearLayout android:id="@+id/mobile_reports_node_child_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout"/>
         </LinearLayout>
     </ScrollView>
-    <com.discord.widgets.mobile_reports.MobileReportsBottomButton android:gravity="bottom" android:id="@+id/mobile_reports_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+    <com.discord.widgets.mobile_reports.MobileReportsBottomButton android:gravity="bottom" android:id="@+id/mobile_reports_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="0" style="@style/UiKit_ViewGroup_LinearLayout"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/view_selectable_friend_suggestion.xml b/app/src/main/res/layout-v22/view_selectable_friend_suggestion.xml
index e3dbdc8f21..72fc9fcd2b 100644
--- a/app/src/main/res/layout-v22/view_selectable_friend_suggestion.xml
+++ b/app/src/main/res/layout-v22/view_selectable_friend_suggestion.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/friend_suggestion_container" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friend_suggestion_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friend_suggestion_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friend_suggestion_nickname" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextMuted" android:id="@+id/friend_suggestion_discriminator" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@+id/friend_suggestion_name" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_name" app:layout_constraintTop_toTopOf="@+id/friend_suggestion_name" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friend_suggestion_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toBottomOf="@+id/friend_suggestion_name" style="@style/res_2131952580_uikit_textview_singleline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friend_suggestion_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/Avatar_Standard"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friend_suggestion_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friend_suggestion_nickname" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_SingleLine"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextMuted" android:id="@+id/friend_suggestion_discriminator" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@+id/friend_suggestion_name" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_name" app:layout_constraintTop_toTopOf="@+id/friend_suggestion_name" style="@style/UiKit_TextView_SingleLine"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friend_suggestion_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toBottomOf="@+id/friend_suggestion_name" style="@style/UiKit_TextView_SingleLine"/>
     <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/friend_suggestion_selected" android:layout_width="32dp" android:layout_height="32dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/view_setting_shared.xml b/app/src/main/res/layout-v22/view_setting_shared.xml
index f59e8ba423..83eaa3cd07 100644
--- a/app/src/main/res/layout-v22/view_setting_shared.xml
+++ b/app/src/main/res/layout-v22/view_setting_shared.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@+id/setting_drawable_left" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:id="@+id/setting_label" android:layout_width="wrap_content" android:layout_marginStart="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/setting_subtext" app:layout_constraintEnd_toStartOf="@+id/setting_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toTopOf="0" app:layout_goneMarginStart="0dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:id="@+id/setting_tag" android:visibility="gone" android:text="@string/recommended" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/setting_label" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_label" app:layout_constraintTop_toTopOf="@+id/setting_label" style="@style/res_2131952583_uikit_textview_tagged"/>
-    <TextView android:id="@+id/setting_subtext" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toBottomOf="@+id/setting_label" app:layout_goneMarginStart="0dp" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:id="@+id/setting_label" android:layout_width="wrap_content" android:layout_marginStart="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/setting_subtext" app:layout_constraintEnd_toStartOf="@+id/setting_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toTopOf="0" app:layout_goneMarginStart="0dp" style="@style/UiKit_TextView"/>
+    <TextView android:id="@+id/setting_tag" android:visibility="gone" android:text="@string/recommended" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/setting_label" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_label" app:layout_constraintTop_toTopOf="@+id/setting_label" style="@style/UiKit_TextView_Tagged"/>
+    <TextView android:id="@+id/setting_subtext" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toBottomOf="@+id/setting_label" app:layout_goneMarginStart="0dp" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout-v22/view_stage_channel_speaker.xml b/app/src/main/res/layout-v22/view_stage_channel_speaker.xml
index 47c735e3f1..5343ebccf9 100644
--- a/app/src/main/res/layout-v22/view_stage_channel_speaker.xml
+++ b/app/src/main/res/layout-v22/view_stage_channel_speaker.xml
@@ -7,7 +7,7 @@
         <com.discord.views.VoiceUserView android:layout_gravity="center" android:id="@+id/stage_channel_speaker" android:layout_width="@dimen/avatar_size_extra_large" android:layout_height="@dimen/avatar_size_extra_large" app:vuv_animate_avatar_when_ringing="false" app:vuv_fade_when_disconnected="true"/>
     </com.discord.views.calls.SpeakerPulseView>
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:orientation="horizontal" android:background="@drawable/bg_stream_label" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginBottom="4dp" android:layout_marginHorizontal="4dp" android:paddingHorizontal="8dp" android:paddingVertical="4dp">
-        <ImageView android:id="@+id/stage_channel_speaker_blocked" android:background="@drawable/drawable_circle_white" android:padding="2dp" android:src="@drawable/ic_blocked_12dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorStatusDangerBackground" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textColor="@color/white" android:id="@+id/stage_channel_speaker_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_speaker_blocked" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_speaker_blocked" app:layout_constraintTop_toTopOf="@+id/stage_channel_speaker_blocked" style="@style/res_2131952580_uikit_textview_singleline"/>
+        <ImageView android:id="@+id/stage_channel_speaker_blocked" android:background="@drawable/drawable_circle_white" android:padding="2dp" android:src="@drawable/ic_blocked_12dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorStatusDangerBackground" style="@style/UiKit_ImageView"/>
+        <TextView android:textColor="@color/white" android:id="@+id/stage_channel_speaker_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_speaker_blocked" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_speaker_blocked" app:layout_constraintTop_toTopOf="@+id/stage_channel_speaker_blocked" style="@style/UiKit_TextView_SingleLine"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
diff --git a/app/src/main/res/layout-v22/view_stage_channel_visit_community.xml b/app/src/main/res/layout-v22/view_stage_channel_visit_community.xml
index d51b1957a5..6c17fd06bf 100644
--- a/app/src/main/res/layout-v22/view_stage_channel_visit_community.xml
+++ b/app/src/main/res/layout-v22/view_stage_channel_visit_community.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/rounded_rectangle_1000dp_radius" android:layout_width="wrap_content" android:layout_height="wrap_content" android:backgroundTint="@color/white_alpha_10">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/visit_community_icon" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginStart="4dp" android:layout_marginVertical="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/visit_community_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@+id/visit_community_icon_text" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/visit_community_icon" app:layout_constraintLeft_toLeftOf="@+id/visit_community_icon" app:layout_constraintRight_toRightOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="@+id/visit_community_icon" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="@color/white" android:id="@+id/visit_community_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/visit_community" android:layout_marginStart="4dp" android:layout_marginEnd="8dp" android:layout_marginVertical="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/visit_community_icon" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginStart="4dp" android:layout_marginVertical="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/visit_community_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Medium"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@+id/visit_community_icon_text" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/visit_community_icon" app:layout_constraintLeft_toLeftOf="@+id/visit_community_icon" app:layout_constraintRight_toRightOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="@+id/visit_community_icon" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="@color/white" android:id="@+id/visit_community_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/visit_community" android:layout_marginStart="4dp" android:layout_marginEnd="8dp" android:layout_marginVertical="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/view_steps.xml b/app/src/main/res/layout-v22/view_steps.xml
index fd984a93cb..5b004d6c4c 100644
--- a/app/src/main/res/layout-v22/view_steps.xml
+++ b/app/src/main/res/layout-v22/view_steps.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <androidx.viewpager2.widget.ViewPager2 android:id="@+id/steps_viewpager" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@+id/steps_button_container" android:layout_below="@+id/steps_close"/>
-    <ImageView android:id="@+id/steps_close" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:foreground="?attr/selectableItemBackgroundBorderless" android:src="?attr/ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" android:layout_marginVertical="16dp" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:gravity="center" android:id="@+id/steps_title" android:paddingTop="16dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignTop="@+id/steps_close" android:layout_alignBottom="@+id/steps_close" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_marginStart="40dp" android:layout_toStartOf="@+id/steps_close" style="@style/res_2131952569_uikit_textview_h6"/>
-    <LinearLayout android:id="@+id/steps_button_container" android:visibility="gone" android:layout_margin="16dp" android:layout_alignParentBottom="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.discord.views.LoadingButton android:id="@+id/steps_done" android:paddingLeft="0dp" android:paddingRight="0dp" android:visibility="gone" android:text="@string/done" android:paddingHorizontal="0dp" app:lb_progress_color="@color/white" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/steps_next" android:text="@string/next" style="@style/res_2131952458_uikit_material_button"/>
-        <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/steps_cancel" android:background="?attr/selectableItemBackground" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_marginTop="4dp" android:text="@string/cancel" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+    <ImageView android:id="@+id/steps_close" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:foreground="?attr/selectableItemBackgroundBorderless" android:src="?attr/ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" android:layout_marginVertical="16dp" style="@style/UiKit_ImageView"/>
+    <TextView android:gravity="center" android:id="@+id/steps_title" android:paddingTop="16dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignTop="@+id/steps_close" android:layout_alignBottom="@+id/steps_close" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_marginStart="40dp" android:layout_toStartOf="@+id/steps_close" style="@style/UiKit_TextView_H6"/>
+    <LinearLayout android:id="@+id/steps_button_container" android:visibility="gone" android:layout_margin="16dp" android:layout_alignParentBottom="true" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.discord.views.LoadingButton android:id="@+id/steps_done" android:paddingLeft="0dp" android:paddingRight="0dp" android:visibility="gone" android:text="@string/done" android:paddingHorizontal="0dp" app:lb_progress_color="@color/white" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/steps_next" android:text="@string/next" style="@style/UiKit_Material_Button"/>
+        <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/steps_cancel" android:background="?attr/selectableItemBackground" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_marginTop="4dp" android:text="@string/cancel" style="@style/UiKit_TextView_Large_SingleLine"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout-v22/view_upload_progress.xml b/app/src/main/res/layout-v22/view_upload_progress.xml
index d7da44d5a1..6c792f87b3 100644
--- a/app/src/main/res/layout-v22/view_upload_progress.xml
+++ b/app/src/main/res/layout-v22/view_upload_progress.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/progress_file_image" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/progress_text" app:layout_constraintEnd_toStartOf="@+id/progress_text" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/progress_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/progress_text"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:ellipsize="middle" android:id="@+id/progress_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/progress_bar" app:layout_constraintEnd_toStartOf="@+id/progress_subtext" app:layout_constraintLeft_toRightOf="@+id/progress_file_image" app:layout_constraintRight_toLeftOf="@+id/progress_subtext" app:layout_constraintStart_toEndOf="@+id/progress_file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:ellipsize="middle" android:id="@+id/progress_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/progress_bar" app:layout_constraintEnd_toStartOf="@+id/progress_subtext" app:layout_constraintLeft_toRightOf="@+id/progress_file_image" app:layout_constraintRight_toLeftOf="@+id/progress_subtext" app:layout_constraintStart_toEndOf="@+id/progress_file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Semibold"/>
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_200" android:id="@+id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginHorizontal="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/progress_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/progress_text" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/progress_text"/>
     <ProgressBar android:id="@+id/progress_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:maxHeight="1dp" android:max="100" android:minHeight="1dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/progress_text" style="@style/res_2131952680_widget_appcompat_progressbar_horizontal"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/voice_controls_sheet_view.xml b/app/src/main/res/layout-v22/voice_controls_sheet_view.xml
index ee226ef91a..6c574a3525 100644
--- a/app/src/main/res/layout-v22/voice_controls_sheet_view.xml
+++ b/app/src/main/res/layout-v22/voice_controls_sheet_view.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/VoiceControlsSheet">
-    <LinearLayout android:id="@+id/peek_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:id="@+id/peek_container" style="@style/UiKit_ViewGroup_LinearLayout">
         <View android:layout_gravity="center" android:id="@+id/handle" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="40dp" android:layout_height="4dp" android:layout_marginTop="4dp" android:layout_marginBottom="8dp" android:alpha="0.8"/>
-        <LinearLayout android:gravity="center" android:layout_marginBottom="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <ImageView android:id="@+id/video_button" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" android:layout_marginHorizontal="12dp" app:backgroundTint="?attr/colorBackgroundPrimary" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
-            <ImageView android:id="@+id/screen_share_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mobile_screenshare_24dp" android:contentDescription="@string/video" android:layout_marginHorizontal="12dp" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
-            <ImageView android:id="@+id/move_to_audience_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stage_move_to_audience" android:contentDescription="@string/move_me_to_audience" android:layout_marginHorizontal="12dp" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+        <LinearLayout android:gravity="center" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <ImageView android:id="@+id/video_button" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" android:layout_marginHorizontal="12dp" app:backgroundTint="?attr/colorBackgroundPrimary" style="@style/UiKit_Calls_ButtonCircle"/>
+            <ImageView android:id="@+id/screen_share_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mobile_screenshare_24dp" android:contentDescription="@string/video" android:layout_marginHorizontal="12dp" style="@style/UiKit_Calls_ButtonCircle"/>
+            <ImageView android:id="@+id/move_to_audience_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stage_move_to_audience" android:contentDescription="@string/move_me_to_audience" android:layout_marginHorizontal="12dp" style="@style/UiKit_Calls_ButtonCircle"/>
             <com.discord.views.NumericBadgingView android:id="@+id/raise_hand_badge" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_marginHorizontal="12dp">
-                <ImageView android:id="@+id/raise_hand_button" android:src="@drawable/ic_stage_raised_hand" android:contentDescription="@string/video" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+                <ImageView android:id="@+id/raise_hand_button" android:src="@drawable/ic_stage_raised_hand" android:contentDescription="@string/video" style="@style/UiKit_Calls_ButtonCircle"/>
             </com.discord.views.NumericBadgingView>
-            <ImageView android:id="@+id/invite_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_guild_invite_24dp" android:contentDescription="@string/invite_a_friend" android:layout_marginHorizontal="12dp" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+            <ImageView android:id="@+id/invite_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_guild_invite_24dp" android:contentDescription="@string/invite_a_friend" android:layout_marginHorizontal="12dp" style="@style/UiKit_Calls_ButtonCircle"/>
             <FrameLayout android:id="@+id/audio_output_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_marginHorizontal="12dp">
-                <ImageView android:id="@+id/audio_output_button" android:src="@drawable/ic_sound_24dp" android:contentDescription="@string/switch_audio_output" app:tint="@color/white" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+                <ImageView android:id="@+id/audio_output_button" android:src="@drawable/ic_sound_24dp" android:contentDescription="@string/switch_audio_output" app:tint="@color/white" style="@style/UiKit_Calls_ButtonCircle"/>
                 <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/audio_output_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_down_14dp" android:importantForAccessibility="no" android:layout_marginEnd="6dp" app:tint="@color/white"/>
             </FrameLayout>
-            <ImageView android:id="@+id/mute_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mic_white_24dp" android:contentDescription="@string/mute" android:layout_marginHorizontal="12dp" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
-            <com.google.android.material.textview.MaterialTextView android:id="@+id/stage_disconnect_button_large" android:paddingLeft="24dp" android:paddingRight="24dp" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:text="@string/stage_channel_leave_button" android:drawablePadding="10dp" android:layout_marginHorizontal="12dp" android:paddingHorizontal="24dp" app:drawableEndCompat="@drawable/ic_stage_leave_20dp" style="@style/res_2131952387_uikit_calls_buttonpill_red"/>
-            <ImageView android:id="@+id/stop_watching_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stop_stream" android:contentDescription="@string/stop_watching" android:layout_marginHorizontal="12dp" app:tint="@color/white" style="@style/res_2131952385_uikit_calls_buttoncircle_red"/>
-            <ImageView android:id="@+id/disconnect_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/disconnect_self" android:layout_marginHorizontal="12dp" app:tint="@color/white" style="@style/res_2131952385_uikit_calls_buttoncircle_red"/>
+            <ImageView android:id="@+id/mute_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mic_white_24dp" android:contentDescription="@string/mute" android:layout_marginHorizontal="12dp" style="@style/UiKit_Calls_ButtonCircle"/>
+            <com.google.android.material.textview.MaterialTextView android:id="@+id/stage_disconnect_button_large" android:paddingLeft="24dp" android:paddingRight="24dp" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:text="@string/stage_channel_leave_button" android:drawablePadding="10dp" android:layout_marginHorizontal="12dp" android:paddingHorizontal="24dp" app:drawableEndCompat="@drawable/ic_stage_leave_20dp" style="@style/UiKit_Calls_ButtonPill_Red"/>
+            <ImageView android:id="@+id/stop_watching_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stop_stream" android:contentDescription="@string/stop_watching" android:layout_marginHorizontal="12dp" app:tint="@color/white" style="@style/UiKit_Calls_ButtonCircle_Red"/>
+            <ImageView android:id="@+id/disconnect_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/disconnect_self" android:layout_marginHorizontal="12dp" app:tint="@color/white" style="@style/UiKit_Calls_ButtonCircle_Red"/>
         </LinearLayout>
-        <Button android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/push_to_talk_button" android:background="@drawable/drawable_bg_white_alpha_24_corners_gradient" android:padding="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_marginBottom="16dp" android:text="@string/input_mode_ptt" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <Button android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/push_to_talk_button" android:background="@drawable/drawable_bg_white_alpha_24_corners_gradient" android:padding="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_marginBottom="16dp" android:text="@string/input_mode_ptt" style="@style/UiKit_TextView_Semibold"/>
     </LinearLayout>
     <androidx.cardview.widget.CardView android:id="@+id/secondary_actions_card" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white_alpha_24" app:cardCornerRadius="8dp" app:cardElevation="0dp">
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@drawable/drawable_listitem_divider_left_padded" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/stream_volume_label" android:text="@string/stream_volume" style="@style/res_2131952451_uikit_listitem"/>
-            <com.discord.views.calls.VolumeSliderView android:id="@+id/stream_volume_slider" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" app:vsv_icon_tint="@color/white" app:vsv_max_volume="300" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal"/>
-            <TextView android:id="@+id/audio_output_secondary_button" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
-            <TextView android:id="@+id/screen_share_secondary_button" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
-            <TextView android:id="@+id/deafen_secondary_button" android:src="?attr/ic_deafen_state" android:text="@string/deafen" app:drawableStartCompat="?attr/ic_deafen_state" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
-            <TextView android:id="@+id/invite_secondary_button" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@drawable/drawable_listitem_divider_left_padded" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/stream_volume_label" android:text="@string/stream_volume" style="@style/UiKit_ListItem"/>
+            <com.discord.views.calls.VolumeSliderView android:id="@+id/stream_volume_slider" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" app:vsv_icon_tint="@color/white" app:vsv_max_volume="300" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal"/>
+            <TextView android:id="@+id/audio_output_secondary_button" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
+            <TextView android:id="@+id/screen_share_secondary_button" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
+            <TextView android:id="@+id/deafen_secondary_button" android:src="?attr/ic_deafen_state" android:text="@string/deafen" app:drawableStartCompat="?attr/ic_deafen_state" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
+            <TextView android:id="@+id/invite_secondary_button" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </merge>
diff --git a/app/src/main/res/layout-v22/widget_auth_landing.xml b/app/src/main/res/layout-v22/widget_auth_landing.xml
index aec5da661d..9fa06ac457 100644
--- a/app/src/main/res/layout-v22/widget_auth_landing.xml
+++ b/app/src/main/res/layout-v22/widget_auth_landing.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_landing_ptrn" style="@style/res_2131952602_uikit_viewgroup_page">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_landing_ptrn" style="@style/UiKit_ViewGroup_Page">
     <com.discord.app.AppViewFlipper android:id="@+id/auth_landing_switch_flipper" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="16dp" android:layout_above="@+id/auth_bottom_container" android:layout_marginStart="16dp" android:layout_marginEnd="16dp">
         <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent">
-            <ImageView android:layout_gravity="top" android:id="@+id/auth_landing_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:src="?attr/auth_logo" android:scaleType="center" android:contentDescription="@string/discord" style="@style/res_2131952448_uikit_imageview"/>
-            <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="@dimen/auth_splash_vertical_margin" android:layout_marginRight="16dp" android:layout_marginBottom="@dimen/auth_splash_vertical_margin" android:src="@drawable/img_landing_splash" android:scaleType="fitCenter" android:layout_above="@+id/auth_landing_title" android:layout_below="@+id/auth_landing_logo" android:contentDescription="@string/discord" android:layout_marginHorizontal="16dp" android:layout_marginVertical="@dimen/auth_splash_vertical_margin" style="@style/res_2131952448_uikit_imageview"/>
+            <ImageView android:layout_gravity="top" android:id="@+id/auth_landing_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:src="?attr/auth_logo" android:scaleType="center" android:contentDescription="@string/discord" style="@style/UiKit_ImageView"/>
+            <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="@dimen/auth_splash_vertical_margin" android:layout_marginRight="16dp" android:layout_marginBottom="@dimen/auth_splash_vertical_margin" android:src="@drawable/img_landing_splash" android:scaleType="fitCenter" android:layout_above="@+id/auth_landing_title" android:layout_below="@+id/auth_landing_logo" android:contentDescription="@string/discord" android:layout_marginHorizontal="16dp" android:layout_marginVertical="@dimen/auth_splash_vertical_margin" style="@style/UiKit_ImageView"/>
             <com.discord.views.ScreenTitleView android:id="@+id/auth_landing_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:layout_alignParentBottom="true" android:layout_centerInParent="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile"/>
         </RelativeLayout>
         <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent">
-            <ImageView android:layout_width="175dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:src="?attr/auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/res_2131952448_uikit_imageview"/>
+            <ImageView android:layout_width="175dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:src="?attr/auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/UiKit_ImageView"/>
             <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true">
                 <com.discord.views.ScreenTitleView android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile"/>
                 <com.discord.widgets.auth.AuthInviteInfoView android:id="@+id/auth_landing_invite_info" android:layout_width="match_parent" android:layout_height="wrap_content"/>
@@ -15,7 +15,7 @@
         </RelativeLayout>
     </com.discord.app.AppViewFlipper>
     <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@+id/auth_bottom_container" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:paddingStart="16dp" android:paddingEnd="16dp">
-        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_register" android:text="@string/register" style="@style/res_2131952382_uikit_authbutton_material"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_login" android:text="@string/login" android:backgroundTint="?attr/colorButtonSecondary" style="@style/res_2131952382_uikit_authbutton_material"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_register" android:text="@string/register" style="@style/UiKit_AuthButton_Material"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_login" android:text="@string/login" android:backgroundTint="?attr/colorButtonSecondary" style="@style/UiKit_AuthButton_Material"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout-v22/widget_call_fullscreen.xml b/app/src/main/res/layout-v22/widget_call_fullscreen.xml
index 65802c4c5f..3d5a371dbe 100644
--- a/app/src/main/res/layout-v22/widget_call_fullscreen.xml
+++ b/app/src/main/res/layout-v22/widget_call_fullscreen.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:background="@color/black" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
-    <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_global_status" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952589_uikit_viewgroup"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:background="@color/black" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
+    <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_global_status" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/top_of_ui" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="widget_global_status"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/call_video_recycler" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/call_stage_recycler" android:paddingTop="92dp" android:clipToPadding="false" android:layout_width="0dp" android:layout_height="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui"/>
     <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@+id/call_participants_hidden" android:background="@color/black" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
         <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/video_call_illustration" android:importantForAccessibility="no"/>
-        <TextView android:textColor="@color/white" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" android:paddingHorizontal="64dp" style="@style/res_2131952541_uikit_textappearance_semibold"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" style="@style/res_2131952458_uikit_material_button"/>
+        <TextView android:textColor="@color/white" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" android:paddingHorizontal="64dp" style="@style/UiKit_TextAppearance_Semibold"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/call_non_video_container" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
         <include android:id="@+id/private_call" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" layout="@layout/widget_call_fullscreen_private_call"/>
         <RelativeLayout android:id="@+id/action_bar_underlay" android:background="@drawable/drawable_black_underlay_gradient" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0">
             <View android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"/>
         </RelativeLayout>
-        <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-            <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/res_2131951667_apptheme_toolbar_transparent">
+        <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+            <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/AppTheme_Toolbar_Transparent">
                 <com.discord.views.calls.StageCallVisitCommunityView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/call_visit_community" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
             </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.AppBarLayout>
-        <TextView android:id="@+id/call_fullscreen_mentions" android:visibility="gone" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952022_icon_mentions_call"/>
+        <TextView android:id="@+id/call_fullscreen_mentions" android:visibility="gone" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" app:layout_constraintVertical_chainStyle="2" style="@style/Icon_Mentions_Call"/>
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/call_streaming_active" android:background="@color/black" android:padding="16dp" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/action_bar_toolbar_layout">
             <include android:id="@+id/audio_share" layout="@layout/widget_call_fullscreen_audio_share_warning"/>
             <androidx.constraintlayout.widget.Barrier android:id="@+id/call_audio_share_warning_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="audio_share"/>
             <ImageView android:id="@+id/call_streaming_active_illustration" android:layout_width="130dp" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/screen_share_illustration" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/call_streaming_active_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_audio_share_warning_barrier" app:layout_constraintVertical_chainStyle="2"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:id="@+id/call_streaming_active_header" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_stream_active_header" android:textAlignment="center" android:paddingHorizontal="64dp" app:layout_constraintBottom_toTopOf="@+id/call_streaming_active_body" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_illustration" style="@style/res_2131952534_uikit_textappearance_bold"/>
-            <TextView android:textColor="@color/primary_dark_300" android:id="@+id/call_streaming_active_body" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_active_body" android:textAlignment="center" android:paddingHorizontal="64dp" app:layout_constraintBottom_toTopOf="@+id/call_stop_streaming_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_header" style="@style/res_2131952533_uikit_textappearance"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/call_stop_streaming_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mobile_stream_stop_sharing" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_body" style="@style/res_2131952458_uikit_material_button"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:id="@+id/call_streaming_active_header" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_stream_active_header" android:textAlignment="center" android:paddingHorizontal="64dp" app:layout_constraintBottom_toTopOf="@+id/call_streaming_active_body" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_illustration" style="@style/UiKit_TextAppearance_Bold"/>
+            <TextView android:textColor="@color/primary_dark_300" android:id="@+id/call_streaming_active_body" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_active_body" android:textAlignment="center" android:paddingHorizontal="64dp" app:layout_constraintBottom_toTopOf="@+id/call_stop_streaming_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_header" style="@style/UiKit_TextAppearance"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/call_stop_streaming_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mobile_stream_stop_sharing" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_body" style="@style/UiKit_Material_Button"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
         <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" android:layout_marginTop="32dp" app:cardCornerRadius="8dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toBottomOf="@+id/action_bar_toolbar_layout" app:layout_goneMarginTop="72dp">
             <com.discord.views.calls.VideoCallParticipantView android:id="@+id/call_pip" android:visibility="gone" android:layout_width="140dp" android:layout_height="79dp" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="true"/>
         </androidx.cardview.widget.CardView>
-        <com.google.android.material.button.MaterialButton android:theme="@style/res_2131951648_apptheme_dark" android:textColor="@color/primary_100" android:id="@+id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0dp" android:layout_margin="8dp" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_630_alpha_90" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952458_uikit_material_button"/>
+        <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme_Dark" android:textColor="@color/primary_100" android:id="@+id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0dp" android:layout_margin="8dp" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_630_alpha_90" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_Material_Button"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/call_controls_sheet_container" android:saveEnabled="false" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
         <com.discord.widgets.voice.controls.VoiceControlsSheetView android:layout_gravity="center_horizontal" android:id="@+id/voice_controls_sheet_view" android:visibility="invisible" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" style="@style/VoiceControlsSheet"/>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/stage_call_speaking_chip" android:background="@drawable/bg_stage_channel_speaking_chip" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui" app:layout_constraintVertical_bias="0.75" app:layout_constraintWidth_max="275dp">
         <com.discord.views.user.UserSummaryView android:id="@+id/stage_call_speaking_user_summary" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/stage_call_speaking_user_summary_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:summary_avatarOverlap="4dp" app:summary_avatarSize="24dp" app:summary_maxAvatars="3"/>
-        <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_call_speaking_user_summary_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_call_speaking_user_summary" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+        <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_call_speaking_user_summary_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_call_speaking_user_summary" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Medium_SingleLine"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <ViewStub android:id="@+id/start_stage_event_button_stub" android:layout="@layout/stub_call_fullscreen_start_stage_event_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.75"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml b/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml
index 524e678dce..85089f4322 100644
--- a/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_channel_picker_sheet.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/channel_picker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/channel_picker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/channel_picker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/channel_picker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:background="?attr/colorBackgroundTertiary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952564_uikit_textview_bold"/>
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:background="?attr/colorBackgroundTertiary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_TextView_Bold"/>
                 <com.discord.views.SearchInputView android:id="@+id/channel_picker_search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="16dp" android:layout_marginRight="12dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="12dp" android:layout_marginVertical="16dp" app:siv_hint="@string/search_channels" app:siv_search_content_description="@string/search_channels"/>
             </LinearLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/channel_picker_app_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/channel_picker_app_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" style="@style/res_2131952679_widget_appcompat_progressbar"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_picker_recycler" android:layout_height="match_parent" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_picker_recycler" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_channel_settings_add_member.xml b/app/src/main/res/layout-v22/widget_channel_settings_add_member.xml
index 700e9579da..831ec913e5 100644
--- a/app/src/main/res/layout-v22/widget_channel_settings_add_member.xml
+++ b/app/src/main/res/layout-v22/widget_channel_settings_add_member.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
-    <LinearLayout android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingNestedViewBehavior" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout">
+    <LinearLayout android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingNestedViewBehavior" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.SearchInputView android:id="@+id/search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="14dp" android:layout_marginRight="16dp" android:layout_marginBottom="14dp" android:layout_marginHorizontal="16dp" android:layout_marginVertical="14dp" app:siv_hint="@string/private_channel_add_members_modal_search_placeholder_mobile"/>
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler" android:layout_width="match_parent" android:layout_height="match_parent"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_channel_settings_add_member_category.xml b/app/src/main/res/layout-v22/widget_channel_settings_add_member_category.xml
index 3665e2e5dc..86e6ca0c64 100644
--- a/app/src/main/res/layout-v22/widget_channel_settings_add_member_category.xml
+++ b/app/src/main/res/layout-v22/widget_channel_settings_add_member_category.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp">
-    <TextView android:id="@+id/label" android:paddingTop="24dp" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952569_uikit_textview_h6"/>
+    <TextView android:id="@+id/label" android:paddingTop="24dp" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_H6"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_channel_settings_add_member_sheet.xml b/app/src/main/res/layout-v22/widget_channel_settings_add_member_sheet.xml
index 45392806a7..46ec47e6fd 100644
--- a/app/src/main/res/layout-v22/widget_channel_settings_add_member_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_channel_settings_add_member_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundTertiary" android:paddingLeft="16dp" android:paddingTop="14dp" android:paddingRight="16dp" android:paddingBottom="14dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" android:paddingVertical="14dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/channel_permissions_add_moderator_title" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/add_button" android:background="?attr/selectableItemBackgroundBorderless" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/add" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundTertiary" android:paddingLeft="16dp" android:paddingTop="14dp" android:paddingRight="16dp" android:paddingBottom="14dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" android:paddingVertical="14dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/channel_permissions_add_moderator_title" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/add_button" android:background="?attr/selectableItemBackgroundBorderless" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/add" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.fragment.app.FragmentContainerView android:id="@+id/content" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_channels_list_item_active_stage_event.xml b/app/src/main/res/layout-v22/widget_channels_list_item_active_stage_event.xml
index d43021c540..d213b1ac4c 100644
--- a/app/src/main/res/layout-v22/widget_channels_list_item_active_stage_event.xml
+++ b/app/src/main/res/layout-v22/widget_channels_list_item_active_stage_event.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="12dp" android:paddingTop="8dp" android:paddingRight="12dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="12dp" android:paddingVertical="8dp">
     <ImageView android:id="@+id/live_now_dot" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/stage_channel_live_dot" app:layout_constraintBottom_toBottomOf="@+id/live_now_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/live_now_label"/>
-    <TextView android:textSize="12sp" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/live_now_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_live_now" android:textAllCaps="true" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/live_now_dot" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/stage_event_topic" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/live_now_label" style="@style/res_2131952521_uikit_stage_topic"/>
-    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/stage_event_channel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:lines="1" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="?attr/colorHeaderSecondary" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/channel_separator" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_event_topic" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textSize="12sp" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/live_now_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_live_now" android:textAllCaps="true" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/live_now_dot" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/stage_event_topic" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/live_now_label" style="@style/UiKit_Stage_Topic"/>
+    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/stage_event_channel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:lines="1" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="?attr/colorHeaderSecondary" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/channel_separator" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_event_topic" style="@style/UiKit_TextView_Medium"/>
     <ImageView android:id="@+id/channel_separator" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/stage_channel_info_separator_dot" android:scaleType="centerInside" android:paddingHorizontal="8dp" app:layout_constraintBottom_toBottomOf="@+id/stage_event_channel" app:layout_constraintEnd_toStartOf="@+id/stage_event_listeners" app:layout_constraintStart_toEndOf="@+id/stage_event_channel" app:layout_constraintTop_toTopOf="@+id/stage_event_channel" app:tint="?attr/colorTextMuted"/>
-    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/stage_event_listeners" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/stage_event_channel" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/channel_separator" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/stage_event_listeners" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/stage_event_channel" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/channel_separator" style="@style/UiKit_TextView_Medium"/>
     <com.discord.views.user.UserSummaryView android:id="@+id/user_summary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintEnd_toStartOf="@+id/user_summary_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_event_channel" app:summary_avatarOverlap="4dp" app:summary_avatarSize="16dp" app:summary_maxAvatars="3"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/user_summary_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/user_summary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/user_summary" app:layout_constraintTop_toBottomOf="@+id/stage_event_channel" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
-    <com.google.android.material.button.MaterialButton android:textSize="16sp" android:id="@+id/stage_event_listen_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/user_summary" style="@style/res_2131952460_uikit_material_button_green"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/user_summary_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/user_summary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/user_summary" app:layout_constraintTop_toBottomOf="@+id/stage_event_channel" style="@style/UiKit_TextView_Medium_SingleLine"/>
+    <com.google.android.material.button.MaterialButton android:textSize="16sp" android:id="@+id/stage_event_listen_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/user_summary" style="@style/UiKit_Material_Button_Green"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_channels_list_item_guild_scheduled_events.xml b/app/src/main/res/layout-v22/widget_channels_list_item_guild_scheduled_events.xml
index c5f3d72426..f30dc0d8d9 100644
--- a/app/src/main/res/layout-v22/widget_channels_list_item_guild_scheduled_events.xml
+++ b/app/src/main/res/layout-v22/widget_channels_list_item_guild_scheduled_events.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:paddingVertical="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:paddingVertical="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <ImageView android:id="@+id/channels_list_item_guild_scheduled_event_icon" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_event_20dp" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorChannelDefault"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_guild_scheduled_event_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/guild_events" android:singleLine="true" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channels_list_item_guild_scheduled_event_count" app:layout_constraintStart_toEndOf="@+id/channels_list_item_guild_scheduled_event_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/channels_list_item_guild_scheduled_event_count" android:background="@drawable/drawable_circle_background_tertiary" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952023_icon_mentions_large"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_guild_scheduled_event_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/guild_events" android:singleLine="true" android:layout_marginHorizontal="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channels_list_item_guild_scheduled_event_count" app:layout_constraintStart_toEndOf="@+id/channels_list_item_guild_scheduled_event_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/channels_list_item_guild_scheduled_event_count" android:background="@drawable/drawable_circle_background_tertiary" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Icon_Mentions_Large"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_input.xml b/app/src/main/res/layout-v22/widget_chat_input.xml
index cc3335ff3f..c6e13b467d 100644
--- a/app/src/main/res/layout-v22/widget_chat_input.xml
+++ b/app/src/main/res/layout-v22/widget_chat_input.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/chat_input_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/chat_input_container" style="@style/UiKit_ViewGroup_LinearLayout">
     <include android:id="@+id/guard" layout="@layout/widget_chat_input_guard"/>
     <include android:id="@+id/guard_member_verification" layout="@layout/widget_chat_input_member_verification_guard"/>
-    <LinearLayout android:id="@+id/chat_input_wrap" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:id="@+id/chat_input_wrap" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
         <LinearLayout android:orientation="vertical" android:id="@+id/chat_input_stickers_container" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="12dp" android:paddingRight="12dp" android:paddingBottom="4dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="12dp">
-            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_stickers_matching_header" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_stickers_matching_header" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
             <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_stickers_recycler" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="12dp"/>
-            <View style="@style/res_2131952416_uikit_divider"/>
+            <View style="@style/UiKit_Divider"/>
         </LinearLayout>
         <FrameLayout android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_emoji_matching_header" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="12dp" android:layout_marginVertical="8dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_emoji_matching_header" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="12dp" android:layout_marginVertical="8dp" style="@style/UiKit_TextView"/>
         </FrameLayout>
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_mentions_recycler" android:background="?attr/colorBackgroundSecondary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
         <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/chat_input_categories_recycler" android:background="?attr/colorBackgroundTertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingHorizontal="8dp"/>
         <include android:id="@+id/application_commands_root" android:visibility="gone" layout="@layout/widget_chat_input_application_commands"/>
         <RelativeLayout android:id="@+id/chat_input_context_bar" android:background="?attr/colorBackgroundSecondary" android:visibility="gone" android:layout_width="match_parent" android:layout_height="40dp">
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/chat_input_context_cancel" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="44dp" android:layout_height="match_parent" android:src="@drawable/ic_close_circle_nova_grey_24dp" android:scaleType="fitCenter" android:layout_centerVertical="true" android:paddingStart="12dp" android:paddingEnd="12dp" style="@style/res_2131952449_uikit_imageview_clickable"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/chat_input_context_description" android:layout_width="wrap_content" android:layout_height="match_parent" android:maxLines="1" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@+id/chat_input_context_reply_mention_button" android:layout_toEndOf="@+id/chat_input_context_cancel" style="@style/res_2131952563_uikit_textview"/>
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/chat_input_context_cancel" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="44dp" android:layout_height="match_parent" android:src="@drawable/ic_close_circle_nova_grey_24dp" android:scaleType="fitCenter" android:layout_centerVertical="true" android:paddingStart="12dp" android:paddingEnd="12dp" style="@style/UiKit_ImageView_Clickable"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/chat_input_context_description" android:layout_width="wrap_content" android:layout_height="match_parent" android:maxLines="1" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@+id/chat_input_context_reply_mention_button" android:layout_toEndOf="@+id/chat_input_context_cancel" style="@style/UiKit_TextView"/>
             <LinearLayout android:gravity="center" android:id="@+id/chat_input_context_reply_mention_button" android:background="?attr/selectableItemBackground" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_centerVertical="true" android:paddingStart="12dp" android:paddingEnd="12dp" android:layout_alignParentEnd="true">
                 <ImageView android:id="@+id/chat_input_context_reply_mention_button_image" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_mentions_white_24dp" android:contentDescription="@string/mention" app:tint="?attr/colorControlBrandForeground"/>
-                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/chat_input_context_reply_mention_button_text" android:text="@string/reply_mention_on" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
+                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/chat_input_context_reply_mention_button_text" android:text="@string/reply_mention_on" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
             </LinearLayout>
         </RelativeLayout>
         <androidx.fragment.app.FragmentContainerView android:name="com.lytefast.flexinput.fragment.FlexInputFragment" android:id="@+id/chat_input_widget" android:layout_width="match_parent" android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout-v22/widget_chat_input_application_commands.xml b/app/src/main/res/layout-v22/widget_chat_input_application_commands.xml
index fb88aa80a2..f0326b510e 100644
--- a/app/src/main/res/layout-v22/widget_chat_input_application_commands.xml
+++ b/app/src/main/res/layout-v22/widget_chat_input_application_commands.xml
@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content">
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_application_commands_recycler" android:scrollbars="none" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/divider" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0"/>
     <View android:id="@+id/divider" android:background="?attr/colorBackgroundFloating" android:layout_width="match_parent" android:layout_height="0.5dp" app:layout_constraintBottom_toTopOf="@+id/chat_input_application_commands_option_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0"/>
-    <TextView android:id="@+id/chat_input_application_commands_option_description" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:paddingVertical="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:id="@+id/chat_input_application_commands_option_description" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:paddingVertical="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_input_slash_loading_item.xml b/app/src/main/res/layout-v22/widget_chat_input_slash_loading_item.xml
index e9d92da8d7..9624bf3875 100644
--- a/app/src/main/res/layout-v22/widget_chat_input_slash_loading_item.xml
+++ b/app/src/main/res/layout-v22/widget_chat_input_slash_loading_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondaryAlt" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="4dp" android:layout_height="44dp" android:paddingHorizontal="16dp" android:paddingVertical="4dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondaryAlt" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="4dp" android:layout_height="44dp" android:paddingHorizontal="16dp" android:paddingVertical="4dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <View android:id="@+id/name_placeholder" android:background="@drawable/drawable_empty_text_placeholder_white" android:layout_width="0dp" android:layout_height="14dp" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintEnd_toEndOf="@+id/name_placeholder_end_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@+id/name_placeholder_end_guideline" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintGuide_percent="0.3"/>
     <View android:id="@+id/description_placeholder" android:background="@drawable/drawable_empty_text_placeholder_white" android:layout_width="0dp" android:layout_height="14dp" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/description_placeholder_end_guideline" app:layout_constraintStart_toStartOf="0"/>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_application_command.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_application_command.xml
index 5f0045e616..fbe7350f15 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_application_command.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_application_command.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:paddingTop="10dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
-    <ImageView android:id="@+id/chat_list_adapter_item_text_avatar" android:layout_width="@dimen/avatar_size_chat" android:layout_height="@dimen/avatar_size_medium" android:src="@drawable/ic_slash_command_24dp" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorTextMuted" style="@style/res_2131951672_avatar_chat"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/UiKit_Chat_Guideline"/>
+    <ImageView android:id="@+id/chat_list_adapter_item_text_avatar" android:layout_width="@dimen/avatar_size_chat" android:layout_height="@dimen/avatar_size_medium" android:src="@drawable/ic_slash_command_24dp" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorTextMuted" style="@style/Avatar_Chat"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:paddingBottom="2dp" android:layout_marginTop="1dp" android:lineSpacingMultiplier="1" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_name" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:paddingBottom="2dp" android:layout_marginTop="1dp" android:lineSpacingMultiplier="1" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_name" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.cardview.widget.CardView android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_decorator" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_header">
-        <TextView android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_command" android:background="?attr/selectableItemBackground" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:paddingHorizontal="8dp" android:paddingVertical="8dp" style="@style/res_2131952394_uikit_chat_text"/>
+        <TextView android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_command" android:background="?attr/selectableItemBackground" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:paddingHorizontal="8dp" android:paddingVertical="8dp" style="@style/UiKit_Chat_Text"/>
     </androidx.cardview.widget.CardView>
     <FrameLayout android:id="@+id/chat_list_adapter_item_text_decorator_reply_link_icon" android:visibility="visible" android:clipChildren="false" android:layout_width="34dp" android:layout_height="20dp" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_decorator" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_avatar">
         <com.discord.widgets.chat.list.ViewReplySpline android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="3dp" android:layout_marginStart="2dp" app:end_padding="2dp" app:orientation="vertical" app:tint="?attr/colorBackgroundAccent"/>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_call.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_call.xml
index d7cae3f642..9863e3b42e 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_call.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_call.xml
@@ -2,12 +2,12 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginTop="8dp" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginBottom="8dp" android:foreground="?attr/bg_pressed_highlight" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:strokeWidth="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" android:paddingVertical="8dp">
         <ImageView android:id="@+id/chat_list_adapter_item_call_icon" android:layout_width="24dp" android:layout_height="24dp" android:importantForAccessibility="no" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_call_title" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="16dp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_call_subtitle" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/sample_time_pm" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131951902_callmessage_subtitle"/>
-        <LinearLayout android:id="@+id/chat_list_adapter_item_call_unjoined_ongoing_subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_unjoined_call_duration" android:layout_width="wrap_content" style="@style/res_2131951902_callmessage_subtitle"/>
-            <TextView android:textSize="12dp" android:layout_width="wrap_content" android:text="@string/ongoing_call_tap_to_join" android:paddingStart="2dp" style="@style/res_2131951902_callmessage_subtitle"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_call_title" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="16dp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_call_subtitle" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/sample_time_pm" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/CallMessage_Subtitle"/>
+        <LinearLayout android:id="@+id/chat_list_adapter_item_call_unjoined_ongoing_subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_unjoined_call_duration" android:layout_width="wrap_content" style="@style/CallMessage_Subtitle"/>
+            <TextView android:textSize="12dp" android:layout_width="wrap_content" android:text="@string/ongoing_call_tap_to_join" android:paddingStart="2dp" style="@style/CallMessage_Subtitle"/>
         </LinearLayout>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_list_adapter_item_call_participants" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_list_adapter_item_call_participants" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_embed.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_embed.xml
index d35189cbe1..652afcb5ce 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_embed.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_embed.xml
@@ -2,30 +2,30 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:background="?attr/theme_chat_mentioned_me" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="@color/status_yellow_500" android:visibility="gone" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_highlighted_bg"/>
-    <com.google.android.material.card.MaterialCardView android:id="@+id/chat_list_item_embed_container_card" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" android:transitionGroup="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952388_uikit_chat_embed_cardview">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <com.google.android.material.card.MaterialCardView android:id="@+id/chat_list_item_embed_container_card" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" android:transitionGroup="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_CardView">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_ViewGroup_ConstraintLayout">
             <View android:id="@+id/chat_list_item_embed_divider" android:background="?attr/colorBackgroundModifierAccent" android:layout_width="3dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image_thumbnail" android:visibility="gone" android:layout_margin="4dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="8dp" style="@style/res_2131952448_uikit_imageview"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image_thumbnail" android:visibility="gone" android:layout_margin="4dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="8dp" style="@style/UiKit_ImageView"/>
             <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/chat_list_item_embed_content" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="8dp" android:paddingEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="0">
-                <TextView android:textSize="10sp" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_item_embed_provider" android:background="?attr/selectableItemBackground" android:visibility="gone" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:textSize="10sp" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_item_embed_provider" android:background="?attr/selectableItemBackground" android:visibility="gone" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_author_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" app:layout_constraintBottom_toBottomOf="@+id/chat_list_item_embed_author_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_item_embed_author_text" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="2dp"/>
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_marginStart="@dimen/embed_item_margin" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" app:layout_goneMarginTop="0dp" style="@style/res_2131952579_uikit_textview_semibold"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_title" android:background="?attr/selectableItemBackground" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_author_text" style="@style/res_2131952579_uikit_textview_semibold"/>
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_marginStart="@dimen/embed_item_margin" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" app:layout_goneMarginTop="0dp" style="@style/UiKit_TextView_Semibold"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_title" android:background="?attr/selectableItemBackground" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_author_text" style="@style/UiKit_TextView_Semibold"/>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/chat_list_item_embed_barrier_header" android:layout_width="0dp" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="chat_list_item_embed_title,                                                chat_list_item_embed_author_text,                                                chat_list_item_embed_provider"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_item_embed_description" android:background="?attr/selectableItemBackground" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_header" style="@style/res_2131952563_uikit_textview"/>
-                <LinearLayout android:id="@+id/chat_list_item_embed_fields" android:layout_width="match_parent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_description" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_item_embed_description" android:background="?attr/selectableItemBackground" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_header" style="@style/UiKit_TextView"/>
+                <LinearLayout android:id="@+id/chat_list_item_embed_fields" android:layout_width="match_parent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_description" style="@style/UiKit_ViewGroup_LinearLayout"/>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/chat_list_item_embed_barrier_data" android:layout_width="0dp" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="chat_list_item_embed_barrier_header,                                                chat_list_item_embed_description,                                                chat_list_item_embed_fields"/>
-                <androidx.cardview.widget.CardView android:id="@+id/embed_image_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginVertical="4dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constraintHorizontal_bias="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_data" style="@style/res_2131952589_uikit_viewgroup">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundModifierAccent" app:roundedCornerRadius="2dp" style="@style/res_2131952448_uikit_imageview"/>
+                <androidx.cardview.widget.CardView android:id="@+id/embed_image_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginVertical="4dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constraintHorizontal_bias="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_data" style="@style/UiKit_ViewGroup">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundModifierAccent" app:roundedCornerRadius="2dp" style="@style/UiKit_ImageView"/>
                     <ImageView android:layout_gravity="center" android:id="@+id/chat_list_item_embed_image_icons" android:background="@drawable/drawable_circle_primary_900" android:padding="8dp" android:visibility="gone" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:src="@drawable/ic_play_arrow_24dp" android:scaleType="fitXY" android:alpha="0.6" android:importantForAccessibility="no" app:tint="@color/white"/>
                 </androidx.cardview.widget.CardView>
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_footer_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" android:layout_marginEnd="@dimen/embed_item_margin" app:layout_constraintBottom_toBottomOf="@+id/chat_list_item_embed_footer_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_item_embed_footer_text" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="2dp"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_item_embed_footer_text" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintTop_toBottomOf="@+id/embed_image_container" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_item_embed_footer_text" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintTop_toBottomOf="@+id/embed_image_container" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" style="@style/UiKit_TextView_Semibold"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
             <com.discord.widgets.chat.list.InlineMediaView android:id="@+id/embed_inline_media" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
             <FrameLayout android:id="@+id/chat_list_item_embed_spoiler" android:background="?attr/theme_chat_spoiler_bg" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="0">
                 <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="?attr/colorBackgroundFloating" app:cardCornerRadius="16dp">
-                    <TextView android:textColor="?attr/colorTextNormal" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/spoiler" android:textAllCaps="true" style="@style/res_2131952567_uikit_textview_h2"/>
+                    <TextView android:textColor="?attr/colorTextNormal" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/spoiler" android:textAllCaps="true" style="@style/UiKit_TextView_H2"/>
                 </androidx.cardview.widget.CardView>
             </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_ephemeral_message.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_ephemeral_message.xml
index b76c0fe749..2c4b5c2e89 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_ephemeral_message.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_ephemeral_message.xml
@@ -3,9 +3,9 @@
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:background="?attr/theme_chat_mentioned_me" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="@color/status_yellow_500" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
+        <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/UiKit_Chat_Guideline"/>
         <ImageView android:id="@+id/chat_list_adapter_item_visibility_icon" android:visibility="visible" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_spectate" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_dismiss" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_dismiss" app:tint="?attr/colorTextMuted"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/chat_list_adapter_item_text_dismiss" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/only_you_can_see_and_delete_these" android:layout_marginStart="28dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_icon_help" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/chat_list_adapter_item_text_dismiss" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/only_you_can_see_and_delete_these" android:layout_marginStart="28dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_icon_help" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
         <ImageView android:id="@+id/chat_list_adapter_item_icon_help" android:visibility="visible" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_help_24dp" android:contentDescription="@string/age_gate_view_help_article" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_dismiss" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_dismiss" app:tint="?attr/colorTextMuted"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_invite.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_invite.xml
index 8bc6f1fa40..44aeea16bd 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_invite.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_invite.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/res_2131952389_uikit_chat_embed_container">
-    <TextView android:id="@+id/item_invite_header" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/invite_button_resolving" app:layout_constraintBottom_toTopOf="@+id/barrier_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952391_uikit_chat_embed_header"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/UiKit_Chat_Embed_Container">
+    <TextView android:id="@+id/item_invite_header" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/invite_button_resolving" app:layout_constraintBottom_toTopOf="@+id/barrier_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_Header"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier_header" android:layout_width="0dp" android:layout_height="wrap_content" app:barrierDirection="2" app:constraint_referenced_ids="item_invite_image, item_invite_name"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_invite_image" android:layout_width="42dp" android:layout_height="42dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/barrier_button" app:layout_constraintEnd_toEndOf="@+id/item_invite_name" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier_header" app:layout_constraintVertical_bias="0" app:roundAsCircle="true" app:roundWithOverlayColor="?attr/primary_630"/>
-    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="42dp" android:layout_height="42dp" android:maxLines="1" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_button_layout" app:layout_constraintEnd_toEndOf="@+id/item_invite_image" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" app:layout_constraintVertical_bias="0" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_invite_name" android:layout_width="0dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/item_invite_channel_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/barrier_header" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952573_uikit_textview_marquee"/>
-    <TextView android:gravity="center_vertical" android:id="@+id/item_invite_channel_name" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_voice_16dp" app:drawableTint="?attr/colorChannelDefault" app:layout_constraintBottom_toTopOf="@+id/item_invite_member_container" app:layout_constraintEnd_toEndOf="@+id/item_invite_name" app:layout_constraintStart_toStartOf="@+id/item_invite_name" app:layout_constraintTop_toBottomOf="@+id/item_invite_name" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952392_uikit_chat_embed_subtext"/>
+    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="42dp" android:layout_height="42dp" android:maxLines="1" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_button_layout" app:layout_constraintEnd_toEndOf="@+id/item_invite_image" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" app:layout_constraintVertical_bias="0" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_invite_name" android:layout_width="0dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/item_invite_channel_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/barrier_header" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Marquee"/>
+    <TextView android:gravity="center_vertical" android:id="@+id/item_invite_channel_name" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_voice_16dp" app:drawableTint="?attr/colorChannelDefault" app:layout_constraintBottom_toTopOf="@+id/item_invite_member_container" app:layout_constraintEnd_toEndOf="@+id/item_invite_name" app:layout_constraintStart_toStartOf="@+id/item_invite_name" app:layout_constraintTop_toBottomOf="@+id/item_invite_name" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_Chat_Embed_Subtext"/>
     <include android:id="@+id/item_invite_member_container" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/barrier_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/item_invite_channel_name" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" layout="@layout/view_server_member_count"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier_button" android:layout_width="0dp" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="item_invite_member_container, item_invite_image"/>
     <FrameLayout android:id="@+id/item_invite_button_layout" android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/join_guild" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="@+id/item_invite_hub_layout" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier_button" app:layout_constraintVertical_bias="0">
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_joined_button" android:visibility="gone" android:text="@string/joined_guild" style="@style/res_2131952469_uikit_material_button_secondary_outline"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:text="@string/join_guild" style="@style/res_2131952460_uikit_material_button_green"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_mention_button" android:visibility="gone" android:text="@string/mention" style="@style/res_2131952458_uikit_material_button"/>
-        <View android:id="@+id/item_invite_loading_button" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36dp" android:layout_marginTop="8dp" android:text="@string/mention" style="@style/res_2131952589_uikit_viewgroup"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_joined_button" android:visibility="gone" android:text="@string/joined_guild" style="@style/UiKit_Material_Button_Secondary_Outline"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:text="@string/join_guild" style="@style/UiKit_Material_Button_Green"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_mention_button" android:visibility="gone" android:text="@string/mention" style="@style/UiKit_Material_Button"/>
+        <View android:id="@+id/item_invite_loading_button" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36dp" android:layout_marginTop="8dp" android:text="@string/mention" style="@style/UiKit_ViewGroup"/>
     </FrameLayout>
     <FrameLayout android:id="@+id/item_invite_hub_layout" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_button_layout">
         <View android:background="?attr/colorBackgroundModifierAccent" android:layout_width="match_parent" android:layout_height="1dp"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/item_invite_hub_link" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hub_invite_another_school_link" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/item_invite_hub_link" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hub_invite_another_school_link" style="@style/UiKit_TextView"/>
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_single_line_message_preview.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_single_line_message_preview.xml
index 153ab2b589..1314c9a4da 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_single_line_message_preview.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_single_line_message_preview.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="50dp">
-    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/report_message_top_guideline" app:layout_constraintGuide_begin="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_start_guideline" app:layout_constraintGuide_begin="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_end_guideline" app:layout_constraintGuide_end="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginEnd="4dp" app:layout_constraintStart_toStartOf="@+id/report_message_start_guideline" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/res_2131951677_avatar_small"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_chat_attachment_icon" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/res_2131952580_uikit_textview_singleline"/>
+    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/report_message_top_guideline" app:layout_constraintGuide_begin="16dp" style="@style/UiKit_Guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_start_guideline" app:layout_constraintGuide_begin="16dp" style="@style/UiKit_Guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_end_guideline" app:layout_constraintGuide_end="16dp" style="@style/UiKit_Guideline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginEnd="4dp" app:layout_constraintStart_toStartOf="@+id/report_message_start_guideline" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/Avatar_Small"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/UiKit_TextView_Semibold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_chat_attachment_icon" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/UiKit_TextView_SingleLine"/>
     <ImageView android:id="@+id/chat_list_adapter_item_chat_attachment_icon" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginTop="2dp" android:src="@drawable/ic_gallery_24dp" android:importantForAccessibility="no" app:layout_constraintEnd_toEndOf="@+id/report_message_end_guideline" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" app:tint="?attr/colorInteractiveNormal"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_stage_invite.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_stage_invite.xml
index dcdf9fe50c..81f367cf00 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_stage_invite.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_stage_invite.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/res_2131952389_uikit_chat_embed_container">
-    <TextView android:textColor="?attr/colorStatusPositiveBackground" android:id="@+id/item_invite_header" android:layout_marginBottom="8dp" android:text="@string/stage_channel_live_now" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/stage_channel_live_dot" app:drawableTint="?attr/colorStatusPositiveBackground" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952391_uikit_chat_embed_header"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/UiKit_Chat_Embed_Container">
+    <TextView android:textColor="?attr/colorStatusPositiveBackground" android:id="@+id/item_invite_header" android:layout_marginBottom="8dp" android:text="@string/stage_channel_live_now" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/stage_channel_live_dot" app:drawableTint="?attr/colorStatusPositiveBackground" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_Header"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_invite_image" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="12dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" app:roundWithOverlayColor="?attr/primary_630" app:roundedCornerRadius="4dp"/>
-    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="12dp" android:maxLines="1" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_invite_guild_name" android:layout_width="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toStartOf="@+id/item_listeners_count" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/res_2131952573_uikit_textview_marquee"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorInteractiveNormal" android:gravity="center_vertical" android:id="@+id/item_listeners_count" android:background="@drawable/drawable_pill_background_tertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:drawablePadding="5dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:paddingHorizontal="8dp" app:drawableStartCompat="@drawable/ic_headset_10dp" app:drawableTint="?attr/colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/item_invite_channel_topic" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_guild_name" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="12dp" android:maxLines="1" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_invite_guild_name" android:layout_width="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toStartOf="@+id/item_listeners_count" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/UiKit_TextView_Marquee"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorInteractiveNormal" android:gravity="center_vertical" android:id="@+id/item_listeners_count" android:background="@drawable/drawable_pill_background_tertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:drawablePadding="5dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:paddingHorizontal="8dp" app:drawableStartCompat="@drawable/ic_headset_10dp" app:drawableTint="?attr/colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/item_invite_channel_topic" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_guild_name" style="@style/UiKit_TextView_Semibold"/>
     <com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView android:id="@+id/stage_discovery_speakers_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="4dp" android:layout_marginHorizontal="12dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_channel_topic"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:layout_margin="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_speakers_view" app:layout_goneMarginTop="8dp" style="@style/res_2131952460_uikit_material_button_green"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:layout_margin="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_speakers_view" app:layout_goneMarginTop="8dp" style="@style/UiKit_Material_Button_Green"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_sticker_greet_compact.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_sticker_greet_compact.xml
index 24b2739adc..2f764f602c 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_sticker_greet_compact.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_sticker_greet_compact.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <LinearLayout android:gravity="center" android:orientation="horizontal" android:id="@+id/send_sticker_greet_button" android:background="@drawable/bg_chat_sticker_greet_button" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="8dp" android:paddingEnd="12dp" android:elevation="@dimen/app_elevation" android:paddingVertical="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
         <com.discord.views.sticker.StickerView android:id="@+id/chat_list_adapter_item_sticker_greet" android:layout_width="@dimen/sticker_length_sm" android:layout_height="@dimen/sticker_length_sm"/>
-        <TextView android:id="@+id/chat_list_adapter_item_sticker_greet_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952567_uikit_textview_h2"/>
+        <TextView android:id="@+id/chat_list_adapter_item_sticker_greet_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_H2"/>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_system.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_system.xml
index aea641424a..1b6a6a761d 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_system.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_system.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_margin">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/UiKit_Chat_Guideline"/>
     <ImageView android:id="@+id/system_icon" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:layout_marginTop="3dp" android:importantForAccessibility="no" android:layout_marginStart="18dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <LinearLayout android:orientation="vertical" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
-        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorTextNormal" android:id="@+id/system_text" android:layout_width="match_parent" android:lineSpacingMultiplier="1" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/system_timestamp" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:text="@string/sample_time_pm" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorTextNormal" android:id="@+id/system_text" android:layout_width="match_parent" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/system_timestamp" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:text="@string/sample_time_pm" android:singleLine="true" style="@style/UiKit_TextView"/>
         <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/system_welcome_cta_button" android:background="@drawable/system_cta_bg" android:paddingLeft="12dp" android:paddingTop="4dp" android:paddingRight="12dp" android:paddingBottom="4dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:foreground="?attr/selectableItemBackgroundBorderless" android:paddingHorizontal="12dp" android:paddingVertical="4dp">
             <com.discord.views.sticker.StickerView android:id="@+id/system_welecome_cta_button_sticker" android:layout_width="32dp" android:layout_height="32dp"/>
-            <TextView android:textColor="@color/white" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/welcome_cta_label" android:layout_marginStart="4dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <TextView android:textColor="@color/white" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/welcome_cta_label" android:layout_marginStart="4dp" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
     </LinearLayout>
     <androidx.appcompat.widget.AppCompatImageView android:id="@+id/chat_list_adapter_item_thread_embed_spine" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginTop="4dp" android:src="@drawable/thread_embed_spine_drawable" android:layout_marginStart="@dimen/chat_list_spine_margin" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/system_icon"/>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_text.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_text.xml
index b542495cf6..da64c15cda 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_text.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_text.xml
@@ -5,7 +5,7 @@
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="?attr/color_brand" android:visibility="gone" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_highlighted_bg"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/thread_starter_message_header" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
         <ImageView android:id="@+id/thread_starter_message_header_icon" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_channel_text" android:contentDescription="@string/channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/thread_starter_message_header_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/thread_starter_message_original_message" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/thread_starter_message_header_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/thread_starter_message_header_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/thread_starter_message_original_message" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/thread_starter_message_header_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <FrameLayout android:id="@+id/chat_list_adapter_item_text_decorator_reply_link_icon" android:clipChildren="false" android:layout_width="32dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_decorator" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_decorator" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_decorator">
         <com.discord.widgets.chat.list.ViewReplySpline android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="7dp" app:end_padding="2dp" app:tint="?attr/colorBackgroundAccent"/>
@@ -13,21 +13,21 @@
     <androidx.appcompat.widget.AppCompatImageView android:id="@+id/chat_list_adapter_item_thread_embed_spine" android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginTop="4dp" android:src="@drawable/thread_embed_spine_drawable" android:layout_marginStart="@dimen/chat_list_spine_margin" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_avatar"/>
     <FrameLayout android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_decorator" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:minHeight="18dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginVertical="4dp" app:layout_constraintBottom_toTopOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintLeft_toLeftOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_starter_message_header">
         <LinearLayout android:id="@+id/chat_list_adapter_item_reply_leading_views" android:layout_width="wrap_content" android:layout_height="wrap_content">
-            <ImageView android:id="@+id/chat_list_adapter_item_text_decorator_reply_icon" android:background="@drawable/drawable_circle_black" android:padding="2dp" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_reply_24dp" android:contentDescription="@null" android:layout_marginEnd="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:layout_marginEnd="4dp" style="@style/res_2131951672_avatar_chat"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="4dp" style="@style/res_2131952563_uikit_textview"/>
+            <ImageView android:id="@+id/chat_list_adapter_item_text_decorator_reply_icon" android:background="@drawable/drawable_circle_black" android:padding="2dp" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_reply_24dp" android:contentDescription="@null" android:layout_marginEnd="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:layout_marginEnd="4dp" style="@style/Avatar_Chat"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="4dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_reply_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:alpha="0.64" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_reply_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:alpha="0.64" style="@style/UiKit_TextView"/>
     </FrameLayout>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_decorator" style="@style/res_2131952393_uikit_chat_guideline"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_header" style="@style/res_2131951672_avatar_chat"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_decorator" style="@style/UiKit_Chat_Guideline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_header" style="@style/Avatar_Chat"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/chat_list_adapter_item_text_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_avatar">
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="wrap_content" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@+id/chat_list_adapter_item_text_tag" android:background="@drawable/drawable_button_brand_neutral" android:paddingLeft="3dp" android:paddingTop="0.5dp" android:paddingRight="3dp" android:paddingBottom="0.5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:text="TAG" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_tag" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="wrap_content" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
+        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@+id/chat_list_adapter_item_text_tag" android:background="@drawable/drawable_button_brand_neutral" android:paddingLeft="3dp" android:paddingTop="0.5dp" android:paddingRight="3dp" android:paddingBottom="0.5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:text="TAG" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_tag" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_adapter_item_text" android:visibility="visible" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_header" style="@style/res_2131952394_uikit_chat_text"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_adapter_item_text" android:visibility="visible" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_header" style="@style/UiKit_Chat_Text"/>
     <com.discord.views.typing.TypingDots android:id="@+id/chat_overlay_typing_dots" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="24dp" android:layout_height="match_parent" android:alpha="0.7" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text"/>
     <ImageView android:id="@+id/chat_list_adapter_item_text_error" android:visibility="gone" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_alert_circle_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_loading" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_loading" app:tint="?attr/colorError"/>
-    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_adapter_item_text_loading" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginStart="28dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text" style="@style/res_2131952394_uikit_chat_text"/>
+    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_adapter_item_text_loading" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginStart="28dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text" style="@style/UiKit_Chat_Text"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_thread_draft_form.xml b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_thread_draft_form.xml
index 92155155a3..58127ccfe5 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_adapter_item_thread_draft_form.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_adapter_item_thread_draft_form.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:paddingTop="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952388_uikit_chat_embed_cardview">
-    <ImageView android:id="@+id/thread_icon" android:background="@drawable/drawable_circle_black" android:padding="16dp" android:layout_width="64dp" android:layout_height="64dp" android:src="@drawable/ic_thread" android:contentDescription="@string/thread" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary" style="@style/res_2131951677_avatar_small"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/thread_name_input" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:hint="@string/thread_name" android:imeOptions="actionNext" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:paddingTop="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_Chat_Embed_CardView">
+    <ImageView android:id="@+id/thread_icon" android:background="@drawable/drawable_circle_black" android:padding="16dp" android:layout_width="64dp" android:layout_height="64dp" android:src="@drawable/ic_thread" android:contentDescription="@string/thread" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary" style="@style/Avatar_Small"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/thread_name_input" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:hint="@string/thread_name" android:imeOptions="actionNext" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
     </com.google.android.material.textfield.TextInputLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/private_thread_toggle" android:background="@drawable/rounded_rectangle_4dp_radius" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:backgroundTint="?attr/colorBackgroundSecondary">
-        <LinearLayout android:id="@+id/private_thread_toggle_text" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/private_thread_toggle_switch" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginBottom="2dp" android:text="@string/private_thread" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:id="@+id/private_thread_toggle_badge" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_height="wrap_content" android:text="@string/guild_settings_premium_guild_unlocked" android:drawablePadding="4dp" android:textAllCaps="true" android:layout_marginStart="4dp" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" android:paddingHorizontal="4dp" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <LinearLayout android:id="@+id/private_thread_toggle_text" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/private_thread_toggle_switch" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginBottom="2dp" android:text="@string/private_thread" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:id="@+id/private_thread_toggle_badge" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_height="wrap_content" android:text="@string/guild_settings_premium_guild_unlocked" android:drawablePadding="4dp" android:textAllCaps="true" android:layout_marginStart="4dp" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" android:paddingHorizontal="4dp" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/UiKit_TextView_Semibold"/>
             </LinearLayout>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:text="@string/form_private_thread_description" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:text="@string/form_private_thread_description" style="@style/UiKit_TextView"/>
         </LinearLayout>
         <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/private_thread_toggle_switch" android:clickable="false" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/private_thread_toggle_text" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <TextView android:text="@string/create_thread_header_1" style="@style/res_2131952570_uikit_textview_large"/>
-    <TextView android:id="@+id/auto_archive_duration" android:text="@string/create_thread_header_2" style="@style/res_2131952570_uikit_textview_large"/>
+    <TextView android:text="@string/create_thread_header_1" style="@style/UiKit_TextView_Large"/>
+    <TextView android:id="@+id/auto_archive_duration" android:text="@string/create_thread_header_2" style="@style/UiKit_TextView_Large"/>
     <View android:id="@+id/divider_stroke" android:background="?attr/colorBackgroundAccent" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_marginTop="16dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_bot_ui_button_component.xml b/app/src/main/res/layout-v22/widget_chat_list_bot_ui_button_component.xml
index a686fcddcd..c34d9ff2ee 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_bot_ui_button_component.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_bot_ui_button_component.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.discord.widgets.botuikit.views.ButtonComponentView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <com.google.android.material.button.MaterialButton android:id="@+id/button" android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="36dp" android:insetLeft="0dp" android:insetRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/button" android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="36dp" android:insetLeft="0dp" android:insetRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button_Secondary"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/emoji" android:visibility="visible" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginStart="16dp" android:elevation="12dp" app:actualImageScaleType="2" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textColor="@color/white" android:ellipsize="end" android:id="@+id/label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:elevation="12dp" android:paddingHorizontal="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/link_icon" app:layout_constraintStart_toEndOf="@+id/emoji" app:layout_constraintTop_toTopOf="0"/>
+    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/UiKit_TextAppearance_Button" android:textColor="@color/white" android:ellipsize="end" android:id="@+id/label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:elevation="12dp" android:paddingHorizontal="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/link_icon" app:layout_constraintStart_toEndOf="@+id/emoji" app:layout_constraintTop_toTopOf="0"/>
     <androidx.appcompat.widget.AppCompatImageView android:id="@+id/link_icon" android:visibility="visible" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_launch_24dp" android:layout_marginEnd="16dp" android:elevation="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/label" app:layout_constraintTop_toTopOf="0"/>
     <com.discord.views.typing.TypingDots android:id="@+id/loading_dots" android:layout_width="24dp" android:layout_height="wrap_content" android:elevation="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
 </com.discord.widgets.botuikit.views.ButtonComponentView>
diff --git a/app/src/main/res/layout-v22/widget_chat_list_bot_ui_select_component_pill.xml b/app/src/main/res/layout-v22/widget_chat_list_bot_ui_select_component_pill.xml
index 99cba1bbd0..a655a915f5 100644
--- a/app/src/main/res/layout-v22/widget_chat_list_bot_ui_select_component_pill.xml
+++ b/app/src/main/res/layout-v22/widget_chat_list_bot_ui_select_component_pill.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android" android:ellipsize="end" android:background="@drawable/bg_bot_ui_component_select_pill" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:paddingHorizontal="8dp" android:paddingVertical="2dp" style="@style/res_2131952563_uikit_textview"/>
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android" android:ellipsize="end" android:background="@drawable/bg_bot_ui_component_select_pill" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:paddingHorizontal="8dp" android:paddingVertical="2dp" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout-v22/widget_create_channel_add_member.xml b/app/src/main/res/layout-v22/widget_create_channel_add_member.xml
index 5b9352047a..ff40b4c92c 100644
--- a/app/src/main/res/layout-v22/widget_create_channel_add_member.xml
+++ b/app/src/main/res/layout-v22/widget_create_channel_add_member.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/channel_permissions_moderator_description" android:paddingHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/channel_permissions_moderator_description" android:paddingHorizontal="16dp" style="@style/UiKit_TextView"/>
     <androidx.fragment.app.FragmentContainerView android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_discovery.xml b/app/src/main/res/layout-v22/widget_discovery.xml
index 0d439ab8c8..a3d17101ea 100644
--- a/app/src/main/res/layout-v22/widget_discovery.xml
+++ b/app/src/main/res/layout-v22/widget_discovery.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textAppearance="@style/res_2131952544_uikit_textappearance_toolbar_title" android:id="@+id/discovery_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_discovery_guild_sidebar_live_stages_category" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textAppearance="@style/res_2131952543_uikit_textappearance_toolbar_subtitle" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/discovery_start_stage" android:padding="16dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/start_stage_button_text_mobile" android:textAllCaps="false" android:fontFamily="?attr/font_primary_normal" app:layout_constraintBottom_toBottomOf="@+id/discovery_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/discovery_title"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Title" android:id="@+id/discovery_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_discovery_guild_sidebar_live_stages_category" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Subtitle" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/discovery_start_stage" android:padding="16dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/start_stage_button_text_mobile" android:textAllCaps="false" android:fontFamily="?attr/font_primary_normal" app:layout_constraintBottom_toBottomOf="@+id/discovery_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/discovery_title"/>
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipe_refresh_layout" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_title">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/discovery_recycler" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/discovery_recycler" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/discovery_empty_state" android:layout_width="match_parent" android:layout_height="match_parent">
         <ImageView android:id="@+id/discovery_empty_state_wumpus" android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/discovery_empty_state_header" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" app:srcCompat="@drawable/discovery_empty_state"/>
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:gravity="center" android:id="@+id/discovery_empty_state_header" android:layout_width="0dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_no_results_header" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/discovery_empty_state_subheader" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_wumpus" app:layout_constraintWidth_percent="0.7" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discovery_empty_state_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/stage_discovery_no_results_subheader" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_header" style="@style/res_2131952574_uikit_textview_medium"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:gravity="center" android:id="@+id/discovery_empty_state_header" android:layout_width="0dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_no_results_header" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/discovery_empty_state_subheader" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_wumpus" app:layout_constraintWidth_percent="0.7" style="@style/UiKit_TextView_Large"/>
+        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discovery_empty_state_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/stage_discovery_no_results_subheader" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_header" style="@style/UiKit_TextView_Medium"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_discovery_intro_card.xml b/app/src/main/res/layout-v22/widget_discovery_intro_card.xml
index 6e404b1604..3a81f65b9a 100644
--- a/app/src/main/res/layout-v22/widget_discovery_intro_card.xml
+++ b/app/src/main/res/layout-v22/widget_discovery_intro_card.xml
@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/drawable_discovery_intro_card_bg" android:scaleType="fitXY" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <ImageView android:layout_gravity="end" android:id="@+id/discovery_intro_card_dismiss" android:padding="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="12dp" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/dismiss" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_title" android:text="@string/stage_discovery_intro_card_header" app:layout_constraintBottom_toTopOf="@+id/discovery_intro_card_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.25" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_subtitle" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_intro_card_body" android:paddingHorizontal="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_intro_card_title" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_title" android:text="@string/stage_discovery_intro_card_header" app:layout_constraintBottom_toTopOf="@+id/discovery_intro_card_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.25" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_subtitle" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_intro_card_body" android:paddingHorizontal="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_intro_card_title" style="@style/UiKit_TextView_Medium"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_discovery_stage_card.xml b/app/src/main/res/layout-v22/widget_discovery_stage_card.xml
index 55b7eb458f..f3041f5181 100644
--- a/app/src/main/res/layout-v22/widget_discovery_stage_card.xml
+++ b/app/src/main/res/layout-v22/widget_discovery_stage_card.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/discovery_stage_card" android:background="@drawable/drawable_discovery_stage_card_bg" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/discovery_stage_card" android:background="@drawable/drawable_discovery_stage_card_bg" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
     <com.discord.views.discovery.DiscoveryStageCardTopHatView android:id="@+id/discovery_stage_card_top_hat" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" android:paddingVertical="8dp"/>
-    <View android:id="@+id/stage_card_top_hat_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/res_2131952416_uikit_divider"/>
+    <View android:id="@+id/stage_card_top_hat_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/UiKit_Divider"/>
     <com.discord.views.discovery.DiscoveryStageCardBodyView android:id="@+id/discovery_stage_card_body_view" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-    <View android:id="@+id/stage_card_controls_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/res_2131952416_uikit_divider"/>
+    <View android:id="@+id/stage_card_controls_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/UiKit_Divider"/>
     <com.discord.views.discovery.DiscoveryStageCardControlsView android:id="@+id/discovery_stage_card_controls" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp"/>
-    <TextView android:textColor="@color/status_red_400" android:id="@+id/discovery_stage_card_error" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/stage_discovery_connection_error_generic" android:paddingHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textColor="@color/status_red_400" android:id="@+id/discovery_stage_card_error" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/stage_discovery_connection_error_generic" android:paddingHorizontal="16dp" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_edit_profile_banner_sheet.xml b/app/src/main/res/layout-v22/widget_edit_profile_banner_sheet.xml
index 972c7920ac..9aa001f322 100644
--- a/app/src/main/res/layout-v22/widget_edit_profile_banner_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_edit_profile_banner_sheet.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:paddingBottom="4dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/banner_color_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" android:paddingVertical="12dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_banner_color_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/banner_color_item_description" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952456_uikit_listitem_title"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_color_description" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/banner_color_item_title" style="@style/res_2131952452_uikit_listitem_description"/>
-        <ImageView android:id="@+id/banner_color_preview" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/drawable_circle_black" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorBackgroundPrimary" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:paddingBottom="4dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/banner_color_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" android:paddingVertical="12dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_banner_color_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/banner_color_item_description" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem_Title"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_color_description" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/banner_color_item_title" style="@style/UiKit_ListItem_Description"/>
+        <ImageView android:id="@+id/banner_color_preview" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/drawable_circle_black" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorBackgroundPrimary" style="@style/UiKit_ImageView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <LinearLayout android:id="@+id/banner_change_image_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" android:paddingVertical="12dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_change_profile_banner" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952456_uikit_listitem_title"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_specs" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952452_uikit_listitem_description"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_settings_customization_upsell" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952461_uikit_material_button_green_fit"/>
+    <LinearLayout android:id="@+id/banner_change_image_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" android:paddingVertical="12dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_change_profile_banner" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ListItem_Title"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_specs" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ListItem_Description"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_settings_customization_upsell" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green_Fit"/>
     </LinearLayout>
-    <com.google.android.material.textview.MaterialTextView android:textColor="@color/status_red" android:id="@+id/banner_remove_image_item" android:background="?attr/bg_pressed_highlight" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/user_settings_remove_profile_banner" android:paddingHorizontal="16dp" android:paddingVertical="12dp" style="@style/res_2131952456_uikit_listitem_title"/>
+    <com.google.android.material.textview.MaterialTextView android:textColor="@color/status_red" android:id="@+id/banner_remove_image_item" android:background="?attr/bg_pressed_highlight" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/user_settings_remove_profile_banner" android:paddingHorizontal="16dp" android:paddingVertical="12dp" style="@style/UiKit_ListItem_Title"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_emoji_picker.xml b/app/src/main/res/layout-v22/widget_emoji_picker.xml
index 0a033f9cd7..1538d68a0d 100644
--- a/app/src/main/res/layout-v22/widget_emoji_picker.xml
+++ b/app/src/main/res/layout-v22/widget_emoji_picker.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/emoji_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/emoji_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <FrameLayout android:id="@+id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:animateLayoutChanges="true" android:backgroundTint="?attr/colorBackgroundTertiary">
-                <TextView android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/emoji_inline_search_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/res_2131952486_uikit_searchinput"/>
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/res_2131952486_uikit_searchinput"/>
-                <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/emoji_search_clear" android:src="@drawable/ic_search_16dp" android:contentDescription="@string/search_for_emoji" app:tint="?attr/colorTextMuted" style="@style/res_2131952487_uikit_searchinputclear"/>
+                <TextView android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/emoji_inline_search_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/UiKit_SearchInput"/>
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/UiKit_SearchInput"/>
+                <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/emoji_search_clear" android:src="@drawable/ic_search_16dp" android:contentDescription="@string/search_for_emoji" app:tint="?attr/colorTextMuted" style="@style/UiKit_SearchInputClear"/>
             </FrameLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_height="match_parent" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_marginHorizontal="12dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawablePadding="16dp" app:drawableTopCompat="?attr/theme_expression_tray_search_icon_empty" style="@style/res_2131952563_uikit_textview"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_height="match_parent" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_marginHorizontal="12dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawablePadding="16dp" app:drawableTopCompat="?attr/theme_expression_tray_search_icon_empty" style="@style/UiKit_TextView"/>
     </com.discord.app.AppViewFlipper>
-    <View android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/emoji_picker_bottom_bar" style="@style/res_2131952416_uikit_divider"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <View android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/emoji_picker_bottom_bar" style="@style/UiKit_Divider"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/emoji_picker_category_recycler" android:layout_width="0dp" android:layout_height="match_parent" app:layout_constraintEnd_toStartOf="@+id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="0"/>
         <androidx.constraintlayout.widget.Barrier android:id="@+id/emoji_picker_category_barrier" android:layout_width="0dp" android:layout_height="match_parent" app:barrierDirection="5" app:constraint_referenced_ids="emoji_picker_unicode_emoji_shortcut_button,emoji_picker_backspace_icon"/>
         <ImageView android:id="@+id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@+id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@+id/emoji_picker_category_barrier" app:tint="?attr/colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon"/>
diff --git a/app/src/main/res/layout-v22/widget_emoji_sheet.xml b/app/src/main/res/layout-v22/widget_emoji_sheet.xml
index 32993c5b05..a40743ff45 100644
--- a/app/src/main/res/layout-v22/widget_emoji_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_emoji_sheet.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_sheet_flipper" android:layout_width="match_parent" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-        <LinearLayout android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/emoji_iv" android:layout_width="48dp" android:layout_height="48dp" android:adjustViewBounds="true" android:layout_marginEnd="16dp" app:actualImageScaleType="2" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/name_tv" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/emoji_info_tv" android:layout_marginTop="4dp" style="@style/res_2131952563_uikit_textview"/>
+<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_sheet_flipper" android:layout_width="match_parent" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_Page_LinearLayout">
+        <LinearLayout android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/emoji_iv" android:layout_width="48dp" android:layout_height="48dp" android:adjustViewBounds="true" android:layout_marginEnd="16dp" app:actualImageScaleType="2" style="@style/UiKit_ImageView"/>
+            <LinearLayout android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/name_tv" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/emoji_info_tv" android:layout_marginTop="4dp" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
         <FrameLayout android:id="@+id/button_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp">
-            <com.google.android.material.button.MaterialButton android:id="@+id/join_btn" android:text="@string/nuf_join_server_button" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:gravity="center" android:id="@+id/premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952460_uikit_material_button_green"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/join_btn" android:text="@string/nuf_join_server_button" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:gravity="center" android:id="@+id/premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green"/>
         </FrameLayout>
         <FrameLayout android:id="@+id/favorite_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp">
-            <View android:layout_gravity="top" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952416_uikit_divider"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_add_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_add_to_favorites" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_remove_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_remove_from_favorites" style="@style/res_2131952464_uikit_material_button_red"/>
+            <View android:layout_gravity="top" android:background="?attr/colorBackgroundAccent" style="@style/UiKit_Divider"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_add_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_add_to_favorites" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_remove_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_remove_from_favorites" style="@style/UiKit_Material_Button_Red"/>
         </FrameLayout>
-        <LinearLayout android:id="@+id/guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952416_uikit_divider"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/bottom_header_tv" android:layout_marginTop="16dp" android:text="@string/emoji_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-            <LinearLayout android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:id="@+id/guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/UiKit_Divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/bottom_header_tv" android:layout_marginTop="16dp" android:text="@string/emoji_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+            <LinearLayout android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/guildAvatarWrap" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_iv" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guildAvatarText" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952563_uikit_textview"/>
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_iv" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/UiKit_ImageView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guildAvatarText" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit_TextView"/>
                 </FrameLayout>
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_name_tv" android:drawablePadding="8dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_info_tv" android:layout_marginTop="4dp" style="@style/res_2131952563_uikit_textview"/>
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_name_tv" android:drawablePadding="8dp" style="@style/UiKit_TextView_Bold"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_info_tv" android:layout_marginTop="4dp" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_end_stage_bottom_sheet.xml b/app/src/main/res/layout-v22/widget_end_stage_bottom_sheet.xml
index 7067ac38df..a7149d6cab 100644
--- a/app/src/main/res/layout-v22/widget_end_stage_bottom_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_end_stage_bottom_sheet.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:paddingLeft="16dp" android:paddingTop="24dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingHorizontal="16dp" android:paddingVertical="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:paddingLeft="16dp" android:paddingTop="24dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingHorizontal="16dp" android:paddingVertical="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" app:stv_subtitle="@string/explicit_end_stage_subtitle" app:stv_title="@string/explicit_end_stage_title"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/cancel" android:layout_marginTop="24dp" android:text="@string/explicit_end_stage_cancel" style="@style/res_2131952467_uikit_material_button_secondary"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/confirm" android:layout_marginTop="8dp" android:text="@string/explicit_end_stage_confirm_mobile" style="@style/res_2131952464_uikit_material_button_red"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/cancel" android:layout_marginTop="24dp" android:text="@string/explicit_end_stage_cancel" style="@style/UiKit_Material_Button_Secondary"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/confirm" android:layout_marginTop="8dp" android:text="@string/explicit_end_stage_confirm_mobile" style="@style/UiKit_Material_Button_Red"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout-v22/widget_expression_tray.xml b/app/src/main/res/layout-v22/widget_expression_tray.xml
index 19d3ed629b..2215b0c24b 100644
--- a/app/src/main/res/layout-v22/widget_expression_tray.xml
+++ b/app/src/main/res/layout-v22/widget_expression_tray.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/expression_tray_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.discord.utilities.views.ContentResizingCoordinatorLayout android:id="@+id/expression_tray_landing_page" style="@style/res_2131952602_uikit_viewgroup_page">
-        <com.google.android.material.appbar.AppBarLayout android:id="@+id/expression_tray_toolbar_layout" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/expression_tray_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.discord.utilities.views.ContentResizingCoordinatorLayout android:id="@+id/expression_tray_landing_page" style="@style/UiKit_ViewGroup_Page">
+        <com.google.android.material.appbar.AppBarLayout android:id="@+id/expression_tray_toolbar_layout" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
             <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/expression_tray_toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_scrollFlags="5">
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/expression_tray_segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/expression_tray_segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                         <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/expression_tray_emoji_card" android:contentDescription="@string/expression_picker_open_emoji_picker_a11y_label" app:segment_text="@string/expression_picker_emoji" style="@style/SegmentedControlTabCard"/>
                         <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/expression_tray_gif_card" android:contentDescription="@string/expression_picker_open_gif_picker_a11y_label" app:segment_text="@string/expression_picker_gif" style="@style/SegmentedControlTabCard"/>
                         <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/expression_tray_sticker_card" android:contentDescription="@string/expression_picker_open_sticker_picker_a11y_label" app:segment_text="@string/expression_picker_sticker" style="@style/SegmentedControlTabCard"/>
                     </com.discord.views.segmentedcontrol.SegmentedControlContainer>
                     <com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@+id/expression_tray_search_bar" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:foreground="?attr/bg_pressed_highlight" android:animateLayoutChanges="true" android:layout_marginHorizontal="12dp" app:bottomLeftRadius="4dp" app:bottomRightRadius="4dp" app:topLeftRadius="4dp" app:topRightRadius="4dp">
-                        <TextView android:gravity="center_vertical" android:id="@+id/expression_tray_search_button" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/res_2131952486_uikit_searchinput"/>
+                        <TextView android:gravity="center_vertical" android:id="@+id/expression_tray_search_button" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/UiKit_SearchInput"/>
                         <ImageView android:id="@+id/expression_tray_search_icon" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?attr/colorTextMuted"/>
                     </com.discord.utilities.view.rounded.RoundedRelativeLayout>
                 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_friends_list_contact_sync_upsell.xml b/app/src/main/res/layout-v22/widget_friends_list_contact_sync_upsell.xml
index 6ac3b5df60..8d710f75a0 100644
--- a/app/src/main/res/layout-v22/widget_friends_list_contact_sync_upsell.xml
+++ b/app/src/main/res/layout-v22/widget_friends_list_contact_sync_upsell.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/friends_list_contact_sync_upsell_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131951998_friendslist_contactsyncupsell_card">
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/friends_list_contact_sync_upsell_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/FriendsList_ContactSyncUpsell_Card">
     <androidx.constraintlayout.widget.ConstraintLayout android:padding="12dp" android:layout_width="match_parent" android:layout_height="wrap_content">
         <ImageView android:id="@+id/friends_list_contact_sync_upsell_icon" android:layout_width="40dp" android:layout_height="40dp" android:src="@drawable/ic_contact_sync_friends_list_upsell" android:contentDescription="@string/contact_sync_landing_title" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friends_list_contact_sync_upsell_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friends_list_contact_sync_upsell_subtitle" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friends_list_contact_sync_upsell_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_subtitle" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" app:layout_constraintTop_toBottomOf="@+id/friends_list_contact_sync_upsell_title" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friends_list_contact_sync_upsell_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friends_list_contact_sync_upsell_subtitle" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friends_list_contact_sync_upsell_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_subtitle" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" app:layout_constraintTop_toBottomOf="@+id/friends_list_contact_sync_upsell_title" style="@style/UiKit_TextView"/>
         <ImageView android:id="@+id/friends_list_contact_sync_upsell_arrow" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_arrow_right_24dp" android:contentDescription="@string/contact_sync_landing_title" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout-v22/widget_gif_category.xml b/app/src/main/res/layout-v22/widget_gif_category.xml
index 735ec42890..ff4ed2bbbe 100644
--- a/app/src/main/res/layout-v22/widget_gif_category.xml
+++ b/app/src/main/res/layout-v22/widget_gif_category.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.discord.utilities.views.ContentResizingCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/gif_category_container" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/colorBackgroundSecondary" style="@style/res_2131951638_apptheme_appbarlayout_flat">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/colorBackgroundSecondary" style="@style/AppTheme_AppBarLayout_Flat">
         <com.google.android.material.appbar.CollapsingToolbarLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_scrollFlags="5">
-            <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/gif_category_title" android:background="?attr/bg_pressed_highlight" android:padding="12dp" android:layout_width="match_parent" android:minHeight="56dp" app:drawableStartCompat="@drawable/ic_chevron_left_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/gif_category_title" android:background="?attr/bg_pressed_highlight" android:padding="12dp" android:layout_width="match_parent" android:minHeight="56dp" app:drawableStartCompat="@drawable/ic_chevron_left_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_category_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:visibility="gone" android:layout_height="match_parent" android:paddingHorizontal="12dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_category_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" android:paddingHorizontal="12dp" app:glv_is_staggered="true" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_category_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:visibility="gone" android:layout_height="match_parent" android:paddingHorizontal="12dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_category_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" android:paddingHorizontal="12dp" app:glv_is_staggered="true" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </com.discord.utilities.views.ContentResizingCoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_gif_picker_search.xml b/app/src/main/res/layout-v22/widget_gif_picker_search.xml
index aa427706de..09c697ac48 100644
--- a/app/src/main/res/layout-v22/widget_gif_picker_search.xml
+++ b/app/src/main/res/layout-v22/widget_gif_picker_search.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <com.discord.views.SearchInputView android:id="@+id/search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="16dp" android:layout_marginRight="12dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="12dp" android:layout_marginVertical="16dp" app:siv_hint="@string/search_tenor" app:siv_search_content_description="@string/search_tenor"/>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/gif_search_view_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_search_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" android:paddingHorizontal="12dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_search_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" android:paddingHorizontal="12dp" app:glv_is_staggered="true" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/gif_search_view_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_search_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" android:paddingHorizontal="12dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_search_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" android:paddingHorizontal="12dp" app:glv_is_staggered="true" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_global_status_indicator.xml b/app/src/main/res/layout-v22/widget_global_status_indicator.xml
index ccae8dcdaa..4ee3d4c3dc 100644
--- a/app/src/main/res/layout-v22/widget_global_status_indicator.xml
+++ b/app/src/main/res/layout-v22/widget_global_status_indicator.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/indicator" android:background="@color/status_green_600" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:paddingHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center" android:id="@+id/indicator_content" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <ImageView android:id="@+id/indicator_icon" android:layout_marginEnd="8dp" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/indicator_text" style="@style/res_2131952580_uikit_textview_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/indicator" android:background="@color/status_green_600" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:paddingHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center" android:id="@+id/indicator_content" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <ImageView android:id="@+id/indicator_icon" android:layout_marginEnd="8dp" style="@style/UiKit_ImageView"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/indicator_text" style="@style/UiKit_TextView_SingleLine"/>
     </LinearLayout>
-    <TextView android:textAppearance="@style/res_2131952543_uikit_textappearance_toolbar_subtitle" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/alert_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_alert_circle_16dp" app:drawableTint="@color/white" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <LinearLayout android:gravity="center" android:id="@+id/indicator_actions" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.google.android.material.button.MaterialButton android:id="@+id/indicator_decline" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_decline" android:layout_weight="1" style="@style/res_2131952474_uikit_material_button_white_outline"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Subtitle" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/alert_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_alert_circle_16dp" app:drawableTint="@color/white" style="@style/UiKit_TextView_SingleLine"/>
+    <LinearLayout android:gravity="center" android:id="@+id/indicator_actions" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.google.android.material.button.MaterialButton android:id="@+id/indicator_decline" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_decline" android:layout_weight="1" style="@style/UiKit_Material_Button_White_Outline"/>
         <Space android:layout_width="16dp" android:layout_height="0dp"/>
-        <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_600" android:id="@+id/indicator_accept" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_accept" android:layout_weight="1" style="@style/res_2131952473_uikit_material_button_white"/>
+        <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_600" android:id="@+id/indicator_accept" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_accept" android:layout_weight="1" style="@style/UiKit_Material_Button_White"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_clone.xml b/app/src/main/res/layout-v22/widget_guild_clone.xml
index c45a26229f..4ce5f18088 100644
--- a/app/src/main/res/layout-v22/widget_guild_clone.xml
+++ b/app/src/main/res/layout-v22/widget_guild_clone.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <com.discord.app.AppViewFlipper android:id="@+id/guild_create_flipper" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_resolving_title" style="@style/res_2131952567_uikit_textview_h2"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <com.discord.app.AppViewFlipper android:id="@+id/guild_create_flipper" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_resolving_title" style="@style/UiKit_TextView_H2"/>
                 <ProgressBar android:id="@+id/loading_button_progress" android:layout_width="30dp" android:layout_height="30dp"/>
             </LinearLayout>
-            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_title" style="@style/res_2131952567_uikit_textview_h2"/>
-                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_subtitle" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_title" style="@style/UiKit_TextView_H2"/>
+                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit_TextView_Subtext"/>
             </LinearLayout>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/guild_template_modal_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@+id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_template_32dp" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/guild_template_modal_title" style="@style/UiKit_TextView_H1_Bold"/>
+                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@+id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_template_32dp" style="@style/UiKit_TextView_Large_SingleLine"/>
                 <include android:layout_gravity="center" android:id="@+id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" layout="@layout/layout_icon_uploader"/>
-                <LinearLayout android:padding="16dp" style="@style/res_2131952402_uikit_copy">
-                    <TextView android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginBottom="8dp" android:text="@string/form_label_server_name" style="@style/res_2131952569_uikit_textview_h6"/>
-                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_create_name" android:hint="@string/form_placeholder_server_name" style="@style/res_2131952545_uikit_textinputlayout">
-                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="8dp" android:importantForAutofill="no" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+                <LinearLayout android:padding="16dp" style="@style/UiKit_Copy">
+                    <TextView android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginBottom="8dp" android:text="@string/form_label_server_name" style="@style/UiKit_TextView_H6"/>
+                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_create_name" android:hint="@string/form_placeholder_server_name" style="@style/UiKit_TextInputLayout">
+                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="8dp" android:importantForAutofill="no" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                     </com.google.android.material.textfield.TextInputLayout>
-                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/guild_create_guidelines" android:layout_marginLeft="0dp" android:layout_marginRight="0dp" android:layout_marginBottom="8dp" style="@style/res_2131952581_uikit_textview_subtext"/>
+                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/guild_create_guidelines" android:layout_marginLeft="0dp" android:layout_marginRight="0dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_Subtext"/>
                     <com.discord.views.LoadingButton android:id="@+id/guild_create_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100"/>
-                    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_create_protip" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_create_protip" style="@style/UiKit_TextView"/>
                 </LinearLayout>
-                <LinearLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_marginTop="16dp" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/res_2131952416_uikit_divider"/>
-                    <TextView android:text="@string/channels" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                <LinearLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_marginTop="16dp" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit_Divider"/>
+                    <TextView android:text="@string/channels" style="@style/UiKit_TextView_H1_Bold"/>
+                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit_TextView_Subtext"/>
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_LinearLayout">
                         <com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@+id/guild_template_preview_channels" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="8dp"/>
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout android:id="@+id/guild_template_preview_roles_layout" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:text="@string/guild_template_modal_roles_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                <LinearLayout android:id="@+id/guild_template_preview_roles_layout" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit_TextView_H1_Bold"/>
+                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit_TextView_Subtext"/>
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_LinearLayout">
                         <com.discord.widgets.roles.RolesListView android:id="@+id/guild_template_preview_roles" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="8dp"/>
                     </LinearLayout>
                 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_invite_info.xml b/app/src/main/res/layout-v22/widget_guild_invite_info.xml
index f7bf092c98..afae41a516 100644
--- a/app/src/main/res/layout-v22/widget_guild_invite_info.xml
+++ b/app/src/main/res/layout-v22/widget_guild_invite_info.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <RelativeLayout android:id="@+id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/UiKit_ViewGroup_LinearLayout">
+    <RelativeLayout android:id="@+id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
         <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="64dp">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar" style="@style/res_2131951673_avatar_hero"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar" style="@style/Avatar_Hero"/>
         </androidx.cardview.widget.CardView>
         <RelativeLayout android:id="@+id/invite_avatar_small_wrap" android:background="?attr/colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="-3dp" android:layout_alignParentBottom="true" android:layout_marginEnd="-3dp" android:layout_alignParentEnd="true"/>
     </RelativeLayout>
-    <ImageView android:id="@+id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96dp" android:layout_marginTop="16dp" android:layout_marginRight="96dp" android:layout_marginBottom="16dp" android:src="?attr/img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/res_2131952448_uikit_imageview"/>
-    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="18sp" android:id="@+id/invite_title" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-        <LinearLayout android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:paddingHorizontal="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <ImageView android:id="@+id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96dp" android:layout_marginTop="16dp" android:layout_marginRight="96dp" android:layout_marginBottom="16dp" android:src="?attr/img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit_ImageView"/>
+    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="18sp" android:id="@+id/invite_title" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+        <LinearLayout android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:paddingHorizontal="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@+id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23dp">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar_small" style="@style/res_2131951674_avatar_large"/>
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar_small" style="@style/Avatar_Large"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:textSize="26sp" android:textColor="?attr/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/invite_message" android:drawablePadding="4dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textSize="26sp" android:textColor="?attr/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/invite_message" android:drawablePadding="4dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@+id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
+        <LinearLayout android:gravity="center" android:id="@+id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
             <androidx.cardview.widget.CardView android:id="@+id/invite_members_online_wrap" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="30dp">
-                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_green_600" app:roundAsCircle="true"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
             <androidx.cardview.widget.CardView android:id="@+id/invite_members_total_wrap" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="30dp">
-                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_members_total" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_members_total" android:singleLine="true" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_invite_share_sheet.xml b/app/src/main/res/layout-v22/widget_guild_invite_share_sheet.xml
index fe967d0b57..63673c9fcc 100644
--- a/app/src/main/res/layout-v22/widget_guild_invite_share_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_guild_invite_share_sheet.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/root" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_height="match_parent" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-        <com.discord.app.AppViewFlipper android:id="@+id/suggestions_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+        <com.discord.app.AppViewFlipper android:id="@+id/suggestions_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
             <androidx.core.widget.NestedScrollView android:id="@+id/empty_state_scroller" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <androidx.constraintlayout.widget.ConstraintLayout android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                    <ImageView android:layout_gravity="center" android:id="@+id/empty_state_img" android:layout_marginTop="16dp" android:src="@drawable/drawable_invite_share_art_envelope" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_state_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/invite_empty_title" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_img" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/invite_empty_body" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_title" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/empty_state_invite_link" android:background="?attr/bg_clickable_rounded_4dp" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="56dp" android:layout_marginTop="16dp" android:text="@string/invite_link_example_verified" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" android:paddingHorizontal="16dp" app:layout_constraintEnd_toStartOf="@+id/empty_state_link_options" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_body" style="@style/res_2131952580_uikit_textview_singleline"/>
+                <androidx.constraintlayout.widget.ConstraintLayout android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                    <ImageView android:layout_gravity="center" android:id="@+id/empty_state_img" android:layout_marginTop="16dp" android:src="@drawable/drawable_invite_share_art_envelope" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_state_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/invite_empty_title" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_img" style="@style/UiKit_TextView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/invite_empty_body" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_title" style="@style/UiKit_TextView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/empty_state_invite_link" android:background="?attr/bg_clickable_rounded_4dp" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="56dp" android:layout_marginTop="16dp" android:text="@string/invite_link_example_verified" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" android:paddingHorizontal="16dp" app:layout_constraintEnd_toStartOf="@+id/empty_state_link_options" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_body" style="@style/UiKit_TextView_SingleLine"/>
                     <ImageButton android:id="@+id/empty_state_link_options" android:background="?attr/bg_clickable_rounded_4dp" android:padding="16dp" android:layout_width="56dp" android:layout_height="56dp" android:src="?attr/ic_settings" android:contentDescription="@string/link_settings" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/empty_state_invite_link"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_settings_subtext" android:layout_marginTop="8dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_invite_link" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <com.google.android.material.button.MaterialButton android:id="@+id/empty_state_share_btn" android:layout_marginTop="16dp" android:text="@string/share_link" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_settings_subtext" style="@style/res_2131952458_uikit_material_button"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_settings_subtext" android:layout_marginTop="8dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_invite_link" style="@style/UiKit_TextView_Subtext"/>
+                    <com.google.android.material.button.MaterialButton android:id="@+id/empty_state_share_btn" android:layout_marginTop="16dp" android:text="@string/share_link" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_settings_subtext" style="@style/UiKit_Material_Button"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.core.widget.NestedScrollView>
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_ConstraintLayout">
                 <com.discord.views.SearchInputView android:id="@+id/search_input" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toTopOf="@+id/search_barrier" app:layout_constraintEnd_toStartOf="@+id/share_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:siv_search_content_description="@string/invite_search_for_friends"/>
                 <androidx.cardview.widget.CardView android:id="@+id/share_button" android:layout_width="40dp" android:layout_height="0dp" android:foreground="?attr/bg_pressed_highlight" android:layout_marginEnd="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:layout_constraintBottom_toBottomOf="@+id/search_input" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/search_input" app:strokeWidth="0dp">
-                    <ImageView android:layout_gravity="center" android:src="@drawable/ic_share_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
+                    <ImageView android:layout_gravity="center" android:src="@drawable/ic_share_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
                 </androidx.cardview.widget.CardView>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/search_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="search_input,share_button"/>
-                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/copy_link_group" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:layout_marginStart="8dp" app:layout_constraintBottom_toTopOf="@+id/link_settings_barrier" app:layout_constraintEnd_toStartOf="@+id/invite_settings_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/search_barrier" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/copy_link_group" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:layout_marginStart="8dp" app:layout_constraintBottom_toTopOf="@+id/link_settings_barrier" app:layout_constraintEnd_toStartOf="@+id/invite_settings_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/search_barrier" style="@style/UiKit_ViewGroup_ConstraintLayout">
                     <FrameLayout android:id="@+id/copy_link_icon" android:background="@drawable/drawable_circle_black" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp" app:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/copy_link_icon_barrier" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-                        <ImageView android:layout_gravity="center" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_diag_link_24dp" android:contentDescription="@string/copy_link" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
+                        <ImageView android:layout_gravity="center" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_diag_link_24dp" android:contentDescription="@string/copy_link" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
                     </FrameLayout>
                     <androidx.constraintlayout.widget.Barrier android:id="@+id/copy_link_icon_barrier" android:layout_width="0dp" android:layout_height="match_parent" app:barrierDirection="6" app:constraint_referenced_ids="copy_link_icon"/>
-                    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/copy_link_title" android:layout_width="0dp" android:text="@string/invite_copy_invite_link_header_mobile" app:layout_constraintBottom_toTopOf="@+id/copy_link_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/copy_link_subtitle" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toBottomOf="@+id/copy_link_title" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/copy_link_title" android:layout_width="0dp" android:text="@string/invite_copy_invite_link_header_mobile" app:layout_constraintBottom_toTopOf="@+id/copy_link_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/copy_link_subtitle" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toBottomOf="@+id/copy_link_title" style="@style/UiKit_TextView"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
                 <FrameLayout android:id="@+id/invite_settings_button" android:background="?attr/bg_pressed_highlight" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/link_settings_barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_group" app:layout_constraintTop_toBottomOf="@+id/search_barrier">
-                    <ImageView android:layout_gravity="center" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_settings_24dp" android:contentDescription="@string/link_settings" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
+                    <ImageView android:layout_gravity="center" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_settings_24dp" android:contentDescription="@string/link_settings" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
                 </FrameLayout>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/link_settings_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="copy_link_group,invite_settings_button"/>
-                <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/invite_suggestions_header" android:layout_marginBottom="8dp" android:text="@string/invite_your_friends_header_mobile" android:textAllCaps="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/suggestion_list" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/link_settings_barrier" app:layout_constraintVertical_bias="0" style="@style/res_2131952563_uikit_textview"/>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_height="0dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/invite_suggestions_header" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/invite_suggestions_header" android:layout_marginBottom="8dp" android:text="@string/invite_your_friends_header_mobile" android:textAllCaps="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/suggestion_list" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/link_settings_barrier" app:layout_constraintVertical_bias="0" style="@style/UiKit_TextView"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_height="0dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/invite_suggestions_header" style="@style/UiKit_ViewGroup_RecyclerView"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.discord.app.AppViewFlipper>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_details.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_details.xml
index 1b2eed7041..f468df4029 100644
--- a/app/src/main/res/layout-v22/widget_guild_role_subscription_details.xml
+++ b/app/src/main/res/layout-v22/widget_guild_role_subscription_details.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/create_subscription_tier_details_layout" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
     <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_title" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_title" android:paddingHorizontal="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_description" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
-        <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_tier_detail_name_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_name_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_title" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_title" android:paddingHorizontal="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_description" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
+        <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_tier_detail_name_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_name_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_custom_image_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_custom_image_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
         <com.discord.widgets.guild_role_subscriptions.GuildSubscriptionRoleImageUploadView android:id="@+id/create_subscription_tier_image_upload_view" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp"/>
-        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_price_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_price_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
         <Spinner android:id="@+id/create_subscription_tier_price" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:popupBackground="?attr/colorPrimary"/>
-        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_description_layout" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_description_layout" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_details.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_details.xml
index 9704b181c9..dcf0687484 100644
--- a/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_details.xml
+++ b/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_details.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/guild_subscription_plan_details_layout" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
     <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:layout_gravity="center_horizontal" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_title" android:paddingHorizontal="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-        <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_subtitle" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
+        <TextView android:layout_gravity="center_horizontal" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_title" android:paddingHorizontal="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+        <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
         <com.discord.widgets.guild_role_subscriptions.GuildRoleSubscriptionPlanDetailsView android:id="@+id/guild_subscription_role_plan_details_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_channel_benefit.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_channel_benefit.xml
index 1c566aa344..3728f82e0b 100644
--- a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_channel_benefit.xml
+++ b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_channel_benefit.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/res_2131951663_apptheme_toolbar">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar">
             <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952574_uikit_textview_medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_channel_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_channel_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_exclusive_channel_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_channel_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_channel_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_channel_benefit_title" style="@style/res_2131952580_uikit_textview_singleline"/>
-                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_channel_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
+                <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextView_Medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_channel_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_channel_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_exclusive_channel_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_channel_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_channel_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_channel_benefit_title" style="@style/UiKit_TextView_SingleLine"/>
+                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_channel_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_marginTop="32dp" android:text="@string/channel" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_benefit_channel" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_benefits_channel_name_placeholder" android:drawablePadding="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952570_uikit_textview_large"/>
-            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_marginTop="32dp" android:text="@string/channel" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_benefit_channel" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_benefits_channel_name_placeholder" android:drawablePadding="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Large"/>
+            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
             <LinearLayout android:orientation="horizontal" android:id="@+id/guild_role_subscription_channel_benefit_select_emoji" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_channel_benefit_emoji" android:layout_width="20dp" android:layout_height="20dp" app:actualImageScaleType="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_smiley_desaturated" app:placeholderImageScaleType="2"/>
-                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_channel_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952570_uikit_textview_large"/>
+                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_channel_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Large"/>
             </LinearLayout>
-            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_channel_benefit_description" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_channel_benefit_description" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_channel_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_channel_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_design.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_design.xml
index e31e9f1f77..4a729a2b29 100644
--- a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_design.xml
+++ b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_design.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_title" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_description" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_title" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
+    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_title" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_description" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_title" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
     <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginHorizontal="@dimen/guild_role_subscription_setup_default_padding" app:cardCornerRadius="8dp" app:cardElevation="0dp">
         <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/res_2131951655_apptheme_light" android:id="@+id/guild_role_subscription_tier_member_preview_light" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="8dp" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding"/>
-            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/res_2131951648_apptheme_dark" android:id="@+id/guild_role_subscription_tier_member_preview_dark" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="8dp" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding"/>
+            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/AppTheme_Light" android:id="@+id/guild_role_subscription_tier_member_preview_light" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="8dp" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding"/>
+            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/AppTheme_Dark" android:id="@+id/guild_role_subscription_tier_member_preview_dark" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="8dp" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_color_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_color_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
     <LinearLayout android:orientation="horizontal" android:id="@+id/guild_role_subscription_tier_appearance_color_layout" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
         <View android:id="@+id/guild_role_subscription_tier_appearance_color" android:background="@drawable/rounded_rectangle_4dp_radius" android:layout_width="24dp" android:layout_height="24dp"/>
-        <TextView android:textColor="?attr/colorInteractiveNormal" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_tier_appearance_color_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952574_uikit_textview_medium"/>
+        <TextView android:textColor="?attr/colorInteractiveNormal" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_tier_appearance_color_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Medium"/>
     </LinearLayout>
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_badge_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_badge_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
     <com.discord.widgets.guild_role_subscriptions.GuildSubscriptionRoleImageUploadView android:id="@+id/guild_role_subscription_tier_member_badge" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:description="@string/guild_role_subscription_tier_design_member_badge_description" app:image_size="@dimen/avatar_size_medium" app:image_style="1" app:use_center_scale_type="true"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_intangible_benefit.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_intangible_benefit.xml
index aa62f9792f..a5f1d4ef47 100644
--- a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_intangible_benefit.xml
+++ b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_intangible_benefit.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/res_2131951663_apptheme_toolbar">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar">
             <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952574_uikit_textview_medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_intangible_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_intangible_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_additional_benefit_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_intangible_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_intangible_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_intangible_benefit_title" style="@style/res_2131952580_uikit_textview_singleline"/>
-                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_intangible_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
+                <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextView_Medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_intangible_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_intangible_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_additional_benefit_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_intangible_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Medium_SingleLine"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_intangible_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_intangible_benefit_title" style="@style/UiKit_TextView_SingleLine"/>
+                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_intangible_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_benefit" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_benefits_intangible_name_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_benefit" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_benefits_intangible_name_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
             <LinearLayout android:orientation="horizontal" android:id="@+id/guild_role_subscription_intangible_benefit_select_emoji" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_intangible_benefit_emoji" android:layout_width="20dp" android:layout_height="20dp" app:actualImageScaleType="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_smiley_desaturated" app:placeholderImageScaleType="2"/>
-                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_intangible_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952574_uikit_textview_medium"/>
+                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_intangible_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Medium"/>
             </LinearLayout>
-            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_description_layout" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_description_layout" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" android:paddingVertical="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_intangible_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_intangible_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_review.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_review.xml
index 99dcd103e9..8d2bec2af3 100644
--- a/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_review.xml
+++ b/app/src/main/res/layout-v22/widget_guild_role_subscription_tier_review.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_confirmation_title" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-    <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_create_tier_confirmation_description" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
+    <TextView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_confirmation_title" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+    <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_create_tier_confirmation_description" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/subscription_tier_review_recycler" android:background="@drawable/drawable_rect_rounded_bg_secondary" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginHorizontal="@dimen/guild_role_subscription_setup_default_padding"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_scheduled_event_list_bottom_sheet.xml b/app/src/main/res/layout-v22/widget_guild_scheduled_event_list_bottom_sheet.xml
index 7f3f839dfa..646a6df5af 100644
--- a/app/src/main/res/layout-v22/widget_guild_scheduled_event_list_bottom_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_guild_scheduled_event_list_bottom_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="wrap_content" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_scheduled_event_list_toolbar_container" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textAppearance="@style/res_2131952544_uikit_textappearance_toolbar_title" android:id="@+id/guild_scheduled_event_list_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_events" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Title" android:id="@+id/guild_scheduled_event_list_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_events" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_scheduled_event_list_recycler_view" android:layout_margin="16dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_toolbar_container" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_scheduled_event_list_recycler_view" android:layout_margin="16dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_toolbar_container" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_scheduled_event_settings.xml b/app/src/main/res/layout-v22/widget_guild_scheduled_event_settings.xml
index e2e09f6642..c10783572b 100644
--- a/app/src/main/res/layout-v22/widget_guild_scheduled_event_settings.xml
+++ b/app/src/main/res/layout-v22/widget_guild_scheduled_event_settings.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_scheduled_event_settings_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_settings_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_settings_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.core.widget.NestedScrollView android:id="@+id/guild_scheduled_event_settings_scroll_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/guild_scheduled_event_settings_next_button" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_toolbar">
         <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent">
             <com.discord.views.ScreenTitleView android:id="@+id/guild_scheduled_event_settings_stv" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:stv_subtitle="@string/guild_event_create_body" app:stv_title="@string/guild_event_create_header"/>
-            <TextView android:id="@+id/guild_scheduled_event_settings_topic_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/guild_event_create_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_stv" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_topic_input" android:padding="12dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_topic_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/guild_event_create_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_stv" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_topic_input" android:padding="12dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:id="@+id/guild_scheduled_event_settings_place_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_event_choose_place_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_layout" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <LinearLayout android:id="@+id/guild_scheduled_event_settings_place_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_header" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_on_discord" app:cs_text="@string/guild_event_choose_place_discord" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_elsewhere" app:cs_text="@string/guild_event_choose_place_elsewhere" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_place_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_event_choose_place_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_layout" style="@style/UiKit_Stage_SectionHeader"/>
+            <LinearLayout android:id="@+id/guild_scheduled_event_settings_place_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_header" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_on_discord" app:cs_text="@string/guild_event_choose_place_discord" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_Divider"/>
+                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_elsewhere" app:cs_text="@string/guild_event_choose_place_elsewhere" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_select_channel_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_options" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_select_channel_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:hint="@string/guild_settings_public_welcome_select_a_channel" android:maxLength="240" android:drawableEnd="@drawable/ic_arrow_down" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_select_channel_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_options" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_select_channel_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:hint="@string/guild_settings_public_welcome_select_a_channel" android:maxLength="240" android:drawableEnd="@drawable/ic_arrow_down" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:id="@+id/guild_scheduled_event_settings_start_date_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/create_event_start_date_label" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_select_channel_input_layout" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <TextView android:id="@+id/guild_scheduled_event_settings_start_time_header" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/create_event_start_time_label" app:layout_constraintBaseline_toBaselineOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_date_input_layout" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_date_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_start_date_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/create_event_start_date_label" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_select_channel_input_layout" style="@style/UiKit_Stage_SectionHeader"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_start_time_header" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/create_event_start_time_label" app:layout_constraintBaseline_toBaselineOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_date_input_layout" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_date_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_time_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_time_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_time_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_time_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_time_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_time_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:id="@+id/guild_scheduled_event_settings_description_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/create_stage_instance_description_input_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_input_layout" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_description_input_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_description_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:gravity="top|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_scheduled_event_settings_description_input" android:padding="12dp" android:hint="@string/guild_event_create_description_placeholder" android:lines="2" android:maxLength="240" android:lineSpacingMultiplier="1.2" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_description_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/create_stage_instance_description_input_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_input_layout" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_description_input_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_description_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:gravity="top|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_scheduled_event_settings_description_input" android:padding="12dp" android:hint="@string/guild_event_create_description_placeholder" android:lines="2" android:maxLength="240" android:lineSpacingMultiplier="1.2" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/next" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952458_uikit_material_button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/next" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_guild_sticker_sheet.xml b/app/src/main/res/layout-v22/widget_guild_sticker_sheet.xml
index 014d28653b..e76542a85f 100644
--- a/app/src/main/res/layout-v22/widget_guild_sticker_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_guild_sticker_sheet.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_sticker_sheet_flipper" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="14dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_sticker_sheet_flipper" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="14dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <com.discord.views.sticker.StickerView android:id="@+id/guild_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_description" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
         <FrameLayout android:id="@+id/guild_sticker_sheet_button_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp">
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_join_btn" android:text="@string/sticker_popout_join_server" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952460_uikit_material_button_green"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_join_btn" android:text="@string/sticker_popout_join_server" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green"/>
         </FrameLayout>
-        <LinearLayout android:id="@+id/guild_sticker_sheet_guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952416_uikit_divider"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_header" android:layout_marginTop="16dp" android:text="@string/sticker_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-            <LinearLayout android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:id="@+id/guild_sticker_sheet_guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/UiKit_Divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_header" android:layout_marginTop="16dp" android:text="@string/sticker_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+            <LinearLayout android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/guild_sticker_sheet_guild_icon_wrapper" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_sticker_sheet_guild_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guild_sticker_sheet_guild_icon_text" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952563_uikit_textview"/>
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_sticker_sheet_guild_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/UiKit_ImageView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guild_sticker_sheet_guild_icon_text" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit_TextView"/>
                 </FrameLayout>
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_guild_name" android:drawablePadding="8dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_info" android:layout_marginTop="4dp" style="@style/res_2131952563_uikit_textview"/>
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_guild_name" android:drawablePadding="8dp" style="@style/UiKit_TextView_Bold"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_info" android:layout_marginTop="4dp" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_issue_details_form.xml b/app/src/main/res/layout-v22/widget_issue_details_form.xml
index 142c33aa4d..0d2e66833d 100644
--- a/app/src/main/res/layout-v22/widget_issue_details_form.xml
+++ b/app/src/main/res/layout-v22/widget_issue_details_form.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952601_uikit_viewgroup_nestedscrollview_page">
-    <LinearLayout style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-        <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-            <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_NestedScrollView_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_Page_LinearLayout">
+        <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+            <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar"/>
         </com.google.android.material.appbar.AppBarLayout>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/issue_details_input" android:layout_margin="16dp" android:hint="@string/feedback_describe_issue" style="@style/res_2131952545_uikit_textinputlayout">
-            <com.google.android.material.textfield.TextInputEditText android:maxLength="1024" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/issue_details_input" android:layout_margin="16dp" android:hint="@string/feedback_describe_issue" style="@style/UiKit_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:maxLength="1024" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorTextMuted" android:id="@+id/issue_details_cx_prompt" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/issue_details_submit_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/submit" android:layout_marginHorizontal="16dp" style="@style/res_2131952458_uikit_material_button"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorTextMuted" android:id="@+id/issue_details_cx_prompt" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/issue_details_submit_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/submit" android:layout_marginHorizontal="16dp" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout-v22/widget_member_verification.xml b/app/src/main/res/layout-v22/widget_member_verification.xml
index 89c1f98b83..ddfa118cd4 100644
--- a/app/src/main/res/layout-v22/widget_member_verification.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.discord.views.CustomAppBarLayout android:id="@+id/app_bar_layout" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131951637_apptheme_appbarlayout">
+    <com.discord.views.CustomAppBarLayout android:id="@+id/app_bar_layout" android:background="?attr/colorBackgroundPrimary" style="@style/AppTheme_AppBarLayout">
         <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/collapsing_toolbar" android:layout_width="match_parent" android:layout_height="match_parent" app:contentScrim="?attr/colorBackgroundPrimary" app:layout_scrollFlags="3">
             <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/member_verification_banner_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="36dp" app:placeholderImage="@drawable/drawable_default_invite_splash" app:viewAspectRatio="1.77"/>
@@ -8,18 +8,18 @@
                     <com.discord.views.MemberVerificationAvatarView android:id="@+id/member_verification_guild_icon" android:layout_width="64dp" android:layout_height="64dp"/>
                 </androidx.cardview.widget.CardView>
             </RelativeLayout>
-            <androidx.appcompat.widget.Toolbar android:background="@drawable/drawable_black_underlay_gradient" app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951663_apptheme_toolbar"/>
+            <androidx.appcompat.widget.Toolbar android:background="@drawable/drawable_black_underlay_gradient" app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.discord.views.CustomAppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/member_verification_scrollview" android:visibility="gone" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:layout_below="@+id/app_bar_layout" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="18dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_title" android:layout_marginHorizontal="16dp" style="@style/res_2131952001_friendslist_emptystate_title"/>
-            <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_subtitle" android:layout_marginHorizontal="16dp" style="@style/res_2131952574_uikit_textview_medium"/>
-            <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" android:layout_marginVertical="24dp" style="@style/res_2131952491_uikit_settings_divider"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/member_verification_scrollview" android:visibility="gone" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:layout_below="@+id/app_bar_layout" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="18dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_title" android:layout_marginHorizontal="16dp" style="@style/FriendsList_EmptyState_Title"/>
+            <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_subtitle" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView_Medium"/>
+            <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" android:layout_marginVertical="24dp" style="@style/UiKit_Settings_Divider"/>
             <com.discord.widgets.servers.member_verification.MemberVerificationView android:id="@+id/member_verification_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp"/>
-            <androidx.recyclerview.widget.RecyclerView android:id="@+id/member_verification_rules_recycler" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-            <com.discord.views.LoadingButton android:id="@+id/member_verification_rules_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="16dp" android:paddingHorizontal="0dp" app:lb_progress_color="@color/white" app:lb_text="@string/member_verification_notice_cta" style="@style/res_2131952458_uikit_material_button"/>
+            <androidx.recyclerview.widget.RecyclerView android:id="@+id/member_verification_rules_recycler" style="@style/UiKit_ViewGroup_RecyclerView"/>
+            <com.discord.views.LoadingButton android:id="@+id/member_verification_rules_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="16dp" android:paddingHorizontal="0dp" app:lb_progress_color="@color/white" app:lb_text="@string/member_verification_notice_cta" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_member_verification_header_item.xml b/app/src/main/res/layout-v22/widget_member_verification_header_item.xml
index 4ac39b3c87..44162b8b28 100644
--- a/app/src/main/res/layout-v22/widget_member_verification_header_item.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification_header_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_rules_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/member_verification_form_rules_label" android:layout_marginHorizontal="16dp" style="@style/res_2131952621_userprofile_section_headertextappearance"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_rules_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/member_verification_form_rules_label" android:layout_marginHorizontal="16dp" style="@style/UserProfile_Section_HeaderTextAppearance"/>
diff --git a/app/src/main/res/layout-v22/widget_member_verification_multiple_choice_item.xml b/app/src/main/res/layout-v22/widget_member_verification_multiple_choice_item.xml
index 8e1a0194e6..76e38a261b 100644
--- a/app/src/main/res/layout-v22/widget_member_verification_multiple_choice_item.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification_multiple_choice_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_multiple_choice_radio_group" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952589_uikit_viewgroup"/>
+<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_multiple_choice_radio_group" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup"/>
diff --git a/app/src/main/res/layout-v22/widget_member_verification_paragraph_item.xml b/app/src/main/res/layout-v22/widget_member_verification_paragraph_item.xml
index e472ea7da4..917b9b213a 100644
--- a/app/src/main/res/layout-v22/widget_member_verification_paragraph_item.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification_paragraph_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_paragraph_field" android:padding="12dp" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_paragraph_field" android:padding="12dp" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
 </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout-v22/widget_member_verification_pending_dialog.xml b/app/src/main/res/layout-v22/widget_member_verification_pending_dialog.xml
index cc9a51c2ac..f3ff5902c9 100644
--- a/app/src/main/res/layout-v22/widget_member_verification_pending_dialog.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification_pending_dialog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content">
     <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
-        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" android:paddingHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" android:paddingHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
             <ImageView android:layout_gravity="center_horizontal" android:id="@+id/member_verification_pending_img" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:importantForAccessibility="no"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/pending_dialog_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:gravity="center" android:id="@+id/pending_dialog_desc" android:layout_width="match_parent" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" style="@style/res_2131952574_uikit_textview_medium"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_primary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:insetTop="0dp" android:insetBottom="0dp" android:layout_marginVertical="8dp" android:paddingHorizontal="0dp" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_secondary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" android:backgroundTint="?attr/primary_500" android:paddingHorizontal="0dp" style="@style/res_2131952458_uikit_material_button"/>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/member_verification_tertiary_btn" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="0dp" android:paddingTop="20dp" android:paddingRight="0dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/leave_server" android:paddingHorizontal="0dp" style="@style/res_2131952535_uikit_textappearance_button"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/pending_dialog_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:gravity="center" android:id="@+id/pending_dialog_desc" android:layout_width="match_parent" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" style="@style/UiKit_TextView_Medium"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_primary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:insetTop="0dp" android:insetBottom="0dp" android:layout_marginVertical="8dp" android:paddingHorizontal="0dp" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_secondary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" android:backgroundTint="?attr/primary_500" android:paddingHorizontal="0dp" style="@style/UiKit_Material_Button"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/member_verification_tertiary_btn" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="0dp" android:paddingTop="20dp" android:paddingRight="0dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/leave_server" android:paddingHorizontal="0dp" style="@style/UiKit_TextAppearance_Button"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout-v22/widget_member_verification_rule_item.xml b/app/src/main/res/layout-v22/widget_member_verification_rule_item.xml
index ed856ac80a..4d90c0b3c4 100644
--- a/app/src/main/res/layout-v22/widget_member_verification_rule_item.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification_rule_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.discord.utilities.view.rounded.RoundedRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_rule_root" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp">
-    <LinearLayout android:id="@+id/member_verification_rule_container" android:padding="12dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/member_verification_rule_index" style="@style/res_2131952016_guildprofilesheet_discoverableguild_text"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/colorTextNormal" android:id="@+id/member_verification_rule_description" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:paddingHorizontal="8dp" style="@style/res_2131952570_uikit_textview_large"/>
+    <LinearLayout android:id="@+id/member_verification_rule_container" android:padding="12dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/member_verification_rule_index" style="@style/GuildProfileSheet_DiscoverableGuild_Text"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/colorTextNormal" android:id="@+id/member_verification_rule_description" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:paddingHorizontal="8dp" style="@style/UiKit_TextView_Large"/>
     </LinearLayout>
-    <View android:id="@+id/member_verification_rule_divider" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_alignBottom="@+id/member_verification_rule_container" android:layout_marginHorizontal="12dp" style="@style/res_2131952491_uikit_settings_divider"/>
+    <View android:id="@+id/member_verification_rule_divider" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_alignBottom="@+id/member_verification_rule_container" android:layout_marginHorizontal="12dp" style="@style/UiKit_Settings_Divider"/>
 </com.discord.utilities.view.rounded.RoundedRelativeLayout>
diff --git a/app/src/main/res/layout-v22/widget_member_verification_success.xml b/app/src/main/res/layout-v22/widget_member_verification_success.xml
index 93b2f1173f..c6c639e654 100644
--- a/app/src/main/res/layout-v22/widget_member_verification_success.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification_success.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginHorizontal="24dp">
     <androidx.cardview.widget.CardView android:id="@+id/member_verification_success_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="168dp" android:layout_centerInParent="true" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
-        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="84dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:paddingHorizontal="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/member_verification_guild_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/lurker_mode_popout_success_body" android:layout_marginHorizontal="16dp" style="@style/res_2131952574_uikit_textview_medium"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/lurker_mode_popout_success_button" android:layout_marginVertical="24dp" android:paddingHorizontal="0dp" style="@style/res_2131952458_uikit_material_button"/>
+        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="84dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:paddingHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/member_verification_guild_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/lurker_mode_popout_success_body" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView_Medium"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/lurker_mode_popout_success_button" android:layout_marginVertical="24dp" android:paddingHorizontal="0dp" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_success_discovery" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:importantForAccessibility="no"/>
diff --git a/app/src/main/res/layout-v22/widget_member_verification_text_input_item.xml b/app/src/main/res/layout-v22/widget_member_verification_text_input_item.xml
index ebecdc3a28..6736aa8a51 100644
--- a/app/src/main/res/layout-v22/widget_member_verification_text_input_item.xml
+++ b/app/src/main/res/layout-v22/widget_member_verification_text_input_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_text_input_field" android:padding="12dp" android:maxLength="150" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_text_input_field" android:padding="12dp" android:maxLength="150" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
 </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout-v22/widget_moderator_start_stage.xml b/app/src/main/res/layout-v22/widget_moderator_start_stage.xml
index e18f776c95..f82409591c 100644
--- a/app/src/main/res/layout-v22/widget_moderator_start_stage.xml
+++ b/app/src/main/res/layout-v22/widget_moderator_start_stage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:backgroundTint="?attr/colorPrimaryDark" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:backgroundTint="?attr/colorPrimaryDark" style="@style/UiKit_ViewGroup_Page">
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_exit_stage_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <Button android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:id="@+id/moderator_start_stage_exit_stage_button" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="20dp" android:paddingTop="12dp" android:paddingRight="20dp" android:paddingBottom="12dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/exit_event_stage_options_label" android:drawablePadding="8dp" android:drawableEnd="@drawable/ic_exit_24dp" android:backgroundTint="@color/status_red_500" android:paddingHorizontal="20dp" android:paddingVertical="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintVertical_bias="1"/>
+    <Button android:textAppearance="@style/UiKit_TextAppearance_Button" android:id="@+id/moderator_start_stage_exit_stage_button" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="20dp" android:paddingTop="12dp" android:paddingRight="20dp" android:paddingBottom="12dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/exit_event_stage_options_label" android:drawablePadding="8dp" android:drawableEnd="@drawable/ic_exit_24dp" android:backgroundTint="@color/status_red_500" android:paddingHorizontal="20dp" android:paddingVertical="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintVertical_bias="1"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_payment_source_edit_dialog.xml b/app/src/main/res/layout-v22/widget_payment_source_edit_dialog.xml
index ef878a8418..0c76935c5d 100644
--- a/app/src/main/res/layout-v22/widget_payment_source_edit_dialog.xml
+++ b/app/src/main/res/layout-v22/widget_payment_source_edit_dialog.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/res_2131951663_apptheme_toolbar">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme_Toolbar">
         <com.discord.views.LoadingButton android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/dialog_save" android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:lb_progress_color="?attr/primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?attr/primary_100"/>
     </androidx.appcompat.widget.Toolbar>
-    <androidx.core.widget.NestedScrollView android:layout_weight="1" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@+id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_info_outline_white_24dp" style="@style/res_2131952563_uikit_textview"/>
+    <androidx.core.widget.NestedScrollView android:layout_weight="1" style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@+id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_info_outline_white_24dp" style="@style/UiKit_TextView"/>
             <com.discord.widgets.settings.billing.PaymentSourceView android:id="@+id/payment_source_summary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp"/>
-            <TextView android:id="@+id/payment_source_edit_help" android:layout_marginBottom="8dp" android:text="@string/payment_source_edit_help_card" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <TextView android:layout_marginTop="8dp" android:text="@string/billing_address" style="@style/res_2131952567_uikit_textview_h2"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_name" android:hint="@string/billing_address_name" android:autofillHints="name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <TextView android:id="@+id/payment_source_edit_help" android:layout_marginBottom="8dp" android:text="@string/payment_source_edit_help_card" style="@style/UiKit_TextView_Subtext"/>
+            <TextView android:layout_marginTop="8dp" android:text="@string/billing_address" style="@style/UiKit_TextView_H2"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_name" android:hint="@string/billing_address_name" android:autofillHints="name" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address1" android:hint="@string/billing_address_address" android:autofillHints="postalAddress" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:inputType="textPostalAddress" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address1" android:hint="@string/billing_address_address" android:autofillHints="postalAddress" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:inputType="textPostalAddress" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address2" android:hint="@string/billing_address_address2" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address2" android:hint="@string/billing_address_address2" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_city" android:hint="@string/billing_address_city" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_city" android:hint="@string/billing_address_city" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_state" android:hint="@string/billing_address_state" app:endIconDrawable="?attr/ic_navigate_next" app:endIconMode="-1" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionGo" style="@style/res_2131952549_uikit_textinputlayout_edittext_nofocus"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_state" android:hint="@string/billing_address_state" app:endIconDrawable="?attr/ic_navigate_next" app:endIconMode="-1" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionGo" style="@style/UiKit_TextInputLayout_EditText_NoFocus"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_postal_code" android:hint="@string/billing_address_zip_code" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:nextFocusRight="@+id/dialog_save" android:imeOptions="actionDone" android:nextFocusForward="@+id/dialog_save" android:autofillHints="postalCode" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_postal_code" android:hint="@string/billing_address_zip_code" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:nextFocusRight="@+id/dialog_save" android:imeOptions="actionDone" android:nextFocusForward="@+id/dialog_save" android:autofillHints="postalCode" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_country" android:focusable="false" android:hint="@string/billing_address_country" app:endIconDrawable="@drawable/ic_lock_white_a60_16dp" app:endIconMode="-1" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:textColor="?attr/primary_400" android:inputType="none" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_country" android:focusable="false" android:hint="@string/billing_address_country" app:endIconDrawable="@drawable/ic_lock_white_a60_16dp" app:endIconMode="-1" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:textColor="?attr/primary_400" android:inputType="none" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <CheckBox android:id="@+id/payment_source_edit_default" android:layout_marginTop="8dp" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="?attr/color_brand_500" style="@style/res_2131952396_uikit_checkbox"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/dialog_delete" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/payment_source_delete" style="@style/res_2131952466_uikit_material_button_red_outline"/>
+            <CheckBox android:id="@+id/payment_source_edit_default" android:layout_marginTop="8dp" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="?attr/color_brand_500" style="@style/UiKit_Checkbox"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/dialog_delete" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/payment_source_delete" style="@style/UiKit_Material_Button_Red_Outline"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_preview_guild_scheduled_event.xml b/app/src/main/res/layout-v22/widget_preview_guild_scheduled_event.xml
index 2bf6d5bf7d..dd9528ad71 100644
--- a/app/src/main/res/layout-v22/widget_preview_guild_scheduled_event.xml
+++ b/app/src/main/res/layout-v22/widget_preview_guild_scheduled_event.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/confirm_guild_scheduled_event_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/confirm_guild_scheduled_event_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/confirm_guild_scheduled_event_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.widgets.guildscheduledevent.GuildScheduledEventItemView android:id="@+id/confirm_guild_scheduled_event_preview" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/confirm_guild_scheduled_event_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/confirm_guild_scheduled_event_toolbar" app:layout_constraintVertical_chainStyle="2"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="30sp" android:gravity="center" android:id="@+id/confirm_guild_scheduled_event_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:text="@string/guild_event_preview_title" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/guild_scheduled_event_settings_next_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/confirm_guild_scheduled_event_preview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/schedule_event" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="30sp" android:gravity="center" android:id="@+id/confirm_guild_scheduled_event_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:text="@string/guild_event_preview_title" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/guild_scheduled_event_settings_next_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/confirm_guild_scheduled_event_preview"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/schedule_event" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_profile_marketing_sheet.xml b/app/src/main/res/layout-v22/widget_profile_marketing_sheet.xml
index 1c13ab2112..1250e2ce45 100644
--- a/app/src/main/res/layout-v22/widget_profile_marketing_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_profile_marketing_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/profile_marketing_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/img_profile_marketing"/>
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:stv_subtitle="@string/profile_customization_marketing_tooltip_body" app:stv_title="@string/profile_customization_marketing_tooltip_header"/>
-        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@+id/profile_marketing_update_profile_button" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/profile_customization_marketing_tooltip_cta_mobile" android:paddingVertical="12dp" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/profile_marketing_skip_button" android:text="@string/skip_for_now" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@+id/profile_marketing_update_profile_button" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/profile_customization_marketing_tooltip_cta_mobile" android:paddingVertical="12dp" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/profile_marketing_skip_button" android:text="@string/skip_for_now" style="@style/UiKit_Material_Button_Transparent_Fit"/>
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout-v22/widget_select_component_bottom_sheet.xml b/app/src/main/res/layout-v22/widget_select_component_bottom_sheet.xml
index 034d8d26d8..40d0b6aba8 100644
--- a/app/src/main/res/layout-v22/widget_select_component_bottom_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_select_component_bottom_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/widget_sheet_component_bottom_sheet_header" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:id="@+id/widget_sheet_component_bottom_sheet_placeholder" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/widget_sheet_component_bottom_sheet_subtitle" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952564_uikit_textview_bold"/>
-        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/widget_sheet_component_bottom_sheet_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_sheet_component_bottom_sheet_placeholder" style="@style/res_2131952581_uikit_textview_subtext"/>
-        <TextView android:textColor="?attr/color_brand" android:id="@+id/widget_sheet_component_bottom_sheet_select" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/select" android:layout_marginStart="16dp" android:paddingHorizontal="16dp" android:paddingVertical="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <TextView android:id="@+id/widget_sheet_component_bottom_sheet_placeholder" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/widget_sheet_component_bottom_sheet_subtitle" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Bold"/>
+        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/widget_sheet_component_bottom_sheet_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_sheet_component_bottom_sheet_placeholder" style="@style/UiKit_TextView_Subtext"/>
+        <TextView android:textColor="?attr/color_brand" android:id="@+id/widget_sheet_component_bottom_sheet_select" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/select" android:layout_marginStart="16dp" android:paddingHorizontal="16dp" android:paddingVertical="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/widget_sheet_component_bottom_sheet_recycler" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constrainedHeight="true" app:layout_constraintTop_toBottomOf="@+id/widget_sheet_component_bottom_sheet_header" app:max_height_screen_ratio="0.75"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_server_settings_community_overview.xml b/app/src/main/res/layout-v22/widget_server_settings_community_overview.xml
index da3f2859b3..1e8cb992e9 100644
--- a/app/src/main/res/layout-v22/widget_server_settings_community_overview.xml
+++ b/app/src/main/res/layout-v22/widget_server_settings_community_overview.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView android:id="@+id/server_settings_community_overview_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_rules_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_community_locale" app:csv_description_text="@string/guild_settings_community_locale_help" app:csv_title_text="@string/form_label_server_language" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_disable_community_message" app:csv_description_text="@string/guild_settings_community_disable_community_description" app:csv_is_dropdown="false" app:csv_title_text="@string/guild_settings_community_disable_community" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+    <ScrollView android:id="@+id/server_settings_community_overview_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_rules_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_community_locale" app:csv_description_text="@string/guild_settings_community_locale_help" app:csv_title_text="@string/form_label_server_language" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_disable_community_message" app:csv_description_text="@string/guild_settings_community_disable_community_description" app:csv_is_dropdown="false" app:csv_title_text="@string/guild_settings_community_disable_community" style="@style/UiKit_ViewGroup_LinearLayout"/>
             <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@+id/server_settings_disable_community_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:layout_marginBottom="18dp" android:layout_marginStart="16dp" android:layout_marginVertical="18dp" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/guild_settings_community_disable_community" app:lb_text_color="@drawable/button_text_color_primary_100"/>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout-v22/widget_server_settings_community_setup_first_step.xml b/app/src/main/res/layout-v22/widget_server_settings_community_setup_first_step.xml
index 588954f872..ad82f50d70 100644
--- a/app/src/main/res/layout-v22/widget_server_settings_community_setup_first_step.xml
+++ b/app/src/main/res/layout-v22/widget_server_settings_community_setup_first_step.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="?attr/drawable_community_setup_first_step" android:importantForAccessibility="no"/>
         <com.discord.views.ScreenTitleView android:id="@+id/community_step_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:stv_subtitle="@string/enable_community_modal_step_1_body" app:stv_title="@string/enable_community_modal_step_1_header"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_settings_verified_emailed_switch" app:cs_subtext="@string/enable_community_modal_verification_level_help" app:cs_text="@string/enable_community_modal_verification_level_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <View android:layout_marginTop="24dp" style="@style/res_2131952491_uikit_settings_divider"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_settings_scan_messages_switch" app:cs_subtext="@string/enable_public_modal_content_filter_help" app:cs_text="@string/enable_community_modal_content_filter_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_settings_verified_emailed_switch" app:cs_subtext="@string/enable_community_modal_verification_level_help" app:cs_text="@string/enable_community_modal_verification_level_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <View android:layout_marginTop="24dp" style="@style/UiKit_Settings_Divider"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_settings_scan_messages_switch" app:cs_subtext="@string/enable_public_modal_content_filter_help" app:cs_text="@string/enable_community_modal_content_filter_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout-v22/widget_server_settings_community_setup_second_step.xml b/app/src/main/res/layout-v22/widget_server_settings_community_setup_second_step.xml
index dfb5b2995c..f7e6e4c225 100644
--- a/app/src/main/res/layout-v22/widget_server_settings_community_setup_second_step.xml
+++ b/app/src/main/res/layout-v22/widget_server_settings_community_setup_second_step.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="?attr/drawable_community_setup_second_step" android:importantForAccessibility="no"/>
         <com.discord.views.ScreenTitleView android:id="@+id/community_step_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:stv_subtitle="@string/enable_community_modal_step_2_body" app:stv_title="@string/enable_community_modal_step_2_title"/>
-        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_guidelines_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_subtitle_text="@string/guild_template_name_announcements" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_subtitle_text="@string/public_updates_channel_title" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
+        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_guidelines_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_subtitle_text="@string/guild_template_name_announcements" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/UiKit_ViewGroup_LinearLayout"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_subtitle_text="@string/public_updates_channel_title" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/UiKit_ViewGroup_LinearLayout"/>
+        <View style="@style/UiKit_Settings_Divider"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout-v22/widget_server_settings_community_setup_third_step.xml b/app/src/main/res/layout-v22/widget_server_settings_community_setup_third_step.xml
index 9a59d0a748..228c185852 100644
--- a/app/src/main/res/layout-v22/widget_server_settings_community_setup_third_step.xml
+++ b/app/src/main/res/layout-v22/widget_server_settings_community_setup_third_step.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="match_parent" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="?attr/drawable_community_setup_third_step" android:importantForAccessibility="no"/>
         <com.discord.views.ScreenTitleView android:id="@+id/community_step_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:stv_subtitle="@string/enable_community_modal_step_3_body" app:stv_title="@string/enable_community_modal_step_3_title"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_setting_notifications_to_mentions_switch" app:cs_text="@string/enable_community_modal_default_notifications_label_mobile" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_setting_manage_permissions_switch" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:text="@string/public_guild_policy_title" android:textAllCaps="true" android:paddingHorizontal="16dp" style="@style/res_2131952564_uikit_textview_bold"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_setting_community_guidelines_switch" app:cs_text="@string/public_guild_policy_accept" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="0" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/community_setting_guidelines" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" android:paddingHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_setting_notifications_to_mentions_switch" app:cs_text="@string/enable_community_modal_default_notifications_label_mobile" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_setting_manage_permissions_switch" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:text="@string/public_guild_policy_title" android:textAllCaps="true" android:paddingHorizontal="16dp" style="@style/UiKit_TextView_Bold"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_setting_community_guidelines_switch" app:cs_text="@string/public_guild_policy_accept" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="0" style="@style/UiKit_CheckedSetting_Themed"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/community_setting_guidelines" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" android:paddingHorizontal="16dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout-v22/widget_server_settings_enable_community.xml b/app/src/main/res/layout-v22/widget_server_settings_enable_community.xml
index a75d671fd1..d3491822a6 100644
--- a/app/src/main/res/layout-v22/widget_server_settings_enable_community.xml
+++ b/app/src/main/res/layout-v22/widget_server_settings_enable_community.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_get_started_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_get_started_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <RelativeLayout android:id="@+id/community_header_image" android:layout_width="match_parent" android:layout_height="wrap_content">
             <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/community_setup_get_started" android:scaleType="centerCrop" android:adjustViewBounds="true" android:importantForAccessibility="no"/>
             <com.discord.widgets.servers.community.CommunityGetStartedHeaderIconView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" android:layout_marginStart="8dp" android:layout_alignStart="@+id/community_get_started_header_image" app:chi_icon="@drawable/community_server_get_started_hogwarts" app:chi_title_text="Hogwarts School"/>
@@ -9,8 +9,8 @@
             <com.discord.widgets.servers.community.CommunityGetStartedHeaderIconView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:layout_alignBottom="@+id/community_get_started_header_image" android:layout_marginEnd="8dp" android:layout_alignEnd="@+id/community_get_started_header_image" app:chi_icon="@drawable/community_server_get_started_pokemon" app:chi_title_text="Pokemon GO"/>
         </RelativeLayout>
         <com.discord.views.ScreenTitleView android:id="@+id/community_get_started_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:layout_marginHorizontal="16dp" app:stv_subtitle="@string/guild_settings_community_intro_body" app:stv_title="@string/guild_settings_community_intro_header"/>
-        <com.google.android.material.button.MaterialButton android:ellipsize="end" android:id="@+id/community_setting_get_started" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" android:maxLines="1" android:layout_marginHorizontal="16dp" style="@style/res_2131952458_uikit_material_button"/>
-        <TextView android:gravity="center" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="40dp" android:text="@string/guild_settings_community_intro_details_mobile" android:layout_marginHorizontal="16dp" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+        <com.google.android.material.button.MaterialButton android:ellipsize="end" android:id="@+id/community_setting_get_started" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" android:maxLines="1" android:layout_marginHorizontal="16dp" style="@style/UiKit_Material_Button"/>
+        <TextView android:gravity="center" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="40dp" android:text="@string/guild_settings_community_intro_details_mobile" android:layout_marginHorizontal="16dp" style="@style/UiKit_Settings_Item_SubText"/>
         <com.discord.widgets.servers.community.CommunityGetStartedInformationView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:csi_description_text="@string/guild_settings_community_intro_upsell_discovery_body" app:csi_icon="?attr/drawable_ic_community_setting_analytics" app:csi_title_text="@string/guild_settings_community_intro_upsell_discovery_header"/>
         <com.discord.widgets.servers.community.CommunityGetStartedInformationView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="10dp" android:layout_marginRight="16dp" android:layout_marginBottom="10dp" android:layout_marginHorizontal="16dp" android:layout_marginVertical="10dp" app:csi_description_text="@string/guild_settings_community_intro_upsell_analytics_body_mobile" app:csi_icon="?attr/drawable_ic_community_setting_server_insights" app:csi_title_text="@string/guild_settings_community_intro_upsell_analytics_header"/>
         <com.discord.widgets.servers.community.CommunityGetStartedInformationView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" app:csi_description_text="@string/guild_settings_community_intro_upsell_stay_informed_body" app:csi_icon="?attr/drawable_ic_community_setting_info" app:csi_title_text="@string/guild_settings_community_intro_upsell_stay_informed_header"/>
diff --git a/app/src/main/res/layout-v22/widget_settings.xml b/app/src/main/res/layout-v22/widget_settings.xml
index 151a8a68e0..9702185712 100644
--- a/app/src/main/res/layout-v22/widget_settings.xml
+++ b/app/src/main/res/layout-v22/widget_settings.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/toolbarColor" style="@style/res_2131951637_apptheme_appbarlayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout app:titleEnabled="false" style="@style/res_2131951647_apptheme_collapsingtoolbarlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/toolbarColor" style="@style/AppTheme_AppBarLayout">
+        <com.google.android.material.appbar.CollapsingToolbarLayout app:titleEnabled="false" style="@style/AppTheme_CollapsingToolbarLayout">
             <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@+id/user_settings_profile_header_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="?attr/actionBarSize" app:layout_collapseMode="2" app:user_profile_header_background_color="?attr/toolbarColor"/>
-            <androidx.appcompat.widget.Toolbar app:layout_collapseMode="1" app:navigationContentDescription="@string/back" style="@style/res_2131951663_apptheme_toolbar"/>
+            <androidx.appcompat.widget.Toolbar app:layout_collapseMode="1" app:navigationContentDescription="@string/back" style="@style/AppTheme_Toolbar"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <androidx.appcompat.widget.LinearLayoutCompat style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/user_settings_header" android:text="@string/user_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <LinearLayout android:gravity="center_vertical" android:id="@+id/set_status_container" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:background="@color/transparent" android:layout_width="0dp" android:text="@string/set_status" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <androidx.appcompat.widget.LinearLayoutCompat style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/user_settings_header" android:text="@string/user_settings" style="@style/UiKit_Settings_Item_Header"/>
+            <LinearLayout android:gravity="center_vertical" android:id="@+id/set_status_container" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:background="@color/transparent" android:layout_width="0dp" android:text="@string/set_status" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
                 <com.discord.views.StatusView android:id="@+id/settings_status_view" android:layout_width="16dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="2dp" app:sv_corner_radius="4dp"/>
-                <TextView android:id="@+id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="8dp" style="@style/res_2131952492_uikit_settings_item"/>
+                <TextView android:id="@+id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="8dp" style="@style/UiKit_Settings_Item"/>
             </LinearLayout>
-            <TextView android:id="@+id/account" android:text="@string/user_settings_my_account" app:drawableStartCompat="@drawable/ic_my_account_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <LinearLayout android:id="@+id/profile" android:background="?attr/selectableItemBackground" android:paddingStart="0dp" android:paddingEnd="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:id="@+id/profile_text" android:background="@color/transparent" android:layout_width="wrap_content" android:text="@string/user_settings_user_profile" android:paddingStart="16dp" android:paddingEnd="8dp" app:drawableStartCompat="@drawable/ic_edit_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@+id/profile_new_badge" android:background="@drawable/rounded_rectangle_16dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:visibility="gone" android:text="@string/_new" android:lineSpacingMultiplier="1.25" android:textAllCaps="true" android:backgroundTint="@color/status_red_530" android:paddingHorizontal="4dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:id="@+id/account" android:text="@string/user_settings_my_account" app:drawableStartCompat="@drawable/ic_my_account_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <LinearLayout android:id="@+id/profile" android:background="?attr/selectableItemBackground" android:paddingStart="0dp" android:paddingEnd="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:id="@+id/profile_text" android:background="@color/transparent" android:layout_width="wrap_content" android:text="@string/user_settings_user_profile" android:paddingStart="16dp" android:paddingEnd="8dp" app:drawableStartCompat="@drawable/ic_edit_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@+id/profile_new_badge" android:background="@drawable/rounded_rectangle_16dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:visibility="gone" android:text="@string/_new" android:lineSpacingMultiplier="1.25" android:textAllCaps="true" android:backgroundTint="@color/status_red_530" android:paddingHorizontal="4dp" style="@style/UiKit_TextView"/>
             </LinearLayout>
-            <TextView android:id="@+id/privacy" android:text="@string/privacy_and_safety" app:drawableStartCompat="@drawable/ic_privacy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/authorized_apps" android:text="@string/authorized_apps" app:drawableStartCompat="@drawable/ic_authed_apps_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/connections" android:text="@string/connections" app:drawableStartCompat="@drawable/ic_phonelink_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/settings_billing" android:visibility="gone" android:text="@string/billing" app:drawableStartCompat="@drawable/ic_billing_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/qr_scanner" android:text="@string/user_settings_scan_qr_code" app:drawableStartCompat="@drawable/ic_qr_code_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <LinearLayout android:id="@+id/nitro_settings_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:id="@+id/nitro_header" android:text="@string/premium_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/settings_nitro" app:drawableStartCompat="@drawable/ic_nitro_rep" app:drawableTint="?attr/colorControlBrandForeground" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/nitro_boosting" android:text="@string/premium_guild_subscription_title" app:drawableStartCompat="@drawable/ic_settings_boost_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <TextView android:id="@+id/privacy" android:text="@string/privacy_and_safety" app:drawableStartCompat="@drawable/ic_privacy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/authorized_apps" android:text="@string/authorized_apps" app:drawableStartCompat="@drawable/ic_authed_apps_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/connections" android:text="@string/connections" app:drawableStartCompat="@drawable/ic_phonelink_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/settings_billing" android:visibility="gone" android:text="@string/billing" app:drawableStartCompat="@drawable/ic_billing_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/qr_scanner" android:text="@string/user_settings_scan_qr_code" app:drawableStartCompat="@drawable/ic_qr_code_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <LinearLayout android:id="@+id/nitro_settings_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:id="@+id/nitro_header" android:text="@string/premium_settings" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/settings_nitro" app:drawableStartCompat="@drawable/ic_nitro_rep" app:drawableTint="?attr/colorControlBrandForeground" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/nitro_boosting" android:text="@string/premium_guild_subscription_title" app:drawableStartCompat="@drawable/ic_settings_boost_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
                 <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/nitroGiftingContainer" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <TextView android:id="@+id/nitro_gifting" android:background="@null" android:layout_width="0dp" android:text="@string/premium_gifting_title" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_gift_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/nitroGiftingBadge" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:paddingStart="4dp" android:paddingEnd="4dp" android:layout_marginEnd="20dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+                    <TextView android:id="@+id/nitro_gifting" android:background="@null" android:layout_width="0dp" android:text="@string/premium_gifting_title" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_gift_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/nitroGiftingBadge" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:paddingStart="4dp" android:paddingEnd="4dp" android:layout_marginEnd="20dp" style="@style/UiKit_TextView_Semibold"/>
                 </LinearLayout>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/app_settings_header" android:text="@string/app_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/voice" android:text="@string/voice_and_video" app:drawableStartCompat="@drawable/ic_voice_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/notifications" android:text="@string/notifications" app:drawableStartCompat="@drawable/ic_notification_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/text_images_settings" android:text="@string/text_and_images" app:drawableStartCompat="@drawable/ic_text_image_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/appearance" android:text="@string/appearance" app:drawableStartCompat="@drawable/ic_theme_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/accessibility" android:text="@string/accessibility" app:drawableStartCompat="@drawable/ic_accessibility_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/behavior" android:text="@string/form_label_mobile_notifications_behavior" app:drawableStartCompat="@drawable/ic_behavior_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/language" android:text="@string/language" app:drawableStartCompat="@drawable/ic_locale_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/activity_status" android:text="@string/activity_status" app:drawableStartCompat="@drawable/ic_activity_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <View android:id="@+id/developer_options_divider" android:visibility="gone" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/developer_options_header" android:visibility="gone" android:text="@string/developer_options" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/developer_options" android:visibility="gone" android:text="@string/developer_options" app:drawableStartCompat="@drawable/ic_security_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/app_info_header" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/changelog" android:text="@string/change_log" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/support" android:text="@string/support" app:drawableStartCompat="@drawable/ic_help_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/upload_debug_logs" android:text="@string/upload_debug_logs" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/acknowledgements" android:text="@string/acknowledgements" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/app_settings_header" android:text="@string/app_settings" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/voice" android:text="@string/voice_and_video" app:drawableStartCompat="@drawable/ic_voice_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/notifications" android:text="@string/notifications" app:drawableStartCompat="@drawable/ic_notification_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/text_images_settings" android:text="@string/text_and_images" app:drawableStartCompat="@drawable/ic_text_image_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/appearance" android:text="@string/appearance" app:drawableStartCompat="@drawable/ic_theme_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/accessibility" android:text="@string/accessibility" app:drawableStartCompat="@drawable/ic_accessibility_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/behavior" android:text="@string/form_label_mobile_notifications_behavior" app:drawableStartCompat="@drawable/ic_behavior_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/language" android:text="@string/language" app:drawableStartCompat="@drawable/ic_locale_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/activity_status" android:text="@string/activity_status" app:drawableStartCompat="@drawable/ic_activity_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <View android:id="@+id/developer_options_divider" android:visibility="gone" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/developer_options_header" android:visibility="gone" android:text="@string/developer_options" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/developer_options" android:visibility="gone" android:text="@string/developer_options" app:drawableStartCompat="@drawable/ic_security_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/app_info_header" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/changelog" android:text="@string/change_log" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/support" android:text="@string/support" app:drawableStartCompat="@drawable/ic_help_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/upload_debug_logs" android:text="@string/upload_debug_logs" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/acknowledgements" android:text="@string/acknowledgements" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_settings_account_change_password.xml b/app/src/main/res/layout-v22/widget_settings_account_change_password.xml
index 384c4a66e6..056b7b6979 100644
--- a/app/src/main/res/layout-v22/widget_settings_account_change_password.xml
+++ b/app/src/main/res/layout-v22/widget_settings_account_change_password.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_current_password_input" android:hint="@string/form_label_current_password" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password">
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_current_password_input" android:hint="@string/form_label_current_password" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password">
                     <requestFocus/>
                 </com.google.android.material.textfield.TextInputEditText>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_new_password_input" android:hint="@string/form_label_new_password" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:autofillHints="none" android:importantForAutofill="no" style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_new_password_input" android:hint="@string/form_label_new_password" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:autofillHints="none" android:importantForAutofill="no" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_two_factor" android:visibility="gone" android:hint="@string/two_fa" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" android:autofillHints="none" android:importantForAutofill="no" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_two_factor" android:visibility="gone" android:hint="@string/two_fa" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" android:autofillHints="none" android:importantForAutofill="no" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/change_password_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/change_password_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_settings_account_contacts_name_edit.xml b/app/src/main/res/layout-v22/widget_settings_account_contacts_name_edit.xml
index 5e2ac6853e..4f8e7390c1 100644
--- a/app/src/main/res/layout-v22/widget_settings_account_contacts_name_edit.xml
+++ b/app/src/main/res/layout-v22/widget_settings_account_contacts_name_edit.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_name_wrap" android:hint="@string/contact_sync_enter_name_input_header" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_name_wrap" android:hint="@string/contact_sync_enter_name_input_header" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_update_name_subtitle" android:layout_marginVertical="16dp" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red" android:id="@+id/settings_account_name_clear" android:padding="0dp" android:minWidth="0dp" android:text="@string/contact_sync_remove_name" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_update_name_subtitle" android:layout_marginVertical="16dp" style="@style/UiKit_TextView"/>
+            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red" android:id="@+id/settings_account_name_clear" android:padding="0dp" android:minWidth="0dp" android:text="@string/contact_sync_remove_name" style="@style/UiKit_Material_Button_Transparent_Fit"/>
         </LinearLayout>
     </ScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_settings_privacy.xml b/app/src/main/res/layout-v22/widget_settings_privacy.xml
index f12bcd689f..987ca7daf0 100644
--- a/app/src/main/res/layout-v22/widget_settings_privacy.xml
+++ b/app/src/main/res/layout-v22/widget_settings_privacy.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_privacy_safe_messaging_header" android:text="@string/user_explicit_content_filter" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/user_explicit_content_filter_help" style="@style/res_2131952492_uikit_settings_item"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_2" app:cs_subtext="@string/user_explicit_content_filter_friends_and_non_friends_help" app:cs_text="@string/user_explicit_content_filter_friends_and_non_friends" app:cs_text_color="@color/status_green_600" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_1" app:cs_subtext="@string/user_explicit_content_filter_non_friends_help" app:cs_text="@string/user_explicit_content_filter_non_friends" app:cs_text_color="@color/status_yellow_560" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_0" app:cs_subtext="@string/user_explicit_content_filter_disabled_help" app:cs_text="@string/user_explicit_content_filter_disabled" app:cs_text_color="@color/status_red_500" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_privacy_defaults_header" android:text="@string/user_dm_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_default_restricted_guilds" app:cs_subtext="@string/user_dm_settings_help" app:cs_text="@string/new_guilds_dm_allowed" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_privacy_friend_source_header" android:text="@string/friend_permitted_source" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_0" app:cs_text="@string/friend_permitted_source_all" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_1" app:cs_text="@string/friend_permitted_source_mutual_friends" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_2" app:cs_text="@string/friend_permitted_source_mutual_guilds" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/settings_privacy_contact_sync" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_privacy_contact_sync_title" android:text="@string/contact_sync_title" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_staff_only" app:cs_text="STAFF ONLY - Contact Sync Connection" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_enabled" app:cs_text="@string/contact_sync_setting_label" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_setting_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/contact_sync_info_settings_2" android:layout_marginHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_info_2" android:layout_marginHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:text="@string/contact_sync_info_permissions_form_header" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_phone" app:cs_subtext="@string/contact_sync_info_phone" app:cs_text="@string/form_label_phone_number" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_email" app:cs_subtext="@string/contact_sync_info_email" app:cs_text="@string/email" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_privacy_safe_messaging_header" android:text="@string/user_explicit_content_filter" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/user_explicit_content_filter_help" style="@style/UiKit_Settings_Item"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_2" app:cs_subtext="@string/user_explicit_content_filter_friends_and_non_friends_help" app:cs_text="@string/user_explicit_content_filter_friends_and_non_friends" app:cs_text_color="@color/status_green_600" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_1" app:cs_subtext="@string/user_explicit_content_filter_non_friends_help" app:cs_text="@string/user_explicit_content_filter_non_friends" app:cs_text_color="@color/status_yellow_560" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_0" app:cs_subtext="@string/user_explicit_content_filter_disabled_help" app:cs_text="@string/user_explicit_content_filter_disabled" app:cs_text_color="@color/status_red_500" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_privacy_defaults_header" android:text="@string/user_dm_settings" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_default_restricted_guilds" app:cs_subtext="@string/user_dm_settings_help" app:cs_text="@string/new_guilds_dm_allowed" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_privacy_friend_source_header" android:text="@string/friend_permitted_source" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_0" app:cs_text="@string/friend_permitted_source_all" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_1" app:cs_text="@string/friend_permitted_source_mutual_friends" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_2" app:cs_text="@string/friend_permitted_source_mutual_guilds" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/settings_privacy_contact_sync" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_privacy_contact_sync_title" android:text="@string/contact_sync_title" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_staff_only" app:cs_text="STAFF ONLY - Contact Sync Connection" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_enabled" app:cs_text="@string/contact_sync_setting_label" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_setting_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/contact_sync_info_settings_2" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_info_2" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView"/>
+                <TextView android:text="@string/contact_sync_info_permissions_form_header" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_phone" app:cs_subtext="@string/contact_sync_info_phone" app:cs_text="@string/form_label_phone_number" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_email" app:cs_subtext="@string/contact_sync_info_email" app:cs_text="@string/email" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/settings_privacy_controls" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_privacy_data_header" android:text="@string/data_privacy_controls" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_statistics" app:cs_subtext="@string/data_privacy_controls_usage_statistics_note" app:cs_text="@string/data_privacy_controls_usage_statistics_title" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_personalization" app:cs_subtext="@string/data_privacy_controls_personalization_note_learn_more" app:cs_text="@string/data_privacy_controls_personalization_title" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_screenreader_detection" app:cs_subtext="@string/data_privacy_controls_allow_accessibility_detection_note" app:cs_text="@string/data_privacy_controls_allow_accessibility_detection_title" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_basic_service" app:cs_subtext="@string/data_privacy_controls_basic_service_note" app:cs_text="@string/data_privacy_controls_basic_service_title" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_request_data" android:text="@string/data_privacy_controls_request_data_download" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952463_uikit_material_button_outline"/>
-                <TextView android:layout_gravity="center_horizontal" android:id="@+id/request_data_link" android:background="?attr/selectableItemBackground" android:padding="8dp" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout android:id="@+id/settings_privacy_controls" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_privacy_data_header" android:text="@string/data_privacy_controls" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_statistics" app:cs_subtext="@string/data_privacy_controls_usage_statistics_note" app:cs_text="@string/data_privacy_controls_usage_statistics_title" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_personalization" app:cs_subtext="@string/data_privacy_controls_personalization_note_learn_more" app:cs_text="@string/data_privacy_controls_personalization_title" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_screenreader_detection" app:cs_subtext="@string/data_privacy_controls_allow_accessibility_detection_note" app:cs_text="@string/data_privacy_controls_allow_accessibility_detection_title" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_basic_service" app:cs_subtext="@string/data_privacy_controls_basic_service_note" app:cs_text="@string/data_privacy_controls_basic_service_title" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_request_data" android:text="@string/data_privacy_controls_request_data_download" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button_Outline"/>
+                <TextView android:layout_gravity="center_horizontal" android:id="@+id/request_data_link" android:background="?attr/selectableItemBackground" android:padding="8dp" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_stage_channel_audience.xml b/app/src/main/res/layout-v22/widget_stage_channel_audience.xml
index b81b7479b4..dfe2678f66 100644
--- a/app/src/main/res/layout-v22/widget_stage_channel_audience.xml
+++ b/app/src/main/res/layout-v22/widget_stage_channel_audience.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_audience_member_container" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:paddingHorizontal="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_audience_member_container" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:paddingHorizontal="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
     <com.discord.views.CutoutView android:id="@+id/stage_channel_audience_member_icon_container" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cutout_badgeInset="6dp" app:cutout_badgeRadius="14dp" app:cutout_style="1" app:layout_constraintBottom_toTopOf="@+id/stage_channel_audience_member_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_audience_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/res_2131951674_avatar_large"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_audience_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/Avatar_Large"/>
     </com.discord.views.CutoutView>
     <ImageView android:id="@+id/stage_channel_audience_member_raised_hand" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_stage_raised_hand_24dp_activatable" app:layout_constraintCircle="@+id/stage_channel_audience_member_icon_container" app:layout_constraintCircleAngle="@integer/uikit_badge_angle" app:layout_constraintCircleRadius="26dp"/>
-    <TextView android:textColor="@color/primary_000" android:id="@+id/stage_channel_audience_member_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:drawablePadding="6dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_channel_audience_member_icon_container" style="@style/res_2131952580_uikit_textview_singleline"/>
+    <TextView android:textColor="@color/primary_000" android:id="@+id/stage_channel_audience_member_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:drawablePadding="6dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_channel_audience_member_icon_container" style="@style/UiKit_TextView_SingleLine"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_stage_channel_details.xml b/app/src/main/res/layout-v22/widget_stage_channel_details.xml
index f6827bb7b7..a97e0d2e16 100644
--- a/app/src/main/res/layout-v22/widget_stage_channel_details.xml
+++ b/app/src/main/res/layout-v22/widget_stage_channel_details.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="24dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:textColor="@color/white" android:id="@+id/widget_stage_channel_details_topic" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952522_uikit_stage_topic_header"/>
-    <TextView android:ellipsize="end" android:id="@+id/widget_stage_channel_details_name" android:maxLines="1" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="@color/status_green_600" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_dot" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_stage_channel_details_topic" app:layout_constraintWidth_default="1" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:textColor="@color/white" android:id="@+id/widget_stage_channel_details_topic" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_Topic_Header"/>
+    <TextView android:ellipsize="end" android:id="@+id/widget_stage_channel_details_name" android:maxLines="1" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="@color/status_green_600" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_dot" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_stage_channel_details_topic" app:layout_constraintWidth_default="1" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:layout_gravity="center" android:id="@+id/widget_stage_channel_details_dot" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/stage_channel_dot_separator" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_speaker_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_name" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name"/>
     <ImageView android:id="@+id/widget_stage_channel_details_speaker_icon" android:padding="2dp" android:layout_width="wrap_content" android:layout_height="16dp" android:src="@drawable/ic_mic_white_18dp" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_speaker_count" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_dot" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/widget_stage_channel_details_speaker_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_listener_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_speaker_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/widget_stage_channel_details_speaker_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_listener_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_speaker_icon" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:id="@+id/widget_stage_channel_details_listener_icon" android:padding="2dp" android:layout_width="wrap_content" android:layout_height="16dp" android:src="@drawable/ic_headset_24dp" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_listener_count" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_speaker_count" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/widget_stage_channel_details_listener_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_blocked_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_listener_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/widget_stage_channel_details_listener_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_blocked_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_listener_icon" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:id="@+id/widget_stage_channel_details_blocked_icon" android:padding="2dp" android:layout_width="wrap_content" android:layout_height="16dp" android:src="@drawable/ic_blocked_12dp" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_blocked_count" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_listener_count" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/widget_stage_channel_details_blocked_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/public_dot" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_blocked_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/widget_stage_channel_details_blocked_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/public_dot" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_blocked_icon" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:layout_gravity="center" android:id="@+id/public_dot" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/stage_channel_dot_separator" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/public_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_blocked_count" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name"/>
     <ImageView android:id="@+id/public_icon" android:layout_width="12dp" android:layout_height="12dp" android:src="@drawable/ic_globe_24dp" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/public_text" app:layout_constraintEnd_toStartOf="@+id/public_text" app:layout_constraintStart_toEndOf="@+id/public_dot" app:layout_constraintTop_toTopOf="@+id/public_text" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/public_text" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/stage_instance_privacy_type_public_label" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/public_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/public_text" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/stage_instance_privacy_type_public_label" android:layout_marginHorizontal="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/public_icon" style="@style/UiKit_Stage_Detail"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_stage_moderator_join_bottom_sheet.xml b/app/src/main/res/layout-v22/widget_stage_moderator_join_bottom_sheet.xml
index 98435629cb..97164389c3 100644
--- a/app/src/main/res/layout-v22/widget_stage_moderator_join_bottom_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_stage_moderator_join_bottom_sheet.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
-        <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="34dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+        <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="34dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
             <androidx.appcompat.widget.AppCompatImageView android:id="@+id/sparkle" android:background="@drawable/ic_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="centerInside" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:srcCompat="@drawable/ic_channel_stage_24dp_white" app:tint="?attr/colorInteractiveNormal"/>
-            <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/res_2131952519_uikit_stage_title"/>
-            <TextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_moderator_join_modal_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952517_uikit_stage_subtitle"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/join_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_speaker" android:layout_marginEnd="4dp" app:icon="@drawable/ic_mic_grey_24dp" app:iconGravity="2" app:layout_constraintEnd_toStartOf="@+id/join_audience" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/res_2131952467_uikit_material_button_secondary"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/join_audience" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_audience" android:layout_marginStart="4dp" app:icon="@drawable/ic_members_24dp" app:iconGravity="2" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/join_speaker" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/res_2131952467_uikit_material_button_secondary"/>
+            <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/UiKit_Stage_Title"/>
+            <TextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_moderator_join_modal_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_Stage_Subtitle"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/join_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_speaker" android:layout_marginEnd="4dp" app:icon="@drawable/ic_mic_grey_24dp" app:iconGravity="2" app:layout_constraintEnd_toStartOf="@+id/join_audience" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/UiKit_Material_Button_Secondary"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/join_audience" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_audience" android:layout_marginStart="4dp" app:icon="@drawable/ic_members_24dp" app:iconGravity="2" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/join_speaker" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/UiKit_Material_Button_Secondary"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_stage_public_notice_bottom_sheet.xml b/app/src/main/res/layout-v22/widget_stage_public_notice_bottom_sheet.xml
index ddd20bab84..92ccba8c76 100644
--- a/app/src/main/res/layout-v22/widget_stage_public_notice_bottom_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_stage_public_notice_bottom_sheet.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
         <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
             <androidx.appcompat.widget.AppCompatImageView android:id="@+id/public_notice_header_icon" android:background="@drawable/ic_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:src="@drawable/ic_globe_32dp" android:scaleType="centerInside" app:layout_constraintBottom_toTopOf="@+id/public_notice_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/primary_000"/>
             <com.discord.views.ScreenTitleView android:id="@+id/public_notice_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@+id/public_notice_info_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_header_icon" app:stv_title="@string/start_stage_public_info_title"/>
-            <LinearLayout android:id="@+id/public_notice_info_wrap" android:background="@drawable/drawable_start_stage_bg" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constraintBottom_toTopOf="@+id/public_notice_confirm" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_title" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/start_stage_public_info_section_one" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
-                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:layout_marginVertical="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:text="@string/start_stage_public_info_section_two" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
-                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:layout_marginVertical="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/section_three" android:text="@string/start_stage_public_info_section_three" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
-                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:layout_marginVertical="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:text="@string/start_stage_public_info_section_four" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
+            <LinearLayout android:id="@+id/public_notice_info_wrap" android:background="@drawable/drawable_start_stage_bg" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constraintBottom_toTopOf="@+id/public_notice_confirm" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_title" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/start_stage_public_info_section_one" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
+                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:layout_marginVertical="16dp" style="@style/UiKit_Divider"/>
+                <TextView android:text="@string/start_stage_public_info_section_two" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
+                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:layout_marginVertical="16dp" style="@style/UiKit_Divider"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/section_three" android:text="@string/start_stage_public_info_section_three" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
+                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:layout_marginVertical="16dp" style="@style/UiKit_Divider"/>
+                <TextView android:text="@string/start_stage_public_info_section_four" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
             </LinearLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_confirm" android:layout_marginTop="24dp" android:text="@string/start_stage_public_confirm" app:layout_constraintBottom_toTopOf="@+id/public_notice_dismiss" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_info_wrap" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_dismiss" android:text="@string/nevermind" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_confirm" style="@style/res_2131952467_uikit_material_button_secondary"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_confirm" android:layout_marginTop="24dp" android:text="@string/start_stage_public_confirm" app:layout_constraintBottom_toTopOf="@+id/public_notice_dismiss" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_info_wrap" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_dismiss" android:text="@string/nevermind" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_confirm" style="@style/UiKit_Material_Button_Secondary"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_stage_raised_hands_bottom_sheet.xml b/app/src/main/res/layout-v22/widget_stage_raised_hands_bottom_sheet.xml
index a87fa41136..ed3a72e16e 100644
--- a/app/src/main/res/layout-v22/widget_stage_raised_hands_bottom_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_stage_raised_hands_bottom_sheet.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_raised_hands_bottom_sheet_root" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_raised_hands_bottom_sheet_root" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
         <View android:id="@+id/header" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="14dp" android:text="@string/request_to_speak_area_title" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952520_uikit_stage_title_secondary"/>
-        <com.google.android.material.textview.MaterialTextView android:ellipsize="end" android:id="@+id/subtitle" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/request_to_speak_area_all_roles" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/stage_raise_hands_enabled_toggle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952517_uikit_stage_subtitle"/>
-        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/stage_raise_hands_enabled_toggle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="true" app:layout_constraintBottom_toBottomOf="@+id/header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952455_uikit_listitem_switch"/>
-        <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:gravity="center_vertical" android:id="@+id/toggle_speaker_state_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:layout_height="80dp" android:text="@string/moderator_raise_own_hand" android:paddingStart="72dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/header" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="14dp" android:text="@string/request_to_speak_area_title" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_Title_Secondary"/>
+        <com.google.android.material.textview.MaterialTextView android:ellipsize="end" android:id="@+id/subtitle" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/request_to_speak_area_all_roles" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/stage_raise_hands_enabled_toggle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_Stage_Subtitle"/>
+        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/stage_raise_hands_enabled_toggle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="true" app:layout_constraintBottom_toBottomOf="@+id/header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem_Switch"/>
+        <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:gravity="center_vertical" android:id="@+id/toggle_speaker_state_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:layout_height="80dp" android:text="@string/moderator_raise_own_hand" android:paddingStart="72dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/header" style="@style/UiKit_TextView_Semibold"/>
         <ImageView android:id="@+id/toggle_speaker_state_icon" android:background="@drawable/ripple_circle_black" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_mic_white_24dp" android:scaleType="centerInside" android:backgroundTint="?attr/colorBackgroundTertiary" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="@+id/toggle_speaker_state_button" app:layout_constraintStart_toStartOf="@+id/toggle_speaker_state_button" app:layout_constraintTop_toTopOf="@+id/toggle_speaker_state_button" app:tint="?attr/colorInteractiveNormal"/>
-        <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:id="@+id/raised_hands_count_label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/request_to_speak_list_title" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/toggle_speaker_state_button" style="@style/res_2131952516_uikit_stage_sectionheader"/>
+        <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:id="@+id/raised_hands_count_label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/request_to_speak_list_title" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/toggle_speaker_state_button" style="@style/UiKit_Stage_SectionHeader"/>
         <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/stage_raised_hands_recycler" android:paddingTop="8dp" android:paddingBottom="8dp" android:clipToPadding="false" android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="200dp" android:nestedScrollingEnabled="true" android:paddingVertical="8dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_count_label" app:layout_constraintVertical_bias="0" app:max_height="400dp"/>
-        <ImageView android:id="@+id/raised_hands_empty_sparkle" android:background="@drawable/ic_sparkle" android:layout_marginTop="70dp" android:src="@drawable/ic_stage_raised_hand" android:scaleType="centerInside" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_count_label" app:layout_constraintVertical_chainStyle="2" app:tint="?attr/primary_300" style="@style/res_2131952448_uikit_imageview"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/request_to_speak_empty_list_title" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_sparkle" style="@style/res_2131952519_uikit_stage_title"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="70dp" android:text="@string/request_to_speak_empty_list_body" android:paddingHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_title" style="@style/res_2131952517_uikit_stage_subtitle"/>
+        <ImageView android:id="@+id/raised_hands_empty_sparkle" android:background="@drawable/ic_sparkle" android:layout_marginTop="70dp" android:src="@drawable/ic_stage_raised_hand" android:scaleType="centerInside" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_count_label" app:layout_constraintVertical_chainStyle="2" app:tint="?attr/primary_300" style="@style/UiKit_ImageView"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/request_to_speak_empty_list_title" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_sparkle" style="@style/UiKit_Stage_Title"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="70dp" android:text="@string/request_to_speak_empty_list_body" android:paddingHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_title" style="@style/UiKit_Stage_Subtitle"/>
         <androidx.constraintlayout.widget.Group android:id="@+id/raised_hands_empty_group" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="raised_hands_empty_sparkle,raised_hands_empty_title,raised_hands_empty_subtitle"/>
         <androidx.constraintlayout.widget.Group android:id="@+id/toggle_speaker_state_group" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="toggle_speaker_state_button,toggle_speaker_state_icon"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_stage_settings.xml b/app/src/main/res/layout-v22/widget_stage_settings.xml
index e1ee01f663..e0d8bfb70a 100644
--- a/app/src/main/res/layout-v22/widget_stage_settings.xml
+++ b/app/src/main/res/layout-v22/widget_stage_settings.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:paddingHorizontal="16dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <androidx.core.widget.NestedScrollView android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:paddingHorizontal="16dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
             <com.discord.views.ScreenTitleView android:id="@+id/stage_start_screen_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@+id/stage_start_topic_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:stv_subtitle="@string/start_stage_channel_event_modal_subtitle" app:stv_title="@string/start_stage_channel_event_modal_title"/>
-            <TextView android:id="@+id/stage_start_topic_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/start_stage_channel_event_modal_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_screen_title" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/stage_start_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_title" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/topic_input" android:layout_height="48dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <TextView android:id="@+id/stage_start_topic_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/start_stage_channel_event_modal_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_screen_title" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/stage_start_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_title" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/topic_input" android:layout_height="48dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <LinearLayout android:id="@+id/stage_start_creation_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_layout" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.discord.views.CheckedSetting android:id="@+id/stage_start_members_radio_button" app:cs_drawable_left="@drawable/ic_members_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_members_subtitle" app:cs_text="@string/start_stage_channel_event_members_title" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <com.discord.views.CheckedSetting android:id="@+id/stage_start_public_radio_button" app:cs_drawable_left="@drawable/ic_globe_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_public_subtitle" app:cs_text="@string/start_stage_channel_event_public_title" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <LinearLayout android:id="@+id/stage_start_creation_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_layout" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.discord.views.CheckedSetting android:id="@+id/stage_start_members_radio_button" app:cs_drawable_left="@drawable/ic_members_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_members_subtitle" app:cs_text="@string/start_stage_channel_event_members_title" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_Divider"/>
+                <com.discord.views.CheckedSetting android:id="@+id/stage_start_public_radio_button" app:cs_drawable_left="@drawable/ic_globe_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_public_subtitle" app:cs_text="@string/start_stage_channel_event_public_title" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_public_disclaimer" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_channel_event_public_explanation" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_creation_options" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_help_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_modal_set_topic_help_text" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_public_disclaimer" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <com.discord.views.CheckedSetting android:id="@+id/notify_members_check" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cs_background="@drawable/drawable_start_stage_bg" app:cs_text="@string/guild_notify_members" app:cs_view_type="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_help_text" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_public_disclaimer" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_channel_event_public_explanation" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_creation_options" style="@style/UiKit_TextView_Subtext"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_help_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_modal_set_topic_help_text" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_public_disclaimer" style="@style/UiKit_TextView_Subtext"/>
+            <com.discord.views.CheckedSetting android:id="@+id/notify_members_check" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cs_background="@drawable/drawable_start_stage_bg" app:cs_text="@string/guild_notify_members" app:cs_view_type="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_help_text" style="@style/UiKit_CheckedSetting_Themed"/>
             <Space android:id="@+id/start_stage_button_spacer" android:layout_width="16dp" android:layout_height="0dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/notify_members_check"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/start_stage_button" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_button_spacer" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/start_stage_button" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_button_spacer" style="@style/UiKit_Material_Button"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_start_stage_server_selection.xml b/app/src/main/res/layout-v22/widget_start_stage_server_selection.xml
index d252746ef6..f51162c8d3 100644
--- a/app/src/main/res/layout-v22/widget_start_stage_server_selection.xml
+++ b/app/src/main/res/layout-v22/widget_start_stage_server_selection.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
     <ImageView android:id="@+id/start_stage_server_selection_banner" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/img_create_stage_choose_server" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
     <ImageView android:id="@+id/close_button" android:background="@drawable/drawable_uikit_white_circle" android:padding="4dp" android:focusable="true" android:clickable="true" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="16dp" android:src="@drawable/ic_close_primary_200_24dp" android:contentDescription="@string/close" android:backgroundTint="@color/black_alpha_50" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/start_stage_server_selection_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_title" android:layout_marginHorizontal="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_banner" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/start_stage_server_selection_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_subtitle" android:layout_marginHorizontal="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_title" style="@style/res_2131952563_uikit_textview"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="16dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button_hint" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_subtitle" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/start_stage_server_selection_button_hint" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/start_stage_modal_server_selection_button_hint" android:textAllCaps="true" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <Button android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textColor="@color/white" android:id="@+id/start_stage_server_selection_button" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/start_stage_modal_server_selection_button_text" android:backgroundTint="?attr/colorBackgroundAccent" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/start_stage_server_selection_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_title" android:layout_marginHorizontal="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_banner" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/start_stage_server_selection_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_subtitle" android:layout_marginHorizontal="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_title" style="@style/UiKit_TextView"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="16dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button_hint" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_subtitle" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/start_stage_server_selection_button_hint" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/start_stage_modal_server_selection_button_hint" android:textAllCaps="true" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_TextView"/>
+    <Button android:textAppearance="@style/UiKit_TextAppearance_Button" android:textColor="@color/white" android:id="@+id/start_stage_server_selection_button" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/start_stage_modal_server_selection_button_text" android:backgroundTint="?attr/colorBackgroundAccent" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_start_stage_server_selection_bullet_item.xml b/app/src/main/res/layout-v22/widget_start_stage_server_selection_bullet_item.xml
index be20b9a56a..61cfd97615 100644
--- a/app/src/main/res/layout-v22/widget_start_stage_server_selection_bullet_item.xml
+++ b/app/src/main/res/layout-v22/widget_start_stage_server_selection_bullet_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/start_stage_server_selection_bullet_item_container" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_icon" android:background="@drawable/drawable_uikit_white_circle" android:padding="8dp" android:layout_width="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_height="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="12dp" android:src="@drawable/ic_channel_stage_24dp" android:importantForAccessibility="no" android:backgroundTint="?attr/colorBackgroundTertiary" android:layout_marginHorizontal="16dp" android:layout_marginVertical="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951678_avatar_standard"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_bullet_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_bullet_item_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_bullet_item_text" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952416_uikit_divider"/>
+    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_icon" android:background="@drawable/drawable_uikit_white_circle" android:padding="8dp" android:layout_width="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_height="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="12dp" android:src="@drawable/ic_channel_stage_24dp" android:importantForAccessibility="no" android:backgroundTint="?attr/colorBackgroundTertiary" android:layout_marginHorizontal="16dp" android:layout_marginVertical="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Standard"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_bullet_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_bullet_item_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_bullet_item_text" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_Divider"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_start_stage_server_selection_guild_item.xml b/app/src/main/res/layout-v22/widget_start_stage_server_selection_guild_item.xml
index 672a2d8b91..ff19eb24c8 100644
--- a/app/src/main/res/layout-v22/widget_start_stage_server_selection_guild_item.xml
+++ b/app/src/main/res/layout-v22/widget_start_stage_server_selection_guild_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/start_stage_server_selection_guild_item_container" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/start_stage_server_selection_guild_item_icon" android:background="@drawable/drawable_squircle_transparent" android:layout_width="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_height="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="12dp" android:layout_marginHorizontal="16dp" android:layout_marginVertical="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/asset_default_avatar_32dp"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_guild_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_guild_item_icon" app:layout_constraintRight_toLeftOf="@+id/start_stage_server_selection_guild_item_arrow" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <ImageView android:id="@+id/start_stage_server_selection_guild_item_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_arrow_right" android:importantForAccessibility="no" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/start_stage_server_selection_guild_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_guild_item_text" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952416_uikit_divider"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_guild_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_guild_item_icon" app:layout_constraintRight_toLeftOf="@+id/start_stage_server_selection_guild_item_arrow" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_SingleLine"/>
+    <ImageView android:id="@+id/start_stage_server_selection_guild_item_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_arrow_right" android:importantForAccessibility="no" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/start_stage_server_selection_guild_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_guild_item_text" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_Divider"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_sticker_pack_store_sheet.xml b/app/src/main/res/layout-v22/widget_sticker_pack_store_sheet.xml
index f5b9e0b3eb..c985ea096e 100644
--- a/app/src/main/res/layout-v22/widget_sticker_pack_store_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_sticker_pack_store_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_pack_store_sheet_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/sticker_pack_view_all_banner" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:importantForAccessibility="no" app:actualImageScaleType="6" app:viewAspectRatio="4.4" style="@style/res_2131952448_uikit_imageview"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/sticker_pack_store_sheet_recycler" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:layout_height="match_parent" android:layout_above="@+id/sticker_pack_store_sheet_buy_button_container" android:layout_below="@+id/sticker_pack_view_all_banner" android:paddingHorizontal="8dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_pack_store_sheet_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/sticker_pack_view_all_banner" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:importantForAccessibility="no" app:actualImageScaleType="6" app:viewAspectRatio="4.4" style="@style/UiKit_ImageView"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/sticker_pack_store_sheet_recycler" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:layout_height="match_parent" android:layout_above="@+id/sticker_pack_store_sheet_buy_button_container" android:layout_below="@+id/sticker_pack_view_all_banner" android:paddingHorizontal="8dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
     <FrameLayout android:id="@+id/sticker_pack_store_sheet_buy_button_container" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="16dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true">
         <com.discord.views.LoadingButton android:id="@+id/sticker_store_buy_button_premium" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" app:lb_background_color="@color/status_green_600" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white"/>
     </FrameLayout>
diff --git a/app/src/main/res/layout-v22/widget_sticker_picker.xml b/app/src/main/res/layout-v22/widget_sticker_picker.xml
index 1f04cff6c4..0e2499f1a8 100644
--- a/app/src/main/res/layout-v22/widget_sticker_picker.xml
+++ b/app/src/main/res/layout-v22/widget_sticker_picker.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/sticker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/sticker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <com.discord.views.SearchInputView android:id="@+id/sticker_search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:animateLayoutChanges="true" app:siv_hint="@string/search_for_stickers" app:siv_search_content_description="@string/search_for_stickers"/>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_sticker_picker_recycler" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:layout_marginTop="12dp" android:layout_marginRight="8dp" android:layout_marginHorizontal="8dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_sticker_picker_recycler" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:layout_marginTop="12dp" android:layout_marginRight="8dp" android:layout_marginHorizontal="8dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
             <ImageView android:layout_gravity="center_horizontal" android:id="@+id/chat_input_sticker_picker_empty_image" android:layout_width="wrap_content" android:layout_height="72dp" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no"/>
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8dp" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/res_2131952563_uikit_textview"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/chat_input_sticker_picker_empty_link" android:visibility="gone" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/res_2131952572_uikit_textview_link"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8dp" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/UiKit_TextView"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/chat_input_sticker_picker_empty_link" android:visibility="gone" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/UiKit_TextView_Link"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container_phase_1" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title_phase_1" android:layout_marginTop="8dp" android:text="@string/sticker_picker_premium_empty_state_title" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle_phase_1" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" android:text="@string/sticker_picker_premium_empty_state_subtitle" style="@style/res_2131952563_uikit_textview"/>
-            <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container_phase_1" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title_phase_1" android:layout_marginTop="8dp" android:text="@string/sticker_picker_premium_empty_state_title" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle_phase_1" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" android:text="@string/sticker_picker_premium_empty_state_subtitle" style="@style/UiKit_TextView"/>
+            <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <com.discord.views.sticker.StickerView android:id="@+id/chat_input_sticker_picker_empty_sticker_1" android:layout_width="60dp" android:layout_height="60dp" android:layout_marginRight="4dp"/>
                 <com.discord.views.sticker.StickerView android:id="@+id/chat_input_sticker_picker_empty_sticker_2" android:layout_width="60dp" android:layout_height="60dp" android:layout_marginRight="4dp"/>
                 <com.discord.views.sticker.StickerView android:id="@+id/chat_input_sticker_picker_empty_sticker_3" android:layout_width="60dp" android:layout_height="60dp" android:layout_marginRight="4dp"/>
@@ -25,8 +25,8 @@
             <com.discord.views.LoadingButton android:id="@+id/chat_input_sticker_picker_empty_subscribe" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:lb_background_color="@color/status_green_600" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white" app:lb_text="@string/sticker_picker_premium_empty_state_cta"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
-    <View android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/sticker_picker_bottom_bar" style="@style/res_2131952416_uikit_divider"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <View android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/sticker_picker_bottom_bar" style="@style/UiKit_Divider"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/sticker_picker_category_recycler" android:layout_width="0dp" android:layout_height="match_parent" android:contentDescription="@string/categories" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-v22/widget_sticker_sheet.xml b/app/src/main/res/layout-v22/widget_sticker_sheet.xml
index 3fa31de3af..9fbb98e597 100644
--- a/app/src/main/res/layout-v22/widget_sticker_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_sticker_sheet.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_sheet_sticker_name" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_sheet_sticker_info" android:focusable="true" android:clickable="true" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <LinearLayout android:id="@+id/sticker_sheet_stickers_container" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:weightSum="4" android:importantForAccessibility="noHideDescendants" android:layout_marginHorizontal="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_sheet_sticker_name" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_sheet_sticker_info" android:focusable="true" android:clickable="true" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" android:layout_marginHorizontal="16dp" style="@style/UiKit_TextView"/>
+    <LinearLayout android:id="@+id/sticker_sheet_stickers_container" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:weightSum="4" android:importantForAccessibility="noHideDescendants" android:layout_marginHorizontal="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_1" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_2" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_3" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_4" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
     </LinearLayout>
     <com.discord.views.LoadingButton android:id="@+id/sticker_sheet_buy_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:lb_background_color="@color/status_green_600" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/sticker_sheet_view_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/sticker_pack_view" android:layout_marginHorizontal="16dp" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/sticker_sheet_view_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/sticker_pack_view" android:layout_marginHorizontal="16dp" style="@style/UiKit_Material_Button_Secondary"/>
     <RelativeLayout android:id="@+id/sticker_sheet_view_limited_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp">
-        <TextView android:layout_width="wrap_content" android:text="@string/sticker_popout_countdown_header" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.chip.Chip android:id="@+id/sticker_sheet_view_limited_chip" android:layout_alignParentEnd="true" style="@style/res_2131952400_uikit_chip_limited"/>
+        <TextView android:layout_width="wrap_content" android:text="@string/sticker_popout_countdown_header" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+        <com.google.android.material.chip.Chip android:id="@+id/sticker_sheet_view_limited_chip" android:layout_alignParentEnd="true" style="@style/UiKit_Chip_Limited"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_unknown_sticker_sheet.xml b/app/src/main/res/layout-v22/widget_unknown_sticker_sheet.xml
index 0fd4ac35d1..ba1eefec2b 100644
--- a/app/src/main/res/layout-v22/widget_unknown_sticker_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_unknown_sticker_sheet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="14dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="14dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <com.discord.views.sticker.StickerView android:id="@+id/unknown_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/unknown_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/sticker_popout_premium_unjoined_private_guild_description" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/unknown_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/sticker_popout_premium_unjoined_private_guild_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout-v22/widget_user_sheet.xml b/app/src/main/res/layout-v22/widget_user_sheet.xml
index 04879e3bc6..99f85d0933 100644
--- a/app/src/main/res/layout-v22/widget_user_sheet.xml
+++ b/app/src/main/res/layout-v22/widget_user_sheet.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:focusable="true" android:focusableInTouchMode="true" android:contentDescription="@string/profile" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:focusable="true" android:focusableInTouchMode="true" android:contentDescription="@string/profile" style="@style/UiKit_ViewGroup_NestedScrollView">
     <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-        <LinearLayout android:id="@+id/user_sheet_content" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+        <LinearLayout android:id="@+id/user_sheet_content" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
             <FrameLayout android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="@dimen/uikit_elevation_low">
                 <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@+id/user_sheet_profile_header_view" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" app:user_profile_header_background_color="?attr/colorBackgroundTertiary"/>
-                <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/user_sheet_more_button" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginTop="16dp" android:src="@drawable/ic_more_options_with_circular_background" android:contentDescription="@string/more" android:layout_marginEnd="16dp" style="@style/res_2131952449_uikit_imageview_clickable"/>
+                <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/user_sheet_more_button" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginTop="16dp" android:src="@drawable/ic_more_options_with_circular_background" android:contentDescription="@string/more" android:layout_marginEnd="16dp" style="@style/UiKit_ImageView_Clickable"/>
             </FrameLayout>
             <FrameLayout android:id="@+id/user_sheet_profile_edit_container" android:background="?attr/colorBackgroundTertiary" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="@dimen/uikit_elevation_low" android:paddingHorizontal="16dp">
-                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_profile_edit_button" android:layout_width="match_parent" android:text="@string/edit_profile" style="@style/res_2131952468_uikit_material_button_secondary_fit"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_profile_edit_button" android:layout_width="match_parent" android:text="@string/edit_profile" style="@style/UiKit_Material_Button_Secondary_Fit"/>
             </FrameLayout>
-            <View android:id="@+id/user_sheet_profile_actions_divider" android:visibility="gone" style="@style/res_2131952416_uikit_divider"/>
-            <LinearLayout android:id="@+id/user_sheet_profile_actions_container" android:background="?attr/colorBackgroundTertiary" android:elevation="@dimen/uikit_elevation_low" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <Button android:id="@+id/user_sheet_message_action_button" android:layout_width="0dp" android:text="@string/user_profile_message" android:drawableTop="?attr/ic_user_profile_action_message" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:id="@+id/user_sheet_call_action_button" android:layout_width="0dp" android:text="@string/user_profile_audio" android:drawableTop="?attr/ic_user_profile_action_call" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:id="@+id/user_sheet_video_action_button" android:layout_width="0dp" android:text="@string/user_profile_video" android:drawableTop="?attr/ic_user_profile_action_video" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:textColor="@color/status_green_600" android:id="@+id/user_sheet_add_friend_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_add_friend" android:drawableTop="@drawable/ic_add_friend_plus" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:textColor="@color/status_yellow_500" android:id="@+id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
+            <View android:id="@+id/user_sheet_profile_actions_divider" android:visibility="gone" style="@style/UiKit_Divider"/>
+            <LinearLayout android:id="@+id/user_sheet_profile_actions_container" android:background="?attr/colorBackgroundTertiary" android:elevation="@dimen/uikit_elevation_low" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <Button android:id="@+id/user_sheet_message_action_button" android:layout_width="0dp" android:text="@string/user_profile_message" android:drawableTop="?attr/ic_user_profile_action_message" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:id="@+id/user_sheet_call_action_button" android:layout_width="0dp" android:text="@string/user_profile_audio" android:drawableTop="?attr/ic_user_profile_action_call" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:id="@+id/user_sheet_video_action_button" android:layout_width="0dp" android:text="@string/user_profile_video" android:drawableTop="?attr/ic_user_profile_action_video" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:textColor="@color/status_green_600" android:id="@+id/user_sheet_add_friend_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_add_friend" android:drawableTop="@drawable/ic_add_friend_plus" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:textColor="@color/status_yellow_500" android:id="@+id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
             </LinearLayout>
-            <androidx.cardview.widget.CardView android:id="@+id/user_sheet_profile_stage_actions_card" android:visibility="gone" android:layout_marginTop="16dp" style="@style/res_2131952619_userprofile_section_card">
+            <androidx.cardview.widget.CardView android:id="@+id/user_sheet_profile_stage_actions_card" android:visibility="gone" android:layout_marginTop="16dp" style="@style/UserProfile_Section_Card">
                 <com.discord.widgets.stage.usersheet.UserProfileStageActionsView android:id="@+id/user_sheet_profile_stage_actions_view" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/res_2131952620_userprofile_section_header"/>
-            <LinearLayout android:id="@+id/user_sheet_friend_request_incoming_container" android:visibility="gone" android:layout_width="match_parent" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_ignore_button" android:text="@string/friend_request_ignore" android:layout_weight="1" android:layout_marginEnd="8dp" style="@style/res_2131952468_uikit_material_button_secondary_fit"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1" style="@style/res_2131952461_uikit_material_button_green_fit"/>
+            <TextView android:id="@+id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/UserProfile_Section_Header"/>
+            <LinearLayout android:id="@+id/user_sheet_friend_request_incoming_container" android:visibility="gone" android:layout_width="match_parent" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_ignore_button" android:text="@string/friend_request_ignore" android:layout_weight="1" android:layout_marginEnd="8dp" style="@style/UiKit_Material_Button_Secondary_Fit"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1" style="@style/UiKit_Material_Button_Green_Fit"/>
             </LinearLayout>
-            <TextView android:id="@+id/about_me_header" android:visibility="gone" android:text="@string/user_popout_about_me" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView android:id="@+id/about_me_card" android:visibility="gone" style="@style/res_2131952619_userprofile_section_card">
-                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/about_me_text" android:padding="16dp" android:maxLines="6" android:lineSpacingMultiplier="1.25" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:id="@+id/about_me_header" android:visibility="gone" android:text="@string/user_popout_about_me" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView android:id="@+id/about_me_card" android:visibility="gone" style="@style/UserProfile_Section_Card">
+                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/about_me_text" android:padding="16dp" android:maxLines="6" android:lineSpacingMultiplier="1.25" style="@style/UiKit_TextView"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_profile_voice_settings_header" android:text="@string/voice_settings" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView android:id="@+id/voice_settings_view_card" android:visibility="gone" style="@style/res_2131952619_userprofile_section_card">
+            <TextView android:id="@+id/user_sheet_profile_voice_settings_header" android:text="@string/voice_settings" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView android:id="@+id/voice_settings_view_card" android:visibility="gone" style="@style/UserProfile_Section_Card">
                 <com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView android:id="@+id/user_sheet_profile_voice_settings_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </androidx.cardview.widget.CardView>
-            <FrameLayout android:id="@+id/rich_presence_container" android:visibility="gone" style="@style/res_2131952589_uikit_viewgroup"/>
-            <LinearLayout android:id="@+id/user_sheet_guild_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/user_sheet_guild_header" style="@style/res_2131952620_userprofile_section_header"/>
-                <com.discord.widgets.roles.RolesListView android:id="@+id/user_sheet_roles_list" android:contentDescription="@string/roles" style="@style/res_2131952618_userprofile_section"/>
-                <androidx.cardview.widget.CardView android:id="@+id/user_sheet_admin_card" android:layout_marginTop="16dp" style="@style/res_2131952619_userprofile_section_card">
+            <FrameLayout android:id="@+id/rich_presence_container" android:visibility="gone" style="@style/UiKit_ViewGroup"/>
+            <LinearLayout android:id="@+id/user_sheet_guild_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/user_sheet_guild_header" style="@style/UserProfile_Section_Header"/>
+                <com.discord.widgets.roles.RolesListView android:id="@+id/user_sheet_roles_list" android:contentDescription="@string/roles" style="@style/UserProfile_Section"/>
+                <androidx.cardview.widget.CardView android:id="@+id/user_sheet_admin_card" android:layout_marginTop="16dp" style="@style/UserProfile_Section_Card">
                     <com.discord.widgets.user.profile.UserProfileAdminView android:id="@+id/user_sheet_admin_view" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
                 </androidx.cardview.widget.CardView>
             </LinearLayout>
-            <TextView android:id="@+id/user_sheet_connections_header" android:visibility="gone" android:text="@string/connections" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView style="@style/res_2131952619_userprofile_section_card">
+            <TextView android:id="@+id/user_sheet_connections_header" android:visibility="gone" android:text="@string/connections" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView style="@style/UserProfile_Section_Card">
                 <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@+id/user_sheet_connections_view" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_note_header" android:text="@string/note" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView style="@style/res_2131952619_userprofile_section_card">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/user_sheet_note_text_field_wrap" android:layout_marginBottom="16dp" android:hint="@string/note_placeholder_mobile" app:boxStrokeWidth="0dp" app:counterEnabled="true" app:counterMaxLength="256" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/user_sheet_note_text_field" android:maxLength="256" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <TextView android:id="@+id/user_sheet_note_header" android:text="@string/note" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView style="@style/UserProfile_Section_Card">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/user_sheet_note_text_field_wrap" android:layout_marginBottom="16dp" android:hint="@string/note_placeholder_mobile" app:boxStrokeWidth="0dp" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/user_sheet_note_text_field" android:maxLength="256" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/res_2131952620_userprofile_section_header"/>
-            <TextView android:id="@+id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/res_2131952453_uikit_listitem_icon"/>
+            <TextView android:id="@+id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UserProfile_Section_Header"/>
+            <TextView android:id="@+id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/UiKit_ListItem_Icon"/>
         </LinearLayout>
         <FrameLayout android:id="@+id/user_sheet_loading_container" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent">
             <androidx.core.widget.ContentLoadingProgressBar android:layout_gravity="top|center_vertical|center_horizontal|center" android:id="@+id/loading_progress_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="32dp" android:contentDescription="@string/loading" style="?android:attr/progressBarStyleLarge"/>
diff --git a/app/src/main/res/layout-w600dp/widget_guild_invite.xml b/app/src/main/res/layout-w600dp/widget_guild_invite.xml
index 6eb0ac8bdf..5dc8378733 100644
--- a/app/src/main/res/layout-w600dp/widget_guild_invite.xml
+++ b/app/src/main/res/layout-w600dp/widget_guild_invite.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" android:foreground="?attr/gradient_invite_splash">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_invite_splash" android:layout_width="match_parent" android:layout_height="match_parent" app:actualImageScaleType="6" app:placeholderImage="@drawable/drawable_default_invite_splash" app:placeholderImageScaleType="6"/>
     </FrameLayout>
-    <RelativeLayout android:layout_height="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <androidx.core.widget.NestedScrollView android:layout_height="match_parent" android:layout_above="@+id/guild_invite_actions" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-            <com.discord.widgets.guilds.invite.WidgetInviteInfo android:gravity="center" android:id="@+id/guild_invite_info" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+    <RelativeLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <androidx.core.widget.NestedScrollView android:layout_height="match_parent" android:layout_above="@+id/guild_invite_actions" style="@style/UiKit_ViewGroup_ScrollView">
+            <com.discord.widgets.guilds.invite.WidgetInviteInfo android:gravity="center" android:id="@+id/guild_invite_info" style="@style/UiKit_ViewGroup_LinearLayout"/>
         </androidx.core.widget.NestedScrollView>
-        <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_invite_actions" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952403_uikit_copy_anchor">
+        <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_invite_actions" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_Copy_Anchor">
             <FrameLayout android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintWidth_percent="0.5">
-                <com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@+id/guild_invite_cancel" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="200dp" android:text="@string/cancel" style="@style/res_2131952467_uikit_material_button_secondary"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_accept" android:visibility="gone" android:layout_width="match_parent" android:maxWidth="500dp" android:text="@string/instant_invite_accept" style="@style/res_2131952458_uikit_material_button"/>
+                <com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@+id/guild_invite_cancel" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="200dp" android:text="@string/cancel" style="@style/UiKit_Material_Button_Secondary"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_accept" android:visibility="gone" android:layout_width="match_parent" android:maxWidth="500dp" android:text="@string/instant_invite_accept" style="@style/UiKit_Material_Button"/>
             </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </RelativeLayout>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-w600dp/widget_guild_invite_info.xml b/app/src/main/res/layout-w600dp/widget_guild_invite_info.xml
index e53cef4816..86799f7b66 100644
--- a/app/src/main/res/layout-w600dp/widget_guild_invite_info.xml
+++ b/app/src/main/res/layout-w600dp/widget_guild_invite_info.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:id="@+id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96dp" android:layout_marginTop="16dp" android:layout_marginRight="96dp" android:layout_marginBottom="16dp" android:src="?attr/img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/res_2131952448_uikit_imageview"/>
-    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <RelativeLayout android:id="@+id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:id="@+id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96dp" android:layout_marginTop="16dp" android:layout_marginRight="96dp" android:layout_marginBottom="16dp" android:src="?attr/img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit_ImageView"/>
+    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <RelativeLayout android:id="@+id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
             <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="64dp">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar" style="@style/res_2131951673_avatar_hero"/>
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar" style="@style/Avatar_Hero"/>
             </androidx.cardview.widget.CardView>
             <RelativeLayout android:id="@+id/invite_avatar_small_wrap" android:background="?attr/colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="-3dp" android:layout_alignParentBottom="true" android:layout_marginEnd="-3dp" android:layout_alignParentEnd="true"/>
         </RelativeLayout>
-        <TextView android:textSize="18sp" android:id="@+id/invite_title" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <TextView android:textSize="18sp" android:id="@+id/invite_title" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@+id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23dp">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar_small" style="@style/res_2131951674_avatar_large"/>
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar_small" style="@style/Avatar_Large"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:textSize="26sp" android:textColor="?attr/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/invite_message" android:drawablePadding="4dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textSize="26sp" android:textColor="?attr/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/invite_message" android:drawablePadding="4dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@+id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:gravity="center" android:id="@+id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <androidx.cardview.widget.CardView android:id="@+id/invite_members_online_wrap" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="30dp">
-                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_green_600" app:roundAsCircle="true"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
             <androidx.cardview.widget.CardView android:id="@+id/invite_members_total_wrap" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="30dp">
-                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_members_total" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_members_total" android:singleLine="true" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
diff --git a/app/src/main/res/layout/allow_accessibility_detection_dialog.xml b/app/src/main/res/layout/allow_accessibility_detection_dialog.xml
index 95ada7023d..0842eb5bed 100644
--- a/app/src/main/res/layout/allow_accessibility_detection_dialog.xml
+++ b/app/src/main/res/layout/allow_accessibility_detection_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:text="@string/accessibility_detection_modal_header" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:id="@+id/accessibility_detection_body_text" android:padding="16dp" android:text="@string/accessibility_detection_modal_body" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/accessibility_detection_disable" android:text="@string/accessibility_detection_modal_decline_label" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/accessibility_detection_enable" android:text="@string/accessibility_detection_modal_accept_label" style="@style/res_2131952459_uikit_material_button_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:text="@string/accessibility_detection_modal_header" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Divider"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:id="@+id/accessibility_detection_body_text" android:padding="16dp" android:text="@string/accessibility_detection_modal_body" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/accessibility_detection_disable" android:text="@string/accessibility_detection_modal_decline_label" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/accessibility_detection_enable" android:text="@string/accessibility_detection_modal_accept_label" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/anchored_voice_controls_view.xml b/app/src/main/res/layout/anchored_voice_controls_view.xml
index c8faeecd38..883794d48b 100644
--- a/app/src/main/res/layout/anchored_voice_controls_view.xml
+++ b/app/src/main/res/layout/anchored_voice_controls_view.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:id="@+id/voice_fullscreen_controls_controls_wrap" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:id="@+id/voice_fullscreen_controls_controls_wrap" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageView android:id="@+id/voice_fullscreen_controls_camera" android:background="?attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/ic_videocam_white_24dp" android:layout_weight="1" android:contentDescription="@string/camera"/>
         <ImageView android:id="@+id/voice_fullscreen_controls_screenshare" android:background="?attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/ic_mobile_screenshare_24dp" android:layout_weight="1" android:contentDescription="@string/deafen" app:tint="?attr/colorInteractiveNormal"/>
         <ImageView android:id="@+id/voice_fullscreen_controls_mute_state" android:background="?attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="wrap_content" android:src="?attr/ic_mic_state" android:layout_weight="1" android:contentDescription="@string/mute"/>
         <ImageView android:id="@+id/voice_fullscreen_controls_speaker" android:background="?attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1" android:contentDescription="@string/switch_audio_output" app:tint="?attr/colorInteractiveNormal"/>
         <ImageView android:id="@+id/voice_fullscreen_controls_disconnect" android:background="?attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="match_parent" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500"/>
     </LinearLayout>
-    <com.google.android.material.button.MaterialButton android:id="@+id/voice_fullscreen_controls_ptt" android:visibility="gone" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:text="@string/input_mode_ptt" style="@style/res_2131952458_uikit_material_button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/voice_fullscreen_controls_ptt" android:visibility="gone" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:text="@string/input_mode_ptt" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/audio_output_selection_dialog.xml b/app/src/main/res/layout/audio_output_selection_dialog.xml
index 425b4ade42..7f0553fa3a 100644
--- a/app/src/main/res/layout/audio_output_selection_dialog.xml
+++ b/app/src/main/res/layout/audio_output_selection_dialog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundSecondary" android:minWidth="328dp" style="@style/res_2131952411_uikit_dialog_container">
-    <TextView android:id="@+id/audio_output_selection_dialog_header" android:background="?attr/colorBackgroundTertiary" android:text="@string/audio_devices_output_selection_prompt" style="@style/res_2131952451_uikit_listitem"/>
-    <RadioGroup android:id="@+id/audio_output_selection_dialog_radio_group" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_bluetooth_radio" android:text="@string/audio_devices_bluetooth" android:drawableEnd="@drawable/ic_bluetooth_24dp" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_speaker_radio" android:text="@string/audio_devices_speaker" android:drawableEnd="@drawable/ic_sound_24dp" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_wired_radio" android:text="@string/audio_devices_wired" android:drawableEnd="@drawable/ic_headset_24dp" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_earpiece_radio" android:text="@string/audio_devices_earpiece" android:drawableEnd="@drawable/ic_phone_24dp" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundSecondary" android:minWidth="328dp" style="@style/UiKit_Dialog_Container">
+    <TextView android:id="@+id/audio_output_selection_dialog_header" android:background="?attr/colorBackgroundTertiary" android:text="@string/audio_devices_output_selection_prompt" style="@style/UiKit_ListItem"/>
+    <RadioGroup android:id="@+id/audio_output_selection_dialog_radio_group" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_bluetooth_radio" android:text="@string/audio_devices_bluetooth" android:drawableEnd="@drawable/ic_bluetooth_24dp" style="@style/UiKit_ListItem_Icon_Radio"/>
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_speaker_radio" android:text="@string/audio_devices_speaker" android:drawableEnd="@drawable/ic_sound_24dp" style="@style/UiKit_ListItem_Icon_Radio"/>
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_wired_radio" android:text="@string/audio_devices_wired" android:drawableEnd="@drawable/ic_headset_24dp" style="@style/UiKit_ListItem_Icon_Radio"/>
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/audio_output_selection_earpiece_radio" android:text="@string/audio_devices_earpiece" android:drawableEnd="@drawable/ic_phone_24dp" style="@style/UiKit_ListItem_Icon_Radio"/>
     </RadioGroup>
 </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_simple_selector.xml b/app/src/main/res/layout/bottom_sheet_simple_selector.xml
index 483edbfed4..2ebff48ea1 100644
--- a/app/src/main/res/layout/bottom_sheet_simple_selector.xml
+++ b/app/src/main/res/layout/bottom_sheet_simple_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/widget_simple_bottom_sheet_selector_header" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="56dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:id="@+id/widget_simple_bottom_sheet_selector_placeholder" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952564_uikit_textview_bold"/>
+        <TextView android:id="@+id/widget_simple_bottom_sheet_selector_placeholder" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Bold"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/widget_simple_bottom_sheet_selector_recycler" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constrainedHeight="true" app:layout_constraintTop_toBottomOf="@+id/widget_simple_bottom_sheet_selector_header" app:max_height_screen_ratio="0.75"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_simple_selector_item.xml b/app/src/main/res/layout/bottom_sheet_simple_selector_item.xml
index 8e4f8827d4..347cc7ae0e 100644
--- a/app/src/main/res/layout/bottom_sheet_simple_selector_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_simple_selector_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/select_component_sheet_item_icon" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginStart="16dp" app:actualImageScaleType="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_title" android:layout_width="0dp" android:layout_height="wrap_content" android:drawablePadding="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_description" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952456_uikit_listitem_title"/>
-    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_description" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_title" app:layout_goneMarginTop="0dp" style="@style/res_2131952452_uikit_listitem_description"/>
+    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_title" android:layout_width="0dp" android:layout_height="wrap_content" android:drawablePadding="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_description" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem_Title"/>
+    <com.google.android.material.textview.MaterialTextView android:id="@+id/select_component_sheet_item_description" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_title" app:layout_goneMarginTop="0dp" style="@style/UiKit_ListItem_Description"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/camera_capacity_dialog.xml b/app/src/main/res/layout/camera_capacity_dialog.xml
index cd6a4cc613..4acde84cb0 100644
--- a/app/src/main/res/layout/camera_capacity_dialog.xml
+++ b/app/src/main/res/layout/camera_capacity_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:padding="16dp" android:text="@string/video_capacity_modal_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:padding="16dp" android:text="@string/video_capacity_modal_header" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <TextView android:textColor="@color/primary_200" android:id="@+id/camera_capacity_body" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:text="@string/video_capacity_modal_body" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/camera_capacity_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/okay" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:textColor="@color/primary_200" android:id="@+id/camera_capacity_body" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:text="@string/video_capacity_modal_body" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/camera_capacity_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/okay" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/card_segment_view.xml b/app/src/main/res/layout/card_segment_view.xml
index 423d4d6d5f..493f50a112 100644
--- a/app/src/main/res/layout/card_segment_view.xml
+++ b/app/src/main/res/layout/card_segment_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:gravity="center" android:layout_centerVertical="true" android:paddingStart="8dp" android:paddingEnd="4dp" android:layout_alignParentEnd="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:gravity="center" android:layout_centerVertical="true" android:paddingStart="8dp" android:paddingEnd="4dp" android:layout_alignParentEnd="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <TextView android:id="@+id/card_segment_text" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:paddingStart="0dp" android:paddingEnd="4dp" style="@style/SegmentedControlTab"/>
-        <TextView android:id="@+id/card_segment_badge" android:background="@drawable/drawable_overlay_mentions" android:visibility="gone" android:layout_marginEnd="4dp" style="@style/res_2131952021_icon_mentions"/>
+        <TextView android:id="@+id/card_segment_badge" android:background="@drawable/drawable_overlay_mentions" android:visibility="gone" android:layout_marginEnd="4dp" style="@style/Icon_Mentions"/>
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout/channel_permission_owner_view.xml b/app/src/main/res/layout/channel_permission_owner_view.xml
index c98924a768..a8a980a14b 100644
--- a/app/src/main/res/layout/channel_permission_owner_view.xml
+++ b/app/src/main/res/layout/channel_permission_owner_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/image" android:layout_width="40dp" android:layout_height="40dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImageScaleType="4" style="@style/Avatar"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:ellipsize="end" android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginStart="16dp" android:layout_marginEnd="20dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:ellipsize="end" android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginStart="16dp" android:layout_marginEnd="20dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Semibold"/>
     <ImageView android:id="@+id/crown" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_crown_16dp" android:contentDescription="@string/private_channel_add_members_modal_row_owner" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/name" app:layout_constraintTop_toTopOf="@+id/name"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/image" app:layout_constraintTop_toBottomOf="@+id/name" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/image" app:layout_constraintTop_toBottomOf="@+id/name" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/confirm_remove_permission_dialog.xml b/app/src/main/res/layout/confirm_remove_permission_dialog.xml
index 5ee21fea98..ca5ec9b708 100644
--- a/app/src/main/res/layout/confirm_remove_permission_dialog.xml
+++ b/app/src/main/res/layout/confirm_remove_permission_dialog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:padding="16dp" android:text="@string/settings_permissions_delete_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:padding="16dp" android:text="@string/settings_permissions_delete_title" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/body" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:text="@string/settings_permissions_delete_body" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout android:paddingTop="4dp" android:paddingBottom="4dp" style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:layout_gravity="center_vertical" android:id="@+id/cancel" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/body" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:text="@string/settings_permissions_delete_body" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout android:paddingTop="4dp" android:paddingBottom="4dp" style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:layout_gravity="center_vertical" android:id="@+id/cancel" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
         <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@+id/confirm" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:lb_background_color="@color/status_red" app:lb_progress_color="@color/white" app:lb_text="@string/private_channel_members_remove_yes_confirmation" app:lb_text_color="@drawable/button_text_color_primary_100"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/connected_account_actions_dialog.xml b/app/src/main/res/layout/connected_account_actions_dialog.xml
index e10628cc87..9a37b62b39 100644
--- a/app/src/main/res/layout/connected_account_actions_dialog.xml
+++ b/app/src/main/res/layout/connected_account_actions_dialog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630" android:minWidth="328dp" style="@style/res_2131952411_uikit_dialog_container">
-    <TextView android:id="@+id/connected_account_actions_dialog_header" android:background="?attr/primary_700" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/connected_account_actions_dialog_open_in_browser" android:visibility="gone" android:text="@string/open_in_browser" style="@style/res_2131952451_uikit_listitem"/>
-    <TextView android:id="@+id/connected_account_actions_dialog_copy_username" android:text="@string/copy_username" style="@style/res_2131952451_uikit_listitem"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630" android:minWidth="328dp" style="@style/UiKit_Dialog_Container">
+    <TextView android:id="@+id/connected_account_actions_dialog_header" android:background="?attr/primary_700" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/connected_account_actions_dialog_open_in_browser" android:visibility="gone" android:text="@string/open_in_browser" style="@style/UiKit_ListItem"/>
+    <TextView android:id="@+id/connected_account_actions_dialog_copy_username" android:text="@string/copy_username" style="@style/UiKit_ListItem"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/contact_sync_permissions_sheet.xml b/app/src/main/res/layout/contact_sync_permissions_sheet.xml
index 527286144e..d97c27a171 100644
--- a/app/src/main/res/layout/contact_sync_permissions_sheet.xml
+++ b/app/src/main/res/layout/contact_sync_permissions_sheet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_permissions_discoverable_toggle" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:cs_padding_vertical="0dp" app:cs_text="@string/contact_sync_landing_toggle_label" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_permissions_discovery_info_1" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_landing_info_2" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_discovery_info_2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discoverable_toggle" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_permissions_discovery_info_2" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_info_2" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_learn_more" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discovery_info_1" style="@style/res_2131952563_uikit_textview"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_permissions_learn_more" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_learn_more" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_subtitle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discovery_info_2" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/contact_sync_permissions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="24dp" android:text="@string/contact_sync_info_permissions_form_header" android:lineSpacingMultiplier="1" android:textAllCaps="true" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_phone_toggle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_learn_more" style="@style/res_2131952564_uikit_textview_bold"/>
-    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_permissions_phone_toggle" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_padding_vertical="16dp" app:cs_subtext="@string/contact_sync_info_phone" app:cs_subtext_color="?attr/colorHeaderSecondary" app:cs_subtext_size="@dimen/uikit_textsize_small" app:cs_text="@string/form_label_phone_number" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_email_toggle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discovery_info_2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_permissions_email_toggle" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_padding_vertical="0dp" app:cs_subtext="@string/contact_sync_info_email" app:cs_subtext_color="?attr/colorHeaderSecondary" app:cs_subtext_size="@dimen/uikit_textsize_small" app:cs_text="@string/form_label_email" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_phone_toggle" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_permissions_discoverable_toggle" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:cs_padding_vertical="0dp" app:cs_text="@string/contact_sync_landing_toggle_label" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_CheckedSetting_Themed"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_permissions_discovery_info_1" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_landing_info_2" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_discovery_info_2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discoverable_toggle" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_permissions_discovery_info_2" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_info_2" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_learn_more" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discovery_info_1" style="@style/UiKit_TextView"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_permissions_learn_more" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_learn_more" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_subtitle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discovery_info_2" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/contact_sync_permissions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="24dp" android:text="@string/contact_sync_info_permissions_form_header" android:lineSpacingMultiplier="1" android:textAllCaps="true" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_phone_toggle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_learn_more" style="@style/UiKit_TextView_Bold"/>
+    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_permissions_phone_toggle" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_padding_vertical="16dp" app:cs_subtext="@string/contact_sync_info_phone" app:cs_subtext_color="?attr/colorHeaderSecondary" app:cs_subtext_size="@dimen/uikit_textsize_small" app:cs_text="@string/form_label_phone_number" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:layout_constraintBottom_toTopOf="@+id/contact_sync_permissions_email_toggle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_discovery_info_2" style="@style/UiKit_CheckedSetting_Themed"/>
+    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_permissions_email_toggle" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_padding_vertical="0dp" app:cs_subtext="@string/contact_sync_info_email" app:cs_subtext_color="?attr/colorHeaderSecondary" app:cs_subtext_size="@dimen/uikit_textsize_small" app:cs_text="@string/form_label_email" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_permissions_phone_toggle" style="@style/UiKit_CheckedSetting_Themed"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/contact_sync_upsell_sheet.xml b/app/src/main/res/layout/contact_sync_upsell_sheet.xml
index 8b9db88552..ee7285ffee 100644
--- a/app/src/main/res/layout/contact_sync_upsell_sheet.xml
+++ b/app/src/main/res/layout/contact_sync_upsell_sheet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_upsell_title" android:layout_marginTop="24dp" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:fontFamily="?attr/font_primary_bold" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_upsell_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_upsell_title" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_upsell_title" android:layout_marginTop="24dp" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:fontFamily="?attr/font_primary_bold" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1"/>
+    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_upsell_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_upsell_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_upsell_title" style="@style/UiKit_TextView_Medium"/>
     <LinearLayout android:orientation="vertical" android:id="@+id/contact_sync_upsell_cta" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0">
         <include android:id="@+id/contact_sync_upsell_toggle_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" layout="@layout/layout_contact_sync_toggle_info"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_upsell_next_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/contact_sync_upsell_skip_button" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:text="@string/private_channel_add_members_modal_skip" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_upsell_next_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/contact_sync_upsell_skip_button" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:text="@string/private_channel_add_members_modal_skip" style="@style/UiKit_Material_Button_Transparent_Fit"/>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/default_tooltip_view_bottom.xml b/app/src/main/res/layout/default_tooltip_view_bottom.xml
index 2efd1177e3..6b85d8ae55 100644
--- a/app/src/main/res/layout/default_tooltip_view_bottom.xml
+++ b/app/src/main/res/layout/default_tooltip_view_bottom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/TooltipDefaultContainer">
-    <ImageView android:src="@drawable/ic_tooltip_bottom_tail" android:rotation="180" app:layout_constraintBottom_toTopOf="@+id/default_tooltip_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:tint="?attr/color_brand" style="@style/res_2131952448_uikit_imageview"/>
+    <ImageView android:src="@drawable/ic_tooltip_bottom_tail" android:rotation="180" app:layout_constraintBottom_toTopOf="@+id/default_tooltip_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:tint="?attr/color_brand" style="@style/UiKit_ImageView"/>
     <TextView android:id="@+id/default_tooltip_text" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" style="@style/TooltipDefaultText"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/default_tooltip_view_top.xml b/app/src/main/res/layout/default_tooltip_view_top.xml
index ebdf43b94d..4013ed2017 100644
--- a/app/src/main/res/layout/default_tooltip_view_top.xml
+++ b/app/src/main/res/layout/default_tooltip_view_top.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/TooltipDefaultContainer">
     <TextView android:id="@+id/default_tooltip_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/TooltipDefaultText"/>
-    <ImageView android:src="@drawable/ic_tooltip_bottom_tail" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/default_tooltip_text" app:tint="?attr/color_brand" style="@style/res_2131952448_uikit_imageview"/>
+    <ImageView android:src="@drawable/ic_tooltip_bottom_tail" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/default_tooltip_text" app:tint="?attr/color_brand" style="@style/UiKit_ImageView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_add_content_pager_with_fab.xml b/app/src/main/res/layout/dialog_add_content_pager_with_fab.xml
index d9e7c66b02..dc848f44eb 100644
--- a/app/src/main/res/layout/dialog_add_content_pager_with_fab.xml
+++ b/app/src/main/res/layout/dialog_add_content_pager_with_fab.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/flexInputDialogBackground" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131951974_flexinput_dialogwhenlarge">
-    <androidx.viewpager.widget.ViewPager android:layout_gravity="bottom" android:id="@+id/content_pager" android:layout_width="match_parent" android:layout_height="@dimen/default_keyboard_height" style="@style/res_2131951963_flexinput_addcontent"/>
-    <FrameLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131951971_flexinput_addcontent_container_tablayout">
-        <com.google.android.material.tabs.TabLayout android:id="@+id/content_tabs" android:background="?attr/primary_800_bg" style="@style/res_2131951973_flexinput_addcontent_tablayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/flexInputDialogBackground" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/FlexInput_DialogWhenLarge">
+    <androidx.viewpager.widget.ViewPager android:layout_gravity="bottom" android:id="@+id/content_pager" android:layout_width="match_parent" android:layout_height="@dimen/default_keyboard_height" style="@style/FlexInput_AddContent"/>
+    <FrameLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/FlexInput_AddContent_Container_TabLayout">
+        <com.google.android.material.tabs.TabLayout android:id="@+id/content_tabs" android:background="?attr/primary_800_bg" style="@style/FlexInput_AddContent_TabLayout">
             <com.google.android.material.tabs.TabItem android:icon="@drawable/ic_keyboard_24dp" android:id="@+id/add_content_keyboard_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/show_keyboard"/>
         </com.google.android.material.tabs.TabLayout>
     </FrameLayout>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/action_btn" android:visibility="gone" android:contentDescription="@string/send_message" app:layout_anchor="@+id/content_pager" style="@style/res_2131951970_flexinput_addcontent_button_send"/>
-    <ImageView android:id="@+id/launch_btn" android:contentDescription="@string/select_from_application_a11y_label" app:layout_anchor="@+id/content_pager" style="@style/res_2131951969_flexinput_addcontent_button_launcher"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/action_btn" android:visibility="gone" android:contentDescription="@string/send_message" app:layout_anchor="@+id/content_pager" style="@style/FlexInput_AddContent_Button_Send"/>
+    <ImageView android:id="@+id/launch_btn" android:contentDescription="@string/select_from_application_a11y_label" app:layout_anchor="@+id/content_pager" style="@style/FlexInput_AddContent_Button_Launcher"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/dialog_date_picker.xml b/app/src/main/res/layout/dialog_date_picker.xml
index 26f00706c9..4d5578b8be 100644
--- a/app/src/main/res/layout/dialog_date_picker.xml
+++ b/app/src/main/res/layout/dialog_date_picker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:gravity="center" android:id="@+id/dialog_date_picker_title" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:gravity="center" android:id="@+id/dialog_date_picker_title" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView_H1_Bold"/>
     <DatePicker android:theme="@style/DialogDatePicker" android:id="@+id/dialog_date_picker_input" android:layout_width="match_parent" android:layout_height="match_parent" android:calendarViewShown="false" android:datePickerMode="spinner"/>
-    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/dialog_date_picker_done" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/done" style="@style/res_2131952458_uikit_material_button"/>
+    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/dialog_date_picker_done" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/done" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_simple_selector.xml b/app/src/main/res/layout/dialog_simple_selector.xml
index e57865f1f9..fd535b66b0 100644
--- a/app/src/main/res/layout/dialog_simple_selector.xml
+++ b/app/src/main/res/layout/dialog_simple_selector.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/dialog_title" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1.4" android:elevation="@dimen/app_elevation" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/dialog_title" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1.4" android:elevation="@dimen/app_elevation" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Settings_Divider"/>
     <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:orientation="vertical" android:id="@+id/dialog_selections" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="LinearLayoutManager" app:max_height_screen_ratio="0.5"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <FrameLayout android:background="?attr/primary_630" android:layout_width="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:layout_gravity="end" android:id="@+id/dialog_cancel" android:text="@string/cancel" android:textAllCaps="true" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+    <View style="@style/UiKit_Divider"/>
+    <FrameLayout android:background="?attr/primary_630" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_Page">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:layout_gravity="end" android:id="@+id/dialog_cancel" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit_Material_Button_Transparent_Fit"/>
     </FrameLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_simple_selector_item.xml b/app/src/main/res/layout/dialog_simple_selector_item.xml
index 6bc12202a7..37068c65d1 100644
--- a/app/src/main/res/layout/dialog_simple_selector_item.xml
+++ b/app/src/main/res/layout/dialog_simple_selector_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_large" android:padding="16dp" android:layout_width="match_parent" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/sample_number_9" style="@style/res_2131952579_uikit_textview_semibold"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_large" android:padding="16dp" android:layout_width="match_parent" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/sample_number_9" style="@style/UiKit_TextView_Semibold"/>
diff --git a/app/src/main/res/layout/directory_add_server_list_item.xml b/app/src/main/res/layout/directory_add_server_list_item.xml
index e6a7b8e27e..d36359d10e 100644
--- a/app/src/main/res/layout/directory_add_server_list_item.xml
+++ b/app/src/main/res/layout/directory_add_server_list_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/account" android:text="@string/hub_add_server_cta" app:drawableStartCompat="@drawable/ic_add_circle_dark" style="@style/res_2131952497_uikit_settings_item_icon"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/account" android:text="@string/hub_add_server_cta" app:drawableStartCompat="@drawable/ic_add_circle_dark" style="@style/UiKit_Settings_Item_Icon"/>
diff --git a/app/src/main/res/layout/discord_hub_add_server_list_item.xml b/app/src/main/res/layout/discord_hub_add_server_list_item.xml
index fee5e162a9..378a7fc496 100644
--- a/app/src/main/res/layout/discord_hub_add_server_list_item.xml
+++ b/app/src/main/res/layout/discord_hub_add_server_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <com.google.android.material.card.MaterialCardView android:id="@+id/discord_u_add_server_list_item_layout" android:background="?attr/colorBackgroundPrimary" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952046_nux_guildtemplates_card">
+    <com.google.android.material.card.MaterialCardView android:id="@+id/discord_u_add_server_list_item_layout" android:background="?attr/colorBackgroundPrimary" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/Nux_GuildTemplates_Card">
         <LinearLayout android:gravity="center_vertical" android:padding="12dp" android:layout_width="match_parent" android:layout_height="wrap_content">
             <com.discord.views.GuildView android:id="@+id/discord_u_add_server_list_item_image" android:layout_width="40dp" android:layout_height="40dp" app:gv_text_size="16sp" style="@style/Avatar"/>
-            <TextView android:id="@+id/discord_u_add_server_list_item_text" android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952047_nux_guildtemplates_card_action"/>
+            <TextView android:id="@+id/discord_u_add_server_list_item_text" android:layout_width="0dp" android:layout_weight="1" style="@style/Nux_GuildTemplates_Card_Action"/>
             <ImageView android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/icon_carrot" android:importantForAccessibility="no"/>
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/emoji_picker_premium_upsell.xml b/app/src/main/res/layout/emoji_picker_premium_upsell.xml
index 1850a6cf85..d0627fa8ea 100644
--- a/app/src/main/res/layout/emoji_picker_premium_upsell.xml
+++ b/app/src/main/res/layout/emoji_picker_premium_upsell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:orientation="horizontal" android:background="@drawable/rounded_rectangle_4dp_radius" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:backgroundTint="?attr/colorBackgroundTertiary">
     <ImageView android:layout_width="22dp" android:layout_height="wrap_content" android:layout_margin="12dp" android:src="@drawable/ic_nitro_badge_nitro_gradient_16dp" android:adjustViewBounds="true" android:importantForAccessibility="no"/>
-    <TextView android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_body" android:layout_weight="1" android:lineSpacingMultiplier="1" android:layout_marginEnd="36dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:id="@+id/emojiPickerPremiumCta" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="12dp" android:paddingTop="16dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_cta" style="@style/res_2131952572_uikit_textview_link"/>
+    <TextView android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_body" android:layout_weight="1" android:lineSpacingMultiplier="1" android:layout_marginEnd="36dp" style="@style/UiKit_TextView"/>
+    <TextView android:id="@+id/emojiPickerPremiumCta" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="12dp" android:paddingTop="16dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/emoji_picker_premium_upsell_cta" style="@style/UiKit_TextView_Link"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/empty_friends_state_contact_sync_view.xml b/app/src/main/res/layout/empty_friends_state_contact_sync_view.xml
index 22724beed2..b66b28bdd5 100644
--- a/app/src/main/res/layout/empty_friends_state_contact_sync_view.xml
+++ b/app/src/main/res/layout/empty_friends_state_contact_sync_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@+id/empty_friends_state_cs_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/img_contact_sync_empty_state_upsell" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_cs_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2"/>
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_friends_state_cs_title" android:text="@string/contact_sync_find_friends_title" app:layout_constraintBottom_toTopOf="@+id/cs_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_image" style="@style/res_2131952001_friendslist_emptystate_title"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/cs_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_empty_friends_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_cs_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_title" style="@style/res_2131952000_friendslist_emptystate_subtitle"/>
-    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_cs_button" android:text="@string/get_started" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/cs_subtitle" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_friends_state_cs_title" android:text="@string/contact_sync_find_friends_title" app:layout_constraintBottom_toTopOf="@+id/cs_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_image" style="@style/FriendsList_EmptyState_Title"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/cs_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_empty_friends_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_cs_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_cs_title" style="@style/FriendsList_EmptyState_Subtitle"/>
+    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_cs_button" android:text="@string/get_started" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/cs_subtitle" style="@style/UiKit_Material_Button"/>
 </merge>
diff --git a/app/src/main/res/layout/empty_friends_state_view.xml b/app/src/main/res/layout/empty_friends_state_view.xml
index c9758fb9f6..ff06989993 100644
--- a/app/src/main/res/layout/empty_friends_state_view.xml
+++ b/app/src/main/res/layout/empty_friends_state_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@+id/empty_friends_state_image" android:src="@drawable/img_wumpus_playing_with_friends" android:importantForAccessibility="no" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131951999_friendslist_emptystate_image"/>
-    <TextView android:id="@+id/empty_friends_state_title" android:text="@string/friends_empty_state_all" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_image" style="@style/res_2131952001_friendslist_emptystate_title"/>
-    <TextView android:id="@+id/subtitle" android:text="@string/friends_empty_state_subtitle" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_add_friend" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_title" style="@style/res_2131952000_friendslist_emptystate_subtitle"/>
-    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_add_friend" android:text="@string/add_friend" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/res_2131952458_uikit_material_button"/>
+    <ImageView android:id="@+id/empty_friends_state_image" android:src="@drawable/img_wumpus_playing_with_friends" android:importantForAccessibility="no" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/FriendsList_EmptyState_Image"/>
+    <TextView android:id="@+id/empty_friends_state_title" android:text="@string/friends_empty_state_all" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_image" style="@style/FriendsList_EmptyState_Title"/>
+    <TextView android:id="@+id/subtitle" android:text="@string/friends_empty_state_subtitle" app:layout_constraintBottom_toTopOf="@+id/empty_friends_state_add_friend" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_friends_state_title" style="@style/FriendsList_EmptyState_Subtitle"/>
+    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/empty_friends_state_add_friend" android:text="@string/add_friend" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/UiKit_Material_Button"/>
 </merge>
diff --git a/app/src/main/res/layout/exo_player_control_view.xml b/app/src/main/res/layout/exo_player_control_view.xml
index 6165a08e24..7bc6885a61 100644
--- a/app/src/main/res/layout/exo_player_control_view.xml
+++ b/app/src/main/res/layout/exo_player_control_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" style="@style/res_2131952589_uikit_viewgroup">
-    <LinearLayout android:gravity="center_vertical" android:background="@color/primary_900_alpha_80" android:padding="16dp" android:layout_alignParentBottom="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" style="@style/UiKit_ViewGroup">
+    <LinearLayout android:gravity="center_vertical" android:background="@color/primary_900_alpha_80" android:padding="16dp" android:layout_alignParentBottom="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageButton android:id="@+id/exo_play" android:layout_width="24dp" android:layout_height="24dp" android:contentDescription="@string/play" android:layout_marginEnd="16dp" style="@style/res_2131951923_exomediabutton_play"/>
         <ImageButton android:id="@+id/exo_pause" android:layout_width="24dp" android:layout_height="24dp" android:contentDescription="@string/pause" android:layout_marginEnd="16dp" style="@style/res_2131951922_exomediabutton_pause"/>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="14dp" android:textColor="@color/white" android:id="@+id/exo_position" android:minWidth="40dp" android:layout_marginEnd="8dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="14dp" android:textColor="@color/white" android:id="@+id/exo_position" android:minWidth="40dp" android:layout_marginEnd="8dp" style="@style/UiKit_TextView"/>
         <com.google.android.exoplayer2.ui.DefaultTimeBar android:id="@+id/exo_progress" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="14dp" android:textColor="@color/white" android:id="@+id/exo_duration" android:layout_marginStart="8dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="14dp" android:textColor="@color/white" android:id="@+id/exo_duration" android:layout_marginStart="8dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/expression_picker_header_item.xml b/app/src/main/res/layout/expression_picker_header_item.xml
index 887de2b042..2e06e84f93 100644
--- a/app/src/main/res/layout/expression_picker_header_item.xml
+++ b/app/src/main/res/layout/expression_picker_header_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/header_item_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="4dp" android:paddingTop="4dp" android:paddingRight="4dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/header_item_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="4dp" android:paddingTop="4dp" android:paddingRight="4dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
diff --git a/app/src/main/res/layout/feedback_view.xml b/app/src/main/res/layout/feedback_view.xml
index 427fdffb28..4678c6f30b 100644
--- a/app/src/main/res/layout/feedback_view.xml
+++ b/app/src/main/res/layout/feedback_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/feedback_rating_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-        <TextView android:id="@+id/feedback_rating_summary_prompt" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951958_feedback_row_prompt"/>
-        <ImageView android:id="@+id/feedback_sad_rating" android:src="?attr/ic_selectable_feedback_sad" android:contentDescription="@string/call_feedback_sentiment_negative" android:layout_marginEnd="24dp" app:layout_constraintEnd_toStartOf="@+id/feedback_neutral_rating" app:layout_constraintTop_toBottomOf="@+id/feedback_rating_summary_prompt" style="@style/res_2131952449_uikit_imageview_clickable"/>
-        <ImageButton android:id="@+id/feedback_neutral_rating" android:src="?attr/ic_selectable_feedback_neutral" android:contentDescription="@string/call_feedback_sentiment_neutral" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/feedback_rating_summary_prompt" style="@style/res_2131952449_uikit_imageview_clickable"/>
-        <ImageButton android:id="@+id/feedback_happy_rating" android:src="?attr/ic_selectable_feedback_happy" android:contentDescription="@string/call_feedback_sentiment_positive" android:layout_marginStart="24dp" app:layout_constraintStart_toEndOf="@+id/feedback_neutral_rating" app:layout_constraintTop_toBottomOf="@+id/feedback_rating_summary_prompt" style="@style/res_2131952449_uikit_imageview_clickable"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/feedback_rating_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+        <TextView android:id="@+id/feedback_rating_summary_prompt" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Feedback_Row_Prompt"/>
+        <ImageView android:id="@+id/feedback_sad_rating" android:src="?attr/ic_selectable_feedback_sad" android:contentDescription="@string/call_feedback_sentiment_negative" android:layout_marginEnd="24dp" app:layout_constraintEnd_toStartOf="@+id/feedback_neutral_rating" app:layout_constraintTop_toBottomOf="@+id/feedback_rating_summary_prompt" style="@style/UiKit_ImageView_Clickable"/>
+        <ImageButton android:id="@+id/feedback_neutral_rating" android:src="?attr/ic_selectable_feedback_neutral" android:contentDescription="@string/call_feedback_sentiment_neutral" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/feedback_rating_summary_prompt" style="@style/UiKit_ImageView_Clickable"/>
+        <ImageButton android:id="@+id/feedback_happy_rating" android:src="?attr/ic_selectable_feedback_happy" android:contentDescription="@string/call_feedback_sentiment_positive" android:layout_marginStart="24dp" app:layout_constraintStart_toEndOf="@+id/feedback_neutral_rating" app:layout_constraintTop_toBottomOf="@+id/feedback_rating_summary_prompt" style="@style/UiKit_ImageView_Clickable"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <TextView android:id="@+id/feedback_issue_section_header" android:visibility="gone" style="@style/res_2131951960_feedback_row_sectionheader"/>
-    <androidx.cardview.widget.CardView android:id="@+id/feedback_issues_card" android:visibility="gone" style="@style/res_2131951959_feedback_row_sectioncard">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/feedback_issues_recycler" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <TextView android:id="@+id/feedback_issue_section_header" android:visibility="gone" style="@style/Feedback_Row_SectionHeader"/>
+    <androidx.cardview.widget.CardView android:id="@+id/feedback_issues_card" android:visibility="gone" style="@style/Feedback_Row_SectionCard">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/feedback_issues_recycler" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/flex_input_widget.xml b/app/src/main/res/layout/flex_input_widget.xml
index 462b66620e..6e43a71557 100644
--- a/app/src/main/res/layout/flex_input_widget.xml
+++ b/app/src/main/res/layout/flex_input_widget.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:background="?attr/colorBackgroundPrimary" android:animateLayoutChanges="false" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center_vertical" android:id="@+id/attachment_preview_container" android:visibility="gone" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:background="?attr/colorBackgroundPrimary" android:animateLayoutChanges="false" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center_vertical" android:id="@+id/attachment_preview_container" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/attachment_preview_list" android:clipToPadding="false" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" app:layoutManager="LinearLayoutManager"/>
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4dp" style="@style/res_2131951976_flexinput_input_button"/>
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4dp" style="@style/FlexInput_Input_Button"/>
     </LinearLayout>
-    <RelativeLayout android:animateLayoutChanges="true" style="@style/res_2131952589_uikit_viewgroup">
-        <LinearLayout android:id="@+id/left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@+id/expand_btn" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131951975_flexinput_input"/>
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:layout_marginRight="8dp" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_media" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131951975_flexinput_input"/>
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gift_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" android:src="@drawable/ic_gift_24dp" android:contentDescription="@string/premium_gifting_purchase_gift" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131951975_flexinput_input"/>
+    <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup">
+        <LinearLayout android:id="@+id/left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@+id/expand_btn" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?attr/colorInteractiveNormal" style="@style/FlexInput_Input"/>
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:layout_marginRight="8dp" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_media" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/FlexInput_Input"/>
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/gift_btn" android:background="@drawable/drawable_circle_black" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" android:src="@drawable/ic_gift_24dp" android:contentDescription="@string/premium_gifting_purchase_gift" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:tint="?attr/colorInteractiveNormal" style="@style/FlexInput_Input"/>
         </LinearLayout>
-        <LinearLayout android:id="@+id/main_input_container" android:background="@drawable/drawable_flex_input_bg" android:paddingLeft="12dp" android:paddingRight="4dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:layout_toLeftOf="@+id/send_btn_container" android:layout_toRightOf="@+id/left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:textColorHint="?attr/colorTextMuted" android:layout_gravity="center_vertical" android:id="@+id/text_input" android:background="@color/transparent" android:paddingTop="4dp" android:paddingBottom="4dp" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0dp" android:minHeight="40dp" android:maxLines="5" android:layout_weight="1" android:lineSpacingMultiplier="1" android:inputType="text|textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:id="@+id/main_input_container" android:background="@drawable/drawable_flex_input_bg" android:paddingLeft="12dp" android:paddingRight="4dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:layout_toLeftOf="@+id/send_btn_container" android:layout_toRightOf="@+id/left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:textColorHint="?attr/colorTextMuted" android:layout_gravity="center_vertical" android:id="@+id/text_input" android:background="@color/transparent" android:paddingTop="4dp" android:paddingBottom="4dp" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0dp" android:minHeight="40dp" android:maxLines="5" android:layout_weight="1" android:lineSpacingMultiplier="1" android:inputType="text|textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit_TextView"/>
             <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/expression_btn_container" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/expression_btn" android:background="@null" android:padding="8dp" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952447_uikit_imagebutton"/>
+                <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/expression_btn" android:background="@null" android:padding="8dp" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageButton"/>
                 <ImageView android:layout_gravity="bottom|right|center_vertical|center_horizontal|center" android:id="@+id/expression_btn_badge" android:visibility="gone" android:layout_width="7dp" android:layout_height="7dp" android:layout_marginRight="11dp" android:layout_marginBottom="11dp" android:src="@drawable/drawable_circle_red" android:importantForAccessibility="no" app:tint="@color/status_red_500"/>
             </FrameLayout>
         </LinearLayout>
         <FrameLayout android:id="@+id/send_btn_container" android:background="@drawable/drawable_circle_black" android:visibility="gone" android:clipToPadding="false" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?attr/chat_send_btn_bg">
             <ImageView android:layout_gravity="center" android:id="@+id/send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:importantForAccessibility="no" app:tint="?attr/chat_send_btn"/>
         </FrameLayout>
-        <TextView android:gravity="center" android:id="@+id/cannot_send_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="24dp" android:paddingRight="12dp" android:paddingBottom="24dp" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:gravity="center" android:id="@+id/cannot_send_text" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="24dp" android:paddingRight="12dp" android:paddingBottom="24dp" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit_TextView"/>
     </RelativeLayout>
     <FrameLayout android:id="@+id/expression_tray_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/default_keyboard_height"/>
     <FrameLayout android:id="@+id/default_window_insets_handler" android:visibility="visible" android:layout_width="match_parent" android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml
index d061ba3613..321b13b400 100644
--- a/app/src/main/res/layout/fragment_camera.xml
+++ b/app/src/main/res/layout/fragment_camera.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <RelativeLayout android:id="@+id/camera_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <RelativeLayout android:id="@+id/camera_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
         <com.otaliastudios.cameraview.CameraView android:id="@+id/camera_view" android:layout_width="match_parent" android:layout_height="match_parent" app:cameraAudio="0" app:cameraEngine="1" app:cameraFlash="2" app:cameraGestureTap="1" app:cameraRequestPermissions="false"/>
-        <ImageButton android:id="@+id/camera_flash_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/flash_off" style="@style/res_2131951979_flexinput_input_button_camera_flash"/>
-        <ImageButton android:id="@+id/camera_facing_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/camera_switch" style="@style/res_2131951978_flexinput_input_button_camera_facing"/>
-        <ImageView android:id="@+id/take_photo_btn" android:layout_width="56dp" android:layout_height="56dp" android:contentDescription="@string/take_a_photo" style="@style/res_2131951977_flexinput_input_button_camera_capture"/>
-        <ImageButton android:id="@+id/launch_camera_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/camera" style="@style/res_2131951980_flexinput_input_button_camera_launcher"/>
+        <ImageButton android:id="@+id/camera_flash_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/flash_off" style="@style/FlexInput_Input_Button_Camera_Flash"/>
+        <ImageButton android:id="@+id/camera_facing_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/camera_switch" style="@style/FlexInput_Input_Button_Camera_Facing"/>
+        <ImageView android:id="@+id/take_photo_btn" android:layout_width="56dp" android:layout_height="56dp" android:contentDescription="@string/take_a_photo" style="@style/FlexInput_Input_Button_Camera_Capture"/>
+        <ImageButton android:id="@+id/launch_camera_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/camera" style="@style/FlexInput_Input_Button_Camera_Launcher"/>
     </RelativeLayout>
-    <ViewStub android:id="@+id/permissions_view_stub" android:layout="@layout/view_permissions_required" android:layout_marginTop="32dp" style="@style/res_2131952589_uikit_viewgroup"/>
+    <ViewStub android:id="@+id/permissions_view_stub" android:layout="@layout/view_permissions_required" android:layout_marginTop="32dp" style="@style/UiKit_ViewGroup"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_recycler_view.xml b/app/src/main/res/layout/fragment_recycler_view.xml
index fcebdb2fbe..10bdc47e43 100644
--- a/app/src/main/res/layout/fragment_recycler_view.xml
+++ b/app/src/main/res/layout/fragment_recycler_view.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/swipeRefreshLayout" android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView android:name="com.lytefast.flexinput.RecyclerViewFragment" android:id="@+id/list" android:background="?attr/colorPrimary" app:layoutManager="LinearLayoutManager" style="@style/res_2131951972_flexinput_addcontent_page"/>
+    <androidx.recyclerview.widget.RecyclerView android:name="com.lytefast.flexinput.RecyclerViewFragment" android:id="@+id/list" android:background="?attr/colorPrimary" app:layoutManager="LinearLayoutManager" style="@style/FlexInput_AddContent_Page"/>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/gif_category_item_view.xml b/app/src/main/res/layout/gif_category_item_view.xml
index 471f8becbf..64a2d9deb5 100644
--- a/app/src/main/res/layout/gif_category_item_view.xml
+++ b/app/src/main/res/layout/gif_category_item_view.xml
@@ -2,8 +2,8 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="96dp" android:layout_marginBottom="8dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:strokeWidth="0dp">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/gif_category_item_preview" android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="centerCrop" app:placeholderImage="?attr/colorBackgroundPrimary"/>
     <View android:background="@color/primary_800_alpha_50" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <LinearLayout android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:layout_marginBottom="8dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:layout_marginBottom="8dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageView android:layout_gravity="center_vertical" android:id="@+id/gif_category_item_icon" android:layout_width="16dp" android:layout_height="16dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:tint="@color/white"/>
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textColor="@color/white" android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/gif_category_item_title" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textColor="@color/white" android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/gif_category_item_title" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/gif_search_empty_state_text_box_view.xml b/app/src/main/res/layout/gif_search_empty_state_text_box_view.xml
index c5c39638ba..645b5b1896 100644
--- a/app/src/main/res/layout/gif_search_empty_state_text_box_view.xml
+++ b/app/src/main/res/layout/gif_search_empty_state_text_box_view.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginTop="4dp" android:layout_marginRight="4dp" android:layout_marginBottom="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginTop="4dp" android:layout_marginRight="4dp" android:layout_marginBottom="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/gif_suggested_term_view.xml b/app/src/main/res/layout/gif_suggested_term_view.xml
index 2e60b3ce9f..d59143d1a8 100644
--- a/app/src/main/res/layout/gif_suggested_term_view.xml
+++ b/app/src/main/res/layout/gif_suggested_term_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/gif_search_suggested_terms_container" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/gif_search_suggested_terms_icon_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_gif_search_results" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="?attr/theme_expression_tray_search_icon_empty" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/gif_search_suggested_terms_container" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/gif_search_suggested_terms_icon_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_gif_search_results" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="?attr/theme_expression_tray_search_icon_empty" style="@style/UiKit_TextView"/>
     <com.google.android.flexbox.FlexboxLayout android:id="@+id/gif_search_suggested_terms_flex_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:alignItems="2" app:flexWrap="1" app:justifyContent="2" app:layout_minHeight="24dp" app:layout_minWidth="48dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/gift_purchased_dialog.xml b/app/src/main/res/layout/gift_purchased_dialog.xml
index 17c5373834..cb32682cb1 100644
--- a/app/src/main/res/layout/gift_purchased_dialog.xml
+++ b/app/src/main/res/layout/gift_purchased_dialog.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:clipChildren="false" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <RelativeLayout android:layout_marginBottom="32dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <ImageView android:id="@+id/gift_purchased_icon" android:layout_width="72dp" android:layout_height="72dp" android:scaleType="fitXY" android:layout_centerInParent="true" android:translationY="16dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:clipChildren="false" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <RelativeLayout android:layout_marginBottom="32dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <ImageView android:id="@+id/gift_purchased_icon" android:layout_width="72dp" android:layout_height="72dp" android:scaleType="fitXY" android:layout_centerInParent="true" android:translationY="16dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     </RelativeLayout>
-    <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="8dp" android:text="@string/application_store_purchase_gift_confirmation_title" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:gravity="center" android:id="@+id/gift_purchased_dialog_subtext" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <View android:layout_gravity="center" android:layout_width="360dp" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:paddingStart="32dp" android:paddingEnd="32dp" style="@style/res_2131952417_uikit_divider_thick"/>
-    <TextView android:layout_width="match_parent" android:text="@string/billing_gift_link" android:layout_marginStart="8dp" style="@style/res_2131952496_uikit_settings_item_header"/>
-    <RelativeLayout android:id="@+id/gift_entitlement_code_container" android:background="?attr/primary_660_bg_outline" android:layout_height="36dp" android:layout_marginBottom="8dp" android:paddingStart="8dp" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" style="@style/res_2131952589_uikit_viewgroup">
-        <TextView android:textColor="?attr/colorInteractiveActive" android:ellipsize="end" android:id="@+id/gift_entitlement_code" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/gift_entitlement_copy" android:layout_marginRight="6dp" android:minWidth="0dp" android:text="@string/copy" android:layout_centerVertical="true" android:textAllCaps="true" android:layout_alignParentEnd="true" android:backgroundTint="@color/uikit_btn_bg_color_selector_brand" style="@style/res_2131952459_uikit_material_button_fit"/>
+    <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="8dp" android:text="@string/application_store_purchase_gift_confirmation_title" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:gravity="center" android:id="@+id/gift_purchased_dialog_subtext" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
+    <View android:layout_gravity="center" android:layout_width="360dp" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:paddingStart="32dp" android:paddingEnd="32dp" style="@style/UiKit_Divider_Thick"/>
+    <TextView android:layout_width="match_parent" android:text="@string/billing_gift_link" android:layout_marginStart="8dp" style="@style/UiKit_Settings_Item_Header"/>
+    <RelativeLayout android:id="@+id/gift_entitlement_code_container" android:background="?attr/primary_660_bg_outline" android:layout_height="36dp" android:layout_marginBottom="8dp" android:paddingStart="8dp" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" style="@style/UiKit_ViewGroup">
+        <TextView android:textColor="?attr/colorInteractiveActive" android:ellipsize="end" android:id="@+id/gift_entitlement_code" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextAppearance_Button" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/gift_entitlement_copy" android:layout_marginRight="6dp" android:minWidth="0dp" android:text="@string/copy" android:layout_centerVertical="true" android:textAllCaps="true" android:layout_alignParentEnd="true" android:backgroundTint="@color/uikit_btn_bg_color_selector_brand" style="@style/UiKit_Material_Button_Fit"/>
     </RelativeLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/gift_link_subtext" android:layout_width="match_parent" android:layout_marginBottom="16dp" android:text="@string/application_store_gift_purchase_confirmation_subtext" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/gift_purchased_dialog_confirm" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginBottom="16dp" android:text="@string/close" style="@style/res_2131952458_uikit_material_button"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/gift_link_subtext" android:layout_width="match_parent" android:layout_marginBottom="16dp" android:text="@string/application_store_gift_purchase_confirmation_subtext" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/gift_purchased_dialog_confirm" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginBottom="16dp" android:text="@string/close" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/group_invite_friends_bottom_sheet.xml b/app/src/main/res/layout/group_invite_friends_bottom_sheet.xml
index 197e842072..a835f8b827 100644
--- a/app/src/main/res/layout/group_invite_friends_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_invite_friends_bottom_sheet.xml
@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/root" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
     <com.discord.chips_view.ChipsView android:id="@+id/chips_view" android:background="@drawable/rounded_rectangle_4dp_radius" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:foreground="?attr/bg_pressed_highlight" android:overScrollMode="never" android:paddingStart="4dp" android:paddingEnd="0dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:cv_bg_color="?attr/colorBackgroundPrimary" app:cv_bg_color_clicked="?attr/color_brand" app:cv_chip_bg_res="@drawable/rounded_rectangle_4dp_radius" app:cv_chip_layout="@layout/view_chip" app:cv_color="?attr/colorBackgroundPrimary" app:cv_color_clicked="?attr/color_brand" app:cv_height="36dp" app:cv_hint="@string/invite_friends" app:cv_max_height="400dp" app:cv_search_text_color="?attr/colorTextMuted" app:cv_search_text_size="@dimen/uikit_textsize_medium" app:cv_text_color="?attr/colorTextNormal" app:cv_text_color_clicked="@color/white" app:cv_vertical_spacing="4dp" app:drawableEndCompat="@drawable/ic_search_16dp" app:drawableTint="?attr/colorTextMuted" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <androidx.appcompat.widget.AppCompatImageView android:id="@+id/search_icon" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_search_16dp" android:tint="?attr/colorTextMuted" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="@+id/chips_view" app:layout_constraintEnd_toEndOf="@+id/chips_view" app:layout_constraintTop_toTopOf="@+id/chips_view"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chips_view" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chips_view" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/group_invite_friends_sheet_item.xml b/app/src/main/res/layout/group_invite_friends_sheet_item.xml
index e2130dc750..62e049edf0 100644
--- a/app/src/main/res/layout/group_invite_friends_sheet_item.xml
+++ b/app/src/main/res/layout/group_invite_friends_sheet_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:clipChildren="false" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:layout_width="34dp" android:layout_height="34dp" android:layout_marginTop="2dp" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:textColor="?attr/colorInteractiveActive" android:id="@+id/friends_list_item_name" android:layout_width="0dp" android:text="@string/sample_user_name" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_selected_checkbox" app:layout_constraintStart_toEndOf="@+id/friends_list_item_avatar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952570_uikit_textview_large"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:clipChildren="false" style="@style/UiKit_ViewGroup_ConstraintLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:layout_width="34dp" android:layout_height="34dp" android:layout_marginTop="2dp" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Standard"/>
+    <TextView android:textColor="?attr/colorInteractiveActive" android:id="@+id/friends_list_item_name" android:layout_width="0dp" android:text="@string/sample_user_name" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_selected_checkbox" app:layout_constraintStart_toEndOf="@+id/friends_list_item_avatar" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large"/>
     <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/user_selected_checkbox" android:saveEnabled="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" android:buttonTint="?attr/colorCompoundButton" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/guild_channel_side_bar_actions_view.xml b/app/src/main/res/layout/guild_channel_side_bar_actions_view.xml
index 90151f697f..3a7ef75b9b 100644
--- a/app/src/main/res/layout/guild_channel_side_bar_actions_view.xml
+++ b/app/src/main/res/layout/guild_channel_side_bar_actions_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_search" android:text="@string/search" android:drawableTop="@drawable/ic_sidebar_search_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_pins" android:text="@string/pins" android:drawableTop="@drawable/ic_sidebar_pins_on_dark_24dp" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_sidebar_notifications_off_dark_24dp" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_settings" android:text="@string/settings" android:drawableTop="@drawable/ic_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_search" android:text="@string/search" android:drawableTop="@drawable/ic_sidebar_search_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/ChannelSideBarActions_Actions_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_pins" android:text="@string/pins" android:drawableTop="@drawable/ic_sidebar_pins_on_dark_24dp" style="@style/ChannelSideBarActions_Actions_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_sidebar_notifications_off_dark_24dp" style="@style/ChannelSideBarActions_Actions_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/channel_sidebar_actions_settings" android:text="@string/settings" android:drawableTop="@drawable/ic_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/ChannelSideBarActions_Actions_Button"/>
 </merge>
diff --git a/app/src/main/res/layout/guild_invite_empty_search_results_item.xml b/app/src/main/res/layout/guild_invite_empty_search_results_item.xml
index 0521fc173f..62fa56c32a 100644
--- a/app/src/main/res/layout/guild_invite_empty_search_results_item.xml
+++ b/app/src/main/res/layout/guild_invite_empty_search_results_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_margin="24dp" style="@style/res_2131952576_uikit_textview_noresults"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_margin="24dp" style="@style/UiKit_TextView_NoResults"/>
diff --git a/app/src/main/res/layout/guild_role_chip.xml b/app/src/main/res/layout/guild_role_chip.xml
index 35083bf873..0657f93a8f 100644
--- a/app/src/main/res/layout/guild_role_chip.xml
+++ b/app/src/main/res/layout/guild_role_chip.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" app:chipBackgroundColor="?attr/colorBackgroundTertiary" app:chipCornerRadius="4dp" app:chipIcon="@drawable/drawable_circle_white_12dp" app:chipIconSize="12sp" app:chipStartPadding="8dp" app:ensureMinTouchTargetSize="false"/>
+<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" app:chipBackgroundColor="?attr/colorBackgroundTertiary" app:chipCornerRadius="4dp" app:chipIcon="@drawable/drawable_circle_white_12dp" app:chipIconSize="12sp" app:chipStartPadding="8dp" app:ensureMinTouchTargetSize="false"/>
diff --git a/app/src/main/res/layout/guild_role_item.xml b/app/src/main/res/layout/guild_role_item.xml
index 4832a46bec..20f775b9e9 100644
--- a/app/src/main/res/layout/guild_role_item.xml
+++ b/app/src/main/res/layout/guild_role_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginEnd="4dp" app:cardBackgroundColor="?attr/primary_700" app:cardCornerRadius="4dp" app:cardElevation="0dp">
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/primary_100" android:ellipsize="end" android:id="@+id/guild_role_item_text" android:padding="8dp" android:maxLines="1" android:drawablePadding="8dp" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/primary_100" android:ellipsize="end" android:id="@+id/guild_role_item_text" android:padding="8dp" android:maxLines="1" android:drawablePadding="8dp" style="@style/UiKit_TextView_Subtext"/>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/guild_scheduled_event_item_view.xml b/app/src/main/res/layout/guild_scheduled_event_item_view.xml
index 5a9146e99a..4295ce6f70 100644
--- a/app/src/main/res/layout/guild_scheduled_event_item_view.xml
+++ b/app/src/main/res/layout/guild_scheduled_event_item_view.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/bg_guild_scheduled_event_list_item" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/guild_scheduled_event_list_item_status_icon" android:layout_width="20dp" android:layout_height="20dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_date_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxLines="1" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
-    <TextView android:textAppearance="@style/res_2131952575_uikit_textview_medium_singleline" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_scheduled_event_list_item_rsvp_text" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:fontFamily="?attr/font_primary_normal" android:backgroundTint="?attr/colorBackgroundSecondary" app:drawableStartCompat="@drawable/ic_bell_12dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textAppearance="@style/res_2131952579_uikit_textview_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_scheduled_event_list_item_title_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
-    <TextView android:textAppearance="@style/res_2131952579_uikit_textview_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_desc_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:fontFamily="?attr/font_primary_normal" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_title_text"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_date_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxLines="1" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_list_item_rsvp_text" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
+    <TextView android:textAppearance="@style/UiKit_TextView_Medium_SingleLine" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_scheduled_event_list_item_rsvp_text" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:fontFamily="?attr/font_primary_normal" android:backgroundTint="?attr/colorBackgroundSecondary" app:drawableStartCompat="@drawable/ic_bell_12dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
+    <TextView android:textAppearance="@style/UiKit_TextView_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_scheduled_event_list_item_title_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="?attr/font_primary_semibold" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_rsvp_text"/>
+    <TextView android:textAppearance="@style/UiKit_TextView_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_desc_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:fontFamily="?attr/font_primary_normal" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_title_text"/>
     <ImageView android:id="@+id/guild_scheduled_event_list_item_channel_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_desc_text" app:srcCompat="@drawable/ic_stage_20dp" app:tint="?attr/colorHeaderSecondary"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_channel_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_channel_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_channel_icon"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_list_item_channel_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_channel_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_list_item_status_icon" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_channel_icon"/>
     <ImageView android:id="@+id/guild_scheduled_event_list_item_bottom_button" android:background="?attr/bg_pressed_highlight" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="16dp" android:contentDescription="@string/stage_instance_interested_label" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_item_channel_icon" app:srcCompat="@drawable/bg_guild_scheduled_event_list_item_interested_button_default"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:id="@+id/guild_scheduled_event_list_item_bottom_button_text" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_instance_interested_label" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_bell_16dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_bottom_button"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:id="@+id/guild_scheduled_event_list_item_bottom_button_text" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_instance_interested_label" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_bell_16dp" app:layout_constraintBottom_toBottomOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_list_item_bottom_button" app:layout_constraintTop_toTopOf="@+id/guild_scheduled_event_list_item_bottom_button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/guild_template_channels_item_view.xml b/app/src/main/res/layout/guild_template_channels_item_view.xml
index 6268cdfa35..7b85914c00 100644
--- a/app/src/main/res/layout/guild_template_channels_item_view.xml
+++ b/app/src/main/res/layout/guild_template_channels_item_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:layout_height="40sp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <ImageView android:id="@+id/guild_template_channels_item_image" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_chevron_down_grey_12dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textColor="?attr/colorChannelDefault" android:gravity="center" android:id="@+id/guild_template_channels_item_name" style="@style/res_2131952580_uikit_textview_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:layout_height="40sp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <ImageView android:id="@+id/guild_template_channels_item_image" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_chevron_down_grey_12dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
+    <TextView android:textColor="?attr/colorChannelDefault" android:gravity="center" android:id="@+id/guild_template_channels_item_name" style="@style/UiKit_TextView_SingleLine"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/guild_template_channels_view.xml b/app/src/main/res/layout/guild_template_channels_view.xml
index 2429b8cbd1..5da170e5ea 100644
--- a/app/src/main/res/layout/guild_template_channels_view.xml
+++ b/app/src/main/res/layout/guild_template_channels_view.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_template_channels_recycler_view" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_template_channels_recycler_view" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/guild_video_at_capacity.xml b/app/src/main/res/layout/guild_video_at_capacity.xml
index 3f70339d29..2ecca426af 100644
--- a/app/src/main/res/layout/guild_video_at_capacity.xml
+++ b/app/src/main/res/layout/guild_video_at_capacity.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:padding="16dp" android:text="@string/stream_full_modal_body" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:padding="16dp" android:text="@string/stream_full_modal_body" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <LinearLayout android:paddingTop="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textColor="@color/primary_200" android:layout_marginBottom="16dp" android:text="@string/stream_full_modal_body" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:paddingTop="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textColor="@color/primary_200" android:layout_marginBottom="16dp" android:text="@string/stream_full_modal_body" style="@style/UiKit_TextView"/>
         <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/drawable_stream_full" android:importantForAccessibility="no"/>
     </LinearLayout>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/guild_video_at_capacity_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/okay" style="@style/res_2131952458_uikit_material_button"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/guild_video_at_capacity_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/okay" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/hub_add_server_confirmation_dialog.xml b/app/src/main/res/layout/hub_add_server_confirmation_dialog.xml
index 62cfb6daff..a61231c937 100644
--- a/app/src/main/res/layout/hub_add_server_confirmation_dialog.xml
+++ b/app/src/main/res/layout/hub_add_server_confirmation_dialog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
     <com.discord.views.GuildView android:layout_gravity="center_horizontal" android:id="@+id/add_server_confirmation_dialog_image" android:layout_width="80dp" android:layout_height="80dp" android:layout_marginTop="24dp" android:layout_marginBottom="16dp" android:scaleType="centerCrop" android:importantForAccessibility="no" app:gv_text_size="24sp"/>
-    <TextView android:layout_gravity="center" android:layout_marginBottom="8dp" android:text="@string/hub_add_or_create_server_confirmation_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/add_server_confirmation_dialog_description" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/add_server_confirmation_dialog_positive" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hub_add_server_confirmation_button" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:layout_gravity="center" android:layout_marginBottom="8dp" android:text="@string/hub_add_or_create_server_confirmation_title" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/add_server_confirmation_dialog_description" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/add_server_confirmation_dialog_positive" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hub_add_server_confirmation_button" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/icon_list_item_text_view.xml b/app/src/main/res/layout/icon_list_item_text_view.xml
index 3e08ac30b1..eb992b2ddb 100644
--- a/app/src/main/res/layout/icon_list_item_text_view.xml
+++ b/app/src/main/res/layout/icon_list_item_text_view.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/bg_pressed_highlight" style="@style/res_2131952453_uikit_listitem_icon"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/bg_pressed_highlight" style="@style/UiKit_ListItem_Icon"/>
diff --git a/app/src/main/res/layout/icon_thread_browser_layout.xml b/app/src/main/res/layout/icon_thread_browser_layout.xml
index a118343812..66a8a15f21 100644
--- a/app/src/main/res/layout/icon_thread_browser_layout.xml
+++ b/app/src/main/res/layout/icon_thread_browser_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/thread_browser_root" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="16dp">
     <ImageView android:id="@+id/thread_browser_icon" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_thread" android:contentDescription="@string/threads" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/thread_browser_count" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/thread_browser_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/thread_browser_count" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/thread_browser_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/image_upload_dialog.xml b/app/src/main/res/layout/image_upload_dialog.xml
index d7d13ef3c0..77be38d7d8 100644
--- a/app/src/main/res/layout/image_upload_dialog.xml
+++ b/app/src/main/res/layout/image_upload_dialog.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:padding="16dp" android:layout_width="match_parent" android:text="@string/upload_image" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:padding="16dp" android:layout_width="match_parent" android:text="@string/upload_image" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:gravity="center" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:gravity="start" android:layout_gravity="start" android:padding="16dp" android:text="@string/upload_image_body" style="@style/res_2131952563_uikit_textview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:gravity="center" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:gravity="start" android:layout_gravity="start" android:padding="16dp" android:text="@string/upload_image_body" style="@style/UiKit_TextView"/>
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/notice_image" android:layout_width="200dp" android:layout_height="200dp"/>
-            <TextView android:id="@+id/notice_crop" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:text="@string/crop" style="@style/res_2131952572_uikit_textview_link"/>
+            <TextView android:id="@+id/notice_crop" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:text="@string/crop" style="@style/UiKit_TextView_Link"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_200" android:id="@+id/notice_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/notice_upload" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/upload" android:layout_marginStart="8dp" style="@style/res_2131952458_uikit_material_button"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_200" android:id="@+id/notice_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/notice_upload" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/upload" android:layout_marginStart="8dp" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/image_upload_failed_dialog.xml b/app/src/main/res/layout/image_upload_failed_dialog.xml
index 70efb04014..ab7ee7eb58 100644
--- a/app/src/main/res/layout/image_upload_failed_dialog.xml
+++ b/app/src/main/res/layout/image_upload_failed_dialog.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_RelativeLayout">
     <RelativeLayout android:layout_width="304dp" android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:translationZ="8dp">
         <ImageView android:layout_width="100dp" android:layout_height="130dp" android:layout_marginTop="10dp" android:src="@drawable/ic_file_large_document" android:rotation="-28" android:layout_marginEnd="-56dp" android:layout_toStartOf="@+id/chat_input_upload_too_large_center_file"/>
         <ImageView android:layout_width="100dp" android:layout_height="130dp" android:layout_marginTop="10dp" android:src="@drawable/ic_file_large_video" android:rotation="28" android:layout_marginStart="-56dp" android:layout_toEndOf="@+id/chat_input_upload_too_large_center_file"/>
         <ImageView android:id="@+id/chat_input_upload_too_large_center_file" android:layout_width="100dp" android:layout_height="130dp" android:src="@drawable/ic_file_large_code" android:layout_centerHorizontal="true"/>
     </RelativeLayout>
     <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="48dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="8dp">
-        <LinearLayout android:layout_marginTop="80dp" android:layout_marginBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/upload_area_too_large_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/image_upload_failed_text" android:layout_width="match_parent" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
-            <View android:id="@+id/image_upload_failed_divider" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952416_uikit_divider"/>
+        <LinearLayout android:layout_marginTop="80dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/upload_area_too_large_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_H1_Bold"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/image_upload_failed_text" android:layout_width="match_parent" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView"/>
+            <View android:id="@+id/image_upload_failed_divider" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_Divider"/>
             <Space android:layout_width="match_parent" android:layout_height="16dp"/>
-            <RelativeLayout android:id="@+id/image_upload_failed_compression_settings_container" android:background="?attr/selectableItemBackground" android:paddingTop="4dp" android:paddingBottom="4dp" android:visibility="gone" android:layout_marginBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/image_upload_failed_compression_settings_checkbox" android:layout_alignParentStart="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textColor="?attr/primary_100" android:id="@+id/setting_label" android:text="@string/upload_area_always_compress" style="@style/res_2131952567_uikit_textview_h2"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/setting_subtext" android:layout_marginTop="4dp" android:text="@string/upload_area_always_compress_desc" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <RelativeLayout android:id="@+id/image_upload_failed_compression_settings_container" android:background="?attr/selectableItemBackground" android:paddingTop="4dp" android:paddingBottom="4dp" android:visibility="gone" android:layout_marginBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/image_upload_failed_compression_settings_checkbox" android:layout_alignParentStart="true" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textColor="?attr/primary_100" android:id="@+id/setting_label" android:text="@string/upload_area_always_compress" style="@style/UiKit_TextView_H2"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/setting_subtext" android:layout_marginTop="4dp" android:text="@string/upload_area_always_compress_desc" style="@style/UiKit_TextView_Subtext"/>
                 </LinearLayout>
                 <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/image_upload_failed_compression_settings_checkbox" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" android:layout_alignParentEnd="true" android:buttonTint="?attr/colorCompoundButton"/>
             </RelativeLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/image_upload_failed_send_compress" android:text="@string/send_compressed" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/image_upload_failed_send_compress" android:text="@string/send_compressed" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button"/>
             <RelativeLayout android:id="@+id/image_upload_failed_nitro_wrapper" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <com.google.android.material.button.MaterialButton android:id="@+id/image_upload_failed_nitro" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952460_uikit_material_button_green"/>
-                <TextView android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textColor="@color/primary_100" android:gravity="center" android:focusable="false" android:focusableInTouchMode="false" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/learn_more_alt" android:drawablePadding="4dp" android:layout_centerInParent="true" android:translationZ="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_white" style="@style/res_2131952563_uikit_textview"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/image_upload_failed_nitro" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button_Green"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance_Button" android:textColor="@color/primary_100" android:gravity="center" android:focusable="false" android:focusableInTouchMode="false" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/learn_more_alt" android:drawablePadding="4dp" android:layout_centerInParent="true" android:translationZ="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_white" style="@style/UiKit_TextView"/>
             </RelativeLayout>
-            <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:id="@+id/image_upload_failed_cancel" android:layout_width="match_parent" android:text="@string/cancel" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952471_uikit_material_button_transparent"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/image_upload_failed_okay" android:visibility="gone" android:text="@string/okay" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:id="@+id/image_upload_failed_cancel" android:layout_width="match_parent" android:text="@string/cancel" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button_Transparent"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/image_upload_failed_okay" android:visibility="gone" android:text="@string/okay" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/inline_media_view.xml b/app/src/main/res/layout/inline_media_view.xml
index 2e1a854cc7..6039a91e2f 100644
--- a/app/src/main/res/layout/inline_media_view.xml
+++ b/app/src/main/res/layout/inline_media_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxHeight="500dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp">
     <com.google.android.exoplayer2.ui.PlayerView android:layout_gravity="center" android:id="@+id/inline_media_player_view" android:layout_width="match_parent" android:layout_height="match_parent" app:resize_mode="0" app:surface_type="2" app:use_controller="false"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/inline_media_image_preview" android:layout_width="match_parent" android:layout_height="match_parent" android:contentDescription="@string/image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundPrimary" style="@style/res_2131952448_uikit_imageview"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/inline_media_image_preview" android:layout_width="match_parent" android:layout_height="match_parent" android:contentDescription="@string/image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundPrimary" style="@style/UiKit_ImageView"/>
     <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/inline_media_gif_indicator" android:visibility="gone" android:layout_width="36dp" android:layout_height="22dp" android:layout_marginTop="8dp" android:src="@drawable/gif" android:importantForAccessibility="no" android:layout_marginEnd="8dp"/>
     <ImageView android:layout_gravity="center" android:id="@+id/inline_media_play_button" android:background="@drawable/drawable_circle_primary_900" android:padding="8dp" android:visibility="gone" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:src="@drawable/ic_play_arrow_24dp" android:scaleType="fitXY" android:contentDescription="@string/play_full_video" android:alpha="0.6" app:tint="@color/white"/>
     <ProgressBar android:layout_gravity="center" android:id="@+id/inline_media_loading_indicator" android:background="@drawable/drawable_circle_primary_900" android:padding="8dp" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:indeterminate="true" android:layout_centerInParent="true" android:alpha="0.6" android:indeterminateTint="@color/white"/>
diff --git a/app/src/main/res/layout/integration_sync_settings.xml b/app/src/main/res/layout/integration_sync_settings.xml
index 3986e5241c..8ef7661d6b 100644
--- a/app/src/main/res/layout/integration_sync_settings.xml
+++ b/app/src/main/res/layout/integration_sync_settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
     <RelativeLayout android:id="@+id/edit_integration_sync_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content">
         <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/drawable_icon_sync_integration" android:layout_centerVertical="true" android:contentDescription="@string/sync" android:layout_alignParentEnd="true"/>
-        <TextView android:id="@+id/edit_integration_subscriber_count" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/edit_integration_last_sync_time" android:layout_below="@+id/edit_integration_subscriber_count" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:id="@+id/edit_integration_subscriber_count" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/edit_integration_last_sync_time" android:layout_below="@+id/edit_integration_subscriber_count" style="@style/UiKit_TextView"/>
     </RelativeLayout>
-    <View android:layout_marginStart="16dp" style="@style/res_2131952416_uikit_divider"/>
-    <RelativeLayout android:id="@+id/edit_integration_synced_role_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:focusable="true" android:clickable="true" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <TextView android:text="@string/form_label_synced_role" android:layout_centerVertical="true" android:layout_toStartOf="@+id/edit_integration_synced_role" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:id="@+id/edit_integration_synced_role" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/res_2131952563_uikit_textview"/>
+    <View android:layout_marginStart="16dp" style="@style/UiKit_Divider"/>
+    <RelativeLayout android:id="@+id/edit_integration_synced_role_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <TextView android:text="@string/form_label_synced_role" android:layout_centerVertical="true" android:layout_toStartOf="@+id/edit_integration_synced_role" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+        <TextView android:id="@+id/edit_integration_synced_role" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit_TextView"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/invite_settings_radio_button.xml b/app/src/main/res/layout/invite_settings_radio_button.xml
index a3497203fd..b13a96f036 100644
--- a/app/src/main/res/layout/invite_settings_radio_button.xml
+++ b/app/src/main/res/layout/invite_settings_radio_button.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatRadioButton xmlns:android="http://schemas.android.com/apk/res/android" android:textColor="@color/white" android:background="?attr/invite_settings_radio_button_background" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_margin="8dp" android:button="@null" android:minWidth="100dp" style="@style/res_2131952483_uikit_radiobutton"/>
+<androidx.appcompat.widget.AppCompatRadioButton xmlns:android="http://schemas.android.com/apk/res/android" android:textColor="@color/white" android:background="?attr/invite_settings_radio_button_background" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_margin="8dp" android:button="@null" android:minWidth="100dp" style="@style/UiKit_RadioButton"/>
diff --git a/app/src/main/res/layout/layout_account_credits_list.xml b/app/src/main/res/layout/layout_account_credits_list.xml
index 3f495f4f46..0f9137c56e 100644
--- a/app/src/main/res/layout/layout_account_credits_list.xml
+++ b/app/src/main/res/layout/layout_account_credits_list.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp" app:cardElevation="0dp">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.premium.AccountCreditView android:id="@+id/credit_nitro" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-        <View android:id="@+id/credit_nitro_divider" style="@style/res_2131952416_uikit_divider"/>
+        <View android:id="@+id/credit_nitro_divider" style="@style/UiKit_Divider"/>
         <com.discord.views.premium.AccountCreditView android:id="@+id/credit_nitro_classic" android:layout_width="match_parent" android:layout_height="wrap_content"/>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/layout_age_verify.xml b/app/src/main/res/layout/layout_age_verify.xml
index a197472048..25362cb393 100644
--- a/app/src/main/res/layout/layout_age_verify.xml
+++ b/app/src/main/res/layout/layout_age_verify.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/age_verify_title" android:text="@string/age_gate_existing_header" android:drawablePadding="16dp" app:drawableTopCompat="@drawable/img_age_gate_safety" app:layout_constraintBottom_toTopOf="@+id/age_verify_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/age_verify_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_input_wrapper" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_title" style="@style/res_2131952570_uikit_textview_large"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/age_verify_input_wrapper" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:hint="@string/age_gate_date_of_birth" app:layout_constraintBottom_toTopOf="@+id/age_verify_next_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_description" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952549_uikit_textinputlayout_edittext_nofocus"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/age_verify_title" android:text="@string/age_gate_existing_header" android:drawablePadding="16dp" app:drawableTopCompat="@drawable/img_age_gate_safety" app:layout_constraintBottom_toTopOf="@+id/age_verify_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/age_verify_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_input_wrapper" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_title" style="@style/UiKit_TextView_Large"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/age_verify_input_wrapper" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:hint="@string/age_gate_date_of_birth" app:layout_constraintBottom_toTopOf="@+id/age_verify_next_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_description" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_NoFocus"/>
     </com.google.android.material.textfield.TextInputLayout>
     <com.discord.views.LoadingButton android:id="@+id/age_verify_next_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_input_wrapper" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_age_verify_confirm.xml b/app/src/main/res/layout/layout_age_verify_confirm.xml
index c671832102..55d6ae404b 100644
--- a/app/src/main/res/layout/layout_age_verify_confirm.xml
+++ b/app/src/main/res/layout/layout_age_verify_confirm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/age_verify_confirm_title" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/age_gate_confirm_header" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_confirm_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/age_verify_confirm_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_confirm_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_confirm_title" style="@style/res_2131952570_uikit_textview_large"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/age_verify_confirm_title" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/age_gate_confirm_header" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_confirm_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/age_verify_confirm_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_confirm_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_confirm_title" style="@style/UiKit_TextView_Large"/>
     <com.discord.views.LoadingButton android:id="@+id/age_verify_confirm_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toTopOf="@+id/age_verify_confirm_back_button" app:layout_constraintTop_toBottomOf="@+id/age_verify_confirm_description" app:lb_progress_color="@color/white" app:lb_text="@string/age_gate_confirm_button" app:lb_text_color="@drawable/button_text_color_primary_100"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/age_verify_confirm_back_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/back" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_confirm_button" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/age_verify_confirm_back_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/back" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_confirm_button" style="@style/UiKit_Material_Button_Secondary"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_age_verify_underage.xml b/app/src/main/res/layout/layout_age_verify_underage.xml
index 056f113cea..f47b7d9b7d 100644
--- a/app/src/main/res/layout/layout_age_verify_underage.xml
+++ b/app/src/main/res/layout/layout_age_verify_underage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center_horizontal" android:id="@+id/age_verify_underage_title" android:text="@string/age_gate_underage_existing_header" android:drawablePadding="16dp" app:drawableTopCompat="@drawable/img_age_gate_failure" app:layout_constraintBottom_toTopOf="@+id/age_verify_underage_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/age_verify_underage_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/age_gate_underage_body" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/underage_warning" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_underage_title" style="@style/res_2131952570_uikit_textview_large"/>
-    <TextView android:gravity="center_horizontal" android:id="@+id/underage_warning" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="16dp" android:text="@string/age_gate_underage_existing_body_deletion_with_days" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_return_to_login_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_underage_description" style="@style/res_2131952570_uikit_textview_large"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/age_verify_return_to_login_button" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/return_to_login" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toBottomOf="@+id/underage_warning" style="@style/res_2131952458_uikit_material_button"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center_horizontal" android:id="@+id/age_verify_underage_title" android:text="@string/age_gate_underage_existing_header" android:drawablePadding="16dp" app:drawableTopCompat="@drawable/img_age_gate_failure" app:layout_constraintBottom_toTopOf="@+id/age_verify_underage_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/age_verify_underage_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/age_gate_underage_body" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/underage_warning" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_underage_title" style="@style/UiKit_TextView_Large"/>
+    <TextView android:gravity="center_horizontal" android:id="@+id/underage_warning" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="16dp" android:text="@string/age_gate_underage_existing_body_deletion_with_days" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/age_verify_return_to_login_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_underage_description" style="@style/UiKit_TextView_Large"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/age_verify_return_to_login_button" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/return_to_login" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toBottomOf="@+id/underage_warning" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_contact_sync_add_phone.xml b/app/src/main/res/layout/layout_contact_sync_add_phone.xml
index 3cfa734fac..2d1eb77be3 100644
--- a/app/src/main/res/layout/layout_contact_sync_add_phone.xml
+++ b/app/src/main/res/layout/layout_contact_sync_add_phone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_add_phone_title" android:text="@string/contact_sync_enter_phone_number_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_add_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/contact_sync_enter_phone_number_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_title" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_add_phone_title" android:text="@string/contact_sync_enter_phone_number_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_add_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/contact_sync_enter_phone_number_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_title" style="@style/UiKit_TextView"/>
     <com.discord.views.phone.PhoneOrEmailInputView android:id="@+id/contact_sync_add_phone_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" app:force_mode="2" app:hint="@string/phone_verification_phone_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_subtitle"/>
-    <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/contact_sync_add_phone_next" android:text="@string/next" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_input" style="@style/res_2131952585_uikit_user_phone_manage_confirm"/>
+    <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/contact_sync_add_phone_next" android:text="@string/next" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_add_phone_input" style="@style/UiKit_User_Phone_Manage_Confirm"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_contact_sync_landing.xml b/app/src/main/res/layout/layout_contact_sync_landing.xml
index f742d0e4de..50563c5dae 100644
--- a/app/src/main/res/layout/layout_contact_sync_landing.xml
+++ b/app/src/main/res/layout/layout_contact_sync_landing.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_landing_title" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_landing_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_landing_title" style="@style/res_2131952574_uikit_textview_medium"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_landing_title" android:text="@string/contact_sync_landing_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_landing_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:gravity="center_horizontal" android:id="@+id/contact_sync_landing_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_android_landing_screen_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_cta" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_landing_title" style="@style/UiKit_TextView_Medium"/>
     <LinearLayout android:orientation="vertical" android:id="@+id/contact_sync_landing_cta" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/contact_sync_landing_toggle_info" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0">
         <com.discord.views.LoadingButton android:id="@+id/contact_sync_landing_next_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/get_started"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_landing_needs_permissions" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:visibility="gone" android:text="@string/contact_sync_needs_permissions_android" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_landing_needs_permissions" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:visibility="gone" android:text="@string/contact_sync_needs_permissions_android" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
         <View android:id="@+id/contact_sync_landing_permissions_divider" android:background="?attr/colorBackgroundAccent" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="16dp"/>
     </LinearLayout>
     <include android:id="@+id/contact_sync_landing_toggle_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:layout_constraintBottom_toBottomOf="0" layout="@layout/layout_contact_sync_toggle_info"/>
diff --git a/app/src/main/res/layout/layout_contact_sync_name_input.xml b/app/src/main/res/layout/layout_contact_sync_name_input.xml
index 6e2276615e..5a37f442c5 100644
--- a/app/src/main/res/layout/layout_contact_sync_name_input.xml
+++ b/app/src/main/res/layout/layout_contact_sync_name_input.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_name_title" android:text="@string/contact_sync_enter_name_title" android:drawablePadding="16dp" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/contact_sync_name_subtitle" android:layout_marginTop="8dp" android:text="@string/contact_sync_enter_name_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_input_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_title" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/contact_sync_name_input_wrap" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:hint="@string/contact_sync_enter_name_input_header" app:endIconMode="2" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_prefill_hint" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_subtitle" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:id="@+id/contact_sync_name_input" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_name_title" android:text="@string/contact_sync_enter_name_title" android:drawablePadding="16dp" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/contact_sync_name_subtitle" android:layout_marginTop="8dp" android:text="@string/contact_sync_enter_name_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_input_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_title" style="@style/UiKit_TextView"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/contact_sync_name_input_wrap" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:hint="@string/contact_sync_enter_name_input_header" app:endIconMode="2" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_prefill_hint" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_subtitle" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:id="@+id/contact_sync_name_input" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
     </com.google.android.material.textfield.TextInputLayout>
-    <TextView android:id="@+id/contact_sync_name_prefill_hint" android:visibility="gone" android:text="@string/contact_sync_enter_name_prefill" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_next_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_input_wrap" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <TextView android:id="@+id/contact_sync_name_prefill_hint" android:visibility="gone" android:text="@string/contact_sync_enter_name_prefill" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/contact_sync_name_next_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_input_wrap" style="@style/UiKit_TextView_Subtext"/>
     <com.discord.views.LoadingButton android:id="@+id/contact_sync_name_next_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:layout_constraintTop_toBottomOf="@+id/contact_sync_name_prefill_hint" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_contact_sync_suggestions.xml b/app/src/main/res/layout/layout_contact_sync_suggestions.xml
index e3822314c2..c6ce4b3712 100644
--- a/app/src/main/res/layout/layout_contact_sync_suggestions.xml
+++ b/app/src/main/res/layout/layout_contact_sync_suggestions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/res_2131952574_uikit_textview_medium"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/UiKit_TextView_Medium"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/UiKit_ViewGroup_RecyclerView"/>
     <com.discord.views.LoadingButton android:id="@+id/contact_sync_suggestions_submit_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/next" app:layout_constraintBottom_toBottomOf="0" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next" app:lb_text_color="?attr/primary_100"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_contact_sync_suggestions_empty.xml b/app/src/main/res/layout/layout_contact_sync_suggestions_empty.xml
index 5656d001c0..b070bdbdc3 100644
--- a/app/src/main/res/layout/layout_contact_sync_suggestions_empty.xml
+++ b/app/src/main/res/layout/layout_contact_sync_suggestions_empty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_empty_title" android:text="@string/contact_sync_suggestions_empty_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_suggestions_empty_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_suggestions_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_empty_subtitle" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_invite_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_empty_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_invite_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/invite_friends" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_skip_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952458_uikit_material_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_skip_button" android:layout_marginBottom="8dp" android:text="@string/private_channel_add_members_modal_skip" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_empty_title" android:text="@string/contact_sync_suggestions_empty_title" android:drawablePadding="16dp" android:textAlignment="center" app:drawableTopCompat="@drawable/img_contact_sync_suggestions_empty_header" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_suggestions_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_empty_subtitle" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_invite_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_empty_title" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_invite_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/invite_friends" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_skip_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/contact_sync_suggestions_skip_button" android:layout_marginBottom="8dp" android:text="@string/private_channel_add_members_modal_skip" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button_Transparent_Fit"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_contact_sync_toggle_info.xml b/app/src/main/res/layout/layout_contact_sync_toggle_info.xml
index febd8966f1..29bbf7f188 100644
--- a/app/src/main/res/layout/layout_contact_sync_toggle_info.xml
+++ b/app/src/main/res/layout/layout_contact_sync_toggle_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_discovery_toggle" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/contact_sync_landing_toggle_label" app:cs_text_fontpath="?attr/font_primary_semibold" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_discovery_info_1" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/contact_sync_landing_info_2" android:lineSpacingMultiplier="1" style="@style/res_2131952574_uikit_textview_medium"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_discovery_info_2" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_permissions_description_android" android:lineSpacingMultiplier="1" style="@style/res_2131952574_uikit_textview_medium"/>
+    <com.discord.views.CheckedSetting android:id="@+id/contact_sync_discovery_toggle" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/contact_sync_landing_toggle_label" app:cs_text_fontpath="?attr/font_primary_semibold" style="@style/UiKit_CheckedSetting_Themed"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_discovery_info_1" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/contact_sync_landing_info_2" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Medium"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_discovery_info_2" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_permissions_description_android" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Medium"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_contact_sync_verify_phone.xml b/app/src/main/res/layout/layout_contact_sync_verify_phone.xml
index d6e60bd90f..3b4070b915 100644
--- a/app/src/main/res/layout/layout_contact_sync_verify_phone.xml
+++ b/app/src/main/res/layout/layout_contact_sync_verify_phone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_verify_phone_title" android:text="@string/sms_confirmation_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_verify_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/verification_phone_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_verify_phone_title" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/contact_sync_verify_phone_title" android:text="@string/sms_confirmation_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_verify_phone_subtitle" android:layout_marginTop="16dp" android:text="@string/verification_phone_description" android:lineSpacingMultiplier="1" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_verify_phone_title" style="@style/UiKit_TextView"/>
     <com.discord.views.CodeVerificationView android:id="@+id/contact_sync_verify_phone_code" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_verify_phone_subtitle"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_icon_uploader.xml b/app/src/main/res/layout/layout_icon_uploader.xml
index d9d0c81af3..20b70f0834 100644
--- a/app/src/main/res/layout/layout_icon_uploader.xml
+++ b/app/src/main/res/layout/layout_icon_uploader.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <ImageView android:id="@+id/icon_uploader_placeholder_border" android:layout_width="0dp" android:layout_height="0dp" android:src="@drawable/drawable_circle_dashed" app:layout_constraintBottom_toBottomOf="@+id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@+id/icon_uploader_image" app:layout_constraintStart_toStartOf="@+id/icon_uploader_image" app:layout_constraintTop_toTopOf="@+id/icon_uploader_image" app:tint="?attr/colorInteractiveNormal"/>
     <ImageView android:id="@+id/icon_uploader_placeholder_icon" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_camera_24dp" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/icon_uploader_placeholder_text" app:layout_constraintEnd_toEndOf="@+id/icon_uploader_image" app:layout_constraintStart_toStartOf="@+id/icon_uploader_image" app:layout_constraintTop_toTopOf="@+id/icon_uploader_image" app:layout_constraintVertical_chainStyle="2" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/icon_uploader_placeholder_text" android:layout_width="0dp" android:layout_height="24dp" android:text="@string/upload" android:textAllCaps="true" android:paddingStart="8dp" android:paddingEnd="8dp" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8sp" app:autoSizeStepGranularity="1sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@+id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@+id/icon_uploader_image" app:layout_constraintStart_toStartOf="@+id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@+id/icon_uploader_placeholder_icon" style="@style/res_2131952564_uikit_textview_bold"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/icon_uploader_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@null" style="@style/res_2131951673_avatar_hero"/>
-    <ImageView android:id="@+id/icon_uploader_plus" android:background="@drawable/drawable_circle_brand_500" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_upload_plus_32dp" android:translationX="6dp" android:translationY="-6dp" android:importantForAccessibility="no" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@+id/icon_uploader_image" app:layout_constraintTop_toTopOf="@+id/icon_uploader_image" style="@style/res_2131952448_uikit_imageview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/icon_uploader_placeholder_text" android:layout_width="0dp" android:layout_height="24dp" android:text="@string/upload" android:textAllCaps="true" android:paddingStart="8dp" android:paddingEnd="8dp" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8sp" app:autoSizeStepGranularity="1sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@+id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@+id/icon_uploader_image" app:layout_constraintStart_toStartOf="@+id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@+id/icon_uploader_placeholder_icon" style="@style/UiKit_TextView_Bold"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/icon_uploader_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@null" style="@style/Avatar_Hero"/>
+    <ImageView android:id="@+id/icon_uploader_plus" android:background="@drawable/drawable_circle_brand_500" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_upload_plus_32dp" android:translationX="6dp" android:translationY="-6dp" android:importantForAccessibility="no" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@+id/icon_uploader_image" app:layout_constraintTop_toTopOf="@+id/icon_uploader_image" style="@style/UiKit_ImageView"/>
     <androidx.constraintlayout.widget.Group android:id="@+id/placeholder_group" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="icon_uploader_placeholder_border,icon_uploader_placeholder_icon,icon_uploader_placeholder_text,icon_uploader_plus"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_premium_guild_status_features_user.xml b/app/src/main/res/layout/layout_premium_guild_status_features_user.xml
index ce79f54007..3bbe723db4 100644
--- a/app/src/main/res/layout/layout_premium_guild_status_features_user.xml
+++ b/app/src/main/res/layout/layout_premium_guild_status_features_user.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginBottom="16dp" android:text="@string/premium_guild_perks_modal_subscriber_perks_header" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_subscriber_feature_member_badge" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_subscriber_feature_profile_badge" app:drawableStartCompat="@drawable/ic_booster_profile_badge_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_subscriber_feature_role" app:drawableStartCompat="@drawable/ic_role_pink_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginBottom="16dp" android:text="@string/premium_guild_perks_modal_subscriber_perks_header" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_subscriber_feature_member_badge" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_subscriber_feature_profile_badge" app:drawableStartCompat="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_subscriber_feature_role" app:drawableStartCompat="@drawable/ic_role_pink_24dp" style="@style/UiKit_TextView_Perk"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_premium_settings_payment.xml b/app/src/main/res/layout/layout_premium_settings_payment.xml
index dfe1187225..ad9cce230c 100644
--- a/app/src/main/res/layout/layout_premium_settings_payment.xml
+++ b/app/src/main/res/layout/layout_premium_settings_payment.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/premium_settings_payment_container" android:background="?attr/colorBackgroundSecondary" android:layout_marginTop="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/premium_settings_payment_header" android:background="?attr/colorBackgroundPrimary" android:text="@string/billing_step_payment" style="@style/res_2131952496_uikit_settings_item_header"/>
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/premium_settings_billing_info" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/premium_settings_billing_information" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="?attr/colorTextLink" android:id="@+id/premium_settings_google_play_manage" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/billing_manage_on_google_play" style="@style/res_2131952563_uikit_textview"/>
-    <View android:id="@+id/premium_settings_billing_divider" android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/res_2131952416_uikit_divider"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/active_subscriptions_bottom_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952467_uikit_material_button_secondary"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/premium_settings_payment_container" android:background="?attr/colorBackgroundSecondary" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/premium_settings_payment_header" android:background="?attr/colorBackgroundPrimary" android:text="@string/billing_step_payment" style="@style/UiKit_Settings_Item_Header"/>
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/premium_settings_billing_info" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/premium_settings_billing_information" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="?attr/colorTextLink" android:id="@+id/premium_settings_google_play_manage" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/billing_manage_on_google_play" style="@style/UiKit_TextView"/>
+    <View android:id="@+id/premium_settings_billing_divider" android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/UiKit_Divider"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/active_subscriptions_bottom_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_Material_Button_Secondary"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_unhandled_uri.xml b/app/src/main/res/layout/layout_unhandled_uri.xml
index d28ba5c930..457ef72fd1 100644
--- a/app/src/main/res/layout/layout_unhandled_uri.xml
+++ b/app/src/main/res/layout/layout_unhandled_uri.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/color_brand" android:background="@drawable/drawable_bg_settings_header" android:paddingLeft="@dimen/settings_option_padding" android:paddingTop="@dimen/settings_option_padding_header_top" android:paddingRight="@dimen/settings_option_padding" android:paddingBottom="@dimen/settings_option_padding" android:layout_width="match_parent" android:text="@string/unhandled_link_title" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/color_brand" android:background="@drawable/drawable_bg_settings_header" android:paddingLeft="@dimen/settings_option_padding" android:paddingTop="@dimen/settings_option_padding_header_top" android:paddingRight="@dimen/settings_option_padding" android:paddingBottom="@dimen/settings_option_padding" android:layout_width="match_parent" android:text="@string/unhandled_link_title" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+    <View style="@style/UiKit_Divider"/>
     <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp">
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:text="@string/unhandled_link_body" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@+id/unhandled_uri_display" android:background="?attr/selectableItemBackground" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="match_parent" android:drawablePadding="10dp" app:drawableStartCompat="@drawable/icon_menu_copy" style="@style/res_2131952564_uikit_textview_bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:text="@string/unhandled_link_body" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@+id/unhandled_uri_display" android:background="?attr/selectableItemBackground" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="match_parent" android:drawablePadding="10dp" app:drawableStartCompat="@drawable/icon_menu_copy" style="@style/UiKit_TextView_Bold"/>
     </LinearLayout>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/unhandled_uri_okay" android:paddingLeft="32dp" android:paddingRight="32dp" android:layout_width="match_parent" android:layout_marginLeft="15dp" android:layout_marginTop="8dp" android:layout_marginRight="15dp" android:layout_marginBottom="8dp" android:text="@string/okay" style="@style/res_2131952458_uikit_material_button"/>
+    <View style="@style/UiKit_Divider"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/unhandled_uri_okay" android:paddingLeft="32dp" android:paddingRight="32dp" android:layout_width="match_parent" android:layout_marginLeft="15dp" android:layout_marginTop="8dp" android:layout_marginRight="15dp" android:layout_marginBottom="8dp" android:text="@string/okay" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/leave_guild_dialog.xml b/app/src/main/res/layout/leave_guild_dialog.xml
index d7c13648a0..98638fc0d3 100644
--- a/app/src/main/res/layout/leave_guild_dialog.xml
+++ b/app/src/main/res/layout/leave_guild_dialog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/leave_guild_dialog_header" android:padding="16dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/leave_guild_dialog_header" android:padding="16dp" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <TextView android:id="@+id/leave_guild_dialog_body" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_200" android:id="@+id/leave_guild_cancel_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <TextView android:id="@+id/leave_guild_dialog_body" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_200" android:id="@+id/leave_guild_cancel_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
         <com.discord.views.LoadingButton android:id="@+id/leave_guild_confirm_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:lb_progress_color="@color/white" app:lb_text="@string/leave_server" app:lb_text_color="@drawable/button_text_color_primary_100"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/member_verification_avatar_view.xml b/app/src/main/res/layout/member_verification_avatar_view.xml
index b84c62b406..fdac8bf07c 100644
--- a/app/src/main/res/layout/member_verification_avatar_view.xml
+++ b/app/src/main/res/layout/member_verification_avatar_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/member_verification_avatar" android:layout_width="match_parent" android:layout_height="match_parent" app:placeholderImage="@drawable/drawable_squircle_brand_500" app:roundedCornerRadius="16dp"/>
-    <TextView android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/member_verification_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/member_verification_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/moderator_start_stage_continue_item.xml b/app/src/main/res/layout/moderator_start_stage_continue_item.xml
index 8b895e1c24..37c48d99b4 100644
--- a/app/src/main/res/layout/moderator_start_stage_continue_item.xml
+++ b/app/src/main/res/layout/moderator_start_stage_continue_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="24dp" android:text="@string/stage_continue_prompt_title" android:drawablePadding="4dp" app:drawableRightCompat="@drawable/ic_arrow_right_link_16dp" app:drawableTint="?attr/colorTextLink" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952572_uikit_textview_link"/>
+    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="24dp" android:text="@string/stage_continue_prompt_title" android:drawablePadding="4dp" app:drawableRightCompat="@drawable/ic_arrow_right_link_16dp" app:drawableTint="?attr/colorTextLink" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Link"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/moderator_start_stage_header_item.xml b/app/src/main/res/layout/moderator_start_stage_header_item.xml
index 9c7555408e..c1dd21942b 100644
--- a/app/src/main/res/layout/moderator_start_stage_header_item.xml
+++ b/app/src/main/res/layout/moderator_start_stage_header_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/moderator_start_stage_icon" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/ic_mentions_empty" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" app:layout_constraintWidth_percent="0.33"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="30sp" android:gravity="center" android:id="@+id/moderator_start_stage_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="32dp" android:layout_marginTop="24dp" android:layout_marginRight="32dp" android:text="@string/stage_start_prompt_title_moderator" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_icon"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/moderator_start_stage_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/stage_start_prompt_subtitle" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_title" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="30sp" android:gravity="center" android:id="@+id/moderator_start_stage_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="32dp" android:layout_marginTop="24dp" android:layout_marginRight="32dp" android:text="@string/stage_start_prompt_title_moderator" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_icon"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/moderator_start_stage_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:text="@string/stage_start_prompt_subtitle" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_title" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/moderator_start_stage_list_item.xml b/app/src/main/res/layout/moderator_start_stage_list_item.xml
index 48fd27d626..4b611e1836 100644
--- a/app/src/main/res/layout/moderator_start_stage_list_item.xml
+++ b/app/src/main/res/layout/moderator_start_stage_list_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:backgroundTint="?attr/colorBackgroundSecondary">
-    <ImageView android:id="@+id/icon_bg" android:layout_width="0dp" android:layout_height="0dp" android:src="@drawable/drawable_uikit_white_circle" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/subtitle" app:layout_constraintDimensionRatio="H,1:1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/title" app:tint="@color/status_green_600" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/icon" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_channel_stage_24dp" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/icon_bg" app:layout_constraintLeft_toLeftOf="@+id/icon_bg" app:layout_constraintRight_toRightOf="@+id/icon_bg" app:layout_constraintTop_toTopOf="@+id/icon_bg" app:tint="@color/white" style="@style/res_2131952448_uikit_imageview"/>
-    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <ImageView android:id="@+id/icon_bg" android:layout_width="0dp" android:layout_height="0dp" android:src="@drawable/drawable_uikit_white_circle" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/subtitle" app:layout_constraintDimensionRatio="H,1:1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/title" app:tint="@color/status_green_600" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/icon" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_channel_stage_24dp" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/icon_bg" app:layout_constraintLeft_toLeftOf="@+id/icon_bg" app:layout_constraintRight_toRightOf="@+id/icon_bg" app:layout_constraintTop_toTopOf="@+id/icon_bg" app:tint="@color/white" style="@style/UiKit_ImageView"/>
+    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_SingleLine"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/arrow" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_TextView_Medium_SingleLine"/>
     <ImageView android:id="@+id/arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_end_24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/moderator_start_stage_waiting_item.xml b/app/src/main/res/layout/moderator_start_stage_waiting_item.xml
index 1519029bb6..f24b30d6a4 100644
--- a/app/src/main/res/layout/moderator_start_stage_waiting_item.xml
+++ b/app/src/main/res/layout/moderator_start_stage_waiting_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.discord.views.user.UserSummaryView android:id="@+id/moderator_start_stage_waiting_user_list" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/moderator_start_stage_waiting_user_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_waiting_user_list" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/moderator_start_stage_waiting_user_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/moderator_start_stage_waiting_user_list" style="@style/UiKit_TextView_Medium_SingleLine"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/multi_value_prop_premium_upsell_dialog.xml b/app/src/main/res/layout/multi_value_prop_premium_upsell_dialog.xml
index 5910496309..aac06e6320 100644
--- a/app/src/main/res/layout/multi_value_prop_premium_upsell_dialog.xml
+++ b/app/src/main/res/layout/multi_value_prop_premium_upsell_dialog.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
     <androidx.viewpager2.widget.ViewPager2 android:id="@+id/premium_upsell_viewpager" android:layout_width="match_parent" android:layout_height="250dp"/>
-    <com.google.android.material.tabs.TabLayout android:id="@+id/premium_upsell_dots" android:layout_below="@+id/premium_upsell_viewpager" style="@style/res_2131952530_uikit_tablayout_pagerindicator"/>
-    <View android:id="@+id/premium_upsell_divider" android:layout_below="@+id/premium_upsell_dots" style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout android:id="@+id/premium_upsell_button_container" android:layout_below="@+id/premium_upsell_divider" style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/premium_upsell_close" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952471_uikit_material_button_transparent"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/learn_more" android:layout_marginStart="8dp" style="@style/res_2131952461_uikit_material_button_green_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_get_premium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:layout_marginStart="8dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952461_uikit_material_button_green_fit"/>
+    <com.google.android.material.tabs.TabLayout android:id="@+id/premium_upsell_dots" android:layout_below="@+id/premium_upsell_viewpager" style="@style/UiKit_TabLayout_PagerIndicator"/>
+    <View android:id="@+id/premium_upsell_divider" android:layout_below="@+id/premium_upsell_dots" style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout android:id="@+id/premium_upsell_button_container" android:layout_below="@+id/premium_upsell_divider" style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/premium_upsell_close" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit_Material_Button_Transparent"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/learn_more" android:layout_marginStart="8dp" style="@style/UiKit_Material_Button_Green_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_get_premium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:layout_marginStart="8dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green_Fit"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/notification_mute_settings_view.xml b/app/src/main/res/layout/notification_mute_settings_view.xml
index 5fc58fe0eb..128172fa50 100644
--- a/app/src/main/res/layout/notification_mute_settings_view.xml
+++ b/app/src/main/res/layout/notification_mute_settings_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/notification_mute_settings_mute_item" android:text="@string/form_label_mute_server" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952492_uikit_settings_item"/>
-    <TextView android:id="@+id/notification_mute_settings_mute_item_status" style="@style/res_2131952493_uikit_settings_item_addition"/>
-    <TextView android:id="@+id/notification_mute_settings_mute_item_description" style="@style/res_2131952493_uikit_settings_item_addition"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/notification_mute_settings_mute_item" android:text="@string/form_label_mute_server" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item"/>
+    <TextView android:id="@+id/notification_mute_settings_mute_item_status" style="@style/UiKit_Settings_Item_Addition"/>
+    <TextView android:id="@+id/notification_mute_settings_mute_item_description" style="@style/UiKit_Settings_Item_Addition"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/nux_guild_template_card_view_holder.xml b/app/src/main/res/layout/nux_guild_template_card_view_holder.xml
index 93628bbaf8..56f0c498a2 100644
--- a/app/src/main/res/layout/nux_guild_template_card_view_holder.xml
+++ b/app/src/main/res/layout/nux_guild_template_card_view_holder.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/nux_guild_template_card" android:layout_marginBottom="8dp" style="@style/res_2131952046_nux_guildtemplates_card">
-    <TextView android:id="@+id/nux_guild_template_text" android:text="@string/guild_template_header_community" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/drawable_guild_template_community" style="@style/res_2131952047_nux_guildtemplates_card_action"/>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/nux_guild_template_card" android:layout_marginBottom="8dp" style="@style/Nux_GuildTemplates_Card">
+    <TextView android:id="@+id/nux_guild_template_text" android:text="@string/guild_template_header_community" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/drawable_guild_template_community" style="@style/Nux_GuildTemplates_Card_Action"/>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/nux_guild_template_text_view_holder.xml b/app/src/main/res/layout/nux_guild_template_text_view_holder.xml
index 88882adf79..c6acdafde9 100644
--- a/app/src/main/res/layout/nux_guild_template_text_view_holder.xml
+++ b/app/src/main/res/layout/nux_guild_template_text_view_holder.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/res_2131952537_uikit_textappearance_listitem_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/guild_template_selector_option_header"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/UiKit_TextAppearance_ListItem_Label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/guild_template_selector_option_header"/>
diff --git a/app/src/main/res/layout/oauth_token_permission_detailed_list_item.xml b/app/src/main/res/layout/oauth_token_permission_detailed_list_item.xml
index b616794b57..88e4d488b0 100644
--- a/app/src/main/res/layout/oauth_token_permission_detailed_list_item.xml
+++ b/app/src/main/res/layout/oauth_token_permission_detailed_list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="4dp" android:paddingBottom="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-    <ImageView android:id="@+id/oauth_token_permission_detailed_icon" android:layout_margin="4dp" android:src="@drawable/ic_check_circle_green_24dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/oauth_token_permission_detailed_name" android:layout_width="0dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toBottomOf="@+id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toTopOf="@+id/oauth_token_permission_detailed_icon" style="@style/res_2131952567_uikit_textview_h2"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="4dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+    <ImageView android:id="@+id/oauth_token_permission_detailed_icon" android:layout_margin="4dp" android:src="@drawable/ic_check_circle_green_24dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/oauth_token_permission_detailed_name" android:layout_width="0dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toBottomOf="@+id/oauth_token_permission_detailed_icon" app:layout_constraintTop_toTopOf="@+id/oauth_token_permission_detailed_icon" style="@style/UiKit_TextView_H2"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/oauth_token_permission_list_item.xml b/app/src/main/res/layout/oauth_token_permission_list_item.xml
index 59cfad176b..8228721ff8 100644
--- a/app/src/main/res/layout/oauth_token_permission_list_item.xml
+++ b/app/src/main/res/layout/oauth_token_permission_list_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:paddingTop="4dp" android:paddingBottom="4dp" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_check_circle_green_24dp" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:paddingTop="4dp" android:paddingBottom="4dp" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_check_circle_green_24dp" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/overlay_bubble_menu.xml b/app/src/main/res/layout/overlay_bubble_menu.xml
index a08beda442..607c0955fe 100644
--- a/app/src/main/res/layout/overlay_bubble_menu.xml
+++ b/app/src/main/res/layout/overlay_bubble_menu.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/res_2131951648_apptheme_dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layoutDirection="ltr" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/AppTheme_Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layoutDirection="ltr" style="@style/UiKit_ViewGroup_LinearLayout">
     <LinearLayout android:gravity="right|center_vertical|center_horizontal|center" android:orientation="horizontal" android:id="@+id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
         <View android:id="@+id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size"/>
         <View android:background="@color/white_alpha_30" android:layout_width="1dp" android:layout_height="32dp" android:layout_marginLeft="8dp" android:layout_marginRight="8dp"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
-        <TextView android:gravity="center" android:id="@+id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
+        <TextView android:gravity="center" android:id="@+id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4dp" style="@style/UiKit_TextView_H1_Bold"/>
     </LinearLayout>
-    <com.discord.views.OverlayMenuView android:id="@+id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable"/>
+    <com.discord.views.OverlayMenuView android:id="@+id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/overlay_voice_bubble.xml b/app/src/main/res/layout/overlay_voice_bubble.xml
index 87067adeb2..ef5c82b0bf 100644
--- a/app/src/main/res/layout/overlay_voice_bubble.xml
+++ b/app/src/main/res/layout/overlay_voice_bubble.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/res_2131951648_apptheme_dark" android:id="@+id/overlay_bubble_iv" android:background="@drawable/drawable_circle_transparent" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_margin="8dp" android:elevation="4dp" style="@style/res_2131951674_avatar_large"/>
+<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/AppTheme_Dark" android:id="@+id/overlay_bubble_iv" android:background="@drawable/drawable_circle_transparent" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_margin="8dp" android:elevation="4dp" style="@style/Avatar_Large"/>
diff --git a/app/src/main/res/layout/overlay_voice_channel_selector.xml b/app/src/main/res/layout/overlay_voice_channel_selector.xml
index abd97e72a2..3b536f09dc 100644
--- a/app/src/main/res/layout/overlay_voice_channel_selector.xml
+++ b/app/src/main/res/layout/overlay_voice_channel_selector.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/res_2131951648_apptheme_dark" android:layout_gravity="center" android:id="@+id/dialog_card" android:layout_margin="16dp" app:cardElevation="8dp" style="@style/res_2131952049_overlay_dialog_constrained">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:gravity="center_vertical" android:background="@color/primary_700" android:focusable="true" android:clickable="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <ImageView android:padding="16dp" android:src="@drawable/ic_volume_up_white_24dp" android:importantForAccessibility="no" app:tint="@color/white" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@+id/test" android:layout_width="0dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/channel_select" android:layout_weight="1" style="@style/res_2131952579_uikit_textview_semibold"/>
-            <ImageView android:id="@+id/close" android:background="?attr/selectableItemBackground" android:padding="16dp" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" app:tint="@color/white" style="@style/res_2131952448_uikit_imageview"/>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/AppTheme_Dark" android:layout_gravity="center" android:id="@+id/dialog_card" android:layout_margin="16dp" app:cardElevation="8dp" style="@style/Overlay_Dialog_Constrained">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:gravity="center_vertical" android:background="@color/primary_700" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <ImageView android:padding="16dp" android:src="@drawable/ic_volume_up_white_24dp" android:importantForAccessibility="no" app:tint="@color/white" style="@style/UiKit_ImageView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@+id/test" android:layout_width="0dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/channel_select" android:layout_weight="1" style="@style/UiKit_TextView_Semibold"/>
+            <ImageView android:id="@+id/close" android:background="?attr/selectableItemBackground" android:padding="16dp" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" app:tint="@color/white" style="@style/UiKit_ImageView"/>
         </LinearLayout>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/overlay_channel_search" app:boxBackgroundColor="@color/primary_dark_700" style="@style/res_2131952560_uikit_textinputlayout_search">
-            <com.google.android.material.textfield.TextInputEditText android:hint="@string/search_channels" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/overlay_channel_search" app:boxBackgroundColor="@color/primary_dark_700" style="@style/UiKit_TextInputLayout_Search">
+            <com.google.android.material.textfield.TextInputEditText android:hint="@string/search_channels" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/empty_results" android:visibility="gone" android:layout_width="match_parent" android:layout_marginLeft="32dp" android:layout_marginTop="64dp" android:layout_marginRight="32dp" android:text="@string/overlay_no_results" android:drawablePadding="8dp" android:layout_weight="1" android:textAlignment="center" app:autoSizeMinTextSize="8sp" app:autoSizeTextType="uniform" app:drawableBottomCompat="@drawable/img_quick_switcher_empty" style="@style/res_2131952570_uikit_textview_large"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/results_rv" android:padding="8dp" android:clipToPadding="false" android:layout_weight="1" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/empty_results" android:visibility="gone" android:layout_width="match_parent" android:layout_marginLeft="32dp" android:layout_marginTop="64dp" android:layout_marginRight="32dp" android:text="@string/overlay_no_results" android:drawablePadding="8dp" android:layout_weight="1" android:textAlignment="center" app:autoSizeMinTextSize="8sp" app:autoSizeTextType="uniform" app:drawableBottomCompat="@drawable/img_quick_switcher_empty" style="@style/UiKit_TextView_Large"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/results_rv" android:padding="8dp" android:clipToPadding="false" android:layout_weight="1" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/payment_method_list_add_item.xml b/app/src/main/res/layout/payment_method_list_add_item.xml
index 74241d224c..efef390470 100644
--- a/app/src/main/res/layout/payment_method_list_add_item.xml
+++ b/app/src/main/res/layout/payment_method_list_add_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:minHeight="40dp" android:text="@string/billing_add_payment_method" style="@style/res_2131952458_uikit_material_button"/>
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:minHeight="40dp" android:text="@string/billing_add_payment_method" style="@style/UiKit_Material_Button"/>
diff --git a/app/src/main/res/layout/payment_method_list_header.xml b/app/src/main/res/layout/payment_method_list_header.xml
index 42c189f472..6697202a32 100644
--- a/app/src/main/res/layout/payment_method_list_header.xml
+++ b/app/src/main/res/layout/payment_method_list_header.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/res_2131952496_uikit_settings_item_header" android:id="@+id/payment_method_header" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/UiKit_Settings_Item_Header" android:id="@+id/payment_method_header" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp"/>
diff --git a/app/src/main/res/layout/payment_method_list_item.xml b/app/src/main/res/layout/payment_method_list_item.xml
index 2f1a908c51..882a488696 100644
--- a/app/src/main/res/layout/payment_method_list_item.xml
+++ b/app/src/main/res/layout/payment_method_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952589_uikit_viewgroup">
-    <com.google.android.material.button.MaterialButton android:id="@+id/payment_method_edit" android:paddingLeft="16dp" android:paddingRight="16dp" android:minWidth="0dp" android:text="@string/edit" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" style="@style/res_2131952468_uikit_material_button_secondary_fit"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup">
+    <com.google.android.material.button.MaterialButton android:id="@+id/payment_method_edit" android:paddingLeft="16dp" android:paddingRight="16dp" android:minWidth="0dp" android:text="@string/edit" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" style="@style/UiKit_Material_Button_Secondary_Fit"/>
     <com.discord.widgets.settings.billing.PaymentSourceView android:id="@+id/payment_method_summary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_toStartOf="@+id/payment_method_edit" android:layout_alignParentStart="true"/>
-    <View android:background="@color/primary_630" android:layout_marginTop="16dp" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/res_2131952417_uikit_divider_thick"/>
+    <View android:background="@color/primary_630" android:layout_marginTop="16dp" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit_Divider_Thick"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/payment_source_view.xml b/app/src/main/res/layout/payment_source_view.xml
index 4be083753f..f13c59be9a 100644
--- a/app/src/main/res/layout/payment_source_view.xml
+++ b/app/src/main/res/layout/payment_source_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952589_uikit_viewgroup">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup">
     <androidx.cardview.widget.CardView android:id="@+id/payment_source_view_icon_wrapper" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardCornerRadius="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/payment_source_view_title" app:layout_constraintTop_toTopOf="@+id/payment_source_view_title" app:layout_constraintVertical_bias="0">
-        <ImageView android:id="@+id/payment_source_view_icon" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+        <ImageView android:id="@+id/payment_source_view_icon" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     </androidx.cardview.widget.CardView>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@+id/payment_source_view_title" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/payment_source_view_subtext" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_icon_wrapper" app:layout_constraintRight_toLeftOf="@+id/payment_source_view_invalid" app:layout_constraintTop_toBottomOf="@+id/payment_source_view_title" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <TextView android:textSize="12sp" android:textColor="@color/primary_100" android:id="@+id/payment_source_view_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_height="18dp" android:layout_marginTop="2dp" android:text="@string/payment_source_invalid" android:lineSpacingMultiplier="1" android:textAllCaps="true" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_title" app:layout_constraintRight_toLeftOf="@+id/payment_source_view_premium" app:layout_constraintTop_toTopOf="@+id/payment_source_view_title" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <ImageView android:id="@+id/payment_source_view_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2dp" android:layout_width="24dp" android:layout_height="18dp" android:layout_marginTop="2dp" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" android:layout_marginStart="4dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_invalid" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/payment_source_view_title" app:layout_goneMarginLeft="8dp" app:layout_goneMarginStart="8dp" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@+id/payment_source_view_subtext" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_icon_wrapper" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/payment_source_view_title" app:layout_constraintVertical_bias="0" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@+id/payment_source_view_title" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/payment_source_view_subtext" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_icon_wrapper" app:layout_constraintRight_toLeftOf="@+id/payment_source_view_invalid" app:layout_constraintTop_toBottomOf="@+id/payment_source_view_title" style="@style/UiKit_TextView_SingleLine"/>
+    <TextView android:textSize="12sp" android:textColor="@color/primary_100" android:id="@+id/payment_source_view_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_height="18dp" android:layout_marginTop="2dp" android:text="@string/payment_source_invalid" android:lineSpacingMultiplier="1" android:textAllCaps="true" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_title" app:layout_constraintRight_toLeftOf="@+id/payment_source_view_premium" app:layout_constraintTop_toTopOf="@+id/payment_source_view_title" style="@style/UiKit_TextView_SingleLine"/>
+    <ImageView android:id="@+id/payment_source_view_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2dp" android:layout_width="24dp" android:layout_height="18dp" android:layout_marginTop="2dp" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" android:layout_marginStart="4dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_invalid" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/payment_source_view_title" app:layout_goneMarginLeft="8dp" app:layout_goneMarginStart="8dp" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@+id/payment_source_view_subtext" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/payment_source_view_icon_wrapper" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/payment_source_view_title" app:layout_constraintVertical_bias="0" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/premium_activated_dialog.xml b/app/src/main/res/layout/premium_activated_dialog.xml
index 8fa69de3e7..383da2e998 100644
--- a/app/src/main/res/layout/premium_activated_dialog.xml
+++ b/app/src/main/res/layout/premium_activated_dialog.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:clipChildren="false" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <RelativeLayout android:layout_marginBottom="32dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <ImageView android:id="@+id/premium_activated_header_background" android:background="@drawable/bg_premium_subscription_header" android:layout_height="100dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:id="@+id/premium_activated_logo" android:layout_marginTop="16dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:id="@+id/premium_activated_wumpus" android:layout_centerInParent="true" android:translationX="-15dp" android:translationY="8dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:clipChildren="false" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <RelativeLayout android:layout_marginBottom="32dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <ImageView android:id="@+id/premium_activated_header_background" android:background="@drawable/bg_premium_subscription_header" android:layout_height="100dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <ImageView android:id="@+id/premium_activated_logo" android:layout_marginTop="16dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" style="@style/UiKit_ImageView"/>
+        <ImageView android:id="@+id/premium_activated_wumpus" android:layout_centerInParent="true" android:translationX="-15dp" android:translationY="8dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     </RelativeLayout>
-    <ImageView android:layout_gravity="center_horizontal" android:id="@+id/premium_activated_title" android:layout_height="40dp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:src="?attr/img_premium_activated_tier_2" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:gravity="center" android:id="@+id/premium_activated_description" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/premium_activated_confirm" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:text="@string/premium_upgrade_done_button" style="@style/res_2131952458_uikit_material_button"/>
+    <ImageView android:layout_gravity="center_horizontal" android:id="@+id/premium_activated_title" android:layout_height="40dp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:src="?attr/img_premium_activated_tier_2" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:gravity="center" android:id="@+id/premium_activated_description" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/premium_activated_confirm" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:text="@string/premium_upgrade_done_button" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/premium_and_premium_guild_activated_dialog.xml b/app/src/main/res/layout/premium_and_premium_guild_activated_dialog.xml
index 92daa6f6a0..baa5820d6b 100644
--- a/app/src/main/res/layout/premium_and_premium_guild_activated_dialog.xml
+++ b/app/src/main/res/layout/premium_and_premium_guild_activated_dialog.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:clipChildren="false" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <RelativeLayout android:layout_marginBottom="32dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <ImageView android:background="@drawable/bg_premium_bundle_header" android:layout_height="100dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:layout_marginTop="16dp" android:src="?attr/img_logo_discord_nitro_and_boost" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:layout_height="90dp" android:src="@drawable/img_premium_and_premium_guild_subscription_header" android:layout_centerInParent="true" android:translationX="-15dp" android:translationY="16dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:clipChildren="false" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <RelativeLayout android:layout_marginBottom="32dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <ImageView android:background="@drawable/bg_premium_bundle_header" android:layout_height="100dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <ImageView android:layout_marginTop="16dp" android:src="?attr/img_logo_discord_nitro_and_boost" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" style="@style/UiKit_ImageView"/>
+        <ImageView android:layout_height="90dp" android:src="@drawable/img_premium_and_premium_guild_subscription_header" android:layout_centerInParent="true" android:translationX="-15dp" android:translationY="16dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     </RelativeLayout>
-    <ImageView android:layout_gravity="center_horizontal" android:layout_height="40dp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:src="?attr/img_plan_activated" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:gravity="center" android:id="@+id/premium_and_premium_guild_activated_text" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/premium_activated_confirm" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:text="@string/premium_upgrade_done_button" style="@style/res_2131952458_uikit_material_button"/>
+    <ImageView android:layout_gravity="center_horizontal" android:layout_height="40dp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:src="?attr/img_plan_activated" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:gravity="center" android:id="@+id/premium_and_premium_guild_activated_text" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/premium_activated_confirm" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:text="@string/premium_upgrade_done_button" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/premium_guild_subscription_activated_dialog.xml b/app/src/main/res/layout/premium_guild_subscription_activated_dialog.xml
index ca93e2e37c..b03f2fb17a 100644
--- a/app/src/main/res/layout/premium_guild_subscription_activated_dialog.xml
+++ b/app/src/main/res/layout/premium_guild_subscription_activated_dialog.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.airbnb.lottie.LottieAnimationView android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_activated_lottie" android:layout_width="140dp" android:layout_height="88dp" android:layout_marginTop="24dp" app:lottie_fileName="animations/anim_boost_activated.json" style="@style/res_2131952457_uikit_lottieanimationview"/>
-    <ImageView android:layout_gravity="center_horizontal" android:layout_marginLeft="8dp" android:layout_marginTop="24dp" android:layout_marginRight="8dp" android:src="?attr/img_boost_activated" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_activated_body1" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_activated_body2" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/premium_guild_subscription_activated_ok" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:text="@string/guild_subscription_purchase_modal_activated_close_button" style="@style/res_2131952458_uikit_material_button"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.airbnb.lottie.LottieAnimationView android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_activated_lottie" android:layout_width="140dp" android:layout_height="88dp" android:layout_marginTop="24dp" app:lottie_fileName="animations/anim_boost_activated.json" style="@style/UiKit_LottieAnimationView"/>
+    <ImageView android:layout_gravity="center_horizontal" android:layout_marginLeft="8dp" android:layout_marginTop="24dp" android:layout_marginRight="8dp" android:src="?attr/img_boost_activated" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_activated_body1" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView"/>
+    <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_activated_body2" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/premium_guild_subscription_activated_ok" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:text="@string/guild_subscription_purchase_modal_activated_close_button" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/premium_guild_subscription_cancel_dialog.xml b/app/src/main/res/layout/premium_guild_subscription_cancel_dialog.xml
index 0938b03208..8798260f1f 100644
--- a/app/src/main/res/layout/premium_guild_subscription_cancel_dialog.xml
+++ b/app/src/main/res/layout/premium_guild_subscription_cancel_dialog.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/premium_guild_subscription_cancel_header" android:padding="16dp" android:text="@string/premium_guild_subscription_cancel_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/premium_guild_subscription_cancel_header" android:padding="16dp" android:text="@string/premium_guild_subscription_cancel_title" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
             <com.discord.app.AppViewFlipper android:id="@+id/premium_guild_subscription_cancel_flipper" android:layout_width="match_parent" android:layout_height="wrap_content">
                 <ProgressBar android:layout_gravity="center" android:id="@+id/active_subscription_progress" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp"/>
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:src="@drawable/img_boost_cancel" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:id="@+id/premium_guild_subscription_cancel_body" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textColor="@color/status_red_500" android:id="@+id/premium_guild_subscription_cancel_error" android:visibility="gone" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscription_error_mobile" style="@style/res_2131952563_uikit_textview"/>
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:src="@drawable/img_boost_cancel" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+                    <TextView android:id="@+id/premium_guild_subscription_cancel_body" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+                    <TextView android:textColor="@color/status_red_500" android:id="@+id/premium_guild_subscription_cancel_error" android:visibility="gone" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </com.discord.app.AppViewFlipper>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorInteractiveActive" android:id="@+id/premium_guild_subscription_cancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:text="@string/nevermind" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorInteractiveActive" android:id="@+id/premium_guild_subscription_cancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:text="@string/nevermind" style="@style/UiKit_Material_Button_Transparent"/>
         <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@+id/premium_guild_subscription_cancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_cancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/premium_guild_subscription_uncancel_dialog.xml b/app/src/main/res/layout/premium_guild_subscription_uncancel_dialog.xml
index 920dbae2f5..3d143c7c81 100644
--- a/app/src/main/res/layout/premium_guild_subscription_uncancel_dialog.xml
+++ b/app/src/main/res/layout/premium_guild_subscription_uncancel_dialog.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/premium_guild_subscription_uncancel_header" android:padding="16dp" android:text="@string/premium_guild_subscription_inventory_uncancel_title_mobile" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/premium_guild_subscription_uncancel_header" android:padding="16dp" android:text="@string/premium_guild_subscription_inventory_uncancel_title_mobile" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
     <com.discord.app.AppViewFlipper android:id="@+id/premium_guild_subscription_uncancel_flipper" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952481_uikit_progressbar_white"/>
-        <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-            <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <ImageView android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_uncancel_image" android:visibility="gone" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:src="@drawable/img_nitro_uncancel" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:id="@+id/premium_guild_subscription_uncancel_body" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_inventory_uncancel_description" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textColor="@color/status_red_500" android:id="@+id/premium_guild_subscription_uncancel_error" android:visibility="gone" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscription_inventory_uncancel_error" style="@style/res_2131952563_uikit_textview"/>
+        <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ProgressBar_White"/>
+        <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+            <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <ImageView android:layout_gravity="center_horizontal" android:id="@+id/premium_guild_subscription_uncancel_image" android:visibility="gone" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:src="@drawable/img_nitro_uncancel" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+                    <TextView android:id="@+id/premium_guild_subscription_uncancel_body" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_inventory_uncancel_description" style="@style/UiKit_TextView"/>
+                    <TextView android:textColor="@color/status_red_500" android:id="@+id/premium_guild_subscription_uncancel_error" android:visibility="gone" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscription_inventory_uncancel_error" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
     </com.discord.app.AppViewFlipper>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorInteractiveActive" android:id="@+id/premium_guild_subscription_uncancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:text="@string/nevermind" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorInteractiveActive" android:id="@+id/premium_guild_subscription_uncancel_nevermind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:text="@string/nevermind" style="@style/UiKit_Material_Button_Transparent"/>
         <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@+id/premium_guild_subscription_uncancel_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:lb_progress_color="@color/white" app:lb_text="@string/premium_guild_subscription_inventory_uncancel_button_mobile" app:lb_text_color="@drawable/button_text_color_primary_100"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/premium_guild_subscription_upsell_dialog.xml b/app/src/main/res/layout/premium_guild_subscription_upsell_dialog.xml
index 2d4da6126e..662c9a369c 100644
--- a/app/src/main/res/layout/premium_guild_subscription_upsell_dialog.xml
+++ b/app/src/main/res/layout/premium_guild_subscription_upsell_dialog.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ImageView android:id="@+id/premium_guild_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952449_uikit_imageview_clickable"/>
-    <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" android:src="@drawable/img_premium_guild_upsell_cta_boost" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:layout_marginBottom="16dp" android:text="@string/premium_guild_subscription_upsell_modal_header" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-        <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_threads_archive" app:drawableStartCompat="@drawable/ic_clock_24dp" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_threads_private" app:drawableStartCompat="@drawable/ic_thread_locked" app:drawableTint="#83ddc5" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_stickers" app:drawableStartCompat="@drawable/ic_sticker_icon_24dp" app:drawableTint="#d09aff" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_other" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" app:drawableTint="#8ea1e1" style="@style/res_2131952578_uikit_textview_perk_small"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <ImageView android:id="@+id/premium_guild_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView_Clickable"/>
+    <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" android:src="@drawable/img_premium_guild_upsell_cta_boost" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:layout_marginBottom="16dp" android:text="@string/premium_guild_subscription_upsell_modal_header" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+        <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_threads_archive" app:drawableStartCompat="@drawable/ic_clock_24dp" style="@style/UiKit_TextView_Perk_Small"/>
+                <View style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_threads_private" app:drawableStartCompat="@drawable/ic_thread_locked" app:drawableTint="#83ddc5" style="@style/UiKit_TextView_Perk_Small"/>
+                <View style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_stickers" app:drawableStartCompat="@drawable/ic_sticker_icon_24dp" app:drawableTint="#d09aff" style="@style/UiKit_TextView_Perk_Small"/>
+                <View style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/premium_guild_subscription_upsell_perks_other" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" app:drawableTint="#8ea1e1" style="@style/UiKit_TextView_Perk_Small"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-        <LinearLayout android:layout_marginBottom="32dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.button.MaterialButton android:id="@+id/premium_guild_upsell_subscribe_button" android:layout_marginBottom="16dp" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/res_2131952458_uikit_material_button"/>
-            <TextView android:id="@+id/premium_guild_upsell_close_button" android:text="@string/close" style="@style/res_2131952413_uikit_dialog_textview_dismiss"/>
+        <LinearLayout android:layout_marginBottom="32dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.button.MaterialButton android:id="@+id/premium_guild_upsell_subscribe_button" android:layout_marginBottom="16dp" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit_Material_Button"/>
+            <TextView android:id="@+id/premium_guild_upsell_close_button" android:text="@string/close" style="@style/UiKit_Dialog_TextView_Dismiss"/>
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/premium_guild_upgrade_dialog.xml b/app/src/main/res/layout/premium_guild_upgrade_dialog.xml
index 9598833575..340af9bf27 100644
--- a/app/src/main/res/layout/premium_guild_upgrade_dialog.xml
+++ b/app/src/main/res/layout/premium_guild_upgrade_dialog.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ImageView android:id="@+id/premium_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952449_uikit_imageview_clickable"/>
-    <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" android:src="@drawable/img_premium_guild_subscription_purchase_header_tier_2" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_upsell_description" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-        <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/premium_upsell_server_perk" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/premium_upsell_feature_chat_perks_mobile" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/premium_upsell_feature_stream" app:drawableStartCompat="@drawable/ic_nitro_perk_stream_24dp" app:drawableTint="?attr/primary_300" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/premium_upsell_feature_upload" app:drawableStartCompat="@drawable/ic_upload_24dp" app:drawableTint="#fed648" style="@style/res_2131952578_uikit_textview_perk_small"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <ImageView android:id="@+id/premium_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView_Clickable"/>
+    <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" android:src="@drawable/img_premium_guild_subscription_purchase_header_tier_2" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_upsell_description" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+        <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/premium_upsell_server_perk" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/UiKit_TextView_Perk_Small"/>
+                <View android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/premium_upsell_feature_chat_perks_mobile" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" style="@style/UiKit_TextView_Perk_Small"/>
+                <View android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/premium_upsell_feature_stream" app:drawableStartCompat="@drawable/ic_nitro_perk_stream_24dp" app:drawableTint="?attr/primary_300" style="@style/UiKit_TextView_Perk_Small"/>
+                <View android:background="?attr/colorBackgroundPrimary" android:layout_height="1dp" style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/premium_upsell_feature_upload" app:drawableStartCompat="@drawable/ic_upload_24dp" app:drawableTint="#fed648" style="@style/UiKit_TextView_Perk_Small"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-        <LinearLayout android:layout_marginBottom="32dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.button.MaterialButton android:id="@+id/upgrade_button" android:layout_marginBottom="16dp" android:text="@string/premium_upsell_upgrade" style="@style/res_2131952409_uikit_dialog_button"/>
-            <TextView android:id="@+id/continue_button" android:text="@string/premium_upsell_continue_to_boosts" style="@style/res_2131952413_uikit_dialog_textview_dismiss"/>
+        <LinearLayout android:layout_marginBottom="32dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.button.MaterialButton android:id="@+id/upgrade_button" android:layout_marginBottom="16dp" android:text="@string/premium_upsell_upgrade" style="@style/UiKit_Dialog_Button"/>
+            <TextView android:id="@+id/continue_button" android:text="@string/premium_upsell_continue_to_boosts" style="@style/UiKit_Dialog_TextView_Dismiss"/>
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/premium_sticker_upsell_dialog.xml b/app/src/main/res/layout/premium_sticker_upsell_dialog.xml
index 20b95afce7..a31e87c0a4 100644
--- a/app/src/main/res/layout/premium_sticker_upsell_dialog.xml
+++ b/app/src/main/res/layout/premium_sticker_upsell_dialog.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ImageView android:id="@+id/premium_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952449_uikit_imageview_clickable"/>
-    <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" android:src="@drawable/img_premium_stickers_upsell" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_upsell_description" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-        <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_2_upsell_perk_quantity" app:drawableStartCompat="@drawable/ic_sticker_icon_24dp" app:drawableTint="#9cb8ff" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_2_upsell_perk_custom" app:drawableStartCompat="@drawable/ic_sticker_icon_24dp" app:drawableTint="#d09aff" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:id="@+id/premium_upsell_perk_boosts" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/res_2131952578_uikit_textview_perk_small"/>
-                <View style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_2_upsell_perk_premium_subscription" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" app:drawableTint="#83ddc5" style="@style/res_2131952578_uikit_textview_perk_small"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <ImageView android:id="@+id/premium_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView_Clickable"/>
+    <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" android:src="@drawable/img_premium_stickers_upsell" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_upsell_description" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+        <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_2_upsell_perk_quantity" app:drawableStartCompat="@drawable/ic_sticker_icon_24dp" app:drawableTint="#9cb8ff" style="@style/UiKit_TextView_Perk_Small"/>
+                <View style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_2_upsell_perk_custom" app:drawableStartCompat="@drawable/ic_sticker_icon_24dp" app:drawableTint="#d09aff" style="@style/UiKit_TextView_Perk_Small"/>
+                <View style="@style/UiKit_Divider"/>
+                <TextView android:id="@+id/premium_upsell_perk_boosts" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/UiKit_TextView_Perk_Small"/>
+                <View style="@style/UiKit_Divider"/>
+                <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_2_upsell_perk_premium_subscription" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" app:drawableTint="#83ddc5" style="@style/UiKit_TextView_Perk_Small"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-        <LinearLayout android:layout_marginBottom="32dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.button.MaterialButton android:id="@+id/subscribe_button" android:layout_marginBottom="16dp" android:text="@string/learn_more" style="@style/res_2131952460_uikit_material_button_green"/>
-            <TextView android:id="@+id/close_button" android:text="@string/close" style="@style/res_2131952413_uikit_dialog_textview_dismiss"/>
+        <LinearLayout android:layout_marginBottom="32dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.button.MaterialButton android:id="@+id/subscribe_button" android:layout_marginBottom="16dp" android:text="@string/learn_more" style="@style/UiKit_Material_Button_Green"/>
+            <TextView android:id="@+id/close_button" android:text="@string/close" style="@style/UiKit_Dialog_TextView_Dismiss"/>
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/premium_upgrade_yearly_dialog.xml b/app/src/main/res/layout/premium_upgrade_yearly_dialog.xml
index 2b0122fd50..7aaaf4fb82 100644
--- a/app/src/main/res/layout/premium_upgrade_yearly_dialog.xml
+++ b/app/src/main/res/layout/premium_upgrade_yearly_dialog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <ImageView android:layout_gravity="center" android:id="@+id/premium_upsell_header" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/premium_upsell_yearly_title" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="8dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_upsell_yearly_description" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-    <LinearLayout android:layout_marginBottom="32dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.google.android.material.button.MaterialButton android:id="@+id/purchase_premium_yearly" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="16dp" android:backgroundTint="@color/status_green_600" style="@style/res_2131952409_uikit_dialog_button"/>
-        <TextView android:id="@+id/purchase_premium_monthly" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:text="@string/premium_upsell_continue_to_monthly" style="@style/res_2131952413_uikit_dialog_textview_dismiss"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <ImageView android:layout_gravity="center" android:id="@+id/premium_upsell_header" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/premium_upsell_yearly_title" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_upsell_yearly_description" android:layout_width="match_parent" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="32dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+    <LinearLayout android:layout_marginBottom="32dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.google.android.material.button.MaterialButton android:id="@+id/purchase_premium_yearly" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginBottom="16dp" android:backgroundTint="@color/status_green_600" style="@style/UiKit_Dialog_Button"/>
+        <TextView android:id="@+id/purchase_premium_monthly" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:text="@string/premium_upsell_continue_to_monthly" style="@style/UiKit_Dialog_TextView_Dismiss"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/private_channel_side_bar_actions_view.xml b/app/src/main/res/layout/private_channel_side_bar_actions_view.xml
index 2cebfcdbb6..0fede2c07a 100644
--- a/app/src/main/res/layout/private_channel_side_bar_actions_view.xml
+++ b/app/src/main/res/layout/private_channel_side_bar_actions_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_call" android:text="@string/call" android:drawableTop="@drawable/ic_call_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_video" android:text="@string/video" android:drawableTop="@drawable/ic_videocam_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_sidebar_notifications_off_dark_24dp" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_search" android:text="@string/search" android:drawableTop="@drawable/ic_sidebar_search_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131951906_channelsidebaractions_actions_button"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_call" android:text="@string/call" android:drawableTop="@drawable/ic_call_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/ChannelSideBarActions_Actions_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_video" android:text="@string/video" android:drawableTop="@drawable/ic_videocam_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/ChannelSideBarActions_Actions_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_sidebar_notifications_off_dark_24dp" style="@style/ChannelSideBarActions_Actions_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/private_channel_sidebar_actions_search" android:text="@string/search" android:drawableTop="@drawable/ic_sidebar_search_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/ChannelSideBarActions_Actions_Button"/>
 </merge>
diff --git a/app/src/main/res/layout/publish_message_dialog.xml b/app/src/main/res/layout/publish_message_dialog.xml
index c00def42b8..ecdbdc12ed 100644
--- a/app/src/main/res/layout/publish_message_dialog.xml
+++ b/app/src/main/res/layout/publish_message_dialog.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/notice_header" android:padding="16dp" android:layout_width="match_parent" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/notice_header" android:padding="16dp" android:layout_width="match_parent" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:gravity="center" android:id="@+id/notice_body_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_gravity="start" android:id="@+id/notice_body_text" android:padding="16dp" android:layout_width="match_parent" android:textAlignment="textStart" style="@style/res_2131952563_uikit_textview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:gravity="center" android:id="@+id/notice_body_container" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_gravity="start" android:id="@+id/notice_body_text" android:padding="16dp" android:layout_width="match_parent" android:textAlignment="textStart" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
         <com.google.android.material.button.MaterialButton android:id="@+id/notice_cancel" android:text="@string/cancel" style="?attr/buttonBarNegativeButtonStyle"/>
         <com.google.android.material.button.MaterialButton android:id="@+id/notice_ok" android:text="@string/okay" android:layout_marginStart="8dp" style="?attr/buttonBarPositiveButtonStyle"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/reaction_view.xml b/app/src/main/res/layout/reaction_view.xml
index fe34d5c846..e177c5fcd5 100644
--- a/app/src/main/res/layout/reaction_view.xml
+++ b/app/src/main/res/layout/reaction_view.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:background="?attr/theme_chat_reaction_background" android:paddingLeft="6dp" android:paddingRight="6dp" android:layout_width="wrap_content" android:layout_height="26dp" android:minWidth="40dp">
     <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/emoji_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="4dp"/>
     <TextSwitcher android:id="@+id/counter_text_switcher" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="4dp">
-        <TextView android:textColor="?attr/theme_chat_reaction_text_color" android:gravity="center_vertical" android:id="@+id/counter_text_1" android:layout_height="match_parent" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textColor="?attr/theme_chat_reaction_text_color" android:gravity="center_vertical" android:id="@+id/counter_text_2" android:layout_height="match_parent" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <TextView android:textColor="?attr/theme_chat_reaction_text_color" android:gravity="center_vertical" android:id="@+id/counter_text_1" android:layout_height="match_parent" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textColor="?attr/theme_chat_reaction_text_color" android:gravity="center_vertical" android:id="@+id/counter_text_2" android:layout_height="match_parent" style="@style/UiKit_TextView_Semibold"/>
     </TextSwitcher>
 </LinearLayout>
diff --git a/app/src/main/res/layout/search_input_view.xml b/app/src/main/res/layout/search_input_view.xml
index ea50c6850b..bf38f04767 100644
--- a/app/src/main/res/layout/search_input_view.xml
+++ b/app/src/main/res/layout/search_input_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.google.android.material.textfield.TextInputEditText android:id="@+id/search_input_edit_text" android:background="@null" android:layout_width="0dp" android:hint="@string/instant_invite_friends" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/search_clear" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952486_uikit_searchinput"/>
-    <ImageView android:id="@+id/search_clear" android:src="@drawable/ic_search_16dp" android:contentDescription="@string/reset" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorTextMuted" style="@style/res_2131952487_uikit_searchinputclear"/>
+    <com.google.android.material.textfield.TextInputEditText android:id="@+id/search_input_edit_text" android:background="@null" android:layout_width="0dp" android:hint="@string/instant_invite_friends" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/search_clear" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_SearchInput"/>
+    <ImageView android:id="@+id/search_clear" android:src="@drawable/ic_search_16dp" android:contentDescription="@string/reset" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorTextMuted" style="@style/UiKit_SearchInputClear"/>
 </merge>
diff --git a/app/src/main/res/layout/selectable_list_item.xml b/app/src/main/res/layout/selectable_list_item.xml
index dbcd07565c..599a648fd6 100644
--- a/app/src/main/res/layout/selectable_list_item.xml
+++ b/app/src/main/res/layout/selectable_list_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView style="@style/res_2131952451_uikit_listitem"/>
+<TextView style="@style/UiKit_ListItem"/>
diff --git a/app/src/main/res/layout/server_settings_members_role_spinner_item.xml b/app/src/main/res/layout/server_settings_members_role_spinner_item.xml
index c9dbc5ac6a..5ff32cf5da 100644
--- a/app/src/main/res/layout/server_settings_members_role_spinner_item.xml
+++ b/app/src/main/res/layout/server_settings_members_role_spinner_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textColor="@color/primary_500" android:id="@+id/role_spinner_item_textview" android:background="?attr/selectableItemBackground" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textColor="@color/primary_500" android:id="@+id/role_spinner_item_textview" android:background="?attr/selectableItemBackground" android:singleLine="true" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/server_settings_members_role_spinner_item_open.xml b/app/src/main/res/layout/server_settings_members_role_spinner_item_open.xml
index a4080ddbc6..c4147ee477 100644
--- a/app/src/main/res/layout/server_settings_members_role_spinner_item_open.xml
+++ b/app/src/main/res/layout/server_settings_members_role_spinner_item_open.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/role_spinner_item_textview" android:background="?attr/selectableItemBackground" android:padding="10dp" android:layout_width="match_parent" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/role_spinner_item_textview" android:background="?attr/selectableItemBackground" android:padding="10dp" android:layout_width="match_parent" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/settings_channel_list_category_item.xml b/app/src/main/res/layout/settings_channel_list_category_item.xml
index e4c9b93871..dc41d9a893 100644
--- a/app/src/main/res/layout/settings_channel_list_category_item.xml
+++ b/app/src/main/res/layout/settings_channel_list_category_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <TextView android:id="@+id/settings_channel_list_category_item_text" android:textAllCaps="true" android:layout_marginStart="16dp" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <ImageView android:id="@+id/settings_channel_list_category_item_drag" android:src="?attr/ic_drag_handle" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <TextView android:id="@+id/settings_channel_list_category_item_text" android:textAllCaps="true" android:layout_marginStart="16dp" style="@style/UiKit_TextView_Semibold"/>
+    <ImageView android:id="@+id/settings_channel_list_category_item_drag" android:src="?attr/ic_drag_handle" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/settings_channel_list_item.xml b/app/src/main/res/layout/settings_channel_list_item.xml
index 0c8785aa0f..7ea8429905 100644
--- a/app/src/main/res/layout/settings_channel_list_item.xml
+++ b/app/src/main/res/layout/settings_channel_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/UiKit_ViewGroup_RelativeLayout">
     <View android:id="@+id/settings_channel_list_item_selected_overlay" android:background="@color/grey_1_alpha_60" android:visibility="visible" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <ImageView android:id="@+id/settings_channel_list_item_hash" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_channel_text" android:layout_centerVertical="true" android:contentDescription="@string/text_channel" android:layout_marginStart="28dp" app:tint="?attr/colorTextNormal" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/settings_channel_list_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toStartOf="@+id/settings_channel_list_item_drag" android:layout_toEndOf="@+id/settings_channel_list_item_hash" style="@style/res_2131952563_uikit_textview"/>
-    <ImageView android:id="@+id/settings_channel_list_item_drag" android:src="?attr/ic_drag_handle" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
+    <ImageView android:id="@+id/settings_channel_list_item_hash" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_channel_text" android:layout_centerVertical="true" android:contentDescription="@string/text_channel" android:layout_marginStart="28dp" app:tint="?attr/colorTextNormal" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/settings_channel_list_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toStartOf="@+id/settings_channel_list_item_drag" android:layout_toEndOf="@+id/settings_channel_list_item_hash" style="@style/UiKit_TextView"/>
+    <ImageView android:id="@+id/settings_channel_list_item_drag" android:src="?attr/ic_drag_handle" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/shiny_button.xml b/app/src/main/res/layout/shiny_button.xml
index 8b2c6599be..59e451f59f 100644
--- a/app/src/main/res/layout/shiny_button.xml
+++ b/app/src/main/res/layout/shiny_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <TextView android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textColor="@color/white" android:gravity="center" android:id="@+id/text" android:background="@drawable/drawable_button_green" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:drawablePadding="4dp" android:layout_centerInParent="true" app:drawableStartCompat="@drawable/ic_nitro_badge_white"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Button" android:textColor="@color/white" android:gravity="center" android:id="@+id/text" android:background="@drawable/drawable_button_green" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:drawablePadding="4dp" android:layout_centerInParent="true" app:drawableStartCompat="@drawable/ic_nitro_badge_white"/>
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/premium_shine" android:layout_alignTop="@+id/text" android:layout_alignBottom="@+id/text" android:layout_centerHorizontal="true" android:paddingEnd="24dp" android:layout_alignStart="@+id/text" android:layout_alignEnd="@+id/text"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/simple_confirmation_dialog.xml b/app/src/main/res/layout/simple_confirmation_dialog.xml
index c4fe0a8ca5..bdcecdf578 100644
--- a/app/src/main/res/layout/simple_confirmation_dialog.xml
+++ b/app/src/main/res/layout/simple_confirmation_dialog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/simple_confirmation_dialog_title" android:padding="16dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/simple_confirmation_dialog_title" android:padding="16dp" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <TextView android:id="@+id/simple_confirmation_dialog_description" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_200" android:id="@+id/simple_confirmation_dialog_negative" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/simple_confirmation_dialog_positive" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/leave_server" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:id="@+id/simple_confirmation_dialog_description" android:paddingTop="8dp" android:layout_marginBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_200" android:id="@+id/simple_confirmation_dialog_negative" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/simple_confirmation_dialog_positive" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/leave_server" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/simple_member_list_item.xml b/app/src/main/res/layout/simple_member_list_item.xml
index 1b022a1bc6..00efacda50 100644
--- a/app/src/main/res/layout/simple_member_list_item.xml
+++ b/app/src/main/res/layout/simple_member_list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/member_list_item_avatar" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:layout_gravity="center_vertical" android:id="@+id/member_list_item_name" android:layout_marginStart="16dp" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/member_list_item_avatar" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/Avatar_Standard"/>
+    <TextView android:layout_gravity="center_vertical" android:id="@+id/member_list_item_name" android:layout_marginStart="16dp" style="@style/UiKit_TextView_Large_SingleLine"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/simple_role_list_item.xml b/app/src/main/res/layout/simple_role_list_item.xml
index 78cc283e43..c45d280bc5 100644
--- a/app/src/main/res/layout/simple_role_list_item.xml
+++ b/app/src/main/res/layout/simple_role_list_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:id="@+id/server_settings_role_item_name" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:singleLine="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:id="@+id/server_settings_role_item_name" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:singleLine="true" style="@style/UiKit_TextView_Semibold"/>
diff --git a/app/src/main/res/layout/single_value_prop_premium_upsell_dialog.xml b/app/src/main/res/layout/single_value_prop_premium_upsell_dialog.xml
index e9e47863b8..d05d005e0b 100644
--- a/app/src/main/res/layout/single_value_prop_premium_upsell_dialog.xml
+++ b/app/src/main/res/layout/single_value_prop_premium_upsell_dialog.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="312dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout app:layout_constraintBottom_toTopOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="312dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout app:layout_constraintBottom_toTopOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
         <View android:id="@+id/transparent_space" android:layout_width="match_parent" android:layout_height="64dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
         <View android:id="@+id/content_background" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/transparent_space"/>
-        <ImageView android:layout_gravity="center_horizontal" android:id="@+id/value_prop_image" android:layout_width="224dp" android:layout_height="154dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_header_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/upsell_header_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="24dp" android:fontFamily="@font/ginto_medium" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/upsell_body_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/value_prop_image" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:id="@+id/upsell_body_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="4dp" android:layout_marginBottom="24dp" android:textAlignment="center" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/upsell_header_text" style="@style/res_2131952563_uikit_textview"/>
+        <ImageView android:layout_gravity="center_horizontal" android:id="@+id/value_prop_image" android:layout_width="224dp" android:layout_height="154dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_header_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/upsell_header_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="24dp" android:fontFamily="@font/ginto_medium" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/upsell_body_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/value_prop_image" style="@style/UiKit_TextView"/>
+        <TextView android:id="@+id/upsell_body_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="4dp" android:layout_marginBottom="24dp" android:textAlignment="center" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/upsell_header_text" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <LinearLayout android:id="@+id/button_container" style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/close_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <LinearLayout android:id="@+id/button_container" style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/close_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit_Material_Button_Transparent"/>
         <com.discord.views.premium.ShinyButton android:id="@+id/get_premium_button" android:layout_width="wrap_content" android:layout_height="40dp" app:sb_drawable_start="@drawable/ic_nitro_badge_white" app:sb_text="@string/premium_settings_get"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_header_item.xml b/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_header_item.xml
index 8a4dfc2519..6007ce5340 100644
--- a/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_header_item.xml
+++ b/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_header_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-    <com.google.android.material.textview.MaterialTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_blocked_users_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952519_uikit_stage_title"/>
-    <com.google.android.material.textview.MaterialTextView android:gravity="center" android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:text="@string/form_placeholder_username" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952518_uikit_stage_subtitle_description"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
+    <com.google.android.material.textview.MaterialTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_blocked_users_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_Title"/>
+    <com.google.android.material.textview.MaterialTextView android:gravity="center" android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:text="@string/form_placeholder_username" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_Stage_Subtitle_Description"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_item.xml b/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_item.xml
index 35d684e959..68a28512b8 100644
--- a/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_item.xml
+++ b/app/src/main/res/layout/stage_audience_blocked_bottom_sheet_item.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_blocked_member_container" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_blocked_member_container" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <com.discord.views.CutoutView android:id="@+id/stage_channel_blocked_member_icon_container" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cutout_badgeInset="6dp" app:cutout_badgeRadius="14dp" app:cutout_style="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_blocked_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/res_2131951674_avatar_large"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_blocked_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/Avatar_Large"/>
     </com.discord.views.CutoutView>
     <ImageView android:id="@+id/stage_channel_blocked_member_speaker" android:padding="4dp" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_mic_white_18dp" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintCircle="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintCircleAngle="@integer/uikit_badge_angle" app:layout_constraintCircleRadius="26dp" app:tint="@color/white"/>
-    <TextView android:id="@+id/stage_channel_blocked_member_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_member_speaker" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
-    <TextView android:textColor="@color/status_red_500" android:id="@+id/stage_channel_blocked_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/blocked" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintStart_toStartOf="@+id/stage_channel_blocked_member_name" app:layout_constraintTop_toBottomOf="@+id/stage_channel_blocked_member_name" style="@style/res_2131952574_uikit_textview_medium"/>
-    <View android:id="@+id/stage_channel_blocked_text_divider" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toStartOf="@+id/stage_channel_blocked_text_speaker" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_text" style="@style/res_2131952418_uikit_divider_vertical"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/stage_channel_blocked_text_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speaker" app:layout_constraintBaseline_toBaselineOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text_divider" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <TextView android:id="@+id/stage_channel_blocked_member_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_member_speaker" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Medium_SingleLine"/>
+    <TextView android:textColor="@color/status_red_500" android:id="@+id/stage_channel_blocked_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/blocked" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_member_icon_container" app:layout_constraintStart_toStartOf="@+id/stage_channel_blocked_member_name" app:layout_constraintTop_toBottomOf="@+id/stage_channel_blocked_member_name" style="@style/UiKit_TextView_Medium"/>
+    <View android:id="@+id/stage_channel_blocked_text_divider" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toStartOf="@+id/stage_channel_blocked_text_speaker" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text" app:layout_constraintTop_toTopOf="@+id/stage_channel_blocked_text" style="@style/UiKit_Divider_Vertical"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/stage_channel_blocked_text_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speaker" app:layout_constraintBaseline_toBaselineOf="@+id/stage_channel_blocked_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_blocked_text_divider" style="@style/UiKit_TextView_Subtext"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/stage_raised_hands_item_user.xml b/app/src/main/res/layout/stage_raised_hands_item_user.xml
index 34eaa292ec..46f274a14e 100644
--- a/app/src/main/res/layout/stage_raised_hands_item_user.xml
+++ b/app/src/main/res/layout/stage_raised_hands_item_user.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_raised_hands_item_user_avatar" android:layout_width="@dimen/avatar_size_raised_hands" android:layout_height="@dimen/avatar_size_raised_hands" app:actualImageScaleType="2" app:fadeDuration="0" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:roundAsCircle="true"/>
-    <TextView android:id="@+id/stage_raised_hands_item_user_name" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/stage_raised_hands_item_role" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toTopOf="@+id/stage_raised_hands_item_user_avatar" style="@style/res_2131952515_uikit_stage_listitem_title"/>
-    <TextView android:id="@+id/stage_raised_hands_item_role" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toBottomOf="@+id/stage_raised_hands_item_user_name" style="@style/res_2131952514_uikit_stage_listitem_subtitle"/>
-    <ImageView android:id="@+id/stage_raised_hands_item_invite_button" android:src="@drawable/ic_check_white_24dp" android:contentDescription="@string/stage_speak_invite_send" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_dismiss_button" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952512_uikit_stage_clickablebutton"/>
-    <ImageView android:id="@+id/stage_raised_hands_item_dismiss_button" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/dismiss" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952512_uikit_stage_clickablebutton"/>
+    <TextView android:id="@+id/stage_raised_hands_item_user_name" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/stage_raised_hands_item_role" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toTopOf="@+id/stage_raised_hands_item_user_avatar" style="@style/UiKit_Stage_ListItem_Title"/>
+    <TextView android:id="@+id/stage_raised_hands_item_role" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_invite_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/stage_raised_hands_item_user_avatar" app:layout_constraintTop_toBottomOf="@+id/stage_raised_hands_item_user_name" style="@style/UiKit_Stage_ListItem_Subtitle"/>
+    <ImageView android:id="@+id/stage_raised_hands_item_invite_button" android:src="@drawable/ic_check_white_24dp" android:contentDescription="@string/stage_speak_invite_send" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/stage_raised_hands_item_dismiss_button" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_ClickableButton"/>
+    <ImageView android:id="@+id/stage_raised_hands_item_dismiss_button" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/dismiss" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_ClickableButton"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/sticker_pack_details_dialog.xml b/app/src/main/res/layout/sticker_pack_details_dialog.xml
index d4bd4389ac..99e4698738 100644
--- a/app/src/main/res/layout/sticker_pack_details_dialog.xml
+++ b/app/src/main/res/layout/sticker_pack_details_dialog.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/sticker_pack_details_close" android:text="@string/close" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_pack_details_pack" android:layout_alignParentTop="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/sticker_pack_details_close" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-        <LinearLayout android:layout_marginTop="8dp" android:layout_below="@+id/sticker_pack_details_pack" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_pack_details_animated" android:visibility="gone" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_pack_details_premium" android:visibility="gone" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_pack_details_limited" android:visibility="gone" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/sticker_pack_details_close" android:text="@string/close" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" style="@style/UiKit_TextView"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_pack_details_pack" android:layout_alignParentTop="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/sticker_pack_details_close" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+        <LinearLayout android:layout_marginTop="8dp" android:layout_below="@+id/sticker_pack_details_pack" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_pack_details_animated" android:visibility="gone" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_pack_details_premium" android:visibility="gone" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_pack_details_limited" android:visibility="gone" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </RelativeLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/sticker_premium_upsell_dialog.xml b/app/src/main/res/layout/sticker_premium_upsell_dialog.xml
index e51443b884..dc2fbac8b0 100644
--- a/app/src/main/res/layout/sticker_premium_upsell_dialog.xml
+++ b/app/src/main/res/layout/sticker_premium_upsell_dialog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:layout_gravity="center" android:layout_height="80dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/premium_upsell_global_stickers_title_mobile" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/sticker_premium_upsell_description" android:layout_marginBottom="32dp" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/sticker_premium_upsell_subscribe_button" android:layout_marginBottom="16dp" android:text="@string/sticker_picker_premium_empty_state_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952460_uikit_material_button_green"/>
-        <TextView android:id="@+id/sticker_premium_upsell_close_button" android:layout_marginBottom="32dp" android:text="@string/close" style="@style/res_2131952413_uikit_dialog_textview_dismiss"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:layout_gravity="center" android:layout_height="80dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/premium_upsell_global_stickers_title_mobile" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/sticker_premium_upsell_description" android:layout_marginBottom="32dp" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/sticker_premium_upsell_subscribe_button" android:layout_marginBottom="16dp" android:text="@string/sticker_picker_premium_empty_state_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green"/>
+        <TextView android:id="@+id/sticker_premium_upsell_close_button" android:layout_marginBottom="32dp" android:text="@string/close" style="@style/UiKit_Dialog_TextView_Dismiss"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/sticker_store_header_item.xml b/app/src/main/res/layout/sticker_store_header_item.xml
index e7faa79519..efea179d93 100644
--- a/app/src/main/res/layout/sticker_store_header_item.xml
+++ b/app/src/main/res/layout/sticker_store_header_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="12dp" android:paddingTop="8dp" android:paddingRight="12dp" android:paddingBottom="12dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.google.android.material.chip.Chip android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/sticker_store_header_item_new" android:visibility="gone" android:text="@string/_new" android:layout_marginEnd="4dp" style="@style/res_2131952401_uikit_chip_new"/>
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_store_header_item_title" style="@style/res_2131952563_uikit_textview"/>
-        <RelativeLayout android:layout_gravity="center_vertical" android:id="@+id/sticker_store_header_item_container" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="12dp" android:paddingTop="8dp" android:paddingRight="12dp" android:paddingBottom="12dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.google.android.material.chip.Chip android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/sticker_store_header_item_new" android:visibility="gone" android:text="@string/_new" android:layout_marginEnd="4dp" style="@style/UiKit_Chip_New"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_store_header_item_title" style="@style/UiKit_TextView"/>
+        <RelativeLayout android:layout_gravity="center_vertical" android:id="@+id/sticker_store_header_item_container" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_RelativeLayout">
             <FrameLayout android:id="@+id/sticker_store_header_item_animated" android:background="?attr/primary_200_circle" android:visibility="gone" android:layout_width="16dp" android:layout_height="16dp" android:layout_centerVertical="true" android:layout_alignParentStart="true" android:backgroundTint="?attr/colorBackgroundModifierAccent">
                 <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/ic_play_arrow_24dp" app:tint="?attr/primary_300"/>
             </FrameLayout>
@@ -12,6 +12,6 @@
             </FrameLayout>
         </RelativeLayout>
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:id="@+id/sticker_store_header_item_description" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_store_header_item_subtitle" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:id="@+id/sticker_store_header_item_description" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_store_header_item_subtitle" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/stub_call_fullscreen_start_stage_event_button.xml b/app/src/main/res/layout/stub_call_fullscreen_start_stage_event_button.xml
index 3ca09408cc..2407a11108 100644
--- a/app/src/main/res/layout/stub_call_fullscreen_start_stage_event_button.xml
+++ b/app/src/main/res/layout/stub_call_fullscreen_start_stage_event_button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/bg_start_stage_event_button" android:paddingLeft="16dp" android:paddingTop="13dp" android:paddingRight="16dp" android:paddingBottom="13dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:elevation="16dp">
-    <ImageView android:id="@+id/icon" android:background="@drawable/bg_start_stage_cutout" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_channel_stage_16dp" android:scaleType="centerInside" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="@color/white" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/plus_badge" android:background="@drawable/drawable_circle_black" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_plus_dark_a60_24dp" android:scaleType="centerInside" android:layout_marginStart="16dp" android:backgroundTint="@color/white" app:layout_constraintCircle="@+id/icon" app:layout_constraintCircleAngle="45" app:layout_constraintCircleRadius="22dp" app:tint="@color/black" style="@style/res_2131952448_uikit_imageview"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952574_uikit_textview_medium"/>
+    <ImageView android:id="@+id/icon" android:background="@drawable/bg_start_stage_cutout" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_channel_stage_16dp" android:scaleType="centerInside" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="@color/white" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/plus_badge" android:background="@drawable/drawable_circle_black" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_plus_dark_a60_24dp" android:scaleType="centerInside" android:layout_marginStart="16dp" android:backgroundTint="@color/white" app:layout_constraintCircle="@+id/icon" app:layout_constraintCircleAngle="45" app:layout_constraintCircleRadius="22dp" app:tint="@color/black" style="@style/UiKit_ImageView"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Semibold"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_start_subtitle" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_TextView_Medium"/>
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_end_24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/suggested_friend_view.xml b/app/src/main/res/layout/suggested_friend_view.xml
index 3b151ca856..b27414015c 100644
--- a/app/src/main/res/layout/suggested_friend_view.xml
+++ b/app/src/main/res/layout/suggested_friend_view.xml
@@ -3,6 +3,6 @@
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/suggested_friend_avatar" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar"/>
     <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/suggested_friend_username" android:layout_width="0dp" android:layout_height="0dp" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/suggested_friend_public_name" app:layout_constraintHeight_default="1" app:layout_constraintStart_toEndOf="@+id/suggested_friend_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2"/>
     <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/suggested_friend_public_name" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="2dp" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHeight_default="1" app:layout_constraintStart_toEndOf="@+id/suggested_friend_avatar" app:layout_constraintTop_toBottomOf="@+id/suggested_friend_username"/>
-    <androidx.appcompat.widget.AppCompatImageView android:id="@+id/suggested_friend_decline" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/suggested_friend_send_request" app:layout_constraintTop_toTopOf="0" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
-    <androidx.appcompat.widget.AppCompatImageView android:id="@+id/suggested_friend_send_request" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:srcCompat="@drawable/ic_add_friend_plus" app:tint="?attr/colorInteractiveHover" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
+    <androidx.appcompat.widget.AppCompatImageView android:id="@+id/suggested_friend_decline" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/suggested_friend_send_request" app:layout_constraintTop_toTopOf="0" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/FriendsList_FriendsItem_ActionButton"/>
+    <androidx.appcompat.widget.AppCompatImageView android:id="@+id/suggested_friend_send_request" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:srcCompat="@drawable/ic_add_friend_plus" app:tint="?attr/colorInteractiveHover" style="@style/FriendsList_FriendsItem_ActionButton"/>
 </merge>
diff --git a/app/src/main/res/layout/tabs_host_bottom_navigation_view.xml b/app/src/main/res/layout/tabs_host_bottom_navigation_view.xml
index 460ebbc336..b285a9e01b 100644
--- a/app/src/main/res/layout/tabs_host_bottom_navigation_view.xml
+++ b/app/src/main/res/layout/tabs_host_bottom_navigation_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorTabsBackground" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <View android:background="?attr/colorTabsDivider" style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout android:layout_gravity="center_horizontal" android:id="@+id/tabs_host_bottom_nav_tabs_container" android:background="?attr/colorTabsBackground" android:baselineAligned="false" android:weightSum="5" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorTabsBackground" style="@style/UiKit_ViewGroup_LinearLayout">
+    <View android:background="?attr/colorTabsDivider" style="@style/UiKit_Divider"/>
+    <LinearLayout android:layout_gravity="center_horizontal" android:id="@+id/tabs_host_bottom_nav_tabs_container" android:background="?attr/colorTabsBackground" android:baselineAligned="false" android:weightSum="5" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/tabs_host_bottom_nav_home_item" style="@style/TabsHostBottomNavItemWithNotifications">
             <ImageView android:id="@+id/tabs_host_bottom_nav_home_icon" android:src="?attr/ic_tab_home" android:contentDescription="@string/tabs_home_accessibility_label" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/TabsHostBottomNavIcon"/>
             <TextView android:id="@+id/tabs_host_bottom_nav_home_notifications_badge" app:layout_constraintCircle="@+id/tabs_host_bottom_nav_home_icon" style="@style/TabsHostBottomNavNotificationBadge"/>
diff --git a/app/src/main/res/layout/thread_browser_empty.xml b/app/src/main/res/layout/thread_browser_empty.xml
index 7971d3f887..fb75f01720 100644
--- a/app/src/main/res/layout/thread_browser_empty.xml
+++ b/app/src/main/res/layout/thread_browser_empty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/thread_browser_empty" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/thread_browser_empty" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <ImageView android:id="@+id/thread_icon" android:background="@drawable/ic_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_chat_message_white_24dp" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/thread_browser_empty_heading" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/thread_browser_empty_heading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/thread_browser_empty_state_active_header" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/thread_browser_empty_subheading" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_icon" style="@style/res_2131952565_uikit_textview_h1"/>
+    <TextView android:id="@+id/thread_browser_empty_heading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/thread_browser_empty_state_active_header" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/thread_browser_empty_subheading" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_icon" style="@style/UiKit_TextView_H1"/>
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/thread_browser_empty_subheading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/thread_browser_empty_state_subtext" android:fontFamily="?attr/font_primary_normal" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/thread_browser_empty_create_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_browser_empty_heading"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/thread_browser_empty_create_button" android:layout_width="wrap_content" android:layout_marginTop="16dp" android:text="@string/create_thread" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_browser_empty_subheading" style="@style/res_2131952458_uikit_material_button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/thread_browser_empty_create_button" android:layout_width="wrap_content" android:layout_marginTop="16dp" android:text="@string/create_thread" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_browser_empty_subheading" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/thread_browser_item_header.xml b/app/src/main/res/layout/thread_browser_item_header.xml
index c1c1bc87a4..d2db67c80a 100644
--- a/app/src/main/res/layout/thread_browser_item_header.xml
+++ b/app/src/main/res/layout/thread_browser_item_header.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/header_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:singleLine="true" android:textAllCaps="true" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952564_uikit_textview_bold"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/header_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:singleLine="true" android:textAllCaps="true" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Bold"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/thread_browser_thread_view.xml b/app/src/main/res/layout/thread_browser_thread_view.xml
index 17d586ad71..e65fb7f07e 100644
--- a/app/src/main/res/layout/thread_browser_thread_view.xml
+++ b/app/src/main/res/layout/thread_browser_thread_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/selectableItemBackground" android:paddingTop="12dp" android:paddingBottom="12dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/thread_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" app:layout_constraintEnd_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/selectableItemBackground" android:paddingTop="12dp" android:paddingBottom="12dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/thread_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" app:layout_constraintEnd_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
         <FrameLayout android:id="@+id/thread_image" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginTop="2dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_name">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/thread_avatar" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/res_2131951677_avatar_small"/>
-            <ImageView android:id="@+id/thread_icon" android:background="@drawable/drawable_circle_black" android:padding="3dp" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/ic_chat_message_white_24dp" android:contentDescription="@string/thread" android:backgroundTint="@color/primary_dark_700" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/thread_name" app:layout_constraintTop_toBottomOf="@+id/thread_name" app:tint="@color/primary_300" style="@style/res_2131951677_avatar_small"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/thread_avatar" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/Avatar_Small"/>
+            <ImageView android:id="@+id/thread_icon" android:background="@drawable/drawable_circle_black" android:padding="3dp" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/ic_chat_message_white_24dp" android:contentDescription="@string/thread" android:backgroundTint="@color/primary_dark_700" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/thread_name" app:layout_constraintTop_toBottomOf="@+id/thread_name" app:tint="@color/primary_300" style="@style/Avatar_Small"/>
         </FrameLayout>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:id="@+id/thread_message" android:layout_width="0dp" android:layout_height="wrap_content" android:singleLine="true" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/thread_timestamp_separator" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toEndOf="@+id/thread_image" app:layout_constraintTop_toBottomOf="@+id/thread_name" app:layout_constraintWidth_default="1" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorBackgroundAccent" android:ellipsize="end" android:id="@+id/thread_timestamp_separator" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="•" android:singleLine="true" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/thread_timestamp" app:layout_constraintStart_toEndOf="@+id/thread_message" app:layout_constraintTop_toBottomOf="@+id/thread_name" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:id="@+id/thread_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_timestamp_separator" app:layout_constraintTop_toBottomOf="@+id/thread_name" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:id="@+id/thread_message" android:layout_width="0dp" android:layout_height="wrap_content" android:singleLine="true" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/thread_timestamp_separator" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toEndOf="@+id/thread_image" app:layout_constraintTop_toBottomOf="@+id/thread_name" app:layout_constraintWidth_default="1" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorBackgroundAccent" android:ellipsize="end" android:id="@+id/thread_timestamp_separator" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="•" android:singleLine="true" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/thread_timestamp" app:layout_constraintStart_toEndOf="@+id/thread_message" app:layout_constraintTop_toBottomOf="@+id/thread_name" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:id="@+id/thread_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_timestamp_separator" app:layout_constraintTop_toBottomOf="@+id/thread_name" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
diff --git a/app/src/main/res/layout/user_actions_dialog.xml b/app/src/main/res/layout/user_actions_dialog.xml
index 2b1e76482b..ee1c44d00c 100644
--- a/app/src/main/res/layout/user_actions_dialog.xml
+++ b/app/src/main/res/layout/user_actions_dialog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" android:minWidth="328dp" style="@style/res_2131952411_uikit_dialog_container">
-    <LinearLayout android:background="?attr/primary_700" android:padding="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_actions_dialog_avatar" android:layout_marginEnd="16dp" app:roundWithOverlayColor="?attr/primary_700" style="@style/res_2131951676_avatar_medium"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" android:minWidth="328dp" style="@style/UiKit_Dialog_Container">
+    <LinearLayout android:background="?attr/primary_700" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_actions_dialog_avatar" android:layout_marginEnd="16dp" app:roundWithOverlayColor="?attr/primary_700" style="@style/Avatar_Medium"/>
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/user_actions_dialog_user_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="?attr/font_primary_semibold"/>
     </LinearLayout>
-    <TextView android:id="@+id/user_actions_dialog_block_item" android:text="@string/block" app:drawableStartCompat="?attr/ic_user_actions_block" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_actions_dialog_unblock_item" android:text="@string/unblock" app:drawableStartCompat="?attr/ic_user_actions_unblock" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_actions_dialog_remove_friend_item" android:text="@string/remove_friend" app:drawableStartCompat="?attr/ic_user_actions_remove_friend" style="@style/res_2131952453_uikit_listitem_icon"/>
+    <TextView android:id="@+id/user_actions_dialog_block_item" android:text="@string/block" app:drawableStartCompat="?attr/ic_user_actions_block" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_actions_dialog_unblock_item" android:text="@string/unblock" app:drawableStartCompat="?attr/ic_user_actions_unblock" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_actions_dialog_remove_friend_item" android:text="@string/remove_friend" app:drawableStartCompat="?attr/ic_user_actions_remove_friend" style="@style/UiKit_ListItem_Icon"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/user_avatar_presence_view.xml b/app/src/main/res/layout/user_avatar_presence_view.xml
index 87253b5949..2583ec97bd 100644
--- a/app/src/main/res/layout/user_avatar_presence_view.xml
+++ b/app/src/main/res/layout/user_avatar_presence_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/user_avatar_presence_container" android:layout_width="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/user_avatar_presence_container" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
     <FrameLayout android:id="@+id/avatar_container" android:layout_width="wrap_content" android:layout_height="wrap_content">
         <ImageView android:layout_gravity="center" android:id="@+id/avatar_cutout" android:layout_width="0dp" android:layout_height="0dp" android:src="@drawable/drawable_circle_transparent"/>
         <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/avatar" android:background="@drawable/drawable_circle_transparent" android:layout_width="wrap_content" android:layout_height="wrap_content" app:actualImageScaleType="2" app:placeholderImage="?attr/asset_default_avatar_80dp" app:roundWithOverlayColor="?attr/primary_700"/>
diff --git a/app/src/main/res/layout/user_profile_admin_view.xml b/app/src/main/res/layout/user_profile_admin_view.xml
index e41bb469b3..d65ce0d41f 100644
--- a/app/src/main/res/layout/user_profile_admin_view.xml
+++ b/app/src/main/res/layout/user_profile_admin_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/user_profile_admin_edit_member" android:visibility="gone" android:text="@string/manage_user" app:drawableStartCompat="?attr/ic_settings" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_admin_server_mute" android:visibility="gone" android:text="@string/server_voice_mute" app:drawableStartCompat="?attr/ic_mic_grey" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_admin_server_deafen" android:visibility="gone" android:text="@string/server_deafen" app:drawableStartCompat="?attr/ic_headset_grey" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_admin_server_move" android:visibility="gone" android:text="@string/move_to" app:drawableStartCompat="@drawable/ic_transfer_red_24dp" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_admin_server_disconnect" android:visibility="gone" android:text="@string/disconnect_other" app:drawableStartCompat="@drawable/ic_call_disconnect_24dp" app:drawableTint="@color/status_red" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_admin_kick" android:visibility="gone" android:text="@string/kick" app:drawableStartCompat="@drawable/ic_remove_friend_red_24dp" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_admin_ban" android:visibility="gone" android:text="@string/ban" app:drawableStartCompat="@drawable/ic_ban_red_24dp" style="@style/res_2131952453_uikit_listitem_icon"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/user_profile_admin_edit_member" android:visibility="gone" android:text="@string/manage_user" app:drawableStartCompat="?attr/ic_settings" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_admin_server_mute" android:visibility="gone" android:text="@string/server_voice_mute" app:drawableStartCompat="?attr/ic_mic_grey" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_admin_server_deafen" android:visibility="gone" android:text="@string/server_deafen" app:drawableStartCompat="?attr/ic_headset_grey" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_admin_server_move" android:visibility="gone" android:text="@string/move_to" app:drawableStartCompat="@drawable/ic_transfer_red_24dp" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_admin_server_disconnect" android:visibility="gone" android:text="@string/disconnect_other" app:drawableStartCompat="@drawable/ic_call_disconnect_24dp" app:drawableTint="@color/status_red" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_admin_kick" android:visibility="gone" android:text="@string/kick" app:drawableStartCompat="@drawable/ic_remove_friend_red_24dp" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_admin_ban" android:visibility="gone" android:text="@string/ban" app:drawableStartCompat="@drawable/ic_ban_red_24dp" style="@style/UiKit_ListItem_Icon"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/user_profile_connections_view.xml b/app/src/main/res/layout/user_profile_connections_view.xml
index ccf1cbedc9..ddef3f45fa 100644
--- a/app/src/main/res/layout/user_profile_connections_view.xml
+++ b/app/src/main/res/layout/user_profile_connections_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/user_profile_connections_mutual_guilds_item" android:background="?attr/bg_pressed_highlight" android:text="@string/mutual_guilds" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_connections_mutual_friends_item" android:background="?attr/bg_pressed_highlight" android:text="@string/mutual_friends" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_profile_connections_view_recycler" android:contentDescription="@string/connections" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/user_profile_connections_mutual_guilds_item" android:background="?attr/bg_pressed_highlight" android:text="@string/mutual_guilds" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_connections_mutual_friends_item" android:background="?attr/bg_pressed_highlight" android:text="@string/mutual_friends" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_ListItem_Icon"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_profile_connections_view_recycler" android:contentDescription="@string/connections" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/user_profile_header_badge.xml b/app/src/main/res/layout/user_profile_header_badge.xml
index 07bd2d369d..828e669452 100644
--- a/app/src/main/res/layout/user_profile_header_badge.xml
+++ b/app/src/main/res/layout/user_profile_header_badge.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/user_sheet_badge_image" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="6dp" android:layout_marginBottom="0dp" android:scaleType="fitCenter" android:layout_marginStart="6dp" android:layout_marginEnd="0dp" style="@style/res_2131952448_uikit_imageview"/>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/user_sheet_badge_image" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="6dp" android:layout_marginBottom="0dp" android:scaleType="fitCenter" android:layout_marginStart="6dp" android:layout_marginEnd="0dp" style="@style/UiKit_ImageView"/>
diff --git a/app/src/main/res/layout/user_profile_header_view.xml b/app/src/main/res/layout/user_profile_header_view.xml
index ecfc271666..bc4789ece6 100644
--- a/app/src/main/res/layout/user_profile_header_view.xml
+++ b/app/src/main/res/layout/user_profile_header_view.xml
@@ -10,10 +10,10 @@
         <ImageView android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_edit_24dp" android:scaleType="fitCenter" android:contentDescription="@string/user_settings_change_avatar_a11y_label" app:tint="?attr/colorInteractiveNormal"/>
     </androidx.cardview.widget.CardView>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/large_avatar_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="large_avatar"/>
-    <LinearLayout android:id="@+id/user_profile_header_name_wrap" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_profile_header_badges_recycler" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/large_avatar_barrier" app:layout_goneMarginEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.discord.views.UsernameView android:id="@+id/user_profile_header_primary_name" android:layout_width="wrap_content" android:layout_height="wrap_content" app:username_line_spacing_multiplier="1" app:username_singleline="false" app:username_text_appearance="@style/res_2131952534_uikit_textappearance_bold" app:username_text_size="@dimen/uikit_textsize_xxlarge"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/primary_400" android:id="@+id/user_profile_header_secondary_name" android:visibility="gone" android:singleLine="false" android:lineSpacingMultiplier="1" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/user_profile_header_custom_status" android:layout_marginTop="16dp" android:singleLine="false" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:id="@+id/user_profile_header_name_wrap" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_profile_header_badges_recycler" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/large_avatar_barrier" app:layout_goneMarginEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.discord.views.UsernameView android:id="@+id/user_profile_header_primary_name" android:layout_width="wrap_content" android:layout_height="wrap_content" app:username_line_spacing_multiplier="1" app:username_singleline="false" app:username_text_appearance="@style/UiKit_TextAppearance_Bold" app:username_text_size="@dimen/uikit_textsize_xxlarge"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/primary_400" android:id="@+id/user_profile_header_secondary_name" android:visibility="gone" android:singleLine="false" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Semibold"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/user_profile_header_custom_status" android:layout_marginTop="16dp" android:singleLine="false" style="@style/UiKit_TextView"/>
     </LinearLayout>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_profile_header_badges_recycler" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/user_profile_header_name_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toBottomOf="@+id/banner" app:layout_constraintVertical_bias="1" app:reverseLayout="true" app:stackFromEnd="true"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/user_profile_stage_actions_view.xml b/app/src/main/res/layout/user_profile_stage_actions_view.xml
index ee9eaa60a6..7ef5ad9e67 100644
--- a/app/src/main/res/layout/user_profile_stage_actions_view.xml
+++ b/app/src/main/res/layout/user_profile_stage_actions_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/user_profile_stage_invite_to_speak" android:visibility="gone" android:text="@string/stage_channel_user_invite_to_speak" app:drawableStartCompat="@drawable/ic_stage_invite_speak" style="@style/res_2131952453_uikit_listitem_icon"/>
-    <TextView android:id="@+id/user_profile_stage_move_to_audience" android:visibility="gone" android:text="@string/stage_channel_user_move_to_audience" app:drawableStartCompat="@drawable/ic_stage_move_to_audience" app:drawableTint="@color/primary_300" style="@style/res_2131952453_uikit_listitem_icon"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/user_profile_stage_invite_to_speak" android:visibility="gone" android:text="@string/stage_channel_user_invite_to_speak" app:drawableStartCompat="@drawable/ic_stage_invite_speak" style="@style/UiKit_ListItem_Icon"/>
+    <TextView android:id="@+id/user_profile_stage_move_to_audience" android:visibility="gone" android:text="@string/stage_channel_user_move_to_audience" app:drawableStartCompat="@drawable/ic_stage_move_to_audience" app:drawableTint="@color/primary_300" style="@style/UiKit_ListItem_Icon"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/user_profile_voice_settings_view.xml b/app/src/main/res/layout/user_profile_voice_settings_view.xml
index 2f08ba1492..1569248c5a 100644
--- a/app/src/main/res/layout/user_profile_voice_settings_view.xml
+++ b/app/src/main/res/layout/user_profile_voice_settings_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/user_sheet_volume_label" android:text="@string/user_profile_volume" style="@style/res_2131952451_uikit_listitem"/>
-    <com.discord.views.calls.VolumeSliderView android:id="@+id/user_sheet_volume_slider" android:paddingLeft="16dp" android:paddingRight="16dp" app:vsv_icon_tint="?attr/colorInteractiveNormal" app:vsv_max_volume="100" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/user_sheet_muted" android:text="@string/mute" style="@style/res_2131952455_uikit_listitem_switch"/>
-    <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/user_sheet_deafen" android:text="@string/deafen" style="@style/res_2131952455_uikit_listitem_switch"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/user_sheet_volume_label" android:text="@string/user_profile_volume" style="@style/UiKit_ListItem"/>
+    <com.discord.views.calls.VolumeSliderView android:id="@+id/user_sheet_volume_slider" android:paddingLeft="16dp" android:paddingRight="16dp" app:vsv_icon_tint="?attr/colorInteractiveNormal" app:vsv_max_volume="100" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal"/>
+    <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/user_sheet_muted" android:text="@string/mute" style="@style/UiKit_ListItem_Switch"/>
+    <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/user_sheet_deafen" android:text="@string/deafen" style="@style/UiKit_ListItem_Switch"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_account_credit.xml b/app/src/main/res/layout/view_account_credit.xml
index 8d6f6ac1c1..1940512cca 100644
--- a/app/src/main/res/layout/view_account_credit.xml
+++ b/app/src/main/res/layout/view_account_credit.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952589_uikit_viewgroup">
-    <ImageView android:id="@+id/credit_icon" android:layout_width="40dp" android:layout_height="40dp" android:layout_margin="16dp" android:src="@drawable/drawable_ic_nitro" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <LinearLayout android:id="@+id/credit_info_container" android:layout_width="0dp" android:layout_margin="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/credit_icon" app:layout_constraintRight_toLeftOf="@+id/credit_time" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/credit_header" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:ellipsize="end" android:id="@+id/credit_info" android:maxLines="2" style="@style/res_2131952563_uikit_textview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup">
+    <ImageView android:id="@+id/credit_icon" android:layout_width="40dp" android:layout_height="40dp" android:layout_margin="16dp" android:src="@drawable/drawable_ic_nitro" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <LinearLayout android:id="@+id/credit_info_container" android:layout_width="0dp" android:layout_margin="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/credit_icon" app:layout_constraintRight_toLeftOf="@+id/credit_time" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/credit_header" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:ellipsize="end" android:id="@+id/credit_info" android:maxLines="2" style="@style/UiKit_TextView"/>
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/credit_time" android:layout_marginEnd="16dp" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/credit_info_container" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/credit_time" android:layout_marginEnd="16dp" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/credit_info_container" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_active_subscription.xml b/app/src/main/res/layout/view_active_subscription.xml
index 807b90a251..d7dabeb850 100644
--- a/app/src/main/res/layout/view_active_subscription.xml
+++ b/app/src/main/res/layout/view_active_subscription.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952589_uikit_viewgroup">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup">
     <ImageView android:id="@+id/active_subscription_header_background" android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="fitXY" android:adjustViewBounds="true" android:importantForAccessibility="no"/>
-    <ProgressBar android:theme="@style/res_2131952481_uikit_progressbar_white" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/active_subscription_progress" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp"/>
-    <LinearLayout android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:layout_marginBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <ProgressBar android:theme="@style/UiKit_ProgressBar_White" android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/active_subscription_progress" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp"/>
+    <LinearLayout android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <ImageView android:id="@+id/active_subscription_header_icon" android:layout_width="56dp" android:layout_height="40dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp"/>
             <ImageView android:layout_gravity="center_vertical" android:id="@+id/active_subscription_header_logo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="fitStart" android:adjustViewBounds="true" android:maxHeight="40dp"/>
         </LinearLayout>
-        <TextView android:textColor="@color/white" android:id="@+id/active_subscription_header_text" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.flexbox.FlexboxLayout android:gravity="center_vertical" app:flexWrap="1" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_bg_color_selector_brand" android:id="@+id/active_subscription_top_button" android:layout_width="wrap_content" android:minHeight="40dp" android:layout_marginEnd="16dp" style="@style/res_2131952473_uikit_material_button_white"/>
-            <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_bg_color_selector_brand" android:id="@+id/active_subscription_manage_premium_guild_button" android:layout_width="wrap_content" android:minHeight="40dp" android:text="@string/premium_guild_perks_modal_manage_your_subscriptions" android:layout_marginEnd="16dp" style="@style/res_2131952473_uikit_material_button_white"/>
-            <TextView android:textColor="@color/white" android:id="@+id/active_subscription_cancel_button" android:background="?attr/selectableItemBackground" android:padding="8dp" android:text="@string/cancel" android:textAllCaps="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <TextView android:textColor="@color/white" android:id="@+id/active_subscription_header_text" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+        <com.google.android.flexbox.FlexboxLayout android:gravity="center_vertical" app:flexWrap="1" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_bg_color_selector_brand" android:id="@+id/active_subscription_top_button" android:layout_width="wrap_content" android:minHeight="40dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button_White"/>
+            <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_bg_color_selector_brand" android:id="@+id/active_subscription_manage_premium_guild_button" android:layout_width="wrap_content" android:minHeight="40dp" android:text="@string/premium_guild_perks_modal_manage_your_subscriptions" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button_White"/>
+            <TextView android:textColor="@color/white" android:id="@+id/active_subscription_cancel_button" android:background="?attr/selectableItemBackground" android:padding="8dp" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit_TextView_Semibold"/>
         </com.google.android.flexbox.FlexboxLayout>
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_add_override_item.xml b/app/src/main/res/layout/view_add_override_item.xml
index 04cdd3612d..7bc2c96770 100644
--- a/app/src/main/res/layout/view_add_override_item.xml
+++ b/app/src/main/res/layout/view_add_override_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/res_2131952421_uikit_guideline"/>
-    <ImageView android:padding="8dp" android:layout_margin="8dp" android:src="?attr/ic_plus_a60" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/category_overview_name" android:text="@string/add_channel_or_category" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/navigation_indicator" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <ImageView android:id="@+id/navigation_indicator" android:layout_margin="8dp" android:src="?attr/ic_navigate_next" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit_Guideline"/>
+    <ImageView android:padding="8dp" android:layout_margin="8dp" android:src="?attr/ic_plus_a60" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/category_overview_name" android:text="@string/add_channel_or_category" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/navigation_indicator" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <ImageView android:id="@+id/navigation_indicator" android:layout_margin="8dp" android:src="?attr/ic_navigate_next" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_appcommands_optionheading_listitem.xml b/app/src/main/res/layout/view_appcommands_optionheading_listitem.xml
index 8f38cdafd2..d300a10aee 100644
--- a/app/src/main/res/layout/view_appcommands_optionheading_listitem.xml
+++ b/app/src/main/res/layout/view_appcommands_optionheading_listitem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <View android:id="@+id/divider" android:visibility="visible" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optionheading_title" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optionheading_title" style="@style/res_2131952418_uikit_divider_vertical"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="12sp" android:textColor="?attr/colorTextMuted" android:id="@+id/appcommands_optionheading_title" android:paddingLeft="8dp" android:paddingTop="14dp" android:paddingRight="8dp" android:paddingBottom="14dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/divider" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <View android:id="@+id/divider" android:visibility="visible" android:layout_width="1dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optionheading_title" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optionheading_title" style="@style/UiKit_Divider_Vertical"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="12sp" android:textColor="?attr/colorTextMuted" android:id="@+id/appcommands_optionheading_title" android:paddingLeft="8dp" android:paddingTop="14dp" android:paddingRight="8dp" android:paddingBottom="14dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/divider" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_appcommands_optionparam_listitem.xml b/app/src/main/res/layout/view_appcommands_optionparam_listitem.xml
index 5b29bb5357..68709ccdae 100644
--- a/app/src/main/res/layout/view_appcommands_optionparam_listitem.xml
+++ b/app/src/main/res/layout/view_appcommands_optionparam_listitem.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <TextView android:id="@+id/appcommands_optiontitle_title" android:background="?attr/colorBackgroundAccent" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginTop="8dp" android:layout_marginRight="4dp" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:id="@+id/appcommands_optiontitle_title" android:background="?attr/colorBackgroundAccent" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginTop="8dp" android:layout_marginRight="4dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_appcommands_optiontitle_listitem.xml b/app/src/main/res/layout/view_appcommands_optiontitle_listitem.xml
index eba892e6fc..332e26980a 100644
--- a/app/src/main/res/layout/view_appcommands_optiontitle_listitem.xml
+++ b/app/src/main/res/layout/view_appcommands_optiontitle_listitem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/appcommands_optiontitle_avatar" android:visibility="visible" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optiontitle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optiontitle" app:placeholderImage="@drawable/ic_slash_command_24dp" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textColor="?attr/colorTextNormal" android:id="@+id/appcommands_optiontitle" android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:paddingStart="12dp" android:paddingEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/appcommands_optiontitle_avatar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/appcommands_optiontitle_avatar" android:visibility="visible" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/appcommands_optiontitle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/appcommands_optiontitle" app:placeholderImage="@drawable/ic_slash_command_24dp" style="@style/Avatar_Medium"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textColor="?attr/colorTextNormal" android:id="@+id/appcommands_optiontitle" android:paddingTop="12dp" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" android:paddingStart="12dp" android:paddingEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/appcommands_optiontitle_avatar" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_attachment_preview_item.xml b/app/src/main/res/layout/view_attachment_preview_item.xml
index 076c29cb83..d1cb3b8af4 100644
--- a/app/src/main/res/layout/view_attachment_preview_item.xml
+++ b/app/src/main/res/layout/view_attachment_preview_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="@dimen/attachment_preview_dimen" android:layout_margin="@dimen/grid_item_padding" android:adjustViewBounds="true" app:fadeDuration="@android:integer/config_shortAnimTime" app:placeholderImage="?attr/ic_flex_input_file" app:roundedCornerRadius="3dp" app:viewAspectRatio="1" style="@style/res_2131951981_flexinput_items"/>
+<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="@dimen/attachment_preview_dimen" android:layout_margin="@dimen/grid_item_padding" android:adjustViewBounds="true" app:fadeDuration="@android:integer/config_shortAnimTime" app:placeholderImage="?attr/ic_flex_input_file" app:roundedCornerRadius="3dp" app:viewAspectRatio="1" style="@style/FlexInput_Items"/>
diff --git a/app/src/main/res/layout/view_auth_invite_info.xml b/app/src/main/res/layout/view_auth_invite_info.xml
index 0ae9ddfb9c..28886e76e6 100644
--- a/app/src/main/res/layout/view_auth_invite_info.xml
+++ b/app/src/main/res/layout/view_auth_invite_info.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_RelativeLayout">
     <com.facebook.drawee.view.SimpleDraweeView android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignTop="@+id/auth_invite_info_content" android:layout_alignBottom="@+id/auth_invite_info_content" android:layout_alignStart="@+id/auth_invite_info_content" android:layout_alignEnd="@+id/auth_invite_info_content" app:roundedCornerRadius="8dp"/>
-    <LinearLayout android:id="@+id/auth_invite_info_content" android:padding="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/auth_invite_info_guild_avatar" app:roundWithOverlayColor="?attr/colorBackgroundTertiary" style="@style/res_2131951674_avatar_large"/>
-        <ImageView android:id="@+id/auth_invite_info_template_icon" android:visibility="gone" android:src="@drawable/ic_template_32dp" android:importantForAccessibility="no" app:tint="?attr/colorHeaderSecondary" style="@style/res_2131951674_avatar_large"/>
-        <LinearLayout android:layout_gravity="center_vertical" android:layout_marginStart="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_invite_info_invited_text" android:layout_marginBottom="2dp" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/auth_invite_info_guild_name" android:maxLines="1" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:id="@+id/auth_invite_info_content" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/auth_invite_info_guild_avatar" app:roundWithOverlayColor="?attr/colorBackgroundTertiary" style="@style/Avatar_Large"/>
+        <ImageView android:id="@+id/auth_invite_info_template_icon" android:visibility="gone" android:src="@drawable/ic_template_32dp" android:importantForAccessibility="no" app:tint="?attr/colorHeaderSecondary" style="@style/Avatar_Large"/>
+        <LinearLayout android:layout_gravity="center_vertical" android:layout_marginStart="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_invite_info_invited_text" android:layout_marginBottom="2dp" style="@style/UiKit_TextView"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/auth_invite_info_guild_name" android:maxLines="1" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_category_override_item.xml b/app/src/main/res/layout/view_category_override_item.xml
index 9f09bfdebb..358e4095f0 100644
--- a/app/src/main/res/layout/view_category_override_item.xml
+++ b/app/src/main/res/layout/view_category_override_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/res_2131952421_uikit_guideline"/>
-    <ImageView android:padding="8dp" android:layout_margin="8dp" android:src="?attr/ic_category" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/category_override_name" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/category_override_status" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <TextView android:textColor="?attr/primary_100" android:id="@+id/category_override_status" android:padding="4dp" android:maxLines="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/navigation_indicator" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <ImageView android:id="@+id/navigation_indicator" android:layout_margin="8dp" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit_Guideline"/>
+    <ImageView android:padding="8dp" android:layout_margin="8dp" android:src="?attr/ic_category" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/category_override_name" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/category_override_status" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <TextView android:textColor="?attr/primary_100" android:id="@+id/category_override_status" android:padding="4dp" android:maxLines="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/navigation_indicator" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <ImageView android:id="@+id/navigation_indicator" android:layout_margin="8dp" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_channel_override_item.xml b/app/src/main/res/layout/view_channel_override_item.xml
index 3855d2abf9..9df63542f4 100644
--- a/app/src/main/res/layout/view_channel_override_item.xml
+++ b/app/src/main/res/layout/view_channel_override_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/res_2131952421_uikit_guideline"/>
-    <ImageView android:padding="8dp" android:layout_margin="8dp" android:src="?attr/ic_channel_text" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/channel_override_name" app:layout_constraintBottom_toTopOf="@+id/channel_override_category_name" app:layout_constraintEnd_toStartOf="@+id/channel_override_status" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:id="@+id/channel_override_category_name" android:visibility="gone" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_override_status" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toBottomOf="@+id/channel_override_name" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
-    <TextView android:textColor="?attr/primary_100" android:id="@+id/channel_override_status" android:padding="4dp" android:maxLines="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/navigation_indicator" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <ImageView android:id="@+id/navigation_indicator" android:layout_margin="8dp" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit_Guideline"/>
+    <ImageView android:padding="8dp" android:layout_margin="8dp" android:src="?attr/ic_channel_text" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/channel_override_name" app:layout_constraintBottom_toTopOf="@+id/channel_override_category_name" app:layout_constraintEnd_toStartOf="@+id/channel_override_status" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:id="@+id/channel_override_category_name" android:visibility="gone" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_override_status" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintTop_toBottomOf="@+id/channel_override_name" style="@style/UiKit_TextView_Subtext_SingleLine"/>
+    <TextView android:textColor="?attr/primary_100" android:id="@+id/channel_override_status" android:padding="4dp" android:maxLines="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/navigation_indicator" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <ImageView android:id="@+id/navigation_indicator" android:layout_margin="8dp" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_chat_action_item.xml b/app/src/main/res/layout/view_chat_action_item.xml
index 0ce1f5188d..b1408adc92 100644
--- a/app/src/main/res/layout/view_chat_action_item.xml
+++ b/app/src/main/res/layout/view_chat_action_item.xml
@@ -2,7 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:contentPadding="16dp">
     <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent">
         <ImageView android:id="@+id/chat_action_item_image" android:layout_width="40dp" android:layout_height="40dp" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="16dp"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_vertical" android:id="@+id/chat_action_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_vertical" android:id="@+id/chat_action_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_Semibold"/>
         <ImageView android:layout_gravity="center_vertical" android:layout_width="24dp" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_right" android:importantForAccessibility="no" app:tint="?attr/colorInteractiveNormal"/>
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_chat_embed_game_invite.xml b/app/src/main/res/layout/view_chat_embed_game_invite.xml
index e04a7bacef..aded1ffb7c 100644
--- a/app/src/main/res/layout/view_chat_embed_game_invite.xml
+++ b/app/src/main/res/layout/view_chat_embed_game_invite.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_game_invite_cover_iv" android:layout_width="match_parent" android:layout_height="168dp" android:scaleType="fitCenter" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/item_game_invite_header" style="@style/res_2131952391_uikit_chat_embed_header"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:paddingBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_game_invite_cover_iv" android:layout_width="match_parent" android:layout_height="168dp" android:scaleType="fitCenter" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/item_game_invite_header" style="@style/UiKit_Chat_Embed_Header"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:paddingBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_game_invite_avatar_iv" android:layout_width="40dp" android:layout_height="40dp" app:actualImageScaleType="2" app:layout_constraintEnd_toStartOf="@+id/item_game_invite_application_name_tv" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/ic_game_icon_placeholder" app:placeholderImageScaleType="2" app:roundAsCircle="true"/>
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_game_invite_avatar_status_iv" android:visibility="gone" android:layout_width="20dp" android:layout_height="20dp" app:backgroundImage="?attr/colorBackgroundSecondary" app:layout_constraintBottom_toBottomOf="@+id/item_game_invite_avatar_iv" app:layout_constraintEnd_toEndOf="@+id/item_game_invite_avatar_iv" app:roundAsCircle="true" app:roundingBorderColor="?attr/colorBackgroundSecondary" app:roundingBorderPadding="0.5dp" app:roundingBorderWidth="2dp"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/item_game_invite_application_name_tv" android:layout_width="0dp" android:maxLines="2" android:layout_marginStart="8dp" app:layout_constraintBottom_toTopOf="@+id/item_game_invite_subtext" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_game_invite_avatar_iv" app:layout_constraintTop_toTopOf="@+id/item_game_invite_avatar_iv" style="@style/res_2131952565_uikit_textview_h1"/>
-        <TextView android:id="@+id/item_game_invite_subtext" android:layout_width="0dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/item_game_invite_barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/item_game_invite_application_name_tv" app:layout_constraintTop_toBottomOf="@+id/item_game_invite_application_name_tv" style="@style/res_2131952581_uikit_textview_subtext"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/item_game_invite_application_name_tv" android:layout_width="0dp" android:maxLines="2" android:layout_marginStart="8dp" app:layout_constraintBottom_toTopOf="@+id/item_game_invite_subtext" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_game_invite_avatar_iv" app:layout_constraintTop_toTopOf="@+id/item_game_invite_avatar_iv" style="@style/UiKit_TextView_H1"/>
+        <TextView android:id="@+id/item_game_invite_subtext" android:layout_width="0dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/item_game_invite_barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/item_game_invite_application_name_tv" app:layout_constraintTop_toBottomOf="@+id/item_game_invite_application_name_tv" style="@style/UiKit_TextView_Subtext"/>
         <androidx.constraintlayout.widget.Barrier android:id="@+id/item_game_invite_barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="item_game_invite_avatar_iv,item_game_invite_application_name_tv,item_game_invite_subtext"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_game_invite_action_btn" android:visibility="gone" android:layout_marginTop="16dp" android:text="@string/game_action_button_play" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_game_invite_barrier" app:layout_constraintVertical_bias="1" style="@style/res_2131952460_uikit_material_button_green"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/item_game_invite_recycler" android:layout_width="0dp" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="16dp" android:layout_marginStart="@dimen/uikit_textsize_large" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_game_invite_action_btn" app:layout_constraintTop_toBottomOf="@+id/item_game_invite_barrier" app:layout_goneMarginStart="0dp" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_game_invite_action_btn" android:visibility="gone" android:layout_marginTop="16dp" android:text="@string/game_action_button_play" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_game_invite_barrier" app:layout_constraintVertical_bias="1" style="@style/UiKit_Material_Button_Green"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/item_game_invite_recycler" android:layout_width="0dp" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="16dp" android:layout_marginStart="@dimen/uikit_textsize_large" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_game_invite_action_btn" app:layout_constraintTop_toBottomOf="@+id/item_game_invite_barrier" app:layout_goneMarginStart="0dp" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_chat_upload.xml b/app/src/main/res/layout/view_chat_upload.xml
index 5b3efed81a..e3609e55a9 100644
--- a/app/src/main/res/layout/view_chat_upload.xml
+++ b/app/src/main/res/layout/view_chat_upload.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/file_image" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/display_name" app:layout_constraintEnd_toStartOf="@+id/display_name" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/display_name" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/display_name"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="middle" android:id="@+id/display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/subtitle_text" app:layout_constraintLeft_toRightOf="@+id/file_image" app:layout_constraintRight_toLeftOf="@+id/subtitle_text" app:layout_constraintStart_toEndOf="@+id/file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="middle" android:id="@+id/display_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/subtitle_text" app:layout_constraintLeft_toRightOf="@+id/file_image" app:layout_constraintRight_toLeftOf="@+id/subtitle_text" app:layout_constraintStart_toEndOf="@+id/file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Semibold"/>
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/display_name" app:layout_constraintEnd_toStartOf="@+id/failed_alert_icon" app:layout_constraintLeft_toRightOf="@+id/display_name" app:layout_constraintRight_toLeftOf="@+id/failed_alert_icon" app:layout_constraintStart_toEndOf="@+id/display_name"/>
     <ImageView android:id="@+id/failed_alert_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_alert_circle_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/display_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/display_name"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_chat_upload_list.xml b/app/src/main/res/layout/view_chat_upload_list.xml
index 29515eeaab..b639dd67cb 100644
--- a/app/src/main/res/layout/view_chat_upload_list.xml
+++ b/app/src/main/res/layout/view_chat_upload_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/chat_embed_bg" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/chat_embed_bg" style="@style/UiKit_ViewGroup_LinearLayout">
     <com.discord.views.FailedUploadView android:id="@+id/chat_upload_1" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
     <com.discord.views.FailedUploadView android:id="@+id/chat_upload_2" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
     <com.discord.views.FailedUploadView android:id="@+id/chat_upload_3" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/view_checkable_role_list_item.xml b/app/src/main/res/layout/view_checkable_role_list_item.xml
index b3679194ed..fd099fdb1d 100644
--- a/app/src/main/res/layout/view_checkable_role_list_item.xml
+++ b/app/src/main/res/layout/view_checkable_role_list_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.CheckedSetting xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/role_item_checked_setting" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+<com.discord.views.CheckedSetting xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/role_item_checked_setting" style="@style/UiKit_CheckedSetting_Themed"/>
diff --git a/app/src/main/res/layout/view_chip.xml b/app/src/main/res/layout/view_chip.xml
index c9d2e7947e..2a0d7fcdcd 100644
--- a/app/src/main/res/layout/view_chip.xml
+++ b/app/src/main/res/layout/view_chip.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="52dp" android:paddingStart="12dp" android:paddingEnd="12dp">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chip_image" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:id="@+id/chip_text" android:singleLine="true" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chip_image" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chip_image" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Medium"/>
+    <TextView android:id="@+id/chip_text" android:singleLine="true" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chip_image" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_chip_deprecated.xml b/app/src/main/res/layout/view_chip_deprecated.xml
index e096d7574f..27bd8be299 100644
--- a/app/src/main/res/layout/view_chip_deprecated.xml
+++ b/app/src/main/res/layout/view_chip_deprecated.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="24dp" android:paddingStart="0dp" android:paddingEnd="12dp">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chip_image" android:padding="2dp" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:gravity="center_vertical" android:id="@+id/chip_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="5dp" android:layout_toEndOf="@+id/chip_image" style="@style/res_2131952563_uikit_textview"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chip_image" android:padding="2dp" style="@style/Avatar_Medium"/>
+    <TextView android:gravity="center_vertical" android:id="@+id/chip_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="5dp" android:layout_toEndOf="@+id/chip_image" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_code_verification.xml b/app/src/main/res/layout/view_code_verification.xml
index 196086724e..4120d4d540 100644
--- a/app/src/main/res/layout/view_code_verification.xml
+++ b/app/src/main/res/layout/view_code_verification.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" style="@style/res_2131952587_uikit_user_phone_verify_digits">
-    <TextView android:id="@+id/verify_char_1" style="@style/res_2131952588_uikit_user_verify_char"/>
-    <TextView android:id="@+id/verify_char_2" style="@style/res_2131952588_uikit_user_verify_char"/>
-    <TextView android:id="@+id/verify_char_3" style="@style/res_2131952588_uikit_user_verify_char"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" style="@style/UiKit_User_Phone_Verify_Digits">
+    <TextView android:id="@+id/verify_char_1" style="@style/UiKit_User_Verify_Char"/>
+    <TextView android:id="@+id/verify_char_2" style="@style/UiKit_User_Verify_Char"/>
+    <TextView android:id="@+id/verify_char_3" style="@style/UiKit_User_Verify_Char"/>
     <Space android:layout_width="16dp" android:layout_height="0dp"/>
-    <TextView android:id="@+id/verify_char_4" style="@style/res_2131952588_uikit_user_verify_char"/>
-    <TextView android:id="@+id/verify_char_5" style="@style/res_2131952588_uikit_user_verify_char"/>
-    <TextView android:id="@+id/verify_char_6" style="@style/res_2131952588_uikit_user_verify_char"/>
+    <TextView android:id="@+id/verify_char_4" style="@style/UiKit_User_Verify_Char"/>
+    <TextView android:id="@+id/verify_char_5" style="@style/UiKit_User_Verify_Char"/>
+    <TextView android:id="@+id/verify_char_6" style="@style/UiKit_User_Verify_Char"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_community_get_started_header.xml b/app/src/main/res/layout/view_community_get_started_header.xml
index 83f5d98218..e6265fe8c6 100644
--- a/app/src/main/res/layout/view_community_get_started_header.xml
+++ b/app/src/main/res/layout/view_community_get_started_header.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" app:cardElevation="0dp">
-    <LinearLayout android:background="?attr/colorBackgroundTertiary" android:padding="4dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:background="?attr/colorBackgroundTertiary" android:padding="4dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageView android:id="@+id/community_get_started_header_icon" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginEnd="4dp"/>
-        <TextView android:gravity="center_vertical" android:id="@+id/community_get_started_header_icon_text" android:layout_width="wrap_content" android:layout_height="match_parent" android:drawablePadding="4dp" style="@style/res_2131952569_uikit_textview_h6"/>
+        <TextView android:gravity="center_vertical" android:id="@+id/community_get_started_header_icon_text" android:layout_width="wrap_content" android:layout_height="match_parent" android:drawablePadding="4dp" style="@style/UiKit_TextView_H6"/>
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_community_get_started_information.xml b/app/src/main/res/layout/view_community_get_started_information.xml
index 9abff72e35..3ecd416852 100644
--- a/app/src/main/res/layout/view_community_get_started_information.xml
+++ b/app/src/main/res/layout/view_community_get_started_information.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/toolbarColor" app:cardCornerRadius="8dp" app:cardElevation="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/toolbarColor" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <androidx.constraintlayout.widget.Guideline android:id="@+id/community_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
+        <androidx.constraintlayout.widget.Guideline android:id="@+id/community_guideline" style="@style/UiKit_Chat_Guideline"/>
         <RelativeLayout android:id="@+id/community_list_adapter_item_text_icon" android:layout_width="40dp" android:layout_height="40dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@+id/community_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/community_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/community_list_adapter_item_text_header">
             <ImageView android:id="@+id/community_list_adapter_item_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/drawable_ic_community_setting_analytics_dark" android:layout_centerInParent="true"/>
         </RelativeLayout>
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/community_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/community_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/community_guideline" app:layout_constraintTop_toTopOf="@+id/community_list_adapter_item_text_icon">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/community_list_adapter_item_text_name" android:fontFamily="?attr/font_display_bold" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/community_list_adapter_item_text_header" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/community_list_adapter_item_text_name" android:fontFamily="?attr/font_display_bold" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/community_list_adapter_item_text_header" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/community_list_adapter_item_description" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginEnd="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/community_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/community_guideline" app:layout_constraintTop_toBottomOf="@+id/community_list_adapter_item_text_header" style="@style/res_2131952394_uikit_chat_text"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/community_list_adapter_item_description" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginEnd="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/community_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/community_guideline" app:layout_constraintTop_toBottomOf="@+id/community_list_adapter_item_text_header" style="@style/UiKit_Chat_Text"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_connection_guild_integration.xml b/app/src/main/res/layout/view_connection_guild_integration.xml
index e4b1e7179f..29bd1c19a2 100644
--- a/app/src/main/res/layout/view_connection_guild_integration.xml
+++ b/app/src/main/res/layout/view_connection_guild_integration.xml
@@ -2,9 +2,9 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:cardCornerRadius="4dp" app:cardElevation="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_width="match_parent" android:layout_height="wrap_content">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/widget_connection_integration_guild_icon" android:layout_width="32dp" android:layout_height="32dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/widget_connection_integration_join_guild" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/widget_connection_integration_join_guild" app:roundAsCircle="true"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/widget_connection_integration_guild_name" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_handle" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toTopOf="@+id/widget_connection_integration_join_guild" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/widget_connection_integration_guild_handle" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="@+id/widget_connection_integration_join_guild" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_guild_name" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/widget_connection_integration_join_guild" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/join" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_join_error" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952467_uikit_material_button_secondary"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorError" android:id="@+id/widget_connection_integration_guild_join_error" android:visibility="visible" android:layout_marginBottom="8dp" android:text="@string/error_occurred_try_again" android:lineSpacingMultiplier="1" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/widget_connection_integration_guild_name" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_join_guild" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/widget_connection_integration_guild_name" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_handle" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toTopOf="@+id/widget_connection_integration_join_guild" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/widget_connection_integration_guild_handle" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="@+id/widget_connection_integration_join_guild" app:layout_constraintStart_toEndOf="@+id/widget_connection_integration_guild_icon" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_guild_name" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/widget_connection_integration_join_guild" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/join" app:layout_constraintBottom_toTopOf="@+id/widget_connection_integration_guild_join_error" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Material_Button_Secondary"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorError" android:id="@+id/widget_connection_integration_guild_join_error" android:visibility="visible" android:layout_marginBottom="8dp" android:text="@string/error_occurred_try_again" android:lineSpacingMultiplier="1" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/widget_connection_integration_guild_name" app:layout_constraintTop_toBottomOf="@+id/widget_connection_integration_join_guild" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/view_dialog_confirmation.xml b/app/src/main/res/layout/view_dialog_confirmation.xml
index ccb94c6f27..e784807372 100644
--- a/app/src/main/res/layout/view_dialog_confirmation.xml
+++ b/app/src/main/res/layout/view_dialog_confirmation.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:layout_width="match_parent" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:id="@+id/view_dialog_confirmation_text" android:text="@string/sample_confirmation" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/view_dialog_confirmation_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/view_dialog_confirmation_confirm" android:text="@string/confirm" style="@style/res_2131952459_uikit_material_button_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:layout_width="match_parent" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Divider"/>
+    <TextView android:id="@+id/view_dialog_confirmation_text" android:text="@string/sample_confirmation" style="@style/UiKit_Settings_Item_SubText"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/view_dialog_confirmation_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/view_dialog_confirmation_confirm" android:text="@string/confirm" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_discovery_stage_card_body.xml b/app/src/main/res/layout/view_discovery_stage_card_body.xml
index 126753b365..c917f655af 100644
--- a/app/src/main/res/layout/view_discovery_stage_card_body.xml
+++ b/app/src/main/res/layout/view_discovery_stage_card_body.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <FrameLayout android:id="@+id/stage_discovery_guild_icon_wrap" android:layout_width="wrap_content" android:layout_height="20dp" app:layout_constraintBottom_toTopOf="@+id/stage_discovery_stage_name" app:layout_constraintEnd_toStartOf="@+id/stage_discovery_guild_name" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_discovery_guild_icon" app:fadeDuration="50" app:roundedCornerRadius="4dp" style="@style/res_2131952524_uikit_stagediscoveryavatar"/>
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/stage_discovery_guild_icon_text" android:background="@drawable/drawable_discovery_card_icon_bg_4dp_rounded" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_width="wrap_content" android:layout_height="20dp" android:minWidth="20dp" style="@style/res_2131952563_uikit_textview"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_discovery_guild_icon" app:fadeDuration="50" app:roundedCornerRadius="4dp" style="@style/UiKit_StageDiscoveryAvatar"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/stage_discovery_guild_icon_text" android:background="@drawable/drawable_discovery_card_icon_bg_4dp_rounded" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_width="wrap_content" android:layout_height="20dp" android:minWidth="20dp" style="@style/UiKit_TextView"/>
     </FrameLayout>
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_discovery_guild_name" android:layout_width="wrap_content" android:layout_height="20dp" android:drawablePadding="4dp" android:layout_marginStart="12dp" android:layout_marginEnd="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toStartOf="@+id/stage_discovery_badge_barrier" app:layout_constraintStart_toEndOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_discovery_guild_name" android:layout_width="wrap_content" android:layout_height="20dp" android:drawablePadding="4dp" android:layout_marginStart="12dp" android:layout_marginEnd="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toStartOf="@+id/stage_discovery_badge_barrier" app:layout_constraintStart_toEndOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Medium_SingleLine"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/stage_discovery_badge_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="5" app:constraint_referenced_ids="stage_discovery_audience_badge"/>
-    <LinearLayout android:id="@+id/stage_discovery_audience_badge" android:background="@drawable/drawable_discovery_card_icon_bg_12dp_rounded" android:paddingLeft="8dp" android:paddingTop="1dp" android:paddingRight="8dp" android:paddingBottom="1dp" android:layout_width="wrap_content" android:layout_height="20dp" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_discovery_badge_barrier" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:id="@+id/stage_discovery_audience_badge" android:background="@drawable/drawable_discovery_card_icon_bg_12dp_rounded" android:paddingLeft="8dp" android:paddingTop="1dp" android:paddingRight="8dp" android:paddingBottom="1dp" android:layout_width="wrap_content" android:layout_height="20dp" app:layout_constraintBottom_toBottomOf="@+id/stage_discovery_guild_icon_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_discovery_badge_barrier" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageView android:layout_gravity="center" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_headset_24dp" android:layout_marginEnd="6dp" app:tint="?attr/primary_300"/>
-        <TextView android:textColor="?attr/primary_300" android:layout_gravity="center" android:id="@+id/stage_discovery_audience_badge_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952574_uikit_textview_medium"/>
+        <TextView android:textColor="?attr/primary_300" android:layout_gravity="center" android:id="@+id/stage_discovery_audience_badge_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_Medium"/>
     </LinearLayout>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/primary_000" android:ellipsize="end" android:id="@+id/stage_discovery_stage_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:maxLines="2" app:layout_constraintBottom_toTopOf="@+id/stage_discovery_speakers_view" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_guild_icon_wrap" style="@style/res_2131952570_uikit_textview_large"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/primary_000" android:ellipsize="end" android:id="@+id/stage_discovery_stage_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:maxLines="2" app:layout_constraintBottom_toTopOf="@+id/stage_discovery_speakers_view" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_guild_icon_wrap" style="@style/UiKit_TextView_Large"/>
     <com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView android:id="@+id/stage_discovery_speakers_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginBottom="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_stage_name"/>
 </merge>
diff --git a/app/src/main/res/layout/view_discovery_stage_card_controls.xml b/app/src/main/res/layout/view_discovery_stage_card_controls.xml
index c66d3e7a31..9c2bb4b66d 100644
--- a/app/src/main/res/layout/view_discovery_stage_card_controls.xml
+++ b/app/src/main/res/layout/view_discovery_stage_card_controls.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/discovery_control_audio_icon" android:layout_width="18dp" android:layout_height="wrap_content" android:src="@drawable/ic_headset_24dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toTopOf="@+id/discovery_control_exit_quietly" app:layout_constraintEnd_toStartOf="@+id/discovery_control_joined_as" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="@color/status_green_600"/>
-    <TextView android:textColor="@color/status_green_600" android:id="@+id/discovery_control_joined_as" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_discovery_audience_join_notice" app:layout_constraintBottom_toBottomOf="@+id/discovery_control_audio_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/discovery_control_audio_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/discovery_control_exit_quietly" android:layout_width="0dp" android:layout_marginTop="4dp" android:text="@string/audience_disconnect" android:layout_marginEnd="4dp" app:layout_constraintEnd_toStartOf="@+id/discovery_control_open_stage" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_control_audio_icon" style="@style/res_2131952467_uikit_material_button_secondary"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/discovery_control_open_stage" android:layout_width="0dp" android:layout_marginTop="4dp" android:text="@string/stage_discovery_card_open_stage" android:layout_marginStart="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/discovery_control_exit_quietly" app:layout_constraintTop_toBottomOf="@+id/discovery_control_audio_icon" style="@style/res_2131952460_uikit_material_button_green"/>
+    <TextView android:textColor="@color/status_green_600" android:id="@+id/discovery_control_joined_as" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_discovery_audience_join_notice" app:layout_constraintBottom_toBottomOf="@+id/discovery_control_audio_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/discovery_control_audio_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/discovery_control_exit_quietly" android:layout_width="0dp" android:layout_marginTop="4dp" android:text="@string/audience_disconnect" android:layout_marginEnd="4dp" app:layout_constraintEnd_toStartOf="@+id/discovery_control_open_stage" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_control_audio_icon" style="@style/UiKit_Material_Button_Secondary"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/discovery_control_open_stage" android:layout_width="0dp" android:layout_marginTop="4dp" android:text="@string/stage_discovery_card_open_stage" android:layout_marginStart="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/discovery_control_exit_quietly" app:layout_constraintTop_toBottomOf="@+id/discovery_control_audio_icon" style="@style/UiKit_Material_Button_Green"/>
 </merge>
diff --git a/app/src/main/res/layout/view_discovery_stage_card_top_hat.xml b/app/src/main/res/layout/view_discovery_stage_card_top_hat.xml
index 2fbbefca9f..ec9f378cef 100644
--- a/app/src/main/res/layout/view_discovery_stage_card_top_hat.xml
+++ b/app/src/main/res/layout/view_discovery_stage_card_top_hat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/discovery_stage_card_top_hat_icon" android:layout_marginEnd="8dp" app:fadeDuration="50" style="@style/res_2131952525_uikit_stagediscoveryavatar_circle"/>
-    <TextView android:textColor="?attr/primary_300" android:layout_gravity="center" android:id="@+id/discovery_stage_card_top_hat_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/discovery_stage_card_top_hat_icon" android:layout_marginEnd="8dp" app:fadeDuration="50" style="@style/UiKit_StageDiscoveryAvatar_Circle"/>
+    <TextView android:textColor="?attr/primary_300" android:layout_gravity="center" android:id="@+id/discovery_stage_card_top_hat_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_Medium_SingleLine"/>
 </merge>
diff --git a/app/src/main/res/layout/view_experiment_override.xml b/app/src/main/res/layout/view_experiment_override.xml
index 5b5cdd91c4..ae5755f7e3 100644
--- a/app/src/main/res/layout/view_experiment_override.xml
+++ b/app/src/main/res/layout/view_experiment_override.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp">
-    <TextView android:id="@+id/experiment_override_experiment_name" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952567_uikit_textview_h2"/>
-    <TextView android:id="@+id/experiment_override_experiment_api_name" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toBottomOf="@+id/experiment_override_experiment_name" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <TextView android:id="@+id/experiment_override_bucket_descriptions" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" app:layout_constrainedHeight="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toBottomOf="@+id/experiment_override_experiment_api_name" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:id="@+id/experiment_override_experiment_name" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_H2"/>
+    <TextView android:id="@+id/experiment_override_experiment_api_name" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toBottomOf="@+id/experiment_override_experiment_name" style="@style/UiKit_TextView_Subtext"/>
+    <TextView android:id="@+id/experiment_override_bucket_descriptions" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" app:layout_constrainedHeight="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toBottomOf="@+id/experiment_override_experiment_api_name" style="@style/UiKit_TextView"/>
     <com.google.android.material.card.MaterialCardView android:id="@+id/experiment_override_buckets_spinner_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:cardBackgroundColor="?attr/colorBackgroundFloating" app:cardCornerRadius="4dp" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952741_widget_materialcomponents_cardview">
         <Spinner android:id="@+id/experiment_override_buckets_spinner" android:layout_width="wrap_content" android:layout_height="wrap_content" android:dropDownSelector="@drawable/button_brand_500" android:popupBackground="?attr/colorBackgroundFloating" android:dropDownWidth="100dp" android:spinnerMode="dropdown" android:layout_marginStart="8dp"/>
     </com.google.android.material.card.MaterialCardView>
-    <TextView android:id="@+id/experiment_override_clear" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="0dp" android:text="Clear Override" app:layout_constrainedWidth="true" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/experiment_override_buckets_spinner_container" style="@style/res_2131952572_uikit_textview_link"/>
+    <TextView android:id="@+id/experiment_override_clear" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="0dp" android:text="Clear Override" app:layout_constrainedWidth="true" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/experiment_override_buckets_spinner_container" style="@style/UiKit_TextView_Link"/>
 </merge>
diff --git a/app/src/main/res/layout/view_file_item.xml b/app/src/main/res/layout/view_file_item.xml
index 41ed93e53e..345f6de4f5 100644
--- a/app/src/main/res/layout/view_file_item.xml
+++ b/app/src/main/res/layout/view_file_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content" android:animateLayoutChanges="true" style="@style/res_2131951988_flexinput_items_file">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/thumb_iv" android:layout_margin="4dp" android:layout_marginTop="8dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toStartOf="@+id/file_name_tv" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/file_name_tv" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951989_flexinput_items_file_image"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content" android:animateLayoutChanges="true" style="@style/FlexInput_Items_File">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/thumb_iv" android:layout_margin="4dp" android:layout_marginTop="8dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toStartOf="@+id/file_name_tv" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/file_name_tv" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/FlexInput_Items_File_Image"/>
     <ImageView android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/type_iv" android:layout_width="@dimen/file_type_icon_dimen" android:layout_height="@dimen/file_type_icon_dimen" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/thumb_iv" app:layout_constraintEnd_toEndOf="@+id/thumb_iv" app:layout_constraintRight_toRightOf="@+id/thumb_iv" app:tint="?attr/flexInputIconColor"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/file_name_tv" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:layout_marginBottom="4dp" android:maxLines="1" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/selection_indicator" app:layout_constraintLeft_toRightOf="@+id/thumb_iv" app:layout_constraintRight_toLeftOf="@+id/selection_indicator" app:layout_constraintStart_toEndOf="@+id/thumb_iv" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951990_flexinput_items_file_name"/>
-    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/file_subtitle_tv" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/file_name_tv" app:layout_constraintLeft_toLeftOf="@+id/file_name_tv" app:layout_constraintRight_toRightOf="@+id/file_name_tv" app:layout_constraintStart_toStartOf="@+id/file_name_tv" app:layout_constraintTop_toBottomOf="@+id/file_name_tv" style="@style/res_2131951992_flexinput_items_file_subtitle"/>
-    <ImageView android:id="@+id/selection_indicator" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintLeft_toRightOf="@+id/file_name_tv" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/file_name_tv" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951991_flexinput_items_file_selection"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/file_name_tv" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:layout_marginBottom="4dp" android:maxLines="1" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/selection_indicator" app:layout_constraintLeft_toRightOf="@+id/thumb_iv" app:layout_constraintRight_toLeftOf="@+id/selection_indicator" app:layout_constraintStart_toEndOf="@+id/thumb_iv" app:layout_constraintTop_toTopOf="0" style="@style/FlexInput_Items_File_Name"/>
+    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/file_subtitle_tv" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/file_name_tv" app:layout_constraintLeft_toLeftOf="@+id/file_name_tv" app:layout_constraintRight_toRightOf="@+id/file_name_tv" app:layout_constraintStart_toStartOf="@+id/file_name_tv" app:layout_constraintTop_toBottomOf="@+id/file_name_tv" style="@style/FlexInput_Items_File_Subtitle"/>
+    <ImageView android:id="@+id/selection_indicator" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintLeft_toRightOf="@+id/file_name_tv" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/file_name_tv" app:layout_constraintTop_toTopOf="0" style="@style/FlexInput_Items_File_Selection"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_gift_entitlement_list_item.xml b/app/src/main/res/layout/view_gift_entitlement_list_item.xml
index 357102c633..0ab8f1afee 100644
--- a/app/src/main/res/layout/view_gift_entitlement_list_item.xml
+++ b/app/src/main/res/layout/view_gift_entitlement_list_item.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/gift_entitlement_container" android:background="?attr/primary_630_bg" style="@style/res_2131952589_uikit_viewgroup">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/gift_entitlement_container" android:background="?attr/primary_630_bg" style="@style/UiKit_ViewGroup">
     <View android:layout_gravity="bottom" android:id="@+id/gift_entitlement_divider" android:background="?attr/primary_700" android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp"/>
     <com.discord.app.AppViewFlipper android:id="@+id/gift_entitlement_flipper" android:layout_width="match_parent" android:layout_height="wrap_content" android:measureAllChildren="false">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <RelativeLayout android:id="@+id/gift_entitlement_code_container" android:background="?attr/primary_660_bg_outline" android:paddingStart="8dp" style="@style/res_2131952589_uikit_viewgroup">
-                <TextView android:textColor="?attr/primary_000" android:ellipsize="end" android:id="@+id/gift_entitlement_code" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-                <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/gift_entitlement_copy" android:layout_marginRight="6dp" android:minWidth="0dp" android:text="@string/copy" android:layout_centerVertical="true" android:textAllCaps="true" android:layout_alignParentEnd="true" android:backgroundTint="@color/uikit_btn_bg_color_selector_brand" style="@style/res_2131952459_uikit_material_button_fit"/>
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <RelativeLayout android:id="@+id/gift_entitlement_code_container" android:background="?attr/primary_660_bg_outline" android:paddingStart="8dp" style="@style/UiKit_ViewGroup">
+                <TextView android:textColor="?attr/primary_000" android:ellipsize="end" android:id="@+id/gift_entitlement_code" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+                <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextAppearance_Button" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/gift_entitlement_copy" android:layout_marginRight="6dp" android:minWidth="0dp" android:text="@string/copy" android:layout_centerVertical="true" android:textAllCaps="true" android:layout_alignParentEnd="true" android:backgroundTint="@color/uikit_btn_bg_color_selector_brand" style="@style/UiKit_Material_Button_Fit"/>
             </RelativeLayout>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/primary_400" android:id="@+id/gift_entitlement_revoke" android:layout_marginTop="8dp" android:layout_marginBottom="12dp" style="@style/res_2131952563_uikit_textview"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/primary_400" android:id="@+id/gift_entitlement_revoke" android:layout_marginTop="8dp" android:layout_marginBottom="12dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <RelativeLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952589_uikit_viewgroup">
-            <com.google.android.material.button.MaterialButton android:id="@+id/gift_entitlement_generate" android:text="@string/gift_inventory_generate_link_ios" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/res_2131952459_uikit_material_button_fit"/>
-            <TextView android:text="@string/gift_inventory_generate_help" android:layout_centerInParent="true" android:layout_marginEnd="@dimen/avatar_size_medium" android:layout_toStartOf="@+id/gift_entitlement_generate" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
+        <RelativeLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup">
+            <com.google.android.material.button.MaterialButton android:id="@+id/gift_entitlement_generate" android:text="@string/gift_inventory_generate_link_ios" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit_Material_Button_Fit"/>
+            <TextView android:text="@string/gift_inventory_generate_help" android:layout_centerInParent="true" android:layout_marginEnd="@dimen/avatar_size_medium" android:layout_toStartOf="@+id/gift_entitlement_generate" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
         </RelativeLayout>
     </com.discord.app.AppViewFlipper>
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml b/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml
index e15092d8a7..d0b0280bd5 100644
--- a/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml
+++ b/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml
@@ -2,9 +2,9 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout android:padding="16dp" android:layout_width="match_parent" android:layout_height="match_parent">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/giftPromoImage" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginTop="4dp" android:importantForAccessibility="no" app:actualImageScaleType="2" app:backgroundImage="?attr/colorPromoLogoBackground" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:roundWithOverlayColor="?attr/colorBackgroundSecondary" app:roundedCornerRadius="4dp"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/giftPromoTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/giftPromoButton" app:layout_constraintStart_toEndOf="@+id/giftPromoImage" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/giftPromoDescription" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="@+id/giftPromoTitle" app:layout_constraintStart_toStartOf="@+id/giftPromoTitle" app:layout_constraintTop_toBottomOf="@+id/giftPromoTitle" style="@style/res_2131952574_uikit_textview_medium"/>
-        <TextView android:id="@+id/giftPromoMoreDetails" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/more_details" app:layout_constraintEnd_toEndOf="@+id/giftPromoTitle" app:layout_constraintStart_toStartOf="@+id/giftPromoTitle" app:layout_constraintTop_toBottomOf="@+id/giftPromoDescription" style="@style/res_2131952572_uikit_textview_link"/>
-        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/giftPromoButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/promotion_card_action_claim" android:insetTop="0dp" android:insetBottom="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952458_uikit_material_button"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/giftPromoTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/giftPromoButton" app:layout_constraintStart_toEndOf="@+id/giftPromoImage" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/giftPromoDescription" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="@+id/giftPromoTitle" app:layout_constraintStart_toStartOf="@+id/giftPromoTitle" app:layout_constraintTop_toBottomOf="@+id/giftPromoTitle" style="@style/UiKit_TextView_Medium"/>
+        <TextView android:id="@+id/giftPromoMoreDetails" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/more_details" app:layout_constraintEnd_toEndOf="@+id/giftPromoTitle" app:layout_constraintStart_toStartOf="@+id/giftPromoTitle" app:layout_constraintTop_toBottomOf="@+id/giftPromoDescription" style="@style/UiKit_TextView_Link"/>
+        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/giftPromoButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/promotion_card_action_claim" android:insetTop="0dp" android:insetBottom="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Material_Button"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/view_gift_sku_list_item.xml b/app/src/main/res/layout/view_gift_sku_list_item.xml
index 425d089163..192b1efe7a 100644
--- a/app/src/main/res/layout/view_gift_sku_list_item.xml
+++ b/app/src/main/res/layout/view_gift_sku_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginTop="16dp" app:cardBackgroundColor="?attr/primary_660" app:cardCornerRadius="4dp" style="@style/res_2131952589_uikit_viewgroup">
-    <RelativeLayout android:padding="8dp" style="@style/res_2131952589_uikit_viewgroup">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginTop="16dp" app:cardBackgroundColor="?attr/primary_660" app:cardCornerRadius="4dp" style="@style/UiKit_ViewGroup">
+    <RelativeLayout android:padding="8dp" style="@style/UiKit_ViewGroup">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/gift_sku_icon" android:layout_width="32dp" android:layout_height="32dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="8dp" android:layout_alignParentStart="true"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_000" android:id="@+id/gift_sku_name" android:layout_alignParentTop="true" android:layout_marginStart="48dp" android:layout_alignParentStart="true" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:id="@+id/gift_sku_copies" android:layout_below="@+id/gift_sku_name" android:layout_marginStart="48dp" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_000" android:id="@+id/gift_sku_name" android:layout_alignParentTop="true" android:layout_marginStart="48dp" android:layout_alignParentStart="true" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:id="@+id/gift_sku_copies" android:layout_below="@+id/gift_sku_name" android:layout_marginStart="48dp" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
         <ImageView android:id="@+id/gift_sku_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon_carrot" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="8dp" android:layout_alignParentEnd="true"/>
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/view_global_search_item.xml b/app/src/main/res/layout/view_global_search_item.xml
index 76d128b2ab..3a58446c4d 100644
--- a/app/src/main/res/layout/view_global_search_item.xml
+++ b/app/src/main/res/layout/view_global_search_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/res_2131952421_uikit_guideline"/>
-    <ImageView android:id="@+id/item_unread" android:src="@drawable/ic_unread_white_9dp" android:contentDescription="@string/new_unreads" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_icon_iv" android:padding="2dp" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="4dp" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="5" app:roundAsCircle="true" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/item_name_tv" android:layout_width="0dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintBottom_toTopOf="@+id/item_description_tv" app:layout_constraintEnd_toStartOf="@+id/item_group_tv" app:layout_constraintStart_toStartOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:id="@+id/item_description_tv" android:visibility="gone" android:layout_width="0dp" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/item_group_tv" app:layout_constraintStart_toStartOf="@+id/item_name_tv" app:layout_constraintTop_toBottomOf="@+id/item_name_tv" app:layout_constraintWidth_min="64dp" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
-    <TextView android:gravity="end" android:id="@+id/item_group_tv" android:textAlignment="viewEnd" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@+id/item_mentions_tv" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_max="140dp" app:layout_constraintWidth_min="64dp" app:layout_goneMarginEnd="8dp" app:layout_goneMarginRight="8dp" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
-    <TextView android:id="@+id/item_mentions_tv" android:visibility="gone" android:text="@string/sample_number_99" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952023_icon_mentions_large"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit_Guideline"/>
+    <ImageView android:id="@+id/item_unread" android:src="@drawable/ic_unread_white_9dp" android:contentDescription="@string/new_unreads" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_icon_iv" android:padding="2dp" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="4dp" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@+id/guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="5" app:roundAsCircle="true" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/item_name_tv" android:layout_width="0dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintBottom_toTopOf="@+id/item_description_tv" app:layout_constraintEnd_toStartOf="@+id/item_group_tv" app:layout_constraintStart_toStartOf="@+id/guideline" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:id="@+id/item_description_tv" android:visibility="gone" android:layout_width="0dp" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/item_group_tv" app:layout_constraintStart_toStartOf="@+id/item_name_tv" app:layout_constraintTop_toBottomOf="@+id/item_name_tv" app:layout_constraintWidth_min="64dp" style="@style/UiKit_TextView_Subtext_SingleLine"/>
+    <TextView android:gravity="end" android:id="@+id/item_group_tv" android:textAlignment="viewEnd" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@+id/item_mentions_tv" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_max="140dp" app:layout_constraintWidth_min="64dp" app:layout_goneMarginEnd="8dp" app:layout_goneMarginRight="8dp" style="@style/UiKit_TextView_Subtext_SingleLine"/>
+    <TextView android:id="@+id/item_mentions_tv" android:visibility="gone" android:text="@string/sample_number_99" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Icon_Mentions_Large"/>
 </merge>
diff --git a/app/src/main/res/layout/view_grid_image.xml b/app/src/main/res/layout/view_grid_image.xml
index d04d63a0c6..d88c12e554 100644
--- a/app/src/main/res/layout/view_grid_image.xml
+++ b/app/src/main/res/layout/view_grid_image.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951993_flexinput_items_photo">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/FlexInput_Items_Photo">
     <FrameLayout android:id="@+id/content_container" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/content_iv" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" app:placeholderImageScaleType="6" app:roundedCornerRadius="4dp" style="@style/res_2131951994_flexinput_items_photo_image"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/content_iv" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" app:placeholderImageScaleType="6" app:roundedCornerRadius="4dp" style="@style/FlexInput_Items_Photo_Image"/>
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveActive" android:layout_gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/item_video_indicator" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/video" android:backgroundTint="?attr/colorBackgroundTertiary" style="UiKit.TextAppearance.Bold"/>
     </FrameLayout>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_check_indicator" android:visibility="gone" style="@style/res_2131951995_flexinput_items_photo_selection"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_check_indicator" android:visibility="gone" style="@style/FlexInput_Items_Photo_Selection"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_guild.xml b/app/src/main/res/layout/view_guild.xml
index 5a6b3f3ef0..2cad0e7002 100644
--- a/app/src/main/res/layout/view_guild.xml
+++ b/app/src/main/res/layout/view_guild.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/guilds_item_avatar_wrap" android:background="?attr/colorBackgroundSecondary" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_avatar" android:layout_width="match_parent" android:layout_height="match_parent" app:fadeDuration="50" app:placeholderImage="?attr/colorBackgroundSecondary" app:roundAsCircle="true"/>
-    <TextView android:textSize="8dp" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/guild_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="8dp" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/guild_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/view_guild_invite_bottom_sheet.xml b/app/src/main/res/layout/view_guild_invite_bottom_sheet.xml
index fa92539dce..c747071e53 100644
--- a/app/src/main/res/layout/view_guild_invite_bottom_sheet.xml
+++ b/app/src/main/res/layout/view_guild_invite_bottom_sheet.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/res_2131952595_uikit_viewgroup_linearlayout_bottomsheet">
-    <LinearLayout android:background="?attr/primary_630" android:paddingBottom="@dimen/list_bottom_padding" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:padding="0dp" android:text="@string/form_label_instant_invite_channel" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/res_2131952496_uikit_settings_item_header"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_LinearLayout_BottomSheet">
+    <LinearLayout android:background="?attr/primary_630" android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:padding="0dp" android:text="@string/form_label_instant_invite_channel" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/UiKit_Settings_Item_Header"/>
             <Spinner android:id="@+id/guild_invite_channel_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:popupBackground="?attr/colorPrimary"/>
             <View android:background="?attr/primary_400" android:layout_width="match_parent" android:layout_height="0.25dp"/>
         </LinearLayout>
-        <TextView android:text="@string/expire_after" style="@style/res_2131952496_uikit_settings_item_header"/>
-        <HorizontalScrollView style="@style/res_2131952611_uikit_viewgroup_scrollview_horizontal">
+        <TextView android:text="@string/expire_after" style="@style/UiKit_Settings_Item_Header"/>
+        <HorizontalScrollView style="@style/UiKit_ViewGroup_ScrollView_Horizontal">
             <RadioGroup android:orientation="horizontal" android:id="@+id/guild_invite_expires_after_radiogroup" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
         </HorizontalScrollView>
-        <TextView android:text="@string/max_number_of_uses" style="@style/res_2131952496_uikit_settings_item_header"/>
-        <HorizontalScrollView style="@style/res_2131952611_uikit_viewgroup_scrollview_horizontal">
+        <TextView android:text="@string/max_number_of_uses" style="@style/UiKit_Settings_Item_Header"/>
+        <HorizontalScrollView style="@style/UiKit_ViewGroup_ScrollView_Horizontal">
             <RadioGroup android:orientation="horizontal" android:id="@+id/guild_invite_max_uses_radiogroup" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
         </HorizontalScrollView>
-        <com.discord.views.CheckedSetting android:id="@+id/guild_invite_temporary_membership" app:cs_subtext="@string/temporary_membership_explanation" app:cs_text="@string/grant_temporary_membership" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_generate_link" android:layout_margin="16dp" android:text="@string/create_link" style="@style/res_2131952458_uikit_material_button"/>
+        <com.discord.views.CheckedSetting android:id="@+id/guild_invite_temporary_membership" app:cs_subtext="@string/temporary_membership_explanation" app:cs_text="@string/grant_temporary_membership" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_generate_link" android:layout_margin="16dp" android:text="@string/create_link" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_guild_role_subscription_add_benefit_item.xml b/app/src/main/res/layout/view_guild_role_subscription_add_benefit_item.xml
index cf80b366ba..2880675927 100644
--- a/app/src/main/res/layout/view_guild_role_subscription_add_benefit_item.xml
+++ b/app/src/main/res/layout/view_guild_role_subscription_add_benefit_item.xml
@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:background="@drawable/ripple_rounded_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
     <View android:id="@+id/guild_role_subscription_add_benefit_image_circle" android:background="@drawable/drawable_circle_dashed_4dp" android:layout_width="40dp" android:layout_height="40dp" android:alpha="0.06" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_add_24dp" android:contentDescription="@string/channel_select" app:layout_constraintBottom_toBottomOf="@+id/guild_role_subscription_add_benefit_image_circle" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_add_benefit_image_circle" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_add_benefit_image_circle" app:layout_constraintTop_toTopOf="@+id/guild_role_subscription_add_benefit_image_circle" app:tint="?attr/colorInteractiveActive"/>
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_add_benefit_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_add_benefit_image_circle" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952570_uikit_textview_large"/>
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_add_benefit_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_add_benefit_image_circle" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_guild_role_subscription_benefit_item.xml b/app/src/main/res/layout/view_guild_role_subscription_benefit_item.xml
index 7eaacc3483..f91aa9c362 100644
--- a/app/src/main/res/layout/view_guild_role_subscription_benefit_item.xml
+++ b/app/src/main/res/layout/view_guild_role_subscription_benefit_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/ripple_rounded_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_benefit_image" android:background="?attr/primary_700_circle" android:layout_width="40dp" android:layout_height="40dp" app:actualImageScaleType="4" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_benefit_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_benefit_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_benefit_image" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952567_uikit_textview_h2"/>
-    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_role_subscription_benefit_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_benefit_name" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_benefit_name" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_benefit_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_benefit_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_benefit_image" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_H2"/>
+    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_role_subscription_benefit_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_benefit_name" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_benefit_name" style="@style/UiKit_TextView_Medium"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_guild_role_subscription_channel_item.xml b/app/src/main/res/layout/view_guild_role_subscription_channel_item.xml
index 9c0223b0f0..66f6edb23b 100644
--- a/app/src/main/res/layout/view_guild_role_subscription_channel_item.xml
+++ b/app/src/main/res/layout/view_guild_role_subscription_channel_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/channel_item_type_icon" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_item_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_weight="1" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_item_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_weight="1" style="@style/UiKit_TextView_Medium"/>
     <ImageView android:id="@+id/channel_item_selected" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_check_blurple" android:contentDescription="@string/select"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_guild_role_subscription_image_upload.xml b/app/src/main/res/layout/view_guild_role_subscription_image_upload.xml
index 062bfa392b..f78f7b5fd0 100644
--- a/app/src/main/res/layout/view_guild_role_subscription_image_upload.xml
+++ b/app/src/main/res/layout/view_guild_role_subscription_image_upload.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_subscription_upload_image_label" android:text="@string/guild_role_subscription_tier_detail_custom_image_description" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/guild_subscription_image" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952574_uikit_textview_medium"/>
-    <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_subscription_upload_image" android:layout_width="wrap_content" android:layout_marginTop="16dp" android:text="@string/guild_role_subscription_tier_detail_custom_image_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_subscription_upload_image_label" app:strokeColor="@color/uikit_btn_bg_color_selector_background_accent_dark" style="@style/res_2131952458_uikit_material_button"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_subscription_image" android:background="?attr/primary_700_circle" android:layout_width="84dp" android:layout_height="84dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_image_upload" app:placeholderImageScaleType="4" style="@style/res_2131951679_avatar_xxlarge"/>
-    <ImageView android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_subscription_edit_image" android:background="?attr/primary_630_circle" android:visibility="visible" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_edit_24dp" android:scaleType="centerInside" android:contentDescription="@string/guild_role_subscription_tier_detail_custom_image_a11y_label" app:layout_constraintCircle="@+id/guild_subscription_image" app:layout_constraintCircleAngle="225" app:layout_constraintCircleRadius="42dp" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952449_uikit_imageview_clickable"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_subscription_upload_image_label" android:text="@string/guild_role_subscription_tier_detail_custom_image_description" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/guild_subscription_image" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Medium"/>
+    <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_subscription_upload_image" android:layout_width="wrap_content" android:layout_marginTop="16dp" android:text="@string/guild_role_subscription_tier_detail_custom_image_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_subscription_upload_image_label" app:strokeColor="@color/uikit_btn_bg_color_selector_background_accent_dark" style="@style/UiKit_Material_Button"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_subscription_image" android:background="?attr/primary_700_circle" android:layout_width="84dp" android:layout_height="84dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_image_upload" app:placeholderImageScaleType="4" style="@style/Avatar_XXLarge"/>
+    <ImageView android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_subscription_edit_image" android:background="?attr/primary_630_circle" android:visibility="visible" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_edit_24dp" android:scaleType="centerInside" android:contentDescription="@string/guild_role_subscription_tier_detail_custom_image_a11y_label" app:layout_constraintCircle="@+id/guild_subscription_image" app:layout_constraintCircleAngle="225" app:layout_constraintCircleRadius="42dp" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView_Clickable"/>
 </merge>
diff --git a/app/src/main/res/layout/view_guild_role_subscription_plan_details.xml b/app/src/main/res/layout/view_guild_role_subscription_plan_details.xml
index 2470eaf1f3..30386d7197 100644
--- a/app/src/main/res/layout/view_guild_role_subscription_plan_details.xml
+++ b/app/src/main/res/layout/view_guild_role_subscription_plan_details.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:id="@+id/guild_role_subscription_plan_cover_image_label" android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_plan_setup_cover_photo_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <TextView android:id="@+id/guild_role_subscription_plan_cover_image_label" android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_plan_setup_cover_photo_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_plan_cover_image" android:background="@drawable/drawable_rect_rounded_bg_tertiary" android:layout_width="match_parent" android:layout_height="114dp" android:layout_marginLeft="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginTop="8dp" android:layout_marginRight="@dimen/guild_role_subscription_setup_default_padding" android:importantForAccessibility="no" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image_label" app:placeholderImage="@drawable/ic_image_upload"/>
-    <ImageView android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_subscription_plan_details_edit_cover_image" android:background="@drawable/drawable_circle_interactive_text_normal" android:padding="4dp" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_edit_24dp" android:scaleType="centerInside" android:contentDescription="@string/guild_role_subscription_tier_detail_custom_image_a11y_label" android:translationX="-8dp" android:translationY="8dp" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintTop_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:tint="?attr/colorBackgroundSecondary" style="@style/res_2131952449_uikit_imageview_clickable"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_plan_cover_image_info" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_plan_setup_cover_photo_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image" style="@style/res_2131952574_uikit_textview_medium"/>
-    <View android:id="@+id/guild_role_subscription_plan_details_divider" android:layout_margin="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image_info" style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:id="@+id/guild_role_subscription_plan_description_label" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_detail_description_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_details_divider" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_plan_description_layout" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_description_label" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_plan_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_plan_setup_description_placeholder" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+    <ImageView android:layout_gravity="bottom|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_subscription_plan_details_edit_cover_image" android:background="@drawable/drawable_circle_interactive_text_normal" android:padding="4dp" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_edit_24dp" android:scaleType="centerInside" android:contentDescription="@string/guild_role_subscription_tier_detail_custom_image_a11y_label" android:translationX="-8dp" android:translationY="8dp" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_plan_cover_image" app:layout_constraintTop_toTopOf="@+id/guild_role_subscription_plan_cover_image" app:tint="?attr/colorBackgroundSecondary" style="@style/UiKit_ImageView_Clickable"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_plan_cover_image_info" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_plan_setup_cover_photo_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image" style="@style/UiKit_TextView_Medium"/>
+    <View android:id="@+id/guild_role_subscription_plan_details_divider" android:layout_margin="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_cover_image_info" style="@style/UiKit_Divider"/>
+    <TextView android:id="@+id/guild_role_subscription_plan_description_label" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_detail_description_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_details_divider" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_plan_description_layout" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_plan_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_plan_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_plan_setup_description_placeholder" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
     </com.google.android.material.textfield.TextInputLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_guild_role_subscription_section_header_item.xml b/app/src/main/res/layout/view_guild_role_subscription_section_header_item.xml
index 0247272b1d..85a1c8869f 100644
--- a/app/src/main/res/layout/view_guild_role_subscription_section_header_item.xml
+++ b/app/src/main/res/layout/view_guild_role_subscription_section_header_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_role_subscription_section_header" android:background="?attr/colorBackgroundPrimary" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952569_uikit_textview_h6"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_role_subscription_section_header" android:background="?attr/colorBackgroundPrimary" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_TextView_H6"/>
diff --git a/app/src/main/res/layout/view_guild_role_subscription_tier_header.xml b/app/src/main/res/layout/view_guild_role_subscription_tier_header.xml
index ca3bc2eee6..b7946e1b7e 100644
--- a/app/src/main/res/layout/view_guild_role_subscription_tier_header.xml
+++ b/app/src/main/res/layout/view_guild_role_subscription_tier_header.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:orientation="vertical" android:background="@drawable/drawable_rect_rounded_bg_tertiary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_tier_header_image" android:layout_width="80dp" android:layout_height="80dp" style="@style/res_2131951679_avatar_xxlarge"/>
-    <TextView android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_tier_header_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" style="@style/res_2131952567_uikit_textview_h2"/>
-    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_role_subscription_tier_header_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" style="@style/res_2131952567_uikit_textview_h2"/>
-    <Button android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:id="@+id/guild_role_subscription_tier_header_subscribe" android:background="@drawable/bg_guild_role_subscription_subscribe_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_review_subscribe_label"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_header_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/res_2131952574_uikit_textview_medium"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_tier_header_image" android:layout_width="80dp" android:layout_height="80dp" style="@style/Avatar_XXLarge"/>
+    <TextView android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_tier_header_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" style="@style/UiKit_TextView_H2"/>
+    <TextView android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_role_subscription_tier_header_price" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" style="@style/UiKit_TextView_H2"/>
+    <Button android:textAppearance="@style/UiKit_TextAppearance_Button" android:id="@+id/guild_role_subscription_tier_header_subscribe" android:background="@drawable/bg_guild_role_subscription_subscribe_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_review_subscribe_label"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_header_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/UiKit_TextView_Medium"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_image.xml b/app/src/main/res/layout/view_image.xml
index 4985ca3470..b8677d6234 100644
--- a/app/src/main/res/layout/view_image.xml
+++ b/app/src/main/res/layout/view_image.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="96dp" android:adjustViewBounds="true" app:fadeDuration="@android:integer/config_shortAnimTime" app:placeholderImage="?attr/ic_insert_drive_file" app:placeholderImageScaleType="2" app:roundedCornerRadius="3dp" app:viewAspectRatio="1" style="@style/res_2131951981_flexinput_items"/>
+<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="96dp" android:adjustViewBounds="true" app:fadeDuration="@android:integer/config_shortAnimTime" app:placeholderImage="?attr/ic_insert_drive_file" app:placeholderImageScaleType="2" app:roundedCornerRadius="3dp" app:viewAspectRatio="1" style="@style/FlexInput_Items"/>
diff --git a/app/src/main/res/layout/view_input_modal.xml b/app/src/main/res/layout/view_input_modal.xml
index e6e8a70199..fffd1e5539 100644
--- a/app/src/main/res/layout/view_input_modal.xml
+++ b/app/src/main/res/layout/view_input_modal.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_input" android:layout_margin="8dp" style="@style/res_2131952558_uikit_textinputlayout_primary">
-    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_input" android:layout_margin="8dp" style="@style/UiKit_TextInputLayout_Primary">
+    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
 </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/view_interaction_failed_label.xml b/app/src/main/res/layout/view_interaction_failed_label.xml
index cbdfeb9fed..e2d26c0fce 100644
--- a/app/src/main/res/layout/view_interaction_failed_label.xml
+++ b/app/src/main/res/layout/view_interaction_failed_label.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingBottom="9dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
     <ImageView android:id="@+id/view_interaction_failed_label_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_alert_circle_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/view_interaction_failed_label_message" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/view_interaction_failed_label_message" app:tint="@color/status_red_500"/>
-    <TextView android:textColor="@color/status_red_500" android:id="@+id/view_interaction_failed_label_message" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/view_interaction_failed_label_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textColor="@color/status_red_500" android:id="@+id/view_interaction_failed_label_message" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/view_interaction_failed_label_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_invite_settings_channel_spinner_item.xml b/app/src/main/res/layout/view_invite_settings_channel_spinner_item.xml
index eb7b5716ba..19682f679d 100644
--- a/app/src/main/res/layout/view_invite_settings_channel_spinner_item.xml
+++ b/app/src/main/res/layout/view_invite_settings_channel_spinner_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/channel_spinner_item_textview" android:background="?attr/selectableItemBackground" android:padding="12dp" android:layout_width="match_parent" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/channel_spinner_item_textview" android:background="?attr/selectableItemBackground" android:padding="12dp" android:layout_width="match_parent" android:singleLine="true" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/view_invite_settngs_channel_spinner_item_open.xml b/app/src/main/res/layout/view_invite_settngs_channel_spinner_item_open.xml
index a6c3d8072e..308a7a3eb2 100644
--- a/app/src/main/res/layout/view_invite_settngs_channel_spinner_item_open.xml
+++ b/app/src/main/res/layout/view_invite_settngs_channel_spinner_item_open.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_200" android:id="@+id/channel_spinner_dropdown_item_textview" android:background="?attr/selectableItemBackground" android:padding="12dp" android:layout_width="match_parent" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_200" android:id="@+id/channel_spinner_dropdown_item_textview" android:background="?attr/selectableItemBackground" android:padding="12dp" android:layout_width="match_parent" android:singleLine="true" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/view_loading_button.xml b/app/src/main/res/layout/view_loading_button.xml
index 0ab9966e0d..97bb18cf8c 100644
--- a/app/src/main/res/layout/view_loading_button.xml
+++ b/app/src/main/res/layout/view_loading_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content">
     <ProgressBar android:layout_gravity="center" android:id="@+id/loading_button_progress" android:layout_width="30dp" android:layout_height="30dp" android:translationZ="8dp"/>
-    <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/loading_button_button" android:focusable="false" android:clickable="false" android:fontFamily="?attr/font_primary_semibold" style="@style/res_2131952458_uikit_material_button"/>
+    <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/loading_button_button" android:focusable="false" android:clickable="false" android:fontFamily="?attr/font_primary_semibold" style="@style/UiKit_Material_Button"/>
 </merge>
diff --git a/app/src/main/res/layout/view_member_verification.xml b/app/src/main/res/layout/view_member_verification.xml
index ce268509f8..19ca210e19 100644
--- a/app/src/main/res/layout/view_member_verification.xml
+++ b/app/src/main/res/layout/view_member_verification.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" app:cardCornerRadius="4dp" app:cardElevation="0dp">
-    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <ImageView android:layout_gravity="center_vertical" android:id="@+id/member_verification_verify_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" android:layout_marginEnd="8dp"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/member_verification_verify_text" android:layout_width="0dp" android:layout_height="match_parent" android:drawablePadding="8dp" android:layout_weight="1" style="@style/res_2131952570_uikit_textview_large"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_verify_button" android:padding="0dp" android:layout_width="wrap_content" android:text="@string/verify" style="@style/res_2131952458_uikit_material_button"/>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/member_verification_verified_check" android:visibility="gone" android:layout_margin="8dp" android:text="@string/guild_verified" android:drawablePadding="8dp" app:drawableLeftCompat="@drawable/ic_checkmark_green_16dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/member_verification_verify_text" android:layout_width="0dp" android:layout_height="match_parent" android:drawablePadding="8dp" android:layout_weight="1" style="@style/UiKit_TextView_Large"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_verify_button" android:padding="0dp" android:layout_width="wrap_content" android:text="@string/verify" style="@style/UiKit_Material_Button"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/member_verification_verified_check" android:visibility="gone" android:layout_margin="8dp" android:text="@string/guild_verified" android:drawablePadding="8dp" app:drawableLeftCompat="@drawable/ic_checkmark_green_16dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_mobile_report_block_user.xml b/app/src/main/res/layout/view_mobile_report_block_user.xml
index 3fde8aa348..d8037a18e9 100644
--- a/app/src/main/res/layout/view_mobile_report_block_user.xml
+++ b/app/src/main/res/layout/view_mobile_report_block_user.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_block_user_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_reports_block_element_header" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/mobile_reports_block_user_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_reports_block_element_description" style="@style/res_2131952574_uikit_textview_medium"/>
-    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/mobile_reports_block_user_avatar" android:importantForAccessibility="no" style="@style/res_2131951678_avatar_standard"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:id="@+id/mobile_reports_block_user_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginStart="16dp" style="@style/res_2131952580_uikit_textview_singleline"/>
-        <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:id="@+id/mobile_reports_block_user_button" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_height="32dp" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/block" android:insetTop="0dp" android:insetBottom="0dp" android:elevation="0dp" android:backgroundTint="@color/status_red" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_block_user_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_reports_block_element_header" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/mobile_reports_block_user_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_reports_block_element_description" style="@style/UiKit_TextView_Medium"/>
+    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/mobile_reports_block_user_avatar" android:importantForAccessibility="no" style="@style/Avatar_Standard"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:id="@+id/mobile_reports_block_user_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginStart="16dp" style="@style/UiKit_TextView_SingleLine"/>
+        <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextAppearance_Button" android:id="@+id/mobile_reports_block_user_button" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_height="32dp" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/block" android:insetTop="0dp" android:insetBottom="0dp" android:elevation="0dp" android:backgroundTint="@color/status_red" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_mobile_reports_bottom_button.xml b/app/src/main/res/layout/view_mobile_reports_bottom_button.xml
index 62fa779773..7af7023ca0 100644
--- a/app/src/main/res/layout/view_mobile_reports_bottom_button.xml
+++ b/app/src/main/res/layout/view_mobile_reports_bottom_button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
-    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/res_2131952416_uikit_divider"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <com.discord.views.LoadingButton android:id="@+id/report_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:elevation="0dp" style="@style/res_2131952458_uikit_material_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/report_node_bottom_button_cancel" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:elevation="0dp" style="@style/res_2131952471_uikit_material_button_transparent"/>
-    <TextView android:textColor="@color/status_red" android:id="@+id/report_node_bottom_button_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAlignment="center" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/UiKit_Divider"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/UiKit_TextView_Subtext"/>
+    <com.discord.views.LoadingButton android:id="@+id/report_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:elevation="0dp" style="@style/UiKit_Material_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/report_node_bottom_button_cancel" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:elevation="0dp" style="@style/UiKit_Material_Button_Transparent"/>
+    <TextView android:textColor="@color/status_red" android:id="@+id/report_node_bottom_button_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAlignment="center" style="@style/UiKit_TextView_Subtext"/>
 </merge>
diff --git a/app/src/main/res/layout/view_mobile_reports_breadcrumbs.xml b/app/src/main/res/layout/view_mobile_reports_breadcrumbs.xml
index 366658bb71..0d67519e9b 100644
--- a/app/src/main/res/layout/view_mobile_reports_breadcrumbs.xml
+++ b/app/src/main/res/layout/view_mobile_reports_breadcrumbs.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="top|left|center_vertical|center_horizontal|center|start" android:orientation="vertical">
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:layout_width="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_reports_breadcrumbs_title" style="@style/res_2131952564_uikit_textview_bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:layout_width="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_reports_breadcrumbs_title" style="@style/UiKit_TextView_Bold"/>
 </merge>
diff --git a/app/src/main/res/layout/view_mobile_reports_breadcrumbs_item.xml b/app/src/main/res/layout/view_mobile_reports_breadcrumbs_item.xml
index 4eb825781e..b07955317a 100644
--- a/app/src/main/res/layout/view_mobile_reports_breadcrumbs_item.xml
+++ b/app/src/main/res/layout/view_mobile_reports_breadcrumbs_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:minHeight="20dp">
     <View android:id="@+id/reports_breadcrumbs_item_dot" android:background="@drawable/drawable_circle_brand_500" android:layout_width="4dp" android:layout_height="4dp" android:layout_marginTop="8dp" android:layout_marginStart="2dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/reports_breadcrumbs_item_title" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:textAlignment="textStart" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/reports_breadcrumbs_item_dot" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952570_uikit_textview_large"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/reports_breadcrumbs_item_title" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:textAlignment="textStart" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/reports_breadcrumbs_item_dot" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_mobile_reports_channel_preview.xml b/app/src/main/res/layout/view_mobile_reports_channel_preview.xml
index 835f62b9a0..23fbff017e 100644
--- a/app/src/main/res/layout/view_mobile_reports_channel_preview.xml
+++ b/app/src/main/res/layout/view_mobile_reports_channel_preview.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/mobile_reports_channel_preview_top_guideline" app:layout_constraintGuide_begin="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/mobile_reports_channel_preview_bottom_guideline" app:layout_constraintGuide_end="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/mobile_reports_channel_preview_start_guideline" app:layout_constraintGuide_begin="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/mobile_reports_channel_preview_end_guideline" app:layout_constraintGuide_end="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/mobile_reports_channel_preview_image" android:importantForAccessibility="no" android:layout_marginEnd="4dp" app:layout_constraintStart_toStartOf="@+id/mobile_reports_channel_preview_start_guideline" app:layout_constraintTop_toTopOf="@+id/mobile_reports_channel_preview_top_guideline" style="@style/res_2131951677_avatar_small"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/mobile_reports_channel_preview_channel_name" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginStart="12dp" app:layout_constraintEnd_toEndOf="@+id/mobile_reports_channel_preview_end_guideline" app:layout_constraintStart_toEndOf="@+id/mobile_reports_channel_preview_image" app:layout_constraintTop_toTopOf="@+id/mobile_reports_channel_preview_top_guideline" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/mobile_reports_channel_preview_stage_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:layout_constraintBottom_toBottomOf="@+id/mobile_reports_channel_preview_bottom_guideline" app:layout_constraintEnd_toEndOf="@+id/mobile_reports_channel_preview_end_guideline" app:layout_constraintStart_toStartOf="@+id/mobile_reports_channel_preview_start_guideline" app:layout_constraintTop_toBottomOf="@+id/mobile_reports_channel_preview_image" style="@style/res_2131952564_uikit_textview_bold"/>
+    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/mobile_reports_channel_preview_top_guideline" app:layout_constraintGuide_begin="16dp" style="@style/UiKit_Guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/mobile_reports_channel_preview_bottom_guideline" app:layout_constraintGuide_end="16dp" style="@style/UiKit_Guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/mobile_reports_channel_preview_start_guideline" app:layout_constraintGuide_begin="16dp" style="@style/UiKit_Guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/mobile_reports_channel_preview_end_guideline" app:layout_constraintGuide_end="16dp" style="@style/UiKit_Guideline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/mobile_reports_channel_preview_image" android:importantForAccessibility="no" android:layout_marginEnd="4dp" app:layout_constraintStart_toStartOf="@+id/mobile_reports_channel_preview_start_guideline" app:layout_constraintTop_toTopOf="@+id/mobile_reports_channel_preview_top_guideline" style="@style/Avatar_Small"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/mobile_reports_channel_preview_channel_name" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginStart="12dp" app:layout_constraintEnd_toEndOf="@+id/mobile_reports_channel_preview_end_guideline" app:layout_constraintStart_toEndOf="@+id/mobile_reports_channel_preview_image" app:layout_constraintTop_toTopOf="@+id/mobile_reports_channel_preview_top_guideline" style="@style/UiKit_TextView_Medium_SingleLine"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/mobile_reports_channel_preview_stage_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:layout_constraintBottom_toBottomOf="@+id/mobile_reports_channel_preview_bottom_guideline" app:layout_constraintEnd_toEndOf="@+id/mobile_reports_channel_preview_end_guideline" app:layout_constraintStart_toStartOf="@+id/mobile_reports_channel_preview_start_guideline" app:layout_constraintTop_toBottomOf="@+id/mobile_reports_channel_preview_image" style="@style/UiKit_TextView_Bold"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_mobile_reports_child.xml b/app/src/main/res/layout/view_mobile_reports_child.xml
index 6953a05f74..4fc36d44ca 100644
--- a/app/src/main/res/layout/view_mobile_reports_child.xml
+++ b/app/src/main/res/layout/view_mobile_reports_child.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <androidx.cardview.widget.CardView android:id="@+id/mobile_reports_child" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:minHeight="64dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="0dp" app:roundedCornerRadius="4dp">
-        <TextView android:layout_gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/mobile_reports_child_menu_title" android:layout_marginStart="16dp" android:layout_marginEnd="40dp" style="@style/res_2131952567_uikit_textview_h2"/>
+        <TextView android:layout_gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/mobile_reports_child_menu_title" android:layout_marginStart="16dp" android:layout_marginEnd="40dp" style="@style/UiKit_TextView_H2"/>
         <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_chevron_right_primary_300_12dp" android:contentDescription="@string/pagination_next" android:layout_marginEnd="8dp" app:drawableTint="?attr/colorInteractiveNormal"/>
     </androidx.cardview.widget.CardView>
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_mobile_reports_multicheck_item.xml b/app/src/main/res/layout/view_mobile_reports_multicheck_item.xml
index f487857ab8..5ec5029a02 100644
--- a/app/src/main/res/layout/view_mobile_reports_multicheck_item.xml
+++ b/app/src/main/res/layout/view_mobile_reports_multicheck_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.CheckedSetting xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_view_type="0" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+<com.discord.views.CheckedSetting xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_view_type="0" style="@style/UiKit_CheckedSetting_Themed"/>
diff --git a/app/src/main/res/layout/view_nitro_boost_perks.xml b/app/src/main/res/layout/view_nitro_boost_perks.xml
index 41c78ef5af..e0d122627a 100644
--- a/app/src/main/res/layout/view_nitro_boost_perks.xml
+++ b/app/src/main/res/layout/view_nitro_boost_perks.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardCornerRadius="4dp">
-    <LinearLayout android:id="@+id/container" android:background="?attr/primary_630" android:minHeight="315dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:id="@+id/container" android:background="?attr/primary_630" android:minHeight="315dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <RelativeLayout android:id="@+id/perks_level_header" android:background="?attr/primary_700" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/perks_level_header_text" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" android:maxLines="1" android:drawablePadding="16dp" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/perks_level_header_boosts_container" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/perks_level_header_text" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" android:maxLines="1" android:drawablePadding="16dp" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/perks_level_header_boosts_container" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
             <FrameLayout android:id="@+id/perks_level_header_boosts_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true">
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/perks_level_header_boosts" android:drawablePadding="16dp" app:drawableEndCompat="@drawable/ic_perk_lock" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/perks_level_header_boosts" android:drawablePadding="16dp" app:drawableEndCompat="@drawable/ic_perk_lock" style="@style/UiKit_TextView"/>
                 <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@+id/perks_level_header_unlocked" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white" app:cardCornerRadius="10dp">
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/color_brand_500" android:gravity="center_vertical" android:layout_marginLeft="6dp" android:layout_marginRight="6dp" android:text="@string/guild_settings_premium_guild_unlocked" android:textAllCaps="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/color_brand_500" android:gravity="center_vertical" android:layout_marginLeft="6dp" android:layout_marginRight="6dp" android:text="@string/guild_settings_premium_guild_unlocked" android:textAllCaps="true" style="@style/UiKit_TextView_Semibold"/>
                 </androidx.cardview.widget.CardView>
             </FrameLayout>
         </RelativeLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/perks_level_contents_header" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/perks_level_contents_recycler" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:nestedScrollingEnabled="false" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/perks_level_contents_header" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/perks_level_contents_recycler" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:nestedScrollingEnabled="false" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/view_nitro_boost_perks_list_item.xml b/app/src/main/res/layout/view_nitro_boost_perks_list_item.xml
index fe03e92cba..d11a852699 100644
--- a/app/src/main/res/layout/view_nitro_boost_perks_list_item.xml
+++ b/app/src/main/res/layout/view_nitro_boost_perks_list_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:id="@+id/perk_view_content_list_item" android:padding="8dp" android:drawablePadding="8dp" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_vertical" android:id="@+id/perk_view_content_list_item" android:padding="8dp" android:drawablePadding="8dp" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/view_no_gifts_list_item.xml b/app/src/main/res/layout/view_no_gifts_list_item.xml
index 8e046bb2e1..e7c65cc907 100644
--- a/app/src/main/res/layout/view_no_gifts_list_item.xml
+++ b/app/src/main/res/layout/view_no_gifts_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_marginTop="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <ImageView android:layout_gravity="center_vertical" android:layout_width="88dp" android:layout_height="40dp" android:src="@drawable/img_no_gifts" android:importantForAccessibility="no" android:layout_marginEnd="8dp"/>
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_000" android:text="@string/gift_inventory_no_gifts" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_000" android:text="@string/gift_inventory_no_gifts" style="@style/UiKit_TextView_Semibold"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_overlay_menu.xml b/app/src/main/res/layout/view_overlay_menu.xml
index f2a06cbe91..842cb81c35 100644
--- a/app/src/main/res/layout/view_overlay_menu.xml
+++ b/app/src/main/res/layout/view_overlay_menu.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/res_2131951648_apptheme_dark" android:orientation="vertical" android:layout_width="240dp" android:layout_height="match_parent">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/AppTheme_Dark" android:orientation="vertical" android:layout_width="240dp" android:layout_height="match_parent">
     <include android:id="@+id/content" layout="@layout/view_overlay_menu_content"/>
     <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cardBackgroundColor="@color/primary_700" app:cardCornerRadius="8dp" app:cardElevation="8dp">
         <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <ImageView android:id="@+id/src_toggle" android:padding="16dp" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1" android:contentDescription="@string/use_speaker" style="@style/res_2131952449_uikit_imageview_clickable"/>
-            <ImageView android:id="@+id/mute_toggle" android:padding="16dp" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1" android:contentDescription="@string/mute" style="@style/res_2131952449_uikit_imageview_clickable"/>
-            <ImageView android:id="@+id/disconnect_btn" android:padding="16dp" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/res_2131952449_uikit_imageview_clickable"/>
+            <ImageView android:id="@+id/src_toggle" android:padding="16dp" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1" android:contentDescription="@string/use_speaker" style="@style/UiKit_ImageView_Clickable"/>
+            <ImageView android:id="@+id/mute_toggle" android:padding="16dp" android:src="@drawable/ic_mic_state_dark" android:layout_weight="1" android:contentDescription="@string/mute" style="@style/UiKit_ImageView_Clickable"/>
+            <ImageView android:id="@+id/disconnect_btn" android:padding="16dp" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" style="@style/UiKit_ImageView_Clickable"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </merge>
diff --git a/app/src/main/res/layout/view_overlay_menu_content.xml b/app/src/main/res/layout/view_overlay_menu_content.xml
index 707e2c516c..517f9fd0aa 100644
--- a/app/src/main/res/layout/view_overlay_menu_content.xml
+++ b/app/src/main/res/layout/view_overlay_menu_content.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/res_2131951648_apptheme_dark" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="locale" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8dp" app:cardElevation="8dp">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:theme="@style/AppTheme_Dark" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="locale" app:cardBackgroundColor="@color/primary_630" app:cardCornerRadius="8dp" app:cardElevation="8dp">
     <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
         <androidx.constraintlayout.widget.ConstraintLayout android:background="@color/primary_700" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:minWidth="240dp">
             <ImageView android:id="@+id/overlay_network_icon" android:padding="2dp" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_voice_quality_fine" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-            <TextView android:textColor="@color/white" android:id="@+id/overlay_guild_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:fontFamily="?attr/font_primary_semibold" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@+id/overlay_channel_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/overlay_network_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/overlay_network_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-            <TextView android:id="@+id/overlay_channel_name" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="@+id/overlay_guild_name" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/overlay_guild_name" app:layout_constraintTop_toBottomOf="@+id/overlay_guild_name" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <TextView android:textColor="@color/white" android:id="@+id/overlay_guild_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:fontFamily="?attr/font_primary_semibold" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@+id/overlay_channel_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/overlay_network_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/overlay_network_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
+            <TextView android:id="@+id/overlay_channel_name" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="@+id/overlay_guild_name" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/overlay_guild_name" app:layout_constraintTop_toBottomOf="@+id/overlay_guild_name" style="@style/UiKit_TextView_Subtext"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <TextView android:id="@+id/overlay_invite_link" android:text="@string/overlay_menu_get_invite" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_diag_link_24dp" app:drawableTint="?attr/colorInteractiveNormal" app:fontFamily="?attr/font_primary_semibold" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/overlay_switch_channels" android:text="@string/overlay_menu_switch_channels" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_channel_text_white_a60_24dp" app:fontFamily="?attr/font_primary_semibold" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/overlay_open_app" android:layout_marginBottom="8dp" android:text="@string/overlay_menu_open_discord" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/img_logo_square" app:fontFamily="?attr/font_primary_semibold" style="@style/res_2131952497_uikit_settings_item_icon"/>
+        <TextView android:id="@+id/overlay_invite_link" android:text="@string/overlay_menu_get_invite" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_diag_link_24dp" app:drawableTint="?attr/colorInteractiveNormal" app:fontFamily="?attr/font_primary_semibold" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/overlay_switch_channels" android:text="@string/overlay_menu_switch_channels" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_channel_text_white_a60_24dp" app:fontFamily="?attr/font_primary_semibold" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/overlay_open_app" android:layout_marginBottom="8dp" android:text="@string/overlay_menu_open_discord" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/img_logo_square" app:fontFamily="?attr/font_primary_semibold" style="@style/UiKit_Settings_Item_Icon"/>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/view_permissions_required.xml b/app/src/main/res/layout/view_permissions_required.xml
index 44235351e0..45f40861ab 100644
--- a/app/src/main/res/layout/view_permissions_required.xml
+++ b/app/src/main/res/layout/view_permissions_required.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:src="@drawable/img_permission_prime" android:contentDescription="@string/system_permission_request_files" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:gravity="center" android:id="@+id/permissions_required_text" android:padding="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/permissions_required_action_btn" android:text="@string/system_permission_grant" style="@style/res_2131952459_uikit_material_button_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:src="@drawable/img_permission_prime" android:contentDescription="@string/system_permission_request_files" style="@style/UiKit_ImageView"/>
+    <TextView android:gravity="center" android:id="@+id/permissions_required_text" android:padding="16dp" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/permissions_required_action_btn" android:text="@string/system_permission_grant" style="@style/UiKit_Material_Button_Fit"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_phone_or_email_input.xml b/app/src/main/res/layout/view_phone_or_email_input.xml
index 7311667e48..9dd425721c 100644
--- a/app/src/main/res/layout/view_phone_or_email_input.xml
+++ b/app/src/main/res/layout/view_phone_or_email_input.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/res_2131952586_uikit_user_phone_manage_number">
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/phone_or_email_country_code_wrap" android:visibility="gone" android:layout_width="wrap_content" android:foreground="?attr/selectableItemBackground" android:hint="@string/country_code" android:layout_marginEnd="8dp" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:focusable="true" android:focusableInTouchMode="false" android:clickable="true" android:layout_width="100dp" android:text="+1" android:cursorVisible="false" android:inputType="none" style="@style/res_2131952551_uikit_textinputlayout_edittext_singleline_countrycode"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/UiKit_User_Phone_Manage_Number">
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/phone_or_email_country_code_wrap" android:visibility="gone" android:layout_width="wrap_content" android:foreground="?attr/selectableItemBackground" android:hint="@string/country_code" android:layout_marginEnd="8dp" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:focusable="true" android:focusableInTouchMode="false" android:clickable="true" android:layout_width="100dp" android:text="+1" android:cursorVisible="false" android:inputType="none" style="@style/UiKit_TextInputLayout_EditText_SingleLine_CountryCode"/>
     </com.google.android.material.textfield.TextInputLayout>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/phone_or_email_main_input_wrap" android:layout_width="0dp" android:layout_weight="1" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:id="@+id/phone_or_email_main_input" style="@style/res_2131952552_uikit_textinputlayout_edittext_singleline_email"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/phone_or_email_main_input_wrap" android:layout_width="0dp" android:layout_weight="1" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:id="@+id/phone_or_email_main_input" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Email"/>
     </com.google.android.material.textfield.TextInputLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_premium_guild_confirmation.xml b/app/src/main/res/layout/view_premium_guild_confirmation.xml
index 121c368643..d562bf01fa 100644
--- a/app/src/main/res/layout/view_premium_guild_confirmation.xml
+++ b/app/src/main/res/layout/view_premium_guild_confirmation.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <androidx.constraintlayout.widget.ConstraintLayout android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/premium_guild_confirmation_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951674_avatar_large"/>
-        <TextView android:textColor="?attr/colorInteractiveActive" android:ellipsize="end" android:id="@+id/premium_guild_confirmation_guild_name" android:layout_width="0dp" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxLines="1" app:layout_constraintLeft_toRightOf="@+id/premium_guild_confirmation_avatar" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <LinearLayout android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" app:layout_constraintLeft_toRightOf="@+id/premium_guild_confirmation_avatar" app:layout_constraintTop_toBottomOf="@+id/premium_guild_confirmation_guild_name" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <com.google.android.material.chip.Chip android:id="@+id/premium_guild_confirmation_level_info_previous" app:chipIcon="@drawable/ic_guild_badge_premium_tier_1_banner" style="@style/res_2131952476_uikit_premiumguild_confirmation_chip"/>
-            <ImageView android:layout_gravity="center_vertical" android:id="@+id/premium_guild_confirmation_upgrade_arrow" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:src="@drawable/ic_double_carot_right_16dp" android:importantForAccessibility="no" app:tint="@color/status_red_500" style="@style/res_2131952448_uikit_imageview"/>
-            <com.google.android.material.chip.Chip android:id="@+id/premium_guild_confirmation_level_info_upgrade" app:chipIcon="@drawable/ic_guild_badge_premium_tier_1_banner" style="@style/res_2131952476_uikit_premiumguild_confirmation_chip"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/premium_guild_confirmation_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Large"/>
+        <TextView android:textColor="?attr/colorInteractiveActive" android:ellipsize="end" android:id="@+id/premium_guild_confirmation_guild_name" android:layout_width="0dp" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxLines="1" app:layout_constraintLeft_toRightOf="@+id/premium_guild_confirmation_avatar" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
+        <LinearLayout android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" app:layout_constraintLeft_toRightOf="@+id/premium_guild_confirmation_avatar" app:layout_constraintTop_toBottomOf="@+id/premium_guild_confirmation_guild_name" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <com.google.android.material.chip.Chip android:id="@+id/premium_guild_confirmation_level_info_previous" app:chipIcon="@drawable/ic_guild_badge_premium_tier_1_banner" style="@style/UiKit_PremiumGuild_Confirmation_Chip"/>
+            <ImageView android:layout_gravity="center_vertical" android:id="@+id/premium_guild_confirmation_upgrade_arrow" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:src="@drawable/ic_double_carot_right_16dp" android:importantForAccessibility="no" app:tint="@color/status_red_500" style="@style/UiKit_ImageView"/>
+            <com.google.android.material.chip.Chip android:id="@+id/premium_guild_confirmation_level_info_upgrade" app:chipIcon="@drawable/ic_guild_badge_premium_tier_1_banner" style="@style/UiKit_PremiumGuild_Confirmation_Chip"/>
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_premium_guild_features_guild_old.xml b/app/src/main/res/layout/view_premium_guild_features_guild_old.xml
index b74827046f..d42efd19d3 100644
--- a/app/src/main/res/layout/view_premium_guild_features_guild_old.xml
+++ b/app/src/main/res/layout/view_premium_guild_features_guild_old.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:layout_marginTop="16dp" android:text="@string/premium_guild_guild_features_header" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_emoji" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_stickers" app:drawableStartCompat="@drawable/ic_premium_marketing_stickers_24dp" app:drawableTint="#d09aff" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_upload_size" app:drawableStartCompat="@drawable/ic_upload_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_audio_quality" app:drawableStartCompat="@drawable/ic_headset_blue_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_customization" app:drawableStartCompat="@drawable/ic_star_24dp" app:drawableTint="#faa61a" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_threads" app:drawableStartCompat="@drawable/ic_thread_white_24dp" app:drawableTint="#86dcc5" style="@style/res_2131952577_uikit_textview_perk"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:layout_marginTop="16dp" android:text="@string/premium_guild_guild_features_header" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_emoji" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_stickers" app:drawableStartCompat="@drawable/ic_premium_marketing_stickers_24dp" app:drawableTint="#d09aff" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_upload_size" app:drawableStartCompat="@drawable/ic_upload_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_audio_quality" app:drawableStartCompat="@drawable/ic_headset_blue_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_customization" app:drawableStartCompat="@drawable/ic_star_24dp" app:drawableTint="#faa61a" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_guild_feature_threads" app:drawableStartCompat="@drawable/ic_thread_white_24dp" app:drawableTint="#86dcc5" style="@style/UiKit_TextView_Perk"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_premium_guild_features_user_old.xml b/app/src/main/res/layout/view_premium_guild_features_user_old.xml
index be8bba4884..32d12018e4 100644
--- a/app/src/main/res/layout/view_premium_guild_features_user_old.xml
+++ b/app/src/main/res/layout/view_premium_guild_features_user_old.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:layout_marginTop="16dp" android:text="@string/premium_guild_user_features_header" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_user_feature_member_badge" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_user_feature_profile_badge" app:drawableStartCompat="@drawable/ic_booster_profile_badge_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_user_feature_role" app:drawableStartCompat="@drawable/ic_role_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:layout_marginTop="16dp" android:text="@string/premium_guild_user_features_header" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_user_feature_member_badge" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_user_feature_profile_badge" app:drawableStartCompat="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/premium_guild_user_feature_role" app:drawableStartCompat="@drawable/ic_role_24dp" style="@style/UiKit_TextView_Perk"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_premium_guild_progress.xml b/app/src/main/res/layout/view_premium_guild_progress.xml
index 4ad5136fa2..8f511b3fd6 100644
--- a/app/src/main/res/layout/view_premium_guild_progress.xml
+++ b/app/src/main/res/layout/view_premium_guild_progress.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952589_uikit_viewgroup">
-    <LinearLayout android:gravity="center" android:layout_gravity="center" android:background="?attr/primary_800_circle" android:layout_width="70dp" android:layout_height="70dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:id="@+id/progress_gem_icon" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveActive" android:id="@+id/progress_level_text" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup">
+    <LinearLayout android:gravity="center" android:layout_gravity="center" android:background="?attr/primary_800_circle" android:layout_width="70dp" android:layout_height="70dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:id="@+id/progress_gem_icon" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveActive" android:id="@+id/progress_level_text" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
     </LinearLayout>
     <ProgressBar android:layout_gravity="center" android:id="@+id/progress_progress" android:layout_width="82dp" android:layout_height="82dp" android:progressDrawable="@drawable/drawable_boost_progress_ring" style="?android:attr/progressBarStyleHorizontal"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/view_premium_guild_progress_bar.xml b/app/src/main/res/layout/view_premium_guild_progress_bar.xml
index a79cd4b5f2..6058822b1e 100644
--- a/app/src/main/res/layout/view_premium_guild_progress_bar.xml
+++ b/app/src/main/res/layout/view_premium_guild_progress_bar.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952589_uikit_viewgroup">
-    <ProgressBar android:id="@+id/boost_bar_progress_bar" android:layout_width="match_parent" android:layout_height="4dp" android:layout_marginLeft="8dp" android:layout_marginTop="14dp" android:layout_marginRight="8dp" android:progressDrawable="?attr/bg_boost_progress_bar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952480_uikit_progressbar_line_horizontal_determinate"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup">
+    <ProgressBar android:id="@+id/boost_bar_progress_bar" android:layout_width="match_parent" android:layout_height="4dp" android:layout_marginLeft="8dp" android:layout_marginTop="14dp" android:layout_marginRight="8dp" android:progressDrawable="?attr/bg_boost_progress_bar" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ProgressBar_Line_Horizontal_Determinate"/>
     <FrameLayout android:id="@+id/boost_bar_tier_0_container" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintEnd_toStartOf="@+id/boost_bar_tier_1_container" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/boost_bar_tier_1_container" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
         <FrameLayout android:background="?attr/colorPrimaryCircle" android:layout_width="32dp" android:layout_height="32dp">
             <ImageView android:layout_gravity="center" android:id="@+id/boost_bar_tier_0_iv" android:layout_width="20dp" android:layout_height="20dp" android:src="?attr/bg_gem_premium_guild" android:contentDescription="@string/premium_guild_header_badge_no_tier"/>
         </FrameLayout>
     </FrameLayout>
-    <LinearLayout android:gravity="center_horizontal" android:id="@+id/boost_bar_tier_1_container" android:layout_width="0dp" app:layout_constraintEnd_toStartOf="@+id/boost_bar_tier_2_container" app:layout_constraintHorizontal_weight="2" app:layout_constraintLeft_toRightOf="@+id/boost_bar_tier_0_container" app:layout_constraintRight_toLeftOf="@+id/boost_bar_tier_2_container" app:layout_constraintStart_toEndOf="@+id/boost_bar_tier_0_container" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:gravity="center_horizontal" android:id="@+id/boost_bar_tier_1_container" android:layout_width="0dp" app:layout_constraintEnd_toStartOf="@+id/boost_bar_tier_2_container" app:layout_constraintHorizontal_weight="2" app:layout_constraintLeft_toRightOf="@+id/boost_bar_tier_0_container" app:layout_constraintRight_toLeftOf="@+id/boost_bar_tier_2_container" app:layout_constraintStart_toEndOf="@+id/boost_bar_tier_0_container" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
         <FrameLayout android:background="?attr/colorPrimaryCircle" android:layout_width="32dp" android:layout_height="32dp">
             <ImageView android:layout_gravity="center" android:id="@+id/boost_bar_tier_1_iv" android:background="?attr/bg_gem_premium_guild" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_gem_tier_1" android:importantForAccessibility="no"/>
         </FrameLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/boost_bar_tier_1_tv" android:layout_marginTop="6dp" android:text="@string/premium_guild_tier_1" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/boost_bar_tier_1_tv" android:layout_marginTop="6dp" android:text="@string/premium_guild_tier_1" style="@style/UiKit_TextView"/>
     </LinearLayout>
-    <LinearLayout android:gravity="center_horizontal" android:id="@+id/boost_bar_tier_2_container" android:layout_width="0dp" app:layout_constraintEnd_toStartOf="@+id/boost_bar_tier_3_container" app:layout_constraintHorizontal_weight="2" app:layout_constraintLeft_toRightOf="@+id/boost_bar_tier_1_container" app:layout_constraintRight_toLeftOf="@+id/boost_bar_tier_3_container" app:layout_constraintStart_toEndOf="@+id/boost_bar_tier_1_container" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:gravity="center_horizontal" android:id="@+id/boost_bar_tier_2_container" android:layout_width="0dp" app:layout_constraintEnd_toStartOf="@+id/boost_bar_tier_3_container" app:layout_constraintHorizontal_weight="2" app:layout_constraintLeft_toRightOf="@+id/boost_bar_tier_1_container" app:layout_constraintRight_toLeftOf="@+id/boost_bar_tier_3_container" app:layout_constraintStart_toEndOf="@+id/boost_bar_tier_1_container" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
         <FrameLayout android:background="?attr/colorPrimaryCircle" android:layout_width="32dp" android:layout_height="32dp">
             <ImageView android:layout_gravity="center" android:id="@+id/boost_bar_tier_2_iv" android:background="?attr/bg_gem_premium_guild" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_gem_tier_2" android:importantForAccessibility="no"/>
         </FrameLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/boost_bar_tier_2_tv" android:layout_marginTop="6dp" android:text="@string/premium_guild_tier_2" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/boost_bar_tier_2_tv" android:layout_marginTop="6dp" android:text="@string/premium_guild_tier_2" style="@style/UiKit_TextView"/>
     </LinearLayout>
-    <LinearLayout android:gravity="right" android:layout_gravity="right" android:id="@+id/boost_bar_tier_3_container" android:layout_width="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/boost_bar_tier_2_container" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/boost_bar_tier_2_container" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:gravity="right" android:layout_gravity="right" android:id="@+id/boost_bar_tier_3_container" android:layout_width="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/boost_bar_tier_2_container" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/boost_bar_tier_2_container" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
         <FrameLayout android:background="?attr/colorPrimaryCircle" android:layout_width="32dp" android:layout_height="32dp">
             <ImageView android:layout_gravity="center" android:id="@+id/boost_bar_tier_3_iv" android:background="?attr/bg_gem_premium_guild" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/drawable_gem_tier_3" android:importantForAccessibility="no"/>
         </FrameLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/boost_bar_tier_3_tv" android:layout_marginTop="6dp" android:text="@string/premium_guild_tier_3" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/boost_bar_tier_3_tv" android:layout_marginTop="6dp" android:text="@string/premium_guild_tier_3" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_premium_marketing.xml b/app/src/main/res/layout/view_premium_marketing.xml
index e9286823d3..fc8c8ba241 100644
--- a/app/src/main/res/layout/view_premium_marketing.xml
+++ b/app/src/main/res/layout/view_premium_marketing.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_premium_marketing_marketing_container" android:background="@drawable/drawable_bg_premium_guild_gradient_corners" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_marketing_marketing_title" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/guild_settings_premium_upsell_heading_secondary" android:lineSpacingMultiplier="1" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_marketing_marketing_subtitle" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <LinearLayout android:layout_marginTop="16dp" style="@style/res_2131952479_uikit_premiumguild_settings_marketing_container">
-        <ImageView android:layout_height="12dp" android:layout_marginBottom="4dp" android:src="?attr/img_premium_wordmark" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:src="@drawable/img_logo_nitro" android:contentDescription="@string/premium_tier_2" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:id="@+id/view_premium_marketing_nitro_boost_discount" android:layout_marginTop="16dp" style="@style/res_2131952477_uikit_premiumguild_settings_marketing_check"/>
-        <TextView android:id="@+id/view_premium_marketing_nitro_boost_count" android:layout_marginTop="8dp" style="@style/res_2131952477_uikit_premiumguild_settings_marketing_check"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_premium_marketing_marketing_container" android:background="@drawable/drawable_bg_premium_guild_gradient_corners" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_marketing_marketing_title" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/guild_settings_premium_upsell_heading_secondary" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_marketing_marketing_subtitle" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView_Semibold"/>
+    <LinearLayout android:layout_marginTop="16dp" style="@style/UiKit_PremiumGuild_Settings_Marketing_Container">
+        <ImageView android:layout_height="12dp" android:layout_marginBottom="4dp" android:src="?attr/img_premium_wordmark" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <ImageView android:src="@drawable/img_logo_nitro" android:contentDescription="@string/premium_tier_2" style="@style/UiKit_ImageView"/>
+        <TextView android:id="@+id/view_premium_marketing_nitro_boost_discount" android:layout_marginTop="16dp" style="@style/UiKit_PremiumGuild_Settings_Marketing_Check"/>
+        <TextView android:id="@+id/view_premium_marketing_nitro_boost_count" android:layout_marginTop="8dp" style="@style/UiKit_PremiumGuild_Settings_Marketing_Check"/>
     </LinearLayout>
-    <LinearLayout android:id="@+id/view_premium_marketing_container_tier1" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952479_uikit_premiumguild_settings_marketing_container">
-        <ImageView android:layout_height="12dp" android:layout_marginBottom="4dp" android:src="?attr/img_premium_wordmark" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:src="@drawable/img_logo_nitro_classic_header" android:contentDescription="@string/premium_tier_1" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:id="@+id/view_premium_marketing_nitro_classic_boost_discount" android:layout_marginTop="16dp" style="@style/res_2131952477_uikit_premiumguild_settings_marketing_check"/>
-        <TextView android:id="@+id/view_premium_marketing_nitro_classic_boost_count" android:layout_marginTop="8dp" android:alpha="0.5" style="@style/res_2131952478_uikit_premiumguild_settings_marketing_clear"/>
+    <LinearLayout android:id="@+id/view_premium_marketing_container_tier1" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_PremiumGuild_Settings_Marketing_Container">
+        <ImageView android:layout_height="12dp" android:layout_marginBottom="4dp" android:src="?attr/img_premium_wordmark" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <ImageView android:src="@drawable/img_logo_nitro_classic_header" android:contentDescription="@string/premium_tier_1" style="@style/UiKit_ImageView"/>
+        <TextView android:id="@+id/view_premium_marketing_nitro_classic_boost_discount" android:layout_marginTop="16dp" style="@style/UiKit_PremiumGuild_Settings_Marketing_Check"/>
+        <TextView android:id="@+id/view_premium_marketing_nitro_classic_boost_count" android:layout_marginTop="8dp" android:alpha="0.5" style="@style/UiKit_PremiumGuild_Settings_Marketing_Clear"/>
     </LinearLayout>
-    <com.google.android.material.button.MaterialButton android:textColor="?attr/color_brand_500" android:id="@+id/view_premium_marketing_learn_more" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/guild_settings_premium_upsell_learn_more" style="@style/res_2131952473_uikit_material_button_white"/>
+    <com.google.android.material.button.MaterialButton android:textColor="?attr/color_brand_500" android:id="@+id/view_premium_marketing_learn_more" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/guild_settings_premium_upsell_learn_more" style="@style/UiKit_Material_Button_White"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_premium_settings_perks.xml b/app/src/main/res/layout/view_premium_settings_perks.xml
index 88996729a5..2b06d87e55 100644
--- a/app/src/main/res/layout/view_premium_settings_perks.xml
+++ b/app/src/main/res/layout/view_premium_settings_perks.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/primary_000" android:paddingTop="8dp" android:paddingBottom="8dp" android:text="@string/premium_included" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:text="@string/premium_perks_tier_2_profile" app:drawableStartCompat="@drawable/ic_premium_marketing_custom_profile_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:text="@string/premium_perks_tier_2_custom_emoji" app:drawableStartCompat="@drawable/ic_premium_marketing_global_emojis_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:text="@string/premium_perks_tier_2_stream_resolution" app:drawableStartCompat="@drawable/ic_premium_marketing_stream_quality_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:id="@+id/upload_size_perk" android:text="@string/premium_perks_upload_size" app:drawableStartCompat="@drawable/ic_premium_marketing_upload_size_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:id="@+id/guild_subscription_perk" android:text="@string/premium_perks_tier_2_guild_subscription" app:drawableStartCompat="@drawable/ic_premium_marketing_guild_boost_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:id="@+id/max_guilds_perk" android:text="@string/premium_perks_tier_2_max_guilds" app:drawableStartCompat="@drawable/ic_premium_marketing_more_guilds_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:id="@+id/max_message_length_perk" android:text="@string/premium_chat_perks_max_message_length" app:drawableStartCompat="@drawable/ic_premium_marketing_longer_messages_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:text="@string/premium_chat_perks_custom_stickers" app:drawableStartCompat="@drawable/ic_premium_marketing_stickers_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/primary_000" android:paddingTop="8dp" android:paddingBottom="8dp" android:text="@string/premium_included" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:text="@string/premium_perks_tier_2_profile" app:drawableStartCompat="@drawable/ic_premium_marketing_custom_profile_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:text="@string/premium_perks_tier_2_custom_emoji" app:drawableStartCompat="@drawable/ic_premium_marketing_global_emojis_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:text="@string/premium_perks_tier_2_stream_resolution" app:drawableStartCompat="@drawable/ic_premium_marketing_stream_quality_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:id="@+id/upload_size_perk" android:text="@string/premium_perks_upload_size" app:drawableStartCompat="@drawable/ic_premium_marketing_upload_size_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:id="@+id/guild_subscription_perk" android:text="@string/premium_perks_tier_2_guild_subscription" app:drawableStartCompat="@drawable/ic_premium_marketing_guild_boost_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:id="@+id/max_guilds_perk" android:text="@string/premium_perks_tier_2_max_guilds" app:drawableStartCompat="@drawable/ic_premium_marketing_more_guilds_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:id="@+id/max_message_length_perk" android:text="@string/premium_chat_perks_max_message_length" app:drawableStartCompat="@drawable/ic_premium_marketing_longer_messages_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:text="@string/premium_chat_perks_custom_stickers" app:drawableStartCompat="@drawable/ic_premium_marketing_stickers_24dp" style="@style/UiKit_TextView_Perk"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_premium_settings_tier_1.xml b/app/src/main/res/layout/view_premium_settings_tier_1.xml
index 65a8c0ac61..bf53d2a20b 100644
--- a/app/src/main/res/layout/view_premium_settings_tier_1.xml
+++ b/app/src/main/res/layout/view_premium_settings_tier_1.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/primary_000" android:layout_marginTop="16dp" android:text="@string/premium_tier_1_perks_title" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:text="@string/premium_perks_tier_1_profile" app:drawableStartCompat="@drawable/ic_premium_marketing_custom_profile_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:id="@+id/tier_1_guild_subscription_perk" android:text="@string/premium_perks_tier_1_guild_subscription" app:drawableStartCompat="@drawable/ic_premium_marketing_guild_boost_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:text="@string/premium_perks_tier_1_custom_emoji" app:drawableStartCompat="@drawable/ic_premium_marketing_global_emojis_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:id="@+id/tier1_upload_size_perk" android:text="@string/premium_perks_upload_size" app:drawableStartCompat="@drawable/ic_premium_marketing_upload_size_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <TextView android:text="@string/premium_perks_tier_1_stream_resolution" app:drawableStartCompat="@drawable/ic_premium_marketing_stream_quality_24dp" style="@style/res_2131952577_uikit_textview_perk"/>
-    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/premium_settings_premium_classic" android:layout_marginTop="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952467_uikit_material_button_secondary"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/primary_000" android:layout_marginTop="16dp" android:text="@string/premium_tier_1_perks_title" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:text="@string/premium_perks_tier_1_profile" app:drawableStartCompat="@drawable/ic_premium_marketing_custom_profile_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:id="@+id/tier_1_guild_subscription_perk" android:text="@string/premium_perks_tier_1_guild_subscription" app:drawableStartCompat="@drawable/ic_premium_marketing_guild_boost_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:text="@string/premium_perks_tier_1_custom_emoji" app:drawableStartCompat="@drawable/ic_premium_marketing_global_emojis_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:id="@+id/tier1_upload_size_perk" android:text="@string/premium_perks_upload_size" app:drawableStartCompat="@drawable/ic_premium_marketing_upload_size_24dp" style="@style/UiKit_TextView_Perk"/>
+    <TextView android:text="@string/premium_perks_tier_1_stream_resolution" app:drawableStartCompat="@drawable/ic_premium_marketing_stream_quality_24dp" style="@style/UiKit_TextView_Perk"/>
+    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/premium_settings_premium_classic" android:layout_marginTop="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Secondary"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_premium_settings_tier_2.xml b/app/src/main/res/layout/view_premium_settings_tier_2.xml
index f87c716211..de4ccc3688 100644
--- a/app/src/main/res/layout/view_premium_settings_tier_2.xml
+++ b/app/src/main/res/layout/view_premium_settings_tier_2.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <ImageView android:id="@+id/premium_settings_nitro" android:layout_width="wrap_content" android:layout_height="70dp" android:src="?attr/img_logo_discord_nitro" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:id="@+id/premium_settings_nitro_wumpus" android:layout_width="wrap_content" android:layout_height="70dp" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1" android:importantForAccessibility="no" android:layout_marginStart="16dp" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <ImageView android:id="@+id/premium_settings_nitro" android:layout_width="wrap_content" android:layout_height="70dp" android:src="?attr/img_logo_discord_nitro" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/UiKit_ImageView"/>
+        <ImageView android:id="@+id/premium_settings_nitro_wumpus" android:layout_width="wrap_content" android:layout_height="70dp" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1" android:importantForAccessibility="no" android:layout_marginStart="16dp" style="@style/UiKit_ImageView"/>
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/primary_000" android:layout_marginTop="16dp" android:text="@string/premium_tier_2_title" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_200" android:layout_marginTop="8dp" android:text="@string/premium_tier_2_subtitle" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/premium_settings_premium" android:layout_marginTop="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952460_uikit_material_button_green"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/primary_000" android:layout_marginTop="16dp" android:text="@string/premium_tier_2_title" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_200" android:layout_marginTop="8dp" android:text="@string/premium_tier_2_subtitle" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:id="@+id/premium_settings_premium" android:layout_marginTop="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_premium_upsell_info.xml b/app/src/main/res/layout/view_premium_upsell_info.xml
index ba4fc16695..cdd1de79cf 100644
--- a/app/src/main/res/layout/view_premium_upsell_info.xml
+++ b/app/src/main/res/layout/view_premium_upsell_info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_settings_premium_upsell_heading_primary" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_upsell_info_subheading" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_upsell_info_subheading_price" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_upsell_info_subheading_blurb" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_guilds_blurb" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_settings_premium_upsell_heading_primary" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_upsell_info_subheading" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_upsell_info_subheading_price" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/view_premium_upsell_info_subheading_blurb" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_guilds_blurb" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_private_call_grid_overflow.xml b/app/src/main/res/layout/view_private_call_grid_overflow.xml
index 4fed31b9bb..4fe91e703d 100644
--- a/app/src/main/res/layout/view_private_call_grid_overflow.xml
+++ b/app/src/main/res/layout/view_private_call_grid_overflow.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:background="?attr/primary_700_circle_alpha_50" android:layout_margin="8dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:background="?attr/primary_700_circle_alpha_50" android:layout_margin="8dp" style="@style/UiKit_TextView_Semibold"/>
diff --git a/app/src/main/res/layout/view_radio_button.xml b/app/src/main/res/layout/view_radio_button.xml
index ba779809ac..f849c88ea3 100644
--- a/app/src/main/res/layout/view_radio_button.xml
+++ b/app/src/main/res/layout/view_radio_button.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RadioButton xmlns:android="http://schemas.android.com/apk/res/android" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_margin="8dp" android:button="@null" android:minWidth="100dp" style="@style/res_2131952483_uikit_radiobutton"/>
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_margin="8dp" android:button="@null" android:minWidth="100dp" style="@style/UiKit_RadioButton"/>
diff --git a/app/src/main/res/layout/view_reports_menu_node.xml b/app/src/main/res/layout/view_reports_menu_node.xml
index 1d9c3e75ac..edc72b4163 100644
--- a/app/src/main/res/layout/view_reports_menu_node.xml
+++ b/app/src/main/res/layout/view_reports_menu_node.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
     <ScrollView android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toTopOf="@+id/mobile_reports_node_bottom_button" app:layout_constraintTop_toTopOf="0">
-        <LinearLayout android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+        <LinearLayout android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
             <ImageView android:id="@+id/mobile_reports_node_success_shield" android:visibility="gone" android:layout_width="100dp" android:layout_height="100dp" android:layout_marginBottom="16dp" android:src="@drawable/img_report_success_shield"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_node_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/mobile_reports_node_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/res_2131952570_uikit_textview_large"/>
-            <com.google.android.material.card.MaterialCardView android:id="@+id/mobile_reports_node_info_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorInfoHelpBackground" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:contentPadding="8dp" app:strokeColor="?attr/colorFocusPrimary" app:strokeWidth="1dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <com.facebook.drawee.view.SimpleDraweeView android:background="@drawable/ic_info_24dp" android:layout_width="24dp" android:layout_height="24dp" android:backgroundTint="?attr/colorFocusPrimary" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center" android:id="@+id/mobile_reports_node_info_text" android:textAlignment="center" android:layout_marginStart="8dp" style="@style/res_2131952574_uikit_textview_medium"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/mobile_reports_node_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/UiKit_TextView_H1_Bold"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/mobile_reports_node_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/UiKit_TextView_Large"/>
+            <com.google.android.material.card.MaterialCardView android:id="@+id/mobile_reports_node_info_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorInfoHelpBackground" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:contentPadding="8dp" app:strokeColor="?attr/colorFocusPrimary" app:strokeWidth="1dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <com.facebook.drawee.view.SimpleDraweeView android:background="@drawable/ic_info_24dp" android:layout_width="24dp" android:layout_height="24dp" android:backgroundTint="?attr/colorFocusPrimary" style="@style/UiKit_ImageView"/>
+                    <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center" android:id="@+id/mobile_reports_node_info_text" android:textAlignment="center" android:layout_marginStart="8dp" style="@style/UiKit_TextView_Medium"/>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
             <include android:id="@+id/mobile_reports_node_block_user" android:visibility="gone" layout="@layout/view_mobile_report_block_user"/>
@@ -18,10 +18,10 @@
             <com.google.android.material.card.MaterialCardView android:id="@+id/mobile_reports_node_channel_preview" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:strokeColor="?attr/colorBackgroundModifierAccent" app:strokeWidth="1dp">
                 <include android:id="@+id/mobile_reports_channel_preview" layout="@layout/view_mobile_reports_channel_preview"/>
             </com.google.android.material.card.MaterialCardView>
-            <com.discord.widgets.mobile_reports.MobileReportsBreadcrumbs android:gravity="top|left|center_vertical|center_horizontal|center|start" android:orientation="vertical" android:id="@+id/mobile_reports_node_breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <LinearLayout android:id="@+id/mobile_reports_multiselect" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <LinearLayout android:id="@+id/mobile_reports_node_child_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+            <com.discord.widgets.mobile_reports.MobileReportsBreadcrumbs android:gravity="top|left|center_vertical|center_horizontal|center|start" android:orientation="vertical" android:id="@+id/mobile_reports_node_breadcrumbs" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <LinearLayout android:id="@+id/mobile_reports_multiselect" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <LinearLayout android:id="@+id/mobile_reports_node_child_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout"/>
         </LinearLayout>
     </ScrollView>
-    <com.discord.widgets.mobile_reports.MobileReportsBottomButton android:gravity="bottom" android:id="@+id/mobile_reports_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+    <com.discord.widgets.mobile_reports.MobileReportsBottomButton android:gravity="bottom" android:id="@+id/mobile_reports_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="0" style="@style/UiKit_ViewGroup_LinearLayout"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_review_request_modal_image.xml b/app/src/main/res/layout/view_review_request_modal_image.xml
index e0107eb191..06cf9728fd 100644
--- a/app/src/main/res/layout/view_review_request_modal_image.xml
+++ b/app/src/main/res/layout/view_review_request_modal_image.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_marginTop="8dp" android:src="?attr/img_wumpus_ball" android:contentDescription="@string/rating_request_body_android" style="@style/res_2131952448_uikit_imageview"/>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_marginTop="8dp" android:src="?attr/img_wumpus_ball" android:contentDescription="@string/rating_request_body_android" style="@style/UiKit_ImageView"/>
diff --git a/app/src/main/res/layout/view_screen_title.xml b/app/src/main/res/layout/view_screen_title.xml
index 40bd6a62b2..e37dddf25f 100644
--- a/app/src/main/res/layout/view_screen_title.xml
+++ b/app/src/main/res/layout/view_screen_title.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/screen_title_title" android:lineSpacingMultiplier="1" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/screen_title_subtitle" android:layout_marginTop="8dp" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/screen_title_title" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/screen_title_subtitle" android:layout_marginTop="8dp" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_selectable_friend_suggestion.xml b/app/src/main/res/layout/view_selectable_friend_suggestion.xml
index cb1b50791c..6f9e91fe60 100644
--- a/app/src/main/res/layout/view_selectable_friend_suggestion.xml
+++ b/app/src/main/res/layout/view_selectable_friend_suggestion.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/friend_suggestion_container" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friend_suggestion_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friend_suggestion_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friend_suggestion_nickname" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextMuted" android:id="@+id/friend_suggestion_discriminator" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@+id/friend_suggestion_name" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_name" app:layout_constraintTop_toTopOf="@+id/friend_suggestion_name" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friend_suggestion_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toBottomOf="@+id/friend_suggestion_name" style="@style/res_2131952580_uikit_textview_singleline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friend_suggestion_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/Avatar_Standard"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friend_suggestion_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friend_suggestion_nickname" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_SingleLine"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextMuted" android:id="@+id/friend_suggestion_discriminator" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@+id/friend_suggestion_name" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_name" app:layout_constraintTop_toTopOf="@+id/friend_suggestion_name" style="@style/UiKit_TextView_SingleLine"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friend_suggestion_nickname" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/friend_suggestion_avatar" app:layout_constraintTop_toBottomOf="@+id/friend_suggestion_name" style="@style/UiKit_TextView_SingleLine"/>
     <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/friend_suggestion_selected" android:layout_width="32dp" android:layout_height="32dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_server_discovery_header.xml b/app/src/main/res/layout/view_server_discovery_header.xml
index 7356b84dc3..c172d716ef 100644
--- a/app/src/main/res/layout/view_server_discovery_header.xml
+++ b/app/src/main/res/layout/view_server_discovery_header.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" android:animateLayoutChanges="true">
-    <ImageView android:id="@+id/server_discovery_header_image" android:layout_width="0dp" android:src="@drawable/bg_server_discovery_header" android:scaleType="centerCrop" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textColor="@color/white" android:id="@+id/server_discovery_header_title" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_header_description" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintTop_toTopOf="@+id/server_discovery_header_image" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/server_discovery_header_description" android:layout_width="0dp" android:layout_marginTop="4dp" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_header_search_layout" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintTop_toBottomOf="@+id/server_discovery_header_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952574_uikit_textview_medium"/>
+    <ImageView android:id="@+id/server_discovery_header_image" android:layout_width="0dp" android:src="@drawable/bg_server_discovery_header" android:scaleType="centerCrop" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <TextView android:textColor="@color/white" android:id="@+id/server_discovery_header_title" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_header_description" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintTop_toTopOf="@+id/server_discovery_header_image" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/server_discovery_header_description" android:layout_width="0dp" android:layout_marginTop="4dp" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_header_search_layout" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintTop_toBottomOf="@+id/server_discovery_header_title" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Medium"/>
     <FrameLayout android:id="@+id/server_discovery_header_search_layout" android:background="@drawable/rounded_rectangle_4dp_radius" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/server_discovery_header_image" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintVertical_bias="1">
-        <TextView android:textColor="?attr/colorTextMuted" android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/directory_search_placeholder" style="@style/res_2131952574_uikit_textview_medium"/>
+        <TextView android:textColor="?attr/colorTextMuted" android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/directory_search_placeholder" style="@style/UiKit_TextView_Medium"/>
         <ImageView android:layout_gravity="end" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_grey_24dp" android:importantForAccessibility="no"/>
     </FrameLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_server_discovery_item.xml b/app/src/main/res/layout/view_server_discovery_item.xml
index 04e374d22e..cb1ac7fd45 100644
--- a/app/src/main/res/layout/view_server_discovery_item.xml
+++ b/app/src/main/res/layout/view_server_discovery_item.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:animateLayoutChanges="true">
-    <com.discord.views.GuildView android:id="@+id/server_discovery_item_image" android:layout_width="40dp" android:layout_height="40dp" android:layout_margin="16dp" android:scaleType="centerCrop" android:importantForAccessibility="no" app:gv_text_size="16sp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/server_discovery_item_barrier" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" style="@style/res_2131952448_uikit_imageview"/>
+    <com.discord.views.GuildView android:id="@+id/server_discovery_item_image" android:layout_width="40dp" android:layout_height="40dp" android:layout_margin="16dp" android:scaleType="centerCrop" android:importantForAccessibility="no" app:gv_text_size="16sp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/server_discovery_item_barrier" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" style="@style/UiKit_ImageView"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/server_discovery_item_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="6" app:constraint_referenced_ids="server_discovery_item_image"/>
-    <TextView android:id="@+id/server_discovery_item_title" android:layout_width="0dp" android:layout_marginTop="16dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_description" app:layout_constraintEnd_toStartOf="@+id/server_discovery_item_overflow" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toTopOf="0" app:layout_goneMarginEnd="16dp" style="@style/res_2131952565_uikit_textview_h1"/>
-    <ImageView android:id="@+id/server_discovery_item_overflow" android:layout_marginTop="16dp" android:src="?attr/ic_overflow" android:contentDescription="@string/settings" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_title" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/server_discovery_item_description" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_count_container" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/server_discovery_item_title" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:id="@+id/server_discovery_item_title" android:layout_width="0dp" android:layout_marginTop="16dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_description" app:layout_constraintEnd_toStartOf="@+id/server_discovery_item_overflow" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toTopOf="0" app:layout_goneMarginEnd="16dp" style="@style/UiKit_TextView_H1"/>
+    <ImageView android:id="@+id/server_discovery_item_overflow" android:layout_marginTop="16dp" android:src="?attr/ic_overflow" android:contentDescription="@string/settings" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_title" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/server_discovery_item_description" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_count_container" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/server_discovery_item_title" style="@style/UiKit_TextView_Medium"/>
     <include android:id="@+id/server_discovery_item_count_container" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/button_barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/server_discovery_item_description" layout="@layout/view_server_member_count"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/button_barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="2" app:constraint_referenced_ids="server_discovery_item_button, server_discovery_item_button_joined"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/server_discovery_item_button" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/join" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/button_barrier" style="@style/res_2131952460_uikit_material_button_green"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/server_discovery_item_button_joined" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/hub_directory_card_joined_guild_button" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/button_barrier" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/server_discovery_item_button" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/join" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/button_barrier" style="@style/UiKit_Material_Button_Green"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/server_discovery_item_button_joined" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/hub_directory_card_joined_guild_button" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/button_barrier" style="@style/UiKit_Material_Button_Secondary"/>
     <View android:background="@color/white_alpha_20" android:layout_width="0dp" android:layout_height="1dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/button_barrier" app:layout_constraintVertical_bias="1"/>
 </merge>
diff --git a/app/src/main/res/layout/view_server_member_count.xml b/app/src/main/res/layout/view_server_member_count.xml
index f13fc8bfbd..d2d15e9009 100644
--- a/app/src/main/res/layout/view_server_member_count.xml
+++ b/app/src/main/res/layout/view_server_member_count.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:layout_width="match_parent" android:layout_marginTop="4dp" android:minWidth="100dp" android:minHeight="16dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <ImageView android:id="@+id/item_invite_online_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_circle_green" android:contentDescription="@string/instant_invite_guild_members_online" android:layout_marginEnd="4dp" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/item_invite_online_text" android:singleLine="true" android:layout_marginEnd="8dp" style="@style/res_2131952392_uikit_chat_embed_subtext"/>
-    <ImageView android:id="@+id/item_invite_total_member_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_grey_user_icon" android:contentDescription="@string/instant_invite_guild_members_total" android:layout_marginEnd="4dp" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/item_invite_total_member_text" android:singleLine="true" style="@style/res_2131952392_uikit_chat_embed_subtext"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:layout_width="match_parent" android:layout_marginTop="4dp" android:minWidth="100dp" android:minHeight="16dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <ImageView android:id="@+id/item_invite_online_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_circle_green" android:contentDescription="@string/instant_invite_guild_members_online" android:layout_marginEnd="4dp" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/item_invite_online_text" android:singleLine="true" android:layout_marginEnd="8dp" style="@style/UiKit_Chat_Embed_Subtext"/>
+    <ImageView android:id="@+id/item_invite_total_member_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_grey_user_icon" android:contentDescription="@string/instant_invite_guild_members_total" android:layout_marginEnd="4dp" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/item_invite_total_member_text" android:singleLine="true" style="@style/UiKit_Chat_Embed_Subtext"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_server_settings_community_setting_selector.xml b/app/src/main/res/layout/view_server_settings_community_setting_selector.xml
index bea3346ce1..ebe7063fae 100644
--- a/app/src/main/res/layout/view_server_settings_community_setting_selector.xml
+++ b/app/src/main/res/layout/view_server_settings_community_setting_selector.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/server_settings_public_setting_selector" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/server_settings_public_setting_selector" style="@style/UiKit_ViewGroup_LinearLayout">
     <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/server_settings_community_setting_selector_title" android:paddingBottom="4dp" android:text="@string/enable_public_modal_rules_channel_title" android:fontFamily="?attr/font_primary_semibold" style="@style/res_2131952498_uikit_settings_item_label"/>
-            <TextView android:id="@+id/server_settings_community_setting_selector_subtitle" android:visibility="gone" android:drawablePadding="2dp" style="@style/res_2131952493_uikit_settings_item_addition"/>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/server_settings_community_setting_selector_title" android:paddingBottom="4dp" android:text="@string/enable_public_modal_rules_channel_title" android:fontFamily="?attr/font_primary_semibold" style="@style/UiKit_Settings_Item_Label"/>
+            <TextView android:id="@+id/server_settings_community_setting_selector_subtitle" android:visibility="gone" android:drawablePadding="2dp" style="@style/UiKit_Settings_Item_Addition"/>
         </LinearLayout>
         <ImageView android:id="@+id/server_settings_community_setting_selector_dropdown_icon" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_chevron_down_grey_12dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true"/>
     </RelativeLayout>
-    <TextView android:id="@+id/server_settings_community_setting_selector_description" android:paddingLeft="0dp" android:paddingTop="8dp" android:paddingRight="0dp" android:paddingBottom="0dp" android:text="@string/enable_public_modal_rules_channel_help" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+    <TextView android:id="@+id/server_settings_community_setting_selector_description" android:paddingLeft="0dp" android:paddingTop="8dp" android:paddingRight="0dp" android:paddingBottom="0dp" android:text="@string/enable_public_modal_rules_channel_help" style="@style/UiKit_Settings_Item_SubText"/>
 </merge>
diff --git a/app/src/main/res/layout/view_server_settings_icon_name.xml b/app/src/main/res/layout/view_server_settings_icon_name.xml
index 8d0f4b6f57..97e73fc7b7 100644
--- a/app/src/main/res/layout/view_server_settings_icon_name.xml
+++ b/app/src/main/res/layout/view_server_settings_icon_name.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/server_settings_overview_icon_name_container" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:clipToPadding="false" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/color_brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?attr/primary_600" style="@style/res_2131951679_avatar_xxlarge"/>
-    <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_upload_image_40dp" android:importantForAccessibility="no" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@+id/server_settings_overview_icon" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="42sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@+id/server_settings_overview_icon_text" android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="8dp" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@+id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@+id/server_settings_overview_icon" app:textAllCaps="true" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@+id/icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@+id/server_settings_overview_icon" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorTextLink" android:id="@+id/server_settings_overview_icon_remove" android:background="?attr/selectableItemBackground" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@+id/icon_label" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/overview_name" android:layout_width="0dp" android:hint="@string/form_label_server_name" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952558_uikit_textinputlayout_primary">
-        <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/server_settings_overview_icon_name_container" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:clipToPadding="false" style="@style/UiKit_ViewGroup_ConstraintLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/color_brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?attr/primary_600" style="@style/Avatar_XXLarge"/>
+    <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_upload_image_40dp" android:importantForAccessibility="no" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@+id/server_settings_overview_icon" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="42sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@+id/server_settings_overview_icon_text" android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="8dp" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@+id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@+id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit_TextView"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@+id/icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@+id/server_settings_overview_icon" style="@style/UiKit_TextView_Subtext"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorTextLink" android:id="@+id/server_settings_overview_icon_remove" android:background="?attr/selectableItemBackground" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@+id/icon_label" style="@style/UiKit_TextView_Subtext"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/overview_name" android:layout_width="0dp" android:hint="@string/form_label_server_name" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextInputLayout_Primary">
+        <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
     </com.google.android.material.textfield.TextInputLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_server_settings_notifications.xml b/app/src/main/res/layout/view_server_settings_notifications.xml
index 4006d68beb..fd026592da 100644
--- a/app/src/main/res/layout/view_server_settings_notifications.xml
+++ b/app/src/main/res/layout/view_server_settings_notifications.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:text="@string/form_label_default_notification_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-    <TextView android:text="@string/form_help_default_notification_settings_mobile" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <com.discord.views.CheckedSetting android:id="@+id/server_settings_overview_notification_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <com.discord.views.CheckedSetting android:id="@+id/server_settings_overview_notification_only_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:text="@string/form_label_default_notification_settings" style="@style/UiKit_Settings_Item_Header"/>
+    <TextView android:text="@string/form_help_default_notification_settings_mobile" style="@style/UiKit_Settings_Item_SubText"/>
+    <com.discord.views.CheckedSetting android:id="@+id/server_settings_overview_notification_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+    <com.discord.views.CheckedSetting android:id="@+id/server_settings_overview_notification_only_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_server_settings_region.xml b/app/src/main/res/layout/view_server_settings_region.xml
index a867f1ce0e..febf84b07f 100644
--- a/app/src/main/res/layout/view_server_settings_region.xml
+++ b/app/src/main/res/layout/view_server_settings_region.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/overview_region_wrap" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:text="@string/form_label_server_region" style="@style/res_2131952498_uikit_settings_item_label"/>
-        <TextView android:id="@+id/overview_region" style="@style/res_2131952493_uikit_settings_item_addition"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/overview_region_wrap" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:text="@string/form_label_server_region" style="@style/UiKit_Settings_Item_Label"/>
+        <TextView android:id="@+id/overview_region" style="@style/UiKit_Settings_Item_Addition"/>
     </LinearLayout>
     <ImageView android:layout_gravity="center" android:id="@+id/overview_region_flag" android:padding="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/form_label_server_region"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_server_settings_region_help.xml b/app/src/main/res/layout/view_server_settings_region_help.xml
index a3c3065686..debfbeaab7 100644
--- a/app/src/main/res/layout/view_server_settings_region_help.xml
+++ b/app/src/main/res/layout/view_server_settings_region_help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:id="@+id/overview_region_wrap_help" android:baselineAligned="false" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <TextView android:text="@string/form_label_server_region" style="@style/res_2131952498_uikit_settings_item_label"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/guild_region_help" android:paddingTop="4dp" android:text="@string/guild_region_deprecated_blurb" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:id="@+id/overview_region_wrap_help" android:baselineAligned="false" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <TextView android:text="@string/form_label_server_region" style="@style/UiKit_Settings_Item_Label"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/guild_region_help" android:paddingTop="4dp" android:text="@string/guild_region_deprecated_blurb" style="@style/UiKit_Settings_Item_SubText"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_server_settings_system_channel_wrap.xml b/app/src/main/res/layout/view_server_settings_system_channel_wrap.xml
index 61941d7ec5..a0027e7fb7 100644
--- a/app/src/main/res/layout/view_server_settings_system_channel_wrap.xml
+++ b/app/src/main/res/layout/view_server_settings_system_channel_wrap.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/system_channel_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:text="@string/form_label_system_channel" style="@style/res_2131952498_uikit_settings_item_label"/>
-    <TextView android:id="@+id/system_channel" android:drawablePadding="2dp" style="@style/res_2131952493_uikit_settings_item_addition"/>
-    <TextView android:text="@string/form_help_system_channel" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <com.discord.views.CheckedSetting android:id="@+id/system_channel_join" app:cs_text="@string/form_help_system_channel_join_messages" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <com.discord.views.CheckedSetting android:id="@+id/system_channel_boost" app:cs_text="@string/form_help_system_channel_premium_subscription_messages" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/system_channel_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:text="@string/form_label_system_channel" style="@style/UiKit_Settings_Item_Label"/>
+    <TextView android:id="@+id/system_channel" android:drawablePadding="2dp" style="@style/UiKit_Settings_Item_Addition"/>
+    <TextView android:text="@string/form_help_system_channel" style="@style/UiKit_Settings_Item_SubText"/>
+    <com.discord.views.CheckedSetting android:id="@+id/system_channel_join" app:cs_text="@string/form_help_system_channel_join_messages" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+    <com.discord.views.CheckedSetting android:id="@+id/system_channel_boost" app:cs_text="@string/form_help_system_channel_premium_subscription_messages" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_server_settings_upload_banner.xml b/app/src/main/res/layout/view_server_settings_upload_banner.xml
index 7fa3945689..0228e53da4 100644
--- a/app/src/main/res/layout/view_server_settings_upload_banner.xml
+++ b/app/src/main/res/layout/view_server_settings_upload_banner.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <TextView android:text="@string/guild_settings_server_banner" style="@style/res_2131952496_uikit_settings_item_header"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <View style="@style/UiKit_Settings_Divider"/>
+    <TextView android:text="@string/guild_settings_server_banner" style="@style/UiKit_Settings_Item_Header"/>
     <FrameLayout android:id="@+id/server_settings_overview_upload_banner_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:foreground="?attr/selectableItemBackground">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/upload_banner" android:background="?attr/primary_630" android:layout_width="match_parent" android:layout_height="wrap_content" app:roundedCornerRadius="3dp" app:viewAspectRatio="1.78"/>
-        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/upload_banner_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" app:backgroundTint="@color/white" app:fabCustomSize="32dp" app:maxImageSize="32dp" app:tint="@null" style="@style/res_2131952114_settings_floatingactionbutton"/>
-        <TextView android:layout_gravity="center" android:id="@+id/upload_banner_unlock" android:drawablePadding="8dp" android:textAllCaps="true" app:drawableTopCompat="@drawable/ic_perk_lock" style="@style/res_2131952564_uikit_textview_bold"/>
+        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/upload_banner_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" app:backgroundTint="@color/white" app:fabCustomSize="32dp" app:maxImageSize="32dp" app:tint="@null" style="@style/Settings_FloatingActionButton"/>
+        <TextView android:layout_gravity="center" android:id="@+id/upload_banner_unlock" android:drawablePadding="8dp" android:textAllCaps="true" app:drawableTopCompat="@drawable/ic_perk_lock" style="@style/UiKit_TextView_Bold"/>
     </FrameLayout>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/color_brand_500" android:id="@+id/server_settings_overview_upload_banner_remove" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <TextView android:id="@+id/upload_banner_nitro_tier" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:paddingBottom="4dp" android:text="@string/form_help_server_banner" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/upload_banner_learn_more" android:paddingBottom="4dp" android:text="@string/guild_settings_banner_recommend" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/color_brand_500" android:id="@+id/server_settings_overview_upload_banner_remove" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit_TextView_Subtext"/>
+    <TextView android:id="@+id/upload_banner_nitro_tier" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit_TextView"/>
+    <TextView android:paddingBottom="4dp" android:text="@string/form_help_server_banner" style="@style/UiKit_Settings_Item_SubText"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/upload_banner_learn_more" android:paddingBottom="4dp" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit_Settings_Item_SubText"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_server_settings_upload_splash.xml b/app/src/main/res/layout/view_server_settings_upload_splash.xml
index 0a3c45a0ff..3cdfeb05af 100644
--- a/app/src/main/res/layout/view_server_settings_upload_splash.xml
+++ b/app/src/main/res/layout/view_server_settings_upload_splash.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <TextView android:text="@string/guild_settings_server_invite_background" style="@style/res_2131952496_uikit_settings_item_header"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <View style="@style/UiKit_Settings_Divider"/>
+    <TextView android:text="@string/guild_settings_server_invite_background" style="@style/UiKit_Settings_Item_Header"/>
     <FrameLayout android:id="@+id/server_settings_overview_upload_splash_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:foreground="?attr/selectableItemBackground">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/upload_splash" android:background="?attr/primary_630" android:layout_width="match_parent" android:layout_height="wrap_content" app:roundedCornerRadius="3dp" app:viewAspectRatio="1.78"/>
-        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_overview_upload_splash_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" app:backgroundTint="@color/white" app:fabCustomSize="32dp" app:maxImageSize="32dp" app:tint="@null" style="@style/res_2131952114_settings_floatingactionbutton"/>
-        <TextView android:layout_gravity="center" android:id="@+id/upload_splash_unlock" android:drawablePadding="8dp" android:textAllCaps="true" app:drawableTopCompat="@drawable/ic_perk_lock" style="@style/res_2131952564_uikit_textview_bold"/>
+        <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_overview_upload_splash_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" app:backgroundTint="@color/white" app:fabCustomSize="32dp" app:maxImageSize="32dp" app:tint="@null" style="@style/Settings_FloatingActionButton"/>
+        <TextView android:layout_gravity="center" android:id="@+id/upload_splash_unlock" android:drawablePadding="8dp" android:textAllCaps="true" app:drawableTopCompat="@drawable/ic_perk_lock" style="@style/UiKit_TextView_Bold"/>
     </FrameLayout>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/color_brand_500" android:id="@+id/server_settings_overview_upload_splash_remove" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <TextView android:id="@+id/upload_splash_nitro_tier" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:paddingBottom="4dp" android:text="@string/guild_settings_splash_info" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/upload_splash_learn_more" android:paddingTop="4dp" android:text="@string/guild_settings_splash_recommend" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/color_brand_500" android:id="@+id/server_settings_overview_upload_splash_remove" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit_TextView_Subtext"/>
+    <TextView android:id="@+id/upload_splash_nitro_tier" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit_TextView"/>
+    <TextView android:paddingBottom="4dp" android:text="@string/guild_settings_splash_info" style="@style/UiKit_Settings_Item_SubText"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/upload_splash_learn_more" android:paddingTop="4dp" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit_Settings_Item_SubText"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_setting_check.xml b/app/src/main/res/layout/view_setting_check.xml
index 0f6cb4dfeb..ef5201b430 100644
--- a/app/src/main/res/layout/view_setting_check.xml
+++ b/app/src/main/res/layout/view_setting_check.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952589_uikit_viewgroup">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/setting_container" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/setting_container" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <include layout="@layout/view_setting_shared"/>
         <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" android:buttonTint="?attr/colorCompoundButton" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_setting_radio.xml b/app/src/main/res/layout/view_setting_radio.xml
index 0dcdcaf8fa..8280c3b664 100644
--- a/app/src/main/res/layout/view_setting_radio.xml
+++ b/app/src/main/res/layout/view_setting_radio.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952589_uikit_viewgroup">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/setting_container" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/setting_container" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <include layout="@layout/view_setting_shared"/>
         <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" android:buttonTint="?attr/colorCompoundButton" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_setting_shared.xml b/app/src/main/res/layout/view_setting_shared.xml
index 431a95c8ac..5efa5960ea 100644
--- a/app/src/main/res/layout/view_setting_shared.xml
+++ b/app/src/main/res/layout/view_setting_shared.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@+id/setting_drawable_left" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:id="@+id/setting_label" android:layout_width="wrap_content" android:layout_marginStart="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/setting_subtext" app:layout_constraintEnd_toStartOf="@+id/setting_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toTopOf="0" app:layout_goneMarginStart="0dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:id="@+id/setting_tag" android:visibility="gone" android:text="@string/recommended" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/setting_label" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_label" app:layout_constraintTop_toTopOf="@+id/setting_label" style="@style/res_2131952583_uikit_textview_tagged"/>
-    <TextView android:id="@+id/setting_subtext" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toBottomOf="@+id/setting_label" app:layout_goneMarginStart="0dp" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:id="@+id/setting_label" android:layout_width="wrap_content" android:layout_marginStart="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/setting_subtext" app:layout_constraintEnd_toStartOf="@+id/setting_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toTopOf="0" app:layout_goneMarginStart="0dp" style="@style/UiKit_TextView"/>
+    <TextView android:id="@+id/setting_tag" android:visibility="gone" android:text="@string/recommended" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/setting_label" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_label" app:layout_constraintTop_toTopOf="@+id/setting_label" style="@style/UiKit_TextView_Tagged"/>
+    <TextView android:id="@+id/setting_subtext" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/setting_button" app:layout_constraintStart_toEndOf="@+id/setting_drawable_left" app:layout_constraintTop_toBottomOf="@+id/setting_label" app:layout_goneMarginStart="0dp" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/view_setting_switch.xml b/app/src/main/res/layout/view_setting_switch.xml
index f4eccbc7e9..1645028c49 100644
--- a/app/src/main/res/layout/view_setting_switch.xml
+++ b/app/src/main/res/layout/view_setting_switch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952589_uikit_viewgroup">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/setting_container" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/setting_container" android:background="?attr/selectableItemBackground" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <include layout="@layout/view_setting_shared"/>
         <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:thumbTint="?attr/colorCompoundButton"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_settings_boosted_boost_listitem.xml b/app/src/main/res/layout/view_settings_boosted_boost_listitem.xml
index 6a1ccba15f..43dbdd3459 100644
--- a/app/src/main/res/layout/view_settings_boosted_boost_listitem.xml
+++ b/app/src/main/res/layout/view_settings_boosted_boost_listitem.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" style="@style/res_2131952589_uikit_viewgroup">
-    <ImageView android:id="@+id/boosted_boost_cancelled" android:src="@drawable/ic_warning_circle_24dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="8dp" android:layout_alignParentStart="true" style="@style/res_2131952448_uikit_imageview"/>
-    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:layout_width="match_parent" android:layout_centerVertical="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/boosted_boost_action" android:layout_toEndOf="@+id/boosted_boost_cancelled" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/boosted_boost_date" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/boosted_boost_cooldown" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" style="@style/UiKit_ViewGroup">
+    <ImageView android:id="@+id/boosted_boost_cancelled" android:src="@drawable/ic_warning_circle_24dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="8dp" android:layout_alignParentStart="true" style="@style/UiKit_ImageView"/>
+    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:layout_width="match_parent" android:layout_centerVertical="true" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/boosted_boost_action" android:layout_toEndOf="@+id/boosted_boost_cancelled" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/boosted_boost_date" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/boosted_boost_cooldown" style="@style/UiKit_TextView"/>
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/boosted_boost_action" android:text="@string/premium_guild_subscription_select_server_button" android:drawablePadding="16dp" android:layout_centerVertical="true" android:contentDescription="@string/manage_premium_guild_subscription" android:layout_alignParentEnd="true" app:drawableEndCompat="?attr/ic_overflow" style="@style/res_2131952572_uikit_textview_link"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/boosted_boost_action" android:text="@string/premium_guild_subscription_select_server_button" android:drawablePadding="16dp" android:layout_centerVertical="true" android:contentDescription="@string/manage_premium_guild_subscription" android:layout_alignParentEnd="true" app:drawableEndCompat="?attr/ic_overflow" style="@style/UiKit_TextView_Link"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_settings_boosted_guild_listitem.xml b/app/src/main/res/layout/view_settings_boosted_guild_listitem.xml
index 0f8ac42e86..95fbc5ce21 100644
--- a/app/src/main/res/layout/view_settings_boosted_guild_listitem.xml
+++ b/app/src/main/res/layout/view_settings_boosted_guild_listitem.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_marginTop="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952589_uikit_viewgroup">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_ViewGroup">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/boosted_guild_banner" android:background="?attr/bg_subscription_placeholder_pattern" android:layout_width="match_parent" android:layout_height="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
         <View android:id="@+id/boosted_guild_gradient" android:background="@color/primary_700" android:layout_width="match_parent" android:layout_height="0dp" android:alpha="0.65" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
         <com.discord.views.premiumguild.PremiumGuildProgressView android:id="@+id/boosted_guild_progress_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <LinearLayout android:background="?attr/colorBackgroundFloating" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/boosted_sample_guild_icon" android:layout_marginRight="8dp" style="@style/res_2131952435_uikit_guildslisticon"/>
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/boosted_sample_guild_name" android:maxLines="1" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/boosted_sample_guild_count" android:paddingTop="4dp" android:paddingBottom="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:background="?attr/colorBackgroundFloating" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/boosted_sample_guild_icon" android:layout_marginRight="8dp" style="@style/UiKit_GuildsListIcon"/>
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/boosted_sample_guild_name" android:maxLines="1" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/boosted_sample_guild_count" android:paddingTop="4dp" android:paddingBottom="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_settings_boosted_header_listitem.xml b/app/src/main/res/layout/view_settings_boosted_header_listitem.xml
index f37b981ff0..04759f7b82 100644
--- a/app/src/main/res/layout/view_settings_boosted_header_listitem.xml
+++ b/app/src/main/res/layout/view_settings_boosted_header_listitem.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/boosted_header" style="@style/res_2131952496_uikit_settings_item_header"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/boosted_header" style="@style/UiKit_Settings_Item_Header"/>
diff --git a/app/src/main/res/layout/view_settings_boosted_sample_guild.xml b/app/src/main/res/layout/view_settings_boosted_sample_guild.xml
index ca487e455c..0d7e3a5304 100644
--- a/app/src/main/res/layout/view_settings_boosted_sample_guild.xml
+++ b/app/src/main/res/layout/view_settings_boosted_sample_guild.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginBottom="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <RelativeLayout android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/boosted_sample_guild_icon" android:layout_marginRight="16dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/res_2131952435_uikit_guildslisticon"/>
-        <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/boosted_sample_guild_progress" android:layout_toEndOf="@+id/boosted_sample_guild_icon" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/boosted_sample_guild_name" android:maxLines="1" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/boosted_sample_guild_count" android:paddingTop="4dp" android:paddingBottom="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/res_2131952563_uikit_textview"/>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginBottom="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <RelativeLayout android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/boosted_sample_guild_icon" android:layout_marginRight="16dp" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit_GuildsListIcon"/>
+        <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/boosted_sample_guild_progress" android:layout_toEndOf="@+id/boosted_sample_guild_icon" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/boosted_sample_guild_name" android:maxLines="1" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/boosted_sample_guild_count" android:paddingTop="4dp" android:paddingBottom="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
         <com.discord.views.premiumguild.PremiumGuildProgressView android:id="@+id/boosted_sample_guild_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_alignParentEnd="true"/>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/view_settings_premium_guild_marketing_header.xml b/app/src/main/res/layout/view_settings_premium_guild_marketing_header.xml
index d24d80cc6b..3c3ce113db 100644
--- a/app/src/main/res/layout/view_settings_premium_guild_marketing_header.xml
+++ b/app/src/main/res/layout/view_settings_premium_guild_marketing_header.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:layout_gravity="center_horizontal" android:src="@drawable/img_boost_hands" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="16dp" android:src="@drawable/img_server_boost_long" android:importantForAccessibility="no" app:tint="?attr/colorInteractiveActive" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_header" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/res_2131952563_uikit_textview"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:layout_gravity="center_horizontal" android:src="@drawable/img_boost_hands" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <ImageView android:layout_gravity="center_horizontal" android:layout_marginTop="16dp" android:src="@drawable/img_server_boost_long" android:importantForAccessibility="no" app:tint="?attr/colorInteractiveActive" style="@style/UiKit_ImageView"/>
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_header" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_marketing_blurb" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/view_settings_premium_guild_no_guilds.xml b/app/src/main/res/layout/view_settings_premium_guild_no_guilds.xml
index 04f66230a6..2ceecc6560 100644
--- a/app/src/main/res/layout/view_settings_premium_guild_no_guilds.xml
+++ b/app/src/main/res/layout/view_settings_premium_guild_no_guilds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:layout_gravity="center_horizontal" android:id="@+id/settings_boost_no_guilds_image" android:src="?attr/img_gem_hands_faded" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/settings_boost_no_guilds_title" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_title" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/settings_boost_no_guilds_subtitle" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_text" style="@style/res_2131952563_uikit_textview"/>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:layout_gravity="center_horizontal" android:id="@+id/settings_boost_no_guilds_image" android:src="?attr/img_gem_hands_faded" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/settings_boost_no_guilds_title" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_title" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/settings_boost_no_guilds_subtitle" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_marketing_guilds_empty_description_text" style="@style/UiKit_TextView"/>
 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/view_simple_spinner_dropdown_item.xml b/app/src/main/res/layout/view_simple_spinner_dropdown_item.xml
index af7b0eaffc..e63e4e8ef5 100644
--- a/app/src/main/res/layout/view_simple_spinner_dropdown_item.xml
+++ b/app/src/main/res/layout/view_simple_spinner_dropdown_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:padding="8dp" android:layout_width="match_parent" android:textAlignment="inherit" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:padding="8dp" android:layout_width="match_parent" android:textAlignment="inherit" style="@style/UiKit_TextView_Large_SingleLine"/>
diff --git a/app/src/main/res/layout/view_stage_channel_speaker.xml b/app/src/main/res/layout/view_stage_channel_speaker.xml
index eee96b7c8c..e1280787f8 100644
--- a/app/src/main/res/layout/view_stage_channel_speaker.xml
+++ b/app/src/main/res/layout/view_stage_channel_speaker.xml
@@ -7,7 +7,7 @@
         <com.discord.views.VoiceUserView android:layout_gravity="center" android:id="@+id/stage_channel_speaker" android:layout_width="@dimen/avatar_size_extra_large" android:layout_height="@dimen/avatar_size_extra_large" app:vuv_animate_avatar_when_ringing="false" app:vuv_fade_when_disconnected="true"/>
     </com.discord.views.calls.SpeakerPulseView>
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:orientation="horizontal" android:background="@drawable/bg_stream_label" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_marginBottom="4dp">
-        <ImageView android:id="@+id/stage_channel_speaker_blocked" android:background="@drawable/drawable_circle_white" android:padding="2dp" android:src="@drawable/ic_blocked_12dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorStatusDangerBackground" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textColor="@color/white" android:id="@+id/stage_channel_speaker_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_speaker_blocked" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_speaker_blocked" app:layout_constraintTop_toTopOf="@+id/stage_channel_speaker_blocked" style="@style/res_2131952580_uikit_textview_singleline"/>
+        <ImageView android:id="@+id/stage_channel_speaker_blocked" android:background="@drawable/drawable_circle_white" android:padding="2dp" android:src="@drawable/ic_blocked_12dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorStatusDangerBackground" style="@style/UiKit_ImageView"/>
+        <TextView android:textColor="@color/white" android:id="@+id/stage_channel_speaker_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="6dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/stage_channel_speaker_blocked" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_channel_speaker_blocked" app:layout_constraintTop_toTopOf="@+id/stage_channel_speaker_blocked" style="@style/UiKit_TextView_SingleLine"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
diff --git a/app/src/main/res/layout/view_stage_channel_visit_community.xml b/app/src/main/res/layout/view_stage_channel_visit_community.xml
index c739498e0d..a92933b985 100644
--- a/app/src/main/res/layout/view_stage_channel_visit_community.xml
+++ b/app/src/main/res/layout/view_stage_channel_visit_community.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/rounded_rectangle_1000dp_radius" android:layout_width="wrap_content" android:layout_height="wrap_content" android:backgroundTint="@color/white_alpha_10">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/visit_community_icon" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/visit_community_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@+id/visit_community_icon_text" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/visit_community_icon" app:layout_constraintLeft_toLeftOf="@+id/visit_community_icon" app:layout_constraintRight_toRightOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="@+id/visit_community_icon" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="@color/white" android:id="@+id/visit_community_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/visit_community" android:layout_marginStart="4dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/visit_community_icon" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/visit_community_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Medium"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@+id/visit_community_icon_text" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/visit_community_icon" app:layout_constraintLeft_toLeftOf="@+id/visit_community_icon" app:layout_constraintRight_toRightOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="@+id/visit_community_icon" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="@color/white" android:id="@+id/visit_community_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/visit_community" android:layout_marginStart="4dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/visit_community_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_steps.xml b/app/src/main/res/layout/view_steps.xml
index 6ca4ffcd40..3af51020a5 100644
--- a/app/src/main/res/layout/view_steps.xml
+++ b/app/src/main/res/layout/view_steps.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <androidx.viewpager2.widget.ViewPager2 android:id="@+id/steps_viewpager" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@+id/steps_button_container" android:layout_below="@+id/steps_close"/>
-    <ImageView android:id="@+id/steps_close" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:foreground="?attr/selectableItemBackgroundBorderless" android:src="?attr/ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:gravity="center" android:id="@+id/steps_title" android:paddingTop="16dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignTop="@+id/steps_close" android:layout_alignBottom="@+id/steps_close" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_marginStart="40dp" android:layout_toStartOf="@+id/steps_close" style="@style/res_2131952569_uikit_textview_h6"/>
-    <LinearLayout android:id="@+id/steps_button_container" android:visibility="gone" android:layout_margin="16dp" android:layout_alignParentBottom="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.discord.views.LoadingButton android:id="@+id/steps_done" android:paddingLeft="0dp" android:paddingRight="0dp" android:visibility="gone" android:text="@string/done" app:lb_progress_color="@color/white" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/steps_next" android:text="@string/next" style="@style/res_2131952458_uikit_material_button"/>
-        <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/steps_cancel" android:background="?attr/selectableItemBackground" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_marginTop="4dp" android:text="@string/cancel" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+    <ImageView android:id="@+id/steps_close" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:foreground="?attr/selectableItemBackgroundBorderless" android:src="?attr/ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" style="@style/UiKit_ImageView"/>
+    <TextView android:gravity="center" android:id="@+id/steps_title" android:paddingTop="16dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignTop="@+id/steps_close" android:layout_alignBottom="@+id/steps_close" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_marginStart="40dp" android:layout_toStartOf="@+id/steps_close" style="@style/UiKit_TextView_H6"/>
+    <LinearLayout android:id="@+id/steps_button_container" android:visibility="gone" android:layout_margin="16dp" android:layout_alignParentBottom="true" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.discord.views.LoadingButton android:id="@+id/steps_done" android:paddingLeft="0dp" android:paddingRight="0dp" android:visibility="gone" android:text="@string/done" app:lb_progress_color="@color/white" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/steps_next" android:text="@string/next" style="@style/UiKit_Material_Button"/>
+        <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/steps_cancel" android:background="?attr/selectableItemBackground" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_marginTop="4dp" android:text="@string/cancel" style="@style/UiKit_TextView_Large_SingleLine"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/view_stream_preview.xml b/app/src/main/res/layout/view_stream_preview.xml
index 017ad60f5c..f154c8f6ff 100644
--- a/app/src/main/res/layout/view_stream_preview.xml
+++ b/app/src/main/res/layout/view_stream_preview.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/bg_stream_preview" android:layout_width="match_parent" android:layout_height="wrap_content" android:backgroundTint="?attr/colorBackgroundTertiary">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stream_preview_image" android:layout_width="match_parent" android:layout_height="152dp" app:layout_constraintBottom_toTopOf="@+id/stream_preview_placeholder_caption" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/drawable_stream_preview_not_available"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@+id/stream_preview_overlay_text" android:background="@drawable/bg_stream_preview_overlay_caption" android:padding="8dp" android:text="@string/join_stream" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/stream_preview_placeholder_caption" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/stream_preview_loading" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stream_preview_image" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@+id/stream_preview_overlay_text" android:background="@drawable/bg_stream_preview_overlay_caption" android:padding="8dp" android:text="@string/join_stream" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/stream_preview_placeholder_caption" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/stream_preview_loading" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stream_preview_image" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_ternary_checkbox.xml b/app/src/main/res/layout/view_ternary_checkbox.xml
index 38b17b04a4..26aa4aacd8 100644
--- a/app/src/main/res/layout/view_ternary_checkbox.xml
+++ b/app/src/main/res/layout/view_ternary_checkbox.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
     <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
-        <RelativeLayout style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-            <LinearLayout android:padding="16dp" android:layout_toStartOf="@+id/checkboxes_container" android:layout_alignParentStart="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/setting_label" android:layout_marginEnd="16dp" style="@style/res_2131952570_uikit_textview_large"/>
-                <TextView android:id="@+id/setting_subtext" android:layout_marginTop="5dp" style="@style/res_2131952563_uikit_textview"/>
+        <RelativeLayout style="@style/UiKit_ViewGroup_RelativeLayout">
+            <LinearLayout android:padding="16dp" android:layout_toStartOf="@+id/checkboxes_container" android:layout_alignParentStart="true" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/setting_label" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_Large"/>
+                <TextView android:id="@+id/setting_subtext" android:layout_marginTop="5dp" style="@style/UiKit_TextView"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/checkboxes_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+            <LinearLayout android:id="@+id/checkboxes_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <FrameLayout android:id="@+id/checkable_off_container" android:layout_width="44dp" android:layout_height="32dp">
-                    <com.discord.views.CheckableImageView android:id="@+id/ternary_check_off" android:background="@drawable/drawable_bg_ternary_off" android:src="@drawable/drawable_ic_ternary_off" style="@style/res_2131952395_uikit_checkableimageview"/>
+                    <com.discord.views.CheckableImageView android:id="@+id/ternary_check_off" android:background="@drawable/drawable_bg_ternary_off" android:src="@drawable/drawable_ic_ternary_off" style="@style/UiKit_CheckableImageView"/>
                     <View android:id="@+id/off_disabled_overlay" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="match_parent" android:layout_height="match_parent"/>
                 </FrameLayout>
-                <com.discord.views.CheckableImageView android:id="@+id/ternary_check_neutral" android:background="@drawable/drawable_bg_ternary_neutral" android:src="@drawable/drawable_ic_ternary_neutral" style="@style/res_2131952395_uikit_checkableimageview"/>
-                <com.discord.views.CheckableImageView android:id="@+id/ternary_check_on" android:background="@drawable/drawable_bg_ternary_on" android:src="@drawable/drawable_ic_ternary_on" style="@style/res_2131952395_uikit_checkableimageview"/>
+                <com.discord.views.CheckableImageView android:id="@+id/ternary_check_neutral" android:background="@drawable/drawable_bg_ternary_neutral" android:src="@drawable/drawable_ic_ternary_neutral" style="@style/UiKit_CheckableImageView"/>
+                <com.discord.views.CheckableImageView android:id="@+id/ternary_check_on" android:background="@drawable/drawable_bg_ternary_on" android:src="@drawable/drawable_ic_ternary_on" style="@style/UiKit_CheckableImageView"/>
             </LinearLayout>
         </RelativeLayout>
         <View android:id="@+id/setting_disabled_overlay" android:background="?attr/ternaryCheckboxDisabledColor" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="match_parent" android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/view_toolbar_title.xml b/app/src/main/res/layout/view_toolbar_title.xml
index da984659aa..007c6520f1 100644
--- a/app/src/main/res/layout/view_toolbar_title.xml
+++ b/app/src/main/res/layout/view_toolbar_title.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ImageView android:id="@+id/toolbar_icon" android:layout_height="24dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/toolbar_title" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" app:drawableTint="?attr/colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@+id/toolbar_presence" app:layout_constraintStart_toEndOf="@+id/toolbar_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952544_uikit_textappearance_toolbar_title"/>
-    <TextView android:id="@+id/toolbar_title_subtext" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/toolbar_title" app:layout_constraintTop_toBottomOf="@+id/toolbar_title" style="@style/res_2131952543_uikit_textappearance_toolbar_subtitle"/>
+    <ImageView android:id="@+id/toolbar_icon" android:layout_height="24dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/toolbar_title" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" app:drawableTint="?attr/colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@+id/toolbar_presence" app:layout_constraintStart_toEndOf="@+id/toolbar_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextAppearance_Toolbar_Title"/>
+    <TextView android:id="@+id/toolbar_title_subtext" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/toolbar_title" app:layout_constraintTop_toBottomOf="@+id/toolbar_title" style="@style/UiKit_TextAppearance_Toolbar_Subtitle"/>
     <com.discord.views.StatusView android:id="@+id/toolbar_presence" android:visibility="gone" android:layout_width="12dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="@+id/toolbar_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/toolbar_title" app:layout_constraintTop_toTopOf="@+id/toolbar_title"/>
 </merge>
diff --git a/app/src/main/res/layout/view_upload_progress.xml b/app/src/main/res/layout/view_upload_progress.xml
index 5f857b1ab9..d3064c51a8 100644
--- a/app/src/main/res/layout/view_upload_progress.xml
+++ b/app/src/main/res/layout/view_upload_progress.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/progress_file_image" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/progress_text" app:layout_constraintEnd_toStartOf="@+id/progress_text" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/progress_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/progress_text"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:ellipsize="middle" android:id="@+id/progress_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/progress_bar" app:layout_constraintEnd_toStartOf="@+id/progress_subtext" app:layout_constraintLeft_toRightOf="@+id/progress_file_image" app:layout_constraintRight_toLeftOf="@+id/progress_subtext" app:layout_constraintStart_toEndOf="@+id/progress_file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:ellipsize="middle" android:id="@+id/progress_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/progress_bar" app:layout_constraintEnd_toStartOf="@+id/progress_subtext" app:layout_constraintLeft_toRightOf="@+id/progress_file_image" app:layout_constraintRight_toLeftOf="@+id/progress_subtext" app:layout_constraintStart_toEndOf="@+id/progress_file_image" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Semibold"/>
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_200" android:id="@+id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/progress_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/progress_text" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/progress_text"/>
     <ProgressBar android:id="@+id/progress_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:maxHeight="1dp" android:max="100" android:minHeight="1dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/progress_text" style="@style/res_2131952680_widget_appcompat_progressbar_horizontal"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_user_list_item.xml b/app/src/main/res/layout/view_user_list_item.xml
index eff8747192..04df8e3626 100644
--- a/app/src/main/res/layout/view_user_list_item.xml
+++ b/app/src/main/res/layout/view_user_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_list_item_avatar" android:layout_centerVertical="true" android:layout_marginEnd="24dp" style="@style/res_2131951678_avatar_standard"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_list_item_avatar" android:layout_centerVertical="true" android:layout_marginEnd="24dp" style="@style/Avatar_Standard"/>
     <com.discord.views.StatusView android:id="@+id/user_list_item_status" android:layout_width="16dp" android:layout_height="wrap_content" android:layout_alignBottom="@+id/user_list_item_avatar" android:translationX="2dp" android:translationY="2dp" android:layout_alignEnd="@+id/user_list_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="2dp" app:sv_corner_radius="4dp"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/user_list_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/user_list_item_avatar" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/user_list_item_name_secondary" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="5dp" android:layout_toEndOf="@+id/user_list_item_name" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/user_list_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/user_list_item_avatar" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/user_list_item_name_secondary" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="5dp" android:layout_toEndOf="@+id/user_list_item_name" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/view_user_status_presence.xml b/app/src/main/res/layout/view_user_status_presence.xml
index 3b0d604ffb..de36726efa 100644
--- a/app/src/main/res/layout/view_user_status_presence.xml
+++ b/app/src/main/res/layout/view_user_status_presence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/user_status_update_online" android:background="?attr/bg_pressed_highlight" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/user_status_update_online" android:background="?attr/bg_pressed_highlight" android:padding="16dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <ImageView android:layout_gravity="top" android:id="@+id/user_status_presence_dot" android:layout_width="16dp" android:layout_height="16dp" android:layout_margin="4dp" android:importantForAccessibility="no"/>
-    <LinearLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textColor="?attr/primary_100" android:id="@+id/user_status_presence_title" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:id="@+id/user_status_presence_subtitle" android:layout_marginTop="4dp" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textColor="?attr/primary_100" android:id="@+id/user_status_presence_title" style="@style/UiKit_TextView_Large"/>
+        <TextView android:id="@+id/user_status_presence_subtitle" android:layout_marginTop="4dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_user_status_presence_custom.xml b/app/src/main/res/layout/view_user_status_presence_custom.xml
index 3d52cee511..a5f7127dde 100644
--- a/app/src/main/res/layout/view_user_status_presence_custom.xml
+++ b/app/src/main/res/layout/view_user_status_presence_custom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/bg_pressed_highlight" android:padding="16dp" android:focusable="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/bg_pressed_highlight" android:padding="16dp" android:focusable="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_status_presence_custom_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" android:layout_marginEnd="16dp" app:placeholderImage="@drawable/ic_smiley_desaturated"/>
-    <TextView android:textColor="?attr/primary_100" android:id="@+id/user_status_presence_custom_text" android:layout_width="0dp" android:singleLine="true" android:layout_weight="1" style="@style/res_2131952570_uikit_textview_large"/>
-    <androidx.appcompat.widget.AppCompatImageView android:id="@+id/user_status_presence_custom_clear" android:src="?attr/ic_close_24dp" android:contentDescription="@string/custom_status_clear_custom_status" android:layout_marginStart="16dp" app:tint="?attr/primary_300" style="@style/res_2131952449_uikit_imageview_clickable"/>
+    <TextView android:textColor="?attr/primary_100" android:id="@+id/user_status_presence_custom_text" android:layout_width="0dp" android:singleLine="true" android:layout_weight="1" style="@style/UiKit_TextView_Large"/>
+    <androidx.appcompat.widget.AppCompatImageView android:id="@+id/user_status_presence_custom_clear" android:src="?attr/ic_close_24dp" android:contentDescription="@string/custom_status_clear_custom_status" android:layout_marginStart="16dp" app:tint="?attr/primary_300" style="@style/UiKit_ImageView_Clickable"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_username.xml b/app/src/main/res/layout/view_username.xml
index 77f6cebb43..384cfc75e6 100644
--- a/app/src/main/res/layout/view_username.xml
+++ b/app/src/main/res/layout/view_username.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <com.facebook.drawee.span.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="start" android:id="@+id/username_text" android:singleLine="true" android:shadowColor="@color/primary_light_100" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/username_tag" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@+id/username_tag" android:background="@drawable/drawable_tag_brand" android:paddingTop="0.5dp" android:paddingBottom="0.5dp" android:visibility="gone" android:singleLine="true" android:paddingStart="3dp" android:paddingEnd="3dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/username_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/username_text" app:layout_constraintTop_toTopOf="@+id/username_text" style="@style/res_2131952563_uikit_textview"/>
+    <com.facebook.drawee.span.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="start" android:id="@+id/username_text" android:singleLine="true" android:shadowColor="@color/primary_light_100" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/username_tag" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@+id/username_tag" android:background="@drawable/drawable_tag_brand" android:paddingTop="0.5dp" android:paddingBottom="0.5dp" android:visibility="gone" android:singleLine="true" android:paddingStart="3dp" android:paddingEnd="3dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/username_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/username_text" app:layout_constraintTop_toTopOf="@+id/username_text" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/view_video_call_participant.xml b/app/src/main/res/layout/view_video_call_participant.xml
index 80610670f9..362bc37a47 100644
--- a/app/src/main/res/layout/view_video_call_participant.xml
+++ b/app/src/main/res/layout/view_video_call_participant.xml
@@ -6,10 +6,10 @@
     <com.discord.views.calls.AppVideoStreamRenderer android:id="@+id/participant_video_stream_renderer" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:vcpv_is_overlay="false" app:vcpv_match_video_orientation="false"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/participant_stream_preview_image" android:background="@color/primary_dark_700" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" android:alpha="0.3" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintDimensionRatio="16:9" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/drawable_stream_preview_not_available"/>
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:id="@+id/participant_stream_preview_text" android:background="@drawable/bg_stream_preview_overlay_caption_opaque" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/watch_stream" android:fontFamily="?attr/font_primary_semibold" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@+id/participant_stream_paused" android:background="@color/black_alpha_70" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:text="@string/stream_capture_paused" android:fontFamily="?attr/font_primary_semibold" style="@style/res_2131952563_uikit_textview"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center_horizontal" android:id="@+id/participant_stream_ended" android:background="@color/black" android:padding="24dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerVertical="true" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@+id/participant_stream_paused" android:background="@color/black_alpha_70" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:text="@string/stream_capture_paused" android:fontFamily="?attr/font_primary_semibold" style="@style/UiKit_TextView"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center_horizontal" android:id="@+id/participant_stream_ended" android:background="@color/black" android:padding="24dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerVertical="true" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <ImageView android:id="@+id/participant_stream_ended_img" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/drawable_stream_ended_dark" android:scaleType="fitCenter" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/participant_stream_ended_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2"/>
-        <TextView android:theme="@style/res_2131951648_apptheme_dark" android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/participant_stream_ended_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_ended" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/participant_stream_ended_img" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:theme="@style/AppTheme_Dark" android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/participant_stream_ended_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_ended" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/participant_stream_ended_img" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <ProgressBar android:id="@+id/participant_video_loading_indicator" android:visibility="gone" android:layout_width="50dp" android:layout_height="50dp" android:indeterminate="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
     <TextView android:textSize="14dp" android:textColor="@color/white" android:id="@+id/participant_video_label" android:background="@drawable/bg_stream_label" android:paddingLeft="8dp" android:paddingTop="5dp" android:paddingRight="8dp" android:paddingBottom="5dp" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginBottom="8dp" android:includeFontPadding="false" android:drawablePadding="6dp" android:fontFamily="?attr/font_primary_normal" app:drawableLeftCompat="@drawable/ic_screen_14dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/participant_voice_indicators"/>
diff --git a/app/src/main/res/layout/view_voice_user.xml b/app/src/main/res/layout/view_voice_user.xml
index a53e8ffa55..f9b252343a 100644
--- a/app/src/main/res/layout/view_voice_user.xml
+++ b/app/src/main/res/layout/view_voice_user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
     <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/voice_user_avatar" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="4dp" app:actualImageScaleType="2" app:fadeDuration="0" app:roundAsCircle="true"/>
-    <TextView android:textSize="18sp" android:textColor="@color/primary_100" android:gravity="center" android:layout_gravity="center" android:id="@+id/voice_user_name_display" android:background="@drawable/drawable_bg_voice_user_overlay" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/res_2131952564_uikit_textview_bold"/>
+    <TextView android:textSize="18sp" android:textColor="@color/primary_100" android:gravity="center" android:layout_gravity="center" android:id="@+id/voice_user_name_display" android:background="@drawable/drawable_bg_voice_user_overlay" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/UiKit_TextView_Bold"/>
 </merge>
diff --git a/app/src/main/res/layout/voice_controls_sheet_view.xml b/app/src/main/res/layout/voice_controls_sheet_view.xml
index 989fc5b295..746333aefb 100644
--- a/app/src/main/res/layout/voice_controls_sheet_view.xml
+++ b/app/src/main/res/layout/voice_controls_sheet_view.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/VoiceControlsSheet">
-    <LinearLayout android:id="@+id/peek_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:id="@+id/peek_container" style="@style/UiKit_ViewGroup_LinearLayout">
         <View android:layout_gravity="center" android:id="@+id/handle" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="40dp" android:layout_height="4dp" android:layout_marginTop="4dp" android:layout_marginBottom="8dp" android:alpha="0.8"/>
-        <LinearLayout android:gravity="center" android:layout_marginBottom="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <ImageView android:id="@+id/video_button" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" app:backgroundTint="?attr/colorBackgroundPrimary" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
-            <ImageView android:id="@+id/screen_share_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mobile_screenshare_24dp" android:contentDescription="@string/video" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
-            <ImageView android:id="@+id/move_to_audience_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stage_move_to_audience" android:contentDescription="@string/move_me_to_audience" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+        <LinearLayout android:gravity="center" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <ImageView android:id="@+id/video_button" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" app:backgroundTint="?attr/colorBackgroundPrimary" style="@style/UiKit_Calls_ButtonCircle"/>
+            <ImageView android:id="@+id/screen_share_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mobile_screenshare_24dp" android:contentDescription="@string/video" style="@style/UiKit_Calls_ButtonCircle"/>
+            <ImageView android:id="@+id/move_to_audience_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stage_move_to_audience" android:contentDescription="@string/move_me_to_audience" style="@style/UiKit_Calls_ButtonCircle"/>
             <com.discord.views.NumericBadgingView android:id="@+id/raise_hand_badge" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginRight="12dp">
-                <ImageView android:id="@+id/raise_hand_button" android:src="@drawable/ic_stage_raised_hand" android:contentDescription="@string/video" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+                <ImageView android:id="@+id/raise_hand_button" android:src="@drawable/ic_stage_raised_hand" android:contentDescription="@string/video" style="@style/UiKit_Calls_ButtonCircle"/>
             </com.discord.views.NumericBadgingView>
-            <ImageView android:id="@+id/invite_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_guild_invite_24dp" android:contentDescription="@string/invite_a_friend" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+            <ImageView android:id="@+id/invite_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_guild_invite_24dp" android:contentDescription="@string/invite_a_friend" style="@style/UiKit_Calls_ButtonCircle"/>
             <FrameLayout android:id="@+id/audio_output_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginRight="12dp">
-                <ImageView android:id="@+id/audio_output_button" android:src="@drawable/ic_sound_24dp" android:contentDescription="@string/switch_audio_output" app:tint="@color/white" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
+                <ImageView android:id="@+id/audio_output_button" android:src="@drawable/ic_sound_24dp" android:contentDescription="@string/switch_audio_output" app:tint="@color/white" style="@style/UiKit_Calls_ButtonCircle"/>
                 <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/audio_output_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_down_14dp" android:importantForAccessibility="no" android:layout_marginEnd="6dp" app:tint="@color/white"/>
             </FrameLayout>
-            <ImageView android:id="@+id/mute_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mic_white_24dp" android:contentDescription="@string/mute" style="@style/res_2131952384_uikit_calls_buttoncircle"/>
-            <com.google.android.material.textview.MaterialTextView android:id="@+id/stage_disconnect_button_large" android:paddingLeft="24dp" android:paddingRight="24dp" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:text="@string/stage_channel_leave_button" android:drawablePadding="10dp" app:drawableEndCompat="@drawable/ic_stage_leave_20dp" style="@style/res_2131952387_uikit_calls_buttonpill_red"/>
-            <ImageView android:id="@+id/stop_watching_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stop_stream" android:contentDescription="@string/stop_watching" app:tint="@color/white" style="@style/res_2131952385_uikit_calls_buttoncircle_red"/>
-            <ImageView android:id="@+id/disconnect_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/disconnect_self" app:tint="@color/white" style="@style/res_2131952385_uikit_calls_buttoncircle_red"/>
+            <ImageView android:id="@+id/mute_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_mic_white_24dp" android:contentDescription="@string/mute" style="@style/UiKit_Calls_ButtonCircle"/>
+            <com.google.android.material.textview.MaterialTextView android:id="@+id/stage_disconnect_button_large" android:paddingLeft="24dp" android:paddingRight="24dp" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:text="@string/stage_channel_leave_button" android:drawablePadding="10dp" app:drawableEndCompat="@drawable/ic_stage_leave_20dp" style="@style/UiKit_Calls_ButtonPill_Red"/>
+            <ImageView android:id="@+id/stop_watching_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_stop_stream" android:contentDescription="@string/stop_watching" app:tint="@color/white" style="@style/UiKit_Calls_ButtonCircle_Red"/>
+            <ImageView android:id="@+id/disconnect_button" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/disconnect_self" app:tint="@color/white" style="@style/UiKit_Calls_ButtonCircle_Red"/>
         </LinearLayout>
-        <Button android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/push_to_talk_button" android:background="@drawable/drawable_bg_white_alpha_24_corners_gradient" android:padding="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_marginBottom="16dp" android:text="@string/input_mode_ptt" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <Button android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/push_to_talk_button" android:background="@drawable/drawable_bg_white_alpha_24_corners_gradient" android:padding="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_marginBottom="16dp" android:text="@string/input_mode_ptt" style="@style/UiKit_TextView_Semibold"/>
     </LinearLayout>
     <androidx.cardview.widget.CardView android:id="@+id/secondary_actions_card" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white_alpha_24" app:cardCornerRadius="8dp" app:cardElevation="0dp">
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@drawable/drawable_listitem_divider_left_padded" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/stream_volume_label" android:text="@string/stream_volume" style="@style/res_2131952451_uikit_listitem"/>
-            <com.discord.views.calls.VolumeSliderView android:id="@+id/stream_volume_slider" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" app:vsv_icon_tint="@color/white" app:vsv_max_volume="300" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal"/>
-            <TextView android:id="@+id/audio_output_secondary_button" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
-            <TextView android:id="@+id/screen_share_secondary_button" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
-            <TextView android:id="@+id/deafen_secondary_button" android:src="?attr/ic_deafen_state" android:text="@string/deafen" app:drawableStartCompat="?attr/ic_deafen_state" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
-            <TextView android:id="@+id/invite_secondary_button" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="@color/white" style="@style/res_2131952453_uikit_listitem_icon"/>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@drawable/drawable_listitem_divider_left_padded" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/stream_volume_label" android:text="@string/stream_volume" style="@style/UiKit_ListItem"/>
+            <com.discord.views.calls.VolumeSliderView android:id="@+id/stream_volume_slider" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" app:vsv_icon_tint="@color/white" app:vsv_max_volume="300" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal"/>
+            <TextView android:id="@+id/audio_output_secondary_button" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
+            <TextView android:id="@+id/screen_share_secondary_button" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
+            <TextView android:id="@+id/deafen_secondary_button" android:src="?attr/ic_deafen_state" android:text="@string/deafen" app:drawableStartCompat="?attr/ic_deafen_state" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
+            <TextView android:id="@+id/invite_secondary_button" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="@color/white" style="@style/UiKit_ListItem_Icon"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </merge>
diff --git a/app/src/main/res/layout/voice_user_limit_view.xml b/app/src/main/res/layout/voice_user_limit_view.xml
index 9fc6498d6d..99bd1d8213 100644
--- a/app/src/main/res/layout/voice_user_limit_view.xml
+++ b/app/src/main/res/layout/voice_user_limit_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="12dp" android:textColor="?attr/colorChannelsDefault" android:id="@+id/voice_user_limit_current" android:background="@drawable/voice_user_limit_view_left_bg" android:paddingLeft="8dp" android:paddingTop="2.25dp" android:paddingRight="2dp" android:paddingBottom="2.25dp" android:includeFontPadding="false" android:drawablePadding="4dp" android:backgroundTint="?attr/colorBackgroundMobilePrimary" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelsDefault" android:id="@+id/voice_user_limit_max" android:background="@drawable/voice_user_limit_view_right_bg" android:paddingLeft="8dp" android:paddingTop="2.25dp" android:paddingRight="8dp" android:paddingBottom="2.25dp" android:includeFontPadding="false" android:backgroundTint="?attr/colorBackgroundTertiary" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="12dp" android:textColor="?attr/colorChannelsDefault" android:id="@+id/voice_user_limit_current" android:background="@drawable/voice_user_limit_view_left_bg" android:paddingLeft="8dp" android:paddingTop="2.25dp" android:paddingRight="2dp" android:paddingBottom="2.25dp" android:includeFontPadding="false" android:drawablePadding="4dp" android:backgroundTint="?attr/colorBackgroundMobilePrimary" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelsDefault" android:id="@+id/voice_user_limit_max" android:background="@drawable/voice_user_limit_view_right_bg" android:paddingLeft="8dp" android:paddingTop="2.25dp" android:paddingRight="8dp" android:paddingBottom="2.25dp" android:includeFontPadding="false" android:backgroundTint="?attr/colorBackgroundTertiary" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/voice_user_list_item_header.xml b/app/src/main/res/layout/voice_user_list_item_header.xml
index ebdbb6224d..ae00dc01e1 100644
--- a/app/src/main/res/layout/voice_user_list_item_header.xml
+++ b/app/src/main/res/layout/voice_user_list_item_header.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/primary_400" android:id="@+id/voice_user_list_item_header_label" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAllCaps="true" style="@style/res_2131952563_uikit_textview"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/primary_400" android:id="@+id/voice_user_list_item_header_label" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAllCaps="true" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/voice_user_list_item_invite.xml b/app/src/main/res/layout/voice_user_list_item_invite.xml
index 74774d8530..865fbf3c4f 100644
--- a/app/src/main/res/layout/voice_user_list_item_invite.xml
+++ b/app/src/main/res/layout/voice_user_list_item_invite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <ImageView android:background="?attr/colorPrimaryCircle" android:padding="8dp" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="4dp" android:src="@drawable/ic_header_members_add_white_24dp" android:importantForAccessibility="no" android:backgroundTint="?attr/colorBackgroundTertiary" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/invite_friends" android:singleLine="true" android:layout_weight="1" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/invite_friends" android:singleLine="true" android:layout_weight="1" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/voice_user_list_item_user.xml b/app/src/main/res/layout/voice_user_list_item_user.xml
index c8ced5fed8..85f84949cf 100644
--- a/app/src/main/res/layout/voice_user_list_item_user.xml
+++ b/app/src/main/res/layout/voice_user_list_item_user.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center_vertical" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center_vertical" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <com.discord.views.VoiceUserView android:id="@+id/voice_user_list_item_user_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" app:vuv_animate_avatar_when_ringing="false" app:vuv_avatar_size="32dp" app:vuv_fade_when_disconnected="false"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/voice_user_list_item_user_name" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:singleLine="true" android:layout_weight="1" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/voice_user_list_item_user_name" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:singleLine="true" android:layout_weight="1" style="@style/UiKit_TextView"/>
         <TextView android:textSize="14sp" android:textColor="@color/white" android:id="@+id/voice_user_list_item_live_indicator" android:background="@drawable/bg_stream_live_indicator" android:paddingLeft="6dp" android:paddingRight="6dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="16dp" android:text="@string/live" android:textAllCaps="true" android:fontFamily="?attr/font_primary_semibold"/>
         <ImageView android:id="@+id/voice_user_list_item_spectating_indicator" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_spectate" android:contentDescription="@string/video" app:tint="?attr/colorInteractiveNormal"/>
         <ImageView android:id="@+id/voice_user_list_item_mute_indicator" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginRight="16dp" android:src="?attr/ic_mic_muted_red_strike_interactiveNormal" android:contentDescription="@string/form_label_muted"/>
         <ImageView android:id="@+id/voice_user_list_item_deafen_indicator" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginRight="16dp" android:src="?attr/ic_headset_deafened_red_strike_interactiveNormal" android:contentDescription="@string/sound_deafen"/>
         <ImageView android:id="@+id/voice_user_list_item_video_indicator" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" app:tint="?attr/colorInteractiveNormal"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/voice_user_list_item_toggle_ringing" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="16dp" android:text="@string/stop_ringing" style="@style/res_2131952467_uikit_material_button_secondary"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/voice_user_list_item_toggle_ringing" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="16dp" android:text="@string/stop_ringing" style="@style/UiKit_Material_Button_Secondary"/>
     </LinearLayout>
     <com.discord.views.StreamPreviewView android:id="@+id/voice_user_list_item_user_stream_preview" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/volume_slider_view.xml b/app/src/main/res/layout/volume_slider_view.xml
index 62dfacca52..231b7dcdc7 100644
--- a/app/src/main/res/layout/volume_slider_view.xml
+++ b/app/src/main/res/layout/volume_slider_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:id="@+id/volume_slider_min_vol" android:src="@drawable/ic_sound_quiet_24dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+    <ImageView android:id="@+id/volume_slider_min_vol" android:src="@drawable/ic_sound_quiet_24dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     <SeekBar android:id="@+id/volume_slider_seek_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:maxHeight="8dp" android:max="100" android:progressDrawable="@drawable/drawable_settings_progress" android:thumb="@drawable/drawable_thumb_white" android:layout_weight="1" android:splitTrack="false"/>
-    <ImageView android:id="@+id/volume_slider_max_vol" android:src="@drawable/ic_sound_24dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+    <ImageView android:id="@+id/volume_slider_max_vol" android:src="@drawable/ic_sound_24dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
 </merge>
diff --git a/app/src/main/res/layout/widget_accept_gift_dialog.xml b/app/src/main/res/layout/widget_accept_gift_dialog.xml
index 9825025290..752e5716c9 100644
--- a/app/src/main/res/layout/widget_accept_gift_dialog.xml
+++ b/app/src/main/res/layout/widget_accept_gift_dialog.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:minWidth="260dp" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:minWidth="260dp" style="@style/UiKit_ViewGroup_Page_LinearLayout">
     <com.discord.app.AppViewFlipper android:id="@+id/accept_gift_flipper" android:layout_width="match_parent" android:layout_height="match_parent">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-                <LinearLayout android:gravity="center" android:id="@+id/accept_gift_body_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/accept_gift_body_image" android:layout_margin="16dp" style="@style/res_2131952020_icon_game"/>
-                    <TextView android:gravity="center_horizontal" android:id="@+id/accept_gift_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                    <TextView android:gravity="center_horizontal" android:id="@+id/accept_gift_body_text" android:layout_marginTop="8dp" style="@style/res_2131952563_uikit_textview"/>
-                    <LinearLayout android:id="@+id/accept_gift_disclaimer_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                        <View android:layout_marginTop="12dp" android:layout_marginBottom="12dp" style="@style/res_2131952416_uikit_divider"/>
-                        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@+id/accept_gift_disclaimer_text" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+                <LinearLayout android:gravity="center" android:id="@+id/accept_gift_body_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/accept_gift_body_image" android:layout_margin="16dp" style="@style/Icon_Game"/>
+                    <TextView android:gravity="center_horizontal" android:id="@+id/accept_gift_header" style="@style/UiKit_TextView_H1_Bold"/>
+                    <TextView android:gravity="center_horizontal" android:id="@+id/accept_gift_body_text" android:layout_marginTop="8dp" style="@style/UiKit_TextView"/>
+                    <LinearLayout android:id="@+id/accept_gift_disclaimer_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                        <View android:layout_marginTop="12dp" android:layout_marginBottom="12dp" style="@style/UiKit_Divider"/>
+                        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@+id/accept_gift_disclaimer_text" style="@style/UiKit_TextView"/>
                     </LinearLayout>
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
             <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp">
                 <ProgressBar android:layout_gravity="center" android:id="@+id/accept_gift_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-                <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/accept_gift_confirm" android:layout_width="wrap_content" style="@style/res_2131952458_uikit_material_button"/>
+                <com.google.android.material.button.MaterialButton android:layout_gravity="center" android:id="@+id/accept_gift_confirm" android:layout_width="wrap_content" style="@style/UiKit_Material_Button"/>
             </FrameLayout>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
diff --git a/app/src/main/res/layout/widget_add_friend_user_list_item.xml b/app/src/main/res/layout/widget_add_friend_user_list_item.xml
index a0a11f2891..db34e24955 100644
--- a/app/src/main/res/layout/widget_add_friend_user_list_item.xml
+++ b/app/src/main/res/layout/widget_add_friend_user_list_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/add_friend_user_item_avatar" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951678_avatar_standard"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/add_friend_user_item_avatar" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Standard"/>
     <com.discord.views.StatusView android:id="@+id/add_friend_user_item_status" android:layout_width="16dp" android:layout_height="wrap_content" android:translationX="2dp" android:translationY="2dp" app:layout_constraintBottom_toBottomOf="@+id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@+id/add_friend_user_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="3dp" app:sv_corner_radius="4dp"/>
-    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/add_friend_user_item_text" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/add_friend_user_item_avatar" app:layout_constraintRight_toLeftOf="@+id/add_friend_user_item_buttons" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/add_friend_user_item_name" android:maxLines="1" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:id="@+id/add_friend_user_item_name_secondary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952580_uikit_textview_singleline"/>
+    <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/add_friend_user_item_text" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/add_friend_user_item_avatar" app:layout_constraintRight_toLeftOf="@+id/add_friend_user_item_buttons" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/add_friend_user_item_name" android:maxLines="1" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:id="@+id/add_friend_user_item_name_secondary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_SingleLine"/>
     </LinearLayout>
-    <LinearLayout android:id="@+id/add_friend_user_item_buttons" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:id="@+id/add_friend_user_item_buttons" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <androidx.appcompat.widget.AppCompatImageView android:id="@+id/add_friend_user_send_button" android:layout_width="wrap_content" android:layout_height="wrap_content" app:srcCompat="@drawable/ic_add_friend_send"/>
         <androidx.appcompat.widget.AppCompatImageView android:id="@+id/add_friend_user_check_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:srcCompat="@drawable/ic_add_friend_green_check"/>
-        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/add_friend_user_accept_button" android:background="?attr/primary_700_circle" android:layout_marginStart="16dp" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
-        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/add_friend_user_decline_button" android:background="?attr/primary_700_circle" android:layout_marginStart="16dp" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/add_friend_user_accept_button" android:background="?attr/primary_700_circle" android:layout_marginStart="16dp" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/FriendsList_FriendsItem_ActionButton"/>
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/add_friend_user_decline_button" android:background="?attr/primary_700_circle" android:layout_marginStart="16dp" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/FriendsList_FriendsItem_ActionButton"/>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_age_verify.xml b/app/src/main/res/layout/widget_age_verify.xml
index 1282a236b3..56937b4be9 100644
--- a/app/src/main/res/layout/widget_age_verify.xml
+++ b/app/src/main/res/layout/widget_age_verify.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/age_verify_view_flipper" android:inAnimation="@anim/activity_slide_horizontal_open_in" android:outAnimation="@anim/activity_slide_horizontal_open_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/age_verify_view_flipper" android:inAnimation="@anim/activity_slide_horizontal_open_in" android:outAnimation="@anim/activity_slide_horizontal_open_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <include android:id="@+id/verify" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_age_verify"/>
         <include android:id="@+id/confirm" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_age_verify_confirm"/>
         <include android:id="@+id/underage" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_age_verify_underage"/>
diff --git a/app/src/main/res/layout/widget_announcement_guild_profile_sheet.xml b/app/src/main/res/layout/widget_announcement_guild_profile_sheet.xml
index ee78f11cf6..2df6e3f213 100644
--- a/app/src/main/res/layout/widget_announcement_guild_profile_sheet.xml
+++ b/app/src/main/res/layout/widget_announcement_guild_profile_sheet.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingTop="16dp" android:paddingBottom="16dp" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingTop="16dp" android:paddingBottom="16dp" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/announcement_guild_avatar" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginBottom="16dp" app:roundedCornerRadius="16dp"/>
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <ImageView android:layout_gravity="center" android:id="@+id/announcement_guild_staff_icon" android:visibility="visible" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:src="@drawable/ic_staff_badge_blurple_24dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp"/>
-            <TextView android:id="@+id/announcement_guild_name" android:text="@string/announcement_guild_popout_name" style="@style/res_2131952565_uikit_textview_h1"/>
+            <TextView android:id="@+id/announcement_guild_name" android:text="@string/announcement_guild_popout_name" style="@style/UiKit_TextView_H1"/>
         </LinearLayout>
-        <TextView android:id="@+id/announcement_guild_description" android:layout_marginBottom="16dp" android:text="@string/announcement_guild_description" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:id="@+id/announcement_guild_here_to_help" android:text="@string/announcement_guild_here_to_help" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:id="@+id/announcement_guild_description" android:layout_marginBottom="16dp" android:text="@string/announcement_guild_description" style="@style/UiKit_TextView"/>
+        <TextView android:id="@+id/announcement_guild_here_to_help" android:text="@string/announcement_guild_here_to_help" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_application_command_bottom_sheet.xml b/app/src/main/res/layout/widget_application_command_bottom_sheet.xml
index 4581f346d4..915bf66073 100644
--- a/app/src/main/res/layout/widget_application_command_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_application_command_bottom_sheet.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundTertiary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/command_bottom_sheet_command_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:paddingStart="0dp" android:paddingEnd="4dp" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundTertiary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/command_bottom_sheet_command_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:paddingStart="0dp" android:paddingEnd="4dp" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/command_bottom_sheet_command_avatar" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/command_bottom_sheet_command_title" app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toEndOf="@+id/command_bottom_sheet_command_title" app:layout_constraintTop_toTopOf="@+id/command_bottom_sheet_command_title" app:roundAsCircle="true"/>
-    <TextView android:textStyle="bold" android:id="@+id/command_bottom_sheet_command_title_application_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:paddingStart="4dp" android:paddingEnd="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/command_bottom_sheet_command_avatar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
-    <TextView android:id="@+id/command_bottom_sheet_command_content" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/command_bottom_sheet_command_title" style="@style/res_2131952394_uikit_chat_text"/>
+    <TextView android:textStyle="bold" android:id="@+id/command_bottom_sheet_command_title_application_name" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:paddingStart="4dp" android:paddingEnd="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/command_bottom_sheet_command_avatar" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
+    <TextView android:id="@+id/command_bottom_sheet_command_content" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/command_bottom_sheet_command_title" style="@style/UiKit_Chat_Text"/>
     <ProgressBar android:id="@+id/command_bottom_sheet_command_loader" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/bottom" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <LinearLayout android:gravity="start" android:id="@+id/bottom" android:background="?attr/colorBackgroundSecondary" android:padding="16dp" android:layout_marginTop="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/command_bottom_sheet_command_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/command_bottom_sheet_command_slash_heading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/application_command" android:textAllCaps="true" style="@style/res_2131952394_uikit_chat_text"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/command_bottom_sheet_command_copy_button" android:layout_height="match_parent" android:text="@string/copy_command" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <LinearLayout android:gravity="start" android:id="@+id/bottom" android:background="?attr/colorBackgroundSecondary" android:padding="16dp" android:layout_marginTop="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/command_bottom_sheet_command_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/command_bottom_sheet_command_slash_heading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/application_command" android:textAllCaps="true" style="@style/UiKit_Chat_Text"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/command_bottom_sheet_command_copy_button" android:layout_height="match_parent" android:text="@string/copy_command" style="@style/UiKit_Material_Button_Secondary"/>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_audit_log_filter_sheet.xml b/app/src/main/res/layout/widget_audit_log_filter_sheet.xml
index 6dd0414bcb..23d52248ca 100644
--- a/app/src/main/res/layout/widget_audit_log_filter_sheet.xml
+++ b/app/src/main/res/layout/widget_audit_log_filter_sheet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/audit_log_filter_input" style="@style/res_2131952560_uikit_textinputlayout_search">
-        <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/audit_log_filter_input" style="@style/UiKit_TextInputLayout_Search">
+        <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
     </com.google.android.material.textfield.TextInputLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/audit_log_filter_recycler" android:minHeight="200dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/audit_log_filter_recycler" android:minHeight="200dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_auth_age_gated.xml b/app/src/main/res/layout/widget_auth_age_gated.xml
index b88c059083..5d35306272 100644
--- a/app/src/main/res/layout/widget_auth_age_gated.xml
+++ b/app/src/main/res/layout/widget_auth_age_gated.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
     <LinearLayout android:orientation="vertical" android:id="@+id/auth_register_container" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
         <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="64dp" android:src="@drawable/img_age_gate_failure" android:contentDescription="@string/age_gate_underage_header"/>
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:stv_title="@string/age_gate_underage_header"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/auth_register_underage_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/age_gate_underage_body_post_register_message" android:lineSpacingMultiplier="1" style="@style/res_2131952570_uikit_textview_large"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/auth_register_underage_button" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/return_to_login" style="@style/res_2131952458_uikit_material_button"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/auth_register_underage_description" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/age_gate_underage_body_post_register_message" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Large"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/auth_register_underage_button" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/return_to_login" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_auth_birthday.xml b/app/src/main/res/layout/widget_auth_birthday.xml
index 03e31dedb7..836dd64d93 100644
--- a/app/src/main/res/layout/widget_auth_birthday.xml
+++ b/app/src/main/res/layout/widget_auth_birthday.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
     <LinearLayout android:orientation="vertical" android:id="@+id/auth_register_container" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="24dp" app:stv_title="@string/age_gate_header"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_register_birthday" android:layout_marginBottom="8dp" android:hint="@string/age_gate_date_of_birth" style="@style/res_2131952545_uikit_textinputlayout">
-            <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952549_uikit_textinputlayout_edittext_nofocus"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_register_birthday" android:layout_marginBottom="8dp" android:hint="@string/age_gate_date_of_birth" style="@style/UiKit_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_NoFocus"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" style="@style/res_2131952589_uikit_viewgroup">
-            <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/auth_policy_links" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/auth_policy_links" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" style="@style/res_2131952396_uikit_checkbox"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_policy_links" android:visibility="visible" android:layout_width="0dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="8dp" app:layout_goneMarginStart="8dp" style="@style/res_2131952563_uikit_textview"/>
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup">
+            <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/auth_policy_links" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/auth_policy_links" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" style="@style/UiKit_Checkbox"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_policy_links" android:visibility="visible" android:layout_width="0dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="8dp" app:layout_goneMarginStart="8dp" style="@style/UiKit_TextView"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <com.google.android.material.button.MaterialButton android:id="@+id/auth_register_button" android:text="@string/register_title" style="@style/res_2131952382_uikit_authbutton_material"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/auth_register_button" android:text="@string/register_title" style="@style/UiKit_AuthButton_Material"/>
     </LinearLayout>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_auth_captcha.xml b/app/src/main/res/layout/widget_auth_captcha.xml
index 182f952921..fe04a63735 100644
--- a/app/src/main/res/layout/widget_auth_captcha.xml
+++ b/app/src/main/res/layout/widget_auth_captcha.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:gravity="center_horizontal" android:padding="16dp" android:layout_height="wrap_content" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
-            <com.airbnb.lottie.LottieAnimationView style="@style/res_2131952380_uikit_anim_verify_by_phone"/>
-            <LinearLayout android:gravity="center_horizontal" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:gravity="center_horizontal" android:padding="16dp" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
+            <com.airbnb.lottie.LottieAnimationView style="@style/UiKit_Anim_Verify_By_Phone"/>
+            <LinearLayout android:gravity="center_horizontal" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
                 <com.discord.views.ScreenTitleView android:id="@+id/screen_title" android:layout_width="match_parent" android:layout_height="wrap_content" app:stv_subtitle="@string/verify_by_recaptcha_description" app:stv_title="@string/verify_by_recaptcha"/>
-                <TextView android:textColor="?attr/colorTextLink" android:id="@+id/auth_captcha_help" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/captcha_issues" style="@style/res_2131952563_uikit_textview"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/auth_captcha_verify" android:text="@string/verify" style="@style/res_2131952382_uikit_authbutton_material"/>
+                <TextView android:textColor="?attr/colorTextLink" android:id="@+id/auth_captcha_help" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/captcha_issues" style="@style/UiKit_TextView"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/auth_captcha_verify" android:text="@string/verify" style="@style/UiKit_AuthButton_Material"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_auth_header.xml b/app/src/main/res/layout/widget_auth_header.xml
index 2ed37839c6..1487224e1f 100644
--- a/app/src/main/res/layout/widget_auth_header.xml
+++ b/app/src/main/res/layout/widget_auth_header.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.AppBarLayout xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-    <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<com.google.android.material.appbar.AppBarLayout xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+    <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar_Transparent"/>
 </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/widget_auth_landing.xml b/app/src/main/res/layout/widget_auth_landing.xml
index 8cf43da018..c9333d769c 100644
--- a/app/src/main/res/layout/widget_auth_landing.xml
+++ b/app/src/main/res/layout/widget_auth_landing.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_landing_ptrn" style="@style/res_2131952602_uikit_viewgroup_page">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_landing_ptrn" style="@style/UiKit_ViewGroup_Page">
     <com.discord.app.AppViewFlipper android:id="@+id/auth_landing_switch_flipper" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="16dp" android:layout_above="@+id/auth_bottom_container" android:layout_marginStart="16dp" android:layout_marginEnd="16dp">
         <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent">
-            <ImageView android:layout_gravity="top" android:id="@+id/auth_landing_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:src="?attr/auth_logo" android:scaleType="center" android:contentDescription="@string/discord" style="@style/res_2131952448_uikit_imageview"/>
-            <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="@dimen/auth_splash_vertical_margin" android:layout_marginRight="16dp" android:layout_marginBottom="@dimen/auth_splash_vertical_margin" android:src="@drawable/img_landing_splash" android:scaleType="fitCenter" android:layout_above="@+id/auth_landing_title" android:layout_below="@+id/auth_landing_logo" android:contentDescription="@string/discord" style="@style/res_2131952448_uikit_imageview"/>
+            <ImageView android:layout_gravity="top" android:id="@+id/auth_landing_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:src="?attr/auth_logo" android:scaleType="center" android:contentDescription="@string/discord" style="@style/UiKit_ImageView"/>
+            <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="@dimen/auth_splash_vertical_margin" android:layout_marginRight="16dp" android:layout_marginBottom="@dimen/auth_splash_vertical_margin" android:src="@drawable/img_landing_splash" android:scaleType="fitCenter" android:layout_above="@+id/auth_landing_title" android:layout_below="@+id/auth_landing_logo" android:contentDescription="@string/discord" style="@style/UiKit_ImageView"/>
             <com.discord.views.ScreenTitleView android:id="@+id/auth_landing_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:layout_alignParentBottom="true" android:layout_centerInParent="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile"/>
         </RelativeLayout>
         <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent">
-            <ImageView android:layout_width="175dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:src="?attr/auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/res_2131952448_uikit_imageview"/>
+            <ImageView android:layout_width="175dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:src="?attr/auth_logo" android:layout_centerHorizontal="true" android:contentDescription="@string/discord" style="@style/UiKit_ImageView"/>
             <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true">
                 <com.discord.views.ScreenTitleView android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:stv_subtitle="@string/nuf_body_refresh" app:stv_title="@string/nuf_title_mobile"/>
                 <com.discord.widgets.auth.AuthInviteInfoView android:id="@+id/auth_landing_invite_info" android:layout_width="match_parent" android:layout_height="wrap_content"/>
@@ -15,7 +15,7 @@
         </RelativeLayout>
     </com.discord.app.AppViewFlipper>
     <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@+id/auth_bottom_container" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:paddingStart="16dp" android:paddingEnd="16dp">
-        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_register" android:text="@string/register" style="@style/res_2131952382_uikit_authbutton_material"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_login" android:text="@string/login" android:backgroundTint="?attr/colorButtonSecondary" style="@style/res_2131952382_uikit_authbutton_material"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_register" android:text="@string/register" style="@style/UiKit_AuthButton_Material"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/auth_landing_login" android:text="@string/login" android:backgroundTint="?attr/colorButtonSecondary" style="@style/UiKit_AuthButton_Material"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_auth_login.xml b/app/src/main/res/layout/widget_auth_login.xml
index cd81c1e05d..ec246c8f54 100644
--- a/app/src/main/res/layout/widget_auth_login.xml
+++ b/app/src/main/res/layout/widget_auth_login.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
+    <androidx.core.widget.NestedScrollView android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
         <LinearLayout android:orientation="vertical" android:id="@+id/auth_login_container" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="match_parent" android:layout_height="match_parent">
             <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/auth_login_body" app:stv_title="@string/login_title"/>
             <com.discord.views.phone.PhoneOrEmailInputView android:id="@+id/auth_login_login_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="12dp" app:hint="@string/form_label_email_or_phone_number" app:nextFocusForward="@+id/auth_login_password"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_login_password_wrap" android:layout_marginBottom="4dp" android:hint="@string/form_label_password" style="@style/res_2131952557_uikit_textinputlayout_password">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_login_password_wrap" android:layout_marginBottom="4dp" android:hint="@string/form_label_password" style="@style/UiKit_TextInputLayout_Password">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:textColor="?attr/colorTextLink" android:id="@+id/auth_login_forgot_password" android:padding="4dp" android:layout_marginTop="4dp" android:text="@string/forgot_password" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <TextView android:textColor="?attr/colorTextLink" android:id="@+id/auth_login_password_manager_link" android:padding="4dp" android:layout_marginBottom="12dp" android:text="@string/password_manager_use" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/auth_login" android:text="@string/login" style="@style/res_2131952382_uikit_authbutton_material"/>
+            <TextView android:textColor="?attr/colorTextLink" android:id="@+id/auth_login_forgot_password" android:padding="4dp" android:layout_marginTop="4dp" android:text="@string/forgot_password" style="@style/UiKit_TextView_Subtext"/>
+            <TextView android:textColor="?attr/colorTextLink" android:id="@+id/auth_login_password_manager_link" android:padding="4dp" android:layout_marginBottom="12dp" android:text="@string/password_manager_use" style="@style/UiKit_TextView_Subtext"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/auth_login" android:text="@string/login" style="@style/UiKit_AuthButton_Material"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_auth_mfa.xml b/app/src/main/res/layout/widget_auth_mfa.xml
index e1fa3cda0f..a7ebcbca67 100644
--- a/app/src/main/res/layout/widget_auth_mfa.xml
+++ b/app/src/main/res/layout/widget_auth_mfa.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="80dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="8dp" android:text="@string/two_fa" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="16dp" android:text="@string/two_fa_enter_token_label" style="@style/res_2131952574_uikit_textview_medium"/>
+    <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="80dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="8dp" android:text="@string/two_fa" style="@style/UiKit_TextView"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="16dp" android:text="@string/two_fa_enter_token_label" style="@style/UiKit_TextView_Medium"/>
             <com.discord.views.CodeVerificationView android:id="@+id/auth_mfa_verification" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/auth_login_forgot_password" android:layout_marginTop="16dp" android:maxWidth="320dp" android:text="@string/two_fa_enter_token_body" style="@style/res_2131952574_uikit_textview_medium"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/auth_login_forgot_password" android:layout_marginTop="16dp" android:maxWidth="320dp" android:text="@string/two_fa_enter_token_body" style="@style/UiKit_TextView_Medium"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_auth_mfa_backup_codes.xml b/app/src/main/res/layout/widget_auth_mfa_backup_codes.xml
index 6374c8ee92..58c3a4dd72 100644
--- a/app/src/main/res/layout/widget_auth_mfa_backup_codes.xml
+++ b/app/src/main/res/layout/widget_auth_mfa_backup_codes.xml
@@ -3,14 +3,14 @@
     <TextView android:id="@+id/server_settings_delete_server_header" android:text="@string/two_fa_backup_codes_label" style="@style/AppAlertDialogHeader"/>
     <LinearLayout style="@style/AppAlertDialogContent">
         <LinearLayout android:orientation="vertical" android:background="@drawable/drawable_bg_settings_item" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textSize="11sp" android:textColor="@color/grey_2" android:paddingTop="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:text="@string/two_fa_backup_code_enter" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/widget_auth_mfa_backup_codes_edittext" android:hint="@string/two_fa_backup_code_hint" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+            <TextView android:textSize="11sp" android:textColor="@color/grey_2" android:paddingTop="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:text="@string/two_fa_backup_code_enter" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/widget_auth_mfa_backup_codes_edittext" android:hint="@string/two_fa_backup_code_hint" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </LinearLayout>
     <LinearLayout style="@style/AppAlertDialogFooter">
-        <com.google.android.material.button.MaterialButton android:id="@+id/widget_auth_mfa_backup_codes_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/widget_auth_mfa_backup_codes_send" android:text="@string/send" style="@style/res_2131952459_uikit_material_button_fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/widget_auth_mfa_backup_codes_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/widget_auth_mfa_backup_codes_send" android:text="@string/send" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_auth_mfa_info.xml b/app/src/main/res/layout/widget_auth_mfa_info.xml
index db2cd938bb..10d7653584 100644
--- a/app/src/main/res/layout/widget_auth_mfa_info.xml
+++ b/app/src/main/res/layout/widget_auth_mfa_info.xml
@@ -5,6 +5,6 @@
         <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/widget_auth_mfa_info_text" android:text="@string/two_fa_download_app_body" style="@style/AppAlertDialogText"/>
     </LinearLayout>
     <LinearLayout style="@style/AppAlertDialogFooter">
-        <com.google.android.material.button.MaterialButton android:id="@+id/widget_auth_mfa_info_okay" android:text="@string/okay" style="@style/res_2131952459_uikit_material_button_fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/widget_auth_mfa_info_okay" android:text="@string/okay" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_auth_phone_verify.xml b/app/src/main/res/layout/widget_auth_phone_verify.xml
index 07ae48d95d..6bec9c3cfc 100644
--- a/app/src/main/res/layout/widget_auth_phone_verify.xml
+++ b/app/src/main/res/layout/widget_auth_phone_verify.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="80dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/auth_phone_verify_title" android:layout_marginBottom="8dp" android:text="@string/phone_ip_authorization_title" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/auth_phone_verify_subtitle" android:layout_marginBottom="16dp" android:text="@string/phone_ip_authorization_subtitle" style="@style/res_2131952574_uikit_textview_medium"/>
+    <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="80dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/auth_phone_verify_title" android:layout_marginBottom="8dp" android:text="@string/phone_ip_authorization_title" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/auth_phone_verify_subtitle" android:layout_marginBottom="16dp" android:text="@string/phone_ip_authorization_subtitle" style="@style/UiKit_TextView_Medium"/>
             <com.discord.views.CodeVerificationView android:id="@+id/auth_phone_verify_code" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <LinearLayout android:gravity="center_horizontal" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/auth_phone_verify_resend" android:padding="4dp" android:text="@string/resend_code" style="@style/res_2131952572_uikit_textview_link"/>
-                <TextView android:id="@+id/auth_phone_verify_action_separator" android:padding="4dp" android:visibility="gone" android:text="•" style="@style/res_2131952574_uikit_textview_medium"/>
-                <TextView android:id="@+id/auth_phone_verify_call" android:padding="4dp" android:visibility="gone" android:text="@string/call_me_instead" style="@style/res_2131952572_uikit_textview_link"/>
+            <LinearLayout android:gravity="center_horizontal" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/auth_phone_verify_resend" android:padding="4dp" android:text="@string/resend_code" style="@style/UiKit_TextView_Link"/>
+                <TextView android:id="@+id/auth_phone_verify_action_separator" android:padding="4dp" android:visibility="gone" android:text="•" style="@style/UiKit_TextView_Medium"/>
+                <TextView android:id="@+id/auth_phone_verify_call" android:padding="4dp" android:visibility="gone" android:text="@string/call_me_instead" style="@style/UiKit_TextView_Link"/>
             </LinearLayout>
             <LinearLayout android:gravity="bottom" android:orientation="vertical" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="match_parent">
-                <LinearLayout android:gravity="center_horizontal" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:id="@+id/auth_phone_bailout" android:padding="4dp" android:visibility="gone" android:text="@string/verify_by_phone_bail" style="@style/res_2131952572_uikit_textview_link"/>
+                <LinearLayout android:gravity="center_horizontal" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:id="@+id/auth_phone_bailout" android:padding="4dp" android:visibility="gone" android:text="@string/verify_by_phone_bail" style="@style/UiKit_TextView_Link"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_auth_register_account_information.xml b/app/src/main/res/layout/widget_auth_register_account_information.xml
index 3163a30e64..c0568c1e75 100644
--- a/app/src/main/res/layout/widget_auth_register_account_information.xml
+++ b/app/src/main/res/layout/widget_auth_register_account_information.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
+    <androidx.core.widget.NestedScrollView android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
         <LinearLayout android:orientation="vertical" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="match_parent" android:layout_height="match_parent">
             <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="24dp" app:stv_title="@string/register"/>
-            <TextView android:textAppearance="@style/res_2131952537_uikit_textappearance_listitem_label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/form_placeholder_username"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_register_account_information_username_wrap" android:layout_marginBottom="8dp" android:hint="@string/form_label_username" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:nextFocusForward="@+id/auth_register_account_information_password_wrap" style="@style/res_2131952556_uikit_textinputlayout_edittext_singleline_username"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_ListItem_Label" android:textSize="@dimen/uikit_textsize_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/form_placeholder_username"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_register_account_information_username_wrap" android:layout_marginBottom="8dp" android:hint="@string/form_label_username" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:nextFocusForward="@+id/auth_register_account_information_password_wrap" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Username"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:textAppearance="@style/res_2131952563_uikit_textview" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/register_username_hint"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_register_account_information_password_wrap" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:hint="@string/form_label_password" style="@style/res_2131952557_uikit_textinputlayout_password">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+            <TextView android:textAppearance="@style/UiKit_TextView" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/register_username_hint"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/auth_register_account_information_password_wrap" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:hint="@string/form_label_password" style="@style/UiKit_TextInputLayout_Password">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" style="@style/res_2131952589_uikit_viewgroup">
-                <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/auth_policy_links" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/auth_policy_links" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" style="@style/res_2131952396_uikit_checkbox"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_policy_links" android:visibility="visible" android:layout_width="0dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="8dp" app:layout_goneMarginStart="8dp" style="@style/res_2131952563_uikit_textview"/>
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup">
+                <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/auth_tos_opt_in" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/auth_policy_links" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/auth_policy_links" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" style="@style/UiKit_Checkbox"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_policy_links" android:visibility="visible" android:layout_width="0dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/auth_tos_opt_in" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/auth_tos_opt_in" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.5" app:layout_goneMarginLeft="8dp" app:layout_goneMarginStart="8dp" style="@style/UiKit_TextView"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
             <com.discord.views.LoadingButton android:id="@+id/auth_register_account_information_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/next" app:lb_disable_elevation="true" app:lb_padding_bottom="18dp" app:lb_padding_top="18dp" app:lb_progress_color="@color/white" app:lb_text_color="@color/uikit_btn_text_color_selector" app:lb_text_size="@dimen/uikit_textsize_large"/>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_auth_register_identity.xml b/app/src/main/res/layout/widget_auth_register_identity.xml
index 8f334e6d88..4e3a92f71d 100644
--- a/app/src/main/res/layout/widget_auth_register_identity.xml
+++ b/app/src/main/res/layout/widget_auth_register_identity.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/auth_ptrn" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
+    <androidx.core.widget.NestedScrollView android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
         <LinearLayout android:orientation="vertical" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="match_parent" android:layout_height="match_parent">
             <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="24dp" app:stv_title="@string/enter_phone_or_email"/>
-            <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/auth_register_identity_segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_marginBottom="24dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+            <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/auth_register_identity_segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_marginBottom="24dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/auth_register_identity_first_segment_card" style="@style/SegmentedControlTabCard"/>
                 <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/auth_register_identity_second_segment_card" style="@style/SegmentedControlTabCard"/>
             </com.discord.views.segmentedcontrol.SegmentedControlContainer>
             <com.discord.views.phone.PhoneOrEmailInputView android:id="@+id/auth_register_identity_input" android:layout_width="match_parent" android:layout_height="wrap_content" app:hint="@string/form_label_phone_number"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_register_identity_policy_link" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/auth_register_identity_button" android:text="@string/next" style="@style/res_2131952382_uikit_authbutton_material"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/auth_register_identity_policy_link" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/auth_register_identity_button" android:text="@string/next" style="@style/UiKit_AuthButton_Material"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_auth_reset_password.xml b/app/src/main/res/layout/widget_auth_reset_password.xml
index f9070482f4..f17bbd5b81 100644
--- a/app/src/main/res/layout/widget_auth_reset_password.xml
+++ b/app/src/main/res/layout/widget_auth_reset_password.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="80dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="8dp" android:text="@string/reset_password_title" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="16dp" android:text="@string/password_recovery_external_link_description" style="@style/res_2131952574_uikit_textview_medium"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/auth_reset_password_submit" android:text="@string/continue_in_browser" style="@style/res_2131952382_uikit_authbutton_material"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/auth_reset_password_back" android:text="@string/back_to_login" android:backgroundTint="?attr/colorButtonSecondary" style="@style/res_2131952382_uikit_authbutton_material"/>
+    <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="80dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="8dp" android:text="@string/reset_password_title" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="16dp" android:text="@string/password_recovery_external_link_description" style="@style/UiKit_TextView_Medium"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/auth_reset_password_submit" android:text="@string/continue_in_browser" style="@style/UiKit_AuthButton_Material"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/auth_reset_password_back" android:text="@string/back_to_login" android:backgroundTint="?attr/colorButtonSecondary" style="@style/UiKit_AuthButton_Material"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_auth_undelete_account.xml b/app/src/main/res/layout/widget_auth_undelete_account.xml
index 3fe169f5c2..393166c7c4 100644
--- a/app/src/main/res/layout/widget_auth_undelete_account.xml
+++ b/app/src/main/res/layout/widget_auth_undelete_account.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:gravity="center" android:layout_height="wrap_content" android:layout_marginBottom="4dp" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
-                <ImageView android:src="@drawable/img_wump_trash_dark" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:gravity="center" android:layout_height="wrap_content" android:layout_marginBottom="4dp" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
+                <ImageView android:src="@drawable/img_wump_trash_dark" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
                 <com.discord.views.ScreenTitleView android:id="@+id/auth_undelete_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" app:stv_subtitle="@string/account_scheduled_for_deletion_description" app:stv_title="@string/account_scheduled_for_deletion_title"/>
             </LinearLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/auth_undelete_delete" android:text="@string/return_to_login" style="@style/res_2131952382_uikit_authbutton_material"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/auth_undelete_cancel" android:text="@string/account_scheduled_for_deletion_cancel_mobile" android:backgroundTint="?attr/colorButtonSecondary" style="@style/res_2131952382_uikit_authbutton_material"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/auth_undelete_delete" android:text="@string/return_to_login" style="@style/UiKit_AuthButton_Material"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/auth_undelete_cancel" android:text="@string/account_scheduled_for_deletion_cancel_mobile" android:backgroundTint="?attr/colorButtonSecondary" style="@style/UiKit_AuthButton_Material"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_ban_user.xml b/app/src/main/res/layout/widget_ban_user.xml
index 239c2f4c34..46c30b34ad 100644
--- a/app/src/main/res/layout/widget_ban_user.xml
+++ b/app/src/main/res/layout/widget_ban_user.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:id="@+id/settings_account_scroll" style="@style/res_2131952411_uikit_dialog_container">
-    <TextView android:id="@+id/ban_user_title" android:text="@string/ban_user_title" style="@style/res_2131952414_uikit_dialog_title"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:id="@+id/settings_account_scroll" style="@style/UiKit_Dialog_Container">
+    <TextView android:id="@+id/ban_user_title" android:text="@string/ban_user_title" style="@style/UiKit_Dialog_Title"/>
+    <View style="@style/UiKit_Divider"/>
     <ScrollView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-        <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/ban_user_body" android:text="@string/ban_user_body" style="@style/res_2131952408_uikit_dialog_body"/>
-            <TextView android:text="@string/form_label_delete_message_history" style="@style/res_2131952412_uikit_dialog_subtitle"/>
-            <com.discord.views.CheckedSetting android:id="@+id/ban_user_delete_messages_none" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_none" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/ban_user_delete_messages_1_day" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_24hr" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/ban_user_delete_messages_7_days" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_7d" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <TextView android:text="@string/form_label_reason_ban" style="@style/res_2131952412_uikit_dialog_subtitle"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/ban_user_reason" android:layout_margin="16dp" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:hint="@string/form_label_reason_ban" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+        <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/ban_user_body" android:text="@string/ban_user_body" style="@style/UiKit_Dialog_Body"/>
+            <TextView android:text="@string/form_label_delete_message_history" style="@style/UiKit_Dialog_Subtitle"/>
+            <com.discord.views.CheckedSetting android:id="@+id/ban_user_delete_messages_none" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_none" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/ban_user_delete_messages_1_day" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_24hr" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/ban_user_delete_messages_7_days" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/delete_message_history_option_7d" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <TextView android:text="@string/form_label_reason_ban" style="@style/UiKit_Dialog_Subtitle"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/ban_user_reason" android:layout_margin="16dp" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:hint="@string/form_label_reason_ban" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:id="@+id/ban_user_button_container" style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/ban_user_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/ban_user_confirm" android:text="@string/confirm" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+    <LinearLayout android:id="@+id/ban_user_button_container" style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/ban_user_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/ban_user_confirm" android:text="@string/confirm" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_bug_report.xml b/app/src/main/res/layout/widget_bug_report.xml
index f9e7a63e2d..74f47a3fff 100644
--- a/app/src/main/res/layout/widget_bug_report.xml
+++ b/app/src/main/res/layout/widget_bug_report.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
         <com.discord.app.AppViewFlipper android:id="@+id/bug_report_switch_flipper" android:layout_width="match_parent" android:layout_height="wrap_content" android:animateLayoutChanges="true" app:avf_previewed_child_index="0">
             <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
                 <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorTextMuted" android:id="@+id/bug_report_no_screenshot_label" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/bug_report_no_screenshot" app:layout_constraintBottom_toBottomOf="@+id/bug_report_screenshot" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bug_report_screenshot"/>
                 <androidx.appcompat.widget.AppCompatImageView android:id="@+id/bug_report_screenshot" android:background="?attr/colorBackgroundTertiary" android:padding="1dp" android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginTop="16dp" android:adjustViewBounds="true" android:maxHeight="352dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
                 <androidx.appcompat.widget.AppCompatImageView android:id="@+id/bug_report_clear_screenshot" android:background="?attr/primary_800_circle" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_delete_circle" android:scaleType="centerInside" android:elevation="12dp" app:layout_constraintBottom_toTopOf="@+id/bug_report_screenshot" app:layout_constraintEnd_toEndOf="@+id/bug_report_screenshot" app:layout_constraintStart_toEndOf="@+id/bug_report_screenshot" app:layout_constraintTop_toTopOf="@+id/bug_report_screenshot"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/bug_report_undo_screenshot_remove" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="8dp" android:text="@string/undo" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_no_screenshot_label" style="@style/res_2131952458_uikit_material_button"/>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/bug_report_name" android:layout_marginTop="8dp" android:hint="@string/bug_report_name" app:boxBackgroundColor="?attr/colorBackgroundTertiary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxCornerRadiusTopStart="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_screenshot" style="@style/res_2131952545_uikit_textinputlayout">
-                    <com.google.android.material.textfield.TextInputEditText android:maxLines="10" android:maxLength="5000" android:imeOptions="actionDone" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/bug_report_undo_screenshot_remove" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="8dp" android:text="@string/undo" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_no_screenshot_label" style="@style/UiKit_Material_Button"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/bug_report_name" android:layout_marginTop="8dp" android:hint="@string/bug_report_name" app:boxBackgroundColor="?attr/colorBackgroundTertiary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxCornerRadiusTopStart="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_screenshot" style="@style/UiKit_TextInputLayout">
+                    <com.google.android.material.textfield.TextInputEditText android:maxLines="10" android:maxLength="5000" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <com.google.android.material.card.MaterialCardView android:id="@+id/bug_report_priority_card" android:descendantFocusability="beforeDescendants" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_name">
                     <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent">
                         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/bug_report_priority_icon" android:visibility="visible" android:layout_width="24dp" android:layout_height="24dp" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:actualImageScaleType="5" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/img_clyde_empty"/>
-                        <com.google.android.material.textfield.TextInputLayout android:enabled="false" android:id="@+id/bug_report_priority" android:focusable="false" android:clickable="false" android:layout_width="0dp" android:hint="@string/bug_report_priority" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/bug_report_select_component_chevron" app:layout_constraintStart_toEndOf="@+id/bug_report_priority_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952545_uikit_textinputlayout">
-                            <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:background="?attr/colorBackgroundTertiary" android:focusable="false" android:clickable="false" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+                        <com.google.android.material.textfield.TextInputLayout android:enabled="false" android:id="@+id/bug_report_priority" android:focusable="false" android:clickable="false" android:layout_width="0dp" android:hint="@string/bug_report_priority" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/bug_report_select_component_chevron" app:layout_constraintStart_toEndOf="@+id/bug_report_priority_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextInputLayout">
+                            <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:background="?attr/colorBackgroundTertiary" android:focusable="false" android:clickable="false" style="@style/UiKit_TextInputLayout_EditText"/>
                         </com.google.android.material.textfield.TextInputLayout>
                         <ImageView android:id="@+id/bug_report_select_component_chevron" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_chevron_right_grey_12dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal"/>
                         <View android:id="@+id/widget_bug_report_severity_touch_delegate" android:background="?attr/selectableItemBackground" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
                     </androidx.constraintlayout.widget.ConstraintLayout>
                 </com.google.android.material.card.MaterialCardView>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/bug_report_description" android:layout_marginTop="8dp" android:hint="@string/bug_report_description" app:boxBackgroundColor="?attr/colorBackgroundTertiary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxCornerRadiusTopStart="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_priority_card" style="@style/res_2131952545_uikit_textinputlayout">
-                    <com.google.android.material.textfield.TextInputEditText android:maxLines="20" android:maxLength="50000" android:imeOptions="actionNext" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/bug_report_description" android:layout_marginTop="8dp" android:hint="@string/bug_report_description" app:boxBackgroundColor="?attr/colorBackgroundTertiary" app:boxCornerRadiusBottomEnd="4dp" app:boxCornerRadiusBottomStart="4dp" app:boxCornerRadiusTopEnd="4dp" app:boxCornerRadiusTopStart="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_priority_card" style="@style/UiKit_TextInputLayout">
+                    <com.google.android.material.textfield.TextInputEditText android:maxLines="20" android:maxLength="50000" android:imeOptions="actionNext" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorTextDanger" android:id="@+id/submit_report_error" android:paddingBottom="16dp" android:visibility="gone" android:layout_marginTop="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_submit" style="@style/res_2131952564_uikit_textview_bold"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/bug_report_submit" android:layout_marginTop="8dp" android:text="@string/submit_bug" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_description" style="@style/res_2131952458_uikit_material_button"/>
+                <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorTextDanger" android:id="@+id/submit_report_error" android:paddingBottom="16dp" android:visibility="gone" android:layout_marginTop="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_submit" style="@style/UiKit_TextView_Bold"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/bug_report_submit" android:layout_marginTop="8dp" android:text="@string/submit_bug" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_description" style="@style/UiKit_Material_Button"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
             <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent">
                 <com.discord.views.sticker.StickerView android:id="@+id/bug_report_status_expression" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/bug_report_status_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2"/>
-                <com.google.android.material.textview.MaterialTextView android:id="@+id/bug_report_status_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_status_expression" style="@style/res_2131952567_uikit_textview_h2"/>
+                <com.google.android.material.textview.MaterialTextView android:id="@+id/bug_report_status_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bug_report_status_expression" style="@style/UiKit_TextView_H2"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.discord.app.AppViewFlipper>
     </ScrollView>
diff --git a/app/src/main/res/layout/widget_call_fullscreen.xml b/app/src/main/res/layout/widget_call_fullscreen.xml
index 6648ff09e9..895245f854 100644
--- a/app/src/main/res/layout/widget_call_fullscreen.xml
+++ b/app/src/main/res/layout/widget_call_fullscreen.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:background="@color/black" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
-    <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_global_status" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952589_uikit_viewgroup"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_container" android:background="@color/black" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
+    <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_global_status" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/top_of_ui" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="widget_global_status"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/call_video_recycler" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/call_stage_recycler" android:paddingTop="92dp" android:clipToPadding="false" android:layout_width="0dp" android:layout_height="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui"/>
     <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@+id/call_participants_hidden" android:background="@color/black" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
         <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/video_call_illustration" android:importantForAccessibility="no"/>
-        <TextView android:textColor="@color/white" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" style="@style/res_2131952541_uikit_textappearance_semibold"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" style="@style/res_2131952458_uikit_material_button"/>
+        <TextView android:textColor="@color/white" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" style="@style/UiKit_TextAppearance_Semibold"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/call_non_video_container" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
         <include android:id="@+id/private_call" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" layout="@layout/widget_call_fullscreen_private_call"/>
         <RelativeLayout android:id="@+id/action_bar_underlay" android:background="@drawable/drawable_black_underlay_gradient" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0">
             <View android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"/>
         </RelativeLayout>
-        <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-            <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/res_2131951667_apptheme_toolbar_transparent">
+        <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+            <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/AppTheme_Toolbar_Transparent">
                 <com.discord.views.calls.StageCallVisitCommunityView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/call_visit_community" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
             </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.AppBarLayout>
-        <TextView android:id="@+id/call_fullscreen_mentions" android:visibility="gone" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952022_icon_mentions_call"/>
+        <TextView android:id="@+id/call_fullscreen_mentions" android:visibility="gone" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="@+id/action_bar_toolbar_layout" app:layout_constraintVertical_chainStyle="2" style="@style/Icon_Mentions_Call"/>
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/call_streaming_active" android:background="@color/black" android:padding="16dp" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/action_bar_toolbar_layout">
             <include android:id="@+id/audio_share" layout="@layout/widget_call_fullscreen_audio_share_warning"/>
             <androidx.constraintlayout.widget.Barrier android:id="@+id/call_audio_share_warning_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="audio_share"/>
             <ImageView android:id="@+id/call_streaming_active_illustration" android:layout_width="130dp" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/screen_share_illustration" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/call_streaming_active_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_audio_share_warning_barrier" app:layout_constraintVertical_chainStyle="2"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:id="@+id/call_streaming_active_header" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_stream_active_header" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/call_streaming_active_body" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_illustration" style="@style/res_2131952534_uikit_textappearance_bold"/>
-            <TextView android:textColor="@color/primary_dark_300" android:id="@+id/call_streaming_active_body" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_active_body" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/call_stop_streaming_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_header" style="@style/res_2131952533_uikit_textappearance"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/call_stop_streaming_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mobile_stream_stop_sharing" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_body" style="@style/res_2131952458_uikit_material_button"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:id="@+id/call_streaming_active_header" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/mobile_stream_active_header" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/call_streaming_active_body" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_illustration" style="@style/UiKit_TextAppearance_Bold"/>
+            <TextView android:textColor="@color/primary_dark_300" android:id="@+id/call_streaming_active_body" android:paddingLeft="64dp" android:paddingRight="64dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/mobile_stream_active_body" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/call_stop_streaming_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_header" style="@style/UiKit_TextAppearance"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/call_stop_streaming_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mobile_stream_stop_sharing" android:backgroundTint="@color/primary_500" app:cornerRadius="100dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/call_streaming_active_body" style="@style/UiKit_Material_Button"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
         <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" android:layout_marginTop="32dp" app:cardCornerRadius="8dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toBottomOf="@+id/action_bar_toolbar_layout" app:layout_goneMarginTop="72dp">
             <com.discord.views.calls.VideoCallParticipantView android:id="@+id/call_pip" android:visibility="gone" android:layout_width="140dp" android:layout_height="79dp" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="true"/>
         </androidx.cardview.widget.CardView>
-        <com.google.android.material.button.MaterialButton android:theme="@style/res_2131951648_apptheme_dark" android:textColor="@color/primary_100" android:id="@+id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0dp" android:layout_margin="8dp" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_630_alpha_90" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952458_uikit_material_button"/>
+        <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme_Dark" android:textColor="@color/primary_100" android:id="@+id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0dp" android:layout_margin="8dp" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_630_alpha_90" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_Material_Button"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@+id/call_controls_sheet_container" android:saveEnabled="false" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui">
         <com.discord.widgets.voice.controls.VoiceControlsSheetView android:layout_gravity="center_horizontal" android:id="@+id/voice_controls_sheet_view" android:visibility="invisible" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" style="@style/VoiceControlsSheet"/>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/stage_call_speaking_chip" android:background="@drawable/bg_stage_channel_speaking_chip" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/top_of_ui" app:layout_constraintVertical_bias="0.75" app:layout_constraintWidth_max="275dp">
         <com.discord.views.user.UserSummaryView android:id="@+id/stage_call_speaking_user_summary" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/stage_call_speaking_user_summary_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:summary_avatarOverlap="4dp" app:summary_avatarSize="24dp" app:summary_maxAvatars="3"/>
-        <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_call_speaking_user_summary_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_call_speaking_user_summary" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+        <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/stage_call_speaking_user_summary_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/stage_call_speaking_user_summary" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Medium_SingleLine"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <ViewStub android:id="@+id/start_stage_event_button_stub" android:layout="@layout/stub_call_fullscreen_start_stage_event_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.75"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_call_fullscreen_audio_share_warning.xml b/app/src/main/res/layout/widget_call_fullscreen_audio_share_warning.xml
index 925258872e..0df5efce75 100644
--- a/app/src/main/res/layout/widget_call_fullscreen_audio_share_warning.xml
+++ b/app/src/main/res/layout/widget_call_fullscreen_audio_share_warning.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/call_streaming_audio_share_warning" android:layout_width="0dp" android:layout_height="wrap_content" android:elevation="0dp" app:cardBackgroundColor="@color/status_yellow_500_alpha_10" app:cardCornerRadius="4dp" app:layout_constraintBottom_toTopOf="@+id/call_audio_share_warning_barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" app:strokeColor="@color/status_yellow" app:strokeWidth="1dp">
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:padding="8dp" android:text="@string/mobile_stream_active_soundshare_warning_android" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_warning_circle_24dp" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:padding="8dp" android:text="@string/mobile_stream_active_soundshare_warning_android" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_warning_circle_24dp" style="@style/UiKit_TextView"/>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/widget_call_fullscreen_private_call.xml b/app/src/main/res/layout/widget_call_fullscreen_private_call.xml
index 50733ffa55..1422e1bbf9 100644
--- a/app/src/main/res/layout/widget_call_fullscreen_private_call.xml
+++ b/app/src/main/res/layout/widget_call_fullscreen_private_call.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/private_call_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent">
     <com.discord.widgets.voice.fullscreen.grid.PrivateCallBlurredGridView android:id="@+id/private_call_blurred_grid_view" android:background="@color/primary_dark_630" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <LinearLayout android:gravity="center" android:id="@+id/private_call_container_content" android:layout_centerInParent="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@+id/private_call_connectivity_status_bar" android:background="@drawable/rounded_rectangle_4dp_radius" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="24dp" android:text="@string/ongoing_call_voice_quality_low" app:backgroundTint="@color/status_red" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:gravity="center" android:id="@+id/private_call_container_content" android:layout_centerInParent="true" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@+id/private_call_connectivity_status_bar" android:background="@drawable/rounded_rectangle_4dp_radius" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="24dp" android:text="@string/ongoing_call_voice_quality_low" app:backgroundTint="@color/status_red" style="@style/UiKit_TextView"/>
         <com.discord.widgets.voice.fullscreen.grid.PrivateCallGridView android:id="@+id/private_call_grid_view" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/private_call_status_primary" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:singleLine="true" style="@style/res_2131952564_uikit_textview_bold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_dark_300" android:id="@+id/private_call_status_secondary" android:layout_margin="8dp" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_dark_300" android:id="@+id/private_call_status_duration" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/private_call_status_primary" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:singleLine="true" style="@style/UiKit_TextView_Bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_dark_300" android:id="@+id/private_call_status_secondary" android:layout_margin="8dp" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_dark_300" android:id="@+id/private_call_status_duration" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_change_log.xml b/app/src/main/res/layout/widget_change_log.xml
index 647d1d1c1e..5a39f35987 100644
--- a/app/src/main/res/layout/widget_change_log.xml
+++ b/app/src/main/res/layout/widget_change_log.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" style="@style/res_2131951663_apptheme_toolbar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView android:id="@+id/change_log_scrollview" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-        <LinearLayout android:id="@+id/change_log_contents" android:paddingBottom="@dimen/list_bottom_padding" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+        <LinearLayout android:id="@+id/change_log_contents" android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit_ViewGroup_LinearLayout">
             <FrameLayout android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" android:elevation="16dp">
                 <FrameLayout android:background="@color/black" android:layout_width="match_parent" android:layout_height="wrap_content">
                     <VideoView android:id="@+id/change_log_video" android:layout_width="match_parent" android:layout_height="200dp"/>
@@ -12,12 +12,12 @@
                 <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/change_log_thumbnail" android:padding="8dp" android:visibility="gone" android:clickable="false" android:layout_width="match_parent" android:layout_height="wrap_content" app:backgroundImage="@color/primary_900_alpha_60" app:viewAspectRatio="1.7778"/>
                 <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/change_log_video_overlay" android:padding="8dp" android:clickable="false" android:layout_width="64dp" android:layout_height="64dp" app:backgroundImage="@color/primary_900_alpha_60" app:placeholderImage="@drawable/ic_play_arrow_grey_24dp" app:placeholderImageScaleType="2" app:roundAsCircle="true"/>
             </FrameLayout>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/change_log_body" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/change_log_md_body" style="@style/res_2131952563_uikit_textview"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/change_log_body" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/change_log_md_body" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingTop="4dp" android:paddingBottom="4dp" android:paddingStart="16dp" android:paddingEnd="0dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/change_log_twitter" android:padding="8dp" android:layout_margin="2dp" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" app:tint="?attr/primary_100" style="@style/res_2131952449_uikit_imageview_clickable"/>
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/change_log_facebook" android:padding="8dp" android:layout_margin="2dp" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" app:tint="?attr/primary_100" style="@style/res_2131952449_uikit_imageview_clickable"/>
-        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/change_log_instagram" android:padding="8dp" android:layout_margin="2dp" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" app:tint="?attr/primary_100" style="@style/res_2131952449_uikit_imageview_clickable"/>
+    <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingTop="4dp" android:paddingBottom="4dp" android:paddingStart="16dp" android:paddingEnd="0dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/change_log_twitter" android:padding="8dp" android:layout_margin="2dp" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" app:tint="?attr/primary_100" style="@style/UiKit_ImageView_Clickable"/>
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/change_log_facebook" android:padding="8dp" android:layout_margin="2dp" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" app:tint="?attr/primary_100" style="@style/UiKit_ImageView_Clickable"/>
+        <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/change_log_instagram" android:padding="8dp" android:layout_margin="2dp" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" app:tint="?attr/primary_100" style="@style/UiKit_ImageView_Clickable"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_change_log_special.xml b/app/src/main/res/layout/widget_change_log_special.xml
index 21d29a8448..0602da90aa 100644
--- a/app/src/main/res/layout/widget_change_log_special.xml
+++ b/app/src/main/res/layout/widget_change_log_special.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:fitsSystemWindows="true" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:fitsSystemWindows="true" style="@style/UiKit_ViewGroup_Page_LinearLayout">
     <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent">
         <androidx.core.widget.NestedScrollView android:id="@+id/change_log_special_scrollview" android:layout_width="match_parent" android:layout_height="match_parent">
-            <LinearLayout android:id="@+id/change_log_special_contents" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+            <LinearLayout android:id="@+id/change_log_special_contents" style="@style/UiKit_ViewGroup_LinearLayout">
                 <androidx.cardview.widget.CardView android:id="@+id/changelog_special_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="-24dp" app:cardCornerRadius="24dp">
-                    <LinearLayout android:background="@drawable/bg_changelog_special_header" android:paddingTop="68dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                        <TextView android:textSize="32sp" android:textColor="@color/white" android:layout_gravity="center" android:text="@string/changelog_stickers_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                        <TextView android:textSize="@dimen/uikit_textsize_large" android:textStyle="italic" android:textColor="@color/white" android:layout_gravity="center" android:id="@+id/change_log_special_date" android:paddingLeft="4dp" android:paddingRight="4dp" android:text="@string/change_log_md_date" style="@style/res_2131952581_uikit_textview_subtext"/>
+                    <LinearLayout android:background="@drawable/bg_changelog_special_header" android:paddingTop="68dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                        <TextView android:textSize="32sp" android:textColor="@color/white" android:layout_gravity="center" android:text="@string/changelog_stickers_header" style="@style/UiKit_TextView_H1_Bold"/>
+                        <TextView android:textSize="@dimen/uikit_textsize_large" android:textStyle="italic" android:textColor="@color/white" android:layout_gravity="center" android:id="@+id/change_log_special_date" android:paddingLeft="4dp" android:paddingRight="4dp" android:text="@string/change_log_md_date" style="@style/UiKit_TextView_Subtext"/>
                         <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/changelog_special_hero" android:scaleType="fitXY" android:adjustViewBounds="true"/>
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
@@ -17,13 +17,13 @@
                         <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/change_log_video_overlay" android:padding="8dp" android:clickable="false" android:layout_width="64dp" android:layout_height="64dp" app:backgroundImage="@color/primary_900_alpha_60" app:placeholderImage="@drawable/ic_play_arrow_grey_24dp" app:placeholderImageScaleType="2" app:roundAsCircle="true"/>
                     </FrameLayout>
                 </androidx.cardview.widget.CardView>
-                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/change_log_body" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_marginTop="-16dp" android:layout_marginBottom="16dp" android:text="@string/change_log_md_body" android:lineSpacingMultiplier="1" android:fontFamily="?attr/font_primary_normal" style="@style/res_2131952563_uikit_textview"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/change_log_body" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_marginTop="-16dp" android:layout_marginBottom="16dp" android:text="@string/change_log_md_body" android:lineSpacingMultiplier="1" android:fontFamily="?attr/font_primary_normal" style="@style/UiKit_TextView"/>
                 <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="8dp" app:cardElevation="8dp">
-                    <LinearLayout android:paddingTop="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                        <LinearLayout android:paddingLeft="24dp" android:paddingRight="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                            <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center" android:layout_marginBottom="8dp" android:text="@string/changelog_stickers_cta_title" android:lineSpacingMultiplier="1" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                            <TextView android:textColor="?attr/colorTextNormal" android:gravity="center" android:layout_gravity="center" android:id="@+id/change_log_special_cta_body" android:focusable="true" android:clickable="true" android:layout_marginBottom="8dp" android:text="@string/changelog_stickers_cta_body" android:lineSpacingMultiplier="1" style="@style/res_2131952570_uikit_textview_large"/>
-                            <com.google.android.material.button.MaterialButton android:gravity="center" android:layout_gravity="center" android:id="@+id/change_log_special_button" android:layout_width="wrap_content" android:text="@string/changelog_stickers_cta" android:contentDescription="@strings/changelog_special_cta" style="@style/res_2131952460_uikit_material_button_green"/>
+                    <LinearLayout android:paddingTop="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                        <LinearLayout android:paddingLeft="24dp" android:paddingRight="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                            <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_gravity="center" android:layout_marginBottom="8dp" android:text="@string/changelog_stickers_cta_title" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_H1_Bold"/>
+                            <TextView android:textColor="?attr/colorTextNormal" android:gravity="center" android:layout_gravity="center" android:id="@+id/change_log_special_cta_body" android:focusable="true" android:clickable="true" android:layout_marginBottom="8dp" android:text="@string/changelog_stickers_cta_body" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Large"/>
+                            <com.google.android.material.button.MaterialButton android:gravity="center" android:layout_gravity="center" android:id="@+id/change_log_special_button" android:layout_width="wrap_content" android:text="@string/changelog_stickers_cta" android:contentDescription="@strings/changelog_special_cta" style="@style/UiKit_Material_Button_Green"/>
                         </LinearLayout>
                         <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/changelog_special_footer" android:scaleType="fitXY" android:adjustViewBounds="true"/>
                     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_follow_sheet.xml b/app/src/main/res/layout/widget_channel_follow_sheet.xml
index 5684bf261e..1d661f2bdd 100644
--- a/app/src/main/res/layout/widget_channel_follow_sheet.xml
+++ b/app/src/main/res/layout/widget_channel_follow_sheet.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
         <FrameLayout android:background="?attr/bg_announcements_follow_sheet" android:layout_width="match_parent" android:layout_height="96dp">
-            <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="32dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+            <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="32dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channel_follow_guild_icon" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:roundedCornerRadius="4dp"/>
                 <androidx.cardview.widget.CardView android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:layout_marginEnd="8dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="4dp">
-                    <TextView android:gravity="center_vertical" android:id="@+id/channel_follow_channel_name" android:layout_height="match_parent" android:drawablePadding="8dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableStartCompat="@drawable/ic_channel_text" app:drawableTint="?attr/colorTextMuted" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+                    <TextView android:gravity="center_vertical" android:id="@+id/channel_follow_channel_name" android:layout_height="match_parent" android:drawablePadding="8dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableStartCompat="@drawable/ic_channel_text" app:drawableTint="?attr/colorTextMuted" style="@style/UiKit_TextView_Large_SingleLine"/>
                 </androidx.cardview.widget.CardView>
             </LinearLayout>
         </FrameLayout>
         <com.discord.app.AppViewFlipper android:id="@+id/follow_sheet_view_flipper" android:layout_width="wrap_content" android:layout_height="wrap_content" android:measureAllChildren="false">
-            <LinearLayout android:padding="16dp" android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="16dp" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_gravity="center" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/follow_modal_body" android:textAlignment="center" style="@style/res_2131952581_uikit_textview_subtext"/>
-                <TextView android:text="@string/form_label_send_to" style="@style/res_2131952569_uikit_textview_h6"/>
+            <LinearLayout android:padding="16dp" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="16dp" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit_TextView_H1_Bold"/>
+                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_gravity="center" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/follow_modal_body" android:textAlignment="center" style="@style/UiKit_TextView_Subtext"/>
+                <TextView android:text="@string/form_label_send_to" style="@style/UiKit_TextView_H6"/>
                 <com.google.android.material.card.MaterialCardView android:id="@+id/channel_follow_select_guild" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" app:contentPadding="8dp">
-                    <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_follow_selected_guild_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@+id/channel_follow_guild_dropdown_icon" android:layout_alignParentStart="true" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
+                    <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_RelativeLayout">
+                        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_follow_selected_guild_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@+id/channel_follow_guild_dropdown_icon" android:layout_alignParentStart="true" style="@style/UiKit_TextView_Subtext_SingleLine"/>
                         <ImageView android:id="@+id/channel_follow_guild_dropdown_icon" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_arrow_drop_down_white_18dp" android:importantForAccessibility="no" android:layout_alignParentEnd="true"/>
                     </RelativeLayout>
                 </com.google.android.material.card.MaterialCardView>
-                <TextView android:text="@string/form_label_select_channel" style="@style/res_2131952569_uikit_textview_h6"/>
+                <TextView android:text="@string/form_label_select_channel" style="@style/UiKit_TextView_H6"/>
                 <com.google.android.material.card.MaterialCardView android:id="@+id/channel_follow_select_channel" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" app:contentPadding="8dp">
-                    <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_follow_selected_channel_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@+id/channel_follow_channel_dropdown_icon" android:layout_alignParentStart="true" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
+                    <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_RelativeLayout">
+                        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/channel_follow_selected_channel_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/select" android:layout_centerVertical="true" android:layout_toStartOf="@+id/channel_follow_channel_dropdown_icon" android:layout_alignParentStart="true" style="@style/UiKit_TextView_Subtext_SingleLine"/>
                         <ImageView android:id="@+id/channel_follow_channel_dropdown_icon" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_arrow_drop_down_white_18dp" android:importantForAccessibility="no" android:layout_alignParentEnd="true"/>
                     </RelativeLayout>
                 </com.google.android.material.card.MaterialCardView>
-                <TextView android:textSize="12sp" android:id="@+id/channel_follow_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textAlignment="viewStart" style="@style/res_2131952223_textappearance_error"/>
-                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_marginBottom="16dp" android:text="@string/follow_modal_hint" style="@style/res_2131952581_uikit_textview_subtext"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/create_channel_follower_button" android:text="@string/follow" style="@style/res_2131952458_uikit_material_button"/>
+                <TextView android:textSize="12sp" android:id="@+id/channel_follow_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textAlignment="viewStart" style="@style/TextAppearance_Error"/>
+                <TextView android:textSize="@dimen/uikit_textsize_medium" android:layout_marginBottom="16dp" android:text="@string/follow_modal_hint" style="@style/UiKit_TextView_Subtext"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/create_channel_follower_button" android:text="@string/follow" style="@style/UiKit_Material_Button"/>
             </LinearLayout>
-            <LinearLayout android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                <TextView android:textSize="12sp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/follow_modal_hint_no_perms" android:textAlignment="center" style="@style/res_2131952223_textappearance_error"/>
+            <LinearLayout android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_gravity="center" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/follow_modal_title" android:textAlignment="center" style="@style/UiKit_TextView_H1_Bold"/>
+                <TextView android:textSize="12sp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/follow_modal_hint_no_perms" android:textAlignment="center" style="@style/TextAppearance_Error"/>
             </LinearLayout>
         </com.discord.app.AppViewFlipper>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_follow_success_dialog.xml b/app/src/main/res/layout/widget_channel_follow_success_dialog.xml
index 7bc8671ac0..753bbacfc3 100644
--- a/app/src/main/res/layout/widget_channel_follow_success_dialog.xml
+++ b/app/src/main/res/layout/widget_channel_follow_success_dialog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:gravity="center" android:background="?attr/colorBackgroundPrimary" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:gravity="center" android:background="?attr/colorBackgroundPrimary" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channel_follow_success_image" android:layout_width="280dp" android:layout_height="120dp" android:layout_marginTop="24dp" android:layout_marginBottom="32dp" android:importantForAccessibility="no"/>
-        <TextView android:layout_gravity="center" android:id="@+id/channel_follow_success_text" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/res_2131952565_uikit_textview_h1"/>
-        <TextView android:layout_gravity="center" android:layout_marginBottom="24dp" android:text="@string/follow_success_modal_body" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/channel_follow_success_confirm" android:text="@string/tutorial_close" style="@style/res_2131952458_uikit_material_button"/>
+        <TextView android:layout_gravity="center" android:id="@+id/channel_follow_success_text" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/UiKit_TextView_H1"/>
+        <TextView android:layout_gravity="center" android:layout_marginBottom="24dp" android:text="@string/follow_success_modal_body" android:textAlignment="center" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/channel_follow_success_confirm" android:text="@string/tutorial_close" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_channel_group_dm_settings.xml b/app/src/main/res/layout/widget_channel_group_dm_settings.xml
index 9dff7f0101..b47712623f 100644
--- a/app/src/main/res/layout/widget_channel_group_dm_settings.xml
+++ b/app/src/main/res/layout/widget_channel_group_dm_settings.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/group_dm_settings_scroll_view" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/settings_group_icon" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/color_brand_500" app:roundAsCircle="true" style="@style/res_2131951679_avatar_xxlarge"/>
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@+id/settings_group_icon" app:layout_constraintRight_toRightOf="@+id/settings_group_icon" app:layout_constraintTop_toTopOf="@+id/settings_group_icon" style="@style/res_2131952448_uikit_imageview"/>
-                <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@+id/settings_group_icon_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/settings_group_icon_remove" app:layout_constraintEnd_toEndOf="@+id/settings_group_icon" app:layout_constraintStart_toStartOf="@+id/settings_group_icon" app:layout_constraintTop_toBottomOf="@+id/settings_group_icon" style="@style/res_2131952581_uikit_textview_subtext"/>
-                <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/color_brand_500" android:id="@+id/settings_group_icon_remove" android:background="?attr/selectableItemBackground" android:padding="8dp" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/settings_group_icon" app:layout_constraintStart_toStartOf="@+id/settings_group_icon" app:layout_constraintTop_toBottomOf="@+id/settings_group_icon_label" style="@style/res_2131952581_uikit_textview_subtext"/>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_name" android:layout_width="0dp" android:hint="@string/form_label_channel_name" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/settings_group_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/settings_group_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/settings_group_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/group_dm_settings_scroll_view" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit_ViewGroup_LinearLayout">
+            <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/settings_group_icon" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/color_brand_500" app:roundAsCircle="true" style="@style/Avatar_XXLarge"/>
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@+id/settings_group_icon" app:layout_constraintRight_toRightOf="@+id/settings_group_icon" app:layout_constraintTop_toTopOf="@+id/settings_group_icon" style="@style/UiKit_ImageView"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@+id/settings_group_icon_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/settings_group_icon_remove" app:layout_constraintEnd_toEndOf="@+id/settings_group_icon" app:layout_constraintStart_toStartOf="@+id/settings_group_icon" app:layout_constraintTop_toBottomOf="@+id/settings_group_icon" style="@style/UiKit_TextView_Subtext"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/color_brand_500" android:id="@+id/settings_group_icon_remove" android:background="?attr/selectableItemBackground" android:padding="8dp" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/settings_group_icon" app:layout_constraintStart_toStartOf="@+id/settings_group_icon" app:layout_constraintTop_toBottomOf="@+id/settings_group_icon_label" style="@style/UiKit_TextView_Subtext"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_name" android:layout_width="0dp" android:hint="@string/form_label_channel_name" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/settings_group_icon" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/settings_group_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/settings_group_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/notification_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/notification_settings" style="@style/UiKit_Settings_Item_Header"/>
             <com.discord.widgets.servers.NotificationMuteSettingsView android:id="@+id/group_dm_notifications_mute_settings_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <View style="@style/UiKit_Settings_Divider"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_settings_save" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save_changes" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_settings_save" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save_changes" style="@style/Settings_FloatingActionButton"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_channel_members_list.xml b/app/src/main/res/layout/widget_channel_members_list.xml
index 93937d89b5..139d7e4ee9 100644
--- a/app/src/main/res/layout/widget_channel_members_list.xml
+++ b/app/src/main/res/layout/widget_channel_members_list.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:scrollbars="none" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:scrollbars="none" style="@style/UiKit_ViewGroup_RecyclerView"/>
diff --git a/app/src/main/res/layout/widget_channel_members_list_item_add.xml b/app/src/main/res/layout/widget_channel_members_list_item_add.xml
index 4ac886f25e..05327679c1 100644
--- a/app/src/main/res/layout/widget_channel_members_list_item_add.xml
+++ b/app/src/main/res/layout/widget_channel_members_list_item_add.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <ImageView android:id="@+id/channel_members_list_item_add" android:background="@drawable/drawable_circle_background_secondary" android:padding="8dp" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_add_person_16dp" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="16dp" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/channel_members_list_item_add_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/invite_members" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/channel_members_list_item_add_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/invite_members" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_members_list_item_header.xml b/app/src/main/res/layout/widget_channel_members_list_item_header.xml
index 4ea4a3e907..c8a9bd890b 100644
--- a/app/src/main/res/layout/widget_channel_members_list_item_header.xml
+++ b/app/src/main/res/layout/widget_channel_members_list_item_header.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:gravity="bottom" android:id="@+id/channel_members_list_item_header_text" android:focusable="true" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/res_2131952569_uikit_textview_h6"/>
+    <TextView android:gravity="bottom" android:id="@+id/channel_members_list_item_header_text" android:focusable="true" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/UiKit_TextView_H6"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_channel_members_list_item_user.xml b/app/src/main/res/layout/widget_channel_members_list_item_user.xml
index 3897269cc9..14223e9966 100644
--- a/app/src/main/res/layout/widget_channel_members_list_item_user.xml
+++ b/app/src/main/res/layout/widget_channel_members_list_item_user.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="@dimen/channel_list_row_height" android:paddingStart="16dp" android:paddingEnd="16dp">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channel_members_list_item_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/res_2131951678_avatar_standard"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channel_members_list_item_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/Avatar_Standard"/>
     <com.discord.views.StatusView android:id="@+id/channel_members_list_item_presence" android:layout_width="10dp" android:layout_height="wrap_content" android:translationX="1.5dp" android:translationY="1.5dp" app:layout_constraintBottom_toBottomOf="@+id/channel_members_list_item_avatar" app:layout_constraintRight_toRightOf="@+id/channel_members_list_item_avatar" app:sv_background_color="?attr/primary_600" app:sv_border_width="1.5dp" app:sv_corner_radius="2dp"/>
     <com.discord.views.UsernameView android:id="@+id/channel_members_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="4dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/channel_members_list_item_game" app:layout_constraintEnd_toStartOf="@+id/channel_members_list_item_group_owner_indicator" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintHorizontal_weight="1" app:layout_constraintRight_toRightOf="@+id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@+id/channel_members_list_item_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2"/>
-    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/primary_400" android:id="@+id/channel_members_list_item_game" android:singleLine="true" android:layout_marginStart="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_members_list_item_rich_presence_iv" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintLeft_toRightOf="@+id/channel_members_list_item_avatar" app:layout_constraintRight_toLeftOf="@+id/channel_members_list_item_rich_presence_iv" app:layout_constraintStart_toEndOf="@+id/channel_members_list_item_avatar" app:layout_constraintTop_toBottomOf="@+id/channel_members_list_item_name" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <ImageView android:id="@+id/channel_members_list_item_rich_presence_iv" android:src="@drawable/ic_rich_presence_grey_16dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="@+id/channel_members_list_item_game" app:layout_constraintEnd_toStartOf="@+id/channel_members_list_item_group_owner_indicator" app:layout_constraintLeft_toRightOf="@+id/channel_members_list_item_game" app:layout_constraintRight_toLeftOf="@+id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@+id/channel_members_list_item_game" app:layout_constraintTop_toTopOf="@+id/channel_members_list_item_game" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/channel_members_list_item_group_owner_indicator" android:src="@drawable/ic_crown_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_members_list_item_boosted_indicator" app:layout_constraintRight_toLeftOf="@+id/channel_members_list_item_boosted_indicator" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/channel_members_list_item_boosted_indicator" android:src="@drawable/ic_member_list_boosted_badge_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/primary_400" android:id="@+id/channel_members_list_item_game" android:singleLine="true" android:layout_marginStart="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_members_list_item_rich_presence_iv" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintLeft_toRightOf="@+id/channel_members_list_item_avatar" app:layout_constraintRight_toLeftOf="@+id/channel_members_list_item_rich_presence_iv" app:layout_constraintStart_toEndOf="@+id/channel_members_list_item_avatar" app:layout_constraintTop_toBottomOf="@+id/channel_members_list_item_name" style="@style/UiKit_TextView_Subtext"/>
+    <ImageView android:id="@+id/channel_members_list_item_rich_presence_iv" android:src="@drawable/ic_rich_presence_grey_16dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="@+id/channel_members_list_item_game" app:layout_constraintEnd_toStartOf="@+id/channel_members_list_item_group_owner_indicator" app:layout_constraintLeft_toRightOf="@+id/channel_members_list_item_game" app:layout_constraintRight_toLeftOf="@+id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@+id/channel_members_list_item_game" app:layout_constraintTop_toTopOf="@+id/channel_members_list_item_game" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/channel_members_list_item_group_owner_indicator" android:src="@drawable/ic_crown_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_members_list_item_boosted_indicator" app:layout_constraintRight_toLeftOf="@+id/channel_members_list_item_boosted_indicator" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/channel_members_list_item_boosted_indicator" android:src="@drawable/ic_member_list_boosted_badge_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_channel_notification_settings.xml b/app/src/main/res/layout/widget_channel_notification_settings.xml
index 4c62c7491f..224d0b0148 100644
--- a/app/src/main/res/layout/widget_channel_notification_settings.xml
+++ b/app/src/main/res/layout/widget_channel_notification_settings.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit_ViewGroup_LinearLayout">
             <com.discord.widgets.servers.NotificationMuteSettingsView android:id="@+id/mute_settings" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <LinearLayout android:id="@+id/channel_settings_notifications_frequency_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View android:id="@+id/frequency_top_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/form_label_notification_frequency" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <com.discord.views.CheckedSetting android:id="@+id/frequency_radio_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                    <com.discord.views.CheckedSetting android:id="@+id/frequency_radio_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                    <com.discord.views.CheckedSetting android:id="@+id/frequency_radio_nothing" app:cs_text="@string/form_label_nothing" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <LinearLayout android:id="@+id/channel_settings_notifications_frequency_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View android:id="@+id/frequency_top_divider" style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/form_label_notification_frequency" style="@style/UiKit_Settings_Item_Header"/>
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <com.discord.views.CheckedSetting android:id="@+id/frequency_radio_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                    <com.discord.views.CheckedSetting android:id="@+id/frequency_radio_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                    <com.discord.views.CheckedSetting android:id="@+id/frequency_radio_nothing" app:cs_text="@string/form_label_nothing" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
                 </LinearLayout>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:gravity="center_vertical" android:id="@+id/channel_notification_settings_system" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <ImageView android:padding="@dimen/uikit_textsize_large" android:src="?attr/ic_notifications_a60" android:contentDescription="@string/form_label_mobile_notifications_system_label" style="@style/res_2131952448_uikit_imageview"/>
-                <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:text="@string/form_label_mobile_user_notifications_label" style="@style/res_2131952498_uikit_settings_item_label"/>
-                    <TextView android:text="@string/form_label_mobile_user_notifications_hint" style="@style/res_2131952493_uikit_settings_item_addition"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:gravity="center_vertical" android:id="@+id/channel_notification_settings_system" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <ImageView android:padding="@dimen/uikit_textsize_large" android:src="?attr/ic_notifications_a60" android:contentDescription="@string/form_label_mobile_notifications_system_label" style="@style/UiKit_ImageView"/>
+                <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:text="@string/form_label_mobile_user_notifications_label" style="@style/UiKit_Settings_Item_Label"/>
+                    <TextView android:text="@string/form_label_mobile_user_notifications_hint" style="@style/UiKit_Settings_Item_Addition"/>
                 </LinearLayout>
-                <ImageView android:padding="16dp" android:src="@drawable/icon_carrot" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+                <ImageView android:padding="16dp" android:src="@drawable/icon_carrot" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_channel_onboarding.xml b/app/src/main/res/layout/widget_channel_onboarding.xml
index 25c992a7c3..d1e626bbb9 100644
--- a/app/src/main/res/layout/widget_channel_onboarding.xml
+++ b/app/src/main/res/layout/widget_channel_onboarding.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/nuf_channels_description" app:stv_title="@string/nuf_channels_title"/>
-        <ImageView android:layout_width="280dp" android:layout_marginBottom="24dp" android:src="?attr/drawable_channels_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/res_2131952448_uikit_imageview"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/channel_actions_view" android:text="@string/nuf_channels_cta_label" style="@style/res_2131952382_uikit_authbutton_material"/>
+        <ImageView android:layout_width="280dp" android:layout_marginBottom="24dp" android:src="?attr/drawable_channels_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit_ImageView"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/channel_actions_view" android:text="@string/nuf_channels_cta_label" style="@style/UiKit_AuthButton_Material"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_picker_sheet.xml b/app/src/main/res/layout/widget_channel_picker_sheet.xml
index b7bd588c9f..7c7de6c114 100644
--- a/app/src/main/res/layout/widget_channel_picker_sheet.xml
+++ b/app/src/main/res/layout/widget_channel_picker_sheet.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/channel_picker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/channel_picker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/channel_picker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/channel_picker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:background="?attr/colorBackgroundTertiary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952564_uikit_textview_bold"/>
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:background="?attr/colorBackgroundTertiary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_TextView_Bold"/>
                 <com.discord.views.SearchInputView android:id="@+id/channel_picker_search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="16dp" android:layout_marginRight="12dp" android:layout_marginBottom="16dp" app:siv_hint="@string/search_channels" app:siv_search_content_description="@string/search_channels"/>
             </LinearLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/channel_picker_app_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/channel_picker_app_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" style="@style/res_2131952679_widget_appcompat_progressbar"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_picker_recycler" android:layout_height="match_parent" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_picker_recycler" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_channel_pinned_messages.xml b/app/src/main/res/layout/widget_channel_pinned_messages.xml
index 7289ecb6c4..7d279c511b 100644
--- a/app/src/main/res/layout/widget_channel_pinned_messages.xml
+++ b/app/src/main/res/layout/widget_channel_pinned_messages.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_pinned_messages_recycler" android:scrollbars="vertical" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_pinned_messages_recycler" android:scrollbars="vertical" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_channel_search_item.xml b/app/src/main/res/layout/widget_channel_search_item.xml
index 2e0a3adb14..5108480f1d 100644
--- a/app/src/main/res/layout/widget_channel_search_item.xml
+++ b/app/src/main/res/layout/widget_channel_search_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.widgets.user.search.ViewGlobalSearchItem xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingTop="2dp" android:paddingBottom="2dp" android:focusable="true" android:clickable="true" android:clipChildren="false" android:paddingEnd="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout"/>
+<com.discord.widgets.user.search.ViewGlobalSearchItem xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingTop="2dp" android:paddingBottom="2dp" android:focusable="true" android:clickable="true" android:clipChildren="false" android:paddingEnd="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout"/>
diff --git a/app/src/main/res/layout/widget_channel_search_item_header.xml b/app/src/main/res/layout/widget_channel_search_item_header.xml
index f8522f5493..efc8d96478 100644
--- a/app/src/main/res/layout/widget_channel_search_item_header.xml
+++ b/app/src/main/res/layout/widget_channel_search_item_header.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_header_tv" android:layout_marginTop="8dp" android:text="@string/search_newest" android:singleLine="true" style="@style/res_2131952485_uikit_search_header"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_header_tv" android:layout_marginTop="8dp" android:text="@string/search_newest" android:singleLine="true" style="@style/UiKit_Search_Header"/>
diff --git a/app/src/main/res/layout/widget_channel_selector.xml b/app/src/main/res/layout/widget_channel_selector.xml
index f58ad5c941..a05b8cd06a 100644
--- a/app/src/main/res/layout/widget_channel_selector.xml
+++ b/app/src/main/res/layout/widget_channel_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/channel_select" android:layout_marginStart="16dp" style="@style/res_2131952506_uikit_sheet_header_title"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_selector_list" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/channel_select" android:layout_marginStart="16dp" style="@style/UiKit_Sheet_Header_Title"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_selector_list" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_channel_selector_item.xml b/app/src/main/res/layout/widget_channel_selector_item.xml
index 4ea08f767a..614b84e961 100644
--- a/app/src/main/res/layout/widget_channel_selector_item.xml
+++ b/app/src/main/res/layout/widget_channel_selector_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_name" android:singleLine="true" app:drawableStartCompat="@drawable/ic_channels_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_name" android:singleLine="true" app:drawableStartCompat="@drawable/ic_channels_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
diff --git a/app/src/main/res/layout/widget_channel_settings_add_member.xml b/app/src/main/res/layout/widget_channel_settings_add_member.xml
index a2a4f447fc..773ec2cbd8 100644
--- a/app/src/main/res/layout/widget_channel_settings_add_member.xml
+++ b/app/src/main/res/layout/widget_channel_settings_add_member.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
-    <LinearLayout android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingNestedViewBehavior" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout">
+    <LinearLayout android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingNestedViewBehavior" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.SearchInputView android:id="@+id/search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="14dp" android:layout_marginRight="16dp" android:layout_marginBottom="14dp" app:siv_hint="@string/private_channel_add_members_modal_search_placeholder_mobile"/>
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler" android:layout_width="match_parent" android:layout_height="match_parent"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_add_member_category.xml b/app/src/main/res/layout/widget_channel_settings_add_member_category.xml
index 39ad4689c9..ab19ce73fc 100644
--- a/app/src/main/res/layout/widget_channel_settings_add_member_category.xml
+++ b/app/src/main/res/layout/widget_channel_settings_add_member_category.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:id="@+id/label" android:paddingTop="24dp" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952569_uikit_textview_h6"/>
+    <TextView android:id="@+id/label" android:paddingTop="24dp" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_H6"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_add_member_sheet.xml b/app/src/main/res/layout/widget_channel_settings_add_member_sheet.xml
index 66362ece97..7d7bda40ce 100644
--- a/app/src/main/res/layout/widget_channel_settings_add_member_sheet.xml
+++ b/app/src/main/res/layout/widget_channel_settings_add_member_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundTertiary" android:paddingLeft="16dp" android:paddingTop="14dp" android:paddingRight="16dp" android:paddingBottom="14dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/channel_permissions_add_moderator_title" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/add_button" android:background="?attr/selectableItemBackgroundBorderless" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/add" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundTertiary" android:paddingLeft="16dp" android:paddingTop="14dp" android:paddingRight="16dp" android:paddingBottom="14dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/channel_permissions_add_moderator_title" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toStartOf="@+id/add_button" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/add_button" android:background="?attr/selectableItemBackgroundBorderless" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/add" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.fragment.app.FragmentContainerView android:id="@+id/content" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_cannot_delete.xml b/app/src/main/res/layout/widget_channel_settings_cannot_delete.xml
index 010bca5973..bf43663f94 100644
--- a/app/src/main/res/layout/widget_channel_settings_cannot_delete.xml
+++ b/app/src/main/res/layout/widget_channel_settings_cannot_delete.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/channel_settings_cannot_delete_title" android:padding="16dp" android:layout_width="match_parent" android:text="@string/cannot_delete_channel" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View android:layout_marginTop="0dp" style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:id="@+id/channel_settings_cannot_delete_body" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <TextView android:paddingTop="0dp" android:text="@string/android_designate_other_channel" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout android:gravity="end" android:background="?attr/colorBackgroundSecondary" android:padding="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.google.android.material.button.MaterialButton android:id="@+id/channel_settings_cannot_delete_confirm" android:text="@string/okay" style="@style/res_2131952459_uikit_material_button_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/channel_settings_cannot_delete_title" android:padding="16dp" android:layout_width="match_parent" android:text="@string/cannot_delete_channel" style="@style/UiKit_TextView_H1_Bold"/>
+    <View android:layout_marginTop="0dp" style="@style/UiKit_Divider"/>
+    <TextView android:id="@+id/channel_settings_cannot_delete_body" style="@style/UiKit_Settings_Item_SubText"/>
+    <TextView android:paddingTop="0dp" android:text="@string/android_designate_other_channel" style="@style/UiKit_Settings_Item_SubText"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout android:gravity="end" android:background="?attr/colorBackgroundSecondary" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.google.android.material.button.MaterialButton android:id="@+id/channel_settings_cannot_delete_confirm" android:text="@string/okay" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_delete.xml b/app/src/main/res/layout/widget_channel_settings_delete.xml
index 39283f1c19..e1e4449037 100644
--- a/app/src/main/res/layout/widget_channel_settings_delete.xml
+++ b/app/src/main/res/layout/widget_channel_settings_delete.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/channel_settings_delete_title" android:padding="16dp" android:layout_width="match_parent" android:text="@string/delete_channel" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View android:layout_marginTop="0dp" style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:id="@+id/channel_settings_delete_body" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout android:gravity="end" android:background="?attr/primary_630" android:padding="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.google.android.material.button.MaterialButton android:id="@+id/channel_settings_delete_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/channel_settings_delete_confirm" android:text="@string/delete" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/channel_settings_delete_title" android:padding="16dp" android:layout_width="match_parent" android:text="@string/delete_channel" style="@style/UiKit_TextView_H1_Bold"/>
+    <View android:layout_marginTop="0dp" style="@style/UiKit_Divider"/>
+    <TextView android:id="@+id/channel_settings_delete_body" style="@style/UiKit_Settings_Item_SubText"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout android:gravity="end" android:background="?attr/primary_630" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.google.android.material.button.MaterialButton android:id="@+id/channel_settings_delete_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/channel_settings_delete_confirm" android:text="@string/delete" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_edit_permissions.xml b/app/src/main/res/layout/widget_channel_settings_edit_permissions.xml
index 935b74b304..b4b0ab65ff 100644
--- a/app/src/main/res/layout/widget_channel_settings_edit_permissions.xml
+++ b/app/src/main/res/layout/widget_channel_settings_edit_permissions.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_margin="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channel_permissions_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_permissions_target_name" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951678_avatar_standard"/>
-                <TextView android:ellipsize="end" android:id="@+id/channel_permissions_target_name" android:layout_width="0dp" android:layout_margin="16dp" android:maxLines="4" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_permissions_channel_name" app:layout_constraintStart_toEndOf="@+id/channel_permissions_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_default="2" app:layout_constraintWidth_percent="0.6" app:layout_goneMarginLeft="0dp" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:ellipsize="end" android:gravity="end" android:id="@+id/channel_permissions_channel_name" android:maxLines="4" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/channel_permissions_target_name" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_margin="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channel_permissions_avatar" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_permissions_target_name" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Standard"/>
+                <TextView android:ellipsize="end" android:id="@+id/channel_permissions_target_name" android:layout_width="0dp" android:layout_margin="16dp" android:maxLines="4" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channel_permissions_channel_name" app:layout_constraintStart_toEndOf="@+id/channel_permissions_avatar" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_default="2" app:layout_constraintWidth_percent="0.6" app:layout_goneMarginLeft="0dp" style="@style/UiKit_TextView"/>
+                <TextView android:ellipsize="end" android:gravity="end" android:id="@+id/channel_permissions_channel_name" android:maxLines="4" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/channel_permissions_target_name" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:id="@+id/section_general_permissions" android:text="@string/role_permissions_section_general_channel" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:id="@+id/section_general_permissions" android:text="@string/role_permissions_section_general_channel" style="@style/UiKit_Settings_Item_Header"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_text_read_messages" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/view_channel" app:tcs_subtext="@string/role_permissions_view_channel_description_channel"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_general_manage_channel" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/manage_channel" app:tcs_subtext="@string/role_permissions_manage_channel_description_text"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_general_manage_threads" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/manage_threads" app:tcs_subtext="@string/role_permissions_manage_threads_description_text"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_general_manage_permissions" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/manage_permissions" app:tcs_subtext="@string/role_permissions_manage_roles_description_channel"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_general_manage_webhooks" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/manage_webhooks" app:tcs_subtext="@string/role_permissions_manage_webhooks_description_channel"/>
             </LinearLayout>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/role_permissions_section_membership" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/role_permissions_section_membership" style="@style/UiKit_Settings_Item_Header"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_general_create_instant_invite" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/create_instant_invite" app:tcs_subtext="@string/role_permissions_create_instant_invite_description_text"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_permissions_text_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/role_permissions_section_text" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <LinearLayout android:id="@+id/channel_permissions_text_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/role_permissions_section_text" style="@style/UiKit_Settings_Item_Header"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_text_send_messages" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/send_messages" app:tcs_subtext="@string/role_permissions_send_messages_description_text"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_text_use_public_threads" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/use_public_threads" app:tcs_subtext="@string/role_permissions_use_public_threads_description_text"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_text_use_private_threads" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/use_private_threads" app:tcs_subtext="@string/role_permissions_use_private_threads_description_text"/>
@@ -41,9 +41,9 @@
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_text_send_tts_messages" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/send_tts_messages" app:tcs_subtext="@string/role_permissions_send_tts_messages_description_text"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_use_application_commands" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/role_permissions_use_application_commands" app:tcs_subtext="@string/role_permissions_use_application_commands_description_text"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_permissions_voice_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/role_permissions_section_voice" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <LinearLayout android:id="@+id/channel_permissions_voice_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/role_permissions_section_voice" style="@style/UiKit_Settings_Item_Header"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_voice_connect" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/connect" app:tcs_subtext="@string/role_permissions_connect_description_voice"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_voice_speak" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/speak" app:tcs_subtext="@string/role_permissions_speak_description_voice"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_voice_video" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/video" app:tcs_subtext="@string/role_permissions_stream_description_voice"/>
@@ -53,13 +53,13 @@
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_voice_deafen_members" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/deafen_members" app:tcs_subtext="@string/role_permissions_deafen_members_description_voice"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_voice_move_members" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/move_members" app:tcs_subtext="@string/role_permissions_move_members_description_voice"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_permissions_stage_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/role_permissions_section_stage" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <LinearLayout android:id="@+id/channel_permissions_stage_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/role_permissions_section_stage" style="@style/UiKit_Settings_Item_Header"/>
                 <com.discord.views.TernaryCheckBox android:id="@+id/channel_permission_stage_request_to_speak" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/request_to_speak" app:tcs_subtext="@string/role_permissions_request_to_speak_description_stage"/>
             </LinearLayout>
             <Space android:layout_width="match_parent" android:layout_height="64dp"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_permissions_save" android:focusable="true" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_permissions_save" android:focusable="true" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_permissions_add_member.xml b/app/src/main/res/layout/widget_channel_settings_permissions_add_member.xml
index f323dc043f..6d86c26322 100644
--- a/app/src/main/res/layout/widget_channel_settings_permissions_add_member.xml
+++ b/app/src/main/res/layout/widget_channel_settings_permissions_add_member.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_permissions_add_member_name_search" style="@style/res_2131952560_uikit_textinputlayout_search">
-            <com.google.android.material.textfield.TextInputEditText android:hint="@string/members_search_placeholder" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_permissions_add_member_name_search" style="@style/UiKit_TextInputLayout_Search">
+            <com.google.android.material.textfield.TextInputEditText android:hint="@string/members_search_placeholder" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
         </com.google.android.material.textfield.TextInputLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/channel_settings_permissions_add_member_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_settings_permissions_add_member_recycler" android:scrollbars="vertical" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <TextView android:id="@+id/no_results_text" android:text="@string/guild_members_search_no_result" style="@style/res_2131952576_uikit_textview_noresults"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/channel_settings_permissions_add_member_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_settings_permissions_add_member_recycler" android:scrollbars="vertical" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <TextView android:id="@+id/no_results_text" android:text="@string/guild_members_search_no_result" style="@style/UiKit_TextView_NoResults"/>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_permissions_add_role.xml b/app/src/main/res/layout/widget_channel_settings_permissions_add_role.xml
index acda7aaaf1..27ca0bd9b0 100644
--- a/app/src/main/res/layout/widget_channel_settings_permissions_add_role.xml
+++ b/app/src/main/res/layout/widget_channel_settings_permissions_add_role.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_settings_permissions_add_role_recycler" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/channel_settings_permissions_add_role_recycler" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_channel_settings_permissions_advanced.xml b/app/src/main/res/layout/widget_channel_settings_permissions_advanced.xml
index 3fe9d5fb41..90e148a3ab 100644
--- a/app/src/main/res/layout/widget_channel_settings_permissions_advanced.xml
+++ b/app/src/main/res/layout/widget_channel_settings_permissions_advanced.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
     <androidx.core.widget.NestedScrollView android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_behavior="com.discord.app.AppScrollingNestedViewBehavior">
-        <LinearLayout android:paddingBottom="64dp" android:layout_marginTop="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_300" android:id="@+id/add_role" android:focusable="true" android:clickable="true" android:text="@string/add_a_role" app:drawableStartCompat="?attr/ic_plus_a60" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_300" android:id="@+id/add_member" android:focusable="true" android:clickable="true" android:text="@string/add_a_member" app:drawableStartCompat="?attr/ic_plus_a60" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <LinearLayout android:id="@+id/roles_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/roles" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/roles_recycler" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <LinearLayout android:paddingBottom="64dp" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_300" android:id="@+id/add_role" android:focusable="true" android:clickable="true" android:text="@string/add_a_role" app:drawableStartCompat="?attr/ic_plus_a60" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_300" android:id="@+id/add_member" android:focusable="true" android:clickable="true" android:text="@string/add_a_member" app:drawableStartCompat="?attr/ic_plus_a60" style="@style/UiKit_Settings_Item_Icon"/>
+            <LinearLayout android:id="@+id/roles_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/roles" style="@style/UiKit_Settings_Item_Header"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/roles_recycler" style="@style/UiKit_ViewGroup_RecyclerView"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/members_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/members" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/members_recycler" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+            <LinearLayout android:id="@+id/members_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/members" style="@style/UiKit_Settings_Item_Header"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/members_recycler" style="@style/UiKit_ViewGroup_RecyclerView"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_channel_settings_permissions_overview.xml b/app/src/main/res/layout/widget_channel_settings_permissions_overview.xml
index b2054adec1..27e7764f9f 100644
--- a/app/src/main/res/layout/widget_channel_settings_permissions_overview.xml
+++ b/app/src/main/res/layout/widget_channel_settings_permissions_overview.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior">
-        <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_margin="12dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_margin="12dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <com.discord.views.segmentedcontrol.CardSegment app:segment_text="@string/channel_permissions_moderator_title" style="@style/SegmentedControlTabCard"/>
             <com.discord.views.segmentedcontrol.CardSegment app:segment_text="@string/settings_advanced" style="@style/SegmentedControlTabCard"/>
         </com.discord.views.segmentedcontrol.SegmentedControlContainer>
-        <com.discord.app.AppViewFlipper android:id="@+id/flipper" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+        <com.discord.app.AppViewFlipper android:id="@+id/flipper" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
             <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.channels.permissions.WidgetStageChannelModeratorPermissions" android:id="@+id/stage_moderator_permissions_fragment" android:layout_width="match_parent" android:layout_height="match_parent"/>
             <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.channels.permissions.WidgetChannelSettingsPermissionsAdvanced" android:id="@+id/advanced_permissions_fragment" android:layout_width="match_parent" android:layout_height="match_parent"/>
         </com.discord.app.AppViewFlipper>
diff --git a/app/src/main/res/layout/widget_channel_topic.xml b/app/src/main/res/layout/widget_channel_topic.xml
index 5eb080043d..42a9f89d77 100644
--- a/app/src/main/res/layout/widget_channel_topic.xml
+++ b/app/src/main/res/layout/widget_channel_topic.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/channel_topic" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:layout_width="match_parent" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/channel_topic" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="top" android:id="@+id/channel_topic_channel_icon" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginTop="2dp" android:layout_marginEnd="8dp" app:actualImageScaleType="2" app:placeholderImage="?attr/ic_channel_text" app:roundAsCircle="true"/>
-        <TextView android:textAppearance="@style/res_2131952565_uikit_textview_h1" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/channel_topic_name" android:layout_width="0dp" android:text="@string/form_label_channel_topic" android:layout_weight="1" app:drawableTint="?attr/colorChannelsDefault" style="@style/res_2131952563_uikit_textview"/>
-        <ImageView android:layout_gravity="top" android:id="@+id/channel_topic_more_icon" android:visibility="gone" android:layout_marginTop="2dp" android:src="?attr/ic_overflow" android:contentDescription="@string/settings" style="@style/res_2131952448_uikit_imageview"/>
+        <TextView android:textAppearance="@style/UiKit_TextView_H1" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/channel_topic_name" android:layout_width="0dp" android:text="@string/form_label_channel_topic" android:layout_weight="1" app:drawableTint="?attr/colorChannelsDefault" style="@style/UiKit_TextView"/>
+        <ImageView android:layout_gravity="top" android:id="@+id/channel_topic_more_icon" android:visibility="gone" android:layout_marginTop="2dp" android:src="?attr/ic_overflow" android:contentDescription="@string/settings" style="@style/UiKit_ImageView"/>
     </LinearLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderSecondary" android:autoLink="all" android:id="@+id/channel_topic_title" android:layout_width="match_parent" android:layout_marginTop="8dp" style="@style/res_2131952563_uikit_textview"/>
-    <RelativeLayout android:layout_width="match_parent" android:layout_height="16dp" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <ImageView android:id="@+id/channel_topic_ellipsis" android:src="?attr/ic_channel_topic_ellipsis" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderSecondary" android:autoLink="all" android:id="@+id/channel_topic_title" android:layout_width="match_parent" android:layout_marginTop="8dp" style="@style/UiKit_TextView"/>
+    <RelativeLayout android:layout_width="match_parent" android:layout_height="16dp" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <ImageView android:id="@+id/channel_topic_ellipsis" android:src="?attr/ic_channel_topic_ellipsis" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channels_list.xml b/app/src/main/res/layout/widget_channels_list.xml
index caef7bbd1c..eba5ea702f 100644
--- a/app/src/main/res/layout/widget_channels_list.xml
+++ b/app/src/main/res/layout/widget_channels_list.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.utilities.view.rounded.RoundedCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_channels_list_container" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" app:topLeftRadius="@dimen/tab_host_corner_radius" app:topRightRadius="@dimen/tab_host_corner_radius" style="@style/res_2131952589_uikit_viewgroup">
-    <com.discord.views.CustomAppBarLayout android:id="@+id/app_bar_layout" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131951637_apptheme_appbarlayout">
+<com.discord.utilities.view.rounded.RoundedCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_channels_list_container" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" app:topLeftRadius="@dimen/tab_host_corner_radius" app:topRightRadius="@dimen/tab_host_corner_radius" style="@style/UiKit_ViewGroup">
+    <com.discord.views.CustomAppBarLayout android:id="@+id/app_bar_layout" android:background="?attr/colorBackgroundSecondary" style="@style/AppTheme_AppBarLayout">
         <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/collapsing_toolbar" android:layout_width="match_parent" android:layout_height="match_parent" app:contentScrim="?attr/colorBackgroundSecondary" app:scrimVisibleHeightTrigger="0dp">
             <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_list_banner" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:maxHeight="150dp" app:actualImageScaleType="6"/>
                 <FrameLayout android:id="@+id/channels_list_banner_foreground" android:background="@drawable/drawable_top_down_black_40_alpha_gradient" android:layout_width="match_parent" android:layout_height="48dp"/>
             </FrameLayout>
-            <androidx.appcompat.widget.Toolbar android:id="@+id/channels_toolbar" android:background="@null" style="@style/res_2131951663_apptheme_toolbar">
-                <TextView android:textAppearance="@style/res_2131952566_uikit_textview_h1_bold" android:textSize="18sp" android:textColor="?attr/colorInteractiveActive" android:gravity="center_vertical" android:id="@+id/channels_list_header" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:singleLine="true" android:drawablePadding="4dp" app:drawableEndCompat="?attr/ic_overflow" app:drawableRightCompat="?attr/ic_overflow" style="@style/res_2131952563_uikit_textview"/>
+            <androidx.appcompat.widget.Toolbar android:id="@+id/channels_toolbar" android:background="@null" style="@style/AppTheme_Toolbar">
+                <TextView android:textAppearance="@style/UiKit_TextView_H1_Bold" android:textSize="18sp" android:textColor="?attr/colorInteractiveActive" android:gravity="center_vertical" android:id="@+id/channels_list_header" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:singleLine="true" android:drawablePadding="4dp" app:drawableEndCompat="?attr/ic_overflow" app:drawableRightCompat="?attr/ic_overflow" style="@style/UiKit_TextView"/>
             </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
         <androidx.appcompat.widget.Toolbar android:id="@+id/channels_list_private_channels_header" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" app:contentInsetStart="0dp">
-            <androidx.constraintlayout.widget.ConstraintLayout android:background="@color/transparent" android:paddingTop="8dp" android:paddingBottom="16dp" android:paddingStart="16dp" android:paddingEnd="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <TextView android:textAppearance="@style/res_2131952568_uikit_textview_h2_bold" android:textColor="?attr/colorInteractiveActive" android:id="@+id/channels_list_direct_messages_title" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="visible" android:text="@string/direct_messages" app:layout_constraintEnd_toStartOf="@+id/channels_list_start_group" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-                <androidx.appcompat.widget.AppCompatImageView android:id="@+id/channels_list_start_group" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:src="@drawable/ic_group_add_white_24dp" android:contentDescription="@string/create_dm" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
-                <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/channels_list_search" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:foreground="?attr/bg_pressed_highlight" android:text="@string/dm_search_placeholder" android:paddingStart="8dp" android:paddingEnd="8dp" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:drawableEndCompat="@drawable/ic_search_16dp" app:drawableTint="?attr/colorTextMuted" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_list_direct_messages_title"/>
+            <androidx.constraintlayout.widget.ConstraintLayout android:background="@color/transparent" android:paddingTop="8dp" android:paddingBottom="16dp" android:paddingStart="16dp" android:paddingEnd="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <TextView android:textAppearance="@style/UiKit_TextView_H2_Bold" android:textColor="?attr/colorInteractiveActive" android:id="@+id/channels_list_direct_messages_title" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="visible" android:text="@string/direct_messages" app:layout_constraintEnd_toStartOf="@+id/channels_list_start_group" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+                <androidx.appcompat.widget.AppCompatImageView android:id="@+id/channels_list_start_group" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:src="@drawable/ic_group_add_white_24dp" android:contentDescription="@string/create_dm" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/channels_list_search" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:foreground="?attr/bg_pressed_highlight" android:text="@string/dm_search_placeholder" android:paddingStart="8dp" android:paddingEnd="8dp" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:drawableEndCompat="@drawable/ic_search_16dp" app:drawableTint="?attr/colorTextMuted" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_list_direct_messages_title"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.discord.views.CustomAppBarLayout>
     <com.discord.widgets.friends.EmptyFriendsStateView android:id="@+id/widget_channels_list_empty_friends_state_view" android:padding="16dp" android:layout_width="match_parent" android:layout_height="match_parent" app:ef_title_text_size="@dimen/uikit_textsize_large"/>
     <com.discord.widgets.friends.EmptyFriendsStateContactSyncView android:id="@+id/widget_channels_list_empty_friends_state_cs_view" android:padding="16dp" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="40dp" app:ef_title_text_size="@dimen/uikit_textsize_large"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/channels_list" android:paddingBottom="8dp" android:visibility="gone" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" android:layout_below="@+id/channels_list_search" android:overScrollMode="never" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/channels_list" android:paddingBottom="8dp" android:visibility="gone" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" android:layout_below="@+id/channels_list_search" android:overScrollMode="never" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
     <ViewStub android:id="@+id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_anchor="@+id/channels_list"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center" android:layout_gravity="end" android:id="@+id/channels_list_premium_guild_hint" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="48dp" android:layout_marginRight="28dp" android:translationZ="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center" android:layout_gravity="end" android:id="@+id/channels_list_premium_guild_hint" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="48dp" android:layout_marginRight="28dp" android:translationZ="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <View android:id="@+id/channels_list_tooltip_top_tail" android:background="@drawable/drawable_tooltip_top_tail" android:layout_width="24dp" android:layout_height="20dp" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
         <View android:id="@+id/channels_list_tooltip_background" android:background="@drawable/drawable_bg_tooltip" android:layout_width="match_parent" android:layout_height="0dp" android:translationY="-8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_list_tooltip_top_tail"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@+id/channels_list_premium_guild_hint_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_header" android:lineSpacingMultiplier="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/channels_list_tooltip_background" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/channels_list_premium_guild_hint_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_text" android:lineSpacingMultiplier="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_list_premium_guild_hint_title" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:theme="@style/res_2131951648_apptheme_dark" android:textColor="?attr/color_brand_500" android:id="@+id/channels_list_premium_guild_hint_button" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_close" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_list_premium_guild_hint_subtitle" style="@style/res_2131952473_uikit_material_button_white"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@+id/channels_list_premium_guild_hint_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_header" android:lineSpacingMultiplier="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/channels_list_tooltip_background" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/channels_list_premium_guild_hint_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_text" android:lineSpacingMultiplier="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_list_premium_guild_hint_title" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme_Dark" android:textColor="?attr/color_brand_500" android:id="@+id/channels_list_premium_guild_hint_button" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_close" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_list_premium_guild_hint_subtitle" style="@style/UiKit_Material_Button_White"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.discord.utilities.view.rounded.RoundedCoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_actions_change_nickname.xml b/app/src/main/res/layout/widget_channels_list_actions_change_nickname.xml
index 15931efd48..4ec470d04d 100644
--- a/app/src/main/res/layout/widget_channels_list_actions_change_nickname.xml
+++ b/app/src/main/res/layout/widget_channels_list_actions_change_nickname.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/channels_list_actions_change_nickname_title" android:padding="16dp" android:layout_width="match_parent" android:text="@string/change_nickname" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/channels_list_actions_change_nickname_edit_text" android:hint="@string/nickname" style="@style/res_2131952558_uikit_textinputlayout_primary">
-            <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952556_uikit_textinputlayout_edittext_singleline_username"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/channels_list_actions_change_nickname_title" android:padding="16dp" android:layout_width="match_parent" android:text="@string/change_nickname" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/channels_list_actions_change_nickname_edit_text" android:hint="@string/nickname" style="@style/UiKit_TextInputLayout_Primary">
+            <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Username"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextLink" android:id="@+id/channels_list_actions_change_nickname_reset" android:paddingTop="8dp" android:text="@string/reset_nickname" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextLink" android:id="@+id/channels_list_actions_change_nickname_reset" android:paddingTop="8dp" android:text="@string/reset_nickname" style="@style/UiKit_TextView_Semibold"/>
     </LinearLayout>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/channels_list_actions_change_nickname_cancel" android:text="@string/cancel" android:layout_marginEnd="8dp" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/channels_list_actions_change_nickname_save" android:layout_width="wrap_content" android:text="@string/save" style="@style/res_2131952459_uikit_material_button_fit"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/channels_list_actions_change_nickname_cancel" android:text="@string/cancel" android:layout_marginEnd="8dp" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/channels_list_actions_change_nickname_save" android:layout_width="wrap_content" android:text="@string/save" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_actions.xml b/app/src/main/res/layout/widget_channels_list_item_actions.xml
index be2289d540..107ead8d38 100644
--- a/app/src/main/res/layout/widget_channels_list_item_actions.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_actions.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout android:paddingBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <FrameLayout style="@style/res_2131952505_uikit_sheet_header_icon">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_list_item_text_actions_icon" style="@style/res_2131951674_avatar_large"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <FrameLayout style="@style/UiKit_Sheet_Header_Icon">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_list_item_text_actions_icon" style="@style/Avatar_Large"/>
             </FrameLayout>
-            <TextView android:id="@+id/channels_list_item_text_actions_title" style="@style/res_2131952506_uikit_sheet_header_title"/>
+            <TextView android:id="@+id/channels_list_item_text_actions_title" style="@style/UiKit_Sheet_Header_Title"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:id="@+id/dm_action_profile" android:text="@string/profile" app:drawableStartCompat="?attr/ic_account" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/text_action_mark_as_read" android:text="@string/mark_as_read" app:drawableStartCompat="?attr/ic_visibility" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/text_action_mute" app:drawableStartCompat="?attr/ic_channel_mute" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/text_action_thread_browser" android:text="@string/threads" app:drawableStartCompat="?attr/ic_thread" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/action_channel_settings" app:drawableStartCompat="?attr/ic_settings" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/action_channel_notifications" android:text="@string/notification_settings" app:drawableStartCompat="?attr/ic_notifications_a60" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/action_invite" android:text="@string/instant_invite" app:drawableStartCompat="?attr/ic_person_add" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <View android:id="@+id/developer_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:id="@+id/action_copy_id" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/res_2131952497_uikit_settings_item_icon"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <TextView android:id="@+id/dm_action_profile" android:text="@string/profile" app:drawableStartCompat="?attr/ic_account" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/text_action_mark_as_read" android:text="@string/mark_as_read" app:drawableStartCompat="?attr/ic_visibility" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/text_action_mute" app:drawableStartCompat="?attr/ic_channel_mute" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/text_action_thread_browser" android:text="@string/threads" app:drawableStartCompat="?attr/ic_thread" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/action_channel_settings" app:drawableStartCompat="?attr/ic_settings" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/action_channel_notifications" android:text="@string/notification_settings" app:drawableStartCompat="?attr/ic_notifications_a60" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/action_invite" android:text="@string/instant_invite" app:drawableStartCompat="?attr/ic_person_add" style="@style/UiKit_Settings_Item_Icon"/>
+        <View android:id="@+id/developer_divider" style="@style/UiKit_Settings_Divider"/>
+        <TextView android:id="@+id/action_copy_id" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/UiKit_Settings_Item_Icon"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_channels_list_item_active_stage_event.xml b/app/src/main/res/layout/widget_channels_list_item_active_stage_event.xml
index dbf2d8b087..3f5b3b502c 100644
--- a/app/src/main/res/layout/widget_channels_list_item_active_stage_event.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_active_stage_event.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="12dp" android:paddingTop="8dp" android:paddingRight="12dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/live_now_dot" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/stage_channel_live_dot" app:layout_constraintBottom_toBottomOf="@+id/live_now_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/live_now_label"/>
-    <TextView android:textSize="12sp" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/live_now_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_live_now" android:textAllCaps="true" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/live_now_dot" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/stage_event_topic" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/live_now_label" style="@style/res_2131952521_uikit_stage_topic"/>
-    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/stage_event_channel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:lines="1" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="?attr/colorHeaderSecondary" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/channel_separator" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_event_topic" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textSize="12sp" android:textColor="@color/status_green_600" android:gravity="center_vertical" android:id="@+id/live_now_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stage_channel_live_now" android:textAllCaps="true" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/live_now_dot" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/stage_event_topic" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/live_now_label" style="@style/UiKit_Stage_Topic"/>
+    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/stage_event_channel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:lines="1" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="?attr/colorHeaderSecondary" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/channel_separator" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_event_topic" style="@style/UiKit_TextView_Medium"/>
     <ImageView android:id="@+id/channel_separator" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/stage_channel_info_separator_dot" android:scaleType="centerInside" app:layout_constraintBottom_toBottomOf="@+id/stage_event_channel" app:layout_constraintEnd_toStartOf="@+id/stage_event_listeners" app:layout_constraintStart_toEndOf="@+id/stage_event_channel" app:layout_constraintTop_toTopOf="@+id/stage_event_channel" app:tint="?attr/colorTextMuted"/>
-    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/stage_event_listeners" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/stage_event_channel" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/channel_separator" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/stage_event_listeners" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/stage_event_channel" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/channel_separator" style="@style/UiKit_TextView_Medium"/>
     <com.discord.views.user.UserSummaryView android:id="@+id/user_summary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintEnd_toStartOf="@+id/user_summary_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_event_channel" app:summary_avatarOverlap="4dp" app:summary_avatarSize="16dp" app:summary_maxAvatars="3"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/user_summary_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/user_summary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/user_summary" app:layout_constraintTop_toBottomOf="@+id/stage_event_channel" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
-    <com.google.android.material.button.MaterialButton android:textSize="16sp" android:id="@+id/stage_event_listen_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/user_summary" style="@style/res_2131952460_uikit_material_button_green"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/user_summary_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/user_summary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/user_summary" app:layout_constraintTop_toBottomOf="@+id/stage_event_channel" style="@style/UiKit_TextView_Medium_SingleLine"/>
+    <com.google.android.material.button.MaterialButton android:textSize="16sp" android:id="@+id/stage_event_listen_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/user_summary" style="@style/UiKit_Material_Button_Green"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_audience_count.xml b/app/src/main/res/layout/widget_channels_list_item_audience_count.xml
index ac745bf12e..c7b267adb4 100644
--- a/app/src/main/res/layout/widget_channels_list_item_audience_count.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_audience_count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:background="?attr/bg_pressed_highlight" android:layout_height="24dp" android:layout_marginBottom="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <ImageView android:id="@+id/stage_channel_audience_icon" android:background="@drawable/drawable_circle_black" android:padding="4dp" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:src="@drawable/ic_members_24dp" android:layout_centerVertical="true" android:layout_marginStart="44dp" android:layout_marginEnd="8dp" android:backgroundTint="?attr/primary_700" app:iconTint="?attr/primary_300" style="@style/res_2131951677_avatar_small"/>
-    <TextView android:textColor="?attr/colorChannelDefault" android:id="@+id/stage_channels_audience_count" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginEnd="4dp" android:layout_toEndOf="@+id/stage_channel_audience_icon" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:background="?attr/bg_pressed_highlight" android:layout_height="24dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <ImageView android:id="@+id/stage_channel_audience_icon" android:background="@drawable/drawable_circle_black" android:padding="4dp" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:src="@drawable/ic_members_24dp" android:layout_centerVertical="true" android:layout_marginStart="44dp" android:layout_marginEnd="8dp" android:backgroundTint="?attr/primary_700" app:iconTint="?attr/primary_300" style="@style/Avatar_Small"/>
+    <TextView android:textColor="?attr/colorChannelDefault" android:id="@+id/stage_channels_audience_count" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginEnd="4dp" android:layout_toEndOf="@+id/stage_channel_audience_icon" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_category.xml b/app/src/main/res/layout/widget_channels_list_item_category.xml
index 70b448840a..c127d52ccb 100644
--- a/app/src/main/res/layout/widget_channels_list_item_category.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/drawable_overlay_category" android:paddingTop="12dp" android:paddingBottom="12dp" android:focusable="false" android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <ImageView android:id="@+id/channels_item_category_arrow" android:layout_width="12dp" android:layout_height="12dp" android:src="@drawable/ic_chevron_down_grey_12dp" android:importantForAccessibility="no" android:layout_marginStart="2dp" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_item_category_name" android:focusable="true" android:layout_width="0dp" android:singleLine="true" android:layout_weight="1" android:textAllCaps="true" android:layout_marginStart="2dp" android:layout_marginEnd="8dp" style="@style/res_2131952569_uikit_textview_h6"/>
-    <ImageView android:id="@+id/channels_item_category_add" android:src="@drawable/ic_add_24dp" android:scaleType="centerCrop" android:contentDescription="@string/guild_settings_action_filter_channel_create" android:layout_marginEnd="8dp" app:tint="?attr/colorChannelDefault" style="@style/res_2131952449_uikit_imageview_clickable"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/drawable_overlay_category" android:paddingTop="12dp" android:paddingBottom="12dp" android:focusable="false" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <ImageView android:id="@+id/channels_item_category_arrow" android:layout_width="12dp" android:layout_height="12dp" android:src="@drawable/ic_chevron_down_grey_12dp" android:importantForAccessibility="no" android:layout_marginStart="2dp" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_item_category_name" android:focusable="true" android:layout_width="0dp" android:singleLine="true" android:layout_weight="1" android:textAllCaps="true" android:layout_marginStart="2dp" android:layout_marginEnd="8dp" style="@style/UiKit_TextView_H6"/>
+    <ImageView android:id="@+id/channels_item_category_add" android:src="@drawable/ic_add_24dp" android:scaleType="centerCrop" android:contentDescription="@string/guild_settings_action_filter_channel_create" android:layout_marginEnd="8dp" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView_Clickable"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_channel.xml b/app/src/main/res/layout/widget_channels_list_item_channel.xml
index 34284820a8..a5973f057b 100644
--- a/app/src/main/res/layout/widget_channels_list_item_channel.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_channel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginBottom="4dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <ImageView android:id="@+id/channels_item_channel_unread" android:src="@drawable/ic_unread_white_9dp" android:layout_centerVertical="true" android:importantForAccessibility="no" app:tint="?attr/colorInteractiveActive" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/channels_item_channel_hash" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_channel_text" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:tint="?attr/colorTextNormal" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:id="@+id/channels_item_channel_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/channels_item_channel_mentions" android:layout_toEndOf="@+id/channels_item_channel_hash" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:id="@+id/channels_item_channel_mentions" android:background="?attr/drawable_overlay_mentions" android:visibility="gone" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/res_2131952023_icon_mentions_large"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginBottom="4dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <ImageView android:id="@+id/channels_item_channel_unread" android:src="@drawable/ic_unread_white_9dp" android:layout_centerVertical="true" android:importantForAccessibility="no" app:tint="?attr/colorInteractiveActive" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/channels_item_channel_hash" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_channel_text" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:tint="?attr/colorTextNormal" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:id="@+id/channels_item_channel_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/channels_item_channel_mentions" android:layout_toEndOf="@+id/channels_item_channel_hash" style="@style/UiKit_TextView"/>
+    <TextView android:id="@+id/channels_item_channel_mentions" android:background="?attr/drawable_overlay_mentions" android:visibility="gone" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/Icon_Mentions_Large"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_channel_private.xml b/app/src/main/res/layout/widget_channels_list_item_channel_private.xml
index 9d47e626b4..389ead44a3 100644
--- a/app/src/main/res/layout/widget_channels_list_item_channel_private.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_channel_private.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_list_item_private_avatar" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:placeholderImage="?attr/colorPrimaryCircle" style="@style/res_2131951678_avatar_standard"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="8dp" android:layout_height="wrap_content" android:layout_marginBottom="4dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_list_item_private_avatar" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:placeholderImage="?attr/colorPrimaryCircle" style="@style/Avatar_Standard"/>
     <com.discord.views.StatusView android:id="@+id/channel_list_item_private_status" android:layout_width="12dp" android:layout_height="wrap_content" android:layout_alignBottom="@+id/channels_list_item_private_avatar" android:translationX="2dp" android:translationY="2dp" android:layout_alignEnd="@+id/channels_list_item_private_avatar" app:sv_background_color="?attr/colorBackgroundSecondary" app:sv_border_width="2dp" app:sv_corner_radius="2dp"/>
-    <LinearLayout android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/channels_list_item_private_mentions" android:layout_toEndOf="@+id/channels_list_item_private_avatar" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:orientation="horizontal" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_private_name" android:singleLine="true" style="@style/res_2131952579_uikit_textview_semibold"/>
-            <TextView android:textSize="9.5sp" android:textColor="@color/white" android:layout_gravity="center" android:id="@+id/channels_list_item_private_tag" android:background="@drawable/drawable_tag_brand" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/system_dm_tag_system" android:singleLine="true" android:paddingStart="3dp" android:paddingEnd="3dp" android:layout_marginStart="6dp" app:drawableStartCompat="@drawable/ic_verified_10dp" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/channels_list_item_private_mentions" android:layout_toEndOf="@+id/channels_list_item_private_avatar" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:orientation="horizontal" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_private_name" android:singleLine="true" style="@style/UiKit_TextView_Semibold"/>
+            <TextView android:textSize="9.5sp" android:textColor="@color/white" android:layout_gravity="center" android:id="@+id/channels_list_item_private_tag" android:background="@drawable/drawable_tag_brand" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/system_dm_tag_system" android:singleLine="true" android:paddingStart="3dp" android:paddingEnd="3dp" android:layout_marginStart="6dp" app:drawableStartCompat="@drawable/ic_verified_10dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/channels_list_item_private_desc" android:singleLine="true" style="@style/res_2131952581_uikit_textview_subtext"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/channels_list_item_private_desc" android:singleLine="true" style="@style/UiKit_TextView_Subtext"/>
     </LinearLayout>
-    <TextView android:id="@+id/channels_list_item_private_mentions" android:background="?attr/drawable_overlay_mentions" android:visibility="gone" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/res_2131952023_icon_mentions_large"/>
+    <TextView android:id="@+id/channels_list_item_private_mentions" android:background="?attr/drawable_overlay_mentions" android:visibility="gone" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/Icon_Mentions_Large"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_channel_stage_voice.xml b/app/src/main/res/layout/widget_channels_list_item_channel_stage_voice.xml
index 4a91d943ad..eb7b3cf0e0 100644
--- a/app/src/main/res/layout/widget_channels_list_item_channel_stage_voice.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_channel_stage_voice.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <ImageView android:id="@+id/stage_channel_item_stage_channel_icon" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_channel_stage_24dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <ImageView android:id="@+id/stage_channel_item_stage_channel_icon" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_channel_stage_24dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
     <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_toEndOf="@+id/stage_channel_item_stage_channel_icon">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:ellipsize="end" android:id="@+id/stage_channel_item_voice_channel_name" android:singleLine="true" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelDefault" android:id="@+id/stage_channel_item_voice_channel_topic" style="@style/res_2131952521_uikit_stage_topic"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:ellipsize="end" android:id="@+id/stage_channel_item_voice_channel_name" android:singleLine="true" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelDefault" android:id="@+id/stage_channel_item_voice_channel_topic" style="@style/UiKit_Stage_Topic"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_channel_voice.xml b/app/src/main/res/layout/widget_channels_list_item_channel_voice.xml
index 6b139cc69e..708512fd58 100644
--- a/app/src/main/res/layout/widget_channels_list_item_channel_voice.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_channel_voice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <ImageView android:id="@+id/channels_item_voice_channel_speaker" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_channel_voice" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_item_voice_channel_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/channels_item_voice_channel_user_limit" android:layout_toEndOf="@+id/channels_item_voice_channel_speaker" style="@style/res_2131952579_uikit_textview_semibold"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <ImageView android:id="@+id/channels_item_voice_channel_speaker" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_channel_voice" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_item_voice_channel_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/channels_item_voice_channel_user_limit" android:layout_toEndOf="@+id/channels_item_voice_channel_speaker" style="@style/UiKit_TextView_Semibold"/>
     <com.discord.views.VoiceUserLimitView android:id="@+id/channels_item_voice_channel_user_limit" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_directory.xml b/app/src/main/res/layout/widget_channels_list_item_directory.xml
index 7e6d061ed3..9c43674704 100644
--- a/app/src/main/res/layout/widget_channels_list_item_directory.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_directory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="@drawable/ic_directory_selector_background" android:padding="8dp" android:layout_marginBottom="4dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <ImageView android:id="@+id/directory_channel_icon" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_compass" android:importantForAccessibility="no" android:layout_marginEnd="8dp" android:backgroundTint="?attr/primary_700" app:tint="@color/channel_item_hub_selector" style="@style/res_2131951677_avatar_small"/>
-    <TextView android:textColor="@color/channel_item_hub_selector" android:id="@+id/directory_channel_name" android:singleLine="true" style="@style/res_2131952570_uikit_textview_large"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="@drawable/ic_directory_selector_background" android:padding="8dp" android:layout_marginBottom="4dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <ImageView android:id="@+id/directory_channel_icon" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_compass" android:importantForAccessibility="no" android:layout_marginEnd="8dp" android:backgroundTint="?attr/primary_700" app:tint="@color/channel_item_hub_selector" style="@style/Avatar_Small"/>
+    <TextView android:textColor="@color/channel_item_hub_selector" android:id="@+id/directory_channel_name" android:singleLine="true" style="@style/UiKit_TextView_Large"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_guild_scheduled_events.xml b/app/src/main/res/layout/widget_channels_list_item_guild_scheduled_events.xml
index a325d7696a..9b52031d5f 100644
--- a/app/src/main/res/layout/widget_channels_list_item_guild_scheduled_events.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_guild_scheduled_events.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <ImageView android:id="@+id/channels_list_item_guild_scheduled_event_icon" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_event_20dp" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorChannelDefault"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_guild_scheduled_event_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/guild_events" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channels_list_item_guild_scheduled_event_count" app:layout_constraintStart_toEndOf="@+id/channels_list_item_guild_scheduled_event_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/channels_list_item_guild_scheduled_event_count" android:background="@drawable/drawable_circle_background_tertiary" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952023_icon_mentions_large"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_guild_scheduled_event_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/guild_events" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channels_list_item_guild_scheduled_event_count" app:layout_constraintStart_toEndOf="@+id/channels_list_item_guild_scheduled_event_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/channels_list_item_guild_scheduled_event_count" android:background="@drawable/drawable_circle_background_tertiary" android:minWidth="16dp" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Icon_Mentions_Large"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_header.xml b/app/src/main/res/layout/widget_channels_list_item_header.xml
index 0df2e41a08..61865d07c9 100644
--- a/app/src/main/res/layout/widget_channels_list_item_header.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_marginTop="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_header" android:singleLine="true" android:layout_centerVertical="true" android:textAllCaps="true" android:layout_toStartOf="@+id/channels_list_new" android:layout_alignParentStart="true" style="@style/res_2131952564_uikit_textview_bold"/>
-    <ImageView android:id="@+id/channels_list_new" android:padding="6dp" android:src="@drawable/ic_add_24dp" android:scaleType="center" android:layout_centerVertical="true" android:layout_alignParentEnd="true" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_marginTop="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_list_item_header" android:singleLine="true" android:layout_centerVertical="true" android:textAllCaps="true" android:layout_toStartOf="@+id/channels_list_new" android:layout_alignParentStart="true" style="@style/UiKit_TextView_Bold"/>
+    <ImageView android:id="@+id/channels_list_new" android:padding="6dp" android:src="@drawable/ic_add_24dp" android:scaleType="center" android:layout_centerVertical="true" android:layout_alignParentEnd="true" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_invite.xml b/app/src/main/res/layout/widget_channels_list_item_invite.xml
index 049fa57be4..d72e008b7c 100644
--- a/app/src/main/res/layout/widget_channels_list_item_invite.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_invite.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="44dp" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/invite_members" android:textAllCaps="false" style="@style/res_2131952467_uikit_material_button_secondary"/>
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="44dp" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/invite_members" android:textAllCaps="false" style="@style/UiKit_Material_Button_Secondary"/>
diff --git a/app/src/main/res/layout/widget_channels_list_item_mfa.xml b/app/src/main/res/layout/widget_channels_list_item_mfa.xml
index 65bb85c0e3..d38237435e 100644
--- a/app/src/main/res/layout/widget_channels_list_item_mfa.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_mfa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundSecondary" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:layout_gravity="center" android:src="@drawable/asset_mfa_server" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/channels_list_item_mfa_text" android:layout_marginTop="16dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundSecondary" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:layout_gravity="center" android:src="@drawable/asset_mfa_server" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/channels_list_item_mfa_text" android:layout_marginTop="16dp" style="@style/UiKit_TextView_Semibold"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_thread.xml b/app/src/main/res/layout/widget_channels_list_item_thread.xml
index 6e1e7988e0..55dc6bf182 100644
--- a/app/src/main/res/layout/widget_channels_list_item_thread.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_thread.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <ImageView android:id="@+id/channels_item_thread_unread" android:src="@drawable/ic_unread_white_9dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/channels_item_thread_content" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveActive" style="@style/res_2131952448_uikit_imageview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <ImageView android:id="@+id/channels_item_thread_unread" android:src="@drawable/ic_unread_white_9dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/channels_item_thread_content" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveActive" style="@style/UiKit_ImageView"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/channels_item_thread_content" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginStart="32dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:id="@+id/channels_item_thread_name" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="12dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channels_item_thread_mentions" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:id="@+id/channels_item_thread_mentions" android:background="?attr/drawable_overlay_mentions" android:visibility="gone" android:minWidth="16dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952023_icon_mentions_large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:id="@+id/channels_item_thread_name" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="12dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/channels_item_thread_mentions" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+        <TextView android:id="@+id/channels_item_thread_mentions" android:background="?attr/drawable_overlay_mentions" android:visibility="gone" android:minWidth="16dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Icon_Mentions_Large"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <ImageView android:id="@+id/channels_item_thread_spine" android:layout_width="wrap_content" android:layout_height="0dp" android:src="@drawable/ic_spine_long_cap" android:scaleType="fitXY" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorBackgroundAccent" style="@style/res_2131952448_uikit_imageview"/>
+    <ImageView android:id="@+id/channels_item_thread_spine" android:layout_width="wrap_content" android:layout_height="0dp" android:src="@drawable/ic_spine_long_cap" android:scaleType="fitXY" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorBackgroundAccent" style="@style/UiKit_ImageView"/>
     <Space android:layout_width="match_parent" android:layout_height="4dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/channels_item_thread_content"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_item_thread_actions.xml b/app/src/main/res/layout/widget_channels_list_item_thread_actions.xml
index 0b5e05f203..0265480aa5 100644
--- a/app/src/main/res/layout/widget_channels_list_item_thread_actions.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_thread_actions.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout android:paddingBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <FrameLayout style="@style/res_2131952505_uikit_sheet_header_icon">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_list_item_thread_actions_icon" style="@style/res_2131951674_avatar_large"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <FrameLayout style="@style/UiKit_Sheet_Header_Icon">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_list_item_thread_actions_icon" style="@style/Avatar_Large"/>
             </FrameLayout>
-            <TextView android:id="@+id/channels_list_item_thread_actions_title" style="@style/res_2131952506_uikit_sheet_header_title"/>
+            <TextView android:id="@+id/channels_list_item_thread_actions_title" style="@style/UiKit_Sheet_Header_Title"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:id="@+id/channels_list_item_thread_actions_mark_as_read" android:text="@string/mark_as_read" app:drawableStartCompat="?attr/ic_visibility" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/channels_list_item_thread_actions_channel_notifications" android:text="@string/notification_settings" app:drawableStartCompat="?attr/ic_notifications_a60" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <View android:id="@+id/channels_list_item_thread_actions_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:id="@+id/channels_list_item_thread_actions_edit" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/edit_thread" app:drawableStartCompat="?attr/ic_edit" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <LinearLayout android:gravity="center_vertical" android:id="@+id/channels_list_item_thread_actions_archive_settings" android:background="?attr/selectableItemBackground" style="@style/res_2131952492_uikit_settings_item">
-            <ImageView android:importantForAccessibility="no" android:paddingStart="0dp" android:paddingEnd="32dp" app:srcCompat="?attr/ic_recent" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/channels_list_item_thread_actions_archive_settings_header" android:background="@color/transparent" android:paddingTop="0dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/archive_settings" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/res_2131952498_uikit_settings_item_label"/>
-                <TextView android:id="@+id/channels_list_item_thread_actions_archive_settings_subheader" android:background="@color/transparent" android:paddingBottom="0dp" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/res_2131952493_uikit_settings_item_addition"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <TextView android:id="@+id/channels_list_item_thread_actions_mark_as_read" android:text="@string/mark_as_read" app:drawableStartCompat="?attr/ic_visibility" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/channels_list_item_thread_actions_channel_notifications" android:text="@string/notification_settings" app:drawableStartCompat="?attr/ic_notifications_a60" style="@style/UiKit_Settings_Item_Icon"/>
+        <View android:id="@+id/channels_list_item_thread_actions_divider" style="@style/UiKit_Settings_Divider"/>
+        <TextView android:id="@+id/channels_list_item_thread_actions_edit" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/edit_thread" app:drawableStartCompat="?attr/ic_edit" style="@style/UiKit_Settings_Item_Icon"/>
+        <LinearLayout android:gravity="center_vertical" android:id="@+id/channels_list_item_thread_actions_archive_settings" android:background="?attr/selectableItemBackground" style="@style/UiKit_Settings_Item">
+            <ImageView android:importantForAccessibility="no" android:paddingStart="0dp" android:paddingEnd="32dp" app:srcCompat="?attr/ic_recent" style="@style/UiKit_ImageView"/>
+            <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/channels_list_item_thread_actions_archive_settings_header" android:background="@color/transparent" android:paddingTop="0dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/archive_settings" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/UiKit_Settings_Item_Label"/>
+                <TextView android:id="@+id/channels_list_item_thread_actions_archive_settings_subheader" android:background="@color/transparent" android:paddingBottom="0dp" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/UiKit_Settings_Item_Addition"/>
             </LinearLayout>
         </LinearLayout>
-        <TextView android:id="@+id/channels_list_item_thread_actions_unarchive" android:visibility="visible" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/unarchive_thread" app:drawableStartCompat="?attr/ic_recent" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:textColor="@color/status_red_500" android:id="@+id/channels_list_item_thread_actions_leave" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/leave_thread" app:drawableStartCompat="@drawable/ic_remove_friend_red_24dp" app:drawableTint="@color/status_red_500" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <View android:id="@+id/channels_list_item_thread_actions_developer_divider" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:id="@+id/channels_list_item_thread_actions_copy_id" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/res_2131952497_uikit_settings_item_icon"/>
+        <TextView android:id="@+id/channels_list_item_thread_actions_unarchive" android:visibility="visible" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/unarchive_thread" app:drawableStartCompat="?attr/ic_recent" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:textColor="@color/status_red_500" android:id="@+id/channels_list_item_thread_actions_leave" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/leave_thread" app:drawableStartCompat="@drawable/ic_remove_friend_red_24dp" app:drawableTint="@color/status_red_500" style="@style/UiKit_Settings_Item_Icon"/>
+        <View android:id="@+id/channels_list_item_thread_actions_developer_divider" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_Settings_Divider"/>
+        <TextView android:id="@+id/channels_list_item_thread_actions_copy_id" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/UiKit_Settings_Item_Icon"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_channels_list_item_voice_user.xml b/app/src/main/res/layout/widget_channels_list_item_voice_user.xml
index 7bcc9dc686..ce8d32a2c3 100644
--- a/app/src/main/res/layout/widget_channels_list_item_voice_user.xml
+++ b/app/src/main/res/layout/widget_channels_list_item_voice_user.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:background="?attr/bg_pressed_highlight" android:layout_height="24dp" android:layout_marginBottom="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_item_voice_user_avatar" android:layout_centerVertical="true" android:layout_marginStart="44dp" android:layout_marginEnd="8dp" style="@style/res_2131951677_avatar_small"/>
-    <TextView android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_item_voice_user_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginEnd="4dp" android:layout_toStartOf="@+id/indicators_container" android:layout_toEndOf="@+id/channels_item_voice_user_avatar" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" android:background="?attr/bg_pressed_highlight" android:layout_height="24dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/channels_item_voice_user_avatar" android:layout_centerVertical="true" android:layout_marginStart="44dp" android:layout_marginEnd="8dp" style="@style/Avatar_Small"/>
+    <TextView android:textColor="?attr/colorChannelDefault" android:id="@+id/channels_item_voice_user_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginEnd="4dp" android:layout_toStartOf="@+id/indicators_container" android:layout_toEndOf="@+id/channels_item_voice_user_avatar" style="@style/UiKit_TextView"/>
     <LinearLayout android:gravity="center_vertical" android:id="@+id/indicators_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true">
-        <ImageView android:id="@+id/channels_item_voice_user_camera" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_videocam_white_24dp" android:importantForAccessibility="no" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:id="@+id/channels_item_voice_user_headphones" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_deafen_v2_deafened" android:importantForAccessibility="no" android:layout_marginStart="6dp" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:id="@+id/channels_item_voice_user_microphone" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_mute_v2_muted" android:importantForAccessibility="no" android:layout_marginStart="6dp" app:tint="?attr/colorChannelDefault" style="@style/res_2131952448_uikit_imageview"/>
+        <ImageView android:id="@+id/channels_item_voice_user_camera" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_videocam_white_24dp" android:importantForAccessibility="no" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
+        <ImageView android:id="@+id/channels_item_voice_user_headphones" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_deafen_v2_deafened" android:importantForAccessibility="no" android:layout_marginStart="6dp" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
+        <ImageView android:id="@+id/channels_item_voice_user_microphone" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_mute_v2_muted" android:importantForAccessibility="no" android:layout_marginStart="6dp" app:tint="?attr/colorChannelDefault" style="@style/UiKit_ImageView"/>
         <TextView android:textSize="14sp" android:textColor="@color/white" android:id="@+id/channels_item_voice_user_live" android:background="@drawable/bg_stream_live_indicator" android:paddingLeft="6dp" android:paddingRight="6dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/live" android:textAllCaps="true" android:fontFamily="?attr/font_primary_semibold" android:layout_marginStart="6dp"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_channels_list_unreads.xml b/app/src/main/res/layout/widget_channels_list_unreads.xml
index 968e75ff01..73b617f7c3 100644
--- a/app/src/main/res/layout/widget_channels_list_unreads.xml
+++ b/app/src/main/res/layout/widget_channels_list_unreads.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <RelativeLayout android:id="@+id/channels_list_unreads_background" android:background="@drawable/drawable_button_grey" android:paddingLeft="2dp" android:paddingTop="3dp" android:paddingRight="2dp" android:paddingBottom="3dp" android:layout_margin="8dp" android:elevation="2dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <TextView android:textSize="12dp" android:textColor="@color/white" android:ellipsize="none" android:id="@+id/channels_list_unreads" android:drawablePadding="2dp" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
+    <RelativeLayout android:id="@+id/channels_list_unreads_background" android:background="@drawable/drawable_button_grey" android:paddingLeft="2dp" android:paddingTop="3dp" android:paddingRight="2dp" android:paddingBottom="3dp" android:layout_margin="8dp" android:elevation="2dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <TextView android:textSize="12dp" android:textColor="@color/white" android:ellipsize="none" android:id="@+id/channels_list_unreads" android:drawablePadding="2dp" android:layout_centerInParent="true" android:textAllCaps="true" style="@style/UiKit_TextView_Subtext_SingleLine"/>
     </RelativeLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_chat_input.xml b/app/src/main/res/layout/widget_chat_input.xml
index 75e64349cb..f6a917fdaa 100644
--- a/app/src/main/res/layout/widget_chat_input.xml
+++ b/app/src/main/res/layout/widget_chat_input.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/chat_input_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/chat_input_container" style="@style/UiKit_ViewGroup_LinearLayout">
     <include android:id="@+id/guard" layout="@layout/widget_chat_input_guard"/>
     <include android:id="@+id/guard_member_verification" layout="@layout/widget_chat_input_member_verification_guard"/>
-    <LinearLayout android:id="@+id/chat_input_wrap" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:id="@+id/chat_input_wrap" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
         <LinearLayout android:orientation="vertical" android:id="@+id/chat_input_stickers_container" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="12dp" android:paddingRight="12dp" android:paddingBottom="4dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_stickers_matching_header" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_stickers_matching_header" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
             <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_stickers_recycler" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="12dp"/>
-            <View style="@style/res_2131952416_uikit_divider"/>
+            <View style="@style/UiKit_Divider"/>
         </LinearLayout>
         <FrameLayout android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_emoji_matching_header" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_emoji_matching_header" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
         </FrameLayout>
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_mentions_recycler" android:background="?attr/colorBackgroundSecondary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
         <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/chat_input_categories_recycler" android:background="?attr/colorBackgroundTertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height"/>
         <include android:id="@+id/application_commands_root" android:visibility="gone" layout="@layout/widget_chat_input_application_commands"/>
         <RelativeLayout android:id="@+id/chat_input_context_bar" android:background="?attr/colorBackgroundSecondary" android:visibility="gone" android:layout_width="match_parent" android:layout_height="40dp">
-            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/chat_input_context_cancel" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="44dp" android:layout_height="match_parent" android:src="@drawable/ic_close_circle_nova_grey_24dp" android:scaleType="fitCenter" android:layout_centerVertical="true" android:paddingStart="12dp" android:paddingEnd="12dp" style="@style/res_2131952449_uikit_imageview_clickable"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/chat_input_context_description" android:layout_width="wrap_content" android:layout_height="match_parent" android:maxLines="1" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@+id/chat_input_context_reply_mention_button" android:layout_toEndOf="@+id/chat_input_context_cancel" style="@style/res_2131952563_uikit_textview"/>
+            <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/chat_input_context_cancel" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="44dp" android:layout_height="match_parent" android:src="@drawable/ic_close_circle_nova_grey_24dp" android:scaleType="fitCenter" android:layout_centerVertical="true" android:paddingStart="12dp" android:paddingEnd="12dp" style="@style/UiKit_ImageView_Clickable"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/chat_input_context_description" android:layout_width="wrap_content" android:layout_height="match_parent" android:maxLines="1" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@+id/chat_input_context_reply_mention_button" android:layout_toEndOf="@+id/chat_input_context_cancel" style="@style/UiKit_TextView"/>
             <LinearLayout android:gravity="center" android:id="@+id/chat_input_context_reply_mention_button" android:background="?attr/selectableItemBackground" android:paddingTop="10dp" android:paddingBottom="10dp" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_centerVertical="true" android:paddingStart="12dp" android:paddingEnd="12dp" android:layout_alignParentEnd="true">
                 <ImageView android:id="@+id/chat_input_context_reply_mention_button_image" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_mentions_white_24dp" android:contentDescription="@string/mention" app:tint="?attr/colorControlBrandForeground"/>
-                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/chat_input_context_reply_mention_button_text" android:text="@string/reply_mention_on" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
+                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/chat_input_context_reply_mention_button_text" android:text="@string/reply_mention_on" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
             </LinearLayout>
         </RelativeLayout>
         <androidx.fragment.app.FragmentContainerView android:name="com.lytefast.flexinput.fragment.FlexInputFragment" android:id="@+id/chat_input_widget" android:layout_width="match_parent" android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/widget_chat_input_application_commands.xml b/app/src/main/res/layout/widget_chat_input_application_commands.xml
index 63b8c525ec..c6015ef1cc 100644
--- a/app/src/main/res/layout/widget_chat_input_application_commands.xml
+++ b/app/src/main/res/layout/widget_chat_input_application_commands.xml
@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content">
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_application_commands_recycler" android:scrollbars="none" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/divider" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0"/>
     <View android:id="@+id/divider" android:background="?attr/colorBackgroundFloating" android:layout_width="match_parent" android:layout_height="0.5dp" app:layout_constraintBottom_toTopOf="@+id/chat_input_application_commands_option_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0"/>
-    <TextView android:id="@+id/chat_input_application_commands_option_description" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:id="@+id/chat_input_application_commands_option_description" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml b/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml
index 750003866c..c9511b2b88 100644
--- a/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml
+++ b/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/AutocompleteItemContainer">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_input_item_avatar" android:visibility="gone" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951678_avatar_standard"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_input_item_avatar" android:visibility="gone" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Standard"/>
     <com.discord.views.StatusView android:id="@+id/chat_input_item_status" android:layout_width="8dp" android:layout_height="8dp" android:translationX="1.5dp" android:translationY="1.5dp" app:layout_constraintBottom_toBottomOf="@+id/chat_input_item_avatar" app:layout_constraintEnd_toEndOf="@+id/chat_input_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="1dp" app:sv_show_mobile="false"/>
-    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/chat_input_item_emoji" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/chat_input_item_emoji" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/chat_input_icon_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="6" app:constraint_referenced_ids="chat_input_item_avatar, chat_input_item_emoji" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/chat_input_item_name" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toTopOf="@+id/chat_input_item_description" app:layout_constraintEnd_toStartOf="@+id/chat_input_item_name_right" app:layout_constraintStart_toEndOf="@+id/chat_input_icon_barrier" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:ellipsize="end" android:id="@+id/chat_input_item_description" android:visibility="gone" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/chat_input_item_name_right" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/chat_input_item_name_right" app:layout_constraintStart_toEndOf="@+id/chat_input_icon_barrier" app:layout_constraintTop_toBottomOf="@+id/chat_input_item_name" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="end" android:id="@+id/chat_input_item_name_right" android:layout_width="wrap_content" android:maxWidth="@dimen/chat_input_autocomplete_name_max_width" android:singleLine="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_percent="33" style="@style/res_2131952563_uikit_textview"/>
-    <View android:id="@+id/chat_input_item_divider" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="@+id/chat_input_item_name" style="@style/res_2131952416_uikit_divider"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/chat_input_item_name" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toTopOf="@+id/chat_input_item_description" app:layout_constraintEnd_toStartOf="@+id/chat_input_item_name_right" app:layout_constraintStart_toEndOf="@+id/chat_input_icon_barrier" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:ellipsize="end" android:id="@+id/chat_input_item_description" android:visibility="gone" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/chat_input_item_name_right" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/chat_input_item_name_right" app:layout_constraintStart_toEndOf="@+id/chat_input_icon_barrier" app:layout_constraintTop_toBottomOf="@+id/chat_input_item_name" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="end" android:id="@+id/chat_input_item_name_right" android:layout_width="wrap_content" android:maxWidth="@dimen/chat_input_autocomplete_name_max_width" android:singleLine="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_percent="33" style="@style/UiKit_TextView"/>
+    <View android:id="@+id/chat_input_item_divider" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="@+id/chat_input_item_name" style="@style/UiKit_Divider"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_input_command_application_header_item.xml b/app/src/main/res/layout/widget_chat_input_command_application_header_item.xml
index 37daabb581..645d213571 100644
--- a/app/src/main/res/layout/widget_chat_input_command_application_header_item.xml
+++ b/app/src/main/res/layout/widget_chat_input_command_application_header_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondaryAlt" android:layout_width="match_parent" android:layout_height="32dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondaryAlt" android:layout_width="match_parent" android:layout_height="32dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <ImageView android:id="@+id/chat_input_application_avatar" android:layout_width="16dp" android:layout_height="16dp" android:contentDescription="@string/image" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/chat_input_application_name" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/chat_input_application_avatar" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/chat_input_application_name" android:layout_width="0dp" android:singleLine="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/chat_input_application_avatar" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_input_emoji_autocomplete_upsell_item.xml b/app/src/main/res/layout/widget_chat_input_emoji_autocomplete_upsell_item.xml
index 8f646f883b..c063f9d7fa 100644
--- a/app/src/main/res/layout/widget_chat_input_emoji_autocomplete_upsell_item.xml
+++ b/app/src/main/res/layout/widget_chat_input_emoji_autocomplete_upsell_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:orientation="horizontal" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AutocompleteItemContainer">
-    <TextView android:id="@+id/chat_input_emoji_upsell_text" android:padding="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:id="@+id/chat_input_emoji_upsell_text" android:padding="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" style="@style/UiKit_TextView_Semibold"/>
     <com.discord.views.PileView android:id="@+id/chat_input_emoji_upsell_pile" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" app:pile_itemBackgroundColor="?attr/colorBackgroundTertiary" app:pile_itemCutoutThickness="2dp" app:pile_itemOverlap="4dp" app:pile_itemPadding="4dp" app:pile_itemSize="24dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_input_guard.xml b/app/src/main/res/layout/widget_chat_input_guard.xml
index 3505ff56be..c42d633a5a 100644
--- a/app/src/main/res/layout/widget_chat_input_guard.xml
+++ b/app/src/main/res/layout/widget_chat_input_guard.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="8dp" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="8dp" android:visibility="gone" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_input_guard_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center" android:id="@+id/chat_input_guard_subtext" android:paddingTop="2sp" android:paddingBottom="2sp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952581_uikit_textview_subtext"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="8dp" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="8dp" android:visibility="gone" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_input_guard_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center" android:id="@+id/chat_input_guard_subtext" android:paddingTop="2sp" android:paddingBottom="2sp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_TextView_Subtext"/>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-        <com.google.android.material.button.MaterialButton android:id="@+id/chat_input_guard_action_secondary" android:visibility="gone" android:layout_weight="1" android:layout_marginEnd="16dp" style="@style/res_2131952467_uikit_material_button_secondary"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/chat_input_guard_action" android:text="@string/resend_verification_email" android:layout_weight="1" style="@style/res_2131952458_uikit_material_button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/chat_input_guard_action_secondary" android:visibility="gone" android:layout_weight="1" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button_Secondary"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/chat_input_guard_action" android:text="@string/resend_verification_email" android:layout_weight="1" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_input_item.xml b/app/src/main/res/layout/widget_chat_input_item.xml
index 7621180da4..b39776da4d 100644
--- a/app/src/main/res/layout/widget_chat_input_item.xml
+++ b/app/src/main/res/layout/widget_chat_input_item.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:layout_height="36dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <RelativeLayout android:id="@+id/chat_input_item_icon_container" android:layout_width="wrap_content" android:layout_centerVertical="true" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_input_item_avatar" android:layout_marginStart="16dp" style="@style/res_2131951677_avatar_small"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:layout_height="36dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <RelativeLayout android:id="@+id/chat_input_item_icon_container" android:layout_width="wrap_content" android:layout_centerVertical="true" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_input_item_avatar" android:layout_marginStart="16dp" style="@style/Avatar_Small"/>
         <com.discord.views.StatusView android:id="@+id/chat_input_item_status" android:layout_width="8dp" android:layout_height="8dp" android:layout_alignBottom="@+id/chat_input_item_avatar" android:translationX="1.5dp" android:translationY="1.5dp" android:layout_alignEnd="@+id/chat_input_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="1dp" app:sv_show_mobile="false"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_input_item_emoji" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:layout_marginStart="16dp" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_input_item_emoji" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:layout_marginStart="16dp" style="@style/UiKit_TextView"/>
     </RelativeLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginStart="8dp" android:layout_toStartOf="@+id/chat_input_item_name_right" android:layout_toEndOf="@+id/chat_input_item_icon_container" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_input_item_name_right" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxWidth="@dimen/chat_input_autocomplete_name_max_width" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_input_item_description" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" android:singleLine="true" android:layout_marginStart="16dp" android:layout_toStartOf="@+id/chat_input_item_name_right" style="@style/res_2131952563_uikit_textview"/>
-    <View android:layout_alignParentBottom="true" android:layout_alignStart="@+id/chat_input_item_icon_container" style="@style/res_2131952416_uikit_divider"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginStart="8dp" android:layout_toStartOf="@+id/chat_input_item_name_right" android:layout_toEndOf="@+id/chat_input_item_icon_container" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_input_item_name_right" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxWidth="@dimen/chat_input_autocomplete_name_max_width" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_input_item_description" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" android:singleLine="true" android:layout_marginStart="16dp" android:layout_toStartOf="@+id/chat_input_item_name_right" style="@style/UiKit_TextView"/>
+    <View android:layout_alignParentBottom="true" android:layout_alignStart="@+id/chat_input_item_icon_container" style="@style/UiKit_Divider"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml b/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml
index ca712fdc8f..a7aaa787a5 100644
--- a/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml
+++ b/app/src/main/res/layout/widget_chat_input_member_verification_guard.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp">
     <androidx.cardview.widget.CardView android:id="@+id/chat_member_verification_input_guard_action" android:layout_width="match_parent" android:layout_height="wrap_content" android:foreground="?attr/bg_pressed_highlight" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
-        <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <ImageView android:layout_gravity="center_vertical" android:id="@+id/chat_member_verification_input_guard_icon" android:layout_width="40dp" android:src="@drawable/img_member_verification_started" android:importantForAccessibility="no" android:layout_marginStart="12dp" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/chat_member_verification_input_guard_text" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/member_verification_chat_blocker_text" android:layout_weight="1" android:lineSpacingMultiplier="1" android:layout_marginStart="12dp" style="@style/res_2131952574_uikit_textview_medium"/>
+        <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <ImageView android:layout_gravity="center_vertical" android:id="@+id/chat_member_verification_input_guard_icon" android:layout_width="40dp" android:src="@drawable/img_member_verification_started" android:importantForAccessibility="no" android:layout_marginStart="12dp" style="@style/UiKit_ImageView"/>
+            <TextView android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/chat_member_verification_input_guard_text" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/member_verification_chat_blocker_text" android:layout_weight="1" android:lineSpacingMultiplier="1" android:layout_marginStart="12dp" style="@style/UiKit_TextView_Medium"/>
             <ImageView android:layout_gravity="center_vertical" android:id="@+id/chat_member_verification_input_guard_chevron" android:layout_width="32dp" android:layout_height="wrap_content" android:src="@drawable/ic_member_verification_chat_guard_cta" android:importantForAccessibility="no" android:layout_marginStart="12dp" android:layout_marginEnd="12dp"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/widget_chat_input_perm_req_files.xml b/app/src/main/res/layout/widget_chat_input_perm_req_files.xml
index aeec701621..5838fd4089 100644
--- a/app/src/main/res/layout/widget_chat_input_perm_req_files.xml
+++ b/app/src/main/res/layout/widget_chat_input_perm_req_files.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <ImageView android:layout_marginTop="24dp" android:src="@drawable/img_permission_prime" android:contentDescription="@string/system_permission_request_files" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:gravity="center" android:id="@+id/perm_req_text" android:padding="16dp" android:text="@string/system_permission_request_files" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/action_btn" android:text="@string/system_permission_grant" style="@style/res_2131952459_uikit_material_button_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <ImageView android:layout_marginTop="24dp" android:src="@drawable/img_permission_prime" android:contentDescription="@string/system_permission_request_files" style="@style/UiKit_ImageView"/>
+    <TextView android:gravity="center" android:id="@+id/perm_req_text" android:padding="16dp" android:text="@string/system_permission_request_files" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/action_btn" android:text="@string/system_permission_grant" style="@style/UiKit_Material_Button_Fit"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_input_slash_loading_item.xml b/app/src/main/res/layout/widget_chat_input_slash_loading_item.xml
index f5b01e1883..1c2527cfc8 100644
--- a/app/src/main/res/layout/widget_chat_input_slash_loading_item.xml
+++ b/app/src/main/res/layout/widget_chat_input_slash_loading_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondaryAlt" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="4dp" android:layout_height="44dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondaryAlt" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="4dp" android:layout_height="44dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <View android:id="@+id/name_placeholder" android:background="@drawable/drawable_empty_text_placeholder_white" android:layout_width="0dp" android:layout_height="14dp" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintEnd_toEndOf="@+id/name_placeholder_end_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <androidx.constraintlayout.widget.Guideline android:orientation="vertical" android:id="@+id/name_placeholder_end_guideline" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintGuide_percent="0.3"/>
     <View android:id="@+id/description_placeholder" android:background="@drawable/drawable_empty_text_placeholder_white" android:layout_width="0dp" android:layout_height="14dp" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/description_placeholder_end_guideline" app:layout_constraintStart_toStartOf="0"/>
diff --git a/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml b/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml
index e60f680c5f..73a2cc88c5 100644
--- a/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml
+++ b/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:background="@drawable/drawable_bg_corners_4dp" android:visibility="gone" android:layout_width="wrap_content" android:elevation="4dp" android:backgroundTint="?attr/colorBackgroundFloating" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:background="@drawable/drawable_bg_corners_4dp" android:visibility="gone" android:layout_width="wrap_content" android:elevation="4dp" android:backgroundTint="?attr/colorBackgroundFloating" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_1" android:paddingLeft="4dp" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginRight="8dp"/>
     <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_2" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginRight="8dp"/>
     <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_3" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginRight="8dp"/>
diff --git a/app/src/main/res/layout/widget_chat_list_actions.xml b/app/src/main/res/layout/widget_chat_list_actions.xml
index 2983996e82..de69ef21fd 100644
--- a/app/src/main/res/layout/widget_chat_list_actions.xml
+++ b/app/src/main/res/layout/widget_chat_list_actions.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:id="@+id/dialog_chat_actions_container" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center" android:id="@+id/dialog_chat_actions_add_reaction_emojis_list" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:contentDescription="@string/add_reaction" android:nestedScrollingEnabled="false" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
-        <TextView android:id="@+id/dialog_chat_actions_resend" android:text="@string/resend_message" app:drawableStartCompat="@drawable/ic_resend_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_edit" android:text="@string/edit" app:drawableStartCompat="@drawable/ic_edit_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_reply" android:text="@string/message_action_reply" app:drawableStartCompat="@drawable/ic_reply_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_start_thread" android:visibility="gone" android:text="@string/create_thread" app:drawableStartCompat="@drawable/ic_thread" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_copy" android:text="@string/copy_text" app:drawableStartCompat="@drawable/ic_copy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_delete" android:text="@string/delete" app:drawableStartCompat="@drawable/ic_delete_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:gravity="center_vertical" android:id="@+id/dialog_chat_actions_profile" android:text="@string/profile" app:drawableStartCompat="@drawable/ic_profile_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" app:drawableStartCompat="@drawable/ic_reaction_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_remove_all_reactions" android:text="@string/remove_all_reactions" app:drawableStartCompat="@drawable/ic_remove_reaction_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_publish" android:visibility="gone" android:text="@string/news_channel_publish" app:drawableStartCompat="@drawable/ic_publish_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_pin" android:text="@string/pin" app:drawableStartCompat="@drawable/ic_pin_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_share" android:visibility="gone" android:text="@string/share" app:drawableStartCompat="@drawable/ic_share_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_mark_unread" android:text="@string/mark_unread" app:drawableStartCompat="@drawable/ic_mark_unread_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_copy_id" android:visibility="gone" android:text="@string/copy_id" app:drawableStartCompat="@drawable/ic_copy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/dialog_chat_actions_report" android:visibility="gone" android:text="@string/report" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:id="@+id/dialog_chat_actions_container" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center" android:id="@+id/dialog_chat_actions_add_reaction_emojis_list" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:contentDescription="@string/add_reaction" android:nestedScrollingEnabled="false" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
+        <TextView android:id="@+id/dialog_chat_actions_resend" android:text="@string/resend_message" app:drawableStartCompat="@drawable/ic_resend_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_edit" android:text="@string/edit" app:drawableStartCompat="@drawable/ic_edit_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_reply" android:text="@string/message_action_reply" app:drawableStartCompat="@drawable/ic_reply_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_start_thread" android:visibility="gone" android:text="@string/create_thread" app:drawableStartCompat="@drawable/ic_thread" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_copy" android:text="@string/copy_text" app:drawableStartCompat="@drawable/ic_copy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_delete" android:text="@string/delete" app:drawableStartCompat="@drawable/ic_delete_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:gravity="center_vertical" android:id="@+id/dialog_chat_actions_profile" android:text="@string/profile" app:drawableStartCompat="@drawable/ic_profile_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" app:drawableStartCompat="@drawable/ic_reaction_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_remove_all_reactions" android:text="@string/remove_all_reactions" app:drawableStartCompat="@drawable/ic_remove_reaction_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_publish" android:visibility="gone" android:text="@string/news_channel_publish" app:drawableStartCompat="@drawable/ic_publish_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_pin" android:text="@string/pin" app:drawableStartCompat="@drawable/ic_pin_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_share" android:visibility="gone" android:text="@string/share" app:drawableStartCompat="@drawable/ic_share_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_mark_unread" android:text="@string/mark_unread" app:drawableStartCompat="@drawable/ic_mark_unread_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_copy_id" android:visibility="gone" android:text="@string/copy_id" app:drawableStartCompat="@drawable/ic_copy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/dialog_chat_actions_report" android:visibility="gone" android:text="@string/report" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_application_command.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_application_command.xml
index 74b62d48c3..0b3b0ca190 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_application_command.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_application_command.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:paddingTop="10dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
-    <ImageView android:id="@+id/chat_list_adapter_item_text_avatar" android:layout_width="@dimen/avatar_size_chat" android:layout_height="@dimen/avatar_size_medium" android:src="@drawable/ic_slash_command_24dp" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorTextMuted" style="@style/res_2131951672_avatar_chat"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/UiKit_Chat_Guideline"/>
+    <ImageView android:id="@+id/chat_list_adapter_item_text_avatar" android:layout_width="@dimen/avatar_size_chat" android:layout_height="@dimen/avatar_size_medium" android:src="@drawable/ic_slash_command_24dp" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorTextMuted" style="@style/Avatar_Chat"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:paddingBottom="2dp" android:layout_marginTop="1dp" android:lineSpacingMultiplier="1" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_name" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:paddingBottom="2dp" android:layout_marginTop="1dp" android:lineSpacingMultiplier="1" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_name" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.cardview.widget.CardView android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_decorator" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_header">
-        <TextView android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_command" android:background="?attr/selectableItemBackground" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" style="@style/res_2131952394_uikit_chat_text"/>
+        <TextView android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_command" android:background="?attr/selectableItemBackground" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" style="@style/UiKit_Chat_Text"/>
     </androidx.cardview.widget.CardView>
     <FrameLayout android:id="@+id/chat_list_adapter_item_text_decorator_reply_link_icon" android:visibility="visible" android:clipChildren="false" android:layout_width="34dp" android:layout_height="20dp" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_decorator" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_avatar">
         <com.discord.widgets.chat.list.ViewReplySpline android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="3dp" android:layout_marginStart="2dp" app:end_padding="2dp" app:orientation="vertical" app:tint="?attr/colorBackgroundAccent"/>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_attachment.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_attachment.xml
index 3ac558b25b..70ba921374 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_attachment.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_attachment.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" style="@style/res_2131952589_uikit_viewgroup">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup">
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:background="?attr/theme_chat_mentioned_me" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="@color/status_yellow_500" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_highlighted_bg"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/UiKit_Chat_Guideline"/>
     <com.discord.widgets.chat.list.InlineMediaView android:id="@+id/chat_list_item_attachment_inline_media" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:maxHeight="500dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0"/>
-    <com.google.android.material.card.MaterialCardView android:id="@+id/chat_list_item_attachment_card" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" android:transitionGroup="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952388_uikit_chat_embed_cardview">
-        <androidx.constraintlayout.widget.ConstraintLayout android:padding="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-            <ImageView android:id="@+id/chat_list_item_attachment_icon" android:src="@drawable/ic_file_unknown" android:contentDescription="@string/attachment_filename_unknown" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:id="@+id/chat_list_item_attachment_name" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/chat_list_item_attachment_description" app:layout_constraintEnd_toStartOf="@+id/chat_list_item_attachment_download" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_attachment_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952572_uikit_textview_link"/>
-            <TextView android:id="@+id/chat_list_item_attachment_description" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/chat_list_item_attachment_name" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_attachment_name" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <ImageView android:id="@+id/chat_list_item_attachment_download" android:src="?attr/ic_file_download_opaque" android:contentDescription="@string/download" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+    <com.google.android.material.card.MaterialCardView android:id="@+id/chat_list_item_attachment_card" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" android:transitionGroup="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_CardView">
+        <androidx.constraintlayout.widget.ConstraintLayout android:padding="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+            <ImageView android:id="@+id/chat_list_item_attachment_icon" android:src="@drawable/ic_file_unknown" android:contentDescription="@string/attachment_filename_unknown" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+            <TextView android:id="@+id/chat_list_item_attachment_name" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/chat_list_item_attachment_description" app:layout_constraintEnd_toStartOf="@+id/chat_list_item_attachment_download" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_attachment_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Link"/>
+            <TextView android:id="@+id/chat_list_item_attachment_description" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="@+id/chat_list_item_attachment_name" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_attachment_name" style="@style/UiKit_TextView_Subtext"/>
+            <ImageView android:id="@+id/chat_list_item_attachment_download" android:src="?attr/ic_file_download_opaque" android:contentDescription="@string/download" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/chat_list_item_attachment_barrier" android:layout_width="0dp" android:layout_height="0dp" app:barrierDirection="6" app:constraint_referenced_ids="chat_list_item_attachment_card,                                        chat_list_item_attachment_inline_media"/>
     <FrameLayout android:id="@+id/chat_list_item_attachment_spoiler" android:background="?attr/theme_chat_spoiler_bg" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" android:elevation="@dimen/app_elevation" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/chat_list_item_attachment_barrier" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
         <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/black_alpha_60" app:cardCornerRadius="16dp" app:cardElevation="@dimen/app_elevation">
-            <TextView android:textColor="@color/primary_200" android:layout_gravity="center" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/spoiler" android:textAllCaps="true" style="@style/res_2131952567_uikit_textview_h2"/>
+            <TextView android:textColor="@color/primary_200" android:layout_gravity="center" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/spoiler" android:textAllCaps="true" style="@style/UiKit_TextView_H2"/>
         </androidx.cardview.widget.CardView>
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_blocked.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_blocked.xml
index 90f5300e94..b62fec726e 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_blocked.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_blocked.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin">
-    <TextView android:textSize="11sp" android:textColor="?attr/theme_chat_blocked_text" android:gravity="center" android:id="@+id/chat_list_adapter_item_blocked" android:background="?attr/theme_chat_blocked_bg" android:paddingTop="7.5dp" android:paddingBottom="7.5dp" android:layout_width="match_parent" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="11sp" android:textColor="?attr/theme_chat_blocked_text" android:gravity="center" android:id="@+id/chat_list_adapter_item_blocked" android:background="?attr/theme_chat_blocked_bg" android:paddingTop="7.5dp" android:paddingBottom="7.5dp" android:layout_width="match_parent" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_bot_component_row.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_bot_component_row.xml
index 193b1c1408..2be80874eb 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_bot_component_row.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_bot_component_row.xml
@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="?attr/color_brand" android:visibility="gone" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_highlighted_bg"/>
-    <LinearLayout android:id="@+id/chat_list_adapter_item_component_root" android:layout_marginStart="@dimen/uikit_guideline_chat" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+    <LinearLayout android:id="@+id/chat_list_adapter_item_component_root" android:layout_marginStart="@dimen/uikit_guideline_chat" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_call.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_call.xml
index ac066b7b55..12a0f1d1c4 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_call.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_call.xml
@@ -2,12 +2,12 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginTop="8dp" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginBottom="8dp" android:foreground="?attr/bg_pressed_highlight" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:strokeWidth="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content">
         <ImageView android:id="@+id/chat_list_adapter_item_call_icon" android:layout_width="24dp" android:layout_height="24dp" android:importantForAccessibility="no" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_call_title" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_call_subtitle" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/sample_time_pm" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131951902_callmessage_subtitle"/>
-        <LinearLayout android:id="@+id/chat_list_adapter_item_call_unjoined_ongoing_subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_unjoined_call_duration" android:layout_width="wrap_content" style="@style/res_2131951902_callmessage_subtitle"/>
-            <TextView android:textSize="12dp" android:layout_width="wrap_content" android:text="@string/ongoing_call_tap_to_join" android:paddingStart="2dp" style="@style/res_2131951902_callmessage_subtitle"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_call_title" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_call_subtitle" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/sample_time_pm" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/CallMessage_Subtitle"/>
+        <LinearLayout android:id="@+id/chat_list_adapter_item_call_unjoined_ongoing_subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <TextView android:textSize="12dp" android:id="@+id/chat_list_adapter_item_unjoined_call_duration" android:layout_width="wrap_content" style="@style/CallMessage_Subtitle"/>
+            <TextView android:textSize="12dp" android:layout_width="wrap_content" android:text="@string/ongoing_call_tap_to_join" android:paddingStart="2dp" style="@style/CallMessage_Subtitle"/>
         </LinearLayout>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_list_adapter_item_call_participants" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_list_adapter_item_call_participants" android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_embed.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_embed.xml
index 2b34542f3d..590e203dbd 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_embed.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_embed.xml
@@ -2,30 +2,30 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:background="?attr/theme_chat_mentioned_me" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="@color/status_yellow_500" android:visibility="gone" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_highlighted_bg"/>
-    <com.google.android.material.card.MaterialCardView android:id="@+id/chat_list_item_embed_container_card" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" android:transitionGroup="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952388_uikit_chat_embed_cardview">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <com.google.android.material.card.MaterialCardView android:id="@+id/chat_list_item_embed_container_card" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" android:transitionGroup="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_CardView">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_ViewGroup_ConstraintLayout">
             <View android:id="@+id/chat_list_item_embed_divider" android:background="?attr/colorBackgroundModifierAccent" android:layout_width="3dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image_thumbnail" android:visibility="gone" android:layout_margin="4dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="8dp" style="@style/res_2131952448_uikit_imageview"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image_thumbnail" android:visibility="gone" android:layout_margin="4dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="8dp" style="@style/UiKit_ImageView"/>
             <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/chat_list_item_embed_content" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="8dp" android:paddingEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="0">
-                <TextView android:textSize="10sp" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_item_embed_provider" android:background="?attr/selectableItemBackground" android:visibility="gone" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:textSize="10sp" android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_item_embed_provider" android:background="?attr/selectableItemBackground" android:visibility="gone" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_author_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" app:layout_constraintBottom_toBottomOf="@+id/chat_list_item_embed_author_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_item_embed_author_text" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="2dp"/>
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_marginStart="@dimen/embed_item_margin" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" app:layout_goneMarginTop="0dp" style="@style/res_2131952579_uikit_textview_semibold"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_title" android:background="?attr/selectableItemBackground" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_author_text" style="@style/res_2131952579_uikit_textview_semibold"/>
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_marginStart="@dimen/embed_item_margin" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" app:layout_goneMarginTop="0dp" style="@style/UiKit_TextView_Semibold"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_embed_title" android:background="?attr/selectableItemBackground" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_author_text" style="@style/UiKit_TextView_Semibold"/>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/chat_list_item_embed_barrier_header" android:layout_width="0dp" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="chat_list_item_embed_title,                                                chat_list_item_embed_author_text,                                                chat_list_item_embed_provider"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_item_embed_description" android:background="?attr/selectableItemBackground" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_header" style="@style/res_2131952563_uikit_textview"/>
-                <LinearLayout android:id="@+id/chat_list_item_embed_fields" android:layout_width="match_parent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_description" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_item_embed_description" android:background="?attr/selectableItemBackground" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_header" style="@style/UiKit_TextView"/>
+                <LinearLayout android:id="@+id/chat_list_item_embed_fields" android:layout_width="match_parent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_description" style="@style/UiKit_ViewGroup_LinearLayout"/>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/chat_list_item_embed_barrier_data" android:layout_width="0dp" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="chat_list_item_embed_barrier_header,                                                chat_list_item_embed_description,                                                chat_list_item_embed_fields"/>
-                <androidx.cardview.widget.CardView android:id="@+id/embed_image_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constraintHorizontal_bias="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_data" style="@style/res_2131952589_uikit_viewgroup">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundModifierAccent" app:roundedCornerRadius="2dp" style="@style/res_2131952448_uikit_imageview"/>
+                <androidx.cardview.widget.CardView android:id="@+id/embed_image_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constraintHorizontal_bias="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_item_embed_barrier_data" style="@style/UiKit_ViewGroup">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_image" app:overlayImage="@drawable/drawable_overlay_image_square" app:placeholderImage="?attr/colorBackgroundModifierAccent" app:roundedCornerRadius="2dp" style="@style/UiKit_ImageView"/>
                     <ImageView android:layout_gravity="center" android:id="@+id/chat_list_item_embed_image_icons" android:background="@drawable/drawable_circle_primary_900" android:padding="8dp" android:visibility="gone" android:layout_width="@dimen/embed_play_button_width" android:layout_height="@dimen/embed_play_button_width" android:src="@drawable/ic_play_arrow_24dp" android:scaleType="fitXY" android:alpha="0.6" android:importantForAccessibility="no" app:tint="@color/white"/>
                 </androidx.cardview.widget.CardView>
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_item_embed_footer_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" android:layout_marginEnd="@dimen/embed_item_margin" app:layout_constraintBottom_toBottomOf="@+id/chat_list_item_embed_footer_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_item_embed_footer_text" app:placeholderImage="?attr/colorBackgroundPrimary" app:roundedCornerRadius="2dp"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_item_embed_footer_text" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintTop_toBottomOf="@+id/embed_image_container" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_item_embed_footer_text" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="4dp" android:lineSpacingMultiplier="1" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_footer_icon" app:layout_constraintTop_toBottomOf="@+id/embed_image_container" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" style="@style/UiKit_TextView_Semibold"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
             <com.discord.widgets.chat.list.InlineMediaView android:id="@+id/embed_inline_media" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
             <FrameLayout android:id="@+id/chat_list_item_embed_spoiler" android:background="?attr/theme_chat_spoiler_bg" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_item_embed_divider" app:layout_constraintTop_toTopOf="0">
                 <androidx.cardview.widget.CardView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="?attr/colorBackgroundFloating" app:cardCornerRadius="16dp">
-                    <TextView android:textColor="?attr/colorTextNormal" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/spoiler" android:textAllCaps="true" style="@style/res_2131952567_uikit_textview_h2"/>
+                    <TextView android:textColor="?attr/colorTextNormal" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:paddingBottom="4dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/spoiler" android:textAllCaps="true" style="@style/UiKit_TextView_H2"/>
                 </androidx.cardview.widget.CardView>
             </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_embed_field.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_embed_field.xml
index c5616a37a3..d5f4ef03a2 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_embed_field.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_embed_field.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/primary_100" android:id="@+id/chat_list_item_embed_field_name" android:layout_width="match_parent" android:layout_marginTop="@dimen/embed_item_margin" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_item_embed_field_value" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_marginTop="4dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/primary_100" android:id="@+id/chat_list_item_embed_field_name" android:layout_width="match_parent" android:layout_marginTop="@dimen/embed_item_margin" style="@style/UiKit_TextView_Semibold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_item_embed_field_value" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_marginTop="4dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_empty_pins.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_empty_pins.xml
index 78aaedda02..1c37829e3e 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_empty_pins.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_empty_pins.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:layout_marginRight="10dp">
     <ImageView android:id="@+id/chat_list_empty_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="?attr/theme_chat_empty_pins" android:layout_above="@+id/chat_list_empty_pins_text" android:layout_centerHorizontal="true"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_list_empty_pins_text" android:layout_marginTop="10dp" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_list_empty_pins_text" android:layout_marginTop="10dp" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_ephemeral_message.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_ephemeral_message.xml
index 39de0604ca..2f789652a3 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_ephemeral_message.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_ephemeral_message.xml
@@ -3,9 +3,9 @@
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:background="?attr/theme_chat_mentioned_me" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="@color/status_yellow_500" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
+        <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/UiKit_Chat_Guideline"/>
         <ImageView android:id="@+id/chat_list_adapter_item_visibility_icon" android:visibility="visible" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_spectate" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_dismiss" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_dismiss" app:tint="?attr/colorTextMuted"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/chat_list_adapter_item_text_dismiss" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/only_you_can_see_and_delete_these" android:layout_marginStart="28dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_icon_help" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/chat_list_adapter_item_text_dismiss" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/only_you_can_see_and_delete_these" android:layout_marginStart="28dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_icon_help" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
         <ImageView android:id="@+id/chat_list_adapter_item_icon_help" android:visibility="visible" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_help_24dp" android:contentDescription="@string/age_gate_view_help_article" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_dismiss" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_dismiss" app:tint="?attr/colorTextMuted"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_failed.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_failed.xml
index 76a20ca812..d87763e29e 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_failed.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_failed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/chat_list_adapter_item_failed" android:background="?attr/selectableItemBackground" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/res_2131951672_avatar_chat"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/Avatar_Chat"/>
     <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_toEndOf="@+id/chat_list_adapter_item_text_avatar">
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:layout_marginBottom="4dp" android:maxWidth="150dp" android:text="@string/sample_user_name" android:lineSpacingMultiplier="1" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="13.75sp" android:textColor="@color/status_red_500" android:textColorLink="?attr/colorTextLink" android:id="@+id/chat_list_adapter_item_text" android:layout_width="match_parent" android:layout_marginBottom="4dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:layout_marginBottom="4dp" android:maxWidth="150dp" android:text="@string/sample_user_name" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Large_SingleLine"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="13.75sp" android:textColor="@color/status_red_500" android:textColorLink="?attr/colorTextLink" android:id="@+id/chat_list_adapter_item_text" android:layout_width="match_parent" android:layout_marginBottom="4dp" style="@style/UiKit_TextView"/>
         <com.discord.views.FailedUploadList android:id="@+id/chat_list_adapter_item_failed_upload_list" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp"/>
-        <TextView android:textSize="11sp" android:textColor="@color/status_red_500" android:id="@+id/chat_list_adapter_item_alert_text" android:layout_width="match_parent" android:layout_marginBottom="4dp" android:text="@string/send_message_failure" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_alert_circle_16dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="11sp" android:textColor="@color/status_red_500" android:id="@+id/chat_list_adapter_item_alert_text" android:layout_width="match_parent" android:layout_marginBottom="4dp" android:text="@string/send_message_failure" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_alert_circle_16dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_game_invite.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_game_invite.xml
index 5571da02a1..91b1ecb430 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_game_invite.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_game_invite.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="16dp" app:cardCornerRadius="4dp" app:cardElevation="1dp" style="@style/res_2131952388_uikit_chat_embed_cardview">
-    <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@+id/item_game_invite" style="@style/res_2131952589_uikit_viewgroup"/>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="16dp" app:cardCornerRadius="4dp" app:cardElevation="1dp" style="@style/UiKit_Chat_Embed_CardView">
+    <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@+id/item_game_invite" style="@style/UiKit_ViewGroup"/>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_gift.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_gift.xml
index 2d41d2c696..2f1b1e27a2 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_gift.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_gift.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/res_2131952389_uikit_chat_embed_container">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/UiKit_Chat_Embed_Container">
     <FrameLayout android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/item_gift_image" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_gift_image_background" android:layout_width="match_parent" android:layout_height="match_parent" android:alpha="0.1" app:actualImageScaleType="4"/>
         <View android:background="?attr/gift_embed_gradient_overlay" android:layout_width="match_parent" android:layout_height="match_parent"/>
     </FrameLayout>
-    <TextView android:id="@+id/item_gift_header" android:text="@string/invite_button_resolving" style="@style/res_2131952391_uikit_chat_embed_header"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_gift_image" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_gift_header" app:placeholderImage="?attr/ic_game_icon_placeholder" style="@style/res_2131952020_icon_game"/>
-    <LinearLayout android:id="@+id/item_gift_details" android:layout_width="0dp" android:layout_marginTop="8dp" android:minHeight="50dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/item_gift_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/item_gift_image" app:layout_constraintTop_toBottomOf="@+id/item_gift_header" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_gift_name" android:minWidth="150dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/res_2131952573_uikit_textview_marquee"/>
-        <TextView android:id="@+id/item_gift_expires" android:layout_marginTop="4dp" android:singleLine="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/res_2131952392_uikit_chat_embed_subtext"/>
+    <TextView android:id="@+id/item_gift_header" android:text="@string/invite_button_resolving" style="@style/UiKit_Chat_Embed_Header"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_gift_image" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_gift_header" app:placeholderImage="?attr/ic_game_icon_placeholder" style="@style/Icon_Game"/>
+    <LinearLayout android:id="@+id/item_gift_details" android:layout_width="0dp" android:layout_marginTop="8dp" android:minHeight="50dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/item_gift_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/item_gift_image" app:layout_constraintTop_toBottomOf="@+id/item_gift_header" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_gift_name" android:minWidth="150dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_Marquee"/>
+        <TextView android:id="@+id/item_gift_expires" android:layout_marginTop="4dp" android:singleLine="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/UiKit_Chat_Embed_Subtext"/>
     </LinearLayout>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="item_gift_image,item_gift_details"/>
-    <TextView android:id="@+id/item_gift_subtext" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="@+id/item_gift_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/item_gift_image" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/res_2131952392_uikit_chat_embed_subtext"/>
+    <TextView android:id="@+id/item_gift_subtext" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="@+id/item_gift_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/item_gift_image" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/UiKit_Chat_Embed_Subtext"/>
     <FrameLayout android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_gift_subtext">
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_gift_cannot_claim_button" android:visibility="gone" android:text="@string/gift_embed_button_claimed" style="@style/res_2131952420_uikit_giftembeddisabledbutton"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_gift_accept_button" android:visibility="gone" android:text="@string/gift_embed_button_accept" style="@style/res_2131952460_uikit_material_button_green"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_gift_verify_button" android:visibility="gone" android:text="@string/verify_account" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_gift_subtext" style="@style/res_2131952458_uikit_material_button"/>
-        <View android:id="@+id/item_gift_loading_button_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36dp" android:layout_marginTop="6dp" style="@style/res_2131952589_uikit_viewgroup"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_gift_cannot_claim_button" android:visibility="gone" android:text="@string/gift_embed_button_claimed" style="@style/UiKit_GiftEmbedDisabledButton"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_gift_accept_button" android:visibility="gone" android:text="@string/gift_embed_button_accept" style="@style/UiKit_Material_Button_Green"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_gift_verify_button" android:visibility="gone" android:text="@string/verify_account" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_gift_subtext" style="@style/UiKit_Material_Button"/>
+        <View android:id="@+id/item_gift_loading_button_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36dp" android:layout_marginTop="6dp" style="@style/UiKit_ViewGroup"/>
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_guild_invite_reminder.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_guild_invite_reminder.xml
index 2a431ee698..b809102c08 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_guild_invite_reminder.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_guild_invite_reminder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/chat_action_item_image" android:layout_width="@dimen/avatar_size_chat" android:layout_height="@dimen/avatar_size_chat" android:src="@drawable/ic_reminder_notification" android:scaleType="fitCenter" android:importantForAccessibility="no" android:layout_marginEnd="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_vertical" android:id="@+id/chat_action_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_action_item_image" app:layout_constraintTop_toTopOf="@+id/chat_action_item_image" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:id="@+id/chat_action_item_subtext" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="@+id/chat_action_item_text" app:layout_constraintTop_toBottomOf="@+id/chat_action_item_text" style="@style/res_2131952533_uikit_textappearance"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/chat_action_item_button" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/system_message_invite_users_button" app:layout_constraintStart_toStartOf="@+id/chat_action_item_subtext" app:layout_constraintTop_toBottomOf="@+id/chat_action_item_subtext" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_vertical" android:id="@+id/chat_action_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_action_item_image" app:layout_constraintTop_toTopOf="@+id/chat_action_item_image" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:id="@+id/chat_action_item_subtext" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="@+id/chat_action_item_text" app:layout_constraintTop_toBottomOf="@+id/chat_action_item_text" style="@style/UiKit_TextAppearance"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/chat_action_item_button" android:visibility="visible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/system_message_invite_users_button" app:layout_constraintStart_toStartOf="@+id/chat_action_item_subtext" app:layout_constraintTop_toBottomOf="@+id/chat_action_item_subtext" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_guild_template.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_guild_template.xml
index 2c3837a619..d5d6b5b61a 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_guild_template.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_guild_template.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" android:padding="8dp" style="@style/res_2131952389_uikit_chat_embed_container">
-    <TextView android:id="@+id/item_guild_template_header" android:layout_marginTop="0dp" android:text="@string/guild_template_resolved_embed_title" android:layout_marginStart="0dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952391_uikit_chat_embed_header"/>
-    <ImageView android:id="@+id/item_guild_template_image" android:layout_width="42dp" android:layout_height="42dp" android:layout_marginTop="8dp" android:src="@drawable/ic_template_32dp" android:contentDescription="@string/guild_template_resolved_embed_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_header" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_guild_template_name" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/item_guild_template_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/item_guild_template_image" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_header" style="@style/res_2131952573_uikit_textview_marquee"/>
-    <TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/item_guild_template_subtext" android:visibility="visible" android:layout_width="0dp" android:maxLines="1" android:singleLine="true" app:layout_constraintEnd_toEndOf="@+id/item_guild_template_name" app:layout_constraintStart_toStartOf="@+id/item_guild_template_name" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_name" style="@style/res_2131952392_uikit_chat_embed_subtext"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/item_guild_template_join_button" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/guild_template_open" android:insetBottom="6dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_image" style="@style/res_2131952460_uikit_material_button_green"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" android:padding="8dp" style="@style/UiKit_Chat_Embed_Container">
+    <TextView android:id="@+id/item_guild_template_header" android:layout_marginTop="0dp" android:text="@string/guild_template_resolved_embed_title" android:layout_marginStart="0dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_Header"/>
+    <ImageView android:id="@+id/item_guild_template_image" android:layout_width="42dp" android:layout_height="42dp" android:layout_marginTop="8dp" android:src="@drawable/ic_template_32dp" android:contentDescription="@string/guild_template_resolved_embed_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_header" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_guild_template_name" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/item_guild_template_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/item_guild_template_image" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_header" style="@style/UiKit_TextView_Marquee"/>
+    <TextView android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/item_guild_template_subtext" android:visibility="visible" android:layout_width="0dp" android:maxLines="1" android:singleLine="true" app:layout_constraintEnd_toEndOf="@+id/item_guild_template_name" app:layout_constraintStart_toStartOf="@+id/item_guild_template_name" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_name" style="@style/UiKit_Chat_Embed_Subtext"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/item_guild_template_join_button" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/guild_template_open" android:insetBottom="6dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_guild_template_image" style="@style/UiKit_Material_Button_Green"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_guild_welcome.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_guild_welcome.xml
index 9efcf9299f..e76c46e2e9 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_guild_welcome.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_guild_welcome.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/item_guild_welcome_header" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <LinearLayout android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_guild_welcome_subheader" android:text="@string/welcome_cta_subtitle_owner" style="@style/res_2131952563_uikit_textview"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_guild_welcome_subheader_intro" android:layout_marginTop="8dp" android:text="@string/welcome_cta_subtitle_owner" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/item_guild_welcome_header" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_H1_Bold"/>
+    <LinearLayout android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_guild_welcome_subheader" android:text="@string/welcome_cta_subtitle_owner" style="@style/UiKit_TextView"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_guild_welcome_subheader_intro" android:layout_marginTop="8dp" android:text="@string/welcome_cta_subtitle_owner" style="@style/UiKit_TextView"/>
     </LinearLayout>
-    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_invite_friends" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_add_friend" app:action_item_text="@string/welcome_cta_invite_title" style="@style/res_2131952613_uikit_welcomemessagecard"/>
-    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_upload_icon" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_personalize" app:action_item_text="@string/welcome_cta_personalize_title_mobile" style="@style/res_2131952613_uikit_welcomemessagecard"/>
+    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_invite_friends" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_add_friend" app:action_item_text="@string/welcome_cta_invite_title" style="@style/UiKit_WelcomeMessageCard"/>
+    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_upload_icon" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_personalize" app:action_item_text="@string/welcome_cta_personalize_title_mobile" style="@style/UiKit_WelcomeMessageCard"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml
index 582558877b..c4e78ae4bb 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/res_2131952389_uikit_chat_embed_container">
-    <TextView android:id="@+id/item_invite_header" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/invite_button_resolving" app:layout_constraintBottom_toTopOf="@+id/barrier_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952391_uikit_chat_embed_header"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/UiKit_Chat_Embed_Container">
+    <TextView android:id="@+id/item_invite_header" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/invite_button_resolving" app:layout_constraintBottom_toTopOf="@+id/barrier_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_Header"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier_header" android:layout_width="0dp" android:layout_height="wrap_content" app:barrierDirection="2" app:constraint_referenced_ids="item_invite_image, item_invite_name"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_invite_image" android:layout_width="42dp" android:layout_height="42dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/barrier_button" app:layout_constraintEnd_toEndOf="@+id/item_invite_name" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier_header" app:layout_constraintVertical_bias="0" app:roundAsCircle="true" app:roundWithOverlayColor="?attr/primary_630"/>
-    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="42dp" android:layout_height="42dp" android:maxLines="1" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_button_layout" app:layout_constraintEnd_toEndOf="@+id/item_invite_image" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" app:layout_constraintVertical_bias="0" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_invite_name" android:layout_width="0dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/item_invite_channel_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/barrier_header" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952573_uikit_textview_marquee"/>
-    <TextView android:gravity="center_vertical" android:id="@+id/item_invite_channel_name" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_voice_16dp" app:drawableTint="?attr/colorChannelDefault" app:layout_constraintBottom_toTopOf="@+id/item_invite_member_container" app:layout_constraintEnd_toEndOf="@+id/item_invite_name" app:layout_constraintStart_toStartOf="@+id/item_invite_name" app:layout_constraintTop_toBottomOf="@+id/item_invite_name" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952392_uikit_chat_embed_subtext"/>
+    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="42dp" android:layout_height="42dp" android:maxLines="1" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_button_layout" app:layout_constraintEnd_toEndOf="@+id/item_invite_image" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" app:layout_constraintVertical_bias="0" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_invite_name" android:layout_width="0dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/item_invite_channel_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/barrier_header" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Marquee"/>
+    <TextView android:gravity="center_vertical" android:id="@+id/item_invite_channel_name" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_voice_16dp" app:drawableTint="?attr/colorChannelDefault" app:layout_constraintBottom_toTopOf="@+id/item_invite_member_container" app:layout_constraintEnd_toEndOf="@+id/item_invite_name" app:layout_constraintStart_toStartOf="@+id/item_invite_name" app:layout_constraintTop_toBottomOf="@+id/item_invite_name" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_Chat_Embed_Subtext"/>
     <include android:id="@+id/item_invite_member_container" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/barrier_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/item_invite_channel_name" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" layout="@layout/view_server_member_count"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier_button" android:layout_width="0dp" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="item_invite_member_container, item_invite_image"/>
     <FrameLayout android:id="@+id/item_invite_button_layout" android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/join_guild" app:layout_constraintBottom_toBottomOf="@+id/item_invite_hub_layout" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier_button" app:layout_constraintVertical_bias="0">
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_joined_button" android:visibility="gone" android:text="@string/joined_guild" style="@style/res_2131952469_uikit_material_button_secondary_outline"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:text="@string/join_guild" style="@style/res_2131952460_uikit_material_button_green"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_mention_button" android:visibility="gone" android:text="@string/mention" style="@style/res_2131952458_uikit_material_button"/>
-        <View android:id="@+id/item_invite_loading_button" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36dp" android:layout_marginTop="8dp" android:text="@string/mention" style="@style/res_2131952589_uikit_viewgroup"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_joined_button" android:visibility="gone" android:text="@string/joined_guild" style="@style/UiKit_Material_Button_Secondary_Outline"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:text="@string/join_guild" style="@style/UiKit_Material_Button_Green"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_mention_button" android:visibility="gone" android:text="@string/mention" style="@style/UiKit_Material_Button"/>
+        <View android:id="@+id/item_invite_loading_button" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_height="36dp" android:layout_marginTop="8dp" android:text="@string/mention" style="@style/UiKit_ViewGroup"/>
     </FrameLayout>
     <FrameLayout android:id="@+id/item_invite_hub_layout" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_button_layout">
         <View android:background="?attr/colorBackgroundModifierAccent" android:layout_width="match_parent" android:layout_height="1dp"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/item_invite_hub_link" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hub_invite_another_school_link" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/item_invite_hub_link" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hub_invite_another_school_link" style="@style/UiKit_TextView"/>
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_mention_footer.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_mention_footer.xml
index 2f4d8ba035..365ec1a0dd 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_mention_footer.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_mention_footer.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="bottom" android:orientation="vertical" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <View android:id="@+id/chat_list_item_mention_footer_divider" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:textSize="13.75sp" android:textColor="?attr/colorTextMuted" android:gravity="center" android:id="@+id/chat_list_item_message_header_channel" android:paddingLeft="8dp" android:paddingTop="16dp" android:paddingRight="8dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:text="@string/no_recent_mentions" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <View android:id="@+id/chat_list_item_mention_footer_divider" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/UiKit_Divider"/>
+    <TextView android:textSize="13.75sp" android:textColor="?attr/colorTextMuted" android:gravity="center" android:id="@+id/chat_list_item_message_header_channel" android:paddingLeft="8dp" android:paddingTop="16dp" android:paddingRight="8dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:text="@string/no_recent_mentions" style="@style/UiKit_TextView_Semibold"/>
     <LinearLayout android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="198dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp">
         <View android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"/>
         <ImageView android:id="@+id/chat_list_item_mention_footer_hand" android:layout_width="wrap_content" android:layout_height="198dp" android:src="?attr/theme_chat_empty_mentions_hand"/>
         <View android:id="@+id/tile" android:background="?attr/theme_chat_empty_mentions_arm" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"/>
     </LinearLayout>
     <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginBottom="@dimen/chat_cell_horizontal_spacing_padding" android:transitionGroup="true" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp">
-        <LinearLayout android:padding="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textColor="@color/status_green_600" android:gravity="center" android:paddingLeft="8dp" android:paddingTop="16dp" android:paddingRight="8dp" android:layout_width="match_parent" android:text="@string/pinned_messages_pro_tip" android:singleLine="true" android:textAllCaps="true" style="@style/res_2131952579_uikit_textview_semibold"/>
-            <TextView android:textSize="13.75sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:text="@string/recent_mentions_pro_tip" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:padding="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textColor="@color/status_green_600" android:gravity="center" android:paddingLeft="8dp" android:paddingTop="16dp" android:paddingRight="8dp" android:layout_width="match_parent" android:text="@string/pinned_messages_pro_tip" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit_TextView_Semibold"/>
+            <TextView android:textSize="13.75sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:text="@string/recent_mentions_pro_tip" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_message_header.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_message_header.xml
index b0532c9db7..2f4e869ca6 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_message_header.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_message_header.xml
@@ -2,6 +2,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
     <Space android:id="@+id/chat_list_item_message_header_spacer" android:layout_width="match_parent" android:layout_height="@dimen/chat_cell_horizontal_spacing_padding"/>
     <View android:id="@+id/chat_list_item_message_header_divider" android:background="?attr/colorBackgroundModifierAccent" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_marginTop="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginBottom="@dimen/chat_cell_horizontal_spacing_padding" android:layout_below="@+id/chat_list_item_message_header_spacer" android:layout_alignWithParentIfMissing="true"/>
-    <TextView android:textSize="13.75sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_message_header_channel" android:singleLine="true" android:layout_below="@+id/chat_list_item_message_header_divider" android:layout_alignWithParentIfMissing="true" android:paddingStart="@dimen/chat_cell_horizontal_spacing_total" android:paddingEnd="0dp" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_item_message_header_guild" android:singleLine="true" android:layout_alignTop="@+id/chat_list_item_message_header_channel" android:layout_alignBottom="@+id/chat_list_item_message_header_channel" android:layout_alignWithParentIfMissing="true" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_total" android:layout_toEndOf="@+id/chat_list_item_message_header_channel" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="13.75sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_item_message_header_channel" android:singleLine="true" android:layout_below="@+id/chat_list_item_message_header_divider" android:layout_alignWithParentIfMissing="true" android:paddingStart="@dimen/chat_cell_horizontal_spacing_total" android:paddingEnd="0dp" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_item_message_header_guild" android:singleLine="true" android:layout_alignTop="@+id/chat_list_item_message_header_channel" android:layout_alignBottom="@+id/chat_list_item_message_header_channel" android:layout_alignWithParentIfMissing="true" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_total" android:layout_toEndOf="@+id/chat_list_item_message_header_channel" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_minimal.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_minimal.xml
index 01fba9c79a..37689bd588 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_minimal.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_minimal.xml
@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="wrap_content">
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:background="?attr/theme_chat_mentioned_me" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="@color/status_yellow_500" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text" android:layout_width="match_parent" android:layout_marginBottom="2dp" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text" android:layout_width="match_parent" android:layout_marginBottom="2dp" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_private_channel_start.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_private_channel_start.xml
index 74553236f1..bd3b54addb 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_private_channel_start.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_private_channel_start.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/private_channel_start_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="10dp" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:textAppearance="@style/res_2131952024_markdown_header1" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_private_channel_start_header" android:layout_width="match_parent" android:layout_marginTop="16dp" android:text="@string/unknown_user" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/private_channel_start_text" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:text="@string/system_dm_empty_message" style="@style/res_2131952563_uikit_textview"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/private_channel_start_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="10dp" style="@style/Avatar_Standard"/>
+    <TextView android:textAppearance="@style/Markdown_Header1" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_private_channel_start_header" android:layout_width="match_parent" android:layout_marginTop="16dp" android:text="@string/unknown_user" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/private_channel_start_text" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:text="@string/system_dm_empty_message" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_result_count.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_result_count.xml
index ee09ac1638..4b3f4af7bf 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_result_count.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_result_count.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_500" android:id="@+id/result_count" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:layout_width="match_parent" android:textAllCaps="true" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_500" android:id="@+id/result_count" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:layout_width="match_parent" android:textAllCaps="true" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView_Semibold"/>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_search_empty.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_search_empty.xml
index 16c625fae2..5cb9f7a732 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_search_empty.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_search_empty.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/chat_list_search_empty_image" style="@style/res_2131952576_uikit_textview_noresults"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/chat_list_search_empty_image" style="@style/UiKit_TextView_NoResults"/>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_search_error.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_search_error.xml
index f126477d94..a8a5dcb52d 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_search_error.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_search_error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:layout_marginRight="10dp">
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="?attr/theme_search_broken_results" android:layout_above="@+id/chat_list_search_error_text" android:layout_centerHorizontal="true"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_list_search_error_text" android:layout_marginTop="10dp" android:text="@string/search_error" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_list_search_error_text" android:layout_marginTop="10dp" android:text="@string/search_error" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_search_indexing.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_search_indexing.xml
index b634a91a7f..fb3c0ebc51 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_search_indexing.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_search_indexing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="10dp" android:layout_marginRight="10dp">
     <com.airbnb.lottie.LottieAnimationView android:id="@+id/chat_list_search_indexing_animation" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_above="@+id/chat_list_search_indexing_text" android:layout_centerHorizontal="true" app:lottie_autoPlay="true" app:lottie_fileName="?attr/theme_search_indexing_animation" app:lottie_loop="true"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_list_search_indexing_text" android:layout_marginTop="10dp" android:text="@string/search_guild_still_indexing" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorTextNormal" android:gravity="center" android:id="@+id/chat_list_search_indexing_text" android:layout_marginTop="10dp" android:text="@string/search_guild_still_indexing" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_single_line_message_preview.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_single_line_message_preview.xml
index 5b1331d8ba..ab8da65fd1 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_single_line_message_preview.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_single_line_message_preview.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="50dp">
-    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/report_message_top_guideline" app:layout_constraintGuide_begin="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_start_guideline" app:layout_constraintGuide_begin="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_end_guideline" app:layout_constraintGuide_end="16dp" style="@style/res_2131952421_uikit_guideline"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginEnd="4dp" app:layout_constraintStart_toStartOf="@+id/report_message_start_guideline" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/res_2131951677_avatar_small"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_chat_attachment_icon" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/res_2131952580_uikit_textview_singleline"/>
+    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/report_message_top_guideline" app:layout_constraintGuide_begin="16dp" style="@style/UiKit_Guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_start_guideline" app:layout_constraintGuide_begin="16dp" style="@style/UiKit_Guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/report_message_end_guideline" app:layout_constraintGuide_end="16dp" style="@style/UiKit_Guideline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginEnd="4dp" app:layout_constraintStart_toStartOf="@+id/report_message_start_guideline" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/Avatar_Small"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/UiKit_TextView_Semibold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/chat_list_adapter_item_text" android:layout_width="0dp" android:layout_height="18dp" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_chat_attachment_icon" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" style="@style/UiKit_TextView_SingleLine"/>
     <ImageView android:id="@+id/chat_list_adapter_item_chat_attachment_icon" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginTop="2dp" android:src="@drawable/ic_gallery_24dp" android:importantForAccessibility="no" app:layout_constraintEnd_toEndOf="@+id/report_message_end_guideline" app:layout_constraintTop_toTopOf="@+id/report_message_top_guideline" app:tint="?attr/colorInteractiveNormal"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_spotify_listen_together.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_spotify_listen_together.xml
index 94175d07f6..577b407544 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_spotify_listen_together.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_spotify_listen_together.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" android:layout_height="@dimen/chat_listen_embed_height" style="@style/res_2131952389_uikit_chat_embed_container">
-    <TextView android:id="@+id/item_listen_together_header" style="@style/res_2131952391_uikit_chat_embed_header"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" android:layout_height="@dimen/chat_listen_embed_height" style="@style/UiKit_Chat_Embed_Container">
+    <TextView android:id="@+id/item_listen_together_header" style="@style/UiKit_Chat_Embed_Header"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_listen_together_album_image" android:layout_width="42dp" android:layout_height="42dp" android:layout_marginTop="16dp" android:layout_marginBottom="4dp" android:layout_marginStart="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_listen_together_header" app:roundedCornerRadius="4dp"/>
-    <TextView android:id="@+id/item_listen_together_session_ended" android:visibility="gone" android:layout_margin="16dp" android:text="@string/invite_embed_listen_has_ended" app:layout_constrainedWidth="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_listen_together_header" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <TextView android:ellipsize="marquee" android:id="@+id/item_listen_together_track" android:layout_width="0dp" android:layout_marginTop="16dp" android:marqueeRepeatLimit="marquee_forever" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/item_listen_together_album_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/item_listen_together_album_image" app:layout_constraintTop_toBottomOf="@+id/item_listen_together_header" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <TextView android:id="@+id/item_listen_together_artist" android:layout_width="0dp" app:layout_constraintEnd_toEndOf="@+id/item_listen_together_track" app:layout_constraintLeft_toLeftOf="@+id/item_listen_together_track" app:layout_constraintRight_toRightOf="@+id/item_listen_together_track" app:layout_constraintStart_toStartOf="@+id/item_listen_together_track" app:layout_constraintTop_toBottomOf="@+id/item_listen_together_track" style="@style/res_2131952573_uikit_textview_marquee"/>
+    <TextView android:id="@+id/item_listen_together_session_ended" android:visibility="gone" android:layout_margin="16dp" android:text="@string/invite_embed_listen_has_ended" app:layout_constrainedWidth="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_listen_together_header" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <TextView android:ellipsize="marquee" android:id="@+id/item_listen_together_track" android:layout_width="0dp" android:layout_marginTop="16dp" android:marqueeRepeatLimit="marquee_forever" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/item_listen_together_album_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/item_listen_together_album_image" app:layout_constraintTop_toBottomOf="@+id/item_listen_together_header" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <TextView android:id="@+id/item_listen_together_artist" android:layout_width="0dp" app:layout_constraintEnd_toEndOf="@+id/item_listen_together_track" app:layout_constraintLeft_toLeftOf="@+id/item_listen_together_track" app:layout_constraintRight_toRightOf="@+id/item_listen_together_track" app:layout_constraintStart_toStartOf="@+id/item_listen_together_track" app:layout_constraintTop_toBottomOf="@+id/item_listen_together_track" style="@style/UiKit_TextView_Marquee"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="item_listen_together_album_image,item_listen_together_artist"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/item_listen_together_recycler" android:layout_width="0dp" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/item_listen_together_join" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/item_listen_together_join" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
-    <TextView android:id="@+id/item_listen_together_join" android:text="@string/invite_embed_join_via_desktop_app" style="@style/res_2131952390_uikit_chat_embed_footer"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/item_listen_together_recycler" android:layout_width="0dp" android:layout_height="@dimen/avatar_size_standard" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/item_listen_together_join" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/item_listen_together_join" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
+    <TextView android:id="@+id/item_listen_together_join" android:text="@string/invite_embed_join_via_desktop_app" style="@style/UiKit_Chat_Embed_Footer"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_stage_invite.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_stage_invite.xml
index 556213966c..ba6102a82f 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_stage_invite.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_stage_invite.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/res_2131952389_uikit_chat_embed_container">
-    <TextView android:textColor="?attr/colorStatusPositiveBackground" android:id="@+id/item_invite_header" android:layout_marginBottom="8dp" android:text="@string/stage_channel_live_now" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/stage_channel_live_dot" app:drawableTint="?attr/colorStatusPositiveBackground" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952391_uikit_chat_embed_header"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/item_listen_together_container" style="@style/UiKit_Chat_Embed_Container">
+    <TextView android:textColor="?attr/colorStatusPositiveBackground" android:id="@+id/item_invite_header" android:layout_marginBottom="8dp" android:text="@string/stage_channel_live_now" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/stage_channel_live_dot" app:drawableTint="?attr/colorStatusPositiveBackground" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Embed_Header"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_invite_image" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="12dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" app:roundWithOverlayColor="?attr/primary_630" app:roundedCornerRadius="4dp"/>
-    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="12dp" android:maxLines="1" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_invite_guild_name" android:layout_width="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toStartOf="@+id/item_listeners_count" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/res_2131952573_uikit_textview_marquee"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorInteractiveNormal" android:gravity="center_vertical" android:id="@+id/item_listeners_count" android:background="@drawable/drawable_pill_background_tertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:drawablePadding="5dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_headset_10dp" app:drawableTint="?attr/colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/item_invite_channel_topic" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_guild_name" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginTop="12dp" android:maxLines="1" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/item_invite_guild_name" android:layout_width="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toStartOf="@+id/item_listeners_count" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/UiKit_TextView_Marquee"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorInteractiveNormal" android:gravity="center_vertical" android:id="@+id/item_listeners_count" android:background="@drawable/drawable_pill_background_tertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:drawablePadding="5dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_headset_10dp" app:drawableTint="?attr/colorInteractiveNormal" app:layout_constraintBottom_toBottomOf="@+id/item_invite_image" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/item_invite_image" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="16sp" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/item_invite_channel_topic" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_guild_name" style="@style/UiKit_TextView_Semibold"/>
     <com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView android:id="@+id/stage_discovery_speakers_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="4dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_channel_topic"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:layout_margin="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_speakers_view" app:layout_goneMarginTop="8dp" style="@style/res_2131952460_uikit_material_button_green"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:layout_margin="16dp" android:text="@string/stage_channel_join_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_discovery_speakers_view" app:layout_goneMarginTop="8dp" style="@style/UiKit_Material_Button_Green"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_start.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_start.xml
index 146c7f09eb..42d8a0c7d4 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_start.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_start.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
     <ImageView android:id="@+id/chat_list_adapter_thread_header_icon" android:background="@drawable/drawable_circle_black" android:padding="16dp" android:visibility="gone" android:layout_width="64dp" android:layout_height="64dp" android:layout_marginTop="76dp" android:layout_marginBottom="24dp" android:src="@drawable/ic_thread" android:contentDescription="@string/thread" android:backgroundTint="?attr/colorBackgroundAccent" app:tint="?attr/colorHeaderPrimary"/>
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_header" android:layout_marginBottom="8dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/chat_list_adapter_item_subheader1" android:visibility="gone" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/chat_list_adapter_item_subheader2" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextLink" android:id="@+id/chat_list_adapter_item_edit_channel" android:focusable="true" android:clickable="true" android:layout_marginTop="8dp" android:text="@string/edit_channel" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_header" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/chat_list_adapter_item_subheader1" android:visibility="gone" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/chat_list_adapter_item_subheader2" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextLink" android:id="@+id/chat_list_adapter_item_edit_channel" android:focusable="true" android:clickable="true" android:layout_marginTop="8dp" android:text="@string/edit_channel" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_sticker.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_sticker.xml
index 48c96afcdf..168b31c606 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_sticker.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_sticker.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/res_2131952388_uikit_chat_embed_cardview">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" style="@style/UiKit_Chat_Embed_CardView">
     <com.discord.views.sticker.StickerView android:id="@+id/chat_list_adapter_item_sticker" android:layout_width="@dimen/sticker_length" android:layout_height="@dimen/sticker_length"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet.xml
index 788297f676..df89f6d441 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.discord.views.sticker.StickerView android:id="@+id/chat_list_adapter_item_sticker_greet" android:layout_width="@dimen/sticker_length" android:layout_height="@dimen/sticker_length"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/send_sticker_greet_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952458_uikit_material_button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/send_sticker_greet_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet_compact.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet_compact.xml
index 75dfaad39f..2c7294159d 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet_compact.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_sticker_greet_compact.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
     <LinearLayout android:gravity="center" android:orientation="horizontal" android:id="@+id/send_sticker_greet_button" android:background="@drawable/bg_chat_sticker_greet_button" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="8dp" android:paddingEnd="12dp" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
         <com.discord.views.sticker.StickerView android:id="@+id/chat_list_adapter_item_sticker_greet" android:layout_width="@dimen/sticker_length_sm" android:layout_height="@dimen/sticker_length_sm"/>
-        <TextView android:id="@+id/chat_list_adapter_item_sticker_greet_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952567_uikit_textview_h2"/>
+        <TextView android:id="@+id/chat_list_adapter_item_sticker_greet_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_H2"/>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_system.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_system.xml
index d21637dca6..a7c991690f 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_system.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_system.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_margin">
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/res_2131952393_uikit_chat_guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" style="@style/UiKit_Chat_Guideline"/>
     <ImageView android:id="@+id/system_icon" android:layout_width="@dimen/avatar_size_small" android:layout_height="@dimen/avatar_size_small" android:layout_marginTop="3dp" android:importantForAccessibility="no" android:layout_marginStart="18dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <LinearLayout android:orientation="vertical" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
-        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorTextNormal" android:id="@+id/system_text" android:layout_width="match_parent" android:lineSpacingMultiplier="1" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/system_timestamp" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:text="@string/sample_time_pm" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorTextNormal" android:id="@+id/system_text" android:layout_width="match_parent" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/system_timestamp" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:text="@string/sample_time_pm" android:singleLine="true" style="@style/UiKit_TextView"/>
         <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/system_welcome_cta_button" android:background="@drawable/system_cta_bg" android:paddingLeft="12dp" android:paddingTop="4dp" android:paddingRight="12dp" android:paddingBottom="4dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:foreground="?attr/selectableItemBackgroundBorderless">
             <com.discord.views.sticker.StickerView android:id="@+id/system_welecome_cta_button_sticker" android:layout_width="32dp" android:layout_height="32dp"/>
-            <TextView android:textColor="@color/white" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/welcome_cta_label" android:layout_marginStart="4dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <TextView android:textColor="@color/white" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/welcome_cta_label" android:layout_marginStart="4dp" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
     </LinearLayout>
     <androidx.appcompat.widget.AppCompatImageView android:id="@+id/chat_list_adapter_item_thread_embed_spine" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginTop="4dp" android:src="@drawable/thread_embed_spine_drawable" android:layout_marginStart="@dimen/chat_list_spine_margin" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/system_icon"/>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_text.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_text.xml
index 0e994b4e99..c25e2dfa4c 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_text.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_text.xml
@@ -5,7 +5,7 @@
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="?attr/color_brand" android:visibility="gone" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_highlighted_bg"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/thread_starter_message_header" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
         <ImageView android:id="@+id/thread_starter_message_header_icon" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_channel_text" android:contentDescription="@string/channel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/thread_starter_message_header_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/thread_starter_message_original_message" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/thread_starter_message_header_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/thread_starter_message_header_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/thread_starter_message_original_message" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/thread_starter_message_header_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <FrameLayout android:id="@+id/chat_list_adapter_item_text_decorator_reply_link_icon" android:clipChildren="false" android:layout_width="32dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_decorator" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_decorator" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_decorator">
         <com.discord.widgets.chat.list.ViewReplySpline android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="7dp" app:end_padding="2dp" app:tint="?attr/colorBackgroundAccent"/>
@@ -13,21 +13,21 @@
     <androidx.appcompat.widget.AppCompatImageView android:id="@+id/chat_list_adapter_item_thread_embed_spine" android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginTop="4dp" android:src="@drawable/thread_embed_spine_drawable" android:layout_marginStart="@dimen/chat_list_spine_margin" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_avatar"/>
     <FrameLayout android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_decorator" android:visibility="gone" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:minHeight="18dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintBottom_toTopOf="@+id/chat_list_adapter_item_text_avatar" app:layout_constraintLeft_toLeftOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_starter_message_header">
         <LinearLayout android:id="@+id/chat_list_adapter_item_reply_leading_views" android:layout_width="wrap_content" android:layout_height="wrap_content">
-            <ImageView android:id="@+id/chat_list_adapter_item_text_decorator_reply_icon" android:background="@drawable/drawable_circle_black" android:padding="2dp" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_reply_24dp" android:contentDescription="@null" android:layout_marginEnd="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:layout_marginEnd="4dp" style="@style/res_2131951672_avatar_chat"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="4dp" style="@style/res_2131952563_uikit_textview"/>
+            <ImageView android:id="@+id/chat_list_adapter_item_text_decorator_reply_icon" android:background="@drawable/drawable_circle_black" android:padding="2dp" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_reply_24dp" android:contentDescription="@null" android:layout_marginEnd="4dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:layout_marginEnd="4dp" style="@style/Avatar_Chat"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="4dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_reply_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:alpha="0.64" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/chat_list_adapter_item_text_reply_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:alpha="0.64" style="@style/UiKit_TextView"/>
     </FrameLayout>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_decorator" style="@style/res_2131952393_uikit_chat_guideline"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_header" style="@style/res_2131951672_avatar_chat"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_decorator" style="@style/UiKit_Chat_Guideline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_list_adapter_item_text_avatar" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_header" style="@style/Avatar_Chat"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/chat_list_adapter_item_text_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toRightOf="@+id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_avatar">
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="wrap_content" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@+id/chat_list_adapter_item_text_tag" android:background="@drawable/drawable_button_brand_neutral" android:paddingLeft="3dp" android:paddingTop="0.5dp" android:paddingRight="3dp" android:paddingBottom="0.5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:text="TAG" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_tag" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_list_adapter_item_text_name" android:layout_width="wrap_content" android:lineSpacingMultiplier="1" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_tag" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
+        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@+id/chat_list_adapter_item_text_tag" android:background="@drawable/drawable_button_brand_neutral" android:paddingLeft="3dp" android:paddingTop="0.5dp" android:paddingRight="3dp" android:paddingBottom="0.5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:text="TAG" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@+id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_name" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:gravity="center_vertical" android:id="@+id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="1dp" android:maxWidth="150dp" android:singleLine="true" android:layout_marginStart="6dp" app:layout_constraintBaseline_toBaselineOf="@+id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/chat_list_adapter_item_text_tag" style="@style/UiKit_TextView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_adapter_item_text" android:visibility="visible" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_header" style="@style/res_2131952394_uikit_chat_text"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/chat_list_adapter_item_text" android:visibility="visible" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text_header" style="@style/UiKit_Chat_Text"/>
     <com.discord.views.typing.TypingDots android:id="@+id/chat_overlay_typing_dots" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="24dp" android:layout_height="match_parent" android:alpha="0.7" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text"/>
     <ImageView android:id="@+id/chat_list_adapter_item_text_error" android:visibility="gone" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_alert_circle_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/chat_list_adapter_item_text_loading" app:layout_constraintStart_toEndOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_text_loading" app:tint="?attr/colorError"/>
-    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_adapter_item_text_loading" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginStart="28dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text" style="@style/res_2131952394_uikit_chat_text"/>
+    <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/chat_list_adapter_item_text_loading" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" android:layout_marginStart="28dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="@+id/chat_list_adapter_item_text_header" app:layout_constraintTop_toBottomOf="@+id/chat_list_adapter_item_text" style="@style/UiKit_Chat_Text"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_text_divider.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_text_divider.xml
index 28e12bf145..4966bbc369 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_text_divider.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_text_divider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_total" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_total" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="match_parent" android:layout_height="wrap_content">
     <View android:id="@+id/divider_stroke_left" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_centerInParent="true" android:layout_toStartOf="@+id/divider_text"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center" android:id="@+id/divider_text" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_centerInParent="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center" android:id="@+id/divider_text" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_centerInParent="true" style="@style/UiKit_TextView_Semibold"/>
     <View android:id="@+id/divider_stroke_right" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_centerInParent="true" android:layout_toEndOf="@+id/divider_text"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_thread_draft_form.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_thread_draft_form.xml
index 8d278135b3..67120ae11c 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_thread_draft_form.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_thread_draft_form.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:paddingTop="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952388_uikit_chat_embed_cardview">
-    <ImageView android:id="@+id/thread_icon" android:background="@drawable/drawable_circle_black" android:padding="16dp" android:layout_width="64dp" android:layout_height="64dp" android:src="@drawable/ic_thread" android:contentDescription="@string/thread" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary" style="@style/res_2131951677_avatar_small"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/thread_name_input" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:hint="@string/thread_name" android:imeOptions="actionNext" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:paddingTop="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_Chat_Embed_CardView">
+    <ImageView android:id="@+id/thread_icon" android:background="@drawable/drawable_circle_black" android:padding="16dp" android:layout_width="64dp" android:layout_height="64dp" android:src="@drawable/ic_thread" android:contentDescription="@string/thread" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorHeaderPrimary" style="@style/Avatar_Small"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/thread_name_input" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:hint="@string/thread_name" android:imeOptions="actionNext" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
     </com.google.android.material.textfield.TextInputLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/private_thread_toggle" android:background="@drawable/rounded_rectangle_4dp_radius" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:backgroundTint="?attr/colorBackgroundSecondary">
-        <LinearLayout android:id="@+id/private_thread_toggle_text" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/private_thread_toggle_switch" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginBottom="2dp" android:text="@string/private_thread" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:id="@+id/private_thread_toggle_badge" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_height="wrap_content" android:text="@string/guild_settings_premium_guild_unlocked" android:drawablePadding="4dp" android:textAllCaps="true" android:layout_marginStart="4dp" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <LinearLayout android:id="@+id/private_thread_toggle_text" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/private_thread_toggle_switch" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginBottom="2dp" android:text="@string/private_thread" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:id="@+id/private_thread_toggle_badge" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_height="wrap_content" android:text="@string/guild_settings_premium_guild_unlocked" android:drawablePadding="4dp" android:textAllCaps="true" android:layout_marginStart="4dp" android:backgroundTint="?attr/colorBackgroundSecondaryAlt" app:drawableStartCompat="@drawable/ic_boosted_badge_12dp" style="@style/UiKit_TextView_Semibold"/>
             </LinearLayout>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:text="@string/form_private_thread_description" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:text="@string/form_private_thread_description" style="@style/UiKit_TextView"/>
         </LinearLayout>
         <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/private_thread_toggle_switch" android:clickable="false" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/private_thread_toggle_text" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <TextView android:text="@string/create_thread_header_1" style="@style/res_2131952570_uikit_textview_large"/>
-    <TextView android:id="@+id/auto_archive_duration" android:text="@string/create_thread_header_2" style="@style/res_2131952570_uikit_textview_large"/>
+    <TextView android:text="@string/create_thread_header_1" style="@style/UiKit_TextView_Large"/>
+    <TextView android:id="@+id/auto_archive_duration" android:text="@string/create_thread_header_2" style="@style/UiKit_TextView_Large"/>
     <View android:id="@+id/divider_stroke" android:background="?attr/colorBackgroundAccent" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_marginTop="16dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_thread_embed.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_thread_embed.xml
index b7bd0f8573..45edc67a4a 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_thread_embed.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_thread_embed.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/thread_embed_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/thread_embed_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
     <View android:id="@+id/chat_list_adapter_item_highlighted_bg" android:background="?attr/theme_chat_mentioned_me" android:visibility="gone" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <View android:id="@+id/chat_list_adapter_item_gutter_bg" android:background="@color/status_yellow_500" android:visibility="gone" android:layout_width="2dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/chat_list_adapter_item_highlighted_bg"/>
-    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="0" style="@style/res_2131952393_uikit_chat_guideline"/>
+    <androidx.constraintlayout.widget.Guideline android:id="@+id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="0" style="@style/UiKit_Chat_Guideline"/>
     <com.discord.widgets.chat.list.ViewReplySpline android:id="@+id/thread_embed_spine" android:layout_width="32dp" android:layout_height="0dp" android:layout_marginStart="@dimen/chat_list_spine_margin" app:cap_style="1" app:end_padding="2dp" app:layout_constraintBottom_toTopOf="@+id/thread_embed_message_center_guideline" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:orientation="vertical" app:tint="?attr/colorBackgroundAccent"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/thread_embed_selectable_background" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="@dimen/chat_cell_horizontal_spacing_padding" android:foreground="?attr/bg_pressed_highlight" android:paddingStart="12dp" android:paddingEnd="12dp" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" android:backgroundTint="?attr/colorBackgroundSecondary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="@+id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/thread_embed_name" android:layout_width="0dp" android:layout_height="wrap_content" android:singleLine="true" app:layout_constraintEnd_toStartOf="@+id/thread_embed_messages_count" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textColor="?attr/colorTextLink" android:id="@+id/thread_embed_messages_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginEnd="4dp" app:layout_constraintEnd_toStartOf="@+id/thread_embed_messages_count_chevron" app:layout_constraintStart_toEndOf="@+id/thread_embed_name" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:id="@+id/thread_embed_name" android:layout_width="0dp" android:layout_height="wrap_content" android:singleLine="true" app:layout_constraintEnd_toStartOf="@+id/thread_embed_messages_count" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textColor="?attr/colorTextLink" android:id="@+id/thread_embed_messages_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginEnd="4dp" app:layout_constraintEnd_toStartOf="@+id/thread_embed_messages_count_chevron" app:layout_constraintStart_toEndOf="@+id/thread_embed_name" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
         <ImageView android:id="@+id/thread_embed_messages_count_chevron" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_chevron" app:layout_constraintBottom_toBottomOf="@+id/thread_embed_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/thread_embed_name"/>
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/thread_embed_most_recent_message_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_embed_name">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/thread_embed_most_recent_message_avatar" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951677_avatar_small"/>
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:id="@+id/thread_embed_most_recent_message_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:paddingStart="0dp" android:paddingEnd="4dp" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/thread_embed_most_recent_message_avatar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952394_uikit_chat_text"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/thread_embed_most_recent_message_avatar" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Small"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:id="@+id/thread_embed_most_recent_message_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:paddingStart="0dp" android:paddingEnd="4dp" android:layout_marginStart="4dp" app:layout_constraintStart_toEndOf="@+id/thread_embed_most_recent_message_avatar" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Chat_Text"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/thread_embed_most_recent_message_content" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" app:layout_constraintEnd_toStartOf="@+id/thread_embed_icon" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/thread_embed_most_recent_message_header" app:layout_constraintWidth_default="1" style="@style/res_2131952394_uikit_chat_text"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/thread_embed_most_recent_message_content" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" app:layout_constraintEnd_toStartOf="@+id/thread_embed_icon" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/thread_embed_most_recent_message_header" app:layout_constraintWidth_default="1" style="@style/UiKit_Chat_Text"/>
         <ImageView android:id="@+id/thread_embed_icon" android:visibility="gone" android:layout_width="16dp" android:layout_height="16dp" android:src="?attr/ic_flex_input_image" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/thread_embed_most_recent_message_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_embed_most_recent_message_content" app:layout_constraintTop_toTopOf="@+id/thread_embed_most_recent_message_content"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <View android:id="@+id/thread_embed_message_center_guideline" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@+id/thread_embed_selectable_background" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/thread_embed_selectable_background"/>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_upload_progress.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_upload_progress.xml
index c0ff06a82c..68ca43a4d1 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_upload_progress.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_upload_progress.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" style="@style/res_2131952389_uikit_chat_embed_container">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0.05" android:layout_marginEnd="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" style="@style/UiKit_Chat_Embed_Container">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0.05" android:layout_marginEnd="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.UploadProgressView android:id="@+id/upload_progress_1" android:layout_width="match_parent" android:layout_height="wrap_content"/>
         <com.discord.views.UploadProgressView android:id="@+id/upload_progress_2" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
         <com.discord.views.UploadProgressView android:id="@+id/upload_progress_3" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/widget_chat_list_bot_ui_button_component.xml b/app/src/main/res/layout/widget_chat_list_bot_ui_button_component.xml
index c10957e715..5cf8398a3b 100644
--- a/app/src/main/res/layout/widget_chat_list_bot_ui_button_component.xml
+++ b/app/src/main/res/layout/widget_chat_list_bot_ui_button_component.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.discord.widgets.botuikit.views.ButtonComponentView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <com.google.android.material.button.MaterialButton android:id="@+id/button" android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="36dp" android:insetLeft="0dp" android:insetRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/button" android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="36dp" android:insetLeft="0dp" android:insetRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button_Secondary"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/emoji" android:visibility="visible" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginStart="16dp" android:elevation="12dp" app:actualImageScaleType="2" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textColor="@color/white" android:ellipsize="end" android:id="@+id/label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:elevation="12dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/link_icon" app:layout_constraintStart_toEndOf="@+id/emoji" app:layout_constraintTop_toTopOf="0"/>
+    <com.google.android.material.textview.MaterialTextView android:textAppearance="@style/UiKit_TextAppearance_Button" android:textColor="@color/white" android:ellipsize="end" android:id="@+id/label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:elevation="12dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/link_icon" app:layout_constraintStart_toEndOf="@+id/emoji" app:layout_constraintTop_toTopOf="0"/>
     <androidx.appcompat.widget.AppCompatImageView android:id="@+id/link_icon" android:visibility="visible" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_launch_24dp" android:layout_marginEnd="16dp" android:elevation="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/label" app:layout_constraintTop_toTopOf="0"/>
     <com.discord.views.typing.TypingDots android:id="@+id/loading_dots" android:layout_width="24dp" android:layout_height="wrap_content" android:elevation="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
 </com.discord.widgets.botuikit.views.ButtonComponentView>
diff --git a/app/src/main/res/layout/widget_chat_list_bot_ui_select_component.xml b/app/src/main/res/layout/widget_chat_list_bot_ui_select_component.xml
index 59c9edfc55..1e70f0d771 100644
--- a/app/src/main/res/layout/widget_chat_list_bot_ui_select_component.xml
+++ b/app/src/main/res/layout/widget_chat_list_bot_ui_select_component.xml
@@ -2,7 +2,7 @@
 <com.discord.widgets.botuikit.views.select.SelectComponentView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/bg_bot_ui_component_select" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:foreground="@drawable/ripple_selector_rounded" android:maxWidth="300dp" android:minHeight="40dp">
     <com.google.android.flexbox.FlexboxLayout android:id="@+id/select_component_selections_root" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginEnd="8dp" app:dividerDrawable="@drawable/bot_ui_component_divider_drawable" app:flexWrap="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/select_component_chevron" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:showDivider="2"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/select_component_selection_icon" android:visibility="gone" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginEnd="8dp" app:actualImageScaleType="2" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/select_component_selection_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorInteractiveNormal" android:ellipsize="end" android:gravity="start" android:id="@+id/select_component_selection_text" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/select_component_loading" app:layout_constraintStart_toEndOf="@+id/select_component_selection_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+    <com.google.android.material.textview.MaterialTextView android:textColor="?attr/colorInteractiveNormal" android:ellipsize="end" android:gravity="start" android:id="@+id/select_component_selection_text" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/select_component_loading" app:layout_constraintStart_toEndOf="@+id/select_component_selection_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
     <ImageView android:id="@+id/select_component_chevron" android:layout_width="8dp" android:layout_height="12dp" android:src="@drawable/ic_chevron" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal"/>
     <com.discord.views.typing.TypingDots android:id="@+id/select_component_loading" android:layout_width="24dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
 </com.discord.widgets.botuikit.views.select.SelectComponentView>
diff --git a/app/src/main/res/layout/widget_chat_list_bot_ui_select_component_pill.xml b/app/src/main/res/layout/widget_chat_list_bot_ui_select_component_pill.xml
index b148e07c6f..ed9dfcc44b 100644
--- a/app/src/main/res/layout/widget_chat_list_bot_ui_select_component_pill.xml
+++ b/app/src/main/res/layout/widget_chat_list_bot_ui_select_component_pill.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android" android:ellipsize="end" android:background="@drawable/bg_bot_ui_component_select_pill" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" style="@style/res_2131952563_uikit_textview"/>
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android" android:ellipsize="end" android:background="@drawable/bg_bot_ui_component_select_pill" android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" style="@style/UiKit_TextView"/>
diff --git a/app/src/main/res/layout/widget_chat_overlay.xml b/app/src/main/res/layout/widget_chat_overlay.xml
index 40fcfa1180..631be3f956 100644
--- a/app/src/main/res/layout/widget_chat_overlay.xml
+++ b/app/src/main/res/layout/widget_chat_overlay.xml
@@ -2,10 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true">
     <include android:id="@+id/stickers_suggestions" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="60dp" app:layout_constraintBottom_toTopOf="@+id/chat_overlay_typing" app:layout_constraintRight_toRightOf="0" layout="@layout/widget_chat_input_sticker_suggestions"/>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/chat_overlay_old_messages_fab" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" android:src="@drawable/ic_arrow_down" android:contentDescription="@string/jump_to_present" android:backgroundTint="?attr/colorBackgroundTertiary" app:borderWidth="0dp" app:fabSize="1" app:layout_constraintBottom_toTopOf="@+id/chat_overlay_typing" app:layout_constraintRight_toRightOf="0" app:tint="?attr/colorInteractiveNormal"/>
-    <RelativeLayout android:gravity="center_vertical" android:id="@+id/chat_overlay_typing" android:background="?attr/primary_630" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/uikit_typing_indicator_height" android:paddingStart="8dp" android:paddingEnd="8dp" app:layout_constraintBottom_toBottomOf="0" style="@style/res_2131952589_uikit_viewgroup">
+    <RelativeLayout android:gravity="center_vertical" android:id="@+id/chat_overlay_typing" android:background="?attr/primary_630" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/uikit_typing_indicator_height" android:paddingStart="8dp" android:paddingEnd="8dp" app:layout_constraintBottom_toBottomOf="0" style="@style/UiKit_ViewGroup">
         <com.discord.views.typing.TypingDots android:id="@+id/chat_overlay_typing_dots" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="match_parent"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/chat_typing_users_typing" android:layout_width="wrap_content" android:layout_height="@dimen/uikit_typing_indicator_height" android:maxLines="1" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/chat_overlay_typing_dots" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/chat_typing_users_slowmode" android:layout_width="wrap_content" android:layout_height="@dimen/uikit_typing_indicator_height" android:maxLines="1" android:layout_toStartOf="@+id/chat_typing_users_slowmode_icon" android:layout_toEndOf="@+id/chat_typing_users_typing" style="@style/res_2131952563_uikit_textview"/>
-        <ImageView android:id="@+id/chat_typing_users_slowmode_icon" android:src="?attr/ic_slowmode_timer" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="4dp" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="center_vertical" android:id="@+id/chat_typing_users_typing" android:layout_width="wrap_content" android:layout_height="@dimen/uikit_typing_indicator_height" android:maxLines="1" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/chat_overlay_typing_dots" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/chat_typing_users_slowmode" android:layout_width="wrap_content" android:layout_height="@dimen/uikit_typing_indicator_height" android:maxLines="1" android:layout_toStartOf="@+id/chat_typing_users_slowmode_icon" android:layout_toEndOf="@+id/chat_typing_users_typing" style="@style/UiKit_TextView"/>
+        <ImageView android:id="@+id/chat_typing_users_slowmode_icon" android:src="?attr/ic_slowmode_timer" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="4dp" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_chat_status.xml b/app/src/main/res/layout/widget_chat_status.xml
index 4e3a74c1e9..aceb55388a 100644
--- a/app/src/main/res/layout/widget_chat_status.xml
+++ b/app/src/main/res/layout/widget_chat_status.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:id="@+id/chat_status_unread_messages" android:background="?attr/color_brand_500" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="gone" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:gravity="center_vertical" android:id="@+id/chat_status_unread_messages_text" android:layout_width="0dp" android:layout_weight="1" android:lineSpacingMultiplier="1" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <ImageView android:gravity="center_vertical" android:id="@+id/chat_status_unread_messages_mark" android:layout_height="wrap_content" android:src="@drawable/ic_close_white_18dp" android:scaleType="center" android:contentDescription="@string/mark_as_read" android:paddingStart="16dp" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:id="@+id/chat_status_unread_messages" android:background="?attr/color_brand_500" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="gone" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:gravity="center_vertical" android:id="@+id/chat_status_unread_messages_text" android:layout_width="0dp" android:layout_weight="1" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Semibold"/>
+    <ImageView android:gravity="center_vertical" android:id="@+id/chat_status_unread_messages_mark" android:layout_height="wrap_content" android:src="@drawable/ic_close_white_18dp" android:scaleType="center" android:contentDescription="@string/mark_as_read" android:paddingStart="16dp" style="@style/UiKit_ImageView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_choose_plan.xml b/app/src/main/res/layout/widget_choose_plan.xml
index 0763617c1c..b9eb30c307 100644
--- a/app/src/main/res/layout/widget_choose_plan.xml
+++ b/app/src/main/res/layout/widget_choose_plan.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:background="?attr/colorBackgroundSecondary" app:navigationIcon="?attr/ic_action_bar_back" app:title="@string/premium_choose_plan_title" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:background="?attr/colorBackgroundSecondary" app:navigationIcon="?attr/ic_action_bar_back" app:title="@string/premium_choose_plan_title" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:layout_height="match_parent" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/choose_plan_recycler" android:background="?attr/colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <LinearLayout android:gravity="center" android:id="@+id/choose_plan_empty_container" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_height="90dp" android:layout_marginBottom="16dp" android:src="@drawable/img_clyde_empty" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_marginBottom="8dp" android:text="@string/premium_no_plans_header" android:textAlignment="center" style="@style/res_2131952565_uikit_textview_h1"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_300" android:id="@+id/choose_plan_empty_description" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
+    <com.discord.app.AppViewFlipper android:layout_height="match_parent" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/choose_plan_recycler" android:background="?attr/colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <LinearLayout android:gravity="center" android:id="@+id/choose_plan_empty_container" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_height="90dp" android:layout_marginBottom="16dp" android:src="@drawable/img_clyde_empty" style="@style/UiKit_ImageView"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:layout_marginBottom="8dp" android:text="@string/premium_no_plans_header" android:textAlignment="center" style="@style/UiKit_TextView_H1"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_300" android:id="@+id/choose_plan_empty_description" android:lineSpacingMultiplier="1" android:textAlignment="center" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_choose_plan_adapter_divider_item.xml b/app/src/main/res/layout/widget_choose_plan_adapter_divider_item.xml
index 1625db9a0b..a097382a18 100644
--- a/app/src/main/res/layout/widget_choose_plan_adapter_divider_item.xml
+++ b/app/src/main/res/layout/widget_choose_plan_adapter_divider_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952416_uikit_divider"/>
+<View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_Divider"/>
diff --git a/app/src/main/res/layout/widget_choose_plan_adapter_header_item.xml b/app/src/main/res/layout/widget_choose_plan_adapter_header_item.xml
index 5a905b985a..80d23628ec 100644
--- a/app/src/main/res/layout/widget_choose_plan_adapter_header_item.xml
+++ b/app/src/main/res/layout/widget_choose_plan_adapter_header_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/select_subscription_header_text" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:singleLine="true" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/select_subscription_header_text" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_choose_plan_adapter_plan_item.xml b/app/src/main/res/layout/widget_choose_plan_adapter_plan_item.xml
index e4961dc19c..728e6393e4 100644
--- a/app/src/main/res/layout/widget_choose_plan_adapter_plan_item.xml
+++ b/app/src/main/res/layout/widget_choose_plan_adapter_plan_item.xml
@@ -2,13 +2,13 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/plan_item_container" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:minHeight="56dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
     <ImageView android:id="@+id/plan_item_border" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent"/>
     <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="1dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:cardForegroundColor="#00000000">
-        <LinearLayout android:gravity="center_vertical" android:layout_gravity="center_vertical" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <ImageView android:id="@+id/plan_item_icon" android:paddingRight="8dp" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_plan_premium_and_premium_guild_13" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout android:gravity="center_vertical" android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/plan_item_name" style="@style/res_2131952579_uikit_textview_semibold"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/plan_item_current_plan" android:text="@string/premium_current_active_subscription" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:gravity="center_vertical" android:layout_gravity="center_vertical" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <ImageView android:id="@+id/plan_item_icon" android:paddingRight="8dp" android:layout_width="32dp" android:layout_height="32dp" android:src="@drawable/ic_plan_premium_and_premium_guild_13" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <LinearLayout android:gravity="center_vertical" android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/plan_item_name" style="@style/UiKit_TextView_Semibold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/plan_item_current_plan" android:text="@string/premium_current_active_subscription" style="@style/UiKit_TextView"/>
             </LinearLayout>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/plan_item_price" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/plan_item_price" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/widget_claim_outbound_promo.xml b/app/src/main/res/layout/widget_claim_outbound_promo.xml
index 48e76daf4c..5e421d91be 100644
--- a/app/src/main/res/layout/widget_claim_outbound_promo.xml
+++ b/app/src/main/res/layout/widget_claim_outbound_promo.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
     <com.discord.app.AppViewFlipper android:id="@+id/claimPromoFlipper" android:paddingTop="32dp" android:paddingBottom="32dp" android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="24dp" android:paddingEnd="24dp">
         <FrameLayout android:id="@+id/claimPromoLoading" android:layout_width="match_parent" android:layout_height="match_parent">
             <ProgressBar android:layout_gravity="center" android:padding="32dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
         </FrameLayout>
         <androidx.appcompat.widget.LinearLayoutCompat android:gravity="center_horizontal" android:orientation="vertical" android:id="@+id/claimPromoSuccess" android:layout_width="match_parent" android:layout_height="wrap_content">
             <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:importantForAccessibility="no" app:srcCompat="@drawable/claim_promo_success"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/outbound_promotion_redemption_modal_title" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_horizontal" android:id="@+id/claimPromoBody" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp" android:lineSpacingMultiplier="1" style="@style/res_2131952574_uikit_textview_medium"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/outbound_promotion_redemption_modal_title" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_horizontal" android:id="@+id/claimPromoBody" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Medium"/>
             <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="32dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:contentPadding="12dp">
                 <androidx.appcompat.widget.LinearLayoutCompat android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/redemption_code" style="@style/res_2131952579_uikit_textview_semibold"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/redemption_code" style="@style/UiKit_TextView_Semibold"/>
                     <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/claimPromoCodeBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp">
                         <FrameLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1">
                             <HorizontalScrollView android:scrollbars="none" android:layout_width="match_parent" android:layout_height="wrap_content">
-                                <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/claimPromoCode" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:textIsSelectable="true" android:paddingStart="8dp" android:paddingEnd="8dp" style="@style/res_2131952574_uikit_textview_medium"/>
+                                <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/claimPromoCode" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:textIsSelectable="true" android:paddingStart="8dp" android:paddingEnd="8dp" style="@style/UiKit_TextView_Medium"/>
                             </HorizontalScrollView>
                             <ImageView android:layout_gravity="end" android:layout_width="16dp" android:layout_height="match_parent" android:importantForAccessibility="no" app:srcCompat="@drawable/gradient_transparent_colorbackgroundsecondary"/>
                         </FrameLayout>
-                        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/claimPromoCopyButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/copy" android:insetTop="0dp" android:insetBottom="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" android:layout_marginEnd="8dp" style="@style/res_2131952458_uikit_material_button"/>
+                        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/claimPromoCopyButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/copy" android:insetTop="0dp" android:insetBottom="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" android:layout_marginEnd="8dp" style="@style/UiKit_Material_Button"/>
                     </LinearLayout>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/outbound_promotion_code_confirmation_email" style="@style/res_2131952574_uikit_textview_medium"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/outbound_promotion_code_confirmation_email" style="@style/UiKit_TextView_Medium"/>
                 </androidx.appcompat.widget.LinearLayoutCompat>
             </com.google.android.material.card.MaterialCardView>
-            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoRedeemButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/redeem" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoMaybeLaterButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/maybe_later" style="@style/res_2131952471_uikit_material_button_transparent"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoRedeemButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/redeem" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoMaybeLaterButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/maybe_later" style="@style/UiKit_Material_Button_Transparent"/>
         </androidx.appcompat.widget.LinearLayoutCompat>
         <androidx.appcompat.widget.LinearLayoutCompat android:gravity="center_horizontal" android:orientation="vertical" android:id="@+id/claimPromoFailure" android:layout_width="match_parent" android:layout_height="wrap_content">
             <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:importantForAccessibility="no" app:srcCompat="@drawable/img_premium_subscription_header_error"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/generic_error_title" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:text="@string/generic_error_body" android:lineSpacingMultiplier="1" style="@style/res_2131952574_uikit_textview_medium"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoFailureCloseButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952458_uikit_material_button"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/generic_error_title" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:text="@string/generic_error_body" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Medium"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoFailureCloseButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit_Material_Button"/>
         </androidx.appcompat.widget.LinearLayoutCompat>
     </com.discord.app.AppViewFlipper>
 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/widget_client_outdated.xml b/app/src/main/res/layout/widget_client_outdated.xml
index 91f115e996..bbbfcd3ebf 100644
--- a/app/src/main/res/layout/widget_client_outdated.xml
+++ b/app/src/main/res/layout/widget_client_outdated.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/client_outdated_anchor_wrap" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952406_uikit_copy_container">
-            <ImageView android:src="?attr/img_forced_update" android:contentDescription="@string/new_terms_title" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:layout_gravity="center" android:text="@string/out_of_date_title" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:gravity="center" android:layout_marginTop="16dp" android:text="@string/out_of_date_description" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/client_outdated_anchor_wrap" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_Copy_Container">
+            <ImageView android:src="?attr/img_forced_update" android:contentDescription="@string/new_terms_title" style="@style/UiKit_ImageView"/>
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:layout_gravity="center" android:text="@string/out_of_date_title" style="@style/UiKit_TextView_H1"/>
+                <TextView android:gravity="center" android:layout_marginTop="16dp" android:text="@string/out_of_date_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:id="@+id/client_outdated_anchor_wrap" android:layout_marginTop="8dp" android:layout_alignParentBottom="true" style="@style/res_2131952403_uikit_copy_anchor">
-        <com.google.android.material.button.MaterialButton android:id="@+id/client_outdated_update" android:text="@string/out_of_date_action" style="@style/res_2131952458_uikit_material_button"/>
+    <LinearLayout android:id="@+id/client_outdated_anchor_wrap" android:layout_marginTop="8dp" android:layout_alignParentBottom="true" style="@style/UiKit_Copy_Anchor">
+        <com.google.android.material.button.MaterialButton android:id="@+id/client_outdated_update" android:text="@string/out_of_date_action" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_collapsed_voice_user_list_item.xml b/app/src/main/res/layout/widget_collapsed_voice_user_list_item.xml
index e49e0579bb..7279c9f155 100644
--- a/app/src/main/res/layout/widget_collapsed_voice_user_list_item.xml
+++ b/app/src/main/res/layout/widget_collapsed_voice_user_list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630_circle" android:padding="@dimen/uikit_settings_voice_user_border_padding" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/widget_collapsed_user_imageview" app:placeholderImage="@drawable/drawable_grey_user_icon" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:textSize="10sp" android:textColor="@color/white" android:layout_gravity="center" android:id="@+id/widget_collapsed_user_count" style="@style/res_2131952564_uikit_textview_bold"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/widget_collapsed_user_imageview" app:placeholderImage="@drawable/drawable_grey_user_icon" style="@style/Avatar_Medium"/>
+    <TextView android:textSize="10sp" android:textColor="@color/white" android:layout_gravity="center" android:id="@+id/widget_collapsed_user_count" style="@style/UiKit_TextView_Bold"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_confirm_remove_community_dialog.xml b/app/src/main/res/layout/widget_confirm_remove_community_dialog.xml
index 1b8909bff2..db6c7a4124 100644
--- a/app/src/main/res/layout/widget_confirm_remove_community_dialog.xml
+++ b/app/src/main/res/layout/widget_confirm_remove_community_dialog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/confirm_deleting_community_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/confirm_deleting_community_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/guild_settings_community_disable_community_dialog_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/confirm_deleting_community_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/confirm_deleting_community_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/guild_settings_community_disable_community_dialog_title" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <TextView android:layout_gravity="start" android:id="@+id/confirm_deleting_community_body_text" android:padding="16dp" android:layout_width="match_parent" android:text="@string/guild_settings_community_disable_community_dialog_message" android:textAlignment="textStart" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/confirm_deleting_community_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/confirm_deleting_community_ok" android:text="@string/confirm" style="@style/res_2131952459_uikit_material_button_fit"/>
+    <TextView android:layout_gravity="start" android:id="@+id/confirm_deleting_community_body_text" android:padding="16dp" android:layout_width="match_parent" android:text="@string/guild_settings_community_disable_community_dialog_message" android:textAlignment="textStart" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/confirm_deleting_community_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/confirm_deleting_community_ok" android:text="@string/confirm" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_connections_add_xbox.xml b/app/src/main/res/layout/widget_connections_add_xbox.xml
index 625315fe03..49a59dc788 100644
--- a/app/src/main/res/layout/widget_connections_add_xbox.xml
+++ b/app/src/main/res/layout/widget_connections_add_xbox.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <RelativeLayout android:layout_height="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <LinearLayout android:gravity="center" android:layout_centerInParent="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout style="@style/res_2131952383_uikit_authcopycontainer">
-                <TextView android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/xbox_authorization_title" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:layout_marginBottom="8dp" android:text="@string/connection_enter_code" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <RelativeLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <LinearLayout android:gravity="center" android:layout_centerInParent="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout style="@style/UiKit_AuthCopyContainer">
+                <TextView android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/xbox_authorization_title" style="@style/UiKit_TextView_H1"/>
+                <TextView android:layout_marginBottom="8dp" android:text="@string/connection_enter_code" style="@style/UiKit_TextView_Subtext"/>
             </LinearLayout>
-            <com.discord.views.CodeVerificationView android:id="@+id/connections_xbox_code" android:layout_marginTop="16dp" app:cvv_character_input_type="1" style="@style/res_2131952589_uikit_viewgroup"/>
+            <com.discord.views.CodeVerificationView android:id="@+id/connections_xbox_code" android:layout_marginTop="16dp" app:cvv_character_input_type="1" style="@style/UiKit_ViewGroup"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@+id/connections_xbox_login" android:background="?attr/primary_500" android:padding="8dp" android:layout_margin="8dp" android:foreground="?attr/selectableItemBackground" android:layout_alignParentBottom="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <TextView android:textColor="?attr/primary_300" android:text="@string/connection_login_with" android:layout_marginEnd="8dp" style="@style/res_2131952563_uikit_textview"/>
-            <ImageView android:paddingTop="4dp" android:paddingBottom="4dp" android:src="@drawable/ic_account_microsoft" android:contentDescription="@string/connection_login_microsoft" style="@style/res_2131952448_uikit_imageview"/>
+        <LinearLayout android:gravity="center" android:id="@+id/connections_xbox_login" android:background="?attr/primary_500" android:padding="8dp" android:layout_margin="8dp" android:foreground="?attr/selectableItemBackground" android:layout_alignParentBottom="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <TextView android:textColor="?attr/primary_300" android:text="@string/connection_login_with" android:layout_marginEnd="8dp" style="@style/UiKit_TextView"/>
+            <ImageView android:paddingTop="4dp" android:paddingBottom="4dp" android:src="@drawable/ic_account_microsoft" android:contentDescription="@string/connection_login_microsoft" style="@style/UiKit_ImageView"/>
         </LinearLayout>
     </RelativeLayout>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_contact_sync.xml b/app/src/main/res/layout/widget_contact_sync.xml
index 90d0c5f40d..b19e0626a5 100644
--- a/app/src/main/res/layout/widget_contact_sync.xml
+++ b/app/src/main/res/layout/widget_contact_sync.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/contact_sync_view_flipper" android:inAnimation="@anim/activity_slide_horizontal_open_in" android:outAnimation="@anim/activity_slide_horizontal_open_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/contact_sync_view_flipper" android:inAnimation="@anim/activity_slide_horizontal_open_in" android:outAnimation="@anim/activity_slide_horizontal_open_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <include android:id="@+id/contact_sync_landing" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_contact_sync_landing"/>
         <include android:id="@+id/contact_sync_add_phone" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_contact_sync_add_phone"/>
         <include android:id="@+id/contact_sync_verify_phone" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_contact_sync_verify_phone"/>
diff --git a/app/src/main/res/layout/widget_create_channel.xml b/app/src/main/res/layout/widget_create_channel.xml
index b9028ed3f1..664e5ee901 100644
--- a/app/src/main/res/layout/widget_create_channel.xml
+++ b/app/src/main/res/layout/widget_create_channel.xml
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:title="@string/create_channel" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:title="@string/create_channel" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131951640_apptheme_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_channel_name_layout" android:layout_margin="16dp" android:hint="@string/form_label_channel_name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:maxLength="100" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <androidx.core.widget.NestedScrollView style="@style/AppTheme_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_channel_name_layout" android:layout_margin="16dp" android:hint="@string/form_label_channel_name" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:maxLength="100" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/create_channel_type_container" android:layout_marginBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:gravity="center_vertical" android:layout_marginTop="16dp" android:text="@string/channel_type" android:textAllCaps="true" android:layout_marginStart="16dp" style="@style/res_2131952569_uikit_textview_h6"/>
-                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_text_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/create_channel_type_container" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:gravity="center_vertical" android:layout_marginTop="16dp" android:text="@string/channel_type" android:textAllCaps="true" android:layout_marginStart="16dp" style="@style/UiKit_TextView_H6"/>
+                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_text_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
                     <ImageView android:id="@+id/create_channel_text_icon" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_channel_text_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0"/>
-                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_text_title" android:layout_width="0dp" android:text="@string/text_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_text_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_text_radio" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/text_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_text_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_text_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_text_title" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <RadioButton android:id="@+id/create_channel_text_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952483_uikit_radiobutton"/>
+                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_text_title" android:layout_width="0dp" android:text="@string/text_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_text_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_text_radio" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/text_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_text_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_text_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_text_title" style="@style/UiKit_TextView_Subtext"/>
+                    <RadioButton android:id="@+id/create_channel_text_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_RadioButton"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
-                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_voice_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_voice_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
                     <ImageView android:id="@+id/create_channel_voice_icon" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_channel_voice_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0"/>
-                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_voice_title" android:layout_width="0dp" android:text="@string/voice_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_voice_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_voice_radio" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/voice_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_voice_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_voice_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_voice_title" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <RadioButton android:id="@+id/create_channel_voice_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952483_uikit_radiobutton"/>
+                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_voice_title" android:layout_width="0dp" android:text="@string/voice_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_voice_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_voice_radio" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/voice_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_voice_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_voice_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_voice_title" style="@style/UiKit_TextView_Subtext"/>
+                    <RadioButton android:id="@+id/create_channel_voice_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_RadioButton"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
-                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_announcements_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_announcements_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
                     <ImageView android:id="@+id/create_channel_announcements_icon" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_channel_announcements_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0"/>
-                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_announcements_title" android:layout_width="0dp" android:text="@string/news_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_announcements_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_announcements_radio" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/news_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_announcements_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_announcements_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_announcements_title" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <RadioButton android:id="@+id/create_channel_announcements_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952483_uikit_radiobutton"/>
+                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_announcements_title" android:layout_width="0dp" android:text="@string/news_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_announcements_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_announcements_radio" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/news_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_announcements_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_announcements_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_announcements_title" style="@style/UiKit_TextView_Subtext"/>
+                    <RadioButton android:id="@+id/create_channel_announcements_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_RadioButton"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
-                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_stage_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/create_channel_stage_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
                     <ImageView android:id="@+id/create_channel_stage_icon" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_channel_stage_16dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0"/>
-                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_stage_title" android:layout_width="0dp" android:text="@string/stage_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_stage_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_stage_radio" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/stage_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_stage_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_stage_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_stage_title" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <RadioButton android:id="@+id/create_channel_stage_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952483_uikit_radiobutton"/>
+                    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_stage_title" android:layout_width="0dp" android:text="@string/stage_channel" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_stage_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_stage_radio" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+                    <TextView android:layout_width="0dp" android:layout_marginTop="2dp" android:text="@string/stage_channel_desc" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintLeft_toRightOf="@+id/create_channel_stage_icon" app:layout_constraintRight_toLeftOf="@+id/create_channel_stage_radio" app:layout_constraintTop_toBottomOf="@+id/create_channel_stage_title" style="@style/UiKit_TextView_Subtext"/>
+                    <RadioButton android:id="@+id/create_channel_stage_radio" android:background="@null" android:focusable="false" android:clickable="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_RadioButton"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <RelativeLayout android:id="@+id/create_channel_private_container" android:paddingTop="16dp" android:paddingBottom="8dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_private_title" android:layout_marginTop="8dp" android:text="@string/private_channel" android:drawablePadding="8dp" android:layout_alignParentStart="true" app:drawableStartCompat="@drawable/ic_channel_lock_16dp" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:id="@+id/create_channel_private_info" android:layout_marginTop="16dp" android:text="@string/private_channel_note" android:layout_below="@+id/create_channel_private_title" android:layout_marginStart="24dp" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <RelativeLayout android:id="@+id/create_channel_private_container" android:paddingTop="16dp" android:paddingBottom="8dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/create_channel_private_title" android:layout_marginTop="8dp" android:text="@string/private_channel" android:drawablePadding="8dp" android:layout_alignParentStart="true" app:drawableStartCompat="@drawable/ic_channel_lock_16dp" style="@style/UiKit_TextView"/>
+                <TextView android:id="@+id/create_channel_private_info" android:layout_marginTop="16dp" android:text="@string/private_channel_note" android:layout_below="@+id/create_channel_private_title" android:layout_marginStart="24dp" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
                 <androidx.appcompat.widget.SwitchCompat android:id="@+id/create_channel_private_switch" android:background="@null" android:focusable="false" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" app:thumbTint="?attr/colorCompoundButton"/>
             </RelativeLayout>
-            <View android:id="@+id/create_channel_role_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:gravity="center_vertical" android:id="@+id/create_channel_role_header" android:visibility="gone" android:layout_margin="16dp" android:text="@string/form_label_channel_permissions" android:textAllCaps="true" style="@style/res_2131952569_uikit_textview_h6"/>
+            <View android:id="@+id/create_channel_role_divider" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:gravity="center_vertical" android:id="@+id/create_channel_role_header" android:visibility="gone" android:layout_margin="16dp" android:text="@string/form_label_channel_permissions" android:textAllCaps="true" style="@style/UiKit_TextView_H6"/>
             <androidx.recyclerview.widget.RecyclerView android:id="@+id/create_channel_role_access_recycler" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_create_channel_add_member.xml b/app/src/main/res/layout/widget_create_channel_add_member.xml
index 3bda85bc58..8d9b6b45c5 100644
--- a/app/src/main/res/layout/widget_create_channel_add_member.xml
+++ b/app/src/main/res/layout/widget_create_channel_add_member.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/channel_permissions_moderator_description" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/channel_permissions_moderator_description" style="@style/UiKit_TextView"/>
     <androidx.fragment.app.FragmentContainerView android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_create_guild_role_subscription_tier.xml b/app/src/main/res/layout/widget_create_guild_role_subscription_tier.xml
index bfa4e3a24d..549d714f8f 100644
--- a/app/src/main/res/layout/widget_create_guild_role_subscription_tier.xml
+++ b/app/src/main/res/layout/widget_create_guild_role_subscription_tier.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.steps.StepsView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/create_guild_subscription_role_tier_steps_view" style="@style/res_2131952602_uikit_viewgroup_page"/>
+<com.discord.views.steps.StepsView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/create_guild_subscription_role_tier_steps_view" style="@style/UiKit_ViewGroup_Page"/>
diff --git a/app/src/main/res/layout/widget_creation_intent.xml b/app/src/main/res/layout/widget_creation_intent.xml
index e30b7be92e..e05a828ad3 100644
--- a/app/src/main/res/layout/widget_creation_intent.xml
+++ b/app/src/main/res/layout/widget_creation_intent.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
             <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/creation_intent_description" app:stv_title="@string/creation_intent_title"/>
-            <com.google.android.material.card.MaterialCardView android:id="@+id/creation_intent_first_option" android:layout_marginBottom="8dp" style="@style/res_2131952046_nux_guildtemplates_card">
-                <TextView android:id="@+id/creation_intent_first_option_text" android:text="@string/guild_template_header_create" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/drawable_guild_template_create" style="@style/res_2131952047_nux_guildtemplates_card_action"/>
+            <com.google.android.material.card.MaterialCardView android:id="@+id/creation_intent_first_option" android:layout_marginBottom="8dp" style="@style/Nux_GuildTemplates_Card">
+                <TextView android:id="@+id/creation_intent_first_option_text" android:text="@string/guild_template_header_create" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/drawable_guild_template_create" style="@style/Nux_GuildTemplates_Card_Action"/>
             </com.google.android.material.card.MaterialCardView>
-            <com.google.android.material.card.MaterialCardView android:id="@+id/creation_intent_second_option" android:layout_marginBottom="8dp" style="@style/res_2131952046_nux_guildtemplates_card">
-                <TextView android:id="@+id/creation_intent_second_option_text" android:text="@string/guild_template_header_create" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/drawable_guild_template_create" style="@style/res_2131952047_nux_guildtemplates_card_action"/>
+            <com.google.android.material.card.MaterialCardView android:id="@+id/creation_intent_second_option" android:layout_marginBottom="8dp" style="@style/Nux_GuildTemplates_Card">
+                <TextView android:id="@+id/creation_intent_second_option_text" android:text="@string/guild_template_header_create" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/drawable_guild_template_create" style="@style/Nux_GuildTemplates_Card_Action"/>
             </com.google.android.material.card.MaterialCardView>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/creation_intent_skip_text" android:layout_width="match_parent" style="@style/res_2131952563_uikit_textview"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/creation_intent_skip_text" android:layout_width="match_parent" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_debugging.xml b/app/src/main/res/layout/widget_debugging.xml
index 3350ed1873..47203dcd9f 100644
--- a/app/src/main/res/layout/widget_debugging.xml
+++ b/app/src/main/res/layout/widget_debugging.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/debugging_logs" android:scrollbars="vertical" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/debugging_logs" android:scrollbars="vertical" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_debugging_adapter_item.xml b/app/src/main/res/layout/widget_debugging_adapter_item.xml
index 34472c6126..dd2cf4d9c5 100644
--- a/app/src/main/res/layout/widget_debugging_adapter_item.xml
+++ b/app/src/main/res/layout/widget_debugging_adapter_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:ellipsize="end" android:id="@+id/log_message" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:maxLines="2" style="@style/res_2131952563_uikit_textview"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:ellipsize="end" android:id="@+id/log_message" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:maxLines="2" style="@style/UiKit_TextView"/>
+    <View style="@style/UiKit_Settings_Divider"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_directories_search.xml b/app/src/main/res/layout/widget_directories_search.xml
index 482435a0cc..3a5127eebf 100644
--- a/app/src/main/res/layout/widget_directories_search.xml
+++ b/app/src/main/res/layout/widget_directories_search.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:background="?attr/primary_630" app:layout_constraintBottom_toTopOf="@+id/barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951637_apptheme_appbarlayout">
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/search_bar" style="@style/res_2131952561_uikit_textinputlayout_search_actionbar">
-            <com.google.android.material.textfield.TextInputEditText android:id="@+id/search_bar_text" android:hint="@string/search" android:imeOptions="actionDone" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" android:background="?attr/primary_630" app:layout_constraintBottom_toTopOf="@+id/barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/AppTheme_AppBarLayout">
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/search_bar" style="@style/UiKit_TextInputLayout_Search_ActionBar">
+            <com.google.android.material.textfield.TextInputEditText android:id="@+id/search_bar_text" android:hint="@string/search" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search">
                 <requestFocus/>
             </com.google.android.material.textfield.TextInputEditText>
         </com.google.android.material.textfield.TextInputLayout>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="action_bar_toolbar_layout"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier"/>
-    <LinearLayout android:id="@+id/empty_state" android:padding="16dp" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:id="@+id/empty_state" android:padding="16dp" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="?attr/img_empty_search" android:importantForAccessibility="no"/>
-        <TextView android:gravity="center" android:id="@+id/empty_title" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/directory_search_no_results_title" style="@style/res_2131952567_uikit_textview_h2"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@+id/empty_description" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:gravity="center" android:id="@+id/empty_title" android:paddingBottom="4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/directory_search_no_results_title" style="@style/UiKit_TextView_H2"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@+id/empty_description" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_TextView"/>
     </LinearLayout>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/search" android:src="@drawable/ic_search_white_24dp" android:contentDescription="@string/search" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/search" android:src="@drawable/ic_search_white_24dp" android:contentDescription="@string/search" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toStartOf="0" style="@style/Settings_FloatingActionButton"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_directory_channel.xml b/app/src/main/res/layout/widget_directory_channel.xml
index b09b1f186f..d9d8e5ca5f 100644
--- a/app/src/main/res/layout/widget_directory_channel.xml
+++ b/app/src/main/res/layout/widget_directory_channel.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.utilities.view.rounded.RoundedRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true" app:topLeftRadius="@dimen/tab_host_corner_radius" app:topRightRadius="@dimen/tab_host_corner_radius" style="@style/res_2131952602_uikit_viewgroup_page">
+<com.discord.utilities.view.rounded.RoundedRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true" app:topLeftRadius="@dimen/tab_host_corner_radius" app:topRightRadius="@dimen/tab_host_corner_radius" style="@style/UiKit_ViewGroup_Page">
     <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_width="match_parent" android:layout_height="match_parent">
-        <com.google.android.material.appbar.AppBarLayout android:background="?attr/toolbarColor" style="@style/res_2131951637_apptheme_appbarlayout">
-            <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/res_2131951647_apptheme_collapsingtoolbarlayout">
+        <com.google.android.material.appbar.AppBarLayout android:background="?attr/toolbarColor" style="@style/AppTheme_AppBarLayout">
+            <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme_CollapsingToolbarLayout">
                 <com.discord.views.directories.ServerDiscoveryHeader android:id="@+id/header" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="?attr/actionBarSize" app:layout_collapseMode="2" app:layout_scrollFlags="3"/>
-                <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0dp" app:layout_collapseMode="1" app:navigationContentDescription="@string/back" style="@style/res_2131951663_apptheme_toolbar"/>
+                <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0dp" app:layout_collapseMode="1" app:navigationContentDescription="@string/back" style="@style/AppTheme_Toolbar"/>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
         </com.google.android.material.appbar.AppBarLayout>
         <include android:id="@+id/widget_directory_channel_empty" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/widget_directory_channel_empty"/>
diff --git a/app/src/main/res/layout/widget_directory_channel_empty.xml b/app/src/main/res/layout/widget_directory_channel_empty.xml
index 2449ab86c1..39b9211bb5 100644
--- a/app/src/main/res/layout/widget_directory_channel_empty.xml
+++ b/app/src/main/res/layout/widget_directory_channel_empty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent" android:baselineAligned="false" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/item_directory_empty_header" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/item_directory_empty_subheader" android:layout_marginBottom="16dp" android:text="@string/hub_directory_channel_empty_subtitle" style="@style/res_2131952563_uikit_textview"/>
-    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_add_server" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_personalize" app:action_item_text="@string/hub_directory_channel_empty_add_server" style="@style/res_2131952613_uikit_welcomemessagecard"/>
-    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_invite_friends" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_add_friend" app:action_item_text="@string/hub_directory_channel_empty_invite" style="@style/res_2131952613_uikit_welcomemessagecard"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent" android:baselineAligned="false" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/item_directory_empty_header" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_H1_Bold"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/item_directory_empty_subheader" android:layout_marginBottom="16dp" android:text="@string/hub_directory_channel_empty_subtitle" style="@style/UiKit_TextView"/>
+    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_add_server" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_personalize" app:action_item_text="@string/hub_directory_channel_empty_add_server" style="@style/UiKit_WelcomeMessageCard"/>
+    <com.discord.views.ChatActionItem android:id="@+id/welcome_card_invite_friends" android:layout_marginBottom="12dp" app:action_item_img_src="@drawable/ic_guild_welcome_add_friend" app:action_item_text="@string/hub_directory_channel_empty_invite" style="@style/UiKit_WelcomeMessageCard"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_disable_delete_account_dialog.xml b/app/src/main/res/layout/widget_disable_delete_account_dialog.xml
index d2589243e0..2d00bcc021 100644
--- a/app/src/main/res/layout/widget_disable_delete_account_dialog.xml
+++ b/app/src/main/res/layout/widget_disable_delete_account_dialog.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/disable_delete_header" android:padding="16dp" android:text="@string/disable_account" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/disable_delete_header" android:padding="16dp" android:text="@string/disable_account" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="14dp" android:id="@+id/disable_delete_body" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/disable_delete_password_wrap" android:hint="@string/form_label_password" style="@style/res_2131952559_uikit_textinputlayout_primary_password">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="14dp" android:id="@+id/disable_delete_body" style="@style/UiKit_TextView"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/disable_delete_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit_TextInputLayout_Primary_Password">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/disable_delete_code_wrap" android:hint="@string/two_fa_auth_code" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/disable_delete_code_wrap" android:hint="@string/two_fa_auth_code" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:id="@+id/disable_delete_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:id="@+id/disable_delete_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
         <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@+id/disable_delete_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/disable" app:lb_text_color="@drawable/button_text_color_primary_100"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_discord_hub_add_server.xml b/app/src/main/res/layout/widget_discord_hub_add_server.xml
index 2f631a0e59..11313aa967 100644
--- a/app/src/main/res/layout/widget_discord_hub_add_server.xml
+++ b/app/src/main/res/layout/widget_discord_hub_add_server.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.views.ScreenTitleView android:id="@+id/header" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/hub_choose_guild_subtitle" app:stv_title="@string/hub_choose_guild_title"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"/>
     <LinearLayout android:orientation="vertical" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="@dimen/app_elevation">
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:stv_title="Want to start a new group?"/>
-        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/discord_u_add_server_create_server" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/okay" style="@style/res_2131952467_uikit_material_button_secondary"/>
+        <com.google.android.material.button.MaterialButton android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@+id/discord_u_add_server_create_server" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/okay" style="@style/UiKit_Material_Button_Secondary"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_discord_hub_description.xml b/app/src/main/res/layout/widget_discord_hub_description.xml
index f6ab7b24b3..13216a0991 100644
--- a/app/src/main/res/layout/widget_discord_hub_description.xml
+++ b/app/src/main/res/layout/widget_discord_hub_description.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.views.ScreenTitleView android:id="@+id/header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:stv_subtitle="@string/hub_add_guild_description_help" app:stv_title="@string/hub_customize_existing_guild_title"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/description_layout" android:layout_marginBottom="8dp" android:hint="@string/hub_add_guild_description_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:counterEnabled="true" app:counterMaxLength="500" app:endIconMode="2" app:expandedHintEnabled="false" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:gravity="top|left|center_vertical|center_horizontal|center|start" android:id="@+id/description" android:hint="@string/hub_add_guild_description_placeholder" android:minLines="2" android:maxLength="500" android:imeOptions="actionDone" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/description_layout" android:layout_marginBottom="8dp" android:hint="@string/hub_add_guild_description_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:counterEnabled="true" app:counterMaxLength="500" app:endIconMode="2" app:expandedHintEnabled="false" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:gravity="top|left|center_vertical|center_horizontal|center|start" android:id="@+id/description" android:hint="@string/hub_add_guild_description_placeholder" android:minLines="2" android:maxLength="500" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
     </com.google.android.material.textfield.TextInputLayout>
-    <com.discord.views.LoadingButton android:id="@+id/add_server" app:lb_text="@string/hub_add_server_cta" style="@style/res_2131952458_uikit_material_button"/>
+    <com.discord.views.LoadingButton android:id="@+id/add_server" app:lb_text="@string/hub_add_server_cta" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_discord_hub_email_confirmation.xml b/app/src/main/res/layout/widget_discord_hub_email_confirmation.xml
index fd89961518..152f3f6f55 100644
--- a/app/src/main/res/layout/widget_discord_hub_email_confirmation.xml
+++ b/app/src/main/res/layout/widget_discord_hub_email_confirmation.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:gravity="center" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:gravity="center" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/bg_discord_hub_email_confirmation" android:scaleType="centerCrop" android:importantForAccessibility="no"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/discord_hub_email_confirmation_header_title" android:layout_marginBottom="8dp" android:text="@string/hub_waitlist_modal_join_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="24dp" android:text="@string/member_verification_email_confirmation_subtitle" style="@style/res_2131952563_uikit_textview"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/discord_hub_email_confirmation_resend" android:text="@string/member_verification_email_resend" style="@style/res_2131952572_uikit_textview_link"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/discord_hub_email_confirmation_different" android:layout_marginTop="16dp" android:text="@string/hub_email_confirmation_different_email" style="@style/res_2131952572_uikit_textview_link"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/discord_hub_email_confirmation_header_title" android:layout_marginBottom="8dp" android:text="@string/hub_waitlist_modal_join_header" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_marginBottom="24dp" android:text="@string/member_verification_email_confirmation_subtitle" style="@style/UiKit_TextView"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/discord_hub_email_confirmation_resend" android:text="@string/member_verification_email_resend" style="@style/UiKit_TextView_Link"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/discord_hub_email_confirmation_different" android:layout_marginTop="16dp" android:text="@string/hub_email_confirmation_different_email" style="@style/UiKit_TextView_Link"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_discord_hub_email_flow.xml b/app/src/main/res/layout/widget_discord_hub_email_flow.xml
index 5e46fa0f02..a2d8f2c5d5 100644
--- a/app/src/main/res/layout/widget_discord_hub_email_flow.xml
+++ b/app/src/main/res/layout/widget_discord_hub_email_flow.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" android:baselineAligned="false" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" android:baselineAligned="false" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
     <include android:id="@+id/discord_hub_email_input" android:visibility="gone" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" layout="@layout/widget_discord_hub_email_input"/>
     <include android:id="@+id/discord_hub_email_confirmation" android:visibility="gone" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" layout="@layout/widget_discord_hub_email_confirmation"/>
     <include android:id="@+id/discord_hub_waitlist" android:visibility="gone" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" layout="@layout/widget_discord_hub_waitlist"/>
     <LinearLayout android:orientation="vertical" android:id="@+id/discord_hub_email_button_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp">
         <com.discord.views.LoadingButton android:id="@+id/discord_hub_email_yes" android:layout_width="match_parent" android:layout_height="wrap_content" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/discord_hub_email_no" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/invite_no_thanks" style="@style/res_2131952471_uikit_material_button_transparent"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/discord_hub_email_no" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/invite_no_thanks" style="@style/UiKit_Material_Button_Transparent"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_discord_hub_email_input.xml b/app/src/main/res/layout/widget_discord_hub_email_input.xml
index 7f4301c110..e793a1a0f7 100644
--- a/app/src/main/res/layout/widget_discord_hub_email_input.xml
+++ b/app/src/main/res/layout/widget_discord_hub_email_input.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:gravity="center" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:gravity="center" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:layout_gravity="center_horizontal" android:id="@+id/discord_hub_email_header_image" android:layout_width="match_parent" android:layout_height="150dp" android:layout_marginBottom="16dp" android:src="@drawable/bg_discord_hub_email_verification" android:scaleType="fitCenter" android:importantForAccessibility="no"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/discord_hub_email_header_title" android:layout_marginBottom="8dp" android:text="@string/hub_waitlist_modal_join_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/discord_hub_email_header_description" android:layout_marginBottom="24dp" android:text="@string/hub_waitlist_modal_join_subheader" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/discord_hub_email_header_description_email_input_layout" android:layout_marginBottom="8dp" android:hint="@string/hub_waitlist_modal_form_title" app:expandedHintEnabled="false" style="@style/res_2131952545_uikit_textinputlayout">
-            <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/discord_hub_email_header_description_email_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hub_email_connection_content_input_placeholder" style="@style/res_2131952552_uikit_textinputlayout_edittext_singleline_email"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/discord_hub_email_header_title" android:layout_marginBottom="8dp" android:text="@string/hub_waitlist_modal_join_header" style="@style/UiKit_TextView_H1_Bold"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/discord_hub_email_header_description" android:layout_marginBottom="24dp" android:text="@string/hub_waitlist_modal_join_subheader" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/discord_hub_email_header_description_email_input_layout" android:layout_marginBottom="8dp" android:hint="@string/hub_waitlist_modal_form_title" app:expandedHintEnabled="false" style="@style/UiKit_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/discord_hub_email_header_description_email_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hub_email_connection_content_input_placeholder" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Email"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discord_hub_email_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hub_waitlist_modal_form_description" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discord_hub_email_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hub_waitlist_modal_form_description" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_discord_hub_waitlist.xml b/app/src/main/res/layout/widget_discord_hub_waitlist.xml
index f36ffb23f0..8df891165f 100644
--- a/app/src/main/res/layout/widget_discord_hub_waitlist.xml
+++ b/app/src/main/res/layout/widget_discord_hub_waitlist.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:gravity="center" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:gravity="center" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/bg_discord_hub_email_verification" android:scaleType="centerCrop" android:importantForAccessibility="no"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="8dp" android:text="@string/hub_waitlist_modal_joined_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:layout_marginBottom="8dp" android:text="@string/hub_waitlist_modal_joined_header" style="@style/UiKit_TextView_H1_Bold"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_discovery.xml b/app/src/main/res/layout/widget_discovery.xml
index 1b05edc30a..145a1a2427 100644
--- a/app/src/main/res/layout/widget_discovery.xml
+++ b/app/src/main/res/layout/widget_discovery.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
-    <TextView android:textAppearance="@style/res_2131952544_uikit_textappearance_toolbar_title" android:id="@+id/discovery_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_discovery_guild_sidebar_live_stages_category" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textAppearance="@style/res_2131952543_uikit_textappearance_toolbar_subtitle" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/discovery_start_stage" android:padding="16dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/start_stage_button_text_mobile" android:textAllCaps="false" android:fontFamily="?attr/font_primary_normal" app:layout_constraintBottom_toBottomOf="@+id/discovery_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/discovery_title"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Title" android:id="@+id/discovery_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_discovery_guild_sidebar_live_stages_category" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Subtitle" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/discovery_start_stage" android:padding="16dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/start_stage_button_text_mobile" android:textAllCaps="false" android:fontFamily="?attr/font_primary_normal" app:layout_constraintBottom_toBottomOf="@+id/discovery_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/discovery_title"/>
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipe_refresh_layout" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_title">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/discovery_recycler" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/discovery_recycler" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/discovery_empty_state" android:layout_width="match_parent" android:layout_height="match_parent">
         <ImageView android:id="@+id/discovery_empty_state_wumpus" android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/discovery_empty_state_header" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" app:srcCompat="@drawable/discovery_empty_state"/>
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:gravity="center" android:id="@+id/discovery_empty_state_header" android:layout_width="0dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_no_results_header" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/discovery_empty_state_subheader" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_wumpus" app:layout_constraintWidth_percent="0.7" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discovery_empty_state_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/stage_discovery_no_results_subheader" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_header" style="@style/res_2131952574_uikit_textview_medium"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:gravity="center" android:id="@+id/discovery_empty_state_header" android:layout_width="0dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_no_results_header" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/discovery_empty_state_subheader" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_wumpus" app:layout_constraintWidth_percent="0.7" style="@style/UiKit_TextView_Large"/>
+        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/discovery_empty_state_subheader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/stage_discovery_no_results_subheader" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_empty_state_header" style="@style/UiKit_TextView_Medium"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_discovery_intro_card.xml b/app/src/main/res/layout/widget_discovery_intro_card.xml
index af3ead5be6..e63b98631e 100644
--- a/app/src/main/res/layout/widget_discovery_intro_card.xml
+++ b/app/src/main/res/layout/widget_discovery_intro_card.xml
@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/drawable_discovery_intro_card_bg" android:scaleType="fitXY" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     <ImageView android:layout_gravity="end" android:id="@+id/discovery_intro_card_dismiss" android:padding="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="12dp" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/dismiss" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_title" android:text="@string/stage_discovery_intro_card_header" app:layout_constraintBottom_toTopOf="@+id/discovery_intro_card_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.25" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_subtitle" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_intro_card_body" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_intro_card_title" style="@style/res_2131952574_uikit_textview_medium"/>
+    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_title" android:text="@string/stage_discovery_intro_card_header" app:layout_constraintBottom_toTopOf="@+id/discovery_intro_card_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0.25" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textColor="@color/white" android:gravity="center" android:layout_gravity="center" android:id="@+id/discovery_intro_card_subtitle" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_marginTop="8dp" android:text="@string/stage_discovery_intro_card_body" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/discovery_intro_card_title" style="@style/UiKit_TextView_Medium"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_discovery_other_speakers_count.xml b/app/src/main/res/layout/widget_discovery_other_speakers_count.xml
index 6e381f9acd..4f1fa7503d 100644
--- a/app/src/main/res/layout/widget_discovery_other_speakers_count.xml
+++ b/app/src/main/res/layout/widget_discovery_other_speakers_count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
     <ImageView android:background="@drawable/drawable_discovery_card_icon_bg_circle" android:padding="4dp" android:layout_width="20dp" android:layout_height="20dp" android:src="@drawable/ic_mic_grey_24dp" android:layout_marginEnd="8dp" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:id="@+id/other_speakers_count_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <TextView android:id="@+id/other_speakers_count_text" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_Medium_SingleLine"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_discovery_stage_card.xml b/app/src/main/res/layout/widget_discovery_stage_card.xml
index 2b05888adc..29a6cbf9ac 100644
--- a/app/src/main/res/layout/widget_discovery_stage_card.xml
+++ b/app/src/main/res/layout/widget_discovery_stage_card.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/discovery_stage_card" android:background="@drawable/drawable_discovery_stage_card_bg" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/discovery_stage_card" android:background="@drawable/drawable_discovery_stage_card_bg" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
     <com.discord.views.discovery.DiscoveryStageCardTopHatView android:id="@+id/discovery_stage_card_top_hat" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-    <View android:id="@+id/stage_card_top_hat_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/res_2131952416_uikit_divider"/>
+    <View android:id="@+id/stage_card_top_hat_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/UiKit_Divider"/>
     <com.discord.views.discovery.DiscoveryStageCardBodyView android:id="@+id/discovery_stage_card_body_view" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-    <View android:id="@+id/stage_card_controls_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/res_2131952416_uikit_divider"/>
+    <View android:id="@+id/stage_card_controls_divider" android:layout_width="match_parent" android:layout_height="1dp" style="@style/UiKit_Divider"/>
     <com.discord.views.discovery.DiscoveryStageCardControlsView android:id="@+id/discovery_stage_card_controls" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-    <TextView android:textColor="@color/status_red_400" android:id="@+id/discovery_stage_card_error" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/stage_discovery_connection_error_generic" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textColor="@color/status_red_400" android:id="@+id/discovery_stage_card_error" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/stage_discovery_connection_error_generic" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_discovery_stage_card_speaker.xml b/app/src/main/res/layout/widget_discovery_stage_card_speaker.xml
index 25103dd159..f0a8604ebc 100644
--- a/app/src/main/res/layout/widget_discovery_stage_card_speaker.xml
+++ b/app/src/main/res/layout/widget_discovery_stage_card_speaker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/discovery_stage_card_speaker_avatar" android:layout_marginEnd="8dp" app:fadeDuration="50" style="@style/res_2131952525_uikit_stagediscoveryavatar_circle"/>
-    <TextView android:layout_gravity="center" android:id="@+id/discovery_stage_card_speaker_name" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/discovery_stage_card_speaker_avatar" android:layout_marginEnd="8dp" app:fadeDuration="50" style="@style/UiKit_StageDiscoveryAvatar_Circle"/>
+    <TextView android:layout_gravity="center" android:id="@+id/discovery_stage_card_speaker_name" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_TextView_Medium_SingleLine"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_edit_profile_banner_sheet.xml b/app/src/main/res/layout/widget_edit_profile_banner_sheet.xml
index 31c1abc27a..8b2fdba0c9 100644
--- a/app/src/main/res/layout/widget_edit_profile_banner_sheet.xml
+++ b/app/src/main/res/layout/widget_edit_profile_banner_sheet.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:paddingBottom="4dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/banner_color_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_banner_color_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/banner_color_item_description" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952456_uikit_listitem_title"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_color_description" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/banner_color_item_title" style="@style/res_2131952452_uikit_listitem_description"/>
-        <ImageView android:id="@+id/banner_color_preview" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/drawable_circle_black" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorBackgroundPrimary" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:paddingBottom="4dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/banner_color_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_banner_color_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/banner_color_item_description" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem_Title"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_color_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_color_description" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/banner_color_preview" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/banner_color_item_title" style="@style/UiKit_ListItem_Description"/>
+        <ImageView android:id="@+id/banner_color_preview" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/drawable_circle_black" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorBackgroundPrimary" style="@style/UiKit_ImageView"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <LinearLayout android:id="@+id/banner_change_image_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_change_profile_banner" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952456_uikit_listitem_title"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_specs" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952452_uikit_listitem_description"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_settings_customization_upsell" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952461_uikit_material_button_green_fit"/>
+    <LinearLayout android:id="@+id/banner_change_image_item_container" android:background="?attr/bg_pressed_highlight" android:paddingTop="12dp" android:paddingBottom="12dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_title" android:layout_height="wrap_content" android:text="@string/user_settings_change_profile_banner" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ListItem_Title"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/banner_change_image_item_description" android:visibility="visible" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_settings_banner_specs" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ListItem_Description"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/premium_upsell_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_settings_customization_upsell" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green_Fit"/>
     </LinearLayout>
-    <com.google.android.material.textview.MaterialTextView android:textColor="@color/status_red" android:id="@+id/banner_remove_image_item" android:background="?attr/bg_pressed_highlight" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/user_settings_remove_profile_banner" style="@style/res_2131952456_uikit_listitem_title"/>
+    <com.google.android.material.textview.MaterialTextView android:textColor="@color/status_red" android:id="@+id/banner_remove_image_item" android:background="?attr/bg_pressed_highlight" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" android:paddingBottom="12dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/user_settings_remove_profile_banner" style="@style/UiKit_ListItem_Title"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_edit_role.xml b/app/src/main/res/layout/widget_edit_role.xml
index cf726be9e8..881e9ac043 100644
--- a/app/src/main/res/layout/widget_edit_role.xml
+++ b/app/src/main/res/layout/widget_edit_role.xml
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/role_settings_overview_scroll" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/form_label_role_name" style="@style/res_2131952496_uikit_settings_item_header"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/role_settings_overview_scroll" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/form_label_role_name" style="@style/UiKit_Settings_Item_Header"/>
             <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_role_name" android:hint="@string/form_label_role_name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:inputType="textNoSuggestions" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_role_name" android:hint="@string/form_label_role_name" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:inputType="textNoSuggestions" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <View android:id="@+id/role_settings_edit_name_disabled_overlay" android:background="@color/white_alpha_30" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
             </FrameLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/form_label_role_color" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/form_label_role_color" style="@style/UiKit_Settings_Item_Header"/>
             <RelativeLayout android:id="@+id/role_settings_color_selector_container" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="64dp">
-                <TextView android:layout_margin="16dp" android:text="@string/form_label_role_color" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:layout_margin="16dp" android:text="@string/form_label_role_color" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
                 <View android:id="@+id/role_settings_current_color_display" android:background="@drawable/drawable_circle_brand" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="16dp" android:layout_alignParentEnd="true" android:elevation="2dp"/>
                 <View android:id="@+id/role_settings_color_disabled_overlay" android:background="@color/white_alpha_30" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
             </RelativeLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/form_label_role_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_hoist_checkedsetting" app:cs_text="@string/form_label_hoist_description" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_mentionable_checkedsetting" app:cs_subtext="@string/form_label_mentionable_description" app:cs_text="@string/form_label_mentionable" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/role_permissions_section_general_guild" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_read_messages" app:cs_subtext="@string/role_permissions_view_channel_description" app:cs_text="@string/role_permissions_view_channel" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_channels" app:cs_subtext="@string/role_permissions_manage_channels_description" app:cs_text="@string/manage_channels" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_roles" app:cs_subtext="@string/role_permissions_manage_roles_description" app:cs_text="@string/manage_roles" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_emojis_and_stickers" app:cs_subtext="@string/role_permissions_manage_emojis_and_stickers_description" app:cs_text="@string/manage_emojis_and_stickers" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_view_audit_log" app:cs_subtext="@string/role_permissions_view_audit_log_description" app:cs_text="@string/view_audit_log" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_view_guild_analytics" app:cs_subtext="@string/role_permissions_view_guild_analytics_description" app:cs_text="@string/view_guild_analytics" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_webhooks" app:cs_subtext="@string/role_permissions_manage_webhooks_description" app:cs_text="@string/manage_webhooks" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_server" app:cs_subtext="@string/role_permissions_manage_server_description" app:cs_text="@string/manage_server" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/role_permissions_section_membership" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_create_instant_invite" app:cs_subtext="@string/role_permissions_create_instant_invite_description" app:cs_text="@string/create_instant_invite" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_change_nickname" app:cs_subtext="@string/role_permissions_change_nickname_description" app:cs_text="@string/change_nickname" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_nicknames" app:cs_subtext="@string/role_permissions_manage_nicknames_description" app:cs_text="@string/manage_nicknames" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_kick_members" app:cs_subtext="@string/role_permissions_kick_members_description" app:cs_text="@string/kick_members" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_ban_members" app:cs_subtext="@string/role_permissions_ban_members_description" app:cs_text="@string/ban_members" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/role_permissions_section_text" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_send_messages" app:cs_subtext="@string/role_permissions_send_messages_description" app:cs_text="@string/send_messages" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_public_threads" app:cs_subtext="@string/role_permissions_use_public_threads_description" app:cs_text="@string/use_public_threads" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_private_threads" app:cs_subtext="@string/role_permissions_use_private_threads_description" app:cs_text="@string/use_private_threads" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_embed_links" app:cs_subtext="@string/role_permissions_embed_links_description" app:cs_text="@string/embed_links" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_attach_files" app:cs_subtext="@string/role_permissions_attach_files_description" app:cs_text="@string/attach_files" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_add_reactions" app:cs_subtext="@string/role_permissions_add_reactions_description" app:cs_text="@string/add_reactions" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_external_emojis" app:cs_subtext="@string/role_permissions_use_external_emojis_description" app:cs_text="@string/role_permissions_use_external_emojis" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_external_stickers" app:cs_subtext="@string/role_permissions_use_external_stickers_description" app:cs_text="@string/role_permissions_use_external_stickers" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_mention_everyone" app:cs_subtext="@string/role_permissions_mention_everyone_description" app:cs_text="@string/mention_everyone" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_messages" app:cs_subtext="@string/role_permissions_manage_messages_description" app:cs_text="@string/manage_messages" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_threads" app:cs_subtext="@string/role_permissions_manage_threads_description" app:cs_text="@string/manage_threads" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_read_message_history" app:cs_subtext="@string/role_permissions_read_message_history_description" app:cs_text="@string/read_message_history" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_send_tts_messages" app:cs_subtext="@string/send_tts_messages_description" app:cs_text="@string/send_tts_messages" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_application_commands" app:cs_subtext="@string/role_permissions_use_application_commands_guild_description" app:cs_text="@string/role_permissions_use_application_commands" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/role_permissions_section_voice" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_connect" app:cs_subtext="@string/role_permissions_connect_description" app:cs_text="@string/connect" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_speak" app:cs_subtext="@string/role_permissions_speak_description" app:cs_text="@string/speak" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_video" app:cs_subtext="@string/role_permissions_stream_description" app:cs_text="@string/video" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_use_voice_activity" app:cs_subtext="@string/role_permissions_use_vad_description" app:cs_text="@string/use_vad" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_priority_speaker" app:cs_subtext="@string/role_permissions_priority_speaker_description" app:cs_text="@string/priority_speaker" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_mute_members" app:cs_subtext="@string/role_permissions_mute_members_description" app:cs_text="@string/mute_members" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_deafen_members" app:cs_subtext="@string/role_permissions_deafen_members_description" app:cs_text="@string/deafen_members" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_move_members" app:cs_subtext="@string/role_permissions_move_members_description" app:cs_text="@string/move_members" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View android:id="@+id/stage_permissions_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/stage_permissions_title" android:text="@string/role_permissions_section_stage" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_request_to_speak" app:cs_subtext="@string/role_permissions_request_to_speak_description" app:cs_text="@string/request_to_speak" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/role_permissions_section_advanced" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_administrator" app:cs_subtext="@string/role_permissions_administrator_description" app:cs_text="@string/administrator" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/form_label_role_settings" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_hoist_checkedsetting" app:cs_text="@string/form_label_hoist_description" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_mentionable_checkedsetting" app:cs_subtext="@string/form_label_mentionable_description" app:cs_text="@string/form_label_mentionable" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/role_permissions_section_general_guild" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_read_messages" app:cs_subtext="@string/role_permissions_view_channel_description" app:cs_text="@string/role_permissions_view_channel" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_channels" app:cs_subtext="@string/role_permissions_manage_channels_description" app:cs_text="@string/manage_channels" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_roles" app:cs_subtext="@string/role_permissions_manage_roles_description" app:cs_text="@string/manage_roles" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_emojis_and_stickers" app:cs_subtext="@string/role_permissions_manage_emojis_and_stickers_description" app:cs_text="@string/manage_emojis_and_stickers" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_view_audit_log" app:cs_subtext="@string/role_permissions_view_audit_log_description" app:cs_text="@string/view_audit_log" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_view_guild_analytics" app:cs_subtext="@string/role_permissions_view_guild_analytics_description" app:cs_text="@string/view_guild_analytics" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_webhooks" app:cs_subtext="@string/role_permissions_manage_webhooks_description" app:cs_text="@string/manage_webhooks" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_server" app:cs_subtext="@string/role_permissions_manage_server_description" app:cs_text="@string/manage_server" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/role_permissions_section_membership" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_create_instant_invite" app:cs_subtext="@string/role_permissions_create_instant_invite_description" app:cs_text="@string/create_instant_invite" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_change_nickname" app:cs_subtext="@string/role_permissions_change_nickname_description" app:cs_text="@string/change_nickname" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_nicknames" app:cs_subtext="@string/role_permissions_manage_nicknames_description" app:cs_text="@string/manage_nicknames" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_kick_members" app:cs_subtext="@string/role_permissions_kick_members_description" app:cs_text="@string/kick_members" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_ban_members" app:cs_subtext="@string/role_permissions_ban_members_description" app:cs_text="@string/ban_members" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/role_permissions_section_text" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_send_messages" app:cs_subtext="@string/role_permissions_send_messages_description" app:cs_text="@string/send_messages" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_public_threads" app:cs_subtext="@string/role_permissions_use_public_threads_description" app:cs_text="@string/use_public_threads" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_private_threads" app:cs_subtext="@string/role_permissions_use_private_threads_description" app:cs_text="@string/use_private_threads" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_embed_links" app:cs_subtext="@string/role_permissions_embed_links_description" app:cs_text="@string/embed_links" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_attach_files" app:cs_subtext="@string/role_permissions_attach_files_description" app:cs_text="@string/attach_files" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_add_reactions" app:cs_subtext="@string/role_permissions_add_reactions_description" app:cs_text="@string/add_reactions" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_external_emojis" app:cs_subtext="@string/role_permissions_use_external_emojis_description" app:cs_text="@string/role_permissions_use_external_emojis" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_external_stickers" app:cs_subtext="@string/role_permissions_use_external_stickers_description" app:cs_text="@string/role_permissions_use_external_stickers" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_mention_everyone" app:cs_subtext="@string/role_permissions_mention_everyone_description" app:cs_text="@string/mention_everyone" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_messages" app:cs_subtext="@string/role_permissions_manage_messages_description" app:cs_text="@string/manage_messages" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_threads" app:cs_subtext="@string/role_permissions_manage_threads_description" app:cs_text="@string/manage_threads" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_read_message_history" app:cs_subtext="@string/role_permissions_read_message_history_description" app:cs_text="@string/read_message_history" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_send_tts_messages" app:cs_subtext="@string/send_tts_messages_description" app:cs_text="@string/send_tts_messages" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_use_application_commands" app:cs_subtext="@string/role_permissions_use_application_commands_guild_description" app:cs_text="@string/role_permissions_use_application_commands" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/role_permissions_section_voice" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_connect" app:cs_subtext="@string/role_permissions_connect_description" app:cs_text="@string/connect" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_speak" app:cs_subtext="@string/role_permissions_speak_description" app:cs_text="@string/speak" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_video" app:cs_subtext="@string/role_permissions_stream_description" app:cs_text="@string/video" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_use_voice_activity" app:cs_subtext="@string/role_permissions_use_vad_description" app:cs_text="@string/use_vad" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_priority_speaker" app:cs_subtext="@string/role_permissions_priority_speaker_description" app:cs_text="@string/priority_speaker" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_mute_members" app:cs_subtext="@string/role_permissions_mute_members_description" app:cs_text="@string/mute_members" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_deafen_members" app:cs_subtext="@string/role_permissions_deafen_members_description" app:cs_text="@string/deafen_members" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_voice_move_members" app:cs_subtext="@string/role_permissions_move_members_description" app:cs_text="@string/move_members" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View android:id="@+id/stage_permissions_divider" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/stage_permissions_title" android:text="@string/role_permissions_section_stage" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_request_to_speak" app:cs_subtext="@string/role_permissions_request_to_speak_description" app:cs_text="@string/request_to_speak" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/role_permissions_section_advanced" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_administrator" app:cs_subtext="@string/role_permissions_administrator_description" app:cs_text="@string/administrator" style="@style/UiKit_CheckedSetting_Themed"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/edit_role_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/edit_role_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_emoji_picker.xml b/app/src/main/res/layout/widget_emoji_picker.xml
index 517e15e51f..ee87afb029 100644
--- a/app/src/main/res/layout/widget_emoji_picker.xml
+++ b/app/src/main/res/layout/widget_emoji_picker.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/emoji_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/emoji_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <FrameLayout android:id="@+id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:animateLayoutChanges="true" android:backgroundTint="?attr/colorBackgroundTertiary">
-                <TextView android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/emoji_inline_search_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/res_2131952486_uikit_searchinput"/>
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/res_2131952486_uikit_searchinput"/>
-                <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/emoji_search_clear" android:src="@drawable/ic_search_16dp" android:contentDescription="@string/search_for_emoji" app:tint="?attr/colorTextMuted" style="@style/res_2131952487_uikit_searchinputclear"/>
+                <TextView android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@+id/emoji_inline_search_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/UiKit_SearchInput"/>
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/UiKit_SearchInput"/>
+                <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/emoji_search_clear" android:src="@drawable/ic_search_16dp" android:contentDescription="@string/search_for_emoji" app:tint="?attr/colorTextMuted" style="@style/UiKit_SearchInputClear"/>
             </FrameLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_height="match_parent" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawablePadding="16dp" app:drawableTopCompat="?attr/theme_expression_tray_search_icon_empty" style="@style/res_2131952563_uikit_textview"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_height="match_parent" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawablePadding="16dp" app:drawableTopCompat="?attr/theme_expression_tray_search_icon_empty" style="@style/UiKit_TextView"/>
     </com.discord.app.AppViewFlipper>
-    <View android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/emoji_picker_bottom_bar" style="@style/res_2131952416_uikit_divider"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <View android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/emoji_picker_bottom_bar" style="@style/UiKit_Divider"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/emoji_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/emoji_picker_category_recycler" android:layout_width="0dp" android:layout_height="match_parent" app:layout_constraintEnd_toStartOf="@+id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="0"/>
         <androidx.constraintlayout.widget.Barrier android:id="@+id/emoji_picker_category_barrier" android:layout_width="0dp" android:layout_height="match_parent" app:barrierDirection="5" app:constraint_referenced_ids="emoji_picker_unicode_emoji_shortcut_button,emoji_picker_backspace_icon"/>
         <ImageView android:id="@+id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@+id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@+id/emoji_picker_category_barrier" app:tint="?attr/colorInteractiveNormal" style="@style/ExpressionPickerButtonIcon"/>
diff --git a/app/src/main/res/layout/widget_emoji_sheet.xml b/app/src/main/res/layout/widget_emoji_sheet.xml
index d9fd84514c..f314f8be05 100644
--- a/app/src/main/res/layout/widget_emoji_sheet.xml
+++ b/app/src/main/res/layout/widget_emoji_sheet.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_sheet_flipper" android:layout_width="match_parent" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-        <LinearLayout android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/emoji_iv" android:layout_width="48dp" android:layout_height="48dp" android:adjustViewBounds="true" android:layout_marginEnd="16dp" app:actualImageScaleType="2" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/name_tv" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/emoji_info_tv" android:layout_marginTop="4dp" style="@style/res_2131952563_uikit_textview"/>
+<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/emoji_sheet_flipper" android:layout_width="match_parent" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_Page_LinearLayout">
+        <LinearLayout android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@+id/emoji_iv" android:layout_width="48dp" android:layout_height="48dp" android:adjustViewBounds="true" android:layout_marginEnd="16dp" app:actualImageScaleType="2" style="@style/UiKit_ImageView"/>
+            <LinearLayout android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/name_tv" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/emoji_info_tv" android:layout_marginTop="4dp" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
         <FrameLayout android:id="@+id/button_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp">
-            <com.google.android.material.button.MaterialButton android:id="@+id/join_btn" android:text="@string/nuf_join_server_button" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:gravity="center" android:id="@+id/premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952460_uikit_material_button_green"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/join_btn" android:text="@string/nuf_join_server_button" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:gravity="center" android:id="@+id/premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green"/>
         </FrameLayout>
         <FrameLayout android:id="@+id/favorite_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp">
-            <View android:layout_gravity="top" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952416_uikit_divider"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_add_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_add_to_favorites" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_remove_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_remove_from_favorites" style="@style/res_2131952464_uikit_material_button_red"/>
+            <View android:layout_gravity="top" android:background="?attr/colorBackgroundAccent" style="@style/UiKit_Divider"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_add_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_add_to_favorites" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/favorite_remove_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/emoji_remove_from_favorites" style="@style/UiKit_Material_Button_Red"/>
         </FrameLayout>
-        <LinearLayout android:id="@+id/guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952416_uikit_divider"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/bottom_header_tv" android:layout_marginTop="16dp" android:text="@string/emoji_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-            <LinearLayout android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:id="@+id/guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/UiKit_Divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/bottom_header_tv" android:layout_marginTop="16dp" android:text="@string/emoji_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+            <LinearLayout android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/guildAvatarWrap" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_iv" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guildAvatarText" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952563_uikit_textview"/>
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_iv" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/UiKit_ImageView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guildAvatarText" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit_TextView"/>
                 </FrameLayout>
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_name_tv" android:drawablePadding="8dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_info_tv" android:layout_marginTop="4dp" style="@style/res_2131952563_uikit_textview"/>
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_name_tv" android:drawablePadding="8dp" style="@style/UiKit_TextView_Bold"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_info_tv" android:layout_marginTop="4dp" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_enable_community_steps.xml b/app/src/main/res/layout/widget_enable_community_steps.xml
index 307a2b3d54..10438edb67 100644
--- a/app/src/main/res/layout/widget_enable_community_steps.xml
+++ b/app/src/main/res/layout/widget_enable_community_steps.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.steps.StepsView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/enable_community_stepsview" style="@style/res_2131952602_uikit_viewgroup_page"/>
+<com.discord.views.steps.StepsView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/enable_community_stepsview" style="@style/UiKit_ViewGroup_Page"/>
diff --git a/app/src/main/res/layout/widget_enable_mfa_steps.xml b/app/src/main/res/layout/widget_enable_mfa_steps.xml
index eee7565a1c..1e983fd687 100644
--- a/app/src/main/res/layout/widget_enable_mfa_steps.xml
+++ b/app/src/main/res/layout/widget_enable_mfa_steps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
     <com.discord.views.steps.StepsView android:id="@+id/enable_mfa_stepsview" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_enable_sms_backup_dialog.xml b/app/src/main/res/layout/widget_enable_sms_backup_dialog.xml
index c44dd6d047..aaaa8cf9de 100644
--- a/app/src/main/res/layout/widget_enable_sms_backup_dialog.xml
+++ b/app/src/main/res/layout/widget_enable_sms_backup_dialog.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/enable_sms_backup_header" android:padding="16dp" android:text="@string/mfa_sms_auth" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/enable_sms_backup_header" android:padding="16dp" android:text="@string/mfa_sms_auth" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/enable_sms_backup_body" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/enable_sms_backup_password_wrap" android:hint="@string/form_label_password" style="@style/res_2131952559_uikit_textinputlayout_primary_password">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/enable_sms_backup_body" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/enable_sms_backup_password_wrap" android:hint="@string/form_label_password" style="@style/UiKit_TextInputLayout_Primary_Password">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:id="@+id/enable_sms_backup_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:id="@+id/enable_sms_backup_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
         <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@+id/enable_sms_backup_confirm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:lb_background_color="@color/status_green_600" app:lb_progress_color="@color/white" app:lb_text="@string/enable" app:lb_text_color="@drawable/button_text_color_primary_100"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_enable_two_factor_password_dialog.xml b/app/src/main/res/layout/widget_enable_two_factor_password_dialog.xml
index a94396b46b..be065e206f 100644
--- a/app/src/main/res/layout/widget_enable_two_factor_password_dialog.xml
+++ b/app/src/main/res/layout/widget_enable_two_factor_password_dialog.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/enable_two_factor_password_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/enable_two_factor_password_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/two_fa_enable" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/enable_two_factor_password_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/enable_two_factor_password_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/two_fa_enable" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:gravity="center" android:id="@+id/enable_two_factor_password_body_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_gravity="start" android:id="@+id/enable_two_factor_password_body_text" android:padding="16dp" android:layout_width="match_parent" android:text="@string/user_settings_edit_account_password_label" android:textAlignment="textStart" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/enable_two_factor_password_view_input" android:layout_margin="8dp" android:hint="@string/form_label_password" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:gravity="center" android:id="@+id/enable_two_factor_password_body_container" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_gravity="start" android:id="@+id/enable_two_factor_password_body_text" android:padding="16dp" android:layout_width="match_parent" android:text="@string/user_settings_edit_account_password_label" android:textAlignment="textStart" style="@style/UiKit_TextView"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/enable_two_factor_password_view_input" android:layout_margin="8dp" android:hint="@string/form_label_password" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
         <com.google.android.material.button.MaterialButton android:id="@+id/enable_two_factor_password_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="?attr/buttonBarNegativeButtonStyle"/>
         <com.discord.views.LoadingButton android:id="@+id/enable_two_factor_password_ok" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:lb_progress_color="@color/white" app:lb_text="@string/confirm"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_end_stage_bottom_sheet.xml b/app/src/main/res/layout/widget_end_stage_bottom_sheet.xml
index eb12789f69..bc7475d816 100644
--- a/app/src/main/res/layout/widget_end_stage_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_end_stage_bottom_sheet.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:paddingLeft="16dp" android:paddingTop="24dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:paddingLeft="16dp" android:paddingTop="24dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" app:stv_subtitle="@string/explicit_end_stage_subtitle" app:stv_title="@string/explicit_end_stage_title"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/cancel" android:layout_marginTop="24dp" android:text="@string/explicit_end_stage_cancel" style="@style/res_2131952467_uikit_material_button_secondary"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/confirm" android:layout_marginTop="8dp" android:text="@string/explicit_end_stage_confirm_mobile" style="@style/res_2131952464_uikit_material_button_red"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/cancel" android:layout_marginTop="24dp" android:text="@string/explicit_end_stage_cancel" style="@style/UiKit_Material_Button_Secondary"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/confirm" android:layout_marginTop="8dp" android:text="@string/explicit_end_stage_confirm_mobile" style="@style/UiKit_Material_Button_Red"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_expression_tray.xml b/app/src/main/res/layout/widget_expression_tray.xml
index 549e5b1f3c..86f671be8d 100644
--- a/app/src/main/res/layout/widget_expression_tray.xml
+++ b/app/src/main/res/layout/widget_expression_tray.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/expression_tray_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.discord.utilities.views.ContentResizingCoordinatorLayout android:id="@+id/expression_tray_landing_page" style="@style/res_2131952602_uikit_viewgroup_page">
-        <com.google.android.material.appbar.AppBarLayout android:id="@+id/expression_tray_toolbar_layout" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/expression_tray_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.discord.utilities.views.ContentResizingCoordinatorLayout android:id="@+id/expression_tray_landing_page" style="@style/UiKit_ViewGroup_Page">
+        <com.google.android.material.appbar.AppBarLayout android:id="@+id/expression_tray_toolbar_layout" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
             <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/expression_tray_toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_scrollFlags="5">
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/expression_tray_segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <com.discord.views.segmentedcontrol.SegmentedControlContainer android:id="@+id/expression_tray_segmented_control" android:background="@drawable/drawable_segmented_control_container_bg" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                         <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/expression_tray_emoji_card" android:contentDescription="@string/expression_picker_open_emoji_picker_a11y_label" app:segment_text="@string/expression_picker_emoji" style="@style/SegmentedControlTabCard"/>
                         <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/expression_tray_gif_card" android:contentDescription="@string/expression_picker_open_gif_picker_a11y_label" app:segment_text="@string/expression_picker_gif" style="@style/SegmentedControlTabCard"/>
                         <com.discord.views.segmentedcontrol.CardSegment android:id="@+id/expression_tray_sticker_card" android:contentDescription="@string/expression_picker_open_sticker_picker_a11y_label" app:segment_text="@string/expression_picker_sticker" style="@style/SegmentedControlTabCard"/>
                     </com.discord.views.segmentedcontrol.SegmentedControlContainer>
                     <com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@+id/expression_tray_search_bar" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:foreground="?attr/bg_pressed_highlight" android:animateLayoutChanges="true" app:bottomLeftRadius="4dp" app:bottomRightRadius="4dp" app:topLeftRadius="4dp" app:topRightRadius="4dp">
-                        <TextView android:gravity="center_vertical" android:id="@+id/expression_tray_search_button" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/res_2131952486_uikit_searchinput"/>
+                        <TextView android:gravity="center_vertical" android:id="@+id/expression_tray_search_button" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:hint="@string/search_for_emoji" style="@style/UiKit_SearchInput"/>
                         <ImageView android:id="@+id/expression_tray_search_icon" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?attr/colorTextMuted"/>
                     </com.discord.utilities.view.rounded.RoundedRelativeLayout>
                 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_fatal_crash.xml b/app/src/main/res/layout/widget_fatal_crash.xml
index 0dc35be4b7..2b76de3b47 100644
--- a/app/src/main/res/layout/widget_fatal_crash.xml
+++ b/app/src/main/res/layout/widget_fatal_crash.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:padding="24dp" android:scrollbars="none" android:clipToPadding="false" android:layout_marginBottom="8dp" android:fillViewport="true" android:overScrollMode="never" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout android:orientation="vertical" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="8dp" android:src="?attr/img_wumpus_tophat" style="@style/res_2131952448_uikit_imageview"/>
-        <LinearLayout android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_marginBottom="8dp" android:text="@string/crash_unexpected" style="@style/res_2131952567_uikit_textview_h2"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:autoLink="web" android:id="@+id/fatal_crash_testers_invite" android:layout_marginBottom="8dp" android:text="@string/crash_testers_invite" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:text="@string/crash_disclaimer" style="@style/res_2131952563_uikit_textview"/>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:padding="24dp" android:scrollbars="none" android:clipToPadding="false" android:layout_marginBottom="8dp" android:fillViewport="true" android:overScrollMode="never" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout android:orientation="vertical" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="8dp" android:src="?attr/img_wumpus_tophat" style="@style/UiKit_ImageView"/>
+        <LinearLayout android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_marginBottom="8dp" android:text="@string/crash_unexpected" style="@style/UiKit_TextView_H2"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:autoLink="web" android:id="@+id/fatal_crash_testers_invite" android:layout_marginBottom="8dp" android:text="@string/crash_testers_invite" style="@style/UiKit_TextView"/>
+            <TextView android:text="@string/crash_disclaimer" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center_vertical" android:id="@+id/fatal_crash_details" android:layout_height="0dp" android:layout_marginTop="8dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_marginBottom="8dp" android:text="@string/crash_details" style="@style/res_2131952567_uikit_textview_h2"/>
-            <TextView android:id="@+id/fatal_crash_app_version" android:layout_marginBottom="8dp" android:text="@string/crash_app_version" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:id="@+id/fatal_crash_device" android:layout_marginBottom="8dp" android:text="@string/crash_device" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:id="@+id/fatal_crash_os_version" android:layout_marginBottom="8dp" android:text="@string/crash_device_version" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:id="@+id/fatal_crash_source" android:layout_marginBottom="8dp" android:text="@string/crash_source" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:id="@+id/fatal_crash_time" android:text="@string/crash_timestamp" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:gravity="center_vertical" android:id="@+id/fatal_crash_details" android:layout_height="0dp" android:layout_marginTop="8dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_marginBottom="8dp" android:text="@string/crash_details" style="@style/UiKit_TextView_H2"/>
+            <TextView android:id="@+id/fatal_crash_app_version" android:layout_marginBottom="8dp" android:text="@string/crash_app_version" style="@style/UiKit_TextView"/>
+            <TextView android:id="@+id/fatal_crash_device" android:layout_marginBottom="8dp" android:text="@string/crash_device" style="@style/UiKit_TextView"/>
+            <TextView android:id="@+id/fatal_crash_os_version" android:layout_marginBottom="8dp" android:text="@string/crash_device_version" style="@style/UiKit_TextView"/>
+            <TextView android:id="@+id/fatal_crash_source" android:layout_marginBottom="8dp" android:text="@string/crash_source" style="@style/UiKit_TextView"/>
+            <TextView android:id="@+id/fatal_crash_time" android:text="@string/crash_timestamp" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/widget_feedback_sheet.xml b/app/src/main/res/layout/widget_feedback_sheet.xml
index dabb4681d1..75447c0304 100644
--- a/app/src/main/res/layout/widget_feedback_sheet.xml
+++ b/app/src/main/res/layout/widget_feedback_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/feedback_sheet_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <FrameLayout android:background="?attr/colorBackgroundTertiary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/feedback_sheet_title" android:text="@string/call_feedback_sheet_title" style="@style/res_2131952453_uikit_listitem_icon"/>
-            <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/feedback_sheet_close_button" android:background="?attr/bg_pressed_highlight" android:padding="16dp" android:src="?attr/ic_close_24dp" android:contentDescription="@string/close" style="@style/res_2131952448_uikit_imageview"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/feedback_sheet_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <FrameLayout android:background="?attr/colorBackgroundTertiary" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/feedback_sheet_title" android:text="@string/call_feedback_sheet_title" style="@style/UiKit_ListItem_Icon"/>
+            <ImageView android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/feedback_sheet_close_button" android:background="?attr/bg_pressed_highlight" android:padding="16dp" android:src="?attr/ic_close_24dp" android:contentDescription="@string/close" style="@style/UiKit_ImageView"/>
         </FrameLayout>
         <com.discord.widgets.voice.feedback.FeedbackView android:id="@+id/feedback_sheet_feedback_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_friends_add.xml b/app/src/main/res/layout/widget_friends_add.xml
index 2d826d66ec..f373cdf358 100644
--- a/app/src/main/res/layout/widget_friends_add.xml
+++ b/app/src/main/res/layout/widget_friends_add.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/action_bar_toolbar_layout" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <LinearLayout app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.utilities.simple_pager.SimplePager android:id="@+id/add_friend_view_pager" android:layout_width="match_parent" android:layout_height="match_parent">
-            <com.google.android.material.tabs.TabLayout android:id="@+id/action_bar_tabs" android:background="?attr/toolbarColor" android:layout_width="match_parent" android:layout_height="wrap_content" app:tabGravity="0" app:tabIndicatorHeight="0dp" app:tabMaxWidth="0dp" app:tabMode="1" app:tabSelectedTextColor="?attr/tabSelectedTextColor" app:tabTextAppearance="@style/res_2131951630_app_tablayout_text" app:tabTextColor="?attr/tabTextColor"/>
+            <com.google.android.material.tabs.TabLayout android:id="@+id/action_bar_tabs" android:background="?attr/toolbarColor" android:layout_width="match_parent" android:layout_height="wrap_content" app:tabGravity="0" app:tabIndicatorHeight="0dp" app:tabMaxWidth="0dp" app:tabMode="1" app:tabSelectedTextColor="?attr/tabSelectedTextColor" app:tabTextAppearance="@style/App_TabLayout_Text" app:tabTextColor="?attr/tabTextColor"/>
         </com.discord.utilities.simple_pager.SimplePager>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_friends_add_by_id.xml b/app/src/main/res/layout/widget_friends_add_by_id.xml
index 99b7cf4b17..54916ecc98 100644
--- a/app/src/main/res/layout/widget_friends_add_by_id.xml
+++ b/app/src/main/res/layout/widget_friends_add_by_id.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:scrollbars="none" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:gravity="center" android:id="@+id/friends_add_container" android:background="?attr/colorBackgroundPrimary" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:scrollbars="none" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:gravity="center" android:id="@+id/friends_add_container" android:background="?attr/colorBackgroundPrimary" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_save_your_group" android:importantForAccessibility="no"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="32dp" android:text="@string/add_by_id_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="8dp" android:text="@string/add_by_id_body" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-        <LinearLayout android:layout_marginTop="32dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/friends_add_text_edit_wrap" android:layout_marginBottom="4dp" android:hint="@string/username_and_tag" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="32dp" android:text="@string/add_by_id_title" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_gravity="center" android:layout_marginTop="8dp" android:text="@string/add_by_id_body" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+        <LinearLayout android:layout_marginTop="32dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/friends_add_text_edit_wrap" android:layout_marginBottom="4dp" android:hint="@string/username_and_tag" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="start" android:id="@+id/friend_add_username_indicator" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:enabled="false" android:ellipsize="end" android:id="@+id/friends_add_send" android:layout_marginTop="16dp" android:text="@string/add_friend_add_manually" style="@style/res_2131951997_friendsadd_button"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="start" android:id="@+id/friend_add_username_indicator" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:enabled="false" android:ellipsize="end" android:id="@+id/friends_add_send" android:layout_marginTop="16dp" android:text="@string/add_friend_add_manually" style="@style/FriendsAdd_Button"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_friends_list.xml b/app/src/main/res/layout/widget_friends_list.xml
index 0d3dcede10..c0277153a7 100644
--- a/app/src/main/res/layout/widget_friends_list.xml
+++ b/app/src/main/res/layout/widget_friends_list.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
     <com.discord.app.AppViewFlipper android:id="@+id/friends_list_flipper" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/action_bar_toolbar_layout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/friends_list_recycler" android:background="?attr/colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <ScrollView android:layout_gravity="center" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-            <com.discord.widgets.friends.EmptyFriendsStateView android:id="@+id/friends_list_empty_friends_state_view" android:padding="16dp" app:ef_title_text_size="@dimen/uikit_textsize_xlarge" style="@style/res_2131952589_uikit_viewgroup"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/friends_list_recycler" android:background="?attr/colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <ScrollView android:layout_gravity="center" style="@style/UiKit_ViewGroup_ScrollView">
+            <com.discord.widgets.friends.EmptyFriendsStateView android:id="@+id/friends_list_empty_friends_state_view" android:padding="16dp" app:ef_title_text_size="@dimen/uikit_textsize_xlarge" style="@style/UiKit_ViewGroup"/>
         </ScrollView>
-        <ScrollView android:layout_gravity="center" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-            <com.discord.widgets.friends.EmptyFriendsStateContactSyncView android:id="@+id/friends_list_empty_friends_state_cs_view" android:padding="16dp" app:ef_title_text_size="@dimen/uikit_textsize_xlarge" style="@style/res_2131952589_uikit_viewgroup"/>
+        <ScrollView android:layout_gravity="center" style="@style/UiKit_ViewGroup_ScrollView">
+            <com.discord.widgets.friends.EmptyFriendsStateContactSyncView android:id="@+id/friends_list_empty_friends_state_cs_view" android:padding="16dp" app:ef_title_text_size="@dimen/uikit_textsize_xlarge" style="@style/UiKit_ViewGroup"/>
         </ScrollView>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/friends_list_loading" android:background="?attr/colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/friends_list_loading" android:background="?attr/colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </com.discord.app.AppViewFlipper>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0dp" style="@style/res_2131951663_apptheme_toolbar"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0dp" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_friends_list_adapter_item_friend.xml b/app/src/main/res/layout/widget_friends_list_adapter_item_friend.xml
index 087a6c4998..92611ea9ac 100644
--- a/app/src/main/res/layout/widget_friends_list_adapter_item_friend.xml
+++ b/app/src/main/res/layout/widget_friends_list_adapter_item_friend.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952002_friendslist_friendsitem">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:importantForAccessibility="noHideDescendants" style="@style/res_2131952005_friendslist_friendsitem_avatar"/>
-    <com.discord.views.StatusView android:id="@+id/friends_list_item_status" android:layout_alignBottom="@+id/friends_list_item_avatar" android:layout_alignEnd="@+id/friends_list_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="3dp" app:sv_corner_radius="4dp" style="@style/res_2131952008_friendslist_friendsitem_status"/>
-    <LinearLayout android:id="@+id/friends_list_item_text" android:layout_toStartOf="@+id/friends_list_item_buttons_wrap" android:layout_toEndOf="@+id/friends_list_item_avatar" style="@style/res_2131952009_friendslist_friendsitem_text">
-        <TextView android:id="@+id/friends_list_item_name" android:text="@string/sample_user_name" style="@style/res_2131952007_friendslist_friendsitem_name"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/friends_list_item_activity" android:text="@string/sample_user_presence" style="@style/res_2131952004_friendslist_friendsitem_activity"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/FriendsList_FriendsItem">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:importantForAccessibility="noHideDescendants" style="@style/FriendsList_FriendsItem_Avatar"/>
+    <com.discord.views.StatusView android:id="@+id/friends_list_item_status" android:layout_alignBottom="@+id/friends_list_item_avatar" android:layout_alignEnd="@+id/friends_list_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="3dp" app:sv_corner_radius="4dp" style="@style/FriendsList_FriendsItem_Status"/>
+    <LinearLayout android:id="@+id/friends_list_item_text" android:layout_toStartOf="@+id/friends_list_item_buttons_wrap" android:layout_toEndOf="@+id/friends_list_item_avatar" style="@style/FriendsList_FriendsItem_Text">
+        <TextView android:id="@+id/friends_list_item_name" android:text="@string/sample_user_name" style="@style/FriendsList_FriendsItem_Name"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/friends_list_item_activity" android:text="@string/sample_user_presence" style="@style/FriendsList_FriendsItem_Activity"/>
     </LinearLayout>
-    <LinearLayout android:id="@+id/friends_list_item_buttons_wrap" style="@style/res_2131952006_friendslist_friendsitem_buttonswrap">
-        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_call_button" android:contentDescription="@string/call" android:layout_marginEnd="8dp" app:srcCompat="@drawable/ic_user_profile_action_call_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
-        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_chat_button" android:contentDescription="@string/dm" android:layout_marginStart="8dp" app:srcCompat="@drawable/ic_chat_message_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
+    <LinearLayout android:id="@+id/friends_list_item_buttons_wrap" style="@style/FriendsList_FriendsItem_ButtonsWrap">
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_call_button" android:contentDescription="@string/call" android:layout_marginEnd="8dp" app:srcCompat="@drawable/ic_user_profile_action_call_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/FriendsList_FriendsItem_ActionButton"/>
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_chat_button" android:contentDescription="@string/dm" android:layout_marginStart="8dp" app:srcCompat="@drawable/ic_chat_message_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/FriendsList_FriendsItem_ActionButton"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_friends_list_adapter_item_header.xml b/app/src/main/res/layout/widget_friends_list_adapter_item_header.xml
index ea4c842e74..7752231f93 100644
--- a/app/src/main/res/layout/widget_friends_list_adapter_item_header.xml
+++ b/app/src/main/res/layout/widget_friends_list_adapter_item_header.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952010_friendslist_itemheader">
-    <TextView android:id="@+id/friends_list_item_header_text" style="@style/res_2131952012_friendslist_itemheader_title"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/FriendsList_ItemHeader">
+    <TextView android:id="@+id/friends_list_item_header_text" style="@style/FriendsList_ItemHeader_Title"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_friends_list_adapter_item_loading.xml b/app/src/main/res/layout/widget_friends_list_adapter_item_loading.xml
index e947692c25..3d145b9fdc 100644
--- a/app/src/main/res/layout/widget_friends_list_adapter_item_loading.xml
+++ b/app/src/main/res/layout/widget_friends_list_adapter_item_loading.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="48dp">
-    <View android:id="@+id/blank_item_avatar_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952005_friendslist_friendsitem_avatar"/>
+    <View android:id="@+id/blank_item_avatar_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/FriendsList_FriendsItem_Avatar"/>
     <View android:id="@+id/blank_item_username_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="0dp" android:layout_height="16dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/blank_item_avatar_placeholder" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_percent="0.7"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_friends_list_adapter_item_pending.xml b/app/src/main/res/layout/widget_friends_list_adapter_item_pending.xml
index 159e010397..c5c5501c2b 100644
--- a/app/src/main/res/layout/widget_friends_list_adapter_item_pending.xml
+++ b/app/src/main/res/layout/widget_friends_list_adapter_item_pending.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952002_friendslist_friendsitem">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:importantForAccessibility="no" style="@style/res_2131952005_friendslist_friendsitem_avatar"/>
-    <com.discord.views.StatusView android:id="@+id/friends_list_item_status" android:layout_alignBottom="@+id/friends_list_item_avatar" android:layout_alignEnd="@+id/friends_list_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="2dp" app:sv_corner_radius="4dp" style="@style/res_2131952008_friendslist_friendsitem_status"/>
-    <LinearLayout android:id="@+id/friends_list_item_text" android:layout_toStartOf="@+id/friends_list_item_buttons_wrap" android:layout_toEndOf="@+id/friends_list_item_avatar" style="@style/res_2131952009_friendslist_friendsitem_text">
-        <TextView android:id="@+id/friends_list_item_name" android:text="@string/sample_user_name" style="@style/res_2131952007_friendslist_friendsitem_name"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/friends_list_item_activity" android:text="@string/sample_user_presence" style="@style/res_2131952004_friendslist_friendsitem_activity"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/FriendsList_FriendsItem">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:importantForAccessibility="no" style="@style/FriendsList_FriendsItem_Avatar"/>
+    <com.discord.views.StatusView android:id="@+id/friends_list_item_status" android:layout_alignBottom="@+id/friends_list_item_avatar" android:layout_alignEnd="@+id/friends_list_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="2dp" app:sv_corner_radius="4dp" style="@style/FriendsList_FriendsItem_Status"/>
+    <LinearLayout android:id="@+id/friends_list_item_text" android:layout_toStartOf="@+id/friends_list_item_buttons_wrap" android:layout_toEndOf="@+id/friends_list_item_avatar" style="@style/FriendsList_FriendsItem_Text">
+        <TextView android:id="@+id/friends_list_item_name" android:text="@string/sample_user_name" style="@style/FriendsList_FriendsItem_Name"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/friends_list_item_activity" android:text="@string/sample_user_presence" style="@style/FriendsList_FriendsItem_Activity"/>
     </LinearLayout>
-    <LinearLayout android:id="@+id/friends_list_item_buttons_wrap" style="@style/res_2131952006_friendslist_friendsitem_buttonswrap">
-        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_accept_button" android:layout_marginEnd="8dp" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
-        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_decline_button" android:layout_marginStart="8dp" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/res_2131952003_friendslist_friendsitem_actionbutton"/>
+    <LinearLayout android:id="@+id/friends_list_item_buttons_wrap" style="@style/FriendsList_FriendsItem_ButtonsWrap">
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_accept_button" android:layout_marginEnd="8dp" app:srcCompat="@drawable/ic_check_green_24dp" style="@style/FriendsList_FriendsItem_ActionButton"/>
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/friends_list_item_decline_button" android:layout_marginStart="8dp" app:srcCompat="@drawable/ic_close_white_24dp" app:tint="@color/status_red" style="@style/FriendsList_FriendsItem_ActionButton"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_friends_list_contact_sync_upsell.xml b/app/src/main/res/layout/widget_friends_list_contact_sync_upsell.xml
index 8c9b6bb75e..b26545d3b6 100644
--- a/app/src/main/res/layout/widget_friends_list_contact_sync_upsell.xml
+++ b/app/src/main/res/layout/widget_friends_list_contact_sync_upsell.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/friends_list_contact_sync_upsell_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131951998_friendslist_contactsyncupsell_card">
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/friends_list_contact_sync_upsell_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/FriendsList_ContactSyncUpsell_Card">
     <androidx.constraintlayout.widget.ConstraintLayout android:padding="12dp" android:layout_width="match_parent" android:layout_height="wrap_content">
         <ImageView android:id="@+id/friends_list_contact_sync_upsell_icon" android:layout_width="40dp" android:layout_height="40dp" android:src="@drawable/ic_contact_sync_friends_list_upsell" android:contentDescription="@string/contact_sync_landing_title" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friends_list_contact_sync_upsell_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friends_list_contact_sync_upsell_subtitle" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friends_list_contact_sync_upsell_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_subtitle" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" app:layout_constraintTop_toBottomOf="@+id/friends_list_contact_sync_upsell_title" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/friends_list_contact_sync_upsell_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_title" android:layout_marginStart="16dp" app:layout_constraintBottom_toTopOf="@+id/friends_list_contact_sync_upsell_subtitle" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/friends_list_contact_sync_upsell_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/contact_sync_find_friends_subtitle" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/friends_list_contact_sync_upsell_icon" app:layout_constraintTop_toBottomOf="@+id/friends_list_contact_sync_upsell_title" style="@style/UiKit_TextView"/>
         <ImageView android:id="@+id/friends_list_contact_sync_upsell_arrow" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_arrow_right_24dp" android:contentDescription="@string/contact_sync_landing_title" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/widget_friends_list_expandable_header.xml b/app/src/main/res/layout/widget_friends_list_expandable_header.xml
index 0dbe302856..d905bfdd9a 100644
--- a/app/src/main/res/layout/widget_friends_list_expandable_header.xml
+++ b/app/src/main/res/layout/widget_friends_list_expandable_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952010_friendslist_itemheader">
-    <TextView android:id="@+id/friends_list_pending_item_header_text" style="@style/res_2131952012_friendslist_itemheader_title"/>
-    <TextView android:id="@+id/friends_list_expandable_header_button" android:text="@string/friends_pending_request_expand" app:drawableEndCompat="@drawable/ic_arrow_right_24dp" app:drawableTint="?attr/colorHeaderSecondary" style="@style/res_2131952011_friendslist_itemheader_expandbutton"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/FriendsList_ItemHeader">
+    <TextView android:id="@+id/friends_list_pending_item_header_text" style="@style/FriendsList_ItemHeader_Title"/>
+    <TextView android:id="@+id/friends_list_expandable_header_button" android:text="@string/friends_pending_request_expand" app:drawableEndCompat="@drawable/ic_arrow_right_24dp" app:drawableTint="?attr/colorHeaderSecondary" style="@style/FriendsList_ItemHeader_ExpandButton"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_friends_nearby.xml b/app/src/main/res/layout/widget_friends_nearby.xml
index 33762f10af..53dad5cbc1 100644
--- a/app/src/main/res/layout/widget_friends_nearby.xml
+++ b/app/src/main/res/layout/widget_friends_nearby.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:gravity="center" android:background="?attr/colorBackgroundPrimary" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:gravity="center" android:background="?attr/colorBackgroundPrimary" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.rlottie.RLottieImageView android:id="@+id/nearby_friends_searching_lottie" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/nearby_friends_searching_title" android:layout_marginTop="32dp" android:text="@string/add_friend_nearby_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/nearby_friends_searching_body" android:layout_marginTop="8dp" android:text="@string/add_friend_nearby_body" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="center" android:id="@+id/nearby_friends_learn_more" android:padding="4dp" android:layout_marginTop="4dp" android:text="@string/learn_more" app:fontFamily="?attr/font_primary_semibold" style="@style/res_2131952572_uikit_textview_link"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/nearby_friends_recycler" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginTop="32dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@+id/nearby_friends_enable" android:layout_marginTop="32dp" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/res_2131951997_friendsadd_button"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/nearby_friends_searching_title" android:layout_marginTop="32dp" android:text="@string/add_friend_nearby_title" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/nearby_friends_searching_body" android:layout_marginTop="8dp" android:text="@string/add_friend_nearby_body" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="center" android:id="@+id/nearby_friends_learn_more" android:padding="4dp" android:layout_marginTop="4dp" android:text="@string/learn_more" app:fontFamily="?attr/font_primary_semibold" style="@style/UiKit_TextView_Link"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/nearby_friends_recycler" android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:layout_marginTop="32dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <com.google.android.material.button.MaterialButton android:layout_gravity="center_horizontal" android:id="@+id/nearby_friends_enable" android:layout_marginTop="32dp" android:text="@string/add_friend_nearby_enable" android:textAllCaps="true" style="@style/FriendsAdd_Button"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_gif_category.xml b/app/src/main/res/layout/widget_gif_category.xml
index b93528cf3a..1fba11a356 100644
--- a/app/src/main/res/layout/widget_gif_category.xml
+++ b/app/src/main/res/layout/widget_gif_category.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.discord.utilities.views.ContentResizingCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/gif_category_container" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/colorBackgroundSecondary" style="@style/res_2131951638_apptheme_appbarlayout_flat">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/colorBackgroundSecondary" style="@style/AppTheme_AppBarLayout_Flat">
         <com.google.android.material.appbar.CollapsingToolbarLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_scrollFlags="5">
-            <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/gif_category_title" android:background="?attr/bg_pressed_highlight" android:padding="12dp" android:layout_width="match_parent" android:minHeight="56dp" app:drawableStartCompat="@drawable/ic_chevron_left_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@+id/gif_category_title" android:background="?attr/bg_pressed_highlight" android:padding="12dp" android:layout_width="match_parent" android:minHeight="56dp" app:drawableStartCompat="@drawable/ic_chevron_left_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_category_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:visibility="gone" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_category_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" app:glv_is_staggered="true" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_category_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:visibility="gone" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_category_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" app:glv_is_staggered="true" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </com.discord.utilities.views.ContentResizingCoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_gif_picker.xml b/app/src/main/res/layout/widget_gif_picker.xml
index b01d9af40d..40cbb5b64b 100644
--- a/app/src/main/res/layout/widget_gif_picker.xml
+++ b/app/src/main/res/layout/widget_gif_picker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/gif_picker_container" android:background="?attr/colorBackgroundSecondary" android:paddingStart="12dp" android:paddingEnd="12dp" style="@style/res_2131952602_uikit_viewgroup_page">
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_picker_category_recycler" android:paddingTop="4dp" android:visibility="gone" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_picker_loading_view" android:paddingTop="12dp" android:layout_height="match_parent" app:glv_is_staggered="false" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/gif_picker_container" android:background="?attr/colorBackgroundSecondary" android:paddingStart="12dp" android:paddingEnd="12dp" style="@style/UiKit_ViewGroup_Page">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_picker_category_recycler" android:paddingTop="4dp" android:visibility="gone" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_picker_loading_view" android:paddingTop="12dp" android:layout_height="match_parent" app:glv_is_staggered="false" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_gif_picker_search.xml b/app/src/main/res/layout/widget_gif_picker_search.xml
index 02d444ef77..fc910aa8a9 100644
--- a/app/src/main/res/layout/widget_gif_picker_search.xml
+++ b/app/src/main/res/layout/widget_gif_picker_search.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <com.discord.views.SearchInputView android:id="@+id/search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="16dp" android:layout_marginRight="12dp" android:layout_marginBottom="16dp" app:siv_hint="@string/search_tenor" app:siv_search_content_description="@string/search_tenor"/>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/gif_search_view_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_search_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_search_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" app:glv_is_staggered="true" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/gif_search_view_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/gif_search_gif_recycler" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@+id/gif_search_loading_view" android:paddingLeft="12dp" android:paddingRight="12dp" android:layout_height="match_parent" app:glv_is_staggered="true" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_global_search.xml b/app/src/main/res/layout/widget_global_search.xml
index 393de79022..07ccc038cd 100644
--- a/app/src/main/res/layout/widget_global_search.xml
+++ b/app/src/main/res/layout/widget_global_search.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorPrimary" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/res_2131951637_apptheme_appbarlayout">
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/global_search_bar" style="@style/res_2131952562_uikit_textinputlayout_search_actionbar_filter">
-            <com.google.android.material.textfield.TextInputEditText android:id="@+id/global_search_bar_text" android:hint="@string/quickswitcher_placeholder" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorPrimary" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/AppTheme_AppBarLayout">
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/global_search_bar" style="@style/UiKit_TextInputLayout_Search_ActionBar_Filter">
+            <com.google.android.material.textfield.TextInputEditText android:id="@+id/global_search_bar_text" android:hint="@string/quickswitcher_placeholder" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search">
                 <requestFocus/>
             </com.google.android.material.textfield.TextInputEditText>
         </com.google.android.material.textfield.TextInputLayout>
         <com.discord.utilities.view.scrolling.NestedScrollableHost android:layout_width="match_parent" android:layout_height="wrap_content">
-            <androidx.recyclerview.widget.RecyclerView android:id="@+id/global_search_guild_list" style="@style/res_2131952429_uikit_guildslist_horiz"/>
+            <androidx.recyclerview.widget.RecyclerView android:id="@+id/global_search_guild_list" style="@style/UiKit_GuildsList_Horiz"/>
         </com.discord.utilities.view.scrolling.NestedScrollableHost>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/global_search_view_flipper" android:background="?attr/colorBackgroundPrimary" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/global_search_recycler" android:paddingTop="8dp" android:paddingBottom="64dp" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="0dp" style="@style/res_2131952589_uikit_viewgroup">
-            <LinearLayout android:gravity="center_horizontal" android:layout_margin="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <ImageView android:src="@drawable/img_quick_switcher_empty" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-                <TextView android:layout_margin="16dp" android:text="@string/quickswitcher_tutorial_message_search" style="@style/res_2131952563_uikit_textview"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/global_search_view_flipper" android:background="?attr/colorBackgroundPrimary" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/global_search_recycler" android:paddingTop="8dp" android:paddingBottom="64dp" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="0dp" style="@style/UiKit_ViewGroup">
+            <LinearLayout android:gravity="center_horizontal" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <ImageView android:src="@drawable/img_quick_switcher_empty" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+                <TextView android:layout_margin="16dp" android:text="@string/quickswitcher_tutorial_message_search" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-        <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-            <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="0dp" style="@style/res_2131952589_uikit_viewgroup">
-                <LinearLayout android:gravity="center_horizontal" android:layout_margin="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <ImageView android:src="?attr/img_empty_search" android:contentDescription="@string/search_no_results" style="@style/res_2131952450_uikit_imageview_hideinlandscape"/>
-                    <TextView app:drawableTopCompat="@null" style="@style/res_2131952576_uikit_textview_noresults"/>
-                    <View android:layout_marginTop="4dp" android:layout_marginBottom="4dp" style="@style/res_2131952416_uikit_divider"/>
-                    <TextView android:layout_margin="8dp" android:text="@string/other_options" style="@style/res_2131952567_uikit_textview_h2"/>
-                    <com.google.android.material.button.MaterialButton android:id="@+id/global_search_add_a_friend_btn" android:text="@string/add_friend" style="@style/res_2131952458_uikit_material_button"/>
-                    <com.google.android.material.button.MaterialButton android:id="@+id/global_search_join_guild_btn" android:text="@string/join_server_button_cta" style="@style/res_2131952458_uikit_material_button"/>
+        <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+            <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="0dp" style="@style/UiKit_ViewGroup">
+                <LinearLayout android:gravity="center_horizontal" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <ImageView android:src="?attr/img_empty_search" android:contentDescription="@string/search_no_results" style="@style/UiKit_ImageView_HideInLandscape"/>
+                    <TextView app:drawableTopCompat="@null" style="@style/UiKit_TextView_NoResults"/>
+                    <View android:layout_marginTop="4dp" android:layout_marginBottom="4dp" style="@style/UiKit_Divider"/>
+                    <TextView android:layout_margin="8dp" android:text="@string/other_options" style="@style/UiKit_TextView_H2"/>
+                    <com.google.android.material.button.MaterialButton android:id="@+id/global_search_add_a_friend_btn" android:text="@string/add_friend" style="@style/UiKit_Material_Button"/>
+                    <com.google.android.material.button.MaterialButton android:id="@+id/global_search_join_guild_btn" android:text="@string/join_server_button_cta" style="@style/UiKit_Material_Button"/>
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_global_search_dialog.xml b/app/src/main/res/layout/widget_global_search_dialog.xml
index d5b9cf7371..4cc8dffab5 100644
--- a/app/src/main/res/layout/widget_global_search_dialog.xml
+++ b/app/src/main/res/layout/widget_global_search_dialog.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android" android:name="com.discord.widgets.user.search.WidgetGlobalSearch" android:id="@+id/widget_global_search_container" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952589_uikit_viewgroup"/>
+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android" android:name="com.discord.widgets.user.search.WidgetGlobalSearch" android:id="@+id/widget_global_search_container" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup"/>
diff --git a/app/src/main/res/layout/widget_global_search_item_divider.xml b/app/src/main/res/layout/widget_global_search_item_divider.xml
index f3b127f28b..75d61bcbb4 100644
--- a/app/src/main/res/layout/widget_global_search_item_divider.xml
+++ b/app/src/main/res/layout/widget_global_search_item_divider.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout style="@style/res_2131952439_uikit_guildslistitemhoriz_wrap">
-    <View style="@style/res_2131952434_uikit_guildslistdividericonhoriz"/>
+<FrameLayout style="@style/UiKit_GuildsListItemHoriz_Wrap">
+    <View style="@style/UiKit_GuildsListDividerIconHoriz"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_global_search_item_dm.xml b/app/src/main/res/layout/widget_global_search_item_dm.xml
index 4a9091be3a..6a5d937e31 100644
--- a/app/src/main/res/layout/widget_global_search_item_dm.xml
+++ b/app/src/main/res/layout/widget_global_search_item_dm.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952438_uikit_guildslistitemhoriz">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_GuildsListItemHoriz">
     <include android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" layout="@layout/widget_guilds_list_item_dm"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_global_search_item_guild.xml b/app/src/main/res/layout/widget_global_search_item_guild.xml
index 4ed302fff1..eb9e14b284 100644
--- a/app/src/main/res/layout/widget_global_search_item_guild.xml
+++ b/app/src/main/res/layout/widget_global_search_item_guild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952438_uikit_guildslistitemhoriz">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_GuildsListItemHoriz">
     <include android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" layout="@layout/widget_guilds_list_item_guild"/>
-    <ImageView android:id="@+id/guilds_item_selected" android:importantForAccessibility="no" style="@style/res_2131952442_uikit_guildslistselectedhoriz"/>
-    <ImageView android:id="@+id/guilds_item_unread" android:importantForAccessibility="no" style="@style/res_2131952445_uikit_guildslistunreadhoriz"/>
+    <ImageView android:id="@+id/guilds_item_selected" android:importantForAccessibility="no" style="@style/UiKit_GuildsListSelectedHoriz"/>
+    <ImageView android:id="@+id/guilds_item_unread" android:importantForAccessibility="no" style="@style/UiKit_GuildsListUnreadHoriz"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_global_status_indicator.xml b/app/src/main/res/layout/widget_global_status_indicator.xml
index 08966286ab..9189e2cb5a 100644
--- a/app/src/main/res/layout/widget_global_status_indicator.xml
+++ b/app/src/main/res/layout/widget_global_status_indicator.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/indicator" android:background="@color/status_green_600" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center" android:id="@+id/indicator_content" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <ImageView android:id="@+id/indicator_icon" android:layout_marginEnd="8dp" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/indicator_text" style="@style/res_2131952580_uikit_textview_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:id="@+id/indicator" android:background="@color/status_green_600" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center" android:id="@+id/indicator_content" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <ImageView android:id="@+id/indicator_icon" android:layout_marginEnd="8dp" style="@style/UiKit_ImageView"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/indicator_text" style="@style/UiKit_TextView_SingleLine"/>
     </LinearLayout>
-    <TextView android:textAppearance="@style/res_2131952543_uikit_textappearance_toolbar_subtitle" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/alert_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_alert_circle_16dp" app:drawableTint="@color/white" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <LinearLayout android:gravity="center" android:id="@+id/indicator_actions" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.google.android.material.button.MaterialButton android:id="@+id/indicator_decline" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_decline" android:layout_weight="1" style="@style/res_2131952474_uikit_material_button_white_outline"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Subtitle" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/alert_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_alert_circle_16dp" app:drawableTint="@color/white" style="@style/UiKit_TextView_SingleLine"/>
+    <LinearLayout android:gravity="center" android:id="@+id/indicator_actions" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.google.android.material.button.MaterialButton android:id="@+id/indicator_decline" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_decline" android:layout_weight="1" style="@style/UiKit_Material_Button_White_Outline"/>
         <Space android:layout_width="16dp" android:layout_height="0dp"/>
-        <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_600" android:id="@+id/indicator_accept" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_accept" android:layout_weight="1" style="@style/res_2131952473_uikit_material_button_white"/>
+        <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_600" android:id="@+id/indicator_accept" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/stage_speak_invite_accept" android:layout_weight="1" style="@style/UiKit_Material_Button_White"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_group_invite_friends.xml b/app/src/main/res/layout/widget_group_invite_friends.xml
index 8c784052e6..bb19a43253 100644
--- a/app/src/main/res/layout/widget_group_invite_friends.xml
+++ b/app/src/main/res/layout/widget_group_invite_friends.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
-        <RelativeLayout android:id="@+id/group_invite_friends_recipients_container" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-            <TextView android:textColor="?attr/primary_100" android:id="@+id/group_invite_friends_text_to" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/group_dm_invite_to" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
+        <RelativeLayout android:id="@+id/group_invite_friends_recipients_container" style="@style/UiKit_ViewGroup_RelativeLayout">
+            <TextView android:textColor="?attr/primary_100" android:id="@+id/group_invite_friends_text_to" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/group_dm_invite_to" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView"/>
             <com.discord.chips_view.ChipsView android:id="@+id/group_invite_friends_chips" android:layout_width="match_parent" android:layout_height="wrap_content" android:overScrollMode="never" android:layout_toEndOf="@+id/group_invite_friends_text_to" app:cv_bg_color="?attr/primary_630" app:cv_bg_color_clicked="?attr/primary_700" app:cv_chip_bg_res="@drawable/drawable_chip_background_deprecated" app:cv_chip_layout="@layout/view_chip_deprecated" app:cv_color="?attr/primary_630" app:cv_color_clicked="?attr/primary_700" app:cv_icon_delete="@drawable/drawable_chip_delete" app:cv_max_height="120dp" app:cv_search_text_color="?attr/primary_300" app:cv_search_text_size="@dimen/uikit_textsize_medium" app:cv_text_color="?attr/primary_300" app:cv_text_color_clicked="?attr/primary_300" app:cv_vertical_spacing="6dp"/>
-            <View android:layout_alignParentBottom="true" style="@style/res_2131952416_uikit_divider"/>
+            <View android:layout_alignParentBottom="true" style="@style/UiKit_Divider"/>
         </RelativeLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/group_invite_friends_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/group_invite_friends_recycler" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <TextView android:text="@string/group_dm_invite_empty" app:drawableTopCompat="@drawable/asset_no_results_light" style="@style/res_2131952576_uikit_textview_noresults"/>
-        <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/group_dm_invite_full_main" app:drawableTopCompat="@drawable/asset_group_full" style="@style/res_2131952576_uikit_textview_noresults"/>
-            <TextView android:gravity="center" android:layout_margin="8dp" android:text="@string/group_dm_invite_full_sub" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/group_invite_friends_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/group_invite_friends_recycler" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <TextView android:text="@string/group_dm_invite_empty" app:drawableTopCompat="@drawable/asset_no_results_light" style="@style/UiKit_TextView_NoResults"/>
+        <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/group_dm_invite_full_main" app:drawableTopCompat="@drawable/asset_group_full" style="@style/UiKit_TextView_NoResults"/>
+            <TextView android:gravity="center" android:layout_margin="8dp" android:text="@string/group_dm_invite_full_sub" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/group_invite_friends_save_fab" android:src="@drawable/ic_send_white_24dp" android:contentDescription="@string/save" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/group_invite_friends_save_fab" android:src="@drawable/ic_send_white_24dp" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_group_invite_friends_item.xml b/app/src/main/res/layout/widget_group_invite_friends_item.xml
index 1a607c728a..bcadf75bec 100644
--- a/app/src/main/res/layout/widget_group_invite_friends_item.xml
+++ b/app/src/main/res/layout/widget_group_invite_friends_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <RelativeLayout android:id="@+id/friend_container" android:background="?attr/selectableItemBackground" android:paddingTop="8dp" android:paddingBottom="8dp" android:focusable="true" android:clickable="true" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <RelativeLayout android:id="@+id/friend_container" android:background="?attr/selectableItemBackground" android:paddingTop="8dp" android:paddingBottom="8dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_RelativeLayout">
         <RelativeLayout android:id="@+id/friends_list_item_avatar_wrap" android:clipChildren="false" android:layout_width="34dp" android:layout_height="34dp" android:layout_marginLeft="16dp" android:layout_marginTop="2dp" android:layout_marginRight="16dp" android:layout_centerVertical="true">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:importantForAccessibility="no" style="@style/res_2131951678_avatar_standard"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:importantForAccessibility="no" style="@style/Avatar_Standard"/>
             <com.discord.views.StatusView android:id="@+id/friends_list_item_status" android:layout_width="14dp" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="2dp" app:sv_corner_radius="2dp"/>
         </RelativeLayout>
-        <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/user_selected_checkbox" android:layout_toEndOf="@+id/friends_list_item_avatar_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textColor="?attr/primary_100" android:id="@+id/friends_list_item_name" android:text="@string/sample_user_name" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
-            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/friends_list_item_game" android:layout_marginTop="2dp" android:text="@string/sample_user_presence" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/user_selected_checkbox" android:layout_toEndOf="@+id/friends_list_item_avatar_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textColor="?attr/primary_100" android:id="@+id/friends_list_item_name" android:text="@string/sample_user_name" android:singleLine="true" style="@style/UiKit_TextView"/>
+            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/friends_list_item_game" android:layout_marginTop="2dp" android:text="@string/sample_user_presence" android:singleLine="true" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <CheckBox android:id="@+id/user_selected_checkbox" android:clickable="false" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" app:buttonTint="?attr/colorCompoundButton" style="@style/res_2131952396_uikit_checkbox"/>
+        <CheckBox android:id="@+id/user_selected_checkbox" android:clickable="false" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" app:buttonTint="?attr/colorCompoundButton" style="@style/UiKit_Checkbox"/>
     </RelativeLayout>
-    <View style="@style/res_2131952416_uikit_divider"/>
+    <View style="@style/UiKit_Divider"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_call_onboarding.xml b/app/src/main/res/layout/widget_guild_call_onboarding.xml
index a830936e9a..840595512a 100644
--- a/app/src/main/res/layout/widget_guild_call_onboarding.xml
+++ b/app/src/main/res/layout/widget_guild_call_onboarding.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/nuf_voice_channels_description" app:stv_title="@string/nuf_voice_channels_title"/>
-        <ImageView android:layout_width="280dp" android:layout_marginBottom="24dp" android:src="@drawable/img_voice_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/res_2131952448_uikit_imageview"/>
-        <com.discord.views.JoinVoiceChannelButton android:id="@+id/guild_call_onboarding_connect" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952458_uikit_material_button"/>
+        <ImageView android:layout_width="280dp" android:layout_marginBottom="24dp" android:src="@drawable/img_voice_onboarding" android:contentDescription="@string/nuf_channels_description" style="@style/UiKit_ImageView"/>
+        <com.discord.views.JoinVoiceChannelButton android:id="@+id/guild_call_onboarding_connect" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_clone.xml b/app/src/main/res/layout/widget_guild_clone.xml
index c58952e1af..4c1cbff81f 100644
--- a/app/src/main/res/layout/widget_guild_clone.xml
+++ b/app/src/main/res/layout/widget_guild_clone.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <com.discord.app.AppViewFlipper android:id="@+id/guild_create_flipper" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_resolving_title" style="@style/res_2131952567_uikit_textview_h2"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <com.discord.app.AppViewFlipper android:id="@+id/guild_create_flipper" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_resolving_title" style="@style/UiKit_TextView_H2"/>
                 <ProgressBar android:id="@+id/loading_button_progress" android:layout_width="30dp" android:layout_height="30dp"/>
             </LinearLayout>
-            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_title" style="@style/res_2131952567_uikit_textview_h2"/>
-                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_subtitle" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_title" style="@style/UiKit_TextView_H2"/>
+                <TextView android:layout_marginBottom="8dp" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit_TextView_Subtext"/>
             </LinearLayout>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/guild_template_modal_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@+id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_template_32dp" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/guild_template_modal_title" style="@style/UiKit_TextView_H1_Bold"/>
+                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@+id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_template_32dp" style="@style/UiKit_TextView_Large_SingleLine"/>
                 <include android:layout_gravity="center" android:id="@+id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" layout="@layout/layout_icon_uploader"/>
-                <LinearLayout android:padding="16dp" style="@style/res_2131952402_uikit_copy">
-                    <TextView android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginBottom="8dp" android:text="@string/form_label_server_name" style="@style/res_2131952569_uikit_textview_h6"/>
-                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_create_name" android:hint="@string/form_placeholder_server_name" style="@style/res_2131952545_uikit_textinputlayout">
-                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="8dp" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+                <LinearLayout android:padding="16dp" style="@style/UiKit_Copy">
+                    <TextView android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginBottom="8dp" android:text="@string/form_label_server_name" style="@style/UiKit_TextView_H6"/>
+                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_create_name" android:hint="@string/form_placeholder_server_name" style="@style/UiKit_TextInputLayout">
+                        <com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="8dp" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                     </com.google.android.material.textfield.TextInputLayout>
-                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/guild_create_guidelines" android:layout_marginLeft="0dp" android:layout_marginRight="0dp" android:layout_marginBottom="8dp" style="@style/res_2131952581_uikit_textview_subtext"/>
+                    <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/guild_create_guidelines" android:layout_marginLeft="0dp" android:layout_marginRight="0dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_Subtext"/>
                     <com.discord.views.LoadingButton android:id="@+id/guild_create_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100"/>
-                    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_create_protip" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="12sp" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_create_protip" style="@style/UiKit_TextView"/>
                 </LinearLayout>
-                <LinearLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_marginTop="16dp" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/res_2131952416_uikit_divider"/>
-                    <TextView android:text="@string/channels" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                <LinearLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <View android:background="?attr/colorBackgroundModifierAccent" android:layout_marginTop="16dp" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit_Divider"/>
+                    <TextView android:text="@string/channels" style="@style/UiKit_TextView_H1_Bold"/>
+                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit_TextView_Subtext"/>
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_LinearLayout">
                         <com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@+id/guild_template_preview_channels" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="8dp"/>
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout android:id="@+id/guild_template_preview_roles_layout" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:text="@string/guild_template_modal_roles_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                <LinearLayout android:id="@+id/guild_template_preview_roles_layout" android:layout_marginTop="16dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit_TextView_H1_Bold"/>
+                    <TextView android:textColor="?attr/colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit_TextView_Subtext"/>
+                    <LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:paddingStart="8dp" android:paddingEnd="8dp" android:backgroundTint="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_LinearLayout">
                         <com.discord.widgets.roles.RolesListView android:id="@+id/guild_template_preview_roles" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="8dp"/>
                     </LinearLayout>
                 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_context_menu.xml b/app/src/main/res/layout/widget_guild_context_menu.xml
index 3e77edf38d..dafe8fb16e 100644
--- a/app/src/main/res/layout/widget_guild_context_menu.xml
+++ b/app/src/main/res/layout/widget_guild_context_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_context_menu_card" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundFloating" app:cardCornerRadius="4dp" app:cardElevation="4dp" app:cardUseCompatPadding="true">
     <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="240dp">
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_context_menu_header" android:paddingTop="14dp" android:paddingBottom="14dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="?attr/font_display_bold" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952568_uikit_textview_h2_bold"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_context_menu_header" android:paddingTop="14dp" android:paddingBottom="14dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="?attr/font_display_bold" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView_H2_Bold"/>
         <View android:id="@+id/guild_context_menu_header_divider" android:background="?attr/colorBackgroundModifierAccent" android:layout_width="match_parent" android:layout_height="1dp"/>
         <TextView android:id="@+id/guild_context_menu_mark_as_read" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/mark_as_read" app:drawableStartCompat="@drawable/ic_mail_24dp" style="@style/ContextMenuTextOption"/>
         <TextView android:id="@+id/guild_context_menu_notifications" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/notifications" app:drawableStartCompat="@drawable/ic_guild_notifications_24dp" style="@style/ContextMenuTextOption"/>
diff --git a/app/src/main/res/layout/widget_guild_create.xml b/app/src/main/res/layout/widget_guild_create.xml
index e2c6e3f0a0..874dc0b4b5 100644
--- a/app/src/main/res/layout/widget_guild_create.xml
+++ b/app/src/main/res/layout/widget_guild_create.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
             <com.discord.views.ScreenTitleView android:id="@+id/guild_create_screen_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/create_server_description_mobile_refresh" app:stv_title="@string/create_server_title_mobile_refresh"/>
             <include android:layout_gravity="center" android:id="@+id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="24dp" layout="@layout/layout_icon_uploader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_create_name" android:layout_marginBottom="8dp" android:hint="@string/form_label_server_name" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_create_name" android:layout_marginBottom="8dp" android:hint="@string/form_label_server_name" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_create_guidelines" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_create_guidelines" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
             <com.discord.views.LoadingButton android:id="@+id/guild_create_button" android:layout_width="match_parent" android:layout_height="wrap_content" app:lb_padding_bottom="16dp" app:lb_padding_top="16dp" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_create_server_button" app:lb_text_color="@drawable/button_text_color_primary_100" app:lb_text_size="@dimen/uikit_textsize_large"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_guild_folder_settings.xml b/app/src/main/res/layout/widget_guild_folder_settings.xml
index 18dfa14ee9..a53e4421c5 100644
--- a/app/src/main/res/layout/widget_guild_folder_settings.xml
+++ b/app/src/main/res/layout/widget_guild_folder_settings.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:orientation="vertical" android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/guild_folder_name" style="@style/res_2131952496_uikit_settings_item_header"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:orientation="vertical" android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/guild_folder_name" style="@style/UiKit_Settings_Item_Header"/>
             <FrameLayout android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="8dp">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_guild_folder_name" android:hint="@string/guild_folder_name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:inputType="textNoSuggestions" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_guild_folder_name" android:hint="@string/guild_folder_name" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText android:maxLength="100" android:inputType="textNoSuggestions" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </FrameLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/guild_folder_color" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/guild_folder_color" style="@style/UiKit_Settings_Item_Header"/>
             <RelativeLayout android:id="@+id/guild_folder_settings_color" android:background="?attr/bg_pressed_highlight" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="64dp">
-                <TextView android:id="@+id/guild_folder_color_name" android:layout_margin="16dp" android:text="@string/guild_folder_color" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:id="@+id/guild_folder_color_name" android:layout_margin="16dp" android:text="@string/guild_folder_color" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
                 <View android:id="@+id/guild_folder_settings_color_display" android:background="@drawable/drawable_circle_brand" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="16dp" android:layout_alignParentEnd="true" android:elevation="2dp"/>
             </RelativeLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/guild_folder_settings_save" android:visibility="visible" android:contentDescription="@string/save_changes" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/guild_folder_settings_save" android:visibility="visible" android:contentDescription="@string/save_changes" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_hub_profile_actions.xml b/app/src/main/res/layout/widget_guild_hub_profile_actions.xml
index 4fe3166349..f0f9eba5e6 100644
--- a/app/src/main/res/layout/widget_guild_hub_profile_actions.xml
+++ b/app/src/main/res/layout/widget_guild_hub_profile_actions.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_profile_sheet_bottom_container" android:paddingBottom="16dp" android:layout_width="0dp" android:paddingStart="16dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_actions_top_barrier" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:id="@+id/guild_profile_sheet_actions" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_invite_action" android:layout_marginTop="16dp" style="@style/res_2131952013_guildprofilesheet_actions_card">
-            <TextView android:id="@+id/guild_profile_sheet_invite" android:padding="16dp" android:text="@string/invite_a_friend" style="@style/res_2131952015_guildprofilesheet_actions_title"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_profile_sheet_bottom_container" android:paddingBottom="16dp" android:layout_width="0dp" android:paddingStart="16dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_actions_top_barrier" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:id="@+id/guild_profile_sheet_actions" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_invite_action" android:layout_marginTop="16dp" style="@style/GuildProfileSheet_Actions_Card">
+            <TextView android:id="@+id/guild_profile_sheet_invite" android:padding="16dp" android:text="@string/invite_a_friend" style="@style/GuildProfileSheet_Actions_Title"/>
         </androidx.cardview.widget.CardView>
-        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_secondary_actions" android:layout_marginTop="16dp" style="@style/res_2131952013_guildprofilesheet_actions_card">
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout android:id="@+id/guild_profile_sheet_change_nickname" android:background="?attr/bg_pressed_highlight" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:layout_gravity="center" android:layout_width="match_parent" android:text="@string/change_identity" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_nickname" android:layout_width="match_parent" style="@style/res_2131952563_uikit_textview"/>
+        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_secondary_actions" android:layout_marginTop="16dp" style="@style/GuildProfileSheet_Actions_Card">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout android:id="@+id/guild_profile_sheet_change_nickname" android:background="?attr/bg_pressed_highlight" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:layout_gravity="center" android:layout_width="match_parent" android:text="@string/change_identity" style="@style/UiKit_TextView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_nickname" android:layout_width="match_parent" style="@style/UiKit_TextView"/>
                 </LinearLayout>
-                <TextView android:textColor="@color/status_red_500" android:id="@+id/guild_profile_sheet_leave_server" android:padding="16dp" android:text="@string/leave_server" style="@style/res_2131952015_guildprofilesheet_actions_title"/>
+                <TextView android:textColor="@color/status_red_500" android:id="@+id/guild_profile_sheet_leave_server" android:padding="16dp" android:text="@string/leave_server" style="@style/GuildProfileSheet_Actions_Title"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite.xml b/app/src/main/res/layout/widget_guild_invite.xml
index 658db44fe5..d2cafd6e80 100644
--- a/app/src/main/res/layout/widget_guild_invite.xml
+++ b/app/src/main/res/layout/widget_guild_invite.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <RelativeLayout android:layout_height="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <RelativeLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
         <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:foreground="?attr/gradient_invite_splash" android:layout_alignParentTop="true">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_invite_splash" android:layout_width="match_parent" android:layout_height="wrap_content" app:actualImageScaleType="2" app:placeholderImage="@drawable/drawable_default_invite_splash" app:placeholderImageScaleType="2" app:viewAspectRatio="1.78"/>
         </FrameLayout>
-        <androidx.core.widget.NestedScrollView android:layout_height="match_parent" android:layout_above="@+id/guild_invite_actions" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-            <com.discord.widgets.guilds.invite.WidgetInviteInfo android:gravity="center" android:layout_gravity="center" android:id="@+id/guild_invite_info" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+        <androidx.core.widget.NestedScrollView android:layout_height="match_parent" android:layout_above="@+id/guild_invite_actions" style="@style/UiKit_ViewGroup_ScrollView">
+            <com.discord.widgets.guilds.invite.WidgetInviteInfo android:gravity="center" android:layout_gravity="center" android:id="@+id/guild_invite_info" style="@style/UiKit_ViewGroup_LinearLayout"/>
         </androidx.core.widget.NestedScrollView>
-        <LinearLayout android:id="@+id/guild_invite_actions" style="@style/res_2131952403_uikit_copy_anchor">
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_cancel" android:visibility="visible" android:text="@string/cancel" style="@style/res_2131952467_uikit_material_button_secondary"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_accept" android:visibility="gone" android:text="@string/instant_invite_accept" style="@style/res_2131952458_uikit_material_button"/>
+        <LinearLayout android:id="@+id/guild_invite_actions" style="@style/UiKit_Copy_Anchor">
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_cancel" android:visibility="visible" android:text="@string/cancel" style="@style/UiKit_Material_Button_Secondary"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_accept" android:visibility="gone" android:text="@string/instant_invite_accept" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </RelativeLayout>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite_info.xml b/app/src/main/res/layout/widget_guild_invite_info.xml
index cbcadeeed0..c602100be3 100644
--- a/app/src/main/res/layout/widget_guild_invite_info.xml
+++ b/app/src/main/res/layout/widget_guild_invite_info.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <RelativeLayout android:id="@+id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" style="@style/UiKit_ViewGroup_LinearLayout">
+    <RelativeLayout android:id="@+id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
         <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="64dp">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar" style="@style/res_2131951673_avatar_hero"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar" style="@style/Avatar_Hero"/>
         </androidx.cardview.widget.CardView>
         <RelativeLayout android:id="@+id/invite_avatar_small_wrap" android:background="?attr/colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="-3dp" android:layout_alignParentBottom="true" android:layout_marginEnd="-3dp" android:layout_alignParentEnd="true"/>
     </RelativeLayout>
-    <ImageView android:id="@+id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96dp" android:layout_marginTop="16dp" android:layout_marginRight="96dp" android:layout_marginBottom="16dp" android:src="?attr/img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/res_2131952448_uikit_imageview"/>
-    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="18sp" android:id="@+id/invite_title" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
-        <LinearLayout android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <ImageView android:id="@+id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96dp" android:layout_marginTop="16dp" android:layout_marginRight="96dp" android:layout_marginBottom="16dp" android:src="?attr/img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit_ImageView"/>
+    <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="18sp" android:id="@+id/invite_title" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
+        <LinearLayout android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@+id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23dp">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar_small" style="@style/res_2131951674_avatar_large"/>
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_avatar_small" style="@style/Avatar_Large"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:textSize="26sp" android:textColor="?attr/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/invite_message" android:drawablePadding="4dp" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textSize="26sp" android:textColor="?attr/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@+id/invite_message" android:drawablePadding="4dp" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@+id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
+        <LinearLayout android:gravity="center" android:id="@+id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
             <androidx.cardview.widget.CardView android:id="@+id/invite_members_online_wrap" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="30dp">
-                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_green_600" app:roundAsCircle="true"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/invite_members_online" android:text="@string/instant_invite_guild_members_online" android:singleLine="true" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
             <androidx.cardview.widget.CardView android:id="@+id/invite_members_total_wrap" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="30dp">
-                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_members_total" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_members_total" android:singleLine="true" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite_settings.xml b/app/src/main/res/layout/widget_guild_invite_settings.xml
index 5f32840030..c533b0d067 100644
--- a/app/src/main/res/layout/widget_guild_invite_settings.xml
+++ b/app/src/main/res/layout/widget_guild_invite_settings.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_close_24dp" app:title="@string/link_settings" style="@style/res_2131951663_apptheme_toolbar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_close_24dp" app:title="@string/link_settings" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent">
-        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:padding="16dp" android:layout_marginTop="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:padding="0dp" android:text="@string/form_label_instant_invite_channel" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/res_2131952496_uikit_settings_item_header"/>
+        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:padding="16dp" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:padding="0dp" android:text="@string/form_label_instant_invite_channel" android:paddingStart="0dp" android:paddingEnd="0dp" style="@style/UiKit_Settings_Item_Header"/>
                 <Spinner android:id="@+id/guild_invite_channel_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:popupBackground="?attr/colorPrimary"/>
                 <View android:background="?attr/colorBackgroundAccent" android:layout_width="match_parent" android:layout_height="0.25dp"/>
             </LinearLayout>
-            <TextView android:text="@string/expire_after" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <HorizontalScrollView style="@style/res_2131952611_uikit_viewgroup_scrollview_horizontal">
+            <TextView android:text="@string/expire_after" style="@style/UiKit_Settings_Item_Header"/>
+            <HorizontalScrollView style="@style/UiKit_ViewGroup_ScrollView_Horizontal">
                 <RadioGroup android:orientation="horizontal" android:id="@+id/guild_invite_expires_after_radiogroup" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
             </HorizontalScrollView>
-            <TextView android:text="@string/max_number_of_uses" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <HorizontalScrollView style="@style/res_2131952611_uikit_viewgroup_scrollview_horizontal">
+            <TextView android:text="@string/max_number_of_uses" style="@style/UiKit_Settings_Item_Header"/>
+            <HorizontalScrollView style="@style/UiKit_ViewGroup_ScrollView_Horizontal">
                 <RadioGroup android:orientation="horizontal" android:id="@+id/guild_invite_max_uses_radiogroup" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
             </HorizontalScrollView>
-            <com.discord.views.CheckedSetting android:id="@+id/guild_invite_temporary_membership" app:cs_subtext="@string/temporary_membership_explanation" app:cs_text="@string/grant_temporary_membership" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_generate_link" android:layout_margin="16dp" android:text="@string/create_link" style="@style/res_2131952458_uikit_material_button"/>
+            <com.discord.views.CheckedSetting android:id="@+id/guild_invite_temporary_membership" app:cs_subtext="@string/temporary_membership_explanation" app:cs_text="@string/grant_temporary_membership" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_generate_link" android:layout_margin="16dp" android:text="@string/create_link" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite_share.xml b/app/src/main/res/layout/widget_guild_invite_share.xml
index 4164ae75e4..38f656fa42 100644
--- a/app/src/main/res/layout/widget_guild_invite_share.xml
+++ b/app/src/main/res/layout/widget_guild_invite_share.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <LinearLayout android:layout_height="match_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+    <LinearLayout android:layout_height="match_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_Page_LinearLayout">
         <com.discord.app.AppViewFlipper android:id="@+id/guild_invite_suggestions_flipper" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-            <ImageView android:layout_gravity="center" android:layout_margin="32dp" android:src="?attr/img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_invite_share_search" style="@style/res_2131952560_uikit_textinputlayout_search">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <ImageView android:layout_gravity="center" android:layout_margin="32dp" android:src="?attr/img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_invite_share_search" style="@style/UiKit_TextInputLayout_Search">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_invite_suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_weight="1" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-                <TextView android:id="@+id/guild_invite_empty_results" android:visibility="gone" style="@style/res_2131952576_uikit_textview_noresults"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_invite_suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_RecyclerView"/>
+                <TextView android:id="@+id/guild_invite_empty_results" android:visibility="gone" style="@style/UiKit_TextView_NoResults"/>
             </LinearLayout>
         </com.discord.app.AppViewFlipper>
-        <View android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952416_uikit_divider"/>
-        <LinearLayout android:background="?attr/primary_630" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_gravity="center" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/invite_footer_link_header" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <LinearLayout android:background="@drawable/drawable_bg_outline_dark" android:layout_height="46dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:textSize="16dp" android:textColor="?attr/primary_100" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/guild_invite_link" android:background="?attr/selectableItemBackground" android:layout_width="0dp" android:layout_height="match_parent" android:text="@string/invite_link_example_verified" android:singleLine="true" android:layout_weight="1" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952564_uikit_textview_bold"/>
+        <View android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_Divider"/>
+        <LinearLayout android:background="?attr/primary_630" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_gravity="center" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/invite_footer_link_header" style="@style/UiKit_TextView_Subtext"/>
+            <LinearLayout android:background="@drawable/drawable_bg_outline_dark" android:layout_height="46dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:textSize="16dp" android:textColor="?attr/primary_100" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/guild_invite_link" android:background="?attr/selectableItemBackground" android:layout_width="0dp" android:layout_height="match_parent" android:text="@string/invite_link_example_verified" android:singleLine="true" android:layout_weight="1" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView_Bold"/>
                 <ImageView android:id="@+id/guild_invite_settings_edit" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="16dp" android:paddingTop="10dp" android:paddingRight="16dp" android:paddingBottom="10dp" android:layout_width="46dp" android:layout_height="46dp" android:src="?attr/ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/link_settings"/>
             </LinearLayout>
         </LinearLayout>
-        <LinearLayout android:background="?attr/primary_630" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.discord.views.CheckedSetting android:id="@+id/guild_invite_never_expire" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:cs_subtext="@string/invite_links_expire_after_default" app:cs_text="@string/set_invite_link_never_expire" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_share_btn" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/share_link" style="@style/res_2131952458_uikit_material_button"/>
+        <LinearLayout android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.discord.views.CheckedSetting android:id="@+id/guild_invite_never_expire" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:cs_subtext="@string/invite_links_expire_after_default" app:cs_text="@string/set_invite_link_never_expire" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_share_btn" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/share_link" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </LinearLayout>
     <View android:id="@+id/bottom_sheet_tint" android:background="@color/black_alpha_60" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@+id/invite_settings_bottom_sheet" android:background="?attr/primary_630" style="@style/res_2131952595_uikit_viewgroup_linearlayout_bottomsheet"/>
+    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@+id/invite_settings_bottom_sheet" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_LinearLayout_BottomSheet"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite_share_compact.xml b/app/src/main/res/layout/widget_guild_invite_share_compact.xml
index 68d6d0c7aa..9ff1702a5b 100644
--- a/app/src/main/res/layout/widget_guild_invite_share_compact.xml
+++ b/app/src/main/res/layout/widget_guild_invite_share_compact.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <LinearLayout android:layout_height="match_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+    <LinearLayout android:layout_height="match_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_Page_LinearLayout">
         <com.discord.app.AppViewFlipper android:id="@+id/guild_invite_suggestions_flipper" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-            <ImageView android:layout_gravity="center" android:layout_margin="32dp" android:src="?attr/img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_invite_share_compact_search" style="@style/res_2131952560_uikit_textinputlayout_search">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <ImageView android:layout_gravity="center" android:layout_margin="32dp" android:src="?attr/img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_invite_share_compact_search" style="@style/UiKit_TextInputLayout_Search">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_invite_suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_weight="1" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-                <TextView android:id="@+id/guild_invite_empty_results" android:visibility="gone" style="@style/res_2131952576_uikit_textview_noresults"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_invite_suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_RecyclerView"/>
+                <TextView android:id="@+id/guild_invite_empty_results" android:visibility="gone" style="@style/UiKit_TextView_NoResults"/>
             </LinearLayout>
         </com.discord.app.AppViewFlipper>
-        <View android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952416_uikit_divider"/>
-        <LinearLayout android:gravity="center_horizontal" android:background="?attr/colorBackgroundMobileSecondary" android:padding="16dp" android:clipChildren="false" android:clipToPadding="false" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/invite_footer_link_header" style="@style/res_2131952563_uikit_textview"/>
-            <LinearLayout android:clipChildren="false" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:id="@+id/guild_invite_share_btn" android:layout_width="0dp" android:text="@string/invite_link_example_verified" android:layout_weight="1" android:contentDescription="@string/share_to" android:textAlignment="textStart" app:icon="@drawable/ic_share_white_24dp" app:iconGravity="3" app:iconTint="?attr/colorInteractiveNormal" app:rippleColor="@color/status_green_600" style="@style/res_2131952470_uikit_material_button_tertiary"/>
-                <ImageView android:layout_gravity="center_vertical" android:id="@+id/guild_invite_settings_edit" android:background="?attr/selectableItemBackgroundBorderless" android:padding="8dp" android:src="?attr/ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/share_invite_link_for_access" android:layout_marginStart="8dp" style="@style/res_2131952449_uikit_imageview_clickable"/>
+        <View android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_Divider"/>
+        <LinearLayout android:gravity="center_horizontal" android:background="?attr/colorBackgroundMobileSecondary" android:padding="16dp" android:clipChildren="false" android:clipToPadding="false" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/invite_footer_link_header" style="@style/UiKit_TextView"/>
+            <LinearLayout android:clipChildren="false" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorTextNormal" android:id="@+id/guild_invite_share_btn" android:layout_width="0dp" android:text="@string/invite_link_example_verified" android:layout_weight="1" android:contentDescription="@string/share_to" android:textAlignment="textStart" app:icon="@drawable/ic_share_white_24dp" app:iconGravity="3" app:iconTint="?attr/colorInteractiveNormal" app:rippleColor="@color/status_green_600" style="@style/UiKit_Material_Button_Tertiary"/>
+                <ImageView android:layout_gravity="center_vertical" android:id="@+id/guild_invite_settings_edit" android:background="?attr/selectableItemBackgroundBorderless" android:padding="8dp" android:src="?attr/ic_settings" android:scaleType="centerCrop" android:contentDescription="@string/share_invite_link_for_access" android:layout_marginStart="8dp" style="@style/UiKit_ImageView_Clickable"/>
             </LinearLayout>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_invite_never_expire" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorInteractiveNormal" android:id="@+id/guild_invite_never_expire" style="@style/UiKit_TextView_Subtext"/>
         </LinearLayout>
     </LinearLayout>
     <View android:id="@+id/bottom_sheet_tint" android:background="@color/black_alpha_60" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@+id/invite_settings_bottom_sheet" android:background="?attr/primary_630" style="@style/res_2131952595_uikit_viewgroup_linearlayout_bottomsheet"/>
+    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@+id/invite_settings_bottom_sheet" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_LinearLayout_BottomSheet"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite_share_empty_suggestions.xml b/app/src/main/res/layout/widget_guild_invite_share_empty_suggestions.xml
index c1ed70b5c9..067c11b6d4 100644
--- a/app/src/main/res/layout/widget_guild_invite_share_empty_suggestions.xml
+++ b/app/src/main/res/layout/widget_guild_invite_share_empty_suggestions.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="24dp" android:src="@drawable/drawable_invite_share_art_envelope" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="24dp" android:src="@drawable/drawable_invite_share_art_envelope" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
             <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:stv_subtitle="@string/invite_empty_body" app:stv_title="@string/invite_empty_title"/>
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_marginBottom="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/guild_invite_empty_suggestions_invite_link" android:background="?attr/bg_clickable_rounded_4dp" android:layout_width="0dp" android:layout_height="0dp" android:text="@string/invite_link_example_verified" android:layout_weight="1" android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_invite_empty_suggestions_settings_edit" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952580_uikit_textview_singleline"/>
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/guild_invite_empty_suggestions_invite_link" android:background="?attr/bg_clickable_rounded_4dp" android:layout_width="0dp" android:layout_height="0dp" android:text="@string/invite_link_example_verified" android:layout_weight="1" android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_invite_empty_suggestions_settings_edit" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_SingleLine"/>
                 <ImageButton android:id="@+id/guild_invite_empty_suggestions_settings_edit" android:background="?attr/bg_clickable_rounded_4dp" android:padding="16dp" android:layout_width="56dp" android:layout_height="56dp" android:src="?attr/ic_settings" android:contentDescription="@string/share_invite_link_for_access" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_marginBottom="16dp" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_empty_suggestions_invite_share_btn" android:text="@string/share_link" style="@style/res_2131952382_uikit_authbutton_material"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_invite_empty_suggestions_settings_invite_link_subtext" android:layout_marginBottom="16dp" style="@style/UiKit_TextView_Subtext"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_invite_empty_suggestions_invite_share_btn" android:text="@string/share_link" style="@style/UiKit_AuthButton_Material"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <View android:id="@+id/bottom_sheet_tint" android:background="@color/black_alpha_60" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@+id/invite_settings_bottom_sheet" android:background="?attr/primary_630" style="@style/res_2131952595_uikit_viewgroup_linearlayout_bottomsheet"/>
+    <com.discord.widgets.guilds.invite.ViewInviteSettingsSheet android:id="@+id/invite_settings_bottom_sheet" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_LinearLayout_BottomSheet"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite_share_item.xml b/app/src/main/res/layout/widget_guild_invite_share_item.xml
index 618f1ce6a2..aeb0680649 100644
--- a/app/src/main/res/layout/widget_guild_invite_share_item.xml
+++ b/app/src/main/res/layout/widget_guild_invite_share_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_icon_iv" android:importantForAccessibility="no" android:layout_marginEnd="16dp" app:placeholderImage="?attr/colorPrimaryCircle" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/item_name_tv" android:layout_width="0dp" android:layout_weight="1" android:layout_marginEnd="8dp" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
-    <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_600" android:id="@+id/item_invite_btn" android:paddingTop="0dp" android:paddingBottom="0dp" android:layout_width="wrap_content" android:minWidth="64dp" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/res_2131952462_uikit_material_button_green_outline"/>
-    <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_300_alpha_30" android:id="@+id/item_sent" android:paddingTop="0dp" android:paddingBottom="0dp" android:visibility="gone" android:minWidth="64dp" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_icon_iv" android:importantForAccessibility="no" android:layout_marginEnd="16dp" app:placeholderImage="?attr/colorPrimaryCircle" style="@style/Avatar_Standard"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/item_name_tv" android:layout_width="0dp" android:layout_weight="1" android:layout_marginEnd="8dp" style="@style/UiKit_TextView_Subtext_SingleLine"/>
+    <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_600" android:id="@+id/item_invite_btn" android:paddingTop="0dp" android:paddingBottom="0dp" android:layout_width="wrap_content" android:minWidth="64dp" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit_Material_Button_Green_Outline"/>
+    <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_300_alpha_30" android:id="@+id/item_sent" android:paddingTop="0dp" android:paddingBottom="0dp" android:visibility="gone" android:minWidth="64dp" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit_Material_Button_Transparent_Fit"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_invite_share_sheet.xml b/app/src/main/res/layout/widget_guild_invite_share_sheet.xml
index 71df61b2be..65b2d4f601 100644
--- a/app/src/main/res/layout/widget_guild_invite_share_sheet.xml
+++ b/app/src/main/res/layout/widget_guild_invite_share_sheet.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/root" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_height="match_parent" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-        <com.discord.app.AppViewFlipper android:id="@+id/suggestions_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+        <com.discord.app.AppViewFlipper android:id="@+id/suggestions_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
             <androidx.core.widget.NestedScrollView android:id="@+id/empty_state_scroller" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <androidx.constraintlayout.widget.ConstraintLayout android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                    <ImageView android:layout_gravity="center" android:id="@+id/empty_state_img" android:layout_marginTop="16dp" android:src="@drawable/drawable_invite_share_art_envelope" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_state_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/invite_empty_title" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_img" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/invite_empty_body" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_title" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/empty_state_invite_link" android:background="?attr/bg_clickable_rounded_4dp" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="56dp" android:layout_marginTop="16dp" android:text="@string/invite_link_example_verified" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintEnd_toStartOf="@+id/empty_state_link_options" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_body" style="@style/res_2131952580_uikit_textview_singleline"/>
+                <androidx.constraintlayout.widget.ConstraintLayout android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                    <ImageView android:layout_gravity="center" android:id="@+id/empty_state_img" android:layout_marginTop="16dp" android:src="@drawable/drawable_invite_share_art_envelope" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/empty_state_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/invite_empty_title" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_img" style="@style/UiKit_TextView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_body" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/invite_empty_body" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_title" style="@style/UiKit_TextView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="start" android:gravity="center_vertical" android:id="@+id/empty_state_invite_link" android:background="?attr/bg_clickable_rounded_4dp" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_width="0dp" android:layout_height="56dp" android:layout_marginTop="16dp" android:text="@string/invite_link_example_verified" android:layout_marginEnd="8dp" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintEnd_toStartOf="@+id/empty_state_link_options" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_body" style="@style/UiKit_TextView_SingleLine"/>
                     <ImageButton android:id="@+id/empty_state_link_options" android:background="?attr/bg_clickable_rounded_4dp" android:padding="16dp" android:layout_width="56dp" android:layout_height="56dp" android:src="?attr/ic_settings" android:contentDescription="@string/link_settings" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/empty_state_invite_link"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_settings_subtext" android:layout_marginTop="8dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_invite_link" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <com.google.android.material.button.MaterialButton android:id="@+id/empty_state_share_btn" android:layout_marginTop="16dp" android:text="@string/share_link" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_settings_subtext" style="@style/res_2131952458_uikit_material_button"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/empty_state_settings_subtext" android:layout_marginTop="8dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_invite_link" style="@style/UiKit_TextView_Subtext"/>
+                    <com.google.android.material.button.MaterialButton android:id="@+id/empty_state_share_btn" android:layout_marginTop="16dp" android:text="@string/share_link" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/empty_state_settings_subtext" style="@style/UiKit_Material_Button"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.core.widget.NestedScrollView>
-            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_ConstraintLayout">
                 <com.discord.views.SearchInputView android:id="@+id/search_input" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:layout_marginStart="16dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toTopOf="@+id/search_barrier" app:layout_constraintEnd_toStartOf="@+id/share_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:siv_search_content_description="@string/invite_search_for_friends"/>
                 <androidx.cardview.widget.CardView android:id="@+id/share_button" android:layout_width="40dp" android:layout_height="0dp" android:foreground="?attr/bg_pressed_highlight" android:layout_marginEnd="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" app:cardElevation="0dp" app:layout_constraintBottom_toBottomOf="@+id/search_input" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/search_input" app:strokeWidth="0dp">
-                    <ImageView android:layout_gravity="center" android:src="@drawable/ic_share_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
+                    <ImageView android:layout_gravity="center" android:src="@drawable/ic_share_white_24dp" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
                 </androidx.cardview.widget.CardView>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/search_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="search_input,share_button"/>
-                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/copy_link_group" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:layout_marginStart="8dp" app:layout_constraintBottom_toTopOf="@+id/link_settings_barrier" app:layout_constraintEnd_toStartOf="@+id/invite_settings_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/search_barrier" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+                <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/copy_link_group" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:layout_marginStart="8dp" app:layout_constraintBottom_toTopOf="@+id/link_settings_barrier" app:layout_constraintEnd_toStartOf="@+id/invite_settings_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/search_barrier" style="@style/UiKit_ViewGroup_ConstraintLayout">
                     <FrameLayout android:id="@+id/copy_link_icon" android:background="@drawable/drawable_circle_black" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp" app:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/copy_link_icon_barrier" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-                        <ImageView android:layout_gravity="center" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_diag_link_24dp" android:contentDescription="@string/copy_link" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
+                        <ImageView android:layout_gravity="center" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_diag_link_24dp" android:contentDescription="@string/copy_link" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
                     </FrameLayout>
                     <androidx.constraintlayout.widget.Barrier android:id="@+id/copy_link_icon_barrier" android:layout_width="0dp" android:layout_height="match_parent" app:barrierDirection="6" app:constraint_referenced_ids="copy_link_icon"/>
-                    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/copy_link_title" android:layout_width="0dp" android:text="@string/invite_copy_invite_link_header_mobile" app:layout_constraintBottom_toTopOf="@+id/copy_link_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/copy_link_subtitle" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toBottomOf="@+id/copy_link_title" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/copy_link_title" android:layout_width="0dp" android:text="@string/invite_copy_invite_link_header_mobile" app:layout_constraintBottom_toTopOf="@+id/copy_link_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/copy_link_subtitle" android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_icon_barrier" app:layout_constraintTop_toBottomOf="@+id/copy_link_title" style="@style/UiKit_TextView"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
                 <FrameLayout android:id="@+id/invite_settings_button" android:background="?attr/bg_pressed_highlight" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/link_settings_barrier" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/copy_link_group" app:layout_constraintTop_toBottomOf="@+id/search_barrier">
-                    <ImageView android:layout_gravity="center" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_settings_24dp" android:contentDescription="@string/link_settings" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952448_uikit_imageview"/>
+                    <ImageView android:layout_gravity="center" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_settings_24dp" android:contentDescription="@string/link_settings" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView"/>
                 </FrameLayout>
                 <androidx.constraintlayout.widget.Barrier android:id="@+id/link_settings_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="copy_link_group,invite_settings_button"/>
-                <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/invite_suggestions_header" android:layout_marginBottom="8dp" android:text="@string/invite_your_friends_header_mobile" android:textAllCaps="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/suggestion_list" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/link_settings_barrier" app:layout_constraintVertical_bias="0" style="@style/res_2131952563_uikit_textview"/>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_height="0dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/invite_suggestions_header" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:id="@+id/invite_suggestions_header" android:layout_marginBottom="8dp" android:text="@string/invite_your_friends_header_mobile" android:textAllCaps="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/suggestion_list" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/link_settings_barrier" app:layout_constraintVertical_bias="0" style="@style/UiKit_TextView"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/suggestion_list" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_height="0dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/invite_suggestions_header" style="@style/UiKit_ViewGroup_RecyclerView"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.discord.app.AppViewFlipper>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_join.xml b/app/src/main/res/layout/widget_guild_join.xml
index 10bf966e4d..42244e1898 100644
--- a/app/src/main/res/layout/widget_guild_join.xml
+++ b/app/src/main/res/layout/widget_guild_join.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:layout_height="match_parent" android:baselineAligned="false" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:layout_height="match_parent" android:baselineAligned="false" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
             <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/join_server_description_mobile_refresh" app:stv_title="@string/join_server_title_mobile_refresh"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_join_invite" android:layout_marginBottom="16dp" android:hint="@string/form_label_invite_link" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:inputType="textUri" android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_join_invite" android:layout_marginBottom="16dp" android:hint="@string/form_label_invite_link" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText">
                     <requestFocus/>
                 </com.google.android.material.textfield.TextInputEditText>
             </com.google.android.material.textfield.TextInputLayout>
             <include layout="@layout/widget_guild_join_invite_examples"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_join_action_btn" android:layout_marginTop="16dp" android:text="@string/nuf_join_server_button" style="@style/res_2131952382_uikit_authbutton_material"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_join_action_btn" android:layout_marginTop="16dp" android:text="@string/nuf_join_server_button" style="@style/UiKit_AuthButton_Material"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <ImageView android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="4dp" android:src="?attr/img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/res_2131952450_uikit_imageview_hideinlandscape"/>
-    <com.discord.utilities.dimmer.DimmerView style="@style/res_2131952415_uikit_dimmerview"/>
+    <ImageView android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="4dp" android:src="?attr/img_wumpus_tophat" android:contentDescription="@string/join_server_button_cta_mobile" style="@style/UiKit_ImageView_HideInLandscape"/>
+    <com.discord.utilities.dimmer.DimmerView style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_join_invite_examples.xml b/app/src/main/res/layout/widget_guild_join_invite_examples.xml
index 3b930c8214..1d13742416 100644
--- a/app/src/main/res/layout/widget_guild_join_invite_examples.xml
+++ b/app/src/main/res/layout/widget_guild_join_invite_examples.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textAppearance="@style/res_2131952537_uikit_textappearance_listitem_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/join_server_invite_examples_header" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/invite_link_example_simple" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/invite_link_example_full" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/invite_link_example_verified" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_ListItem_Label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/join_server_invite_examples_header" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/invite_link_example_simple" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/invite_link_example_full" style="@style/UiKit_TextView"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/invite_link_example_verified" style="@style/UiKit_TextView"/>
 </merge>
diff --git a/app/src/main/res/layout/widget_guild_profile_actions.xml b/app/src/main/res/layout/widget_guild_profile_actions.xml
index e66835bf59..21760aa33a 100644
--- a/app/src/main/res/layout/widget_guild_profile_actions.xml
+++ b/app/src/main/res/layout/widget_guild_profile_actions.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_profile_sheet_bottom_container" android:paddingBottom="16dp" android:layout_width="0dp" android:paddingStart="16dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_actions_top_barrier" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:id="@+id/guild_profile_sheet_actions" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_mark_as_read_action" android:layout_marginTop="16dp" style="@style/res_2131952013_guildprofilesheet_actions_card">
-            <TextView android:id="@+id/guild_profile_sheet_mark_as_read" android:padding="16dp" android:text="@string/mark_as_read" style="@style/res_2131952015_guildprofilesheet_actions_title"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_profile_sheet_bottom_container" android:paddingBottom="16dp" android:layout_width="0dp" android:paddingStart="16dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_actions_top_barrier" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:id="@+id/guild_profile_sheet_actions" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_mark_as_read_action" android:layout_marginTop="16dp" style="@style/GuildProfileSheet_Actions_Card">
+            <TextView android:id="@+id/guild_profile_sheet_mark_as_read" android:padding="16dp" android:text="@string/mark_as_read" style="@style/GuildProfileSheet_Actions_Title"/>
         </androidx.cardview.widget.CardView>
-        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_primary_actions" android:layout_marginTop="16dp" style="@style/res_2131952013_guildprofilesheet_actions_card">
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/guild_profile_sheet_create_channel" android:padding="16dp" android:text="@string/create_channel" style="@style/res_2131952015_guildprofilesheet_actions_title"/>
-                <TextView android:id="@+id/guild_profile_sheet_create_category" android:padding="16dp" android:text="@string/create_category" style="@style/res_2131952015_guildprofilesheet_actions_title"/>
+        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_primary_actions" android:layout_marginTop="16dp" style="@style/GuildProfileSheet_Actions_Card">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/guild_profile_sheet_create_channel" android:padding="16dp" android:text="@string/create_channel" style="@style/GuildProfileSheet_Actions_Title"/>
+                <TextView android:id="@+id/guild_profile_sheet_create_category" android:padding="16dp" android:text="@string/create_category" style="@style/GuildProfileSheet_Actions_Title"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_secondary_actions" android:layout_marginTop="16dp" style="@style/res_2131952013_guildprofilesheet_actions_card">
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout android:id="@+id/guild_profile_sheet_change_nickname" android:background="?attr/bg_pressed_highlight" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:layout_gravity="center" android:layout_width="match_parent" android:text="@string/change_nickname" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_nickname" android:layout_width="match_parent" style="@style/res_2131952563_uikit_textview"/>
+        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_secondary_actions" android:layout_marginTop="16dp" style="@style/GuildProfileSheet_Actions_Card">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout android:id="@+id/guild_profile_sheet_change_nickname" android:background="?attr/bg_pressed_highlight" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:layout_gravity="center" android:layout_width="match_parent" android:text="@string/change_nickname" style="@style/UiKit_TextView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_nickname" android:layout_width="match_parent" style="@style/UiKit_TextView"/>
                 </LinearLayout>
-                <com.discord.views.CheckedSetting android:id="@+id/guild_profile_sheet_allow_dm" app:cs_subtext="@string/allow_server_dms" app:cs_text="@string/direct_messages" style="@style/res_2131952014_guildprofilesheet_actions_checkedsetting"/>
-                <com.discord.views.CheckedSetting android:id="@+id/guild_profile_sheet_hide_muted_channels" app:cs_text="@string/hide_muted_channels" style="@style/res_2131952014_guildprofilesheet_actions_checkedsetting"/>
-                <TextView android:textColor="@color/status_red_500" android:id="@+id/guild_profile_sheet_leave_server" android:padding="16dp" android:text="@string/leave_server" style="@style/res_2131952015_guildprofilesheet_actions_title"/>
+                <com.discord.views.CheckedSetting android:id="@+id/guild_profile_sheet_allow_dm" app:cs_subtext="@string/allow_server_dms" app:cs_text="@string/direct_messages" style="@style/GuildProfileSheet_Actions_CheckedSetting"/>
+                <com.discord.views.CheckedSetting android:id="@+id/guild_profile_sheet_hide_muted_channels" app:cs_text="@string/hide_muted_channels" style="@style/GuildProfileSheet_Actions_CheckedSetting"/>
+                <TextView android:textColor="@color/status_red_500" android:id="@+id/guild_profile_sheet_leave_server" android:padding="16dp" android:text="@string/leave_server" style="@style/GuildProfileSheet_Actions_Title"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_developer_actions" android:layout_marginTop="16dp" style="@style/res_2131952013_guildprofilesheet_actions_card">
-            <TextView android:id="@+id/guild_profile_sheet_copy_id" android:padding="16dp" android:text="@string/copy_id" style="@style/res_2131952015_guildprofilesheet_actions_title"/>
+        <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_developer_actions" android:layout_marginTop="16dp" style="@style/GuildProfileSheet_Actions_Card">
+            <TextView android:id="@+id/guild_profile_sheet_copy_id" android:padding="16dp" android:text="@string/copy_id" style="@style/GuildProfileSheet_Actions_Title"/>
         </androidx.cardview.widget.CardView>
     </LinearLayout>
-    <LinearLayout android:gravity="center_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_profile_sheet_emojis_count" android:textAllCaps="true" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:gravity="center_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_profile_sheet_emojis_count" android:textAllCaps="true" style="@style/UiKit_TextView"/>
         <ImageView android:id="@+id/guild_profile_sheet_premium_upsell_dot_separator" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_circle_white" android:importantForAccessibility="no" android:layout_marginStart="8dp" app:tint="?attr/colorTextMuted"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/premium_tier_2_purple" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_premium_upsell_text" android:text="@string/game_popout_nitro_upsell" android:drawablePadding="4dp" android:layout_marginStart="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/res_2131952580_uikit_textview_singleline"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/premium_tier_2_purple" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_premium_upsell_text" android:text="@string/game_popout_nitro_upsell" android:drawablePadding="4dp" android:layout_marginStart="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit_TextView_SingleLine"/>
     </LinearLayout>
-    <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_emojis_card" android:layout_marginTop="8dp" app:contentPadding="8dp" style="@style/res_2131952013_guildprofilesheet_actions_card">
+    <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_emojis_card" android:layout_marginTop="8dp" app:contentPadding="8dp" style="@style/GuildProfileSheet_Actions_Card">
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_profile_sheet_emojis" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"/>
     </androidx.cardview.widget.CardView>
-    <LinearLayout android:id="@+id/guild_profile_sheet_bottom_actions" android:layout_marginTop="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_upload_emoji" android:layout_width="0dp" android:text="@string/upload_emoji" android:layout_weight="1" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_join_server" android:layout_width="0dp" android:text="@string/guild_profile_join_server_button" android:layout_weight="1" android:layout_marginStart="8dp" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_view_server" android:layout_width="0dp" android:text="@string/guild_popout_view_server_button" android:layout_weight="1" android:layout_marginStart="8dp" android:backgroundTint="?attr/colorBackgroundAccent" style="@style/res_2131952458_uikit_material_button"/>
+    <LinearLayout android:id="@+id/guild_profile_sheet_bottom_actions" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_upload_emoji" android:layout_width="0dp" android:text="@string/upload_emoji" android:layout_weight="1" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_join_server" android:layout_width="0dp" android:text="@string/guild_profile_join_server_button" android:layout_weight="1" android:layout_marginStart="8dp" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_view_server" android:layout_width="0dp" android:text="@string/guild_popout_view_server_button" android:layout_weight="1" android:layout_marginStart="8dp" android:backgroundTint="?attr/colorBackgroundAccent" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_profile_emoji_extra.xml b/app/src/main/res/layout/widget_guild_profile_emoji_extra.xml
index 226676e578..711330c148 100644
--- a/app/src/main/res/layout/widget_guild_profile_emoji_extra.xml
+++ b/app/src/main/res/layout/widget_guild_profile_emoji_extra.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/res_2131952581_uikit_textview_subtext" android:textSize="12dp" android:textColor="?attr/colorTextNormal" android:gravity="center" style="@style/res_2131952017_guildprofilesheet_emoji_item"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:textAppearance="@style/UiKit_TextView_Subtext" android:textSize="12dp" android:textColor="?attr/colorTextNormal" android:gravity="center" style="@style/GuildProfileSheet_Emoji_Item"/>
diff --git a/app/src/main/res/layout/widget_guild_profile_emoji_item.xml b/app/src/main/res/layout/widget_guild_profile_emoji_item.xml
index 81ff615b01..a2db1f4089 100644
--- a/app/src/main/res/layout/widget_guild_profile_emoji_item.xml
+++ b/app/src/main/res/layout/widget_guild_profile_emoji_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_profile_sheet_emoji_imageview" app:actualImageScaleType="2" style="@style/res_2131952017_guildprofilesheet_emoji_item"/>
+<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_profile_sheet_emoji_imageview" app:actualImageScaleType="2" style="@style/GuildProfileSheet_Emoji_Item"/>
diff --git a/app/src/main/res/layout/widget_guild_profile_sheet.xml b/app/src/main/res/layout/widget_guild_profile_sheet.xml
index 822f452bac..5d40c20a94 100644
--- a/app/src/main/res/layout/widget_guild_profile_sheet.xml
+++ b/app/src/main/res/layout/widget_guild_profile_sheet.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_NestedScrollView">
     <com.discord.app.AppViewFlipper android:id="@+id/guild_profile_sheet_flipper" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_profile_sheet_constraint_layout" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_profile_sheet_banner" android:layout_width="0dp" android:layout_height="wrap_content" app:actualImageScaleType="6" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:viewAspectRatio="1.78"/>
             <androidx.cardview.widget.CardView android:id="@+id/guild_profile_sheet_icon_card" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="16dp" android:layout_marginStart="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="20dp" app:cardElevation="0dp" app:contentPadding="4dp" app:layout_constraintBottom_toBottomOf="@+id/guild_profile_sheet_banner" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_banner">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_profile_sheet_icon" android:layout_width="match_parent" android:layout_height="match_parent" app:roundWithOverlayColor="?attr/colorBackgroundTertiary" app:roundedCornerRadius="16dp"/>
-                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_icon_name" android:padding="4dp" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@+id/guild_profile_sheet_icon_name" android:padding="4dp" style="@style/UiKit_TextView_Large_SingleLine"/>
             </androidx.cardview.widget.CardView>
-            <LinearLayout android:id="@+id/guild_profile_sheet_content_container" android:paddingBottom="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_icon_card" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+            <LinearLayout android:id="@+id/guild_profile_sheet_content_container" android:paddingBottom="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_icon_card" style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <ImageView android:layout_gravity="center" android:id="@+id/guild_profile_sheet_guild_verified_premium_icon" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/guild_profile_sheet_name" style="@style/res_2131952566_uikit_textview_h1_bold"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/guild_profile_sheet_name" style="@style/UiKit_TextView_H1_Bold"/>
                 </LinearLayout>
-                <TextView android:id="@+id/guild_profile_sheet_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952563_uikit_textview"/>
-                <LinearLayout android:gravity="center" android:layout_width="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <TextView android:id="@+id/guild_profile_sheet_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_TextView"/>
+                <LinearLayout android:gravity="center" android:layout_width="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <LinearLayout android:gravity="center" android:id="@+id/guild_profile_sheet_online_count" android:layout_width="wrap_content" android:layout_height="wrap_content">
                         <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_green_600" app:roundAsCircle="true"/>
-                        <TextView android:id="@+id/guild_profile_sheet_online_count_text" android:layout_marginEnd="16dp" style="@style/res_2131952016_guildprofilesheet_discoverableguild_text"/>
+                        <TextView android:id="@+id/guild_profile_sheet_online_count_text" android:layout_marginEnd="16dp" style="@style/GuildProfileSheet_DiscoverableGuild_Text"/>
                     </LinearLayout>
                     <LinearLayout android:gravity="center" android:id="@+id/guild_profile_sheet_member_count" android:layout_width="wrap_content" android:layout_height="wrap_content">
                         <com.facebook.drawee.view.SimpleDraweeView android:layout_width="8dp" android:layout_height="8dp" android:layout_marginEnd="8dp" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true"/>
-                        <TextView android:id="@+id/guild_profile_sheet_member_count_text" style="@style/res_2131952016_guildprofilesheet_discoverableguild_text"/>
+                        <TextView android:id="@+id/guild_profile_sheet_member_count_text" style="@style/GuildProfileSheet_DiscoverableGuild_Text"/>
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
-            <View android:id="@+id/guild_profile_sheet_content_container_bottom_divider" android:background="?attr/colorBackgroundModifierAccent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_content_container" style="@style/res_2131952416_uikit_divider"/>
-            <LinearLayout android:id="@+id/guild_profile_sheet_tab_items" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_content_container_bottom_divider" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_boosts" android:drawableTop="@drawable/ic_member_list_boosted_badge_24dp" android:layout_weight="1" style="@style/res_2131952018_guildprofilesheet_tabitems_button"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_guild_notifications_24dp" android:layout_weight="1" style="@style/res_2131952018_guildprofilesheet_tabitems_button"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_settings" android:text="@string/settings" android:drawableTop="@drawable/ic_guild_settings_24dp" android:layout_weight="1" style="@style/res_2131952018_guildprofilesheet_tabitems_button"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_invite" android:text="@string/instant_invite" android:drawableTop="@drawable/ic_guild_invite_24dp" android:layout_weight="1" style="@style/res_2131952018_guildprofilesheet_tabitems_button"/>
+            <View android:id="@+id/guild_profile_sheet_content_container_bottom_divider" android:background="?attr/colorBackgroundModifierAccent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_content_container" style="@style/UiKit_Divider"/>
+            <LinearLayout android:id="@+id/guild_profile_sheet_tab_items" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_content_container_bottom_divider" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_boosts" android:drawableTop="@drawable/ic_member_list_boosted_badge_24dp" android:layout_weight="1" style="@style/GuildProfileSheet_TabItems_Button"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_notifications" android:text="@string/notifications" android:drawableTop="@drawable/ic_guild_notifications_24dp" android:layout_weight="1" style="@style/GuildProfileSheet_TabItems_Button"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_settings" android:text="@string/settings" android:drawableTop="@drawable/ic_guild_settings_24dp" android:layout_weight="1" style="@style/GuildProfileSheet_TabItems_Button"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/guild_profile_sheet_invite" android:text="@string/instant_invite" android:drawableTop="@drawable/ic_guild_invite_24dp" android:layout_weight="1" style="@style/GuildProfileSheet_TabItems_Button"/>
             </LinearLayout>
             <androidx.constraintlayout.widget.Barrier android:id="@+id/guild_profile_sheet_actions_top_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="guild_profile_sheet_tab_items, guild_profile_sheet_content_container"/>
             <ViewStub android:id="@+id/widget_guild_profile_actions" android:layout="@layout/widget_guild_profile_actions" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_profile_sheet_actions_top_barrier"/>
diff --git a/app/src/main/res/layout/widget_guild_role_subscription_details.xml b/app/src/main/res/layout/widget_guild_role_subscription_details.xml
index fabe84fa39..ce5f35130a 100644
--- a/app/src/main/res/layout/widget_guild_role_subscription_details.xml
+++ b/app/src/main/res/layout/widget_guild_role_subscription_details.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/create_subscription_tier_details_layout" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
     <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_title" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_title" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_description" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
-        <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_tier_detail_name_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_name_placeholder" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_title" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_title" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+        <TextView android:layout_gravity="center_horizontal" android:id="@+id/create_subscription_tier_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_details_description" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
+        <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_tier_detail_name_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_name_placeholder" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_custom_image_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_custom_image_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
         <com.discord.widgets.guild_role_subscriptions.GuildSubscriptionRoleImageUploadView android:id="@+id/create_subscription_tier_image_upload_view" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp"/>
-        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_price_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_price_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
         <Spinner android:id="@+id/create_subscription_tier_price" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:popupBackground="?attr/colorPrimary"/>
-        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_description_layout" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+        <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/create_subscription_tier_description_layout" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:id="@+id/create_subscription_tier_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/widget_guild_role_subscription_plan_details.xml b/app/src/main/res/layout/widget_guild_role_subscription_plan_details.xml
index 63a64c80ab..5cd3ed81e6 100644
--- a/app/src/main/res/layout/widget_guild_role_subscription_plan_details.xml
+++ b/app/src/main/res/layout/widget_guild_role_subscription_plan_details.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/guild_subscription_plan_details_layout" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
     <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:layout_gravity="center_horizontal" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_title" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-        <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_subtitle" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
+        <TextView android:layout_gravity="center_horizontal" android:paddingLeft="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_title" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+        <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_plan_setup_details_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
         <com.discord.widgets.guild_role_subscriptions.GuildRoleSubscriptionPlanDetailsView android:id="@+id/guild_subscription_role_plan_details_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/widget_guild_role_subscription_tier_benefits.xml b/app/src/main/res/layout/widget_guild_role_subscription_tier_benefits.xml
index e4bd38f556..009773ec64 100644
--- a/app/src/main/res/layout/widget_guild_role_subscription_tier_benefits.xml
+++ b/app/src/main/res/layout/widget_guild_role_subscription_tier_benefits.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="@dimen/guild_role_subscription_setup_default_padding" android:paddingEnd="@dimen/guild_role_subscription_setup_default_padding">
-    <TextView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_benefits_title" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-    <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_create_tier_benefits_description" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
+    <TextView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_benefits_title" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+    <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_create_tier_benefits_description" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/subscription_tier_benefits_recycler" android:layout_width="match_parent" android:layout_height="match_parent"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_role_subscription_tier_channel_benefit.xml b/app/src/main/res/layout/widget_guild_role_subscription_tier_channel_benefit.xml
index d6baf8f935..44c95eb545 100644
--- a/app/src/main/res/layout/widget_guild_role_subscription_tier_channel_benefit.xml
+++ b/app/src/main/res/layout/widget_guild_role_subscription_tier_channel_benefit.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/res_2131951663_apptheme_toolbar">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar">
             <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952574_uikit_textview_medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_channel_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_channel_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_exclusive_channel_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_channel_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_channel_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_channel_benefit_title" style="@style/res_2131952580_uikit_textview_singleline"/>
-                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_channel_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
+                <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextView_Medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_channel_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_channel_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_exclusive_channel_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_channel_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_channel_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Large_SingleLine"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_channel_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_channel_benefit_title" style="@style/UiKit_TextView_SingleLine"/>
+                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_channel_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_channel_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_marginTop="32dp" android:text="@string/channel" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_benefit_channel" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_benefits_channel_name_placeholder" android:drawablePadding="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952570_uikit_textview_large"/>
-            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_marginTop="32dp" android:text="@string/channel" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_benefit_channel" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/guild_role_subscription_tier_benefits_channel_name_placeholder" android:drawablePadding="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Large"/>
+            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
             <LinearLayout android:orientation="horizontal" android:id="@+id/guild_role_subscription_channel_benefit_select_emoji" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_channel_benefit_emoji" android:layout_width="20dp" android:layout_height="20dp" app:actualImageScaleType="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_smiley_desaturated" app:placeholderImageScaleType="2"/>
-                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_channel_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952570_uikit_textview_large"/>
+                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_channel_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Large"/>
             </LinearLayout>
-            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_channel_benefit_description" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_channel_benefit_description" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_channel_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_channel_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_role_subscription_tier_design.xml b/app/src/main/res/layout/widget_guild_role_subscription_tier_design.xml
index 52646f688b..aaf02f4ad7 100644
--- a/app/src/main/res/layout/widget_guild_role_subscription_tier_design.xml
+++ b/app/src/main/res/layout/widget_guild_role_subscription_tier_design.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_title" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_description" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_title" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
+    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_title" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+    <TextView android:layout_gravity="center_horizontal" android:id="@+id/guild_role_subscription_tier_appearance_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_design_description" android:layout_marginStart="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginEnd="@dimen/guild_role_subscription_setup_default_padding" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_title" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
     <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginRight="@dimen/guild_role_subscription_setup_default_padding" app:cardCornerRadius="8dp" app:cardElevation="0dp">
         <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
-            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/res_2131951655_apptheme_light" android:id="@+id/guild_role_subscription_tier_member_preview_light" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/res_2131951648_apptheme_dark" android:id="@+id/guild_role_subscription_tier_member_preview_dark" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/AppTheme_Light" android:id="@+id/guild_role_subscription_tier_member_preview_light" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+            <com.discord.widgets.guild_role_subscriptions.tier.create.GuildRoleSubscriptionMemberPreview android:theme="@style/AppTheme_Dark" android:id="@+id/guild_role_subscription_tier_member_preview_dark" android:paddingLeft="8dp" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingRight="8dp" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_color_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_color_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
     <LinearLayout android:orientation="horizontal" android:id="@+id/guild_role_subscription_tier_appearance_color_layout" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
         <View android:id="@+id/guild_role_subscription_tier_appearance_color" android:background="@drawable/rounded_rectangle_4dp_radius" android:layout_width="24dp" android:layout_height="24dp"/>
-        <TextView android:textColor="?attr/colorInteractiveNormal" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_tier_appearance_color_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952574_uikit_textview_medium"/>
+        <TextView android:textColor="?attr/colorInteractiveNormal" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_tier_appearance_color_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Medium"/>
     </LinearLayout>
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_badge_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_design_member_badge_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_tier_appearance_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
     <com.discord.widgets.guild_role_subscriptions.GuildSubscriptionRoleImageUploadView android:id="@+id/guild_role_subscription_tier_member_badge" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:description="@string/guild_role_subscription_tier_design_member_badge_description" app:image_size="@dimen/avatar_size_medium" app:image_style="1" app:use_center_scale_type="true"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_role_subscription_tier_intangible_benefit.xml b/app/src/main/res/layout/widget_guild_role_subscription_tier_intangible_benefit.xml
index 6bd63f14dd..904073061d 100644
--- a/app/src/main/res/layout/widget_guild_role_subscription_tier_intangible_benefit.xml
+++ b/app/src/main/res/layout/widget_guild_role_subscription_tier_intangible_benefit.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/res_2131951663_apptheme_toolbar">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:contentInsetEnd="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar">
             <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                <com.google.android.material.button.MaterialButton android:textAppearance="@style/res_2131952574_uikit_textview_medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_intangible_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_intangible_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_additional_benefit_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_intangible_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952575_uikit_textview_medium_singleline"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_intangible_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_intangible_benefit_title" style="@style/res_2131952580_uikit_textview_singleline"/>
-                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_intangible_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952471_uikit_material_button_transparent"/>
+                <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit_TextView_Medium" android:textColor="?attr/colorInteractiveActive" android:id="@+id/guild_role_subscription_intangible_benefit_cancel" android:layout_width="wrap_content" android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_role_subscription_intangible_benefit_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_tier_additional_benefit_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/guild_role_subscription_intangible_benefit_subtitle" app:layout_constraintEnd_toStartOf="@+id/guild_role_subscription_intangible_benefit_save" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_cancel" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Medium_SingleLine"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_role_subscription_intangible_benefit_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintStart_toStartOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toBottomOf="@+id/guild_role_subscription_intangible_benefit_title" style="@style/UiKit_TextView_SingleLine"/>
+                <com.google.android.material.button.MaterialButton android:textColor="@color/uikit_btn_text_color_selector" android:id="@+id/guild_role_subscription_intangible_benefit_save" android:layout_width="wrap_content" android:text="@string/save" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_role_subscription_intangible_benefit_title" app:layout_constraintTop_toTopOf="0" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button_Transparent"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_benefit" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_benefits_intangible_name_placeholder" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_benefit" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_name_layout" app:endIconMode="2" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_name" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_benefits_intangible_name_placeholder" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
+            <TextView android:layout_marginTop="32dp" android:text="@string/guild_role_subscription_emoji" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/create_subscription_tier_subtitle" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
             <LinearLayout android:orientation="horizontal" android:id="@+id/guild_role_subscription_intangible_benefit_select_emoji" android:background="@drawable/ripple_bg_secondary" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_role_subscription_intangible_benefit_emoji" android:layout_width="20dp" android:layout_height="20dp" app:actualImageScaleType="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_smiley_desaturated" app:placeholderImageScaleType="2"/>
-                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_intangible_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952574_uikit_textview_medium"/>
+                <TextView android:textColor="?attr/colorInteractiveActive" android:layout_gravity="center_vertical" android:id="@+id/guild_role_subscription_intangible_benefit_emoji_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/icon_carrot" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextView_Medium"/>
             </LinearLayout>
-            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/res_2131952425_uikit_guildsubscriptionrole_setup_label"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_description_layout" app:hintEnabled="false" style="@style/res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+            <TextView android:layout_marginTop="24dp" android:text="@string/guild_role_subscription_tier_detail_description_label" style="@style/UiKit_GuildSubscriptionRole_Setup_Label"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_role_subscription_intangible_benefit_description_layout" app:hintEnabled="false" style="@style/UiKit_GuildSubscriptionRole_Setup_InputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/guild_role_subscription_intangible_benefit_description" android:paddingTop="@dimen/guild_role_subscription_setup_default_padding" android:paddingBottom="@dimen/guild_role_subscription_setup_default_padding" android:hint="@string/guild_role_subscription_tier_detail_description_placeholder" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_intangible_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red_500" android:id="@+id/guild_role_subscription_intangible_benefit_remove" android:padding="@dimen/guild_role_subscription_setup_default_padding" android:layout_width="match_parent" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_tier_benefits_remove_from_tier_label" android:backgroundTint="?attr/colorBackgroundSecondary" app:icon="@drawable/ic_delete_24dp" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/status_red_500" app:rippleColor="?attr/colorControlHighlight" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_guild_role_subscription_tier_review.xml b/app/src/main/res/layout/widget_guild_role_subscription_tier_review.xml
index c797f7a525..717586c38a 100644
--- a/app/src/main/res/layout/widget_guild_role_subscription_tier_review.xml
+++ b/app/src/main/res/layout/widget_guild_role_subscription_tier_review.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_confirmation_title" style="@style/res_2131952427_uikit_guildsubscriptionrole_setup_title"/>
-    <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_create_tier_confirmation_description" style="@style/res_2131952426_uikit_guildsubscriptionrole_setup_subtitle"/>
+    <TextView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/guild_role_subscription_create_tier_confirmation_title" style="@style/UiKit_GuildSubscriptionRole_Setup_Title"/>
+    <TextView android:layout_gravity="center_horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/guild_role_subscription_setup_default_padding" android:text="@string/guild_role_subscription_create_tier_confirmation_description" style="@style/UiKit_GuildSubscriptionRole_Setup_Subtitle"/>
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/subscription_tier_review_recycler" android:background="@drawable/drawable_rect_rounded_bg_secondary" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginTop="@dimen/guild_role_subscription_setup_default_padding" android:layout_marginRight="@dimen/guild_role_subscription_setup_default_padding"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_scheduled_event_list_bottom_sheet.xml b/app/src/main/res/layout/widget_guild_scheduled_event_list_bottom_sheet.xml
index c4f7675b92..1a1a31c960 100644
--- a/app/src/main/res/layout/widget_guild_scheduled_event_list_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_guild_scheduled_event_list_bottom_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="wrap_content" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_scheduled_event_list_toolbar_container" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textAppearance="@style/res_2131952544_uikit_textappearance_toolbar_title" android:id="@+id/guild_scheduled_event_list_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_events" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Toolbar_Title" android:id="@+id/guild_scheduled_event_list_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_events" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_scheduled_event_list_recycler_view" android:layout_margin="16dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_toolbar_container" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_scheduled_event_list_recycler_view" android:layout_margin="16dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_list_toolbar_container" style="@style/UiKit_ViewGroup_RecyclerView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_guild_scheduled_event_settings.xml b/app/src/main/res/layout/widget_guild_scheduled_event_settings.xml
index 8299c702bf..f0d8e2c1b2 100644
--- a/app/src/main/res/layout/widget_guild_scheduled_event_settings.xml
+++ b/app/src/main/res/layout/widget_guild_scheduled_event_settings.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_scheduled_event_settings_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_settings_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_scheduled_event_settings_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.core.widget.NestedScrollView android:id="@+id/guild_scheduled_event_settings_scroll_view" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toTopOf="@+id/guild_scheduled_event_settings_next_button" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_toolbar">
         <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent">
             <com.discord.views.ScreenTitleView android:id="@+id/guild_scheduled_event_settings_stv" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:stv_subtitle="@string/guild_event_create_body" app:stv_title="@string/guild_event_create_header"/>
-            <TextView android:id="@+id/guild_scheduled_event_settings_topic_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/guild_event_create_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_stv" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_topic_input" android:padding="12dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_topic_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/guild_event_create_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_stv" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_topic_input" android:padding="12dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:id="@+id/guild_scheduled_event_settings_place_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_event_choose_place_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_layout" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <LinearLayout android:id="@+id/guild_scheduled_event_settings_place_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_header" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_on_discord" app:cs_text="@string/guild_event_choose_place_discord" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_elsewhere" app:cs_text="@string/guild_event_choose_place_elsewhere" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_place_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/guild_event_choose_place_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_topic_layout" style="@style/UiKit_Stage_SectionHeader"/>
+            <LinearLayout android:id="@+id/guild_scheduled_event_settings_place_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_header" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_on_discord" app:cs_text="@string/guild_event_choose_place_discord" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_Divider"/>
+                <com.discord.views.CheckedSetting android:id="@+id/guild_scheduled_event_settings_place_option_elsewhere" app:cs_text="@string/guild_event_choose_place_elsewhere" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_select_channel_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_options" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_select_channel_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:hint="@string/guild_settings_public_welcome_select_a_channel" android:maxLength="240" android:drawableEnd="@drawable/ic_arrow_down" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_select_channel_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_place_options" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_select_channel_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:hint="@string/guild_settings_public_welcome_select_a_channel" android:maxLength="240" android:drawableEnd="@drawable/ic_arrow_down" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:id="@+id/guild_scheduled_event_settings_start_date_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/create_event_start_date_label" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_select_channel_input_layout" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <TextView android:id="@+id/guild_scheduled_event_settings_start_time_header" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/create_event_start_time_label" app:layout_constraintBaseline_toBaselineOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_date_input_layout" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_date_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_start_date_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/create_event_start_date_label" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_select_channel_input_layout" style="@style/UiKit_Stage_SectionHeader"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_start_time_header" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/create_event_start_time_label" app:layout_constraintBaseline_toBaselineOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_date_input_layout" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_date_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_date_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_time_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_time_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_time_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_start_time_input_layout" android:focusable="false" android:focusableInTouchMode="false" android:layout_width="0dp" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintStart_toStartOf="@+id/guild_scheduled_event_settings_start_time_header" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_time_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/guild_scheduled_event_settings_start_time_input" android:padding="12dp" android:focusable="false" android:focusableInTouchMode="false" android:maxLength="240" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:id="@+id/guild_scheduled_event_settings_description_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/create_stage_instance_description_input_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_input_layout" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_description_input_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_description_header" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:gravity="top|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_scheduled_event_settings_description_input" android:padding="12dp" android:hint="@string/guild_event_create_description_placeholder" android:lines="2" android:maxLength="240" android:lineSpacingMultiplier="1.2" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <TextView android:id="@+id/guild_scheduled_event_settings_description_header" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/create_stage_instance_description_input_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_start_date_input_layout" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_scheduled_event_settings_description_input_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/guild_scheduled_event_settings_description_header" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:gravity="top|left|center_vertical|center_horizontal|center|start" android:id="@+id/guild_scheduled_event_settings_description_input" android:padding="12dp" android:hint="@string/guild_event_create_description_placeholder" android:lines="2" android:maxLength="240" android:lineSpacingMultiplier="1.2" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/next" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952458_uikit_material_button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/next" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_guild_selector.xml b/app/src/main/res/layout/widget_guild_selector.xml
index 57313e3775..841816a637 100644
--- a/app/src/main/res/layout/widget_guild_selector.xml
+++ b/app/src/main/res/layout/widget_guild_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/guild_select" android:layout_marginStart="16dp" style="@style/res_2131952506_uikit_sheet_header_title"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_selector_list" android:paddingTop="4dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/guild_select" android:layout_marginStart="16dp" style="@style/UiKit_Sheet_Header_Title"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_selector_list" android:paddingTop="4dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_guild_selector_item.xml b/app/src/main/res/layout/widget_guild_selector_item.xml
index b12f30cc93..2822b8ced3 100644
--- a/app/src/main/res/layout/widget_guild_selector_item.xml
+++ b/app/src/main/res/layout/widget_guild_selector_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:background="?attr/selectableItemBackground" android:paddingStart="16dp" android:paddingEnd="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:background="?attr/selectableItemBackground" android:paddingStart="16dp" android:paddingEnd="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <FrameLayout android:gravity="center" android:id="@+id/item_avatar_wrap" android:background="@drawable/drawable_circle_black" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_icon" style="@style/res_2131951678_avatar_standard"/>
-        <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/item_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952563_uikit_textview"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/item_icon" style="@style/Avatar_Standard"/>
+        <TextView android:textColor="@color/white" android:gravity="center" android:id="@+id/item_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit_TextView"/>
     </FrameLayout>
-    <TextView android:id="@+id/item_name" android:background="@null" android:focusable="false" android:clickable="false" android:singleLine="true" style="@style/res_2131952492_uikit_settings_item"/>
+    <TextView android:id="@+id/item_name" android:background="@null" android:focusable="false" android:clickable="false" android:singleLine="true" style="@style/UiKit_Settings_Item"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_sticker_sheet.xml b/app/src/main/res/layout/widget_guild_sticker_sheet.xml
index 806f5505e5..4edf27a6e5 100644
--- a/app/src/main/res/layout/widget_guild_sticker_sheet.xml
+++ b/app/src/main/res/layout/widget_guild_sticker_sheet.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_sticker_sheet_flipper" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_sticker_sheet_flipper" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <com.discord.views.sticker.StickerView android:id="@+id/guild_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_description" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
         <FrameLayout android:id="@+id/guild_sticker_sheet_button_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp">
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_join_btn" android:text="@string/sticker_popout_join_server" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952460_uikit_material_button_green"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_join_btn" android:text="@string/sticker_popout_join_server" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/UiKit_Material_Button_Green"/>
         </FrameLayout>
-        <LinearLayout android:id="@+id/guild_sticker_sheet_guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952416_uikit_divider"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_header" android:layout_marginTop="16dp" android:text="@string/sticker_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-            <LinearLayout android:layout_marginTop="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:id="@+id/guild_sticker_sheet_guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/UiKit_Divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_header" android:layout_marginTop="16dp" android:text="@string/sticker_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+            <LinearLayout android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/guild_sticker_sheet_guild_icon_wrapper" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_sticker_sheet_guild_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guild_sticker_sheet_guild_icon_text" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952563_uikit_textview"/>
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_sticker_sheet_guild_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/UiKit_ImageView"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guild_sticker_sheet_guild_icon_text" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit_TextView"/>
                 </FrameLayout>
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_guild_name" android:drawablePadding="8dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_info" android:layout_marginTop="4dp" style="@style/res_2131952563_uikit_textview"/>
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_guild_name" android:drawablePadding="8dp" style="@style/UiKit_TextView_Bold"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_info" android:layout_marginTop="4dp" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_subscription_plan_setup.xml b/app/src/main/res/layout/widget_guild_subscription_plan_setup.xml
index a42db03746..34816e6eeb 100644
--- a/app/src/main/res/layout/widget_guild_subscription_plan_setup.xml
+++ b/app/src/main/res/layout/widget_guild_subscription_plan_setup.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.steps.StepsView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/guild_subscription_plan_setup_step_views" style="@style/res_2131952602_uikit_viewgroup_page"/>
+<com.discord.views.steps.StepsView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/guild_subscription_plan_setup_step_views" style="@style/UiKit_ViewGroup_Page"/>
diff --git a/app/src/main/res/layout/widget_guild_transfer_ownership.xml b/app/src/main/res/layout/widget_guild_transfer_ownership.xml
index d7a56c53f3..52c41af658 100644
--- a/app/src/main/res/layout/widget_guild_transfer_ownership.xml
+++ b/app/src/main/res/layout/widget_guild_transfer_ownership.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:padding="16dp" android:layout_width="match_parent" android:text="@string/transfer_ownership" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout android:id="@+id/guild_transfer_ownership_mfa_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/res_2131952498_uikit_settings_item_label"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_transfer_ownership_mfa_code" android:layout_margin="16dp" android:hint="@string/two_fa_auth_code" style="@style/res_2131952558_uikit_textinputlayout_primary">
-            <com.google.android.material.textfield.TextInputEditText android:inputType="text|textUri|textPassword|textVisiblePassword|number|numberPassword|phone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:padding="16dp" android:layout_width="match_parent" android:text="@string/transfer_ownership" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout android:id="@+id/guild_transfer_ownership_mfa_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit_Settings_Item_Label"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_transfer_ownership_mfa_code" android:layout_margin="16dp" android:hint="@string/two_fa_auth_code" style="@style/UiKit_TextInputLayout_Primary">
+            <com.google.android.material.textfield.TextInputEditText android:inputType="text|textUri|textPassword|textVisiblePassword|number|numberPassword|phone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
-    <com.discord.views.CheckedSetting android:id="@+id/guild_transfer_ownership_acknowledge_check" app:cs_text="@string/transfer_ownership_acknowledge" app:cs_text_size="@dimen/uikit_textsize_small" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:layout_gravity="center_vertical" android:id="@+id/guild_transfer_ownership_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:enabled="true" android:id="@+id/guild_transfer_ownership_confirm" android:text="@string/transfer" android:layout_marginStart="8dp" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+    <com.discord.views.CheckedSetting android:id="@+id/guild_transfer_ownership_acknowledge_check" app:cs_text="@string/transfer_ownership_acknowledge" app:cs_text_size="@dimen/uikit_textsize_small" style="@style/UiKit_CheckedSetting_Themed"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:layout_gravity="center_vertical" android:id="@+id/guild_transfer_ownership_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:enabled="true" android:id="@+id/guild_transfer_ownership_confirm" android:text="@string/transfer" android:layout_marginStart="8dp" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guild_welcome_channel.xml b/app/src/main/res/layout/widget_guild_welcome_channel.xml
index 5b17c45a93..38e058092b 100644
--- a/app/src/main/res/layout/widget_guild_welcome_channel.xml
+++ b/app/src/main/res/layout/widget_guild_welcome_channel.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_horizontal" android:id="@+id/guild_welcome_channel" android:layout_marginTop="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" style="@style/res_2131952589_uikit_viewgroup">
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_welcome_channel_details" android:padding="16dp" style="@style/res_2131952589_uikit_viewgroup">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_horizontal" android:id="@+id/guild_welcome_channel" android:layout_marginTop="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" style="@style/UiKit_ViewGroup">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_welcome_channel_details" android:padding="16dp" style="@style/UiKit_ViewGroup">
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_welcome_channel_icon" android:layout_width="wrap_content" android:layout_height="match_parent" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/guild_welcome_channel_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
             <TextView android:id="@+id/guild_welcome_channel_unicode_emoji" android:visibility="gone" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_welcome_channel_emoji" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:baselineAlignBottom="false" app:actualImageScaleType="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/ic_channel_text" app:roundedCornerRadius="4dp"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/guild_welcome_channel_text" android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/guild_welcome_channel_icon" app:layout_constraintTop_toTopOf="0">
-            <TextView android:id="@+id/guild_welcome_channel_description" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/guild_welcome_channel_name" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952564_uikit_textview_bold"/>
-            <ImageView android:id="@+id/guild_welcome_channel_hash" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginTop="2dp" android:src="@drawable/ic_channel_text" android:importantForAccessibility="no" android:layout_marginEnd="2dp" app:layout_constraintEnd_toStartOf="@+id/guild_welcome_channel_name" app:layout_constraintTop_toBottomOf="@+id/guild_welcome_channel_description" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_welcome_channel_name" android:layout_width="wrap_content" android:layout_marginStart="2dp" app:layout_constraintStart_toEndOf="@+id/guild_welcome_channel_hash" app:layout_constraintTop_toBottomOf="@+id/guild_welcome_channel_description" style="@style/res_2131952580_uikit_textview_singleline"/>
+            <TextView android:id="@+id/guild_welcome_channel_description" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toTopOf="@+id/guild_welcome_channel_name" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_TextView_Bold"/>
+            <ImageView android:id="@+id/guild_welcome_channel_hash" android:layout_width="16dp" android:layout_height="16dp" android:layout_marginTop="2dp" android:src="@drawable/ic_channel_text" android:importantForAccessibility="no" android:layout_marginEnd="2dp" app:layout_constraintEnd_toStartOf="@+id/guild_welcome_channel_name" app:layout_constraintTop_toBottomOf="@+id/guild_welcome_channel_description" style="@style/UiKit_ImageView"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_welcome_channel_name" android:layout_width="wrap_content" android:layout_marginStart="2dp" app:layout_constraintStart_toEndOf="@+id/guild_welcome_channel_hash" app:layout_constraintTop_toBottomOf="@+id/guild_welcome_channel_description" style="@style/UiKit_TextView_SingleLine"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/widget_guild_welcome_sheet.xml b/app/src/main/res/layout/widget_guild_welcome_sheet.xml
index 64faed32a5..ffdca6dffa 100644
--- a/app/src/main/res/layout/widget_guild_welcome_sheet.xml
+++ b/app/src/main/res/layout/widget_guild_welcome_sheet.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_NestedScrollView">
     <com.discord.app.AppViewFlipper android:id="@+id/guild_welcome_sheet_flipper" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <LinearLayout android:background="?attr/colorBackgroundPrimary" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <androidx.cardview.widget.CardView android:layout_gravity="center_horizontal" android:id="@+id/guild_welcome_sheet_icon_card" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="20dp" app:cardElevation="0dp" style="@style/res_2131952448_uikit_imageview">
+        <LinearLayout android:background="?attr/colorBackgroundPrimary" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <androidx.cardview.widget.CardView android:layout_gravity="center_horizontal" android:id="@+id/guild_welcome_sheet_icon_card" android:layout_marginTop="32dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="20dp" app:cardElevation="0dp" style="@style/UiKit_ImageView">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_welcome_sheet_icon" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:roundedCornerRadius="16dp"/>
-                <TextView android:ellipsize="none" android:layout_gravity="center" android:id="@+id/guild_welcome_sheet_icon_name" android:padding="4dp" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+                <TextView android:ellipsize="none" android:layout_gravity="center" android:id="@+id/guild_welcome_sheet_icon_name" android:padding="4dp" style="@style/UiKit_TextView_Large_SingleLine"/>
             </androidx.cardview.widget.CardView>
-            <LinearLayout android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:gravity="center_horizontal" android:id="@+id/guild_welcome_sheet_name" android:layout_width="match_parent" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/guild_welcome_sheet_description" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/welcome_screen_choice_header" android:textAllCaps="true" android:layout_marginEnd="16dp" style="@style/res_2131952564_uikit_textview_bold"/>
+            <LinearLayout android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:gravity="center_horizontal" android:id="@+id/guild_welcome_sheet_name" android:layout_width="match_parent" style="@style/UiKit_TextView_H1"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center_horizontal" android:id="@+id/guild_welcome_sheet_description" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/UiKit_TextView"/>
+                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/welcome_screen_choice_header" android:textAllCaps="true" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_Bold"/>
                 <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_welcome_sheet_channels" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_guilds_list.xml b/app/src/main/res/layout/widget_guilds_list.xml
index c32e92301e..f00f34a493 100644
--- a/app/src/main/res/layout/widget_guilds_list.xml
+++ b/app/src/main/res/layout/widget_guilds_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundTertiary" android:layout_width="wrap_content" android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_list" style="@style/res_2131952428_uikit_guildslist"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_list" style="@style/UiKit_GuildsList"/>
     <ViewStub android:id="@+id/guild_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="match_parent" android:layout_height="wrap_content"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_divider.xml b/app/src/main/res/layout/widget_guilds_list_item_divider.xml
index 7ebb4a60fc..59644f4468 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_divider.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_divider.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout style="@style/res_2131952437_uikit_guildslistitem_wrap">
-    <View style="@style/res_2131952433_uikit_guildslistdividericon"/>
+<FrameLayout style="@style/UiKit_GuildsListItem_Wrap">
+    <View style="@style/UiKit_GuildsListDividerIcon"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_dm.xml b/app/src/main/res/layout/widget_guilds_list_item_dm.xml
index 12d57ac38d..e973cf2f62 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_dm.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_dm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guilds_item_dm_avatar" android:background="?attr/selectableItemBackgroundBorderless" style="@style/res_2131952435_uikit_guildslisticon"/>
-    <TextView android:id="@+id/guilds_item_dm_count" android:layout_alignBottom="@+id/guilds_item_dm_avatar" android:layout_alignEnd="@+id/guilds_item_dm_avatar" style="@style/res_2131952440_uikit_guildslistmentions"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guilds_item_dm_avatar" android:background="?attr/selectableItemBackgroundBorderless" style="@style/UiKit_GuildsListIcon"/>
+    <TextView android:id="@+id/guilds_item_dm_count" android:layout_alignBottom="@+id/guilds_item_dm_avatar" android:layout_alignEnd="@+id/guilds_item_dm_avatar" style="@style/UiKit_GuildsListMentions"/>
 </merge>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_dm_vertical.xml b/app/src/main/res/layout/widget_guilds_list_item_dm_vertical.xml
index 47decd4fdc..9597e77108 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_dm_vertical.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_dm_vertical.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952436_uikit_guildslistitem">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_GuildsListItem">
     <include android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" layout="@layout/widget_guilds_list_item_dm"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_folder.xml b/app/src/main/res/layout/widget_guilds_list_item_folder.xml
index 2b881470da..104ca2efbf 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_folder.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_folder.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackgroundBorderless" style="@style/res_2131952436_uikit_guildslistitem">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackgroundBorderless" style="@style/UiKit_GuildsListItem">
     <FrameLayout android:id="@+id/guilds_item_folder_container" android:background="@drawable/drawable_squircle_transparent" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
         <com.discord.views.ServerFolderView android:id="@+id/guilds_item_folder" android:layout_width="match_parent" android:layout_height="match_parent"/>
         <View android:id="@+id/guilds_item_highlight" android:background="@color/white_alpha_20" android:layout_width="match_parent" android:layout_height="match_parent"/>
     </FrameLayout>
-    <ImageView android:id="@+id/guilds_item_unread" android:importantForAccessibility="no" style="@style/res_2131952444_uikit_guildslistunread"/>
-    <View android:id="@+id/guilds_item_selected" style="@style/res_2131952441_uikit_guildslistselected"/>
-    <ImageView android:id="@+id/guilds_item_voice" android:layout_alignTop="@+id/guilds_item_folder_container" android:contentDescription="@string/connection_status_voice_connected" android:layout_alignEnd="@+id/guilds_item_folder_container" style="@style/res_2131952446_uikit_guildslistvoiceicon"/>
-    <TextView android:id="@+id/guilds_item_mentions" android:layout_alignBottom="@+id/guilds_item_folder_container" android:layout_alignEnd="@+id/guilds_item_folder_container" style="@style/res_2131952440_uikit_guildslistmentions"/>
+    <ImageView android:id="@+id/guilds_item_unread" android:importantForAccessibility="no" style="@style/UiKit_GuildsListUnread"/>
+    <View android:id="@+id/guilds_item_selected" style="@style/UiKit_GuildsListSelected"/>
+    <ImageView android:id="@+id/guilds_item_voice" android:layout_alignTop="@+id/guilds_item_folder_container" android:contentDescription="@string/connection_status_voice_connected" android:layout_alignEnd="@+id/guilds_item_folder_container" style="@style/UiKit_GuildsListVoiceIcon"/>
+    <TextView android:id="@+id/guilds_item_mentions" android:layout_alignBottom="@+id/guilds_item_folder_container" android:layout_alignEnd="@+id/guilds_item_folder_container" style="@style/UiKit_GuildsListMentions"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_guild.xml b/app/src/main/res/layout/widget_guilds_list_item_guild.xml
index 33bfdde588..8f2772f19b 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_guild.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_guild.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <FrameLayout android:gravity="center" android:id="@+id/guilds_item_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guilds_item_avatar" app:fadeDuration="50" style="@style/res_2131952435_uikit_guildslisticon"/>
-        <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guilds_item_avatar_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952563_uikit_textview"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guilds_item_avatar" app:fadeDuration="50" style="@style/UiKit_GuildsListIcon"/>
+        <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guilds_item_avatar_text" android:clickable="false" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit_TextView"/>
     </FrameLayout>
-    <ImageView android:id="@+id/guilds_item_application_stream" android:visibility="gone" android:layout_alignTop="@+id/guilds_item_avatar_wrap" android:contentDescription="@string/status_streaming" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" style="@style/res_2131952431_uikit_guildslistapplicationstreamicon"/>
-    <ImageView android:id="@+id/guilds_item_voice" android:layout_alignTop="@+id/guilds_item_avatar_wrap" android:contentDescription="@string/connection_status_voice_connected" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" style="@style/res_2131952446_uikit_guildslistvoiceicon"/>
-    <TextView android:id="@+id/guilds_item_mentions" android:layout_alignBottom="@+id/guilds_item_avatar_wrap" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" style="@style/res_2131952440_uikit_guildslistmentions"/>
-    <ImageView android:id="@+id/guilds_item_application_status" android:visibility="gone" android:layout_alignBottom="@+id/guilds_item_avatar_wrap" android:contentDescription="@string/member_verification_icon_desc" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" app:srcCompat="@drawable/ic_application_status_rejected" style="@style/res_2131952430_uikit_guildslistapplicationstatus"/>
+    <ImageView android:id="@+id/guilds_item_application_stream" android:visibility="gone" android:layout_alignTop="@+id/guilds_item_avatar_wrap" android:contentDescription="@string/status_streaming" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" style="@style/UiKit_GuildsListApplicationStreamIcon"/>
+    <ImageView android:id="@+id/guilds_item_voice" android:layout_alignTop="@+id/guilds_item_avatar_wrap" android:contentDescription="@string/connection_status_voice_connected" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" style="@style/UiKit_GuildsListVoiceIcon"/>
+    <TextView android:id="@+id/guilds_item_mentions" android:layout_alignBottom="@+id/guilds_item_avatar_wrap" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" style="@style/UiKit_GuildsListMentions"/>
+    <ImageView android:id="@+id/guilds_item_application_status" android:visibility="gone" android:layout_alignBottom="@+id/guilds_item_avatar_wrap" android:contentDescription="@string/member_verification_icon_desc" android:layout_alignEnd="@+id/guilds_item_avatar_wrap" app:srcCompat="@drawable/ic_application_status_rejected" style="@style/UiKit_GuildsListApplicationStatus"/>
 </merge>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_guild_new.xml b/app/src/main/res/layout/widget_guilds_list_item_guild_new.xml
index 20aaf9bda7..3fae04b231 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_guild_new.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_guild_new.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginBottom="@dimen/guild_item_spacing" style="@style/res_2131952435_uikit_guildslisticon">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginBottom="@dimen/guild_item_spacing" style="@style/UiKit_GuildsListIcon">
     <com.facebook.drawee.view.SimpleDraweeView android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="match_parent" android:layout_height="match_parent" app:placeholderImage="?attr/colorBackgroundSecondary" app:roundAsCircle="true"/>
     <ImageView android:layout_gravity="center" android:id="@+id/guilds_item_profile_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_add_24dp" android:contentDescription="@string/create_server_button_cta_mobile" app:tint="@color/status_green_600"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_guild_unavailable.xml b/app/src/main/res/layout/widget_guilds_list_item_guild_unavailable.xml
index 7c04fa0660..812722b5d1 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_guild_unavailable.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_guild_unavailable.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:contentDescription="@string/guild_unavailable_header" style="@style/res_2131952443_uikit_guildslistunavailable"/>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:contentDescription="@string/guild_unavailable_header" style="@style/UiKit_GuildsListUnavailable"/>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_guild_vertical.xml b/app/src/main/res/layout/widget_guilds_list_item_guild_vertical.xml
index c952dceafc..b80f5f6c6b 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_guild_vertical.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_guild_vertical.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952436_uikit_guildslistitem">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_GuildsListItem">
     <include android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" layout="@layout/widget_guilds_list_item_guild"/>
-    <ImageView android:id="@+id/guilds_item_unread" android:importantForAccessibility="no" style="@style/res_2131952444_uikit_guildslistunread"/>
-    <ImageView android:id="@+id/guilds_item_selected" android:importantForAccessibility="no" style="@style/res_2131952441_uikit_guildslistselected"/>
+    <ImageView android:id="@+id/guilds_item_unread" android:importantForAccessibility="no" style="@style/UiKit_GuildsListUnread"/>
+    <ImageView android:id="@+id/guilds_item_selected" android:importantForAccessibility="no" style="@style/UiKit_GuildsListSelected"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_hub_verification.xml b/app/src/main/res/layout/widget_guilds_list_item_hub_verification.xml
index 45ee04fa3f..25cf31afe0 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_hub_verification.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_hub_verification.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginBottom="@dimen/guild_item_spacing" style="@style/res_2131952435_uikit_guildslisticon">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginBottom="@dimen/guild_item_spacing" style="@style/UiKit_GuildsListIcon">
     <com.facebook.drawee.view.SimpleDraweeView android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="match_parent" android:layout_height="match_parent" app:placeholderImage="?attr/colorBackgroundSecondary" app:roundAsCircle="true"/>
     <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_hub_24dp" android:contentDescription="@string/create_server_button_cta_mobile" app:tint="@color/status_green_600"/>
     <com.discord.tooltips.SparkleView android:layout_gravity="center" android:id="@+id/guild_item_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_profile.xml b/app/src/main/res/layout/widget_guilds_list_item_profile.xml
index b4ee590668..7c3d2a22af 100644
--- a/app/src/main/res/layout/widget_guilds_list_item_profile.xml
+++ b/app/src/main/res/layout/widget_guilds_list_item_profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginTop="@dimen/guild_item_spacing" android:contentDescription="@string/direct_messages" style="@style/res_2131952436_uikit_guildslistitem">
-    <FrameLayout android:id="@+id/guilds_item_profile_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" style="@style/res_2131952435_uikit_guildslisticon">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginTop="@dimen/guild_item_spacing" android:contentDescription="@string/direct_messages" style="@style/UiKit_GuildsListItem">
+    <FrameLayout android:id="@+id/guilds_item_profile_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" style="@style/UiKit_GuildsListIcon">
         <ImageView android:layout_gravity="center" android:id="@+id/guilds_item_profile_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_guild_list_dms_24dp" android:importantForAccessibility="no"/>
     </FrameLayout>
-    <ImageView android:id="@+id/guilds_item_profile_selected" android:importantForAccessibility="no" style="@style/res_2131952441_uikit_guildslistselected"/>
+    <ImageView android:id="@+id/guilds_item_profile_selected" android:importantForAccessibility="no" style="@style/UiKit_GuildsListSelected"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_home.xml b/app/src/main/res/layout/widget_home.xml
index 83a1a15fbf..7b770d441c 100644
--- a/app/src/main/res/layout/widget_home.xml
+++ b/app/src/main/res/layout/widget_home.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_home_container" android:background="?attr/colorBackgroundTertiary" style="@style/res_2131952602_uikit_viewgroup_page">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_home_container" android:background="?attr/colorBackgroundTertiary" style="@style/UiKit_ViewGroup_Page">
     <ImageView android:id="@+id/peek_transition_bitmap" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="match_parent"/>
     <com.discord.widgets.home.HomePanelsLayout android:id="@+id/overlapping_panels" android:layout_width="match_parent" android:layout_height="match_parent" app:maxSidePanelNonFullScreenWidth="360dp">
         <include android:id="@+id/panel_left" layout="@layout/widget_home_panel_left"/>
diff --git a/app/src/main/res/layout/widget_home_panel_center_channel_less.xml b/app/src/main/res/layout/widget_home_panel_center_channel_less.xml
index 4d26a860f5..b89e0d07fa 100644
--- a/app/src/main/res/layout/widget_home_panel_center_channel_less.xml
+++ b/app/src/main/res/layout/widget_home_panel_center_channel_less.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ScrollView android:layout_height="match_parent" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952406_uikit_copy_container">
-            <ImageView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="?attr/img_chat_channel_less" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:layout_gravity="center" android:id="@+id/home_panel_center_channel_less_title" android:text="@string/channels_unavailable_title" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:gravity="center" android:id="@+id/home_panel_center_channel_less_body" android:layout_marginTop="16dp" android:text="@string/channels_unavailable_body" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <ScrollView android:layout_height="match_parent" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_Copy_Container">
+            <ImageView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="?attr/img_chat_channel_less" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:layout_gravity="center" android:id="@+id/home_panel_center_channel_less_title" android:text="@string/channels_unavailable_title" style="@style/UiKit_TextView_H1"/>
+                <TextView android:gravity="center" android:id="@+id/home_panel_center_channel_less_body" android:layout_marginTop="16dp" android:text="@string/channels_unavailable_body" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/widget_home_panel_center_chat.xml b/app/src/main/res/layout/widget_home_panel_center_chat.xml
index 413e201efc..aa1bf6ad54 100644
--- a/app/src/main/res/layout/widget_home_panel_center_chat.xml
+++ b/app/src/main/res/layout/widget_home_panel_center_chat.xml
@@ -9,8 +9,8 @@
     <View android:id="@+id/widget_chat_bottom_space" android:layout_width="match_parent" android:layout_height="0dp" android:layout_alignParentBottom="true"/>
     <ViewStub android:id="@+id/home_panel_center_nsfw" android:layout="@layout/widget_home_panel_center_nsfw" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/action_bar_toolbar_layout"/>
     <ViewStub android:id="@+id/home_panel_center_channel_less" android:layout="@layout/widget_home_panel_center_channel_less" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/action_bar_toolbar_layout"/>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0dp" style="@style/res_2131951663_apptheme_toolbar"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0dp" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
     <include android:id="@+id/unread" layout="@layout/widget_home_panel_center_content_unread"/>
 </com.discord.utilities.view.rounded.RoundedRelativeLayout>
diff --git a/app/src/main/res/layout/widget_home_panel_center_content_unread.xml b/app/src/main/res/layout/widget_home_panel_center_content_unread.xml
index 65a3164ea9..d2707eab59 100644
--- a/app/src/main/res/layout/widget_home_panel_center_content_unread.xml
+++ b/app/src/main/res/layout/widget_home_panel_center_content_unread.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:id="@+id/home_toolbar_unread_count" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="16dp" android:text="@string/sample_number_99" android:elevation="4dp" android:outlineProvider="none" style="@style/res_2131952021_icon_mentions"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:id="@+id/home_toolbar_unread_count" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="16dp" android:text="@string/sample_number_99" android:elevation="4dp" android:outlineProvider="none" style="@style/Icon_Mentions"/>
diff --git a/app/src/main/res/layout/widget_home_panel_center_nsfw.xml b/app/src/main/res/layout/widget_home_panel_center_nsfw.xml
index 86d31ba96f..f4255faab1 100644
--- a/app/src/main/res/layout/widget_home_panel_center_nsfw.xml
+++ b/app/src/main/res/layout/widget_home_panel_center_nsfw.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:visibility="gone" android:baselineAligned="false" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <ScrollView android:layout_height="0dp" android:layout_weight="1" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952406_uikit_copy_container">
-            <ImageView android:id="@+id/home_panel_center_nsfw_art" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="?attr/img_chat_nsfw" android:scaleType="fitCenter" android:contentDescription="@string/nsfw_title" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_gravity="center" android:id="@+id/home_panel_center_nsfw_title" android:text="@string/nsfw_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@+id/home_panel_center_nsfw_description" android:layout_marginTop="8dp" android:text="@string/nsfw_description" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:visibility="gone" android:baselineAligned="false" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <ScrollView android:layout_height="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_Copy_Container">
+            <ImageView android:id="@+id/home_panel_center_nsfw_art" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="?attr/img_chat_nsfw" android:scaleType="fitCenter" android:contentDescription="@string/nsfw_title" style="@style/UiKit_ImageView"/>
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:layout_gravity="center" android:id="@+id/home_panel_center_nsfw_title" android:text="@string/nsfw_title" style="@style/UiKit_TextView_H1_Bold"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@+id/home_panel_center_nsfw_description" android:layout_marginTop="8dp" android:text="@string/nsfw_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:id="@+id/home_panel_center_nsfw_anchor_wrap" style="@style/res_2131952403_uikit_copy_anchor">
-        <FrameLayout style="@style/res_2131952405_uikit_copy_anchor_item_rotatable">
-            <com.google.android.material.button.MaterialButton android:id="@+id/home_panel_center_nsfw_confirm" android:text="@string/nsfw_accept" style="@style/res_2131952464_uikit_material_button_red"/>
+    <LinearLayout android:id="@+id/home_panel_center_nsfw_anchor_wrap" style="@style/UiKit_Copy_Anchor">
+        <FrameLayout style="@style/UiKit_Copy_Anchor_Item_Rotatable">
+            <com.google.android.material.button.MaterialButton android:id="@+id/home_panel_center_nsfw_confirm" android:text="@string/nsfw_accept" style="@style/UiKit_Material_Button_Red"/>
         </FrameLayout>
-        <FrameLayout style="@style/res_2131952405_uikit_copy_anchor_item_rotatable">
-            <com.google.android.material.button.MaterialButton android:id="@+id/home_panel_center_nsfw_deny" android:text="@string/nsfw_decline" style="@style/res_2131952467_uikit_material_button_secondary"/>
+        <FrameLayout style="@style/UiKit_Copy_Anchor_Item_Rotatable">
+            <com.google.android.material.button.MaterialButton android:id="@+id/home_panel_center_nsfw_deny" android:text="@string/nsfw_decline" style="@style/UiKit_Material_Button_Secondary"/>
         </FrameLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_home_panel_left.xml b/app/src/main/res/layout/widget_home_panel_left.xml
index b6c625015f..a7dab0b9d0 100644
--- a/app/src/main/res/layout/widget_home_panel_left.xml
+++ b/app/src/main/res/layout/widget_home_panel_left.xml
@@ -4,5 +4,5 @@
     <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.channels.list.WidgetChannelsList" android:id="@+id/widget_channels" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@+id/widget_profile_strip" android:layout_toEndOf="@+id/widget_guilds"/>
     <View android:background="@color/black_alpha_20" android:layout_width="match_parent" android:layout_height="0.25dp" android:layout_above="@+id/widget_profile_strip"/>
     <FrameLayout android:id="@+id/widget_profile_strip" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true"/>
-    <TextView android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/guild_list_add_hint" android:background="@drawable/asset_tooltip_server_create" android:padding="16dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="136dp" android:text="@string/add_a_server_mobile" android:lineSpacingMultiplier="1" android:layout_marginStart="14dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/guild_list_add_hint" android:background="@drawable/asset_tooltip_server_create" android:padding="16dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="136dp" android:text="@string/add_a_server_mobile" android:lineSpacingMultiplier="1" android:layout_marginStart="14dp" style="@style/UiKit_TextView_Semibold"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_hub_add_name.xml b/app/src/main/res/layout/widget_hub_add_name.xml
index 2a13552e21..8705481afa 100644
--- a/app/src/main/res/layout/widget_hub_add_name.xml
+++ b/app/src/main/res/layout/widget_hub_add_name.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
     <com.discord.views.GuildView android:layout_gravity="center_horizontal" android:id="@+id/discord_hub_add_name_image" android:layout_width="80dp" android:layout_height="80dp" android:layout_marginTop="48dp" android:layout_marginBottom="16dp" android:scaleType="centerCrop" android:importantForAccessibility="no" app:gv_text_size="24sp"/>
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/discord_hub_add_name_title" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/hub_real_name_modal_header" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_width="match_parent" android:layout_marginBottom="24dp" android:text="@string/hub_real_name_modal_subheader" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/discord_hub_add_name_input_layout" android:layout_marginBottom="8dp" android:hint="@string/hub_real_name_modal_form_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:expandedHintEnabled="false" style="@style/res_2131952545_uikit_textinputlayout">
-        <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/discord_hub_add_name_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hub_real_name_modal_form_placeholder" style="@style/res_2131952552_uikit_textinputlayout_edittext_singleline_email"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/discord_hub_add_name_title" android:layout_width="match_parent" android:layout_marginBottom="8dp" android:text="@string/hub_real_name_modal_header" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_H1_Bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:layout_width="match_parent" android:layout_marginBottom="24dp" android:text="@string/hub_real_name_modal_subheader" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/discord_hub_add_name_input_layout" android:layout_marginBottom="8dp" android:hint="@string/hub_real_name_modal_form_title" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:expandedHintEnabled="false" style="@style/UiKit_TextInputLayout">
+        <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/discord_hub_add_name_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hub_real_name_modal_form_placeholder" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Email"/>
     </com.google.android.material.textfield.TextInputLayout>
     <com.discord.views.LoadingButton android:id="@+id/discord_hub_add_name_title_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/lets_go"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_incoming_share.xml b/app/src/main/res/layout/widget_incoming_share.xml
index ac0446bd7d..9a477568be 100644
--- a/app/src/main/res/layout/widget_incoming_share.xml
+++ b/app/src/main/res/layout/widget_incoming_share.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_close" app:title="@string/share" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_close" app:title="@string/share" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:paddingTop="8dp" android:text="@string/message_preview" android:textAllCaps="true" style="@style/res_2131952485_uikit_search_header"/>
-            <androidx.cardview.widget.CardView android:id="@+id/external_share_list_wrap" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" style="@style/res_2131952589_uikit_viewgroup">
-                <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/external_share_list" android:clipToPadding="false" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:paddingTop="8dp" android:text="@string/message_preview" android:textAllCaps="true" style="@style/UiKit_Search_Header"/>
+            <androidx.cardview.widget.CardView android:id="@+id/external_share_list_wrap" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" app:cardCornerRadius="4dp" style="@style/UiKit_ViewGroup">
+                <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/external_share_list" android:clipToPadding="false" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit_ViewGroup_RecyclerView"/>
             </androidx.cardview.widget.CardView>
-            <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@+id/external_share_activity_action_preview" android:background="?attr/chat_embed_bg" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:animateLayoutChanges="true" android:elevation="@dimen/app_elevation" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/external_share_comment" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:hint="@string/add_a_comment_optional" app:startIconDrawable="?attr/ic_edit" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+            <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@+id/external_share_activity_action_preview" android:background="?attr/chat_embed_bg" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:animateLayoutChanges="true" android:elevation="@dimen/app_elevation" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/external_share_comment" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:hint="@string/add_a_comment_optional" app:startIconDrawable="?attr/ic_edit" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:text="@string/share_to" android:textAllCaps="true" style="@style/res_2131952485_uikit_search_header"/>
+            <TextView android:text="@string/share_to" android:textAllCaps="true" style="@style/UiKit_Search_Header"/>
             <com.discord.app.AppViewFlipper android:id="@+id/search_flipper" android:paddingLeft="16dp" android:paddingRight="16dp" android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/external_share_search" android:layout_margin="0dp" style="@style/res_2131952560_uikit_textinputlayout_search">
-                    <com.google.android.material.textfield.TextInputEditText android:hint="@string/select_channel_or_category" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/external_share_search" android:layout_margin="0dp" style="@style/UiKit_TextInputLayout_Search">
+                    <com.google.android.material.textfield.TextInputEditText android:hint="@string/select_channel_or_category" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:background="?attr/container_bg_dark_a60" android:elevation="@dimen/app_elevation" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:background="?attr/container_bg_dark_a60" android:elevation="@dimen/app_elevation" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <com.discord.widgets.user.search.ViewGlobalSearchItem android:id="@+id/widget_channel_search_item" android:paddingTop="8dp" android:paddingBottom="8dp" android:clipChildren="false" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
-                    <ImageView android:id="@+id/widget_channel_search_item_remove" android:padding="4dp" android:src="?attr/ic_close_24dp" android:contentDescription="@string/remove" android:layout_marginEnd="4dp" style="@style/res_2131952449_uikit_imageview_clickable"/>
+                    <ImageView android:id="@+id/widget_channel_search_item_remove" android:padding="4dp" android:src="?attr/ic_close_24dp" android:contentDescription="@string/remove" android:layout_marginEnd="4dp" style="@style/UiKit_ImageView_Clickable"/>
                 </LinearLayout>
             </com.discord.app.AppViewFlipper>
-            <com.discord.app.AppViewFlipper android:id="@+id/incoming_share_results_flipper" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/external_share_search_results" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-                <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="0dp" style="@style/res_2131952589_uikit_viewgroup">
-                    <RelativeLayout android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_margin="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                        <TextView android:gravity="start" android:padding="0dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toStartOf="@+id/incoming_share_no_results_img" app:drawableTopCompat="@null" style="@style/res_2131952576_uikit_textview_noresults"/>
-                        <ImageView android:id="@+id/incoming_share_no_results_img" android:layout_width="64dp" android:layout_height="64dp" android:src="?attr/img_empty_search" android:contentDescription="@string/search_no_results" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
+            <com.discord.app.AppViewFlipper android:id="@+id/incoming_share_results_flipper" android:inAnimation="@anim/anim_fade_in" android:outAnimation="@anim/anim_fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/external_share_search_results" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
+                <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="0dp" style="@style/UiKit_ViewGroup">
+                    <RelativeLayout android:gravity="center_horizontal" android:layout_width="match_parent" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                        <TextView android:gravity="start" android:padding="0dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toStartOf="@+id/incoming_share_no_results_img" app:drawableTopCompat="@null" style="@style/UiKit_TextView_NoResults"/>
+                        <ImageView android:id="@+id/incoming_share_no_results_img" android:layout_width="64dp" android:layout_height="64dp" android:src="?attr/img_empty_search" android:contentDescription="@string/search_no_results" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
                     </RelativeLayout>
                 </androidx.cardview.widget.CardView>
             </com.discord.app.AppViewFlipper>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_issue_details_form.xml b/app/src/main/res/layout/widget_issue_details_form.xml
index 0d3b70f9dc..6273c1889a 100644
--- a/app/src/main/res/layout/widget_issue_details_form.xml
+++ b/app/src/main/res/layout/widget_issue_details_form.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952601_uikit_viewgroup_nestedscrollview_page">
-    <LinearLayout style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-        <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-            <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_NestedScrollView_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_Page_LinearLayout">
+        <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+            <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar"/>
         </com.google.android.material.appbar.AppBarLayout>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/issue_details_input" android:layout_margin="16dp" android:hint="@string/feedback_describe_issue" style="@style/res_2131952545_uikit_textinputlayout">
-            <com.google.android.material.textfield.TextInputEditText android:maxLength="1024" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/issue_details_input" android:layout_margin="16dp" android:hint="@string/feedback_describe_issue" style="@style/UiKit_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:maxLength="1024" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
         </com.google.android.material.textfield.TextInputLayout>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorTextMuted" android:id="@+id/issue_details_cx_prompt" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/issue_details_submit_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/submit" style="@style/res_2131952458_uikit_material_button"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorTextMuted" android:id="@+id/issue_details_cx_prompt" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/issue_details_submit_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/submit" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_kick_user.xml b/app/src/main/res/layout/widget_kick_user.xml
index 39480fca63..c05aa7f74b 100644
--- a/app/src/main/res/layout/widget_kick_user.xml
+++ b/app/src/main/res/layout/widget_kick_user.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" style="@style/res_2131952411_uikit_dialog_container">
-    <TextView android:id="@+id/kick_user_title" android:text="@string/kick_user_title" style="@style/res_2131952414_uikit_dialog_title"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" style="@style/UiKit_Dialog_Container">
+    <TextView android:id="@+id/kick_user_title" android:text="@string/kick_user_title" style="@style/UiKit_Dialog_Title"/>
+    <View style="@style/UiKit_Divider"/>
     <ScrollView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-        <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/kick_user_body" android:text="@string/kick_user_body" style="@style/res_2131952408_uikit_dialog_body"/>
-            <TextView android:text="@string/form_label_reason_kick" style="@style/res_2131952412_uikit_dialog_subtitle"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/kick_user_reason" android:layout_margin="16dp" android:hint="@string/form_label_reason_kick" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:maxLength="512" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+        <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/kick_user_body" android:text="@string/kick_user_body" style="@style/UiKit_Dialog_Body"/>
+            <TextView android:text="@string/form_label_reason_kick" style="@style/UiKit_Dialog_Subtitle"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/kick_user_reason" android:layout_margin="16dp" android:hint="@string/form_label_reason_kick" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:maxLength="512" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/kick_user_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/kick_user_confirm" android:text="@string/confirm" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/kick_user_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/kick_user_confirm" android:text="@string/confirm" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_manage_reactions.xml b/app/src/main/res/layout/widget_manage_reactions.xml
index 10ebb7d800..1b23220664 100644
--- a/app/src/main/res/layout/widget_manage_reactions.xml
+++ b/app/src/main/res/layout/widget_manage_reactions.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <RelativeLayout style="@style/res_2131951640_apptheme_appbarscrollingviewbehavior">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/manage_reactions_emojis_recycler" android:background="?attr/primary_630" android:paddingLeft="4dp" android:paddingRight="4dp" android:clipToPadding="false" android:layout_height="50dp" android:layout_alignParentTop="true" android:elevation="2dp" style="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/manage_reactions_results_recycler" android:paddingTop="8dp" android:clipToPadding="false" android:layout_below="@+id/manage_reactions_emojis_recycler" android:layout_alignParentBottom="true" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <RelativeLayout style="@style/AppTheme_AppBarScrollingViewBehavior">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/manage_reactions_emojis_recycler" android:background="?attr/primary_630" android:paddingLeft="4dp" android:paddingRight="4dp" android:clipToPadding="false" android:layout_height="50dp" android:layout_alignParentTop="true" android:elevation="2dp" style="@style/UiKit_ViewGroup_RecyclerView_Horizontal"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/manage_reactions_results_recycler" android:paddingTop="8dp" android:clipToPadding="false" android:layout_below="@+id/manage_reactions_emojis_recycler" android:layout_alignParentBottom="true" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </RelativeLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_manage_reactions_emoji.xml b/app/src/main/res/layout/widget_manage_reactions_emoji.xml
index 6dc8c6340b..bcdd8aae1e 100644
--- a/app/src/main/res/layout/widget_manage_reactions_emoji.xml
+++ b/app/src/main/res/layout/widget_manage_reactions_emoji.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_width="wrap_content" android:layout_height="50dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <LinearLayout android:gravity="center" android:id="@+id/manage_reactions_emoji_container" android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="60dp" android:layout_centerHorizontal="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:gravity="center" android:id="@+id/manage_reactions_emoji_emoji_textview" android:layout_height="24dp" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textSize="18sp" android:textColor="?attr/primary_100" android:id="@+id/manage_reactions_emoji_counter" android:layout_marginStart="8dp" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_width="wrap_content" android:layout_height="50dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <LinearLayout android:gravity="center" android:id="@+id/manage_reactions_emoji_container" android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="60dp" android:layout_centerHorizontal="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:gravity="center" android:id="@+id/manage_reactions_emoji_emoji_textview" android:layout_height="24dp" style="@style/UiKit_TextView"/>
+        <TextView android:textSize="18sp" android:textColor="?attr/primary_100" android:id="@+id/manage_reactions_emoji_counter" android:layout_marginStart="8dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
     <View android:id="@+id/manage_reactions_emoji_selected_indicator" android:background="?attr/manage_reactions_emoji_selection_indicator" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="4dp" android:layout_alignParentBottom="true" android:layout_alignStart="@+id/manage_reactions_emoji_container" android:layout_alignEnd="@+id/manage_reactions_emoji_container"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_manage_reactions_result_error.xml b/app/src/main/res/layout/widget_manage_reactions_result_error.xml
index e3e28d472a..77f38bee5d 100644
--- a/app/src/main/res/layout/widget_manage_reactions_result_error.xml
+++ b/app/src/main/res/layout/widget_manage_reactions_result_error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_height="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <ImageView android:id="@+id/manage_reactions_result_error_img" android:focusable="true" android:clickable="true" android:src="?attr/img_poop" android:layout_above="@+id/manage_reactions_result_error_text" android:layout_centerHorizontal="true" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:gravity="center_horizontal" android:id="@+id/manage_reactions_result_error_text" android:layout_marginTop="10dp" android:text="@string/load_reactions_error" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <ImageView android:id="@+id/manage_reactions_result_error_img" android:focusable="true" android:clickable="true" android:src="?attr/img_poop" android:layout_above="@+id/manage_reactions_result_error_text" android:layout_centerHorizontal="true" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:gravity="center_horizontal" android:id="@+id/manage_reactions_result_error_text" android:layout_marginTop="10dp" android:text="@string/load_reactions_error" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_manage_reactions_result_loading.xml b/app/src/main/res/layout/widget_manage_reactions_result_loading.xml
index 3bb5ab6ab3..3a1b4264b2 100644
--- a/app/src/main/res/layout/widget_manage_reactions_result_loading.xml
+++ b/app/src/main/res/layout/widget_manage_reactions_result_loading.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" style="@style/res_2131952589_uikit_viewgroup">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" style="@style/UiKit_ViewGroup">
     <ProgressBar android:layout_gravity="center" android:layout_width="50dp" android:layout_height="50dp" android:indeterminate="true" android:indeterminateTint="?attr/primary_100" android:indeterminateTintMode="src_in"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_manage_reactions_result_user.xml b/app/src/main/res/layout/widget_manage_reactions_result_user.xml
index ac82ea80af..8cb93462d1 100644
--- a/app/src/main/res/layout/widget_manage_reactions_result_user.xml
+++ b/app/src/main/res/layout/widget_manage_reactions_result_user.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="20dp" android:paddingTop="8dp" android:paddingRight="20dp" android:paddingBottom="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/manage_reactions_result_user_avatar" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentStart="true" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/manage_reactions_result_user_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@+id/manage_reactions_result_remove_reaction" android:layout_toEndOf="@+id/manage_reactions_result_user_avatar" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:paddingLeft="20dp" android:paddingTop="8dp" android:paddingRight="20dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/manage_reactions_result_user_avatar" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:layout_alignParentStart="true" style="@style/Avatar_Standard"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/manage_reactions_result_user_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@+id/manage_reactions_result_remove_reaction" android:layout_toEndOf="@+id/manage_reactions_result_user_avatar" style="@style/UiKit_TextView"/>
     <ImageView android:id="@+id/manage_reactions_result_remove_reaction" android:background="?attr/selectableItemBackgroundBorderless" android:focusable="true" android:clickable="true" android:layout_width="24dp" android:layout_height="24dp" android:src="?attr/ic_close_24dp" android:layout_centerVertical="true" android:contentDescription="@string/remove_reaction" android:layout_alignParentEnd="true"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_masked_links_dialog.xml b/app/src/main/res/layout/widget_masked_links_dialog.xml
index 63e46f6d29..8874a6704e 100644
--- a/app/src/main/res/layout/widget_masked_links_dialog.xml
+++ b/app/src/main/res/layout/widget_masked_links_dialog.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/hold_up" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/hold_up" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Divider"/>
     <androidx.constraintlayout.widget.ConstraintLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
         <ScrollView android:layout_width="0dp" android:layout_height="0dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHeight_default="1" app:layout_constraintHeight_max="100dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0">
-            <TextView android:id="@+id/masked_links_body_text" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+            <TextView android:id="@+id/masked_links_body_text" style="@style/UiKit_Settings_Item_SubText"/>
         </ScrollView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <TextView android:textColor="?attr/colorTextLink" android:id="@+id/masked_links_trust_domain" android:layout_width="match_parent" android:text="@string/masked_link_trust_this_domain" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/masked_links_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/masked_links_confirm" android:text="@string/confirm" style="@style/res_2131952459_uikit_material_button_fit"/>
+    <TextView android:textColor="?attr/colorTextLink" android:id="@+id/masked_links_trust_domain" android:layout_width="match_parent" android:text="@string/masked_link_trust_this_domain" style="@style/UiKit_Settings_Item_SubText"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/masked_links_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/masked_links_confirm" android:text="@string/confirm" style="@style/UiKit_Material_Button_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_media.xml b/app/src/main/res/layout/widget_media.xml
index c77e96267d..4e1ccd3c3e 100644
--- a/app/src/main/res/layout/widget_media.xml
+++ b/app/src/main/res/layout/widget_media.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/media_container" android:background="?attr/primary_900" style="@style/res_2131952602_uikit_viewgroup_page">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/media_container" android:background="?attr/primary_900" style="@style/UiKit_ViewGroup_Page">
     <com.google.android.exoplayer2.ui.PlayerView android:layout_gravity="center" android:id="@+id/media_player_view" android:layout_width="match_parent" android:layout_height="match_parent" app:resize_mode="0" app:surface_type="2" app:use_controller="false"/>
     <com.google.android.exoplayer2.ui.PlayerControlView android:layout_gravity="bottom" android:id="@+id/media_player_control_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
     <com.facebook.samples.zoomable.ZoomableDraweeView android:layout_gravity="center" android:id="@+id/media_image" android:background="?attr/primary_900" android:layout_width="match_parent" android:layout_height="match_parent" app:failureImage="@drawable/asset_sadbot" app:failureImageScaleType="4"/>
     <ProgressBar android:layout_gravity="center" android:id="@+id/media_loading_indicator" android:background="@drawable/drawable_circle_primary_900_alpha_80" android:padding="8dp" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" android:indeterminateTint="@color/white"/>
-    <com.google.android.material.appbar.AppBarLayout android:layout_gravity="top" android:id="@+id/action_bar_toolbar_layout" style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar android:background="?attr/primary_900_alpha_80" style="@style/res_2131951663_apptheme_toolbar"/>
+    <com.google.android.material.appbar.AppBarLayout android:layout_gravity="top" android:id="@+id/action_bar_toolbar_layout" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar android:background="?attr/primary_900_alpha_80" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_member_verification.xml b/app/src/main/res/layout/widget_member_verification.xml
index 68bca78ad9..2f56bb6242 100644
--- a/app/src/main/res/layout/widget_member_verification.xml
+++ b/app/src/main/res/layout/widget_member_verification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.discord.views.CustomAppBarLayout android:id="@+id/app_bar_layout" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131951637_apptheme_appbarlayout">
+    <com.discord.views.CustomAppBarLayout android:id="@+id/app_bar_layout" android:background="?attr/colorBackgroundPrimary" style="@style/AppTheme_AppBarLayout">
         <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/collapsing_toolbar" android:layout_width="match_parent" android:layout_height="match_parent" app:contentScrim="?attr/colorBackgroundPrimary" app:layout_scrollFlags="3">
             <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/member_verification_banner_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="36dp" app:placeholderImage="@drawable/drawable_default_invite_splash" app:viewAspectRatio="1.77"/>
@@ -8,18 +8,18 @@
                     <com.discord.views.MemberVerificationAvatarView android:id="@+id/member_verification_guild_icon" android:layout_width="64dp" android:layout_height="64dp"/>
                 </androidx.cardview.widget.CardView>
             </RelativeLayout>
-            <androidx.appcompat.widget.Toolbar android:background="@drawable/drawable_black_underlay_gradient" app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951663_apptheme_toolbar"/>
+            <androidx.appcompat.widget.Toolbar android:background="@drawable/drawable_black_underlay_gradient" app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.discord.views.CustomAppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/member_verification_scrollview" android:visibility="gone" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:layout_below="@+id/app_bar_layout" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="18dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_title" style="@style/res_2131952001_friendslist_emptystate_title"/>
-            <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_subtitle" style="@style/res_2131952574_uikit_textview_medium"/>
-            <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/res_2131952491_uikit_settings_divider"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/member_verification_scrollview" android:visibility="gone" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:layout_below="@+id/app_bar_layout" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textColor="?attr/colorInteractiveActive" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="18dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_title" style="@style/FriendsList_EmptyState_Title"/>
+            <TextView android:gravity="center" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/member_verification_modal_subtitle" style="@style/UiKit_TextView_Medium"/>
+            <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/UiKit_Settings_Divider"/>
             <com.discord.widgets.servers.member_verification.MemberVerificationView android:id="@+id/member_verification_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp"/>
-            <androidx.recyclerview.widget.RecyclerView android:id="@+id/member_verification_rules_recycler" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-            <com.discord.views.LoadingButton android:id="@+id/member_verification_rules_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" app:lb_progress_color="@color/white" app:lb_text="@string/member_verification_notice_cta" style="@style/res_2131952458_uikit_material_button"/>
+            <androidx.recyclerview.widget.RecyclerView android:id="@+id/member_verification_rules_recycler" style="@style/UiKit_ViewGroup_RecyclerView"/>
+            <com.discord.views.LoadingButton android:id="@+id/member_verification_rules_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" app:lb_progress_color="@color/white" app:lb_text="@string/member_verification_notice_cta" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_member_verification_approve_terms_item.xml b/app/src/main/res/layout/widget_member_verification_approve_terms_item.xml
index 8ce085d5d0..392da0b6fb 100644
--- a/app/src/main/res/layout/widget_member_verification_approve_terms_item.xml
+++ b/app/src/main/res/layout/widget_member_verification_approve_terms_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.CheckedSetting xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/member_verification_rules_check" app:cs_text="@string/member_verification_read_rules" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_text_size="@dimen/uikit_textsize_medium" app:cs_view_type="0" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+<com.discord.views.CheckedSetting xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/member_verification_rules_check" app:cs_text="@string/member_verification_read_rules" app:cs_text_color="?attr/colorHeaderPrimary" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_text_size="@dimen/uikit_textsize_medium" app:cs_view_type="0" style="@style/UiKit_CheckedSetting_Themed"/>
diff --git a/app/src/main/res/layout/widget_member_verification_header_item.xml b/app/src/main/res/layout/widget_member_verification_header_item.xml
index 7148048ddc..09635d2aea 100644
--- a/app/src/main/res/layout/widget_member_verification_header_item.xml
+++ b/app/src/main/res/layout/widget_member_verification_header_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_rules_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/member_verification_form_rules_label" style="@style/res_2131952621_userprofile_section_headertextappearance"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_rules_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/member_verification_form_rules_label" style="@style/UserProfile_Section_HeaderTextAppearance"/>
diff --git a/app/src/main/res/layout/widget_member_verification_multiple_choice_item.xml b/app/src/main/res/layout/widget_member_verification_multiple_choice_item.xml
index eb3b39f1b7..0cf4c3c8ea 100644
--- a/app/src/main/res/layout/widget_member_verification_multiple_choice_item.xml
+++ b/app/src/main/res/layout/widget_member_verification_multiple_choice_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_multiple_choice_radio_group" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/res_2131952589_uikit_viewgroup"/>
+<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_multiple_choice_radio_group" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/UiKit_ViewGroup"/>
diff --git a/app/src/main/res/layout/widget_member_verification_multiple_choice_radio_item.xml b/app/src/main/res/layout/widget_member_verification_multiple_choice_radio_item.xml
index fa4c08c74e..63bddd2ecf 100644
--- a/app/src/main/res/layout/widget_member_verification_multiple_choice_radio_item.xml
+++ b/app/src/main/res/layout/widget_member_verification_multiple_choice_radio_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RadioButton xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952483_uikit_radiobutton"/>
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_RadioButton"/>
diff --git a/app/src/main/res/layout/widget_member_verification_paragraph_item.xml b/app/src/main/res/layout/widget_member_verification_paragraph_item.xml
index ac8499f389..8be9452ee7 100644
--- a/app/src/main/res/layout/widget_member_verification_paragraph_item.xml
+++ b/app/src/main/res/layout/widget_member_verification_paragraph_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_paragraph_field" android:padding="12dp" style="@style/res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph"/>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_paragraph_field" android:padding="12dp" style="@style/UiKit_TextInputLayout_EditText_MultiLine_Paragraph"/>
 </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/widget_member_verification_pending_dialog.xml b/app/src/main/res/layout/widget_member_verification_pending_dialog.xml
index 3a0b60d0ce..ae941c511b 100644
--- a/app/src/main/res/layout/widget_member_verification_pending_dialog.xml
+++ b/app/src/main/res/layout/widget_member_verification_pending_dialog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content">
     <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
-        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="24dp" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
             <ImageView android:layout_gravity="center_horizontal" android:id="@+id/member_verification_pending_img" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:importantForAccessibility="no"/>
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/pending_dialog_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:gravity="center" android:id="@+id/pending_dialog_desc" android:layout_width="match_parent" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" style="@style/res_2131952574_uikit_textview_medium"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_primary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:insetTop="0dp" android:insetBottom="0dp" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_secondary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" android:backgroundTint="?attr/primary_500" style="@style/res_2131952458_uikit_material_button"/>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/member_verification_tertiary_btn" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="0dp" android:paddingTop="20dp" android:paddingRight="0dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/leave_server" style="@style/res_2131952535_uikit_textappearance_button"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/pending_dialog_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:gravity="center" android:id="@+id/pending_dialog_desc" android:layout_width="match_parent" android:layout_marginTop="8dp" android:layout_marginBottom="24dp" style="@style/UiKit_TextView_Medium"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_primary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:insetTop="0dp" android:insetBottom="0dp" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_secondary_btn" android:paddingLeft="0dp" android:paddingRight="0dp" android:insetTop="0dp" android:insetBottom="0dp" android:backgroundTint="?attr/primary_500" style="@style/UiKit_Material_Button"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/member_verification_tertiary_btn" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="0dp" android:paddingTop="20dp" android:paddingRight="0dp" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/leave_server" style="@style/UiKit_TextAppearance_Button"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_member_verification_rule_item.xml b/app/src/main/res/layout/widget_member_verification_rule_item.xml
index 6ce13e8a7f..67a1583ce2 100644
--- a/app/src/main/res/layout/widget_member_verification_rule_item.xml
+++ b/app/src/main/res/layout/widget_member_verification_rule_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.discord.utilities.view.rounded.RoundedRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/member_verification_rule_root" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp">
-    <LinearLayout android:id="@+id/member_verification_rule_container" android:padding="12dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/member_verification_rule_index" style="@style/res_2131952016_guildprofilesheet_discoverableguild_text"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/colorTextNormal" android:id="@+id/member_verification_rule_description" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" style="@style/res_2131952570_uikit_textview_large"/>
+    <LinearLayout android:id="@+id/member_verification_rule_container" android:padding="12dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/member_verification_rule_index" style="@style/GuildProfileSheet_DiscoverableGuild_Text"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?attr/colorTextNormal" android:id="@+id/member_verification_rule_description" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" style="@style/UiKit_TextView_Large"/>
     </LinearLayout>
-    <View android:id="@+id/member_verification_rule_divider" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_alignBottom="@+id/member_verification_rule_container" style="@style/res_2131952491_uikit_settings_divider"/>
+    <View android:id="@+id/member_verification_rule_divider" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:layout_alignBottom="@+id/member_verification_rule_container" style="@style/UiKit_Settings_Divider"/>
 </com.discord.utilities.view.rounded.RoundedRelativeLayout>
diff --git a/app/src/main/res/layout/widget_member_verification_success.xml b/app/src/main/res/layout/widget_member_verification_success.xml
index 33bdd6c833..8082468bfa 100644
--- a/app/src/main/res/layout/widget_member_verification_success.xml
+++ b/app/src/main/res/layout/widget_member_verification_success.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="24dp" android:layout_marginRight="24dp">
     <androidx.cardview.widget.CardView android:id="@+id/member_verification_success_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="168dp" android:layout_centerInParent="true" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
-        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="84dp" android:paddingRight="16dp" android:layout_width="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/member_verification_guild_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952564_uikit_textview_bold"/>
-            <TextView android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/lurker_mode_popout_success_body" style="@style/res_2131952574_uikit_textview_medium"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/lurker_mode_popout_success_button" style="@style/res_2131952458_uikit_material_button"/>
+        <LinearLayout android:layout_gravity="center" android:paddingLeft="16dp" android:paddingTop="84dp" android:paddingRight="16dp" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorInteractiveActive" android:gravity="center" android:id="@+id/member_verification_guild_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Bold"/>
+            <TextView android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/lurker_mode_popout_success_body" style="@style/UiKit_TextView_Medium"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/member_verification_confirm" android:paddingLeft="0dp" android:paddingRight="0dp" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/lurker_mode_popout_success_button" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_success_discovery" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:importantForAccessibility="no"/>
diff --git a/app/src/main/res/layout/widget_member_verification_text_input_item.xml b/app/src/main/res/layout/widget_member_verification_text_input_item.xml
index c676d08ca3..de2d004e1c 100644
--- a/app/src/main/res/layout/widget_member_verification_text_input_item.xml
+++ b/app/src/main/res/layout/widget_member_verification_text_input_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_text_input_field" android:padding="12dp" android:maxLength="150" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:boxBackgroundColor="?attr/colorBackgroundSecondary" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+    <com.google.android.material.textfield.TextInputEditText android:id="@+id/member_verification_text_input_field" android:padding="12dp" android:maxLength="150" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
 </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/widget_mobile_reports.xml b/app/src/main/res/layout/widget_mobile_reports.xml
index 814753d458..e591db2d75 100644
--- a/app/src/main/res/layout/widget_mobile_reports.xml
+++ b/app/src/main/res/layout/widget_mobile_reports.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <FrameLayout android:id="@+id/menu_reports_node_view_holder" style="@style/res_2131951640_apptheme_appbarscrollingviewbehavior"/>
+    <FrameLayout android:id="@+id/menu_reports_node_view_holder" style="@style/AppTheme_AppBarScrollingViewBehavior"/>
     <ProgressBar android:layout_gravity="center" android:id="@+id/mobile_reports_progress_bar" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_moderator_start_stage.xml b/app/src/main/res/layout/widget_moderator_start_stage.xml
index 31c854e857..daf8f338b3 100644
--- a/app/src/main/res/layout/widget_moderator_start_stage.xml
+++ b/app/src/main/res/layout/widget_moderator_start_stage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:backgroundTint="?attr/colorPrimaryDark" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:backgroundTint="?attr/colorPrimaryDark" style="@style/UiKit_ViewGroup_Page">
     <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/moderator_start_stage_exit_stage_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <Button android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:id="@+id/moderator_start_stage_exit_stage_button" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="20dp" android:paddingTop="12dp" android:paddingRight="20dp" android:paddingBottom="12dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/exit_event_stage_options_label" android:drawablePadding="8dp" android:drawableEnd="@drawable/ic_exit_24dp" android:backgroundTint="@color/status_red_500" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintVertical_bias="1"/>
+    <Button android:textAppearance="@style/UiKit_TextAppearance_Button" android:id="@+id/moderator_start_stage_exit_stage_button" android:background="@drawable/rounded_rectangle_1000dp_radius" android:paddingLeft="20dp" android:paddingTop="12dp" android:paddingRight="20dp" android:paddingBottom="12dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/exit_event_stage_options_label" android:drawablePadding="8dp" android:drawableEnd="@drawable/ic_exit_24dp" android:backgroundTint="@color/status_red_500" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintVertical_bias="1"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_music_rich_presence.xml b/app/src/main/res/layout/widget_music_rich_presence.xml
index 85e4670fae..17dfa424ff 100644
--- a/app/src/main/res/layout/widget_music_rich_presence.xml
+++ b/app/src/main/res/layout/widget_music_rich_presence.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/rich_presence_header" style="@style/res_2131952620_userprofile_section_header"/>
-    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/res_2131952619_userprofile_section_card">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952614_userprofile_presencesection_body">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/rich_presence_header" style="@style/UserProfile_Section_Header"/>
+    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/UserProfile_Section_Card">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UserProfile_PresenceSection_Body">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_large" android:layout_width="64dp" android:layout_height="64dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/colorBackgroundSecondary" app:roundedCornerRadius="4dp"/>
             <Space android:id="@+id/image_bottom_guideline" android:layout_width="@dimen/uikit_image_border_size" android:layout_height="@dimen/uikit_image_border_size" android:layout_marginTop="@dimen/uikit_image_border_size" android:layout_marginStart="@dimen/uikit_image_border_size" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@+id/rich_presence_image_large"/>
-            <LinearLayout android:id="@+id/rich_presence_container_data" android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintEnd_toStartOf="@+id/rich_presence_image_small" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/res_2131952615_userprofile_presencesection_body_headertext"/>
-                <TextView android:id="@+id/rich_presence_details" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
-                <TextView android:id="@+id/rich_presence_time" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
+            <LinearLayout android:id="@+id/rich_presence_container_data" android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintEnd_toStartOf="@+id/rich_presence_image_small" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile_PresenceSection_Body_HeaderText"/>
+                <TextView android:id="@+id/rich_presence_details" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
+                <TextView android:id="@+id/rich_presence_time" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
             </LinearLayout>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_small" android:visibility="visible" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_container_data" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:placeholderImage="@drawable/ic_spotify_green_24dp" app:roundAsCircle="true" style="@style/res_2131951676_avatar_medium"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_small" android:visibility="visible" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_container_data" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:placeholderImage="@drawable/ic_spotify_green_24dp" app:roundAsCircle="true" style="@style/Avatar_Medium"/>
             <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="rich_presence_container_data,rich_presence_image_large,rich_presence_image_small"/>
-            <SeekBar android:enabled="false" android:id="@+id/rich_presence_seekbar" android:focusable="false" android:clickable="false" android:layout_height="8dp" android:layout_marginTop="16dp" android:maxHeight="4dp" android:minHeight="4dp" android:paddingStart="0dp" android:paddingEnd="0dp" android:progressTint="?attr/primary_000" android:progressBackgroundTint="?attr/primary_500" android:thumbTint="@color/transparent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/res_2131952488_uikit_seekbar"/>
-            <FrameLayout android:id="@+id/rich_presence_music_progress_container" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_seekbar" style="@style/res_2131952589_uikit_viewgroup">
-                <TextView android:layout_gravity="start" android:id="@+id/rich_presence_music_elapsed" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:layout_gravity="end" android:id="@+id/rich_presence_music_duration" style="@style/res_2131952563_uikit_textview"/>
+            <SeekBar android:enabled="false" android:id="@+id/rich_presence_seekbar" android:focusable="false" android:clickable="false" android:layout_height="8dp" android:layout_marginTop="16dp" android:maxHeight="4dp" android:minHeight="4dp" android:paddingStart="0dp" android:paddingEnd="0dp" android:progressTint="?attr/primary_000" android:progressBackgroundTint="?attr/primary_500" android:thumbTint="@color/transparent" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/UiKit_SeekBar"/>
+            <FrameLayout android:id="@+id/rich_presence_music_progress_container" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_seekbar" style="@style/UiKit_ViewGroup">
+                <TextView android:layout_gravity="start" android:id="@+id/rich_presence_music_elapsed" style="@style/UiKit_TextView"/>
+                <TextView android:layout_gravity="end" android:id="@+id/rich_presence_music_duration" style="@style/UiKit_TextView"/>
             </FrameLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_music_progress_container" style="@style/res_2131952617_userprofile_presencesection_materialbutton"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_music_progress_container" style="@style/UserProfile_PresenceSection_MaterialButton"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_mute_settings_sheet.xml b/app/src/main/res/layout/widget_mute_settings_sheet.xml
index 1037e8d11a..a20e1f5ec5 100644
--- a/app/src/main/res/layout/widget_mute_settings_sheet.xml
+++ b/app/src/main/res/layout/widget_mute_settings_sheet.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:background="?attr/colorBackgroundTertiary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/title" style="@style/res_2131952043_mutesettings_row_title"/>
-            <TextView android:id="@+id/subtitle" style="@style/res_2131952042_mutesettings_row_subtitle"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:background="?attr/colorBackgroundTertiary" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/title" style="@style/MuteSettings_Row_Title"/>
+            <TextView android:id="@+id/subtitle" style="@style/MuteSettings_Row_Subtitle"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@+id/unmute_button" android:background="?attr/selectableItemBackground" android:paddingTop="24dp" android:paddingBottom="24dp" android:visibility="gone" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:gravity="center" android:id="@+id/unmute_button" android:background="?attr/selectableItemBackground" android:paddingTop="24dp" android:paddingBottom="24dp" android:visibility="gone" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="?attr/ic_sidebar_notifications_off_24dp"/>
-            <LinearLayout android:layout_marginStart="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/unmute_button_label" android:text="@string/unmute_channel" style="@style/res_2131952580_uikit_textview_singleline"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/unmute_button_details_label" android:text="@string/form_label_mobile_channel_muted_until" android:textAllCaps="false" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout android:layout_marginStart="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/unmute_button_label" android:text="@string/unmute_channel" style="@style/UiKit_TextView_SingleLine"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/unmute_button_details_label" android:text="@string/form_label_mobile_channel_muted_until" android:textAllCaps="false" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
-        <LinearLayout android:id="@+id/mute_settings_sheet_mute_options" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/option_fifteen_minutes" android:text="@string/mute_duration_15_minutes" style="@style/res_2131952451_uikit_listitem"/>
-            <TextView android:id="@+id/option_one_hour" android:text="@string/mute_duration_1_hour" style="@style/res_2131952451_uikit_listitem"/>
-            <TextView android:id="@+id/option_eight_hours" android:text="@string/mute_duration_8_hours" style="@style/res_2131952451_uikit_listitem"/>
-            <TextView android:id="@+id/option_twenty_four_hours" android:text="@string/mute_duration_24_hours" style="@style/res_2131952451_uikit_listitem"/>
-            <TextView android:id="@+id/option_always" android:text="@string/mute_duration_always" style="@style/res_2131952451_uikit_listitem"/>
+        <LinearLayout android:id="@+id/mute_settings_sheet_mute_options" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/option_fifteen_minutes" android:text="@string/mute_duration_15_minutes" style="@style/UiKit_ListItem"/>
+            <TextView android:id="@+id/option_one_hour" android:text="@string/mute_duration_1_hour" style="@style/UiKit_ListItem"/>
+            <TextView android:id="@+id/option_eight_hours" android:text="@string/mute_duration_8_hours" style="@style/UiKit_ListItem"/>
+            <TextView android:id="@+id/option_twenty_four_hours" android:text="@string/mute_duration_24_hours" style="@style/UiKit_ListItem"/>
+            <TextView android:id="@+id/option_always" android:text="@string/mute_duration_always" style="@style/UiKit_ListItem"/>
         </LinearLayout>
         <FrameLayout android:id="@+id/notification_settings_button_container" android:layout_width="match_parent" android:layout_height="wrap_content">
             <View android:background="?attr/colorBackgroundModifierAccent" android:layout_width="match_parent" android:layout_height="1dp"/>
-            <LinearLayout android:id="@+id/notification_settings_button" android:background="@drawable/bg_pressed_highlight_darken" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:id="@+id/notification_settings_label" android:background="@color/transparent" android:layout_width="wrap_content" android:text="@string/notification_settings" style="@style/res_2131952451_uikit_listitem"/>
+            <LinearLayout android:id="@+id/notification_settings_button" android:background="@drawable/bg_pressed_highlight_darken" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:id="@+id/notification_settings_label" android:background="@color/transparent" android:layout_width="wrap_content" android:text="@string/notification_settings" style="@style/UiKit_ListItem"/>
                 <View android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1"/>
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveMuted" android:id="@+id/notification_settings_overrides_label" android:drawablePadding="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/ic_arrow_right_24dp" app:drawableTint="?attr/colorInteractiveMuted" style="@style/res_2131952580_uikit_textview_singleline"/>
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveMuted" android:id="@+id/notification_settings_overrides_label" android:drawablePadding="8dp" android:layout_marginEnd="8dp" app:drawableEndCompat="@drawable/ic_arrow_right_24dp" app:drawableTint="?attr/colorInteractiveMuted" style="@style/UiKit_TextView_SingleLine"/>
             </LinearLayout>
         </FrameLayout>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:id="@+id/channel_muted_details" android:paddingBottom="16dp" android:text="@string/form_description_mobile_notification_muted" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:id="@+id/channel_muted_details" android:paddingBottom="16dp" android:text="@string/form_description_mobile_notification_muted" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_navigation_help.xml b/app/src/main/res/layout/widget_navigation_help.xml
index a609fee6e0..51c58ae94b 100644
--- a/app/src/main/res/layout/widget_navigation_help.xml
+++ b/app/src/main/res/layout/widget_navigation_help.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-    <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/navigation_help_close" android:padding="24dp" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" style="@style/res_2131952449_uikit_imageview_clickable"/>
+    <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/navigation_help_close" android:padding="24dp" android:src="@drawable/ic_close_24dp" android:contentDescription="@string/close_window" style="@style/UiKit_ImageView_Clickable"/>
     <androidx.viewpager2.widget.ViewPager2 android:id="@+id/navigation_help_nux_pager" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" android:layout_weight="1"/>
-    <com.google.android.material.tabs.TabLayout android:id="@+id/navigation_help_indicators" android:layout_marginBottom="32dp" style="@style/res_2131952530_uikit_tablayout_pagerindicator"/>
+    <com.google.android.material.tabs.TabLayout android:id="@+id/navigation_help_indicators" android:layout_marginBottom="32dp" style="@style/UiKit_TabLayout_PagerIndicator"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_navigation_help_nux_channels.xml b/app/src/main/res/layout/widget_navigation_help_nux_channels.xml
index cd7f8cbccb..0068c0f39a 100644
--- a/app/src/main/res/layout/widget_navigation_help_nux_channels.xml
+++ b/app/src/main/res/layout/widget_navigation_help_nux_channels.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32dp" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32dp" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
     <ImageView android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginBottom="32dp" android:src="@drawable/asset_nux_navigation_channels" android:layout_weight="2" android:importantForAccessibility="no"/>
     <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="16dp" android:text="@string/channels" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_channels" style="@style/res_2131952570_uikit_textview_large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="16dp" android:text="@string/channels" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_channels" style="@style/UiKit_TextView_Large"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_navigation_help_nux_dms.xml b/app/src/main/res/layout/widget_navigation_help_nux_dms.xml
index 3b54beacc6..12dbeaed55 100644
--- a/app/src/main/res/layout/widget_navigation_help_nux_dms.xml
+++ b/app/src/main/res/layout/widget_navigation_help_nux_dms.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32dp" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32dp" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
     <ImageView android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginBottom="32dp" android:src="@drawable/asset_nux_navigation_dms" android:layout_weight="2" android:importantForAccessibility="no"/>
     <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="16dp" android:text="@string/direct_messages" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_dms" style="@style/res_2131952570_uikit_textview_large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="16dp" android:text="@string/direct_messages" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_dms" style="@style/UiKit_TextView_Large"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_navigation_help_nux_guilds.xml b/app/src/main/res/layout/widget_navigation_help_nux_guilds.xml
index ef2ba14eb7..916ae60b69 100644
--- a/app/src/main/res/layout/widget_navigation_help_nux_guilds.xml
+++ b/app/src/main/res/layout/widget_navigation_help_nux_guilds.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32dp" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" android:layout_gravity="center" android:orientation="vertical" android:padding="32dp" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
     <ImageView android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginBottom="32dp" android:src="@drawable/asset_nux_navigation_guilds" android:layout_weight="2" android:importantForAccessibility="no"/>
     <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="16dp" android:text="@string/servers" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_guild" style="@style/res_2131952570_uikit_textview_large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/white" android:gravity="bottom|center_vertical|center_horizontal|center" android:layout_marginBottom="16dp" android:text="@string/servers" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:textColor="@color/white" android:gravity="center" android:text="@string/nux_navigation_help_guild" style="@style/UiKit_TextView_Large"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_notice_dialog.xml b/app/src/main/res/layout/widget_notice_dialog.xml
index d261ee3d9a..a0729fa6bd 100644
--- a/app/src/main/res/layout/widget_notice_dialog.xml
+++ b/app/src/main/res/layout/widget_notice_dialog.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <LinearLayout android:id="@+id/notice_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/notice_header" android:padding="16dp" android:layout_width="match_parent" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <LinearLayout android:id="@+id/notice_header_container" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/notice_header" android:padding="16dp" android:layout_width="match_parent" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
     </LinearLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:gravity="center" android:id="@+id/notice_body_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/notice_body_text" android:padding="16dp" android:layout_width="match_parent" android:textAlignment="textStart" style="@style/res_2131952563_uikit_textview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:gravity="center" android:id="@+id/notice_body_container" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/notice_body_text" android:padding="16dp" android:layout_width="match_parent" android:textAlignment="textStart" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
         <com.google.android.material.button.MaterialButton android:id="@+id/notice_cancel" android:text="@string/cancel" style="?attr/buttonBarNegativeButtonStyle"/>
         <com.google.android.material.button.MaterialButton android:id="@+id/notice_ok" android:text="@string/okay" android:layout_marginStart="8dp" style="?attr/buttonBarPositiveButtonStyle"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_notice_nux_overlay.xml b/app/src/main/res/layout/widget_notice_nux_overlay.xml
index 1399010063..a75071d980 100644
--- a/app/src/main/res/layout/widget_notice_nux_overlay.xml
+++ b/app/src/main/res/layout/widget_notice_nux_overlay.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630_bg" android:layout_width="wrap_content" android:layout_margin="8dp" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
-    <ImageView android:layout_width="match_parent" android:src="@drawable/img_overlay_nux" android:scaleType="centerCrop" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0dp" android:layout_marginTop="24dp" android:text="@string/nux_overlay_title" android:lineSpacingMultiplier="1" android:textAllCaps="false" style="@style/res_2131952414_uikit_dialog_title"/>
-        <TextView android:paddingTop="8dp" android:layout_margin="8dp" android:text="@string/nux_overlay_description" android:textAlignment="center" style="@style/res_2131952408_uikit_dialog_body"/>
-        <LinearLayout android:layout_margin="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.button.MaterialButton android:id="@+id/enable_button" android:text="@string/nux_overlay_enable" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/cancel_button" android:text="@string/no_thanks" style="@style/res_2131952471_uikit_material_button_transparent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630_bg" android:layout_width="wrap_content" android:layout_margin="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
+    <ImageView android:layout_width="match_parent" android:src="@drawable/img_overlay_nux" android:scaleType="centerCrop" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0dp" android:layout_marginTop="24dp" android:text="@string/nux_overlay_title" android:lineSpacingMultiplier="1" android:textAllCaps="false" style="@style/UiKit_Dialog_Title"/>
+        <TextView android:paddingTop="8dp" android:layout_margin="8dp" android:text="@string/nux_overlay_description" android:textAlignment="center" style="@style/UiKit_Dialog_Body"/>
+        <LinearLayout android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.button.MaterialButton android:id="@+id/enable_button" android:text="@string/nux_overlay_enable" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/cancel_button" android:text="@string/no_thanks" style="@style/UiKit_Material_Button_Transparent"/>
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_notice_nux_samsung_link.xml b/app/src/main/res/layout/widget_notice_nux_samsung_link.xml
index 1225470896..7a2a20266a 100644
--- a/app/src/main/res/layout/widget_notice_nux_samsung_link.xml
+++ b/app/src/main/res/layout/widget_notice_nux_samsung_link.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630_bg" android:layout_width="wrap_content" android:layout_margin="8dp" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
-    <ImageView android:layout_width="match_parent" android:src="@drawable/img_game_presence_nux" android:scaleType="centerCrop" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0dp" android:layout_marginTop="24dp" android:text="@string/nux_samsung_game_presence_link_title" android:lineSpacingMultiplier="1" android:textAllCaps="false" style="@style/res_2131952414_uikit_dialog_title"/>
-        <TextView android:paddingTop="8dp" android:layout_margin="8dp" android:text="@string/nux_samsung_game_presence_link_description" android:textAlignment="center" style="@style/res_2131952408_uikit_dialog_body"/>
-        <LinearLayout android:layout_margin="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.button.MaterialButton android:id="@+id/enable_button" android:text="@string/nux_samsung_game_presence_link_enable" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/cancel_button" android:text="@string/no_thanks" style="@style/res_2131952471_uikit_material_button_transparent"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/primary_630_bg" android:layout_width="wrap_content" android:layout_margin="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
+    <ImageView android:layout_width="match_parent" android:src="@drawable/img_game_presence_nux" android:scaleType="centerCrop" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:paddingBottom="0dp" android:layout_marginTop="24dp" android:text="@string/nux_samsung_game_presence_link_title" android:lineSpacingMultiplier="1" android:textAllCaps="false" style="@style/UiKit_Dialog_Title"/>
+        <TextView android:paddingTop="8dp" android:layout_margin="8dp" android:text="@string/nux_samsung_game_presence_link_description" android:textAlignment="center" style="@style/UiKit_Dialog_Body"/>
+        <LinearLayout android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.button.MaterialButton android:id="@+id/enable_button" android:text="@string/nux_samsung_game_presence_link_enable" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/cancel_button" android:text="@string/no_thanks" style="@style/UiKit_Material_Button_Transparent"/>
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_notice_popup.xml b/app/src/main/res/layout/widget_notice_popup.xml
index 168eaf1e50..4b2ac98fd3 100644
--- a/app/src/main/res/layout/widget_notice_popup.xml
+++ b/app/src/main/res/layout/widget_notice_popup.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="@dimen/popup_notif_max_width" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/popup_icon" android:visibility="visible" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/res_2131951676_avatar_medium"/>
-    <RelativeLayout android:id="@+id/popup_title_wrap" android:layout_marginTop="10dp" android:layout_marginBottom="8dp" android:layout_marginStart="8dp" android:layout_toStartOf="@+id/popup_close_btn" android:layout_toEndOf="@+id/popup_icon" style="@style/res_2131952589_uikit_viewgroup">
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/popup_title" android:text="@string/sample_server_name" style="@style/res_2131952580_uikit_textview_singleline"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/popup_subtitle" android:lineSpacingMultiplier="1" android:layout_marginStart="4dp" android:layout_toEndOf="@+id/popup_title" style="@style/res_2131952580_uikit_textview_singleline"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="@dimen/popup_notif_max_width" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/popup_icon" android:visibility="visible" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="@style/Avatar_Medium"/>
+    <RelativeLayout android:id="@+id/popup_title_wrap" android:layout_marginTop="10dp" android:layout_marginBottom="8dp" android:layout_marginStart="8dp" android:layout_toStartOf="@+id/popup_close_btn" android:layout_toEndOf="@+id/popup_icon" style="@style/UiKit_ViewGroup">
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/popup_title" android:text="@string/sample_server_name" style="@style/UiKit_TextView_SingleLine"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/popup_subtitle" android:lineSpacingMultiplier="1" android:layout_marginStart="4dp" android:layout_toEndOf="@+id/popup_title" style="@style/UiKit_TextView_SingleLine"/>
     </RelativeLayout>
-    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@+id/popup_body" android:layout_width="match_parent" android:layout_marginTop="2dp" android:text="@string/sample_channel_message" android:maxLines="3" android:layout_below="@+id/popup_title_wrap" android:lineSpacingMultiplier="1" style="@style/res_2131952570_uikit_textview_large"/>
+    <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@+id/popup_body" android:layout_width="match_parent" android:layout_marginTop="2dp" android:text="@string/sample_channel_message" android:maxLines="3" android:layout_below="@+id/popup_title_wrap" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView_Large"/>
     <com.discord.views.sticker.StickerView android:id="@+id/popup_sticker" android:visibility="gone" android:layout_width="@dimen/chat_input_sticker_size" android:layout_height="@dimen/chat_input_sticker_size" android:layout_marginTop="8dp" android:layout_below="@+id/popup_body"/>
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/popup_attachment" android:visibility="gone" android:layout_width="64dp" android:layout_height="64dp" android:layout_marginTop="8dp" android:layout_below="@+id/popup_sticker" app:actualImageScaleType="6" app:placeholderImage="?attr/colorBackgroundSecondary" app:placeholderImageScaleType="5" app:roundedCornerRadius="4dp"/>
-    <ImageView android:layout_gravity="top|center_vertical|center_horizontal|center" android:id="@+id/popup_close_btn" android:paddingTop="8dp" android:paddingBottom="6dp" android:contentDescription="@string/dismiss" android:paddingStart="4dp" android:paddingEnd="0dp" android:layout_alignParentEnd="true" style="@style/res_2131952449_uikit_imageview_clickable"/>
+    <ImageView android:layout_gravity="top|center_vertical|center_horizontal|center" android:id="@+id/popup_close_btn" android:paddingTop="8dp" android:paddingBottom="6dp" android:contentDescription="@string/dismiss" android:paddingStart="4dp" android:paddingEnd="0dp" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView_Clickable"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_nux_channel_prompt.xml b/app/src/main/res/layout/widget_nux_channel_prompt.xml
index 1cc7e7d301..a2f6281018 100644
--- a/app/src/main/res/layout/widget_nux_channel_prompt.xml
+++ b/app/src/main/res/layout/widget_nux_channel_prompt.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:background="@color/transparent" android:layout_alignParentTop="true" style="@style/res_2131951663_apptheme_toolbar">
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="end" android:id="@+id/nuf_channel_prompt_skip_button" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" android:text="@string/skip" android:textAllCaps="true" android:layout_marginEnd="16dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:background="@color/transparent" android:layout_alignParentTop="true" style="@style/AppTheme_Toolbar">
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="end" android:id="@+id/nuf_channel_prompt_skip_button" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" android:text="@string/skip" android:textAllCaps="true" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_Semibold"/>
     </androidx.appcompat.widget.Toolbar>
-    <androidx.core.widget.NestedScrollView android:paddingBottom="8dp" android:layout_below="@+id/toolbar" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView android:paddingBottom="8dp" android:layout_below="@+id/toolbar" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
             <FrameLayout android:layout_gravity="center" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_marginBottom="8dp">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/nuf_channel_prompt_guild_icon" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/res_2131951674_avatar_large"/>
-                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@+id/nuf_channel_prompt_guild_icon_name" android:padding="4dp" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/nuf_channel_prompt_guild_icon" app:placeholderImage="?attr/asset_default_avatar_32dp" style="@style/Avatar_Large"/>
+                <TextView android:textColor="@color/primary_100" android:ellipsize="none" android:layout_gravity="center" android:id="@+id/nuf_channel_prompt_guild_icon_name" android:padding="4dp" style="@style/UiKit_TextView_Large_SingleLine"/>
             </FrameLayout>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:layout_gravity="center" android:id="@+id/nuf_channel_prompt_guild_name" android:layout_marginBottom="16dp" android:maxLines="1" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="end" android:layout_gravity="center" android:id="@+id/nuf_channel_prompt_guild_name" android:layout_marginBottom="16dp" android:maxLines="1" style="@style/UiKit_TextView_Semibold"/>
             <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:stv_subtitle="@string/nuf_channel_prompt_subtitle" app:stv_title="@string/nuf_channel_prompt_title"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/nuf_channel_prompt_topic_wrap" android:layout_marginBottom="16dp" android:hint="@string/nuf_channel_prompt_topic" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/nuf_channel_prompt_topic_wrap" android:layout_marginBottom="16dp" android:hint="@string/nuf_channel_prompt_topic" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
             <com.discord.views.LoadingButton android:id="@+id/nuf_channel_prompt_cta_button" android:layout_width="match_parent" android:layout_height="wrap_content" app:lb_padding_bottom="16dp" app:lb_padding_top="16dp" app:lb_progress_color="@color/white" app:lb_text="@string/nuf_channel_prompt_cta" app:lb_text_color="@drawable/button_text_color_primary_100" app:lb_text_size="@dimen/uikit_textsize_large"/>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_nux_guild_template.xml b/app/src/main/res/layout/widget_nux_guild_template.xml
index ff9356b4ee..51663f1fb9 100644
--- a/app/src/main/res/layout/widget_nux_guild_template.xml
+++ b/app/src/main/res/layout/widget_nux_guild_template.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <androidx.appcompat.widget.Toolbar android:background="@color/transparent" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951663_apptheme_toolbar"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_height="0dp" android:layout_weight="1" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-        <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/nux_guild_template_section_title" android:layout_marginBottom="8dp" android:text="@string/guild_template_selector_title" app:layout_constraintBottom_toTopOf="@+id/nux_guild_template_section_custom_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/nux_guild_template_section_custom_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="@string/guild_template_selector_description" app:layout_constraintBottom_toTopOf="@+id/recycler_view" app:layout_constraintTop_toBottomOf="@+id/nux_guild_template_section_title" style="@style/res_2131952563_uikit_textview"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="0dp" android:layout_height="0dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@+id/nux_guild_template_section_bottom" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/nux_guild_template_section_custom_label" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <LinearLayout android:id="@+id/nux_guild_template_section_bottom" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/recycler_view" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:layout_gravity="center_horizontal" android:layout_marginBottom="16dp" android:text="@string/nuf_have_an_invite_already" style="@style/res_2131952579_uikit_textview_semibold"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/nux_guild_template_action_join" android:text="@string/nuf_join_a_friend" style="@style/res_2131952467_uikit_material_button_secondary"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+    <androidx.appcompat.widget.Toolbar android:background="@color/transparent" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_height="0dp" android:layout_weight="1" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
+        <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/nux_guild_template_section_title" android:layout_marginBottom="8dp" android:text="@string/guild_template_selector_title" app:layout_constraintBottom_toTopOf="@+id/nux_guild_template_section_custom_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1_Bold"/>
+        <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/nux_guild_template_section_custom_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="@string/guild_template_selector_description" app:layout_constraintBottom_toTopOf="@+id/recycler_view" app:layout_constraintTop_toBottomOf="@+id/nux_guild_template_section_title" style="@style/UiKit_TextView"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="0dp" android:layout_height="0dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@+id/nux_guild_template_section_bottom" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/nux_guild_template_section_custom_label" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <LinearLayout android:id="@+id/nux_guild_template_section_bottom" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/recycler_view" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:layout_gravity="center_horizontal" android:layout_marginBottom="16dp" android:text="@string/nuf_have_an_invite_already" style="@style/UiKit_TextView_Semibold"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/nux_guild_template_action_join" android:text="@string/nuf_join_a_friend" style="@style/UiKit_Material_Button_Secondary"/>
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_nux_post_registration.xml b/app/src/main/res/layout/widget_nux_post_registration.xml
index 9d6d951820..0e69b224dd 100644
--- a/app/src/main/res/layout/widget_nux_post_registration.xml
+++ b/app/src/main/res/layout/widget_nux_post_registration.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <include layout="@layout/widget_auth_header"/>
-    <androidx.core.widget.NestedScrollView android:id="@+id/guild_join_content" android:layout_height="match_parent" android:fillViewport="false" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:gravity="center" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
+    <androidx.core.widget.NestedScrollView android:id="@+id/guild_join_content" android:layout_height="match_parent" android:fillViewport="false" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:gravity="center" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
             <com.discord.views.ScreenTitleView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:stv_subtitle="@string/nux_post_reg_join_server_description" app:stv_title="@string/nux_post_reg_join_server_title"/>
-            <LinearLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_join_invite" android:layout_marginBottom="16dp" android:hint="@string/form_label_invite_link" app:endIconMode="2" style="@style/res_2131952545_uikit_textinputlayout">
-                    <com.google.android.material.textfield.TextInputEditText android:inputType="textUri" android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <LinearLayout android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_join_invite" android:layout_marginBottom="16dp" android:hint="@string/form_label_invite_link" app:endIconMode="2" style="@style/UiKit_TextInputLayout">
+                    <com.google.android.material.textfield.TextInputEditText android:inputType="textUri" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <include layout="@layout/widget_guild_join_invite_examples"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/guild_join_action_btn" android:layout_marginTop="16dp" android:text="@string/nux_post_reg_join_server_skip" style="@style/res_2131952382_uikit_authbutton_material"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/guild_join_action_btn" android:layout_marginTop="16dp" android:text="@string/nux_post_reg_join_server_skip" style="@style/UiKit_AuthButton_Material"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_oauth_authorize.xml b/app/src/main/res/layout/widget_oauth_authorize.xml
index 53c336e2b4..6bd90dc8c9 100644
--- a/app/src/main/res/layout/widget_oauth_authorize.xml
+++ b/app/src/main/res/layout/widget_oauth_authorize.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:fitsSystemWindows="true" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:fitsSystemWindows="true" style="@style/UiKit_ViewGroup_Page">
     <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/drawable_auth_splash" android:scaleType="centerCrop" android:importantForAccessibility="no"/>
-    <androidx.core.widget.NestedScrollView android:layout_gravity="center" android:layout_height="wrap_content" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_gravity="center_horizontal" android:id="@+id/oauth_authorize_logo" android:layout_width="match_parent" android:layout_height="32dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:src="@drawable/img_logo_wordmark" android:scaleType="centerInside" android:contentDescription="@string/discord" style="@style/res_2131952448_uikit_imageview"/>
+    <androidx.core.widget.NestedScrollView android:layout_gravity="center" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_gravity="center_horizontal" android:id="@+id/oauth_authorize_logo" android:layout_width="match_parent" android:layout_height="32dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" android:src="@drawable/img_logo_wordmark" android:scaleType="centerInside" android:contentDescription="@string/discord" style="@style/UiKit_ImageView"/>
             <com.google.android.material.card.MaterialCardView android:id="@+id/oauth_authorize_card" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundFloating" app:cardCornerRadius="8dp" app:cardElevation="8dp" style="@style/res_2131952741_widget_materialcomponents_cardview">
-                <LinearLayout android:id="@+id/oauth_authorize_not_supported" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:padding="16dp" android:layout_width="match_parent" android:text="@string/scope_unsupported_on_android" style="@style/res_2131952565_uikit_textview_h1"/>
-                    <TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="24dp" android:text="@string/scope_unsupported_on_android_description" android:drawablePadding="16dp" app:drawableBottomCompat="?attr/img_baddies" style="@style/res_2131952563_uikit_textview"/>
-                    <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_unsupported_browser" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/copy_link" style="@style/res_2131952458_uikit_material_button"/>
-                    <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_unsupported_cancel" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
+                <LinearLayout android:id="@+id/oauth_authorize_not_supported" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:padding="16dp" android:layout_width="match_parent" android:text="@string/scope_unsupported_on_android" style="@style/UiKit_TextView_H1"/>
+                    <TextView android:gravity="center" android:layout_gravity="center" android:layout_margin="24dp" android:text="@string/scope_unsupported_on_android_description" android:drawablePadding="16dp" app:drawableBottomCompat="?attr/img_baddies" style="@style/UiKit_TextView"/>
+                    <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_unsupported_browser" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/copy_link" style="@style/UiKit_Material_Button"/>
+                    <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_unsupported_cancel" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
                 </LinearLayout>
-                <LinearLayout android:id="@+id/oauth_authorize_content" android:visibility="gone" android:animateLayoutChanges="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <LinearLayout android:gravity="center" android:paddingLeft="32dp" android:paddingTop="32dp" android:paddingRight="32dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                        <LinearLayout android:gravity="center" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/oauth_authorize_application_icon" android:importantForAccessibility="no" android:layout_marginEnd="24dp" app:placeholderImage="?attr/ic_game_icon_placeholder" app:placeholderImageScaleType="2" style="@style/res_2131951679_avatar_xxlarge"/>
-                            <TextView android:textSize="40sp" android:textColor="?attr/colorBackgroundAccent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:text="..." style="@style/res_2131952580_uikit_textview_singleline"/>
-                            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/oauth_authorize_user_icon" android:importantForAccessibility="no" android:layout_marginStart="24dp" app:placeholderImage="?attr/ic_game_icon_placeholder" app:placeholderImageScaleType="2" style="@style/res_2131951679_avatar_xxlarge"/>
+                <LinearLayout android:id="@+id/oauth_authorize_content" android:visibility="gone" android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <LinearLayout android:gravity="center" android:paddingLeft="32dp" android:paddingTop="32dp" android:paddingRight="32dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                        <LinearLayout android:gravity="center" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/oauth_authorize_application_icon" android:importantForAccessibility="no" android:layout_marginEnd="24dp" app:placeholderImage="?attr/ic_game_icon_placeholder" app:placeholderImageScaleType="2" style="@style/Avatar_XXLarge"/>
+                            <TextView android:textSize="40sp" android:textColor="?attr/colorBackgroundAccent" android:layout_height="match_parent" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:text="..." style="@style/UiKit_TextView_SingleLine"/>
+                            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/oauth_authorize_user_icon" android:importantForAccessibility="no" android:layout_marginStart="24dp" app:placeholderImage="?attr/ic_game_icon_placeholder" app:placeholderImageScaleType="2" style="@style/Avatar_XXLarge"/>
                         </LinearLayout>
-                        <TextView android:textSize="20sp" android:id="@+id/oauth_authorize_application_name" android:layout_marginTop="24dp" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                        <TextView android:id="@+id/oauth_authorize_connect_label" android:text="@string/oauth2_requests_account_access" style="@style/res_2131952570_uikit_textview_large"/>
+                        <TextView android:textSize="20sp" android:id="@+id/oauth_authorize_application_name" android:layout_marginTop="24dp" style="@style/UiKit_TextView_H1_Bold"/>
+                        <TextView android:id="@+id/oauth_authorize_connect_label" android:text="@string/oauth2_requests_account_access" style="@style/UiKit_TextView_Large"/>
                     </LinearLayout>
-                    <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/res_2131952416_uikit_divider"/>
-                    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:id="@+id/oauth_authorize_permissions_label_tv" android:padding="0dp" style="@style/res_2131952496_uikit_settings_item_header"/>
-                    <androidx.recyclerview.widget.RecyclerView android:id="@+id/oauth_authorize_permissions_list" android:clipToPadding="false" android:layout_height="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_weight="1" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-                    <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/res_2131952416_uikit_divider"/>
-                    <RelativeLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                        <ImageView android:id="@+id/oauth_authorize_age_notice_icon" android:layout_height="20dp" android:src="@drawable/ic_recent_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?attr/colorTextMuted" style="@style/res_2131952448_uikit_imageview"/>
-                        <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/oauth_authorize_age_notice" android:padding="0dp" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/oauth_authorize_age_notice_icon" android:layout_alignParentEnd="true" style="@style/res_2131952381_uikit_auth_note_rotatable"/>
+                    <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/UiKit_Divider"/>
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:id="@+id/oauth_authorize_permissions_label_tv" android:padding="0dp" style="@style/UiKit_Settings_Item_Header"/>
+                    <androidx.recyclerview.widget.RecyclerView android:id="@+id/oauth_authorize_permissions_list" android:clipToPadding="false" android:layout_height="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_RecyclerView"/>
+                    <View android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" style="@style/UiKit_Divider"/>
+                    <RelativeLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                        <ImageView android:id="@+id/oauth_authorize_age_notice_icon" android:layout_height="20dp" android:src="@drawable/ic_recent_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?attr/colorTextMuted" style="@style/UiKit_ImageView"/>
+                        <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/oauth_authorize_age_notice" android:padding="0dp" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/oauth_authorize_age_notice_icon" android:layout_alignParentEnd="true" style="@style/UiKit_Auth_Note_Rotatable"/>
                     </RelativeLayout>
-                    <RelativeLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                        <ImageView android:id="@+id/oauth_authorize_security_notice_icon" android:layout_height="20dp" android:src="@drawable/ic_shieldstar_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?attr/colorTextMuted" style="@style/res_2131952448_uikit_imageview"/>
-                        <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/oauth_authorize_security_notice" android:padding="0dp" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/oauth_authorize_security_notice_icon" android:layout_alignParentEnd="true" style="@style/res_2131952381_uikit_auth_note_rotatable"/>
+                    <RelativeLayout android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                        <ImageView android:id="@+id/oauth_authorize_security_notice_icon" android:layout_height="20dp" android:src="@drawable/ic_shieldstar_24dp" android:layout_alignParentTop="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" app:tint="?attr/colorTextMuted" style="@style/UiKit_ImageView"/>
+                        <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/oauth_authorize_security_notice" android:padding="0dp" android:layout_marginStart="8dp" android:layout_toEndOf="@+id/oauth_authorize_security_notice_icon" android:layout_alignParentEnd="true" style="@style/UiKit_Auth_Note_Rotatable"/>
                     </RelativeLayout>
-                    <LinearLayout android:layout_marginTop="24dp" android:layoutDirection="rtl" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
-                        <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_grant" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/authorize" android:layout_weight="1" style="@style/res_2131952458_uikit_material_button"/>
-                        <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_deny" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:layout_weight="1" style="@style/res_2131952471_uikit_material_button_transparent"/>
+                    <LinearLayout android:layout_marginTop="24dp" android:layoutDirection="rtl" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
+                        <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_grant" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/authorize" android:layout_weight="1" style="@style/UiKit_Material_Button"/>
+                        <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_deny" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:layout_weight="1" style="@style/UiKit_Material_Button_Transparent"/>
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout android:id="@+id/oauth_authorize_loading" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                <LinearLayout android:id="@+id/oauth_authorize_loading" style="@style/UiKit_ViewGroup_LinearLayout">
                     <ProgressBar android:layout_gravity="center" android:padding="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp"/>
-                    <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_loading_cancel" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
+                    <com.google.android.material.button.MaterialButton android:id="@+id/oauth_authorize_loading_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_outbound_promo_terms.xml b/app/src/main/res/layout/widget_outbound_promo_terms.xml
index 8ceda5ed8d..9422fa4400 100644
--- a/app/src/main/res/layout/widget_outbound_promo_terms.xml
+++ b/app/src/main/res/layout/widget_outbound_promo_terms.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
     <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="18dp" android:text="@string/terms_and_conditions" android:layout_weight="1" style="@style/res_2131952579_uikit_textview_semibold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/promoTermsClose" android:background="?attr/selectableItemBackgroundBorderless" android:padding="18dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="18dp" android:text="@string/terms_and_conditions" android:layout_weight="1" style="@style/UiKit_TextView_Semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/promoTermsClose" android:background="?attr/selectableItemBackgroundBorderless" android:padding="18dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit_TextView_Semibold"/>
     </LinearLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/promoTermsContent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" style="@style/res_2131952563_uikit_textview"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/promoTermsContent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_payment_source_edit_dialog.xml b/app/src/main/res/layout/widget_payment_source_edit_dialog.xml
index 71ba9dfbc2..9c65f39e39 100644
--- a/app/src/main/res/layout/widget_payment_source_edit_dialog.xml
+++ b/app/src/main/res/layout/widget_payment_source_edit_dialog.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/res_2131951663_apptheme_toolbar">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme_Toolbar">
         <com.discord.views.LoadingButton android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/dialog_save" android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:lb_progress_color="?attr/primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?attr/primary_100"/>
     </androidx.appcompat.widget.Toolbar>
-    <androidx.core.widget.NestedScrollView android:layout_weight="1" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@+id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_info_outline_white_24dp" style="@style/res_2131952563_uikit_textview"/>
+    <androidx.core.widget.NestedScrollView android:layout_weight="1" style="@style/UiKit_ViewGroup_NestedScrollView">
+        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@+id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8dp" android:visibility="gone" android:layout_width="match_parent" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_info_outline_white_24dp" style="@style/UiKit_TextView"/>
             <com.discord.widgets.settings.billing.PaymentSourceView android:id="@+id/payment_source_summary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp"/>
-            <TextView android:id="@+id/payment_source_edit_help" android:layout_marginBottom="8dp" android:text="@string/payment_source_edit_help_card" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <TextView android:layout_marginTop="8dp" android:text="@string/billing_address" style="@style/res_2131952567_uikit_textview_h2"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_name" android:hint="@string/billing_address_name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <TextView android:id="@+id/payment_source_edit_help" android:layout_marginBottom="8dp" android:text="@string/payment_source_edit_help_card" style="@style/UiKit_TextView_Subtext"/>
+            <TextView android:layout_marginTop="8dp" android:text="@string/billing_address" style="@style/UiKit_TextView_H2"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_name" android:hint="@string/billing_address_name" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address1" android:hint="@string/billing_address_address" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:inputType="textPostalAddress" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address1" android:hint="@string/billing_address_address" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:inputType="textPostalAddress" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address2" android:hint="@string/billing_address_address2" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_address2" android:hint="@string/billing_address_address2" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_city" android:hint="@string/billing_address_city" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_city" android:hint="@string/billing_address_city" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_state" android:hint="@string/billing_address_state" app:endIconDrawable="?attr/ic_navigate_next" app:endIconMode="-1" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionGo" style="@style/res_2131952549_uikit_textinputlayout_edittext_nofocus"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_state" android:hint="@string/billing_address_state" app:endIconDrawable="?attr/ic_navigate_next" app:endIconMode="-1" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionGo" style="@style/UiKit_TextInputLayout_EditText_NoFocus"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_postal_code" android:hint="@string/billing_address_zip_code" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:nextFocusRight="@+id/dialog_save" android:imeOptions="actionDone" android:nextFocusForward="@+id/dialog_save" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_postal_code" android:hint="@string/billing_address_zip_code" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:nextFocusRight="@+id/dialog_save" android:imeOptions="actionDone" android:nextFocusForward="@+id/dialog_save" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_country" android:focusable="false" android:hint="@string/billing_address_country" app:endIconDrawable="@drawable/ic_lock_white_a60_16dp" app:endIconMode="-1" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:textColor="?attr/primary_400" android:inputType="none" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/payment_source_edit_country" android:focusable="false" android:hint="@string/billing_address_country" app:endIconDrawable="@drawable/ic_lock_white_a60_16dp" app:endIconMode="-1" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:enabled="false" android:textColor="?attr/primary_400" android:inputType="none" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <CheckBox android:id="@+id/payment_source_edit_default" android:layout_marginTop="8dp" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="?attr/color_brand_500" style="@style/res_2131952396_uikit_checkbox"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/dialog_delete" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/payment_source_delete" style="@style/res_2131952466_uikit_material_button_red_outline"/>
+            <CheckBox android:id="@+id/payment_source_edit_default" android:layout_marginTop="8dp" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="?attr/color_brand_500" style="@style/UiKit_Checkbox"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/dialog_delete" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" android:text="@string/payment_source_delete" style="@style/UiKit_Material_Button_Red_Outline"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_phone_country_code_bottom_sheet.xml b/app/src/main/res/layout/widget_phone_country_code_bottom_sheet.xml
index 21d97a7768..718d81f73f 100644
--- a/app/src/main/res/layout/widget_phone_country_code_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_phone_country_code_bottom_sheet.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/phone_country_code_search" android:padding="8dp" android:hint="@string/search" app:boxBackgroundColor="?attr/colorBackgroundTertiary" style="@style/res_2131952560_uikit_textinputlayout_search">
-        <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/phone_country_code_search" android:padding="8dp" android:hint="@string/search" app:boxBackgroundColor="?attr/colorBackgroundTertiary" style="@style/UiKit_TextInputLayout_Search">
+        <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
     </com.google.android.material.textfield.TextInputLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/phone_country_code_recycler" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/phone_country_code_recycler" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
     <View android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_phone_country_code_list_item.xml b/app/src/main/res/layout/widget_phone_country_code_list_item.xml
index 90d1c0a9a0..44e77b96b9 100644
--- a/app/src/main/res/layout/widget_phone_country_code_list_item.xml
+++ b/app/src/main/res/layout/widget_phone_country_code_list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/phone_country_code_item" android:background="?attr/selectableItemBackground" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/phone_country_code_item" android:background="?attr/selectableItemBackground" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderPrimary" android:ellipsize="none" android:id="@+id/phone_country_code_name" android:layout_width="0dp" android:layout_height="match_parent" android:singleLine="false" app:layout_constraintEnd_toStartOf="@+id/phone_country_code_code" app:layout_constraintStart_toStartOf="0"/>
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/phone_country_code_code" android:layout_width="wrap_content" android:layout_height="match_parent" app:layout_constraintEnd_toEndOf="0"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_platform_rich_presence.xml b/app/src/main/res/layout/widget_platform_rich_presence.xml
index 19fdaa985a..735f264d5d 100644
--- a/app/src/main/res/layout/widget_platform_rich_presence.xml
+++ b/app/src/main/res/layout/widget_platform_rich_presence.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/rich_presence_header" style="@style/res_2131952620_userprofile_section_header"/>
-    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/res_2131952619_userprofile_section_card">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952614_userprofile_presencesection_body">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/rich_presence_header" style="@style/UserProfile_Section_Header"/>
+    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/UserProfile_Section_Card">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UserProfile_PresenceSection_Body">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_large" android:layout_width="64dp" android:layout_height="64dp" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/ic_game_icon_placeholder" app:placeholderImageScaleType="2"/>
             <Space android:id="@+id/image_bottom_guideline" android:layout_width="@dimen/uikit_image_border_size" android:layout_height="@dimen/uikit_image_border_size" android:layout_marginTop="@dimen/uikit_image_border_size" android:layout_marginStart="@dimen/uikit_image_border_size" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@+id/rich_presence_image_large"/>
-            <LinearLayout android:id="@+id/rich_presence_container_data" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toStartOf="@+id/rich_presence_image_small" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/res_2131952615_userprofile_presencesection_body_headertext"/>
-                <TextView android:id="@+id/rich_presence_time" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
+            <LinearLayout android:id="@+id/rich_presence_container_data" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toStartOf="@+id/rich_presence_image_small" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile_PresenceSection_Body_HeaderText"/>
+                <TextView android:id="@+id/rich_presence_time" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
             </LinearLayout>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_small" android:visibility="gone" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_container_data" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:roundAsCircle="true" style="@style/res_2131951676_avatar_medium"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_small" android:visibility="gone" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_container_data" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:roundAsCircle="true" style="@style/Avatar_Medium"/>
             <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="rich_presence_container_data,rich_presence_image_large,rich_presence_image_small"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/res_2131952617_userprofile_presencesection_materialbutton"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/UserProfile_PresenceSection_MaterialButton"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_premium_guild_transfer.xml b/app/src/main/res/layout/widget_premium_guild_transfer.xml
index c567b98fc9..66d2d123e2 100644
--- a/app/src/main/res/layout/widget_premium_guild_transfer.xml
+++ b/app/src/main/res/layout/widget_premium_guild_transfer.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginTop="64dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:src="@drawable/drawable_boost_removal" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:layout_marginTop="32dp" android:text="@string/premium_guild_subscribe_confirm_transfer_header" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-            <TextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/premium_guild_transfer_confirmation_blurb" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscribe_confirm_transfer_blurb" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="start" android:id="@+id/premium_guild_transfer_previous_guild_header" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
+    <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginTop="64dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:src="@drawable/drawable_boost_removal" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <TextView android:layout_marginTop="32dp" android:text="@string/premium_guild_subscribe_confirm_transfer_header" style="@style/UiKit_TextView_H1_Bold"/>
+            <TextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/premium_guild_transfer_confirmation_blurb" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/premium_guild_subscribe_confirm_transfer_blurb" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="start" android:id="@+id/premium_guild_transfer_previous_guild_header" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
             <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@+id/premium_guild_transfer_previous_guild" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="start" android:id="@+id/premium_guild_transfer_target_guild_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_gravity="start" android:id="@+id/premium_guild_transfer_target_guild_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
             <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@+id/premium_guild_transfer_target_guild" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp"/>
-            <TextView android:textColor="@color/status_red_500" android:id="@+id/premium_guild_transfer_error" android:visibility="invisible" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_error_mobile" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/premium_guild_transfer_select" android:layout_marginBottom="24dp" android:text="@string/premium_guild_subscribe_transfer_confirm_confirmation" style="@style/res_2131952458_uikit_material_button"/>
+            <TextView android:textColor="@color/status_red_500" android:id="@+id/premium_guild_transfer_error" android:visibility="invisible" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit_TextView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/premium_guild_transfer_select" android:layout_marginBottom="24dp" android:text="@string/premium_guild_subscribe_transfer_confirm_confirmation" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_premium_upsell.xml b/app/src/main/res/layout/widget_premium_upsell.xml
index 67da958c40..18946f184c 100644
--- a/app/src/main/res/layout/widget_premium_upsell.xml
+++ b/app/src/main/res/layout/widget_premium_upsell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:paddingLeft="24dp" android:paddingTop="24dp" android:paddingRight="24dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:id="@+id/premium_upsell_img" android:layout_height="80dp" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="18dp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:id="@+id/premium_upsell_header" android:layout_marginTop="16dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="14dp" android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/premium_upsell_body" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:paddingLeft="24dp" android:paddingTop="24dp" android:paddingRight="24dp" android:paddingBottom="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:id="@+id/premium_upsell_img" android:layout_height="80dp" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="18dp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_horizontal" android:id="@+id/premium_upsell_header" android:layout_marginTop="16dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="14dp" android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/premium_upsell_body" android:layout_marginTop="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_preview_guild_scheduled_event.xml b/app/src/main/res/layout/widget_preview_guild_scheduled_event.xml
index 34aa042aee..27a89dbea0 100644
--- a/app/src/main/res/layout/widget_preview_guild_scheduled_event.xml
+++ b/app/src/main/res/layout/widget_preview_guild_scheduled_event.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/confirm_guild_scheduled_event_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/confirm_guild_scheduled_event_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/confirm_guild_scheduled_event_step_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.widgets.guildscheduledevent.GuildScheduledEventItemView android:id="@+id/confirm_guild_scheduled_event_preview" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toTopOf="@+id/confirm_guild_scheduled_event_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/confirm_guild_scheduled_event_toolbar" app:layout_constraintVertical_chainStyle="2"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="30sp" android:gravity="center" android:id="@+id/confirm_guild_scheduled_event_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:text="@string/guild_event_preview_title" app:layout_constraintBottom_toTopOf="@+id/guild_scheduled_event_settings_next_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/confirm_guild_scheduled_event_preview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/schedule_event" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="30sp" android:gravity="center" android:id="@+id/confirm_guild_scheduled_event_title" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:text="@string/guild_event_preview_title" app:layout_constraintBottom_toTopOf="@+id/guild_scheduled_event_settings_next_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/confirm_guild_scheduled_event_preview"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/guild_scheduled_event_settings_next_button" android:layout_margin="16dp" android:text="@string/schedule_event" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_profile_marketing_sheet.xml b/app/src/main/res/layout/widget_profile_marketing_sheet.xml
index fa28294fe6..be10e4420c 100644
--- a/app/src/main/res/layout/widget_profile_marketing_sheet.xml
+++ b/app/src/main/res/layout/widget_profile_marketing_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/profile_marketing_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:src="@drawable/img_profile_marketing"/>
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" app:stv_subtitle="@string/profile_customization_marketing_tooltip_body" app:stv_title="@string/profile_customization_marketing_tooltip_header"/>
-        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@+id/profile_marketing_update_profile_button" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/profile_customization_marketing_tooltip_cta_mobile" style="@style/res_2131952458_uikit_material_button"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/profile_marketing_skip_button" android:text="@string/skip_for_now" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_large" android:id="@+id/profile_marketing_update_profile_button" android:paddingTop="12dp" android:paddingBottom="12dp" android:text="@string/profile_customization_marketing_tooltip_cta_mobile" style="@style/UiKit_Material_Button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/profile_marketing_skip_button" android:text="@string/skip_for_now" style="@style/UiKit_Material_Button_Transparent_Fit"/>
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_prune_users.xml b/app/src/main/res/layout/widget_prune_users.xml
index 8bbe64b518..b9076ad362 100644
--- a/app/src/main/res/layout/widget_prune_users.xml
+++ b/app/src/main/res/layout/widget_prune_users.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:ellipsize="end" android:id="@+id/prune_user_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/prune_members" android:maxLines="1" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
-        <TextView android:text="@string/form_label_last_seen" style="@style/res_2131952496_uikit_settings_item_header"/>
-        <com.discord.views.CheckedSetting android:id="@+id/prune_users_history_1_radio" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <com.discord.views.CheckedSetting android:id="@+id/prune_users_history_2_radio" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <RelativeLayout android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:ellipsize="end" android:id="@+id/prune_user_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/prune_members" android:maxLines="1" style="@style/UiKit_TextView_H1_Bold"/>
+        <View style="@style/UiKit_Divider"/>
+        <TextView android:text="@string/form_label_last_seen" style="@style/UiKit_Settings_Item_Header"/>
+        <com.discord.views.CheckedSetting android:id="@+id/prune_users_history_1_radio" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+        <com.discord.views.CheckedSetting android:id="@+id/prune_users_history_2_radio" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+        <RelativeLayout android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
             <ProgressBar android:id="@+id/prune_users_loading_progressbar" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="match_parent" android:indeterminate="true" android:layout_alignTop="@+id/prune_users_estimate_text" android:layout_alignBottom="@+id/prune_users_estimate_text" android:layout_centerInParent="true"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/prune_users_estimate_text" android:layout_centerInParent="true" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/prune_users_estimate_text" android:layout_centerInParent="true" style="@style/UiKit_TextView"/>
         </RelativeLayout>
-        <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-            <com.google.android.material.button.MaterialButton android:id="@+id/prune_user_cancel" android:text="@string/cancel" android:layout_marginEnd="8dp" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/prune_user_prune" android:text="@string/prune" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+        <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+            <com.google.android.material.button.MaterialButton android:id="@+id/prune_user_cancel" android:text="@string/cancel" android:layout_marginEnd="8dp" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/prune_user_prune" android:text="@string/prune" style="@style/UiKit_Material_Button_Red_Fit"/>
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/widget_qr_scanner.xml b/app/src/main/res/layout/widget_qr_scanner.xml
index 4371aaecab..c2ba96b035 100644
--- a/app/src/main/res/layout/widget_qr_scanner.xml
+++ b/app/src/main/res/layout/widget_qr_scanner.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/black" style="@style/res_2131952602_uikit_viewgroup_page">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/black" style="@style/UiKit_ViewGroup_Page">
     <me.dm7.barcodescanner.zxing.ZXingScannerView android:id="@+id/qr_scanner" android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <com.google.android.material.chip.Chip android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="@color/white" android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:id="@+id/qr_scanner_chip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/qr_code_in_app_scanner_only" app:chipBackgroundColor="?attr/color_brand"/>
-    <com.google.android.material.appbar.AppBarLayout android:layout_gravity="top" style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar android:background="@color/primary_900_alpha_80" style="@style/res_2131951663_apptheme_toolbar"/>
+    <com.google.android.material.chip.Chip android:textAppearance="@style/UiKit_TextAppearance" android:textColor="@color/white" android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:id="@+id/qr_scanner_chip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/qr_code_in_app_scanner_only" app:chipBackgroundColor="?attr/color_brand"/>
+    <com.google.android.material.appbar.AppBarLayout android:layout_gravity="top" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar android:background="@color/primary_900_alpha_80" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_quick_mentions_dialog.xml b/app/src/main/res/layout/widget_quick_mentions_dialog.xml
index 76a4e8bf84..aa8f1e3885 100644
--- a/app/src/main/res/layout/widget_quick_mentions_dialog.xml
+++ b/app/src/main/res/layout/widget_quick_mentions_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.google.android.material.tabs.TabLayout android:id="@+id/tabs" android:background="?attr/colorBackgroundSecondaryAlt" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tabSelectedTextColor="?attr/colorHeaderPrimary" app:tabTextAppearance="@style/res_2131952544_uikit_textappearance_toolbar_title" app:tabTextColor="?attr/colorTextMuted"/>
+    <com.google.android.material.tabs.TabLayout android:id="@+id/tabs" android:background="?attr/colorBackgroundSecondaryAlt" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tabSelectedTextColor="?attr/colorHeaderPrimary" app:tabTextAppearance="@style/UiKit_TextAppearance_Toolbar_Title" app:tabTextColor="?attr/colorTextMuted"/>
     <androidx.viewpager2.widget.ViewPager2 android:id="@+id/tab_contents" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/tabs"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_remote_auth.xml b/app/src/main/res/layout/widget_remote_auth.xml
index c209bf1075..c8e49f7ee1 100644
--- a/app/src/main/res/layout/widget_remote_auth.xml
+++ b/app/src/main/res/layout/widget_remote_auth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_RelativeLayout">
     <ImageView android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/drawable_auth_splash" android:scaleType="centerCrop" android:importantForAccessibility="no"/>
     <ImageView android:layout_width="40dp" android:layout_height="40dp" android:layout_marginTop="16dp" android:src="@drawable/img_logo_square" android:layout_centerHorizontal="true" android:importantForAccessibility="no" app:tint="@color/white"/>
     <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_centerInParent="true" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="8dp">
diff --git a/app/src/main/res/layout/widget_remote_auth_not_found.xml b/app/src/main/res/layout/widget_remote_auth_not_found.xml
index 8b19407827..9d61ad68e9 100644
--- a/app/src/main/res/layout/widget_remote_auth_not_found.xml
+++ b/app/src/main/res/layout/widget_remote_auth_not_found.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/UiKit_ViewGroup_LinearLayout">
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="24dp" android:src="@drawable/img_remote_auth_not_found" android:importantForAccessibility="no"/>
-    <TextView android:layout_marginBottom="8dp" android:text="@string/qr_code_not_found" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginBottom="32dp" android:text="@string/qr_code_not_found_description" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/remote_auth_not_found_cancel_button" android:text="@string/cancel" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:layout_marginBottom="8dp" android:text="@string/qr_code_not_found" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginBottom="32dp" android:text="@string/qr_code_not_found_description" android:textAlignment="center" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/remote_auth_not_found_cancel_button" android:text="@string/cancel" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_remote_auth_pending_login.xml b/app/src/main/res/layout/widget_remote_auth_pending_login.xml
index 3e632d51e5..c3aeae6536 100644
--- a/app/src/main/res/layout/widget_remote_auth_pending_login.xml
+++ b/app/src/main/res/layout/widget_remote_auth_pending_login.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_horizontal" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_horizontal" style="@style/UiKit_ViewGroup_LinearLayout">
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="24dp" android:src="@drawable/img_remote_auth_loaded" android:importantForAccessibility="no"/>
-    <TextView android:gravity="center" android:text="@string/qr_code_login_confirm" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textColor="@color/status_red_500" android:layout_marginTop="8dp" android:text="@string/confirm_qr_description" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:gravity="center" android:text="@string/qr_code_login_confirm" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textColor="@color/status_red_500" android:layout_marginTop="8dp" android:text="@string/confirm_qr_description" android:textAlignment="center" style="@style/UiKit_TextView"/>
     <androidx.cardview.widget.CardView android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp" app:cardElevation="0dp">
-        <com.google.android.material.switchmaterial.SwitchMaterial android:textColor="?attr/colorHeaderPrimary" android:id="@+id/remote_auth_temporary_switch" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/res_2131952455_uikit_listitem_switch"/>
+        <com.google.android.material.switchmaterial.SwitchMaterial android:textColor="?attr/colorHeaderPrimary" android:id="@+id/remote_auth_temporary_switch" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit_ListItem_Switch"/>
     </androidx.cardview.widget.CardView>
-    <com.google.android.material.button.MaterialButton android:id="@+id/remote_auth_login_button" android:layout_marginTop="24dp" android:layout_marginBottom="8dp" android:text="@string/confirm_qr_login_on_computer" style="@style/res_2131952458_uikit_material_button"/>
-    <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/remote_auth_cancel_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/remote_auth_login_button" android:layout_marginTop="24dp" android:layout_marginBottom="8dp" android:text="@string/confirm_qr_login_on_computer" style="@style/UiKit_Material_Button"/>
+    <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/remote_auth_cancel_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_remote_auth_success.xml b/app/src/main/res/layout/widget_remote_auth_success.xml
index 3ba4f64e64..23c7c2933c 100644
--- a/app/src/main/res/layout/widget_remote_auth_success.xml
+++ b/app/src/main/res/layout/widget_remote_auth_success.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_horizontal" style="@style/UiKit_ViewGroup_LinearLayout">
     <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="24dp" android:src="@drawable/img_remote_auth_finished" android:importantForAccessibility="no"/>
-    <TextView android:text="@string/qr_code_login_success" style="@style/res_2131952565_uikit_textview_h1"/>
-    <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginTop="8dp" android:text="@string/qr_code_login_success_flavor" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/remote_auth_finish_button" android:layout_marginTop="24dp" android:text="@string/_continue" style="@style/res_2131952458_uikit_material_button"/>
+    <TextView android:text="@string/qr_code_login_success" style="@style/UiKit_TextView_H1"/>
+    <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginTop="8dp" android:text="@string/qr_code_login_success_flavor" android:textAlignment="center" style="@style/UiKit_TextView"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/remote_auth_finish_button" android:layout_marginTop="24dp" android:text="@string/_continue" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_screen_share_nfx_sheet.xml b/app/src/main/res/layout/widget_screen_share_nfx_sheet.xml
index 5288ff6f68..6f282016c6 100644
--- a/app/src/main/res/layout/widget_screen_share_nfx_sheet.xml
+++ b/app/src/main/res/layout/widget_screen_share_nfx_sheet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:layout_width="300dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:src="@drawable/screen_share_nfx_illustration" android:importantForAccessibility="no"/>
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:layout_marginBottom="8dp" android:text="@string/screen_share_nfx_title" style="@style/res_2131952563_uikit_textview"/>
-        <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:layout_marginBottom="8dp" android:text="@string/screen_share_nfx_body" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/screen_share_nfx_cta" android:layout_marginBottom="8dp" android:text="@string/screen_share_nfx_try" style="@style/res_2131952458_uikit_material_button"/>
-        <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/screen_share_nfx_cancel_button" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:text="@string/screen_share_nfx_skip" android:textAlignment="center" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:layout_marginBottom="8dp" android:text="@string/screen_share_nfx_title" style="@style/UiKit_TextView"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:layout_marginBottom="8dp" android:text="@string/screen_share_nfx_body" android:textAlignment="center" style="@style/UiKit_TextView"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/screen_share_nfx_cta" android:layout_marginBottom="8dp" android:text="@string/screen_share_nfx_try" style="@style/UiKit_Material_Button"/>
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/screen_share_nfx_cancel_button" android:background="?attr/bg_pressed_highlight" android:padding="8dp" android:text="@string/screen_share_nfx_skip" android:textAlignment="center" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_search.xml b/app/src/main/res/layout/widget_search.xml
index 1b242a71ca..935b691e1c 100644
--- a/app/src/main/res/layout/widget_search.xml
+++ b/app/src/main/res/layout/widget_search.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/colorBackgroundSecondary" style="@style/res_2131951637_apptheme_appbarlayout">
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/widget_search_input" style="@style/res_2131952561_uikit_textinputlayout_search_actionbar">
-            <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/colorBackgroundSecondary" style="@style/AppTheme_AppBarLayout">
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/widget_search_input" style="@style/UiKit_TextInputLayout_Search_ActionBar">
+            <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
         </com.google.android.material.textfield.TextInputLayout>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.search.suggestions.WidgetSearchSuggestions" android:id="@+id/widget_search_suggestions" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior"/>
     <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.search.results.WidgetSearchResults" android:id="@+id/widget_search_results" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="com.discord.app.AppScrollingViewBehavior"/>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/search_send_query_fab" android:visibility="gone" android:src="@drawable/ic_search_white_24dp" android:contentDescription="@string/search" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/search_send_query_fab" android:visibility="gone" android:src="@drawable/ic_search_white_24dp" android:contentDescription="@string/search" style="@style/Settings_FloatingActionButton"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_search_results.xml b/app/src/main/res/layout/widget_search_results.xml
index f18136e3c2..5215280b69 100644
--- a/app/src/main/res/layout/widget_search_results.xml
+++ b/app/src/main/res/layout/widget_search_results.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_results_list" android:paddingBottom="64dp" android:scrollbars="vertical" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_results_list" android:paddingBottom="64dp" android:scrollbars="vertical" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
diff --git a/app/src/main/res/layout/widget_search_suggestion_item_header.xml b/app/src/main/res/layout/widget_search_suggestion_item_header.xml
index 1e21ec6e0d..383b7cafa3 100644
--- a/app/src/main/res/layout/widget_search_suggestion_item_header.xml
+++ b/app/src/main/res/layout/widget_search_suggestion_item_header.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suggestion_item_header" android:singleLine="true" style="@style/res_2131952485_uikit_search_header"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/suggestion_item_header" android:singleLine="true" style="@style/UiKit_Search_Header"/>
diff --git a/app/src/main/res/layout/widget_search_suggestion_item_header_history.xml b/app/src/main/res/layout/widget_search_suggestion_item_header_history.xml
index 907695237e..a8c8627239 100644
--- a/app/src/main/res/layout/widget_search_suggestion_item_header_history.xml
+++ b/app/src/main/res/layout/widget_search_suggestion_item_header_history.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
     <View android:id="@+id/suggestion_item_header_history_divider" android:background="?attr/colorBackgroundModifierAccent" android:layout_width="match_parent" android:layout_height="1px" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:layout_alignParentTop="true"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/suggestion_item_header_history_text" android:layout_width="match_parent" android:text="@string/search_group_header_history" android:layout_alignTop="@+id/suggestion_item_header_history_clear_icon" android:layout_alignBottom="@+id/suggestion_item_header_history_clear_icon" android:textAllCaps="true" android:layout_marginStart="72dp" android:layout_alignParentStart="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:gravity="center_vertical" android:id="@+id/suggestion_item_header_history_text" android:layout_width="match_parent" android:text="@string/search_group_header_history" android:layout_alignTop="@+id/suggestion_item_header_history_clear_icon" android:layout_alignBottom="@+id/suggestion_item_header_history_clear_icon" android:textAllCaps="true" android:layout_marginStart="72dp" android:layout_alignParentStart="true" style="@style/UiKit_TextView_Semibold"/>
     <ImageView android:id="@+id/suggestion_item_header_history_clear_icon" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_all_white_24dp" android:layout_below="@+id/suggestion_item_header_history_divider" android:contentDescription="@string/search_clear_history" android:paddingStart="16dp" android:paddingEnd="16dp" android:layout_alignParentEnd="true" app:tint="?attr/colorInteractiveNormal"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_search_suggestions.xml b/app/src/main/res/layout/widget_search_suggestions.xml
index aac8662cf7..473fdca067 100644
--- a/app/src/main/res/layout/widget_search_suggestions.xml
+++ b/app/src/main/res/layout/widget_search_suggestions.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_suggestions_recycler" android:scrollbars="vertical" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_suggestions_recycler" android:scrollbars="vertical" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
diff --git a/app/src/main/res/layout/widget_search_suggestions_item_channel.xml b/app/src/main/res/layout/widget_search_suggestions_item_channel.xml
index c212a61e23..2afdd76ade 100644
--- a/app/src/main/res/layout/widget_search_suggestions_item_channel.xml
+++ b/app/src/main/res/layout/widget_search_suggestions_item_channel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/search_suggestion_item_channel_container" android:background="?attr/selectableItemBackground" android:padding="@dimen/settings_option_padding" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/search_suggestions_item_channel_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_text_channel_white_24dp" android:layout_centerVertical="true" android:layout_marginEnd="32dp" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/search_suggestions_item_channel_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/search_suggestions_item_channel_icon" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/search_suggestions_item_channel_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/search_suggestions_item_channel_icon" style="@style/UiKit_TextView_Semibold"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_search_suggestions_item_has.xml b/app/src/main/res/layout/widget_search_suggestions_item_has.xml
index 0c24942118..f220f1b8e5 100644
--- a/app/src/main/res/layout/widget_search_suggestions_item_has.xml
+++ b/app/src/main/res/layout/widget_search_suggestions_item_has.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/search_suggestion_item_has_container" android:background="?attr/selectableItemBackground" android:padding="@dimen/settings_option_padding" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/search_suggestions_item_has_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginEnd="32dp" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/search_suggestions_item_has_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/search_suggestions_item_has_icon" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/search_suggestions_item_has_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/search_suggestions_item_has_icon" style="@style/UiKit_TextView_Semibold"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_search_suggestions_item_recent_query.xml b/app/src/main/res/layout/widget_search_suggestions_item_recent_query.xml
index c52975aca6..19dc30eaa4 100644
--- a/app/src/main/res/layout/widget_search_suggestions_item_recent_query.xml
+++ b/app/src/main/res/layout/widget_search_suggestions_item_recent_query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/search_suggestion_item_recent_query_container" android:background="?attr/selectableItemBackground" android:padding="@dimen/settings_option_padding" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content">
     <ImageView android:id="@+id/search_suggestions_item_recent_query_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_history_white_24dp" android:layout_centerVertical="true" android:layout_marginEnd="32dp" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/search_suggestions_item_recent_query_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/search_suggestions_item_recent_query_icon" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textSize="15sp" android:textColor="?attr/colorHeaderPrimary" android:gravity="center_vertical" android:id="@+id/search_suggestions_item_recent_query_text" android:singleLine="true" android:layout_centerVertical="true" android:layout_toEndOf="@+id/search_suggestions_item_recent_query_icon" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_search_suggestions_item_suggestion.xml b/app/src/main/res/layout/widget_search_suggestions_item_suggestion.xml
index 8fcd7360f5..f27d99562a 100644
--- a/app/src/main/res/layout/widget_search_suggestions_item_suggestion.xml
+++ b/app/src/main/res/layout/widget_search_suggestions_item_suggestion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/suggestion_example_container" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="48dp">
     <ImageView android:id="@+id/suggestion_example_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginStart="17dp" app:tint="?attr/colorInteractiveNormal"/>
-    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/suggestion_example_filter" android:layout_centerVertical="true" android:layout_marginStart="72dp" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/suggestion_example_answer" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginStart="5dp" android:layout_toEndOf="@+id/suggestion_example_filter" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textColor="?attr/colorHeaderPrimary" android:id="@+id/suggestion_example_filter" android:layout_centerVertical="true" android:layout_marginStart="72dp" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:textColor="?attr/colorTextNormal" android:ellipsize="end" android:id="@+id/suggestion_example_answer" android:maxLines="1" android:layout_centerVertical="true" android:layout_marginStart="5dp" android:layout_toEndOf="@+id/suggestion_example_filter" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_select_component_bottom_sheet.xml b/app/src/main/res/layout/widget_select_component_bottom_sheet.xml
index 6d1f03aab9..668f346481 100644
--- a/app/src/main/res/layout/widget_select_component_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_select_component_bottom_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/widget_sheet_component_bottom_sheet_header" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <TextView android:id="@+id/widget_sheet_component_bottom_sheet_placeholder" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/widget_sheet_component_bottom_sheet_subtitle" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952564_uikit_textview_bold"/>
-        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/widget_sheet_component_bottom_sheet_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_sheet_component_bottom_sheet_placeholder" style="@style/res_2131952581_uikit_textview_subtext"/>
-        <TextView android:textColor="?attr/color_brand" android:id="@+id/widget_sheet_component_bottom_sheet_select" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/select" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <TextView android:id="@+id/widget_sheet_component_bottom_sheet_placeholder" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/widget_sheet_component_bottom_sheet_subtitle" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_Bold"/>
+        <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/widget_sheet_component_bottom_sheet_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/widget_sheet_component_bottom_sheet_select" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_sheet_component_bottom_sheet_placeholder" style="@style/UiKit_TextView_Subtext"/>
+        <TextView android:textColor="?attr/color_brand" android:id="@+id/widget_sheet_component_bottom_sheet_select" android:background="?attr/selectableItemBackgroundBorderless" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/select" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/widget_sheet_component_bottom_sheet_recycler" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constrainedHeight="true" app:layout_constraintTop_toBottomOf="@+id/widget_sheet_component_bottom_sheet_header" app:max_height_screen_ratio="0.75"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_select_component_bottom_sheet_item.xml b/app/src/main/res/layout/widget_select_component_bottom_sheet_item.xml
index 8d66610cc9..e6162025e5 100644
--- a/app/src/main/res/layout/widget_select_component_bottom_sheet_item.xml
+++ b/app/src/main/res/layout/widget_select_component_bottom_sheet_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/select_component_sheet_item_icon" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginStart="16dp" app:actualImageScaleType="2" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="@dimen/uikit_textsize_large" android:ellipsize="end" android:id="@+id/select_component_sheet_item_title" android:paddingTop="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_description" app:layout_constraintEnd_toStartOf="@+id/select_component_sheet_item_selected" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <com.google.android.material.textview.MaterialTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/select_component_sheet_item_description" android:paddingBottom="16dp" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_divider" app:layout_constraintEnd_toStartOf="@+id/select_component_sheet_item_selected" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_title" style="@style/res_2131952581_uikit_textview_subtext"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="@dimen/uikit_textsize_large" android:ellipsize="end" android:id="@+id/select_component_sheet_item_title" android:paddingTop="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_description" app:layout_constraintEnd_toStartOf="@+id/select_component_sheet_item_selected" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Semibold"/>
+    <com.google.android.material.textview.MaterialTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/select_component_sheet_item_description" android:paddingBottom="16dp" android:visibility="visible" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/select_component_sheet_item_divider" app:layout_constraintEnd_toStartOf="@+id/select_component_sheet_item_selected" app:layout_constraintStart_toEndOf="@+id/select_component_sheet_item_icon" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_title" style="@style/UiKit_TextView_Subtext"/>
     <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/select_component_sheet_item_selected" android:background="@android:color/transparent" android:focusable="false" android:visibility="visible" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:buttonTint="?attr/colorCompoundButton" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <View android:id="@+id/select_component_sheet_item_divider" android:layout_width="0dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_description" style="@style/res_2131952416_uikit_divider"/>
-    <View android:id="@+id/select_component_sheet_item_divider_icon" android:layout_width="0dp" android:layout_marginStart="56dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_description" style="@style/res_2131952416_uikit_divider"/>
+    <View android:id="@+id/select_component_sheet_item_divider" android:layout_width="0dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_description" style="@style/UiKit_Divider"/>
+    <View android:id="@+id/select_component_sheet_item_divider_icon" android:layout_width="0dp" android:layout_marginStart="56dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/select_component_sheet_item_description" style="@style/UiKit_Divider"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_server_boost_confirmation.xml b/app/src/main/res/layout/widget_server_boost_confirmation.xml
index 07a034f46b..5440430698 100644
--- a/app/src/main/res/layout/widget_server_boost_confirmation.xml
+++ b/app/src/main/res/layout/widget_server_boost_confirmation.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
     <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior">
         <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:layout_above="@+id/boost_confirmation_button_container">
-            <LinearLayout android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <ImageView android:src="@drawable/drawable_nitro_server_boost" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-                <TextView android:layout_marginTop="8dp" android:text="@string/premium_guild_subscribe_confirm_blurb" style="@style/res_2131952566_uikit_textview_h1_bold"/>
+            <LinearLayout android:gravity="center" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <ImageView android:src="@drawable/drawable_nitro_server_boost" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+                <TextView android:layout_marginTop="8dp" android:text="@string/premium_guild_subscribe_confirm_blurb" style="@style/UiKit_TextView_H1_Bold"/>
                 <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@+id/boost_confirmation_confirmation_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp"/>
-                <TextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/boost_confirmation_cooldown_warning" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/premium_guild_subscribe_confirm_cooldown_warning" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:id="@+id/boost_confirmation_cooldown_warning" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/premium_guild_subscribe_confirm_cooldown_warning" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </ScrollView>
-        <LinearLayout android:id="@+id/boost_confirmation_button_container" android:layout_margin="16dp" android:layout_alignParentBottom="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textColor="@color/status_red_500" android:id="@+id/boost_confirmation_error" android:visibility="invisible" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_error_mobile" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/boost_confirmation_select" android:text="@string/premium_guild_subscribe_confirm_confirmation" style="@style/res_2131952458_uikit_material_button"/>
+        <LinearLayout android:id="@+id/boost_confirmation_button_container" android:layout_margin="16dp" android:layout_alignParentBottom="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textColor="@color/status_red_500" android:id="@+id/boost_confirmation_error" android:visibility="invisible" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit_TextView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/boost_confirmation_select" android:text="@string/premium_guild_subscribe_confirm_confirmation" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </RelativeLayout>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_boost_status.xml b/app/src/main/res/layout/widget_server_boost_status.xml
index 5288762b9e..e9a7608309 100644
--- a/app/src/main/res/layout/widget_server_boost_status.xml
+++ b/app/src/main/res/layout/widget_server_boost_status.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/boost_status_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/boost_status_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/boost_status_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/res_2131952467_uikit_material_button_secondary"/>
+        <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/boost_status_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit_Material_Button_Secondary"/>
         </LinearLayout>
-        <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-            <LinearLayout android:paddingTop="16dp" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_horizontal" android:id="@+id/boost_status_num_boosts" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_boosted_badge_18dp" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_perks_modal_blurb_mobile" style="@style/res_2131952563_uikit_textview"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/boost_status_learn_more" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/res_2131952563_uikit_textview"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/boost_status_subscribe_button" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/res_2131952458_uikit_material_button"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/boost_status_protip" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/res_2131952563_uikit_textview"/>
+        <androidx.core.widget.NestedScrollView android:layout_height="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView">
+            <LinearLayout android:paddingTop="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?attr/colorHeaderPrimary" android:layout_gravity="center_horizontal" android:id="@+id/boost_status_num_boosts" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_boosted_badge_18dp" style="@style/UiKit_TextView_H1"/>
+                <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_perks_modal_blurb_mobile" style="@style/UiKit_TextView"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/boost_status_learn_more" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/boost_status_subscribe_button" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit_Material_Button"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorTextNormal" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@+id/boost_status_protip" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView"/>
                 <include android:id="@+id/progress" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" layout="@layout/view_premium_guild_progress_bar"/>
                 <com.discord.utilities.simple_pager.SimplePager android:id="@+id/boost_status_viewpager" android:paddingLeft="48dp" android:paddingRight="48dp" android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-                <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" style="@style/res_2131952416_uikit_divider"/>
+                <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" style="@style/UiKit_Divider"/>
                 <include android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" layout="@layout/layout_premium_guild_status_features_user"/>
-                <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" style="@style/res_2131952416_uikit_divider"/>
+                <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" style="@style/UiKit_Divider"/>
                 <com.discord.views.premiumguild.PremiumGuildSubscriptionUpsellView android:id="@+id/boost_status_premium_upsell" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/boost_status_subscribe_button2" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/res_2131952458_uikit_material_button"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/boost_status_subscribe_button2" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_perks_modal_button_subscribe_this_server" style="@style/UiKit_Material_Button"/>
                 <com.discord.views.premiumguild.PremiumSubscriptionMarketingView android:id="@+id/boost_status_premium_marketing" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_server_delete_dialog.xml b/app/src/main/res/layout/widget_server_delete_dialog.xml
index d3efe6846b..a9a44fae62 100644
--- a/app/src/main/res/layout/widget_server_delete_dialog.xml
+++ b/app/src/main/res/layout/widget_server_delete_dialog.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/server_settings_delete_server_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/delete_server_title" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout android:id="@+id/server_settings_delete_server_mfa_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/res_2131952498_uikit_settings_item_label"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_delete_server_mfa_code" android:layout_margin="16dp" android:hint="@string/two_fa_auth_code" style="@style/res_2131952558_uikit_textinputlayout_primary">
-            <com.google.android.material.textfield.TextInputEditText android:inputType="text|textUri|textPassword|textVisiblePassword|number|numberPassword|phone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/server_settings_delete_server_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/delete_server_title" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout android:id="@+id/server_settings_delete_server_mfa_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit_Settings_Item_Label"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_delete_server_mfa_code" android:layout_margin="16dp" android:hint="@string/two_fa_auth_code" style="@style/UiKit_TextInputLayout_Primary">
+            <com.google.android.material.textfield.TextInputEditText android:inputType="text|textUri|textPassword|textVisiblePassword|number|numberPassword|phone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
-    <TextView android:id="@+id/server_settings_delete_server_text" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_delete_server_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_delete_server_confirm" android:text="@string/delete" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+    <TextView android:id="@+id/server_settings_delete_server_text" style="@style/UiKit_Settings_Item_SubText"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_delete_server_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_delete_server_confirm" android:text="@string/delete" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_notification_override_selector.xml b/app/src/main/res/layout/widget_server_notification_override_selector.xml
index c2f85a8c1a..0ce00c348d 100644
--- a/app/src/main/res/layout/widget_server_notification_override_selector.xml
+++ b/app/src/main/res/layout/widget_server_notification_override_selector.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_notifications_channel_search" style="@style/res_2131952560_uikit_textinputlayout_search">
-            <com.google.android.material.textfield.TextInputEditText android:hint="@string/search_channels" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/guild_notifications_channel_search" style="@style/UiKit_TextInputLayout_Search">
+            <com.google.android.material.textfield.TextInputEditText android:hint="@string/search_channels" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
         </com.google.android.material.textfield.TextInputLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_notifications_channel_list" android:paddingTop="8dp" android:paddingBottom="@dimen/list_bottom_padding" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_notifications_channel_list" android:paddingTop="8dp" android:paddingBottom="@dimen/list_bottom_padding" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_notifications.xml b/app/src/main/res/layout/widget_server_notifications.xml
index 262d19093b..89addd96fb 100644
--- a/app/src/main/res/layout/widget_server_notifications.xml
+++ b/app/src/main/res/layout/widget_server_notifications.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131951640_apptheme_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView style="@style/AppTheme_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit_ViewGroup_LinearLayout">
             <com.discord.widgets.servers.NotificationMuteSettingsView android:id="@+id/server_notifications_mute_settings_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-            <View android:id="@+id/server_notifications_frequency_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/server_notifications_frequency_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/notification_settings" android:textAllCaps="true" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/server_notifications_frequency_0_radio" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/server_notifications_frequency_1_radio" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/server_notifications_frequency_2_radio" app:cs_text="@string/form_label_nothing" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <View android:id="@+id/server_notifications_frequency_divider" style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/server_notifications_frequency_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/notification_settings" android:textAllCaps="true" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/server_notifications_frequency_0_radio" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/server_notifications_frequency_1_radio" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/server_notifications_frequency_2_radio" app:cs_text="@string/form_label_nothing" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_notifications_everyone_switch" app:cs_text="@string/form_label_suppress_everyone" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_notifications_roles_switch" app:cs_text="@string/form_label_suppress_roles" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_notifications_push_switch" app:cs_text="@string/form_label_mobile_push_notifications" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/notification_overrides" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_notifications_everyone_switch" app:cs_text="@string/form_label_suppress_everyone" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_notifications_roles_switch" app:cs_text="@string/form_label_suppress_roles" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_notifications_push_switch" app:cs_text="@string/form_label_mobile_push_notifications" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/notification_overrides" style="@style/UiKit_Settings_Item_Header"/>
             <include android:id="@+id/add_override" layout="@layout/view_add_override_item"/>
-            <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_notifications_override_list" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+            <androidx.recyclerview.widget.RecyclerView android:id="@+id/guild_notifications_override_list" style="@style/UiKit_ViewGroup_RecyclerView"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings.xml b/app/src/main/res/layout/widget_server_settings.xml
index c6db19d814..abd122a581 100644
--- a/app/src/main/res/layout/widget_server_settings.xml
+++ b/app/src/main/res/layout/widget_server_settings.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/res_2131951637_apptheme_appbarlayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/res_2131951647_apptheme_collapsingtoolbarlayout">
-            <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="32dp" android:layout_marginTop="?attr/actionBarSize" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <RelativeLayout android:layout_gravity="center_horizontal" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/server_settings_server_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" app:placeholderImage="?attr/color_brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?attr/primary_630" style="@style/res_2131951673_avatar_hero"/>
-                    <TextView android:textSize="42sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center_horizontal" android:id="@+id/server_settings_server_icon_text" android:padding="16dp" android:layout_width="match_parent" android:layout_centerInParent="true" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/primary_630" style="@style/AppTheme_AppBarLayout">
+        <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme_CollapsingToolbarLayout">
+            <LinearLayout android:gravity="center" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="32dp" android:layout_marginTop="?attr/actionBarSize" style="@style/UiKit_ViewGroup_LinearLayout">
+                <RelativeLayout android:layout_gravity="center_horizontal" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/server_settings_server_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" app:placeholderImage="?attr/color_brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?attr/primary_630" style="@style/Avatar_Hero"/>
+                    <TextView android:textSize="42sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center_horizontal" android:id="@+id/server_settings_server_icon_text" android:padding="16dp" android:layout_width="match_parent" android:layout_centerInParent="true" style="@style/UiKit_TextView_Large_SingleLine"/>
                 </RelativeLayout>
-                <TextView android:id="@+id/server_settings_server_name" android:singleLine="true" style="@style/res_2131952565_uikit_textview_h1"/>
+                <TextView android:id="@+id/server_settings_server_name" android:singleLine="true" style="@style/UiKit_TextView_H1"/>
             </LinearLayout>
-            <androidx.appcompat.widget.Toolbar android:background="?attr/primary_630" style="@style/res_2131951663_apptheme_toolbar"/>
+            <androidx.appcompat.widget.Toolbar android:background="?attr/primary_630" style="@style/AppTheme_Toolbar"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131951640_apptheme_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:id="@+id/server_settings_section_general_settings" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:id="@+id/server_settings_option_overview" android:text="@string/overview" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_option_moderation" android:text="@string/moderation" app:drawableStartCompat="@drawable/ic_privacy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_option_audit_log" android:text="@string/guild_settings_label_audit_log" app:drawableStartCompat="@drawable/ic_audit_logs_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_option_channels" android:text="@string/channels" app:drawableStartCompat="@drawable/ic_channels_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_option_integrations" android:text="@string/integrations" app:drawableStartCompat="@drawable/ic_controller_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_option_security" android:text="@string/security" app:drawableStartCompat="@drawable/ic_security_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_option_vanity_url" android:text="@string/vanity_url" app:drawableStartCompat="@drawable/ic_link_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_emojis_option" android:text="@string/emoji" app:drawableStartCompat="@drawable/ic_emoji_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+    <androidx.core.widget.NestedScrollView style="@style/AppTheme_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:id="@+id/server_settings_section_general_settings" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/settings" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:id="@+id/server_settings_option_overview" android:text="@string/overview" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_option_moderation" android:text="@string/moderation" app:drawableStartCompat="@drawable/ic_privacy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_option_audit_log" android:text="@string/guild_settings_label_audit_log" app:drawableStartCompat="@drawable/ic_audit_logs_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_option_channels" android:text="@string/channels" app:drawableStartCompat="@drawable/ic_channels_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_option_integrations" android:text="@string/integrations" app:drawableStartCompat="@drawable/ic_controller_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_option_security" android:text="@string/security" app:drawableStartCompat="@drawable/ic_security_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_option_vanity_url" android:text="@string/vanity_url" app:drawableStartCompat="@drawable/ic_link_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_emojis_option" android:text="@string/emoji" app:drawableStartCompat="@drawable/ic_emoji_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/server_settings_section_community" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View android:id="@+id/server_settings_section_community_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/guild_settings_community" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:id="@+id/server_settings_community_overview_option" android:text="@string/overview" app:drawableStartCompat="@drawable/ic_community_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_enable_community_option" android:visibility="gone" android:text="@string/guild_settings_community_enable_community" app:drawableStartCompat="@drawable/ic_community_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <LinearLayout android:id="@+id/server_settings_section_community" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View android:id="@+id/server_settings_section_community_divider" style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/guild_settings_community" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:id="@+id/server_settings_community_overview_option" android:text="@string/overview" app:drawableStartCompat="@drawable/ic_community_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_enable_community_option" android:visibility="gone" android:text="@string/guild_settings_community_enable_community" app:drawableStartCompat="@drawable/ic_community_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/server_settings_section_user_management" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View android:id="@+id/server_settings_section_user_management_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/user_management" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:id="@+id/server_settings_members_option" android:text="@string/members" app:drawableStartCompat="@drawable/ic_members_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_roles_option" android:text="@string/roles" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_instant_invites_option" android:text="@string/instant_invites" app:drawableStartCompat="@drawable/ic_diag_link_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_bans_option" android:text="@string/bans" app:drawableStartCompat="@drawable/ic_hammer_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <LinearLayout android:id="@+id/server_settings_section_user_management" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View android:id="@+id/server_settings_section_user_management_divider" style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/user_management" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:id="@+id/server_settings_members_option" android:text="@string/members" app:drawableStartCompat="@drawable/ic_members_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_roles_option" android:text="@string/roles" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_instant_invites_option" android:text="@string/instant_invites" app:drawableStartCompat="@drawable/ic_diag_link_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_bans_option" android:text="@string/bans" app:drawableStartCompat="@drawable/ic_hammer_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_server_settings_audit_log.xml b/app/src/main/res/layout/widget_server_settings_audit_log.xml
index f261bb5f7d..0b13f5f098 100644
--- a/app/src/main/res/layout/widget_server_settings_audit_log.xml
+++ b/app/src/main/res/layout/widget_server_settings_audit_log.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_audit_logs_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_audit_logs_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true"/>
-        <LinearLayout android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:id="@+id/server_settings_audit_logs_user_filter_container" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90dp" android:text="@string/guild_settings_filtered_user" android:layout_marginEnd="8dp" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:id="@+id/server_settings_audit_logs_user_filter" style="@style/res_2131952484_uikit_search_chip"/>
+        <LinearLayout android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:id="@+id/server_settings_audit_logs_user_filter_container" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90dp" android:text="@string/guild_settings_filtered_user" android:layout_marginEnd="8dp" style="@style/UiKit_TextView"/>
+                <TextView android:id="@+id/server_settings_audit_logs_user_filter" style="@style/UiKit_Search_Chip"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/server_settings_audit_logs_action_filter_container" android:layout_marginLeft="8dp" android:layout_marginTop="4dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90dp" android:text="@string/guild_settings_filtered_action" android:layout_marginEnd="8dp" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:id="@+id/server_settings_audit_logs_action_filter" style="@style/res_2131952484_uikit_search_chip"/>
+            <LinearLayout android:id="@+id/server_settings_audit_logs_action_filter_container" android:layout_marginLeft="8dp" android:layout_marginTop="4dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:minWidth="90dp" android:text="@string/guild_settings_filtered_action" android:layout_marginEnd="8dp" style="@style/UiKit_TextView"/>
+                <TextView android:id="@+id/server_settings_audit_logs_action_filter" style="@style/UiKit_Search_Chip"/>
             </LinearLayout>
-            <com.discord.app.AppViewFlipper android:id="@+id/server_settings_audit_logs_view_results_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131951640_apptheme_appbarscrollingviewbehavior">
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_audit_logs_recycler" android:scrollbars="vertical" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-                <LinearLayout android:gravity="center" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:id="@+id/no_logs_title" android:text="@string/guild_settings_label_audit_log_empty_title" style="@style/res_2131952576_uikit_textview_noresults"/>
-                    <TextView android:gravity="center" android:id="@+id/no_logs_body" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_settings_label_audit_log_empty_body" style="@style/res_2131952563_uikit_textview"/>
+            <com.discord.app.AppViewFlipper android:id="@+id/server_settings_audit_logs_view_results_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/AppTheme_AppBarScrollingViewBehavior">
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_audit_logs_recycler" android:scrollbars="vertical" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+                <LinearLayout android:gravity="center" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:id="@+id/no_logs_title" android:text="@string/guild_settings_label_audit_log_empty_title" style="@style/UiKit_TextView_NoResults"/>
+                    <TextView android:gravity="center" android:id="@+id/no_logs_body" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/guild_settings_label_audit_log_empty_body" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </com.discord.app.AppViewFlipper>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml b/app/src/main/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml
index 7ab30316b6..8f23db2723 100644
--- a/app/src/main/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml
+++ b/app/src/main/res/layout/widget_server_settings_audit_log_filter_action_listitem.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <FrameLayout android:id="@+id/audit_log_filter_image_container" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp">
-        <ImageView android:id="@+id/audit_log_filter_image_target" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-        <ImageView android:id="@+id/audit_log_filter_image_action" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+        <ImageView android:id="@+id/audit_log_filter_image_target" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+        <ImageView android:id="@+id/audit_log_filter_image_action" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     </FrameLayout>
     <com.discord.views.CheckedSetting android:id="@+id/audit_log_filter_cs" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_background="@color/transparent" app:cs_text_color="?attr/primary_200" app:cs_text_size="@dimen/uikit_textsize_large" app:cs_view_type="1"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml b/app/src/main/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml
index 1cd068143f..2f5bf672d6 100644
--- a/app/src/main/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml
+++ b/app/src/main/res/layout/widget_server_settings_audit_log_filter_user_listitem.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:padding="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:padding="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <FrameLayout android:id="@+id/audit_log_filter_image_container" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/audit_log_filter_avatar" style="@style/res_2131951674_avatar_large"/>
-        <ImageView android:layout_gravity="center" android:id="@+id/audit_log_filter_image" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/audit_log_filter_avatar" style="@style/Avatar_Large"/>
+        <ImageView android:layout_gravity="center" android:id="@+id/audit_log_filter_image" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
     </FrameLayout>
     <com.discord.views.CheckedSetting android:id="@+id/audit_log_filter_cs" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_background="@color/transparent" app:cs_text_color="?attr/primary_200" app:cs_text_size="@dimen/uikit_textsize_large" app:cs_view_type="1"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_audit_log_listitem.xml b/app/src/main/res/layout/widget_server_settings_audit_log_listitem.xml
index 8668052295..2f15ddaf7c 100644
--- a/app/src/main/res/layout/widget_server_settings_audit_log_listitem.xml
+++ b/app/src/main/res/layout/widget_server_settings_audit_log_listitem.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_margin="8dp" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="4dp" style="@style/res_2131952589_uikit_viewgroup">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <RelativeLayout android:id="@+id/audit_log_listitem_top_container" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_margin="8dp" android:elevation="@dimen/app_elevation" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="4dp" style="@style/UiKit_ViewGroup">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <RelativeLayout android:id="@+id/audit_log_listitem_top_container" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_RelativeLayout">
             <FrameLayout android:id="@+id/audit_log_listitem_action_container" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginTop="12dp" android:layout_centerVertical="true" android:layout_marginStart="16dp">
-                <ImageView android:id="@+id/audit_log_listitem_targettype_image" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-                <ImageView android:id="@+id/audit_log_listitem_actiontype_image" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+                <ImageView android:id="@+id/audit_log_listitem_targettype_image" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+                <ImageView android:id="@+id/audit_log_listitem_actiontype_image" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
             </FrameLayout>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/audit_log_listitem_avatar" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_toRightOf="@+id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/res_2131951678_avatar_standard"/>
-            <TextView android:ellipsize="end" android:id="@+id/audit_log_listitem_header_text" android:layout_marginTop="8dp" android:maxLines="3" android:layout_toLeftOf="@+id/audit_log_listitem_arrow" android:layout_toRightOf="@+id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textColor="?attr/primary_400" android:ellipsize="end" android:id="@+id/audit_log_listitem_date_text" android:layout_marginTop="8dp" android:layout_marginRight="32dp" android:layout_marginBottom="8dp" android:maxLines="2" android:layout_toRightOf="@+id/audit_log_listitem_avatar" android:layout_below="@+id/audit_log_listitem_header_text" style="@style/res_2131952563_uikit_textview"/>
-            <ImageView android:id="@+id/audit_log_listitem_arrow" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_centerVertical="true" android:contentDescription="@string/more" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/audit_log_listitem_avatar" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_toRightOf="@+id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/Avatar_Standard"/>
+            <TextView android:ellipsize="end" android:id="@+id/audit_log_listitem_header_text" android:layout_marginTop="8dp" android:maxLines="3" android:layout_toLeftOf="@+id/audit_log_listitem_arrow" android:layout_toRightOf="@+id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+            <TextView android:textColor="?attr/primary_400" android:ellipsize="end" android:id="@+id/audit_log_listitem_date_text" android:layout_marginTop="8dp" android:layout_marginRight="32dp" android:layout_marginBottom="8dp" android:maxLines="2" android:layout_toRightOf="@+id/audit_log_listitem_avatar" android:layout_below="@+id/audit_log_listitem_header_text" style="@style/UiKit_TextView"/>
+            <ImageView android:id="@+id/audit_log_listitem_arrow" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_centerVertical="true" android:contentDescription="@string/more" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
         </RelativeLayout>
-        <TextView android:textColor="?attr/primary_400" android:id="@+id/audit_log_listitem_change_text" android:padding="16dp" android:visibility="gone" android:layout_width="match_parent" style="@style/res_2131952563_uikit_textview"/>
+        <TextView android:textColor="?attr/primary_400" android:id="@+id/audit_log_listitem_change_text" android:padding="16dp" android:visibility="gone" android:layout_width="match_parent" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/widget_server_settings_audit_log_menu_filter.xml b/app/src/main/res/layout/widget_server_settings_audit_log_menu_filter.xml
index 48500e7de9..470f12c696 100644
--- a/app/src/main/res/layout/widget_server_settings_audit_log_menu_filter.xml
+++ b/app/src/main/res/layout/widget_server_settings_audit_log_menu_filter.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content">
-    <ImageView android:padding="12dp" android:src="?attr/ic_filter_list" android:contentDescription="@string/filter" style="@style/res_2131952448_uikit_imageview"/>
+    <ImageView android:padding="12dp" android:src="?attr/ic_filter_list" android:contentDescription="@string/filter" style="@style/UiKit_ImageView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_ban_list_item.xml b/app/src/main/res/layout/widget_server_settings_ban_list_item.xml
index 7d6b41a3ae..4d0a4698dc 100644
--- a/app/src/main/res/layout/widget_server_settings_ban_list_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_ban_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/ban_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/ban_list_item_avatar" android:layout_alignParentStart="true" style="@style/res_2131951678_avatar_standard"/>
-    <TextView android:id="@+id/ban_list_item_name" android:layout_width="match_parent" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toEndOf="@+id/ban_list_item_avatar" app:drawableEndCompat="@drawable/ic_unban_grey" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <View android:layout_marginTop="16dp" android:layout_below="@+id/ban_list_item_avatar" android:layout_alignParentBottom="true" android:layout_toEndOf="@+id/ban_list_item_avatar" style="@style/res_2131952491_uikit_settings_divider"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/ban_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/ban_list_item_avatar" android:layout_alignParentStart="true" style="@style/Avatar_Standard"/>
+    <TextView android:id="@+id/ban_list_item_name" android:layout_width="match_parent" android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toEndOf="@+id/ban_list_item_avatar" app:drawableEndCompat="@drawable/ic_unban_grey" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <View android:layout_marginTop="16dp" android:layout_below="@+id/ban_list_item_avatar" android:layout_alignParentBottom="true" android:layout_toEndOf="@+id/ban_list_item_avatar" style="@style/UiKit_Settings_Divider"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_bans.xml b/app/src/main/res/layout/widget_server_settings_bans.xml
index 7214c2124a..033a6f9b0d 100644
--- a/app/src/main/res/layout/widget_server_settings_bans.xml
+++ b/app/src/main/res/layout/widget_server_settings_bans.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
-        <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_bans_search" style="@style/res_2131952560_uikit_textinputlayout_search">
-            <com.google.android.material.textfield.TextInputEditText android:hint="@string/members_search_placeholder" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
+        <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_bans_search" style="@style/UiKit_TextInputLayout_Search">
+            <com.google.android.material.textfield.TextInputEditText android:hint="@string/members_search_placeholder" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
         </com.google.android.material.textfield.TextInputLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_bans_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_bans_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_bans_recycler" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <TextView android:id="@+id/no_bans_body" android:text="@string/bans_no_users_banned" app:drawableTopCompat="@drawable/asset_empty_no_bans" style="@style/res_2131952576_uikit_textview_noresults"/>
-        <TextView android:id="@+id/no_results_text" android:text="@string/bans_no_results" app:drawableTopCompat="@drawable/asset_no_results_light" style="@style/res_2131952576_uikit_textview_noresults"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_bans_recycler" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <TextView android:id="@+id/no_bans_body" android:text="@string/bans_no_users_banned" app:drawableTopCompat="@drawable/asset_empty_no_bans" style="@style/UiKit_TextView_NoResults"/>
+        <TextView android:id="@+id/no_results_text" android:text="@string/bans_no_results" app:drawableTopCompat="@drawable/asset_no_results_light" style="@style/UiKit_TextView_NoResults"/>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_channels.xml b/app/src/main/res/layout/widget_server_settings_channels.xml
index 4c390d5e21..e1470ab2c5 100644
--- a/app/src/main/res/layout/widget_server_settings_channels.xml
+++ b/app/src/main/res/layout/widget_server_settings_channels.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_channels_text_recycler" android:paddingTop="12dp" android:paddingBottom="32dp" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_channels_create_channel" android:src="@drawable/ic_add_white_24dp" android:contentDescription="@string/create" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_channels_text_recycler" android:paddingTop="12dp" android:paddingBottom="32dp" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_channels_create_channel" android:src="@drawable/ic_add_white_24dp" android:contentDescription="@string/create" style="@style/Settings_FloatingActionButton"/>
     <FrameLayout android:id="@+id/widget_server_settings_channels_container" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_dodgeInsetEdges="800055"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_channels_sort_actions.xml b/app/src/main/res/layout/widget_server_settings_channels_sort_actions.xml
index d9f3782f96..bac8bff114 100644
--- a/app/src/main/res/layout/widget_server_settings_channels_sort_actions.xml
+++ b/app/src/main/res/layout/widget_server_settings_channels_sort_actions.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <TextView android:id="@+id/guild_actions_overview_header_tv" android:text="@string/select_sort_mode" style="@style/res_2131952506_uikit_sheet_header_title"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <TextView android:id="@+id/guild_actions_overview_header_tv" android:text="@string/select_sort_mode" style="@style/UiKit_Sheet_Header_Title"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:id="@+id/server_settings_channels_sort_actions_category" android:text="@string/category" app:drawableStartCompat="?attr/ic_category" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/server_settings_channels_sort_actions_voice" android:text="@string/voice_channel" app:drawableStartCompat="?attr/ic_volume_up" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/server_settings_channels_sort_actions_text" android:text="@string/text_channel" app:drawableStartCompat="?attr/ic_channel_text" style="@style/res_2131952497_uikit_settings_item_icon"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <TextView android:id="@+id/server_settings_channels_sort_actions_category" android:text="@string/category" app:drawableStartCompat="?attr/ic_category" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/server_settings_channels_sort_actions_voice" android:text="@string/voice_channel" app:drawableStartCompat="?attr/ic_volume_up" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/server_settings_channels_sort_actions_text" android:text="@string/text_channel" app:drawableStartCompat="?attr/ic_channel_text" style="@style/UiKit_Settings_Item_Icon"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_server_settings_channels_sort_fab_menu.xml b/app/src/main/res/layout/widget_server_settings_channels_sort_fab_menu.xml
index 385e7add6c..29a1236e79 100644
--- a/app/src/main/res/layout/widget_server_settings_channels_sort_fab_menu.xml
+++ b/app/src/main/res/layout/widget_server_settings_channels_sort_fab_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/fab_menu_table" android:background="@color/primary_630_alpha_60" style="@style/res_2131952602_uikit_viewgroup_page">
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="bottom|right|center_vertical|center_horizontal|center|end" android:id="@+id/fab_menu_table" android:background="@color/primary_630_alpha_60" style="@style/UiKit_ViewGroup_Page">
     <TableRow android:gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/fab_menu_add_category" android:focusable="true" android:clickable="true">
         <com.google.android.material.floatingactionbutton.FloatingActionButton android:src="@drawable/ic_category_16dp" android:contentDescription="@string/add_channel_or_category" app:backgroundTint="?attr/primary_100" style="@style/FabMenuMiniIcon"/>
     </TableRow>
diff --git a/app/src/main/res/layout/widget_server_settings_community_overview.xml b/app/src/main/res/layout/widget_server_settings_community_overview.xml
index ccb7f4555b..bd9f26adfc 100644
--- a/app/src/main/res/layout/widget_server_settings_community_overview.xml
+++ b/app/src/main/res/layout/widget_server_settings_community_overview.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView android:id="@+id/server_settings_community_overview_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_rules_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_community_locale" app:csv_description_text="@string/guild_settings_community_locale_help" app:csv_title_text="@string/form_label_server_language" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_disable_community_message" app:csv_description_text="@string/guild_settings_community_disable_community_description" app:csv_is_dropdown="false" app:csv_title_text="@string/guild_settings_community_disable_community" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
+    <ScrollView android:id="@+id/server_settings_community_overview_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_rules_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_community_locale" app:csv_description_text="@string/guild_settings_community_locale_help" app:csv_title_text="@string/form_label_server_language" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/server_settings_disable_community_message" app:csv_description_text="@string/guild_settings_community_disable_community_description" app:csv_is_dropdown="false" app:csv_title_text="@string/guild_settings_community_disable_community" style="@style/UiKit_ViewGroup_LinearLayout"/>
             <com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@+id/server_settings_disable_community_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:layout_marginBottom="18dp" android:layout_marginStart="16dp" app:lb_background_color="@color/status_red_500" app:lb_progress_color="@color/white" app:lb_text="@string/guild_settings_community_disable_community" app:lb_text_color="@drawable/button_text_color_primary_100"/>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/widget_server_settings_community_setup_first_step.xml b/app/src/main/res/layout/widget_server_settings_community_setup_first_step.xml
index 9010bf9df3..0cd717d2d6 100644
--- a/app/src/main/res/layout/widget_server_settings_community_setup_first_step.xml
+++ b/app/src/main/res/layout/widget_server_settings_community_setup_first_step.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="?attr/drawable_community_setup_first_step" android:importantForAccessibility="no"/>
         <com.discord.views.ScreenTitleView android:id="@+id/community_step_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:stv_subtitle="@string/enable_community_modal_step_1_body" app:stv_title="@string/enable_community_modal_step_1_header"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_settings_verified_emailed_switch" app:cs_subtext="@string/enable_community_modal_verification_level_help" app:cs_text="@string/enable_community_modal_verification_level_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <View android:layout_marginTop="24dp" style="@style/res_2131952491_uikit_settings_divider"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_settings_scan_messages_switch" app:cs_subtext="@string/enable_public_modal_content_filter_help" app:cs_text="@string/enable_community_modal_content_filter_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_settings_verified_emailed_switch" app:cs_subtext="@string/enable_community_modal_verification_level_help" app:cs_text="@string/enable_community_modal_verification_level_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <View android:layout_marginTop="24dp" style="@style/UiKit_Settings_Divider"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_settings_scan_messages_switch" app:cs_subtext="@string/enable_public_modal_content_filter_help" app:cs_text="@string/enable_community_modal_content_filter_label" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/widget_server_settings_community_setup_second_step.xml b/app/src/main/res/layout/widget_server_settings_community_setup_second_step.xml
index 2d909e368c..8bbbf456f3 100644
--- a/app/src/main/res/layout/widget_server_settings_community_setup_second_step.xml
+++ b/app/src/main/res/layout/widget_server_settings_community_setup_second_step.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="wrap_content" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="?attr/drawable_community_setup_second_step" android:importantForAccessibility="no"/>
         <com.discord.views.ScreenTitleView android:id="@+id/community_step_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:stv_subtitle="@string/enable_community_modal_step_2_body" app:stv_title="@string/enable_community_modal_step_2_title"/>
-        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_guidelines_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_subtitle_text="@string/guild_template_name_announcements" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_subtitle_text="@string/public_updates_channel_title" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
+        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_guidelines_channel" app:csv_description_text="@string/guild_settings_community_rules_channel_help_mobile" app:csv_subtitle_text="@string/guild_template_name_announcements" app:csv_title_text="@string/form_label_discovery_rules_channel" style="@style/UiKit_ViewGroup_LinearLayout"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <com.discord.widgets.servers.community.CommunitySelectorView android:id="@+id/community_updates_channel" app:csv_description_text="@string/guild_settings_community_mod_channel_help_mobile" app:csv_subtitle_text="@string/public_updates_channel_title" app:csv_title_text="@string/guild_settings_community_mod_channel_title" style="@style/UiKit_ViewGroup_LinearLayout"/>
+        <View style="@style/UiKit_Settings_Divider"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/widget_server_settings_community_setup_third_step.xml b/app/src/main/res/layout/widget_server_settings_community_setup_third_step.xml
index 24a82b7963..2bee566c33 100644
--- a/app/src/main/res/layout/widget_server_settings_community_setup_third_step.xml
+++ b/app/src/main/res/layout/widget_server_settings_community_setup_third_step.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="match_parent" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_first_step_scroll" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="?attr/drawable_community_setup_third_step" android:importantForAccessibility="no"/>
         <com.discord.views.ScreenTitleView android:id="@+id/community_step_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:stv_subtitle="@string/enable_community_modal_step_3_body" app:stv_title="@string/enable_community_modal_step_3_title"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_setting_notifications_to_mentions_switch" app:cs_text="@string/enable_community_modal_default_notifications_label_mobile" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_setting_manage_permissions_switch" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:text="@string/public_guild_policy_title" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-        <com.discord.views.CheckedSetting android:id="@+id/community_setting_community_guidelines_switch" app:cs_text="@string/public_guild_policy_accept" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="0" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/community_setting_guidelines" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_setting_notifications_to_mentions_switch" app:cs_text="@string/enable_community_modal_default_notifications_label_mobile" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_setting_manage_permissions_switch" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:text="@string/public_guild_policy_title" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+        <com.discord.views.CheckedSetting android:id="@+id/community_setting_community_guidelines_switch" app:cs_text="@string/public_guild_policy_accept" app:cs_text_color="?attr/primary_000" app:cs_text_fontpath="?attr/font_primary_semibold" app:cs_view_type="0" style="@style/UiKit_CheckedSetting_Themed"/>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/community_setting_guidelines" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/widget_server_settings_confirm_disable_integration.xml b/app/src/main/res/layout/widget_server_settings_confirm_disable_integration.xml
index 661286056d..0a09c58ab7 100644
--- a/app/src/main/res/layout/widget_server_settings_confirm_disable_integration.xml
+++ b/app/src/main/res/layout/widget_server_settings_confirm_disable_integration.xml
@@ -5,7 +5,7 @@
         <TextView android:id="@+id/server_settings_confirm_disable_integration_body" style="@style/AppAlertDialogText"/>
     </LinearLayout>
     <LinearLayout style="@style/AppAlertDialogFooter">
-        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_confirm_disable_integration_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_confirm_disable_integration_confirm" android:text="@string/disable" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_confirm_disable_integration_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_confirm_disable_integration_confirm" android:text="@string/disable" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_edit_integration.xml b/app/src/main/res/layout/widget_server_settings_edit_integration.xml
index 662ee96037..4a2a486f17 100644
--- a/app/src/main/res/layout/widget_server_settings_edit_integration.xml
+++ b/app/src/main/res/layout/widget_server_settings_edit_integration.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/edit_integration_settings_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView android:id="@+id/edit_integration_settings_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
             <View android:layout_width="match_parent" android:layout_height="20dp"/>
-            <RelativeLayout android:paddingTop="8dp" android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="0dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                <ImageView android:id="@+id/edit_integration_icon" android:layout_centerVertical="true" android:layout_marginEnd="16dp" style="@style/res_2131952448_uikit_imageview"/>
-                <LinearLayout android:id="@+id/edit_integration_name_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_toEndOf="@+id/edit_integration_icon" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:id="@+id/edit_integration_owner_name" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:id="@+id/edit_integration_name" style="@style/res_2131952563_uikit_textview"/>
+            <RelativeLayout android:paddingTop="8dp" android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="0dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                <ImageView android:id="@+id/edit_integration_icon" android:layout_centerVertical="true" android:layout_marginEnd="16dp" style="@style/UiKit_ImageView"/>
+                <LinearLayout android:id="@+id/edit_integration_name_container" android:layout_width="wrap_content" android:layout_centerVertical="true" android:layout_toEndOf="@+id/edit_integration_icon" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:id="@+id/edit_integration_owner_name" style="@style/UiKit_TextView"/>
+                    <TextView android:id="@+id/edit_integration_name" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </RelativeLayout>
-            <LinearLayout android:id="@+id/edit_member_roles_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/subscriber_information" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <LinearLayout android:id="@+id/edit_member_roles_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/subscriber_information" style="@style/UiKit_Settings_Item_Header"/>
                 <include android:id="@+id/sync_settings" android:layout_width="match_parent" android:layout_height="wrap_content" layout="@layout/integration_sync_settings"/>
             </LinearLayout>
-            <View style="@style/res_2131952416_uikit_divider"/>
-            <LinearLayout android:id="@+id/edit_member_administrative_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/form_label_sub_expire_behavior" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <LinearLayout android:id="@+id/edit_integration_expired_sub_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <com.discord.views.CheckedSetting android:id="@+id/edit_integration_expire_radio_remove_role" app:cs_text="@string/remove_synced_role" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                    <com.discord.views.CheckedSetting android:id="@+id/edit_integration_expire_radio_kick_user" app:cs_text="@string/kick_from_server" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <View style="@style/UiKit_Divider"/>
+            <LinearLayout android:id="@+id/edit_member_administrative_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/form_label_sub_expire_behavior" style="@style/UiKit_Settings_Item_Header"/>
+                <LinearLayout android:id="@+id/edit_integration_expired_sub_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <com.discord.views.CheckedSetting android:id="@+id/edit_integration_expire_radio_remove_role" app:cs_text="@string/remove_synced_role" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                    <com.discord.views.CheckedSetting android:id="@+id/edit_integration_expire_radio_kick_user" app:cs_text="@string/kick_from_server" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
                 </LinearLayout>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/form_label_expire_grace_period" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <LinearLayout android:id="@+id/edit_integration_grace_period_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_1_day" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_3_days" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_7_days" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_14_days" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_30_days" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <LinearLayout android:id="@+id/edit_integration_custom_emotes_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:text="@string/form_label_custom_twitch_emoticon" style="@style/res_2131952496_uikit_settings_item_header"/>
-                    <com.discord.views.CheckedSetting android:id="@+id/edit_integration_custom_emotes_toggle" app:cs_text="@string/enable_twitch_emoji_sync" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/form_label_expire_grace_period" style="@style/UiKit_Settings_Item_Header"/>
+            <LinearLayout android:id="@+id/edit_integration_grace_period_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_1_day" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_3_days" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_7_days" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_14_days" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/edit_integration_grace_period_radio_30_days" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View style="@style/UiKit_Settings_Divider"/>
+                <LinearLayout android:id="@+id/edit_integration_custom_emotes_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:text="@string/form_label_custom_twitch_emoticon" style="@style/UiKit_Settings_Item_Header"/>
+                    <com.discord.views.CheckedSetting android:id="@+id/edit_integration_custom_emotes_toggle" app:cs_text="@string/enable_twitch_emoji_sync" style="@style/UiKit_CheckedSetting_Themed"/>
                 </LinearLayout>
             </LinearLayout>
             <Space android:layout_width="match_parent" android:layout_height="64dp"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/edit_integration_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/edit_integration_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_edit_member.xml b/app/src/main/res/layout/widget_server_settings_edit_member.xml
index be60e571c1..550fcd5afd 100644
--- a/app/src/main/res/layout/widget_server_settings_edit_member.xml
+++ b/app/src/main/res/layout/widget_server_settings_edit_member.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/nickname" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_member_nickname" android:hint="@string/change_nickname" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:endIconDrawable="@drawable/ic_role_lock" app:endIconMode="-1" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:maxLength="32" android:inputType="textNoSuggestions" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/nickname" style="@style/UiKit_Settings_Item_Header"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_member_nickname" android:hint="@string/change_nickname" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:endIconDrawable="@drawable/ic_role_lock" app:endIconMode="-1" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:maxLength="32" android:inputType="textNoSuggestions" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <LinearLayout android:id="@+id/edit_member_roles_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/roles" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/edit_member_roles_recycler" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+            <LinearLayout android:id="@+id/edit_member_roles_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/roles" style="@style/UiKit_Settings_Item_Header"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/edit_member_roles_recycler" style="@style/UiKit_ViewGroup_RecyclerView"/>
             </LinearLayout>
             <LinearLayout android:orientation="vertical" android:id="@+id/edit_member_administrative_container" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/administrative" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:textColor="@color/status_red_500" android:id="@+id/edit_member_kick_button" android:text="@string/kick_user_title" app:drawableStartCompat="@drawable/ic_remove_friend_red_24dp" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:textColor="@color/status_red_500" android:id="@+id/edit_member_ban_button" android:text="@string/ban_user_title" app:drawableStartCompat="@drawable/ic_ban_red_24dp" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:textColor="@color/status_red_500" android:id="@+id/edit_member_transfer_ownership_button" android:text="@string/transfer_ownership" app:drawableStartCompat="@drawable/ic_transfer_red_24dp" style="@style/res_2131952497_uikit_settings_item_icon"/>
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/administrative" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:textColor="@color/status_red_500" android:id="@+id/edit_member_kick_button" android:text="@string/kick_user_title" app:drawableStartCompat="@drawable/ic_remove_friend_red_24dp" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:textColor="@color/status_red_500" android:id="@+id/edit_member_ban_button" android:text="@string/ban_user_title" app:drawableStartCompat="@drawable/ic_ban_red_24dp" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:textColor="@color/status_red_500" android:id="@+id/edit_member_transfer_ownership_button" android:text="@string/transfer_ownership" app:drawableStartCompat="@drawable/ic_transfer_red_24dp" style="@style/UiKit_Settings_Item_Icon"/>
             </LinearLayout>
             <Space android:layout_width="match_parent" android:layout_height="64dp"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/edit_member_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/edit_member_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_emojis.xml b/app/src/main/res/layout/widget_server_settings_emojis.xml
index c0bd4edecd..2e39f728af 100644
--- a/app/src/main/res/layout/widget_server_settings_emojis.xml
+++ b/app/src/main/res/layout/widget_server_settings_emojis.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/widget_server_settings_emojis_view_flipper" android:layout_width="match_parent" android:layout_height="match_parent" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/widget_server_settings_emojis_view_flipper" android:layout_width="match_parent" android:layout_height="match_parent" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" style="@style/res_2131952679_widget_appcompat_progressbar"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/widget_server_settings_emojis_recycler" android:scrollbars="vertical" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/widget_server_settings_emojis_recycler" android:scrollbars="vertical" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_emojis_edit.xml b/app/src/main/res/layout/widget_server_settings_emojis_edit.xml
index b44109fc67..3dd42c3e11 100644
--- a/app/src/main/res/layout/widget_server_settings_emojis_edit.xml
+++ b/app/src/main/res/layout/widget_server_settings_emojis_edit.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_emojis_edit_alias" android:layout_margin="16dp" android:hint="@string/guild_settings_emoji_alias" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:maxLength="32" android:inputType="textNoSuggestions" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_emojis_edit_alias" android:layout_margin="16dp" android:hint="@string/guild_settings_emoji_alias" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:maxLength="32" android:inputType="textNoSuggestions" style="@style/UiKit_TextInputLayout_EditText"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_emojis_edit_alias_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_emojis_edit_alias_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_emojis_empty.xml b/app/src/main/res/layout/widget_server_settings_emojis_empty.xml
index 47250d8546..0c5495a159 100644
--- a/app/src/main/res/layout/widget_server_settings_emojis_empty.xml
+++ b/app/src/main/res/layout/widget_server_settings_emojis_empty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:text="@string/no_emoji_title" app:drawableTopCompat="?attr/theme_emoji_settings_empty" style="@style/res_2131952576_uikit_textview_noresults"/>
-    <TextView android:gravity="center" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/no_emoji" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:text="@string/no_emoji_title" app:drawableTopCompat="?attr/theme_emoji_settings_empty" style="@style/UiKit_TextView_NoResults"/>
+    <TextView android:gravity="center" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/no_emoji" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_emojis_header.xml b/app/src/main/res/layout/widget_server_settings_emojis_header.xml
index be4a009af7..b1e7e331e3 100644
--- a/app/src/main/res/layout/widget_server_settings_emojis_header.xml
+++ b/app/src/main/res/layout/widget_server_settings_emojis_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <com.google.android.material.button.MaterialButton android:id="@+id/widget_server_settings_emojis_upload" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/upload_emoji" style="@style/res_2131952458_uikit_material_button"/>
-    <TextView android:id="@+id/widget_server_settings_emojis_upload_description" android:text="@string/guild_settings_emoji_upload_to_server_message" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <com.google.android.material.button.MaterialButton android:id="@+id/widget_server_settings_emojis_upload" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/upload_emoji" style="@style/UiKit_Material_Button"/>
+    <TextView android:id="@+id/widget_server_settings_emojis_upload_description" android:text="@string/guild_settings_emoji_upload_to_server_message" style="@style/UiKit_Settings_Item_SubText"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_emojis_item.xml b/app/src/main/res/layout/widget_server_settings_emojis_item.xml
index e596de2bdb..7c62648b87 100644
--- a/app/src/main/res/layout/widget_server_settings_emojis_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_emojis_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:id="@+id/server_settings_emojis_container" android:background="?attr/selectableItemBackground" android:padding="8dp" android:focusable="true" android:clickable="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:id="@+id/server_settings_emojis_container" android:background="?attr/selectableItemBackground" android:padding="8dp" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/server_settings_emojis_avatar" android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="@dimen/emoji_size" android:layout_height="@dimen/emoji_size" android:layout_margin="8dp" app:actualImageScaleType="2" app:placeholderImage="?attr/theme_expression_picker_item_placeholder"/>
-    <TextView android:id="@+id/server_settings_emojis_name" android:layout_width="0dp" android:layout_margin="8dp" android:width="0dp" android:layout_weight="1" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-    <TextView android:textColor="?attr/primary_100_alpha_60" android:gravity="end" android:id="@+id/server_settings_emojis_username" android:layout_width="wrap_content" android:maxWidth="100dp" style="@style/res_2131952582_uikit_textview_subtext_singleline"/>
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/server_settings_emojis_username_avatar" android:layout_margin="8dp" style="@style/res_2131951676_avatar_medium"/>
-    <ImageView android:id="@+id/server_settings_emojis_overflow" android:layout_margin="8dp" android:src="@drawable/ic_overflow_dark_24dp" android:contentDescription="@string/more_options" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" style="@style/res_2131952448_uikit_imageview"/>
+    <TextView android:id="@+id/server_settings_emojis_name" android:layout_width="0dp" android:layout_margin="8dp" android:width="0dp" android:layout_weight="1" style="@style/UiKit_TextView_Large_SingleLine"/>
+    <TextView android:textColor="?attr/primary_100_alpha_60" android:gravity="end" android:id="@+id/server_settings_emojis_username" android:layout_width="wrap_content" android:maxWidth="100dp" style="@style/UiKit_TextView_Subtext_SingleLine"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/server_settings_emojis_username_avatar" android:layout_margin="8dp" style="@style/Avatar_Medium"/>
+    <ImageView android:id="@+id/server_settings_emojis_overflow" android:layout_margin="8dp" android:src="@drawable/ic_overflow_dark_24dp" android:contentDescription="@string/more_options" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" style="@style/UiKit_ImageView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_emojis_section.xml b/app/src/main/res/layout/widget_server_settings_emojis_section.xml
index 45d4f3b5d3..5745dff4ce 100644
--- a/app/src/main/res/layout/widget_server_settings_emojis_section.xml
+++ b/app/src/main/res/layout/widget_server_settings_emojis_section.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/widget_server_settings_emojis_section" android:text="@string/sample_channel_name" style="@style/res_2131952496_uikit_settings_item_header"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/widget_server_settings_emojis_section" android:text="@string/sample_channel_name" style="@style/UiKit_Settings_Item_Header"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_enable_community.xml b/app/src/main/res/layout/widget_server_settings_enable_community.xml
index 56cb6ccf0f..ad1d1eafca 100644
--- a/app/src/main/res/layout/widget_server_settings_enable_community.xml
+++ b/app/src/main/res/layout/widget_server_settings_enable_community.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_get_started_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-    <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/community_get_started_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+    <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
         <RelativeLayout android:id="@+id/community_header_image" android:layout_width="match_parent" android:layout_height="wrap_content">
             <ImageView android:id="@+id/community_get_started_header_image" android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/community_setup_get_started" android:scaleType="centerCrop" android:adjustViewBounds="true" android:importantForAccessibility="no"/>
             <com.discord.widgets.servers.community.CommunityGetStartedHeaderIconView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" android:layout_marginStart="8dp" android:layout_alignStart="@+id/community_get_started_header_image" app:chi_icon="@drawable/community_server_get_started_hogwarts" app:chi_title_text="Hogwarts School"/>
@@ -9,8 +9,8 @@
             <com.discord.widgets.servers.community.CommunityGetStartedHeaderIconView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:layout_alignBottom="@+id/community_get_started_header_image" android:layout_marginEnd="8dp" android:layout_alignEnd="@+id/community_get_started_header_image" app:chi_icon="@drawable/community_server_get_started_pokemon" app:chi_title_text="Pokemon GO"/>
         </RelativeLayout>
         <com.discord.views.ScreenTitleView android:id="@+id/community_get_started_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" app:stv_subtitle="@string/guild_settings_community_intro_body" app:stv_title="@string/guild_settings_community_intro_header"/>
-        <com.google.android.material.button.MaterialButton android:ellipsize="end" android:id="@+id/community_setting_get_started" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" android:maxLines="1" style="@style/res_2131952458_uikit_material_button"/>
-        <TextView android:gravity="center" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="40dp" android:text="@string/guild_settings_community_intro_details_mobile" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+        <com.google.android.material.button.MaterialButton android:ellipsize="end" android:id="@+id/community_setting_get_started" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/get_started" android:maxLines="1" style="@style/UiKit_Material_Button"/>
+        <TextView android:gravity="center" android:padding="0dp" android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginRight="16dp" android:layout_marginBottom="40dp" android:text="@string/guild_settings_community_intro_details_mobile" style="@style/UiKit_Settings_Item_SubText"/>
         <com.discord.widgets.servers.community.CommunityGetStartedInformationView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:csi_description_text="@string/guild_settings_community_intro_upsell_discovery_body" app:csi_icon="?attr/drawable_ic_community_setting_analytics" app:csi_title_text="@string/guild_settings_community_intro_upsell_discovery_header"/>
         <com.discord.widgets.servers.community.CommunityGetStartedInformationView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="10dp" android:layout_marginRight="16dp" android:layout_marginBottom="10dp" app:csi_description_text="@string/guild_settings_community_intro_upsell_analytics_body_mobile" app:csi_icon="?attr/drawable_ic_community_setting_server_insights" app:csi_title_text="@string/guild_settings_community_intro_upsell_analytics_header"/>
         <com.discord.widgets.servers.community.CommunityGetStartedInformationView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" app:csi_description_text="@string/guild_settings_community_intro_upsell_stay_informed_body" app:csi_icon="?attr/drawable_ic_community_setting_info" app:csi_title_text="@string/guild_settings_community_intro_upsell_stay_informed_header"/>
diff --git a/app/src/main/res/layout/widget_server_settings_help_item.xml b/app/src/main/res/layout/widget_server_settings_help_item.xml
index 25ebf4fa50..8d8108ab6c 100644
--- a/app/src/main/res/layout/widget_server_settings_help_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_help_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.utilities.view.text.LinkifiedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:id="@+id/server_settings_help_item" android:padding="16dp" android:layout_width="match_parent" android:text="@string/help_roles_description" style="@style/res_2131952579_uikit_textview_semibold"/>
+<com.discord.utilities.view.text.LinkifiedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:id="@+id/server_settings_help_item" android:padding="16dp" android:layout_width="match_parent" android:text="@string/help_roles_description" style="@style/UiKit_TextView_Semibold"/>
diff --git a/app/src/main/res/layout/widget_server_settings_instant_invite_actions.xml b/app/src/main/res/layout/widget_server_settings_instant_invite_actions.xml
index f615932c9c..ebfcc167be 100644
--- a/app/src/main/res/layout/widget_server_settings_instant_invite_actions.xml
+++ b/app/src/main/res/layout/widget_server_settings_instant_invite_actions.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <LinearLayout android:orientation="vertical" style="@style/res_2131952504_uikit_sheet_header_contents">
-                <TextView android:layout_width="match_parent" android:text="@string/instant_invite" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-                <TextView android:id="@+id/invite_actions_title" style="@style/res_2131952563_uikit_textview"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <LinearLayout android:orientation="vertical" style="@style/UiKit_Sheet_Header_Contents">
+                <TextView android:layout_width="match_parent" android:text="@string/instant_invite" style="@style/UiKit_TextView_H1_Bold"/>
+                <TextView android:id="@+id/invite_actions_title" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <TextView android:id="@+id/invite_actions_revoke" android:text="@string/revoke" app:drawableStartCompat="@drawable/ic_remove_circle_outline_red_24dp" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/invite_actions_copy" android:text="@string/copy" app:drawableStartCompat="?attr/ic_copy" style="@style/res_2131952497_uikit_settings_item_icon"/>
-        <TextView android:id="@+id/invite_actions_share" android:text="@string/share" app:drawableStartCompat="?attr/ic_share" style="@style/res_2131952497_uikit_settings_item_icon"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <TextView android:id="@+id/invite_actions_revoke" android:text="@string/revoke" app:drawableStartCompat="@drawable/ic_remove_circle_outline_red_24dp" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/invite_actions_copy" android:text="@string/copy" app:drawableStartCompat="?attr/ic_copy" style="@style/UiKit_Settings_Item_Icon"/>
+        <TextView android:id="@+id/invite_actions_share" android:text="@string/share" app:drawableStartCompat="?attr/ic_share" style="@style/UiKit_Settings_Item_Icon"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_server_settings_instant_invite_list_item.xml b/app/src/main/res/layout/widget_server_settings_instant_invite_list_item.xml
index f27be268ac..d26609a9fc 100644
--- a/app/src/main/res/layout/widget_server_settings_instant_invite_list_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_instant_invite_list_item.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="8dp" android:layout_marginTop="4dp" android:layout_marginRight="8dp" android:layout_marginBottom="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardElevation="@dimen/app_elevation" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:id="@+id/invite_container" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <RelativeLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-            <LinearLayout android:id="@+id/invite_name_container" android:layout_alignParentTop="true" android:layout_toStartOf="@+id/invite_expiration_container" android:layout_alignParentStart="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/invite_code" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:id="@+id/invite_channel" style="@style/res_2131952563_uikit_textview"/>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginLeft="8dp" android:layout_marginTop="4dp" android:layout_marginRight="8dp" android:layout_marginBottom="4dp" app:cardBackgroundColor="?attr/primary_630" app:cardElevation="@dimen/app_elevation" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:id="@+id/invite_container" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_LinearLayout">
+        <RelativeLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+            <LinearLayout android:id="@+id/invite_name_container" android:layout_alignParentTop="true" android:layout_toStartOf="@+id/invite_expiration_container" android:layout_alignParentStart="true" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/invite_code" style="@style/UiKit_TextView"/>
+                <TextView android:id="@+id/invite_channel" style="@style/UiKit_TextView"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginEnd="32dp" android:layout_toStartOf="@+id/invite_settings_icon" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_expires_label" android:text="@string/expires_in" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:id="@+id/invite_expiration_time" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout android:id="@+id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginEnd="32dp" android:layout_toStartOf="@+id/invite_settings_icon" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/invite_expires_label" android:text="@string/expires_in" style="@style/UiKit_TextView"/>
+                <TextView android:id="@+id/invite_expiration_time" style="@style/UiKit_TextView"/>
             </LinearLayout>
-            <ImageView android:id="@+id/invite_settings_icon" android:src="@drawable/ic_overflow_dark_24dp" android:layout_centerVertical="true" android:contentDescription="@string/settings" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
-            <View android:id="@+id/invite_divider" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_below="@+id/invite_name_container" android:layout_alignStart="@+id/invite_name_container" android:layout_alignEnd="@+id/invite_expiration_container" style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_list_item_avatar" android:layout_below="@+id/invite_divider" android:layout_marginEnd="4dp" android:layout_alignParentStart="true" style="@style/res_2131951677_avatar_small"/>
-            <TextView android:gravity="center_vertical" android:id="@+id/invite_user_name" android:layout_below="@+id/invite_divider" android:layout_alignWithParentIfMissing="true" android:layout_toEndOf="@+id/invite_list_item_avatar" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:id="@+id/invite_uses_label" android:text="@string/instant_invite_uses" android:layout_alignBaseline="@+id/invite_user_name" android:layout_alignStart="@+id/invite_expiration_container" style="@style/res_2131952579_uikit_textview_semibold"/>
-            <TextView android:id="@+id/invite_uses" android:layout_below="@+id/invite_expiration_container" android:layout_alignBaseline="@+id/invite_uses_label" android:layout_marginStart="4dp" android:layout_toEndOf="@+id/invite_uses_label" style="@style/res_2131952563_uikit_textview"/>
+            <ImageView android:id="@+id/invite_settings_icon" android:src="@drawable/ic_overflow_dark_24dp" android:layout_centerVertical="true" android:contentDescription="@string/settings" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
+            <View android:id="@+id/invite_divider" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:layout_below="@+id/invite_name_container" android:layout_alignStart="@+id/invite_name_container" android:layout_alignEnd="@+id/invite_expiration_container" style="@style/UiKit_Settings_Divider"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/invite_list_item_avatar" android:layout_below="@+id/invite_divider" android:layout_marginEnd="4dp" android:layout_alignParentStart="true" style="@style/Avatar_Small"/>
+            <TextView android:gravity="center_vertical" android:id="@+id/invite_user_name" android:layout_below="@+id/invite_divider" android:layout_alignWithParentIfMissing="true" android:layout_toEndOf="@+id/invite_list_item_avatar" style="@style/UiKit_TextView"/>
+            <TextView android:id="@+id/invite_uses_label" android:text="@string/instant_invite_uses" android:layout_alignBaseline="@+id/invite_user_name" android:layout_alignStart="@+id/invite_expiration_container" style="@style/UiKit_TextView_Semibold"/>
+            <TextView android:id="@+id/invite_uses" android:layout_below="@+id/invite_expiration_container" android:layout_alignBaseline="@+id/invite_uses_label" android:layout_marginStart="4dp" android:layout_toEndOf="@+id/invite_uses_label" style="@style/UiKit_TextView"/>
         </RelativeLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/widget_server_settings_instant_invites.xml b/app/src/main/res/layout/widget_server_settings_instant_invites.xml
index 5698b03beb..f08b302658 100644
--- a/app/src/main/res/layout/widget_server_settings_instant_invites.xml
+++ b/app/src/main/res/layout/widget_server_settings_instant_invites.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_instant_invites_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_instant_invites_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_instant_invites_recycler" android:paddingTop="4dp" android:scrollbars="vertical" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/no_invites_header" android:text="@string/no_invites_label" android:textAllCaps="true" app:drawableTopCompat="@drawable/asset_empty_no_invites" style="@style/res_2131952576_uikit_textview_noresults"/>
-            <TextView android:gravity="center" android:id="@+id/no_invites_body" android:layout_marginTop="8dp" android:text="@string/no_invites_body" style="@style/res_2131952563_uikit_textview"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_instant_invites_recycler" android:paddingTop="4dp" android:scrollbars="vertical" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/no_invites_header" android:text="@string/no_invites_label" android:textAllCaps="true" app:drawableTopCompat="@drawable/asset_empty_no_invites" style="@style/UiKit_TextView_NoResults"/>
+            <TextView android:gravity="center" android:id="@+id/no_invites_body" android:layout_marginTop="8dp" android:text="@string/no_invites_body" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_integration_list_item.xml b/app/src/main/res/layout/widget_server_settings_integration_list_item.xml
index 329d51879a..b9182ab7d1 100644
--- a/app/src/main/res/layout/widget_server_settings_integration_list_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_integration_list_item.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:elevation="2dp" style="@style/res_2131952589_uikit_viewgroup">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:elevation="2dp" style="@style/UiKit_ViewGroup">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
         <RelativeLayout android:id="@+id/integration_header_container" android:background="?attr/selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="4dp" android:paddingRight="16dp" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="match_parent">
-            <ImageView android:id="@+id/integration_icon" android:layout_margin="8dp" android:layout_centerVertical="true" android:contentDescription="@string/integrations" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout android:id="@+id/integration_name_container" android:layout_centerVertical="true" android:layout_toStartOf="@+id/integration_settings_icon" android:layout_toEndOf="@+id/integration_icon" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/integration_owner_name" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:textColor="?attr/primary_100" android:id="@+id/integration_name" style="@style/res_2131952563_uikit_textview"/>
+            <ImageView android:id="@+id/integration_icon" android:layout_margin="8dp" android:layout_centerVertical="true" android:contentDescription="@string/integrations" style="@style/UiKit_ImageView"/>
+            <LinearLayout android:id="@+id/integration_name_container" android:layout_centerVertical="true" android:layout_toStartOf="@+id/integration_settings_icon" android:layout_toEndOf="@+id/integration_icon" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/integration_owner_name" style="@style/UiKit_TextView_H1"/>
+                <TextView android:textColor="?attr/primary_100" android:id="@+id/integration_name" style="@style/UiKit_TextView"/>
             </LinearLayout>
             <ImageView android:id="@+id/integration_settings_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="?attr/ic_settings" android:layout_centerVertical="true" android:contentDescription="@string/integration_settings" android:layout_alignParentEnd="true"/>
             <ProgressBar android:id="@+id/integration_syncing_progress_bar" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" android:layout_alignTop="@+id/integration_settings_icon" android:layout_alignBottom="@+id/integration_settings_icon" android:layout_centerVertical="true" android:layout_alignStart="@+id/integration_settings_icon" android:layout_alignEnd="@+id/integration_settings_icon"/>
         </RelativeLayout>
-        <com.discord.views.CheckedSetting android:id="@+id/integration_sync_switch" app:cs_text="@string/sync_this_account" app:cs_text_size="@dimen/uikit_textsize_medium" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
+        <com.discord.views.CheckedSetting android:id="@+id/integration_sync_switch" app:cs_text="@string/sync_this_account" app:cs_text_size="@dimen/uikit_textsize_medium" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <View style="@style/UiKit_Settings_Divider"/>
     </LinearLayout>
     <View android:id="@+id/integration_header_disabled_overlay" android:background="@color/white_alpha_70" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_integrations.xml b/app/src/main/res/layout/widget_server_settings_integrations.xml
index 6537f2ad16..338f6f8af6 100644
--- a/app/src/main/res/layout/widget_server_settings_integrations.xml
+++ b/app/src/main/res/layout/widget_server_settings_integrations.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/integrations_view_flipper" android:layout_width="match_parent" android:layout_height="match_parent" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/integrations_recycler" android:layout_height="match_parent" android:layout_marginTop="16dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/integrations_empty_header" android:text="@string/no_integrations_label" app:drawableTopCompat="?attr/ic_empty_integrations" style="@style/res_2131952576_uikit_textview_noresults"/>
-            <TextView android:gravity="center" android:id="@+id/integrations_empty_body" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/no_integrations_body" style="@style/res_2131952563_uikit_textview"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/integrations_view_flipper" android:layout_width="match_parent" android:layout_height="match_parent" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/integrations_recycler" android:layout_height="match_parent" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/integrations_empty_header" android:text="@string/no_integrations_label" app:drawableTopCompat="?attr/ic_empty_integrations" style="@style/UiKit_TextView_NoResults"/>
+            <TextView android:gravity="center" android:id="@+id/integrations_empty_body" android:paddingLeft="16dp" android:paddingRight="16dp" android:text="@string/no_integrations_body" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_member_list_item.xml b/app/src/main/res/layout/widget_server_settings_member_list_item.xml
index db5617887e..5576eb3500 100644
--- a/app/src/main/res/layout/widget_server_settings_member_list_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_member_list_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/member_list_item_container" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/member_list_item_avatar" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/drawable_circle_brand" style="@style/res_2131951674_avatar_large"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/member_list_item_container" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit_ViewGroup_ConstraintLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/member_list_item_avatar" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/drawable_circle_brand" style="@style/Avatar_Large"/>
     <com.discord.views.UsernameView android:gravity="center_vertical" android:id="@+id/member_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/member_list_item_roles_list" app:layout_constraintEnd_toStartOf="@+id/member_list_item_lock" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/member_list_item_avatar" app:layout_constraintTop_toTopOf="0" app:username_singleline="true" app:username_text_size="@dimen/uikit_textsize_large"/>
     <com.discord.widgets.roles.RolesListView android:orientation="horizontal" android:id="@+id/member_list_item_roles_list" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/member_list_item_lock" app:layout_constraintStart_toEndOf="@+id/member_list_item_avatar" app:layout_constraintTop_toBottomOf="@+id/member_list_item_name"/>
-    <ImageView android:id="@+id/member_list_item_lock" android:layout_margin="4dp" android:src="@drawable/ic_role_lock" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/member_list_item_overflow" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/member_list_item_overflow" android:layout_margin="8dp" android:src="@drawable/ic_overflow_dark_24dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <View android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/member_list_item_name" app:layout_constraintStart_toStartOf="@+id/member_list_item_name" style="@style/res_2131952491_uikit_settings_divider"/>
+    <ImageView android:id="@+id/member_list_item_lock" android:layout_margin="4dp" android:src="@drawable/ic_role_lock" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/member_list_item_overflow" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/member_list_item_overflow" android:layout_margin="8dp" android:src="@drawable/ic_overflow_dark_24dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <View android:layout_width="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/member_list_item_name" app:layout_constraintStart_toStartOf="@+id/member_list_item_name" style="@style/UiKit_Settings_Divider"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_members.xml b/app/src/main/res/layout/widget_server_settings_members.xml
index 8b008b057b..a9d4e46090 100644
--- a/app/src/main/res/layout/widget_server_settings_members.xml
+++ b/app/src/main/res/layout/widget_server_settings_members.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
-        <androidx.cardview.widget.CardView android:layout_margin="8dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" style="@style/res_2131952589_uikit_viewgroup">
-            <LinearLayout android:gravity="center_vertical" android:id="@+id/server_settings_members_header_container" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_members_name_search" android:layout_width="0dp" android:layout_margin="0dp" android:hint="@string/members_search_placeholder" android:layout_weight="2" app:boxBackgroundColor="?attr/colorBackgroundTertiary" style="@style/res_2131952560_uikit_textinputlayout_search">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
+        <androidx.cardview.widget.CardView android:layout_margin="8dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" style="@style/UiKit_ViewGroup">
+            <LinearLayout android:gravity="center_vertical" android:id="@+id/server_settings_members_header_container" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_members_name_search" android:layout_width="0dp" android:layout_margin="0dp" android:hint="@string/members_search_placeholder" android:layout_weight="2" app:boxBackgroundColor="?attr/colorBackgroundTertiary" style="@style/UiKit_TextInputLayout_Search">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <Spinner android:gravity="center" android:id="@+id/server_settings_members_roles_spinner" android:background="?attr/colorBackgroundTertiary" android:layout_width="0dp" android:layout_height="match_parent" android:popupBackground="?attr/colorBackgroundTertiary" android:layout_weight="1"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_members_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_members_recycler" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <RelativeLayout android:gravity="center" android:layout_gravity="center" android:clipToPadding="false" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-            <ImageView android:src="?attr/img_empty_search" android:layout_above="@+id/no_results_text" android:layout_centerHorizontal="true" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:gravity="center" android:id="@+id/no_results_text" android:layout_marginTop="10dp" android:text="@string/guild_members_search_no_result" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/res_2131952570_uikit_textview_large"/>
+    <com.discord.app.AppViewFlipper android:id="@+id/server_settings_members_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_members_recycler" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <RelativeLayout android:gravity="center" android:layout_gravity="center" android:clipToPadding="false" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+            <ImageView android:src="?attr/img_empty_search" android:layout_above="@+id/no_results_text" android:layout_centerHorizontal="true" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <TextView android:gravity="center" android:id="@+id/no_results_text" android:layout_marginTop="10dp" android:text="@string/guild_members_search_no_result" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit_TextView_Large"/>
         </RelativeLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_moderation.xml b/app/src/main/res/layout/widget_server_settings_moderation.xml
index d4b40a8197..29974fa3a8 100644
--- a/app/src/main/res/layout/widget_server_settings_moderation.xml
+++ b/app/src/main/res/layout/widget_server_settings_moderation.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/form_label_verification_level" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/server_settings_moderation_verification_help" android:paddingTop="0dp" style="@style/res_2131952492_uikit_settings_item"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_1" app:cs_subtext="@string/verification_level_none_criteria" app:cs_text="@string/verification_level_none" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_2" app:cs_subtext="@string/verification_level_low_criteria" app:cs_text="@string/verification_level_low" app:cs_text_color="@color/status_green_600" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_3" app:cs_subtext="@string/verification_level_medium_criteria" app:cs_text="@string/verification_level_medium" app:cs_text_color="@color/status_yellow_500" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_4" app:cs_subtext="@string/verification_level_high_criteria" app:cs_text="(╯°□°）╯︵ ┻━━┻" app:cs_text_color="@color/status_orange_500" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_5" app:cs_subtext="@string/verification_level_very_high_criteria" app:cs_text="┻━┻ ﾐヽ(ಠ益ಠ)ノ彡┻━┻" app:cs_text_color="@color/status_red_500" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/form_label_explicit_content_filter" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/server_settings_moderation_explicit_help" android:paddingTop="0dp" style="@style/res_2131952492_uikit_settings_item"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_explicit_1" app:cs_subtext="@string/explicit_content_filter_disabled_description" app:cs_text="@string/explicit_content_filter_disabled" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_explicit_2" android:layout_height="wrap_content" app:cs_subtext="@string/explicit_content_filter_medium_description" app:cs_text="@string/explicit_content_filter_medium" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_explicit_3" app:cs_subtext="@string/explicit_content_filter_high_description" app:cs_text="@string/explicit_content_filter_high" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/form_label_verification_level" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/server_settings_moderation_verification_help" android:paddingTop="0dp" style="@style/UiKit_Settings_Item"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_1" app:cs_subtext="@string/verification_level_none_criteria" app:cs_text="@string/verification_level_none" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_2" app:cs_subtext="@string/verification_level_low_criteria" app:cs_text="@string/verification_level_low" app:cs_text_color="@color/status_green_600" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_3" app:cs_subtext="@string/verification_level_medium_criteria" app:cs_text="@string/verification_level_medium" app:cs_text_color="@color/status_yellow_500" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_4" app:cs_subtext="@string/verification_level_high_criteria" app:cs_text="(╯°□°）╯︵ ┻━━┻" app:cs_text_color="@color/status_orange_500" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_verification_5" app:cs_subtext="@string/verification_level_very_high_criteria" app:cs_text="┻━┻ ﾐヽ(ಠ益ಠ)ノ彡┻━┻" app:cs_text_color="@color/status_red_500" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/form_label_explicit_content_filter" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/server_settings_moderation_explicit_help" android:paddingTop="0dp" style="@style/UiKit_Settings_Item"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_explicit_1" app:cs_subtext="@string/explicit_content_filter_disabled_description" app:cs_text="@string/explicit_content_filter_disabled" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_explicit_2" android:layout_height="wrap_content" app:cs_subtext="@string/explicit_content_filter_medium_description" app:cs_text="@string/explicit_content_filter_medium" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/server_settings_moderation_explicit_3" app:cs_subtext="@string/explicit_content_filter_high_description" app:cs_text="@string/explicit_content_filter_high" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_overview.xml b/app/src/main/res/layout/widget_server_settings_overview.xml
index 9c81885cf4..67bdeb0272 100644
--- a/app/src/main/res/layout/widget_server_settings_overview.xml
+++ b/app/src/main/res/layout/widget_server_settings_overview.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView android:id="@+id/server_settings_overview_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <ScrollView android:id="@+id/server_settings_overview_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
             <include android:id="@+id/header" layout="@layout/view_server_settings_icon_name"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <View style="@style/UiKit_Settings_Divider"/>
             <include android:id="@+id/region" layout="@layout/view_server_settings_region"/>
             <include android:id="@+id/region_help" layout="@layout/view_server_settings_region_help"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <View style="@style/UiKit_Settings_Divider"/>
             <include android:id="@+id/afk" layout="@layout/widget_server_settings_overview_section_afk_channel"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <View style="@style/UiKit_Settings_Divider"/>
             <include android:id="@+id/systemChannel" layout="@layout/view_server_settings_system_channel_wrap"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <View style="@style/UiKit_Settings_Divider"/>
             <include android:id="@+id/notifications" layout="@layout/view_server_settings_notifications"/>
             <include android:id="@+id/uploadSplash" layout="@layout/view_server_settings_upload_splash"/>
             <include android:id="@+id/uploadBanner" layout="@layout/view_server_settings_upload_banner"/>
             <View android:layout_width="match_parent" android:layout_height="64dp"/>
         </LinearLayout>
     </ScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_overview_afk_timeout.xml b/app/src/main/res/layout/widget_server_settings_overview_afk_timeout.xml
index afd81bc70d..39aabc0c35 100644
--- a/app/src/main/res/layout/widget_server_settings_overview_afk_timeout.xml
+++ b/app/src/main/res/layout/widget_server_settings_overview_afk_timeout.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <TextView android:id="@+id/guild_actions_overview_header_tv" android:text="@string/form_label_afk_timeout" style="@style/res_2131952506_uikit_sheet_header_title"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <TextView android:id="@+id/guild_actions_overview_header_tv" android:text="@string/form_label_afk_timeout" style="@style/UiKit_Sheet_Header_Title"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <ScrollView style="@style/res_2131952610_uikit_viewgroup_scrollview">
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/server_settings_overview_afk_timeout_01" android:tag="60" app:drawableStartCompat="?attr/ic_timer" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_overview_afk_timeout_05" android:tag="300" app:drawableStartCompat="?attr/ic_timer" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_overview_afk_timeout_15" android:tag="900" app:drawableStartCompat="?attr/ic_timer" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_overview_afk_timeout_30" android:tag="1800" app:drawableStartCompat="?attr/ic_timer" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/server_settings_overview_afk_timeout_60" android:tag="3600" app:drawableStartCompat="?attr/ic_timer" style="@style/res_2131952497_uikit_settings_item_icon"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <ScrollView style="@style/UiKit_ViewGroup_ScrollView">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/server_settings_overview_afk_timeout_01" android:tag="60" app:drawableStartCompat="?attr/ic_timer" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_overview_afk_timeout_05" android:tag="300" app:drawableStartCompat="?attr/ic_timer" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_overview_afk_timeout_15" android:tag="900" app:drawableStartCompat="?attr/ic_timer" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_overview_afk_timeout_30" android:tag="1800" app:drawableStartCompat="?attr/ic_timer" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/server_settings_overview_afk_timeout_60" android:tag="3600" app:drawableStartCompat="?attr/ic_timer" style="@style/UiKit_Settings_Item_Icon"/>
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_overview_region.xml b/app/src/main/res/layout/widget_server_settings_overview_region.xml
index 79a8052924..9b77d82c36 100644
--- a/app/src/main/res/layout/widget_server_settings_overview_region.xml
+++ b/app/src/main/res/layout/widget_server_settings_overview_region.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="wrap_content" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/form_label_server_region" android:lineSpacingMultiplier="1.4" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/server_settings_overview_region_list" android:scrollbars="vertical" android:overScrollMode="never" app:max_height_screen_ratio="0.5" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <FrameLayout android:background="?attr/primary_630" android:layout_width="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
-        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:layout_gravity="end" android:id="@+id/cancel_button" android:text="@string/cancel" android:textAllCaps="true" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/form_label_server_region" android:lineSpacingMultiplier="1.4" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/server_settings_overview_region_list" android:scrollbars="vertical" android:overScrollMode="never" app:max_height_screen_ratio="0.5" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <View style="@style/UiKit_Divider"/>
+    <FrameLayout android:background="?attr/primary_630" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_Page">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/primary_100" android:layout_gravity="end" android:id="@+id/cancel_button" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit_Material_Button_Transparent_Fit"/>
     </FrameLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_overview_region_item.xml b/app/src/main/res/layout/widget_server_settings_overview_region_item.xml
index bee76bfc70..852ff8213c 100644
--- a/app/src/main/res/layout/widget_server_settings_overview_region_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_overview_region_item.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/server_settings_overview_region_item_name" android:singleLine="true" style="@style/res_2131952497_uikit_settings_item_icon"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/server_settings_overview_region_item_name" android:singleLine="true" style="@style/UiKit_Settings_Item_Icon"/>
diff --git a/app/src/main/res/layout/widget_server_settings_overview_section_afk_channel.xml b/app/src/main/res/layout/widget_server_settings_overview_section_afk_channel.xml
index 4de0995d5f..58672c69d1 100644
--- a/app/src/main/res/layout/widget_server_settings_overview_section_afk_channel.xml
+++ b/app/src/main/res/layout/widget_server_settings_overview_section_afk_channel.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:text="@string/afk_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-    <TextView android:text="@string/form_help_afk_channel" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <LinearLayout android:id="@+id/afk_channel_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:text="@string/form_label_afk_channel" style="@style/res_2131952498_uikit_settings_item_label"/>
-        <TextView android:id="@+id/afk_channel" android:drawablePadding="2dp" style="@style/res_2131952493_uikit_settings_item_addition"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:text="@string/afk_settings" style="@style/UiKit_Settings_Item_Header"/>
+    <TextView android:text="@string/form_help_afk_channel" style="@style/UiKit_Settings_Item_SubText"/>
+    <LinearLayout android:id="@+id/afk_channel_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:text="@string/form_label_afk_channel" style="@style/UiKit_Settings_Item_Label"/>
+        <TextView android:id="@+id/afk_channel" android:drawablePadding="2dp" style="@style/UiKit_Settings_Item_Addition"/>
     </LinearLayout>
-    <LinearLayout android:id="@+id/afk_timeout_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:text="@string/form_label_afk_timeout" style="@style/res_2131952498_uikit_settings_item_label"/>
-        <TextView android:id="@+id/afk_timeout" style="@style/res_2131952493_uikit_settings_item_addition"/>
+    <LinearLayout android:id="@+id/afk_timeout_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:text="@string/form_label_afk_timeout" style="@style/UiKit_Settings_Item_Label"/>
+        <TextView android:id="@+id/afk_timeout" style="@style/UiKit_Settings_Item_Addition"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_role_item.xml b/app/src/main/res/layout/widget_server_settings_role_item.xml
index 270866c4e9..284bd90cc9 100644
--- a/app/src/main/res/layout/widget_server_settings_role_item.xml
+++ b/app/src/main/res/layout/widget_server_settings_role_item.xml
@@ -2,9 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="60dp">
     <View android:id="@+id/server_settings_role_item_drag_overlay" android:background="@color/black_alpha_05" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent"/>
     <View android:id="@+id/server_settings_role_item_divider_targeted" android:background="?attr/color_brand" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="3dp" android:layout_alignParentTop="true"/>
-    <FrameLayout android:gravity="center_vertical" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/res_2131952589_uikit_viewgroup">
-        <ImageView android:layout_gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/server_settings_role_item_lock_indicator" android:src="?attr/ic_lock" android:contentDescription="@string/help_role_locked" android:layout_marginStart="8dp" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:layout_gravity="center_vertical" android:id="@+id/server_settings_role_item_name" android:singleLine="true" android:layout_marginStart="64dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <FrameLayout android:gravity="center_vertical" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup">
+        <ImageView android:layout_gravity="left|center_vertical|center_horizontal|center|start" android:id="@+id/server_settings_role_item_lock_indicator" android:src="?attr/ic_lock" android:contentDescription="@string/help_role_locked" android:layout_marginStart="8dp" style="@style/UiKit_ImageView"/>
+        <TextView android:layout_gravity="center_vertical" android:id="@+id/server_settings_role_item_name" android:singleLine="true" android:layout_marginStart="64dp" style="@style/UiKit_TextView_Semibold"/>
     </FrameLayout>
-    <View android:id="@+id/server_settings_role_item_bottom_divider" android:layout_alignParentBottom="true" style="@style/res_2131952491_uikit_settings_divider"/>
+    <View android:id="@+id/server_settings_role_item_bottom_divider" android:layout_alignParentBottom="true" style="@style/UiKit_Settings_Divider"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_roles_list.xml b/app/src/main/res/layout/widget_server_settings_roles_list.xml
index c9b32254c8..7e8a0fe7e7 100644
--- a/app/src/main/res/layout/widget_server_settings_roles_list.xml
+++ b/app/src/main/res/layout/widget_server_settings_roles_list.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_roles_recycler" android:paddingBottom="@dimen/padding_bottom_fab_screen" android:clipToPadding="false" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/roles_list_add_role_fab" android:src="@drawable/ic_add_white_24dp" android:contentDescription="@string/add" style="@style/res_2131952114_settings_floatingactionbutton"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/server_settings_roles_recycler" android:paddingBottom="@dimen/padding_bottom_fab_screen" android:clipToPadding="false" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/roles_list_add_role_fab" android:src="@drawable/ic_add_white_24dp" android:contentDescription="@string/add" style="@style/Settings_FloatingActionButton"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_security.xml b/app/src/main/res/layout/widget_server_settings_security.xml
index 95b1962a6c..15fdbe6447 100644
--- a/app/src/main/res/layout/widget_server_settings_security.xml
+++ b/app/src/main/res/layout/widget_server_settings_security.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
-        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/server_settings_security_label" android:layout_marginTop="32dp" android:text="@string/guild_security_req_mfa_label" style="@style/res_2131952567_uikit_textview_h2"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_security_toggle_mfa_button" android:layout_marginTop="16dp" android:text="@string/guild_security_req_mfa_turn_on" style="@style/res_2131952461_uikit_material_button_green_fit"/>
+    <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
+        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/server_settings_security_label" android:layout_marginTop="32dp" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit_TextView_H2"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_security_toggle_mfa_button" android:layout_marginTop="16dp" android:text="@string/guild_security_req_mfa_turn_on" style="@style/UiKit_Material_Button_Green_Fit"/>
         </LinearLayout>
-        <RelativeLayout android:gravity="center" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_margin="32dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-            <ImageView android:layout_marginBottom="32dp" android:src="@drawable/asset_security" android:layout_above="@+id/mfa_description_text" android:layout_centerHorizontal="true" android:contentDescription="@string/guild_security_req_mfa_turn_on" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:id="@+id/mfa_description_text" android:text="@string/guild_security_req_mfa_body" android:layout_alignParentBottom="true" style="@style/res_2131952563_uikit_textview"/>
+        <RelativeLayout android:gravity="center" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_margin="32dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RelativeLayout">
+            <ImageView android:layout_marginBottom="32dp" android:src="@drawable/asset_security" android:layout_above="@+id/mfa_description_text" android:layout_centerHorizontal="true" android:contentDescription="@string/guild_security_req_mfa_turn_on" style="@style/UiKit_ImageView"/>
+            <TextView android:id="@+id/mfa_description_text" android:text="@string/guild_security_req_mfa_body" android:layout_alignParentBottom="true" style="@style/UiKit_TextView"/>
         </RelativeLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_security_dialog.xml b/app/src/main/res/layout/widget_server_settings_security_dialog.xml
index 4ad5b8e2e5..108d7e4741 100644
--- a/app/src/main/res/layout/widget_server_settings_security_dialog.xml
+++ b/app/src/main/res/layout/widget_server_settings_security_dialog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/notice_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/guild_security_req_mfa_label" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_security_server_mfa_code" android:layout_margin="16dp" android:hint="@string/two_fa_auth_code" style="@style/res_2131952558_uikit_textinputlayout_primary">
-        <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/notice_header" android:padding="16dp" android:layout_width="match_parent" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Divider"/>
+    <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_security_server_mfa_code" android:layout_margin="16dp" android:hint="@string/two_fa_auth_code" style="@style/UiKit_TextInputLayout_Primary">
+        <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
     </com.google.android.material.textfield.TextInputLayout>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
-        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_security_dialog_cancel" android:text="@string/cancel" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_security_dialog_confirm" android:background="@drawable/drawable_button_green" android:text="@string/enable" style="@style/res_2131952461_uikit_material_button_green_fit"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
+        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_security_dialog_cancel" android:text="@string/cancel" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/server_settings_security_dialog_confirm" android:background="@drawable/drawable_button_green" android:text="@string/enable" style="@style/UiKit_Material_Button_Green_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_server_settings_vanity_url.xml b/app/src/main/res/layout/widget_server_settings_vanity_url.xml
index e5737e4e6a..e9ea7dda2e 100644
--- a/app/src/main/res/layout/widget_server_settings_vanity_url.xml
+++ b/app/src/main/res/layout/widget_server_settings_vanity_url.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <RelativeLayout android:paddingLeft="16dp" android:paddingTop="32dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                <TextView android:id="@+id/server_settings_vanity_url_header" android:text="@string/vanity_url" android:textAllCaps="true" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:textColor="@color/status_red_500" android:id="@+id/server_settings_vanity_url_remove" android:visibility="gone" android:text="@string/remove" android:layout_alignParentEnd="true" style="@style/res_2131952564_uikit_textview_bold"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <RelativeLayout android:paddingLeft="16dp" android:paddingTop="32dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                <TextView android:id="@+id/server_settings_vanity_url_header" android:text="@string/vanity_url" android:textAllCaps="true" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:textColor="@color/status_red_500" android:id="@+id/server_settings_vanity_url_remove" android:visibility="gone" android:text="@string/remove" android:layout_alignParentEnd="true" style="@style/UiKit_TextView_Bold"/>
             </RelativeLayout>
-            <RelativeLayout android:id="@+id/server_settings_vanity_url_input_container" android:padding="16dp" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/server_settings_vanity_url_prefix" android:text="@string/discord_gg" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_vanity_input" android:hint="@string/vanity_url_hint_mobile" android:layout_toStartOf="@+id/server_settings_vanity_url_loading_indicator" android:layout_toEndOf="@+id/server_settings_vanity_url_prefix" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-" android:inputType="textNoSuggestions" android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+            <RelativeLayout android:id="@+id/server_settings_vanity_url_input_container" android:padding="16dp" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit_ViewGroup_RelativeLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/server_settings_vanity_url_prefix" android:text="@string/discord_gg" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_settings_vanity_input" android:hint="@string/vanity_url_hint_mobile" android:layout_toStartOf="@+id/server_settings_vanity_url_loading_indicator" android:layout_toEndOf="@+id/server_settings_vanity_url_prefix" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-" android:inputType="textNoSuggestions" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <ProgressBar android:id="@+id/server_settings_vanity_url_loading_indicator" android:layout_width="32dp" android:layout_height="32dp" android:indeterminate="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true"/>
             </RelativeLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@+id/server_settings_vanity_url_error_text" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/change_vanity_url_error" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/vanity_url_help" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/server_settings_vanity_url_current_url" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/vanity_url_help_extended" style="@style/res_2131952563_uikit_textview"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@+id/server_settings_vanity_url_error_text" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/change_vanity_url_error" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/vanity_url_help" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/server_settings_vanity_url_current_url" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/vanity_url_help_extended" style="@style/UiKit_TextView"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_vanity_url_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/server_settings_vanity_url_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings.xml b/app/src/main/res/layout/widget_settings.xml
index daa77626ca..4109859604 100644
--- a/app/src/main/res/layout/widget_settings.xml
+++ b/app/src/main/res/layout/widget_settings.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:background="?attr/toolbarColor" style="@style/res_2131951637_apptheme_appbarlayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout app:titleEnabled="false" style="@style/res_2131951647_apptheme_collapsingtoolbarlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:background="?attr/toolbarColor" style="@style/AppTheme_AppBarLayout">
+        <com.google.android.material.appbar.CollapsingToolbarLayout app:titleEnabled="false" style="@style/AppTheme_CollapsingToolbarLayout">
             <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@+id/user_settings_profile_header_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="?attr/actionBarSize" app:layout_collapseMode="2" app:user_profile_header_background_color="?attr/toolbarColor"/>
-            <androidx.appcompat.widget.Toolbar app:layout_collapseMode="1" app:navigationContentDescription="@string/back" style="@style/res_2131951663_apptheme_toolbar"/>
+            <androidx.appcompat.widget.Toolbar app:layout_collapseMode="1" app:navigationContentDescription="@string/back" style="@style/AppTheme_Toolbar"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <androidx.appcompat.widget.LinearLayoutCompat style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/user_settings_header" android:text="@string/user_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <LinearLayout android:gravity="center_vertical" android:id="@+id/set_status_container" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:background="@color/transparent" android:layout_width="0dp" android:text="@string/set_status" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <androidx.appcompat.widget.LinearLayoutCompat style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/user_settings_header" android:text="@string/user_settings" style="@style/UiKit_Settings_Item_Header"/>
+            <LinearLayout android:gravity="center_vertical" android:id="@+id/set_status_container" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:background="@color/transparent" android:layout_width="0dp" android:text="@string/set_status" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
                 <com.discord.views.StatusView android:id="@+id/settings_status_view" android:layout_width="16dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="2dp" app:sv_corner_radius="4dp"/>
-                <TextView android:id="@+id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="8dp" style="@style/res_2131952492_uikit_settings_item"/>
+                <TextView android:id="@+id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="8dp" style="@style/UiKit_Settings_Item"/>
             </LinearLayout>
-            <TextView android:id="@+id/account" android:text="@string/user_settings_my_account" app:drawableStartCompat="@drawable/ic_my_account_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <LinearLayout android:id="@+id/profile" android:background="?attr/selectableItemBackground" android:paddingStart="0dp" android:paddingEnd="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <TextView android:id="@+id/profile_text" android:background="@color/transparent" android:layout_width="wrap_content" android:text="@string/user_settings_user_profile" android:paddingStart="16dp" android:paddingEnd="8dp" app:drawableStartCompat="@drawable/ic_edit_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@+id/profile_new_badge" android:background="@drawable/rounded_rectangle_16dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:visibility="gone" android:text="@string/_new" android:lineSpacingMultiplier="1.25" android:textAllCaps="true" android:backgroundTint="@color/status_red_530" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:id="@+id/account" android:text="@string/user_settings_my_account" app:drawableStartCompat="@drawable/ic_my_account_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <LinearLayout android:id="@+id/profile" android:background="?attr/selectableItemBackground" android:paddingStart="0dp" android:paddingEnd="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <TextView android:id="@+id/profile_text" android:background="@color/transparent" android:layout_width="wrap_content" android:text="@string/user_settings_user_profile" android:paddingStart="16dp" android:paddingEnd="8dp" app:drawableStartCompat="@drawable/ic_edit_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@+id/profile_new_badge" android:background="@drawable/rounded_rectangle_16dp_radius" android:paddingLeft="4dp" android:paddingRight="4dp" android:visibility="gone" android:text="@string/_new" android:lineSpacingMultiplier="1.25" android:textAllCaps="true" android:backgroundTint="@color/status_red_530" style="@style/UiKit_TextView"/>
             </LinearLayout>
-            <TextView android:id="@+id/privacy" android:text="@string/privacy_and_safety" app:drawableStartCompat="@drawable/ic_privacy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/authorized_apps" android:text="@string/authorized_apps" app:drawableStartCompat="@drawable/ic_authed_apps_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/connections" android:text="@string/connections" app:drawableStartCompat="@drawable/ic_phonelink_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/settings_billing" android:visibility="gone" android:text="@string/billing" app:drawableStartCompat="@drawable/ic_billing_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/qr_scanner" android:text="@string/user_settings_scan_qr_code" app:drawableStartCompat="@drawable/ic_qr_code_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <LinearLayout android:id="@+id/nitro_settings_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:id="@+id/nitro_header" android:text="@string/premium_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/settings_nitro" app:drawableStartCompat="@drawable/ic_nitro_rep" app:drawableTint="?attr/colorControlBrandForeground" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/nitro_boosting" android:text="@string/premium_guild_subscription_title" app:drawableStartCompat="@drawable/ic_settings_boost_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <TextView android:id="@+id/privacy" android:text="@string/privacy_and_safety" app:drawableStartCompat="@drawable/ic_privacy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/authorized_apps" android:text="@string/authorized_apps" app:drawableStartCompat="@drawable/ic_authed_apps_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/connections" android:text="@string/connections" app:drawableStartCompat="@drawable/ic_phonelink_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/settings_billing" android:visibility="gone" android:text="@string/billing" app:drawableStartCompat="@drawable/ic_billing_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/qr_scanner" android:text="@string/user_settings_scan_qr_code" app:drawableStartCompat="@drawable/ic_qr_code_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <LinearLayout android:id="@+id/nitro_settings_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:id="@+id/nitro_header" android:text="@string/premium_settings" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/settings_nitro" app:drawableStartCompat="@drawable/ic_nitro_rep" app:drawableTint="?attr/colorControlBrandForeground" style="@style/UiKit_Settings_Item_Icon"/>
+                <TextView android:id="@+id/nitro_boosting" android:text="@string/premium_guild_subscription_title" app:drawableStartCompat="@drawable/ic_settings_boost_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
                 <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/nitroGiftingContainer" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <TextView android:id="@+id/nitro_gifting" android:background="@null" android:layout_width="0dp" android:text="@string/premium_gifting_title" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_gift_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/nitroGiftingBadge" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:paddingStart="4dp" android:paddingEnd="4dp" android:layout_marginEnd="20dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+                    <TextView android:id="@+id/nitro_gifting" android:background="@null" android:layout_width="0dp" android:text="@string/premium_gifting_title" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_gift_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/nitroGiftingBadge" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:paddingStart="4dp" android:paddingEnd="4dp" android:layout_marginEnd="20dp" style="@style/UiKit_TextView_Semibold"/>
                 </LinearLayout>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/app_settings_header" android:text="@string/app_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/voice" android:text="@string/voice_and_video" app:drawableStartCompat="@drawable/ic_voice_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/notifications" android:text="@string/notifications" app:drawableStartCompat="@drawable/ic_notification_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/text_images_settings" android:text="@string/text_and_images" app:drawableStartCompat="@drawable/ic_text_image_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/appearance" android:text="@string/appearance" app:drawableStartCompat="@drawable/ic_theme_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/accessibility" android:text="@string/accessibility" app:drawableStartCompat="@drawable/ic_accessibility_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/behavior" android:text="@string/form_label_mobile_notifications_behavior" app:drawableStartCompat="@drawable/ic_behavior_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/language" android:text="@string/language" app:drawableStartCompat="@drawable/ic_locale_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/activity_status" android:text="@string/activity_status" app:drawableStartCompat="@drawable/ic_activity_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <View android:id="@+id/developer_options_divider" android:visibility="gone" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/developer_options_header" android:visibility="gone" android:text="@string/developer_options" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/developer_options" android:visibility="gone" android:text="@string/developer_options" app:drawableStartCompat="@drawable/ic_security_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/app_info_header" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/changelog" android:text="@string/change_log" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/support" android:text="@string/support" app:drawableStartCompat="@drawable/ic_help_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/upload_debug_logs" android:text="@string/upload_debug_logs" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <TextView android:id="@+id/acknowledgements" android:text="@string/acknowledgements" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/app_settings_header" android:text="@string/app_settings" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/voice" android:text="@string/voice_and_video" app:drawableStartCompat="@drawable/ic_voice_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/notifications" android:text="@string/notifications" app:drawableStartCompat="@drawable/ic_notification_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/text_images_settings" android:text="@string/text_and_images" app:drawableStartCompat="@drawable/ic_text_image_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/appearance" android:text="@string/appearance" app:drawableStartCompat="@drawable/ic_theme_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/accessibility" android:text="@string/accessibility" app:drawableStartCompat="@drawable/ic_accessibility_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/behavior" android:text="@string/form_label_mobile_notifications_behavior" app:drawableStartCompat="@drawable/ic_behavior_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/language" android:text="@string/language" app:drawableStartCompat="@drawable/ic_locale_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/activity_status" android:text="@string/activity_status" app:drawableStartCompat="@drawable/ic_activity_status_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <View android:id="@+id/developer_options_divider" android:visibility="gone" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/developer_options_header" android:visibility="gone" android:text="@string/developer_options" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/developer_options" android:visibility="gone" android:text="@string/developer_options" app:drawableStartCompat="@drawable/ic_security_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/app_info_header" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/changelog" android:text="@string/change_log" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/support" android:text="@string/support" app:drawableStartCompat="@drawable/ic_help_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/upload_debug_logs" android:text="@string/upload_debug_logs" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+            <TextView android:id="@+id/acknowledgements" android:text="@string/acknowledgements" app:drawableStartCompat="@drawable/ic_info_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_accessibility.xml b/app/src/main/res/layout/widget_settings_accessibility.xml
index 569f7eecac..05f1b9896f 100644
--- a/app/src/main/res/layout/widget_settings_accessibility.xml
+++ b/app/src/main/res/layout/widget_settings_accessibility.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:animateLayoutChanges="true" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_accessibility_reduced_motion_header" android:text="@string/accessibility_prefers_reduced_motion" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/settings_accessibility_reduced_motion_description" android:text="@string/accessibility_prefers_reduced_motion_description" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_accessibility_reduced_motion_switch" app:cs_text="@string/accessibility_prefers_reduced_motion_enable" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <TextView android:id="@+id/settings_accessibility_images_header" android:text="@string/images" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_accessibility_allow_autoplay_gif_switch" app:cs_text="@string/gif_auto_play_label_mobile" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_accessibility_allow_animate_emoji_switch" app:cs_subtext="@string/animate_emoji_note" app:cs_text="@string/animate_emoji" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <LinearLayout android:id="@+id/settings_accessibility_stickers_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_accessibility_stickers_header" android:text="@string/stickers_auto_play_heading" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/stickers_always_animate" app:cs_text="@string/stickers_always_animate" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/stickers_animate_on_interaction" app:cs_subtext="@string/stickers_animate_on_interaction_description" app:cs_text="@string/stickers_animate_on_interaction" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/stickers_never_animate" app:cs_text="@string/stickers_never_animate" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+    <ScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_accessibility_reduced_motion_header" android:text="@string/accessibility_prefers_reduced_motion" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/settings_accessibility_reduced_motion_description" android:text="@string/accessibility_prefers_reduced_motion_description" style="@style/UiKit_Settings_Item_SubText"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_accessibility_reduced_motion_switch" app:cs_text="@string/accessibility_prefers_reduced_motion_enable" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <TextView android:id="@+id/settings_accessibility_images_header" android:text="@string/images" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_accessibility_allow_autoplay_gif_switch" app:cs_text="@string/gif_auto_play_label_mobile" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_accessibility_allow_animate_emoji_switch" app:cs_subtext="@string/animate_emoji_note" app:cs_text="@string/animate_emoji" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <LinearLayout android:id="@+id/settings_accessibility_stickers_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_accessibility_stickers_header" android:text="@string/stickers_auto_play_heading" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/stickers_always_animate" app:cs_text="@string/stickers_always_animate" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/stickers_animate_on_interaction" app:cs_subtext="@string/stickers_animate_on_interaction_description" app:cs_text="@string/stickers_animate_on_interaction" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/stickers_never_animate" app:cs_text="@string/stickers_never_animate" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/widget_settings_account.xml b/app/src/main/res/layout/widget_settings_account.xml
index a40a242a91..ab7a016904 100644
--- a/app/src/main/res/layout/widget_settings_account.xml
+++ b/app/src/main/res/layout/widget_settings_account.xml
@@ -1,77 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/settings_account_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:animateLayoutChanges="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <RelativeLayout android:gravity="center" android:id="@+id/settings_account_verification" android:background="@color/status_red_500" android:visibility="gone" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@+id/settings_account_verification_title" android:text="@string/verify_your_email" android:layout_centerInParent="true" android:layout_toStartOf="@+id/settings_account_verification_button" style="@style/res_2131952579_uikit_textview_semibold"/>
-                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/settings_account_verification_button" android:layout_width="wrap_content" android:minHeight="0dp" android:text="@string/verify_account" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_alignParentEnd="true" style="@style/res_2131952474_uikit_material_button_white_outline"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/settings_account_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <RelativeLayout android:gravity="center" android:id="@+id/settings_account_verification" android:background="@color/status_red_500" android:visibility="gone" style="@style/UiKit_ViewGroup_RelativeLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@+id/settings_account_verification_title" android:text="@string/verify_your_email" android:layout_centerInParent="true" android:layout_toStartOf="@+id/settings_account_verification_button" style="@style/UiKit_TextView_Semibold"/>
+                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/settings_account_verification_button" android:layout_width="wrap_content" android:minHeight="0dp" android:text="@string/verify_account" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_alignParentEnd="true" style="@style/UiKit_Material_Button_White_Outline"/>
             </RelativeLayout>
-            <RelativeLayout android:id="@+id/avatar_edit_section" android:background="?attr/primary_630" android:paddingTop="16dp" android:paddingBottom="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-                <LinearLayout android:gravity="center_vertical" android:id="@+id/settings_account_avatar_wrap" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+            <RelativeLayout android:id="@+id/avatar_edit_section" android:background="?attr/primary_630" android:paddingTop="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+                <LinearLayout android:gravity="center_vertical" android:id="@+id/settings_account_avatar_wrap" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                     <FrameLayout android:id="@+id/settings_account_avatar_container" android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/change_avatar">
-                        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/settings_account_avatar" app:roundWithOverlayColor="?attr/primary_630" style="@style/res_2131951675_avatar_large_extraaccount"/>
+                        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/settings_account_avatar" app:roundWithOverlayColor="?attr/primary_630" style="@style/Avatar_Large_ExtraAccount"/>
                         <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center" android:id="@+id/settings_account_avatar_edit" android:background="@drawable/drawable_circle_white_1" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_upload_image_34dp" android:scaleType="center"/>
                     </FrameLayout>
-                    <LinearLayout android:layout_marginStart="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                        <TextView android:id="@+id/settings_account_tag" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextLink" android:id="@+id/settings_account_remove_avatar" android:background="?attr/selectableItemBackground" android:layout_marginTop="4dp" android:text="@string/remove_icon" style="@style/res_2131952579_uikit_textview_semibold"/>
+                    <LinearLayout android:layout_marginStart="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                        <TextView android:id="@+id/settings_account_tag" style="@style/UiKit_TextView_Large_SingleLine"/>
+                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextLink" android:id="@+id/settings_account_remove_avatar" android:background="?attr/selectableItemBackground" android:layout_marginTop="4dp" android:text="@string/remove_icon" style="@style/UiKit_TextView_Semibold"/>
                     </LinearLayout>
                 </LinearLayout>
             </RelativeLayout>
-            <View android:id="@+id/avatar_edit_section_bottom_divider" style="@style/res_2131952416_uikit_divider"/>
-            <TextView android:id="@+id/settings_account_information_header" android:text="@string/form_label_account_information" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <LinearLayout android:id="@+id/settings_account_information_data_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout android:id="@+id/settings_account_tag_container" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <TextView android:id="@+id/settings_account_tag_label" android:text="@string/username" style="@style/res_2131952494_uikit_settings_item_compound_left"/>
-                    <TextView android:id="@+id/settings_account_tag_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952495_uikit_settings_item_compound_right"/>
+            <View android:id="@+id/avatar_edit_section_bottom_divider" style="@style/UiKit_Divider"/>
+            <TextView android:id="@+id/settings_account_information_header" android:text="@string/form_label_account_information" style="@style/UiKit_Settings_Item_Header"/>
+            <LinearLayout android:id="@+id/settings_account_information_data_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout android:id="@+id/settings_account_tag_container" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <TextView android:id="@+id/settings_account_tag_label" android:text="@string/username" style="@style/UiKit_Settings_Item_Compound_Left"/>
+                    <TextView android:id="@+id/settings_account_tag_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item_Compound_Right"/>
                 </LinearLayout>
-                <LinearLayout android:id="@+id/settings_account_name_container" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <TextView android:id="@+id/settings_account_name_label" android:text="@string/friends_column_name" style="@style/res_2131952494_uikit_settings_item_compound_left"/>
-                    <TextView android:id="@+id/settings_account_name_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952495_uikit_settings_item_compound_right"/>
+                <LinearLayout android:id="@+id/settings_account_name_container" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <TextView android:id="@+id/settings_account_name_label" android:text="@string/friends_column_name" style="@style/UiKit_Settings_Item_Compound_Left"/>
+                    <TextView android:id="@+id/settings_account_name_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item_Compound_Right"/>
                 </LinearLayout>
-                <LinearLayout android:id="@+id/settings_account_email_container" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <TextView android:id="@+id/settings_account_email_label" android:text="@string/email" style="@style/res_2131952494_uikit_settings_item_compound_left"/>
-                    <TextView android:id="@+id/settings_account_email_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952495_uikit_settings_item_compound_right"/>
+                <LinearLayout android:id="@+id/settings_account_email_container" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <TextView android:id="@+id/settings_account_email_label" android:text="@string/email" style="@style/UiKit_Settings_Item_Compound_Left"/>
+                    <TextView android:id="@+id/settings_account_email_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item_Compound_Right"/>
                 </LinearLayout>
-                <LinearLayout android:id="@+id/settings_account_phone_container" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <TextView android:id="@+id/settings_account_phone_label" android:text="@string/phone" style="@style/res_2131952494_uikit_settings_item_compound_left"/>
-                    <TextView android:id="@+id/settings_account_phone_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952495_uikit_settings_item_compound_right"/>
+                <LinearLayout android:id="@+id/settings_account_phone_container" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <TextView android:id="@+id/settings_account_phone_label" android:text="@string/phone" style="@style/UiKit_Settings_Item_Compound_Left"/>
+                    <TextView android:id="@+id/settings_account_phone_text" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item_Compound_Right"/>
                 </LinearLayout>
-                <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_account_change_password" android:text="@string/change_password" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952492_uikit_settings_item"/>
+                <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_account_change_password" android:text="@string/change_password" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item"/>
             </LinearLayout>
-            <View style="@style/res_2131952416_uikit_divider"/>
-            <LinearLayout android:id="@+id/settings_account_mfa_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <TextView android:id="@+id/settings_account_2fa_header" android:layout_width="0dp" android:text="@string/two_fa" android:layout_weight="1" style="@style/res_2131952496_uikit_settings_item_header"/>
-                    <TextView android:textColor="@color/status_green_600" android:id="@+id/settings_account_mfa_enabled_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/user_settings_mfa_enabled" android:textAllCaps="true" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_small_lock_green_24dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <View style="@style/UiKit_Divider"/>
+            <LinearLayout android:id="@+id/settings_account_mfa_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <TextView android:id="@+id/settings_account_2fa_header" android:layout_width="0dp" android:text="@string/two_fa" android:layout_weight="1" style="@style/UiKit_Settings_Item_Header"/>
+                    <TextView android:textColor="@color/status_green_600" android:id="@+id/settings_account_mfa_enabled_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/user_settings_mfa_enabled" android:textAllCaps="true" android:layout_marginEnd="16dp" app:drawableStartCompat="@drawable/ic_small_lock_green_24dp" style="@style/UiKit_TextView_Semibold"/>
                 </LinearLayout>
                 <com.discord.app.AppViewFlipper android:id="@+id/settings_account_mfa_flipper" android:layout_width="match_parent" android:layout_height="wrap_content">
-                    <LinearLayout android:id="@+id/settings_account_mfa_enabled_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                        <TextView android:id="@+id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952492_uikit_settings_item"/>
-                        <TextView android:id="@+id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/res_2131952492_uikit_settings_item"/>
-                        <com.discord.views.CheckedSetting android:id="@+id/settings_account_sms_backup" app:cs_subtext="@string/mfa_sms_auth_sales_pitch" app:cs_text="@string/mfa_sms_auth" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                        <TextView android:id="@+id/settings_account_sms_phone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952563_uikit_textview"/>
+                    <LinearLayout android:id="@+id/settings_account_mfa_enabled_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                        <TextView android:id="@+id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item"/>
+                        <TextView android:id="@+id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/UiKit_Settings_Item"/>
+                        <com.discord.views.CheckedSetting android:id="@+id/settings_account_sms_backup" app:cs_subtext="@string/mfa_sms_auth_sales_pitch" app:cs_text="@string/mfa_sms_auth" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                        <TextView android:id="@+id/settings_account_sms_phone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView"/>
                     </LinearLayout>
-                    <LinearLayout android:gravity="center" android:id="@+id/settings_account_mfa_disabled_container" android:layout_marginBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                    <LinearLayout android:gravity="center" android:id="@+id/settings_account_mfa_disabled_container" android:layout_marginBottom="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
                         <com.airbnb.lottie.LottieAnimationView android:id="@+id/settings_account_mfa_lottie" android:visibility="gone" android:layout_width="110dp" android:layout_height="118dp" app:lottie_autoPlay="true" app:lottie_fileName="animations/anim_verify_by_phone.json" app:lottie_loop="true"/>
-                        <TextView android:id="@+id/settings_account_mfa_sales_pitch" android:visibility="gone" android:text="@string/two_fa_sales_pitch" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-                        <com.google.android.material.button.MaterialButton android:id="@+id/settings_account_mfa_enable" android:visibility="gone" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/two_fa_enable" style="@style/res_2131952467_uikit_material_button_secondary"/>
+                        <TextView android:id="@+id/settings_account_mfa_sales_pitch" android:visibility="gone" android:text="@string/two_fa_sales_pitch" style="@style/UiKit_Settings_Item_SubText"/>
+                        <com.google.android.material.button.MaterialButton android:id="@+id/settings_account_mfa_enable" android:visibility="gone" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/two_fa_enable" style="@style/UiKit_Material_Button_Secondary"/>
                     </LinearLayout>
                 </com.discord.app.AppViewFlipper>
             </LinearLayout>
-            <View style="@style/res_2131952416_uikit_divider"/>
-            <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_blocked_users" android:text="@string/user_settings_blocked_users" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/res_2131952492_uikit_settings_item"/>
-            <View style="@style/res_2131952416_uikit_divider"/>
-            <TextView android:id="@+id/settings_account_management_header" android:text="@string/account_management" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <LinearLayout android:id="@+id/settings_account_private_data_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/res_2131952492_uikit_settings_item"/>
-                <TextView android:textColor="@color/status_red_500" android:id="@+id/settings_account_private_data_delete" android:text="@string/delete_account" style="@style/res_2131952492_uikit_settings_item"/>
+            <View style="@style/UiKit_Divider"/>
+            <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_blocked_users" android:text="@string/user_settings_blocked_users" app:drawableEndCompat="?attr/ic_navigate_next" style="@style/UiKit_Settings_Item"/>
+            <View style="@style/UiKit_Divider"/>
+            <TextView android:id="@+id/settings_account_management_header" android:text="@string/account_management" style="@style/UiKit_Settings_Item_Header"/>
+            <LinearLayout android:id="@+id/settings_account_private_data_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/UiKit_Settings_Item"/>
+                <TextView android:textColor="@color/status_red_500" android:id="@+id/settings_account_private_data_delete" android:text="@string/delete_account" style="@style/UiKit_Settings_Item"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_account_backup_codes.xml b/app/src/main/res/layout/widget_settings_account_backup_codes.xml
index c926a115cf..a81463d7a0 100644
--- a/app/src/main/res/layout/widget_settings_account_backup_codes.xml
+++ b/app/src/main/res/layout/widget_settings_account_backup_codes.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_backup_codes_info" android:layout_margin="16dp" android:text="@string/two_fa_backup_codes_body" style="@style/res_2131952563_uikit_textview"/>
-            <View style="@style/res_2131952416_uikit_divider"/>
-            <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_backup_codes_rv" android:layout_height="wrap_content" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/settings_backup_codes_generate" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:text="@string/two_fa_generate_codes" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_backup_codes_info" android:layout_margin="16dp" android:text="@string/two_fa_backup_codes_body" style="@style/UiKit_TextView"/>
+            <View style="@style/UiKit_Divider"/>
+            <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_backup_codes_rv" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_RecyclerView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/settings_backup_codes_generate" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="24dp" android:text="@string/two_fa_generate_codes" style="@style/UiKit_Material_Button_Secondary"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_account_change_password.xml b/app/src/main/res/layout/widget_settings_account_change_password.xml
index c87b0f9be7..b37b1db8db 100644
--- a/app/src/main/res/layout/widget_settings_account_change_password.xml
+++ b/app/src/main/res/layout/widget_settings_account_change_password.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_current_password_input" android:hint="@string/form_label_current_password" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password">
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_current_password_input" android:hint="@string/form_label_current_password" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password">
                     <requestFocus/>
                 </com.google.android.material.textfield.TextInputEditText>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_new_password_input" android:hint="@string/form_label_new_password" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_new_password_input" android:hint="@string/form_label_new_password" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_two_factor" android:visibility="gone" android:hint="@string/two_fa" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/change_password_two_factor" android:visibility="gone" android:hint="@string/two_fa" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/change_password_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/change_password_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_account_contacts_name_edit.xml b/app/src/main/res/layout/widget_settings_account_contacts_name_edit.xml
index e335511522..5390d7eb2e 100644
--- a/app/src/main/res/layout/widget_settings_account_contacts_name_edit.xml
+++ b/app/src/main/res/layout/widget_settings_account_contacts_name_edit.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_name_wrap" android:hint="@string/contact_sync_enter_name_input_header" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_name_wrap" android:hint="@string/contact_sync_enter_name_input_header" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_update_name_subtitle" style="@style/res_2131952563_uikit_textview"/>
-            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red" android:id="@+id/settings_account_name_clear" android:padding="0dp" android:minWidth="0dp" android:text="@string/contact_sync_remove_name" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
+            <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_update_name_subtitle" style="@style/UiKit_TextView"/>
+            <com.google.android.material.button.MaterialButton android:textColor="@color/status_red" android:id="@+id/settings_account_name_clear" android:padding="0dp" android:minWidth="0dp" android:text="@string/contact_sync_remove_name" style="@style/UiKit_Material_Button_Transparent_Fit"/>
         </LinearLayout>
     </ScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_account_edit.xml b/app/src/main/res/layout/widget_settings_account_edit.xml
index f83ccccc80..0e1937436b 100644
--- a/app/src/main/res/layout/widget_settings_account_edit.xml
+++ b/app/src/main/res/layout/widget_settings_account_edit.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <RelativeLayout style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_username_wrap" android:hint="@string/username" android:layout_toStartOf="@+id/edit_account_tag_layout_container" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/res_2131952546_uikit_textinputlayout_edittext">
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <RelativeLayout style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_username_wrap" android:hint="@string/username" android:layout_toStartOf="@+id/edit_account_tag_layout_container" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit_TextInputLayout_EditText">
                         <requestFocus/>
                     </com.google.android.material.textfield.TextInputEditText>
                 </com.google.android.material.textfield.TextInputLayout>
-                <RelativeLayout android:id="@+id/edit_account_tag_layout_container" android:layout_width="80sp" android:layout_alignParentEnd="true" style="@style/res_2131952589_uikit_viewgroup">
-                    <TextView android:id="@+id/dtddd" android:layout_marginTop="24dp" android:text="#" style="@style/res_2131952565_uikit_textview_h1"/>
-                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_discriminator_wrap" android:hint="@string/user_settings_edit_account_tag" android:layout_toEndOf="@+id/dtddd" app:errorIconDrawable="@null" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                        <com.google.android.material.textfield.TextInputEditText android:gravity="center_horizontal" android:maxLength="4" android:inputType="number" android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+                <RelativeLayout android:id="@+id/edit_account_tag_layout_container" android:layout_width="80sp" android:layout_alignParentEnd="true" style="@style/UiKit_ViewGroup">
+                    <TextView android:id="@+id/dtddd" android:layout_marginTop="24dp" android:text="#" style="@style/UiKit_TextView_H1"/>
+                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_discriminator_wrap" android:hint="@string/user_settings_edit_account_tag" android:layout_toEndOf="@+id/dtddd" app:errorIconDrawable="@null" style="@style/UiKit_TextInputLayout_Primary">
+                        <com.google.android.material.textfield.TextInputEditText android:gravity="center_horizontal" android:maxLength="4" android:inputType="number" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
                     </com.google.android.material.textfield.TextInputLayout>
                 </RelativeLayout>
             </RelativeLayout>
         </LinearLayout>
     </ScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_account_email_edit.xml b/app/src/main/res/layout/widget_settings_account_email_edit.xml
index e2b6fc0a63..fb58a82638 100644
--- a/app/src/main/res/layout/widget_settings_account_email_edit.xml
+++ b/app/src/main/res/layout/widget_settings_account_email_edit.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_email_wrap" android:hint="@string/email" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952552_uikit_textinputlayout_edittext_singleline_email"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_email_wrap" android:hint="@string/email" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Email"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_activity_status.xml b/app/src/main/res/layout/widget_settings_activity_status.xml
index e38bfb183b..5d53a211bf 100644
--- a/app/src/main/res/layout/widget_settings_activity_status.xml
+++ b/app/src/main/res/layout/widget_settings_activity_status.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView style="@style/res_2131952609_uikit_viewgroup_relativelayout_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.discord.views.CheckedSetting android:id="@+id/show_current_activity" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_subtext="@string/show_current_activity_desc" app:cs_text="@string/show_current_activity" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+    <ScrollView style="@style/UiKit_ViewGroup_RelativeLayout_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.discord.views.CheckedSetting android:id="@+id/show_current_activity" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_subtext="@string/show_current_activity_desc" app:cs_text="@string/show_current_activity" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
         </LinearLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_appearance.xml b/app/src/main/res/layout/widget_settings_appearance.xml
index 793ed9cb92..98cb697ee4 100644
--- a/app/src/main/res/layout/widget_settings_appearance.xml
+++ b/app/src/main/res/layout/widget_settings_appearance.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:animateLayoutChanges="true" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_appearance_theme_header" android:text="@string/theme" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_theme_light_radio" app:cs_text="@string/theme_light" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_theme_dark_radio" app:cs_text="@string/theme_dark" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_theme_pure_evil_switch" app:cs_text="@string/theme_pure_evil_switch_label" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_appearance_sync_header" android:text="@string/sync" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_sync_switch" app:cs_text="@string/settings_sync" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/settings_appearance_font_scaling_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_appearance_font_scale_header" android:text="@string/accessibility_font_scaling_label" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:id="@+id/settings_appearance_font_scale_platform" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-                <RelativeLayout style="@style/res_2131952492_uikit_settings_item">
-                    <TextView android:textSize="12dp" android:id="@+id/settings_appearance_font_scaling_seekbar_text_left" android:text="Aa" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-                    <SeekBar android:id="@+id/settings_appearance_font_scaling_seekbar" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:max="70" android:layout_toLeftOf="@+id/settings_appearance_font_scaling_seekbar_text_right" android:layout_toRightOf="@+id/settings_appearance_font_scaling_seekbar_text_left" android:layout_centerVertical="true" style="@style/res_2131952488_uikit_seekbar"/>
-                    <TextView android:textSize="21dp" android:id="@+id/settings_appearance_font_scaling_seekbar_text_right" android:text="Aa" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentEnd="true" style="@style/res_2131952563_uikit_textview"/>
+    <ScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_appearance_theme_header" android:text="@string/theme" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_theme_light_radio" app:cs_text="@string/theme_light" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_theme_dark_radio" app:cs_text="@string/theme_dark" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_theme_pure_evil_switch" app:cs_text="@string/theme_pure_evil_switch_label" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_appearance_sync_header" android:text="@string/sync" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_appearance_sync_switch" app:cs_text="@string/settings_sync" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/settings_appearance_font_scaling_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_appearance_font_scale_header" android:text="@string/accessibility_font_scaling_label" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:id="@+id/settings_appearance_font_scale_platform" style="@style/UiKit_Settings_Item_SubText"/>
+                <RelativeLayout style="@style/UiKit_Settings_Item">
+                    <TextView android:textSize="12dp" android:id="@+id/settings_appearance_font_scaling_seekbar_text_left" android:text="Aa" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+                    <SeekBar android:id="@+id/settings_appearance_font_scaling_seekbar" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:max="70" android:layout_toLeftOf="@+id/settings_appearance_font_scaling_seekbar_text_right" android:layout_toRightOf="@+id/settings_appearance_font_scaling_seekbar_text_left" android:layout_centerVertical="true" style="@style/UiKit_SeekBar"/>
+                    <TextView android:textSize="21dp" android:id="@+id/settings_appearance_font_scaling_seekbar_text_right" android:text="Aa" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentEnd="true" style="@style/UiKit_TextView"/>
                 </RelativeLayout>
-                <FrameLayout android:background="?attr/chat_embed_bg" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="16dp" android:layout_margin="16dp" style="@style/res_2131952589_uikit_viewgroup">
+                <FrameLayout android:background="?attr/chat_embed_bg" android:paddingLeft="8dp" android:paddingTop="8dp" android:paddingRight="8dp" android:paddingBottom="16dp" android:layout_margin="16dp" style="@style/UiKit_ViewGroup">
                     <include android:id="@+id/chat_item" layout="@layout/widget_chat_list_adapter_item_text"/>
                 </FrameLayout>
-                <TextView android:layout_gravity="left" android:id="@+id/settings_appearance_font_scaling_reset" android:background="?attr/selectableItemBackground" android:layout_marginLeft="16dp" android:text="@string/reset" style="@style/res_2131952572_uikit_textview_link"/>
+                <TextView android:layout_gravity="left" android:id="@+id/settings_appearance_font_scaling_reset" android:background="?attr/selectableItemBackground" android:layout_marginLeft="16dp" android:text="@string/reset" style="@style/UiKit_TextView_Link"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/widget_settings_authorized_apps.xml b/app/src/main/res/layout/widget_settings_authorized_apps.xml
index cbf20a5a84..f06be9323f 100644
--- a/app/src/main/res/layout/widget_settings_authorized_apps.xml
+++ b/app/src/main/res/layout/widget_settings_authorized_apps.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/authorized_apps" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/authorized_apps" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/applications_and_connections" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:text="@string/applications_and_connections_body" style="@style/res_2131952493_uikit_settings_item_addition"/>
-            <androidx.recyclerview.widget.RecyclerView android:id="@+id/authorized_apps_list" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/applications_and_connections" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:text="@string/applications_and_connections_body" style="@style/UiKit_Settings_Item_Addition"/>
+            <androidx.recyclerview.widget.RecyclerView android:id="@+id/authorized_apps_list" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_authorized_apps_list_item.xml b/app/src/main/res/layout/widget_settings_authorized_apps_list_item.xml
index 43ae9784b4..4f6c34f012 100644
--- a/app/src/main/res/layout/widget_settings_authorized_apps_list_item.xml
+++ b/app/src/main/res/layout/widget_settings_authorized_apps_list_item.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/oauth_application_list_item" android:layout_marginBottom="16dp" android:importantForAccessibility="no" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="4dp" app:strokeColor="?attr/primary_900" app:strokeWidth="0.5dp" style="@style/res_2131952589_uikit_viewgroup">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/oauth_application_icon_iv" android:layout_width="40dp" android:layout_height="40dp" android:importantForAccessibility="no" app:placeholderImage="?attr/ic_game_icon_placeholder" style="@style/res_2131952020_icon_game"/>
-            <TextView android:id="@+id/oauth_application_name_tv" android:layout_width="0dp" android:layout_weight="1" android:layout_marginStart="16dp" style="@style/res_2131952565_uikit_textview_h1"/>
-            <androidx.appcompat.widget.AppCompatImageView android:layout_gravity="top" android:id="@+id/oauth_application_deauthorize_btn" android:padding="4dp" android:src="?attr/ic_close_24dp" android:contentDescription="@string/deauthorize_app" app:tint="@color/status_red_500" style="@style/res_2131952449_uikit_imageview_clickable"/>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/oauth_application_list_item" android:layout_marginBottom="16dp" android:importantForAccessibility="no" app:cardBackgroundColor="?attr/primary_630" app:cardCornerRadius="4dp" app:strokeColor="?attr/primary_900" app:strokeWidth="0.5dp" style="@style/UiKit_ViewGroup">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:gravity="left|center_vertical|center_horizontal|center|start" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/oauth_application_icon_iv" android:layout_width="40dp" android:layout_height="40dp" android:importantForAccessibility="no" app:placeholderImage="?attr/ic_game_icon_placeholder" style="@style/Icon_Game"/>
+            <TextView android:id="@+id/oauth_application_name_tv" android:layout_width="0dp" android:layout_weight="1" android:layout_marginStart="16dp" style="@style/UiKit_TextView_H1"/>
+            <androidx.appcompat.widget.AppCompatImageView android:layout_gravity="top" android:id="@+id/oauth_application_deauthorize_btn" android:padding="4dp" android:src="?attr/ic_close_24dp" android:contentDescription="@string/deauthorize_app" app:tint="@color/status_red_500" style="@style/UiKit_ImageView_Clickable"/>
         </LinearLayout>
-        <TextView android:id="@+id/oauth_application_description_label_tv" android:text="@string/about_this_app" style="@style/res_2131952496_uikit_settings_item_header"/>
-        <TextView android:id="@+id/oauth_application_description_tv" style="@style/res_2131952493_uikit_settings_item_addition"/>
-        <TextView android:id="@+id/oauth_application_permissions_label_tv" android:text="@string/permissions" style="@style/res_2131952496_uikit_settings_item_header"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/oauth_application_permissions_rv" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <TextView android:id="@+id/oauth_application_description_label_tv" android:text="@string/about_this_app" style="@style/UiKit_Settings_Item_Header"/>
+        <TextView android:id="@+id/oauth_application_description_tv" style="@style/UiKit_Settings_Item_Addition"/>
+        <TextView android:id="@+id/oauth_application_permissions_label_tv" android:text="@string/permissions" style="@style/UiKit_Settings_Item_Header"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/oauth_application_permissions_rv" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/widget_settings_behavior.xml b/app/src/main/res/layout/widget_settings_behavior.xml
index e82ba8f7ba..1490d373c6 100644
--- a/app/src/main/res/layout/widget_settings_behavior.xml
+++ b/app/src/main/res/layout/widget_settings_behavior.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_behavior_keyboard_header" android:text="@string/keyboard_behavior_mobile_header" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_behavior_shift_send_toggle" app:cs_subtext="@string/keyboard_behavior_mobile_shift_enter_to_send_hint" app:cs_text="@string/keyboard_behavior_mobile_shift_enter_to_send" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_behavior_chat_header" android:text="@string/chat_behavior" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_behavior_dev_mode_switch" app:cs_subtext="@string/developer_mode_help_text" app:cs_text="@string/developer_mode" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_behavior_browser_switch" app:cs_subtext="@string/custom_tabs_mobile_body" app:cs_text="@string/custom_tabs_mobile_header" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_behavior_keyboard_header" android:text="@string/keyboard_behavior_mobile_header" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_behavior_shift_send_toggle" app:cs_subtext="@string/keyboard_behavior_mobile_shift_enter_to_send_hint" app:cs_text="@string/keyboard_behavior_mobile_shift_enter_to_send" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_behavior_chat_header" android:text="@string/chat_behavior" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_behavior_dev_mode_switch" app:cs_subtext="@string/developer_mode_help_text" app:cs_text="@string/developer_mode" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_behavior_browser_switch" app:cs_subtext="@string/custom_tabs_mobile_body" app:cs_text="@string/custom_tabs_mobile_header" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_blocked_users.xml b/app/src/main/res/layout/widget_settings_blocked_users.xml
index 745c1a1aff..d3df379bf7 100644
--- a/app/src/main/res/layout/widget_settings_blocked_users.xml
+++ b/app/src/main/res/layout/widget_settings_blocked_users.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/blocked_users_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/blocked_users_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/blocked_users_list_recycler" android:background="?attr/colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent"/>
         <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp">
             <ImageView android:id="@+id/friends_list_item_empty_no_blocked" android:layout_width="320dp" android:layout_height="wrap_content" android:src="?attr/theme_friends_no_block" android:scaleType="fitCenter" android:adjustViewBounds="true" android:importantForAccessibility="no"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:gravity="center" android:layout_width="336dp" android:layout_marginTop="16dp" android:text="@string/user_settings_blocked_users_empty" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorTextNormal" android:gravity="center" android:layout_width="336dp" android:layout_marginTop="16dp" android:text="@string/user_settings_blocked_users_empty" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_boost.xml b/app/src/main/res/layout/widget_settings_boost.xml
index 98e498b02b..0c8b2c4c57 100644
--- a/app/src/main/res/layout/widget_settings_boost.xml
+++ b/app/src/main/res/layout/widget_settings_boost.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/settings_boost_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/settings_boost_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <LinearLayout android:gravity="center" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/settings_boost_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/res_2131952467_uikit_material_button_secondary"/>
+        <LinearLayout android:gravity="center" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/settings_boost_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit_Material_Button_Secondary"/>
         </LinearLayout>
-        <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-            <LinearLayout android:paddingTop="24dp" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <LinearLayout android:id="@+id/settings_boost_subtext_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_subtitle_mobile_1" style="@style/res_2131952563_uikit_textview"/>
-                    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/settings_boost_subtext" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952563_uikit_textview"/>
-                    <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_boost_recycler" android:layout_marginTop="16dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+            <LinearLayout android:paddingTop="24dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <LinearLayout android:id="@+id/settings_boost_subtext_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/premium_guild_subscription_subtitle_mobile_1" style="@style/UiKit_TextView"/>
+                    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/settings_boost_subtext" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView"/>
+                    <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_boost_recycler" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
                 </LinearLayout>
-                <LinearLayout android:layout_marginTop="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                <LinearLayout android:layout_marginTop="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
                     <include layout="@layout/view_settings_premium_guild_marketing_header"/>
                     <include layout="@layout/view_premium_guild_features_user_old"/>
                     <include layout="@layout/view_premium_guild_features_guild_old"/>
-                    <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" style="@style/res_2131952416_uikit_divider"/>
+                    <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" style="@style/UiKit_Divider"/>
                     <com.discord.views.premiumguild.PremiumGuildSubscriptionUpsellView android:id="@+id/settings_boost_upsell_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
-                    <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_boost_sample_guilds" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+                    <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_boost_sample_guilds" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
                     <include android:id="@+id/no_guilds" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="32dp" layout="@layout/view_settings_premium_guild_no_guilds"/>
                 </LinearLayout>
-                <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952416_uikit_divider"/>
+                <View android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_Divider"/>
                 <com.discord.views.premiumguild.PremiumSubscriptionMarketingView android:id="@+id/settings_boost_marketing_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_settings_connections.xml b/app/src/main/res/layout/widget_settings_connections.xml
index 64b07754f9..dd91702495 100644
--- a/app/src/main/res/layout/widget_settings_connections.xml
+++ b/app/src/main/res/layout/widget_settings_connections.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/connections_recycler" android:paddingBottom="@dimen/padding_bottom_fab_screen" android:clipToPadding="false" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
-    <TextView android:id="@+id/connections_empty" android:text="@string/connected_accounts_none" app:drawableTopCompat="?attr/ic_empty_integrations" style="@style/res_2131952576_uikit_textview_noresults"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/connections_recycler" android:paddingBottom="@dimen/padding_bottom_fab_screen" android:clipToPadding="false" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
+    <TextView android:id="@+id/connections_empty" android:text="@string/connected_accounts_none" app:drawableTopCompat="?attr/ic_empty_integrations" style="@style/UiKit_TextView_NoResults"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_connections_add.xml b/app/src/main/res/layout/widget_settings_connections_add.xml
index 1afc89c490..0016bc3137 100644
--- a/app/src/main/res/layout/widget_settings_connections_add.xml
+++ b/app/src/main/res/layout/widget_settings_connections_add.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <TextView android:text="@string/connect_account_title" style="@style/res_2131952506_uikit_sheet_header_title"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <TextView android:text="@string/connect_account_title" style="@style/UiKit_Sheet_Header_Title"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/connections_recycler" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/connections_recycler" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_settings_developer.xml b/app/src/main/res/layout/widget_settings_developer.xml
index 958be721be..13b8f2f09a 100644
--- a/app/src/main/res/layout/widget_settings_developer.xml
+++ b/app/src/main/res/layout/widget_settings_developer.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.discord.views.CheckedSetting android:id="@+id/settings_developer_screenshot_bug_reporting" app:cs_subtext="Enables ability to send a bug report to Discord after you take a screenshot" app:cs_text="Screenshot To Report Bug" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <TextView android:text="Experiments" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:text="Not seeing your experiment? Add it to ExperimentRegistry.kt" android:layout_marginStart="16dp" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <androidx.recyclerview.widget.RecyclerView android:id="@+id/developer_settings_experiments" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-            <TextView android:text="Notice cache" style="@style/res_2131952496_uikit_settings_item_header"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.discord.views.CheckedSetting android:id="@+id/settings_developer_screenshot_bug_reporting" app:cs_subtext="Enables ability to send a bug report to Discord after you take a screenshot" app:cs_text="Screenshot To Report Bug" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <TextView android:text="Experiments" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:text="Not seeing your experiment? Add it to ExperimentRegistry.kt" android:layout_marginStart="16dp" style="@style/UiKit_TextView_Subtext"/>
+            <androidx.recyclerview.widget.RecyclerView android:id="@+id/developer_settings_experiments" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit_ViewGroup_RecyclerView"/>
+            <TextView android:text="Notice cache" style="@style/UiKit_Settings_Item_Header"/>
             <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardElevation="@dimen/app_elevation" style="@style/res_2131952741_widget_materialcomponents_cardview">
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/developer_settings_notices" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/developer_settings_notices" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit_ViewGroup_RecyclerView"/>
             </com.google.android.material.card.MaterialCardView>
-            <TextView android:text="Crashes" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_crash_kotlin" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="Unhandled UI Thread Exception" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_crash_discord_nonfatal" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="Non-fatal Exception" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_crash_discord_jnibridge" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="libdiscord Crash" style="@style/res_2131952458_uikit_material_button"/>
-            <TextView android:id="@+id/textView" android:text="Actions" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_simulate_gateway_reconnect" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="Simulate Gateway Reconnect" style="@style/res_2131952458_uikit_material_button"/>
+            <TextView android:text="Crashes" style="@style/UiKit_Settings_Item_Header"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_crash_kotlin" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="Unhandled UI Thread Exception" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_crash_discord_nonfatal" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="Non-fatal Exception" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_crash_discord_jnibridge" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="libdiscord Crash" style="@style/UiKit_Material_Button"/>
+            <TextView android:id="@+id/textView" android:text="Actions" style="@style/UiKit_Settings_Item_Header"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/developer_settings_simulate_gateway_reconnect" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="Simulate Gateway Reconnect" style="@style/UiKit_Material_Button"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_enable_mfa_download.xml b/app/src/main/res/layout/widget_settings_enable_mfa_download.xml
index 9f416642f1..6de12403d5 100644
--- a/app/src/main/res/layout/widget_settings_enable_mfa_download.xml
+++ b/app/src/main/res/layout/widget_settings_enable_mfa_download.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:layout_width="150dp" android:layout_height="150dp" android:layout_marginBottom="32dp" android:src="@drawable/ic_google_auth_logo" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/two_fa_download_app_label" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:id="@+id/mfa_download_body" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/two_fa_download_app_body" style="@style/res_2131952563_uikit_textview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:layout_width="150dp" android:layout_height="150dp" android:layout_marginBottom="32dp" android:src="@drawable/ic_google_auth_logo" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/two_fa_download_app_label" style="@style/UiKit_TextView"/>
+    <TextView android:id="@+id/mfa_download_body" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/two_fa_download_app_body" style="@style/UiKit_TextView"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings_enable_mfa_input.xml b/app/src/main/res/layout/widget_settings_enable_mfa_input.xml
index e74466323c..1ac0fa5fa0 100644
--- a/app/src/main/res/layout/widget_settings_enable_mfa_input.xml
+++ b/app/src/main/res/layout/widget_settings_enable_mfa_input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/two_fa_login_label" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="24dp" android:text="@string/two_fa_login_body" style="@style/res_2131952563_uikit_textview"/>
-    <com.discord.views.CodeVerificationView android:id="@+id/user_settings_mfa_enable_input_code" android:layout_marginTop="16dp" style="@style/res_2131952589_uikit_viewgroup"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/two_fa_login_label" style="@style/UiKit_TextView"/>
+    <TextView android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="24dp" android:text="@string/two_fa_login_body" style="@style/UiKit_TextView"/>
+    <com.discord.views.CodeVerificationView android:id="@+id/user_settings_mfa_enable_input_code" android:layout_marginTop="16dp" style="@style/UiKit_ViewGroup"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings_enable_mfa_key.xml b/app/src/main/res/layout/widget_settings_enable_mfa_key.xml
index 7652ec86ac..8e0bbf9182 100644
--- a/app/src/main/res/layout/widget_settings_enable_mfa_key.xml
+++ b/app/src/main/res/layout/widget_settings_enable_mfa_key.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/user_settings_mfa_enable_code_label" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="24dp" android:text="@string/user_settings_mfa_enable_code_body" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/enable_mfa_key_code" android:background="?attr/chat_embed_bg" android:padding="8dp" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:foreground="?attr/selectableItemBackground" android:drawablePadding="8dp" app:drawableRightCompat="?attr/ic_copy" app:fontFamily="?attr/font_monospace" style="@style/res_2131952570_uikit_textview_large"/>
-    <TextView android:textColor="?attr/color_brand_500" android:id="@+id/enable_mfa_key_launch_authy" android:background="?attr/selectableItemBackground" android:padding="16dp" android:visibility="invisible" android:layout_marginTop="16dp" style="@style/res_2131952579_uikit_textview_semibold"/>
-    <TextView android:textColor="?attr/color_brand_500" android:id="@+id/enable_mfa_key_launch_google_auth" android:background="?attr/selectableItemBackground" android:padding="16dp" android:visibility="invisible" style="@style/res_2131952579_uikit_textview_semibold"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/user_settings_mfa_enable_code_label" style="@style/UiKit_TextView"/>
+    <TextView android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="24dp" android:text="@string/user_settings_mfa_enable_code_body" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/enable_mfa_key_code" android:background="?attr/chat_embed_bg" android:padding="8dp" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:foreground="?attr/selectableItemBackground" android:drawablePadding="8dp" app:drawableRightCompat="?attr/ic_copy" app:fontFamily="?attr/font_monospace" style="@style/UiKit_TextView_Large"/>
+    <TextView android:textColor="?attr/color_brand_500" android:id="@+id/enable_mfa_key_launch_authy" android:background="?attr/selectableItemBackground" android:padding="16dp" android:visibility="invisible" android:layout_marginTop="16dp" style="@style/UiKit_TextView_Semibold"/>
+    <TextView android:textColor="?attr/color_brand_500" android:id="@+id/enable_mfa_key_launch_google_auth" android:background="?attr/selectableItemBackground" android:padding="16dp" android:visibility="invisible" style="@style/UiKit_TextView_Semibold"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings_enable_mfa_success.xml b/app/src/main/res/layout/widget_settings_enable_mfa_success.xml
index 0d68d2868f..21fb74e1da 100644
--- a/app/src/main/res/layout/widget_settings_enable_mfa_success.xml
+++ b/app/src/main/res/layout/widget_settings_enable_mfa_success.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" android:src="?attr/img_mfa" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/two_fa_success_header" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/two_fa_success_body_mobile" style="@style/res_2131952563_uikit_textview"/>
-    <View android:layout_width="150dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" style="@style/res_2131952416_uikit_divider"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/mfa_success_enable_sms" android:text="@string/mfa_sms_enable" style="@style/res_2131952458_uikit_material_button"/>
-    <TextView android:gravity="center" android:layout_marginTop="8dp" android:text="@string/mfa_sms_auth_sales_pitch" style="@style/res_2131952581_uikit_textview_subtext"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:layout_gravity="center" android:layout_margin="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="32dp" android:src="?attr/img_mfa" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:textSize="24sp" android:textColor="?attr/primary_100" android:layout_marginBottom="8dp" android:text="@string/two_fa_success_header" style="@style/UiKit_TextView"/>
+    <TextView android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:text="@string/two_fa_success_body_mobile" style="@style/UiKit_TextView"/>
+    <View android:layout_width="150dp" android:layout_marginTop="32dp" android:layout_marginBottom="32dp" style="@style/UiKit_Divider"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/mfa_success_enable_sms" android:text="@string/mfa_sms_enable" style="@style/UiKit_Material_Button"/>
+    <TextView android:gravity="center" android:layout_marginTop="8dp" android:text="@string/mfa_sms_auth_sales_pitch" style="@style/UiKit_TextView_Subtext"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings_gifting.xml b/app/src/main/res/layout/widget_settings_gifting.xml
index b6ac121263..1cfa08a9b5 100644
--- a/app/src/main/res/layout/widget_settings_gifting.xml
+++ b/app/src/main/res/layout/widget_settings_gifting.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/premium_gifting_title" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/premium_gifting_title" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/settings_gifting_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/settings_gifting_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <LinearLayout android:gravity="center" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/settings_gifting_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/res_2131952467_uikit_material_button_secondary"/>
+        <LinearLayout android:gravity="center" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/settings_gifting_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit_Material_Button_Secondary"/>
         </LinearLayout>
-        <androidx.core.widget.NestedScrollView style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_gifting_redeem_codes_header" android:paddingBottom="8dp" android:text="@string/gift_inventory_redeem_codes" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:paddingTop="0dp" android:paddingBottom="0dp" android:text="@string/application_entitlement_code_redemption_prompt" style="@style/res_2131952499_uikit_settings_item_subtext"/>
+        <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_gifting_redeem_codes_header" android:paddingBottom="8dp" android:text="@string/gift_inventory_redeem_codes" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:paddingTop="0dp" android:paddingBottom="0dp" android:text="@string/application_entitlement_code_redemption_prompt" style="@style/UiKit_Settings_Item_SubText"/>
                 <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp">
                     <ProgressBar android:layout_gravity="right|center_vertical|center_horizontal|center|end" android:id="@+id/settings_gifting_gift_code_input_progress" android:visibility="gone" android:layout_width="20sp" android:layout_height="20sp" android:layout_marginEnd="16dp"/>
-                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/settings_gifting_gift_code_input_wrap" android:hint="@string/gift_code_hint" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                        <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/settings_gifting_gift_code_input_wrap" android:hint="@string/gift_code_hint" style="@style/UiKit_TextInputLayout_Primary">
+                        <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
                     </com.google.android.material.textfield.TextInputLayout>
                 </FrameLayout>
-                <TextView android:id="@+id/settings_gifting_your_gifts_header" android:paddingBottom="0dp" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/gift_inventory_your_gifts" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_gifting_your_gifts_recycler" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-                <TextView android:id="@+id/settings_gifting_gifts_you_purchased_header" android:paddingBottom="0dp" android:layout_marginTop="8dp" android:text="@string/gift_inventory_gifts_you_purchased" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_gifting_gifts_you_purchased_recycler" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:animateLayoutChanges="false" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-                <LinearLayout android:id="@+id/settings_gifting_purchase_gift_section" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:id="@+id/settings_gifting_select_gift_header" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:text="@string/gift_inventory_select_nitro_gift" style="@style/res_2131952496_uikit_settings_item_header"/>
-                    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/premium_tier_2_gift_learn_more" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:id="@+id/settings_gifting_your_gifts_header" android:paddingBottom="0dp" android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:text="@string/gift_inventory_your_gifts" style="@style/UiKit_Settings_Item_Header"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_gifting_your_gifts_recycler" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_ViewGroup_RecyclerView"/>
+                <TextView android:id="@+id/settings_gifting_gifts_you_purchased_header" android:paddingBottom="0dp" android:layout_marginTop="8dp" android:text="@string/gift_inventory_gifts_you_purchased" style="@style/UiKit_Settings_Item_Header"/>
+                <androidx.recyclerview.widget.RecyclerView android:id="@+id/settings_gifting_gifts_you_purchased_recycler" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:animateLayoutChanges="false" style="@style/UiKit_ViewGroup_RecyclerView"/>
+                <LinearLayout android:id="@+id/settings_gifting_purchase_gift_section" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:id="@+id/settings_gifting_select_gift_header" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:text="@string/gift_inventory_select_nitro_gift" style="@style/UiKit_Settings_Item_Header"/>
+                    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/premium_tier_2_gift_learn_more" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
                     <com.discord.views.premium.GiftSelectView android:id="@+id/gift_select_premium_tier_2_year" android:layout_width="match_parent" android:layout_height="wrap_content"/>
                     <com.discord.views.premium.GiftSelectView android:id="@+id/gift_select_premium_tier_2_month" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/gift_purchase_google_play_notice" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:id="@+id/settings_gifting_select_classic_gift_header" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:text="@string/gift_inventory_select_nitro_classic_gift" style="@style/res_2131952496_uikit_settings_item_header"/>
-                    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/premium_tier_1_gift_learn_more" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/gift_purchase_google_play_notice" style="@style/UiKit_TextView"/>
+                    <TextView android:id="@+id/settings_gifting_select_classic_gift_header" android:paddingBottom="8dp" android:layout_marginTop="8dp" android:text="@string/gift_inventory_select_nitro_classic_gift" style="@style/UiKit_Settings_Item_Header"/>
+                    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/premium_tier_1_gift_learn_more" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
                     <com.discord.views.premium.GiftSelectView android:id="@+id/gift_select_premium_tier_1_year" android:layout_width="match_parent" android:layout_height="wrap_content"/>
                     <com.discord.views.premium.GiftSelectView android:id="@+id/gift_select_premium_tier_1_month" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/gift_purchase_google_play_notice" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/gift_purchase_google_play_notice" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
     </com.discord.app.AppViewFlipper>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_item_add_connected_account.xml b/app/src/main/res/layout/widget_settings_item_add_connected_account.xml
index 1352f0997b..2d7686fc2a 100644
--- a/app/src/main/res/layout/widget_settings_item_add_connected_account.xml
+++ b/app/src/main/res/layout/widget_settings_item_add_connected_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:padding="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <ImageView android:layout_gravity="center_vertical" android:id="@+id/add_connected_account_image" android:layout_width="40dp" android:layout_height="40dp" android:importantForAccessibility="no" android:layout_marginEnd="16dp" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:layout_gravity="center_vertical" android:id="@+id/add_connected_account_text" style="@style/res_2131952571_uikit_textview_large_singleline"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <ImageView android:layout_gravity="center_vertical" android:id="@+id/add_connected_account_image" android:layout_width="40dp" android:layout_height="40dp" android:importantForAccessibility="no" android:layout_marginEnd="16dp" style="@style/UiKit_ImageView"/>
+    <TextView android:layout_gravity="center_vertical" android:id="@+id/add_connected_account_text" style="@style/UiKit_TextView_Large_SingleLine"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings_item_backup_code.xml b/app/src/main/res/layout/widget_settings_item_backup_code.xml
index 1c32bcf263..f3d5fe083a 100644
--- a/app/src/main/res/layout/widget_settings_item_backup_code.xml
+++ b/app/src/main/res/layout/widget_settings_item_backup_code.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textColor="?attr/primary_100" android:id="@+id/item_backup_code_tv" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:foreground="?attr/selectableItemBackground" android:fontFamily="?attr/font_monospace" style="@style/res_2131952570_uikit_textview_large"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textColor="?attr/primary_100" android:id="@+id/item_backup_code_tv" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:foreground="?attr/selectableItemBackground" android:fontFamily="?attr/font_monospace" style="@style/UiKit_TextView_Large"/>
diff --git a/app/src/main/res/layout/widget_settings_item_backup_code_header.xml b/app/src/main/res/layout/widget_settings_item_backup_code_header.xml
index 06f102e205..c6707b8cdf 100644
--- a/app/src/main/res/layout/widget_settings_item_backup_code_header.xml
+++ b/app/src/main/res/layout/widget_settings_item_backup_code_header.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_header" style="@style/res_2131952496_uikit_settings_item_header"/>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_header" style="@style/UiKit_Settings_Item_Header"/>
diff --git a/app/src/main/res/layout/widget_settings_item_blocked_user.xml b/app/src/main/res/layout/widget_settings_item_blocked_user.xml
index ca26547139..2e9f921388 100644
--- a/app/src/main/res/layout/widget_settings_item_blocked_user.xml
+++ b/app/src/main/res/layout/widget_settings_item_blocked_user.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/blocked_user_item" style="@style/res_2131951898_blockeduserslist_item">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/blocked_user_item_avatar" android:layout_centerVertical="true" style="@style/res_2131951899_blockeduserslist_item_avatar"/>
-    <TextView android:id="@+id/blocked_user_item_name" android:text="@string/sample_user_name" android:layout_centerVertical="true" android:layout_toStartOf="@+id/unblock_user_button" android:layout_toEndOf="@+id/blocked_user_item_avatar" style="@style/res_2131951900_blockeduserslist_item_name"/>
-    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/unblock_user_button" android:text="@string/user_settings_blocked_users_unblockbutton" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/res_2131951901_blockeduserslist_item_unblockbutton"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/blocked_user_item" style="@style/BlockedUsersList_Item">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/blocked_user_item_avatar" android:layout_centerVertical="true" style="@style/BlockedUsersList_Item_Avatar"/>
+    <TextView android:id="@+id/blocked_user_item_name" android:text="@string/sample_user_name" android:layout_centerVertical="true" android:layout_toStartOf="@+id/unblock_user_button" android:layout_toEndOf="@+id/blocked_user_item_avatar" style="@style/BlockedUsersList_Item_Name"/>
+    <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/unblock_user_button" android:text="@string/user_settings_blocked_users_unblockbutton" android:singleLine="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/BlockedUsersList_Item_UnblockButton"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_settings_item_connected_account.xml b/app/src/main/res/layout/widget_settings_item_connected_account.xml
index 1d74aa10e4..c5bcf9c1d8 100644
--- a/app/src/main/res/layout/widget_settings_item_connected_account.xml
+++ b/app/src/main/res/layout/widget_settings_item_connected_account.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_margin="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp" style="@style/res_2131952589_uikit_viewgroup">
-    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/selectableItemBackground" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_margin="8dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp" style="@style/UiKit_ViewGroup">
+    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <View android:background="?attr/colorBackgroundSecondaryAlt" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toTopOf="@+id/connected_account_divider" app:layout_constraintTop_toTopOf="0"/>
-        <ImageView android:id="@+id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="16dp" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:id="@+id/connected_account_name" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="@+id/connected_account_img" app:layout_constraintLeft_toRightOf="@+id/connected_account_img" app:layout_constraintRight_toLeftOf="@+id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@+id/connected_account_img" style="@style/res_2131952571_uikit_textview_large_singleline"/>
-        <ImageView android:id="@+id/connected_account_disconnect" android:padding="4dp" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/connected_account_img" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/connected_account_img" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952449_uikit_imageview_clickable"/>
-        <View android:id="@+id/connected_account_divider" android:layout_height="0.5dp" android:layout_marginTop="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/connected_account_img" style="@style/res_2131952416_uikit_divider"/>
-        <LinearLayout android:paddingTop="8dp" android:paddingBottom="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/connected_account_divider" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/display_switch" android:text="@string/display_on_profile" style="@style/res_2131951915_connections_switch"/>
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/display_activity_switch" android:text="@string/display_activity" style="@style/res_2131951915_connections_switch"/>
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/sync_friends_switch" android:text="@string/sync_friends" style="@style/res_2131951915_connections_switch"/>
-            <TextView android:id="@+id/extra_info" android:padding="16dp" android:visibility="gone" app:drawableEndCompat="?attr/ic_open_in_new_24dp" style="@style/res_2131952563_uikit_textview"/>
-            <LinearLayout android:id="@+id/integrations_root" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View android:id="@+id/divider" android:layout_width="match_parent" android:layout_marginBottom="16dp" style="@style/res_2131952417_uikit_divider_thick"/>
-                <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:id="@+id/label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/sub_enabled_servers" android:textAllCaps="true" style="@style/res_2131952563_uikit_textview"/>
+        <ImageView android:id="@+id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="16dp" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+        <TextView android:id="@+id/connected_account_name" android:layout_width="0dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="@+id/connected_account_img" app:layout_constraintLeft_toRightOf="@+id/connected_account_img" app:layout_constraintRight_toLeftOf="@+id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@+id/connected_account_img" style="@style/UiKit_TextView_Large_SingleLine"/>
+        <ImageView android:id="@+id/connected_account_disconnect" android:padding="4dp" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="@+id/connected_account_img" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="@+id/connected_account_img" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_ImageView_Clickable"/>
+        <View android:id="@+id/connected_account_divider" android:layout_height="0.5dp" android:layout_marginTop="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/connected_account_img" style="@style/UiKit_Divider"/>
+        <LinearLayout android:paddingTop="8dp" android:paddingBottom="8dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/connected_account_divider" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/display_switch" android:text="@string/display_on_profile" style="@style/Connections_Switch"/>
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/display_activity_switch" android:text="@string/display_activity" style="@style/Connections_Switch"/>
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections_Switch"/>
+            <TextView android:id="@+id/extra_info" android:padding="16dp" android:visibility="gone" app:drawableEndCompat="?attr/ic_open_in_new_24dp" style="@style/UiKit_TextView"/>
+            <LinearLayout android:id="@+id/integrations_root" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View android:id="@+id/divider" android:layout_width="match_parent" android:layout_marginBottom="16dp" style="@style/UiKit_Divider_Thick"/>
+                <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:id="@+id/label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/sub_enabled_servers" android:textAllCaps="true" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_settings_language.xml b/app/src/main/res/layout/widget_settings_language.xml
index 5a86f334d7..f64f684d30 100644
--- a/app/src/main/res/layout/widget_settings_language.xml
+++ b/app/src/main/res/layout/widget_settings_language.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView style="@style/res_2131952609_uikit_viewgroup_relativelayout_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/settings_language_header" android:text="@string/language" style="@style/res_2131952496_uikit_settings_item_header"/>
+    <ScrollView style="@style/UiKit_ViewGroup_RelativeLayout_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/settings_language_header" android:text="@string/language" style="@style/UiKit_Settings_Item_Header"/>
             <RelativeLayout android:id="@+id/settings_language_current" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textColor="?attr/primary_100" android:text="@string/language" android:layout_toStartOf="@+id/settings_language_current_flag" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-                <ImageView android:id="@+id/settings_language_current_flag" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_centerVertical="true" android:contentDescription="@string/language_select" android:layout_toStartOf="@+id/settings_language_current_text" style="@style/res_2131952448_uikit_imageview"/>
-                <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_language_current_text" android:drawablePadding="16dp" android:layout_alignParentEnd="true" app:drawableEndCompat="@drawable/icon_carrot" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:textColor="?attr/primary_100" android:text="@string/language" android:layout_toStartOf="@+id/settings_language_current_flag" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+                <ImageView android:id="@+id/settings_language_current_flag" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_centerVertical="true" android:contentDescription="@string/language_select" android:layout_toStartOf="@+id/settings_language_current_text" style="@style/UiKit_ImageView"/>
+                <TextView android:textColor="?attr/primary_100" android:id="@+id/settings_language_current_text" android:drawablePadding="16dp" android:layout_alignParentEnd="true" app:drawableEndCompat="@drawable/icon_carrot" style="@style/UiKit_TextView"/>
             </RelativeLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/settings_language_sync_header" android:text="@string/sync" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_language_sync_check" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/settings_sync" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/settings_language_sync_header" android:text="@string/sync" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_language_sync_check" android:layout_width="match_parent" android:layout_height="wrap_content" app:cs_text="@string/settings_sync" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
         </LinearLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_language_select.xml b/app/src/main/res/layout/widget_settings_language_select.xml
index eaab0a4592..1be8f0a7b1 100644
--- a/app/src/main/res/layout/widget_settings_language_select.xml
+++ b/app/src/main/res/layout/widget_settings_language_select.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <TextView android:text="@string/language_select" style="@style/res_2131952506_uikit_sheet_header_title"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <TextView android:text="@string/language_select" style="@style/UiKit_Sheet_Header_Title"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <View style="@style/res_2131952416_uikit_divider"/>
-        <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/settings_language_select_list" android:scrollbars="vertical" android:overScrollMode="never" app:max_height_screen_ratio="0.5" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+        <View style="@style/UiKit_Divider"/>
+        <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/settings_language_select_list" android:scrollbars="vertical" android:overScrollMode="never" app:max_height_screen_ratio="0.5" style="@style/UiKit_ViewGroup_RecyclerView"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_settings_language_select_item.xml b/app/src/main/res/layout/widget_settings_language_select_item.xml
index d6523841a1..0574fb500e 100644
--- a/app/src/main/res/layout/widget_settings_language_select_item.xml
+++ b/app/src/main/res/layout/widget_settings_language_select_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/bg_pressed_highlight" android:padding="8dp" style="@style/res_2131952589_uikit_viewgroup">
-    <ImageView android:id="@+id/flag_icon" android:src="@drawable/icon_flag_bg" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/flag_icon_barrier" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/bg_pressed_highlight" android:padding="8dp" style="@style/UiKit_ViewGroup">
+    <ImageView android:id="@+id/flag_icon" android:src="@drawable/icon_flag_bg" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/flag_icon_barrier" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/flag_icon_barrier" android:layout_width="0dp" android:layout_height="match_parent" app:barrierDirection="6" app:constraint_referenced_ids="flag_icon"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/settings_language_select_item_name_localized" app:layout_constraintBottom_toTopOf="@+id/settings_language_select_item_name" app:layout_constraintStart_toEndOf="@+id/flag_icon_barrier" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/settings_language_select_item_name" android:text="@string/locale" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/flag_icon_barrier" style="@style/res_2131952563_uikit_textview"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/settings_language_select_item_name_localized" app:layout_constraintBottom_toTopOf="@+id/settings_language_select_item_name" app:layout_constraintStart_toEndOf="@+id/flag_icon_barrier" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/settings_language_select_item_name" android:text="@string/locale" android:singleLine="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toEndOf="@+id/flag_icon_barrier" style="@style/UiKit_TextView"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_settings_media.xml b/app/src/main/res/layout/widget_settings_media.xml
index 592713383b..8618e79424 100644
--- a/app/src/main/res/layout/widget_settings_media.xml
+++ b/app/src/main/res/layout/widget_settings_media.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_text_images_display_header" android:text="@string/inline_media_label" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_text_images_embeds_toggle" app:cs_text="@string/inline_embed_media" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/attachments_toggle" app:cs_subtext="@string/inline_attachment_media_help" app:cs_text="@string/inline_attachment_media" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <TextView android:id="@+id/settings_text_images_stickers_header" android:text="@string/stickers_auto_play_heading" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/stickers_suggestions" app:cs_subtext="@string/auto_suggest_stickers_description" app:cs_text="@string/auto_suggest_stickers" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_text_images_compression_header" android:text="@string/image_compression" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/compression_toggle" app:cs_text="@string/image_compression_label" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/compression_toggle_subtext" android:paddingTop="4dp" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_text_images_preview_header" android:text="@string/render_embeds_label" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_text_images_links_toggle" app:cs_text="@string/render_embeds" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_text_images_sync_header" android:text="@string/sync" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_text_images_sync_toggle" app:cs_text="@string/settings_sync" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_text_images_display_header" android:text="@string/inline_media_label" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_text_images_embeds_toggle" app:cs_text="@string/inline_embed_media" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/attachments_toggle" app:cs_subtext="@string/inline_attachment_media_help" app:cs_text="@string/inline_attachment_media" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <TextView android:id="@+id/settings_text_images_stickers_header" android:text="@string/stickers_auto_play_heading" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/stickers_suggestions" app:cs_subtext="@string/auto_suggest_stickers_description" app:cs_text="@string/auto_suggest_stickers" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_text_images_compression_header" android:text="@string/image_compression" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/compression_toggle" app:cs_text="@string/image_compression_label" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/compression_toggle_subtext" android:paddingTop="4dp" style="@style/UiKit_Settings_Item_SubText"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_text_images_preview_header" android:text="@string/render_embeds_label" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_text_images_links_toggle" app:cs_text="@string/render_embeds" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_text_images_sync_header" android:text="@string/sync" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_text_images_sync_toggle" app:cs_text="@string/settings_sync" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_notification_os.xml b/app/src/main/res/layout/widget_settings_notification_os.xml
index 4314a5b4bb..9a1f56236e 100644
--- a/app/src/main/res/layout/widget_settings_notification_os.xml
+++ b/app/src/main/res/layout/widget_settings_notification_os.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <com.discord.views.CheckedSetting android:id="@+id/settings_notification_switch" app:cs_subtext="@string/form_label_mobile_notifications_system_desc" app:cs_text="@string/form_label_mobile_notifications_system_label" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <com.discord.views.CheckedSetting android:id="@+id/settings_inapp_notifs_switch" app:cs_subtext="@string/form_label_mobile_notifications_inapp_desc" app:cs_text="@string/form_label_mobile_notifications_inapp_label" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <RelativeLayout android:id="@+id/settings_notification_os" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/res_2131952492_uikit_settings_item">
-        <TextView android:id="@+id/settings_notification_os_label" android:clickable="false" android:text="@string/form_label_mobile_notifications_os_control_jump" android:layout_alignParentTop="true" style="@style/res_2131952500_uikit_settings_text"/>
-        <TextView android:clickable="false" android:text="@string/form_label_mobile_notifications_os_control_jump_help" android:layout_below="@+id/settings_notification_os_label" style="@style/res_2131952581_uikit_textview_subtext"/>
-        <ImageView android:src="@drawable/icon_carrot" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_630" style="@style/UiKit_ViewGroup_LinearLayout">
+    <com.discord.views.CheckedSetting android:id="@+id/settings_notification_switch" app:cs_subtext="@string/form_label_mobile_notifications_system_desc" app:cs_text="@string/form_label_mobile_notifications_system_label" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+    <com.discord.views.CheckedSetting android:id="@+id/settings_inapp_notifs_switch" app:cs_subtext="@string/form_label_mobile_notifications_inapp_desc" app:cs_text="@string/form_label_mobile_notifications_inapp_label" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <RelativeLayout android:id="@+id/settings_notification_os" android:background="?attr/selectableItemBackground" android:focusable="true" android:clickable="true" style="@style/UiKit_Settings_Item">
+        <TextView android:id="@+id/settings_notification_os_label" android:clickable="false" android:text="@string/form_label_mobile_notifications_os_control_jump" android:layout_alignParentTop="true" style="@style/UiKit_Settings_Text"/>
+        <TextView android:clickable="false" android:text="@string/form_label_mobile_notifications_os_control_jump_help" android:layout_below="@+id/settings_notification_os_label" style="@style/UiKit_TextView_Subtext"/>
+        <ImageView android:src="@drawable/icon_carrot" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings_notifications.xml b/app/src/main/res/layout/widget_settings_notifications.xml
index c694df23be..7073fd986e 100644
--- a/app/src/main/res/layout/widget_settings_notifications.xml
+++ b/app/src/main/res/layout/widget_settings_notifications.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView style="@style/res_2131951640_apptheme_appbarscrollingviewbehavior">
-        <LinearLayout android:animateLayoutChanges="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:text="@string/form_label_mobile_notifications_inapp_label" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_inapp_notifs_switch" app:cs_text="@string/form_label_mobile_notifications_inapp_desc" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:text="@string/form_label_mobile_notifications_system_label" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_enabled" app:cs_text="@string/form_label_mobile_notifications_system_desc" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <LinearLayout android:id="@+id/settings_notifications_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/form_label_mobile_notifications_behavior" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_blink" app:cs_text="@string/form_label_mobile_notifications_blink" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_vibrations" app:cs_text="@string/form_label_mobile_notifications_vibrations" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
-                <TextView android:text="@string/sounds" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_mute_all" app:cs_text="@string/form_label_mobile_notifications_sound_disable" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+    <ScrollView style="@style/AppTheme_AppBarScrollingViewBehavior">
+        <LinearLayout android:animateLayoutChanges="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:text="@string/form_label_mobile_notifications_inapp_label" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_inapp_notifs_switch" app:cs_text="@string/form_label_mobile_notifications_inapp_desc" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:text="@string/form_label_mobile_notifications_system_label" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_enabled" app:cs_text="@string/form_label_mobile_notifications_system_desc" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <LinearLayout android:id="@+id/settings_notifications_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/form_label_mobile_notifications_behavior" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_blink" app:cs_text="@string/form_label_mobile_notifications_blink" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_vibrations" app:cs_text="@string/form_label_mobile_notifications_vibrations" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View style="@style/UiKit_Settings_Divider"/>
+                <TextView android:text="@string/sounds" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_notifications_mute_all" app:cs_text="@string/form_label_mobile_notifications_sound_disable" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/widget_settings_premium.xml b/app/src/main/res/layout/widget_settings_premium.xml
index 38e338e0f0..ac9d074317 100644
--- a/app/src/main/res/layout/widget_settings_premium.xml
+++ b/app/src/main/res/layout/widget_settings_premium.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/premium_settings_view_flipper" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <ScrollView android:id="@+id/premium_settings_scrollview" android:clipToPadding="false" style="@style/res_2131952610_uikit_viewgroup_scrollview">
+    <com.discord.app.AppViewFlipper android:id="@+id/premium_settings_view_flipper" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <ScrollView android:id="@+id/premium_settings_scrollview" android:clipToPadding="false" style="@style/UiKit_ViewGroup_ScrollView">
             <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
                 <ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_pattern" android:layout_width="match_parent" android:layout_height="270sp" android:importantForAccessibility="no" app:layout_constraintTop_toTopOf="0"/>
                 <ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_classic_pattern" android:layout_width="match_parent" android:layout_height="270sp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0"/>
-                <LinearLayout android:layout_width="0dp" android:layout_marginTop="24dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_max="500dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <LinearLayout android:id="@+id/premium_settings_subscription_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+                <LinearLayout android:layout_width="0dp" android:layout_marginTop="24dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintWidth_max="500dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <LinearLayout android:id="@+id/premium_settings_subscription_container" style="@style/UiKit_ViewGroup_LinearLayout">
                         <androidx.cardview.widget.CardView android:id="@+id/premium_settings_status_notice_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="4dp">
-                            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                                <com.google.android.flexbox.FlexboxLayout android:gravity="center_vertical" app:flexWrap="0" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+                            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                                <com.google.android.flexbox.FlexboxLayout android:gravity="center_vertical" app:flexWrap="0" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                                     <ImageView android:layout_width="48dp" android:layout_height="28dp" android:layout_marginTop="8dp" android:src="@drawable/ic_info_24dp" android:importantForAccessibility="no" android:layout_marginStart="8dp"/>
-                                    <TextView android:id="@+id/premium_settings_status_notice_tv" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:paddingStart="4dp" android:paddingEnd="4dp" style="@style/res_2131952563_uikit_textview"/>
+                                    <TextView android:id="@+id/premium_settings_status_notice_tv" android:paddingTop="8dp" android:paddingBottom="8dp" android:layout_width="match_parent" android:paddingStart="4dp" android:paddingEnd="4dp" style="@style/UiKit_TextView"/>
                                 </com.google.android.flexbox.FlexboxLayout>
                                 <Button android:textSize="12sp" android:textColor="@color/white" android:id="@+id/premium_settings_status_notice_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:textAllCaps="false" android:layout_marginStart="4dp" android:layout_marginEnd="4dp"/>
                             </LinearLayout>
                         </androidx.cardview.widget.CardView>
-                        <TextView android:id="@+id/premium_settings_subscriptions_header" android:text="@string/premium_settings_subscriptions_mobile_header" style="@style/res_2131952496_uikit_settings_item_header"/>
-                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@+id/premium_settings_grandfathered" android:background="@drawable/drawable_bg_nitro_gradient" android:padding="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_white" style="@style/res_2131952563_uikit_textview"/>
+                        <TextView android:id="@+id/premium_settings_subscriptions_header" android:text="@string/premium_settings_subscriptions_mobile_header" style="@style/UiKit_Settings_Item_Header"/>
+                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@+id/premium_settings_grandfathered" android:background="@drawable/drawable_bg_nitro_gradient" android:padding="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:drawablePadding="8dp" app:drawableStartCompat="@drawable/ic_nitro_badge_white" style="@style/UiKit_TextView"/>
                         <com.discord.views.ActiveSubscriptionView android:id="@+id/premium_settings_active_subscription" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp"/>
                         <com.discord.views.ActiveSubscriptionView android:id="@+id/premium_settings_active_guild_subscription" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp"/>
-                        <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/billing_payment_premium_description" style="@style/res_2131952563_uikit_textview"/>
+                        <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/billing_payment_premium_description" style="@style/UiKit_TextView"/>
                     </LinearLayout>
                     <include android:id="@+id/payment" layout="@layout/layout_premium_settings_payment"/>
-                    <LinearLayout android:id="@+id/premium_settings_credit_container" android:layout_marginTop="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                        <TextView android:id="@+id/premium_settings_credit_header" android:text="@string/billing_subscription_credit" style="@style/res_2131952496_uikit_settings_item_header"/>
+                    <LinearLayout android:id="@+id/premium_settings_credit_container" android:layout_marginTop="8dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                        <TextView android:id="@+id/premium_settings_credit_header" android:text="@string/billing_subscription_credit" style="@style/UiKit_Settings_Item_Header"/>
                         <include android:id="@+id/account_credits" layout="@layout/layout_account_credits_list"/>
-                        <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/billing_account_credit_description" style="@style/res_2131952563_uikit_textview"/>
+                        <TextView android:textColor="?attr/colorHeaderSecondary" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/billing_account_credit_description" style="@style/UiKit_TextView"/>
                     </LinearLayout>
                     <include android:id="@+id/premium_tier_2" layout="@layout/view_premium_settings_tier_2"/>
                     <include android:id="@+id/premium_perks" layout="@layout/view_premium_settings_perks"/>
                     <include android:id="@+id/premium_tier_1" layout="@layout/view_premium_settings_tier_1"/>
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/premium_settings_legalese" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:id="@+id/premium_settings_legalese" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </ScrollView>
         <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-        <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/premium_settings_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/res_2131952467_uikit_material_button_secondary"/>
+        <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_marginBottom="8dp" android:src="@drawable/img_poop_dark" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/premium_settings_retry" android:layout_width="wrap_content" android:text="@string/retry" style="@style/UiKit_Material_Button_Secondary"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_privacy.xml b/app/src/main/res/layout/widget_settings_privacy.xml
index d361201ef8..b7201e7984 100644
--- a/app/src/main/res/layout/widget_settings_privacy.xml
+++ b/app/src/main/res/layout/widget_settings_privacy.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_privacy_safe_messaging_header" android:text="@string/user_explicit_content_filter" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/user_explicit_content_filter_help" style="@style/res_2131952492_uikit_settings_item"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_2" app:cs_subtext="@string/user_explicit_content_filter_friends_and_non_friends_help" app:cs_text="@string/user_explicit_content_filter_friends_and_non_friends" app:cs_text_color="@color/status_green_600" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_1" app:cs_subtext="@string/user_explicit_content_filter_non_friends_help" app:cs_text="@string/user_explicit_content_filter_non_friends" app:cs_text_color="@color/status_yellow_560" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_0" app:cs_subtext="@string/user_explicit_content_filter_disabled_help" app:cs_text="@string/user_explicit_content_filter_disabled" app:cs_text_color="@color/status_red_500" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_privacy_defaults_header" android:text="@string/user_dm_settings" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_default_restricted_guilds" app:cs_subtext="@string/user_dm_settings_help" app:cs_text="@string/new_guilds_dm_allowed" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_privacy_friend_source_header" android:text="@string/friend_permitted_source" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_0" app:cs_text="@string/friend_permitted_source_all" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_1" app:cs_text="@string/friend_permitted_source_mutual_friends" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_2" app:cs_text="@string/friend_permitted_source_mutual_guilds" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/settings_privacy_contact_sync" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_privacy_contact_sync_title" android:text="@string/contact_sync_title" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_staff_only" app:cs_text="STAFF ONLY - Contact Sync Connection" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_enabled" app:cs_text="@string/contact_sync_setting_label" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_setting_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/contact_sync_info_settings_2" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_info_2" style="@style/res_2131952563_uikit_textview"/>
-                <TextView android:text="@string/contact_sync_info_permissions_form_header" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_phone" app:cs_subtext="@string/contact_sync_info_phone" app:cs_text="@string/form_label_phone_number" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_email" app:cs_subtext="@string/contact_sync_info_email" app:cs_text="@string/email" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_privacy_safe_messaging_header" android:text="@string/user_explicit_content_filter" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:text="@string/user_explicit_content_filter_help" style="@style/UiKit_Settings_Item"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_2" app:cs_subtext="@string/user_explicit_content_filter_friends_and_non_friends_help" app:cs_text="@string/user_explicit_content_filter_friends_and_non_friends" app:cs_text_color="@color/status_green_600" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_1" app:cs_subtext="@string/user_explicit_content_filter_non_friends_help" app:cs_text="@string/user_explicit_content_filter_non_friends" app:cs_text_color="@color/status_yellow_560" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_explicit_0" app:cs_subtext="@string/user_explicit_content_filter_disabled_help" app:cs_text="@string/user_explicit_content_filter_disabled" app:cs_text_color="@color/status_red_500" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_privacy_defaults_header" android:text="@string/user_dm_settings" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_default_restricted_guilds" app:cs_subtext="@string/user_dm_settings_help" app:cs_text="@string/new_guilds_dm_allowed" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_privacy_friend_source_header" android:text="@string/friend_permitted_source" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_0" app:cs_text="@string/friend_permitted_source_all" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_1" app:cs_text="@string/friend_permitted_source_mutual_friends" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_friend_source_2" app:cs_text="@string/friend_permitted_source_mutual_guilds" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/settings_privacy_contact_sync" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_privacy_contact_sync_title" android:text="@string/contact_sync_title" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_staff_only" app:cs_text="STAFF ONLY - Contact Sync Connection" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_enabled" app:cs_text="@string/contact_sync_setting_label" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/contact_sync_setting_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/contact_sync_info_settings_2" style="@style/UiKit_TextView"/>
+                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/contact_sync_info_2" style="@style/UiKit_TextView"/>
+                <TextView android:text="@string/contact_sync_info_permissions_form_header" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_phone" app:cs_subtext="@string/contact_sync_info_phone" app:cs_text="@string/form_label_phone_number" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/contact_sync_setting_email" app:cs_subtext="@string/contact_sync_info_email" app:cs_text="@string/email" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/settings_privacy_controls" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_privacy_data_header" android:text="@string/data_privacy_controls" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_statistics" app:cs_subtext="@string/data_privacy_controls_usage_statistics_note" app:cs_text="@string/data_privacy_controls_usage_statistics_title" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_personalization" app:cs_subtext="@string/data_privacy_controls_personalization_note_learn_more" app:cs_text="@string/data_privacy_controls_personalization_title" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_screenreader_detection" app:cs_subtext="@string/data_privacy_controls_allow_accessibility_detection_note" app:cs_text="@string/data_privacy_controls_allow_accessibility_detection_title" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_basic_service" app:cs_subtext="@string/data_privacy_controls_basic_service_note" app:cs_text="@string/data_privacy_controls_basic_service_title" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_request_data" android:text="@string/data_privacy_controls_request_data_download" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952463_uikit_material_button_outline"/>
-                <TextView android:layout_gravity="center_horizontal" android:id="@+id/request_data_link" android:background="?attr/selectableItemBackground" android:padding="8dp" android:layout_marginBottom="16dp" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout android:id="@+id/settings_privacy_controls" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_privacy_data_header" android:text="@string/data_privacy_controls" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_statistics" app:cs_subtext="@string/data_privacy_controls_usage_statistics_note" app:cs_text="@string/data_privacy_controls_usage_statistics_title" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_personalization" app:cs_subtext="@string/data_privacy_controls_personalization_note_learn_more" app:cs_text="@string/data_privacy_controls_personalization_title" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_screenreader_detection" app:cs_subtext="@string/data_privacy_controls_allow_accessibility_detection_note" app:cs_text="@string/data_privacy_controls_allow_accessibility_detection_title" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_privacy_basic_service" app:cs_subtext="@string/data_privacy_controls_basic_service_note" app:cs_text="@string/data_privacy_controls_basic_service_title" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_request_data" android:text="@string/data_privacy_controls_request_data_download" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_Material_Button_Outline"/>
+                <TextView android:layout_gravity="center_horizontal" android:id="@+id/request_data_link" android:background="?attr/selectableItemBackground" android:padding="8dp" android:layout_marginBottom="16dp" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_privacy_defaults.xml b/app/src/main/res/layout/widget_settings_privacy_defaults.xml
index dadd4f4fd2..12aaf8f922 100644
--- a/app/src/main/res/layout/widget_settings_privacy_defaults.xml
+++ b/app/src/main/res/layout/widget_settings_privacy_defaults.xml
@@ -5,7 +5,7 @@
         <TextView android:text="@string/user_dm_settings_question" style="@style/AppAlertDialogText"/>
     </LinearLayout>
     <LinearLayout style="@style/AppAlertDialogFooter">
-        <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_defaults_existing_no" android:text="@string/no_text" style="@style/res_2131952472_uikit_material_button_transparent_fit"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_defaults_existing_yes" android:text="@string/yes_text" style="@style/res_2131952465_uikit_material_button_red_fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_defaults_existing_no" android:text="@string/no_text" style="@style/UiKit_Material_Button_Transparent_Fit"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/settings_privacy_defaults_existing_yes" android:text="@string/yes_text" style="@style/UiKit_Material_Button_Red_Fit"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings_user_profile.xml b/app/src/main/res/layout/widget_settings_user_profile.xml
index e30a2918e4..90ebf1e025 100644
--- a/app/src/main/res/layout/widget_settings_user_profile.xml
+++ b/app/src/main/res/layout/widget_settings_user_profile.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.widgets.settings.profile.TouchInterceptingCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<com.discord.widgets.settings.profile.TouchInterceptingCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/settings_profile_scroll" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:id="@+id/profile_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <androidx.core.widget.NestedScrollView android:id="@+id/settings_profile_scroll" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:id="@+id/profile_container" style="@style/UiKit_ViewGroup_LinearLayout">
             <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@+id/user_settings_profile_header_view" android:layout_width="match_parent" android:layout_height="wrap_content" app:user_profile_header_background_color="?attr/toolbarColor"/>
-            <TextView android:id="@+id/bio_header" android:text="@string/user_popout_about_me" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView android:id="@+id/bio_preview_card" app:cardBackgroundColor="?attr/colorBackgroundSecondary" style="@style/res_2131952619_userprofile_section_card">
-                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/bio_preview_text" android:padding="16dp" android:maxLines="6" android:lineSpacingMultiplier="1.25" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:id="@+id/bio_header" android:text="@string/user_popout_about_me" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView android:id="@+id/bio_preview_card" app:cardBackgroundColor="?attr/colorBackgroundSecondary" style="@style/UserProfile_Section_Card">
+                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/bio_preview_text" android:padding="16dp" android:maxLines="6" android:lineSpacingMultiplier="1.25" style="@style/UiKit_TextView"/>
             </androidx.cardview.widget.CardView>
-            <androidx.cardview.widget.CardView android:id="@+id/bio_editor_card" app:cardBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:strokeColor="?attr/colorBackgroundTertiary" app:strokeWidth="1dp" style="@style/res_2131952619_userprofile_section_card">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/bio_editor_text_input_field_wrap" android:layout_marginBottom="8dp" android:hint="@string/user_settings_about_me_hint" app:boxBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:counterEnabled="true" app:counterMaxLength="@integer/custom_profiles_bio_max_length" style="@style/res_2131952545_uikit_textinputlayout">
-                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/bio_editor_text_input_field" android:maxLines="6" android:maxLength="@integer/custom_profiles_bio_max_length" android:imeOptions="actionUnspecified" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+            <androidx.cardview.widget.CardView android:id="@+id/bio_editor_card" app:cardBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:strokeColor="?attr/colorBackgroundTertiary" app:strokeWidth="1dp" style="@style/UserProfile_Section_Card">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/bio_editor_text_input_field_wrap" android:layout_marginBottom="8dp" android:hint="@string/user_settings_about_me_hint" app:boxBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:counterEnabled="true" app:counterMaxLength="@integer/custom_profiles_bio_max_length" style="@style/UiKit_TextInputLayout">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/bio_editor_text_input_field" android:maxLines="6" android:maxLength="@integer/custom_profiles_bio_max_length" android:imeOptions="actionUnspecified" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/save_fab" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/save_fab" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </com.discord.widgets.settings.profile.TouchInterceptingCoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_voice.xml b/app/src/main/res/layout/widget_settings_voice.xml
index 5b74f93e18..96dc62d498 100644
--- a/app/src/main/res/layout/widget_settings_voice.xml
+++ b/app/src/main/res/layout/widget_settings_voice.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/voice_and_video" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/back" app:navigationIcon="?attr/ic_action_bar_back" app:subtitle="@string/user_settings" app:title="@string/voice_and_video" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/settings_voice_input_header" android:text="@string/form_label_input" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <RelativeLayout android:id="@+id/settings_voice_mode" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_voice_mode_header" android:text="@string/form_label_input_mode" style="@style/res_2131952498_uikit_settings_item_label"/>
-                <TextView android:id="@+id/settings_voice_mode_value" android:layout_below="@+id/settings_voice_mode_header" style="@style/res_2131952493_uikit_settings_item_addition"/>
-                <ImageView android:src="?attr/ic_navigate_next" android:layout_centerVertical="true" android:contentDescription="@string/form_label_input_mode" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/res_2131952448_uikit_imageview"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/settings_voice_input_header" android:text="@string/form_label_input" style="@style/UiKit_Settings_Item_Header"/>
+            <RelativeLayout android:id="@+id/settings_voice_mode" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_voice_mode_header" android:text="@string/form_label_input_mode" style="@style/UiKit_Settings_Item_Label"/>
+                <TextView android:id="@+id/settings_voice_mode_value" android:layout_below="@+id/settings_voice_mode_header" style="@style/UiKit_Settings_Item_Addition"/>
+                <ImageView android:src="?attr/ic_navigate_next" android:layout_centerVertical="true" android:contentDescription="@string/form_label_input_mode" android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" style="@style/UiKit_ImageView"/>
             </RelativeLayout>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_auto_vad_toggle" app:cs_text="@string/form_label_automatic_vad_mobile" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <RelativeLayout android:id="@+id/settings_voice_sensitivity_wrap" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/res_2131952589_uikit_viewgroup">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:ellipsize="end" android:id="@+id/settings_voice_sensitivity_header" android:text="@string/form_label_sensitivty" android:maxLines="1" android:layout_alignBaseline="@+id/settings_voice_sensitivity_test_button" android:importantForAccessibility="no" android:layout_toStartOf="@+id/settings_voice_sensitivity_test_button" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/primary_100" android:ellipsize="end" android:id="@+id/settings_voice_sensitivity_test_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/form_label_test_microphone" android:maxLines="1" android:layout_alignParentEnd="true" app:icon="?attr/ic_mic" app:iconTint="?attr/primary_100" style="@style/res_2131952474_uikit_material_button_white_outline"/>
-                <LinearLayout android:id="@+id/settings_voice_sensitivity_testing_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/settings_voice_sensitivity_header" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_auto_vad_toggle" app:cs_text="@string/form_label_automatic_vad_mobile" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <RelativeLayout android:id="@+id/settings_voice_sensitivity_wrap" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:ellipsize="end" android:id="@+id/settings_voice_sensitivity_header" android:text="@string/form_label_sensitivty" android:maxLines="1" android:layout_alignBaseline="@+id/settings_voice_sensitivity_test_button" android:importantForAccessibility="no" android:layout_toStartOf="@+id/settings_voice_sensitivity_test_button" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/primary_100" android:ellipsize="end" android:id="@+id/settings_voice_sensitivity_test_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/form_label_test_microphone" android:maxLines="1" android:layout_alignParentEnd="true" app:icon="?attr/ic_mic" app:iconTint="?attr/primary_100" style="@style/UiKit_Material_Button_White_Outline"/>
+                <LinearLayout android:id="@+id/settings_voice_sensitivity_testing_container" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/settings_voice_sensitivity_header" style="@style/UiKit_ViewGroup_LinearLayout">
                     <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-                        <SeekBar android:id="@+id/settings_voice_sensitivity_manual" android:layout_height="32dp" android:layout_marginTop="4dp" android:progressDrawable="@drawable/drawable_voice_sensitivity_progress" android:contentDescription="@string/form_label_sensitivty" style="@style/res_2131952488_uikit_seekbar"/>
+                        <SeekBar android:id="@+id/settings_voice_sensitivity_manual" android:layout_height="32dp" android:layout_marginTop="4dp" android:progressDrawable="@drawable/drawable_voice_sensitivity_progress" android:contentDescription="@string/form_label_sensitivty" style="@style/UiKit_SeekBar"/>
                         <View android:layout_gravity="center_vertical" android:id="@+id/settings_voice_sensitivity_automatic" android:background="@drawable/drawable_voice_indicator_speaking" android:layout_width="match_parent" android:layout_height="8dp" android:layout_marginLeft="2dp" android:layout_marginTop="4dp" android:layout_marginRight="2dp" android:layout_marginBottom="2dp" android:contentDescription="@string/form_label_sensitivty"/>
                     </FrameLayout>
-                    <TextView android:id="@+id/settings_voice_sensitivity_label" android:text="@string/form_help_automatic_vad" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:id="@+id/settings_voice_sensitivity_label" android:text="@string/form_help_automatic_vad" style="@style/UiKit_TextView"/>
                 </LinearLayout>
             </RelativeLayout>
-            <View android:layout_marginTop="0dp" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_voice_output_header" android:text="@string/form_label_output" style="@style/res_2131952496_uikit_settings_item_header"/>
+            <View android:layout_marginTop="0dp" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_voice_output_header" android:text="@string/form_label_output" style="@style/UiKit_Settings_Item_Header"/>
             <LinearLayout android:orientation="vertical" android:id="@+id/settings_voice_output_volume_wrap" android:background="@drawable/drawable_bg_settings_item" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:text="@string/form_label_volume" android:labelFor="@+id/settings_voice_output_volume" style="@style/res_2131952563_uikit_textview"/>
-                <SeekBar android:id="@+id/settings_voice_output_volume" android:layout_marginTop="4dp" style="@style/res_2131952488_uikit_seekbar"/>
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:text="@string/form_label_volume" android:labelFor="@+id/settings_voice_output_volume" style="@style/UiKit_TextView"/>
+                <SeekBar android:id="@+id/settings_voice_output_volume" android:layout_marginTop="4dp" style="@style/UiKit_SeekBar"/>
             </LinearLayout>
-            <View android:layout_marginTop="0dp" style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/settings_voice_video_troubleshooting_guide" android:text="@string/form_help_voice_video_troubleshooting_guide" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-            <View android:layout_marginTop="0dp" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_voice_overlay_header" android:text="@string/settings_games_overlay" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_overlay_toggle" app:cs_subtext="@string/overlay_mobile_toggle_desc" app:cs_text="@string/overlay_mobile_toggle_label" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_voice_processing_header" android:text="@string/form_label_voice_processing" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_noise_cancellation_toggle" app:cs_subtext="@string/user_settings_noise_cancellation_description" app:cs_text="@string/user_settings_noise_cancellation" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <TextView android:id="@+id/settings_voice_krisp_info" android:text="@string/learn_more_link" android:drawablePadding="12dp" app:drawableStartCompat="?attr/ic_krisp_logo" style="@style/res_2131952497_uikit_settings_item_icon"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_echo_cancellation_toggle" app:cs_text="@string/echo_cancellation" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_noise_suppression_toggle" app:cs_text="@string/noise_suppression" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_gain_control_toggle" app:cs_text="@string/automatic_gain_control" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_krisp_vad_toggle" app:cs_subtext="@string/user_settings_disable_advanced_voice_activity" app:cs_text="@string/advanced_voice_activity" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/settings_voice_video_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/settings_voice_video_header" android:text="@string/video" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/settings_voice_enable_hardware_scaling_toggle" app:cs_subtext="@string/mobile_enable_hardware_scaling_desc" app:cs_text="@string/mobile_enable_hardware_scaling" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <View android:layout_marginTop="0dp" style="@style/UiKit_Settings_Divider"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/settings_voice_video_troubleshooting_guide" android:text="@string/form_help_voice_video_troubleshooting_guide" style="@style/UiKit_Settings_Item_SubText"/>
+            <View android:layout_marginTop="0dp" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_voice_overlay_header" android:text="@string/settings_games_overlay" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_overlay_toggle" app:cs_subtext="@string/overlay_mobile_toggle_desc" app:cs_text="@string/overlay_mobile_toggle_label" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_voice_processing_header" android:text="@string/form_label_voice_processing" style="@style/UiKit_Settings_Item_Header"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_noise_cancellation_toggle" app:cs_subtext="@string/user_settings_noise_cancellation_description" app:cs_text="@string/user_settings_noise_cancellation" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <TextView android:id="@+id/settings_voice_krisp_info" android:text="@string/learn_more_link" android:drawablePadding="12dp" app:drawableStartCompat="?attr/ic_krisp_logo" style="@style/UiKit_Settings_Item_Icon"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_echo_cancellation_toggle" app:cs_text="@string/echo_cancellation" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_noise_suppression_toggle" app:cs_text="@string/noise_suppression" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_gain_control_toggle" app:cs_text="@string/automatic_gain_control" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_krisp_vad_toggle" app:cs_subtext="@string/user_settings_disable_advanced_voice_activity" app:cs_text="@string/advanced_voice_activity" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/settings_voice_video_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/settings_voice_video_header" android:text="@string/video" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/settings_voice_enable_hardware_scaling_toggle" app:cs_subtext="@string/mobile_enable_hardware_scaling_desc" app:cs_text="@string/mobile_enable_hardware_scaling" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/settings_voice_opensl_header" android:text="@string/form_label_android_opensl" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <TextView android:id="@+id/settings_voice_opensles_help" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_opensles_default" app:cs_subtext="@string/form_label_android_opensl_default_desc" app:cs_text="@string/form_label_android_opensl_default" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_opensles_force_enabled" app:cs_subtext="@string/form_label_android_opensl_force_enabled_desc" app:cs_text="@string/form_label_android_opensl_force_enabled" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_opensles_force_disabled" app:cs_subtext="@string/form_label_android_opensl_force_disabled_desc" app:cs_text="@string/form_label_android_opensl_force_disabled" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/settings_voice_opensl_header" android:text="@string/form_label_android_opensl" style="@style/UiKit_Settings_Item_Header"/>
+            <TextView android:id="@+id/settings_voice_opensles_help" style="@style/UiKit_Settings_Item_SubText"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_opensles_default" app:cs_subtext="@string/form_label_android_opensl_default_desc" app:cs_text="@string/form_label_android_opensl_default" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_opensles_force_enabled" app:cs_subtext="@string/form_label_android_opensl_force_enabled_desc" app:cs_text="@string/form_label_android_opensl_force_enabled" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/settings_voice_opensles_force_disabled" app:cs_subtext="@string/form_label_android_opensl_force_disabled_desc" app:cs_text="@string/form_label_android_opensl_force_disabled" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_settings_voice_input_mode.xml b/app/src/main/res/layout/widget_settings_voice_input_mode.xml
index 2774b1a30d..814b58a60c 100644
--- a/app/src/main/res/layout/widget_settings_voice_input_mode.xml
+++ b/app/src/main/res/layout/widget_settings_voice_input_mode.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/form_label_input_mode" android:layout_marginStart="16dp" style="@style/res_2131952506_uikit_sheet_header_title"/>
-        <View style="@style/res_2131952491_uikit_settings_divider"/>
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:id="@+id/settings_voice_input_mode_vad" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/input_mode_vad" style="@style/res_2131952498_uikit_settings_item_label"/>
-                <TextView android:text="@string/switch_to_voice_activity" style="@style/res_2131952493_uikit_settings_item_addition"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/form_label_input_mode" android:layout_marginStart="16dp" style="@style/UiKit_Sheet_Header_Title"/>
+        <View style="@style/UiKit_Settings_Divider"/>
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:id="@+id/settings_voice_input_mode_vad" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/input_mode_vad" style="@style/UiKit_Settings_Item_Label"/>
+                <TextView android:text="@string/switch_to_voice_activity" style="@style/UiKit_Settings_Item_Addition"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/settings_voice_input_mode_ptt" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/input_mode_ptt" style="@style/res_2131952498_uikit_settings_item_label"/>
-                <TextView android:text="@string/switch_to_push_to_talk" style="@style/res_2131952493_uikit_settings_item_addition"/>
+            <LinearLayout android:id="@+id/settings_voice_input_mode_ptt" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/input_mode_ptt" style="@style/UiKit_Settings_Item_Label"/>
+                <TextView android:text="@string/switch_to_push_to_talk" style="@style/UiKit_Settings_Item_Addition"/>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_stage_audience_blocked_bottom_sheet.xml b/app/src/main/res/layout/widget_stage_audience_blocked_bottom_sheet.xml
index f0e5a4d257..62918dd747 100644
--- a/app/src/main/res/layout/widget_stage_audience_blocked_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_stage_audience_blocked_bottom_sheet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/blocked_users" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@+id/accept_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:max_height_screen_ratio="0.75"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/accept_button" android:layout_marginTop="16dp" android:text="@string/stage_blocked_users_accept" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/cancel_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/blocked_users" style="@style/res_2131952458_uikit_material_button"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/cancel_button" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:text="@string/stage_blocked_users_cancel" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/accept_button" style="@style/res_2131952471_uikit_material_button_transparent"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/accept_button" android:layout_marginTop="16dp" android:text="@string/stage_blocked_users_accept" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toTopOf="@+id/cancel_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/blocked_users" style="@style/UiKit_Material_Button"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/cancel_button" android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:text="@string/stage_blocked_users_cancel" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/accept_button" style="@style/UiKit_Material_Button_Transparent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_stage_audience_notice_bottom_sheet.xml b/app/src/main/res/layout/widget_stage_audience_notice_bottom_sheet.xml
index 0b6e0bdc1e..e1fdf27096 100644
--- a/app/src/main/res/layout/widget_stage_audience_notice_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_stage_audience_notice_bottom_sheet.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
-    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_CoordinatorLayout">
+    <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <ImageView android:id="@+id/sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:src="@drawable/stage_channel_audience_notice" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_channel_audience_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/res_2131952519_uikit_stage_title"/>
-        <ImageView android:id="@+id/bullet_1_icon" android:src="@drawable/ic_stage_audience" app:layout_constraintBottom_toBottomOf="@+id/bullet_1_label" app:layout_constraintEnd_toStartOf="@+id/bullet_1_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_1_label" style="@style/res_2131952510_uikit_stage_bullet_icon"/>
-        <TextView android:id="@+id/bullet_1_label" android:text="@string/stage_channel_audience_modal_bullet_1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_1_icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952511_uikit_stage_bullet_label"/>
-        <ImageView android:id="@+id/bullet_2_icon" android:src="@drawable/ic_stage_leave_20dp" app:layout_constraintBottom_toBottomOf="@+id/bullet_2_label" app:layout_constraintEnd_toStartOf="@+id/bullet_2_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_2_label" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952510_uikit_stage_bullet_icon"/>
-        <TextView android:id="@+id/bullet_2_label" android:text="@string/stage_channel_audience_modal_bullet_2" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_2_icon" app:layout_constraintTop_toBottomOf="@+id/bullet_1_label" style="@style/res_2131952511_uikit_stage_bullet_label"/>
-        <ImageView android:id="@+id/bullet_3_icon" android:src="@drawable/ic_stage_raised_hand" app:layout_constraintBottom_toBottomOf="@+id/bullet_3_label" app:layout_constraintEnd_toStartOf="@+id/bullet_3_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_3_label" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952510_uikit_stage_bullet_icon"/>
-        <TextView android:id="@+id/bullet_3_label" android:text="@string/stage_channel_audience_modal_bullet_3" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_3_icon" app:layout_constraintTop_toBottomOf="@+id/bullet_2_label" style="@style/res_2131952511_uikit_stage_bullet_label"/>
-        <ImageView android:id="@+id/bullet_4_icon" android:src="@drawable/ic_status_24dp" app:layout_constraintBottom_toBottomOf="@+id/bullet_4_label" app:layout_constraintEnd_toStartOf="@+id/bullet_4_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_4_label" app:tint="?attr/colorInteractiveNormal" style="@style/res_2131952510_uikit_stage_bullet_icon"/>
-        <TextView android:id="@+id/bullet_4_label" android:text="@string/stage_channel_audience_modal_bullet_4" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_4_icon" app:layout_constraintTop_toBottomOf="@+id/bullet_3_label" style="@style/res_2131952511_uikit_stage_bullet_label"/>
+        <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_channel_audience_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/UiKit_Stage_Title"/>
+        <ImageView android:id="@+id/bullet_1_icon" android:src="@drawable/ic_stage_audience" app:layout_constraintBottom_toBottomOf="@+id/bullet_1_label" app:layout_constraintEnd_toStartOf="@+id/bullet_1_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_1_label" style="@style/UiKit_Stage_Bullet_Icon"/>
+        <TextView android:id="@+id/bullet_1_label" android:text="@string/stage_channel_audience_modal_bullet_1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_1_icon" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_Stage_Bullet_Label"/>
+        <ImageView android:id="@+id/bullet_2_icon" android:src="@drawable/ic_stage_leave_20dp" app:layout_constraintBottom_toBottomOf="@+id/bullet_2_label" app:layout_constraintEnd_toStartOf="@+id/bullet_2_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_2_label" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_Stage_Bullet_Icon"/>
+        <TextView android:id="@+id/bullet_2_label" android:text="@string/stage_channel_audience_modal_bullet_2" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_2_icon" app:layout_constraintTop_toBottomOf="@+id/bullet_1_label" style="@style/UiKit_Stage_Bullet_Label"/>
+        <ImageView android:id="@+id/bullet_3_icon" android:src="@drawable/ic_stage_raised_hand" app:layout_constraintBottom_toBottomOf="@+id/bullet_3_label" app:layout_constraintEnd_toStartOf="@+id/bullet_3_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_3_label" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_Stage_Bullet_Icon"/>
+        <TextView android:id="@+id/bullet_3_label" android:text="@string/stage_channel_audience_modal_bullet_3" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_3_icon" app:layout_constraintTop_toBottomOf="@+id/bullet_2_label" style="@style/UiKit_Stage_Bullet_Label"/>
+        <ImageView android:id="@+id/bullet_4_icon" android:src="@drawable/ic_status_24dp" app:layout_constraintBottom_toBottomOf="@+id/bullet_4_label" app:layout_constraintEnd_toStartOf="@+id/bullet_4_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/bullet_4_label" app:tint="?attr/colorInteractiveNormal" style="@style/UiKit_Stage_Bullet_Icon"/>
+        <TextView android:id="@+id/bullet_4_label" android:text="@string/stage_channel_audience_modal_bullet_4" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/bullet_4_icon" app:layout_constraintTop_toBottomOf="@+id/bullet_3_label" style="@style/UiKit_Stage_Bullet_Label"/>
         <androidx.constraintlayout.widget.Barrier android:id="@+id/bottom_of_bullets" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="bullet_4_icon,bullet_4_label"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/button" android:layout_marginTop="24dp" android:text="@string/stage_channel_audience_modal_action" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bottom_of_bullets" style="@style/res_2131952458_uikit_material_button"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/button" android:layout_marginTop="24dp" android:text="@string/stage_channel_audience_modal_action" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/bottom_of_bullets" style="@style/UiKit_Material_Button"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_stage_channel_audience.xml b/app/src/main/res/layout/widget_stage_channel_audience.xml
index 5225e5fe48..2c7611b21c 100644
--- a/app/src/main/res/layout/widget_stage_channel_audience.xml
+++ b/app/src/main/res/layout/widget_stage_channel_audience.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_audience_member_container" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_channel_audience_member_container" android:paddingLeft="8dp" android:paddingRight="8dp" android:clipChildren="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" style="@style/UiKit_ViewGroup_LinearLayout">
     <com.discord.views.CutoutView android:id="@+id/stage_channel_audience_member_icon_container" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cutout_badgeInset="6dp" app:cutout_badgeRadius="14dp" app:cutout_style="1" app:layout_constraintBottom_toTopOf="@+id/stage_channel_audience_member_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_audience_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/res_2131951674_avatar_large"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/stage_channel_audience_member_icon" android:layout_width="48dp" android:layout_height="48dp" style="@style/Avatar_Large"/>
     </com.discord.views.CutoutView>
     <ImageView android:id="@+id/stage_channel_audience_member_raised_hand" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_stage_raised_hand_24dp_activatable" app:layout_constraintCircle="@+id/stage_channel_audience_member_icon_container" app:layout_constraintCircleAngle="@integer/uikit_badge_angle" app:layout_constraintCircleRadius="26dp"/>
-    <TextView android:textColor="@color/primary_000" android:id="@+id/stage_channel_audience_member_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:drawablePadding="6dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_channel_audience_member_icon_container" style="@style/res_2131952580_uikit_textview_singleline"/>
+    <TextView android:textColor="@color/primary_000" android:id="@+id/stage_channel_audience_member_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:drawablePadding="6dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_channel_audience_member_icon_container" style="@style/UiKit_TextView_SingleLine"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_stage_channel_audience_role.xml b/app/src/main/res/layout/widget_stage_channel_audience_role.xml
index 634953713f..1234a76ee5 100644
--- a/app/src/main/res/layout/widget_stage_channel_audience_role.xml
+++ b/app/src/main/res/layout/widget_stage_channel_audience_role.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="16dp">
-    <TextView android:textColor="@color/primary_300" android:id="@+id/stage_channel_audience_role_text" android:layout_width="0dp" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginStart="8dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952564_uikit_textview_bold"/>
+    <TextView android:textColor="@color/primary_300" android:id="@+id/stage_channel_audience_role_text" android:layout_width="0dp" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginStart="8dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_Bold"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_stage_channel_details.xml b/app/src/main/res/layout/widget_stage_channel_details.xml
index b9b08affdd..14e5cf2cb6 100644
--- a/app/src/main/res/layout/widget_stage_channel_details.xml
+++ b/app/src/main/res/layout/widget_stage_channel_details.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="24dp" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:textColor="@color/white" android:id="@+id/widget_stage_channel_details_topic" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952522_uikit_stage_topic_header"/>
-    <TextView android:ellipsize="end" android:id="@+id/widget_stage_channel_details_name" android:maxLines="1" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="@color/status_green_600" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_dot" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_stage_channel_details_topic" app:layout_constraintWidth_default="1" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:textColor="@color/white" android:id="@+id/widget_stage_channel_details_topic" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_Topic_Header"/>
+    <TextView android:ellipsize="end" android:id="@+id/widget_stage_channel_details_name" android:maxLines="1" app:drawableStartCompat="@drawable/ic_channel_stage_16dp" app:drawableTint="@color/status_green_600" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_dot" app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_chainStyle="2" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_stage_channel_details_topic" app:layout_constraintWidth_default="1" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:layout_gravity="center" android:id="@+id/widget_stage_channel_details_dot" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/stage_channel_dot_separator" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_speaker_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_name" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name"/>
     <ImageView android:id="@+id/widget_stage_channel_details_speaker_icon" android:padding="2dp" android:layout_width="wrap_content" android:layout_height="16dp" android:src="@drawable/ic_mic_white_18dp" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_speaker_count" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_dot" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/widget_stage_channel_details_speaker_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_listener_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_speaker_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/widget_stage_channel_details_speaker_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_listener_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_speaker_icon" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:id="@+id/widget_stage_channel_details_listener_icon" android:padding="2dp" android:layout_width="wrap_content" android:layout_height="16dp" android:src="@drawable/ic_headset_24dp" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_listener_count" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_speaker_count" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/widget_stage_channel_details_listener_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_blocked_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_listener_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/widget_stage_channel_details_listener_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_blocked_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_listener_icon" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:id="@+id/widget_stage_channel_details_blocked_icon" android:padding="2dp" android:layout_width="wrap_content" android:layout_height="16dp" android:src="@drawable/ic_blocked_12dp" android:adjustViewBounds="true" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/widget_stage_channel_details_blocked_count" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_listener_count" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/widget_stage_channel_details_blocked_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/public_dot" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_blocked_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/widget_stage_channel_details_blocked_count" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/public_dot" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_blocked_icon" style="@style/UiKit_Stage_Detail"/>
     <ImageView android:layout_gravity="center" android:id="@+id/public_dot" android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/stage_channel_dot_separator" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toStartOf="@+id/public_icon" app:layout_constraintStart_toEndOf="@+id/widget_stage_channel_details_blocked_count" app:layout_constraintTop_toTopOf="@+id/widget_stage_channel_details_name"/>
     <ImageView android:id="@+id/public_icon" android:layout_width="12dp" android:layout_height="12dp" android:src="@drawable/ic_globe_24dp" android:importantForAccessibility="no" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="@+id/public_text" app:layout_constraintEnd_toStartOf="@+id/public_text" app:layout_constraintStart_toEndOf="@+id/public_dot" app:layout_constraintTop_toTopOf="@+id/public_text" app:tint="@color/primary_300"/>
-    <TextView android:id="@+id/public_text" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/stage_instance_privacy_type_public_label" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/public_icon" style="@style/res_2131952513_uikit_stage_detail"/>
+    <TextView android:id="@+id/public_text" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:text="@string/stage_instance_privacy_type_public_label" app:layout_constraintBaseline_toBaselineOf="@+id/widget_stage_channel_details_name" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/public_icon" style="@style/UiKit_Stage_Detail"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_stage_channel_divider.xml b/app/src/main/res/layout/widget_stage_channel_divider.xml
index 9ea244a038..a138beed4c 100644
--- a/app/src/main/res/layout/widget_stage_channel_divider.xml
+++ b/app/src/main/res/layout/widget_stage_channel_divider.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<View xmlns:android="http://schemas.android.com/apk/res/android" android:background="#03ffffff" android:layout_height="1dp" android:layout_marginTop="32dp" android:layout_marginBottom="24dp" style="@style/res_2131952416_uikit_divider"/>
+<View xmlns:android="http://schemas.android.com/apk/res/android" android:background="#03ffffff" android:layout_height="1dp" android:layout_marginTop="32dp" android:layout_marginBottom="24dp" style="@style/UiKit_Divider"/>
diff --git a/app/src/main/res/layout/widget_stage_channel_moderator_permissions.xml b/app/src/main/res/layout/widget_stage_channel_moderator_permissions.xml
index 03c63c7008..847ca81c70 100644
--- a/app/src/main/res/layout/widget_stage_channel_moderator_permissions.xml
+++ b/app/src/main/res/layout/widget_stage_channel_moderator_permissions.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952593_uikit_viewgroup_coordinatorlayout_page">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout_Page">
     <androidx.core.widget.NestedScrollView android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_behavior="com.discord.app.AppScrollingNestedViewBehavior">
-        <LinearLayout android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/channel_permissions_moderator_description" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952563_uikit_textview"/>
+        <LinearLayout android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/channel_permissions_moderator_description" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView"/>
             <com.discord.widgets.channels.permissions.AddPermissionOwnerView android:id="@+id/add_permission_owner_button" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="18dp" android:paddingRight="18dp" android:focusable="true" android:clickable="true" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:foreground="?attr/selectableItemBackground" android:minHeight="48dp" app:apov_label_text="Add Stage Moderators"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_marginBottom="8dp" android:text="@string/channel_permissions_moderator_current_title" android:textAllCaps="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/res_2131952564_uikit_textview_bold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_marginBottom="8dp" android:text="@string/channel_permissions_moderator_current_title" android:textAllCaps="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" style="@style/UiKit_TextView_Bold"/>
             <com.discord.widgets.channels.permissions.PermissionOwnerListView android:id="@+id/roles_permission_owners_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:nestedScrollingEnabled="false"/>
             <com.discord.widgets.channels.permissions.PermissionOwnerListView android:id="@+id/members_permission_owners_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:nestedScrollingEnabled="false"/>
         </LinearLayout>
diff --git a/app/src/main/res/layout/widget_stage_channel_rich_presence.xml b/app/src/main/res/layout/widget_stage_channel_rich_presence.xml
index ba90ac6cd1..934f441d5c 100644
--- a/app/src/main/res/layout/widget_stage_channel_rich_presence.xml
+++ b/app/src/main/res/layout/widget_stage_channel_rich_presence.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/rich_presence_header" android:text="@string/activity_feed_now_playing_stage_channel" style="@style/res_2131952620_userprofile_section_header"/>
-    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/res_2131952619_userprofile_section_card">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952614_userprofile_presencesection_body">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/rich_presence_header" android:text="@string/activity_feed_now_playing_stage_channel" style="@style/UserProfile_Section_Header"/>
+    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/UserProfile_Section_Card">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UserProfile_PresenceSection_Body">
             <FrameLayout android:id="@+id/rich_presence_image_large_wrap" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_large" android:layout_width="64dp" android:layout_height="64dp" app:placeholderImage="?attr/colorBackgroundSecondary" app:roundedCornerRadius="4dp"/>
-                <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/rich_presence_image_large_text" android:background="@drawable/drawable_guild_placeholder_primary_500" android:clickable="false" android:layout_width="64dp" android:layout_height="64dp" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952563_uikit_textview"/>
+                <TextView android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/rich_presence_image_large_text" android:background="@drawable/drawable_guild_placeholder_primary_500" android:clickable="false" android:layout_width="64dp" android:layout_height="64dp" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit_TextView"/>
             </FrameLayout>
             <Space android:id="@+id/image_bottom_guideline" android:layout_width="@dimen/uikit_image_border_size" android:layout_height="@dimen/uikit_image_border_size" android:layout_marginTop="@dimen/uikit_image_border_size" android:layout_marginStart="@dimen/uikit_image_border_size" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large_wrap" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large_wrap" app:layout_constraintTop_toBottomOf="@+id/rich_presence_image_large_wrap"/>
-            <LinearLayout android:id="@+id/rich_presence_container_data" android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large_wrap" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large_wrap" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/res_2131952615_userprofile_presencesection_body_headertext"/>
-                <TextView android:id="@+id/rich_presence_details" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
-                <TextView android:id="@+id/rich_presence_time" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
+            <LinearLayout android:id="@+id/rich_presence_container_data" android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large_wrap" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large_wrap" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile_PresenceSection_Body_HeaderText"/>
+                <TextView android:id="@+id/rich_presence_details" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
+                <TextView android:id="@+id/rich_presence_time" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
             </LinearLayout>
             <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="rich_presence_container_data,rich_presence_image_large_wrap"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_channel_join_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/res_2131952617_userprofile_presencesection_materialbutton"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_channel_join_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/UserProfile_PresenceSection_MaterialButton"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_stage_moderator_join_bottom_sheet.xml b/app/src/main/res/layout/widget_stage_moderator_join_bottom_sheet.xml
index 55160ba132..1d0fc621fa 100644
--- a/app/src/main/res/layout/widget_stage_moderator_join_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_stage_moderator_join_bottom_sheet.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
-        <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="34dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+        <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="34dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
             <androidx.appcompat.widget.AppCompatImageView android:id="@+id/sparkle" android:background="@drawable/ic_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="centerInside" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:srcCompat="@drawable/ic_channel_stage_24dp_white" app:tint="?attr/colorInteractiveNormal"/>
-            <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/res_2131952519_uikit_stage_title"/>
-            <TextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_moderator_join_modal_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952517_uikit_stage_subtitle"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/join_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_speaker" android:layout_marginEnd="4dp" app:icon="@drawable/ic_mic_grey_24dp" app:iconGravity="2" app:layout_constraintEnd_toStartOf="@+id/join_audience" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/res_2131952467_uikit_material_button_secondary"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/join_audience" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_audience" android:layout_marginStart="4dp" app:icon="@drawable/ic_members_24dp" app:iconGravity="2" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/join_speaker" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/res_2131952467_uikit_material_button_secondary"/>
+            <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/UiKit_Stage_Title"/>
+            <TextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_moderator_join_modal_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_Stage_Subtitle"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/join_speaker" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_speaker" android:layout_marginEnd="4dp" app:icon="@drawable/ic_mic_grey_24dp" app:iconGravity="2" app:layout_constraintEnd_toStartOf="@+id/join_audience" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/UiKit_Material_Button_Secondary"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/join_audience" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/stage_moderator_join_modal_join_audience" android:layout_marginStart="4dp" app:icon="@drawable/ic_members_24dp" app:iconGravity="2" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/join_speaker" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/UiKit_Material_Button_Secondary"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_stage_public_notice_bottom_sheet.xml b/app/src/main/res/layout/widget_stage_public_notice_bottom_sheet.xml
index 5fa85a5a37..9282ac6f9f 100644
--- a/app/src/main/res/layout/widget_stage_public_notice_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_stage_public_notice_bottom_sheet.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
         <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content">
             <androidx.appcompat.widget.AppCompatImageView android:id="@+id/public_notice_header_icon" android:background="@drawable/ic_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:src="@drawable/ic_globe_32dp" android:scaleType="centerInside" app:layout_constraintBottom_toTopOf="@+id/public_notice_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/primary_000"/>
             <com.discord.views.ScreenTitleView android:id="@+id/public_notice_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@+id/public_notice_info_wrap" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_header_icon" app:stv_title="@string/start_stage_public_info_title"/>
-            <LinearLayout android:id="@+id/public_notice_info_wrap" android:background="@drawable/drawable_start_stage_bg" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constraintBottom_toTopOf="@+id/public_notice_confirm" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_title" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/start_stage_public_info_section_one" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
-                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:text="@string/start_stage_public_info_section_two" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
-                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/section_three" android:text="@string/start_stage_public_info_section_three" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
-                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <TextView android:text="@string/start_stage_public_info_section_four" style="@style/res_2131952523_uikit_stagediscovery_publicnotice_textview"/>
+            <LinearLayout android:id="@+id/public_notice_info_wrap" android:background="@drawable/drawable_start_stage_bg" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constraintBottom_toTopOf="@+id/public_notice_confirm" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_title" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/start_stage_public_info_section_one" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
+                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_Divider"/>
+                <TextView android:text="@string/start_stage_public_info_section_two" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
+                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_Divider"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/section_three" android:text="@string/start_stage_public_info_section_three" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
+                <View android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="@style/UiKit_Divider"/>
+                <TextView android:text="@string/start_stage_public_info_section_four" style="@style/UiKit_StageDiscovery_PublicNotice_TextView"/>
             </LinearLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_confirm" android:layout_marginTop="24dp" android:text="@string/start_stage_public_confirm" app:layout_constraintBottom_toTopOf="@+id/public_notice_dismiss" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_info_wrap" style="@style/res_2131952458_uikit_material_button"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_dismiss" android:text="@string/nevermind" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_confirm" style="@style/res_2131952467_uikit_material_button_secondary"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_confirm" android:layout_marginTop="24dp" android:text="@string/start_stage_public_confirm" app:layout_constraintBottom_toTopOf="@+id/public_notice_dismiss" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_info_wrap" style="@style/UiKit_Material_Button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/public_notice_dismiss" android:text="@string/nevermind" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/public_notice_confirm" style="@style/UiKit_Material_Button_Secondary"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_stage_raised_hands_bottom_sheet.xml b/app/src/main/res/layout/widget_stage_raised_hands_bottom_sheet.xml
index dccd1520f9..0de7521949 100644
--- a/app/src/main/res/layout/widget_stage_raised_hands_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_stage_raised_hands_bottom_sheet.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_raised_hands_bottom_sheet_root" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/stage_raised_hands_bottom_sheet_root" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
         <View android:id="@+id/header" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="14dp" android:text="@string/request_to_speak_area_title" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952520_uikit_stage_title_secondary"/>
-        <com.google.android.material.textview.MaterialTextView android:ellipsize="end" android:id="@+id/subtitle" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/request_to_speak_area_all_roles" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/stage_raise_hands_enabled_toggle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952517_uikit_stage_subtitle"/>
-        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/stage_raise_hands_enabled_toggle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="true" app:layout_constraintBottom_toBottomOf="@+id/header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952455_uikit_listitem_switch"/>
-        <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:gravity="center_vertical" android:id="@+id/toggle_speaker_state_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:layout_height="80dp" android:text="@string/moderator_raise_own_hand" android:paddingStart="72dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/header" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="14dp" android:text="@string/request_to_speak_area_title" android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_Stage_Title_Secondary"/>
+        <com.google.android.material.textview.MaterialTextView android:ellipsize="end" android:id="@+id/subtitle" android:paddingBottom="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/request_to_speak_area_all_roles" android:layout_marginStart="16dp" app:layout_constraintStart_toEndOf="@+id/stage_raise_hands_enabled_toggle" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_Stage_Subtitle"/>
+        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/stage_raise_hands_enabled_toggle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="true" app:layout_constraintBottom_toBottomOf="@+id/header" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem_Switch"/>
+        <com.google.android.material.textview.MaterialTextView android:textSize="16sp" android:gravity="center_vertical" android:id="@+id/toggle_speaker_state_button" android:background="?attr/bg_pressed_highlight" android:layout_width="match_parent" android:layout_height="80dp" android:text="@string/moderator_raise_own_hand" android:paddingStart="72dp" android:paddingEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/header" style="@style/UiKit_TextView_Semibold"/>
         <ImageView android:id="@+id/toggle_speaker_state_icon" android:background="@drawable/ripple_circle_black" android:layout_width="40dp" android:layout_height="40dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_mic_white_24dp" android:scaleType="centerInside" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="@+id/toggle_speaker_state_button" app:layout_constraintStart_toStartOf="@+id/toggle_speaker_state_button" app:layout_constraintTop_toTopOf="@+id/toggle_speaker_state_button" app:tint="?attr/colorInteractiveNormal"/>
-        <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:id="@+id/raised_hands_count_label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/request_to_speak_list_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/toggle_speaker_state_button" style="@style/res_2131952516_uikit_stage_sectionheader"/>
+        <com.google.android.material.textview.MaterialTextView android:textSize="12sp" android:id="@+id/raised_hands_count_label" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/request_to_speak_list_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/toggle_speaker_state_button" style="@style/UiKit_Stage_SectionHeader"/>
         <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/stage_raised_hands_recycler" android:paddingTop="8dp" android:paddingBottom="8dp" android:clipToPadding="false" android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="200dp" android:nestedScrollingEnabled="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_count_label" app:layout_constraintVertical_bias="0" app:max_height="400dp"/>
-        <ImageView android:id="@+id/raised_hands_empty_sparkle" android:background="@drawable/ic_sparkle" android:layout_marginTop="70dp" android:src="@drawable/ic_stage_raised_hand" android:scaleType="centerInside" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_count_label" app:layout_constraintVertical_chainStyle="2" app:tint="?attr/primary_300" style="@style/res_2131952448_uikit_imageview"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/request_to_speak_empty_list_title" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_sparkle" style="@style/res_2131952519_uikit_stage_title"/>
-        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="70dp" android:text="@string/request_to_speak_empty_list_body" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_title" style="@style/res_2131952517_uikit_stage_subtitle"/>
+        <ImageView android:id="@+id/raised_hands_empty_sparkle" android:background="@drawable/ic_sparkle" android:layout_marginTop="70dp" android:src="@drawable/ic_stage_raised_hand" android:scaleType="centerInside" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_count_label" app:layout_constraintVertical_chainStyle="2" app:tint="?attr/primary_300" style="@style/UiKit_ImageView"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/request_to_speak_empty_list_title" app:layout_constraintBottom_toTopOf="@+id/raised_hands_empty_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_sparkle" style="@style/UiKit_Stage_Title"/>
+        <com.google.android.material.textview.MaterialTextView android:id="@+id/raised_hands_empty_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="70dp" android:text="@string/request_to_speak_empty_list_body" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/raised_hands_empty_title" style="@style/UiKit_Stage_Subtitle"/>
         <androidx.constraintlayout.widget.Group android:id="@+id/raised_hands_empty_group" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="raised_hands_empty_sparkle,raised_hands_empty_title,raised_hands_empty_subtitle"/>
         <androidx.constraintlayout.widget.Group android:id="@+id/toggle_speaker_state_group" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="toggle_speaker_state_button,toggle_speaker_state_icon"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_stage_settings.xml b/app/src/main/res/layout/widget_stage_settings.xml
index 6049970709..92784ec259 100644
--- a/app/src/main/res/layout/widget_stage_settings.xml
+++ b/app/src/main/res/layout/widget_stage_settings.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?attr/ic_action_bar_close" style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <androidx.core.widget.NestedScrollView android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
             <com.discord.views.ScreenTitleView android:id="@+id/stage_start_screen_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@+id/stage_start_topic_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:stv_subtitle="@string/start_stage_channel_event_modal_subtitle" app:stv_title="@string/start_stage_channel_event_modal_title"/>
-            <TextView android:id="@+id/stage_start_topic_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/start_stage_channel_event_modal_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_screen_title" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/stage_start_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_title" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/topic_input" android:layout_height="48dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <TextView android:id="@+id/stage_start_topic_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/start_stage_channel_event_modal_topic_label" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_screen_title" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/stage_start_topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_title" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/topic_input" android:layout_height="48dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <LinearLayout android:id="@+id/stage_start_creation_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_layout" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.discord.views.CheckedSetting android:id="@+id/stage_start_members_radio_button" app:cs_drawable_left="@drawable/ic_members_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_members_subtitle" app:cs_text="@string/start_stage_channel_event_members_title" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/res_2131952416_uikit_divider"/>
-                <com.discord.views.CheckedSetting android:id="@+id/stage_start_public_radio_button" app:cs_drawable_left="@drawable/ic_globe_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_public_subtitle" app:cs_text="@string/start_stage_channel_event_public_title" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <LinearLayout android:id="@+id/stage_start_creation_options" android:background="@drawable/drawable_start_stage_bg" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" app:layout_constrainedHeight="true" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_topic_layout" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.discord.views.CheckedSetting android:id="@+id/stage_start_members_radio_button" app:cs_drawable_left="@drawable/ic_members_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_members_subtitle" app:cs_text="@string/start_stage_channel_event_members_title" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View android:id="@+id/stage_start_divider" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" style="@style/UiKit_Divider"/>
+                <com.discord.views.CheckedSetting android:id="@+id/stage_start_public_radio_button" app:cs_drawable_left="@drawable/ic_globe_24dp" app:cs_drawable_left_tint="?attr/primary_300" app:cs_subtext="@string/start_stage_channel_event_public_subtitle" app:cs_text="@string/start_stage_channel_event_public_title" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_public_disclaimer" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_channel_event_public_explanation" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_creation_options" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_help_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_modal_set_topic_help_text" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_public_disclaimer" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <com.discord.views.CheckedSetting android:id="@+id/notify_members_check" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cs_background="@drawable/drawable_start_stage_bg" app:cs_text="@string/guild_notify_members" app:cs_view_type="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_help_text" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_public_disclaimer" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_channel_event_public_explanation" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_creation_options" style="@style/UiKit_TextView_Subtext"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/stage_start_help_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_modal_set_topic_help_text" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_public_disclaimer" style="@style/UiKit_TextView_Subtext"/>
+            <com.discord.views.CheckedSetting android:id="@+id/notify_members_check" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:cs_background="@drawable/drawable_start_stage_bg" app:cs_text="@string/guild_notify_members" app:cs_view_type="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/stage_start_help_text" style="@style/UiKit_CheckedSetting_Themed"/>
             <Space android:id="@+id/start_stage_button_spacer" android:layout_width="16dp" android:layout_height="0dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/notify_members_check"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/start_stage_button" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_button_spacer" style="@style/res_2131952458_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/start_stage_button" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_button" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_button_spacer" style="@style/UiKit_Material_Button"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_stage_start_event_bottom_sheet.xml b/app/src/main/res/layout/widget_stage_start_event_bottom_sheet.xml
index 428a57445c..caaa152aa8 100644
--- a/app/src/main/res/layout/widget_stage_start_event_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_stage_start_event_bottom_sheet.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
-        <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+        <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_ConstraintLayout">
             <androidx.appcompat.widget.AppCompatImageView android:id="@+id/sparkle" android:background="@drawable/ic_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_channel_stage_24dp_white" android:scaleType="centerInside" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:tint="?attr/colorInteractiveNormal"/>
-            <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/res_2131952519_uikit_stage_title"/>
-            <TextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_channel_event_modal_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/res_2131952517_uikit_stage_subtitle"/>
-            <TextView android:id="@+id/topic_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/start_stage_channel_event_modal_topic_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/res_2131952516_uikit_stage_sectionheader"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/topic_label" style="@style/res_2131952545_uikit_textinputlayout">
-                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/topic_input" android:layout_height="48dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/res_2131952555_uikit_textinputlayout_edittext_singleline_search"/>
+            <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/sparkle" style="@style/UiKit_Stage_Title"/>
+            <TextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/start_stage_channel_event_modal_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/title" style="@style/UiKit_Stage_Subtitle"/>
+            <TextView android:id="@+id/topic_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/start_stage_channel_event_modal_topic_label" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/subtitle" style="@style/UiKit_Stage_SectionHeader"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/topic_layout" android:layout_marginTop="8dp" app:counterMaxLength="240" app:hintEnabled="false" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/topic_label" style="@style/UiKit_TextInputLayout">
+                <com.google.android.material.textfield.TextInputEditText android:textColorHint="?attr/colorTextMuted" android:id="@+id/topic_input" android:layout_height="48dp" android:hint="@string/start_stage_channel_event_modal_topic_placeholder" android:maxLength="240" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Search"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/start_stage_button" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/topic_layout" style="@style/res_2131952458_uikit_material_button"/>
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/speaker_hint" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/start_stage_channel_event_modal_speaker_hint" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_button" style="@style/res_2131952563_uikit_textview"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/start_stage_button" android:layout_marginTop="16dp" android:text="@string/start_stage_channel_event_modal_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/topic_layout" style="@style/UiKit_Material_Button"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/speaker_hint" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/start_stage_channel_event_modal_speaker_hint" android:textAlignment="center" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_button" style="@style/UiKit_TextView"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_start_call_sheet.xml b/app/src/main/res/layout/widget_start_call_sheet.xml
index 06167743ae..afc815f959 100644
--- a/app/src/main/res/layout/widget_start_call_sheet.xml
+++ b/app/src/main/res/layout/widget_start_call_sheet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/start_call_sheet_voice_item" android:text="@string/start_voice_call" app:drawableStartCompat="@drawable/ic_call_24dp" style="@style/res_2131952138_startcallsheet_item"/>
-    <TextView android:id="@+id/start_call_sheet_video_item" android:text="@string/start_video_call" app:drawableStartCompat="@drawable/ic_videocam_white_24dp" style="@style/res_2131952138_startcallsheet_item"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/start_call_sheet_voice_item" android:text="@string/start_voice_call" app:drawableStartCompat="@drawable/ic_call_24dp" style="@style/StartCallSheet_Item"/>
+    <TextView android:id="@+id/start_call_sheet_video_item" android:text="@string/start_video_call" app:drawableStartCompat="@drawable/ic_videocam_white_24dp" style="@style/StartCallSheet_Item"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_start_stage_server_selection.xml b/app/src/main/res/layout/widget_start_stage_server_selection.xml
index d23f7afe2d..8b93e76efe 100644
--- a/app/src/main/res/layout/widget_start_stage_server_selection.xml
+++ b/app/src/main/res/layout/widget_start_stage_server_selection.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_Page">
     <ImageView android:id="@+id/start_stage_server_selection_banner" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/img_create_stage_choose_server" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
     <ImageView android:id="@+id/close_button" android:background="@drawable/drawable_uikit_white_circle" android:padding="4dp" android:focusable="true" android:clickable="true" android:layout_width="32dp" android:layout_height="32dp" android:layout_margin="16dp" android:src="@drawable/ic_close_primary_200_24dp" android:contentDescription="@string/close" android:backgroundTint="@color/black_alpha_50" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/start_stage_server_selection_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_banner" style="@style/res_2131952564_uikit_textview_bold"/>
-    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/start_stage_server_selection_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_subtitle" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_title" style="@style/res_2131952563_uikit_textview"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="16dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button_hint" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_subtitle" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/start_stage_server_selection_button_hint" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/start_stage_modal_server_selection_button_hint" android:textAllCaps="true" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <Button android:textAppearance="@style/res_2131952535_uikit_textappearance_button" android:textColor="@color/white" android:id="@+id/start_stage_server_selection_button" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/start_stage_modal_server_selection_button_text" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0"/>
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center" android:id="@+id/start_stage_server_selection_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_title" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_banner" style="@style/UiKit_TextView_Bold"/>
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/start_stage_server_selection_subtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:text="@string/start_stage_modal_server_selection_subtitle" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_title" style="@style/UiKit_TextView"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="0dp" android:layout_height="0dp" android:layout_margin="16dp" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button_hint" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_server_selection_subtitle" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/start_stage_server_selection_button_hint" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/start_stage_modal_server_selection_button_hint" android:textAllCaps="true" app:layout_constraintBottom_toTopOf="@+id/start_stage_server_selection_button" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_TextView"/>
+    <Button android:textAppearance="@style/UiKit_TextAppearance_Button" android:textColor="@color/white" android:id="@+id/start_stage_server_selection_button" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/start_stage_modal_server_selection_button_text" android:backgroundTint="?attr/colorBackgroundAccent" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_start_stage_server_selection_bullet_item.xml b/app/src/main/res/layout/widget_start_stage_server_selection_bullet_item.xml
index a1321c7d1a..d87720bfdc 100644
--- a/app/src/main/res/layout/widget_start_stage_server_selection_bullet_item.xml
+++ b/app/src/main/res/layout/widget_start_stage_server_selection_bullet_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/start_stage_server_selection_bullet_item_container" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_icon" android:background="@drawable/drawable_uikit_white_circle" android:padding="8dp" android:layout_width="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_height="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="12dp" android:src="@drawable/ic_channel_stage_24dp" android:importantForAccessibility="no" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951678_avatar_standard"/>
-    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_bullet_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_bullet_item_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_bullet_item_text" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952416_uikit_divider"/>
+    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_icon" android:background="@drawable/drawable_uikit_white_circle" android:padding="8dp" android:layout_width="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_height="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="12dp" android:src="@drawable/ic_channel_stage_24dp" android:importantForAccessibility="no" android:backgroundTint="?attr/colorBackgroundTertiary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/Avatar_Standard"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit_TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_bullet_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_bullet_item_icon" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <ImageView android:id="@+id/start_stage_server_selection_bullet_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_bullet_item_text" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_Divider"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_start_stage_server_selection_guild_item.xml b/app/src/main/res/layout/widget_start_stage_server_selection_guild_item.xml
index ba59b7f7ed..bf61523360 100644
--- a/app/src/main/res/layout/widget_start_stage_server_selection_guild_item.xml
+++ b/app/src/main/res/layout/widget_start_stage_server_selection_guild_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/start_stage_server_selection_guild_item_container" android:layout_width="match_parent" android:layout_height="wrap_content">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/start_stage_server_selection_guild_item_icon" android:background="@drawable/drawable_squircle_transparent" android:layout_width="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_height="@dimen/start_stage_server_selection_list_item_icon_size" android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:layout_marginRight="16dp" android:layout_marginBottom="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="@drawable/asset_default_avatar_32dp"/>
-    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_guild_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_guild_item_icon" app:layout_constraintRight_toLeftOf="@+id/start_stage_server_selection_guild_item_arrow" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952580_uikit_textview_singleline"/>
-    <ImageView android:id="@+id/start_stage_server_selection_guild_item_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_arrow_right" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
-    <ImageView android:id="@+id/start_stage_server_selection_guild_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_guild_item_text" app:layout_constraintRight_toRightOf="0" style="@style/res_2131952416_uikit_divider"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@+id/start_stage_server_selection_guild_item_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toRightOf="@+id/start_stage_server_selection_guild_item_icon" app:layout_constraintRight_toLeftOf="@+id/start_stage_server_selection_guild_item_arrow" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView_SingleLine"/>
+    <ImageView android:id="@+id/start_stage_server_selection_guild_item_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_arrow_right" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ImageView"/>
+    <ImageView android:id="@+id/start_stage_server_selection_guild_item_divider" android:layout_width="0dp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="@+id/start_stage_server_selection_guild_item_text" app:layout_constraintRight_toRightOf="0" style="@style/UiKit_Divider"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_sticker_pack_store_sheet.xml b/app/src/main/res/layout/widget_sticker_pack_store_sheet.xml
index 3115fd6886..f44b591041 100644
--- a/app/src/main/res/layout/widget_sticker_pack_store_sheet.xml
+++ b/app/src/main/res/layout/widget_sticker_pack_store_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_pack_store_sheet_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/sticker_pack_view_all_banner" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:importantForAccessibility="no" app:actualImageScaleType="6" app:viewAspectRatio="4.4" style="@style/res_2131952448_uikit_imageview"/>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/sticker_pack_store_sheet_recycler" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:layout_height="match_parent" android:layout_above="@+id/sticker_pack_store_sheet_buy_button_container" android:layout_below="@+id/sticker_pack_view_all_banner" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_pack_store_sheet_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/sticker_pack_view_all_banner" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:importantForAccessibility="no" app:actualImageScaleType="6" app:viewAspectRatio="4.4" style="@style/UiKit_ImageView"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/sticker_pack_store_sheet_recycler" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="8dp" android:paddingTop="4dp" android:paddingRight="8dp" android:layout_height="match_parent" android:layout_above="@+id/sticker_pack_store_sheet_buy_button_container" android:layout_below="@+id/sticker_pack_view_all_banner" style="@style/UiKit_ViewGroup_RecyclerView"/>
     <FrameLayout android:id="@+id/sticker_pack_store_sheet_buy_button_container" android:background="?attr/colorBackgroundSecondary" android:paddingLeft="12dp" android:paddingTop="16dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true">
         <com.discord.views.LoadingButton android:id="@+id/sticker_store_buy_button_premium" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" app:lb_background_color="@color/status_green_600" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white"/>
     </FrameLayout>
diff --git a/app/src/main/res/layout/widget_sticker_picker.xml b/app/src/main/res/layout/widget_sticker_picker.xml
index 9f22414efd..a8ace0404d 100644
--- a/app/src/main/res/layout/widget_sticker_picker.xml
+++ b/app/src/main/res/layout/widget_sticker_picker.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/sticker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/res_2131951667_apptheme_toolbar_transparent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sticker_picker_container" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/sticker_app_bar" android:background="@color/transparent" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0dp" app:contentInsetStart="0dp" style="@style/AppTheme_Toolbar_Transparent">
             <com.discord.views.SearchInputView android:id="@+id/sticker_search_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:layout_marginTop="12dp" android:layout_marginRight="12dp" android:animateLayoutChanges="true" app:siv_hint="@string/search_for_stickers" app:siv_search_content_description="@string/search_for_stickers"/>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_sticker_picker_recycler" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:layout_marginTop="12dp" android:layout_marginRight="8dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout">
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_sticker_picker_recycler" android:layout_height="match_parent" android:layout_marginLeft="8dp" android:layout_marginTop="12dp" android:layout_marginRight="8dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
             <ImageView android:layout_gravity="center_horizontal" android:id="@+id/chat_input_sticker_picker_empty_image" android:layout_width="wrap_content" android:layout_height="72dp" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no"/>
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8dp" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/res_2131952563_uikit_textview"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/chat_input_sticker_picker_empty_link" android:visibility="gone" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/res_2131952572_uikit_textview_link"/>
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8dp" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/UiKit_TextView"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_large" android:id="@+id/chat_input_sticker_picker_empty_link" android:visibility="gone" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" style="@style/UiKit_TextView_Link"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container_phase_1" android:layout_height="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title_phase_1" android:layout_marginTop="8dp" android:text="@string/sticker_picker_premium_empty_state_title" style="@style/res_2131952563_uikit_textview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle_phase_1" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" android:text="@string/sticker_picker_premium_empty_state_subtitle" style="@style/res_2131952563_uikit_textview"/>
-            <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+        <LinearLayout android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_container_phase_1" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/chat_input_sticker_picker_empty_title_phase_1" android:layout_marginTop="8dp" android:text="@string/sticker_picker_premium_empty_state_title" style="@style/UiKit_TextView"/>
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:gravity="center" android:id="@+id/chat_input_sticker_picker_empty_subtitle_phase_1" android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginRight="24dp" android:text="@string/sticker_picker_premium_empty_state_subtitle" style="@style/UiKit_TextView"/>
+            <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
                 <com.discord.views.sticker.StickerView android:id="@+id/chat_input_sticker_picker_empty_sticker_1" android:layout_width="60dp" android:layout_height="60dp" android:layout_marginRight="4dp"/>
                 <com.discord.views.sticker.StickerView android:id="@+id/chat_input_sticker_picker_empty_sticker_2" android:layout_width="60dp" android:layout_height="60dp" android:layout_marginRight="4dp"/>
                 <com.discord.views.sticker.StickerView android:id="@+id/chat_input_sticker_picker_empty_sticker_3" android:layout_width="60dp" android:layout_height="60dp" android:layout_marginRight="4dp"/>
@@ -25,8 +25,8 @@
             <com.discord.views.LoadingButton android:id="@+id/chat_input_sticker_picker_empty_subscribe" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:lb_background_color="@color/status_green_600" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white" app:lb_text="@string/sticker_picker_premium_empty_state_cta"/>
         </LinearLayout>
     </com.discord.app.AppViewFlipper>
-    <View android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/sticker_picker_bottom_bar" style="@style/res_2131952416_uikit_divider"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <View android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar_divider" android:background="?attr/colorBackgroundTertiary" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:layout_above="@+id/sticker_picker_bottom_bar" style="@style/UiKit_Divider"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@+id/sticker_picker_bottom_bar" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingStart="8dp" android:paddingEnd="8dp" android:elevation="8dp" style="@style/UiKit_ViewGroup_ConstraintLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@+id/sticker_picker_category_recycler" android:layout_width="0dp" android:layout_height="match_parent" android:contentDescription="@string/categories" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_sticker_sheet.xml b/app/src/main/res/layout/widget_sticker_sheet.xml
index 70f0c31f19..56715c7e83 100644
--- a/app/src/main/res/layout/widget_sticker_sheet.xml
+++ b/app/src/main/res/layout/widget_sticker_sheet.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_sheet_sticker_name" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952563_uikit_textview"/>
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_sheet_sticker_info" android:focusable="true" android:clickable="true" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" style="@style/res_2131952563_uikit_textview"/>
-    <LinearLayout android:id="@+id/sticker_sheet_stickers_container" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:weightSum="4" android:importantForAccessibility="noHideDescendants" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/sticker_sheet_sticker_name" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView"/>
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/sticker_sheet_sticker_info" android:focusable="true" android:clickable="true" android:layout_marginLeft="16dp" android:layout_marginTop="4dp" android:layout_marginRight="16dp" android:lineSpacingMultiplier="1" style="@style/UiKit_TextView"/>
+    <LinearLayout android:id="@+id/sticker_sheet_stickers_container" android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:weightSum="4" android:importantForAccessibility="noHideDescendants" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_1" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_2" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_3" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
         <com.discord.views.sticker.StickerView android:id="@+id/stickers_sheet_sticker_4" android:layout_width="0dp" android:layout_height="80dp" android:layout_weight="1"/>
     </LinearLayout>
     <com.discord.views.LoadingButton android:id="@+id/sticker_sheet_buy_button" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" app:lb_background_color="@color/status_green_600" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white"/>
-    <com.google.android.material.button.MaterialButton android:id="@+id/sticker_sheet_view_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/sticker_pack_view" style="@style/res_2131952467_uikit_material_button_secondary"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/sticker_sheet_view_button" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:text="@string/sticker_pack_view" style="@style/UiKit_Material_Button_Secondary"/>
     <RelativeLayout android:id="@+id/sticker_sheet_view_limited_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp">
-        <TextView android:layout_width="wrap_content" android:text="@string/sticker_popout_countdown_header" android:layout_alignParentStart="true" style="@style/res_2131952563_uikit_textview"/>
-        <com.google.android.material.chip.Chip android:id="@+id/sticker_sheet_view_limited_chip" android:layout_alignParentEnd="true" style="@style/res_2131952400_uikit_chip_limited"/>
+        <TextView android:layout_width="wrap_content" android:text="@string/sticker_popout_countdown_header" android:layout_alignParentStart="true" style="@style/UiKit_TextView"/>
+        <com.google.android.material.chip.Chip android:id="@+id/sticker_sheet_view_limited_chip" android:layout_alignParentEnd="true" style="@style/UiKit_Chip_Limited"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_stream_rich_presence.xml b/app/src/main/res/layout/widget_stream_rich_presence.xml
index a84e246815..7ab7b7b30b 100644
--- a/app/src/main/res/layout/widget_stream_rich_presence.xml
+++ b/app/src/main/res/layout/widget_stream_rich_presence.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content">
-    <TextView android:id="@+id/rich_presence_header" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952620_userprofile_section_header"/>
-    <androidx.cardview.widget.CardView android:layout_width="0dp" android:layout_marginTop="8dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_header" app:layout_constraintWidth_max="400dp" style="@style/res_2131952619_userprofile_section_card">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <TextView android:id="@+id/rich_presence_header" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UserProfile_Section_Header"/>
+    <androidx.cardview.widget.CardView android:layout_width="0dp" android:layout_marginTop="8dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_header" app:layout_constraintWidth_max="400dp" style="@style/UserProfile_Section_Card">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_ViewGroup_ConstraintLayout">
             <com.discord.views.StreamPreviewView android:id="@+id/stream_preview" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@+id/rich_presence_container_data" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2"/>
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_large" android:layout_width="64dp" android:layout_height="64dp" android:layout_marginBottom="4dp" android:layout_marginStart="4dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toLeftOf="@+id/rich_presence_container_data" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/rich_presence_container_data" app:placeholderImage="?attr/colorBackgroundSecondary" app:roundedCornerRadius="4dp"/>
-            <LinearLayout android:id="@+id/rich_presence_container_data" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@+id/stream_preview" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/res_2131952615_userprofile_presencesection_body_headertext"/>
-                <TextView android:id="@+id/rich_presence_details" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
-                <TextView android:id="@+id/rich_presence_state" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
-                <TextView android:id="@+id/rich_presence_time" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
+            <LinearLayout android:id="@+id/rich_presence_container_data" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@+id/stream_preview" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile_PresenceSection_Body_HeaderText"/>
+                <TextView android:id="@+id/rich_presence_details" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
+                <TextView android:id="@+id/rich_presence_state" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
+                <TextView android:id="@+id/rich_presence_time" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/widget_tabs_host.xml b/app/src/main/res/layout/widget_tabs_host.xml
index d79c0457d4..5eeca140ee 100644
--- a/app/src/main/res/layout/widget_tabs_host.xml
+++ b/app/src/main/res/layout/widget_tabs_host.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_tabs_host_container" android:background="?attr/colorBackgroundTertiary" style="@style/res_2131952602_uikit_viewgroup_page">
-    <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_tabs_host_global_status_indicator" app:layout_constraintBottom_toTopOf="@+id/widget_tabs_host_nav_host" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952589_uikit_viewgroup"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_tabs_host_container" android:background="?attr/colorBackgroundTertiary" style="@style/UiKit_ViewGroup_Page">
+    <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.status.WidgetGlobalStatusIndicator" android:id="@+id/widget_tabs_host_global_status_indicator" app:layout_constraintBottom_toTopOf="@+id/widget_tabs_host_nav_host" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup"/>
     <FrameLayout android:id="@+id/widget_tabs_host_nav_host" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/widget_tabs_host_global_status_indicator">
         <androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.home.WidgetHome" android:id="@+id/widget_tabs_host_home" android:layout_width="match_parent" android:layout_height="match_parent"/>
         <FrameLayout android:id="@+id/widget_tabs_host_non_fullscreen_nav_host" android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/widget_text_channel_settings.xml b/app/src/main/res/layout/widget_text_channel_settings.xml
index 9870920c5e..c64784a5e3 100644
--- a/app/src/main/res/layout/widget_text_channel_settings.xml
+++ b/app/src/main/res/layout/widget_text_channel_settings.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:id="@+id/channel_settings_edit_wrap" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_name" android:layout_margin="16dp" android:hint="@string/form_label_channel_name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:id="@+id/channel_settings_edit_wrap" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_name" android:layout_margin="16dp" android:hint="@string/form_label_channel_name" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_topic" android:layout_margin="16dp" android:hint="@string/form_label_channel_topic" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText android:maxLines="10" android:maxLength="1024" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_topic" android:layout_margin="16dp" android:hint="@string/form_label_channel_topic" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText android:maxLines="10" android:maxLength="1024" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <com.discord.views.CheckedSetting android:id="@+id/channel_settings_announcement" app:cs_text="@string/form_label_news_channel" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
+                <com.discord.views.CheckedSetting android:id="@+id/channel_settings_announcement" app:cs_text="@string/form_label_news_channel" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_settings_pinned_messages_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/pinned_messages" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <FrameLayout style="@style/res_2131952589_uikit_viewgroup">
-                    <TextView android:id="@+id/channel_settings_pinned_messages" android:text="@string/pinned_messages" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/ic_pin_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <LinearLayout android:id="@+id/channel_settings_pinned_messages_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/pinned_messages" style="@style/UiKit_Settings_Item_Header"/>
+                <FrameLayout style="@style/UiKit_ViewGroup">
+                    <TextView android:id="@+id/channel_settings_pinned_messages" android:text="@string/pinned_messages" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/ic_pin_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
                     <View android:id="@+id/channel_settings_pinned_messages_disabled_overlay" android:layout_width="match_parent" android:layout_height="match_parent"/>
                 </FrameLayout>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
+                <View style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_settings_section_user_management" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/user_management" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:id="@+id/channel_settings_permissions" android:text="@string/permissions" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <LinearLayout android:id="@+id/channel_settings_section_user_management" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/user_management" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:id="@+id/channel_settings_permissions" android:text="@string/permissions" app:drawableEndCompat="@drawable/icon_carrot" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
+                <View style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_settings_section_privacy_safety" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/privacy_and_safety" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <com.discord.views.CheckedSetting android:id="@+id/channel_settings_nsfw" app:cs_subtext="@string/form_help_nsfw" app:cs_text="@string/nsfw_title" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
+            <LinearLayout android:id="@+id/channel_settings_section_privacy_safety" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/privacy_and_safety" style="@style/UiKit_Settings_Item_Header"/>
+                <com.discord.views.CheckedSetting android:id="@+id/channel_settings_nsfw" app:cs_subtext="@string/form_help_nsfw" app:cs_text="@string/nsfw_title" style="@style/UiKit_CheckedSetting_Themed"/>
+                <View style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_settings_section_slow_mode" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/form_label_slowmode" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952589_uikit_viewgroup">
-                    <TextView android:id="@+id/channel_settings_slowmode_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_label_slowmode_cooldown" android:layout_alignParentStart="true" android:labelFor="@+id/channel_settings_slow_mode_cooldown_slider" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:layout_gravity="end" android:id="@+id/channel_settings_slow_mode_cooldown_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_alignBaseline="@+id/channel_settings_slowmode_label" android:layout_alignParentEnd="true" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <LinearLayout android:id="@+id/channel_settings_section_slow_mode" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/form_label_slowmode" style="@style/UiKit_Settings_Item_Header"/>
+                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup">
+                    <TextView android:id="@+id/channel_settings_slowmode_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_label_slowmode_cooldown" android:layout_alignParentStart="true" android:labelFor="@+id/channel_settings_slow_mode_cooldown_slider" style="@style/UiKit_TextView"/>
+                    <TextView android:layout_gravity="end" android:id="@+id/channel_settings_slow_mode_cooldown_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_alignBaseline="@+id/channel_settings_slowmode_label" android:layout_alignParentEnd="true" style="@style/UiKit_TextView_Subtext"/>
                 </RelativeLayout>
-                <SeekBar android:id="@+id/channel_settings_slow_mode_cooldown_slider" android:progress="0" style="@style/res_2131952488_uikit_seekbar"/>
-                <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_slowmode" style="@style/res_2131952581_uikit_textview_subtext"/>
+                <SeekBar android:id="@+id/channel_settings_slow_mode_cooldown_slider" android:progress="0" style="@style/UiKit_SeekBar"/>
+                <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_slowmode" style="@style/UiKit_TextView_Subtext"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/channel_settings_section_default_auto_archive_duration" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <View android:layout_marginTop="24dp" style="@style/res_2131952491_uikit_settings_divider"/>
+            <LinearLayout android:id="@+id/channel_settings_section_default_auto_archive_duration" style="@style/UiKit_ViewGroup_LinearLayout">
+                <View android:layout_marginTop="24dp" style="@style/UiKit_Settings_Divider"/>
                 <include android:id="@+id/duration_selector" layout="@layout/widget_thread_archive_actions_sheet"/>
-                <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_default_auto_archive_duration" style="@style/res_2131952581_uikit_textview_subtext"/>
+                <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_default_auto_archive_duration" style="@style/UiKit_TextView_Subtext"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_settings_save" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save_changes" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_settings_save" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save_changes" style="@style/Settings_FloatingActionButton"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_thread_archive_actions_sheet.xml b/app/src/main/res/layout/widget_thread_archive_actions_sheet.xml
index 99ab51f11c..33f7c85542 100644
--- a/app/src/main/res/layout/widget_thread_archive_actions_sheet.xml
+++ b/app/src/main/res/layout/widget_thread_archive_actions_sheet.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:id="@+id/auto_archive_header" android:background="?attr/colorBackgroundTertiary" android:visibility="gone" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/title" android:text="@string/archive_settings" style="@style/res_2131952043_mutesettings_row_title"/>
-            <TextView android:id="@+id/subtitle" style="@style/res_2131952042_mutesettings_row_subtitle"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:id="@+id/auto_archive_header" android:background="?attr/colorBackgroundTertiary" android:visibility="gone" style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/title" android:text="@string/archive_settings" style="@style/MuteSettings_Row_Title"/>
+            <TextView android:id="@+id/subtitle" style="@style/MuteSettings_Row_Subtitle"/>
         </LinearLayout>
-        <TextView android:id="@+id/archive_now" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/archive_now" style="@style/res_2131952451_uikit_listitem"/>
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/auto_archive" style="@style/res_2131952496_uikit_settings_item_header"/>
-        <LinearLayout android:id="@+id/auto_archive_sheet_duration_options" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_one_hour" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <TextView android:layout_width="match_parent" android:text="@string/auto_archive_duration_1_hour" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952451_uikit_listitem"/>
+        <TextView android:id="@+id/archive_now" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/archive_now" style="@style/UiKit_ListItem"/>
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/auto_archive" style="@style/UiKit_Settings_Item_Header"/>
+        <LinearLayout android:id="@+id/auto_archive_sheet_duration_options" style="@style/UiKit_ViewGroup_LinearLayout">
+            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_one_hour" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <TextView android:layout_width="match_parent" android:text="@string/auto_archive_duration_1_hour" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem"/>
                 <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/option_one_hour_radio" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" android:buttonTint="?attr/colorCompoundButton" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
-            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_twenty_four_hours" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <TextView android:layout_width="match_parent" android:text="@string/auto_archive_duration_24_hours" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952451_uikit_listitem"/>
+            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_twenty_four_hours" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <TextView android:layout_width="match_parent" android:text="@string/auto_archive_duration_24_hours" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem"/>
                 <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/option_twenty_four_hours_radio" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" android:buttonTint="?attr/colorCompoundButton" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
             </androidx.constraintlayout.widget.ConstraintLayout>
-            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_three_days" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <TextView android:id="@+id/option_three_days_duration" android:layout_width="match_parent" android:text="@string/auto_archive_duration_3_days" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952451_uikit_listitem"/>
-                <LinearLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/option_three_days_icon" android:layout_width="18dp" android:layout_height="18dp" android:src="@drawable/ic_boosted_badge_12dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:id="@+id/option_three_days_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginEnd="4dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_three_days" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <TextView android:id="@+id/option_three_days_duration" android:layout_width="match_parent" android:text="@string/auto_archive_duration_3_days" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem"/>
+                <LinearLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/option_three_days_icon" android:layout_width="18dp" android:layout_height="18dp" android:src="@drawable/ic_boosted_badge_12dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" style="@style/UiKit_ImageView"/>
+                    <TextView android:id="@+id/option_three_days_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginEnd="4dp" style="@style/UiKit_TextView_Semibold"/>
                     <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/option_three_days_radio" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" android:buttonTint="?attr/colorCompoundButton"/>
                 </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
-            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_seven_days" style="@style/res_2131952591_uikit_viewgroup_constraintlayout">
-                <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/option_seven_days_duration" android:layout_width="match_parent" android:text="@string/auto_archive_duration_1_week" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952451_uikit_listitem"/>
-                <LinearLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/option_seven_days_icon" android:layout_width="18dp" android:layout_height="18dp" android:src="@drawable/ic_boosted_badge_12dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:tint="?attr/colorTextMuted" style="@style/res_2131952448_uikit_imageview"/>
-                    <TextView android:id="@+id/option_seven_days_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginEnd="4dp" style="@style/res_2131952579_uikit_textview_semibold"/>
+            <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/option_seven_days" style="@style/UiKit_ViewGroup_ConstraintLayout">
+                <TextView android:textColor="?attr/colorTextMuted" android:id="@+id/option_seven_days_duration" android:layout_width="match_parent" android:text="@string/auto_archive_duration_1_week" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ListItem"/>
+                <LinearLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <ImageView android:layout_gravity="center_vertical" android:id="@+id/option_seven_days_icon" android:layout_width="18dp" android:layout_height="18dp" android:src="@drawable/ic_boosted_badge_12dp" android:importantForAccessibility="no" android:layout_marginEnd="8dp" app:tint="?attr/colorTextMuted" style="@style/UiKit_ImageView"/>
+                    <TextView android:id="@+id/option_seven_days_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" android:layout_marginEnd="4dp" style="@style/UiKit_TextView_Semibold"/>
                     <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/option_seven_days_radio" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" android:buttonTint="?attr/colorCompoundButton"/>
                 </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_thread_browser.xml b/app/src/main/res/layout/widget_thread_browser.xml
index 1b28f46bdc..331ad90f3d 100644
--- a/app/src/main/res/layout/widget_thread_browser.xml
+++ b/app/src/main/res/layout/widget_thread_browser.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.google.android.material.appbar.AppBarLayout android:id="@+id/thread_browser_toolbar" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+    <com.google.android.material.appbar.AppBarLayout android:id="@+id/thread_browser_toolbar" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.utilities.simple_pager.SimplePager android:id="@+id/thread_browser_view_pager" android:background="?attr/theme_thread_browser_bg" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_browser_toolbar">
-        <com.google.android.material.tabs.TabLayout android:id="@+id/action_bar_tabs" android:background="?attr/toolbarColor" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:tabGravity="0" app:tabIndicatorHeight="0dp" app:tabMaxWidth="0dp" app:tabMode="1" app:tabSelectedTextColor="?attr/tabSelectedTextColor" app:tabTextAppearance="@style/res_2131951630_app_tablayout_text" app:tabTextColor="?attr/tabTextColor"/>
+        <com.google.android.material.tabs.TabLayout android:id="@+id/action_bar_tabs" android:background="?attr/toolbarColor" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:tabGravity="0" app:tabIndicatorHeight="0dp" app:tabMaxWidth="0dp" app:tabMode="1" app:tabSelectedTextColor="?attr/tabSelectedTextColor" app:tabTextAppearance="@style/App_TabLayout_Text" app:tabTextColor="?attr/tabTextColor"/>
     </com.discord.utilities.simple_pager.SimplePager>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_thread_browser_active.xml b/app/src/main/res/layout/widget_thread_browser_active.xml
index 0a1ba7202e..29c9534cfa 100644
--- a/app/src/main/res/layout/widget_thread_browser_active.xml
+++ b/app/src/main/res/layout/widget_thread_browser_active.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <include android:id="@+id/empty_view" android:visibility="invisible" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/recycler_view" layout="@layout/thread_browser_empty" style="@style/res_2131952371_threadbrowser_verticalcenter"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <include android:id="@+id/empty_view" android:visibility="invisible" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/recycler_view" layout="@layout/thread_browser_empty" style="@style/ThreadBrowser_VerticalCenter"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_thread_browser_archived.xml b/app/src/main/res/layout/widget_thread_browser_archived.xml
index d95c819c69..a2a79f8c07 100644
--- a/app/src/main/res/layout/widget_thread_browser_archived.xml
+++ b/app/src/main/res/layout/widget_thread_browser_archived.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952605_uikit_viewgroup_recyclerview"/>
-    <include android:id="@+id/empty_view" android:visibility="invisible" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" layout="@layout/thread_browser_empty" style="@style/res_2131952371_threadbrowser_verticalcenter"/>
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/thread_browser_error_overlay" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingRight="16dp" android:visibility="invisible" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952371_threadbrowser_verticalcenter">
-        <TextView android:id="@+id/thread_browser_error_msg" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/network_error_connection" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/thread_browser_try_again" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952565_uikit_textview_h1"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/thread_browser_try_again" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/try_again" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_browser_error_msg" style="@style/res_2131952458_uikit_material_button"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_ViewGroup_RecyclerView"/>
+    <include android:id="@+id/empty_view" android:visibility="invisible" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" layout="@layout/thread_browser_empty" style="@style/ThreadBrowser_VerticalCenter"/>
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/thread_browser_error_overlay" android:background="?attr/colorBackgroundPrimary" android:paddingLeft="16dp" android:paddingRight="16dp" android:visibility="invisible" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/ThreadBrowser_VerticalCenter">
+        <TextView android:id="@+id/thread_browser_error_msg" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/network_error_connection" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/thread_browser_try_again" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/UiKit_TextView_H1"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/thread_browser_try_again" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/try_again" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_browser_error_msg" style="@style/UiKit_Material_Button"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_thread_browser_filter_sheet.xml b/app/src/main/res/layout/widget_thread_browser_filter_sheet.xml
index 2595cf33e3..434f711e71 100644
--- a/app/src/main/res/layout/widget_thread_browser_filter_sheet.xml
+++ b/app/src/main/res/layout/widget_thread_browser_filter_sheet.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textAppearance="@style/res_2131952534_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_profile_sheet_emojis_count" android:layout_marginTop="24dp" android:layout_marginBottom="8dp" android:text="@string/thread_browser_filter_settings_visibility" android:textAllCaps="true" android:layout_marginStart="16dp" style="@style/res_2131952563_uikit_textview"/>
-        <androidx.cardview.widget.CardView android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:contentPadding="0dp" style="@style/res_2131952619_userprofile_section_card">
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.discord.views.CheckedSetting android:id="@+id/thread_browser_visibility_public" app:cs_text="@string/thread_browser_public" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                <com.discord.views.CheckedSetting android:id="@+id/thread_browser_visibility_private" app:cs_text="@string/thread_browser_private" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textAppearance="@style/UiKit_TextAppearance_Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_profile_sheet_emojis_count" android:layout_marginTop="24dp" android:layout_marginBottom="8dp" android:text="@string/thread_browser_filter_settings_visibility" android:textAllCaps="true" android:layout_marginStart="16dp" style="@style/UiKit_TextView"/>
+        <androidx.cardview.widget.CardView android:layout_marginBottom="16dp" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:contentPadding="0dp" style="@style/UserProfile_Section_Card">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.discord.views.CheckedSetting android:id="@+id/thread_browser_visibility_public" app:cs_text="@string/thread_browser_public" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                <com.discord.views.CheckedSetting android:id="@+id/thread_browser_visibility_private" app:cs_text="@string/thread_browser_private" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-        <androidx.cardview.widget.CardView android:id="@+id/thread_browser_moderator_view_card" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:contentPadding="0dp" style="@style/res_2131952619_userprofile_section_card">
-            <com.discord.views.CheckedSetting android:id="@+id/thread_browser_moderator_view" app:cs_subtext="@string/moderator_view_description" app:cs_text="@string/moderator_view" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+        <androidx.cardview.widget.CardView android:id="@+id/thread_browser_moderator_view_card" app:cardBackgroundColor="?attr/colorBackgroundPrimary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:contentPadding="0dp" style="@style/UserProfile_Section_Card">
+            <com.discord.views.CheckedSetting android:id="@+id/thread_browser_moderator_view" app:cs_subtext="@string/moderator_view_description" app:cs_text="@string/moderator_view" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
         </androidx.cardview.widget.CardView>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_thread_notification_settings.xml b/app/src/main/res/layout/widget_thread_notification_settings.xml
index f2d53dc27b..51b2831bb7 100644
--- a/app/src/main/res/layout/widget_thread_notification_settings.xml
+++ b/app/src/main/res/layout/widget_thread_notification_settings.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/form_label_notification_frequency" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <com.discord.views.CheckedSetting android:id="@+id/thread_settings_notifications_frequency_0" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                    <com.discord.views.CheckedSetting android:id="@+id/thread_settings_notifications_frequency_1" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-                    <com.discord.views.CheckedSetting android:id="@+id/thread_settings_notifications_frequency_2" app:cs_text="@string/form_label_nothing" app:cs_view_type="1" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/form_label_notification_frequency" style="@style/UiKit_Settings_Item_Header"/>
+                <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                    <com.discord.views.CheckedSetting android:id="@+id/thread_settings_notifications_frequency_0" app:cs_text="@string/form_label_all_messages" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                    <com.discord.views.CheckedSetting android:id="@+id/thread_settings_notifications_frequency_1" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
+                    <com.discord.views.CheckedSetting android:id="@+id/thread_settings_notifications_frequency_2" app:cs_text="@string/form_label_nothing" app:cs_view_type="1" style="@style/UiKit_CheckedSetting_Themed"/>
                 </LinearLayout>
             </LinearLayout>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:gravity="center_vertical" android:id="@+id/thread_notification_settings_system" android:background="?attr/selectableItemBackground" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <ImageView android:padding="@dimen/uikit_textsize_large" android:src="?attr/ic_notifications_a60" android:contentDescription="@string/form_label_mobile_notifications_system_label" style="@style/res_2131952448_uikit_imageview"/>
-                <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                    <TextView android:text="@string/form_label_mobile_user_notifications_label" style="@style/res_2131952498_uikit_settings_item_label"/>
-                    <TextView android:text="@string/form_label_mobile_user_notifications_hint" style="@style/res_2131952493_uikit_settings_item_addition"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:gravity="center_vertical" android:id="@+id/thread_notification_settings_system" android:background="?attr/selectableItemBackground" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <ImageView android:padding="@dimen/uikit_textsize_large" android:src="?attr/ic_notifications_a60" android:contentDescription="@string/form_label_mobile_notifications_system_label" style="@style/UiKit_ImageView"/>
+                <LinearLayout android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+                    <TextView android:text="@string/form_label_mobile_user_notifications_label" style="@style/UiKit_Settings_Item_Label"/>
+                    <TextView android:text="@string/form_label_mobile_user_notifications_hint" style="@style/UiKit_Settings_Item_Addition"/>
                 </LinearLayout>
-                <ImageView android:padding="16dp" android:src="@drawable/icon_carrot" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+                <ImageView android:padding="16dp" android:src="@drawable/icon_carrot" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_thread_onboarding.xml b/app/src/main/res/layout/widget_thread_onboarding.xml
index 2b8fb2bfc4..9d12374380 100644
--- a/app/src/main/res/layout/widget_thread_onboarding.xml
+++ b/app/src/main/res/layout/widget_thread_onboarding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" style="@style/UiKit_ViewGroup_LinearLayout">
     <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0">
         <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content">
             <FrameLayout android:id="@+id/thread_onboarding_video_container" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="match_parent" android:layout_height="0dp" android:layout_margin="24dp" android:backgroundTint="?attr/colorBackgroundTertiary" android:outlineProvider="background" app:layout_constraintBottom_toBottomOf="@+id/thread_onboarding_video_frame" app:layout_constraintDimensionRatio="4:3" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/thread_onboarding_video_frame">
@@ -8,18 +8,18 @@
             </FrameLayout>
             <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/thread_onboarding_video_overlay" android:padding="8dp" android:clickable="false" android:layout_width="64dp" android:layout_height="64dp" app:backgroundImage="@color/primary_900_alpha_60" app:layout_constraintBottom_toBottomOf="@+id/thread_onboarding_video_frame" app:layout_constraintEnd_toEndOf="@+id/thread_onboarding_video_frame" app:layout_constraintStart_toStartOf="@+id/thread_onboarding_video_frame" app:layout_constraintTop_toTopOf="@+id/thread_onboarding_video_frame" app:placeholderImage="@drawable/ic_play_arrow_grey_24dp" app:placeholderImageScaleType="2" app:roundAsCircle="true"/>
             <ImageView android:id="@+id/thread_onboarding_video_frame" android:layout_width="match_parent" android:layout_height="0dp" android:src="@drawable/ic_thread_welcome_video_frame" app:layout_constraintDimensionRatio="4:3" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
-            <LinearLayout android:gravity="center_horizontal" android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_onboarding_video_frame" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+            <LinearLayout android:gravity="center_horizontal" android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/thread_onboarding_video_frame" style="@style/UiKit_ViewGroup_LinearLayout">
                 <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/thread_welcome_subtitle" app:stv_title="@string/thread_welcome_title"/>
                 <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="80dp" android:layout_marginStart="24dp" android:layout_marginEnd="24dp">
                     <ImageView android:id="@+id/thread_onboarding_create_icon" android:background="@drawable/drawable_circle_background_tertiary" android:padding="8dp" android:layout_width="40dp" android:layout_height="40dp" android:src="@drawable/ic_add_24dp" app:layout_constraintBottom_toBottomOf="@+id/thread_onboarding_create_text" app:layout_constraintEnd_toStartOf="@+id/thread_onboarding_create_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/thread_onboarding_create_text" app:tint="?attr/colorInteractiveNormal"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/thread_onboarding_create_text" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/thread_welcome_feature_create" android:layout_marginStart="24dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_onboarding_create_icon" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/thread_onboarding_create_text" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/thread_welcome_feature_create" android:layout_marginStart="24dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_onboarding_create_icon" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
                     <ImageView android:id="@+id/thread_onboarding_join_icon" android:background="@drawable/drawable_circle_background_tertiary" android:padding="8dp" android:layout_width="40dp" android:layout_height="40dp" android:src="@drawable/ic_thread" app:layout_constraintBottom_toBottomOf="@+id/thread_onboarding_join_text" app:layout_constraintEnd_toStartOf="@+id/thread_onboarding_join_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/thread_onboarding_join_text" app:tint="?attr/colorInteractiveNormal"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/thread_onboarding_join_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/thread_welcome_feature_join" android:layout_marginStart="24dp" app:layout_constraintBottom_toTopOf="@+id/thread_onboarding_archive_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_onboarding_join_icon" app:layout_constraintTop_toBottomOf="@+id/thread_onboarding_create_text" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/thread_onboarding_join_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/thread_welcome_feature_join" android:layout_marginStart="24dp" app:layout_constraintBottom_toTopOf="@+id/thread_onboarding_archive_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_onboarding_join_icon" app:layout_constraintTop_toBottomOf="@+id/thread_onboarding_create_text" style="@style/UiKit_TextView"/>
                     <ImageView android:id="@+id/thread_onboarding_archive_icon" android:background="@drawable/drawable_circle_background_tertiary" android:padding="8dp" android:layout_width="40dp" android:layout_height="40dp" android:src="@drawable/ic_archived_clock_light" app:layout_constraintBottom_toBottomOf="@+id/thread_onboarding_archive_text" app:layout_constraintEnd_toStartOf="@+id/thread_onboarding_archive_text" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="@+id/thread_onboarding_archive_text" app:tint="?attr/colorInteractiveNormal"/>
-                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/thread_onboarding_archive_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/thread_welcome_feature_archive" android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_onboarding_archive_icon" app:layout_constraintTop_toBottomOf="@+id/thread_onboarding_join_text" style="@style/res_2131952563_uikit_textview"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/thread_onboarding_archive_text" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" android:text="@string/thread_welcome_feature_archive" android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_onboarding_archive_icon" app:layout_constraintTop_toBottomOf="@+id/thread_onboarding_join_text" style="@style/UiKit_TextView"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-    <com.google.android.material.button.MaterialButton android:id="@+id/thread_onboarding_close" android:layout_margin="16dp" android:text="@string/tutorial_close" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/res_2131952382_uikit_authbutton_material"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/thread_onboarding_close" android:layout_margin="16dp" android:text="@string/tutorial_close" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" style="@style/UiKit_AuthButton_Material"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_thread_settings.xml b/app/src/main/res/layout/widget_thread_settings.xml
index 71e3688169..eca376aba2 100644
--- a/app/src/main/res/layout/widget_thread_settings.xml
+++ b/app/src/main/res/layout/widget_thread_settings.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout android:id="@+id/thread_settings_edit_wrap" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/thread_settings_edit_name" android:layout_margin="16dp" android:hint="@string/thread_name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <androidx.core.widget.NestedScrollView android:id="@+id/scroll_view" style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout android:id="@+id/thread_settings_edit_wrap" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit_ViewGroup_LinearLayout">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/thread_settings_edit_name" android:layout_margin="16dp" android:hint="@string/thread_name" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <View style="@style/res_2131952491_uikit_settings_divider"/>
+                <View style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
-            <LinearLayout android:id="@+id/thread_settings_section_slow_mode" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/form_label_slowmode" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952589_uikit_viewgroup">
-                    <TextView android:id="@+id/thread_settings_slowmode_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_label_slowmode_cooldown" android:layout_alignParentStart="true" android:labelFor="@+id/thread_settings_slow_mode_cooldown_slider" style="@style/res_2131952563_uikit_textview"/>
-                    <TextView android:layout_gravity="end" android:id="@+id/thread_settings_slow_mode_cooldown_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_alignBaseline="@+id/thread_settings_slowmode_label" android:layout_alignParentEnd="true" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <LinearLayout android:id="@+id/thread_settings_section_slow_mode" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/form_label_slowmode" style="@style/UiKit_Settings_Item_Header"/>
+                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup">
+                    <TextView android:id="@+id/thread_settings_slowmode_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_label_slowmode_cooldown" android:layout_alignParentStart="true" android:labelFor="@+id/thread_settings_slow_mode_cooldown_slider" style="@style/UiKit_TextView"/>
+                    <TextView android:layout_gravity="end" android:id="@+id/thread_settings_slow_mode_cooldown_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_alignBaseline="@+id/thread_settings_slowmode_label" android:layout_alignParentEnd="true" style="@style/UiKit_TextView_Subtext"/>
                 </RelativeLayout>
-                <SeekBar android:id="@+id/thread_settings_slow_mode_cooldown_slider" android:progress="0" style="@style/res_2131952488_uikit_seekbar"/>
-                <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_slowmode" style="@style/res_2131952581_uikit_textview_subtext"/>
-                <View android:layout_marginTop="24dp" style="@style/res_2131952491_uikit_settings_divider"/>
+                <SeekBar android:id="@+id/thread_settings_slow_mode_cooldown_slider" android:progress="0" style="@style/UiKit_SeekBar"/>
+                <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_slowmode" style="@style/UiKit_TextView_Subtext"/>
+                <View android:layout_marginTop="24dp" style="@style/UiKit_Settings_Divider"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/thread_settings_save" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save_changes" style="@style/res_2131952114_settings_floatingactionbutton"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/thread_settings_save" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save_changes" style="@style/Settings_FloatingActionButton"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_thread_status.xml b/app/src/main/res/layout/widget_thread_status.xml
index 2e09ae0b1a..2f5432ba06 100644
--- a/app/src/main/res/layout/widget_thread_status.xml
+++ b/app/src/main/res/layout/widget_thread_status.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/thread_status" android:background="?attr/primary_660" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="0dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/primary_300" android:ellipsize="end" android:id="@+id/thread_status_text" android:layout_width="0dp" android:text="@string/thread_header_notice_join" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/thread_status_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview"/>
-    <com.discord.views.LoadingButton android:id="@+id/thread_status_button" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_status_text" app:layout_constraintTop_toTopOf="0" app:lb_progress_color="@color/white" app:lb_text="@string/join" style="@style/res_2131952458_uikit_material_button"/>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/thread_status" android:background="?attr/primary_660" android:paddingTop="8dp" android:paddingBottom="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="0dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/primary_300" android:ellipsize="end" android:id="@+id/thread_status_text" android:layout_width="0dp" android:text="@string/thread_header_notice_join" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/thread_status_button" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/UiKit_TextView"/>
+    <com.discord.views.LoadingButton android:id="@+id/thread_status_button" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/thread_status_text" app:layout_constraintTop_toTopOf="0" app:lb_progress_color="@color/white" app:lb_text="@string/join" style="@style/UiKit_Material_Button"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_tos_accept.xml b/app/src/main/res/layout/widget_tos_accept.xml
index efb70cd69a..614149c3e3 100644
--- a/app/src/main/res/layout/widget_tos_accept.xml
+++ b/app/src/main/res/layout/widget_tos_accept.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/alert_tos_ack_wrap" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout style="@style/res_2131952406_uikit_copy_container">
-            <ImageView android:src="?attr/img_new_tos" android:contentDescription="@string/new_terms_title" style="@style/res_2131952448_uikit_imageview"/>
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:layout_gravity="start" android:id="@+id/alert_tos_text_title" android:text="@string/new_terms_title" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:id="@+id/alert_tos_text_description" android:layout_marginTop="16dp" android:text="@string/new_terms_description" style="@style/res_2131952563_uikit_textview"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/alert_tos_terms_of_service" android:layout_marginTop="16dp" android:text="@string/terms_of_service_url" style="@style/res_2131952572_uikit_textview_link"/>
-                <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/alert_tos_privacy_policy" android:layout_marginTop="12dp" android:text="@string/privacy_policy_url" style="@style/res_2131952572_uikit_textview_link"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/alert_tos_ack_wrap" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout style="@style/UiKit_Copy_Container">
+            <ImageView android:src="?attr/img_new_tos" android:contentDescription="@string/new_terms_title" style="@style/UiKit_ImageView"/>
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:layout_gravity="start" android:id="@+id/alert_tos_text_title" android:text="@string/new_terms_title" style="@style/UiKit_TextView_H1"/>
+                <TextView android:id="@+id/alert_tos_text_description" android:layout_marginTop="16dp" android:text="@string/new_terms_description" style="@style/UiKit_TextView"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/alert_tos_terms_of_service" android:layout_marginTop="16dp" android:text="@string/terms_of_service_url" style="@style/UiKit_TextView_Link"/>
+                <com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@+id/alert_tos_privacy_policy" android:layout_marginTop="12dp" android:text="@string/privacy_policy_url" style="@style/UiKit_TextView_Link"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:id="@+id/alert_tos_ack_wrap" android:layout_marginTop="8dp" android:layout_alignParentBottom="true" style="@style/res_2131952403_uikit_copy_anchor">
-        <FrameLayout style="@style/res_2131952405_uikit_copy_anchor_item_rotatable">
-            <CheckBox android:id="@+id/alert_tos_ack" android:layout_height="52dp" android:text="@string/new_terms_ack" style="@style/res_2131952396_uikit_checkbox"/>
+    <LinearLayout android:id="@+id/alert_tos_ack_wrap" android:layout_marginTop="8dp" android:layout_alignParentBottom="true" style="@style/UiKit_Copy_Anchor">
+        <FrameLayout style="@style/UiKit_Copy_Anchor_Item_Rotatable">
+            <CheckBox android:id="@+id/alert_tos_ack" android:layout_height="52dp" android:text="@string/new_terms_ack" style="@style/UiKit_Checkbox"/>
         </FrameLayout>
-        <FrameLayout style="@style/res_2131952405_uikit_copy_anchor_item_rotatable">
-            <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/alert_tos_ack_continue" android:layout_width="match_parent" android:text="@string/new_terms_continue" style="@style/res_2131952458_uikit_material_button"/>
+        <FrameLayout style="@style/UiKit_Copy_Anchor_Item_Rotatable">
+            <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/alert_tos_ack_continue" android:layout_width="match_parent" android:text="@string/new_terms_continue" style="@style/UiKit_Material_Button"/>
         </FrameLayout>
     </LinearLayout>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_tos_report_violation.xml b/app/src/main/res/layout/widget_tos_report_violation.xml
index d929164277..1e864f3fd6 100644
--- a/app/src/main/res/layout/widget_tos_report_violation.xml
+++ b/app/src/main/res/layout/widget_tos_report_violation.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <TextView android:id="@+id/report_header" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/res_2131952565_uikit_textview_h1"/>
-            <TextView android:id="@+id/report_reasons_header" android:visibility="gone" android:layout_marginTop="16dp" android:text="@string/form_label_report_reason" style="@style/res_2131952496_uikit_settings_item_header"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+            <TextView android:id="@+id/report_header" android:layout_width="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" style="@style/UiKit_TextView_H1"/>
+            <TextView android:id="@+id/report_reasons_header" android:visibility="gone" android:layout_marginTop="16dp" android:text="@string/form_label_report_reason" style="@style/UiKit_Settings_Item_Header"/>
             <ProgressBar android:layout_gravity="center" android:id="@+id/report_reasons_loading" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="32dp"/>
-            <LinearLayout android:id="@+id/report_reasons_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_tooltip" android:layout_margin="16dp" style="@style/res_2131952581_uikit_textview_subtext"/>
+            <LinearLayout android:id="@+id/report_reasons_container" style="@style/UiKit_ViewGroup_LinearLayout"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_tooltip" android:layout_margin="16dp" style="@style/UiKit_TextView_Subtext"/>
             <com.discord.views.LoadingButton android:id="@+id/report_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toBottomOf="@+id/age_verify_input_wrapper" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/report"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_tos_report_violation_reason.xml b/app/src/main/res/layout/widget_tos_report_violation_reason.xml
index 3a1aba9ed6..f10148c7a7 100644
--- a/app/src/main/res/layout/widget_tos_report_violation_reason.xml
+++ b/app/src/main/res/layout/widget_tos_report_violation_reason.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_marginBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/report_reason_radio" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/report_reason_header" style="@style/res_2131952567_uikit_textview_h2"/>
-        <TextView android:id="@+id/report_reason_descriptipn" android:layout_marginTop="4dp" style="@style/res_2131952581_uikit_textview_subtext"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_marginBottom="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <LinearLayout android:layout_centerVertical="true" android:layout_toStartOf="@+id/report_reason_radio" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/report_reason_header" style="@style/UiKit_TextView_H2"/>
+        <TextView android:id="@+id/report_reason_descriptipn" android:layout_marginTop="4dp" style="@style/UiKit_TextView_Subtext"/>
     </LinearLayout>
     <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/report_reason_radio" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingStart="0dp" android:paddingEnd="0dp" android:layout_marginStart="16dp" android:layout_alignParentEnd="true"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_unknown_sticker_sheet.xml b/app/src/main/res/layout/widget_unknown_sticker_sheet.xml
index 12d6d67c4d..a6c6ffb39e 100644
--- a/app/src/main/res/layout/widget_unknown_sticker_sheet.xml
+++ b/app/src/main/res/layout/widget_unknown_sticker_sheet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
             <com.discord.views.sticker.StickerView android:id="@+id/unknown_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
-            <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/unknown_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952564_uikit_textview_bold"/>
-                <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/sticker_popout_premium_unjoined_private_guild_description" style="@style/res_2131952563_uikit_textview"/>
+            <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/unknown_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/UiKit_TextView_Bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/sticker_popout_premium_unjoined_private_guild_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/widget_urgent_message_dialog.xml b/app/src/main/res/layout/widget_urgent_message_dialog.xml
index 841267f4c8..3717b758c6 100644
--- a/app/src/main/res/layout/widget_urgent_message_dialog.xml
+++ b/app/src/main/res/layout/widget_urgent_message_dialog.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
-    <TextView android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:layout_width="match_parent" style="@style/res_2131952566_uikit_textview_h1_bold"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <TextView android:id="@+id/view_dialog_confirmation_text" android:text="@string/sample_confirmation" style="@style/res_2131952499_uikit_settings_item_subtext"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <View style="@style/res_2131952416_uikit_divider"/>
-    <LinearLayout style="@style/res_2131952410_uikit_dialog_buttoncontainer">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page_LinearLayout">
+    <TextView android:id="@+id/view_dialog_confirmation_header" android:padding="16dp" android:layout_width="match_parent" style="@style/UiKit_TextView_H1_Bold"/>
+    <View style="@style/UiKit_Divider"/>
+    <TextView android:id="@+id/view_dialog_confirmation_text" android:text="@string/sample_confirmation" style="@style/UiKit_Settings_Item_SubText"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <View style="@style/UiKit_Divider"/>
+    <LinearLayout style="@style/UiKit_Dialog_ButtonContainer">
         <com.discord.views.LoadingButton android:id="@+id/view_dialog_confirmation_confirm" android:padding="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" app:lb_progress_color="@color/white" app:lb_text="@string/okay" app:lb_text_color="@drawable/button_text_color_primary_100"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_url_actions.xml b/app/src/main/res/layout/widget_url_actions.xml
index 90bb2d5882..322b614c7f 100644
--- a/app/src/main/res/layout/widget_url_actions.xml
+++ b/app/src/main/res/layout/widget_url_actions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:textAppearance="@style/res_2131952533_uikit_textappearance" android:textColorLink="?attr/colorTextLink" android:autoLink="web" android:id="@+id/dialog_url_actions_url" style="@style/res_2131952492_uikit_settings_item"/>
-    <View style="@style/res_2131952491_uikit_settings_divider"/>
-    <TextView android:id="@+id/dialog_url_actions_copy" android:text="@string/copy_link" app:drawableStartCompat="?attr/ic_copy" style="@style/res_2131952497_uikit_settings_item_icon"/>
-    <TextView android:id="@+id/dialog_url_actions_open" android:text="@string/open_in_browser" app:drawableStartCompat="?attr/ic_open_in_new" style="@style/res_2131952497_uikit_settings_item_icon"/>
-    <TextView android:id="@+id/dialog_url_actions_share" android:text="@string/share" app:drawableStartCompat="?attr/ic_share" style="@style/res_2131952497_uikit_settings_item_icon"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:textAppearance="@style/UiKit_TextAppearance" android:textColorLink="?attr/colorTextLink" android:autoLink="web" android:id="@+id/dialog_url_actions_url" style="@style/UiKit_Settings_Item"/>
+    <View style="@style/UiKit_Settings_Divider"/>
+    <TextView android:id="@+id/dialog_url_actions_copy" android:text="@string/copy_link" app:drawableStartCompat="?attr/ic_copy" style="@style/UiKit_Settings_Item_Icon"/>
+    <TextView android:id="@+id/dialog_url_actions_open" android:text="@string/open_in_browser" app:drawableStartCompat="?attr/ic_open_in_new" style="@style/UiKit_Settings_Item_Icon"/>
+    <TextView android:id="@+id/dialog_url_actions_share" android:text="@string/share" app:drawableStartCompat="?attr/ic_share" style="@style/UiKit_Settings_Item_Icon"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_usage_settings_dialog.xml b/app/src/main/res/layout/widget_usage_settings_dialog.xml
index 8839ed5fee..b10b8e5788 100644
--- a/app/src/main/res/layout/widget_usage_settings_dialog.xml
+++ b/app/src/main/res/layout/widget_usage_settings_dialog.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="200dp" android:layout_height="200dp" android:src="?attr/theme_friends_no_block" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="200dp" android:layout_height="200dp" android:src="?attr/theme_friends_no_block" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
diff --git a/app/src/main/res/layout/widget_user_account_verify.xml b/app/src/main/res/layout/widget_user_account_verify.xml
index a170ece9fb..babc902b87 100644
--- a/app/src/main/res/layout/widget_user_account_verify.xml
+++ b/app/src/main/res/layout/widget_user_account_verify.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
-        <LinearLayout android:layout_width="wrap_content" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_gravity="center" android:layout_marginBottom="32dp" android:src="?attr/img_baddies" android:contentDescription="@string/new_terms_title" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:layout_gravity="center" android:text="@string/verification_title" style="@style/res_2131952565_uikit_textview_h1"/>
-            <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/verify_account_text_body" android:layout_marginTop="16dp" android:maxWidth="320dp" android:text="@string/verification_body" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <LinearLayout android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
+        <LinearLayout android:layout_width="wrap_content" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <ImageView android:layout_gravity="center" android:layout_marginBottom="32dp" android:src="?attr/img_baddies" android:contentDescription="@string/new_terms_title" style="@style/UiKit_ImageView"/>
+            <TextView android:layout_gravity="center" android:text="@string/verification_title" style="@style/UiKit_TextView_H1"/>
+            <TextView android:gravity="center" android:layout_gravity="center" android:id="@+id/verify_account_text_body" android:layout_marginTop="16dp" android:maxWidth="320dp" android:text="@string/verification_body" style="@style/UiKit_TextView"/>
         </LinearLayout>
-        <LinearLayout android:layout_marginLeft="20dp" android:layout_marginRight="20dp" style="@style/res_2131952377_uikit_alert_verify_account_method_wrapper">
-            <RelativeLayout android:id="@+id/verify_account_by_email" style="@style/res_2131952376_uikit_alert_verify_account_method_container">
-                <LinearLayout style="@style/res_2131952375_uikit_alert_verify_account_method">
-                    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:layout_marginTop="16dp" android:text="@string/verify_by" android:textAllCaps="true" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <TextView android:text="@string/email" android:textAllCaps="true" style="@style/res_2131952565_uikit_textview_h1"/>
+        <LinearLayout android:layout_marginLeft="20dp" android:layout_marginRight="20dp" style="@style/UiKit_Alert_Verify_Account_Method_Wrapper">
+            <RelativeLayout android:id="@+id/verify_account_by_email" style="@style/UiKit_Alert_Verify_Account_Method_Container">
+                <LinearLayout style="@style/UiKit_Alert_Verify_Account_Method">
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:layout_marginTop="16dp" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit_TextView_Subtext"/>
+                    <TextView android:text="@string/email" android:textAllCaps="true" style="@style/UiKit_TextView_H1"/>
                 </LinearLayout>
-                <ImageView android:src="?attr/img_verify_email" android:layout_centerHorizontal="true" android:contentDescription="@string/email" style="@style/res_2131952448_uikit_imageview"/>
+                <ImageView android:src="?attr/img_verify_email" android:layout_centerHorizontal="true" android:contentDescription="@string/email" style="@style/UiKit_ImageView"/>
             </RelativeLayout>
-            <RelativeLayout android:id="@+id/verify_account_by_phone" style="@style/res_2131952376_uikit_alert_verify_account_method_container">
-                <LinearLayout style="@style/res_2131952375_uikit_alert_verify_account_method">
-                    <TextView android:textAppearance="@style/res_2131952541_uikit_textappearance_semibold" android:layout_marginTop="16dp" android:text="@string/verify_by" android:textAllCaps="true" style="@style/res_2131952581_uikit_textview_subtext"/>
-                    <TextView android:text="@string/phone" android:textAllCaps="true" style="@style/res_2131952565_uikit_textview_h1"/>
+            <RelativeLayout android:id="@+id/verify_account_by_phone" style="@style/UiKit_Alert_Verify_Account_Method_Container">
+                <LinearLayout style="@style/UiKit_Alert_Verify_Account_Method">
+                    <TextView android:textAppearance="@style/UiKit_TextAppearance_Semibold" android:layout_marginTop="16dp" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit_TextView_Subtext"/>
+                    <TextView android:text="@string/phone" android:textAllCaps="true" style="@style/UiKit_TextView_H1"/>
                 </LinearLayout>
-                <ImageView android:src="?attr/img_verify_phone" android:layout_centerHorizontal="true" android:contentDescription="@string/phone" style="@style/res_2131952448_uikit_imageview"/>
+                <ImageView android:src="?attr/img_verify_phone" android:layout_centerHorizontal="true" android:contentDescription="@string/phone" style="@style/UiKit_ImageView"/>
             </RelativeLayout>
         </LinearLayout>
     </LinearLayout>
-    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@+id/verify_account_support" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" style="@style/res_2131952581_uikit_textview_subtext"/>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center" android:id="@+id/verify_account_support" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" style="@style/UiKit_TextView_Subtext"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_user_email_update.xml b/app/src/main/res/layout/widget_user_email_update.xml
index 8d027790d5..f66a6513a6 100644
--- a/app/src/main/res/layout/widget_user_email_update.xml
+++ b/app/src/main/res/layout/widget_user_email_update.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/alert_verify_email_anchor" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:layout_gravity="center_vertical" style="@style/res_2131952406_uikit_copy_container">
-            <com.airbnb.lottie.LottieAnimationView style="@style/res_2131952379_uikit_anim_verify_by_email_frozen"/>
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:text="@string/verify_by_email" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:gravity="center" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/enter_email_body" style="@style/res_2131952563_uikit_textview"/>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/alert_verify_email_change_email" android:hint="@string/email" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952552_uikit_textinputlayout_edittext_singleline_email"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/alert_verify_email_anchor" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:layout_gravity="center_vertical" style="@style/UiKit_Copy_Container">
+            <com.airbnb.lottie.LottieAnimationView style="@style/UiKit_Anim_Verify_By_Email_Frozen"/>
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:text="@string/verify_by_email" style="@style/UiKit_TextView_H1"/>
+                <TextView android:gravity="center" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/enter_email_body" style="@style/UiKit_TextView"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/alert_verify_email_change_email" android:hint="@string/email" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Email"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/alert_verify_email_change_password" android:hint="@string/form_label_password" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/alert_verify_email_change_password" android:hint="@string/form_label_password" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:id="@+id/alert_verify_email_anchor" android:layout_alignParentBottom="true" style="@style/res_2131952403_uikit_copy_anchor">
-        <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/alert_verify_email_change" android:text="@string/change_email_short" style="@style/res_2131952458_uikit_material_button"/>
+    <LinearLayout android:id="@+id/alert_verify_email_anchor" android:layout_alignParentBottom="true" style="@style/UiKit_Copy_Anchor">
+        <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/alert_verify_email_change" android:text="@string/change_email_short" style="@style/UiKit_Material_Button"/>
     </LinearLayout>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_user_email_verify.xml b/app/src/main/res/layout/widget_user_email_verify.xml
index 0c33873376..b500ecb2ac 100644
--- a/app/src/main/res/layout/widget_user_email_verify.xml
+++ b/app/src/main/res/layout/widget_user_email_verify.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/alert_verify_email_anchor" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:layout_gravity="center_vertical" style="@style/res_2131952406_uikit_copy_container">
-            <com.airbnb.lottie.LottieAnimationView style="@style/res_2131952378_uikit_anim_verify_by_email"/>
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:text="@string/verify_by_email" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:gravity="center" android:layout_marginTop="16dp" android:text="@string/verify_email_body" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/alert_verify_email_anchor" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:layout_gravity="center_vertical" style="@style/UiKit_Copy_Container">
+            <com.airbnb.lottie.LottieAnimationView style="@style/UiKit_Anim_Verify_By_Email"/>
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:text="@string/verify_by_email" style="@style/UiKit_TextView_H1"/>
+                <TextView android:gravity="center" android:layout_marginTop="16dp" android:text="@string/verify_email_body" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:id="@+id/alert_verify_email_anchor" android:layout_alignParentBottom="true" style="@style/res_2131952403_uikit_copy_anchor">
-        <FrameLayout style="@style/res_2131952405_uikit_copy_anchor_item_rotatable">
-            <com.google.android.material.button.MaterialButton android:id="@+id/alert_verify_email_resend" android:text="@string/resend_email" style="@style/res_2131952458_uikit_material_button"/>
+    <LinearLayout android:id="@+id/alert_verify_email_anchor" android:layout_alignParentBottom="true" style="@style/UiKit_Copy_Anchor">
+        <FrameLayout style="@style/UiKit_Copy_Anchor_Item_Rotatable">
+            <com.google.android.material.button.MaterialButton android:id="@+id/alert_verify_email_resend" android:text="@string/resend_email" style="@style/UiKit_Material_Button"/>
         </FrameLayout>
-        <FrameLayout style="@style/res_2131952405_uikit_copy_anchor_item_rotatable">
-            <com.google.android.material.button.MaterialButton android:id="@+id/alert_verify_email_change" android:text="@string/change_email_short" style="@style/res_2131952471_uikit_material_button_transparent"/>
+        <FrameLayout style="@style/UiKit_Copy_Anchor_Item_Rotatable">
+            <com.google.android.material.button.MaterialButton android:id="@+id/alert_verify_email_change" android:text="@string/change_email_short" style="@style/UiKit_Material_Button_Transparent"/>
         </FrameLayout>
     </LinearLayout>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_user_mentions.xml b/app/src/main/res/layout/widget_user_mentions.xml
index a648c4eab3..a9b84d7845 100644
--- a/app/src/main/res/layout/widget_user_mentions.xml
+++ b/app/src/main/res/layout/widget_user_mentions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@+id/action_bar_toolbar" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_mentions_list" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_mentions_list" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_user_mentions_filter.xml b/app/src/main/res/layout/widget_user_mentions_filter.xml
index 2f149bac35..93662ad1bf 100644
--- a/app/src/main/res/layout/widget_user_mentions_filter.xml
+++ b/app/src/main/res/layout/widget_user_mentions_filter.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-    <LinearLayout android:paddingBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952503_uikit_sheet_header">
-            <ImageView android:src="?attr/ic_sort" android:importantForAccessibility="no" style="@style/res_2131952505_uikit_sheet_header_icon"/>
-            <androidx.constraintlayout.widget.Guideline style="@style/res_2131952502_uikit_sheet_guideline"/>
-            <TextView android:text="@string/filter_mentions" style="@style/res_2131952506_uikit_sheet_header_title"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_ScrollView_Page">
+    <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
+            <ImageView android:src="?attr/ic_sort" android:importantForAccessibility="no" style="@style/UiKit_Sheet_Header_Icon"/>
+            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
+            <TextView android:text="@string/filter_mentions" style="@style/UiKit_Sheet_Header_Title"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
-        <com.discord.views.CheckedSetting android:id="@+id/user_mentions_filter_this_server" app:cs_text="@string/this_server" app:cs_view_type="2" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <com.discord.views.CheckedSetting android:id="@+id/user_mentions_filter_include_everyone" app:cs_text="@string/recent_mentions_filter_everyone" app:cs_view_type="0" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
-        <com.discord.views.CheckedSetting android:id="@+id/user_mentions_filter_include_roles" app:cs_text="@string/recent_mentions_filter_roles" app:cs_view_type="0" style="@style/res_2131952398_uikit_checkedsetting_themed"/>
+        <com.discord.views.CheckedSetting android:id="@+id/user_mentions_filter_this_server" app:cs_text="@string/this_server" app:cs_view_type="2" style="@style/UiKit_CheckedSetting_Themed"/>
+        <com.discord.views.CheckedSetting android:id="@+id/user_mentions_filter_include_everyone" app:cs_text="@string/recent_mentions_filter_everyone" app:cs_view_type="0" style="@style/UiKit_CheckedSetting_Themed"/>
+        <com.discord.views.CheckedSetting android:id="@+id/user_mentions_filter_include_roles" app:cs_text="@string/recent_mentions_filter_roles" app:cs_view_type="0" style="@style/UiKit_CheckedSetting_Themed"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widget_user_mutual_friends.xml b/app/src/main/res/layout/widget_user_mutual_friends.xml
index 8f10edb73b..b2deb50adb 100644
--- a/app/src/main/res/layout/widget_user_mutual_friends.xml
+++ b/app/src/main/res/layout/widget_user_mutual_friends.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_mutual_friends_recycler_view" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_mutual_friends_recycler_view" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_user_mutual_guilds.xml b/app/src/main/res/layout/widget_user_mutual_guilds.xml
index 3556eb69d5..db825fda54 100644
--- a/app/src/main/res/layout/widget_user_mutual_guilds.xml
+++ b/app/src/main/res/layout/widget_user_mutual_guilds.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primary_600" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_CoordinatorLayout">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?attr/ic_action_bar_back" style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_mutual_guilds_recycler_view" style="@style/res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior"/>
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/user_mutual_guilds_recycler_view" style="@style/UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_user_password_verify.xml b/app/src/main/res/layout/widget_user_password_verify.xml
index f3076aa332..c7c80426e3 100644
--- a/app/src/main/res/layout/widget_user_password_verify.xml
+++ b/app/src/main/res/layout/widget_user_password_verify.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_password_wrap" android:hint="@string/user_settings_edit_account_password_label" style="@style/res_2131952559_uikit_textinputlayout_primary_password">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952553_uikit_textinputlayout_edittext_singleline_password"/>
+    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/edit_account_password_wrap" android:hint="@string/user_settings_edit_account_password_label" style="@style/UiKit_TextInputLayout_Primary_Password">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine_Password"/>
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/settings_account_save" android:contentDescription="@string/save" style="@style/Settings_FloatingActionButton_Save"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_user_phone_manage.xml b/app/src/main/res/layout/widget_user_phone_manage.xml
index b9a11ad458..c9ed118a92 100644
--- a/app/src/main/res/layout/widget_user_phone_manage.xml
+++ b/app/src/main/res/layout/widget_user_phone_manage.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ScrollView android:layout_gravity="top" android:layout_height="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:foregroundGravity="top" style="@style/res_2131952610_uikit_viewgroup_scrollview">
-        <LinearLayout android:layout_gravity="top" android:orientation="vertical" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:id="@+id/user_phone_title" android:text="@string/enter_phone_title" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:gravity="center" android:id="@+id/user_phone_add_description_note" android:layout_marginTop="16dp" android:text="@string/enter_phone_description" style="@style/res_2131952563_uikit_textview"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <ScrollView android:layout_gravity="top" android:layout_height="match_parent" android:layout_marginLeft="16dp" android:layout_marginTop="32dp" android:layout_marginRight="16dp" android:foregroundGravity="top" style="@style/UiKit_ViewGroup_ScrollView">
+        <LinearLayout android:layout_gravity="top" android:orientation="vertical" style="@style/UiKit_ViewGroup_LinearLayout">
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:id="@+id/user_phone_title" android:text="@string/enter_phone_title" style="@style/UiKit_TextView_H1"/>
+                <TextView android:gravity="center" android:id="@+id/user_phone_add_description_note" android:layout_marginTop="16dp" android:text="@string/enter_phone_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
             <com.discord.views.phone.PhoneOrEmailInputView android:id="@+id/user_phone_add_number" android:layout_width="match_parent" android:layout_height="wrap_content" app:force_mode="2" app:hint="@string/phone_verification_phone_label"/>
-            <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/user_phone_add_next" android:text="@string/next" style="@style/res_2131952585_uikit_user_phone_manage_confirm"/>
-            <TextView android:textColor="@color/status_red_500" android:gravity="center" android:id="@+id/remove_phone" android:text="@string/user_settings_account_remove_phone_number_button" style="@style/res_2131952492_uikit_settings_item"/>
+            <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@+id/user_phone_add_next" android:text="@string/next" style="@style/UiKit_User_Phone_Manage_Confirm"/>
+            <TextView android:textColor="@color/status_red_500" android:gravity="center" android:id="@+id/remove_phone" android:text="@string/user_settings_account_remove_phone_number_button" style="@style/UiKit_Settings_Item"/>
         </LinearLayout>
     </ScrollView>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_user_phone_verify.xml b/app/src/main/res/layout/widget_user_phone_verify.xml
index 6fd0256635..b8621dbc04 100644
--- a/app/src/main/res/layout/widget_user_phone_verify.xml
+++ b/app/src/main/res/layout/widget_user_phone_verify.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/res_2131952602_uikit_viewgroup_page">
-    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/phone_digit_verification_view" style="@style/res_2131952612_uikit_viewgroup_scrollview_page">
-        <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.airbnb.lottie.LottieAnimationView style="@style/res_2131952380_uikit_anim_verify_by_phone"/>
-            <LinearLayout style="@style/res_2131952402_uikit_copy">
-                <TextView android:text="@string/verification_phone_title" style="@style/res_2131952565_uikit_textview_h1"/>
-                <TextView android:gravity="center" android:layout_marginTop="4dp" android:text="@string/verification_phone_description" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/UiKit_ViewGroup_Page">
+    <ScrollView android:layout_height="match_parent" android:layout_above="@+id/phone_digit_verification_view" style="@style/UiKit_ViewGroup_ScrollView_Page">
+        <LinearLayout android:gravity="center" android:layout_gravity="center" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.airbnb.lottie.LottieAnimationView style="@style/UiKit_Anim_Verify_By_Phone"/>
+            <LinearLayout style="@style/UiKit_Copy">
+                <TextView android:text="@string/verification_phone_title" style="@style/UiKit_TextView_H1"/>
+                <TextView android:gravity="center" android:layout_marginTop="4dp" android:text="@string/verification_phone_description" style="@style/UiKit_TextView"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
     <com.discord.views.CodeVerificationView android:id="@+id/phone_digit_verification_view" android:paddingBottom="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true"/>
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951639_apptheme_appbarlayout_flat_transparent">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951667_apptheme_toolbar_transparent"/>
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat_Transparent">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar_Transparent"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <ImageView android:id="@+id/close_button" android:padding="16dp" android:foreground="?attr/selectableItemBackgroundBorderless" android:src="?attr/ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" style="@style/res_2131952448_uikit_imageview"/>
-    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952415_uikit_dimmerview"/>
+    <ImageView android:id="@+id/close_button" android:padding="16dp" android:foreground="?attr/selectableItemBackgroundBorderless" android:src="?attr/ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" style="@style/UiKit_ImageView"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/UiKit_DimmerView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_user_profile_adapter_item_empty.xml b/app/src/main/res/layout/widget_user_profile_adapter_item_empty.xml
index b11a4ccd3d..38662c73e2 100644
--- a/app/src/main/res/layout/widget_user_profile_adapter_item_empty.xml
+++ b/app/src/main/res/layout/widget_user_profile_adapter_item_empty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <ImageView android:id="@+id/user_profile_adapter_item_empty" android:layout_marginTop="32dp" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-    <TextView android:id="@+id/user_profile_adapter_item_empty_text" android:layout_margin="16dp" style="@style/res_2131952567_uikit_textview_h2"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <ImageView android:id="@+id/user_profile_adapter_item_empty" android:layout_marginTop="32dp" android:importantForAccessibility="no" style="@style/UiKit_ImageView"/>
+    <TextView android:id="@+id/user_profile_adapter_item_empty_text" android:layout_margin="16dp" style="@style/UiKit_TextView_H2"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_user_profile_adapter_item_friend.xml b/app/src/main/res/layout/widget_user_profile_adapter_item_friend.xml
index 5b805a8647..c87873abe1 100644
--- a/app/src/main/res/layout/widget_user_profile_adapter_item_friend.xml
+++ b/app/src/main/res/layout/widget_user_profile_adapter_item_friend.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:padding="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_profile_adapter_item_friend_avatar" style="@style/res_2131951674_avatar_large"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/selectableItemBackground" android:padding="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_profile_adapter_item_friend_avatar" style="@style/Avatar_Large"/>
     <com.discord.views.StatusView android:id="@+id/user_profile_adapter_item_friend_status" android:layout_width="16dp" android:layout_height="wrap_content" android:src="@drawable/ic_status_idle_16dp" android:layout_alignBottom="@+id/user_profile_adapter_item_friend_avatar" android:translationX="2dp" android:translationY="2dp" android:layout_alignEnd="@+id/user_profile_adapter_item_friend_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="2dp" app:sv_corner_radius="2dp"/>
-    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_marginEnd="4dp" android:layout_toStartOf="@+id/user_profile_adapter_item_friend_mutual" android:layout_toEndOf="@+id/user_profile_adapter_item_friend_avatar" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/user_profile_adapter_item_friend_user_name" android:singleLine="true" style="@style/res_2131952570_uikit_textview_large"/>
-        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/user_profile_adapter_item_friend_user_game" android:paddingTop="4dp" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_marginEnd="4dp" android:layout_toStartOf="@+id/user_profile_adapter_item_friend_mutual" android:layout_toEndOf="@+id/user_profile_adapter_item_friend_avatar" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/user_profile_adapter_item_friend_user_name" android:singleLine="true" style="@style/UiKit_TextView_Large"/>
+        <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@+id/user_profile_adapter_item_friend_user_game" android:paddingTop="4dp" android:singleLine="true" style="@style/UiKit_TextView"/>
     </LinearLayout>
-    <LinearLayout android:id="@+id/user_profile_adapter_item_friend_mutual" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <LinearLayout android:id="@+id/user_profile_adapter_item_friend_mutual" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <include android:id="@+id/mutual_server_1" layout="@layout/widget_user_profile_adapter_item_friend_mutual_server"/>
         <include android:id="@+id/mutual_server_2" layout="@layout/widget_user_profile_adapter_item_friend_mutual_server"/>
         <include android:id="@+id/mutual_server_3" layout="@layout/widget_user_profile_adapter_item_friend_mutual_server"/>
diff --git a/app/src/main/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml b/app/src/main/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml
index f978207175..280c119a0c 100644
--- a/app/src/main/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml
+++ b/app/src/main/res/layout/widget_user_profile_adapter_item_friend_mutual_server.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:layout_marginStart="4dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_profile_adapter_item_friend_mutual_image" android:layout_marginStart="4dp" style="@style/res_2131951676_avatar_medium"/>
-    <TextView android:textSize="9sp" android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/user_profile_adapter_item_friend_mutual_text" android:background="@drawable/drawable_circle_brand" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:layout_width="@dimen/avatar_size_medium" android:layout_height="@dimen/avatar_size_medium" android:layout_marginStart="4dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_profile_adapter_item_friend_mutual_image" android:layout_marginStart="4dp" style="@style/Avatar_Medium"/>
+    <TextView android:textSize="9sp" android:textColor="@color/primary_100" android:gravity="center" android:id="@+id/user_profile_adapter_item_friend_mutual_text" android:background="@drawable/drawable_circle_brand" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/UiKit_TextView"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_user_profile_adapter_item_server.xml b/app/src/main/res/layout/widget_user_profile_adapter_item_server.xml
index c2a91df335..e08dbb1e36 100644
--- a/app/src/main/res/layout/widget_user_profile_adapter_item_server.xml
+++ b/app/src/main/res/layout/widget_user_profile_adapter_item_server.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:padding="16dp" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-    <RelativeLayout android:id="@+id/user_profile_adapter_item_server_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" style="@style/res_2131952608_uikit_viewgroup_relativelayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_profile_adapter_item_server_image" style="@style/res_2131951674_avatar_large"/>
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="none" android:gravity="center" android:id="@+id/user_profile_adapter_item_server_text" android:background="@drawable/drawable_circle_brand" android:padding="4dp" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/res_2131952567_uikit_textview_h2"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/selectableItemBackground" android:padding="16dp" style="@style/UiKit_ViewGroup_RelativeLayout">
+    <RelativeLayout android:id="@+id/user_profile_adapter_item_server_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" style="@style/UiKit_ViewGroup_RelativeLayout">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/user_profile_adapter_item_server_image" style="@style/Avatar_Large"/>
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:ellipsize="none" android:gravity="center" android:id="@+id/user_profile_adapter_item_server_text" android:background="@drawable/drawable_circle_brand" android:padding="4dp" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" style="@style/UiKit_TextView_H2"/>
     </RelativeLayout>
-    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toEndOf="@+id/user_profile_adapter_item_server_wrap" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/user_profile_adapter_item_server_name" android:singleLine="true" style="@style/res_2131952570_uikit_textview_large"/>
-        <TextView android:id="@+id/user_profile_adapter_item_server_nick" android:paddingTop="4dp" android:singleLine="true" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:layout_centerVertical="true" android:layout_marginStart="16dp" android:layout_toEndOf="@+id/user_profile_adapter_item_server_wrap" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/user_profile_adapter_item_server_name" android:singleLine="true" style="@style/UiKit_TextView_Large"/>
+        <TextView android:id="@+id/user_profile_adapter_item_server_nick" android:paddingTop="4dp" android:singleLine="true" style="@style/UiKit_TextView"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_user_rich_presence.xml b/app/src/main/res/layout/widget_user_rich_presence.xml
index 56c6481666..4e2ed1b8e2 100644
--- a/app/src/main/res/layout/widget_user_rich_presence.xml
+++ b/app/src/main/res/layout/widget_user_rich_presence.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <TextView android:id="@+id/rich_presence_header" style="@style/res_2131952620_userprofile_section_header"/>
-    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/res_2131952619_userprofile_section_card">
-        <androidx.constraintlayout.widget.ConstraintLayout style="@style/res_2131952614_userprofile_presencesection_body">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_LinearLayout">
+    <TextView android:id="@+id/rich_presence_header" style="@style/UserProfile_Section_Header"/>
+    <androidx.cardview.widget.CardView app:cardBackgroundColor="?attr/colorBackgroundPrimary" style="@style/UserProfile_Section_Card">
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UserProfile_PresenceSection_Body">
             <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_large" android:layout_width="64dp" android:layout_height="64dp" app:layout_constraintHorizontal_chainStyle="1" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:placeholderImage="?attr/ic_game_icon_placeholder" app:placeholderImageScaleType="2" app:roundedCornerRadius="4dp"/>
             <Space android:id="@+id/image_bottom_guideline" android:layout_width="@dimen/uikit_image_border_size" android:layout_height="@dimen/uikit_image_border_size" android:layout_marginTop="@dimen/uikit_image_border_size" android:layout_marginStart="@dimen/uikit_image_border_size" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toBottomOf="@+id/rich_presence_image_large"/>
-            <LinearLayout android:id="@+id/rich_presence_container_data" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/rich_presence_image_small" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/res_2131952615_userprofile_presencesection_body_headertext"/>
-                <TextView android:id="@+id/rich_presence_details" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
-                <TextView android:id="@+id/rich_presence_state" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
-                <TextView android:id="@+id/rich_presence_time" style="@style/res_2131952616_userprofile_presencesection_body_subtext"/>
+            <LinearLayout android:id="@+id/rich_presence_container_data" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/rich_presence_image_small" app:layout_constraintLeft_toRightOf="@+id/rich_presence_image_large" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_image_large" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:layout_goneMarginLeft="0dp" app:layout_goneMarginStart="0dp" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:ellipsize="marquee" android:id="@+id/rich_presence_title" android:singleLine="true" android:marqueeRepeatLimit="marquee_forever" style="@style/UserProfile_PresenceSection_Body_HeaderText"/>
+                <TextView android:id="@+id/rich_presence_details" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
+                <TextView android:id="@+id/rich_presence_state" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
+                <TextView android:id="@+id/rich_presence_time" style="@style/UserProfile_PresenceSection_Body_Subtext"/>
             </LinearLayout>
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_small" android:visibility="gone" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_container_data" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:roundAsCircle="true" style="@style/res_2131951676_avatar_medium"/>
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/rich_presence_image_small" android:visibility="gone" android:layout_marginBottom="16dp" android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/rich_presence_container_data" app:layout_constraintTop_toTopOf="@+id/rich_presence_image_large" app:roundAsCircle="true" style="@style/Avatar_Medium"/>
             <androidx.constraintlayout.widget.Barrier android:id="@+id/barrier" android:layout_width="match_parent" android:layout_height="wrap_content" app:barrierDirection="3" app:constraint_referenced_ids="rich_presence_container_data,rich_presence_image_large,rich_presence_image_small"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/res_2131952617_userprofile_presencesection_materialbutton"/>
-            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_secondary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_primary_button" style="@style/res_2131952617_userprofile_presencesection_materialbutton"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_primary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/barrier" style="@style/UserProfile_PresenceSection_MaterialButton"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/rich_presence_secondary_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/user_activity_play_on_platform" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/rich_presence_primary_button" style="@style/UserProfile_PresenceSection_MaterialButton"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_user_set_custom_status.xml b/app/src/main/res/layout/widget_user_set_custom_status.xml
index f942502094..cc28669191 100644
--- a/app/src/main/res/layout/widget_user_set_custom_status.xml
+++ b/app/src/main/res/layout/widget_user_set_custom_status.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951637_apptheme_appbarlayout">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="64dp" android:focusableInTouchMode="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" style="@style/res_2131952589_uikit_viewgroup">
-                <RelativeLayout android:gravity="center_vertical" android:layout_height="wrap_content" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                    <FrameLayout android:id="@+id/set_custom_status_emoji_button" android:layout_alignTop="@+id/set_custom_status_text" android:layout_alignBottom="@+id/set_custom_status_text" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952448_uikit_imageview">
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="64dp" android:focusableInTouchMode="true" style="@style/UiKit_ViewGroup_LinearLayout">
+            <androidx.cardview.widget.CardView android:layout_margin="16dp" app:cardBackgroundColor="?attr/colorBackgroundTertiary" style="@style/UiKit_ViewGroup">
+                <RelativeLayout android:gravity="center_vertical" android:layout_height="wrap_content" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                    <FrameLayout android:id="@+id/set_custom_status_emoji_button" android:layout_alignTop="@+id/set_custom_status_text" android:layout_alignBottom="@+id/set_custom_status_text" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ImageView">
                         <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@+id/set_custom_status_emoji" android:layout_width="@dimen/custom_status_emoji_preview_size" android:layout_height="@dimen/custom_status_emoji_preview_size" android:contentDescription="@string/select_emoji" app:actualImageScaleType="2"/>
                     </FrameLayout>
-                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/set_custom_status_text" android:hint="@string/custom_status_set_custom_status" android:layout_toEndOf="@+id/set_custom_status_emoji_button" app:endIconContentDescription="@string/custom_status_clear_custom_status" app:endIconDrawable="@drawable/ic_clear_24dp" app:endIconMode="-1" app:endIconTint="?attr/colorInteractiveNormal" style="@style/res_2131952545_uikit_textinputlayout">
-                        <com.google.android.material.textfield.TextInputEditText android:maxLength="128" android:inputType="text|textCapSentences|textAutoCorrect|textAutoComplete" android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+                    <com.google.android.material.textfield.TextInputLayout android:id="@+id/set_custom_status_text" android:hint="@string/custom_status_set_custom_status" android:layout_toEndOf="@+id/set_custom_status_emoji_button" app:endIconContentDescription="@string/custom_status_clear_custom_status" app:endIconDrawable="@drawable/ic_clear_24dp" app:endIconMode="-1" app:endIconTint="?attr/colorInteractiveNormal" style="@style/UiKit_TextInputLayout">
+                        <com.google.android.material.textfield.TextInputEditText android:maxLength="128" android:inputType="text|textCapSentences|textAutoCorrect|textAutoComplete" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine">
                             <requestFocus/>
                         </com.google.android.material.textfield.TextInputEditText>
                     </com.google.android.material.textfield.TextInputLayout>
                 </RelativeLayout>
             </androidx.cardview.widget.CardView>
-            <RadioGroup android:id="@+id/set_custom_status_expiration" android:layout_margin="8dp" style="@style/res_2131952589_uikit_viewgroup">
-                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_never" android:text="@string/custom_status_dont_clear" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
-                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_30_minutes" android:text="@string/custom_status_clear_in_minutes" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
-                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_1_hour" android:text="@string/custom_status_clear_in_hours" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
-                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_4_hours" android:text="@string/custom_status_clear_in_hours" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
-                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_tomorrow" android:text="@string/custom_status_clear_tomorrow" style="@style/res_2131952454_uikit_listitem_icon_radio"/>
+            <RadioGroup android:id="@+id/set_custom_status_expiration" android:layout_margin="8dp" style="@style/UiKit_ViewGroup">
+                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_never" android:text="@string/custom_status_dont_clear" style="@style/UiKit_ListItem_Icon_Radio"/>
+                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_30_minutes" android:text="@string/custom_status_clear_in_minutes" style="@style/UiKit_ListItem_Icon_Radio"/>
+                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_1_hour" android:text="@string/custom_status_clear_in_hours" style="@style/UiKit_ListItem_Icon_Radio"/>
+                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_4_hours" android:text="@string/custom_status_clear_in_hours" style="@style/UiKit_ListItem_Icon_Radio"/>
+                <com.google.android.material.radiobutton.MaterialRadioButton android:id="@+id/set_custom_status_expiration_tomorrow" android:text="@string/custom_status_clear_tomorrow" style="@style/UiKit_ListItem_Icon_Radio"/>
             </RadioGroup>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <ImageView android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_wumpus_custom_status" android:importantForAccessibility="no" style="@style/res_2131952450_uikit_imageview_hideinlandscape"/>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/set_custom_status_save" android:visibility="visible" android:contentDescription="@string/save_changes" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <ImageView android:layout_gravity="bottom|center_vertical|center_horizontal|center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_wumpus_custom_status" android:importantForAccessibility="no" style="@style/UiKit_ImageView_HideInLandscape"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/set_custom_status_save" android:visibility="visible" android:contentDescription="@string/save_changes" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_user_sheet.xml b/app/src/main/res/layout/widget_user_sheet.xml
index 9d4a083475..27dc424a8a 100644
--- a/app/src/main/res/layout/widget_user_sheet.xml
+++ b/app/src/main/res/layout/widget_user_sheet.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:focusable="true" android:focusableInTouchMode="true" android:contentDescription="@string/profile" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundSecondary" android:focusable="true" android:focusableInTouchMode="true" android:contentDescription="@string/profile" style="@style/UiKit_ViewGroup_NestedScrollView">
     <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-        <LinearLayout android:id="@+id/user_sheet_content" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
+        <LinearLayout android:id="@+id/user_sheet_content" android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
             <FrameLayout android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="@dimen/uikit_elevation_low">
                 <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@+id/user_sheet_profile_header_view" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="0" app:user_profile_header_background_color="?attr/colorBackgroundTertiary"/>
-                <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/user_sheet_more_button" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginTop="16dp" android:src="@drawable/ic_more_options_with_circular_background" android:contentDescription="@string/more" android:layout_marginEnd="16dp" style="@style/res_2131952449_uikit_imageview_clickable"/>
+                <ImageView android:layout_gravity="top|right|center_vertical|center_horizontal|center|end" android:id="@+id/user_sheet_more_button" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginTop="16dp" android:src="@drawable/ic_more_options_with_circular_background" android:contentDescription="@string/more" android:layout_marginEnd="16dp" style="@style/UiKit_ImageView_Clickable"/>
             </FrameLayout>
             <FrameLayout android:id="@+id/user_sheet_profile_edit_container" android:background="?attr/colorBackgroundTertiary" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="@dimen/uikit_elevation_low">
-                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_profile_edit_button" android:layout_width="match_parent" android:text="@string/edit_profile" style="@style/res_2131952468_uikit_material_button_secondary_fit"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_profile_edit_button" android:layout_width="match_parent" android:text="@string/edit_profile" style="@style/UiKit_Material_Button_Secondary_Fit"/>
             </FrameLayout>
-            <View android:id="@+id/user_sheet_profile_actions_divider" android:visibility="gone" style="@style/res_2131952416_uikit_divider"/>
-            <LinearLayout android:id="@+id/user_sheet_profile_actions_container" android:background="?attr/colorBackgroundTertiary" android:elevation="@dimen/uikit_elevation_low" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <Button android:id="@+id/user_sheet_message_action_button" android:layout_width="0dp" android:text="@string/user_profile_message" android:drawableTop="?attr/ic_user_profile_action_message" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:id="@+id/user_sheet_call_action_button" android:layout_width="0dp" android:text="@string/user_profile_audio" android:drawableTop="?attr/ic_user_profile_action_call" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:id="@+id/user_sheet_video_action_button" android:layout_width="0dp" android:text="@string/user_profile_video" android:drawableTop="?attr/ic_user_profile_action_video" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:textColor="@color/status_green_600" android:id="@+id/user_sheet_add_friend_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_add_friend" android:drawableTop="@drawable/ic_add_friend_plus" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
-                <Button android:textColor="@color/status_yellow_500" android:id="@+id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1" style="@style/res_2131952447_uikit_imagebutton"/>
+            <View android:id="@+id/user_sheet_profile_actions_divider" android:visibility="gone" style="@style/UiKit_Divider"/>
+            <LinearLayout android:id="@+id/user_sheet_profile_actions_container" android:background="?attr/colorBackgroundTertiary" android:elevation="@dimen/uikit_elevation_low" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <Button android:id="@+id/user_sheet_message_action_button" android:layout_width="0dp" android:text="@string/user_profile_message" android:drawableTop="?attr/ic_user_profile_action_message" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:id="@+id/user_sheet_call_action_button" android:layout_width="0dp" android:text="@string/user_profile_audio" android:drawableTop="?attr/ic_user_profile_action_call" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:id="@+id/user_sheet_video_action_button" android:layout_width="0dp" android:text="@string/user_profile_video" android:drawableTop="?attr/ic_user_profile_action_video" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:textColor="@color/status_green_600" android:id="@+id/user_sheet_add_friend_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_add_friend" android:drawableTop="@drawable/ic_add_friend_plus" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
+                <Button android:textColor="@color/status_yellow_500" android:id="@+id/user_sheet_pending_friend_request_action_button" android:visibility="gone" android:layout_width="0dp" android:text="@string/user_profile_pending" android:drawableTop="@drawable/ic_user_profile_action_pending" android:layout_weight="1" style="@style/UiKit_ImageButton"/>
             </LinearLayout>
-            <androidx.cardview.widget.CardView android:id="@+id/user_sheet_profile_stage_actions_card" android:visibility="gone" android:layout_marginTop="16dp" style="@style/res_2131952619_userprofile_section_card">
+            <androidx.cardview.widget.CardView android:id="@+id/user_sheet_profile_stage_actions_card" android:visibility="gone" android:layout_marginTop="16dp" style="@style/UserProfile_Section_Card">
                 <com.discord.widgets.stage.usersheet.UserProfileStageActionsView android:id="@+id/user_sheet_profile_stage_actions_view" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/res_2131952620_userprofile_section_header"/>
-            <LinearLayout android:id="@+id/user_sheet_friend_request_incoming_container" android:visibility="gone" android:layout_width="match_parent" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
-                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_ignore_button" android:text="@string/friend_request_ignore" android:layout_weight="1" android:layout_marginEnd="8dp" style="@style/res_2131952468_uikit_material_button_secondary_fit"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1" style="@style/res_2131952461_uikit_material_button_green_fit"/>
+            <TextView android:id="@+id/user_sheet_incoming_friend_request_header" android:visibility="gone" android:text="@string/incoming_friend_request" style="@style/UserProfile_Section_Header"/>
+            <LinearLayout android:id="@+id/user_sheet_friend_request_incoming_container" android:visibility="gone" android:layout_width="match_parent" android:paddingStart="16dp" android:paddingEnd="16dp" style="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
+                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_ignore_button" android:text="@string/friend_request_ignore" android:layout_weight="1" android:layout_marginEnd="8dp" style="@style/UiKit_Material_Button_Secondary_Fit"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1" style="@style/UiKit_Material_Button_Green_Fit"/>
             </LinearLayout>
-            <TextView android:id="@+id/about_me_header" android:visibility="gone" android:text="@string/user_popout_about_me" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView android:id="@+id/about_me_card" android:visibility="gone" style="@style/res_2131952619_userprofile_section_card">
-                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/about_me_text" android:padding="16dp" android:maxLines="6" android:lineSpacingMultiplier="1.25" style="@style/res_2131952563_uikit_textview"/>
+            <TextView android:id="@+id/about_me_header" android:visibility="gone" android:text="@string/user_popout_about_me" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView android:id="@+id/about_me_card" android:visibility="gone" style="@style/UserProfile_Section_Card">
+                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/about_me_text" android:padding="16dp" android:maxLines="6" android:lineSpacingMultiplier="1.25" style="@style/UiKit_TextView"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_profile_voice_settings_header" android:text="@string/voice_settings" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView android:id="@+id/voice_settings_view_card" android:visibility="gone" style="@style/res_2131952619_userprofile_section_card">
+            <TextView android:id="@+id/user_sheet_profile_voice_settings_header" android:text="@string/voice_settings" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView android:id="@+id/voice_settings_view_card" android:visibility="gone" style="@style/UserProfile_Section_Card">
                 <com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView android:id="@+id/user_sheet_profile_voice_settings_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </androidx.cardview.widget.CardView>
-            <FrameLayout android:id="@+id/rich_presence_container" android:visibility="gone" style="@style/res_2131952589_uikit_viewgroup"/>
-            <LinearLayout android:id="@+id/user_sheet_guild_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:id="@+id/user_sheet_guild_header" style="@style/res_2131952620_userprofile_section_header"/>
-                <com.discord.widgets.roles.RolesListView android:id="@+id/user_sheet_roles_list" android:contentDescription="@string/roles" style="@style/res_2131952618_userprofile_section"/>
-                <androidx.cardview.widget.CardView android:id="@+id/user_sheet_admin_card" android:layout_marginTop="16dp" style="@style/res_2131952619_userprofile_section_card">
+            <FrameLayout android:id="@+id/rich_presence_container" android:visibility="gone" style="@style/UiKit_ViewGroup"/>
+            <LinearLayout android:id="@+id/user_sheet_guild_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:id="@+id/user_sheet_guild_header" style="@style/UserProfile_Section_Header"/>
+                <com.discord.widgets.roles.RolesListView android:id="@+id/user_sheet_roles_list" android:contentDescription="@string/roles" style="@style/UserProfile_Section"/>
+                <androidx.cardview.widget.CardView android:id="@+id/user_sheet_admin_card" android:layout_marginTop="16dp" style="@style/UserProfile_Section_Card">
                     <com.discord.widgets.user.profile.UserProfileAdminView android:id="@+id/user_sheet_admin_view" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
                 </androidx.cardview.widget.CardView>
             </LinearLayout>
-            <TextView android:id="@+id/user_sheet_connections_header" android:visibility="gone" android:text="@string/connections" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView style="@style/res_2131952619_userprofile_section_card">
+            <TextView android:id="@+id/user_sheet_connections_header" android:visibility="gone" android:text="@string/connections" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView style="@style/UserProfile_Section_Card">
                 <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@+id/user_sheet_connections_view" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"/>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_note_header" android:text="@string/note" style="@style/res_2131952620_userprofile_section_header"/>
-            <androidx.cardview.widget.CardView style="@style/res_2131952619_userprofile_section_card">
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/user_sheet_note_text_field_wrap" android:layout_marginBottom="16dp" android:hint="@string/note_placeholder_mobile" app:boxStrokeWidth="0dp" app:counterEnabled="true" app:counterMaxLength="256" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/user_sheet_note_text_field" android:maxLength="256" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/res_2131952546_uikit_textinputlayout_edittext"/>
+            <TextView android:id="@+id/user_sheet_note_header" android:text="@string/note" style="@style/UserProfile_Section_Header"/>
+            <androidx.cardview.widget.CardView style="@style/UserProfile_Section_Card">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/user_sheet_note_text_field_wrap" android:layout_marginBottom="16dp" android:hint="@string/note_placeholder_mobile" app:boxStrokeWidth="0dp" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit_TextInputLayout_Primary">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/user_sheet_note_text_field" android:maxLength="256" android:inputType="textMultiLine" android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </androidx.cardview.widget.CardView>
-            <TextView android:id="@+id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/res_2131952620_userprofile_section_header"/>
-            <TextView android:id="@+id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/res_2131952453_uikit_listitem_icon"/>
+            <TextView android:id="@+id/user_sheet_developer_header" android:text="@string/developer_mode" style="@style/UserProfile_Section_Header"/>
+            <TextView android:id="@+id/user_sheet_copy_id" android:visibility="gone" android:text="@string/copy_id" app:drawableStartCompat="?attr/ic_copy" style="@style/UiKit_ListItem_Icon"/>
         </LinearLayout>
         <FrameLayout android:id="@+id/user_sheet_loading_container" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent">
             <androidx.core.widget.ContentLoadingProgressBar android:layout_gravity="top|center_vertical|center_horizontal|center" android:id="@+id/loading_progress_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="32dp" android:contentDescription="@string/loading" style="?android:attr/progressBarStyleLarge"/>
diff --git a/app/src/main/res/layout/widget_user_status_update.xml b/app/src/main/res/layout/widget_user_status_update.xml
index 5037b80173..73d3c4ab1f 100644
--- a/app/src/main/res/layout/widget_user_status_update.xml
+++ b/app/src/main/res/layout/widget_user_status_update.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/set_status" android:layout_marginStart="16dp" style="@style/res_2131952506_uikit_sheet_header_title"/>
-        <View style="@style/res_2131952416_uikit_divider"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:id="@+id/guild_actions_overview_header_tv" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@string/set_status" android:layout_marginStart="16dp" style="@style/UiKit_Sheet_Header_Title"/>
+        <View style="@style/UiKit_Divider"/>
         <include android:id="@+id/user_status_update_online" layout="@layout/view_user_status_presence"/>
         <include android:id="@+id/user_status_update_idle" layout="@layout/view_user_status_presence"/>
         <include android:id="@+id/user_status_update_dnd" layout="@layout/view_user_status_presence"/>
diff --git a/app/src/main/res/layout/widget_voice_bottom_sheet.xml b/app/src/main/res/layout/widget_voice_bottom_sheet.xml
index 410a8bbeac..e473bba649 100644
--- a/app/src/main/res/layout/widget_voice_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_voice_bottom_sheet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/voice_bottom_sheet_root" style="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/voice_bottom_sheet_root" style="@style/UiKit_ViewGroup_CoordinatorLayout">
     <androidx.constraintlayout.widget.ConstraintLayout android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
         <include android:id="@+id/header" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0" layout="@layout/layout_voice_bottom_sheet_header"/>
         <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/voice_bottom_sheet_recycler" android:layout_width="0dp" android:layout_height="wrap_content" android:nestedScrollingEnabled="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@+id/voice_bottom_sheet_bottom_content_container" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/header" app:layout_constraintVertical_bias="0" app:max_height="400dp"/>
@@ -7,8 +7,8 @@
         <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/voice_bottom_sheet_bottom_content_container" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/header" app:layout_constraintVertical_bias="1">
             <com.discord.widgets.voice.controls.AnchoredVoiceControlsView android:id="@+id/voice_bottom_sheet_controls" android:background="?attr/colorBackgroundSecondary" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="0"/>
             <RelativeLayout android:orientation="horizontal" android:id="@+id/voice_bottom_sheet_connect_container" android:paddingLeft="16dp" android:paddingRight="16dp" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="@+id/voice_bottom_sheet_controls" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/voice_bottom_sheet_controls">
-                <com.google.android.material.button.MaterialButton android:id="@+id/voice_bottom_sheet_connect" android:layout_width="match_parent" android:layout_height="48dp" android:text="@string/join_voice_channel_cta" android:layout_toStartOf="@+id/voice_bottom_sheet_join_video" style="@style/res_2131952458_uikit_material_button"/>
-                <com.google.android.material.button.MaterialButton android:id="@+id/voice_bottom_sheet_join_video" android:layout_width="48dp" android:layout_height="48dp" android:contentDescription="@string/join_video_channel" android:layout_marginStart="12dp" android:layout_alignParentEnd="true" app:icon="@drawable/ic_videocam_white_24dp" app:iconGravity="2" app:iconPadding="0dp" style="@style/res_2131952458_uikit_material_button"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/voice_bottom_sheet_connect" android:layout_width="match_parent" android:layout_height="48dp" android:text="@string/join_voice_channel_cta" android:layout_toStartOf="@+id/voice_bottom_sheet_join_video" style="@style/UiKit_Material_Button"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/voice_bottom_sheet_join_video" android:layout_width="48dp" android:layout_height="48dp" android:contentDescription="@string/join_video_channel" android:layout_marginStart="12dp" android:layout_alignParentEnd="true" app:icon="@drawable/ic_videocam_white_24dp" app:iconGravity="2" app:iconPadding="0dp" style="@style/UiKit_Material_Button"/>
             </RelativeLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_voice_call_incoming.xml b/app/src/main/res/layout/widget_voice_call_incoming.xml
index c7dacc4a8b..0fb7d1ce63 100644
--- a/app/src/main/res/layout/widget_voice_call_incoming.xml
+++ b/app/src/main/res/layout/widget_voice_call_incoming.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
     <com.discord.widgets.voice.fullscreen.grid.PrivateCallBlurredGridView android:id="@+id/incoming_call_blurred_view" android:background="@color/primary_dark_630" android:layout_width="match_parent" android:layout_height="match_parent"/>
     <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@+id/incoming_call_top_guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_percent="0.15"/>
-    <LinearLayout android:gravity="center_horizontal" android:id="@+id/incoming_call_status_container" android:paddingTop="16dp" android:layout_width="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/incoming_call_users_grid_view" app:layout_constraintVertical_bias="0.2" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/primary_100" android:gravity="center_horizontal" android:id="@+id/incoming_call_status_primary" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:singleLine="true" style="@style/res_2131952564_uikit_textview_bold"/>
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_dark_300" android:id="@+id/incoming_call_status_secondary" style="@style/res_2131952563_uikit_textview"/>
+    <LinearLayout android:gravity="center_horizontal" android:id="@+id/incoming_call_status_container" android:paddingTop="16dp" android:layout_width="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/incoming_call_users_grid_view" app:layout_constraintVertical_bias="0.2" style="@style/UiKit_ViewGroup_LinearLayout">
+        <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="@color/primary_100" android:gravity="center_horizontal" android:id="@+id/incoming_call_status_primary" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:singleLine="true" style="@style/UiKit_TextView_Bold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_dark_300" android:id="@+id/incoming_call_status_secondary" style="@style/UiKit_TextView"/>
     </LinearLayout>
     <com.discord.widgets.voice.fullscreen.grid.PrivateCallGridView android:id="@+id/incoming_call_users_grid_view" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toTopOf="@+id/incoming_call_top_guideline"/>
-    <LinearLayout android:gravity="center" android:orientation="horizontal" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:baselineAligned="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/incoming_call_status_container" app:layout_constraintVertical_bias="0.6" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <LinearLayout android:gravity="center_horizontal" android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.floatingactionbutton.FloatingActionButton android:layout_gravity="center" android:id="@+id/incoming_call_accept_button" android:src="@drawable/ic_call_24dp" android:contentDescription="@string/connect_to_voice" app:backgroundTint="@color/status_green_600" style="@style/res_2131952114_settings_floatingactionbutton"/>
-            <TextView android:textColor="@color/primary_100" android:layout_marginTop="16dp" android:text="@string/join_call" android:textAllCaps="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+    <LinearLayout android:gravity="center" android:orientation="horizontal" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:baselineAligned="false" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintRight_toRightOf="0" app:layout_constraintTop_toBottomOf="@+id/incoming_call_status_container" app:layout_constraintVertical_bias="0.6" style="@style/UiKit_ViewGroup_LinearLayout">
+        <LinearLayout android:gravity="center_horizontal" android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.floatingactionbutton.FloatingActionButton android:layout_gravity="center" android:id="@+id/incoming_call_accept_button" android:src="@drawable/ic_call_24dp" android:contentDescription="@string/connect_to_voice" app:backgroundTint="@color/status_green_600" style="@style/Settings_FloatingActionButton"/>
+            <TextView android:textColor="@color/primary_100" android:layout_marginTop="16dp" android:text="@string/join_call" android:textAllCaps="true" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center_horizontal" android:id="@+id/incoming_call_accept_alt_container" android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.floatingactionbutton.FloatingActionButton android:layout_gravity="center" android:id="@+id/incoming_call_accept_video_button" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/connect_to_video" app:backgroundTint="@color/status_green_600" style="@style/res_2131952114_settings_floatingactionbutton"/>
-            <TextView android:textColor="@color/primary_100" android:layout_marginTop="16dp" android:text="@string/video" android:textAllCaps="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <LinearLayout android:gravity="center_horizontal" android:id="@+id/incoming_call_accept_alt_container" android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.floatingactionbutton.FloatingActionButton android:layout_gravity="center" android:id="@+id/incoming_call_accept_video_button" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/connect_to_video" app:backgroundTint="@color/status_green_600" style="@style/Settings_FloatingActionButton"/>
+            <TextView android:textColor="@color/primary_100" android:layout_marginTop="16dp" android:text="@string/video" android:textAllCaps="true" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
-        <LinearLayout android:gravity="center_horizontal" android:layout_width="0dp" android:layout_weight="1" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.floatingactionbutton.FloatingActionButton android:layout_gravity="center" android:id="@+id/incoming_call_decline_button" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/decline" app:backgroundTint="@color/status_red_500" style="@style/res_2131952114_settings_floatingactionbutton"/>
-            <TextView android:textColor="@color/primary_100" android:layout_marginTop="16dp" android:text="@string/decline" android:contentDescription="@string/decline" android:textAllCaps="true" style="@style/res_2131952579_uikit_textview_semibold"/>
+        <LinearLayout android:gravity="center_horizontal" android:layout_width="0dp" android:layout_weight="1" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.floatingactionbutton.FloatingActionButton android:layout_gravity="center" android:id="@+id/incoming_call_decline_button" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/decline" app:backgroundTint="@color/status_red_500" style="@style/Settings_FloatingActionButton"/>
+            <TextView android:textColor="@color/primary_100" android:layout_marginTop="16dp" android:text="@string/decline" android:contentDescription="@string/decline" android:textAllCaps="true" style="@style/UiKit_TextView_Semibold"/>
         </LinearLayout>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_voice_call_inline.xml b/app/src/main/res/layout/widget_voice_call_inline.xml
index 023432668e..dbc83362d4 100644
--- a/app/src/main/res/layout/widget_voice_call_inline.xml
+++ b/app/src/main/res/layout/widget_voice_call_inline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/voice_call_inline_container" android:background="?attr/colorBackgroundSecondary" android:visibility="gone" android:fitsSystemWindows="true" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <com.google.android.material.button.MaterialButton android:id="@+id/voice_connected_ptt" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="4dp" android:layout_marginRight="10dp" android:layout_marginBottom="4dp" android:text="@string/input_mode_ptt" style="@style/res_2131952458_uikit_material_button"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/voice_call_inline_container" android:background="?attr/colorBackgroundSecondary" android:visibility="gone" android:fitsSystemWindows="true" style="@style/UiKit_ViewGroup_LinearLayout">
+    <com.google.android.material.button.MaterialButton android:id="@+id/voice_connected_ptt" android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="4dp" android:layout_marginRight="10dp" android:layout_marginBottom="4dp" android:text="@string/input_mode_ptt" style="@style/UiKit_Material_Button"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_voice_channel_settings.xml b/app/src/main/res/layout/widget_voice_channel_settings.xml
index f5806b81d5..f5f2ff7abc 100644
--- a/app/src/main/res/layout/widget_voice_channel_settings.xml
+++ b/app/src/main/res/layout/widget_voice_channel_settings.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952602_uikit_viewgroup_page">
-    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
-        <androidx.appcompat.widget.Toolbar style="@style/res_2131951663_apptheme_toolbar"/>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_Page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme_AppBarLayout_Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme_Toolbar"/>
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView style="@style/res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
-        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_name" android:layout_margin="16dp" android:hint="@string/form_label_channel_name" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/res_2131952550_uikit_textinputlayout_edittext_singleline"/>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior">
+        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit_ViewGroup_LinearLayout">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_name" android:layout_margin="16dp" android:hint="@string/form_label_channel_name" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:imeOptions="actionDone" style="@style/UiKit_TextInputLayout_EditText_SingleLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_topic" android:layout_margin="16dp" android:hint="@string/form_label_channel_topic" style="@style/res_2131952558_uikit_textinputlayout_primary">
-                <com.google.android.material.textfield.TextInputEditText android:maxLines="10" style="@style/res_2131952547_uikit_textinputlayout_edittext_multiline"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/channel_settings_edit_topic" android:layout_margin="16dp" android:hint="@string/form_label_channel_topic" style="@style/UiKit_TextInputLayout_Primary">
+                <com.google.android.material.textfield.TextInputEditText android:maxLines="10" style="@style/UiKit_TextInputLayout_EditText_MultiLine"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <View android:id="@+id/bitrate_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/bitrate_title" android:text="@string/form_label_bitrate" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <LinearLayout android:id="@+id/settings_bitrate" style="@style/res_2131952492_uikit_settings_item">
-                <TextView android:id="@+id/current_bitrate_display" style="@style/res_2131952563_uikit_textview"/>
-                <SeekBar android:id="@+id/bitrate_seekbar" android:max="88" style="@style/res_2131952488_uikit_seekbar"/>
+            <View android:id="@+id/bitrate_divider" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/bitrate_title" android:text="@string/form_label_bitrate" style="@style/UiKit_Settings_Item_Header"/>
+            <LinearLayout android:id="@+id/settings_bitrate" style="@style/UiKit_Settings_Item">
+                <TextView android:id="@+id/current_bitrate_display" style="@style/UiKit_TextView"/>
+                <SeekBar android:id="@+id/bitrate_seekbar" android:max="88" style="@style/UiKit_SeekBar"/>
             </LinearLayout>
-            <TextView android:id="@+id/settings_bitrate_help" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <View android:id="@+id/user_limit_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-            <TextView android:id="@+id/user_limit_title" android:text="@string/form_label_user_limit" style="@style/res_2131952496_uikit_settings_item_header"/>
-            <LinearLayout android:id="@+id/settings_user_limit" style="@style/res_2131952492_uikit_settings_item">
-                <TextView android:id="@+id/current_user_limit_display" android:text="@string/no_user_limit" style="@style/res_2131952563_uikit_textview"/>
-                <SeekBar android:id="@+id/user_limit_seekbar" android:max="99" style="@style/res_2131952488_uikit_seekbar"/>
+            <TextView android:id="@+id/settings_bitrate_help" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_Subtext"/>
+            <View android:id="@+id/user_limit_divider" style="@style/UiKit_Settings_Divider"/>
+            <TextView android:id="@+id/user_limit_title" android:text="@string/form_label_user_limit" style="@style/UiKit_Settings_Item_Header"/>
+            <LinearLayout android:id="@+id/settings_user_limit" style="@style/UiKit_Settings_Item">
+                <TextView android:id="@+id/current_user_limit_display" android:text="@string/no_user_limit" style="@style/UiKit_TextView"/>
+                <SeekBar android:id="@+id/user_limit_seekbar" android:max="99" style="@style/UiKit_SeekBar"/>
             </LinearLayout>
-            <TextView android:id="@+id/settings_user_limit_help" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <View android:id="@+id/region_override_divider" style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/channel_settings_region_override_container" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/form_label_region_override" style="@style/res_2131952498_uikit_settings_item_label"/>
-                <TextView android:id="@+id/channel_settings_region_override" style="@style/res_2131952493_uikit_settings_item_addition"/>
+            <TextView android:id="@+id/settings_user_limit_help" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_Subtext"/>
+            <View android:id="@+id/region_override_divider" style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/channel_settings_region_override_container" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/form_label_region_override" style="@style/UiKit_Settings_Item_Label"/>
+                <TextView android:id="@+id/channel_settings_region_override" style="@style/UiKit_Settings_Item_Addition"/>
             </LinearLayout>
-            <TextView android:id="@+id/channel_settings_region_override_help" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952581_uikit_textview_subtext"/>
-            <View style="@style/res_2131952491_uikit_settings_divider"/>
-            <LinearLayout android:id="@+id/channel_settings_section_user_management" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-                <TextView android:text="@string/user_management" style="@style/res_2131952496_uikit_settings_item_header"/>
-                <TextView android:id="@+id/channel_settings_permissions" android:text="@string/permissions" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952497_uikit_settings_item_icon"/>
+            <TextView android:id="@+id/channel_settings_region_override_help" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/UiKit_TextView_Subtext"/>
+            <View style="@style/UiKit_Settings_Divider"/>
+            <LinearLayout android:id="@+id/channel_settings_section_user_management" style="@style/UiKit_ViewGroup_LinearLayout">
+                <TextView android:text="@string/user_management" style="@style/UiKit_Settings_Item_Header"/>
+                <TextView android:id="@+id/channel_settings_permissions" android:text="@string/permissions" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_Settings_Item_Icon"/>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_settings_save" android:contentDescription="@string/save_changes" style="@style/res_2131952115_settings_floatingactionbutton_save"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_settings_save" android:contentDescription="@string/save_changes" style="@style/Settings_FloatingActionButton_Save"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml b/app/src/main/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml
index cebdaedf85..d73d8b9eb5 100644
--- a/app/src/main/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_voice_noise_cancellation_bottom_sheet.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <ImageView android:layout_width="280dp" android:layout_marginBottom="24dp" android:src="@drawable/img_krisp_onboarding" android:contentDescription="@string/mobile_noise_cancellation_popout_title" style="@style/res_2131952448_uikit_imageview"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout android:gravity="center_horizontal" android:padding="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <ImageView android:layout_width="280dp" android:layout_marginBottom="24dp" android:src="@drawable/img_krisp_onboarding" android:contentDescription="@string/mobile_noise_cancellation_popout_title" style="@style/UiKit_ImageView"/>
         <com.discord.views.ScreenTitleView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="24dp" app:stv_subtitle="@string/mobile_noise_cancellation_popout_description" app:stv_title="@string/mobile_noise_cancellation_popout_title"/>
         <TextView android:textColor="@color/link" android:gravity="center_vertical" android:id="@+id/noise_cancellation_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/learn_more_link" android:drawablePadding="16dp" app:drawableStartCompat="?attr/ic_krisp_logo"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/noise_cancellation_enable_button" android:layout_height="match_parent" android:text="@string/enable_noise_cancellation" style="@style/res_2131952382_uikit_authbutton_material"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/noise_cancellation_enable_button" android:layout_height="match_parent" android:text="@string/enable_noise_cancellation" style="@style/UiKit_AuthButton_Material"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_voice_settings_bottom_sheet.xml b/app/src/main/res/layout/widget_voice_settings_bottom_sheet.xml
index 81fcc391fd..f86869d685 100644
--- a/app/src/main/res/layout/widget_voice_settings_bottom_sheet.xml
+++ b/app/src/main/res/layout/widget_voice_settings_bottom_sheet.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/voice_settings_sheet_container" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
-    <LinearLayout android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_settings_toggle_video_participants" android:text="@string/stream_show_non_video" style="@style/res_2131952455_uikit_listitem_switch"/>
-        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_settings_noise_suppression" android:text="@string/mobile_noise_cancellation_popout_title" style="@style/res_2131952455_uikit_listitem_switch"/>
-        <TextView android:id="@+id/voice_settings_invite" android:text="@string/instant_invite" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_header_members_add_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952451_uikit_listitem"/>
-        <TextView android:id="@+id/voice_settings_stage_settings" android:text="@string/edit_stage_title" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_channel_stage_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952451_uikit_listitem"/>
-        <TextView android:id="@+id/voice_settings_voice_settings" android:text="@string/voice_settings" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952451_uikit_listitem"/>
-        <TextView android:id="@+id/voice_settings_notifications" android:text="@string/notification_settings" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_notifications_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952451_uikit_listitem"/>
-        <TextView android:id="@+id/voice_settings_report" android:text="@string/report" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952451_uikit_listitem"/>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/voice_settings_sheet_container" android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/UiKit_ViewGroup_NestedScrollView">
+    <LinearLayout android:layout_marginBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_settings_toggle_video_participants" android:text="@string/stream_show_non_video" style="@style/UiKit_ListItem_Switch"/>
+        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_settings_noise_suppression" android:text="@string/mobile_noise_cancellation_popout_title" style="@style/UiKit_ListItem_Switch"/>
+        <TextView android:id="@+id/voice_settings_invite" android:text="@string/instant_invite" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_header_members_add_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_ListItem"/>
+        <TextView android:id="@+id/voice_settings_stage_settings" android:text="@string/edit_stage_title" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_channel_stage_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_ListItem"/>
+        <TextView android:id="@+id/voice_settings_voice_settings" android:text="@string/voice_settings" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_settings_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_ListItem"/>
+        <TextView android:id="@+id/voice_settings_notifications" android:text="@string/notification_settings" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_notifications_white_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_ListItem"/>
+        <TextView android:id="@+id/voice_settings_report" android:text="@string/report" android:drawablePadding="16dp" app:drawableStartCompat="@drawable/ic_flag_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/UiKit_ListItem"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/values-land/styles.xml b/app/src/main/res/values-land/styles.xml
index 9a6a43cf8e..d7fa9bf865 100644
--- a/app/src/main/res/values-land/styles.xml
+++ b/app/src/main/res/values-land/styles.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="res_2131952049_overlay_dialog_constrained" parent="@style/res_2131952048_overlay_dialog">
+    <style name="Overlay_Dialog_Constrained" parent="@style/Overlay_Dialog">
         <item name="android:layout_width">500dp</item>
     </style>
-    <style name="res_2131952377_uikit_alert_verify_account_method_wrapper" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_Alert_Verify_Account_Method_Wrapper" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_marginLeft">20dp</item>
         <item name="android:layout_marginStart">20dp</item>
     </style>
-    <style name="res_2131952381_uikit_auth_note_rotatable" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_Auth_Note_Rotatable" parent="@style/UiKit_TextView">
         <item name="android:paddingTop">8dp</item>
         <item name="android:paddingBottom">8dp</item>
     </style>
-    <style name="res_2131952402_uikit_copy" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_Copy" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:padding">16dp</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
-    <style name="res_2131952403_uikit_copy_anchor" parent="@style/res_2131952404_uikit_copy_anchor_base">
+    <style name="UiKit_Copy_Anchor" parent="@style/UiKit_Copy_Anchor_Base">
         <item name="android:gravity">clip_horizontal</item>
     </style>
-    <style name="res_2131952405_uikit_copy_anchor_item_rotatable" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_Copy_Anchor_Item_Rotatable" parent="@style/UiKit_ViewGroup">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">1</item>
     </style>
-    <style name="res_2131952450_uikit_imageview_hideinlandscape" parent="@style/res_2131952448_uikit_imageview">
+    <style name="UiKit_ImageView_HideInLandscape" parent="@style/UiKit_ImageView">
         <item name="android:visibility">gone</item>
     </style>
-    <style name="res_2131952587_uikit_user_phone_verify_digits" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="UiKit_User_Phone_Verify_Digits" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_marginLeft">20dp</item>
         <item name="android:layout_weight">1</item>
         <item name="android:layout_marginStart">20dp</item>
     </style>
-    <style name="res_2131952597_uikit_viewgroup_linearlayout_rotatable" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="UiKit_ViewGroup_LinearLayout_Rotatable" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     </style>
-    <style name="res_2131952598_uikit_viewgroup_linearlayout_rotatable_horizontal" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_ViewGroup_LinearLayout_Rotatable_Horizontal" parent="@style/UiKit_ViewGroup_LinearLayout">
     </style>
     <style name="res_2131952706_widget_design_tablayout" parent="@style/res_2131951884_base_widget_design_tablayout">
         <item name="tabGravity">1</item>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index b1df56ff35..a15360a580 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="res_2131951644_apptheme_base_bottomsheet" parent="@style/res_2131952267_theme_design_bottomsheetdialog">
+    <style name="AppTheme_Base_BottomSheet" parent="@style/res_2131952267_theme_design_bottomsheetdialog">
         <item name="android:windowBackground">@android:drawable/screen_background_dark_transparent</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
@@ -8,12 +8,12 @@
         <item name="android:navigationBarColor">@color/nav_bar_color</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
-    <style name="res_2131951655_apptheme_light" parent="@style/res_2131951642_apptheme_autogenerated_light">
+    <style name="AppTheme_Light" parent="@style/AppTheme_AutoGenerated_Light">
         <item name="android:windowLightStatusBar">true</item>
         <item name="actionMenuTextColor">@color/primary_500</item>
-        <item name="actionOverflowButtonStyle">@style/res_2131951665_apptheme_toolbar_overflowicon</item>
+        <item name="actionOverflowButtonStyle">@style/AppTheme_Toolbar_OverflowIcon</item>
         <item name="boost_confirmation_card_bg">@color/white</item>
-        <item name="bottomSheetDialogTheme">@style/res_2131951656_apptheme_light_bottomsheet</item>
+        <item name="bottomSheetDialogTheme">@style/AppTheme_Light_BottomSheet</item>
         <item name="colorAccent">@color/brand_500</item>
         <item name="colorBackgroundAccentButton">@color/uikit_btn_bg_color_selector_background_accent_light</item>
         <item name="colorButtonNormal">@color/brand_500</item>
@@ -34,9 +34,9 @@
         <item name="colorTabsBackground">@color/primary_light_130</item>
         <item name="colorTabsDivider">@color/primary_light_300</item>
         <item name="colorTabsIconActive">@color/primary_light_900</item>
-        <item name="dialogTheme">@style/res_2131951657_apptheme_light_notice</item>
+        <item name="dialogTheme">@style/AppTheme_Light_Notice</item>
         <item name="notice_popup_bg">@color/primary_100</item>
-        <item name="notice_theme_positive_red">@style/res_2131951658_apptheme_light_notice_positivered</item>
+        <item name="notice_theme_positive_red">@style/AppTheme_Light_Notice_PositiveRed</item>
         <item name="primary_000">@color/primary_light_800</item>
         <item name="primary_100">@color/primary_500</item>
         <item name="primary_100_alpha_30">@color/primary_500_alpha_30</item>
diff --git a/app/src/main/res/values-v26/styles.xml b/app/src/main/res/values-v26/styles.xml
index 8dbab97161..f4e87eb7bc 100644
--- a/app/src/main/res/values-v26/styles.xml
+++ b/app/src/main/res/values-v26/styles.xml
@@ -16,31 +16,31 @@
     </style>
     <style name="res_2131951882_base_widget_appcompat_toolbar" parent="@style/res_2131951815_base_v26_widget_appcompat_toolbar">
     </style>
-    <style name="res_2131952551_uikit_textinputlayout_edittext_singleline_countrycode" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_CountryCode" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:maxLength">6</item>
         <item name="android:inputType">number</item>
         <item name="android:autofillHints">phoneCountryCode</item>
     </style>
-    <style name="res_2131952552_uikit_textinputlayout_edittext_singleline_email" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Email" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:inputType">text|textUri|datetime|date</item>
         <item name="android:autofillHints">emailAddress</item>
     </style>
-    <style name="res_2131952553_uikit_textinputlayout_edittext_singleline_password" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Password" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:inputType">textLongMessage</item>
         <item name="android:autofillHints">password</item>
     </style>
-    <style name="res_2131952554_uikit_textinputlayout_edittext_singleline_phone" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Phone" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:maxLength">18</item>
         <item name="android:inputType">phone</item>
         <item name="android:autofillHints">phoneNumber</item>
     </style>
-    <style name="res_2131952555_uikit_textinputlayout_edittext_singleline_search" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Search" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:padding">0dp</item>
         <item name="android:hint">@string/search</item>
         <item name="android:imeOptions">actionDone</item>
         <item name="android:importantForAutofill">no</item>
     </style>
-    <style name="res_2131952556_uikit_textinputlayout_edittext_singleline_username" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Username" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:autofillHints">username</item>
     </style>
     <style name="res_2131952698_widget_design_appbarlayout" parent="@android:style/Widget">
diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml
index c940f1c94d..49b693c52a 100644
--- a/app/src/main/res/values/public.xml
+++ b/app/src/main/res/values/public.xml
@@ -23206,56 +23206,56 @@
     <public type="style" name="res_2131951627_animation_appcompat_tooltip" id="0x7F13000B" />
     <public type="style" name="res_2131951628_animation_design_bottomsheetdialog" id="0x7F13000C" />
     <public type="style" name="res_2131951629_animation_materialcomponents_bottomsheetdialog" id="0x7F13000D" />
-    <public type="style" name="res_2131951630_app_tablayout_text" id="0x7F13000E" />
+    <public type="style" name="App_TabLayout_Text" id="0x7F13000E" />
     <public type="style" name="AppAlertDialog" id="0x7F13000F" />
     <public type="style" name="AppAlertDialogContent" id="0x7F130010" />
     <public type="style" name="AppAlertDialogFooter" id="0x7F130011" />
     <public type="style" name="AppAlertDialogHeader" id="0x7F130012" />
     <public type="style" name="AppAlertDialogText" id="0x7F130013" />
     <public type="style" name="AppTheme" id="0x7F130014" />
-    <public type="style" name="res_2131951637_apptheme_appbarlayout" id="0x7F130015" />
-    <public type="style" name="res_2131951638_apptheme_appbarlayout_flat" id="0x7F130016" />
-    <public type="style" name="res_2131951639_apptheme_appbarlayout_flat_transparent" id="0x7F130017" />
-    <public type="style" name="res_2131951640_apptheme_appbarscrollingviewbehavior" id="0x7F130018" />
-    <public type="style" name="res_2131951641_apptheme_autogenerated_dark" id="0x7F130019" />
-    <public type="style" name="res_2131951642_apptheme_autogenerated_light" id="0x7F13001A" />
-    <public type="style" name="res_2131951643_apptheme_base" id="0x7F13001B" />
-    <public type="style" name="res_2131951644_apptheme_base_bottomsheet" id="0x7F13001C" />
-    <public type="style" name="res_2131951645_apptheme_base_dark" id="0x7F13001D" />
-    <public type="style" name="res_2131951646_apptheme_base_light" id="0x7F13001E" />
-    <public type="style" name="res_2131951647_apptheme_collapsingtoolbarlayout" id="0x7F13001F" />
-    <public type="style" name="res_2131951648_apptheme_dark" id="0x7F130020" />
-    <public type="style" name="res_2131951649_apptheme_dark_bottomsheet" id="0x7F130021" />
-    <public type="style" name="res_2131951650_apptheme_dark_evil" id="0x7F130022" />
-    <public type="style" name="res_2131951651_apptheme_dark_notice" id="0x7F130023" />
-    <public type="style" name="res_2131951652_apptheme_dark_notice_positivered" id="0x7F130024" />
-    <public type="style" name="res_2131951653_apptheme_dialog_popup_tooltip" id="0x7F130025" />
-    <public type="style" name="res_2131951654_apptheme_globalsearchdialog" id="0x7F130026" />
-    <public type="style" name="res_2131951655_apptheme_light" id="0x7F130027" />
-    <public type="style" name="res_2131951656_apptheme_light_bottomsheet" id="0x7F130028" />
-    <public type="style" name="res_2131951657_apptheme_light_notice" id="0x7F130029" />
-    <public type="style" name="res_2131951658_apptheme_light_notice_positivered" id="0x7F13002A" />
-    <public type="style" name="res_2131951659_apptheme_loading" id="0x7F13002B" />
-    <public type="style" name="res_2131951660_apptheme_noactionbar" id="0x7F13002C" />
-    <public type="style" name="res_2131951661_apptheme_popupmenu" id="0x7F13002D" />
-    <public type="style" name="res_2131951662_apptheme_seekbar" id="0x7F13002E" />
-    <public type="style" name="res_2131951663_apptheme_toolbar" id="0x7F13002F" />
-    <public type="style" name="res_2131951664_apptheme_toolbar_actionbutton" id="0x7F130030" />
-    <public type="style" name="res_2131951665_apptheme_toolbar_overflowicon" id="0x7F130031" />
-    <public type="style" name="res_2131951666_apptheme_toolbar_popup" id="0x7F130032" />
-    <public type="style" name="res_2131951667_apptheme_toolbar_transparent" id="0x7F130033" />
-    <public type="style" name="res_2131951668_apptheme_toolbartheme" id="0x7F130034" />
-    <public type="style" name="res_2131951669_apptheme_translucent" id="0x7F130035" />
+    <public type="style" name="AppTheme_AppBarLayout" id="0x7F130015" />
+    <public type="style" name="AppTheme_AppBarLayout_Flat" id="0x7F130016" />
+    <public type="style" name="AppTheme_AppBarLayout_Flat_Transparent" id="0x7F130017" />
+    <public type="style" name="AppTheme_AppBarScrollingViewBehavior" id="0x7F130018" />
+    <public type="style" name="AppTheme_AutoGenerated_Dark" id="0x7F130019" />
+    <public type="style" name="AppTheme_AutoGenerated_Light" id="0x7F13001A" />
+    <public type="style" name="AppTheme_Base" id="0x7F13001B" />
+    <public type="style" name="AppTheme_Base_BottomSheet" id="0x7F13001C" />
+    <public type="style" name="AppTheme_Base_Dark" id="0x7F13001D" />
+    <public type="style" name="AppTheme_Base_Light" id="0x7F13001E" />
+    <public type="style" name="AppTheme_CollapsingToolbarLayout" id="0x7F13001F" />
+    <public type="style" name="AppTheme_Dark" id="0x7F130020" />
+    <public type="style" name="AppTheme_Dark_BottomSheet" id="0x7F130021" />
+    <public type="style" name="AppTheme_Dark_Evil" id="0x7F130022" />
+    <public type="style" name="AppTheme_Dark_Notice" id="0x7F130023" />
+    <public type="style" name="AppTheme_Dark_Notice_PositiveRed" id="0x7F130024" />
+    <public type="style" name="AppTheme_Dialog_Popup_Tooltip" id="0x7F130025" />
+    <public type="style" name="AppTheme_GlobalSearchDialog" id="0x7F130026" />
+    <public type="style" name="AppTheme_Light" id="0x7F130027" />
+    <public type="style" name="AppTheme_Light_BottomSheet" id="0x7F130028" />
+    <public type="style" name="AppTheme_Light_Notice" id="0x7F130029" />
+    <public type="style" name="AppTheme_Light_Notice_PositiveRed" id="0x7F13002A" />
+    <public type="style" name="AppTheme_Loading" id="0x7F13002B" />
+    <public type="style" name="AppTheme_NoActionBar" id="0x7F13002C" />
+    <public type="style" name="AppTheme_PopupMenu" id="0x7F13002D" />
+    <public type="style" name="AppTheme_SeekBar" id="0x7F13002E" />
+    <public type="style" name="AppTheme_Toolbar" id="0x7F13002F" />
+    <public type="style" name="AppTheme_Toolbar_ActionButton" id="0x7F130030" />
+    <public type="style" name="AppTheme_Toolbar_OverflowIcon" id="0x7F130031" />
+    <public type="style" name="AppTheme_Toolbar_Popup" id="0x7F130032" />
+    <public type="style" name="AppTheme_Toolbar_Transparent" id="0x7F130033" />
+    <public type="style" name="AppTheme_ToolbarTheme" id="0x7F130034" />
+    <public type="style" name="AppTheme_Translucent" id="0x7F130035" />
     <public type="style" name="AutocompleteItemContainer" id="0x7F130036" />
     <public type="style" name="Avatar" id="0x7F130037" />
-    <public type="style" name="res_2131951672_avatar_chat" id="0x7F130038" />
-    <public type="style" name="res_2131951673_avatar_hero" id="0x7F130039" />
-    <public type="style" name="res_2131951674_avatar_large" id="0x7F13003A" />
-    <public type="style" name="res_2131951675_avatar_large_extraaccount" id="0x7F13003B" />
-    <public type="style" name="res_2131951676_avatar_medium" id="0x7F13003C" />
-    <public type="style" name="res_2131951677_avatar_small" id="0x7F13003D" />
-    <public type="style" name="res_2131951678_avatar_standard" id="0x7F13003E" />
-    <public type="style" name="res_2131951679_avatar_xxlarge" id="0x7F13003F" />
+    <public type="style" name="Avatar_Chat" id="0x7F130038" />
+    <public type="style" name="Avatar_Hero" id="0x7F130039" />
+    <public type="style" name="Avatar_Large" id="0x7F13003A" />
+    <public type="style" name="Avatar_Large_ExtraAccount" id="0x7F13003B" />
+    <public type="style" name="Avatar_Medium" id="0x7F13003C" />
+    <public type="style" name="Avatar_Small" id="0x7F13003D" />
+    <public type="style" name="Avatar_Standard" id="0x7F13003E" />
+    <public type="style" name="Avatar_XXLarge" id="0x7F13003F" />
     <public type="style" name="res_2131951680_base_alertdialog_appcompat" id="0x7F130040" />
     <public type="style" name="res_2131951681_base_alertdialog_appcompat_light" id="0x7F130041" />
     <public type="style" name="res_2131951682_base_animation_appcompat_dialog" id="0x7F130042" />
@@ -23474,15 +23474,15 @@
     <public type="style" name="res_2131951895_base_widget_materialcomponents_textinputedittext" id="0x7F130117" />
     <public type="style" name="res_2131951896_base_widget_materialcomponents_textinputlayout" id="0x7F130118" />
     <public type="style" name="res_2131951897_base_widget_materialcomponents_textview" id="0x7F130119" />
-    <public type="style" name="res_2131951898_blockeduserslist_item" id="0x7F13011A" />
-    <public type="style" name="res_2131951899_blockeduserslist_item_avatar" id="0x7F13011B" />
-    <public type="style" name="res_2131951900_blockeduserslist_item_name" id="0x7F13011C" />
-    <public type="style" name="res_2131951901_blockeduserslist_item_unblockbutton" id="0x7F13011D" />
-    <public type="style" name="res_2131951902_callmessage_subtitle" id="0x7F13011E" />
+    <public type="style" name="BlockedUsersList_Item" id="0x7F13011A" />
+    <public type="style" name="BlockedUsersList_Item_Avatar" id="0x7F13011B" />
+    <public type="style" name="BlockedUsersList_Item_Name" id="0x7F13011C" />
+    <public type="style" name="BlockedUsersList_Item_UnblockButton" id="0x7F13011D" />
+    <public type="style" name="CallMessage_Subtitle" id="0x7F13011E" />
     <public type="style" name="CardView" id="0x7F13011F" />
     <public type="style" name="res_2131951904_cardview_dark" id="0x7F130120" />
     <public type="style" name="res_2131951905_cardview_light" id="0x7F130121" />
-    <public type="style" name="res_2131951906_channelsidebaractions_actions_button" id="0x7F130122" />
+    <public type="style" name="ChannelSideBarActions_Actions_Button" id="0x7F130122" />
     <public type="style" name="res_2131951907_code_textappearance" id="0x7F130123" />
     <public type="style" name="res_2131951908_code_textappearance_comment" id="0x7F130124" />
     <public type="style" name="res_2131951909_code_textappearance_generics" id="0x7F130125" />
@@ -23491,7 +23491,7 @@
     <public type="style" name="res_2131951912_code_textappearance_literal" id="0x7F130128" />
     <public type="style" name="res_2131951913_code_textappearance_params" id="0x7F130129" />
     <public type="style" name="res_2131951914_code_textappearance_types" id="0x7F13012A" />
-    <public type="style" name="res_2131951915_connections_switch" id="0x7F13012B" />
+    <public type="style" name="Connections_Switch" id="0x7F13012B" />
     <public type="style" name="ContextMenuTextOption" id="0x7F13012C" />
     <public type="style" name="DialogDatePicker" id="0x7F13012D" />
     <public type="style" name="EmptyTheme" id="0x7F13012E" />
@@ -23532,81 +23532,81 @@
     <public type="style" name="ExpressionPickerCategoryItem" id="0x7F130151" />
     <public type="style" name="FabMenuMiniIcon" id="0x7F130152" />
     <public type="style" name="FadeInOut" id="0x7F130153" />
-    <public type="style" name="res_2131951956_feedback_prompttextappearance" id="0x7F130154" />
-    <public type="style" name="res_2131951957_feedback_row" id="0x7F130155" />
-    <public type="style" name="res_2131951958_feedback_row_prompt" id="0x7F130156" />
-    <public type="style" name="res_2131951959_feedback_row_sectioncard" id="0x7F130157" />
-    <public type="style" name="res_2131951960_feedback_row_sectionheader" id="0x7F130158" />
-    <public type="style" name="res_2131951961_feedback_sectionheadertextappearance" id="0x7F130159" />
+    <public type="style" name="Feedback_PromptTextAppearance" id="0x7F130154" />
+    <public type="style" name="Feedback_Row" id="0x7F130155" />
+    <public type="style" name="Feedback_Row_Prompt" id="0x7F130156" />
+    <public type="style" name="Feedback_Row_SectionCard" id="0x7F130157" />
+    <public type="style" name="Feedback_Row_SectionHeader" id="0x7F130158" />
+    <public type="style" name="Feedback_SectionHeaderTextAppearance" id="0x7F130159" />
     <public type="style" name="FlexInput" id="0x7F13015A" />
-    <public type="style" name="res_2131951963_flexinput_addcontent" id="0x7F13015B" />
-    <public type="style" name="res_2131951964_flexinput_addcontent_base_container_tablayout" id="0x7F13015C" />
-    <public type="style" name="res_2131951965_flexinput_addcontent_base_page" id="0x7F13015D" />
-    <public type="style" name="res_2131951966_flexinput_addcontent_base_tablayout" id="0x7F13015E" />
-    <public type="style" name="res_2131951967_flexinput_addcontent_button" id="0x7F13015F" />
-    <public type="style" name="res_2131951968_flexinput_addcontent_button_base_send" id="0x7F130160" />
-    <public type="style" name="res_2131951969_flexinput_addcontent_button_launcher" id="0x7F130161" />
-    <public type="style" name="res_2131951970_flexinput_addcontent_button_send" id="0x7F130162" />
-    <public type="style" name="res_2131951971_flexinput_addcontent_container_tablayout" id="0x7F130163" />
-    <public type="style" name="res_2131951972_flexinput_addcontent_page" id="0x7F130164" />
-    <public type="style" name="res_2131951973_flexinput_addcontent_tablayout" id="0x7F130165" />
-    <public type="style" name="res_2131951974_flexinput_dialogwhenlarge" id="0x7F130166" />
-    <public type="style" name="res_2131951975_flexinput_input" id="0x7F130167" />
-    <public type="style" name="res_2131951976_flexinput_input_button" id="0x7F130168" />
-    <public type="style" name="res_2131951977_flexinput_input_button_camera_capture" id="0x7F130169" />
-    <public type="style" name="res_2131951978_flexinput_input_button_camera_facing" id="0x7F13016A" />
-    <public type="style" name="res_2131951979_flexinput_input_button_camera_flash" id="0x7F13016B" />
-    <public type="style" name="res_2131951980_flexinput_input_button_camera_launcher" id="0x7F13016C" />
-    <public type="style" name="res_2131951981_flexinput_items" id="0x7F13016D" />
-    <public type="style" name="res_2131951982_flexinput_items_base_file" id="0x7F13016E" />
-    <public type="style" name="res_2131951983_flexinput_items_base_file_image" id="0x7F13016F" />
-    <public type="style" name="res_2131951984_flexinput_items_base_file_selection" id="0x7F130170" />
-    <public type="style" name="res_2131951985_flexinput_items_base_photo" id="0x7F130171" />
-    <public type="style" name="res_2131951986_flexinput_items_base_photo_image" id="0x7F130172" />
-    <public type="style" name="res_2131951987_flexinput_items_base_photo_selection" id="0x7F130173" />
-    <public type="style" name="res_2131951988_flexinput_items_file" id="0x7F130174" />
-    <public type="style" name="res_2131951989_flexinput_items_file_image" id="0x7F130175" />
-    <public type="style" name="res_2131951990_flexinput_items_file_name" id="0x7F130176" />
-    <public type="style" name="res_2131951991_flexinput_items_file_selection" id="0x7F130177" />
-    <public type="style" name="res_2131951992_flexinput_items_file_subtitle" id="0x7F130178" />
-    <public type="style" name="res_2131951993_flexinput_items_photo" id="0x7F130179" />
-    <public type="style" name="res_2131951994_flexinput_items_photo_image" id="0x7F13017A" />
-    <public type="style" name="res_2131951995_flexinput_items_photo_selection" id="0x7F13017B" />
-    <public type="style" name="res_2131951996_flexinput_main" id="0x7F13017C" />
-    <public type="style" name="res_2131951997_friendsadd_button" id="0x7F13017D" />
-    <public type="style" name="res_2131951998_friendslist_contactsyncupsell_card" id="0x7F13017E" />
-    <public type="style" name="res_2131951999_friendslist_emptystate_image" id="0x7F13017F" />
-    <public type="style" name="res_2131952000_friendslist_emptystate_subtitle" id="0x7F130180" />
-    <public type="style" name="res_2131952001_friendslist_emptystate_title" id="0x7F130181" />
-    <public type="style" name="res_2131952002_friendslist_friendsitem" id="0x7F130182" />
-    <public type="style" name="res_2131952003_friendslist_friendsitem_actionbutton" id="0x7F130183" />
-    <public type="style" name="res_2131952004_friendslist_friendsitem_activity" id="0x7F130184" />
-    <public type="style" name="res_2131952005_friendslist_friendsitem_avatar" id="0x7F130185" />
-    <public type="style" name="res_2131952006_friendslist_friendsitem_buttonswrap" id="0x7F130186" />
-    <public type="style" name="res_2131952007_friendslist_friendsitem_name" id="0x7F130187" />
-    <public type="style" name="res_2131952008_friendslist_friendsitem_status" id="0x7F130188" />
-    <public type="style" name="res_2131952009_friendslist_friendsitem_text" id="0x7F130189" />
-    <public type="style" name="res_2131952010_friendslist_itemheader" id="0x7F13018A" />
-    <public type="style" name="res_2131952011_friendslist_itemheader_expandbutton" id="0x7F13018B" />
-    <public type="style" name="res_2131952012_friendslist_itemheader_title" id="0x7F13018C" />
-    <public type="style" name="res_2131952013_guildprofilesheet_actions_card" id="0x7F13018D" />
-    <public type="style" name="res_2131952014_guildprofilesheet_actions_checkedsetting" id="0x7F13018E" />
-    <public type="style" name="res_2131952015_guildprofilesheet_actions_title" id="0x7F13018F" />
-    <public type="style" name="res_2131952016_guildprofilesheet_discoverableguild_text" id="0x7F130190" />
-    <public type="style" name="res_2131952017_guildprofilesheet_emoji_item" id="0x7F130191" />
-    <public type="style" name="res_2131952018_guildprofilesheet_tabitems_button" id="0x7F130192" />
+    <public type="style" name="FlexInput_AddContent" id="0x7F13015B" />
+    <public type="style" name="FlexInput_AddContent_Base_Container_TabLayout" id="0x7F13015C" />
+    <public type="style" name="FlexInput_AddContent_Base_Page" id="0x7F13015D" />
+    <public type="style" name="FlexInput_AddContent_Base_TabLayout" id="0x7F13015E" />
+    <public type="style" name="FlexInput_AddContent_Button" id="0x7F13015F" />
+    <public type="style" name="FlexInput_AddContent_Button_Base_Send" id="0x7F130160" />
+    <public type="style" name="FlexInput_AddContent_Button_Launcher" id="0x7F130161" />
+    <public type="style" name="FlexInput_AddContent_Button_Send" id="0x7F130162" />
+    <public type="style" name="FlexInput_AddContent_Container_TabLayout" id="0x7F130163" />
+    <public type="style" name="FlexInput_AddContent_Page" id="0x7F130164" />
+    <public type="style" name="FlexInput_AddContent_TabLayout" id="0x7F130165" />
+    <public type="style" name="FlexInput_DialogWhenLarge" id="0x7F130166" />
+    <public type="style" name="FlexInput_Input" id="0x7F130167" />
+    <public type="style" name="FlexInput_Input_Button" id="0x7F130168" />
+    <public type="style" name="FlexInput_Input_Button_Camera_Capture" id="0x7F130169" />
+    <public type="style" name="FlexInput_Input_Button_Camera_Facing" id="0x7F13016A" />
+    <public type="style" name="FlexInput_Input_Button_Camera_Flash" id="0x7F13016B" />
+    <public type="style" name="FlexInput_Input_Button_Camera_Launcher" id="0x7F13016C" />
+    <public type="style" name="FlexInput_Items" id="0x7F13016D" />
+    <public type="style" name="FlexInput_Items_Base_File" id="0x7F13016E" />
+    <public type="style" name="FlexInput_Items_Base_File_Image" id="0x7F13016F" />
+    <public type="style" name="FlexInput_Items_Base_File_Selection" id="0x7F130170" />
+    <public type="style" name="FlexInput_Items_Base_Photo" id="0x7F130171" />
+    <public type="style" name="FlexInput_Items_Base_Photo_Image" id="0x7F130172" />
+    <public type="style" name="FlexInput_Items_Base_Photo_Selection" id="0x7F130173" />
+    <public type="style" name="FlexInput_Items_File" id="0x7F130174" />
+    <public type="style" name="FlexInput_Items_File_Image" id="0x7F130175" />
+    <public type="style" name="FlexInput_Items_File_Name" id="0x7F130176" />
+    <public type="style" name="FlexInput_Items_File_Selection" id="0x7F130177" />
+    <public type="style" name="FlexInput_Items_File_Subtitle" id="0x7F130178" />
+    <public type="style" name="FlexInput_Items_Photo" id="0x7F130179" />
+    <public type="style" name="FlexInput_Items_Photo_Image" id="0x7F13017A" />
+    <public type="style" name="FlexInput_Items_Photo_Selection" id="0x7F13017B" />
+    <public type="style" name="FlexInput_Main" id="0x7F13017C" />
+    <public type="style" name="FriendsAdd_Button" id="0x7F13017D" />
+    <public type="style" name="FriendsList_ContactSyncUpsell_Card" id="0x7F13017E" />
+    <public type="style" name="FriendsList_EmptyState_Image" id="0x7F13017F" />
+    <public type="style" name="FriendsList_EmptyState_Subtitle" id="0x7F130180" />
+    <public type="style" name="FriendsList_EmptyState_Title" id="0x7F130181" />
+    <public type="style" name="FriendsList_FriendsItem" id="0x7F130182" />
+    <public type="style" name="FriendsList_FriendsItem_ActionButton" id="0x7F130183" />
+    <public type="style" name="FriendsList_FriendsItem_Activity" id="0x7F130184" />
+    <public type="style" name="FriendsList_FriendsItem_Avatar" id="0x7F130185" />
+    <public type="style" name="FriendsList_FriendsItem_ButtonsWrap" id="0x7F130186" />
+    <public type="style" name="FriendsList_FriendsItem_Name" id="0x7F130187" />
+    <public type="style" name="FriendsList_FriendsItem_Status" id="0x7F130188" />
+    <public type="style" name="FriendsList_FriendsItem_Text" id="0x7F130189" />
+    <public type="style" name="FriendsList_ItemHeader" id="0x7F13018A" />
+    <public type="style" name="FriendsList_ItemHeader_ExpandButton" id="0x7F13018B" />
+    <public type="style" name="FriendsList_ItemHeader_Title" id="0x7F13018C" />
+    <public type="style" name="GuildProfileSheet_Actions_Card" id="0x7F13018D" />
+    <public type="style" name="GuildProfileSheet_Actions_CheckedSetting" id="0x7F13018E" />
+    <public type="style" name="GuildProfileSheet_Actions_Title" id="0x7F13018F" />
+    <public type="style" name="GuildProfileSheet_DiscoverableGuild_Text" id="0x7F130190" />
+    <public type="style" name="GuildProfileSheet_Emoji_Item" id="0x7F130191" />
+    <public type="style" name="GuildProfileSheet_TabItems_Button" id="0x7F130192" />
     <public type="style" name="HCaptchaDialogTheme" id="0x7F130193" />
-    <public type="style" name="res_2131952020_icon_game" id="0x7F130194" />
-    <public type="style" name="res_2131952021_icon_mentions" id="0x7F130195" />
-    <public type="style" name="res_2131952022_icon_mentions_call" id="0x7F130196" />
-    <public type="style" name="res_2131952023_icon_mentions_large" id="0x7F130197" />
-    <public type="style" name="res_2131952024_markdown_header1" id="0x7F130198" />
-    <public type="style" name="res_2131952025_markdown_header1_added" id="0x7F130199" />
-    <public type="style" name="res_2131952026_markdown_header1_changelogspecial" id="0x7F13019A" />
-    <public type="style" name="res_2131952027_markdown_header1_fixed" id="0x7F13019B" />
-    <public type="style" name="res_2131952028_markdown_header1_improved" id="0x7F13019C" />
-    <public type="style" name="res_2131952029_markdown_header1_progress" id="0x7F13019D" />
-    <public type="style" name="res_2131952030_markdown_header4" id="0x7F13019E" />
+    <public type="style" name="Icon_Game" id="0x7F130194" />
+    <public type="style" name="Icon_Mentions" id="0x7F130195" />
+    <public type="style" name="Icon_Mentions_Call" id="0x7F130196" />
+    <public type="style" name="Icon_Mentions_Large" id="0x7F130197" />
+    <public type="style" name="Markdown_Header1" id="0x7F130198" />
+    <public type="style" name="Markdown_Header1_Added" id="0x7F130199" />
+    <public type="style" name="Markdown_Header1_ChangelogSpecial" id="0x7F13019A" />
+    <public type="style" name="Markdown_Header1_Fixed" id="0x7F13019B" />
+    <public type="style" name="Markdown_Header1_Improved" id="0x7F13019C" />
+    <public type="style" name="Markdown_Header1_Progress" id="0x7F13019D" />
+    <public type="style" name="Markdown_Header4" id="0x7F13019E" />
     <public type="style" name="res_2131952031_materialalertdialog_materialcomponents" id="0x7F13019F" />
     <public type="style" name="res_2131952032_materialalertdialog_materialcomponents_body_text" id="0x7F1301A0" />
     <public type="style" name="res_2131952033_materialalertdialog_materialcomponents_picker_date_calendar" id="0x7F1301A1" />
@@ -23617,15 +23617,15 @@
     <public type="style" name="res_2131952038_materialalertdialog_materialcomponents_title_panel_centerstacked" id="0x7F1301A6" />
     <public type="style" name="res_2131952039_materialalertdialog_materialcomponents_title_text" id="0x7F1301A7" />
     <public type="style" name="res_2131952040_materialalertdialog_materialcomponents_title_text_centerstacked" id="0x7F1301A8" />
-    <public type="style" name="res_2131952041_mutesettings_row" id="0x7F1301A9" />
-    <public type="style" name="res_2131952042_mutesettings_row_subtitle" id="0x7F1301AA" />
-    <public type="style" name="res_2131952043_mutesettings_row_title" id="0x7F1301AB" />
-    <public type="style" name="res_2131952044_mutesettings_subtitletextappearance" id="0x7F1301AC" />
-    <public type="style" name="res_2131952045_mutesettings_titletextappearance" id="0x7F1301AD" />
-    <public type="style" name="res_2131952046_nux_guildtemplates_card" id="0x7F1301AE" />
-    <public type="style" name="res_2131952047_nux_guildtemplates_card_action" id="0x7F1301AF" />
-    <public type="style" name="res_2131952048_overlay_dialog" id="0x7F1301B0" />
-    <public type="style" name="res_2131952049_overlay_dialog_constrained" id="0x7F1301B1" />
+    <public type="style" name="MuteSettings_Row" id="0x7F1301A9" />
+    <public type="style" name="MuteSettings_Row_Subtitle" id="0x7F1301AA" />
+    <public type="style" name="MuteSettings_Row_Title" id="0x7F1301AB" />
+    <public type="style" name="MuteSettings_SubtitleTextAppearance" id="0x7F1301AC" />
+    <public type="style" name="MuteSettings_TitleTextAppearance" id="0x7F1301AD" />
+    <public type="style" name="Nux_GuildTemplates_Card" id="0x7F1301AE" />
+    <public type="style" name="Nux_GuildTemplates_Card_Action" id="0x7F1301AF" />
+    <public type="style" name="Overlay_Dialog" id="0x7F1301B0" />
+    <public type="style" name="Overlay_Dialog_Constrained" id="0x7F1301B1" />
     <public type="style" name="res_2131952050_platform_appcompat" id="0x7F1301B2" />
     <public type="style" name="res_2131952051_platform_appcompat_light" id="0x7F1301B3" />
     <public type="style" name="res_2131952052_platform_materialcomponents" id="0x7F1301B4" />
@@ -23690,8 +23690,8 @@
     <public type="style" name="res_2131952111_rtlunderlay_widget_appcompat_actionbutton_overflow" id="0x7F1301EF" />
     <public type="style" name="SegmentedControlTab" id="0x7F1301F0" />
     <public type="style" name="SegmentedControlTabCard" id="0x7F1301F1" />
-    <public type="style" name="res_2131952114_settings_floatingactionbutton" id="0x7F1301F2" />
-    <public type="style" name="res_2131952115_settings_floatingactionbutton_save" id="0x7F1301F3" />
+    <public type="style" name="Settings_FloatingActionButton" id="0x7F1301F2" />
+    <public type="style" name="Settings_FloatingActionButton_Save" id="0x7F1301F3" />
     <public type="style" name="res_2131952116_shapeappearance_materialcomponents" id="0x7F1301F4" />
     <public type="style" name="res_2131952117_shapeappearance_materialcomponents_largecomponent" id="0x7F1301F5" />
     <public type="style" name="res_2131952118_shapeappearance_materialcomponents_mediumcomponent" id="0x7F1301F6" />
@@ -23713,8 +23713,8 @@
     <public type="style" name="res_2131952134_shapeappearanceoverlay_materialcomponents_textinputlayout_filledbox" id="0x7F130206" />
     <public type="style" name="res_2131952135_shapeappearanceoverlay_topleftcut" id="0x7F130207" />
     <public type="style" name="res_2131952136_shapeappearanceoverlay_toprightdifferentcornersize" id="0x7F130208" />
-    <public type="style" name="res_2131952137_stage_section_headertextappearance" id="0x7F130209" />
-    <public type="style" name="res_2131952138_startcallsheet_item" id="0x7F13020A" />
+    <public type="style" name="Stage_Section_HeaderTextAppearance" id="0x7F130209" />
+    <public type="style" name="StartCallSheet_Item" id="0x7F13020A" />
     <public type="style" name="TabsHostBottomNavIcon" id="0x7F13020B" />
     <public type="style" name="TabsHostBottomNavItem" id="0x7F13020C" />
     <public type="style" name="TabsHostBottomNavItemWithNotifications" id="0x7F13020D" />
@@ -23799,7 +23799,7 @@
     <public type="style" name="res_2131952220_textappearance_design_snackbar_message" id="0x7F13025C" />
     <public type="style" name="res_2131952221_textappearance_design_suffix" id="0x7F13025D" />
     <public type="style" name="res_2131952222_textappearance_design_tab" id="0x7F13025E" />
-    <public type="style" name="res_2131952223_textappearance_error" id="0x7F13025F" />
+    <public type="style" name="TextAppearance_Error" id="0x7F13025F" />
     <public type="style" name="res_2131952224_textappearance_materialcomponents_badge" id="0x7F130260" />
     <public type="style" name="res_2131952225_textappearance_materialcomponents_body1" id="0x7F130261" />
     <public type="style" name="res_2131952226_textappearance_materialcomponents_body2" id="0x7F130262" />
@@ -23947,257 +23947,257 @@
     <public type="style" name="res_2131952368_themeoverlay_materialcomponents_toolbar_primary" id="0x7F1302F0" />
     <public type="style" name="res_2131952369_themeoverlay_materialcomponents_toolbar_surface" id="0x7F1302F1" />
     <public type="style" name="ThemeOverlayColorAccentRed" id="0x7F1302F2" />
-    <public type="style" name="res_2131952371_threadbrowser_verticalcenter" id="0x7F1302F3" />
+    <public type="style" name="ThreadBrowser_VerticalCenter" id="0x7F1302F3" />
     <public type="style" name="TooltipDefaultContainer" id="0x7F1302F4" />
     <public type="style" name="TooltipDefaultText" id="0x7F1302F5" />
     <public type="style" name="UiKit" id="0x7F1302F6" />
-    <public type="style" name="res_2131952375_uikit_alert_verify_account_method" id="0x7F1302F7" />
-    <public type="style" name="res_2131952376_uikit_alert_verify_account_method_container" id="0x7F1302F8" />
-    <public type="style" name="res_2131952377_uikit_alert_verify_account_method_wrapper" id="0x7F1302F9" />
-    <public type="style" name="res_2131952378_uikit_anim_verify_by_email" id="0x7F1302FA" />
-    <public type="style" name="res_2131952379_uikit_anim_verify_by_email_frozen" id="0x7F1302FB" />
-    <public type="style" name="res_2131952380_uikit_anim_verify_by_phone" id="0x7F1302FC" />
-    <public type="style" name="res_2131952381_uikit_auth_note_rotatable" id="0x7F1302FD" />
-    <public type="style" name="res_2131952382_uikit_authbutton_material" id="0x7F1302FE" />
-    <public type="style" name="res_2131952383_uikit_authcopycontainer" id="0x7F1302FF" />
-    <public type="style" name="res_2131952384_uikit_calls_buttoncircle" id="0x7F130300" />
-    <public type="style" name="res_2131952385_uikit_calls_buttoncircle_red" id="0x7F130301" />
-    <public type="style" name="res_2131952386_uikit_calls_buttonpill" id="0x7F130302" />
-    <public type="style" name="res_2131952387_uikit_calls_buttonpill_red" id="0x7F130303" />
-    <public type="style" name="res_2131952388_uikit_chat_embed_cardview" id="0x7F130304" />
-    <public type="style" name="res_2131952389_uikit_chat_embed_container" id="0x7F130305" />
-    <public type="style" name="res_2131952390_uikit_chat_embed_footer" id="0x7F130306" />
-    <public type="style" name="res_2131952391_uikit_chat_embed_header" id="0x7F130307" />
-    <public type="style" name="res_2131952392_uikit_chat_embed_subtext" id="0x7F130308" />
-    <public type="style" name="res_2131952393_uikit_chat_guideline" id="0x7F130309" />
-    <public type="style" name="res_2131952394_uikit_chat_text" id="0x7F13030A" />
-    <public type="style" name="res_2131952395_uikit_checkableimageview" id="0x7F13030B" />
-    <public type="style" name="res_2131952396_uikit_checkbox" id="0x7F13030C" />
-    <public type="style" name="res_2131952397_uikit_checkedsetting" id="0x7F13030D" />
-    <public type="style" name="res_2131952398_uikit_checkedsetting_themed" id="0x7F13030E" />
-    <public type="style" name="res_2131952399_uikit_chip" id="0x7F13030F" />
-    <public type="style" name="res_2131952400_uikit_chip_limited" id="0x7F130310" />
-    <public type="style" name="res_2131952401_uikit_chip_new" id="0x7F130311" />
-    <public type="style" name="res_2131952402_uikit_copy" id="0x7F130312" />
-    <public type="style" name="res_2131952403_uikit_copy_anchor" id="0x7F130313" />
-    <public type="style" name="res_2131952404_uikit_copy_anchor_base" id="0x7F130314" />
-    <public type="style" name="res_2131952405_uikit_copy_anchor_item_rotatable" id="0x7F130315" />
-    <public type="style" name="res_2131952406_uikit_copy_container" id="0x7F130316" />
-    <public type="style" name="res_2131952407_uikit_dialog_animation" id="0x7F130317" />
-    <public type="style" name="res_2131952408_uikit_dialog_body" id="0x7F130318" />
-    <public type="style" name="res_2131952409_uikit_dialog_button" id="0x7F130319" />
-    <public type="style" name="res_2131952410_uikit_dialog_buttoncontainer" id="0x7F13031A" />
-    <public type="style" name="res_2131952411_uikit_dialog_container" id="0x7F13031B" />
-    <public type="style" name="res_2131952412_uikit_dialog_subtitle" id="0x7F13031C" />
-    <public type="style" name="res_2131952413_uikit_dialog_textview_dismiss" id="0x7F13031D" />
-    <public type="style" name="res_2131952414_uikit_dialog_title" id="0x7F13031E" />
-    <public type="style" name="res_2131952415_uikit_dimmerview" id="0x7F13031F" />
-    <public type="style" name="res_2131952416_uikit_divider" id="0x7F130320" />
-    <public type="style" name="res_2131952417_uikit_divider_thick" id="0x7F130321" />
-    <public type="style" name="res_2131952418_uikit_divider_vertical" id="0x7F130322" />
-    <public type="style" name="res_2131952419_uikit_form_label" id="0x7F130323" />
-    <public type="style" name="res_2131952420_uikit_giftembeddisabledbutton" id="0x7F130324" />
-    <public type="style" name="res_2131952421_uikit_guideline" id="0x7F130325" />
-    <public type="style" name="res_2131952422_uikit_guildsubscriptionrole" id="0x7F130326" />
-    <public type="style" name="res_2131952423_uikit_guildsubscriptionrole_setup" id="0x7F130327" />
-    <public type="style" name="res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout" id="0x7F130328" />
-    <public type="style" name="res_2131952425_uikit_guildsubscriptionrole_setup_label" id="0x7F130329" />
-    <public type="style" name="res_2131952426_uikit_guildsubscriptionrole_setup_subtitle" id="0x7F13032A" />
-    <public type="style" name="res_2131952427_uikit_guildsubscriptionrole_setup_title" id="0x7F13032B" />
-    <public type="style" name="res_2131952428_uikit_guildslist" id="0x7F13032C" />
-    <public type="style" name="res_2131952429_uikit_guildslist_horiz" id="0x7F13032D" />
-    <public type="style" name="res_2131952430_uikit_guildslistapplicationstatus" id="0x7F13032E" />
-    <public type="style" name="res_2131952431_uikit_guildslistapplicationstreamicon" id="0x7F13032F" />
-    <public type="style" name="res_2131952432_uikit_guildslistbadge" id="0x7F130330" />
-    <public type="style" name="res_2131952433_uikit_guildslistdividericon" id="0x7F130331" />
-    <public type="style" name="res_2131952434_uikit_guildslistdividericonhoriz" id="0x7F130332" />
-    <public type="style" name="res_2131952435_uikit_guildslisticon" id="0x7F130333" />
-    <public type="style" name="res_2131952436_uikit_guildslistitem" id="0x7F130334" />
-    <public type="style" name="res_2131952437_uikit_guildslistitem_wrap" id="0x7F130335" />
-    <public type="style" name="res_2131952438_uikit_guildslistitemhoriz" id="0x7F130336" />
-    <public type="style" name="res_2131952439_uikit_guildslistitemhoriz_wrap" id="0x7F130337" />
-    <public type="style" name="res_2131952440_uikit_guildslistmentions" id="0x7F130338" />
-    <public type="style" name="res_2131952441_uikit_guildslistselected" id="0x7F130339" />
-    <public type="style" name="res_2131952442_uikit_guildslistselectedhoriz" id="0x7F13033A" />
-    <public type="style" name="res_2131952443_uikit_guildslistunavailable" id="0x7F13033B" />
-    <public type="style" name="res_2131952444_uikit_guildslistunread" id="0x7F13033C" />
-    <public type="style" name="res_2131952445_uikit_guildslistunreadhoriz" id="0x7F13033D" />
-    <public type="style" name="res_2131952446_uikit_guildslistvoiceicon" id="0x7F13033E" />
-    <public type="style" name="res_2131952447_uikit_imagebutton" id="0x7F13033F" />
-    <public type="style" name="res_2131952448_uikit_imageview" id="0x7F130340" />
-    <public type="style" name="res_2131952449_uikit_imageview_clickable" id="0x7F130341" />
-    <public type="style" name="res_2131952450_uikit_imageview_hideinlandscape" id="0x7F130342" />
-    <public type="style" name="res_2131952451_uikit_listitem" id="0x7F130343" />
-    <public type="style" name="res_2131952452_uikit_listitem_description" id="0x7F130344" />
-    <public type="style" name="res_2131952453_uikit_listitem_icon" id="0x7F130345" />
-    <public type="style" name="res_2131952454_uikit_listitem_icon_radio" id="0x7F130346" />
-    <public type="style" name="res_2131952455_uikit_listitem_switch" id="0x7F130347" />
-    <public type="style" name="res_2131952456_uikit_listitem_title" id="0x7F130348" />
-    <public type="style" name="res_2131952457_uikit_lottieanimationview" id="0x7F130349" />
-    <public type="style" name="res_2131952458_uikit_material_button" id="0x7F13034A" />
-    <public type="style" name="res_2131952459_uikit_material_button_fit" id="0x7F13034B" />
-    <public type="style" name="res_2131952460_uikit_material_button_green" id="0x7F13034C" />
-    <public type="style" name="res_2131952461_uikit_material_button_green_fit" id="0x7F13034D" />
-    <public type="style" name="res_2131952462_uikit_material_button_green_outline" id="0x7F13034E" />
-    <public type="style" name="res_2131952463_uikit_material_button_outline" id="0x7F13034F" />
-    <public type="style" name="res_2131952464_uikit_material_button_red" id="0x7F130350" />
-    <public type="style" name="res_2131952465_uikit_material_button_red_fit" id="0x7F130351" />
-    <public type="style" name="res_2131952466_uikit_material_button_red_outline" id="0x7F130352" />
-    <public type="style" name="res_2131952467_uikit_material_button_secondary" id="0x7F130353" />
-    <public type="style" name="res_2131952468_uikit_material_button_secondary_fit" id="0x7F130354" />
-    <public type="style" name="res_2131952469_uikit_material_button_secondary_outline" id="0x7F130355" />
-    <public type="style" name="res_2131952470_uikit_material_button_tertiary" id="0x7F130356" />
-    <public type="style" name="res_2131952471_uikit_material_button_transparent" id="0x7F130357" />
-    <public type="style" name="res_2131952472_uikit_material_button_transparent_fit" id="0x7F130358" />
-    <public type="style" name="res_2131952473_uikit_material_button_white" id="0x7F130359" />
-    <public type="style" name="res_2131952474_uikit_material_button_white_outline" id="0x7F13035A" />
-    <public type="style" name="res_2131952475_uikit_materialthemeoverlay_textinputlayout" id="0x7F13035B" />
-    <public type="style" name="res_2131952476_uikit_premiumguild_confirmation_chip" id="0x7F13035C" />
-    <public type="style" name="res_2131952477_uikit_premiumguild_settings_marketing_check" id="0x7F13035D" />
-    <public type="style" name="res_2131952478_uikit_premiumguild_settings_marketing_clear" id="0x7F13035E" />
-    <public type="style" name="res_2131952479_uikit_premiumguild_settings_marketing_container" id="0x7F13035F" />
-    <public type="style" name="res_2131952480_uikit_progressbar_line_horizontal_determinate" id="0x7F130360" />
-    <public type="style" name="res_2131952481_uikit_progressbar_white" id="0x7F130361" />
-    <public type="style" name="res_2131952482_uikit_quickswitcher_animation" id="0x7F130362" />
-    <public type="style" name="res_2131952483_uikit_radiobutton" id="0x7F130363" />
-    <public type="style" name="res_2131952484_uikit_search_chip" id="0x7F130364" />
-    <public type="style" name="res_2131952485_uikit_search_header" id="0x7F130365" />
-    <public type="style" name="res_2131952486_uikit_searchinput" id="0x7F130366" />
-    <public type="style" name="res_2131952487_uikit_searchinputclear" id="0x7F130367" />
-    <public type="style" name="res_2131952488_uikit_seekbar" id="0x7F130368" />
-    <public type="style" name="res_2131952489_uikit_settings" id="0x7F130369" />
-    <public type="style" name="res_2131952490_uikit_settings_base_item" id="0x7F13036A" />
-    <public type="style" name="res_2131952491_uikit_settings_divider" id="0x7F13036B" />
-    <public type="style" name="res_2131952492_uikit_settings_item" id="0x7F13036C" />
-    <public type="style" name="res_2131952493_uikit_settings_item_addition" id="0x7F13036D" />
-    <public type="style" name="res_2131952494_uikit_settings_item_compound_left" id="0x7F13036E" />
-    <public type="style" name="res_2131952495_uikit_settings_item_compound_right" id="0x7F13036F" />
-    <public type="style" name="res_2131952496_uikit_settings_item_header" id="0x7F130370" />
-    <public type="style" name="res_2131952497_uikit_settings_item_icon" id="0x7F130371" />
-    <public type="style" name="res_2131952498_uikit_settings_item_label" id="0x7F130372" />
-    <public type="style" name="res_2131952499_uikit_settings_item_subtext" id="0x7F130373" />
-    <public type="style" name="res_2131952500_uikit_settings_text" id="0x7F130374" />
-    <public type="style" name="res_2131952501_uikit_sheet" id="0x7F130375" />
-    <public type="style" name="res_2131952502_uikit_sheet_guideline" id="0x7F130376" />
-    <public type="style" name="res_2131952503_uikit_sheet_header" id="0x7F130377" />
-    <public type="style" name="res_2131952504_uikit_sheet_header_contents" id="0x7F130378" />
-    <public type="style" name="res_2131952505_uikit_sheet_header_icon" id="0x7F130379" />
-    <public type="style" name="res_2131952506_uikit_sheet_header_title" id="0x7F13037A" />
-    <public type="style" name="res_2131952507_uikit_sheet_keyboardavoiding" id="0x7F13037B" />
-    <public type="style" name="res_2131952508_uikit_stage" id="0x7F13037C" />
-    <public type="style" name="res_2131952509_uikit_stage_bullet" id="0x7F13037D" />
-    <public type="style" name="res_2131952510_uikit_stage_bullet_icon" id="0x7F13037E" />
-    <public type="style" name="res_2131952511_uikit_stage_bullet_label" id="0x7F13037F" />
-    <public type="style" name="res_2131952512_uikit_stage_clickablebutton" id="0x7F130380" />
-    <public type="style" name="res_2131952513_uikit_stage_detail" id="0x7F130381" />
-    <public type="style" name="res_2131952514_uikit_stage_listitem_subtitle" id="0x7F130382" />
-    <public type="style" name="res_2131952515_uikit_stage_listitem_title" id="0x7F130383" />
-    <public type="style" name="res_2131952516_uikit_stage_sectionheader" id="0x7F130384" />
-    <public type="style" name="res_2131952517_uikit_stage_subtitle" id="0x7F130385" />
-    <public type="style" name="res_2131952518_uikit_stage_subtitle_description" id="0x7F130386" />
-    <public type="style" name="res_2131952519_uikit_stage_title" id="0x7F130387" />
-    <public type="style" name="res_2131952520_uikit_stage_title_secondary" id="0x7F130388" />
-    <public type="style" name="res_2131952521_uikit_stage_topic" id="0x7F130389" />
-    <public type="style" name="res_2131952522_uikit_stage_topic_header" id="0x7F13038A" />
-    <public type="style" name="res_2131952523_uikit_stagediscovery_publicnotice_textview" id="0x7F13038B" />
-    <public type="style" name="res_2131952524_uikit_stagediscoveryavatar" id="0x7F13038C" />
-    <public type="style" name="res_2131952525_uikit_stagediscoveryavatar_circle" id="0x7F13038D" />
-    <public type="style" name="res_2131952526_uikit_stagediscoveryguilddetail" id="0x7F13038E" />
-    <public type="style" name="res_2131952527_uikit_stagediscoveryguilddetail_medium" id="0x7F13038F" />
-    <public type="style" name="res_2131952528_uikit_stagediscoveryguilddetail_small" id="0x7F130390" />
-    <public type="style" name="res_2131952529_uikit_stagediscoveryicon" id="0x7F130391" />
-    <public type="style" name="res_2131952530_uikit_tablayout_pagerindicator" id="0x7F130392" />
-    <public type="style" name="res_2131952531_uikit_tabs" id="0x7F130393" />
-    <public type="style" name="res_2131952532_uikit_tabs_textappearance" id="0x7F130394" />
-    <public type="style" name="res_2131952533_uikit_textappearance" id="0x7F130395" />
-    <public type="style" name="res_2131952534_uikit_textappearance_bold" id="0x7F130396" />
-    <public type="style" name="res_2131952535_uikit_textappearance_button" id="0x7F130397" />
-    <public type="style" name="res_2131952536_uikit_textappearance_listitem" id="0x7F130398" />
-    <public type="style" name="res_2131952537_uikit_textappearance_listitem_label" id="0x7F130399" />
-    <public type="style" name="res_2131952538_uikit_textappearance_materialedittext" id="0x7F13039A" />
-    <public type="style" name="res_2131952539_uikit_textappearance_materialedittext_input" id="0x7F13039B" />
-    <public type="style" name="res_2131952540_uikit_textappearance_materialedittext_label" id="0x7F13039C" />
-    <public type="style" name="res_2131952541_uikit_textappearance_semibold" id="0x7F13039D" />
-    <public type="style" name="res_2131952542_uikit_textappearance_toolbar" id="0x7F13039E" />
-    <public type="style" name="res_2131952543_uikit_textappearance_toolbar_subtitle" id="0x7F13039F" />
-    <public type="style" name="res_2131952544_uikit_textappearance_toolbar_title" id="0x7F1303A0" />
-    <public type="style" name="res_2131952545_uikit_textinputlayout" id="0x7F1303A1" />
-    <public type="style" name="res_2131952546_uikit_textinputlayout_edittext" id="0x7F1303A2" />
-    <public type="style" name="res_2131952547_uikit_textinputlayout_edittext_multiline" id="0x7F1303A3" />
-    <public type="style" name="res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph" id="0x7F1303A4" />
-    <public type="style" name="res_2131952549_uikit_textinputlayout_edittext_nofocus" id="0x7F1303A5" />
-    <public type="style" name="res_2131952550_uikit_textinputlayout_edittext_singleline" id="0x7F1303A6" />
-    <public type="style" name="res_2131952551_uikit_textinputlayout_edittext_singleline_countrycode" id="0x7F1303A7" />
-    <public type="style" name="res_2131952552_uikit_textinputlayout_edittext_singleline_email" id="0x7F1303A8" />
-    <public type="style" name="res_2131952553_uikit_textinputlayout_edittext_singleline_password" id="0x7F1303A9" />
-    <public type="style" name="res_2131952554_uikit_textinputlayout_edittext_singleline_phone" id="0x7F1303AA" />
-    <public type="style" name="res_2131952555_uikit_textinputlayout_edittext_singleline_search" id="0x7F1303AB" />
-    <public type="style" name="res_2131952556_uikit_textinputlayout_edittext_singleline_username" id="0x7F1303AC" />
-    <public type="style" name="res_2131952557_uikit_textinputlayout_password" id="0x7F1303AD" />
-    <public type="style" name="res_2131952558_uikit_textinputlayout_primary" id="0x7F1303AE" />
-    <public type="style" name="res_2131952559_uikit_textinputlayout_primary_password" id="0x7F1303AF" />
-    <public type="style" name="res_2131952560_uikit_textinputlayout_search" id="0x7F1303B0" />
-    <public type="style" name="res_2131952561_uikit_textinputlayout_search_actionbar" id="0x7F1303B1" />
-    <public type="style" name="res_2131952562_uikit_textinputlayout_search_actionbar_filter" id="0x7F1303B2" />
-    <public type="style" name="res_2131952563_uikit_textview" id="0x7F1303B3" />
-    <public type="style" name="res_2131952564_uikit_textview_bold" id="0x7F1303B4" />
-    <public type="style" name="res_2131952565_uikit_textview_h1" id="0x7F1303B5" />
-    <public type="style" name="res_2131952566_uikit_textview_h1_bold" id="0x7F1303B6" />
-    <public type="style" name="res_2131952567_uikit_textview_h2" id="0x7F1303B7" />
-    <public type="style" name="res_2131952568_uikit_textview_h2_bold" id="0x7F1303B8" />
-    <public type="style" name="res_2131952569_uikit_textview_h6" id="0x7F1303B9" />
-    <public type="style" name="res_2131952570_uikit_textview_large" id="0x7F1303BA" />
-    <public type="style" name="res_2131952571_uikit_textview_large_singleline" id="0x7F1303BB" />
-    <public type="style" name="res_2131952572_uikit_textview_link" id="0x7F1303BC" />
-    <public type="style" name="res_2131952573_uikit_textview_marquee" id="0x7F1303BD" />
-    <public type="style" name="res_2131952574_uikit_textview_medium" id="0x7F1303BE" />
-    <public type="style" name="res_2131952575_uikit_textview_medium_singleline" id="0x7F1303BF" />
-    <public type="style" name="res_2131952576_uikit_textview_noresults" id="0x7F1303C0" />
-    <public type="style" name="res_2131952577_uikit_textview_perk" id="0x7F1303C1" />
-    <public type="style" name="res_2131952578_uikit_textview_perk_small" id="0x7F1303C2" />
-    <public type="style" name="res_2131952579_uikit_textview_semibold" id="0x7F1303C3" />
-    <public type="style" name="res_2131952580_uikit_textview_singleline" id="0x7F1303C4" />
-    <public type="style" name="res_2131952581_uikit_textview_subtext" id="0x7F1303C5" />
-    <public type="style" name="res_2131952582_uikit_textview_subtext_singleline" id="0x7F1303C6" />
-    <public type="style" name="res_2131952583_uikit_textview_tagged" id="0x7F1303C7" />
-    <public type="style" name="res_2131952584_uikit_toast" id="0x7F1303C8" />
-    <public type="style" name="res_2131952585_uikit_user_phone_manage_confirm" id="0x7F1303C9" />
-    <public type="style" name="res_2131952586_uikit_user_phone_manage_number" id="0x7F1303CA" />
-    <public type="style" name="res_2131952587_uikit_user_phone_verify_digits" id="0x7F1303CB" />
-    <public type="style" name="res_2131952588_uikit_user_verify_char" id="0x7F1303CC" />
-    <public type="style" name="res_2131952589_uikit_viewgroup" id="0x7F1303CD" />
-    <public type="style" name="res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout" id="0x7F1303CE" />
-    <public type="style" name="res_2131952591_uikit_viewgroup_constraintlayout" id="0x7F1303CF" />
-    <public type="style" name="res_2131952592_uikit_viewgroup_coordinatorlayout" id="0x7F1303D0" />
-    <public type="style" name="res_2131952593_uikit_viewgroup_coordinatorlayout_page" id="0x7F1303D1" />
-    <public type="style" name="res_2131952594_uikit_viewgroup_linearlayout" id="0x7F1303D2" />
-    <public type="style" name="res_2131952595_uikit_viewgroup_linearlayout_bottomsheet" id="0x7F1303D3" />
-    <public type="style" name="res_2131952596_uikit_viewgroup_linearlayout_horizontal" id="0x7F1303D4" />
-    <public type="style" name="res_2131952597_uikit_viewgroup_linearlayout_rotatable" id="0x7F1303D5" />
-    <public type="style" name="res_2131952598_uikit_viewgroup_linearlayout_rotatable_horizontal" id="0x7F1303D6" />
-    <public type="style" name="res_2131952599_uikit_viewgroup_nestedscrollview" id="0x7F1303D7" />
-    <public type="style" name="res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior" id="0x7F1303D8" />
-    <public type="style" name="res_2131952601_uikit_viewgroup_nestedscrollview_page" id="0x7F1303D9" />
-    <public type="style" name="res_2131952602_uikit_viewgroup_page" id="0x7F1303DA" />
-    <public type="style" name="res_2131952603_uikit_viewgroup_page_linearlayout" id="0x7F1303DB" />
-    <public type="style" name="res_2131952604_uikit_viewgroup_page_linearlayout_horizontal" id="0x7F1303DC" />
-    <public type="style" name="res_2131952605_uikit_viewgroup_recyclerview" id="0x7F1303DD" />
-    <public type="style" name="res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior" id="0x7F1303DE" />
-    <public type="style" name="res_2131952607_uikit_viewgroup_recyclerview_horizontal" id="0x7F1303DF" />
-    <public type="style" name="res_2131952608_uikit_viewgroup_relativelayout" id="0x7F1303E0" />
-    <public type="style" name="res_2131952609_uikit_viewgroup_relativelayout_appbarscrollingviewbehavior" id="0x7F1303E1" />
-    <public type="style" name="res_2131952610_uikit_viewgroup_scrollview" id="0x7F1303E2" />
-    <public type="style" name="res_2131952611_uikit_viewgroup_scrollview_horizontal" id="0x7F1303E3" />
-    <public type="style" name="res_2131952612_uikit_viewgroup_scrollview_page" id="0x7F1303E4" />
-    <public type="style" name="res_2131952613_uikit_welcomemessagecard" id="0x7F1303E5" />
-    <public type="style" name="res_2131952614_userprofile_presencesection_body" id="0x7F1303E6" />
-    <public type="style" name="res_2131952615_userprofile_presencesection_body_headertext" id="0x7F1303E7" />
-    <public type="style" name="res_2131952616_userprofile_presencesection_body_subtext" id="0x7F1303E8" />
-    <public type="style" name="res_2131952617_userprofile_presencesection_materialbutton" id="0x7F1303E9" />
-    <public type="style" name="res_2131952618_userprofile_section" id="0x7F1303EA" />
-    <public type="style" name="res_2131952619_userprofile_section_card" id="0x7F1303EB" />
-    <public type="style" name="res_2131952620_userprofile_section_header" id="0x7F1303EC" />
-    <public type="style" name="res_2131952621_userprofile_section_headertextappearance" id="0x7F1303ED" />
+    <public type="style" name="UiKit_Alert_Verify_Account_Method" id="0x7F1302F7" />
+    <public type="style" name="UiKit_Alert_Verify_Account_Method_Container" id="0x7F1302F8" />
+    <public type="style" name="UiKit_Alert_Verify_Account_Method_Wrapper" id="0x7F1302F9" />
+    <public type="style" name="UiKit_Anim_Verify_By_Email" id="0x7F1302FA" />
+    <public type="style" name="UiKit_Anim_Verify_By_Email_Frozen" id="0x7F1302FB" />
+    <public type="style" name="UiKit_Anim_Verify_By_Phone" id="0x7F1302FC" />
+    <public type="style" name="UiKit_Auth_Note_Rotatable" id="0x7F1302FD" />
+    <public type="style" name="UiKit_AuthButton_Material" id="0x7F1302FE" />
+    <public type="style" name="UiKit_AuthCopyContainer" id="0x7F1302FF" />
+    <public type="style" name="UiKit_Calls_ButtonCircle" id="0x7F130300" />
+    <public type="style" name="UiKit_Calls_ButtonCircle_Red" id="0x7F130301" />
+    <public type="style" name="UiKit_Calls_ButtonPill" id="0x7F130302" />
+    <public type="style" name="UiKit_Calls_ButtonPill_Red" id="0x7F130303" />
+    <public type="style" name="UiKit_Chat_Embed_CardView" id="0x7F130304" />
+    <public type="style" name="UiKit_Chat_Embed_Container" id="0x7F130305" />
+    <public type="style" name="UiKit_Chat_Embed_Footer" id="0x7F130306" />
+    <public type="style" name="UiKit_Chat_Embed_Header" id="0x7F130307" />
+    <public type="style" name="UiKit_Chat_Embed_Subtext" id="0x7F130308" />
+    <public type="style" name="UiKit_Chat_Guideline" id="0x7F130309" />
+    <public type="style" name="UiKit_Chat_Text" id="0x7F13030A" />
+    <public type="style" name="UiKit_CheckableImageView" id="0x7F13030B" />
+    <public type="style" name="UiKit_Checkbox" id="0x7F13030C" />
+    <public type="style" name="UiKit_CheckedSetting" id="0x7F13030D" />
+    <public type="style" name="UiKit_CheckedSetting_Themed" id="0x7F13030E" />
+    <public type="style" name="UiKit_Chip" id="0x7F13030F" />
+    <public type="style" name="UiKit_Chip_Limited" id="0x7F130310" />
+    <public type="style" name="UiKit_Chip_New" id="0x7F130311" />
+    <public type="style" name="UiKit_Copy" id="0x7F130312" />
+    <public type="style" name="UiKit_Copy_Anchor" id="0x7F130313" />
+    <public type="style" name="UiKit_Copy_Anchor_Base" id="0x7F130314" />
+    <public type="style" name="UiKit_Copy_Anchor_Item_Rotatable" id="0x7F130315" />
+    <public type="style" name="UiKit_Copy_Container" id="0x7F130316" />
+    <public type="style" name="UiKit_Dialog_Animation" id="0x7F130317" />
+    <public type="style" name="UiKit_Dialog_Body" id="0x7F130318" />
+    <public type="style" name="UiKit_Dialog_Button" id="0x7F130319" />
+    <public type="style" name="UiKit_Dialog_ButtonContainer" id="0x7F13031A" />
+    <public type="style" name="UiKit_Dialog_Container" id="0x7F13031B" />
+    <public type="style" name="UiKit_Dialog_Subtitle" id="0x7F13031C" />
+    <public type="style" name="UiKit_Dialog_TextView_Dismiss" id="0x7F13031D" />
+    <public type="style" name="UiKit_Dialog_Title" id="0x7F13031E" />
+    <public type="style" name="UiKit_DimmerView" id="0x7F13031F" />
+    <public type="style" name="UiKit_Divider" id="0x7F130320" />
+    <public type="style" name="UiKit_Divider_Thick" id="0x7F130321" />
+    <public type="style" name="UiKit_Divider_Vertical" id="0x7F130322" />
+    <public type="style" name="UiKit_Form_Label" id="0x7F130323" />
+    <public type="style" name="UiKit_GiftEmbedDisabledButton" id="0x7F130324" />
+    <public type="style" name="UiKit_Guideline" id="0x7F130325" />
+    <public type="style" name="UiKit_GuildSubscriptionRole" id="0x7F130326" />
+    <public type="style" name="UiKit_GuildSubscriptionRole_Setup" id="0x7F130327" />
+    <public type="style" name="UiKit_GuildSubscriptionRole_Setup_InputLayout" id="0x7F130328" />
+    <public type="style" name="UiKit_GuildSubscriptionRole_Setup_Label" id="0x7F130329" />
+    <public type="style" name="UiKit_GuildSubscriptionRole_Setup_Subtitle" id="0x7F13032A" />
+    <public type="style" name="UiKit_GuildSubscriptionRole_Setup_Title" id="0x7F13032B" />
+    <public type="style" name="UiKit_GuildsList" id="0x7F13032C" />
+    <public type="style" name="UiKit_GuildsList_Horiz" id="0x7F13032D" />
+    <public type="style" name="UiKit_GuildsListApplicationStatus" id="0x7F13032E" />
+    <public type="style" name="UiKit_GuildsListApplicationStreamIcon" id="0x7F13032F" />
+    <public type="style" name="UiKit_GuildsListBadge" id="0x7F130330" />
+    <public type="style" name="UiKit_GuildsListDividerIcon" id="0x7F130331" />
+    <public type="style" name="UiKit_GuildsListDividerIconHoriz" id="0x7F130332" />
+    <public type="style" name="UiKit_GuildsListIcon" id="0x7F130333" />
+    <public type="style" name="UiKit_GuildsListItem" id="0x7F130334" />
+    <public type="style" name="UiKit_GuildsListItem_Wrap" id="0x7F130335" />
+    <public type="style" name="UiKit_GuildsListItemHoriz" id="0x7F130336" />
+    <public type="style" name="UiKit_GuildsListItemHoriz_Wrap" id="0x7F130337" />
+    <public type="style" name="UiKit_GuildsListMentions" id="0x7F130338" />
+    <public type="style" name="UiKit_GuildsListSelected" id="0x7F130339" />
+    <public type="style" name="UiKit_GuildsListSelectedHoriz" id="0x7F13033A" />
+    <public type="style" name="UiKit_GuildsListUnavailable" id="0x7F13033B" />
+    <public type="style" name="UiKit_GuildsListUnread" id="0x7F13033C" />
+    <public type="style" name="UiKit_GuildsListUnreadHoriz" id="0x7F13033D" />
+    <public type="style" name="UiKit_GuildsListVoiceIcon" id="0x7F13033E" />
+    <public type="style" name="UiKit_ImageButton" id="0x7F13033F" />
+    <public type="style" name="UiKit_ImageView" id="0x7F130340" />
+    <public type="style" name="UiKit_ImageView_Clickable" id="0x7F130341" />
+    <public type="style" name="UiKit_ImageView_HideInLandscape" id="0x7F130342" />
+    <public type="style" name="UiKit_ListItem" id="0x7F130343" />
+    <public type="style" name="UiKit_ListItem_Description" id="0x7F130344" />
+    <public type="style" name="UiKit_ListItem_Icon" id="0x7F130345" />
+    <public type="style" name="UiKit_ListItem_Icon_Radio" id="0x7F130346" />
+    <public type="style" name="UiKit_ListItem_Switch" id="0x7F130347" />
+    <public type="style" name="UiKit_ListItem_Title" id="0x7F130348" />
+    <public type="style" name="UiKit_LottieAnimationView" id="0x7F130349" />
+    <public type="style" name="UiKit_Material_Button" id="0x7F13034A" />
+    <public type="style" name="UiKit_Material_Button_Fit" id="0x7F13034B" />
+    <public type="style" name="UiKit_Material_Button_Green" id="0x7F13034C" />
+    <public type="style" name="UiKit_Material_Button_Green_Fit" id="0x7F13034D" />
+    <public type="style" name="UiKit_Material_Button_Green_Outline" id="0x7F13034E" />
+    <public type="style" name="UiKit_Material_Button_Outline" id="0x7F13034F" />
+    <public type="style" name="UiKit_Material_Button_Red" id="0x7F130350" />
+    <public type="style" name="UiKit_Material_Button_Red_Fit" id="0x7F130351" />
+    <public type="style" name="UiKit_Material_Button_Red_Outline" id="0x7F130352" />
+    <public type="style" name="UiKit_Material_Button_Secondary" id="0x7F130353" />
+    <public type="style" name="UiKit_Material_Button_Secondary_Fit" id="0x7F130354" />
+    <public type="style" name="UiKit_Material_Button_Secondary_Outline" id="0x7F130355" />
+    <public type="style" name="UiKit_Material_Button_Tertiary" id="0x7F130356" />
+    <public type="style" name="UiKit_Material_Button_Transparent" id="0x7F130357" />
+    <public type="style" name="UiKit_Material_Button_Transparent_Fit" id="0x7F130358" />
+    <public type="style" name="UiKit_Material_Button_White" id="0x7F130359" />
+    <public type="style" name="UiKit_Material_Button_White_Outline" id="0x7F13035A" />
+    <public type="style" name="UiKit_MaterialThemeOverlay_TextInputLayout" id="0x7F13035B" />
+    <public type="style" name="UiKit_PremiumGuild_Confirmation_Chip" id="0x7F13035C" />
+    <public type="style" name="UiKit_PremiumGuild_Settings_Marketing_Check" id="0x7F13035D" />
+    <public type="style" name="UiKit_PremiumGuild_Settings_Marketing_Clear" id="0x7F13035E" />
+    <public type="style" name="UiKit_PremiumGuild_Settings_Marketing_Container" id="0x7F13035F" />
+    <public type="style" name="UiKit_ProgressBar_Line_Horizontal_Determinate" id="0x7F130360" />
+    <public type="style" name="UiKit_ProgressBar_White" id="0x7F130361" />
+    <public type="style" name="UiKit_QuickSwitcher_Animation" id="0x7F130362" />
+    <public type="style" name="UiKit_RadioButton" id="0x7F130363" />
+    <public type="style" name="UiKit_Search_Chip" id="0x7F130364" />
+    <public type="style" name="UiKit_Search_Header" id="0x7F130365" />
+    <public type="style" name="UiKit_SearchInput" id="0x7F130366" />
+    <public type="style" name="UiKit_SearchInputClear" id="0x7F130367" />
+    <public type="style" name="UiKit_SeekBar" id="0x7F130368" />
+    <public type="style" name="UiKit_Settings" id="0x7F130369" />
+    <public type="style" name="UiKit_Settings_Base_Item" id="0x7F13036A" />
+    <public type="style" name="UiKit_Settings_Divider" id="0x7F13036B" />
+    <public type="style" name="UiKit_Settings_Item" id="0x7F13036C" />
+    <public type="style" name="UiKit_Settings_Item_Addition" id="0x7F13036D" />
+    <public type="style" name="UiKit_Settings_Item_Compound_Left" id="0x7F13036E" />
+    <public type="style" name="UiKit_Settings_Item_Compound_Right" id="0x7F13036F" />
+    <public type="style" name="UiKit_Settings_Item_Header" id="0x7F130370" />
+    <public type="style" name="UiKit_Settings_Item_Icon" id="0x7F130371" />
+    <public type="style" name="UiKit_Settings_Item_Label" id="0x7F130372" />
+    <public type="style" name="UiKit_Settings_Item_SubText" id="0x7F130373" />
+    <public type="style" name="UiKit_Settings_Text" id="0x7F130374" />
+    <public type="style" name="UiKit_Sheet" id="0x7F130375" />
+    <public type="style" name="UiKit_Sheet_Guideline" id="0x7F130376" />
+    <public type="style" name="UiKit_Sheet_Header" id="0x7F130377" />
+    <public type="style" name="UiKit_Sheet_Header_Contents" id="0x7F130378" />
+    <public type="style" name="UiKit_Sheet_Header_Icon" id="0x7F130379" />
+    <public type="style" name="UiKit_Sheet_Header_Title" id="0x7F13037A" />
+    <public type="style" name="UiKit_Sheet_KeyboardAvoiding" id="0x7F13037B" />
+    <public type="style" name="UiKit_Stage" id="0x7F13037C" />
+    <public type="style" name="UiKit_Stage_Bullet" id="0x7F13037D" />
+    <public type="style" name="UiKit_Stage_Bullet_Icon" id="0x7F13037E" />
+    <public type="style" name="UiKit_Stage_Bullet_Label" id="0x7F13037F" />
+    <public type="style" name="UiKit_Stage_ClickableButton" id="0x7F130380" />
+    <public type="style" name="UiKit_Stage_Detail" id="0x7F130381" />
+    <public type="style" name="UiKit_Stage_ListItem_Subtitle" id="0x7F130382" />
+    <public type="style" name="UiKit_Stage_ListItem_Title" id="0x7F130383" />
+    <public type="style" name="UiKit_Stage_SectionHeader" id="0x7F130384" />
+    <public type="style" name="UiKit_Stage_Subtitle" id="0x7F130385" />
+    <public type="style" name="UiKit_Stage_Subtitle_Description" id="0x7F130386" />
+    <public type="style" name="UiKit_Stage_Title" id="0x7F130387" />
+    <public type="style" name="UiKit_Stage_Title_Secondary" id="0x7F130388" />
+    <public type="style" name="UiKit_Stage_Topic" id="0x7F130389" />
+    <public type="style" name="UiKit_Stage_Topic_Header" id="0x7F13038A" />
+    <public type="style" name="UiKit_StageDiscovery_PublicNotice_TextView" id="0x7F13038B" />
+    <public type="style" name="UiKit_StageDiscoveryAvatar" id="0x7F13038C" />
+    <public type="style" name="UiKit_StageDiscoveryAvatar_Circle" id="0x7F13038D" />
+    <public type="style" name="UiKit_StageDiscoveryGuildDetail" id="0x7F13038E" />
+    <public type="style" name="UiKit_StageDiscoveryGuildDetail_Medium" id="0x7F13038F" />
+    <public type="style" name="UiKit_StageDiscoveryGuildDetail_Small" id="0x7F130390" />
+    <public type="style" name="UiKit_StageDiscoveryIcon" id="0x7F130391" />
+    <public type="style" name="UiKit_TabLayout_PagerIndicator" id="0x7F130392" />
+    <public type="style" name="UiKit_Tabs" id="0x7F130393" />
+    <public type="style" name="UiKit_Tabs_TextAppearance" id="0x7F130394" />
+    <public type="style" name="UiKit_TextAppearance" id="0x7F130395" />
+    <public type="style" name="UiKit_TextAppearance_Bold" id="0x7F130396" />
+    <public type="style" name="UiKit_TextAppearance_Button" id="0x7F130397" />
+    <public type="style" name="UiKit_TextAppearance_ListItem" id="0x7F130398" />
+    <public type="style" name="UiKit_TextAppearance_ListItem_Label" id="0x7F130399" />
+    <public type="style" name="UiKit_TextAppearance_MaterialEditText" id="0x7F13039A" />
+    <public type="style" name="UiKit_TextAppearance_MaterialEditText_Input" id="0x7F13039B" />
+    <public type="style" name="UiKit_TextAppearance_MaterialEditText_Label" id="0x7F13039C" />
+    <public type="style" name="UiKit_TextAppearance_Semibold" id="0x7F13039D" />
+    <public type="style" name="UiKit_TextAppearance_Toolbar" id="0x7F13039E" />
+    <public type="style" name="UiKit_TextAppearance_Toolbar_Subtitle" id="0x7F13039F" />
+    <public type="style" name="UiKit_TextAppearance_Toolbar_Title" id="0x7F1303A0" />
+    <public type="style" name="UiKit_TextInputLayout" id="0x7F1303A1" />
+    <public type="style" name="UiKit_TextInputLayout_EditText" id="0x7F1303A2" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_MultiLine" id="0x7F1303A3" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_MultiLine_Paragraph" id="0x7F1303A4" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_NoFocus" id="0x7F1303A5" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_SingleLine" id="0x7F1303A6" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_SingleLine_CountryCode" id="0x7F1303A7" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_SingleLine_Email" id="0x7F1303A8" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_SingleLine_Password" id="0x7F1303A9" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_SingleLine_Phone" id="0x7F1303AA" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_SingleLine_Search" id="0x7F1303AB" />
+    <public type="style" name="UiKit_TextInputLayout_EditText_SingleLine_Username" id="0x7F1303AC" />
+    <public type="style" name="UiKit_TextInputLayout_Password" id="0x7F1303AD" />
+    <public type="style" name="UiKit_TextInputLayout_Primary" id="0x7F1303AE" />
+    <public type="style" name="UiKit_TextInputLayout_Primary_Password" id="0x7F1303AF" />
+    <public type="style" name="UiKit_TextInputLayout_Search" id="0x7F1303B0" />
+    <public type="style" name="UiKit_TextInputLayout_Search_ActionBar" id="0x7F1303B1" />
+    <public type="style" name="UiKit_TextInputLayout_Search_ActionBar_Filter" id="0x7F1303B2" />
+    <public type="style" name="UiKit_TextView" id="0x7F1303B3" />
+    <public type="style" name="UiKit_TextView_Bold" id="0x7F1303B4" />
+    <public type="style" name="UiKit_TextView_H1" id="0x7F1303B5" />
+    <public type="style" name="UiKit_TextView_H1_Bold" id="0x7F1303B6" />
+    <public type="style" name="UiKit_TextView_H2" id="0x7F1303B7" />
+    <public type="style" name="UiKit_TextView_H2_Bold" id="0x7F1303B8" />
+    <public type="style" name="UiKit_TextView_H6" id="0x7F1303B9" />
+    <public type="style" name="UiKit_TextView_Large" id="0x7F1303BA" />
+    <public type="style" name="UiKit_TextView_Large_SingleLine" id="0x7F1303BB" />
+    <public type="style" name="UiKit_TextView_Link" id="0x7F1303BC" />
+    <public type="style" name="UiKit_TextView_Marquee" id="0x7F1303BD" />
+    <public type="style" name="UiKit_TextView_Medium" id="0x7F1303BE" />
+    <public type="style" name="UiKit_TextView_Medium_SingleLine" id="0x7F1303BF" />
+    <public type="style" name="UiKit_TextView_NoResults" id="0x7F1303C0" />
+    <public type="style" name="UiKit_TextView_Perk" id="0x7F1303C1" />
+    <public type="style" name="UiKit_TextView_Perk_Small" id="0x7F1303C2" />
+    <public type="style" name="UiKit_TextView_Semibold" id="0x7F1303C3" />
+    <public type="style" name="UiKit_TextView_SingleLine" id="0x7F1303C4" />
+    <public type="style" name="UiKit_TextView_Subtext" id="0x7F1303C5" />
+    <public type="style" name="UiKit_TextView_Subtext_SingleLine" id="0x7F1303C6" />
+    <public type="style" name="UiKit_TextView_Tagged" id="0x7F1303C7" />
+    <public type="style" name="UiKit_Toast" id="0x7F1303C8" />
+    <public type="style" name="UiKit_User_Phone_Manage_Confirm" id="0x7F1303C9" />
+    <public type="style" name="UiKit_User_Phone_Manage_Number" id="0x7F1303CA" />
+    <public type="style" name="UiKit_User_Phone_Verify_Digits" id="0x7F1303CB" />
+    <public type="style" name="UiKit_User_Verify_Char" id="0x7F1303CC" />
+    <public type="style" name="UiKit_ViewGroup" id="0x7F1303CD" />
+    <public type="style" name="UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout" id="0x7F1303CE" />
+    <public type="style" name="UiKit_ViewGroup_ConstraintLayout" id="0x7F1303CF" />
+    <public type="style" name="UiKit_ViewGroup_CoordinatorLayout" id="0x7F1303D0" />
+    <public type="style" name="UiKit_ViewGroup_CoordinatorLayout_Page" id="0x7F1303D1" />
+    <public type="style" name="UiKit_ViewGroup_LinearLayout" id="0x7F1303D2" />
+    <public type="style" name="UiKit_ViewGroup_LinearLayout_BottomSheet" id="0x7F1303D3" />
+    <public type="style" name="UiKit_ViewGroup_LinearLayout_Horizontal" id="0x7F1303D4" />
+    <public type="style" name="UiKit_ViewGroup_LinearLayout_Rotatable" id="0x7F1303D5" />
+    <public type="style" name="UiKit_ViewGroup_LinearLayout_Rotatable_Horizontal" id="0x7F1303D6" />
+    <public type="style" name="UiKit_ViewGroup_NestedScrollView" id="0x7F1303D7" />
+    <public type="style" name="UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior" id="0x7F1303D8" />
+    <public type="style" name="UiKit_ViewGroup_NestedScrollView_Page" id="0x7F1303D9" />
+    <public type="style" name="UiKit_ViewGroup_Page" id="0x7F1303DA" />
+    <public type="style" name="UiKit_ViewGroup_Page_LinearLayout" id="0x7F1303DB" />
+    <public type="style" name="UiKit_ViewGroup_Page_LinearLayout_Horizontal" id="0x7F1303DC" />
+    <public type="style" name="UiKit_ViewGroup_RecyclerView" id="0x7F1303DD" />
+    <public type="style" name="UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior" id="0x7F1303DE" />
+    <public type="style" name="UiKit_ViewGroup_RecyclerView_Horizontal" id="0x7F1303DF" />
+    <public type="style" name="UiKit_ViewGroup_RelativeLayout" id="0x7F1303E0" />
+    <public type="style" name="UiKit_ViewGroup_RelativeLayout_AppBarScrollingViewBehavior" id="0x7F1303E1" />
+    <public type="style" name="UiKit_ViewGroup_ScrollView" id="0x7F1303E2" />
+    <public type="style" name="UiKit_ViewGroup_ScrollView_Horizontal" id="0x7F1303E3" />
+    <public type="style" name="UiKit_ViewGroup_ScrollView_Page" id="0x7F1303E4" />
+    <public type="style" name="UiKit_WelcomeMessageCard" id="0x7F1303E5" />
+    <public type="style" name="UserProfile_PresenceSection_Body" id="0x7F1303E6" />
+    <public type="style" name="UserProfile_PresenceSection_Body_HeaderText" id="0x7F1303E7" />
+    <public type="style" name="UserProfile_PresenceSection_Body_Subtext" id="0x7F1303E8" />
+    <public type="style" name="UserProfile_PresenceSection_MaterialButton" id="0x7F1303E9" />
+    <public type="style" name="UserProfile_Section" id="0x7F1303EA" />
+    <public type="style" name="UserProfile_Section_Card" id="0x7F1303EB" />
+    <public type="style" name="UserProfile_Section_Header" id="0x7F1303EC" />
+    <public type="style" name="UserProfile_Section_HeaderTextAppearance" id="0x7F1303ED" />
     <public type="style" name="VoiceControlsSheet" id="0x7F1303EE" />
     <public type="style" name="res_2131952623_widget_appcompat_actionbar" id="0x7F1303EF" />
     <public type="style" name="res_2131952624_widget_appcompat_actionbar_solid" id="0x7F1303F0" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 59e1e57fa1..7ddf60aa93 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,7 +44,7 @@
         <item name="android:windowEnterAnimation">@anim/mtrl_bottom_sheet_slide_in</item>
         <item name="android:windowExitAnimation">@anim/mtrl_bottom_sheet_slide_out</item>
     </style>
-    <style name="res_2131951630_app_tablayout_text">
+    <style name="App_TabLayout_Text">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">?attr/font_primary_semibold</item>
@@ -92,25 +92,25 @@
     </style>
     <style name="AppTheme" parent="@style/res_2131952278_theme_materialcomponents_daynight_bridge">
     </style>
-    <style name="res_2131951637_apptheme_appbarlayout" parent="@style/AppTheme">
+    <style name="AppTheme_AppBarLayout" parent="@style/AppTheme">
         <item name="android:id">@id/action_bar_toolbar_layout</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="liftOnScroll">true</item>
     </style>
-    <style name="res_2131951638_apptheme_appbarlayout_flat" parent="@style/res_2131951637_apptheme_appbarlayout">
+    <style name="AppTheme_AppBarLayout_Flat" parent="@style/AppTheme_AppBarLayout">
         <item name="elevation">0dp</item>
         <item name="liftOnScroll">false</item>
     </style>
-    <style name="res_2131951639_apptheme_appbarlayout_flat_transparent" parent="@style/res_2131951638_apptheme_appbarlayout_flat">
+    <style name="AppTheme_AppBarLayout_Flat_Transparent" parent="@style/AppTheme_AppBarLayout_Flat">
         <item name="android:background">@color/transparent</item>
     </style>
-    <style name="res_2131951640_apptheme_appbarscrollingviewbehavior" parent="@style/AppTheme">
+    <style name="AppTheme_AppBarScrollingViewBehavior" parent="@style/AppTheme">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="layout_behavior">@string/appbar_scrolling_view_behavior</item>
     </style>
-    <style name="res_2131951641_apptheme_autogenerated_dark" parent="@style/res_2131951645_apptheme_base_dark">
+    <style name="AppTheme_AutoGenerated_Dark" parent="@style/AppTheme_Base_Dark">
         <item name="colorActivityCardBackground">@color/primary_dark_700</item>
         <item name="colorBackgroundAccent">@color/primary_dark_500</item>
         <item name="colorBackgroundFloating">@color/primary_dark_800</item>
@@ -182,7 +182,7 @@
         <item name="colorTextWarning">@color/status_yellow</item>
         <item name="colorTextboxMarkdownSyntax">@color/primary_dark_360</item>
     </style>
-    <style name="res_2131951642_apptheme_autogenerated_light" parent="@style/res_2131951646_apptheme_base_light">
+    <style name="AppTheme_AutoGenerated_Light" parent="@style/AppTheme_Base_Light">
         <item name="colorActivityCardBackground">@color/white</item>
         <item name="colorBackgroundAccent">@color/primary_light_500</item>
         <item name="colorBackgroundFloating">@color/white</item>
@@ -254,23 +254,23 @@
         <item name="colorTextWarning">@color/status_yellow</item>
         <item name="colorTextboxMarkdownSyntax">@color/primary_light_530</item>
     </style>
-    <style name="res_2131951643_apptheme_base" parent="@style/res_2131952278_theme_materialcomponents_daynight_bridge">
+    <style name="AppTheme_Base" parent="@style/res_2131952278_theme_materialcomponents_daynight_bridge">
         <item name="android:windowBackground">@null</item>
-        <item name="android:seekBarStyle">@style/res_2131951662_apptheme_seekbar</item>
+        <item name="android:seekBarStyle">@style/AppTheme_SeekBar</item>
         <item name="android:colorEdgeEffect">@color/brand</item>
         <item name="colorAccent">@color/brand_new_260</item>
         <item name="colorPrimary">@color/brand_new</item>
         <item name="colorPrimaryDark">@color/brand_new_460</item>
         <item name="itemTextColor">@color/primary_900</item>
     </style>
-    <style name="res_2131951644_apptheme_base_bottomsheet" parent="@style/res_2131952267_theme_design_bottomsheetdialog">
+    <style name="AppTheme_Base_BottomSheet" parent="@style/res_2131952267_theme_design_bottomsheetdialog">
         <item name="android:windowBackground">@android:drawable/screen_background_dark_transparent</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:drawable/screen_background_dark_transparent</item>
         <item name="android:navigationBarColor">@color/nav_bar_color</item>
     </style>
-    <style name="res_2131951645_apptheme_base_dark" parent="@style/res_2131951660_apptheme_noactionbar">
+    <style name="AppTheme_Base_Dark" parent="@style/AppTheme_NoActionBar">
         <item name="anim_boost_confirmation">animations/anim_nitro_boost_confirmation_dark.json </item>
         <item name="auth_bg">@color/auth_dark</item>
         <item name="auth_bg_button">@color/brand_500</item>
@@ -532,7 +532,7 @@
         <item name="theme_thread_browser_bg">?attr/colorBackgroundPrimary</item>
         <item name="theme_thread_browser_fg">?attr/colorBackgroundSecondary</item>
     </style>
-    <style name="res_2131951646_apptheme_base_light" parent="@style/res_2131951660_apptheme_noactionbar">
+    <style name="AppTheme_Base_Light" parent="@style/AppTheme_NoActionBar">
         <item name="anim_boost_confirmation">animations/anim_nitro_boost_confirmation_light.json </item>
         <item name="auth_bg">@color/auth_light</item>
         <item name="auth_bg_button">@color/primary_500</item>
@@ -794,17 +794,17 @@
         <item name="theme_thread_browser_bg">?attr/colorBackgroundSecondary</item>
         <item name="theme_thread_browser_fg">?attr/colorBackgroundPrimary</item>
     </style>
-    <style name="res_2131951647_apptheme_collapsingtoolbarlayout" parent="@style/AppTheme">
+    <style name="AppTheme_CollapsingToolbarLayout" parent="@style/AppTheme">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="layout_scrollFlags">3</item>
     </style>
-    <style name="res_2131951648_apptheme_dark" parent="@style/res_2131951641_apptheme_autogenerated_dark">
-        <item name="actionButtonStyle">@style/res_2131951664_apptheme_toolbar_actionbutton</item>
+    <style name="AppTheme_Dark" parent="@style/AppTheme_AutoGenerated_Dark">
+        <item name="actionButtonStyle">@style/AppTheme_Toolbar_ActionButton</item>
         <item name="actionMenuTextColor">@color/primary_100</item>
-        <item name="actionOverflowButtonStyle">@style/res_2131951665_apptheme_toolbar_overflowicon</item>
+        <item name="actionOverflowButtonStyle">@style/AppTheme_Toolbar_OverflowIcon</item>
         <item name="boost_confirmation_card_bg">@color/primary_600</item>
-        <item name="bottomSheetDialogTheme">@style/res_2131951649_apptheme_dark_bottomsheet</item>
+        <item name="bottomSheetDialogTheme">@style/AppTheme_Dark_BottomSheet</item>
         <item name="colorAccent">@color/brand_500</item>
         <item name="colorBackgroundAccentButton">@color/uikit_btn_bg_color_selector_background_accent_dark</item>
         <item name="colorButtonNormal">@color/brand_500</item>
@@ -826,9 +826,9 @@
         <item name="colorTabsBackground">@color/primary_dark_800</item>
         <item name="colorTabsDivider">@color/transparent</item>
         <item name="colorTabsIconActive">@color/white</item>
-        <item name="dialogTheme">@style/res_2131951651_apptheme_dark_notice</item>
+        <item name="dialogTheme">@style/AppTheme_Dark_Notice</item>
         <item name="notice_popup_bg">@color/primary_700</item>
-        <item name="notice_theme_positive_red">@style/res_2131951652_apptheme_dark_notice_positivered</item>
+        <item name="notice_theme_positive_red">@style/AppTheme_Dark_Notice_PositiveRed</item>
         <item name="primary_000">@color/white</item>
         <item name="primary_100">@color/primary_100</item>
         <item name="primary_100_alpha_30">@color/primary_100_alpha_30</item>
@@ -872,7 +872,7 @@
         <item name="theme_name">dark</item>
         <item name="toolbarColor">@color/primary_630</item>
     </style>
-    <style name="res_2131951649_apptheme_dark_bottomsheet" parent="@style/res_2131951644_apptheme_base_bottomsheet">
+    <style name="AppTheme_Dark_BottomSheet" parent="@style/AppTheme_Base_BottomSheet">
         <item name="colorAccent">@color/brand_new_500</item>
         <item name="colorButtonNormal">@color/brand_new_500</item>
         <item name="colorControlActivated">@color/brand_new_500</item>
@@ -880,7 +880,7 @@
         <item name="colorPrimary">@color/primary_600</item>
         <item name="colorPrimaryDark">#2b2e31</item>
     </style>
-    <style name="res_2131951650_apptheme_dark_evil" parent="@style/res_2131951648_apptheme_dark">
+    <style name="AppTheme_Dark_Evil" parent="@style/AppTheme_Dark">
         <item name="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
         <item name="colorAccent">@color/brand_600</item>
         <item name="colorBackgroundFloating">@color/primary_600</item>
@@ -900,9 +900,9 @@
         <item name="theme_status_indicator_color">@color/primary_800</item>
         <item name="toolbarColor">@color/primary_800</item>
     </style>
-    <style name="res_2131951651_apptheme_dark_notice" parent="@style/res_2131952253_theme_appcompat_dialog">
-        <item name="buttonBarNegativeButtonStyle">@style/res_2131952472_uikit_material_button_transparent_fit</item>
-        <item name="buttonBarPositiveButtonStyle">@style/res_2131952459_uikit_material_button_fit</item>
+    <style name="AppTheme_Dark_Notice" parent="@style/res_2131952253_theme_appcompat_dialog">
+        <item name="buttonBarNegativeButtonStyle">@style/UiKit_Material_Button_Transparent_Fit</item>
+        <item name="buttonBarPositiveButtonStyle">@style/UiKit_Material_Button_Fit</item>
         <item name="colorAccent">@color/brand_500</item>
         <item name="colorButtonNormal">@color/brand_500</item>
         <item name="colorControlActivated">@color/brand_360</item>
@@ -910,29 +910,29 @@
         <item name="colorPrimary">@color/primary_600</item>
         <item name="colorPrimaryDark">#2b2e31</item>
     </style>
-    <style name="res_2131951652_apptheme_dark_notice_positivered" parent="@style/res_2131951651_apptheme_dark_notice">
-        <item name="buttonBarPositiveButtonStyle">@style/res_2131952465_uikit_material_button_red_fit</item>
+    <style name="AppTheme_Dark_Notice_PositiveRed" parent="@style/AppTheme_Dark_Notice">
+        <item name="buttonBarPositiveButtonStyle">@style/UiKit_Material_Button_Red_Fit</item>
     </style>
-    <style name="res_2131951653_apptheme_dialog_popup_tooltip" parent="@style/res_2131952253_theme_appcompat_dialog">
+    <style name="AppTheme_Dialog_Popup_Tooltip" parent="@style/res_2131952253_theme_appcompat_dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@style/res_2131952407_uikit_dialog_animation</item>
+        <item name="android:windowAnimationStyle">@style/UiKit_Dialog_Animation</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:windowSoftInputMode">stateUnchanged</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
         <item name="android:windowElevation">12dp</item>
     </style>
-    <style name="res_2131951654_apptheme_globalsearchdialog" parent="@android:style/ThemeOverlay.Material.Dialog">
+    <style name="AppTheme_GlobalSearchDialog" parent="@android:style/ThemeOverlay.Material.Dialog">
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:navigationBarColor">@color/nav_bar_color</item>
     </style>
-    <style name="res_2131951655_apptheme_light" parent="@style/res_2131951642_apptheme_autogenerated_light">
+    <style name="AppTheme_Light" parent="@style/AppTheme_AutoGenerated_Light">
         <item name="actionMenuTextColor">@color/primary_500</item>
-        <item name="actionOverflowButtonStyle">@style/res_2131951665_apptheme_toolbar_overflowicon</item>
+        <item name="actionOverflowButtonStyle">@style/AppTheme_Toolbar_OverflowIcon</item>
         <item name="boost_confirmation_card_bg">@color/white</item>
-        <item name="bottomSheetDialogTheme">@style/res_2131951656_apptheme_light_bottomsheet</item>
+        <item name="bottomSheetDialogTheme">@style/AppTheme_Light_BottomSheet</item>
         <item name="colorAccent">@color/brand_500</item>
         <item name="colorBackgroundAccentButton">@color/uikit_btn_bg_color_selector_background_accent_light</item>
         <item name="colorButtonNormal">@color/brand_500</item>
@@ -953,9 +953,9 @@
         <item name="colorTabsBackground">@color/primary_light_130</item>
         <item name="colorTabsDivider">@color/primary_light_300</item>
         <item name="colorTabsIconActive">@color/primary_light_900</item>
-        <item name="dialogTheme">@style/res_2131951657_apptheme_light_notice</item>
+        <item name="dialogTheme">@style/AppTheme_Light_Notice</item>
         <item name="notice_popup_bg">@color/primary_100</item>
-        <item name="notice_theme_positive_red">@style/res_2131951658_apptheme_light_notice_positivered</item>
+        <item name="notice_theme_positive_red">@style/AppTheme_Light_Notice_PositiveRed</item>
         <item name="primary_000">@color/primary_light_800</item>
         <item name="primary_100">@color/primary_500</item>
         <item name="primary_100_alpha_30">@color/primary_500_alpha_30</item>
@@ -999,26 +999,26 @@
         <item name="theme_name">light</item>
         <item name="toolbarColor">@color/white</item>
     </style>
-    <style name="res_2131951656_apptheme_light_bottomsheet" parent="@style/res_2131951644_apptheme_base_bottomsheet">
+    <style name="AppTheme_Light_BottomSheet" parent="@style/AppTheme_Base_BottomSheet">
         <item name="colorAccent">@color/brand_new_500</item>
         <item name="colorButtonNormal">@color/brand_new_500</item>
         <item name="colorControlActivated">@color/brand_new_500</item>
         <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryDark">#e5e5e5</item>
     </style>
-    <style name="res_2131951657_apptheme_light_notice" parent="@style/res_2131952260_theme_appcompat_light_dialog">
-        <item name="buttonBarNegativeButtonStyle">@style/res_2131952472_uikit_material_button_transparent_fit</item>
-        <item name="buttonBarPositiveButtonStyle">@style/res_2131952459_uikit_material_button_fit</item>
+    <style name="AppTheme_Light_Notice" parent="@style/res_2131952260_theme_appcompat_light_dialog">
+        <item name="buttonBarNegativeButtonStyle">@style/UiKit_Material_Button_Transparent_Fit</item>
+        <item name="buttonBarPositiveButtonStyle">@style/UiKit_Material_Button_Fit</item>
         <item name="colorAccent">@color/brand_500</item>
         <item name="colorButtonNormal">@color/brand_500</item>
         <item name="colorControlActivated">@color/brand_500</item>
         <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryDark">#e5e5e5</item>
     </style>
-    <style name="res_2131951658_apptheme_light_notice_positivered" parent="@style/res_2131951657_apptheme_light_notice">
-        <item name="buttonBarPositiveButtonStyle">@style/res_2131952465_uikit_material_button_red_fit</item>
+    <style name="AppTheme_Light_Notice_PositiveRed" parent="@style/AppTheme_Light_Notice">
+        <item name="buttonBarPositiveButtonStyle">@style/UiKit_Material_Button_Red_Fit</item>
     </style>
-    <style name="res_2131951659_apptheme_loading" parent="@style/res_2131951648_apptheme_dark">
+    <style name="AppTheme_Loading" parent="@style/AppTheme_Dark">
         <item name="android:windowBackground">@drawable/drawable_bg_loading</item>
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowEnterAnimation">@null</item>
@@ -1027,7 +1027,7 @@
         <item name="android:windowEnterTransition">@null</item>
         <item name="android:windowExitTransition">@null</item>
     </style>
-    <style name="res_2131951660_apptheme_noactionbar" parent="@style/AppTheme">
+    <style name="AppTheme_NoActionBar" parent="@style/AppTheme">
         <item name="android:listDivider">@color/primary_500_alpha_60</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:navigationBarColor">@color/nav_bar_color</item>
@@ -1082,45 +1082,45 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
-    <style name="res_2131951661_apptheme_popupmenu" parent="@style/res_2131952676_widget_appcompat_popupmenu">
+    <style name="AppTheme_PopupMenu" parent="@style/res_2131952676_widget_appcompat_popupmenu">
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
         <item name="android:itemBackground">?attr/colorBackgroundTertiary</item>
         <item name="android:fontFamily">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131951662_apptheme_seekbar" parent="@android:style/Widget.Material.Light.SeekBar">
+    <style name="AppTheme_SeekBar" parent="@android:style/Widget.Material.Light.SeekBar">
         <item name="android:maxHeight">2dp</item>
         <item name="android:progressTint">?attr/color_brand</item>
         <item name="android:backgroundTint">?attr/color_brand</item>
         <item name="android:thumbTint">?attr/color_brand</item>
     </style>
-    <style name="res_2131951663_apptheme_toolbar" parent="@style/AppTheme">
-        <item name="android:theme">@style/res_2131951668_apptheme_toolbartheme</item>
+    <style name="AppTheme_Toolbar" parent="@style/AppTheme">
+        <item name="android:theme">@style/AppTheme_ToolbarTheme</item>
         <item name="android:id">@id/action_bar_toolbar</item>
         <item name="android:background">?attr/toolbarColor</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?attr/actionBarSize</item>
         <item name="android:minHeight">?attr/actionBarSize</item>
         <item name="layout_collapseMode">1</item>
-        <item name="popupTheme">@style/res_2131951666_apptheme_toolbar_popup</item>
-        <item name="subtitleTextAppearance">@style/res_2131952543_uikit_textappearance_toolbar_subtitle</item>
-        <item name="titleTextAppearance">@style/res_2131952544_uikit_textappearance_toolbar_title</item>
+        <item name="popupTheme">@style/AppTheme_Toolbar_Popup</item>
+        <item name="subtitleTextAppearance">@style/UiKit_TextAppearance_Toolbar_Subtitle</item>
+        <item name="titleTextAppearance">@style/UiKit_TextAppearance_Toolbar_Title</item>
     </style>
-    <style name="res_2131951664_apptheme_toolbar_actionbutton" parent="@style/res_2131952628_widget_appcompat_actionbutton">
+    <style name="AppTheme_Toolbar_ActionButton" parent="@style/res_2131952628_widget_appcompat_actionbutton">
         <item name="android:tint">?attr/colorInteractiveNormal</item>
     </style>
-    <style name="res_2131951665_apptheme_toolbar_overflowicon" parent="@style/res_2131952630_widget_appcompat_actionbutton_overflow">
+    <style name="AppTheme_Toolbar_OverflowIcon" parent="@style/res_2131952630_widget_appcompat_actionbutton_overflow">
         <item name="android:tint">?attr/colorInteractiveNormal</item>
     </style>
-    <style name="res_2131951666_apptheme_toolbar_popup" parent="@style/res_2131952329_themeoverlay_appcompat_light">
+    <style name="AppTheme_Toolbar_Popup" parent="@style/res_2131952329_themeoverlay_appcompat_light">
         <item name="android:fontFamily">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131951667_apptheme_toolbar_transparent" parent="@style/res_2131951663_apptheme_toolbar">
+    <style name="AppTheme_Toolbar_Transparent" parent="@style/AppTheme_Toolbar">
         <item name="android:background">@color/transparent</item>
     </style>
-    <style name="res_2131951668_apptheme_toolbartheme" parent="@style/res_2131952324_themeoverlay_appcompat_dark_actionbar">
+    <style name="AppTheme_ToolbarTheme" parent="@style/res_2131952324_themeoverlay_appcompat_dark_actionbar">
         <item name="colorControlNormal">?attr/primary_000</item>
     </style>
-    <style name="res_2131951669_apptheme_translucent" parent="@style/res_2131951648_apptheme_dark">
+    <style name="AppTheme_Translucent" parent="@style/AppTheme_Dark">
         <item name="android:backgroundDimAmount">0.15</item>
         <item name="android:windowBackground">@color/transparent</item>
         <item name="android:windowNoTitle">true</item>
@@ -1131,7 +1131,7 @@
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
     </style>
-    <style name="AutocompleteItemContainer" parent="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <style name="AutocompleteItemContainer" parent="@style/UiKit_ViewGroup_ConstraintLayout">
         <item name="android:background">?attr/colorBackgroundSecondary</item>
         <item name="android:layout_height">44dp</item>
         <item name="android:foreground">?attr/bg_pressed_highlight</item>
@@ -1142,41 +1142,41 @@
         <item name="placeholderImageScaleType">2</item>
         <item name="roundAsCircle">true</item>
     </style>
-    <style name="res_2131951672_avatar_chat" parent="@style/res_2131951674_avatar_large">
+    <style name="Avatar_Chat" parent="@style/Avatar_Large">
         <item name="android:layout_width">@dimen/avatar_size_chat</item>
         <item name="android:layout_height">@dimen/avatar_size_chat</item>
     </style>
-    <style name="res_2131951673_avatar_hero" parent="@style/Avatar">
+    <style name="Avatar_Hero" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_hero</item>
         <item name="android:layout_height">@dimen/avatar_size_hero</item>
         <item name="placeholderImage">?attr/asset_default_avatar_64dp</item>
     </style>
-    <style name="res_2131951674_avatar_large" parent="@style/Avatar">
+    <style name="Avatar_Large" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_large</item>
         <item name="android:layout_height">@dimen/avatar_size_large</item>
         <item name="placeholderImage">?attr/asset_default_avatar_64dp</item>
     </style>
-    <style name="res_2131951675_avatar_large_extraaccount" parent="@style/Avatar">
+    <style name="Avatar_Large_ExtraAccount" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_extra_large_account</item>
         <item name="android:layout_height">@dimen/avatar_size_extra_large_account</item>
         <item name="placeholderImage">?attr/asset_default_avatar_64dp</item>
     </style>
-    <style name="res_2131951676_avatar_medium" parent="@style/Avatar">
+    <style name="Avatar_Medium" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_medium</item>
         <item name="android:layout_height">@dimen/avatar_size_medium</item>
         <item name="placeholderImage">?attr/asset_default_avatar_32dp</item>
     </style>
-    <style name="res_2131951677_avatar_small" parent="@style/Avatar">
+    <style name="Avatar_Small" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_small</item>
         <item name="android:layout_height">@dimen/avatar_size_small</item>
         <item name="placeholderImage">?attr/asset_default_avatar_32dp</item>
     </style>
-    <style name="res_2131951678_avatar_standard" parent="@style/Avatar">
+    <style name="Avatar_Standard" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_standard</item>
         <item name="android:layout_height">@dimen/avatar_size_standard</item>
         <item name="placeholderImage">?attr/asset_default_avatar_32dp</item>
     </style>
-    <style name="res_2131951679_avatar_xxlarge" parent="@style/Avatar">
+    <style name="Avatar_XXLarge" parent="@style/Avatar">
         <item name="android:layout_width">@dimen/avatar_size_xxlarge</item>
         <item name="android:layout_height">@dimen/avatar_size_xxlarge</item>
         <item name="placeholderImage">?attr/asset_default_avatar_80dp</item>
@@ -2775,27 +2775,27 @@
     </style>
     <style name="res_2131951897_base_widget_materialcomponents_textview" parent="@style/res_2131952692_widget_appcompat_textview">
     </style>
-    <style name="res_2131951898_blockeduserslist_item" parent="@style/res_2131952608_uikit_viewgroup_relativelayout">
+    <style name="BlockedUsersList_Item" parent="@style/UiKit_ViewGroup_RelativeLayout">
         <item name="android:background">@drawable/bg_pressed_highlight_darken</item>
         <item name="android:padding">16dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
-    <style name="res_2131951899_blockeduserslist_item_avatar" parent="@style/res_2131951678_avatar_standard">
+    <style name="BlockedUsersList_Item_Avatar" parent="@style/Avatar_Standard">
         <item name="android:layout_width">40dp</item>
         <item name="android:layout_height">40dp</item>
         <item name="android:layout_marginEnd">16dp</item>
     </style>
-    <style name="res_2131951900_blockeduserslist_item_name" parent="@style/res_2131952571_uikit_textview_large_singleline">
+    <style name="BlockedUsersList_Item_Name" parent="@style/UiKit_TextView_Large_SingleLine">
         <item name="android:textColor">?attr/colorTextNormal</item>
     </style>
-    <style name="res_2131951901_blockeduserslist_item_unblockbutton" parent="@style/res_2131952458_uikit_material_button">
+    <style name="BlockedUsersList_Item_UnblockButton" parent="@style/UiKit_Material_Button">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_marginStart">16dp</item>
         <item name="android:backgroundTint">?attr/colorBackgroundAccent</item>
     </style>
-    <style name="res_2131951902_callmessage_subtitle" parent="@style/res_2131952563_uikit_textview">
-        <item name="android:textAppearance">@style/res_2131952533_uikit_textappearance</item>
+    <style name="CallMessage_Subtitle" parent="@style/UiKit_TextView">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:singleLine">true</item>
     </style>
@@ -2807,7 +2807,7 @@
     <style name="res_2131951905_cardview_light" parent="@style/CardView">
         <item name="cardBackgroundColor">@color/cardview_light_background</item>
     </style>
-    <style name="res_2131951906_channelsidebaractions_actions_button" parent="@style/res_2131952471_uikit_material_button_transparent">
+    <style name="ChannelSideBarActions_Actions_Button" parent="@style/UiKit_Material_Button_Transparent">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorInteractiveNormal</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
@@ -2846,7 +2846,7 @@
     <style name="res_2131951914_code_textappearance_types">
         <item name="android:textColor">#aed581</item>
     </style>
-    <style name="res_2131951915_connections_switch" parent="@style/res_2131952455_uikit_listitem_switch">
+    <style name="Connections_Switch" parent="@style/UiKit_ListItem_Switch">
         <item name="android:padding">16dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -3060,33 +3060,33 @@
         <item name="android:windowEnterAnimation">@anim/anim_fade_in_fast</item>
         <item name="android:windowExitAnimation">@anim/anim_fade_out_fast</item>
     </style>
-    <style name="res_2131951956_feedback_prompttextappearance" parent="@style/res_2131952533_uikit_textappearance">
+    <style name="Feedback_PromptTextAppearance" parent="@style/UiKit_TextAppearance">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
     </style>
-    <style name="res_2131951957_feedback_row">
+    <style name="Feedback_Row">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginStart">16dp</item>
         <item name="android:layout_marginEnd">16dp</item>
     </style>
-    <style name="res_2131951958_feedback_row_prompt" parent="@style/res_2131951957_feedback_row">
-        <item name="android:textAppearance">@style/res_2131951956_feedback_prompttextappearance</item>
+    <style name="Feedback_Row_Prompt" parent="@style/Feedback_Row">
+        <item name="android:textAppearance">@style/Feedback_PromptTextAppearance</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">16dp</item>
     </style>
-    <style name="res_2131951959_feedback_row_sectioncard" parent="@style/res_2131951957_feedback_row">
+    <style name="Feedback_Row_SectionCard" parent="@style/Feedback_Row">
         <item name="cardBackgroundColor">?attr/colorBackgroundPrimary</item>
         <item name="cardCornerRadius">4dp</item>
         <item name="cardElevation">0dp</item>
     </style>
-    <style name="res_2131951960_feedback_row_sectionheader" parent="@style/res_2131951957_feedback_row">
-        <item name="android:textAppearance">@style/res_2131951961_feedback_sectionheadertextappearance</item>
+    <style name="Feedback_Row_SectionHeader" parent="@style/Feedback_Row">
+        <item name="android:textAppearance">@style/Feedback_SectionHeaderTextAppearance</item>
         <item name="android:paddingTop">8dp</item>
         <item name="android:paddingBottom">8dp</item>
         <item name="android:layout_marginTop">8dp</item>
     </style>
-    <style name="res_2131951961_feedback_sectionheadertextappearance" parent="@style/res_2131952541_uikit_textappearance_semibold">
+    <style name="Feedback_SectionHeaderTextAppearance" parent="@style/UiKit_TextAppearance_Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:textAllCaps">true</item>
@@ -3097,9 +3097,9 @@
         <item name="flexInputIconColorActivated">@color/flexInputIconColorActivated</item>
         <item name="flexInputIconColorDisabled">@color/flexInputIconColorDisabled</item>
     </style>
-    <style name="res_2131951963_flexinput_addcontent" parent="@style/res_2131951996_flexinput_main">
+    <style name="FlexInput_AddContent" parent="@style/FlexInput_Main">
     </style>
-    <style name="res_2131951964_flexinput_addcontent_base_container_tablayout" parent="@style/res_2131951963_flexinput_addcontent">
+    <style name="FlexInput_AddContent_Base_Container_TabLayout" parent="@style/FlexInput_AddContent">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_gravity">top|center_vertical</item>
         <item name="android:padding">16dp</item>
@@ -3109,7 +3109,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="background">@android:color/transparent</item>
     </style>
-    <style name="res_2131951965_flexinput_addcontent_base_page" parent="@style/res_2131951963_flexinput_addcontent">
+    <style name="FlexInput_AddContent_Base_Page" parent="@style/FlexInput_AddContent">
         <item name="android:orientation">vertical</item>
         <item name="android:paddingLeft">2dp</item>
         <item name="android:paddingTop">2dp</item>
@@ -3119,7 +3119,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
     </style>
-    <style name="res_2131951966_flexinput_addcontent_base_tablayout" parent="@style/res_2131951963_flexinput_addcontent">
+    <style name="FlexInput_AddContent_Base_TabLayout" parent="@style/FlexInput_AddContent">
         <item name="android:gravity">clip_horizontal</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/tab_height</item>
@@ -3128,34 +3128,34 @@
         <item name="tabIndicatorColor">?attr/flexInputIconColorActivated</item>
         <item name="tabMode">1</item>
     </style>
-    <style name="res_2131951967_flexinput_addcontent_button" parent="@style/res_2131951963_flexinput_addcontent">
+    <style name="FlexInput_AddContent_Button" parent="@style/FlexInput_AddContent">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:tintMode">src_atop</item>
         <item name="android:elevation">8dp</item>
         <item name="tint">@android:color/white</item>
     </style>
-    <style name="res_2131951968_flexinput_addcontent_button_base_send" parent="@style/res_2131951967_flexinput_addcontent_button">
+    <style name="FlexInput_AddContent_Button_Base_Send" parent="@style/FlexInput_AddContent_Button">
         <item name="android:layout_marginRight">16dp</item>
         <item name="android:src">@drawable/ic_send_24dp</item>
         <item name="layout_anchorGravity">800035</item>
     </style>
-    <style name="res_2131951969_flexinput_addcontent_button_launcher" parent="@style/res_2131951967_flexinput_addcontent_button">
+    <style name="FlexInput_AddContent_Button_Launcher" parent="@style/FlexInput_AddContent_Button">
         <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:padding">16dp</item>
         <item name="android:src">@drawable/ic_launch_24dp</item>
         <item name="layout_anchorGravity">800033</item>
     </style>
-    <style name="res_2131951970_flexinput_addcontent_button_send" parent="@style/res_2131951968_flexinput_addcontent_button_base_send">
+    <style name="FlexInput_AddContent_Button_Send" parent="@style/FlexInput_AddContent_Button_Base_Send">
     </style>
-    <style name="res_2131951971_flexinput_addcontent_container_tablayout" parent="@style/res_2131951964_flexinput_addcontent_base_container_tablayout">
+    <style name="FlexInput_AddContent_Container_TabLayout" parent="@style/FlexInput_AddContent_Base_Container_TabLayout">
     </style>
-    <style name="res_2131951972_flexinput_addcontent_page" parent="@style/res_2131951965_flexinput_addcontent_base_page">
+    <style name="FlexInput_AddContent_Page" parent="@style/FlexInput_AddContent_Base_Page">
     </style>
-    <style name="res_2131951973_flexinput_addcontent_tablayout" parent="@style/res_2131951966_flexinput_addcontent_base_tablayout">
+    <style name="FlexInput_AddContent_TabLayout" parent="@style/FlexInput_AddContent_Base_TabLayout">
     </style>
-    <style name="res_2131951974_flexinput_dialogwhenlarge" parent="@style/res_2131952251_theme_appcompat_daynight_dialogwhenlarge">
+    <style name="FlexInput_DialogWhenLarge" parent="@style/res_2131952251_theme_appcompat_daynight_dialogwhenlarge">
         <item name="android:colorBackground">@android:color/transparent</item>
         <item name="android:windowAnimationStyle">@style/res_2131951628_animation_design_bottomsheetdialog</item>
         <item name="android:windowTranslucentStatus">true</item>
@@ -3163,34 +3163,34 @@
         <item name="flexInputAddContentLauncherTitle">@string/choose_an_application</item>
         <item name="flexInputDialogBackground">@android:drawable/screen_background_dark_transparent</item>
     </style>
-    <style name="res_2131951975_flexinput_input" parent="@style/FlexInput">
+    <style name="FlexInput_Input" parent="@style/FlexInput">
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
     </style>
-    <style name="res_2131951976_flexinput_input_button" parent="@style/res_2131951975_flexinput_input">
+    <style name="FlexInput_Input_Button" parent="@style/FlexInput_Input">
         <item name="android:padding">8dp</item>
         <item name="tint">@color/button_color_selector</item>
     </style>
-    <style name="res_2131951977_flexinput_input_button_camera_capture" parent="@style/res_2131951976_flexinput_input_button">
+    <style name="FlexInput_Input_Button_Camera_Capture" parent="@style/FlexInput_Input_Button">
         <item name="android:layout_marginBottom">@dimen/add_content_viewpager_bottom_margin</item>
         <item name="android:src">@drawable/ic_take_photo</item>
         <item name="android:layout_alignParentBottom">true</item>
         <item name="android:layout_centerHorizontal">true</item>
     </style>
-    <style name="res_2131951978_flexinput_input_button_camera_facing" parent="@style/res_2131951976_flexinput_input_button">
+    <style name="FlexInput_Input_Button_Camera_Facing" parent="@style/FlexInput_Input_Button">
         <item name="android:layout_margin">4dp</item>
         <item name="android:src">@drawable/ic_camera_front_white_24dp</item>
         <item name="android:layout_alignParentTop">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_alignParentEnd">true</item>
     </style>
-    <style name="res_2131951979_flexinput_input_button_camera_flash" parent="@style/res_2131951976_flexinput_input_button">
+    <style name="FlexInput_Input_Button_Camera_Flash" parent="@style/FlexInput_Input_Button">
         <item name="android:layout_margin">4dp</item>
         <item name="android:src">@drawable/ic_flash_auto_24dp</item>
         <item name="android:layout_alignParentLeft">true</item>
         <item name="android:layout_alignParentTop">true</item>
         <item name="android:layout_alignParentStart">true</item>
     </style>
-    <style name="res_2131951980_flexinput_input_button_camera_launcher" parent="@style/res_2131951976_flexinput_input_button">
+    <style name="FlexInput_Input_Button_Camera_Launcher" parent="@style/FlexInput_Input_Button">
         <item name="android:layout_marginRight">4dp</item>
         <item name="android:layout_marginBottom">@dimen/add_content_viewpager_bottom_margin</item>
         <item name="android:src">@drawable/ic_launch_24dp</item>
@@ -3199,14 +3199,14 @@
         <item name="android:layout_marginEnd">4dp</item>
         <item name="android:layout_alignParentEnd">true</item>
     </style>
-    <style name="res_2131951981_flexinput_items" parent="@style/FlexInput">
+    <style name="FlexInput_Items" parent="@style/FlexInput">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:animateLayoutChanges">true</item>
     </style>
-    <style name="res_2131951982_flexinput_items_base_file" parent="@style/res_2131951981_flexinput_items">
+    <style name="FlexInput_Items_Base_File" parent="@style/FlexInput_Items">
         <item name="android:padding">@dimen/file_item_padding</item>
     </style>
-    <style name="res_2131951983_flexinput_items_base_file_image" parent="@style/res_2131951981_flexinput_items">
+    <style name="FlexInput_Items_Base_File_Image" parent="@style/FlexInput_Items">
         <item name="android:layout_width">@dimen/file_icon_dimen</item>
         <item name="android:layout_height">@dimen/file_icon_dimen</item>
         <item name="android:scaleType">centerCrop</item>
@@ -3218,16 +3218,16 @@
         <item name="roundAsCircle">true</item>
         <item name="viewAspectRatio">1</item>
     </style>
-    <style name="res_2131951984_flexinput_items_base_file_selection" parent="@style/res_2131951982_flexinput_items_base_file">
+    <style name="FlexInput_Items_Base_File_Selection" parent="@style/FlexInput_Items_Base_File">
         <item name="android:padding">4dp</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:src">@drawable/file_item_selection_indicator_btn</item>
     </style>
-    <style name="res_2131951985_flexinput_items_base_photo" parent="@style/res_2131951981_flexinput_items">
+    <style name="FlexInput_Items_Base_Photo" parent="@style/FlexInput_Items">
         <item name="android:padding">@dimen/grid_item_padding</item>
     </style>
-    <style name="res_2131951986_flexinput_items_base_photo_image" parent="@style/res_2131951981_flexinput_items">
+    <style name="FlexInput_Items_Base_Photo_Image" parent="@style/FlexInput_Items">
         <item name="android:scaleType">fitCenter</item>
         <item name="actualImageScaleType">6</item>
         <item name="fadeDuration">@android:integer/config_shortAnimTime</item>
@@ -3235,7 +3235,7 @@
         <item name="placeholderImageScaleType">2</item>
         <item name="viewAspectRatio">1</item>
     </style>
-    <style name="res_2131951987_flexinput_items_base_photo_selection" parent="@style/res_2131951981_flexinput_items">
+    <style name="FlexInput_Items_Base_Photo_Selection" parent="@style/FlexInput_Items">
         <item name="android:layout_gravity">left|center_horizontal</item>
         <item name="android:layout_width">@dimen/selection_indicator_icon_size</item>
         <item name="android:layout_height">@dimen/selection_indicator_icon_size</item>
@@ -3248,48 +3248,48 @@
         <item name="roundingBorderColor">?attr/flexInputColorHighlight</item>
         <item name="roundingBorderWidth">4dp</item>
     </style>
-    <style name="res_2131951988_flexinput_items_file" parent="@style/res_2131951982_flexinput_items_base_file">
+    <style name="FlexInput_Items_File" parent="@style/FlexInput_Items_Base_File">
     </style>
-    <style name="res_2131951989_flexinput_items_file_image" parent="@style/res_2131951983_flexinput_items_base_file_image">
+    <style name="FlexInput_Items_File_Image" parent="@style/FlexInput_Items_Base_File_Image">
     </style>
-    <style name="res_2131951990_flexinput_items_file_name" parent="@style/res_2131951981_flexinput_items">
+    <style name="FlexInput_Items_File_Name" parent="@style/FlexInput_Items">
         <item name="android:textSize">14sp</item>
     </style>
-    <style name="res_2131951991_flexinput_items_file_selection" parent="@style/res_2131951984_flexinput_items_base_file_selection">
+    <style name="FlexInput_Items_File_Selection" parent="@style/FlexInput_Items_Base_File_Selection">
     </style>
-    <style name="res_2131951992_flexinput_items_file_subtitle" parent="@style/res_2131951981_flexinput_items">
+    <style name="FlexInput_Items_File_Subtitle" parent="@style/FlexInput_Items">
         <item name="android:textSize">10sp</item>
     </style>
-    <style name="res_2131951993_flexinput_items_photo" parent="@style/res_2131951985_flexinput_items_base_photo">
+    <style name="FlexInput_Items_Photo" parent="@style/FlexInput_Items_Base_Photo">
     </style>
-    <style name="res_2131951994_flexinput_items_photo_image" parent="@style/res_2131951986_flexinput_items_base_photo_image">
+    <style name="FlexInput_Items_Photo_Image" parent="@style/FlexInput_Items_Base_Photo_Image">
     </style>
-    <style name="res_2131951995_flexinput_items_photo_selection" parent="@style/res_2131951987_flexinput_items_base_photo_selection">
+    <style name="FlexInput_Items_Photo_Selection" parent="@style/FlexInput_Items_Base_Photo_Selection">
     </style>
-    <style name="res_2131951996_flexinput_main" parent="@style/FlexInput">
+    <style name="FlexInput_Main" parent="@style/FlexInput">
         <item name="android:background">@android:color/transparent</item>
     </style>
-    <style name="res_2131951997_friendsadd_button" parent="@style/res_2131952458_uikit_material_button">
+    <style name="FriendsAdd_Button" parent="@style/UiKit_Material_Button">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:maxLines">1</item>
     </style>
-    <style name="res_2131951998_friendslist_contactsyncupsell_card" parent="@style/res_2131952741_widget_materialcomponents_cardview">
+    <style name="FriendsList_ContactSyncUpsell_Card" parent="@style/res_2131952741_widget_materialcomponents_cardview">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="cardBackgroundColor">?attr/colorBackgroundSecondary</item>
         <item name="cardCornerRadius">8dp</item>
         <item name="cardElevation">0dp</item>
     </style>
-    <style name="res_2131951999_friendslist_emptystate_image">
+    <style name="FriendsList_EmptyState_Image">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">108dp</item>
         <item name="android:scaleType">fitCenter</item>
         <item name="android:adjustViewBounds">true</item>
     </style>
-    <style name="res_2131952000_friendslist_emptystate_subtitle" parent="@style/res_2131952563_uikit_textview">
+    <style name="FriendsList_EmptyState_Subtitle" parent="@style/UiKit_TextView">
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_width">wrap_content</item>
@@ -3297,7 +3297,7 @@
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginBottom">32dp</item>
     </style>
-    <style name="res_2131952001_friendslist_emptystate_title" parent="@style/res_2131952564_uikit_textview_bold">
+    <style name="FriendsList_EmptyState_Title" parent="@style/UiKit_TextView_Bold">
         <item name="android:textSize">@dimen/uikit_textsize_xxlarge</item>
         <item name="android:textColor">?attr/colorTextNormal</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
@@ -3306,47 +3306,47 @@
         <item name="android:layout_marginTop">32dp</item>
         <item name="android:lineSpacingMultiplier">1</item>
     </style>
-    <style name="res_2131952002_friendslist_friendsitem" parent="@style/res_2131952608_uikit_viewgroup_relativelayout">
+    <style name="FriendsList_FriendsItem" parent="@style/UiKit_ViewGroup_RelativeLayout">
         <item name="android:background">@drawable/bg_pressed_highlight_darken</item>
     </style>
-    <style name="res_2131952003_friendslist_friendsitem_actionbutton">
+    <style name="FriendsList_FriendsItem_ActionButton">
         <item name="android:background">?attr/primary_630_circle</item>
         <item name="android:padding">8dp</item>
         <item name="android:layout_width">32dp</item>
         <item name="android:layout_height">32dp</item>
         <item name="android:scaleType">fitCenter</item>
     </style>
-    <style name="res_2131952004_friendslist_friendsitem_activity" parent="@style/res_2131952563_uikit_textview">
+    <style name="FriendsList_FriendsItem_Activity" parent="@style/UiKit_TextView">
         <item name="android:textColor">?attr/colorTextMuted</item>
         <item name="android:paddingTop">2dp</item>
         <item name="android:singleLine">true</item>
     </style>
-    <style name="res_2131952005_friendslist_friendsitem_avatar" parent="@style/res_2131951678_avatar_standard">
+    <style name="FriendsList_FriendsItem_Avatar" parent="@style/Avatar_Standard">
         <item name="android:layout_width">40dp</item>
         <item name="android:layout_height">40dp</item>
         <item name="android:layout_margin">16dp</item>
         <item name="android:layout_centerVertical">true</item>
     </style>
-    <style name="res_2131952006_friendslist_friendsitem_buttonswrap" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="FriendsList_FriendsItem_ButtonsWrap" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_marginStart">16dp</item>
         <item name="android:layout_marginEnd">16dp</item>
         <item name="android:layout_alignParentEnd">true</item>
     </style>
-    <style name="res_2131952007_friendslist_friendsitem_name" parent="@style/res_2131952571_uikit_textview_large_singleline">
+    <style name="FriendsList_FriendsItem_Name" parent="@style/UiKit_TextView_Large_SingleLine">
         <item name="android:textColor">?attr/colorTextNormal</item>
     </style>
-    <style name="res_2131952008_friendslist_friendsitem_status">
+    <style name="FriendsList_FriendsItem_Status">
         <item name="android:layout_width">16dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:translationX">2dp</item>
         <item name="android:translationY">2dp</item>
     </style>
-    <style name="res_2131952009_friendslist_friendsitem_text" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="FriendsList_FriendsItem_Text" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:layout_centerVertical">true</item>
     </style>
-    <style name="res_2131952010_friendslist_itemheader">
+    <style name="FriendsList_ItemHeader">
         <item name="android:background">?attr/colorBackgroundPrimary</item>
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
@@ -3354,7 +3354,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">40dp</item>
     </style>
-    <style name="res_2131952011_friendslist_itemheader_expandbutton" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="FriendsList_ItemHeader_ExpandButton" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
@@ -3366,7 +3366,7 @@
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">false</item>
     </style>
-    <style name="res_2131952012_friendslist_itemheader_title" parent="@style/res_2131952569_uikit_textview_h6">
+    <style name="FriendsList_ItemHeader_Title" parent="@style/UiKit_TextView_H6">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:layout_gravity">top|right|center_vertical|center_horizontal|center</item>
@@ -3376,14 +3376,14 @@
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">true</item>
     </style>
-    <style name="res_2131952013_guildprofilesheet_actions_card">
+    <style name="GuildProfileSheet_Actions_Card">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="cardBackgroundColor">?attr/colorBackgroundPrimary</item>
         <item name="cardCornerRadius">8dp</item>
         <item name="cardElevation">0dp</item>
     </style>
-    <style name="res_2131952014_guildprofilesheet_actions_checkedsetting" parent="@style/res_2131952398_uikit_checkedsetting_themed">
+    <style name="GuildProfileSheet_Actions_CheckedSetting" parent="@style/UiKit_CheckedSetting_Themed">
         <item name="cs_container_background">?attr/bg_pressed_highlight</item>
         <item name="cs_subtext_color">?attr/colorTextMuted</item>
         <item name="cs_subtext_size">@dimen/uikit_textsize_small</item>
@@ -3392,23 +3392,23 @@
         <item name="cs_text_size">@dimen/uikit_textsize_large</item>
         <item name="cs_view_type">2</item>
     </style>
-    <style name="res_2131952015_guildprofilesheet_actions_title">
-        <item name="android:textAppearance">@style/res_2131952541_uikit_textappearance_semibold</item>
+    <style name="GuildProfileSheet_Actions_Title">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Semibold</item>
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:background">?attr/bg_pressed_highlight</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
-    <style name="res_2131952016_guildprofilesheet_discoverableguild_text" parent="@style/res_2131952580_uikit_textview_singleline">
+    <style name="GuildProfileSheet_DiscoverableGuild_Text" parent="@style/UiKit_TextView_SingleLine">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorTextMuted</item>
     </style>
-    <style name="res_2131952017_guildprofilesheet_emoji_item">
+    <style name="GuildProfileSheet_Emoji_Item">
         <item name="android:padding">4dp</item>
         <item name="android:layout_width">32dp</item>
         <item name="android:layout_height">32dp</item>
     </style>
-    <style name="res_2131952018_guildprofilesheet_tabitems_button" parent="@style/res_2131952471_uikit_material_button_transparent">
+    <style name="GuildProfileSheet_TabItems_Button" parent="@style/UiKit_Material_Button_Transparent">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:padding">8dp</item>
         <item name="android:layout_width">0px</item>
@@ -3419,14 +3419,14 @@
         <item name="android:windowMinWidthMinor">100%</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
-    <style name="res_2131952020_icon_game">
+    <style name="Icon_Game">
         <item name="android:layout_width">50dp</item>
         <item name="android:layout_height">50dp</item>
         <item name="placeholderImage">?attr/ic_game_icon_placeholder</item>
         <item name="placeholderImageScaleType">2</item>
         <item name="roundedCornerRadius">4dp</item>
     </style>
-    <style name="res_2131952021_icon_mentions" parent="@style/res_2131952564_uikit_textview_bold">
+    <style name="Icon_Mentions" parent="@style/UiKit_TextView_Bold">
         <item name="android:textSize">10dp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
@@ -3436,7 +3436,7 @@
         <item name="android:singleLine">true</item>
         <item name="android:lineSpacingMultiplier">1</item>
     </style>
-    <style name="res_2131952022_icon_mentions_call" parent="@style/res_2131952021_icon_mentions">
+    <style name="Icon_Mentions_Call" parent="@style/Icon_Mentions">
         <item name="android:background">@drawable/drawable_circle_red</item>
         <item name="android:paddingLeft">2dp</item>
         <item name="android:paddingRight">2dp</item>
@@ -3444,36 +3444,36 @@
         <item name="android:minWidth">16dp</item>
         <item name="android:outlineProvider">none</item>
     </style>
-    <style name="res_2131952023_icon_mentions_large" parent="@style/res_2131952021_icon_mentions">
+    <style name="Icon_Mentions_Large" parent="@style/Icon_Mentions">
         <item name="android:textSize">12dp</item>
         <item name="android:layout_width">20dp</item>
         <item name="android:layout_height">20dp</item>
     </style>
-    <style name="res_2131952024_markdown_header1" parent="@style/res_2131952165_textappearance_appcompat_large">
+    <style name="Markdown_Header1" parent="@style/res_2131952165_textappearance_appcompat_large">
         <item name="android:textSize">@dimen/markdown_header_1_textsize</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">?attr/primary_100</item>
         <item name="android:textAllCaps">true</item>
     </style>
-    <style name="res_2131952025_markdown_header1_added" parent="@style/res_2131952024_markdown_header1">
+    <style name="Markdown_Header1_Added" parent="@style/Markdown_Header1">
         <item name="android:textColor">@color/status_green_600</item>
     </style>
-    <style name="res_2131952026_markdown_header1_changelogspecial" parent="@style/res_2131952165_textappearance_appcompat_large">
+    <style name="Markdown_Header1_ChangelogSpecial" parent="@style/res_2131952165_textappearance_appcompat_large">
         <item name="android:textSize">@dimen/uikit_textsize_xxlarge</item>
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">?attr/font_display_bold</item>
     </style>
-    <style name="res_2131952027_markdown_header1_fixed" parent="@style/res_2131952024_markdown_header1">
+    <style name="Markdown_Header1_Fixed" parent="@style/Markdown_Header1">
         <item name="android:textColor">@color/status_red_500</item>
     </style>
-    <style name="res_2131952028_markdown_header1_improved" parent="@style/res_2131952024_markdown_header1">
+    <style name="Markdown_Header1_Improved" parent="@style/Markdown_Header1">
         <item name="android:textColor">?attr/color_brand_500</item>
     </style>
-    <style name="res_2131952029_markdown_header1_progress" parent="@style/res_2131952024_markdown_header1">
+    <style name="Markdown_Header1_Progress" parent="@style/Markdown_Header1">
         <item name="android:textColor">@color/status_yellow_500</item>
     </style>
-    <style name="res_2131952030_markdown_header4" parent="@style/res_2131952165_textappearance_appcompat_large">
+    <style name="Markdown_Header4" parent="@style/res_2131952165_textappearance_appcompat_large">
         <item name="android:textSize">@dimen/markdown_header_4_textsize</item>
         <item name="android:textStyle">italic</item>
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
@@ -3534,7 +3534,7 @@
         <item name="android:layout_gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:textAlignment">center</item>
     </style>
-    <style name="res_2131952041_mutesettings_row">
+    <style name="MuteSettings_Row">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:layout_width">match_parent</item>
@@ -3542,34 +3542,34 @@
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
     </style>
-    <style name="res_2131952042_mutesettings_row_subtitle" parent="@style/res_2131952041_mutesettings_row">
-        <item name="android:textAppearance">@style/res_2131952044_mutesettings_subtitletextappearance</item>
+    <style name="MuteSettings_Row_Subtitle" parent="@style/MuteSettings_Row">
+        <item name="android:textAppearance">@style/MuteSettings_SubtitleTextAppearance</item>
         <item name="android:paddingBottom">16dp</item>
     </style>
-    <style name="res_2131952043_mutesettings_row_title" parent="@style/res_2131952041_mutesettings_row">
-        <item name="android:textAppearance">@style/res_2131952045_mutesettings_titletextappearance</item>
+    <style name="MuteSettings_Row_Title" parent="@style/MuteSettings_Row">
+        <item name="android:textAppearance">@style/MuteSettings_TitleTextAppearance</item>
         <item name="android:paddingTop">16dp</item>
     </style>
-    <style name="res_2131952044_mutesettings_subtitletextappearance" parent="@style/res_2131952154_textappearance_appcompat">
+    <style name="MuteSettings_SubtitleTextAppearance" parent="@style/res_2131952154_textappearance_appcompat">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorTextMuted</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">?attr/font_primary_semibold</item>
     </style>
-    <style name="res_2131952045_mutesettings_titletextappearance" parent="@style/res_2131952154_textappearance_appcompat">
+    <style name="MuteSettings_TitleTextAppearance" parent="@style/res_2131952154_textappearance_appcompat">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">?attr/font_primary_semibold</item>
     </style>
-    <style name="res_2131952046_nux_guildtemplates_card" parent="@style/res_2131952741_widget_materialcomponents_cardview">
+    <style name="Nux_GuildTemplates_Card" parent="@style/res_2131952741_widget_materialcomponents_cardview">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="cardBackgroundColor">?attr/colorBackgroundSecondaryAlt</item>
         <item name="cardCornerRadius">8dp</item>
         <item name="cardElevation">0dp</item>
     </style>
-    <style name="res_2131952047_nux_guildtemplates_card_action" parent="@style/res_2131952564_uikit_textview_bold">
+    <style name="Nux_GuildTemplates_Card_Action" parent="@style/UiKit_TextView_Bold">
         <item name="android:textSize">16sp</item>
         <item name="android:gravity">clip_horizontal</item>
         <item name="android:paddingLeft">16dp</item>
@@ -3579,12 +3579,12 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:drawablePadding">16dp</item>
     </style>
-    <style name="res_2131952048_overlay_dialog" parent="@style/res_2131952589_uikit_viewgroup">
-        <item name="android:theme">@style/res_2131951648_apptheme_dark</item>
+    <style name="Overlay_Dialog" parent="@style/UiKit_ViewGroup">
+        <item name="android:theme">@style/AppTheme_Dark</item>
         <item name="cardBackgroundColor">@color/primary_630</item>
         <item name="cardCornerRadius">8dp</item>
     </style>
-    <style name="res_2131952049_overlay_dialog_constrained" parent="@style/res_2131952048_overlay_dialog">
+    <style name="Overlay_Dialog_Constrained" parent="@style/Overlay_Dialog">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">400dp</item>
     </style>
@@ -3855,8 +3855,8 @@
         <item name="android:paddingStart">@dimen/abc_action_bar_overflow_padding_start_material</item>
         <item name="android:paddingEnd">@dimen/abc_action_bar_overflow_padding_end_material</item>
     </style>
-    <style name="SegmentedControlTab" parent="@style/res_2131952563_uikit_textview">
-        <item name="android:textAppearance">@style/res_2131952541_uikit_textappearance_semibold</item>
+    <style name="SegmentedControlTab" parent="@style/UiKit_TextView">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Semibold</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_width">match_parent</item>
     </style>
@@ -3869,7 +3869,7 @@
         <item name="cardElevation">0dp</item>
         <item name="strokeWidth">0dp</item>
     </style>
-    <style name="res_2131952114_settings_floatingactionbutton">
+    <style name="Settings_FloatingActionButton">
         <item name="android:layout_gravity">top|left|right|center_vertical|center_horizontal|fill_horizontal|center</item>
         <item name="android:paddingLeft">@dimen/settings_option_padding</item>
         <item name="android:paddingRight">@dimen/settings_option_padding</item>
@@ -3885,7 +3885,7 @@
         <item name="fabSize">@null</item>
         <item name="tint">@color/white</item>
     </style>
-    <style name="res_2131952115_settings_floatingactionbutton_save" parent="@style/res_2131952114_settings_floatingactionbutton">
+    <style name="Settings_FloatingActionButton_Save" parent="@style/Settings_FloatingActionButton">
         <item name="android:visibility">gone</item>
         <item name="android:src">@drawable/icon_save</item>
     </style>
@@ -3955,18 +3955,18 @@
     <style name="res_2131952136_shapeappearanceoverlay_toprightdifferentcornersize" parent="@style/ShapeAppearanceOverlay">
         <item name="cornerSizeTopRight">20px</item>
     </style>
-    <style name="res_2131952137_stage_section_headertextappearance" parent="@style/res_2131952154_textappearance_appcompat">
+    <style name="Stage_Section_HeaderTextAppearance" parent="@style/res_2131952154_textappearance_appcompat">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:fontFamily">?attr/font_primary_semibold</item>
     </style>
-    <style name="res_2131952138_startcallsheet_item" parent="@style/res_2131952453_uikit_listitem_icon">
+    <style name="StartCallSheet_Item" parent="@style/UiKit_ListItem_Icon">
         <item name="android:textColor">?attr/colorInteractiveNormal</item>
         <item name="android:background">@drawable/bg_pressed_highlight_darken</item>
         <item name="drawableTint">?attr/colorInteractiveNormal</item>
     </style>
-    <style name="TabsHostBottomNavIcon" parent="@style/res_2131952448_uikit_imageview">
+    <style name="TabsHostBottomNavIcon" parent="@style/UiKit_ImageView">
         <item name="android:layout_gravity">left|center_horizontal|clip_horizontal</item>
         <item name="tint">?attr/colorInteractiveNormal</item>
     </style>
@@ -3985,7 +3985,7 @@
         <item name="android:layout_weight">1</item>
     </style>
     <style name="TabsHostBottomNavNotificationBadge">
-        <item name="android:textAppearance">@style/res_2131952534_uikit_textappearance_bold</item>
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Bold</item>
         <item name="android:textSize">10dp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
@@ -4205,7 +4205,7 @@
         <item name="android:textColor">@color/mtrl_tabs_legacy_text_color_selector</item>
         <item name="textAllCaps">true</item>
     </style>
-    <style name="res_2131952223_textappearance_error" parent="@style/res_2131952215_textappearance_design_error">
+    <style name="TextAppearance_Error" parent="@style/res_2131952215_textappearance_design_error">
         <item name="android:textColor">@color/status_red_500</item>
     </style>
     <style name="res_2131952224_textappearance_materialcomponents_badge" parent="@style/res_2131951736_base_textappearance_materialcomponents_badge">
@@ -4713,7 +4713,7 @@
     <style name="ThemeOverlayColorAccentRed">
         <item name="android:colorAccent">#ffff0000</item>
     </style>
-    <style name="res_2131952371_threadbrowser_verticalcenter">
+    <style name="ThreadBrowser_VerticalCenter">
         <item name="android:layout_marginBottom">128dp</item>
     </style>
     <style name="TooltipDefaultContainer">
@@ -4721,8 +4721,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:elevation">16dp</item>
     </style>
-    <style name="TooltipDefaultText" parent="@style/res_2131952563_uikit_textview">
-        <item name="android:textAppearance">@style/res_2131952534_uikit_textappearance_bold</item>
+    <style name="TooltipDefaultText" parent="@style/UiKit_TextView">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Bold</item>
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/rounded_rectangle_4dp_radius</item>
@@ -4735,47 +4735,47 @@
     </style>
     <style name="UiKit">
     </style>
-    <style name="res_2131952375_uikit_alert_verify_account_method" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_Alert_Verify_Account_Method" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:background">?attr/primary_700_bg</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">100dp</item>
         <item name="android:layout_alignParentBottom">true</item>
     </style>
-    <style name="res_2131952376_uikit_alert_verify_account_method_container" parent="@style/res_2131952608_uikit_viewgroup_relativelayout">
+    <style name="UiKit_Alert_Verify_Account_Method_Container" parent="@style/UiKit_ViewGroup_RelativeLayout">
         <item name="android:layout_width">138dp</item>
         <item name="android:layout_height">138dp</item>
         <item name="android:layout_marginLeft">8dp</item>
         <item name="android:layout_marginRight">8dp</item>
     </style>
-    <style name="res_2131952377_uikit_alert_verify_account_method_wrapper" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="UiKit_Alert_Verify_Account_Method_Wrapper" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <item name="android:gravity">center_horizontal</item>
         <item name="android:layout_marginTop">40dp</item>
     </style>
-    <style name="res_2131952378_uikit_anim_verify_by_email" parent="@style/res_2131952457_uikit_lottieanimationview">
+    <style name="UiKit_Anim_Verify_By_Email" parent="@style/UiKit_LottieAnimationView">
         <item name="android:layout_width">300dp</item>
         <item name="android:layout_height">186dp</item>
         <item name="lottie_fileName">animations/anim_verify_by_email.json</item>
     </style>
-    <style name="res_2131952379_uikit_anim_verify_by_email_frozen" parent="@style/res_2131952378_uikit_anim_verify_by_email">
+    <style name="UiKit_Anim_Verify_By_Email_Frozen" parent="@style/UiKit_Anim_Verify_By_Email">
         <item name="lottie_autoPlay">false</item>
     </style>
-    <style name="res_2131952380_uikit_anim_verify_by_phone" parent="@style/res_2131952457_uikit_lottieanimationview">
+    <style name="UiKit_Anim_Verify_By_Phone" parent="@style/UiKit_LottieAnimationView">
         <item name="android:layout_width">152dp</item>
         <item name="android:layout_height">163dp</item>
         <item name="lottie_fileName">animations/anim_verify_by_phone.json</item>
     </style>
-    <style name="res_2131952381_uikit_auth_note_rotatable" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_Auth_Note_Rotatable" parent="@style/UiKit_TextView">
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">16dp</item>
     </style>
-    <style name="res_2131952382_uikit_authbutton_material" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_AuthButton_Material" parent="@style/UiKit_Material_Button">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:stateListAnimator">@null</item>
     </style>
-    <style name="res_2131952383_uikit_authcopycontainer" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_AuthCopyContainer" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_width">wrap_content</item>
@@ -4783,27 +4783,27 @@
         <item name="android:layout_marginLeft">16dp</item>
         <item name="android:layout_marginRight">16dp</item>
     </style>
-    <style name="res_2131952384_uikit_calls_buttoncircle" parent="@style/res_2131952449_uikit_imageview_clickable">
+    <style name="UiKit_Calls_ButtonCircle" parent="@style/UiKit_ImageView_Clickable">
         <item name="android:background">@drawable/ripple_circle_black</item>
         <item name="android:layout_width">60dp</item>
         <item name="android:layout_height">60dp</item>
         <item name="android:scaleType">center</item>
         <item name="android:textAllCaps">true</item>
     </style>
-    <style name="res_2131952385_uikit_calls_buttoncircle_red" parent="@style/res_2131952384_uikit_calls_buttoncircle">
+    <style name="UiKit_Calls_ButtonCircle_Red" parent="@style/UiKit_Calls_ButtonCircle">
         <item name="android:background">@drawable/ripple_circle_red</item>
     </style>
-    <style name="res_2131952386_uikit_calls_buttonpill" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_Calls_ButtonPill" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textSize">14sp</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">60dp</item>
     </style>
-    <style name="res_2131952387_uikit_calls_buttonpill_red" parent="@style/res_2131952386_uikit_calls_buttonpill">
+    <style name="UiKit_Calls_ButtonPill_Red" parent="@style/UiKit_Calls_ButtonPill">
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/ripple_pill_red</item>
     </style>
-    <style name="res_2131952388_uikit_chat_embed_cardview" parent="@style/res_2131952741_widget_materialcomponents_cardview">
+    <style name="UiKit_Chat_Embed_CardView" parent="@style/res_2131952741_widget_materialcomponents_cardview">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="cardBackgroundColor">?attr/colorBackgroundSecondary</item>
@@ -4813,7 +4813,7 @@
         <item name="strokeColor">?attr/primary_700_alpha_60</item>
         <item name="strokeWidth">@dimen/chat_embed_card_stroke_width</item>
     </style>
-    <style name="res_2131952389_uikit_chat_embed_container" parent="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <style name="UiKit_Chat_Embed_Container" parent="@style/UiKit_ViewGroup_ConstraintLayout">
         <item name="android:background">?attr/chat_embed_bg</item>
         <item name="android:layout_marginLeft">@dimen/uikit_guideline_chat</item>
         <item name="android:layout_marginTop">@dimen/chat_cell_vertical_spacing_padding</item>
@@ -4825,7 +4825,7 @@
         <item name="android:layout_marginEnd">@dimen/chat_cell_horizontal_spacing_total</item>
         <item name="android:elevation">4dp</item>
     </style>
-    <style name="res_2131952390_uikit_chat_embed_footer" parent="@style/res_2131952564_uikit_textview_bold">
+    <style name="UiKit_Chat_Embed_Footer" parent="@style/UiKit_TextView_Bold">
         <item name="android:textColor">?attr/primary_100</item>
         <item name="android:layout_marginRight">16dp</item>
         <item name="android:layout_marginBottom">16dp</item>
@@ -4834,7 +4834,7 @@
         <item name="layout_constraintEnd_toEndOf">@null</item>
         <item name="layout_constraintRight_toRightOf">@null</item>
     </style>
-    <style name="res_2131952391_uikit_chat_embed_header" parent="@style/res_2131952564_uikit_textview_bold">
+    <style name="UiKit_Chat_Embed_Header" parent="@style/UiKit_TextView_Bold">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:layout_marginLeft">16dp</item>
@@ -4848,20 +4848,20 @@
         <item name="layout_constraintStart_toStartOf">@null</item>
         <item name="layout_constraintTop_toTopOf">@null</item>
     </style>
-    <style name="res_2131952392_uikit_chat_embed_subtext" parent="@style/res_2131952581_uikit_textview_subtext">
+    <style name="UiKit_Chat_Embed_Subtext" parent="@style/UiKit_TextView_Subtext">
         <item name="android:textColor">?attr/primary_300</item>
     </style>
-    <style name="res_2131952393_uikit_chat_guideline" parent="@style/res_2131952421_uikit_guideline">
+    <style name="UiKit_Chat_Guideline" parent="@style/UiKit_Guideline">
         <item name="android:id">@id/uikit_chat_guideline</item>
         <item name="layout_constraintGuide_begin">@dimen/uikit_guideline_chat</item>
     </style>
-    <style name="res_2131952394_uikit_chat_text" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_Chat_Text" parent="@style/UiKit_TextView">
         <item name="android:textSize">13.75sp</item>
         <item name="android:textColor">?attr/colorTextNormal</item>
         <item name="android:minHeight">19dp</item>
         <item name="android:lineSpacingMultiplier">1.1</item>
     </style>
-    <style name="res_2131952395_uikit_checkableimageview">
+    <style name="UiKit_CheckableImageView">
         <item name="android:padding">5dp</item>
         <item name="android:focusable">true</item>
         <item name="android:clickable">true</item>
@@ -4869,7 +4869,7 @@
         <item name="android:layout_height">32dp</item>
         <item name="android:checked">false</item>
     </style>
-    <style name="res_2131952396_uikit_checkbox">
+    <style name="UiKit_Checkbox">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/primary_100</item>
         <item name="android:paddingLeft">8dp</item>
@@ -4880,7 +4880,7 @@
         <item name="android:paddingStart">8dp</item>
         <item name="buttonTint">?attr/primary_100</item>
     </style>
-    <style name="res_2131952397_uikit_checkedsetting">
+    <style name="UiKit_CheckedSetting">
         <item name="android:background">?attr/selectableItemBackground</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -4889,14 +4889,14 @@
         <item name="cs_background">?attr/selectableItemBackground</item>
         <item name="cs_text_fontpath">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131952398_uikit_checkedsetting_themed" parent="@style/res_2131952397_uikit_checkedsetting">
+    <style name="UiKit_CheckedSetting_Themed" parent="@style/UiKit_CheckedSetting">
         <item name="cs_subtext_color">?attr/primary_300</item>
         <item name="cs_subtext_size">@dimen/uikit_textsize_medium</item>
         <item name="cs_text_color">?attr/primary_100</item>
         <item name="cs_text_size">@dimen/uikit_textsize_large</item>
     </style>
-    <style name="res_2131952399_uikit_chip" parent="@style/res_2131952743_widget_materialcomponents_chip_action">
-        <item name="android:textAppearance">@style/res_2131952533_uikit_textappearance</item>
+    <style name="UiKit_Chip" parent="@style/res_2131952743_widget_materialcomponents_chip_action">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="android:paddingTop">2dp</item>
         <item name="android:paddingBottom">2dp</item>
@@ -4912,8 +4912,8 @@
         <item name="chipStartPadding">4dp</item>
         <item name="ensureMinTouchTargetSize">false</item>
     </style>
-    <style name="res_2131952400_uikit_chip_limited" parent="@style/res_2131952743_widget_materialcomponents_chip_action">
-        <item name="android:textAppearance">@style/res_2131952533_uikit_textappearance</item>
+    <style name="UiKit_Chip_Limited" parent="@style/res_2131952743_widget_materialcomponents_chip_action">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance</item>
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="android:paddingTop">0dp</item>
@@ -4932,7 +4932,7 @@
         <item name="chipStartPadding">6dp</item>
         <item name="ensureMinTouchTargetSize">false</item>
     </style>
-    <style name="res_2131952401_uikit_chip_new" parent="@style/res_2131952400_uikit_chip_limited">
+    <style name="UiKit_Chip_New" parent="@style/UiKit_Chip_Limited">
         <item name="android:textSize">9sp</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="chipBackgroundColor">@color/status_red_500</item>
@@ -4943,40 +4943,40 @@
         <item name="chipStartPadding">0dp</item>
         <item name="textAllCaps">true</item>
     </style>
-    <style name="res_2131952402_uikit_copy" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_Copy" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:padding">20dp</item>
     </style>
-    <style name="res_2131952403_uikit_copy_anchor" parent="@style/res_2131952404_uikit_copy_anchor_base">
+    <style name="UiKit_Copy_Anchor" parent="@style/UiKit_Copy_Anchor_Base">
     </style>
-    <style name="res_2131952404_uikit_copy_anchor_base" parent="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
+    <style name="UiKit_Copy_Anchor_Base" parent="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
         <item name="android:paddingLeft">20dp</item>
         <item name="android:paddingRight">20dp</item>
         <item name="android:paddingBottom">20dp</item>
         <item name="android:layout_alignParentBottom">true</item>
     </style>
-    <style name="res_2131952405_uikit_copy_anchor_item_rotatable" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_Copy_Anchor_Item_Rotatable" parent="@style/UiKit_ViewGroup">
     </style>
-    <style name="res_2131952406_uikit_copy_container" parent="@style/res_2131952597_uikit_viewgroup_linearlayout_rotatable">
+    <style name="UiKit_Copy_Container" parent="@style/UiKit_ViewGroup_LinearLayout_Rotatable">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_gravity">left|center_horizontal|clip_horizontal</item>
     </style>
-    <style name="res_2131952407_uikit_dialog_animation" parent="@style/UiKit">
+    <style name="UiKit_Dialog_Animation" parent="@style/UiKit">
         <item name="android:windowEnterAnimation">@anim/activity_slide_horizontal_open_in</item>
         <item name="android:windowExitAnimation">@anim/activity_slide_horizontal_close_out</item>
     </style>
-    <style name="res_2131952408_uikit_dialog_body" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_Dialog_Body" parent="@style/UiKit_TextView">
         <item name="android:paddingLeft">@dimen/dialog_padding_horiz</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingRight">@dimen/dialog_padding_horiz</item>
         <item name="android:paddingBottom">4dp</item>
         <item name="android:lineSpacingMultiplier">1</item>
     </style>
-    <style name="res_2131952409_uikit_dialog_button" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_Dialog_Button" parent="@style/UiKit_Material_Button">
         <item name="android:paddingTop">11dp</item>
         <item name="android:paddingBottom">11dp</item>
     </style>
-    <style name="res_2131952410_uikit_dialog_buttoncontainer" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="UiKit_Dialog_ButtonContainer" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
         <item name="android:gravity">right|center_horizontal</item>
         <item name="android:background">?attr/primary_630</item>
         <item name="android:paddingLeft">8dp</item>
@@ -4984,15 +4984,15 @@
         <item name="android:paddingRight">8dp</item>
         <item name="android:paddingBottom">8dp</item>
     </style>
-    <style name="res_2131952411_uikit_dialog_container" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_Dialog_Container" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:background">?attr/colorBackgroundPrimary</item>
     </style>
-    <style name="res_2131952412_uikit_dialog_subtitle" parent="@style/res_2131952414_uikit_dialog_title">
+    <style name="UiKit_Dialog_Subtitle" parent="@style/UiKit_Dialog_Title">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:layout_marginTop">@dimen/dialog_subtitle_padding_top</item>
     </style>
-    <style name="res_2131952413_uikit_dialog_textview_dismiss" parent="@style/res_2131952541_uikit_textappearance_semibold">
+    <style name="UiKit_Dialog_TextView_Dismiss" parent="@style/UiKit_TextAppearance_Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/colorTextNormal</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
@@ -5003,7 +5003,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textAlignment">center</item>
     </style>
-    <style name="res_2131952414_uikit_dialog_title" parent="@style/res_2131952564_uikit_textview_bold">
+    <style name="UiKit_Dialog_Title" parent="@style/UiKit_TextView_Bold">
         <item name="android:textSize">@dimen/uikit_textsize_xlarge</item>
         <item name="android:textColor">?attr/primary_100</item>
         <item name="android:paddingLeft">@dimen/dialog_padding_horiz</item>
@@ -5013,7 +5013,7 @@
         <item name="android:layout_marginTop">@dimen/dialog_title_padding_top</item>
         <item name="android:textAllCaps">true</item>
     </style>
-    <style name="res_2131952415_uikit_dimmerview" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_DimmerView" parent="@style/UiKit_ViewGroup">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:id">@id/dimmer_view</item>
         <item name="android:background">@color/black_alpha_80</item>
@@ -5021,22 +5021,22 @@
         <item name="android:layout_height">match_parent</item>
         <item name="android:alpha">@null</item>
     </style>
-    <style name="res_2131952416_uikit_divider">
+    <style name="UiKit_Divider">
         <item name="android:background">?attr/colorPrimaryDivider</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">0.25dp</item>
     </style>
-    <style name="res_2131952417_uikit_divider_thick" parent="@style/res_2131952416_uikit_divider">
+    <style name="UiKit_Divider_Thick" parent="@style/UiKit_Divider">
         <item name="android:layout_height">1dp</item>
     </style>
-    <style name="res_2131952418_uikit_divider_vertical">
+    <style name="UiKit_Divider_Vertical">
         <item name="android:background">?attr/colorPrimaryDivider</item>
         <item name="android:layout_width">0.5dp</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_marginLeft">8dp</item>
         <item name="android:layout_marginRight">8dp</item>
     </style>
-    <style name="res_2131952419_uikit_form_label" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_Form_Label" parent="@style/UiKit_TextView">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/primary_200</item>
         <item name="android:gravity">left</item>
@@ -5045,49 +5045,49 @@
         <item name="android:paddingTop">8dp</item>
         <item name="android:paddingRight">8dp</item>
     </style>
-    <style name="res_2131952420_uikit_giftembeddisabledbutton" parent="@style/res_2131952467_uikit_material_button_secondary">
+    <style name="UiKit_GiftEmbedDisabledButton" parent="@style/UiKit_Material_Button_Secondary">
         <item name="android:enabled">false</item>
         <item name="android:textColor">?attr/gift_embed_disabled_button_text_color</item>
         <item name="android:backgroundTint">?attr/primary_600</item>
     </style>
-    <style name="res_2131952421_uikit_guideline" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_Guideline" parent="@style/UiKit_ViewGroup">
         <item name="android:orientation">vertical</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
-    <style name="res_2131952422_uikit_guildsubscriptionrole" parent="@style/UiKit">
+    <style name="UiKit_GuildSubscriptionRole" parent="@style/UiKit">
     </style>
-    <style name="res_2131952423_uikit_guildsubscriptionrole_setup" parent="@style/res_2131952422_uikit_guildsubscriptionrole">
+    <style name="UiKit_GuildSubscriptionRole_Setup" parent="@style/UiKit_GuildSubscriptionRole">
     </style>
-    <style name="res_2131952424_uikit_guildsubscriptionrole_setup_inputlayout" parent="@style/res_2131952558_uikit_textinputlayout_primary">
+    <style name="UiKit_GuildSubscriptionRole_Setup_InputLayout" parent="@style/UiKit_TextInputLayout_Primary">
         <item name="android:layout_marginTop">8dp</item>
         <item name="boxBackgroundColor">?attr/colorBackgroundSecondary</item>
     </style>
-    <style name="res_2131952425_uikit_guildsubscriptionrole_setup_label" parent="@style/res_2131952569_uikit_textview_h6">
+    <style name="UiKit_GuildSubscriptionRole_Setup_Label" parent="@style/UiKit_TextView_H6">
         <item name="android:textColor">?attr/colorInteractiveNormal</item>
         <item name="android:paddingStart">@dimen/guild_role_subscription_setup_default_padding</item>
         <item name="android:paddingEnd">@dimen/guild_role_subscription_setup_default_padding</item>
     </style>
-    <style name="res_2131952426_uikit_guildsubscriptionrole_setup_subtitle" parent="@style/res_2131952574_uikit_textview_medium">
+    <style name="UiKit_GuildSubscriptionRole_Setup_Subtitle" parent="@style/UiKit_TextView_Medium">
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:paddingStart">@dimen/guild_role_subscription_setup_default_padding</item>
         <item name="android:paddingEnd">@dimen/guild_role_subscription_setup_default_padding</item>
     </style>
-    <style name="res_2131952427_uikit_guildsubscriptionrole_setup_title" parent="@style/res_2131952566_uikit_textview_h1_bold">
+    <style name="UiKit_GuildSubscriptionRole_Setup_Title" parent="@style/UiKit_TextView_H1_Bold">
         <item name="android:textSize">@dimen/uikit_textsize_xxlarge</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:paddingStart">@dimen/guild_role_subscription_setup_default_padding</item>
         <item name="android:paddingEnd">@dimen/guild_role_subscription_setup_default_padding</item>
     </style>
-    <style name="res_2131952428_uikit_guildslist" parent="@style/res_2131952605_uikit_viewgroup_recyclerview">
+    <style name="UiKit_GuildsList" parent="@style/UiKit_ViewGroup_RecyclerView">
         <item name="android:scrollbars">@null</item>
         <item name="android:layout_width">@dimen/guild_list_size</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:overScrollMode">never</item>
     </style>
-    <style name="res_2131952429_uikit_guildslist_horiz" parent="@style/res_2131952607_uikit_viewgroup_recyclerview_horizontal">
+    <style name="UiKit_GuildsList_Horiz" parent="@style/UiKit_ViewGroup_RecyclerView_Horizontal">
         <item name="android:paddingLeft">@dimen/guild_item_spacing</item>
         <item name="android:paddingRight">@dimen/guild_item_spacing</item>
         <item name="android:scrollbars">@null</item>
@@ -5095,21 +5095,21 @@
         <item name="android:layout_height">@dimen/guild_list_size</item>
         <item name="android:overScrollMode">never</item>
     </style>
-    <style name="res_2131952430_uikit_guildslistapplicationstatus" parent="@style/res_2131952432_uikit_guildslistbadge">
+    <style name="UiKit_GuildsListApplicationStatus" parent="@style/UiKit_GuildsListBadge">
         <item name="android:background">?attr/drawable_circle_guild_badge_active</item>
         <item name="android:scaleType">center</item>
     </style>
-    <style name="res_2131952431_uikit_guildslistapplicationstreamicon" parent="@style/res_2131952432_uikit_guildslistbadge">
+    <style name="UiKit_GuildsListApplicationStreamIcon" parent="@style/UiKit_GuildsListBadge">
         <item name="android:background">?attr/drawable_circle_guild_badge_inactive</item>
         <item name="android:src">@drawable/ic_monitor_white_24dp</item>
     </style>
-    <style name="res_2131952432_uikit_guildslistbadge" parent="@style/res_2131952448_uikit_imageview">
+    <style name="UiKit_GuildsListBadge" parent="@style/UiKit_ImageView">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:padding">2dp</item>
         <item name="android:layout_width">16dp</item>
         <item name="android:layout_height">16dp</item>
     </style>
-    <style name="res_2131952433_uikit_guildslistdividericon" parent="@style/UiKit">
+    <style name="UiKit_GuildsListDividerIcon" parent="@style/UiKit">
         <item name="android:layout_gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:background">?attr/colorPrimaryDivider</item>
         <item name="android:layout_width">32dp</item>
@@ -5117,7 +5117,7 @@
         <item name="android:layout_marginTop">4dp</item>
         <item name="android:layout_marginBottom">4dp</item>
     </style>
-    <style name="res_2131952434_uikit_guildslistdividericonhoriz" parent="@style/UiKit">
+    <style name="UiKit_GuildsListDividerIconHoriz" parent="@style/UiKit">
         <item name="android:layout_gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:background">@color/white_alpha_20</item>
         <item name="android:layout_width">2dp</item>
@@ -5125,34 +5125,34 @@
         <item name="android:layout_marginLeft">4dp</item>
         <item name="android:layout_marginRight">4dp</item>
     </style>
-    <style name="res_2131952435_uikit_guildslisticon" parent="@style/res_2131951674_avatar_large">
+    <style name="UiKit_GuildsListIcon" parent="@style/Avatar_Large">
         <item name="android:layout_centerInParent">true</item>
         <item name="overlayImage">@null</item>
     </style>
-    <style name="res_2131952436_uikit_guildslistitem" parent="@style/res_2131952608_uikit_viewgroup_relativelayout">
+    <style name="UiKit_GuildsListItem" parent="@style/UiKit_ViewGroup_RelativeLayout">
         <item name="android:clipChildren">false</item>
         <item name="android:layout_width">@dimen/guild_list_size</item>
         <item name="android:layout_height">@dimen/guild_item_size</item>
     </style>
-    <style name="res_2131952437_uikit_guildslistitem_wrap" parent="@style/res_2131952436_uikit_guildslistitem">
+    <style name="UiKit_GuildsListItem_Wrap" parent="@style/UiKit_GuildsListItem">
         <item name="android:layout_height">wrap_content</item>
     </style>
-    <style name="res_2131952438_uikit_guildslistitemhoriz" parent="@style/res_2131952608_uikit_viewgroup_relativelayout">
+    <style name="UiKit_GuildsListItemHoriz" parent="@style/UiKit_ViewGroup_RelativeLayout">
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:clipChildren">false</item>
         <item name="android:layout_width">@dimen/guild_item_size</item>
         <item name="android:layout_height">@dimen/guild_list_size</item>
     </style>
-    <style name="res_2131952439_uikit_guildslistitemhoriz_wrap" parent="@style/res_2131952438_uikit_guildslistitemhoriz">
+    <style name="UiKit_GuildsListItemHoriz_Wrap" parent="@style/UiKit_GuildsListItemHoriz">
         <item name="android:layout_width">wrap_content</item>
     </style>
-    <style name="res_2131952440_uikit_guildslistmentions" parent="@style/res_2131952021_icon_mentions">
+    <style name="UiKit_GuildsListMentions" parent="@style/Icon_Mentions">
         <item name="android:textSize">10dp</item>
         <item name="android:background">?attr/drawable_overlay_guild_mentions</item>
         <item name="android:layout_width">16dp</item>
         <item name="android:layout_height">16dp</item>
     </style>
-    <style name="res_2131952441_uikit_guildslistselected" parent="@style/UiKit">
+    <style name="UiKit_GuildsListSelected" parent="@style/UiKit">
         <item name="android:layout_width">4.5dp</item>
         <item name="android:layout_height">34dp</item>
         <item name="android:src">@drawable/drawable_rect_guild_selected</item>
@@ -5161,36 +5161,36 @@
         <item name="android:layout_alignParentStart">true</item>
         <item name="tint">?attr/colorInteractiveActive</item>
     </style>
-    <style name="res_2131952442_uikit_guildslistselectedhoriz" parent="@style/UiKit">
+    <style name="UiKit_GuildsListSelectedHoriz" parent="@style/UiKit">
         <item name="android:background">@drawable/drawable_rect_guild_selected_horiz</item>
         <item name="android:layout_width">34dp</item>
         <item name="android:layout_height">4.5dp</item>
         <item name="android:layout_alignParentBottom">true</item>
         <item name="android:layout_centerHorizontal">true</item>
     </style>
-    <style name="res_2131952443_uikit_guildslistunavailable" parent="@style/res_2131952436_uikit_guildslistitem">
+    <style name="UiKit_GuildsListUnavailable" parent="@style/UiKit_GuildsListItem">
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:src">@drawable/ic_unavailable_server_46dp</item>
         <item name="android:scaleType">center</item>
     </style>
-    <style name="res_2131952444_uikit_guildslistunread" parent="@style/res_2131952448_uikit_imageview">
+    <style name="UiKit_GuildsListUnread" parent="@style/UiKit_ImageView">
         <item name="android:src">@drawable/ic_unread_white_9dp</item>
         <item name="android:layout_alignParentLeft">true</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_alignParentStart">true</item>
         <item name="tint">?attr/colorInteractiveActive</item>
     </style>
-    <style name="res_2131952445_uikit_guildslistunreadhoriz" parent="@style/res_2131952448_uikit_imageview">
+    <style name="UiKit_GuildsListUnreadHoriz" parent="@style/UiKit_ImageView">
         <item name="android:src">@drawable/ic_unread_white_9dp_horiz</item>
         <item name="android:layout_alignParentBottom">true</item>
         <item name="android:layout_centerHorizontal">true</item>
         <item name="tint">?attr/colorInteractiveActive</item>
     </style>
-    <style name="res_2131952446_uikit_guildslistvoiceicon" parent="@style/res_2131952432_uikit_guildslistbadge">
+    <style name="UiKit_GuildsListVoiceIcon" parent="@style/UiKit_GuildsListBadge">
         <item name="android:background">?attr/drawable_circle_guild_badge_activateable</item>
         <item name="android:src">@drawable/ic_volume_up_white_24dp</item>
     </style>
-    <style name="res_2131952447_uikit_imagebutton" parent="@style/UiKit">
+    <style name="UiKit_ImageButton" parent="@style/UiKit">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:background">?attr/bg_pressed_highlight</item>
@@ -5201,19 +5201,19 @@
         <item name="android:textAllCaps">false</item>
         <item name="fontFamily">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131952448_uikit_imageview">
+    <style name="UiKit_ImageView">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:contentDescription">@null</item>
     </style>
-    <style name="res_2131952449_uikit_imageview_clickable" parent="@style/res_2131952448_uikit_imageview">
+    <style name="UiKit_ImageView_Clickable" parent="@style/UiKit_ImageView">
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:clickable">true</item>
     </style>
-    <style name="res_2131952450_uikit_imageview_hideinlandscape" parent="@style/res_2131952448_uikit_imageview">
+    <style name="UiKit_ImageView_HideInLandscape" parent="@style/UiKit_ImageView">
     </style>
-    <style name="res_2131952451_uikit_listitem" parent="@style/UiKit">
-        <item name="android:textAppearance">@style/res_2131952536_uikit_textappearance_listitem</item>
+    <style name="UiKit_ListItem" parent="@style/UiKit">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_ListItem</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="android:gravity">clip_horizontal</item>
         <item name="android:background">@drawable/bg_pressed_highlight_darken</item>
@@ -5224,113 +5224,113 @@
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
     </style>
-    <style name="res_2131952452_uikit_listitem_description" parent="@style/res_2131952581_uikit_textview_subtext">
+    <style name="UiKit_ListItem_Description" parent="@style/UiKit_TextView_Subtext">
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
     </style>
-    <style name="res_2131952453_uikit_listitem_icon" parent="@style/res_2131952451_uikit_listitem">
+    <style name="UiKit_ListItem_Icon" parent="@style/UiKit_ListItem">
         <item name="android:drawablePadding">16dp</item>
     </style>
-    <style name="res_2131952454_uikit_listitem_icon_radio" parent="@style/res_2131952453_uikit_listitem_icon">
+    <style name="UiKit_ListItem_Icon_Radio" parent="@style/UiKit_ListItem_Icon">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
         <item name="android:fontFamily">?attr/font_primary_semibold</item>
         <item name="android:layoutDirection">rtl</item>
         <item name="android:layout_marginStart">12dp</item>
     </style>
-    <style name="res_2131952455_uikit_listitem_switch" parent="@style/res_2131952451_uikit_listitem">
-        <item name="switchTextAppearance">@style/res_2131952536_uikit_textappearance_listitem</item>
+    <style name="UiKit_ListItem_Switch" parent="@style/UiKit_ListItem">
+        <item name="switchTextAppearance">@style/UiKit_TextAppearance_ListItem</item>
         <item name="thumbTint">?attr/colorCompoundButton</item>
         <item name="useMaterialThemeColors">true</item>
     </style>
-    <style name="res_2131952456_uikit_listitem_title" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_ListItem_Title" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
     </style>
-    <style name="res_2131952457_uikit_lottieanimationview">
+    <style name="UiKit_LottieAnimationView">
         <item name="lottie_autoPlay">true</item>
         <item name="lottie_loop">true</item>
     </style>
-    <style name="res_2131952458_uikit_material_button" parent="@style/res_2131952729_widget_materialcomponents_button">
-        <item name="android:textAppearance">@style/res_2131952535_uikit_textappearance_button</item>
+    <style name="UiKit_Material_Button" parent="@style/res_2131952729_widget_materialcomponents_button">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Button</item>
         <item name="android:textColor">@color/uikit_btn_text_color_selector</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:backgroundTint">@color/uikit_btn_bg_color_selector_brand</item>
     </style>
-    <style name="res_2131952459_uikit_material_button_fit" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_Material_Button_Fit" parent="@style/UiKit_Material_Button">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:minWidth">@dimen/uikit_btn_wrapped_min_width</item>
     </style>
-    <style name="res_2131952460_uikit_material_button_green" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_Material_Button_Green" parent="@style/UiKit_Material_Button">
         <item name="android:textColor">@color/primary_100</item>
         <item name="android:backgroundTint">@color/uikit_btn_bg_color_selector_green</item>
     </style>
-    <style name="res_2131952461_uikit_material_button_green_fit" parent="@style/res_2131952460_uikit_material_button_green">
+    <style name="UiKit_Material_Button_Green_Fit" parent="@style/UiKit_Material_Button_Green">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:minWidth">@dimen/uikit_btn_wrapped_min_width</item>
     </style>
-    <style name="res_2131952462_uikit_material_button_green_outline" parent="@style/res_2131952463_uikit_material_button_outline">
+    <style name="UiKit_Material_Button_Green_Outline" parent="@style/UiKit_Material_Button_Outline">
         <item name="android:textColor">@color/uikit_btn_bg_color_selector_green</item>
         <item name="rippleColor">@color/status_green_500_alpha_60</item>
         <item name="strokeColor">@color/uikit_btn_bg_color_selector_green</item>
     </style>
-    <style name="res_2131952463_uikit_material_button_outline" parent="@style/res_2131952731_widget_materialcomponents_button_outlinedbutton">
-        <item name="android:textAppearance">@style/res_2131952535_uikit_textappearance_button</item>
+    <style name="UiKit_Material_Button_Outline" parent="@style/res_2131952731_widget_materialcomponents_button_outlinedbutton">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Button</item>
         <item name="android:textColor">@color/uikit_btn_outline_color_selector_brand</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="strokeColor">@color/uikit_btn_outline_color_selector_brand</item>
     </style>
-    <style name="res_2131952464_uikit_material_button_red" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_Material_Button_Red" parent="@style/UiKit_Material_Button">
         <item name="android:textColor">@color/primary_100</item>
         <item name="android:backgroundTint">@color/uikit_btn_bg_color_selector_red</item>
     </style>
-    <style name="res_2131952465_uikit_material_button_red_fit" parent="@style/res_2131952464_uikit_material_button_red">
+    <style name="UiKit_Material_Button_Red_Fit" parent="@style/UiKit_Material_Button_Red">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:minWidth">@dimen/uikit_btn_wrapped_min_width</item>
     </style>
-    <style name="res_2131952466_uikit_material_button_red_outline" parent="@style/res_2131952463_uikit_material_button_outline">
+    <style name="UiKit_Material_Button_Red_Outline" parent="@style/UiKit_Material_Button_Outline">
         <item name="android:textColor">@color/uikit_btn_bg_color_selector_red</item>
         <item name="strokeColor">@color/uikit_btn_bg_color_selector_red</item>
     </style>
-    <style name="res_2131952467_uikit_material_button_secondary" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_Material_Button_Secondary" parent="@style/UiKit_Material_Button">
         <item name="android:backgroundTint">?attr/colorButtonSecondary</item>
     </style>
-    <style name="res_2131952468_uikit_material_button_secondary_fit" parent="@style/res_2131952467_uikit_material_button_secondary">
+    <style name="UiKit_Material_Button_Secondary_Fit" parent="@style/UiKit_Material_Button_Secondary">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:minWidth">@dimen/uikit_btn_wrapped_min_width</item>
     </style>
-    <style name="res_2131952469_uikit_material_button_secondary_outline" parent="@style/res_2131952463_uikit_material_button_outline">
+    <style name="UiKit_Material_Button_Secondary_Outline" parent="@style/UiKit_Material_Button_Outline">
         <item name="android:textColor">?attr/colorButtonSecondary</item>
         <item name="strokeColor">?attr/colorButtonSecondary</item>
     </style>
-    <style name="res_2131952470_uikit_material_button_tertiary" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_Material_Button_Tertiary" parent="@style/UiKit_Material_Button">
         <item name="android:backgroundTint">?attr/colorBackgroundTertiary</item>
     </style>
-    <style name="res_2131952471_uikit_material_button_transparent" parent="@style/res_2131952731_widget_materialcomponents_button_outlinedbutton">
-        <item name="android:textAppearance">@style/res_2131952535_uikit_textappearance_button</item>
+    <style name="UiKit_Material_Button_Transparent" parent="@style/res_2131952731_widget_materialcomponents_button_outlinedbutton">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Button</item>
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="rippleColor">?attr/colorBackgroundAccent</item>
         <item name="strokeColor">@color/transparent</item>
     </style>
-    <style name="res_2131952472_uikit_material_button_transparent_fit" parent="@style/res_2131952471_uikit_material_button_transparent">
+    <style name="UiKit_Material_Button_Transparent_Fit" parent="@style/UiKit_Material_Button_Transparent">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:minWidth">@dimen/uikit_btn_wrapped_min_width</item>
     </style>
-    <style name="res_2131952473_uikit_material_button_white" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_Material_Button_White" parent="@style/UiKit_Material_Button">
         <item name="android:textColor">@color/primary_700</item>
         <item name="android:backgroundTint">@color/uikit_btn_bg_color_selector_white</item>
     </style>
-    <style name="res_2131952474_uikit_material_button_white_outline" parent="@style/res_2131952463_uikit_material_button_outline">
+    <style name="UiKit_Material_Button_White_Outline" parent="@style/UiKit_Material_Button_Outline">
         <item name="android:textColor">@color/uikit_btn_bg_color_selector_white</item>
         <item name="strokeColor">@color/uikit_btn_bg_color_selector_white</item>
     </style>
-    <style name="res_2131952475_uikit_materialthemeoverlay_textinputlayout" parent="@style/res_2131952362_themeoverlay_materialcomponents_textinputedittext_filledbox">
+    <style name="UiKit_MaterialThemeOverlay_TextInputLayout" parent="@style/res_2131952362_themeoverlay_materialcomponents_textinputedittext_filledbox">
         <item name="colorControlActivated">?attr/color_brand_500</item>
     </style>
-    <style name="res_2131952476_uikit_premiumguild_confirmation_chip" parent="@style/res_2131952743_widget_materialcomponents_chip_action">
-        <item name="android:textAppearance">@style/res_2131952533_uikit_textappearance</item>
+    <style name="UiKit_PremiumGuild_Confirmation_Chip" parent="@style/res_2131952743_widget_materialcomponents_chip_action">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="android:paddingTop">2dp</item>
         <item name="android:paddingBottom">2dp</item>
@@ -5346,24 +5346,24 @@
         <item name="chipStartPadding">4dp</item>
         <item name="ensureMinTouchTargetSize">false</item>
     </style>
-    <style name="res_2131952477_uikit_premiumguild_settings_marketing_check" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_PremiumGuild_Settings_Marketing_Check" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:layout_gravity">left|center_horizontal</item>
         <item name="android:drawablePadding">16dp</item>
         <item name="android:drawableStart">@drawable/ic_check_white_24dp</item>
     </style>
-    <style name="res_2131952478_uikit_premiumguild_settings_marketing_clear" parent="@style/res_2131952477_uikit_premiumguild_settings_marketing_check">
+    <style name="UiKit_PremiumGuild_Settings_Marketing_Clear" parent="@style/UiKit_PremiumGuild_Settings_Marketing_Check">
         <item name="android:drawableStart">@drawable/ic_clear_white_24dp</item>
     </style>
-    <style name="res_2131952479_uikit_premiumguild_settings_marketing_container" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_PremiumGuild_Settings_Marketing_Container" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:gravity">center_horizontal</item>
         <item name="android:background">@drawable/drawable_bg_white_alpha_06_corners_gradient</item>
         <item name="android:padding">16dp</item>
         <item name="android:layout_marginLeft">16dp</item>
         <item name="android:layout_marginRight">16dp</item>
     </style>
-    <style name="res_2131952480_uikit_progressbar_line_horizontal_determinate" parent="@style/res_2131952680_widget_appcompat_progressbar_horizontal">
+    <style name="UiKit_ProgressBar_Line_Horizontal_Determinate" parent="@style/res_2131952680_widget_appcompat_progressbar_horizontal">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:maxHeight">4dp</item>
@@ -5373,14 +5373,14 @@
         <item name="android:minHeight">2dp</item>
         <item name="android:mirrorForRtl">true</item>
     </style>
-    <style name="res_2131952481_uikit_progressbar_white" parent="@style/res_2131952244_theme_appcompat">
+    <style name="UiKit_ProgressBar_White" parent="@style/res_2131952244_theme_appcompat">
         <item name="colorAccent">@color/white</item>
     </style>
-    <style name="res_2131952482_uikit_quickswitcher_animation" parent="@android:style/Animation.Activity">
+    <style name="UiKit_QuickSwitcher_Animation" parent="@android:style/Animation.Activity">
         <item name="android:windowEnterAnimation">@anim/activity_slide_vertical_open_in</item>
         <item name="android:windowExitAnimation">@anim/activity_slide_vertical_close_out</item>
     </style>
-    <style name="res_2131952483_uikit_radiobutton">
+    <style name="UiKit_RadioButton">
         <item name="android:textColor">?attr/radio_btn_text_color</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:background">?attr/radio_btn_bg</item>
@@ -5390,7 +5390,7 @@
         <item name="android:elevation">2dp</item>
         <item name="android:buttonTint">?attr/colorCompoundButton</item>
     </style>
-    <style name="res_2131952484_uikit_search_chip" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_Search_Chip" parent="@style/UiKit_TextView">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">@color/primary_300</item>
         <item name="android:background">@drawable/drawable_bg_item_filter</item>
@@ -5399,7 +5399,7 @@
         <item name="android:paddingRight">4dp</item>
         <item name="android:paddingBottom">2dp</item>
     </style>
-    <style name="res_2131952485_uikit_search_header" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_Search_Header" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingTop">8dp</item>
@@ -5408,8 +5408,8 @@
         <item name="android:textAllCaps">true</item>
         <item name="android:fontFamily">?attr/font_display_semibold</item>
     </style>
-    <style name="res_2131952486_uikit_searchinput" parent="@style/UiKit">
-        <item name="android:textAppearance">@style/res_2131952533_uikit_textappearance</item>
+    <style name="UiKit_SearchInput" parent="@style/UiKit">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance</item>
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="android:textColorHint">?attr/colorTextMuted</item>
@@ -5421,12 +5421,12 @@
         <item name="android:singleLine">true</item>
         <item name="android:paddingStart">8dp</item>
     </style>
-    <style name="res_2131952487_uikit_searchinputclear" parent="@style/UiKit">
+    <style name="UiKit_SearchInputClear" parent="@style/UiKit">
         <item name="android:padding">8dp</item>
         <item name="android:layout_width">32dp</item>
         <item name="android:layout_height">32dp</item>
     </style>
-    <style name="res_2131952488_uikit_seekbar">
+    <style name="UiKit_SeekBar">
         <item name="android:layout_gravity">clip_horizontal</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -5436,34 +5436,34 @@
         <item name="android:thumb">?attr/img_thumb</item>
         <item name="android:splitTrack">false</item>
     </style>
-    <style name="res_2131952489_uikit_settings" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_Settings" parent="@style/UiKit_TextView">
         <item name="android:textColor">?attr/settings_text_color</item>
         <item name="android:layout_width">match_parent</item>
     </style>
-    <style name="res_2131952490_uikit_settings_base_item" parent="@style/res_2131952489_uikit_settings">
+    <style name="UiKit_Settings_Base_Item" parent="@style/UiKit_Settings">
         <item name="android:textSize">@dimen/uikit_settings_item_text_size</item>
         <item name="android:background">?attr/selectableItemBackground</item>
     </style>
-    <style name="res_2131952491_uikit_settings_divider" parent="@style/res_2131952416_uikit_divider">
+    <style name="UiKit_Settings_Divider" parent="@style/UiKit_Divider">
         <item name="android:layout_marginTop">8dp</item>
     </style>
-    <style name="res_2131952492_uikit_settings_item" parent="@style/res_2131952490_uikit_settings_base_item">
+    <style name="UiKit_Settings_Item" parent="@style/UiKit_Settings_Base_Item">
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">16dp</item>
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
     </style>
-    <style name="res_2131952493_uikit_settings_item_addition" parent="@style/res_2131952492_uikit_settings_item">
+    <style name="UiKit_Settings_Item_Addition" parent="@style/UiKit_Settings_Item">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:paddingTop">0dp</item>
         <item name="android:fontFamily">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131952494_uikit_settings_item_compound_left" parent="@style/res_2131952492_uikit_settings_item">
+    <style name="UiKit_Settings_Item_Compound_Left" parent="@style/UiKit_Settings_Item">
         <item name="android:background">@null</item>
         <item name="android:layout_width">wrap_content</item>
     </style>
-    <style name="res_2131952495_uikit_settings_item_compound_right" parent="@style/res_2131952492_uikit_settings_item">
+    <style name="UiKit_Settings_Item_Compound_Right" parent="@style/UiKit_Settings_Item">
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:ellipsize">end</item>
         <item name="android:background">@null</item>
@@ -5473,40 +5473,40 @@
         <item name="android:layout_weight">1</item>
         <item name="android:textAlignment">textEnd</item>
     </style>
-    <style name="res_2131952496_uikit_settings_item_header" parent="@style/res_2131952492_uikit_settings_item">
+    <style name="UiKit_Settings_Item_Header" parent="@style/UiKit_Settings_Item">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:fontFamily">?attr/font_display_semibold</item>
     </style>
-    <style name="res_2131952497_uikit_settings_item_icon" parent="@style/res_2131952492_uikit_settings_item">
+    <style name="UiKit_Settings_Item_Icon" parent="@style/UiKit_Settings_Item">
         <item name="android:gravity">clip_horizontal</item>
         <item name="android:drawablePadding">32dp</item>
     </style>
-    <style name="res_2131952498_uikit_settings_item_label" parent="@style/res_2131952492_uikit_settings_item">
+    <style name="UiKit_Settings_Item_Label" parent="@style/UiKit_Settings_Item">
         <item name="android:paddingBottom">0dp</item>
     </style>
-    <style name="res_2131952499_uikit_settings_item_subtext" parent="@style/res_2131952492_uikit_settings_item">
+    <style name="UiKit_Settings_Item_SubText" parent="@style/UiKit_Settings_Item">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:fontFamily">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131952500_uikit_settings_text" parent="@style/res_2131952489_uikit_settings">
+    <style name="UiKit_Settings_Text" parent="@style/UiKit_Settings">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:drawablePadding">32dp</item>
         <item name="android:fontFamily">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131952501_uikit_sheet" parent="@style/res_2131952267_theme_design_bottomsheetdialog">
+    <style name="UiKit_Sheet" parent="@style/res_2131952267_theme_design_bottomsheetdialog">
     </style>
-    <style name="res_2131952502_uikit_sheet_guideline" parent="@style/res_2131952421_uikit_guideline">
+    <style name="UiKit_Sheet_Guideline" parent="@style/UiKit_Guideline">
         <item name="android:id">@id/uikit_sheet_header_guideline</item>
         <item name="layout_constraintGuide_begin">@dimen/uikit_guideline_sheet</item>
     </style>
-    <style name="res_2131952503_uikit_sheet_header" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_Sheet_Header" parent="@style/UiKit_ViewGroup">
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">8dp</item>
     </style>
-    <style name="res_2131952504_uikit_sheet_header_contents" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_Sheet_Header_Contents" parent="@style/UiKit_ViewGroup">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_marginRight">8dp</item>
         <item name="android:layout_marginEnd">8dp</item>
@@ -5519,7 +5519,7 @@
         <item name="layout_constraintStart_toEndOf">@id/uikit_sheet_header_guideline</item>
         <item name="layout_constraintTop_toTopOf">@null</item>
     </style>
-    <style name="res_2131952505_uikit_sheet_header_icon" parent="@style/res_2131951674_avatar_large">
+    <style name="UiKit_Sheet_Header_Icon" parent="@style/Avatar_Large">
         <item name="android:layout_marginLeft">8dp</item>
         <item name="android:layout_marginRight">8dp</item>
         <item name="android:scaleType">center</item>
@@ -5532,7 +5532,7 @@
         <item name="layout_constraintStart_toStartOf">@null</item>
         <item name="layout_constraintTop_toTopOf">@null</item>
     </style>
-    <style name="res_2131952506_uikit_sheet_header_title" parent="@style/res_2131952566_uikit_textview_h1_bold">
+    <style name="UiKit_Sheet_Header_Title" parent="@style/UiKit_TextView_H1_Bold">
         <item name="android:ellipsize">end</item>
         <item name="android:layout_marginRight">8dp</item>
         <item name="android:singleLine">true</item>
@@ -5546,15 +5546,15 @@
         <item name="layout_constraintStart_toEndOf">@id/uikit_sheet_header_guideline</item>
         <item name="layout_constraintTop_toTopOf">@null</item>
     </style>
-    <style name="res_2131952507_uikit_sheet_keyboardavoiding" parent="@style/res_2131952501_uikit_sheet">
+    <style name="UiKit_Sheet_KeyboardAvoiding" parent="@style/UiKit_Sheet">
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowSoftInputMode">stateHidden</item>
     </style>
-    <style name="res_2131952508_uikit_stage" parent="@style/UiKit">
+    <style name="UiKit_Stage" parent="@style/UiKit">
     </style>
-    <style name="res_2131952509_uikit_stage_bullet" parent="@style/res_2131952508_uikit_stage">
+    <style name="UiKit_Stage_Bullet" parent="@style/UiKit_Stage">
     </style>
-    <style name="res_2131952510_uikit_stage_bullet_icon" parent="@style/res_2131952509_uikit_stage_bullet">
+    <style name="UiKit_Stage_Bullet_Icon" parent="@style/UiKit_Stage_Bullet">
         <item name="android:background">@drawable/drawable_circle_background_tertiary</item>
         <item name="android:padding">8dp</item>
         <item name="android:layout_width">40dp</item>
@@ -5564,7 +5564,7 @@
         <item name="layout_constraintHorizontal_chainStyle">2</item>
         <item name="layout_constraintStart_toStartOf">@null</item>
     </style>
-    <style name="res_2131952511_uikit_stage_bullet_label" parent="@style/res_2131952518_uikit_stage_subtitle_description">
+    <style name="UiKit_Stage_Bullet_Label" parent="@style/UiKit_Stage_Subtitle_Description">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">24dp</item>
@@ -5574,7 +5574,7 @@
         <item name="layout_constrainedWidth">true</item>
         <item name="layout_constraintEnd_toEndOf">@null</item>
     </style>
-    <style name="res_2131952512_uikit_stage_clickablebutton" parent="@style/res_2131952449_uikit_imageview_clickable">
+    <style name="UiKit_Stage_ClickableButton" parent="@style/UiKit_ImageView_Clickable">
         <item name="android:background">@drawable/ripple_circle_background_primary</item>
         <item name="android:padding">8dp</item>
         <item name="android:layout_width">32dp</item>
@@ -5582,69 +5582,69 @@
         <item name="android:scaleType">centerInside</item>
         <item name="tint">?attr/colorHeaderPrimary</item>
     </style>
-    <style name="res_2131952513_uikit_stage_detail" parent="@style/res_2131952533_uikit_textappearance">
+    <style name="UiKit_Stage_Detail" parent="@style/UiKit_TextAppearance">
         <item name="android:textColor">@color/primary_300</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:drawablePadding">4dp</item>
         <item name="drawableTint">@color/primary_300</item>
     </style>
-    <style name="res_2131952514_uikit_stage_listitem_subtitle" parent="@style/res_2131952517_uikit_stage_subtitle">
+    <style name="UiKit_Stage_ListItem_Subtitle" parent="@style/UiKit_Stage_Subtitle">
         <item name="android:textSize">12sp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:lines">1</item>
     </style>
-    <style name="res_2131952515_uikit_stage_listitem_title" parent="@style/res_2131952519_uikit_stage_title">
+    <style name="UiKit_Stage_ListItem_Title" parent="@style/UiKit_Stage_Title">
         <item name="android:textSize">16sp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:lines">1</item>
     </style>
-    <style name="res_2131952516_uikit_stage_sectionheader" parent="@style/res_2131952574_uikit_textview_medium">
-        <item name="android:textAppearance">@style/res_2131952137_stage_section_headertextappearance</item>
+    <style name="UiKit_Stage_SectionHeader" parent="@style/UiKit_TextView_Medium">
+        <item name="android:textAppearance">@style/Stage_Section_HeaderTextAppearance</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_marginBottom">8dp</item>
     </style>
-    <style name="res_2131952517_uikit_stage_subtitle" parent="@style/res_2131952574_uikit_textview_medium">
+    <style name="UiKit_Stage_Subtitle" parent="@style/UiKit_TextView_Medium">
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
     </style>
-    <style name="res_2131952518_uikit_stage_subtitle_description" parent="@style/res_2131952517_uikit_stage_subtitle">
+    <style name="UiKit_Stage_Subtitle_Description" parent="@style/UiKit_Stage_Subtitle">
         <item name="android:textSize">16sp</item>
         <item name="android:gravity">left|center_horizontal</item>
     </style>
-    <style name="res_2131952519_uikit_stage_title" parent="@style/res_2131952544_uikit_textappearance_toolbar_title">
+    <style name="UiKit_Stage_Title" parent="@style/UiKit_TextAppearance_Toolbar_Title">
     </style>
-    <style name="res_2131952520_uikit_stage_title_secondary" parent="@style/res_2131952519_uikit_stage_title">
+    <style name="UiKit_Stage_Title_Secondary" parent="@style/UiKit_Stage_Title">
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">?attr/font_display_bold</item>
     </style>
-    <style name="res_2131952521_uikit_stage_topic" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_Stage_Topic" parent="@style/UiKit_TextView_Semibold">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">2</item>
     </style>
-    <style name="res_2131952522_uikit_stage_topic_header" parent="@style/res_2131952506_uikit_sheet_header_title">
+    <style name="UiKit_Stage_Topic_Header" parent="@style/UiKit_Sheet_Header_Title">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">2</item>
         <item name="android:singleLine">false</item>
     </style>
-    <style name="res_2131952523_uikit_stagediscovery_publicnotice_textview" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_StageDiscovery_PublicNotice_TextView" parent="@style/UiKit_TextView">
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
     </style>
-    <style name="res_2131952524_uikit_stagediscoveryavatar" parent="@style/res_2131951676_avatar_medium">
+    <style name="UiKit_StageDiscoveryAvatar" parent="@style/Avatar_Medium">
         <item name="android:layout_width">20dp</item>
         <item name="android:layout_height">20dp</item>
         <item name="roundAsCircle">false</item>
     </style>
-    <style name="res_2131952525_uikit_stagediscoveryavatar_circle" parent="@style/res_2131951676_avatar_medium">
+    <style name="UiKit_StageDiscoveryAvatar_Circle" parent="@style/Avatar_Medium">
         <item name="android:layout_width">20dp</item>
         <item name="android:layout_height">20dp</item>
     </style>
-    <style name="res_2131952526_uikit_stagediscoveryguilddetail" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_StageDiscoveryGuildDetail" parent="@style/UiKit_TextView">
         <item name="android:textColor">?attr/primary_300</item>
         <item name="android:ellipsize">end</item>
         <item name="android:layout_width">0dp</item>
@@ -5652,23 +5652,23 @@
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
     </style>
-    <style name="res_2131952527_uikit_stagediscoveryguilddetail_medium" parent="@style/res_2131952526_uikit_stagediscoveryguilddetail">
+    <style name="UiKit_StageDiscoveryGuildDetail_Medium" parent="@style/UiKit_StageDiscoveryGuildDetail">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
     </style>
-    <style name="res_2131952528_uikit_stagediscoveryguilddetail_small" parent="@style/res_2131952526_uikit_stagediscoveryguilddetail">
+    <style name="UiKit_StageDiscoveryGuildDetail_Small" parent="@style/UiKit_StageDiscoveryGuildDetail">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
     </style>
-    <style name="res_2131952529_uikit_stagediscoveryicon" parent="@style/res_2131952448_uikit_imageview">
+    <style name="UiKit_StageDiscoveryIcon" parent="@style/UiKit_ImageView">
         <item name="tint">?attr/primary_300</item>
     </style>
-    <style name="res_2131952530_uikit_tablayout_pagerindicator">
+    <style name="UiKit_TabLayout_PagerIndicator">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">16dp</item>
         <item name="tabBackground">@drawable/tab_dot_selector</item>
         <item name="tabGravity">1</item>
         <item name="tabIndicatorHeight">0dp</item>
     </style>
-    <style name="res_2131952531_uikit_tabs">
+    <style name="UiKit_Tabs">
         <item name="android:background">?attr/colorPrimaryTabs</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">48dp</item>
@@ -5678,25 +5678,25 @@
         <item name="tabMinWidth">112dp</item>
         <item name="tabMode">@null</item>
         <item name="tabSelectedTextColor">?attr/primary_100</item>
-        <item name="tabTextAppearance">@style/res_2131952532_uikit_tabs_textappearance</item>
+        <item name="tabTextAppearance">@style/UiKit_Tabs_TextAppearance</item>
         <item name="tabTextColor">?attr/primary_100_alpha_60</item>
     </style>
-    <style name="res_2131952532_uikit_tabs_textappearance" parent="@style/res_2131952187_textappearance_appcompat_widget_actionbar_title_inverse">
+    <style name="UiKit_Tabs_TextAppearance" parent="@style/res_2131952187_textappearance_appcompat_widget_actionbar_title_inverse">
         <item name="android:textSize">13.75sp</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:fontFamily">?attr/font_display_semibold</item>
     </style>
-    <style name="res_2131952533_uikit_textappearance" parent="@style/res_2131952154_textappearance_appcompat">
+    <style name="UiKit_TextAppearance" parent="@style/res_2131952154_textappearance_appcompat">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/colorTextNormal</item>
         <item name="android:textColorLink">?attr/colorTextLink</item>
         <item name="android:fontFamily">?attr/font_primary_normal</item>
         <item name="android:textDirection">locale</item>
     </style>
-    <style name="res_2131952534_uikit_textappearance_bold" parent="@style/res_2131952533_uikit_textappearance">
+    <style name="UiKit_TextAppearance_Bold" parent="@style/UiKit_TextAppearance">
         <item name="android:fontFamily">?attr/font_primary_bold</item>
     </style>
-    <style name="res_2131952535_uikit_textappearance_button" parent="@style/res_2131952227_textappearance_materialcomponents_button">
+    <style name="UiKit_TextAppearance_Button" parent="@style/res_2131952227_textappearance_materialcomponents_button">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
         <item name="android:textColorLink">?attr/colorTextLink</item>
@@ -5705,42 +5705,42 @@
         <item name="android:letterSpacing">@null</item>
         <item name="fontFamily">?attr/font_primary_semibold</item>
     </style>
-    <style name="res_2131952536_uikit_textappearance_listitem" parent="@style/res_2131952541_uikit_textappearance_semibold">
+    <style name="UiKit_TextAppearance_ListItem" parent="@style/UiKit_TextAppearance_Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/colorInteractiveActive</item>
     </style>
-    <style name="res_2131952537_uikit_textappearance_listitem_label" parent="@style/res_2131952534_uikit_textappearance_bold">
+    <style name="UiKit_TextAppearance_ListItem_Label" parent="@style/UiKit_TextAppearance_Bold">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:textAllCaps">true</item>
     </style>
-    <style name="res_2131952538_uikit_textappearance_materialedittext" parent="@style/res_2131952533_uikit_textappearance">
+    <style name="UiKit_TextAppearance_MaterialEditText" parent="@style/UiKit_TextAppearance">
     </style>
-    <style name="res_2131952539_uikit_textappearance_materialedittext_input" parent="@style/res_2131952538_uikit_textappearance_materialedittext">
+    <style name="UiKit_TextAppearance_MaterialEditText_Input" parent="@style/UiKit_TextAppearance_MaterialEditText">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
     </style>
-    <style name="res_2131952540_uikit_textappearance_materialedittext_label" parent="@style/res_2131952538_uikit_textappearance_materialedittext">
+    <style name="UiKit_TextAppearance_MaterialEditText_Label" parent="@style/UiKit_TextAppearance_MaterialEditText">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
     </style>
-    <style name="res_2131952541_uikit_textappearance_semibold" parent="@style/res_2131952533_uikit_textappearance">
+    <style name="UiKit_TextAppearance_Semibold" parent="@style/UiKit_TextAppearance">
         <item name="android:fontFamily">?attr/font_primary_semibold</item>
     </style>
-    <style name="res_2131952542_uikit_textappearance_toolbar" parent="@style/res_2131952541_uikit_textappearance_semibold">
+    <style name="UiKit_TextAppearance_Toolbar" parent="@style/UiKit_TextAppearance_Semibold">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="singleLine">true</item>
     </style>
-    <style name="res_2131952543_uikit_textappearance_toolbar_subtitle" parent="@style/res_2131952542_uikit_textappearance_toolbar">
+    <style name="UiKit_TextAppearance_Toolbar_Subtitle" parent="@style/UiKit_TextAppearance_Toolbar">
         <item name="android:textSize">12dp</item>
         <item name="android:textColor">?attr/colorTextMuted</item>
         <item name="android:fontFamily">?attr/font_display_normal</item>
     </style>
-    <style name="res_2131952544_uikit_textappearance_toolbar_title" parent="@style/res_2131952542_uikit_textappearance_toolbar">
+    <style name="UiKit_TextAppearance_Toolbar_Title" parent="@style/UiKit_TextAppearance_Toolbar">
         <item name="android:textSize">18dp</item>
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
         <item name="android:fontFamily">?attr/font_display_bold</item>
     </style>
-    <style name="res_2131952545_uikit_textinputlayout" parent="@style/res_2131952802_widget_materialcomponents_textinputlayout_filledbox">
+    <style name="UiKit_TextInputLayout" parent="@style/res_2131952802_widget_materialcomponents_textinputlayout_filledbox">
         <item name="android:textColorHint">?attr/colorTextMuted</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -5751,13 +5751,13 @@
         <item name="boxCornerRadiusTopStart">4dp</item>
         <item name="boxStrokeWidth">0dp</item>
         <item name="boxStrokeWidthFocused">0dp</item>
-        <item name="errorTextAppearance">@style/res_2131952533_uikit_textappearance</item>
-        <item name="hintTextAppearance">@style/res_2131952540_uikit_textappearance_materialedittext_label</item>
+        <item name="errorTextAppearance">@style/UiKit_TextAppearance</item>
+        <item name="hintTextAppearance">@style/UiKit_TextAppearance_MaterialEditText_Label</item>
         <item name="hintTextColor">?attr/colorHeaderSecondary</item>
-        <item name="materialThemeOverlay">@style/res_2131952475_uikit_materialthemeoverlay_textinputlayout</item>
+        <item name="materialThemeOverlay">@style/UiKit_MaterialThemeOverlay_TextInputLayout</item>
     </style>
-    <style name="res_2131952546_uikit_textinputlayout_edittext">
-        <item name="android:textAppearance">@style/res_2131952539_uikit_textappearance_materialedittext_input</item>
+    <style name="UiKit_TextInputLayout_EditText">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_MaterialEditText_Input</item>
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
         <item name="android:textColorHint">?attr/colorHeaderSecondary</item>
         <item name="android:layout_width">match_parent</item>
@@ -5766,49 +5766,49 @@
         <item name="android:imeOptions">actionNext</item>
         <item name="android:textCursorDrawable">@drawable/cursor_color</item>
     </style>
-    <style name="res_2131952547_uikit_textinputlayout_edittext_multiline" parent="@style/res_2131952546_uikit_textinputlayout_edittext">
+    <style name="UiKit_TextInputLayout_EditText_MultiLine" parent="@style/UiKit_TextInputLayout_EditText">
         <item name="android:maxLines">5</item>
         <item name="android:maxLength">512</item>
         <item name="android:inputType">2c001</item>
     </style>
-    <style name="res_2131952548_uikit_textinputlayout_edittext_multiline_paragraph" parent="@style/res_2131952547_uikit_textinputlayout_edittext_multiline">
+    <style name="UiKit_TextInputLayout_EditText_MultiLine_Paragraph" parent="@style/UiKit_TextInputLayout_EditText_MultiLine">
         <item name="android:gravity">center_horizontal</item>
         <item name="android:minHeight">96dp</item>
         <item name="android:maxLength">1000</item>
     </style>
-    <style name="res_2131952549_uikit_textinputlayout_edittext_nofocus" parent="@style/res_2131952546_uikit_textinputlayout_edittext">
+    <style name="UiKit_TextInputLayout_EditText_NoFocus" parent="@style/UiKit_TextInputLayout_EditText">
         <item name="android:focusable">false</item>
         <item name="android:inputType">@null</item>
     </style>
-    <style name="res_2131952550_uikit_textinputlayout_edittext_singleline" parent="@style/res_2131952546_uikit_textinputlayout_edittext">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine" parent="@style/UiKit_TextInputLayout_EditText">
         <item name="android:maxLines">1</item>
     </style>
-    <style name="res_2131952551_uikit_textinputlayout_edittext_singleline_countrycode" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_CountryCode" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:maxLength">6</item>
         <item name="android:inputType">number</item>
     </style>
-    <style name="res_2131952552_uikit_textinputlayout_edittext_singleline_email" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Email" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:inputType">text|textUri|datetime|date</item>
     </style>
-    <style name="res_2131952553_uikit_textinputlayout_edittext_singleline_password" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Password" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:inputType">textLongMessage</item>
     </style>
-    <style name="res_2131952554_uikit_textinputlayout_edittext_singleline_phone" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Phone" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:maxLength">18</item>
         <item name="android:inputType">phone</item>
     </style>
-    <style name="res_2131952555_uikit_textinputlayout_edittext_singleline_search" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Search" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
         <item name="android:padding">0dp</item>
         <item name="android:hint">@string/search</item>
         <item name="android:imeOptions">actionDone</item>
     </style>
-    <style name="res_2131952556_uikit_textinputlayout_edittext_singleline_username" parent="@style/res_2131952550_uikit_textinputlayout_edittext_singleline">
+    <style name="UiKit_TextInputLayout_EditText_SingleLine_Username" parent="@style/UiKit_TextInputLayout_EditText_SingleLine">
     </style>
-    <style name="res_2131952557_uikit_textinputlayout_password" parent="@style/res_2131952545_uikit_textinputlayout">
+    <style name="UiKit_TextInputLayout_Password" parent="@style/UiKit_TextInputLayout">
         <item name="passwordToggleEnabled">true</item>
         <item name="passwordToggleTint">?attr/colorInteractiveNormal</item>
     </style>
-    <style name="res_2131952558_uikit_textinputlayout_primary" parent="@style/res_2131952545_uikit_textinputlayout">
+    <style name="UiKit_TextInputLayout_Primary" parent="@style/UiKit_TextInputLayout">
         <item name="boxBackgroundColor">?attr/colorBackgroundPrimary</item>
         <item name="boxCornerRadiusBottomEnd">0dp</item>
         <item name="boxCornerRadiusBottomStart">0dp</item>
@@ -5817,87 +5817,87 @@
         <item name="boxStrokeWidth">0.75dp</item>
         <item name="boxStrokeWidthFocused">0.75dp</item>
     </style>
-    <style name="res_2131952559_uikit_textinputlayout_primary_password" parent="@style/res_2131952558_uikit_textinputlayout_primary">
+    <style name="UiKit_TextInputLayout_Primary_Password" parent="@style/UiKit_TextInputLayout_Primary">
         <item name="passwordToggleEnabled">true</item>
         <item name="passwordToggleTint">?attr/primary_400</item>
     </style>
-    <style name="res_2131952560_uikit_textinputlayout_search" parent="@style/res_2131952545_uikit_textinputlayout">
+    <style name="UiKit_TextInputLayout_Search" parent="@style/UiKit_TextInputLayout">
         <item name="android:textColorHint">?attr/colorHeaderSecondary</item>
         <item name="android:layout_margin">8dp</item>
         <item name="boxBackgroundColor">?attr/colorInteractiveMuted</item>
         <item name="hintEnabled">false</item>
         <item name="startIconDrawable">@drawable/ic_search_grey_24dp</item>
     </style>
-    <style name="res_2131952561_uikit_textinputlayout_search_actionbar" parent="@style/res_2131952560_uikit_textinputlayout_search">
+    <style name="UiKit_TextInputLayout_Search_ActionBar" parent="@style/UiKit_TextInputLayout_Search">
         <item name="endIconMode">2</item>
         <item name="startIconCheckable">false</item>
         <item name="startIconContentDescription">@string/back</item>
         <item name="startIconDrawable">@drawable/ic_arrow_back_white_24dp</item>
         <item name="startIconTint">?attr/colorInteractiveNormal</item>
     </style>
-    <style name="res_2131952562_uikit_textinputlayout_search_actionbar_filter" parent="@style/res_2131952561_uikit_textinputlayout_search_actionbar">
+    <style name="UiKit_TextInputLayout_Search_ActionBar_Filter" parent="@style/UiKit_TextInputLayout_Search_ActionBar">
         <item name="endIconContentDescription">@string/filter_options</item>
         <item name="endIconDrawable">?attr/ic_filter_list</item>
         <item name="endIconMode">-1</item>
     </style>
-    <style name="res_2131952563_uikit_textview">
-        <item name="android:textAppearance">@style/res_2131952533_uikit_textappearance</item>
+    <style name="UiKit_TextView">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:lineSpacingMultiplier">1.2</item>
     </style>
-    <style name="res_2131952564_uikit_textview_bold" parent="@style/res_2131952563_uikit_textview">
-        <item name="android:textAppearance">@style/res_2131952534_uikit_textappearance_bold</item>
+    <style name="UiKit_TextView_Bold" parent="@style/UiKit_TextView">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Bold</item>
     </style>
-    <style name="res_2131952565_uikit_textview_h1" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_TextView_H1" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textSize">20sp</item>
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
         <item name="android:fontFamily">?attr/font_display_semibold</item>
     </style>
-    <style name="res_2131952566_uikit_textview_h1_bold" parent="@style/res_2131952565_uikit_textview_h1">
+    <style name="UiKit_TextView_H1_Bold" parent="@style/UiKit_TextView_H1">
         <item name="android:fontFamily">?attr/font_display_bold</item>
     </style>
-    <style name="res_2131952567_uikit_textview_h2" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_TextView_H2" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/primary_200</item>
         <item name="android:fontFamily">?attr/font_display_semibold</item>
     </style>
-    <style name="res_2131952568_uikit_textview_h2_bold" parent="@style/res_2131952567_uikit_textview_h2">
+    <style name="UiKit_TextView_H2_Bold" parent="@style/UiKit_TextView_H2">
         <item name="android:fontFamily">?attr/font_display_bold</item>
     </style>
-    <style name="res_2131952569_uikit_textview_h6" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_H6" parent="@style/UiKit_TextView">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:fontFamily">?attr/font_display_bold</item>
     </style>
-    <style name="res_2131952570_uikit_textview_large" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_Large" parent="@style/UiKit_TextView">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
     </style>
-    <style name="res_2131952571_uikit_textview_large_singleline" parent="@style/res_2131952570_uikit_textview_large">
+    <style name="UiKit_TextView_Large_SingleLine" parent="@style/UiKit_TextView_Large">
         <item name="android:textColor">?attr/primary_100</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
     </style>
-    <style name="res_2131952572_uikit_textview_link" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_Link" parent="@style/UiKit_TextView">
         <item name="android:textColor">?attr/colorTextLink</item>
     </style>
-    <style name="res_2131952573_uikit_textview_marquee" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_Marquee" parent="@style/UiKit_TextView">
         <item name="android:ellipsize">marquee</item>
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
         <item name="android:marqueeRepeatLimit">marquee_forever</item>
     </style>
-    <style name="res_2131952574_uikit_textview_medium" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_Medium" parent="@style/UiKit_TextView">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
     </style>
-    <style name="res_2131952575_uikit_textview_medium_singleline" parent="@style/res_2131952574_uikit_textview_medium">
+    <style name="UiKit_TextView_Medium_SingleLine" parent="@style/UiKit_TextView_Medium">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
     </style>
-    <style name="res_2131952576_uikit_textview_noresults" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UiKit_TextView_NoResults" parent="@style/UiKit_TextView_Semibold">
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:layout_gravity">left|center_horizontal|clip_horizontal</item>
         <item name="android:padding">16dp</item>
@@ -5905,14 +5905,14 @@
         <item name="android:drawablePadding">16dp</item>
         <item name="drawableTopCompat">?attr/img_empty_search</item>
     </style>
-    <style name="res_2131952577_uikit_textview_perk" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_Perk" parent="@style/UiKit_TextView">
         <item name="android:textColor">?attr/primary_100</item>
         <item name="android:gravity">clip_horizontal</item>
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:drawablePadding">16dp</item>
     </style>
-    <style name="res_2131952578_uikit_textview_perk_small" parent="@style/res_2131952577_uikit_textview_perk">
+    <style name="UiKit_TextView_Perk_Small" parent="@style/UiKit_TextView_Perk">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/primary_100</item>
         <item name="android:gravity">clip_horizontal</item>
@@ -5921,24 +5921,24 @@
         <item name="android:drawablePadding">16dp</item>
         <item name="android:lineSpacingMultiplier">1</item>
     </style>
-    <style name="res_2131952579_uikit_textview_semibold" parent="@style/res_2131952563_uikit_textview">
-        <item name="android:textAppearance">@style/res_2131952541_uikit_textappearance_semibold</item>
+    <style name="UiKit_TextView_Semibold" parent="@style/UiKit_TextView">
+        <item name="android:textAppearance">@style/UiKit_TextAppearance_Semibold</item>
     </style>
-    <style name="res_2131952580_uikit_textview_singleline" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_SingleLine" parent="@style/UiKit_TextView">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
     </style>
-    <style name="res_2131952581_uikit_textview_subtext" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_Subtext" parent="@style/UiKit_TextView">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorTextMuted</item>
     </style>
-    <style name="res_2131952582_uikit_textview_subtext_singleline" parent="@style/res_2131952581_uikit_textview_subtext">
+    <style name="UiKit_TextView_Subtext_SingleLine" parent="@style/UiKit_TextView_Subtext">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
     </style>
-    <style name="res_2131952583_uikit_textview_tagged" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_TextView_Tagged" parent="@style/UiKit_TextView">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/drawable_tag_brand</item>
@@ -5946,7 +5946,7 @@
         <item name="android:paddingStart">4dp</item>
         <item name="android:paddingEnd">4dp</item>
     </style>
-    <style name="res_2131952584_uikit_toast">
+    <style name="UiKit_Toast">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">@color/primary_100</item>
         <item name="android:gravity">right|center_horizontal|clip_horizontal</item>
@@ -5957,14 +5957,14 @@
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">?attr/font_primary_normal</item>
     </style>
-    <style name="res_2131952585_uikit_user_phone_manage_confirm" parent="@style/res_2131952458_uikit_material_button">
+    <style name="UiKit_User_Phone_Manage_Confirm" parent="@style/UiKit_Material_Button">
         <item name="android:layout_marginTop">16dp</item>
     </style>
-    <style name="res_2131952586_uikit_user_phone_manage_number" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="UiKit_User_Phone_Manage_Number" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     </style>
-    <style name="res_2131952587_uikit_user_phone_verify_digits" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="UiKit_User_Phone_Verify_Digits" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     </style>
-    <style name="res_2131952588_uikit_user_verify_char" parent="@style/res_2131952563_uikit_textview">
+    <style name="UiKit_User_Verify_Char" parent="@style/UiKit_TextView">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?attr/colorTextNormal</item>
         <item name="android:gravity">left|center_horizontal|clip_horizontal</item>
@@ -5977,97 +5977,97 @@
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>
     </style>
-    <style name="res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
-    <style name="res_2131952590_uikit_viewgroup_appviewflipper_incoordinatorlayout" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_AppViewFlipper_InCoordinatorLayout" parent="@style/UiKit_ViewGroup">
         <item name="android:fitsSystemWindows">true</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="layout_behavior">@string/appbar_scrolling_view_behavior</item>
     </style>
-    <style name="res_2131952591_uikit_viewgroup_constraintlayout" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_ConstraintLayout" parent="@style/UiKit_ViewGroup">
     </style>
-    <style name="res_2131952592_uikit_viewgroup_coordinatorlayout" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_CoordinatorLayout" parent="@style/UiKit_ViewGroup">
         <item name="android:orientation">vertical</item>
         <item name="android:fitsSystemWindows">true</item>
     </style>
-    <style name="res_2131952593_uikit_viewgroup_coordinatorlayout_page" parent="@style/res_2131952592_uikit_viewgroup_coordinatorlayout">
+    <style name="UiKit_ViewGroup_CoordinatorLayout_Page" parent="@style/UiKit_ViewGroup_CoordinatorLayout">
         <item name="android:background">?attr/colorBackgroundPrimary</item>
         <item name="android:layout_height">match_parent</item>
     </style>
-    <style name="res_2131952594_uikit_viewgroup_linearlayout" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_LinearLayout" parent="@style/UiKit_ViewGroup">
         <item name="android:orientation">vertical</item>
     </style>
-    <style name="res_2131952595_uikit_viewgroup_linearlayout_bottomsheet" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_ViewGroup_LinearLayout_BottomSheet" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:elevation">4dp</item>
         <item name="behavior_hideable">true</item>
         <item name="layout_behavior">@string/bottom_sheet_behavior</item>
     </style>
-    <style name="res_2131952596_uikit_viewgroup_linearlayout_horizontal" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_ViewGroup_LinearLayout_Horizontal" parent="@style/UiKit_ViewGroup_LinearLayout">
         <item name="android:orientation">@null</item>
     </style>
-    <style name="res_2131952597_uikit_viewgroup_linearlayout_rotatable" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
+    <style name="UiKit_ViewGroup_LinearLayout_Rotatable" parent="@style/UiKit_ViewGroup_LinearLayout">
     </style>
-    <style name="res_2131952598_uikit_viewgroup_linearlayout_rotatable_horizontal" parent="@style/res_2131952596_uikit_viewgroup_linearlayout_horizontal">
+    <style name="UiKit_ViewGroup_LinearLayout_Rotatable_Horizontal" parent="@style/UiKit_ViewGroup_LinearLayout_Horizontal">
     </style>
-    <style name="res_2131952599_uikit_viewgroup_nestedscrollview" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_NestedScrollView" parent="@style/UiKit_ViewGroup">
         <item name="android:clipToPadding">false</item>
         <item name="android:fillViewport">true</item>
         <item name="android:overScrollMode">never</item>
     </style>
-    <style name="res_2131952600_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior" parent="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
+    <style name="UiKit_ViewGroup_NestedScrollView_AppBarScrollingViewBehavior" parent="@style/UiKit_ViewGroup_NestedScrollView">
         <item name="android:fitsSystemWindows">true</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="layout_behavior">@string/action_bar_scrolling_view_behavior</item>
     </style>
-    <style name="res_2131952601_uikit_viewgroup_nestedscrollview_page" parent="@style/res_2131952599_uikit_viewgroup_nestedscrollview">
+    <style name="UiKit_ViewGroup_NestedScrollView_Page" parent="@style/UiKit_ViewGroup_NestedScrollView">
         <item name="android:background">?attr/colorBackgroundPrimary</item>
         <item name="android:layout_height">match_parent</item>
     </style>
-    <style name="res_2131952602_uikit_viewgroup_page" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_Page" parent="@style/UiKit_ViewGroup">
         <item name="android:background">?attr/colorBackgroundPrimary</item>
         <item name="android:layout_height">match_parent</item>
     </style>
-    <style name="res_2131952603_uikit_viewgroup_page_linearlayout" parent="@style/res_2131952602_uikit_viewgroup_page">
+    <style name="UiKit_ViewGroup_Page_LinearLayout" parent="@style/UiKit_ViewGroup_Page">
         <item name="android:orientation">vertical</item>
     </style>
-    <style name="res_2131952604_uikit_viewgroup_page_linearlayout_horizontal" parent="@style/res_2131952603_uikit_viewgroup_page_linearlayout">
+    <style name="UiKit_ViewGroup_Page_LinearLayout_Horizontal" parent="@style/UiKit_ViewGroup_Page_LinearLayout">
         <item name="android:orientation">@null</item>
     </style>
-    <style name="res_2131952605_uikit_viewgroup_recyclerview" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_RecyclerView" parent="@style/UiKit_ViewGroup">
         <item name="android:orientation">vertical</item>
         <item name="android:clipToPadding">false</item>
         <item name="layoutManager">androidx.recyclerview.widget.LinearLayoutManager</item>
     </style>
-    <style name="res_2131952606_uikit_viewgroup_recyclerview_appbarscrollingviewbehavior" parent="@style/res_2131952605_uikit_viewgroup_recyclerview">
+    <style name="UiKit_ViewGroup_RecyclerView_AppBarScrollingViewBehavior" parent="@style/UiKit_ViewGroup_RecyclerView">
         <item name="android:fitsSystemWindows">true</item>
         <item name="android:layout_height">match_parent</item>
         <item name="layout_behavior">@string/action_bar_scrolling_view_behavior</item>
     </style>
-    <style name="res_2131952607_uikit_viewgroup_recyclerview_horizontal" parent="@style/res_2131952605_uikit_viewgroup_recyclerview">
+    <style name="UiKit_ViewGroup_RecyclerView_Horizontal" parent="@style/UiKit_ViewGroup_RecyclerView">
         <item name="android:orientation">@null</item>
         <item name="android:fitsSystemWindows">false</item>
     </style>
-    <style name="res_2131952608_uikit_viewgroup_relativelayout" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_RelativeLayout" parent="@style/UiKit_ViewGroup">
     </style>
-    <style name="res_2131952609_uikit_viewgroup_relativelayout_appbarscrollingviewbehavior" parent="@style/res_2131952608_uikit_viewgroup_relativelayout">
+    <style name="UiKit_ViewGroup_RelativeLayout_AppBarScrollingViewBehavior" parent="@style/UiKit_ViewGroup_RelativeLayout">
         <item name="android:layout_height">match_parent</item>
         <item name="layout_behavior">@string/action_bar_scrolling_view_behavior</item>
     </style>
-    <style name="res_2131952610_uikit_viewgroup_scrollview" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UiKit_ViewGroup_ScrollView" parent="@style/UiKit_ViewGroup">
     </style>
-    <style name="res_2131952611_uikit_viewgroup_scrollview_horizontal" parent="@style/res_2131952610_uikit_viewgroup_scrollview">
+    <style name="UiKit_ViewGroup_ScrollView_Horizontal" parent="@style/UiKit_ViewGroup_ScrollView">
         <item name="android:scrollbars">@null</item>
     </style>
-    <style name="res_2131952612_uikit_viewgroup_scrollview_page" parent="@style/res_2131952610_uikit_viewgroup_scrollview">
+    <style name="UiKit_ViewGroup_ScrollView_Page" parent="@style/UiKit_ViewGroup_ScrollView">
         <item name="android:background">?attr/colorBackgroundPrimary</item>
         <item name="android:layout_height">match_parent</item>
     </style>
-    <style name="res_2131952613_uikit_welcomemessagecard">
+    <style name="UiKit_WelcomeMessageCard">
         <item name="android:focusable">true</item>
         <item name="android:clickable">true</item>
         <item name="android:layout_width">match_parent</item>
@@ -6077,7 +6077,7 @@
         <item name="cardCornerRadius">8dp</item>
         <item name="contentPadding">16dp</item>
     </style>
-    <style name="res_2131952614_userprofile_presencesection_body" parent="@style/res_2131952591_uikit_viewgroup_constraintlayout">
+    <style name="UserProfile_PresenceSection_Body" parent="@style/UiKit_ViewGroup_ConstraintLayout">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingRight">16dp</item>
@@ -6085,44 +6085,44 @@
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
     </style>
-    <style name="res_2131952615_userprofile_presencesection_body_headertext" parent="@style/res_2131952579_uikit_textview_semibold">
+    <style name="UserProfile_PresenceSection_Body_HeaderText" parent="@style/UiKit_TextView_Semibold">
         <item name="android:textColor">?attr/colorHeaderPrimary</item>
     </style>
-    <style name="res_2131952616_userprofile_presencesection_body_subtext" parent="@style/res_2131952581_uikit_textview_subtext">
+    <style name="UserProfile_PresenceSection_Body_Subtext" parent="@style/UiKit_TextView_Subtext">
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
     </style>
-    <style name="res_2131952617_userprofile_presencesection_materialbutton" parent="@style/res_2131952468_uikit_material_button_secondary_fit">
+    <style name="UserProfile_PresenceSection_MaterialButton" parent="@style/UiKit_Material_Button_Secondary_Fit">
         <item name="android:textColor">@color/presence_button_text_color</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
     </style>
-    <style name="res_2131952618_userprofile_section" parent="@style/res_2131952589_uikit_viewgroup">
+    <style name="UserProfile_Section" parent="@style/UiKit_ViewGroup">
         <item name="android:layout_marginLeft">16dp</item>
         <item name="android:layout_marginRight">16dp</item>
         <item name="android:layout_marginStart">16dp</item>
         <item name="android:layout_marginEnd">16dp</item>
     </style>
-    <style name="res_2131952619_userprofile_section_card" parent="@style/res_2131952618_userprofile_section">
+    <style name="UserProfile_Section_Card" parent="@style/UserProfile_Section">
         <item name="android:layout_marginBottom">8dp</item>
         <item name="cardBackgroundColor">?attr/colorBackgroundPrimary</item>
         <item name="cardCornerRadius">8dp</item>
         <item name="cardElevation">0dp</item>
     </style>
-    <style name="res_2131952620_userprofile_section_header" parent="@style/res_2131952618_userprofile_section">
-        <item name="android:textAppearance">@style/res_2131952621_userprofile_section_headertextappearance</item>
+    <style name="UserProfile_Section_Header" parent="@style/UserProfile_Section">
+        <item name="android:textAppearance">@style/UserProfile_Section_HeaderTextAppearance</item>
         <item name="android:paddingTop">8dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginBottom">8dp</item>
     </style>
-    <style name="res_2131952621_userprofile_section_headertextappearance" parent="@style/res_2131952154_textappearance_appcompat">
+    <style name="UserProfile_Section_HeaderTextAppearance" parent="@style/res_2131952154_textappearance_appcompat">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?attr/colorHeaderSecondary</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:fontFamily">?attr/font_display_semibold</item>
     </style>
-    <style name="VoiceControlsSheet" parent="@style/res_2131952594_uikit_viewgroup_linearlayout">
-        <item name="android:theme">@style/res_2131951648_apptheme_dark</item>
+    <style name="VoiceControlsSheet" parent="@style/UiKit_ViewGroup_LinearLayout">
+        <item name="android:theme">@style/AppTheme_Dark</item>
         <item name="android:background">@drawable/drawable_voice_controls_bg</item>
         <item name="android:paddingBottom">@dimen/voice_controls_sheet_bottom_padding</item>
         <item name="android:paddingStart">16dp</item>